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

dix: pass the flags into the CreateClassesChangedEvent 

No effective functional changes, prep work for future patches.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-10-18 17:47:59 +10:00
parent fcdd2587a1
commit e9dee21fa3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/getevents.c
View File

@ -209,7 +209,7 @@ void
CreateClassesChangedEvent(InternalEvent* event, CreateClassesChangedEvent(InternalEvent* event,
DeviceIntPtr master, DeviceIntPtr master,
DeviceIntPtr slave, DeviceIntPtr slave,
int type) int flags)
{ {
int i; int i;
DeviceChangedEvent *dce; DeviceChangedEvent *dce;
@ -223,8 +223,7 @@ CreateClassesChangedEvent(InternalEvent* event,
dce->length = sizeof(DeviceChangedEvent); dce->length = sizeof(DeviceChangedEvent);
dce->type = ET_DeviceChanged; dce->type = ET_DeviceChanged;
dce->time = ms; dce->time = ms;
dce->flags = type; dce->flags = flags;
dce->flags |= DEVCHANGE_SLAVE_SWITCH;
dce->sourceid = slave->id; dce->sourceid = slave->id;
if (slave->button) if (slave->button)
@ -674,7 +673,7 @@ UpdateFromMaster(InternalEvent* events, DeviceIntPtr dev, int type, int *num_eve
if (master && master->last.slave != dev) if (master && master->last.slave != dev)
{ {
CreateClassesChangedEvent(events, master, dev, type); CreateClassesChangedEvent(events, master, dev, type | DEVCHANGE_SLAVE_SWITCH);
if (IsPointerDevice(master)) if (IsPointerDevice(master))
{ {
updateSlaveDeviceCoords(master, dev); updateSlaveDeviceCoords(master, dev);

3
include/input.h
View File

@ -427,7 +427,8 @@ extern _X_EXPORT void FreeEventList(InternalEvent *list, int num_events);
extern void CreateClassesChangedEvent(InternalEvent *event, extern void CreateClassesChangedEvent(InternalEvent *event,
DeviceIntPtr master, DeviceIntPtr master,
DeviceIntPtr slave, DeviceIntPtr slave,
int type); int flags);
extern InternalEvent * UpdateFromMaster( extern InternalEvent * UpdateFromMaster(
InternalEvent *events, InternalEvent *events,
DeviceIntPtr pDev, DeviceIntPtr pDev,