X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=gpsp.git;a=blobdiff_plain;f=input.c;h=94c561d9f97ebe646a64d572bc6251128a5fa79d;hp=3eee0b0d191c4598d5bb9bd440159121afb5c306;hb=42c8119010bfc48776e8c82e42cceb06d07c0247;hpb=4742480dcabcbd9d23fd8cb9a655fc8c9c314513

diff --git a/input.c b/input.c
index 3eee0b0..94c561d 100644
--- a/input.c
+++ b/input.c
@@ -364,10 +364,10 @@ u32 gamepad_config_map[16] =
   BUTTON_ID_SELECT,             // Select
   BUTTON_ID_L,                  // Ltrigger
   BUTTON_ID_R,                  // Rtrigger
-  BUTTON_ID_NONE,               // A
+  BUTTON_ID_FPS,                // A
   BUTTON_ID_A,                  // B
   BUTTON_ID_B,                  // X
-  BUTTON_ID_NONE,               // Y
+  BUTTON_ID_MENU,               // Y
   BUTTON_ID_VOLDOWN,            // Vol down
   BUTTON_ID_VOLUP,              // Vol up
   BUTTON_ID_FPS,                // Push
@@ -412,6 +412,12 @@ gui_action_type get_gui_input()
   if(new_buttons & GP2X_RIGHT)
     new_button = CURSOR_RIGHT;
 
+  if(new_buttons & GP2X_L)
+    new_button = CURSOR_L;
+
+  if(new_buttons & GP2X_R)
+    new_button = CURSOR_R;
+
 
   if(new_button != CURSOR_NONE)
   {
@@ -509,6 +515,13 @@ u32 update_input()
     buttons |= GP2X_VOL_MIDDLE;
   }
 
+  /* for Wiz */
+  if((buttons & GP2X_VOL_DOWN) && (buttons & GP2X_SELECT))
+  {
+    buttons &= ~(GP2X_VOL_DOWN | GP2X_SELECT);
+    buttons |= GP2X_VOL_MIDDLE;
+  }
+
   handled_buttons = ((last_buttons ^ buttons) | GP2X_VOL_DOWN | GP2X_VOL_UP) & buttons;
   last_buttons = buttons;