diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-08-24 09:48:00 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-08-27 14:24:51 +1000 |
| commit | 903c3db1d1685bd855dceed9e7b92890743663e1 (patch) | |
| tree | 7a89f7e26ccad43c924042a1037a9a1cfb9234d5 /include | |
| parent | 8bfd23e144e51401e3756de9260a4811fcc59e91 (diff) | |
Xext: rename Xtst* to XTest*
This patch corrects a misnaming of XTest-related functions.
The extension itself announces itself as XTEST. Xtst is the library name
itself, but all library functions are prefixed by XTest. Same with the
naming in the server.
- Rename all *Xtst* functions to *XTest* for consistency with the library
and in-server API.
- Rename the "Xtst device" property to "XTEST device" for consistency with
the extension naming.
- Rename the device naming to "<master device name> XTEST device". The
default xtest devices become "Virtual core XTEST pointer" and "Virtual
core XTEST keyboard".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 6 | ||||
| -rw-r--r-- | include/xserver-properties.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/input.h b/include/input.h index 34e1c69b3..548e58ca6 100644 --- a/include/input.h +++ b/include/input.h @@ -495,14 +495,14 @@ extern int generate_modkeymap(ClientPtr client, DeviceIntPtr dev, KeyCode **modkeymap, int *max_keys_per_mod); extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map, int max_keys_per_mod); -extern int AllocXtstDevice(ClientPtr client, +extern int AllocXTestDevice(ClientPtr client, char* name, DeviceIntPtr* ptr, DeviceIntPtr* keybd, DeviceIntPtr master_ptr, DeviceIntPtr master_keybd); -extern BOOL IsXtstDevice(DeviceIntPtr dev, DeviceIntPtr master); -extern DeviceIntPtr GetXtstDevice(DeviceIntPtr master); +extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master); +extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master); /* misc event helpers */ extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event); diff --git a/include/xserver-properties.h b/include/xserver-properties.h index 0f18dbc45..626d0ad27 100644 --- a/include/xserver-properties.h +++ b/include/xserver-properties.h @@ -32,8 +32,8 @@ /* BOOL. 0 - device disabled, 1 - device enabled */ #define XI_PROP_ENABLED "Device Enabled" -/* BOOL. If present, device is a virtual Xtst device */ -#define XI_PROP_XTST_DEVICE "Xtst Device" +/* BOOL. If present, device is a virtual XTEST device */ +#define XI_PROP_XTEST_DEVICE "XTEST Device" /* Pointer acceleration properties */ /* INTEGER of any format */ |