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
BUTTON_ID_MENU // Vol middle
};
-extern u32 gp2x_fps_debug;
+extern u32 fps_debug;
extern u32 gpsp_gp2x_joystick_read(void);
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)
{
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;
break;
case BUTTON_ID_FPS:
- gp2x_fps_debug ^= 1;
+ fps_debug ^= 1;
break;
}