zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix keyboard layout issue reported at http://forums.duke4.net/topic/6683-eduke32-forces-my-keyboard-to-us-layout-rather-than-uk

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3998 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2013-08-10 23:09:14 +00:00
parent f2e5b77104
commit bf2c96c9a2
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
polymer/eduke32/build/src/winlayer.c
View file

@ -158,7 +158,7 @@ char appactive=1;
char realfs=0; char realfs=0;
char regrabmouse=0; char regrabmouse=0;
uint32_t mousewheel[2] = { 0,0 }; uint32_t mousewheel[2] = { 0,0 };
char defaultlayoutname[KL_NAMELENGTH];
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// DINPUT (JOYSTICK) // DINPUT (JOYSTICK)
@ -721,13 +721,27 @@ int32_t handleevents(void)
} }
void switchlayout(char * layout)
{
char layoutname[KL_NAMELENGTH];
GetKeyboardLayoutName(layoutname);
if (!Bstrcmp(layoutname, layout))
return;
initprintf("Switching keyboard layout from %s to %s\n", layoutname, layout);
LoadKeyboardLayout(layout, KLF_ACTIVATE|KLF_SETFORPROCESS|KLF_SUBSTITUTE_OK);
}
// //
// initinput() -- init input system // initinput() -- init input system
// //
int32_t initinput(void) int32_t initinput(void)
{ {
int32_t i; int32_t i;
char layoutname[KL_NAMELENGTH]; static int32_t readlayout=0;
moustat=0; moustat=0;
memset(keystatus, 0, sizeof(keystatus)); memset(keystatus, 0, sizeof(keystatus));
@ -745,13 +759,14 @@ int32_t initinput(void)
// 00000409 is "American English" // 00000409 is "American English"
GetKeyboardLayoutName(layoutname); if (!readlayout)
if (Bstrcmp(layoutname, "00000409"))
{ {
initprintf("Switching kb layout from %s ",layoutname); GetKeyboardLayoutName(defaultlayoutname);
LoadKeyboardLayout("00000409", KLF_ACTIVATE|KLF_SETFORPROCESS|KLF_SUBSTITUTE_OK);
GetKeyboardLayoutName(layoutname); if (Bstrcmp(defaultlayoutname, "00000409"))
initprintf("to %s\n",layoutname); switchlayout("00000409");
readlayout = 1;
} }
GetKeyNames(); GetKeyNames();
@ -766,6 +781,8 @@ int32_t initinput(void)
// //
void uninitinput(void) void uninitinput(void)
{ {
switchlayout(defaultlayoutname);
uninitmouse(); uninitmouse();
UninitDirectInput(); UninitDirectInput();
} }