frontend: support seeking the filelist with letter keys

[pcsx_rearmed.git] / frontend / menu.c

diff --git a/frontend/menu.c b/frontend/menu.c
index 7cdfe39..e469580 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -106,8 +106,6 @@ int filter;
 extern int iUseReverb;
 extern int iUseInterpolation;
 extern int iXAPitch;
-extern int iSPUIRQWait;
-extern int iUseTimer;
 extern int iVolume;
 
 static const char *bioses[24];
@@ -308,8 +306,6 @@ static const struct {
        CE_INTVAL_V(iUseReverb, 3),
        CE_INTVAL_V(iXAPitch, 3),
        CE_INTVAL_V(iUseInterpolation, 3),
-       CE_INTVAL_V(iSPUIRQWait, 3),
-       CE_INTVAL_V(iUseTimer, 3),
        CE_INTVAL(warned_about_bios),
        CE_INTVAL(in_evdev_allow_abs_only),
        CE_INTVAL(volume_boost),
@@ -594,7 +590,7 @@ static void draw_savestate_bg(int slot)
 
        x = gpu->ulControl[5] & 0x3ff;
        y = (gpu->ulControl[5] >> 10) & 0x1ff;
-       s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~1);
+       s = (u16 *)gpu->psxVRam + y * 1024 + x;
        w = psx_widths[(gpu->ulStatus >> 16) & 7];
        tmp = gpu->ulControl[7];
        h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
@@ -1041,7 +1037,8 @@ static int menu_loop_cscaler(int id, int keys)
                text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move", g_layer_w, g_layer_h);
                menu_draw_end();
 
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40);
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT
+                               |PBTN_R|PBTN_MOK|PBTN_MBACK, NULL, 40);
                if (inp & PBTN_UP)    g_layer_y--;
                if (inp & PBTN_DOWN)  g_layer_y++;
                if (inp & PBTN_LEFT)  g_layer_x--;
@@ -1215,8 +1212,6 @@ static int menu_loop_plugin_gpu_peopsgl(int id, int keys)
 
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
 static const char h_spu_volboost[]  = "Large values cause distortion";
-static const char h_spu_irq_wait[]  = "Wait for CPU (recommended set to ON)";
-static const char h_spu_thread[]    = "Run sound emulation in main thread (recommended)";
 
 static menu_entry e_menu_plugin_spu[] =
 {
@@ -1224,8 +1219,6 @@ static menu_entry e_menu_plugin_spu[] =
        mee_onoff     ("Reverb",                    0, iUseReverb, 2),
        mee_enum      ("Interpolation",             0, iUseInterpolation, men_spu_interp),
        mee_onoff     ("Adjust XA pitch",           0, iXAPitch, 1),
-       mee_onoff_h   ("SPU IRQ Wait",              0, iSPUIRQWait, 1, h_spu_irq_wait),
-       mee_onoff_h   ("Sound in main thread",      0, iUseTimer, 2, h_spu_thread),
        mee_end,
 };
 
@@ -1448,12 +1441,12 @@ static void debug_menu_loop(void)
                menu_draw_end();
 
                inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |
-                                       PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 10);
+                                       PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, NULL, 10);
                if      (inp & PBTN_MBACK) break;
                else if (inp & PBTN_UP)    { if (df_y > 0) df_y--; }
                else if (inp & PBTN_DOWN)  { if (df_y < 512 - g_menuscreen_h) df_y++; }
-               else if (inp & PBTN_LEFT)  { if (df_x > 0) df_x--; }
-               else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x++; }
+               else if (inp & PBTN_LEFT)  { if (df_x > 0) df_x -= 2; }
+               else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x += 2; }
        }
 
        free(gpuf);
@@ -1598,7 +1591,7 @@ static void menu_bios_warn(void)
        {
                draw_menu_message(tmp_msg, NULL);
 
-               inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
+               inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);
                if (inp & (PBTN_MBACK|PBTN_MOK))
                        return;
        }
@@ -1891,7 +1884,7 @@ static int main_menu_handler(int id, int keys)
                break;
        case MA_MAIN_CREDITS:
                draw_menu_message(credits_text, draw_frame_credits);
-               in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
+               in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);
                break;
        case MA_MAIN_EXIT:
                OnFile_Exit();
@@ -1971,7 +1964,7 @@ void menu_loop(void)
        } while (!ready_to_go);
 
        /* wait until menu, ok, back is released */
-       while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
+       while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
                ;
 
        in_set_config_int(0, IN_CFG_BLOCKING, 0);
@@ -2250,7 +2243,7 @@ static void menu_leave_emu(void)
                }
                else {
                        for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 3) {
-                               bgr888_to_rgb565(d, s, w * 3);
+                               rgb888_to_rgb565(d, s, w * 3);
                                menu_darken_bg(d, d, w, 0);
                        }
                }