diff options
| author | Keith Packard <keithp@keithp.com> | 2010-06-07 14:23:47 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-07 19:56:47 -0700 |
| commit | 8e97e5f9425639ad0a084150d0b232cad417595d (patch) | |
| tree | d644dd9e88086a860e892a2652bdefc1f58dc7bc /include | |
| parent | fdb081b430ddffb495aa5b05bcc4cf10882ff4b2 (diff) | |
If XTest is always required, then eliminate the XTest devPrivate
The internals of XTest are used by Xi and Xkb, and both Xi and Xkb are
always required, so it makes little sense to have XTest place data in
a devPrivate, especially a devPrivate which is only available when the
XTest extension is enabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 1 | ||||
| -rw-r--r-- | include/inputstr.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/input.h b/include/input.h index 3b29855f1..c68a28441 100644 --- a/include/input.h +++ b/include/input.h @@ -237,7 +237,6 @@ extern int key_is_down(DeviceIntPtr pDev, int key_code, int type); extern void InitCoreDevices(void); extern void InitXTestDevices(void); -extern Bool XTestInitPrivates(void); extern _X_EXPORT DeviceIntPtr AddInputDevice( ClientPtr /*client*/, diff --git a/include/inputstr.h b/include/inputstr.h index a83e863be..1b504e939 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -554,6 +554,9 @@ typedef struct _DeviceIntRec { /* coordinate transformation matrix for absolute input devices */ struct pixman_f_transform transform; + + /* XTest related master device id */ + int xtest_master_id; } DeviceIntRec; typedef struct { |