diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-20 15:28:16 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-22 15:44:50 +1000 |
commit | b12d302df8283186ce87882c29b2b0294adb2770 (patch) | |
tree | 7b2f4ce175d1a1aec64a354b922429b50dcc8bde /Xext | |
parent | add2defac7e59dcb355e5ba12b6de60861741d57 (diff) |
Input: rename DeviceIntRec->isMaster to ->type.
isMaster is not enough as long as we differ between master pointers and
keyboard. With flexible device classes, the usual checks for whether a
master device is a pointer (currently check for ->button, ->valuators or
->key) do not work as an SD may post an event through a master and mess this
check up.
Example, a device with valuators but no buttons would remove the button
class from the VCP and thus result in the
IsPointerDevice(inputInfo.pointer) == FALSE.
This will become worse in the future when new device classes are introduced
that aren't provided in the current system (e.g. a switch class).
This patch replaces isMaster with "type", one of SLAVE, MASTER_POINTER and
MASTER_KEYBOARD. All checks for dev->isMaster are replaced with an
IsMaster(dev).
Diffstat (limited to 'Xext')
-rw-r--r-- | Xext/xtest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/xtest.c b/Xext/xtest.c index 96380b769..32abe2a81 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -303,7 +303,7 @@ ProcXTestFakeInput(ClientPtr client) * virtual test device. */ for(it = inputInfo.devices; it ; it = it->next ) - if( !it->isMaster && it->u.master == dev && + if( !IsMaster(it) && it->u.master == dev && dixLookupPrivate(&it->devPrivates, XTstDevicePrivateKey )) break; dev= it; |