diff options
| -rw-r--r-- | Xext/xtest.c | 142 | ||||
| -rw-r--r-- | dix/devices.c | 133 | ||||
| -rw-r--r-- | include/input.h | 1 |
3 files changed, 144 insertions, 132 deletions
diff --git a/Xext/xtest.c b/Xext/xtest.c index c96cbf5c7..6c59952b4 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -32,6 +32,7 @@ #include <X11/X.h> #include <X11/Xproto.h> +#include <X11/Xatom.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -49,6 +50,8 @@ #include <X11/extensions/XIproto.h> #include "exglobals.h" #include "mipointer.h" +#include "xserver-properties.h" +#include "exevents.h" #include "modinit.h" @@ -59,6 +62,22 @@ extern int DeviceValuator; * other's memory */ static EventListPtr xtest_evlist; +/* Used to store if a device is an XTest Virtual device */ +static int XTstDevicePrivateKeyIndex; +DevPrivateKey XTstDevicePrivateKey = &XTstDevicePrivateKeyIndex; + +/** + * vxtstpointer + * is the virtual pointer for XTest. It is the first slave + * device of the VCP. + * vxtstkeyboard + * is the virtual keyboard for XTest. It is the first slave + * device of the VCK + * + * Neither of these devices can be deleted. + */ +DeviceIntPtr vxtstpointer, vxtstkeyboard; + #ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" @@ -564,3 +583,126 @@ SProcXTestDispatch (ClientPtr client) return BadRequest; } } + +/** + * Allocate an virtual slave device for xtest events, this + * is a slave device to inputInfo master devices + */ +void InitXTestDevices(void) +{ + if(AllocXtstDevice(serverClient, "Virtual core", + &vxtstpointer, &vxtstkeyboard, + inputInfo.pointer, inputInfo.keyboard) != Success) + FatalError("Failed to allocate XTst devices"); + + if (ActivateDevice(vxtstpointer, TRUE) != Success || + ActivateDevice(vxtstkeyboard, TRUE) != Success) + FatalError("Failed to activate xtst core devices."); + if (!EnableDevice(vxtstpointer, TRUE) || + !EnableDevice(vxtstkeyboard, TRUE)) + FatalError("Failed to enable xtst core devices."); + + AttachDevice(NULL, vxtstpointer, inputInfo.pointer); + AttachDevice(NULL, vxtstkeyboard, inputInfo.keyboard); +} + +/** + * Don't allow changing the Xtst property. + */ +static int +DeviceSetXtstProperty(DeviceIntPtr dev, Atom property, + XIPropertyValuePtr prop, BOOL checkonly) +{ + if (property == XIGetKnownProperty(XI_PROP_XTST_DEVICE)) + return BadAccess; + + return Success; +} + +/** + * Allocate a device pair that is initialised as a slave + * device with properties that identify the devices as belonging + * to XTest subsystem. + * This only creates the pair, Activate/Enable Device + * still need to be called. + */ +int AllocXtstDevice (ClientPtr client, char* name, + DeviceIntPtr* ptr, DeviceIntPtr* keybd, + DeviceIntPtr master_ptr, DeviceIntPtr master_keybd) +{ + int retval; + int len = strlen(name); + char *xtstname = xcalloc(len + 6, 1 ); + char dummy = 1; + + strncpy( xtstname, name, len); + strncat( xtstname, " Xtst", 5 ); + + retval = AllocDevicePair( client, xtstname, ptr, keybd, CorePointerProc, CoreKeyboardProc, FALSE); + if ( retval == Success ){ + dixSetPrivate(&((*ptr)->devPrivates), XTstDevicePrivateKey, (void *)master_ptr->id); + dixSetPrivate(&((*keybd)->devPrivates), XTstDevicePrivateKey, (void *)master_keybd->id); + } + + xfree( xtstname ); + + XIChangeDeviceProperty(*ptr, XIGetKnownProperty(XI_PROP_XTST_DEVICE), + XA_INTEGER, 8, PropModeReplace, 1, &dummy, + FALSE); + XISetDevicePropertyDeletable(*ptr, XIGetKnownProperty(XI_PROP_XTST_DEVICE), FALSE); + XIRegisterPropertyHandler(*ptr, DeviceSetXtstProperty, NULL, NULL); + XIChangeDeviceProperty(*keybd, XIGetKnownProperty(XI_PROP_XTST_DEVICE), + XA_INTEGER, 8, PropModeReplace, 1, &dummy, + FALSE); + XISetDevicePropertyDeletable(*keybd, XIGetKnownProperty(XI_PROP_XTST_DEVICE), FALSE); + XIRegisterPropertyHandler(*keybd, DeviceSetXtstProperty, NULL, NULL); + + return retval; +} + +/** + * If master is NULL, return TRUE if the given device is an xtest device or + * FALSE otherwise. + * If master is not NULL, return TRUE if the given device is this master's + * xtest device. + */ +BOOL +IsXtstDevice(DeviceIntPtr dev, DeviceIntPtr master) +{ + int is_xtst = FALSE; + int mid; + void *tmp; /* shut up, gcc! */ + + if (IsMaster(dev)) + return is_xtst; + + tmp = dixLookupPrivate(&dev->devPrivates, XTstDevicePrivateKey); + mid = (int)tmp; + + /* deviceid 0 is reserved for XIAllDevices, non-zero mid means xtst + * device */ + if ((!master && mid) || + (master && mid == master->id)) + is_xtst = TRUE; + + return is_xtst; +} + +/** + * @return The X Test virtual device for the given master. + */ +DeviceIntPtr +GetXtstDevice(DeviceIntPtr master) +{ + DeviceIntPtr it; + + for (it = inputInfo.devices; it; it = it->next) + { + if (IsXtstDevice(it, master)) + return it; + } + + /* This only happens if master is a slave device. don't do that */ + return NULL; +} + diff --git a/dix/devices.c b/dix/devices.c index f61136c27..16e8987a2 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -94,21 +94,7 @@ DevPrivateKey CoreDevicePrivateKey = &CoreDevicePrivateKeyIndex; /* Used to store classes currently not in use by an MD */ static int UnusedClassesPrivateKeyIndex; DevPrivateKey UnusedClassesPrivateKey = &UnusedClassesPrivateKeyIndex; -/* Used to store if a device is an XTest Virtual device */ -static int XTstDevicePrivateKeyIndex; -DevPrivateKey XTstDevicePrivateKey = &XTstDevicePrivateKeyIndex; -/** - * vxtstpointer - * is the virtual pointer for XTest. It is the first slave - * device of the VCP. - * vxtstkeyboard - * is the virtual keyboard for XTest. It is the first slave - * device of the VCK - * - * Neither of these devices can be deleted. - */ -DeviceIntPtr vxtstpointer, vxtstkeyboard; static void RecalculateMasterButtons(DeviceIntPtr slave); @@ -638,24 +624,7 @@ InitCoreDevices(void) !EnableDevice(inputInfo.keyboard, TRUE)) FatalError("Failed to enable core devices."); - /* - Allocate an virtual slave device for xtest events, this - is a slave device to inputInfo master devices - */ - if(AllocXtstDevice(serverClient, "Virtual core", - &vxtstpointer, &vxtstkeyboard, - inputInfo.pointer, inputInfo.keyboard) != Success) - FatalError("Failed to allocate XTst devices"); - - if (ActivateDevice(vxtstpointer, TRUE) != Success || - ActivateDevice(vxtstkeyboard, TRUE) != Success) - FatalError("Failed to activate xtst core devices."); - if (!EnableDevice(vxtstpointer, TRUE) || - !EnableDevice(vxtstkeyboard, TRUE)) - FatalError("Failed to enable xtst core devices."); - - AttachDevice(NULL, vxtstpointer, inputInfo.pointer); - AttachDevice(NULL, vxtstkeyboard, inputInfo.keyboard); + InitXTestDevices(); } /** @@ -2559,103 +2528,3 @@ AllocDevicePair (ClientPtr client, char* name, return Success; } -/** - * Don't allow changing the Xtst property. - */ -static int -DeviceSetXtstProperty(DeviceIntPtr dev, Atom property, - XIPropertyValuePtr prop, BOOL checkonly) -{ - if (property == XIGetKnownProperty(XI_PROP_XTST_DEVICE)) - return BadAccess; - - return Success; -} - -/** - * Allocate a device pair that is initialised as a slave - * device with properties that identify the devices as belonging - * to XTest subsystem. - * This only creates the pair, Activate/Enable Device - * still need to be called. - */ -int AllocXtstDevice (ClientPtr client, char* name, - DeviceIntPtr* ptr, DeviceIntPtr* keybd, - DeviceIntPtr master_ptr, DeviceIntPtr master_keybd) -{ - int retval; - int len = strlen(name); - char *xtstname = xcalloc(len + 6, 1 ); - char dummy = 1; - - strncpy( xtstname, name, len); - strncat( xtstname, " Xtst", 5 ); - - retval = AllocDevicePair( client, xtstname, ptr, keybd, CorePointerProc, CoreKeyboardProc, FALSE); - if ( retval == Success ){ - dixSetPrivate(&((*ptr)->devPrivates), XTstDevicePrivateKey, (void *)master_ptr->id); - dixSetPrivate(&((*keybd)->devPrivates), XTstDevicePrivateKey, (void *)master_keybd->id); - } - - xfree( xtstname ); - - XIChangeDeviceProperty(*ptr, XIGetKnownProperty(XI_PROP_XTST_DEVICE), - XA_INTEGER, 8, PropModeReplace, 1, &dummy, - FALSE); - XISetDevicePropertyDeletable(*ptr, XIGetKnownProperty(XI_PROP_XTST_DEVICE), FALSE); - XIRegisterPropertyHandler(*ptr, DeviceSetXtstProperty, NULL, NULL); - XIChangeDeviceProperty(*keybd, XIGetKnownProperty(XI_PROP_XTST_DEVICE), - XA_INTEGER, 8, PropModeReplace, 1, &dummy, - FALSE); - XISetDevicePropertyDeletable(*keybd, XIGetKnownProperty(XI_PROP_XTST_DEVICE), FALSE); - XIRegisterPropertyHandler(*keybd, DeviceSetXtstProperty, NULL, NULL); - - return retval; -} - -/** - * If master is NULL, return TRUE if the given device is an xtest device or - * FALSE otherwise. - * If master is not NULL, return TRUE if the given device is this master's - * xtest device. - */ -BOOL -IsXtstDevice(DeviceIntPtr dev, DeviceIntPtr master) -{ - int is_xtst = FALSE; - int mid; - void *tmp; /* shut up, gcc! */ - - if (IsMaster(dev)) - return is_xtst; - - tmp = dixLookupPrivate(&dev->devPrivates, XTstDevicePrivateKey); - mid = (int)tmp; - - /* deviceid 0 is reserved for XIAllDevices, non-zero mid means xtst - * device */ - if ((!master && mid) || - (master && mid == master->id)) - is_xtst = TRUE; - - return is_xtst; -} - -/** - * @return The X Test virtual device for the given master. - */ -DeviceIntPtr -GetXtstDevice(DeviceIntPtr master) -{ - DeviceIntPtr it; - - for (it = inputInfo.devices; it; it = it->next) - { - if (IsXtstDevice(it, master)) - return it; - } - - /* This only happens if master is a slave device. don't do that */ - return NULL; -} - diff --git a/include/input.h b/include/input.h index d003472eb..34e1c69b3 100644 --- a/include/input.h +++ b/include/input.h @@ -220,6 +220,7 @@ extern void set_key_up(DeviceIntPtr pDev, int key_code, int type); extern int key_is_down(DeviceIntPtr pDev, int key_code, int type); extern void InitCoreDevices(void); +extern void InitXTestDevices(void); extern _X_EXPORT DeviceIntPtr AddInputDevice( ClientPtr /*client*/, |