Chameleon

Chameleon Commit Details

Date:2010-08-17 00:00:55 (4 years 3 months ago)
Author:Tamás Kosárszky
Commit:369
Parents: 368
Message:Removed logo drawing in verbose mode boot. Removed unnecessary drawBackground() calls.
Changes:
M/trunk/i386/boot2/boot.c
M/trunk/i386/boot2/gui.c
M/trunk/i386/boot2/options.c

File differences

trunk/i386/boot2/boot.c
379379
380380
381381
382
383
384
385
386
387382
388383
389384
......
391386
392387
393388
389
394390
395391
396392
......
564560
565561
566562
567
568
569
570
571
572
563
564
573565
574566
575567
// Other status (e.g. 0) means that we should proceed with boot.
if( bootArgs->Video.v_display == GRAPHICS_MODE )
drawBackground();
// Found and loaded a config file. Proceed with boot.
// Turn off any GUI elements
if( bootArgs->Video.v_display == GRAPHICS_MODE )
{
gui.bootprompt.draw = false;
gui.menu.draw = false;
gui.infobox.draw = false;
gui.logo.draw = false;
drawBackground();
updateVRAM();
}
if (ret <= 0) {
printf("Can't find %s\n", bootFile);
if(gui.initialised) {
sleep(1);
drawBackground();
gui.devicelist.draw = true;
gui.redraw = true;
}
sleep(1);
if (gBootFileType == kNetworkDeviceType) {
// Return control back to PXE. Don't unload PXE base code.
gUnloadPXEOnExit = false;
trunk/i386/boot2/gui.c
439439
440440
441441
442
442
443
444
445
443446
444447
445448
......
699702
700703
701704
702
705
706
703707
704708
705709
blend( images[iBackground].image, gui.screen.pixmap, gui.background.pos );
// draw logo.png into background buffer
blend( images[iLogo].image, gui.screen.pixmap, gui.logo.pos);
if (gui.logo.draw)
{
blend( images[iLogo].image, gui.screen.pixmap, gui.logo.pos);
}
memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );
}
if (createWindowBuffer(&gui.devicelist) == 0) {
if (createWindowBuffer(&gui.bootprompt) == 0) {
if (createWindowBuffer(&gui.infobox) == 0) {
if (createWindowBuffer(&gui.menu) == 0) {
if (createWindowBuffer(&gui.menu) == 0) {
gui.logo.draw = true;
drawBackground();
// lets copy the screen into the back buffer
memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );
trunk/i386/boot2/options.c
866866
867867
868868
869
869870
870871
871872
if (bootArgs->Video.v_display == GRAPHICS_MODE) {
// redraw the background buffer
gui.logo.draw = true;
drawBackground();
gui.devicelist.draw = true;
gui.redraw = true;

Archive Download the corresponding diff file

Revision: 369