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

xfree86: use SendDevicePresenceEvents instead of manual event handling. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-09-17 16:01:29 +10:00
parent d044027510
commit ec0ad408ef
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/devices.c
View File

@ -246,7 +246,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
return dev; return dev;
} }
static void void
SendDevicePresenceEvent(int deviceid, int type) SendDevicePresenceEvent(int deviceid, int type)
{ {
DeviceIntRec dummyDev; DeviceIntRec dummyDev;

9
hw/xfree86/common/xf86Xinput.c
View File

@ -1082,14 +1082,7 @@ xf86DisableDevice(DeviceIntPtr dev, Bool panic)
DisableDevice(dev, TRUE); DisableDevice(dev, TRUE);
} else } else
{ {
ev.type = DevicePresenceNotify; SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);
ev.time = currentTime.milliseconds;
ev.devchange = DeviceUnrecoverable;
ev.deviceid = dev->id;
dummyDev.id = 0;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1);
DeleteInputDeviceRequest(dev); DeleteInputDeviceRequest(dev);
} }
} }

1
include/input.h
View File

@ -503,6 +503,7 @@ extern int AllocXTestDevice(ClientPtr client,
DeviceIntPtr master_keybd); DeviceIntPtr master_keybd);
extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master); extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master);
extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master); extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master);
extern void SendDevicePresenceEvent(int deviceid, int type);
/* misc event helpers */ /* misc event helpers */
extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event); extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);