Changeset 656

Timestamp:

12/29/08 06:11:21 (4 years ago)

Author:

reyalp

Message:

• move boot splash logo to file ​http://chdk.kernreaktor.org/mantis/view.php?id=156
• remove OPT_BOOTLOGO since it would only save ~360 bytes now
• formatting tweak badpixel.lua

Location:

trunk

Files:

• CHDK/DATA (added)
• CHDK/DATA/logo.dat (added)
• CHDK/SCRIPTS/TEST/badpixel.lua (modified) (1 diff)
• Makefile (modified) (1 diff)
• buildconf.inc (modified) (1 diff)
• core/Makefile (modified) (1 diff)
• core/gui.c (modified) (7 diffs)
• core/gui_logo.h (deleted)

trunk/CHDK/SCRIPTS/TEST/badpixel.lua

@@ -41 +41 @@
  end
  os.remove("A/CHDK/bad_tmp.bin")
- else
-  print("Try this script again...")
- end
+else
+ print("Try this script again...")
+end

trunk/Makefile

@@ -96 +96 @@
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/BOOKS/*  > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/CURVES/*  > $(DEVNULL)
+        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/DATA/*  > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/FONTS/*  > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full.zip $(topdir)CHDK/GAMES/*   > $(DEVNULL)

trunk/buildconf.inc

@@ -6 +6 @@
 OPT_GAME_CONNECT4=1
 OPT_GAME_MASTERMIND=1
-OPT_BOOTLOGO=1
 OPT_CURVES=1
 OPT_TEXTREADER=1

trunk/core/Makefile

@@ -28 +28 @@
 CFLAGS+=-DOPT_GAME_MASTERMIND
 OPT_OBJS+=gui_mastermind.o
-endif
-ifdef OPT_BOOTLOGO
-CFLAGS+=-DOPT_BOOTLOGO
 endif
 ifdef OPT_CURVES

trunk/core/gui.c

@@ -42 +42 @@
 #ifdef OPT_CURVES
         #include "curves.h"
-#endif
-#ifdef OPT_BOOTLOGO
-        #include "gui_logo.h"
 #endif
 #include "edgeoverlay.h"
@@ -120 +117 @@
 static void gui_draw_osd();
 
-
-static void gui_draw_splash();
-
+static void gui_draw_splash(char* logo, int logo_size);
 
 void user_menu_save();
@@ -2030 +2025 @@
 }
 
-//-------------------------------------------------------------------
-void gui_redraw()
-{
-    enum Gui_Mode gui_mode_old;
-    static int show_script_console=0;
-
-
+static void gui_handle_splash(void) {
+        static char *logo = NULL;
+    static int logo_size;
     if (gui_splash) {
+                static int need_logo=1; // don't use logo ptr, since we don't want to keep re-trying
+                if(need_logo) {
+                const char *logo_name="A/CHDK/DATA/logo.dat";
+            FILE *fd;
+            struct stat st;
+                        need_logo=0;
+            if (stat(logo_name,&st) == 0) {
+                                logo_size=st.st_size;
+                                logo=malloc(logo_size);
+                                if(logo) {
+                                        fd = fopen(logo_name, "rb");
+                                        if(fd){
+                                                fread(logo,1,logo_size,fd);
+                                                fclose(fd);
+                                        }
+                                        else {
+                                                free(logo);
+                                                logo=NULL;
+                                        }
+                }
+                        }
+                }
         if (gui_splash>(SPLASH_TIME-4)) {
-            gui_draw_splash();
+            gui_draw_splash(logo,logo_size);
            //   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)) {
@@ -2046 +2059 @@
         }
         --gui_splash;
-    }
-
+                if(!gui_splash) {
+                        free(logo);
+                }
+    }
+}
+
+//-------------------------------------------------------------------
+void gui_redraw()
+{
+    enum Gui_Mode gui_mode_old;
+    static int show_script_console=0;
+
+        gui_handle_splash();
 
     gui_in_redraw = 1;
@@ -2913 +2937 @@
 //-------------------------------------------------------------------
 
-void gui_draw_splash() {
+void gui_draw_splash(char* logo, int logo_size) {
     coord w, h, x, y;
     static const char *text[] = {
@@ -2920 +2944 @@
         "Camera: " PLATFORM " - " PLATFORMSUB };
     int i, l;
-   // color cl = MAKE_COLOR((gui_splash_mode==MODE_REC)?0xDA:0xD9, COLOR_WHITE);
     color cl = MAKE_COLOR(COLOR_RED, COLOR_WHITE);
 
-
     gui_splash_mode = (mode_get()&MODE_MASK);
-
+    
     h=sizeof(text)/sizeof(text[0])*FONT_HEIGHT+8;
     w=0;
@@ -2939 +2961 @@
         draw_string(x+((w-strlen(text[i])*FONT_WIDTH)>>1), y+i*FONT_HEIGHT+4, text[i], cl);
     }
-#ifdef OPT_BOOTLOGO
-    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};
+    if(logo){
+      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(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++;
-            }
-            
-        }
-    }
-#endif
+      for(pos=0; pos<logo_size; pos++){
+          char data = logo[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++;
+              }     
+          }
+      }
+    }
 }