summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-08 21:39:20 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-31 16:32:18 +1030
commit90a86701e3b9feafa05f44649a8314f06285fab5 (patch)
tree56d567545af0979914600a5d59f8dacde6f31d76
parent36c8a6f3faf56a8f8ca31455812c9132b379b1b3 (diff)
Remove window access protocol requests.
This is a bad idea. It didn't provide security and you can get the same functionality as you did with normal event registration.
-rw-r--r--XI.h17
-rw-r--r--XIproto.h60
2 files changed, 4 insertions, 73 deletions
diff --git a/XI.h b/XI.h
index 63acb3e..a95945b 100644
--- a/XI.h
+++ b/XI.h
@@ -117,9 +117,6 @@ SOFTWARE.
#define sz_xWarpDevicePointerReq 28
#define sz_xChangeDeviceCursorReq 16
#define sz_xChangeDeviceHierarchyReq 8
-#define sz_xChangeWindowAccessReq 12
-#define sz_xQueryWindowAccessReq 8
-#define sz_xQueryWindowAccessReply 32
#define sz_xSetClientPointerReq 12
#define sz_xGetClientPointerReq 8
#define sz_xGetClientPointerReply 32
@@ -280,20 +277,6 @@ SOFTWARE.
#define _deviceEnter 0
#define _deviceLeave 1
-/* Flags for ChangeWindowAccess defaultRule. Pick one. */
-#define WindowAccessNoRule 0
-#define WindowAccessKeepRule 1
-#define WindowAccessDenyAll 2
-#define WindowAccessAllowAll 3
-
-/* Flags for ChangeWindowAccess. */
-#define WindowAccessClearNone 0
-#define WindowAccessClearPerm (1)
-#define WindowAccessClearDeny (1 << 1)
-#define WindowAccessClearRule (1 << 2)
-#define WindowAccessClearAll \
- WindowAccessClearPerm | WindowAccessClearDeny | WindowAccessClearRule
-
/* Device presence notify states */
#define DeviceAdded 0
#define DeviceRemoved 1
diff --git a/XIproto.h b/XIproto.h
index f167f1c..72684dc 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -173,12 +173,10 @@ struct tmask
#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
+#define X_SetClientPointer 44
+#define X_GetClientPointer 45
+#define X_XiSelectEvent 46
+#define X_ExtendedGrabDevice 47
/*********************************************************
*
@@ -1679,56 +1677,6 @@ typedef struct {
} xChangeAttachmentInfo;
-/**********************************************************
- *
- * ChangeWindowAccess.
- *
- */
-
-typedef struct {
- CARD8 reqType; /* input extension major opcode */
- CARD8 ReqType; /* Always X_ChangeWindowAccess */
- CARD16 length B16;
- Window win B32;
- CARD8 npermit; /* number of devices for permit rule */
- CARD8 ndeny; /* number of devices for deny rule */
- CARD8 defaultRule; /* default rule */
- CARD8 clear; /* WindowAccessClearPerm,
- WindowAccessClearDeny,
- WindowAccessClearRule,
- WindowAccessClearAll */
-} xChangeWindowAccessReq;
-
-/**********************************************************
- *
- * QueryWindowAccess
- *
- */
-
-typedef struct {
- CARD8 reqType; /* input extension major code */
- CARD8 ReqType; /* always X_QueryWindowAccess */
- CARD16 length B16;
- Window win B32;
-} xQueryWindowAccessReq;
-
-typedef struct {
- CARD8 repType; /* input extension major opcode */
- CARD8 RepType; /* Always X_QueryWindowAccess */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD8 defaultRule; /* default rule setting */
- CARD8 npermit; /* number of devices in permit */
- CARD8 ndeny; /* number of devices in deny */
- CARD8 pad0;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xQueryWindowAccessReply;
-
-
/**********************************************************
*