psp port runs, bad colors

[libpicofe.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index 53ef33d..bb59510 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -14,15 +14,22 @@
 #include "lprintf.h"\r
 \r
 #if   defined(__GP2X__)\r
-#include "../gp2x/gp2x.h"\r
-#define SCREEN_WIDTH 320\r
-#define SCREEN_BUFFER gp2x_screen\r
+ #include "../gp2x/gp2x.h"\r
+ #define SCREEN_WIDTH 320\r
+ #define SCREEN_BUFFER gp2x_screen\r
 #elif defined(__GIZ__)\r
-#include "../gizmondo/giz.h"\r
-#define SCREEN_WIDTH 321\r
-#define SCREEN_BUFFER giz_screen\r
+ //#include "../gizmondo/giz.h"\r
+ #define SCREEN_WIDTH 321\r
+ #define SCREEN_BUFFER menu_screen\r
+ extern unsigned char *menu_screen;\r
+#elif defined(PSP)\r
+ #include "../psp/psp.h"\r
+ #define SCREEN_WIDTH 512\r
+ #define SCREEN_BUFFER psp_screen\r
 #endif\r
 \r
+char menuErrorMsg[64] = { 0, };\r
+\r
 static unsigned char menu_font_data[10240];\r
 static int menu_text_color = 0xffff; // default to white\r
 static int menu_sel_color = -1; // disabled\r
@@ -157,7 +164,12 @@ static int parse_hex_color(char *buff)
 {\r
        char *endp = buff;\r
        int t = (int) strtoul(buff, &endp, 16);\r
-       if (endp != buff) return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);\r
+       if (endp != buff)\r
+#ifdef PSP\r
+               return ((t<<8)&0xf800) | ((t>>5)&0x07e0) | ((t>>19)&0x1f);\r
+#else\r
+               return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);\r
+#endif\r
        return -1;\r
 }\r
 \r
@@ -213,6 +225,7 @@ void menu_init(void)
                                int tmp = parse_hex_color(buff+16);\r
                                if (tmp >= 0) menu_sel_color = tmp;\r
                                else lprintf("skin.txt: parse error for selection_color\n");\r
+                               lprintf("sel color: %04x\n", menu_sel_color);\r
                        }\r
                        else\r
                                lprintf("skin.txt: parse error: %s\n", buff);\r