fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-08 17:18:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use IsPointerDevice and IsKeyboardDevice.

Browse source
This commit is contained in:
David Reveman 2008-11-19 13:59:52 -05:00
parent f773f0d55b
commit d02da7afa1
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
hw/dmx/dmxinput.c
View file

@ -72,8 +72,11 @@ dmxUpdateKeycodeMap (DeviceIntPtr pDevice)
int width = src->mapWidth; int width = src->mapWidth;
int i; int i;
if (!pDevice->isMaster && pDevice->u.master && pDevice->u.master->key) if (!pDevice->isMaster && pDevice->u.master)
dst = &pDevice->u.master->key->curKeySyms; {
if (IsKeyboardDevice (pDevice->u.master))
dst = &pDevice->u.master->key->curKeySyms;
}
if (dst->mapWidth < width) if (dst->mapWidth < width)
width = dst->mapWidth; width = dst->mapWidth;
@ -193,7 +196,7 @@ dmxGetButtonDevice (DMXInputInfo *dmxInput,
{ {
dmxDevicePrivPtr pDevPriv = DMX_GET_DEVICE_PRIV (dmxInput->devs[i]); dmxDevicePrivPtr pDevPriv = DMX_GET_DEVICE_PRIV (dmxInput->devs[i]);
if (!dmxInput->devs[i]->button) if (!IsPointerDevice (dmxInput->devs[i]))
continue; continue;
if (deviceId >= 0) if (deviceId >= 0)
@ -479,7 +482,7 @@ dmxFakePointerGrab (DMXInputInfo *dmxInput)
if (!pDevice->isMaster && pDevice->u.master) if (!pDevice->isMaster && pDevice->u.master)
pDevice = pDevice->u.master; pDevice = pDevice->u.master;
if (!pDevice->button) if (!IsPointerDevice (pDevice))
continue; continue;
newGrab.device = pDevice; newGrab.device = pDevice;
@ -503,7 +506,7 @@ dmxReleaseFakePointerGrab (DMXInputInfo *dmxInput)
if (!pDevice->isMaster && pDevice->u.master) if (!pDevice->isMaster && pDevice->u.master)
pDevice = pDevice->u.master; pDevice = pDevice->u.master;
if (!pDevice->button) if (!IsPointerDevice (pDevice))
continue; continue;
dmxDeactivateFakeGrab (pDevice); dmxDeactivateFakeGrab (pDevice);
@ -543,7 +546,7 @@ dmxFakeKeyboardGrab (DMXInputInfo *dmxInput)
if (!pDevice->isMaster && pDevice->u.master) if (!pDevice->isMaster && pDevice->u.master)
pDevice = pDevice->u.master; pDevice = pDevice->u.master;
if (!pDevice->key) if (!IsKeyboardDevice (pDevice))
continue; continue;
newGrab.device = pDevice; newGrab.device = pDevice;
@ -567,7 +570,7 @@ dmxReleaseFakeKeyboardGrab (DMXInputInfo *dmxInput)
if (!pDevice->isMaster && pDevice->u.master) if (!pDevice->isMaster && pDevice->u.master)
pDevice = pDevice->u.master; pDevice = pDevice->u.master;
if (!pDevice->key) if (!IsKeyboardDevice (pDevice))
continue; continue;
dmxDeactivateFakeGrab (pDevice); dmxDeactivateFakeGrab (pDevice);
@ -588,7 +591,7 @@ dmxFakeMotion (DMXInputInfo *dmxInput,
{ {
DeviceIntPtr pDevice = dmxInput->devs[i]; DeviceIntPtr pDevice = dmxInput->devs[i];
if (!pDevice->button) if (!IsPointerDevice (pDevice))
continue; continue;
dmxUpdateSpritePosition (pDevice, x, y); dmxUpdateSpritePosition (pDevice, x, y);
@ -1550,7 +1553,7 @@ dmxInputGrabKeyboard (DMXInputInfo *dmxInput,
if (pExtDevice->u.master != pDevice) if (pExtDevice->u.master != pDevice)
continue; continue;
if (!pExtDevice->key) if (!IsKeyboardDevice (pExtDevice))
continue; continue;
dmxDeviceGrabKeyboard (pExtDevice, pWindow); dmxDeviceGrabKeyboard (pExtDevice, pWindow);
@ -1571,7 +1574,7 @@ dmxInputUngrabKeyboard (DMXInputInfo *dmxInput,
if (pExtDevice->u.master != pDevice) if (pExtDevice->u.master != pDevice)
continue; continue;
if (!pExtDevice->key) if (!IsKeyboardDevice (pExtDevice))
continue; continue;
dmxDeviceUngrabKeyboard (pExtDevice); dmxDeviceUngrabKeyboard (pExtDevice);
@ -1594,7 +1597,7 @@ dmxInputGrabPointer (DMXInputInfo *dmxInput,
if (pExtDevice->u.master != pDevice) if (pExtDevice->u.master != pDevice)
continue; continue;
if (!pExtDevice->button) if (!IsPointerDevice (pExtDevice))
continue; continue;
dmxDeviceGrabPointer (pExtDevice, dmxDeviceGrabPointer (pExtDevice,
@ -1618,7 +1621,7 @@ dmxInputUngrabPointer (DMXInputInfo *dmxInput,
if (pExtDevice->u.master != pDevice) if (pExtDevice->u.master != pDevice)
continue; continue;
if (!pExtDevice->button) if (!IsPointerDevice (pExtDevice))
continue; continue;
dmxDeviceUngrabPointer (pExtDevice); dmxDeviceUngrabPointer (pExtDevice);
@ -1642,7 +1645,7 @@ dmxInputWarpPointer (DMXInputInfo *dmxInput,
if (pExtDevice->u.master != pDevice) if (pExtDevice->u.master != pDevice)
continue; continue;
if (!pExtDevice->button) if (!IsPointerDevice (pExtDevice))
continue; continue;
if (!pDevPriv->active) if (!pDevPriv->active)
@ -2229,9 +2232,9 @@ dmxInputDisable (DMXInputInfo *dmxInput)
dmxLogInput (dmxInput, "Disable device id %d: %s\n", dmxLogInput (dmxInput, "Disable device id %d: %s\n",
dmxInput->devs[i]->id, dmxInput->devs[i]->name); dmxInput->devs[i]->id, dmxInput->devs[i]->name);
if (dmxInput->devs[i]->key) if (IsKeyboardDevice (dmxInput->devs[i]))
dmxUpdateKeyState (dmxInput->devs[i], state); dmxUpdateKeyState (dmxInput->devs[i], state);
else if (dmxInput->devs[i]->button) else if (IsPointerDevice (dmxInput->devs[i]))
dmxUpdateButtonState (dmxInput->devs[i], state); dmxUpdateButtonState (dmxInput->devs[i], state);
DisableDevice (dmxInput->devs[i]); DisableDevice (dmxInput->devs[i]);