From 903c3db1d1685bd855dceed9e7b92890743663e1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Aug 2009 09:48:00 +1000 Subject: 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 " XTEST device". The default xtest devices become "Virtual core XTEST pointer" and "Virtual core XTEST keyboard". Signed-off-by: Peter Hutterer --- include/input.h | 6 +++--- include/xserver-properties.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') 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 */ -- cgit v1.2.3