Changes for the upcoming 1.0.5 release

[virtualjaguar] / src / joystick.cpp

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 453c521cd84027f2ba7d8645b192da5ab4b3ec60..3c496ce490dd6334be22ef9fa090ca96a149cb41 100644 (file)
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -44,6 +44,7 @@ static uint8 joystick_ram[4];
 static uint8 joypad_0_buttons[21];
 static uint8 joypad_1_buttons[21];
 extern bool finished;
+extern bool showGUI, GUIKeyHeld = false;
 extern int start_logging;
 int gpu_start_log = 0;
 int op_start_log = 0;
@@ -118,8 +119,17 @@ void joystick_exec(void)
        if (keystate[SDLK_z])           joypad_0_buttons[BUTTON_C] = 0x01;
        if (keystate[SDLK_x])           joypad_0_buttons[BUTTON_B] = 0x01;
        if (keystate[SDLK_c])           joypad_0_buttons[BUTTON_A] = 0x01;
-       if (keystate[SDLK_TAB])         joypad_0_buttons[BUTTON_OPTION] = 0x01;
+       if (keystate[SDLK_QUOTE])       joypad_0_buttons[BUTTON_OPTION] = 0x01;
        if (keystate[SDLK_RETURN])      joypad_0_buttons[BUTTON_PAUSE] = 0x01;
+
+       if (keystate[SDLK_TAB])
+       {
+               if (!GUIKeyHeld)
+                       showGUI = !showGUI, GUIKeyHeld = true;
+       }
+       else
+               GUIKeyHeld = false;
+
        if (keystate[SDLK_q])
                start_logging = 1;
        if (keystate[SDLK_w])