Skip to content

N
nx-libs
Commit b891e5f6 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Keyboard.c: always ask for remote XKB

parent 3fbef7da
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @ b891e5f6
...@@ -693,6 +693,18 @@ N/A ...@@ -693,6 +693,18 @@ N/A
keySyms.mapWidth = mapWidth; keySyms.mapWidth = mapWidth;
keySyms.map = keymap; keySyms.map = keymap;
if (XkbQueryExtension(nxagentDisplay,
&nxagentXkbInfo.Opcode,
&nxagentXkbInfo.EventBase,
&nxagentXkbInfo.ErrorBase,
&nxagentXkbInfo.MajorVersion,
&nxagentXkbInfo.MinorVersion) == 0)
{
ErrorF("Unable to initialize XKEYBOARD extension.\n");
goto XkbError;
}
#ifdef XKB #ifdef XKB
/* /*
...@@ -828,18 +840,6 @@ XkbError: ...@@ -828,18 +840,6 @@ XkbError:
fprintf(stderr, "nxagentKeyboardProc: Init XKB extension.\n"); fprintf(stderr, "nxagentKeyboardProc: Init XKB extension.\n");
#endif #endif
if (XkbQueryExtension(nxagentDisplay,
&nxagentXkbInfo.Opcode,
&nxagentXkbInfo.EventBase,
&nxagentXkbInfo.ErrorBase,
&nxagentXkbInfo.MajorVersion,
&nxagentXkbInfo.MinorVersion) == 0)
{
ErrorF("Unable to initialize XKEYBOARD extension.\n");
goto XkbError;
}
xkb = XkbGetKeyboard(nxagentDisplay, XkbGBN_AllComponentsMask, XkbUseCoreKbd); xkb = XkbGetKeyboard(nxagentDisplay, XkbGBN_AllComponentsMask, XkbUseCoreKbd);
nxagentKeycodeConversionSetup(); nxagentKeycodeConversionSetup();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment