From 5a9010b8e290ffdaffde9f75d9e5e0f57644cfbe Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Mon, 29 Mar 2021 17:39:19 -0400 Subject: [PATCH] Qt hot key rework intermediate commit. --- src/drivers/Qt/HotKeyConf.cpp | 2 +- src/drivers/Qt/config.cpp | 183 +++-- src/drivers/Qt/config.h | 45 +- src/drivers/Qt/input.cpp | 36 +- src/drivers/Qt/keyscan.cpp | 1358 ++++++++++++++++----------------- 5 files changed, 859 insertions(+), 765 deletions(-) diff --git a/src/drivers/Qt/HotKeyConf.cpp b/src/drivers/Qt/HotKeyConf.cpp index 10d6ca7e..59cad07d 100644 --- a/src/drivers/Qt/HotKeyConf.cpp +++ b/src/drivers/Qt/HotKeyConf.cpp @@ -69,7 +69,7 @@ HotKeyConfDialog_t::HotKeyConfDialog_t(QWidget *parent) for (int i = 0; i < HK_MAX; i++) { char keyName[128]; - std::string optionName = prefix + getHotkeyString(i); + std::string optionName = prefix + Hotkeys[i].getConfigName(); //g_config->getOption (optionName.c_str (), &keycode); Hotkeys[i].getString(keyName); diff --git a/src/drivers/Qt/config.cpp b/src/drivers/Qt/config.cpp index a622b9d5..9110fbe5 100644 --- a/src/drivers/Qt/config.cpp +++ b/src/drivers/Qt/config.cpp @@ -52,47 +52,47 @@ #include #endif -static const char* HotkeyStrings[HK_MAX] = { - "OpenROM", - "CloseROM", - "CheatMenu", - "BindState", - "LoadLua", - "ToggleBG", - "SaveState", - "FDSSelect", - "LoadState", - "FDSEject", - "VSInsertCoin", - "VSToggleDip", - "MovieToggleFrameDisplay", - "SubtitleDisplay", - "Reset", - "Screenshot", - "Pause", - "DecreaseSpeed", - "IncreaseSpeed", - "FrameAdvance", - "Turbo", - "ToggleInputDisplay", - "ToggleMovieRW", - "MuteCapture", - "Quit", - "FrameAdvanceLagSkip", - "LagCounterDisplay", - "SelectState0", "SelectState1", "SelectState2", "SelectState3", - "SelectState4", "SelectState5", "SelectState6", "SelectState7", - "SelectState8", "SelectState9", "SelectStateNext", "SelectStatePrev", - "VolumeDown", "VolumeUp", "FKB_Enable" }; +//static const char* HotkeyStrings[HK_MAX] = { +// "OpenROM", +// "CloseROM", +// "CheatMenu", +// "BindState", +// "LoadLua", +// "ToggleBG", +// "SaveState", +// "FDSSelect", +// "LoadState", +// "FDSEject", +// "VSInsertCoin", +// "VSToggleDip", +// "MovieToggleFrameDisplay", +// "SubtitleDisplay", +// "Reset", +// "Screenshot", +// "Pause", +// "DecreaseSpeed", +// "IncreaseSpeed", +// "FrameAdvance", +// "Turbo", +// "ToggleInputDisplay", +// "ToggleMovieRW", +// "MuteCapture", +// "Quit", +// "FrameAdvanceLagSkip", +// "LagCounterDisplay", +// "SelectState0", "SelectState1", "SelectState2", "SelectState3", +// "SelectState4", "SelectState5", "SelectState6", "SelectState7", +// "SelectState8", "SelectState9", "SelectStateNext", "SelectStatePrev", +// "VolumeDown", "VolumeUp", "FKB_Enable" }; -const char *getHotkeyString( int i ) -{ - if ( (i>=0) && (i=0) && (ikey().toString().toStdString().c_str() ); } + //if ( sdl.modifier != 0 ) + //{ + // if ( sdl.modifier & (KMOD_LSHIFT | KMOD_RSHIFT) ) + // { + // strcat( s, "Shift+" ); + // } - strcat( s, SDL_GetKeyName(sdl.value) ); + // if ( sdl.modifier & (KMOD_LALT | KMOD_RALT) ) + // { + // strcat( s, "Alt+" ); + // } + + // if ( sdl.modifier & (KMOD_LCTRL | KMOD_RCTRL) ) + // { + // strcat( s, "Ctrl+" ); + // } + //} + + //strcat( s, SDL_GetKeyName(sdl.value) ); return 0; } diff --git a/src/drivers/Qt/keyscan.cpp b/src/drivers/Qt/keyscan.cpp index cae494dd..0b9c5a4d 100644 --- a/src/drivers/Qt/keyscan.cpp +++ b/src/drivers/Qt/keyscan.cpp @@ -27,967 +27,967 @@ using namespace Qt; -SDL_Scancode convQtKey2SDLScanCode( Qt::Key q ) +SDL_Scancode convQtKey2SDLScanCode(Qt::Key q) { SDL_Scancode s = SDL_SCANCODE_UNKNOWN; switch (q) { - case Key_Escape: - s = SDL_SCANCODE_ESCAPE; + case Key_Escape: + s = SDL_SCANCODE_ESCAPE; break; - case Key_Tab: - case Key_Backtab: - s = SDL_SCANCODE_TAB; + case Key_Tab: + case Key_Backtab: + s = SDL_SCANCODE_TAB; break; - case Key_Backspace: - s = SDL_SCANCODE_BACKSPACE; + case Key_Backspace: + s = SDL_SCANCODE_BACKSPACE; break; - case Key_Return: - s = SDL_SCANCODE_RETURN; + case Key_Return: + s = SDL_SCANCODE_RETURN; break; - case Key_Enter: - s = SDL_SCANCODE_RETURN; + case Key_Enter: + s = SDL_SCANCODE_RETURN; break; - case Key_Insert: - s = SDL_SCANCODE_INSERT; + case Key_Insert: + s = SDL_SCANCODE_INSERT; break; - case Key_Delete: - s = SDL_SCANCODE_DELETE; + case Key_Delete: + s = SDL_SCANCODE_DELETE; break; - case Key_Pause: - s = SDL_SCANCODE_PAUSE; + case Key_Pause: + s = SDL_SCANCODE_PAUSE; break; - case Key_Print: - case Key_SysReq: - s = SDL_SCANCODE_PRINTSCREEN; + case Key_Print: + case Key_SysReq: + s = SDL_SCANCODE_PRINTSCREEN; break; - case Key_Clear: - s = SDL_SCANCODE_CLEAR; + case Key_Clear: + s = SDL_SCANCODE_CLEAR; break; - case Key_Home: - s = SDL_SCANCODE_HOME; + case Key_Home: + s = SDL_SCANCODE_HOME; break; - case Key_End: - s = SDL_SCANCODE_END; + case Key_End: + s = SDL_SCANCODE_END; break; - case Key_Left: - s = SDL_SCANCODE_LEFT; + case Key_Left: + s = SDL_SCANCODE_LEFT; break; - case Key_Up: - s = SDL_SCANCODE_UP; + case Key_Up: + s = SDL_SCANCODE_UP; break; - case Key_Right: - s = SDL_SCANCODE_RIGHT; + case Key_Right: + s = SDL_SCANCODE_RIGHT; break; - case Key_Down: - s = SDL_SCANCODE_DOWN; + case Key_Down: + s = SDL_SCANCODE_DOWN; break; - case Key_PageUp: - s = SDL_SCANCODE_PAGEUP; + case Key_PageUp: + s = SDL_SCANCODE_PAGEUP; break; - case Key_PageDown: - s = SDL_SCANCODE_PAGEDOWN; + case Key_PageDown: + s = SDL_SCANCODE_PAGEDOWN; break; - case Key_Shift: - s = SDL_SCANCODE_LSHIFT; + case Key_Shift: + s = SDL_SCANCODE_LSHIFT; break; - case Key_Control: - s = SDL_SCANCODE_LCTRL; + case Key_Control: + s = SDL_SCANCODE_LCTRL; break; - case Key_Meta: - s = SDL_SCANCODE_LGUI; + case Key_Meta: + s = SDL_SCANCODE_LGUI; break; - case Key_Alt: - s = SDL_SCANCODE_LALT; + case Key_Alt: + s = SDL_SCANCODE_LALT; break; - case Key_CapsLock: - s = SDL_SCANCODE_CAPSLOCK; + case Key_CapsLock: + s = SDL_SCANCODE_CAPSLOCK; break; - case Key_NumLock: - s = SDL_SCANCODE_NUMLOCKCLEAR; + case Key_NumLock: + s = SDL_SCANCODE_NUMLOCKCLEAR; break; - case Key_ScrollLock: - s = SDL_SCANCODE_SCROLLLOCK; + case Key_ScrollLock: + s = SDL_SCANCODE_SCROLLLOCK; break; - case Key_F1: - s = SDL_SCANCODE_F1; + case Key_F1: + s = SDL_SCANCODE_F1; break; - case Key_F2: - s = SDL_SCANCODE_F2; + case Key_F2: + s = SDL_SCANCODE_F2; break; - case Key_F3: - s = SDL_SCANCODE_F3; + case Key_F3: + s = SDL_SCANCODE_F3; break; - case Key_F4: - s = SDL_SCANCODE_F4; + case Key_F4: + s = SDL_SCANCODE_F4; break; - case Key_F5: - s = SDL_SCANCODE_F5; + case Key_F5: + s = SDL_SCANCODE_F5; break; - case Key_F6: - s = SDL_SCANCODE_F6; + case Key_F6: + s = SDL_SCANCODE_F6; break; - case Key_F7: - s = SDL_SCANCODE_F7; + case Key_F7: + s = SDL_SCANCODE_F7; break; - case Key_F8: - s = SDL_SCANCODE_F8; + case Key_F8: + s = SDL_SCANCODE_F8; break; - case Key_F9: - s = SDL_SCANCODE_F9; + case Key_F9: + s = SDL_SCANCODE_F9; break; - case Key_F10: - s = SDL_SCANCODE_F10; + case Key_F10: + s = SDL_SCANCODE_F10; break; - case Key_F11: - s = SDL_SCANCODE_F11; + case Key_F11: + s = SDL_SCANCODE_F11; break; - case Key_F12: - s = SDL_SCANCODE_F12; + case Key_F12: + s = SDL_SCANCODE_F12; break; - case Key_F13: - s = SDL_SCANCODE_F13; + case Key_F13: + s = SDL_SCANCODE_F13; break; - case Key_F14: - s = SDL_SCANCODE_F14; + case Key_F14: + s = SDL_SCANCODE_F14; break; - case Key_F15: - s = SDL_SCANCODE_F15; + case Key_F15: + s = SDL_SCANCODE_F15; break; - case Key_F16: - s = SDL_SCANCODE_F16; + case Key_F16: + s = SDL_SCANCODE_F16; break; - case Key_F17: - s = SDL_SCANCODE_F17; + case Key_F17: + s = SDL_SCANCODE_F17; break; - case Key_F18: - s = SDL_SCANCODE_F18; + case Key_F18: + s = SDL_SCANCODE_F18; break; - case Key_F19: - s = SDL_SCANCODE_F19; + case Key_F19: + s = SDL_SCANCODE_F19; break; - case Key_F20: - s = SDL_SCANCODE_F20; + case Key_F20: + s = SDL_SCANCODE_F20; break; - case Key_F21: - s = SDL_SCANCODE_F21; + case Key_F21: + s = SDL_SCANCODE_F21; break; - case Key_F22: - s = SDL_SCANCODE_F22; + case Key_F22: + s = SDL_SCANCODE_F22; break; - case Key_F23: - s = SDL_SCANCODE_F23; + case Key_F23: + s = SDL_SCANCODE_F23; break; - case Key_F24: - s = SDL_SCANCODE_F24; + case Key_F24: + s = SDL_SCANCODE_F24; break; - //case Key_F25: // F25 .. F35 only on X11 - //case Key_F26: - //case Key_F27: - //case Key_F28: - //case Key_F29: - //case Key_F30: - //case Key_F31: - //case Key_F32: - //case Key_F33: - //case Key_F34: - //case Key_F35: + //case Key_F25: // F25 .. F35 only on X11 + //case Key_F26: + //case Key_F27: + //case Key_F28: + //case Key_F29: + //case Key_F30: + //case Key_F31: + //case Key_F32: + //case Key_F33: + //case Key_F34: + //case Key_F35: // s = SDL_SCANCODE_UNKNOWN; //break; - case Key_Super_L: - case Key_Super_R: - s = SDL_SCANCODE_UNKNOWN; + case Key_Super_L: + case Key_Super_R: + s = SDL_SCANCODE_UNKNOWN; break; - case Key_Menu: - s = SDL_SCANCODE_MENU; + case Key_Menu: + s = SDL_SCANCODE_MENU; break; - case Key_Hyper_L: - case Key_Hyper_R: - s = SDL_SCANCODE_UNKNOWN; + case Key_Hyper_L: + case Key_Hyper_R: + s = SDL_SCANCODE_UNKNOWN; break; - case Key_Help: - s = SDL_SCANCODE_HELP; + case Key_Help: + s = SDL_SCANCODE_HELP; break; - case Key_Direction_L: - case Key_Direction_R: - s = SDL_SCANCODE_UNKNOWN; + case Key_Direction_L: + case Key_Direction_R: + s = SDL_SCANCODE_UNKNOWN; break; - case Key_Space: + case Key_Space: //case Key_Any: - s = SDL_SCANCODE_SPACE; + s = SDL_SCANCODE_SPACE; break; - case Key_Exclam: - s = SDL_SCANCODE_1; + case Key_Exclam: + s = SDL_SCANCODE_1; break; - case Key_QuoteDbl: - s = SDL_SCANCODE_APOSTROPHE; + case Key_QuoteDbl: + s = SDL_SCANCODE_APOSTROPHE; break; - case Key_NumberSign: - s = SDL_SCANCODE_3; + case Key_NumberSign: + s = SDL_SCANCODE_3; break; - case Key_Dollar: - s = SDL_SCANCODE_4; + case Key_Dollar: + s = SDL_SCANCODE_4; break; - case Key_Percent: - s = SDL_SCANCODE_5; + case Key_Percent: + s = SDL_SCANCODE_5; break; - case Key_Ampersand: - s = SDL_SCANCODE_7; + case Key_Ampersand: + s = SDL_SCANCODE_7; break; - case Key_Apostrophe: - s = SDL_SCANCODE_APOSTROPHE; + case Key_Apostrophe: + s = SDL_SCANCODE_APOSTROPHE; break; - case Key_ParenLeft: - s = SDL_SCANCODE_9; + case Key_ParenLeft: + s = SDL_SCANCODE_9; break; - case Key_ParenRight: - s = SDL_SCANCODE_0; + case Key_ParenRight: + s = SDL_SCANCODE_0; break; - case Key_Asterisk: - s = SDL_SCANCODE_8; + case Key_Asterisk: + s = SDL_SCANCODE_8; break; - case Key_Plus: - s = SDL_SCANCODE_EQUALS; + case Key_Plus: + s = SDL_SCANCODE_EQUALS; break; - case Key_Comma: - s = SDL_SCANCODE_COMMA; + case Key_Comma: + s = SDL_SCANCODE_COMMA; break; - case Key_Minus: - s = SDL_SCANCODE_MINUS; + case Key_Minus: + s = SDL_SCANCODE_MINUS; break; - case Key_Period: - s = SDL_SCANCODE_PERIOD; + case Key_Period: + s = SDL_SCANCODE_PERIOD; break; - case Key_Slash: - s = SDL_SCANCODE_SLASH; + case Key_Slash: + s = SDL_SCANCODE_SLASH; break; - case Key_0: - s = SDL_SCANCODE_0; + case Key_0: + s = SDL_SCANCODE_0; break; - case Key_1: - s = SDL_SCANCODE_1; + case Key_1: + s = SDL_SCANCODE_1; break; - case Key_2: - s = SDL_SCANCODE_2; + case Key_2: + s = SDL_SCANCODE_2; break; - case Key_3: - s = SDL_SCANCODE_3; + case Key_3: + s = SDL_SCANCODE_3; break; - case Key_4: - s = SDL_SCANCODE_4; + case Key_4: + s = SDL_SCANCODE_4; break; - case Key_5: - s = SDL_SCANCODE_5; + case Key_5: + s = SDL_SCANCODE_5; break; - case Key_6: - s = SDL_SCANCODE_6; + case Key_6: + s = SDL_SCANCODE_6; break; - case Key_7: - s = SDL_SCANCODE_7; + case Key_7: + s = SDL_SCANCODE_7; break; - case Key_8: - s = SDL_SCANCODE_8; + case Key_8: + s = SDL_SCANCODE_8; break; - case Key_9: - s = SDL_SCANCODE_9; + case Key_9: + s = SDL_SCANCODE_9; break; - case Key_Colon: - case Key_Semicolon: - s = SDL_SCANCODE_SEMICOLON; + case Key_Colon: + case Key_Semicolon: + s = SDL_SCANCODE_SEMICOLON; break; - case Key_Less: - s = SDL_SCANCODE_COMMA; + case Key_Less: + s = SDL_SCANCODE_COMMA; break; - case Key_Equal: - s = SDL_SCANCODE_EQUALS; + case Key_Equal: + s = SDL_SCANCODE_EQUALS; break; - case Key_Greater: - s = SDL_SCANCODE_PERIOD; + case Key_Greater: + s = SDL_SCANCODE_PERIOD; break; - case Key_Question: - s = SDL_SCANCODE_SLASH; + case Key_Question: + s = SDL_SCANCODE_SLASH; break; - case Key_At: - s = SDL_SCANCODE_2; + case Key_At: + s = SDL_SCANCODE_2; break; break; - case Key_A: - s = SDL_SCANCODE_A; + case Key_A: + s = SDL_SCANCODE_A; break; - case Key_B: - s = SDL_SCANCODE_B; + case Key_B: + s = SDL_SCANCODE_B; break; - case Key_C: - s = SDL_SCANCODE_C; + case Key_C: + s = SDL_SCANCODE_C; break; - case Key_D: - s = SDL_SCANCODE_D; + case Key_D: + s = SDL_SCANCODE_D; break; - case Key_E: - s = SDL_SCANCODE_E; + case Key_E: + s = SDL_SCANCODE_E; break; - case Key_F: - s = SDL_SCANCODE_F; + case Key_F: + s = SDL_SCANCODE_F; break; - case Key_G: - s = SDL_SCANCODE_G; + case Key_G: + s = SDL_SCANCODE_G; break; - case Key_H: - s = SDL_SCANCODE_H; + case Key_H: + s = SDL_SCANCODE_H; break; - case Key_I: - s = SDL_SCANCODE_I; + case Key_I: + s = SDL_SCANCODE_I; break; - case Key_J: - s = SDL_SCANCODE_J; + case Key_J: + s = SDL_SCANCODE_J; break; - case Key_K: - s = SDL_SCANCODE_K; + case Key_K: + s = SDL_SCANCODE_K; break; - case Key_L: - s = SDL_SCANCODE_L; + case Key_L: + s = SDL_SCANCODE_L; break; - case Key_M: - s = SDL_SCANCODE_M; + case Key_M: + s = SDL_SCANCODE_M; break; - case Key_N: - s = SDL_SCANCODE_N; + case Key_N: + s = SDL_SCANCODE_N; break; - case Key_O: - s = SDL_SCANCODE_O; + case Key_O: + s = SDL_SCANCODE_O; break; - case Key_P: - s = SDL_SCANCODE_P; + case Key_P: + s = SDL_SCANCODE_P; break; - case Key_Q: - s = SDL_SCANCODE_Q; + case Key_Q: + s = SDL_SCANCODE_Q; break; - case Key_R: - s = SDL_SCANCODE_R; + case Key_R: + s = SDL_SCANCODE_R; break; - case Key_S: - s = SDL_SCANCODE_S; + case Key_S: + s = SDL_SCANCODE_S; break; - case Key_T: - s = SDL_SCANCODE_T; + case Key_T: + s = SDL_SCANCODE_T; break; - case Key_U: - s = SDL_SCANCODE_U; + case Key_U: + s = SDL_SCANCODE_U; break; - case Key_V: - s = SDL_SCANCODE_V; + case Key_V: + s = SDL_SCANCODE_V; break; - case Key_W: - s = SDL_SCANCODE_W; + case Key_W: + s = SDL_SCANCODE_W; break; - case Key_X: - s = SDL_SCANCODE_X; + case Key_X: + s = SDL_SCANCODE_X; break; - case Key_Y: - s = SDL_SCANCODE_Y; + case Key_Y: + s = SDL_SCANCODE_Y; break; - case Key_Z: - s = SDL_SCANCODE_Z; + case Key_Z: + s = SDL_SCANCODE_Z; break; - case Key_BracketLeft: - s = SDL_SCANCODE_LEFTBRACKET; + case Key_BracketLeft: + s = SDL_SCANCODE_LEFTBRACKET; break; - case Key_Backslash: - s = SDL_SCANCODE_BACKSLASH; + case Key_Backslash: + s = SDL_SCANCODE_BACKSLASH; break; - case Key_BracketRight: - s = SDL_SCANCODE_RIGHTBRACKET; + case Key_BracketRight: + s = SDL_SCANCODE_RIGHTBRACKET; break; - //case Key_AsciiCircum: - // s = SDL_SCANCODE_UNKNOWN; - //break; - case Key_Underscore: - s = SDL_SCANCODE_MINUS; + //case Key_AsciiCircum: + // s = SDL_SCANCODE_UNKNOWN; + //break; + case Key_Underscore: + s = SDL_SCANCODE_MINUS; break; - case Key_QuoteLeft: - s = SDL_SCANCODE_GRAVE; + case Key_QuoteLeft: + s = SDL_SCANCODE_GRAVE; break; - case Key_BraceLeft: - s = SDL_SCANCODE_LEFTBRACKET; + case Key_BraceLeft: + s = SDL_SCANCODE_LEFTBRACKET; break; - case Key_Bar: - s = SDL_SCANCODE_BACKSLASH; + case Key_Bar: + s = SDL_SCANCODE_BACKSLASH; break; - case Key_BraceRight: - s = SDL_SCANCODE_RIGHTBRACKET; + case Key_BraceRight: + s = SDL_SCANCODE_RIGHTBRACKET; break; - case Key_AsciiTilde: - s = SDL_SCANCODE_GRAVE; + case Key_AsciiTilde: + s = SDL_SCANCODE_GRAVE; break; - //case Key_nobreakspace: - //case Key_exclamdown: - //case Key_cent: - //case Key_sterling: - //case Key_currency: - //case Key_yen: - //case Key_brokenbar: - //case Key_section: - //case Key_diaeresis: - //case Key_copyright: - //case Key_ordfeminine: - //case Key_guillemotleft: - //case Key_notsign: - //case Key_hyphen: - //case Key_registered: - //case Key_macron: - //case Key_degree: - //case Key_plusminus: - //case Key_twosuperior: - //case Key_threesuperior: - //case Key_acute: - //case Key_mu: - //case Key_paragraph: - //case Key_periodcentered: - //case Key_cedilla: - //case Key_onesuperior: - //case Key_masculine: - //case Key_guillemotright: - //case Key_onequarter: - //case Key_onehalf: - //case Key_threequarters: - //case Key_questiondown: - //case Key_Agrave: - //case Key_Aacute: - //case Key_Acircumflex: - //case Key_Atilde: - //case Key_Adiaeresis: - //case Key_Aring: - //case Key_AE: - //case Key_Ccedilla: - //case Key_Egrave: - //case Key_Eacute: - //case Key_Ecircumflex: - //case Key_Ediaeresis: - //case Key_Igrave: - //case Key_Iacute: - //case Key_Icircumflex: - //case Key_Idiaeresis: - //case Key_ETH: - //case Key_Ntilde: - //case Key_Ograve: - //case Key_Oacute: - //case Key_Ocircumflex: - //case Key_Otilde: - //case Key_Odiaeresis: - //case Key_multiply: - //case Key_Ooblique: - //case Key_Ugrave: - //case Key_Uacute: - //case Key_Ucircumflex: - //case Key_Udiaeresis: - //case Key_Yacute: - //case Key_THORN: - //case Key_ssharp: - //case Key_division: - //case Key_ydiaeresis: - // s = SDL_SCANCODE_UNKNOWN; - //break; - default: - s = SDL_SCANCODE_UNKNOWN; + //case Key_nobreakspace: + //case Key_exclamdown: + //case Key_cent: + //case Key_sterling: + //case Key_currency: + //case Key_yen: + //case Key_brokenbar: + //case Key_section: + //case Key_diaeresis: + //case Key_copyright: + //case Key_ordfeminine: + //case Key_guillemotleft: + //case Key_notsign: + //case Key_hyphen: + //case Key_registered: + //case Key_macron: + //case Key_degree: + //case Key_plusminus: + //case Key_twosuperior: + //case Key_threesuperior: + //case Key_acute: + //case Key_mu: + //case Key_paragraph: + //case Key_periodcentered: + //case Key_cedilla: + //case Key_onesuperior: + //case Key_masculine: + //case Key_guillemotright: + //case Key_onequarter: + //case Key_onehalf: + //case Key_threequarters: + //case Key_questiondown: + //case Key_Agrave: + //case Key_Aacute: + //case Key_Acircumflex: + //case Key_Atilde: + //case Key_Adiaeresis: + //case Key_Aring: + //case Key_AE: + //case Key_Ccedilla: + //case Key_Egrave: + //case Key_Eacute: + //case Key_Ecircumflex: + //case Key_Ediaeresis: + //case Key_Igrave: + //case Key_Iacute: + //case Key_Icircumflex: + //case Key_Idiaeresis: + //case Key_ETH: + //case Key_Ntilde: + //case Key_Ograve: + //case Key_Oacute: + //case Key_Ocircumflex: + //case Key_Otilde: + //case Key_Odiaeresis: + //case Key_multiply: + //case Key_Ooblique: + //case Key_Ugrave: + //case Key_Uacute: + //case Key_Ucircumflex: + //case Key_Udiaeresis: + //case Key_Yacute: + //case Key_THORN: + //case Key_ssharp: + //case Key_division: + //case Key_ydiaeresis: + // s = SDL_SCANCODE_UNKNOWN; + //break; + default: + s = SDL_SCANCODE_UNKNOWN; break; } return s; } -SDL_Keycode convQtKey2SDLKeyCode( Qt::Key q ) +SDL_Keycode convQtKey2SDLKeyCode(Qt::Key q) { SDL_Keycode s = SDLK_UNKNOWN; switch (q) { - case Key_Escape: - s = SDLK_ESCAPE; + case Key_Escape: + s = SDLK_ESCAPE; break; - case Key_Tab: - case Key_Backtab: - s = SDLK_TAB; + case Key_Tab: + case Key_Backtab: + s = SDLK_TAB; break; - case Key_Backspace: - s = SDLK_BACKSPACE; + case Key_Backspace: + s = SDLK_BACKSPACE; break; - case Key_Return: - s = SDLK_RETURN; + case Key_Return: + s = SDLK_RETURN; break; - case Key_Enter: - s = SDLK_KP_ENTER; + case Key_Enter: + s = SDLK_KP_ENTER; break; - case Key_Insert: - s = SDLK_INSERT; + case Key_Insert: + s = SDLK_INSERT; break; - case Key_Delete: - s = SDLK_DELETE; + case Key_Delete: + s = SDLK_DELETE; break; - case Key_Pause: - s = SDLK_PAUSE; + case Key_Pause: + s = SDLK_PAUSE; break; - case Key_Print: - s = SDLK_PRINTSCREEN; + case Key_Print: + s = SDLK_PRINTSCREEN; break; - case Key_SysReq: - s = SDLK_SYSREQ; + case Key_SysReq: + s = SDLK_SYSREQ; break; - case Key_Clear: - s = SDLK_CLEAR; + case Key_Clear: + s = SDLK_CLEAR; break; - case Key_Home: - s = SDLK_HOME; + case Key_Home: + s = SDLK_HOME; break; - case Key_End: - s = SDLK_END; + case Key_End: + s = SDLK_END; break; - case Key_Left: - s = SDLK_LEFT; + case Key_Left: + s = SDLK_LEFT; break; - case Key_Up: - s = SDLK_UP; + case Key_Up: + s = SDLK_UP; break; - case Key_Right: - s = SDLK_RIGHT; + case Key_Right: + s = SDLK_RIGHT; break; - case Key_Down: - s = SDLK_DOWN; + case Key_Down: + s = SDLK_DOWN; break; - case Key_PageUp: - s = SDLK_PAGEUP; + case Key_PageUp: + s = SDLK_PAGEUP; break; - case Key_PageDown: - s = SDLK_PAGEDOWN; + case Key_PageDown: + s = SDLK_PAGEDOWN; break; - case Key_Shift: - s = SDLK_LSHIFT; + case Key_Shift: + s = SDLK_LSHIFT; break; - case Key_Control: - s = SDLK_LCTRL; + case Key_Control: + s = SDLK_LCTRL; break; - case Key_Meta: - s = SDLK_LGUI; + case Key_Meta: + s = SDLK_LGUI; break; - case Key_Alt: - s = SDLK_LALT; + case Key_Alt: + s = SDLK_LALT; break; - case Key_CapsLock: - s = SDLK_CAPSLOCK; + case Key_CapsLock: + s = SDLK_CAPSLOCK; break; - case Key_NumLock: - s = SDLK_NUMLOCKCLEAR; + case Key_NumLock: + s = SDLK_NUMLOCKCLEAR; break; - case Key_ScrollLock: - s = SDLK_SCROLLLOCK; + case Key_ScrollLock: + s = SDLK_SCROLLLOCK; break; - case Key_F1: - s = SDLK_F1; + case Key_F1: + s = SDLK_F1; break; - case Key_F2: - s = SDLK_F2; + case Key_F2: + s = SDLK_F2; break; - case Key_F3: - s = SDLK_F3; + case Key_F3: + s = SDLK_F3; break; - case Key_F4: - s = SDLK_F4; + case Key_F4: + s = SDLK_F4; break; - case Key_F5: - s = SDLK_F5; + case Key_F5: + s = SDLK_F5; break; - case Key_F6: - s = SDLK_F6; + case Key_F6: + s = SDLK_F6; break; - case Key_F7: - s = SDLK_F7; + case Key_F7: + s = SDLK_F7; break; - case Key_F8: - s = SDLK_F8; + case Key_F8: + s = SDLK_F8; break; - case Key_F9: - s = SDLK_F9; + case Key_F9: + s = SDLK_F9; break; - case Key_F10: - s = SDLK_F10; + case Key_F10: + s = SDLK_F10; break; - case Key_F11: - s = SDLK_F11; + case Key_F11: + s = SDLK_F11; break; - case Key_F12: - s = SDLK_F12; + case Key_F12: + s = SDLK_F12; break; - case Key_F13: - s = SDLK_F13; + case Key_F13: + s = SDLK_F13; break; - case Key_F14: - s = SDLK_F14; + case Key_F14: + s = SDLK_F14; break; - case Key_F15: - s = SDLK_F15; + case Key_F15: + s = SDLK_F15; break; - case Key_F16: - s = SDLK_F16; + case Key_F16: + s = SDLK_F16; break; - case Key_F17: - s = SDLK_F17; + case Key_F17: + s = SDLK_F17; break; - case Key_F18: - s = SDLK_F18; + case Key_F18: + s = SDLK_F18; break; - case Key_F19: - s = SDLK_F19; + case Key_F19: + s = SDLK_F19; break; - case Key_F20: - s = SDLK_F20; + case Key_F20: + s = SDLK_F20; break; - case Key_F21: - s = SDLK_F21; + case Key_F21: + s = SDLK_F21; break; - case Key_F22: - s = SDLK_F22; + case Key_F22: + s = SDLK_F22; break; - case Key_F23: - s = SDLK_F23; + case Key_F23: + s = SDLK_F23; break; - case Key_F24: - s = SDLK_F24; + case Key_F24: + s = SDLK_F24; break; - //case Key_F25: // F25 .. F35 only on X11 - //case Key_F26: - //case Key_F27: - //case Key_F28: - //case Key_F29: - //case Key_F30: - //case Key_F31: - //case Key_F32: - //case Key_F33: - //case Key_F34: - //case Key_F35: + //case Key_F25: // F25 .. F35 only on X11 + //case Key_F26: + //case Key_F27: + //case Key_F28: + //case Key_F29: + //case Key_F30: + //case Key_F31: + //case Key_F32: + //case Key_F33: + //case Key_F34: + //case Key_F35: // s = SDL_SCANCODE_UNKNOWN; //break; - case Key_Super_L: - case Key_Super_R: - s = SDLK_UNKNOWN; + case Key_Super_L: + case Key_Super_R: + s = SDLK_UNKNOWN; break; - case Key_Menu: - s = SDLK_MENU; + case Key_Menu: + s = SDLK_MENU; break; - case Key_Hyper_L: - case Key_Hyper_R: - s = SDLK_UNKNOWN; + case Key_Hyper_L: + case Key_Hyper_R: + s = SDLK_UNKNOWN; break; - case Key_Help: - s = SDLK_HELP; + case Key_Help: + s = SDLK_HELP; break; - case Key_Direction_L: - case Key_Direction_R: - s = SDLK_UNKNOWN; + case Key_Direction_L: + case Key_Direction_R: + s = SDLK_UNKNOWN; break; - case Key_Space: + case Key_Space: //case Key_Any: - s = SDLK_SPACE; + s = SDLK_SPACE; break; - case Key_Exclam: - s = SDLK_EXCLAIM; + case Key_Exclam: + s = SDLK_EXCLAIM; break; - case Key_QuoteDbl: - s = SDLK_QUOTEDBL; + case Key_QuoteDbl: + s = SDLK_QUOTEDBL; break; - case Key_NumberSign: - s = SDLK_HASH; + case Key_NumberSign: + s = SDLK_HASH; break; - case Key_Dollar: - s = SDLK_DOLLAR; + case Key_Dollar: + s = SDLK_DOLLAR; break; - case Key_Percent: - s = SDLK_PERCENT; + case Key_Percent: + s = SDLK_PERCENT; break; - case Key_Ampersand: - s = SDLK_AMPERSAND; + case Key_Ampersand: + s = SDLK_AMPERSAND; break; - case Key_Apostrophe: - s = SDLK_QUOTE; + case Key_Apostrophe: + s = SDLK_QUOTE; break; - case Key_ParenLeft: - s = SDLK_LEFTPAREN; + case Key_ParenLeft: + s = SDLK_LEFTPAREN; break; - case Key_ParenRight: - s = SDLK_RIGHTPAREN; + case Key_ParenRight: + s = SDLK_RIGHTPAREN; break; - case Key_Asterisk: - s = SDLK_ASTERISK; + case Key_Asterisk: + s = SDLK_ASTERISK; break; - case Key_Plus: - s = SDLK_PLUS; + case Key_Plus: + s = SDLK_PLUS; break; - case Key_Comma: - s = SDLK_COMMA; + case Key_Comma: + s = SDLK_COMMA; break; - case Key_Minus: - s = SDLK_MINUS; + case Key_Minus: + s = SDLK_MINUS; break; - case Key_Period: - s = SDLK_PERIOD; + case Key_Period: + s = SDLK_PERIOD; break; - case Key_Slash: - s = SDLK_SLASH; + case Key_Slash: + s = SDLK_SLASH; break; - case Key_0: - s = SDLK_0; + case Key_0: + s = SDLK_0; break; - case Key_1: - s = SDLK_1; + case Key_1: + s = SDLK_1; break; - case Key_2: - s = SDLK_2; + case Key_2: + s = SDLK_2; break; - case Key_3: - s = SDLK_3; + case Key_3: + s = SDLK_3; break; - case Key_4: - s = SDLK_4; + case Key_4: + s = SDLK_4; break; - case Key_5: - s = SDLK_5; + case Key_5: + s = SDLK_5; break; - case Key_6: - s = SDLK_6; + case Key_6: + s = SDLK_6; break; - case Key_7: - s = SDLK_7; + case Key_7: + s = SDLK_7; break; - case Key_8: - s = SDLK_8; + case Key_8: + s = SDLK_8; break; - case Key_9: - s = SDLK_9; + case Key_9: + s = SDLK_9; break; - case Key_Colon: - s = SDLK_COLON; + case Key_Colon: + s = SDLK_COLON; break; - case Key_Semicolon: - s = SDLK_SEMICOLON; + case Key_Semicolon: + s = SDLK_SEMICOLON; break; - case Key_Less: - s = SDLK_LESS; + case Key_Less: + s = SDLK_LESS; break; - case Key_Equal: - s = SDLK_EQUALS; + case Key_Equal: + s = SDLK_EQUALS; break; - case Key_Greater: - s = SDLK_GREATER; + case Key_Greater: + s = SDLK_GREATER; break; - case Key_Question: - s = SDLK_QUESTION; + case Key_Question: + s = SDLK_QUESTION; break; - case Key_At: - s = SDLK_AT; + case Key_At: + s = SDLK_AT; break; break; - case Key_A: - s = SDLK_a; + case Key_A: + s = SDLK_a; break; - case Key_B: - s = SDLK_b; + case Key_B: + s = SDLK_b; break; - case Key_C: - s = SDLK_c; + case Key_C: + s = SDLK_c; break; - case Key_D: - s = SDLK_d; + case Key_D: + s = SDLK_d; break; - case Key_E: - s = SDLK_e; + case Key_E: + s = SDLK_e; break; - case Key_F: - s = SDLK_f; + case Key_F: + s = SDLK_f; break; - case Key_G: - s = SDLK_g; + case Key_G: + s = SDLK_g; break; - case Key_H: - s = SDLK_h; + case Key_H: + s = SDLK_h; break; - case Key_I: - s = SDLK_i; + case Key_I: + s = SDLK_i; break; - case Key_J: - s = SDLK_j; + case Key_J: + s = SDLK_j; break; - case Key_K: - s = SDLK_k; + case Key_K: + s = SDLK_k; break; - case Key_L: - s = SDLK_l; + case Key_L: + s = SDLK_l; break; - case Key_M: - s = SDLK_m; + case Key_M: + s = SDLK_m; break; - case Key_N: - s = SDLK_n; + case Key_N: + s = SDLK_n; break; - case Key_O: - s = SDLK_o; + case Key_O: + s = SDLK_o; break; - case Key_P: - s = SDLK_p; + case Key_P: + s = SDLK_p; break; - case Key_Q: - s = SDLK_q; + case Key_Q: + s = SDLK_q; break; - case Key_R: - s = SDLK_r; + case Key_R: + s = SDLK_r; break; - case Key_S: - s = SDLK_s; + case Key_S: + s = SDLK_s; break; - case Key_T: - s = SDLK_t; + case Key_T: + s = SDLK_t; break; - case Key_U: - s = SDLK_u; + case Key_U: + s = SDLK_u; break; - case Key_V: - s = SDLK_v; + case Key_V: + s = SDLK_v; break; - case Key_W: - s = SDLK_w; + case Key_W: + s = SDLK_w; break; - case Key_X: - s = SDLK_x; + case Key_X: + s = SDLK_x; break; - case Key_Y: - s = SDLK_y; + case Key_Y: + s = SDLK_y; break; - case Key_Z: - s = SDLK_z; + case Key_Z: + s = SDLK_z; break; - case Key_BracketLeft: - s = SDLK_LEFTBRACKET; + case Key_BracketLeft: + s = SDLK_LEFTBRACKET; break; - case Key_Backslash: - s = SDLK_BACKSLASH; + case Key_Backslash: + s = SDLK_BACKSLASH; break; - case Key_BracketRight: - s = SDLK_RIGHTBRACKET; + case Key_BracketRight: + s = SDLK_RIGHTBRACKET; break; - //case Key_AsciiCircum: - // s = SDLK_CARET; - //break; - case Key_Underscore: - s = SDLK_UNDERSCORE; + //case Key_AsciiCircum: + // s = SDLK_CARET; + //break; + case Key_Underscore: + s = SDLK_UNDERSCORE; break; - case Key_QuoteLeft: - s = SDLK_BACKQUOTE; + case Key_QuoteLeft: + s = SDLK_BACKQUOTE; break; - case Key_BraceLeft: - s = SDLK_LEFTBRACKET; + case Key_BraceLeft: + s = SDLK_LEFTBRACKET; break; - case Key_Bar: - s = SDLK_BACKSLASH; + case Key_Bar: + s = SDLK_BACKSLASH; break; - case Key_BraceRight: - s = SDLK_RIGHTBRACKET; + case Key_BraceRight: + s = SDLK_RIGHTBRACKET; break; - case Key_AsciiTilde: - s = SDLK_BACKQUOTE; + case Key_AsciiTilde: + s = SDLK_BACKQUOTE; break; - //case Key_nobreakspace: - //case Key_exclamdown: - //case Key_cent: - //case Key_sterling: - //case Key_currency: - //case Key_yen: - //case Key_brokenbar: - //case Key_section: - //case Key_diaeresis: - //case Key_copyright: - //case Key_ordfeminine: - //case Key_guillemotleft: - //case Key_notsign: - //case Key_hyphen: - //case Key_registered: - //case Key_macron: - //case Key_degree: - //case Key_plusminus: - //case Key_twosuperior: - //case Key_threesuperior: - //case Key_acute: - //case Key_mu: - //case Key_paragraph: - //case Key_periodcentered: - //case Key_cedilla: - //case Key_onesuperior: - //case Key_masculine: - //case Key_guillemotright: - //case Key_onequarter: - //case Key_onehalf: - //case Key_threequarters: - //case Key_questiondown: - //case Key_Agrave: - //case Key_Aacute: - //case Key_Acircumflex: - //case Key_Atilde: - //case Key_Adiaeresis: - //case Key_Aring: - //case Key_AE: - //case Key_Ccedilla: - //case Key_Egrave: - //case Key_Eacute: - //case Key_Ecircumflex: - //case Key_Ediaeresis: - //case Key_Igrave: - //case Key_Iacute: - //case Key_Icircumflex: - //case Key_Idiaeresis: - //case Key_ETH: - //case Key_Ntilde: - //case Key_Ograve: - //case Key_Oacute: - //case Key_Ocircumflex: - //case Key_Otilde: - //case Key_Odiaeresis: - //case Key_multiply: - //case Key_Ooblique: - //case Key_Ugrave: - //case Key_Uacute: - //case Key_Ucircumflex: - //case Key_Udiaeresis: - //case Key_Yacute: - //case Key_THORN: - //case Key_ssharp: - //case Key_division: - //case Key_ydiaeresis: - // s = SDL_SCANCODE_UNKNOWN; - //break; - default: - s = SDLK_UNKNOWN; + //case Key_nobreakspace: + //case Key_exclamdown: + //case Key_cent: + //case Key_sterling: + //case Key_currency: + //case Key_yen: + //case Key_brokenbar: + //case Key_section: + //case Key_diaeresis: + //case Key_copyright: + //case Key_ordfeminine: + //case Key_guillemotleft: + //case Key_notsign: + //case Key_hyphen: + //case Key_registered: + //case Key_macron: + //case Key_degree: + //case Key_plusminus: + //case Key_twosuperior: + //case Key_threesuperior: + //case Key_acute: + //case Key_mu: + //case Key_paragraph: + //case Key_periodcentered: + //case Key_cedilla: + //case Key_onesuperior: + //case Key_masculine: + //case Key_guillemotright: + //case Key_onequarter: + //case Key_onehalf: + //case Key_threequarters: + //case Key_questiondown: + //case Key_Agrave: + //case Key_Aacute: + //case Key_Acircumflex: + //case Key_Atilde: + //case Key_Adiaeresis: + //case Key_Aring: + //case Key_AE: + //case Key_Ccedilla: + //case Key_Egrave: + //case Key_Eacute: + //case Key_Ecircumflex: + //case Key_Ediaeresis: + //case Key_Igrave: + //case Key_Iacute: + //case Key_Icircumflex: + //case Key_Idiaeresis: + //case Key_ETH: + //case Key_Ntilde: + //case Key_Ograve: + //case Key_Oacute: + //case Key_Ocircumflex: + //case Key_Otilde: + //case Key_Odiaeresis: + //case Key_multiply: + //case Key_Ooblique: + //case Key_Ugrave: + //case Key_Uacute: + //case Key_Ucircumflex: + //case Key_Udiaeresis: + //case Key_Yacute: + //case Key_THORN: + //case Key_ssharp: + //case Key_division: + //case Key_ydiaeresis: + // s = SDL_SCANCODE_UNKNOWN; + //break; + default: + s = SDLK_UNKNOWN; break; } return s; } -SDL_Keymod convQtKey2SDLModifier( Qt::KeyboardModifiers m ) +SDL_Keymod convQtKey2SDLModifier(Qt::KeyboardModifiers m) { int s = 0; - if ( m != Qt::NoModifier ) + if (m != Qt::NoModifier) { - if ( m & Qt::ShiftModifier ) + if (m & Qt::ShiftModifier) { s |= (KMOD_LSHIFT | KMOD_RSHIFT); } - if ( m & Qt::AltModifier ) + if (m & Qt::AltModifier) { s |= (KMOD_LALT | KMOD_RALT); } - if ( m & Qt::ControlModifier ) + if (m & Qt::ControlModifier) { s |= (KMOD_LCTRL | KMOD_RCTRL); } @@ -995,11 +995,11 @@ SDL_Keymod convQtKey2SDLModifier( Qt::KeyboardModifiers m ) return (SDL_Keymod)s; } -int pushKeyEvent( QKeyEvent *event, int pressDown ) +int pushKeyEvent(QKeyEvent *event, int pressDown) { SDL_Event sdlev; - if ( pressDown ) + if (pressDown) { sdlev.type = SDL_KEYDOWN; sdlev.key.state = SDL_PRESSED; @@ -1010,18 +1010,18 @@ int pushKeyEvent( QKeyEvent *event, int pressDown ) sdlev.key.state = SDL_RELEASED; } - sdlev.key.keysym.sym = convQtKey2SDLKeyCode( (Qt::Key)event->key() ); + sdlev.key.keysym.sym = convQtKey2SDLKeyCode((Qt::Key)event->key()); - sdlev.key.keysym.scancode = SDL_GetScancodeFromKey( sdlev.key.keysym.sym ); + sdlev.key.keysym.scancode = SDL_GetScancodeFromKey(sdlev.key.keysym.sym); - sdlev.key.keysym.mod = convQtKey2SDLModifier( event->modifiers() ); + sdlev.key.keysym.mod = convQtKey2SDLModifier(event->modifiers()); sdlev.key.repeat = 0; //printf("Modifiers: %08X -> %08X \n", event->modifiers(), sdlev.key.keysym.mod ); if (sdlev.key.keysym.scancode != SDL_SCANCODE_UNKNOWN) { - SDL_PushEvent (&sdlev); + SDL_PushEvent(&sdlev); } return 0;