mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-05 15:32:49 +00:00
Xext: purge XGE event masks.
The masks were originally designed to generically handle event masks for extensions. Since all that is in-server anyway, it's much better writing custom event masks for those extensions that need it and not providing a unified mechanism. XI2 needs more than the current implementation, which is already too complex for most other extensions. good riddance. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
@@ -611,16 +611,4 @@ extern _X_EXPORT ClientPtr LookupClient(
|
||||
XID id,
|
||||
ClientPtr client);
|
||||
|
||||
/* GE stuff */
|
||||
extern _X_EXPORT void SetGenericFilter(int extension, Mask* filters);
|
||||
extern _X_EXPORT int ExtGrabDevice(ClientPtr client,
|
||||
DeviceIntPtr dev,
|
||||
int device_mode,
|
||||
WindowPtr grabWindow,
|
||||
WindowPtr confineTo,
|
||||
TimeStamp ctime,
|
||||
Bool ownerEvents,
|
||||
CursorPtr cursor,
|
||||
Mask xi_mask,
|
||||
GenericMaskPtr ge_masks);
|
||||
#endif /* DIX_H */
|
||||
|
||||
@@ -175,7 +175,6 @@ typedef struct _GrabRec {
|
||||
CursorPtr cursor; /* always NULL for keyboards */
|
||||
Mask eventMask;
|
||||
Mask deviceMask;
|
||||
GenericMaskPtr genericMasks;
|
||||
} GrabRec;
|
||||
|
||||
typedef struct _KeyClassRec {
|
||||
|
||||
@@ -79,16 +79,6 @@ typedef struct _DevCursorNode {
|
||||
struct _DevCursorNode* next;
|
||||
} DevCursNodeRec, *DevCursNodePtr, *DevCursorList;
|
||||
|
||||
/* Mask structure for GE extension as stored on the window.
|
||||
* Allows one mask per extension.
|
||||
* .eventMask - Summary mask for all clients, used for quick checking.
|
||||
* .geClients - list of clients with their specific mask.
|
||||
*/
|
||||
typedef struct _GenericClientMasks {
|
||||
Mask eventMasks[MAXEXTENSIONS];
|
||||
GenericMaskPtr geClients;
|
||||
} GenericClientMasksRec, *GenericClientMasksPtr;
|
||||
|
||||
typedef struct _WindowOpt {
|
||||
VisualID visual; /* default: same as parent */
|
||||
CursorPtr cursor; /* default: window.cursorNone */
|
||||
@@ -105,7 +95,6 @@ typedef struct _WindowOpt {
|
||||
RegionPtr inputShape; /* default: NULL */
|
||||
struct _OtherInputMasks *inputMasks; /* default: NULL */
|
||||
DevCursorList deviceCursors; /* default: NULL */
|
||||
struct _GenericClientMasks *geMasks; /* default: NULL */
|
||||
} WindowOptRec, *WindowOptPtr;
|
||||
|
||||
#define BackgroundPixel 2L
|
||||
|
||||
Reference in New Issue
Block a user