Changeset 481 for branches/juciphox/core/gui.c

Timestamp:

08/14/08 00:28:20 (5 years ago)

Author:

phyrephox

Message:

+ added beta support for ixus40_sd300 -> ​http://chdk.setepontos.com/index.php/topic,2042.msg19516.html#msg19516 thx to fishpepper
+ italian language file (assembla bugtracker)

• finnish language file (assembla bugtracker)
• bootlogo: now OSD disabled while bootlogo is shown (not very clever code, i know) - idea from MSL (german forum)
• bootlogo: ​http://chdk.setepontos.com/index.php/topic,2122.msg19745.html#msg19745 (decreased bin size)

File:

• branches/juciphox/core/gui.c (modified) (3 diffs)

branches/juciphox/core/gui.c

@@ -1747 +1747 @@
 void gui_init()
 {
+
     gui_mode = GUI_MODE_NONE;
     gui_restore = 0;
@@ -1809 +1810 @@
     enum Gui_Mode gui_mode_old;
     static int show_script_console=0;
-
     if (gui_splash) {
         if (gui_splash>(SPLASH_TIME-4)) {
             gui_draw_splash();
+                conf.show_osd = 0;
         } else if (gui_splash==1 && (mode_get()&MODE_MASK) == gui_splash_mode && (gui_mode==GUI_MODE_NONE || gui_mode==GUI_MODE_ALT)) {
             draw_restore();
+            conf.show_osd = 1;
         }
         --gui_splash;
@@ -2572 +2574 @@
         draw_string(x+((w-strlen(text[i])*FONT_WIDTH)>>1), y+i*FONT_HEIGHT+4, text[i], cl);
     }
-    int mx,my;
+    int pos;
+    int mx=0;
+    int my=0;
     int offset_x = (screen_width-150)>>1;
     int offset_y = ((screen_height-84)>>1) - 42;
+    const color color_lookup[8] = {0xFF, 0x2E, 0x22, 0x3D, 0x1F,  0x21, 0x00, 0x11};
     
-    for(mx=0; mx<150; mx++){
-        for(my=0; my<84; my++){
-            color c = header_data[my*150+mx];
-            if (c != 0x00)
+    for(pos=0; pos<HEADER_DATA_LEN; pos++){
+        char data = header_data[pos];
+        color c = color_lookup[(data>>5) & 0x07];
+        for(i=0; i<(data&0x1F)+1; i++){
+            if (c!=0x00){
                 draw_pixel(offset_x+mx,offset_y+my,c);
+            }
+            if (mx==149){
+                mx=0;
+                my++;
+            }else{
+                mx++;
+            }
+            
         }
     }