The-Homebrew-Cloud/fbzx-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/fbzx-wii.git synced 2024-11-28 11:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Escape and select on key unpressed

Browse Source
This commit is contained in:
fabio.olimpieri 2012-05-06 12:55:12 +00:00
parent 8f718942d4
commit b30f329a50
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/VirtualKeyboard.c
View File

@ -151,11 +151,7 @@ struct virtkey *get_key_internal()
else if (k & KEY_SELECT) else if (k & KEY_SELECT)
{ {
virtkey_t *key = &keys[ VirtualKeyboard.sel_y * KEY_COLS + VirtualKeyboard.sel_x ]; virtkey_t *key = &keys[ VirtualKeyboard.sel_y * KEY_COLS + VirtualKeyboard.sel_x ];
/*
if (key->sdl_code == 1) // "Done"
if (keys[3 * KEY_COLS + 0 ].is_done) {key->sdl_code = 304; return key; } //Caps Shit
else if (keys[3 * KEY_COLS + 8 ].is_done) {key->sdl_code = 306; return key; } //Sym Shit
*/
if ((key->sdl_code == 304) && !keys[3 * KEY_COLS + 8 ].is_done) if ((key->sdl_code == 304) && !keys[3 * KEY_COLS + 8 ].is_done)
keys[3 * KEY_COLS + 0 ].is_done = !keys[3 * KEY_COLS + 0 ].is_done; //Caps Shit keys[3 * KEY_COLS + 0 ].is_done = !keys[3 * KEY_COLS + 0 ].is_done; //Caps Shit
else if ((key->sdl_code == 306) && !keys[3 * KEY_COLS + 0 ].is_done) else if ((key->sdl_code == 306) && !keys[3 * KEY_COLS + 0 ].is_done)

24
src/menu_sdl.c
View File

@ -653,6 +653,7 @@ uint32_t menu_wait_key_press(void)
SDL_Joystick *joy; SDL_Joystick *joy;
static int joy_keys_changed; static int joy_keys_changed;
static int joy_keys_last; static int joy_keys_last;
static int joy_bottons_last[2][7];
SDL_JoystickUpdate(); SDL_JoystickUpdate();
/* Wii-specific, sorry */ /* Wii-specific, sorry */
for (nr = 0; nr < ordenador.joystick_number; nr++) { for (nr = 0; nr < ordenador.joystick_number; nr++) {
@ -684,14 +685,14 @@ uint32_t menu_wait_key_press(void)
else if( axis1 > 15000 ) keys |= KEY_DOWN; else if( axis1 > 15000 ) keys |= KEY_DOWN;
if (SDL_JoystickGetButton(joy, 0) != 0 || /* A */ if ((!SDL_JoystickGetButton(joy, 0) && joy_bottons_last[nr][0]) || /* A */
SDL_JoystickGetButton(joy, 3) != 0 || /* 2 */ (!SDL_JoystickGetButton(joy, 3) && joy_bottons_last[nr][1]) || /* 2 */
SDL_JoystickGetButton(joy, 9) != 0 || /* CA */ (!SDL_JoystickGetButton(joy, 9) && joy_bottons_last[nr][2]) || /* CA */
SDL_JoystickGetButton(joy, 10) != 0) /* CB */ (!SDL_JoystickGetButton(joy, 10) && joy_bottons_last[nr][3])) /* CB */
keys |= KEY_SELECT; keys |= KEY_SELECT;
if (SDL_JoystickGetButton(joy, 2) != 0 || /* 1 */ if ((!SDL_JoystickGetButton(joy, 2) && joy_bottons_last[nr][4]) || /* 1 */
SDL_JoystickGetButton(joy, 11) != 0 || /* CX */ (!SDL_JoystickGetButton(joy, 11) && joy_bottons_last[nr][5]) || /* CX */
SDL_JoystickGetButton(joy, 12) != 0) /* CY */ (!SDL_JoystickGetButton(joy, 12) && joy_bottons_last[nr][6])) /* CY */
keys |= KEY_ESCAPE; keys |= KEY_ESCAPE;
if (SDL_JoystickGetButton(joy, 5) != 0 || /* + */ if (SDL_JoystickGetButton(joy, 5) != 0 || /* + */
SDL_JoystickGetButton(joy, 18) != 0) /* C+ */ SDL_JoystickGetButton(joy, 18) != 0) /* C+ */
@ -699,7 +700,16 @@ uint32_t menu_wait_key_press(void)
if (SDL_JoystickGetButton(joy, 4) != 0 || /* - */ if (SDL_JoystickGetButton(joy, 4) != 0 || /* - */
SDL_JoystickGetButton(joy, 17) != 0) /* C- */ SDL_JoystickGetButton(joy, 17) != 0) /* C- */
keys |= KEY_PAGEUP; keys |= KEY_PAGEUP;
joy_bottons_last[nr][0]=SDL_JoystickGetButton(joy, 0) ; /* A */
joy_bottons_last[nr][1] =SDL_JoystickGetButton(joy, 3) ; /* 2 */
joy_bottons_last[nr][2] =SDL_JoystickGetButton(joy, 9) ; /* CA */
joy_bottons_last[nr][3] =SDL_JoystickGetButton(joy, 10) ; /* CB */
joy_bottons_last[nr][4] =SDL_JoystickGetButton(joy, 2) ; /* 1 */
joy_bottons_last[nr][5] =SDL_JoystickGetButton(joy, 11) ; /* CX */
joy_bottons_last[nr][6] =SDL_JoystickGetButton(joy, 12) ; /* CY */
} }
joy_keys_changed = keys != joy_keys_last; joy_keys_changed = keys != joy_keys_last;
joy_keys_last = keys; joy_keys_last = keys;
if (!joy_keys_changed) if (!joy_keys_changed)