frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: don't treat VCK/VCP separately in DevHasCursor, IsPointer/KeyboardDevice.

This commit is contained in:
Peter Hutterer 2007-10-16 15:07:31 +09:30
parent e9f149fb56
commit c7b878b904
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/events.c
View File

@ -322,7 +322,7 @@ XItoCoreType(int xitype)
_X_EXPORT Bool _X_EXPORT Bool
DevHasCursor(DeviceIntPtr pDev) DevHasCursor(DeviceIntPtr pDev)
{ {
return (pDev != inputInfo.pointer && pDev->spriteInfo->spriteOwner); return pDev->spriteInfo->spriteOwner;
} }
/* /*
@ -332,7 +332,7 @@ DevHasCursor(DeviceIntPtr pDev)
_X_EXPORT Bool _X_EXPORT Bool
IsPointerDevice(DeviceIntPtr dev) IsPointerDevice(DeviceIntPtr dev)
{ {
return ((dev->valuator && dev->button) || dev == inputInfo.pointer); return (dev->valuator && dev->button);
} }
/* /*
@ -342,7 +342,7 @@ IsPointerDevice(DeviceIntPtr dev)
_X_EXPORT Bool _X_EXPORT Bool
IsKeyboardDevice(DeviceIntPtr dev) IsKeyboardDevice(DeviceIntPtr dev)
{ {
return ((dev->key && dev->kbdfeed) || dev == inputInfo.keyboard); return (dev->key && dev->kbdfeed);
} }
#ifdef XEVIE #ifdef XEVIE