Chameleon

Chameleon Commit Details

Date:2010-09-09 07:27:46 (8 years 10 months ago)
Author:Azimutz
Commit:509
Parents: 508
Message:#define'ing kDefaultThemeName "Default", kLegacyLogoKey "Legacy Logo" and applying related changes. A bit of clean up.
Changes:
M/branches/azimutz/Chazi/i386/boot2/gui.c

File differences

branches/azimutz/Chazi/i386/boot2/gui.c
1313
1414
1515
16
17
16
17
18
1819
1920
2021
2122
2223
23
24
25
26
27
28
2924
25
26
3027
31
32
33
3428
3529
3630
......
134128
135129
136130
137
131
138132
139133
140134
......
680674
681675
682676
683
677
684678
685679
686680
......
18621856
18631857
18641858
1865
1859
18661860
18671861
18681862
#include "vers.h"
#define IMG_REQUIRED -1
#define THEME_NAME_DEFAULT"Default"
static const char *theme_name = THEME_NAME_DEFAULT;
#define LOADPNG(img, alt_img) if (loadThemeImage(#img, alt_img) != 0) { return 1; }
#define VIDEO(x) (bootArgs->Video.v_ ## x)
#define vram VIDEO(baseAddr)
#ifdef EMBED_THEME
#include "art.h"
#endif
#define LOADPNG(img, alt_img) if (loadThemeImage(#img, alt_img) != 0) { return 1; }
#define VIDEO(x) (bootArgs->Video.v_ ## x)
#define vram VIDEO(baseAddr)
int lasttime = 0; // we need this for animating maybe
extern int gDeviceCount; // dup, line 132
static const char *theme_name = kDefaultThemeName; // #define'ed on boot.h
extern int gDeviceCount;
/*
* ATTENTION: the enum and the following array images[] MUST match !!!
*/
int imageCnt = 0;
extern intgDeviceCount;
//extern intgDeviceCount; - dup, line 25
extern intselectIndex;
extern MenuItem *menuItems;
intval, len, count;
chardirspec[128]; //Azi: a bit of testing***
getValueForKey( "Theme", &theme_name, &len, &bootInfo->bootConfig );
getValueForKey( kThemeNameKey, &theme_name, &len, &bootInfo->bootConfig );
if ((strlen(theme_name) + 27) > sizeof(dirspec)) {
return 1;
}
bool legacy_logo;
uint16_t x, y;
if (getBoolForKey("Legacy Logo", &legacy_logo, &bootInfo->bootConfig) && legacy_logo) {
if (getBoolForKey(kLegacyLogoKey, &legacy_logo, &bootInfo->bootConfig) && legacy_logo) {
usePngImage = false;
} else if (bootImageData == NULL) {
loadBootGraphics();

Archive Download the corresponding diff file

Revision: 509