add GetClientPointer request and reply.

add GetPairedPointer request and reply.
move declaration of _XiGetDevicePresenceNotifyEvent out of the macro and wrap
it between extern "C". Otherwise C++ code won't be able to find it.

1 files changed, 59 insertions, 0 deletions

diff --git a/XIproto.h b/XIproto.h
index 3753bea..8905489 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -168,6 +168,8 @@ struct tmask
 #define X_ChangeWindowAccess            42
 #define X_QueryWindowAccess             43
 #define X_SetClientPointer              44
+#define X_GetClientPointer              45
+#define X_GetPairedPointer              46
 
 /*********************************************************
  *
@@ -1645,6 +1647,63 @@ typedef struct {
 
 /**********************************************************
  *
+ * GetClientPointer.
+ *
+ */
+typedef struct {
+    CARD8       reqType;
+    CARD8       ReqType;        /* Always X_GetClientPointer */
+    CARD16      length B16;
+    Window      win B32;
+} xGetClientPointerReq;
+
+typedef struct {
+    CARD8       repType;        /* input extension major opcode */
+    CARD8       RepType;        /* Always X_GetClientPointer */
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    BOOL        set;            /* client pointer is set */
+    CARD8       deviceid;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xGetClientPointerReply;
+
+/**********************************************************
+ *
+ * GetPairedPointer.
+ *
+ */
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       ReqType;        /* Always X_GetPairedPointer */
+    CARD16      length B16;
+    CARD8       deviceid;
+    CARD8       pad0;
+    CARD16      pad1 B16;
+} xGetPairedPointerReq;
+
+typedef struct {
+    CARD8       repType;        /* input extension major opcode */
+    CARD8       RepType;        /* Always X_GetClientPointer */
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    BOOL        paired;         /* keyboard is paired */
+    CARD8       deviceid;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xGetPairedPointerReply;
+
+/**********************************************************
+ *
  * Input extension events.
  *
  * DeviceValuator