diff options
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/exevents.c | 4 | ||||
| -rw-r--r-- | xorg-server/Xi/extinit.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c index 0211e72b7..b0e0ede6c 100644 --- a/xorg-server/Xi/exevents.c +++ b/xorg-server/Xi/exevents.c @@ -944,7 +944,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device) int ret = 0; int state, i; DeviceIntPtr mouse = NULL, kbd = NULL; - DeviceEvent *event = (DeviceEvent*)ev; + DeviceEvent *event = &ev->device_event; CHECKEVENT(ev); @@ -954,7 +954,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device) ev->any.type == ET_RawButtonRelease || ev->any.type == ET_RawMotion) { - ProcessRawEvent((RawDeviceEvent*)ev, device); + ProcessRawEvent(&ev->raw_event, device); return; } diff --git a/xorg-server/Xi/extinit.c b/xorg-server/Xi/extinit.c index 84b999c0c..0c1291903 100644 --- a/xorg-server/Xi/extinit.c +++ b/xorg-server/Xi/extinit.c @@ -72,6 +72,7 @@ SOFTWARE. #include "swaprep.h" #include "registry.h" #include "privates.h" +#include "protocol-versions.h" /* modules local to Xi */ #include "allowev.h" @@ -380,11 +381,6 @@ Mask PropagateMask[MAXDEVICES]; static int XIClientPrivateKeyIndex; DevPrivateKey XIClientPrivateKey = &XIClientPrivateKeyIndex; -static XExtensionVersion thisversion = { XI_Present, - XI_2_Major, - XI_2_Minor -}; - /***************************************************************** * @@ -1255,6 +1251,10 @@ void XInputExtensionInit(void) { ExtensionEntry *extEntry; + XExtensionVersion thisversion = { XI_Present, + SERVER_XI_MAJOR_VERSION, + SERVER_XI_MINOR_VERSION, + }; if (!dixRequestPrivate(XIClientPrivateKey, sizeof(XIClientRec))) FatalError("Cannot request private for XI.\n"); |