Add effective group and modifiers to XIGroupInfo/XIModifierInfo.

Effective modifiers are easy to calculate but let's send them down the wire
nonetheless. Effective group is slightly more complicated since group
wrapping must be taken into account - sending it down the wire simplifies
clients.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/XI2proto.h b/XI2proto.h
index 19ed901..b7b118b 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -236,6 +236,7 @@ typedef struct
     uint32_t    base_mods;              /**< Logically pressed modifiers */
     uint32_t    latched_mods;           /**< Logically latched modifiers */
     uint32_t    locked_mods;            /**< Logically locked modifiers */
+    uint32_t    effective_mods;         /**< Effective modifiers */
 } xXIModifierInfo;
 
 /**
@@ -248,7 +249,7 @@ typedef struct
     uint8_t     base_group;             /**< Logically "pressed" group */
     uint8_t     latched_group;          /**< Logically latched group */
     uint8_t     locked_group;           /**< Logically locked group */
-    uint8_t     pad0;
+    uint8_t     effective_group;        /**< Effective group */
 } xXIGroupInfo;
 
 
@@ -393,7 +394,7 @@ typedef struct {
     xXIModifierInfo mods;
     xXIGroupInfo group;
 } xXIQueryPointerReply;
-#define sz_xXIQueryPointerReply                 52
+#define sz_xXIQueryPointerReply                 56
 
 /**
  * @struct xXIWarpPointerReq