perfect vsync, bugfixes

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

diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c
index 6abe009..11cca13 100644 (file)
--- a/drivers/gp2x/menu.c
+++ b/drivers/gp2x/menu.c
@@ -48,7 +48,13 @@ static int txt_xmin, txt_xmax, txt_ymin, txt_ymax;
 \r
 char menuErrorMsg[40] = {0, };\r
 \r
-static void gp2x_fceu_darken_reset(void)\r
+static void menu_flip(void)\r
+{\r
+       gp2x_video_flush_cache();\r
+       gp2x_video_flip();\r
+}\r
+\r
+static void menu_darken_reset(void)\r
 {\r
        txt_xmin = 320; txt_xmax = 0;\r
        txt_ymin = 240; txt_ymax = 0;\r
@@ -59,10 +65,10 @@ static void gp2x_fceu_copy_bg(void)
        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
+       menu_darken_reset();\r
 }\r
 \r
-static void gp2x_fceu_darken_text_bg(void)\r
+static void menu_darken_text_bg(void)\r
 {\r
        int x, y, xmin, xmax, ymax;\r
        unsigned short *screen = gp2x_screen;\r
@@ -317,7 +323,7 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
                }\r
        }\r
        gp2x_text_out15(5, 120, ">");\r
-       gp2x_video_flip();\r
+       menu_flip();\r
 }\r
 \r
 static int scandir_cmp(const void *p1, const void *p2)\r
@@ -506,7 +512,7 @@ static void draw_patchlist(int sel)
        if (pos < 24) gp2x_smalltext16_lim(14, pos*10, "done", 4);\r
 \r
        gp2x_text_out15(5, 120, ">");\r
-       gp2x_video_flip();\r
+       menu_flip();\r
 }\r
 \r
 void patches_menu_loop(void)\r
@@ -631,7 +637,7 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
        // draw cursor\r
        gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
 \r
-       gp2x_video_flip();\r
+       menu_flip();\r
 }\r
 \r
 static int savestate_menu_loop(int is_loading)\r
@@ -768,8 +774,8 @@ 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
+       menu_darken_text_bg();\r
+       menu_darken_reset();\r
 \r
        if (sel < opt_cnt) {\r
                gp2x_text_out15(30, 190, "Press a button to bind/unbind");\r
@@ -781,8 +787,8 @@ 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
+       menu_darken_text_bg();\r
+       menu_flip();\r
 }\r
 \r
 static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_idx)\r
@@ -861,8 +867,8 @@ 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
+       menu_darken_text_bg();\r
+       menu_flip();\r
 }\r
 \r
 // b_turbo,a_turbo  RLDU SEBA\r
@@ -969,15 +975,15 @@ static void draw_fcemenu_options(int menu_sel)
        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
+               menu_darken_text_bg();\r
+               menu_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
-       gp2x_fceu_darken_text_bg();\r
-       gp2x_video_flip();\r
+       menu_darken_text_bg();\r
+       menu_flip();\r
 }\r
 \r
 static void fcemenu_loop_options(void)\r
@@ -1088,17 +1094,18 @@ static void draw_menu_options(int menu_sel)
        gp2x_text_out15(tl_x, (y+=10), "Faster RAM timings         %s", Settings.ramtimings?"ON":"OFF");\r
        gp2x_text_out15(tl_x, (y+=10), "squidgehack (now %s %s",   mms, Settings.mmuhack?"ON":"OFF");   // 10\r
        gp2x_text_out15(tl_x, (y+=10), "Gamma correction           %i.%02i", Settings.gamma / 100, Settings.gamma%100);\r
-       gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock             %iMhz", Settings.cpuclock);          // 12\r
+       gp2x_text_out15(tl_x, (y+=10), "Perfect VSYNC              %s", Settings.perfect_vsync?"ON":"OFF");\r
+       gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock             %iMhz", Settings.cpuclock);          // 13\r
        gp2x_text_out15(tl_x, (y+=10), "[FCE Ultra options]");\r
-       gp2x_text_out15(tl_x, (y+=10), "Save cfg as default");\r
+       gp2x_text_out15(tl_x, (y+=10), "Save cfg as default");                                          // 15\r
        if (fceugi)\r
                gp2x_text_out15(tl_x, (y+=10), "Save cfg for current game only");\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
+       menu_darken_text_bg();\r
+       menu_flip();\r
 }\r
 \r
 static int sndrate_prevnext(int rate, int dir)\r
@@ -1116,7 +1123,6 @@ static int sndrate_prevnext(int rate, int dir)
 \r
 static void config_commit(void)\r
 {\r
-       gp2x_cpuclock_gamma_update();\r
        if (Settings.region_force)\r
                FCEUI_SetVidSystem(Settings.region_force - 1);\r
 }\r
@@ -1124,7 +1130,7 @@ static void config_commit(void)
 static int menu_loop_options(void)\r
 {\r
        static int menu_sel = 0;\r
-       int menu_sel_max = 14;\r
+       int menu_sel_max = 15;\r
        unsigned long inp = 0;\r
 \r
        if (fceugi) menu_sel_max++;\r
@@ -1138,15 +1144,16 @@ static int menu_loop_options(void)
                if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
                        switch (menu_sel) {\r
                                case  1: Settings.showfps    = !Settings.showfps; break;\r
-                               case  3: soundvol = soundvol ? 0 : 100; break;\r
+                               case  3: soundvol = soundvol ? 0 : 50; break;\r
                                case  9: Settings.ramtimings = !Settings.ramtimings; break;\r
                                case 10: Settings.mmuhack    = !Settings.mmuhack; break;\r
-                               case 13: fcemenu_loop_options(); break;\r
-                               case 14: // done (update and write)\r
+                               case 12: Settings.perfect_vsync = !Settings.perfect_vsync; break;\r
+                               case 14: fcemenu_loop_options(); break;\r
+                               case 15: // done (update and write)\r
                                        config_commit();\r
                                        SaveConfig(NULL);\r
                                        return 1;\r
-                               case 15: // done (update and write for current game)\r
+                               case 16: // done (update and write for current game)\r
                                        config_commit();\r
                                        if (lastLoadedGameName[0])\r
                                                SaveConfig(lastLoadedGameName);\r
@@ -1175,7 +1182,7 @@ static int menu_loop_options(void)
                                case  7: int_incdec(&Settings.sstate_confirm, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break;\r
                                case  8: int_incdec(&CurrentState,            (inp & GP2X_LEFT) ? -1 : 1, 0, 9); break;\r
                                case 11: int_incdec(&Settings.gamma,          (inp & GP2X_LEFT) ? -1 : 1, 0, 300); break;\r
-                               case 12:\r
+                               case 13:\r
                                        while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
                                                Settings.cpuclock += (inp & GP2X_LEFT) ? -1 : 1;\r
                                                if (Settings.cpuclock < 0) Settings.cpuclock = 0; // 0 ~ do not change\r
@@ -1213,8 +1220,8 @@ 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
+       menu_darken_text_bg();\r
+       menu_flip();\r
 }\r
 \r
 \r
@@ -1246,8 +1253,8 @@ static void draw_menu_root(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_fceu_darken_reset();\r
+       menu_darken_text_bg();\r
+       menu_darken_reset();\r
 \r
        // error / version\r
        if (menuErrorMsg[0]) gp2x_text_out15(1, 229, menuErrorMsg);\r
@@ -1256,8 +1263,8 @@ static void draw_menu_root(int menu_sel)
                sprintf(vstr, "v" GP2X_PORT_VERSION " r%i", GP2X_PORT_REV);\r
                gp2x_text_out15(320-strlen(vstr)*8-1, 228, vstr);\r
        }\r
-       gp2x_fceu_darken_text_bg();\r
-       gp2x_video_flip();\r
+       menu_darken_text_bg();\r
+       menu_flip();\r
 }\r
 \r
 \r
@@ -1409,8 +1416,8 @@ static void menu_gfx_prepare(void)
        // switch bpp\r
        gp2x_video_changemode(16);\r
        gp2x_video_set_offs(0);\r
-       gp2x_video_RGB_setscaling(0, 320, 240);\r
-       gp2x_video_flip();\r
+       gp2x_video_RGB_setscaling(320, 240);\r
+       menu_flip();\r
 }\r
 \r
 \r