some skin adjustments

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@226 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index e9ffd46..49e1387 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -212,7 +212,7 @@ endif
 \r
 rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png\r
        zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o\r
-       zip -9 PicoDrive_$(VER).zip skin\r
+       zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
 \r
 code940/code940.bin:\r
        make -C code940/\r

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index b45b295..71ddf68 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -45,7 +45,7 @@ static int menu_sel_color = -1; // disabled
 \r
 char menuErrorMsg[40] = {0, };\r
 \r
-static void menu_darken_bg(void *dst, int pixels);\r
+static void menu_darken_bg(void *dst, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
 \r
 // draws text to current bbp16 screen\r
@@ -562,14 +562,13 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
        start = 12 - sel;\r
        n--; // exclude current dir (".")\r
 \r
-       if (rom_data)\r
-               gp2x_pd_clone_buffer2();\r
-       else {\r
-               memset(gp2x_screen, 0, 320*240*2);\r
-               memset((char *)gp2x_screen + 320*120*2, 0xff, 320*8*2);\r
+       gp2x_pd_clone_buffer2();\r
+\r
+       if (rom_data == NULL) {\r
+               menu_darken_bg(gp2x_screen, 320*240, 0);\r
        }\r
 \r
-       menu_darken_bg((char *)gp2x_screen + 320*120*2, 320*8);\r
+       menu_darken_bg((char *)gp2x_screen + 320*120*2, 320*8, 0);\r
 \r
        if(start - 2 >= 0)\r
                smalltext_out16_lim(14, (start - 2)*10, curdir, 0xffff, 53-2);\r
@@ -1754,7 +1753,7 @@ static void draw_menu_credits(void)
        text_out16(tl_x, (y+=10), "Dzz: ARM940 sample");\r
        text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick");\r
        text_out16(tl_x, (y+=10), "craigix: GP2X hardware");\r
-       text_out16(tl_x, (y+=10), "ketch: skin design");\r
+       text_out16(tl_x, (y+=10), "ketchupgun: skin design");\r
 \r
        menu_flip();\r
 }\r
@@ -1918,15 +1917,25 @@ static void menu_loop_root(void)
        }\r
 }\r
 \r
-static void menu_darken_bg(void *dst, int pixels)\r
+static void menu_darken_bg(void *dst, int pixels, int darker)\r
 {\r
        unsigned int *screen = dst;\r
        pixels /= 2;\r
-       while (pixels--)\r
+       if (darker)\r
        {\r
-               unsigned int p = *screen;\r
-               *screen = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
-               screen++;\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *screen;\r
+                       *screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *screen;\r
+                       *screen++ = (p&0xf79ef79e)>>1;\r
+               }\r
        }\r
 }\r
 \r
@@ -1936,7 +1945,7 @@ static void menu_prepare_bg(int use_game_bg)
        {\r
                // darken the active framebuffer\r
                memset(gp2x_screen, 0, 320*8*2);\r
-               menu_darken_bg((char *)gp2x_screen + 320*8*2, 320*224);\r
+               menu_darken_bg((char *)gp2x_screen + 320*8*2, 320*224, 1);\r
                memset((char *)gp2x_screen + 320*232*2, 0, 320*8*2);\r
        }\r
        else\r

diff --git a/skin/background.png b/platform/gp2x/skin/background.png
similarity index 100%
rename from skin/background.png
rename to platform/gp2x/skin/background.png

diff --git a/skin/font.png b/platform/gp2x/skin/font.png
similarity index 100%
rename from skin/font.png
rename to platform/gp2x/skin/font.png

diff --git a/platform/gp2x/skin/readme.txt b/platform/gp2x/skin/readme.txt
new file mode 100644 (file)
index 0000000..dd83963
--- /dev/null
+++ b/platform/gp2x/skin/readme.txt
@@ -0,0 +1,8 @@
+The skin images can be customized, but there are several limitations:\r
+\r
+background.png - must be 320x240 image with 24bit RGB colors.\r
+font.png       - must be 128x160 8bit grayscale image.\r
+selector.png   - must be 8x10 8bit grayscale image.\r
+\r
+Font and selector colors can be changed by editing skin.txt.\r
+\r

diff --git a/skin/selector.png b/platform/gp2x/skin/selector.png
similarity index 100%
rename from skin/selector.png
rename to platform/gp2x/skin/selector.png

diff --git a/skin/skin.txt b/platform/gp2x/skin/skin.txt
similarity index 96%
rename from skin/skin.txt
rename to platform/gp2x/skin/skin.txt
index 1d67cee..c2baeb2 100644 (file)
--- a/skin/skin.txt
+++ b/platform/gp2x/skin/skin.txt
@@ -1,4 +1,4 @@
-// html-style hex color codes, ex. ff0000 is red, 0000ff is blue, etc.
-text_color=ffffff
-selection_color=c00000
-
+// html-style hex color codes, ex. ff0000 is red, 0000ff is blue, etc.\r
+text_color=ffffff\r
+selection_color=c00000\r
+\r

diff --git a/platform/readme.txt b/platform/readme.txt
index 4f4df8a..c91e4bd 100644 (file)
--- a/platform/readme.txt
+++ b/platform/readme.txt
@@ -209,8 +209,11 @@ GP2X:
 * Dzz for his ARM940 sample code.\r
 * GnoStiC & Puck2099 for USB joystick support.\r
 * Hermes PS2R, god_at_hell for the CpuCtrl library.\r
+* A_SN for his gamma code.\r
 * craigix for supplying the GP2X hardware and making this port possible.\r
 * Alex for the icon.\r
+* ketchupgun for the skin.\r
+* All the people from gp32x boards for their support.\r
 \r
 Symbian:\r
 * Peter van Sebille for his various open-source Symbian projects to learn from.\r
@@ -244,7 +247,7 @@ Changelog
   * Changed key configuration behaviour to the one from gpfce (should be more\r
     intuitive).\r
   + Added some skinning capabilities to the menu system with default skin by\r
-    ketch. Delete skin directory if you want old behaviour.\r
+    ketchupgun. Delete skin directory if you want old behaviour.\r
 \r
 1.32\r
   + Added some new scaling options.\r