menubg, png, bugfix

[fceu.git] / drivers / gp2x / menu.c

diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c
index b23837a..db0d9d1 100644 (file)
--- a/drivers/gp2x/menu.c
+++ b/drivers/gp2x/menu.c
@@ -21,6 +21,7 @@
 #include "../../input.h"\r
 #include "../../state.h"\r
 #include "../../palette.h"\r
+#include "readpng.h"\r
 \r
 #ifndef _DIRENT_HAVE_D_TYPE\r
 #error "need d_type for file browser\r
@@ -44,13 +45,67 @@ static char *gp2xKeyNames[] = {
 \r
 \r
 static char path_buffer[PATH_MAX];\r
+static unsigned short *menu_bg = 0;\r
+static int txt_xmin, txt_xmax, txt_ymin, txt_ymax;\r
 \r
 char menuErrorMsg[40] = {0, };\r
 \r
-// TODO\r
-void gp2x_fceu_copy_bg(void)\r
+static void gp2x_fceu_darken_reset(void)\r
+{\r
+       txt_xmin = 320; txt_xmax = 0;\r
+       txt_ymin = 240; txt_ymax = 0;\r
+}\r
+\r
+static void gp2x_fceu_copy_bg(void)\r
+{\r
+       if (menu_bg)\r
+            memcpy(gp2x_screen, menu_bg, 320*240*2);\r
+       else memset(gp2x_screen, 0, 320*240*2);\r
+       gp2x_fceu_darken_reset();\r
+}\r
+\r
+static void gp2x_fceu_darken_text_bg(void)\r
 {\r
-       memset(gp2x_screen, 0, 320*240*2);\r
+       int x, y, xmin, xmax, ymax;\r
+       unsigned short *screen = gp2x_screen;\r
+\r
+       xmin = txt_xmin - 3;\r
+       if (xmin < 0) xmin = 0;\r
+       xmax = txt_xmax + 2;\r
+       if (xmax > 319) xmax = 319;\r
+\r
+       y = txt_ymin - 3;\r
+       if (y < 0) y = 0;\r
+       ymax = txt_ymax + 2;\r
+       if (ymax > 239) ymax = 239;\r
+\r
+       for (x = xmin; x <= xmax; x++)\r
+               screen[y*320+x] = 0xa514;\r
+       for (y++; y < ymax; y++)\r
+       {\r
+               screen[y*320+xmin] = 0xffff;\r
+               for (x = xmin+1; x < xmax; x++)\r
+               {\r
+                       unsigned int p = screen[y*320+x];\r
+                       if (p != 0xffff)\r
+                               screen[y*320+x] = ((p&0xf79e)>>1) - ((p&0xc618)>>3);\r
+               }\r
+               screen[y*320+xmax] = 0xffff;\r
+       }\r
+       for (x = xmin; x <= xmax; x++)\r
+               screen[y*320+x] = 0xffff;\r
+}\r
+\r
+static void gp2x_fceu_darken_all(void)\r
+{\r
+       unsigned int *screen = gp2x_screen;\r
+       int count = 320*240/2;\r
+\r
+       while (count--)\r
+       {\r
+               unsigned int p = screen[count];\r
+               screen[count] = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
+       }\r
 }\r
 \r
 // draws white text to current bbp15 screen\r
@@ -76,6 +131,10 @@ static void gp2x_text_out15_(int x, int y, const char *text)
                }\r
                screen += 8;\r
        }\r
+       if (x < txt_xmin) txt_xmin = x;\r
+       if (x+i*8 > txt_xmax) txt_xmax = x+i*8;\r
+       if (y < txt_ymin) txt_ymin = y;\r
+       if (y+8   > txt_ymax) txt_ymax = y+8;\r
 }\r
 \r
 void gp2x_text_out15(int x, int y, const char *texto, ...)\r
@@ -243,8 +302,8 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
        start = 12 - sel;\r
        n--; // exclude current dir (".")\r
 \r
-       //memset(gp2x_screen, 0, 320*240);\r
        gp2x_fceu_copy_bg();\r
+       gp2x_fceu_darken_all();\r
 \r
        if(start - 2 >= 0)\r
                gp2x_smalltext8_lim(14, (start - 2)*10, curdir, 53-2);\r
@@ -369,7 +428,7 @@ static char *filesel_loop(char *curr_path, char *final_dest)
                                } else {\r
                                        strcpy(newdir, curr_path);\r
                                        p = newdir + strlen(newdir) - 1;\r
-                                       while (*p == '/' && p >= newdir) *p-- = 0;\r
+                                       while (p >= newdir && *p == '/') *p-- = 0;\r
                                        strcat(newdir, "/");\r
                                        strcat(newdir, namelist[sel+1]->d_name);\r
                                }\r
@@ -689,6 +748,9 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i
        // draw cursor\r
        gp2x_text_out15(x - 16, tl_y + sel*10, ">");\r
 \r
+       gp2x_fceu_darken_text_bg();\r
+       gp2x_fceu_darken_reset();\r
+\r
        if (sel < opt_cnt) {\r
                gp2x_text_out15(30, 190, "Press a button to bind/unbind");\r
                gp2x_text_out15(30, 200, "Use VOL+ to clear");\r
@@ -699,6 +761,7 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i
                gp2x_text_out15(30, 210, "to save controls");\r
                gp2x_text_out15(30, 220, "Press B or X to exit");\r
        }\r
+       gp2x_fceu_darken_text_bg();\r
        gp2x_video_flip();\r
 }\r
 \r
@@ -778,6 +841,7 @@ static void draw_kc_sel(int menu_sel)
                gp2x_text_out15(tl_x, (y+=10), "none");\r
        }\r
 \r
+       gp2x_fceu_darken_text_bg();\r
        gp2x_video_flip();\r
 }\r
 \r
@@ -880,14 +944,18 @@ static void draw_fcemenu_options(int menu_sel)
        gp2x_text_out15(tl_x, (y+=10), "Disable 8 sprite limit     %s", (eoptions&EO_NO8LIM)?"ON":"OFF");\r
        gp2x_text_out15(tl_x, (y+=10), "Done");                                                 // 10\r
 \r
+       // draw cursor\r
+       gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
+\r
        if (menu_sel == 0) {\r
+               gp2x_fceu_darken_text_bg();\r
+               gp2x_fceu_darken_reset();\r
+\r
                gp2x_text_out15(30, 210, "Press B to browse,");\r
                gp2x_text_out15(30, 220, "START to use default");\r
        }\r
 \r
-       // draw cursor\r
-       gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
-\r
+       gp2x_fceu_darken_text_bg();\r
        gp2x_video_flip();\r
 }\r
 \r
@@ -1006,6 +1074,7 @@ static void draw_menu_options(int menu_sel)
        // draw cursor\r
        gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
 \r
+       gp2x_fceu_darken_text_bg();\r
        gp2x_video_flip();\r
 }\r
 \r
@@ -1032,7 +1101,7 @@ static void config_commit(void)
 static int menu_loop_options(void)\r
 {\r
        static int menu_sel = 0;\r
-       int menu_sel_max = 15;\r
+       int menu_sel_max = 14;\r
        unsigned long inp = 0;\r
 \r
        if (fceugi) menu_sel_max++;\r
@@ -1121,6 +1190,7 @@ static void draw_menu_credits(void)
        gp2x_text_out15(20, 180, "  cpuctrl, gamma libs");\r
        gp2x_text_out15(20, 190, "Squidge: squidgehack");\r
 \r
+       gp2x_fceu_darken_text_bg();\r
        gp2x_video_flip();\r
 }\r
 \r
@@ -1152,13 +1222,18 @@ static void draw_menu_root(int menu_sel)
 \r
        // draw cursor\r
        gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
-       // error\r
+\r
+       gp2x_fceu_darken_text_bg();\r
+       gp2x_fceu_darken_reset();\r
+\r
+       // error / version\r
        if (menuErrorMsg[0]) gp2x_text_out15(1, 230, menuErrorMsg);\r
        else {\r
                char vstr[16];\r
                sprintf(vstr, "v" GP2X_PORT_VERSION " r%i", GP2X_PORT_REV);\r
                gp2x_text_out15(320-strlen(vstr)*8-1, 230, vstr);\r
        }\r
+       gp2x_fceu_darken_text_bg();\r
        gp2x_video_flip();\r
 }\r
 \r
@@ -1274,9 +1349,26 @@ static int menu_loop_root(void)
 }\r
 \r
 \r
+extern unsigned short gp2x_palette16[256];\r
+\r
 static void menu_prepare_bg(void)\r
 {\r
-       // TODO...\r
+       menu_bg = malloc(320*240*2);\r
+       if (menu_bg == NULL) return;\r
+\r
+       if (fceugi)\r
+       {\r
+               /* raw emu frame should now be at gp2x_screen */\r
+               soft_scale((char *)gp2x_screen + 32, gp2x_palette16, srendline, erendline-srendline);\r
+               if (srendline)\r
+                       memset32((int *)((char *)gp2x_screen + 32), 0, srendline*320*2/4);\r
+               memcpy(menu_bg, gp2x_screen + 32, 320*240*2);\r
+       }\r
+       else\r
+       {\r
+               memset32((int *)menu_bg, 0, 320*240*2/4);\r
+               readpng(menu_bg, "background.png");\r
+       }\r
 }\r
 \r
 static void menu_gfx_prepare(void)\r
@@ -1299,6 +1391,8 @@ int gp2x_menu_do(void)
 \r
        ret = menu_loop_root();\r
 \r
+       if (menu_bg) free(menu_bg);\r
+       menu_bg = NULL;\r
        menuErrorMsg[0] = 0;\r
 \r
        return ret;\r