Remove Configure/QueryDeviceProperty.

2 files changed, 15 insertions, 70 deletions

diff --git a/XI.h b/XI.h
index f91f3c3..f722bbf 100644
--- a/XI.h
+++ b/XI.h
@@ -108,9 +108,6 @@ SOFTWARE.
 #define sz_xChangeDeviceControlReply		32
 #define sz_xListDevicePropertiesReq             8
 #define sz_xListDevicePropertiesReply           32
-#define sz_xQueryDevicePropertyReq              12
-#define sz_xQueryDevicePropertyReply            32
-#define sz_xConfigureDevicePropertyReq          12
 #define sz_xChangeDevicePropertyReq             20
 #define sz_xDeleteDevicePropertyReq             12
 #define sz_xGetDevicePropertyReq                24
diff --git a/XIproto.h b/XIproto.h
index 0645f8b..d2c2e46 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -72,7 +72,7 @@ SOFTWARE.
 
 #define IEVENTS         19       /* does NOT include generic events */
 #define IERRORS         5
-#define IREQUESTS       51
+#define IREQUESTS       49
 
 #define CLIENT_REQ      1
 
@@ -164,22 +164,20 @@ struct tmask
 #define X_ChangeDeviceControl		35
 /* XI 1.5 */
 #define X_ListDeviceProperties          36
-#define X_QueryDeviceProperty           37
-#define X_ConfigureDeviceProperty       38
-#define X_ChangeDeviceProperty          39
-#define X_DeleteDeviceProperty          40
-#define X_GetDeviceProperty             41
+#define X_ChangeDeviceProperty          37
+#define X_DeleteDeviceProperty          38
+#define X_GetDeviceProperty             39
 /* XI 2 */
-#define X_QueryDevicePointer            42
-#define X_WarpDevicePointer             43
-#define X_ChangeDeviceCursor            44
-#define X_ChangeDeviceHierarchy         45
-#define X_ChangeWindowAccess            46
-#define X_QueryWindowAccess             47
-#define X_SetClientPointer              48
-#define X_GetClientPointer              49
-#define X_XiSelectEvent                 50
-#define X_ExtendedGrabDevice            51
+#define X_QueryDevicePointer            40
+#define X_WarpDevicePointer             41
+#define X_ChangeDeviceCursor            42
+#define X_ChangeDeviceHierarchy         43
+#define X_ChangeWindowAccess            44
+#define X_QueryWindowAccess             45
+#define X_SetClientPointer              46
+#define X_GetClientPointer              47
+#define X_XiSelectEvent                 48
+#define X_ExtendedGrabDevice            49
 
 /*********************************************************
  *
@@ -1475,55 +1473,6 @@ typedef struct {
 
 /*********************************************************
  *
- * QueryDeviceProperty.
- *
- */
-
-typedef struct {
-    CARD8       reqType;        /* input extension major opcode */
-    CARD8       ReqType;        /* always X_QueryDeviceProperty */
-    CARD16      length B16;
-    Atom        property B32;
-    CARD8       deviceid;
-    CARD8       pad0;
-    CARD16      pad1 B16;
-} xQueryDevicePropertyReq;
-
-typedef struct {
-    CARD8       repType;        /* X_Reply                        */
-    CARD8       RepType;        /* always X_QueryDeviceProperty */
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    BOOL        pending;
-    BOOL        range;
-    BOOL        immutable;
-    BOOL        fromClient;     /* TRUE if allocated by client */
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xQueryDevicePropertyReply;
-
-/*********************************************************
- *
- * ConfigureDeviceProperty.
- *
- */
-
-typedef struct {
-    CARD8       reqType;        /* input extension major opcode */
-    CARD8       ReqType;        /* always X_ConfigureDeviceProperty */
-    CARD16      length B16;
-    Atom        property B32;
-    CARD8       deviceid;
-    BOOL        pending;
-    BOOL        range;
-    CARD8       pad;
-} xConfigureDevicePropertyReq;
-
-/*********************************************************
- *
  * ChangeDeviceProperty.
  *
  */
@@ -1577,8 +1526,7 @@ typedef struct {
 #else
     BOOL        delete;
 #endif
-    BOOL        pending;
-    CARD8       pad;
+    CARD16      pad;
 } xGetDevicePropertyReq;
 
 typedef struct {