diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
| commit | faae65fb3693fd1020e740e00f9038607bc4a430 (patch) | |
| tree | 8ee59a2342f6320f9e8dc3e714b118e106f8d64d /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | |
| parent | d545afdf3967b0305c1215bb9f8a545b81fc24e8 (diff) | |
| parent | b44ecc0f897a5d03445aafc120e54b6475699254 (diff) | |
| download | nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.gz nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.bz2 nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.zip | |
Merge branch 'uli42-pr/rework_booleans_v2' into 3.6.x
Attributes GH PR #980: https://github.com/ArcticaProject/nx-libs/pull/980
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 14d811877..00db6ce2a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -161,7 +161,7 @@ XkbAgentInfoRec nxagentXkbInfo = { -1, -1, -1, -1, -1 }; * Keyboard status, updated through XKB events. */ -XkbAgentStateRec nxagentXkbState = { 0, 0, 0, 0, 0 }; +XkbAgentStateRec nxagentXkbState = { 0, 0, 0, 0, False }; /* * Info for disabling/enabling Xkb extension. @@ -776,7 +776,7 @@ XkbError: XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls); } - if (nxagentOption(Shadow) == 1 && pDev && pDev->key) + if (nxagentOption(Shadow) && pDev && pDev->key) { NXShadowInitKeymap(&(pDev->key->curKeySyms)); } @@ -974,7 +974,7 @@ int nxagentResetKeyboard(void) if (dev->key) { #ifdef XKB - if (noXkbExtension == 0 && dev->key->xkbInfo) + if (!noXkbExtension && dev->key->xkbInfo) { oldMinKeycode = dev->key->xkbInfo -> desc -> min_key_code; oldMaxKeycode = dev->key->xkbInfo -> desc -> max_key_code; @@ -1132,7 +1132,7 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev) if (dev->key) { #ifdef XKB - if (noXkbExtension == 0 && dev->key->xkbInfo) + if (!noXkbExtension && dev->key->xkbInfo) { XkbFreeInfo(dev->key->xkbInfo); dev->key->xkbInfo = NULL; |