mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-04 22:36:10 +00:00
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).
This commit is contained in:
parent
add2defac7
commit
b12d302df8
23 changed files with 135 additions and 122 deletions
|
|
@ -325,7 +325,7 @@ AllocateMotionHistory(DeviceIntPtr pDev)
|
|||
* potential valuators, plus the respective range of the valuators.
|
||||
* 3 * INT32 for (min_val, max_val, curr_val))
|
||||
*/
|
||||
if (pDev->isMaster)
|
||||
if (IsMaster(pDev))
|
||||
size = sizeof(INT32) * 3 * MAX_VALUATORS;
|
||||
else
|
||||
size = sizeof(INT32) * pDev->valuator->numAxes;
|
||||
|
|
@ -369,7 +369,7 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
|
|||
if (core && !pScreen)
|
||||
return 0;
|
||||
|
||||
if (pDev->isMaster)
|
||||
if (IsMaster(pDev))
|
||||
size = (sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(Time);
|
||||
else
|
||||
size = (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);
|
||||
|
|
@ -421,7 +421,7 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
|
|||
coord = rescaleValuatorAxis(coord, &from, to, pScreen->height);
|
||||
memcpy(corebuf, &coord, sizeof(INT16));
|
||||
|
||||
} else if (pDev->isMaster)
|
||||
} else if (IsMaster(pDev))
|
||||
{
|
||||
memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */
|
||||
|
||||
|
|
@ -497,7 +497,7 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
|
|||
return;
|
||||
|
||||
v = pDev->valuator;
|
||||
if (pDev->isMaster)
|
||||
if (IsMaster(pDev))
|
||||
{
|
||||
buff += ((sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(CARD32)) *
|
||||
v->last_motion;
|
||||
|
|
|
|||
Loading…
Reference in a new issue