diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-06-22 16:03:06 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2019-06-22 16:05:48 +0200 |
| commit | 3aabc92cf81f20b89dc49e8db3c56ad9fa08481b (patch) | |
| tree | 4356a989e631c00f23dd12bce627b04c6e1172a9 /nx-X11/programs/Xserver/dix | |
| parent | abf3741362f4c200945db6403fcd54df6754d4af (diff) | |
| download | nx-libs-3aabc92cf81f20b89dc49e8db3c56ad9fa08481b.tar.gz nx-libs-3aabc92cf81f20b89dc49e8db3c56ad9fa08481b.tar.bz2 nx-libs-3aabc92cf81f20b89dc49e8db3c56ad9fa08481b.zip | |
rework xkb device private handling
We can only free the xkbDevicePrivate because we do not know the
details of any other (possible) extension. So let's limit to that one
private for now and call the new xkbFreePrivates from dix (where such
a function is completely missing).
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/devices.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 8ad1cc371..3dee81a25 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -73,6 +73,8 @@ SOFTWARE. #include "swaprep.h" #include "dixevents.h" +extern void XkbFreePrivates(DeviceIntPtr device); + DeviceIntPtr AddInputDevice(DeviceProc deviceProc, Bool autoStart) { @@ -275,6 +277,13 @@ CloseDevice(register DeviceIntPtr dev) #endif free(l); } + +#ifdef XKB + XkbFreePrivates(dev); +#endif + + free(dev->devPrivates); + free(dev->sync.event); free(dev); } |