diff --git a/src/console.c b/src/console.c index 1cba7ca24..f6581069f 100644 --- a/src/console.c +++ b/src/console.c @@ -208,14 +208,6 @@ static void CONS_Clear_f(void) Unlock_state(); } -// Choose english keymap -// -/*static void CONS_English_f(void) -{ - shiftxform = english_shiftxform; - CONS_Printf(M_GetText("%s keymap.\n"), M_GetText("English")); -}*/ - static char *bindtable[NUMINPUTS]; static void CONS_Bind_f(void) @@ -633,27 +625,186 @@ void CON_MoveConsole(void) Unlock_state(); } +//====================================================================== +// KEYBOARD LAYOUTS FOR ENTERING TEXT +//====================================================================== + +static char english_shiftxform[] = +{ + 0, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, + ' ', '!', '"', '#', '$', '%', '&', + '"', // shift-' + '(', ')', '*', '+', + '<', // shift-, + '_', // shift-- + '>', // shift-. + '?', // shift-/ + ')', // shift-0 + '!', // shift-1 + '@', // shift-2 + '#', // shift-3 + '$', // shift-4 + '%', // shift-5 + '^', // shift-6 + '&', // shift-7 + '*', // shift-8 + '(', // shift-9 + ':', + ':', // shift-; + '<', + '+', // shift-= + '>', '?', '@', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '{', // shift-[ + '|', // shift-backslash - OH MY GOD DOES WATCOM SUCK + '}', // shift-] + '"', '_', + '~', // shift-` + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '{', '|', '}', '~', 127 +}; + +static char french_shiftxform[] = +{ + 0, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, + ' ','$', //shift-! + '3', //shift-" + '#', '$', '%', + '1', //shift-& + '4', // shift-' + '5', // shift-( + ')', // shift-) + '*', '+', + '?', // shift-, + '6', // shift-- + '.', '/', + '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', + '/', // shitf-: + '.', // shift-; + '>', // shift-< + '+', // shift-= + '>', '?', '@', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '[', '\\', ']', '^', + '8', //shift-_ + '`', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '{', '|', '}', '~', 127, + 128, 129, + '2', + 131, 132, + '0', + 134, + '9', + 136, 137, + '7', + 139, 140, + '%' +}; + +static char french_altgrxform[] = +{ + 0, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, + ' ', '!', + '#', //altgr-" + '#', '$', '%', '&', + '{', //altgr-' + '[', //altgr-( + ']', //altgr-) + '*', '+', ',', + '|', //altg-- + '.', '/', + '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', + ':', ';', '<', + '}', //altgr-= + '>', '?', '@', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '[', '\\', ']', '^', + '\\', //altgr-backslash + '`', + 'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '{', '|', '}', '~', 127, + 128, 129, + '~', + 131, 132, + '@', + 134, + '^', + 136, 137, + '`', + 139, 140, + KEY_FR_U_GRAVE +}; + +// fallback for special letter non displayable in the game (i.e.: 'é','à',etc.) +static INT32 CON_FallBackFrSpecialLetter(INT32 key) +{ + switch (key) + { + case KEY_FR_E_AIGUE: return 'e'; + case KEY_FR_E_GRAVE: return 'e'; + case KEY_FR_C_CEDILLE: return 'c'; + case KEY_FR_A_GRAVE: return 'a'; + case KEY_FR_U_GRAVE: return 'u'; + default: return key; + } +} + +// goddang AZERTY +static size_t CON_GetShiftSize(void) +{ + return ((cv_keyboardlayout.value == 3) ? sizeof(french_shiftxform) : sizeof(english_shiftxform)); +} + +static char *CON_Shiftform(void) +{ + return (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform; +} + INT32 CON_ShiftChar(INT32 ch) { - if (I_UseNativeKeyboard()) + if (I_UseNativeKeyboard() || ch >= (INT32)CON_GetShiftSize()) return ch; + // warning: shiftdown is NOT a boolean, it's 1 or 2 for lshift/rshift if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) { - if (shiftdown ^ capslock) - ch = shiftxform[ch]; + return !!shiftdown != capslock ? CON_Shiftform()[ch] : ch; } - else // if we're holding shift we should still shift non letter symbols + + // if we're holding shift we should still shift non letter symbols + if (shiftdown) { - if (shiftdown) - ch = shiftxform[ch]; - else if (cv_keyboardlayout.value == 3) - { - if (altdown & 0x2) - ch = french_altgrxform[ch]; - else - ch = HU_FallBackFrSpecialLetter(ch); - } + return CON_Shiftform()[ch]; + } + + // AZERTY + if (cv_keyboardlayout.value == 3) + { + if (altdown & 0x2) + return french_altgrxform[ch]; + + return CON_FallBackFrSpecialLetter(ch); } return ch; diff --git a/src/hu_stuff.c b/src/hu_stuff.c index a2472ae8c..d505852f3 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -115,155 +115,8 @@ static patch_t *songcreditbg = NULL; // ------- static void HU_DrawRankings(void); - consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; -//====================================================================== -// KEYBOARD LAYOUTS FOR ENTERING TEXT -//====================================================================== - -char *shiftxform = NULL; - -char english_shiftxform[] = -{ - 0, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, - ' ', '!', '"', '#', '$', '%', '&', - '"', // shift-' - '(', ')', '*', '+', - '<', // shift-, - '_', // shift-- - '>', // shift-. - '?', // shift-/ - ')', // shift-0 - '!', // shift-1 - '@', // shift-2 - '#', // shift-3 - '$', // shift-4 - '%', // shift-5 - '^', // shift-6 - '&', // shift-7 - '*', // shift-8 - '(', // shift-9 - ':', - ':', // shift-; - '<', - '+', // shift-= - '>', '?', '@', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - '{', // shift-[ - '|', // shift-backslash - OH MY GOD DOES WATCOM SUCK - '}', // shift-] - '"', '_', - '~', // shift-` - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - '{', '|', '}', '~', 127 -}; - -char french_shiftxform[] = -{ - 0, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, - ' ','$', //shift-! - '3', //shift-" - '#', '$', '%', - '1', //shift-& - '4', // shift-' - '5', // shift-( - ')', // shift-) - '*', '+', - '?', // shift-, - '6', // shift-- - '.', '/', - '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', - '/', // shitf-: - '.', // shift-; - '>', // shift-< - '+', // shift-= - '>', '?', '@', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - '[', '\\', ']', '^', - '8', //shift-_ - '`', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - '{', '|', '}', '~', 127, - 128, 129, - '2', - 131, 132, - '0', - 134, - '9', - 136, 137, - '7', - 139, 140, - '%' -}; - -char french_altgrxform[] = -{ - 0, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, - ' ', '!', - '#', //altgr-" - '#', '$', '%', '&', - '{', //altgr-' - '[', //altgr-( - ']', //altgr-) - '*', '+', ',', - '|', //altg-- - '.', '/', - '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', - ':', ';', '<', - '}', //altgr-= - '>', '?', '@', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - '[', '\\', ']', '^', - '\\', //altgr-backslash - '`', - 'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', - 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '{', '|', '}', '~', 127, - 128, 129, - '~', - 131, 132, - '@', - 134, - '^', - 136, 137, - '`', - 139, 140, - KEY_FR_U_GRAVE -}; - -//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.) -INT32 HU_FallBackFrSpecialLetter(INT32 key) -{ - switch(key){ - case KEY_FR_E_AIGUE: return 'e'; - case KEY_FR_E_GRAVE: return 'e'; - case KEY_FR_C_CEDILLE: return 'c'; - case KEY_FR_A_GRAVE: return 'a'; - case KEY_FR_U_GRAVE: return 'u'; - default: return key; - } -} - static char cechotext[1024]; static tic_t cechotimer = 0; static tic_t cechoduration = 5*TICRATE; @@ -407,9 +260,6 @@ void HU_Init(void) COM_AddCommand("csay", Command_CSay_f); RegisterNetXCmd(XD_SAY, Got_Saycmd); - // set shift translation table - shiftxform = english_shiftxform; - if (dedicated || rendermode == render_none) return; @@ -435,11 +285,6 @@ void HU_Start(void) headsupactive = true; } -void HU_Shiftform(void) -{ - shiftxform = (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform; -} - //====================================================================== // EXECUTION //====================================================================== diff --git a/src/hu_stuff.h b/src/hu_stuff.h index 8ba4bce19..16b4bf0fc 100644 --- a/src/hu_stuff.h +++ b/src/hu_stuff.h @@ -42,15 +42,6 @@ #define CRED_FONTEND 'Z' // the last font character #define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1) -extern char *shiftxform; // english translation shift table -extern char english_shiftxform[]; - -extern char french_shiftxform[]; -extern char french_altgrxform[]; - -//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.) -INT32 HU_FallBackFrSpecialLetter(INT32 key); - //------------------------------------ // sorted player lines //------------------------------------ @@ -105,8 +96,6 @@ void HU_LoadGraphics(void); // reset heads up when consoleplayer respawns. void HU_Start(void); -void HU_Shiftform(void); - boolean HU_Responder(event_t *ev); void HU_Ticker(void); void HU_TickSongCredits(void); @@ -115,8 +104,6 @@ void HU_Drawer(void); char HU_dequeueChatChar(void); void HU_clearChatChars(void); void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard. -//void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer); -//void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer); void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol); void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds); const char *HU_SkinColorToConsoleColor(skincolors_t color); diff --git a/src/m_menu.c b/src/m_menu.c index 6501c5bf0..04b9cfbf8 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -495,32 +495,6 @@ static consvar_t cv_dummystaff = {"dummystaff", "0", CV_HIDEN|CV_CALL, dummystaf // all the menu definitions and onchanges reside in here now #include "m_menudefs.c" -static INT32 M_ShiftChar(INT32 ch) -{ - if (I_UseNativeKeyboard()) - return ch; - - if (cv_keyboardlayout.value == 3) - { - if (ch >= 32 && ch <= 141) - { - if (shiftdown) - ch = shiftxform[ch]; - else if (altdown & 0x2) - ch = french_altgrxform[ch]; - else - ch = HU_FallBackFrSpecialLetter(ch); - } - } - else - { - if (shiftdown && ch >= 32 && ch <= 127) - ch = shiftxform[ch]; - } - - return ch; -} - // // M_GetGametypeColor // @@ -1249,7 +1223,7 @@ boolean M_Responder(event_t *ev) // Handle menuitems which need a specific key handling if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_KEYHANDLER) { - ch = M_ShiftChar(ch); + ch = CON_ShiftChar(ch); routine(ch); return true; } @@ -1279,6 +1253,7 @@ boolean M_Responder(event_t *ev) void (*otherroutine)(event_t *sev) = currentMenu->menuitems[itemOn].itemaction; otherroutine(ev); //Alam: what a hack } + return true; } } diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index d6327a9ab..31a3776bb 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -113,7 +113,6 @@ static void KeyboardLayout_OnChange(void) { if (cv_keyboardlayout.value != 2) SDL_StopTextInput(); - HU_Shiftform(); } static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}};