Rekill hardcoded azerty
something something SDL textinput mode
This commit is contained in:
parent
de8bbc8525
commit
f5cba44f18
3 changed files with 1 additions and 13 deletions
|
|
@ -30,14 +30,6 @@ extern "C" {
|
|||
#define KEY_MINUS 45
|
||||
#define KEY_EQUALS 61
|
||||
|
||||
//azerty special keys support
|
||||
//(necessary for being able to print 'regular' chars in azerty)
|
||||
#define KEY_FR_E_AIGUE (0x80+2)
|
||||
#define KEY_FR_E_GRAVE (0x80+10)
|
||||
#define KEY_FR_C_CEDILLE (0x80+7)
|
||||
#define KEY_FR_A_GRAVE (0x80+5)
|
||||
#define KEY_FR_U_GRAVE (0x80+13)
|
||||
|
||||
#define KEY_NUMLOCK (0x80+69)
|
||||
#define KEY_SCROLLLOCK (0x80+70)
|
||||
|
||||
|
|
|
|||
|
|
@ -245,7 +245,6 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot
|
|||
return true;
|
||||
}
|
||||
|
||||
//if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown))
|
||||
if (ctrldown)
|
||||
{
|
||||
if (key == 'x' || key == 'X')
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
rendermode_t rendermode = render_soft;
|
||||
rendermode_t chosenrendermode = render_none; // set by command line arguments
|
||||
|
||||
static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}};
|
||||
static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {0, NULL}};
|
||||
consvar_t cv_keyboardlayout = CVAR_INIT ("keyboardlayout", "Default US", CV_SAVE, keyboardlayout_cons_t, NULL);
|
||||
|
||||
boolean highcolor = false;
|
||||
|
|
@ -807,9 +807,6 @@ static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
|
|||
case 2: // "native"
|
||||
event.data1 = GetTypedChar(evt);
|
||||
break;
|
||||
case 3: // AZERTY
|
||||
event.data1 = Impl_SDL_Keysym_To_Keycode(evt);
|
||||
break;
|
||||
default:
|
||||
event.data1 = Impl_SDL_Scancode_To_Keycode(evt.scancode);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in a new issue