fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 01:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

print the keyboardlayout name supplied from windows if it was not found.

Browse source 
This makes it easier for me to add those layouts.
This commit is contained in:
Alexander Gottwald 2004-03-08 17:12:12 +00:00
parent fa3f16246f
commit 389d640338
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hw/xwin/winconfig.c
View file

@ -309,6 +309,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
if (keyboardType > 0 && GetKeyboardLayoutName (layoutName))
{
WinKBLayoutPtr pLayout;
bool bfound = false;
if (! layoutNum)
layoutNum = strtoul (layoutName, (char **)NULL, 16);
@ -339,6 +340,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
if (pLayout->winkbtype > 0 && pLayout->winkbtype != keyboardType)
continue;
bfound = true;
winMsg (X_PROBED,
"Using preset keyboard for \"%s\" (%x), type \"%d\"\n",
pLayout->layoutname, pLayout->winlayout, keyboardType);
@ -349,6 +351,27 @@ winConfigKeyboard (DeviceIntPtr pDevice)
g_winInfo.xkb.options = pLayout->xkboptions;
break;
}
if (!bfound)
{
HKEY regkey;
const char regtempl =
"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\";
char *regpath;
char lname[256];
unsigned short namesize = sizeof(lname);
regpath = alloca(sizeof(regtempl) + KL_NAMELENGTH + 1);
strcpy(regpath, regtempl);
strcat(layoutName);
if (!RegOpenKey(HKEY_LOCAL_MACHINE, regpath, &regkey) &&
!RegQueryValueEx(regkey, "Layout Text", 0, NULL, lname, &namesize))
{
winMsg (X_ERROR,
"Keyboardlayout \"%s\" (%s) is unknown\n", lname, layoutName);
}
}
}
g_winInfo.xkb.initialMap = NULL;