summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-02-25 16:12:35 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-02-25 17:10:40 +1000
commit3992afdd5593f391bcff1eb39d7e975886d817e3 (patch)
tree6dff583b0237ded40e274df8b4ccc5c2628e9c4b /src
parent62858c426e6de1b99df660251737233afd335302 (diff)
Remove DeviceEnter/LeaveNotify handling.
This will be replaced by XI2 GenericEvents. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
-rw-r--r--src/XExtInt.c28
-rw-r--r--src/XExtToWire.c33
2 files changed, 0 insertions, 61 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 572cfcd..6014657 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -764,34 +764,6 @@ XInputWireToEvent(
return ENQUEUE_EVENT;
}
break;
- case XI_DeviceEnterNotify:
- case XI_DeviceLeaveNotify:
- {
- XDeviceCrossingEvent *ev = (XDeviceCrossingEvent*)re;
- deviceEnterNotify *ev2 = (deviceEnterNotify*) event;
- *ev = *(XDeviceCrossingEvent*)save;
- ev->root = ev2->root;
- ev->window = ev2->event;
- ev->subwindow = ev2->child;
- ev->time = ev2->time;
- ev->x_root = ev2->rootX;
- ev->y_root = ev2->rootY;
- ev->x = ev2->eventX;
- ev->y = ev2->eventY;
- ev->state = ev2->state;
- /* mode has same_screen and focus stuffed in the upper 4 bits */
- ev->mode = ev2->mode & 0xF;
- ev->deviceid = ev2->deviceid & DEVICE_BITS;
- ev->detail = ev2->detail;
- if ((ev2->mode >> 4) & ELFlagSameScreen) {
- ev->same_screen = True;
- }
- if ((ev2->mode >> 4) & ELFlagFocus) {
- ev->focus = True;
- }
- return (ENQUEUE_EVENT);
- }
- break;
default:
printf("XInputWireToEvent: UNKNOWN WIRE EVENT! type=%d\n", type);
break;
diff --git a/src/XExtToWire.c b/src/XExtToWire.c
index 7ab558d..6bfef28 100644
--- a/src/XExtToWire.c
+++ b/src/XExtToWire.c
@@ -454,39 +454,6 @@ _XiEventToWire(
cev->deviceid = ev->deviceid;
break;
}
- case XI_DeviceEnterNotify:
- case XI_DeviceLeaveNotify:
- {
- register XDeviceCrossingEvent *ev = (XDeviceCrossingEvent*)re;
- register deviceEnterNotify *elev;
-
- *count =1;
- elev = (deviceEnterNotify *) Xmalloc(*count * sizeof(xEvent));
- if (!elev)
- return (_XUnknownNativeEvent(dpy, re, *event));
- *event = (xEvent *) elev;
-
- elev->type = ev->type;
- elev->deviceid = ev->deviceid;
- elev->root = ev->root;
- elev->event = ev->window;
- elev->child = ev->subwindow;
- elev->time = ev->time;
- elev->eventX = ev->x;
- elev->eventY = ev->y;
- elev->rootX = ev->x_root;
- elev->rootY = ev->y_root;
- elev->state = ev->state;
- elev->mode = ev->mode;
- elev->detail = ev->detail;
- if (ev->same_screen) {
- elev->mode |= ELFlagSameScreen << 4;
- }
- if (ev->focus) {
- elev->mode |= ELFlagFocus << 4;
- }
- break;
- }
default:
return (_XUnknownNativeEvent(dpy, re, *event));
} /* switch */