notaz.gp2x.de
/
gpsp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of GP2X_BUILD checks where they are not really needed
[gpsp.git]
/
input.c
diff --git
a/input.c
b/input.c
index
3eee0b0
..
e4c48fd
100644
(file)
--- a/
input.c
+++ b/
input.c
@@
-364,17
+364,17
@@
u32 gamepad_config_map[16] =
BUTTON_ID_SELECT, // Select
BUTTON_ID_L, // Ltrigger
BUTTON_ID_R, // Rtrigger
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_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
};
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()
extern u32 gpsp_gp2x_joystick_read(void);
gui_action_type get_gui_input()
@@
-412,6
+412,12
@@
gui_action_type get_gui_input()
if(new_buttons & GP2X_RIGHT)
new_button = CURSOR_RIGHT;
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)
{
if(new_button != CURSOR_NONE)
{
@@
-509,6
+515,13
@@
u32 update_input()
buttons |= GP2X_VOL_MIDDLE;
}
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;
handled_buttons = ((last_buttons ^ buttons) | GP2X_VOL_DOWN | GP2X_VOL_UP) & buttons;
last_buttons = buttons;
@@
-564,7
+577,7
@@
u32 update_input()
break;
case BUTTON_ID_FPS:
break;
case BUTTON_ID_FPS:
-
gp2x_
fps_debug ^= 1;
+ fps_debug ^= 1;
break;
}
break;
}