Remove DeviceEnter/LeaveNotify handling.

This will be replaced by XI2 GenericEvents.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 0 insertions, 35 deletions

diff --git a/include/X11/extensions/XInput.h b/include/X11/extensions/XInput.h
index 24b4606..0f92d92 100644
--- a/include/X11/extensions/XInput.h
+++ b/include/X11/extensions/XInput.h
@@ -74,8 +74,6 @@ SOFTWARE.
    DeviceButtonStateNotify, DevicePresenceNotify (essentially unused). This
    code has to be in sync with FixExtensionEvents() in xserver/Xi/extinit.c */
 #define _propertyNotify		6
-#define _deviceEnterNotify	7
-#define _deviceLeaveNotify	8
 
 #define FindTypeAndClass(d,type,_class,classid,offset) \
     { int _i; XInputClassInfo *_ip; \
@@ -172,12 +170,6 @@ extern "C" {
         _class =  (0x10000 | _devicePresence);                  \
     }
 
-#define DeviceEnterNotify(d, type, _class) \
-    FindTypeAndClass(d, type, _class, OtherClass, _deviceEnterNotify);
-
-#define DeviceLeaveNotify(d, type, _class) \
-    FindTypeAndClass(d, type, _class, OtherClass, _deviceLeaveNotify);
-
 /* Errors */
 #define BadDevice(dpy,error) _xibaddevice(dpy, &error)
 
@@ -489,33 +481,6 @@ typedef struct {
     int           state;        /* PropertyNewValue or PropertyDeleted */
 } XDevicePropertyNotifyEvent;
 
-
-typedef struct {
-    int           type;
-    unsigned long serial;       /* # of last request processed by server */
-    Bool          send_event;   /* true if this came from a SendEvent request */
-    Display       *display;     /* Display the event was read from */
-    Window window;	        /* "event" window reported relative to */
-    XID deviceid;
-    Window root;	        /* root window that the event occurred on */
-    Window subwindow;	        /* child window */
-    Time time;		        /* milliseconds */
-    int x, y;		        /* pointer x, y coordinates in event window */
-    int x_root, y_root;	        /* coordinates relative to root */
-    int mode;		        /* NotifyNormal, NotifyGrab, NotifyUngrab */
-    int detail;
-    /*
-     * NotifyAncestor, NotifyVirtual, NotifyInferior, 
-     * NotifyNonlinear,NotifyNonlinearVirtual
-     */
-    Bool same_screen;   /* same screen flag */
-    Bool focus;         /* boolean focus */
-    unsigned int state;	/* key or button mask */
-} XDeviceCrossingEvent;
-
-typedef XDeviceCrossingEvent XDeviceLeaveWindowEvent;
-typedef XDeviceCrossingEvent XDeviceEnterWindowEvent;
-
 /*
  * Notifies the client that the device hierarchy has been changed. The client
  * is expected to re-query the server for the device hierarchy.