aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-06-23 21:39:51 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-06-23 21:39:51 +0200
commit4a440feaf5c4ff7ac8d944a7a9832444fca924d3 (patch)
tree4356a989e631c00f23dd12bce627b04c6e1172a9 /nx-X11/programs/Xserver/xkb
parentabf3741362f4c200945db6403fcd54df6754d4af (diff)
parent3aabc92cf81f20b89dc49e8db3c56ad9fa08481b (diff)
downloadnx-libs-4a440feaf5c4ff7ac8d944a7a9832444fca924d3.tar.gz
nx-libs-4a440feaf5c4ff7ac8d944a7a9832444fca924d3.tar.bz2
nx-libs-4a440feaf5c4ff7ac8d944a7a9832444fca924d3.zip
Merge branch 'uli42-pr/fix_xkb_privates' into 3.6.x
Attributes GH PR #818: https://github.com/ArcticaProject/nx-libs/pull/818
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbActions.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbActions.c b/nx-X11/programs/Xserver/xkb/xkbActions.c
index 90bad93e0..a39e5c8f2 100644
--- a/nx-X11/programs/Xserver/xkb/xkbActions.c
+++ b/nx-X11/programs/Xserver/xkb/xkbActions.c
@@ -81,6 +81,20 @@ XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc)
proc,xkbUnwrapProc);
}
+void
+XkbFreePrivates(DeviceIntPtr device)
+{
+ if (device &&
+ device->devPrivates &&
+ device->nPrivates > 0 &&
+ xkbDevicePrivateIndex != -1 &&
+ xkbDevicePrivateIndex < device->nPrivates)
+ {
+ free(device->devPrivates[xkbDevicePrivateIndex].ptr);
+ device->devPrivates[xkbDevicePrivateIndex].ptr = NULL;
+ }
+}
+
#ifdef XINPUT
extern void ProcessOtherEvent(
xEvent * /* xE */,