Chameleon

Chameleon Commit Details

Date:2010-08-17 10:52:05 (13 years 8 months ago)
Author:Tamás Kosárszky
Commit:372
Parents: 371
Message:Refactored device list initialization.
Changes:
M/trunk/i386/boot2/boot.c
M/trunk/i386/boot2/gui.c
M/trunk/i386/boot2/gui.h

File differences

trunk/i386/boot2/boot.c
373373
374374
375375
376
376
377377
378378
379379
␊
bvChain = newFilteredBVChain(0x80, 0xFF, allowBVFlags, denyBVFlags, &gDeviceCount);␊
setBootGlobals(bvChain);␊
loadThemeValues(&bootInfo->themeConfig);␊
setupDeviceList(&bootInfo->themeConfig);␊
}␊
continue;␊
}␊
trunk/i386/boot2/gui.c
459459
460460
461461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
462526
463527
464528
......
466530
467531
468532
469
470
533
471534
472535
473536
......
517580
518581
519582
520
583
521584
522585
523
524
586
525587
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572588
573589
574590
......
659675
660676
661677
662
663
664
665
666
667
668678
669679
670680
␉memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );␊
}␊
␊
void setupDeviceList(config_file_t *theme)␊
{␊
␉unsigned int pixel;␊
␉int␉alpha;␉␉␉␉// transparency level 0 (obligue) - 255 (transparent)␊
␉uint32_t color;␉␉␉// color value formatted RRGGBB␊
␉int val, len;␊
␉const char *string;␉␊
␊
␉if(getIntForKey("devices_max_visible", &val, theme ))␊
␉␉gui.maxdevices = MIN( val, gDeviceCount );␊
␊
␉if(getIntForKey("devices_iconspacing", &val, theme ))␊
␉␉gui.devicelist.iconspacing = val;␊
␊
␉// check layout for horizontal or vertical␊
␉gui.layout = HorizontalLayout;␊
␉if(getValueForKey( "devices_layout", &string, &len, theme)) {␊
␉␉if (!strcmp (string, "vertical")) {␊
␉␉␉gui.layout = VerticalLayout;␊
␉␉}␊
␉}␊
␊
␉switch (gui.layout) {␊
␉case VerticalLayout:␊
␉␉gui.devicelist.height = ((images[iSelection].image->height + font_console.chars[0]->height + gui.devicelist.iconspacing) * MIN(gui.maxdevices, gDeviceCount) + (images[iDeviceScrollPrev].image->height + images[iDeviceScrollNext].image->height) + gui.devicelist.iconspacing);␊
␉␉gui.devicelist.width = (images[iSelection].image->width + gui.devicelist.iconspacing);␊
␊
␉␉if(getDimensionForKey("devices_pos_x", &pixel, theme, gui.screen.width , images[iSelection].image->width ) )␊
␉␉␉gui.devicelist.pos.x = pixel;␊
␊
␉␉if(getDimensionForKey("devices_pos_y", &pixel, theme, gui.screen.height , gui.devicelist.height ) )␊
␉␉␉gui.devicelist.pos.y = pixel;␊
␉␉break;␊
␉␉␊
␉case HorizontalLayout:␊
␉default:␊
␉␉gui.devicelist.width = ((images[iSelection].image->width + gui.devicelist.iconspacing) * MIN(gui.maxdevices, gDeviceCount) + (images[iDeviceScrollPrev].image->width + images[iDeviceScrollNext].image->width) + gui.devicelist.iconspacing);␊
␉␉gui.devicelist.height = (images[iSelection].image->height + font_console.chars[0]->height + gui.devicelist.iconspacing);␊
␊
␉␉if(getDimensionForKey("devices_pos_x", &pixel, theme, gui.screen.width , gui.devicelist.width ) )␊
␉␉␉gui.devicelist.pos.x = pixel;␊
␉␉else␊
␉␉␉gui.devicelist.pos.x = ( gui.screen.width - gui.devicelist.width ) / 2;␊
␉␉␊
␉␉if(getDimensionForKey("devices_pos_y", &pixel, theme, gui.screen.height , images[iSelection].image->height ) )␊
␉␉␉gui.devicelist.pos.y = pixel;␊
␉␉else␊
␉␉␉gui.devicelist.pos.y = ( gui.screen.height - gui.devicelist.height ) / 2;␊
␉␉break;␊
␉}␊
␊
␉if(getColorForKey("devices_bgcolor", &color, theme))␊
␉␉gui.devicelist.bgcolor = (color & 0x00FFFFFF);␊
␊
␉if(getIntForKey("devices_transparency", &alpha, theme))␊
␉␉gui.devicelist.bgcolor = gui.devicelist.bgcolor | (( 255 - ( alpha & 0xFF) ) << 24);␊
␊
␉if (gui.devicelist.pixmap)␊
␉{␊
␉ freeWindowBuffer(&gui.devicelist);␊
createWindowBuffer(&gui.devicelist);␊
}␊
}␊
␊
void loadThemeValues(config_file_t *theme)␊
{␊
␉unsigned int screen_width = gui.screen.width;␊
␉unsigned int pixel;␊
␉int␉alpha;␉␉␉␉// transparency level 0 (obligue) - 255 (transparent)␊
␉uint32_t color;␉␉␉// color value formatted RRGGBB␊
␉int val, len;␊
␉const char *string;␉␊
␉int val;␊
␊
␉/*␊
␉ * Parse screen parameters␊
␉if(getDimensionForKey("countdown_pos_y", &pixel, theme, screen_height , 0 ) )␊
␉␉gui.countdown.pos.y = pixel;␊
␊
␉/*␊
/*␊
␉ * Parse devicelist parameters␊
␉ */␊
␉if(getIntForKey("devices_max_visible", &val, theme ))␊
␉␉gui.maxdevices = MIN( val, gDeviceCount );␊
␉setupDeviceList(theme);␊
␊
␉if(getIntForKey("devices_iconspacing", &val, theme ))␊
␉␉gui.devicelist.iconspacing = val;␊
␊
␉// check layout for horizontal or vertical␊
␉gui.layout = HorizontalLayout;␊
␉if(getValueForKey( "devices_layout", &string, &len, theme)) {␊
␉␉if (!strcmp (string, "vertical")) {␊
␉␉␉gui.layout = VerticalLayout;␊
␉␉}␊
␉}␊
␊
␉switch (gui.layout) {␊
␉case VerticalLayout:␊
␉␉gui.devicelist.height = ((images[iSelection].image->height + font_console.chars[0]->height + gui.devicelist.iconspacing) * MIN(gui.maxdevices, gDeviceCount) + (images[iDeviceScrollPrev].image->height + images[iDeviceScrollNext].image->height) + gui.devicelist.iconspacing);␊
␉␉gui.devicelist.width = (images[iSelection].image->width + gui.devicelist.iconspacing);␊
␊
␉␉if(getDimensionForKey("devices_pos_x", &pixel, theme, gui.screen.width , images[iSelection].image->width ) )␊
␉␉␉gui.devicelist.pos.x = pixel;␊
␊
␉␉if(getDimensionForKey("devices_pos_y", &pixel, theme, gui.screen.height , gui.devicelist.height ) )␊
␉␉␉gui.devicelist.pos.y = pixel;␊
␉␉break;␊
␉␉␊
␉case HorizontalLayout:␊
␉default:␊
␉␉gui.devicelist.width = ((images[iSelection].image->width + gui.devicelist.iconspacing) * MIN(gui.maxdevices, gDeviceCount) + (images[iDeviceScrollPrev].image->width + images[iDeviceScrollNext].image->width) + gui.devicelist.iconspacing);␊
␉␉gui.devicelist.height = (images[iSelection].image->height + font_console.chars[0]->height + gui.devicelist.iconspacing);␊
␊
␉␉if(getDimensionForKey("devices_pos_x", &pixel, theme, gui.screen.width , gui.devicelist.width ) )␊
␉␉␉gui.devicelist.pos.x = pixel;␊
␉␉else␊
␉␉␉gui.devicelist.pos.x = ( gui.screen.width - gui.devicelist.width ) / 2;␊
␉␉␊
␉␉if(getDimensionForKey("devices_pos_y", &pixel, theme, gui.screen.height , images[iSelection].image->height ) )␊
␉␉␉gui.devicelist.pos.y = pixel;␊
␉␉else␊
␉␉␉gui.devicelist.pos.y = ( gui.screen.height - gui.devicelist.height ) / 2;␊
␉␉break;␊
␉}␊
␊
␉if(getColorForKey("devices_bgcolor", &color, theme))␊
␉␉gui.devicelist.bgcolor = (color & 0x00FFFFFF);␊
␊
␉if(getIntForKey("devices_transparency", &alpha, theme))␊
␉␉gui.devicelist.bgcolor = gui.devicelist.bgcolor | (( 255 - ( alpha & 0xFF) ) << 24);␊
␊
␉/*␊
␉ * Parse infobox parameters␊
␉ */␊
␊
␉if(getColorForKey("font_console_color", &color, theme))␊
␉␉gui.screen.font_console_color = (color & 0x00FFFFFF);␊
␉␉␊
␉if (gui.devicelist.pixmap)␊
␉{␊
␉ freeWindowBuffer(&gui.devicelist);␊
createWindowBuffer(&gui.devicelist);␊
}␊
}␊
␊
int initGUI(void)␊
trunk/i386/boot2/gui.h
134134
135135
136136
137
137
138138
139139
140140
int initGUI();␊
void drawBackground();␊
␊
void loadThemeValues(config_file_t *theme);␊
void setupDeviceList(config_file_t *theme);␊
void drawDeviceIcon(BVRef device, pixmap_t *buffer, position_t p, bool isSelected);␊
void drawDeviceList(int start, int end, int selection);␊
void drawProgressBar(pixmap_t *blendInto, uint16_t width, position_t p, uint8_t progress);␊

Archive Download the corresponding diff file

Revision: 372