From 60b2d114d06617ca60c2905373829299dc051c7f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 25 Feb 2009 15:32:53 +1000 Subject: Move current XI2 stuff out of XInput.h, into XInput2.h This means XInput2.h is rather messy, but it also means we can leave XInput.h untouched for the XI2 rework. --- include/X11/extensions/XInput.h | 130 ---------------------------------------- 1 file changed, 130 deletions(-) (limited to 'include/X11/extensions/XInput.h') diff --git a/include/X11/extensions/XInput.h b/include/X11/extensions/XInput.h index 8c00122..561465c 100644 --- a/include/X11/extensions/XInput.h +++ b/include/X11/extensions/XInput.h @@ -51,7 +51,6 @@ SOFTWARE. #include #include -#include #define _deviceKeyPress 0 #define _deviceKeyRelease 1 @@ -481,39 +480,6 @@ typedef struct { int state; /* PropertyNewValue or PropertyDeleted */ } XDevicePropertyNotifyEvent; -/* - * Notifies the client that the device hierarchy has been changed. The client - * is expected to re-query the server for the device hierarchy. - */ -typedef struct { - int type; /* GenericEvent */ - 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 */ - int extension; /* XI extension offset */ - int evtype; /* XI_DeviceHierarchyChangedNotify */ - Time time; -} XDeviceHierarchyChangedEvent; - -/* - * Notifies the client that the classes have been changed. This happens when - * the slave device that sends through the master changes. - */ -typedef struct { - int type; /* GenericEvent */ - 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 */ - int extension; /* XI extension offset */ - int evtype; /* XI_DeviceHierarchyChangedNotify */ - Time time; - XID deviceid; /* id of the device that changed */ - XID slaveid; /* id of the slave device that caused the - change */ - int num_classes; - XAnyClassPtr inputclassinfo; /* same as in XDeviceInfo */ -} XDeviceClassesChangedEvent; - /******************************************************************* * @@ -964,38 +930,6 @@ typedef struct { } XButtonState; -/******************************************************************* - * - */ -typedef struct { - int type; - char* name; - Bool sendCore; - Bool enable; -} XCreateMasterInfo; - -typedef struct { - int type; - XDevice* device; - int returnMode; /* AttachToMaster, Floating */ - XDevice* returnPointer; - XDevice* returnKeyboard; -} XRemoveMasterInfo; - -typedef struct { - int type; - XDevice* device; - int changeMode; /* AttachToMaster, Floating */ - XDevice* newMaster; -} XChangeAttachmentInfo; - -typedef union { - int type; /* must be first element */ - XCreateMasterInfo create; - XRemoveMasterInfo remove; - XChangeAttachmentInfo change; -} XAnyHierarchyChangeInfo; - /******************************************************************* * @@ -1293,70 +1227,6 @@ extern void XFreeDeviceControl( XDeviceControl* /* control */ ); -extern Bool XQueryDevicePointer( - Display* /* display */, - XDevice* /* device */, - Window /* win */, - Window* /* root */, - Window* /* child */, - int* /* root_x */, - int* /* root_y */, - int* /* win_x */, - int* /* win_y */, - unsigned int* /* mask */ -); - -extern Bool XWarpDevicePointer( - Display* /* display */, - XDevice* /* device */, - Window /* src_win */, - Window /* dst_win */, - int /* src_x */, - int /* src_y */, - unsigned int /* src_width */, - unsigned int /* src_height */, - int /* dst_x */, - int /* dst_y */ -); - -extern Status XDefineDeviceCursor( - Display* /* display */, - XDevice* /* device */, - Window /* win */, - Cursor /* cursor */ -); - -extern Status XUndefineDeviceCursor( - Display* /* display */, - XDevice* /* device */, - Window /* win */ -); - -extern Status XChangeDeviceHierarchy( - Display* /* display */, - XAnyHierarchyChangeInfo* /* changes*/, - int /* num_changes */ -); - -extern Status XSetClientPointer( - Display* /* dpy */, - Window /* win */, - XDevice* /* device */ -); - -extern Bool XGetClientPointer( - Display* /* dpy */, - Window /* win */, - XID* /* deviceid */ -); - -extern Status XiSelectEvent( - Display* /* dpy */, - Window /* win */, - XDevice* /* dev */, - Mask /* mask */ -); - extern Atom* XListDeviceProperties( Display* /* dpy */, XDevice* /* dev */, -- cgit v1.2.3