diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-05 18:11:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-05 18:11:39 +0000 |
| commit | 9366a4edcadcd46d8250f82e79f0925d2ebecac9 (patch) | |
| tree | 28a840e0625fa988a866e9a78edce6c13e409790 /xserver/Xi | |
| parent | b4fa65f9703e9da8db366bfae869f6bcf90ac7f4 (diff) | |
Update to xserver 1.12.3.
Diffstat (limited to 'xserver/Xi')
| -rw-r--r-- | xserver/Xi/extinit.c | 2 | ||||
| -rw-r--r-- | xserver/Xi/stubs.c | 1 | ||||
| -rw-r--r-- | xserver/Xi/xiquerydevice.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/xserver/Xi/extinit.c b/xserver/Xi/extinit.c index 4483076e9..2637f08e5 100644 --- a/xserver/Xi/extinit.c +++ b/xserver/Xi/extinit.c @@ -365,7 +365,7 @@ RESTYPE RT_INPUTCLIENT; extern XExtensionVersion XIVersion; -Mask PropagateMask[MAXDEVICES]; +Mask PropagateMask[EMASKSIZE]; /***************************************************************** * diff --git a/xserver/Xi/stubs.c b/xserver/Xi/stubs.c index 8baa5a09b..39bee7c27 100644 --- a/xserver/Xi/stubs.c +++ b/xserver/Xi/stubs.c @@ -141,4 +141,5 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs, void DeleteInputDeviceRequest(DeviceIntPtr dev) { + RemoveDevice(dev, TRUE); } diff --git a/xserver/Xi/xiquerydevice.c b/xserver/Xi/xiquerydevice.c index 749bc24c9..15c8b2a7b 100644 --- a/xserver/Xi/xiquerydevice.c +++ b/xserver/Xi/xiquerydevice.c @@ -430,7 +430,7 @@ ListTouchInfo(DeviceIntPtr dev, xXITouchInfo * touch) { touch->type = XITouchClass; touch->length = sizeof(xXITouchInfo) >> 2; - touch->sourceid = touch->sourceid; + touch->sourceid = dev->touch->sourceid; touch->mode = dev->touch->mode; touch->num_touches = dev->touch->num_touches; |