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:
parent
fcdd2587a1
commit
e9dee21fa3
|
@ -209,7 +209,7 @@ void
|
|||
CreateClassesChangedEvent(InternalEvent* event,
|
||||
DeviceIntPtr master,
|
||||
DeviceIntPtr slave,
|
||||
int type)
|
||||
int flags)
|
||||
{
|
||||
int i;
|
||||
DeviceChangedEvent *dce;
|
||||
|
@ -223,8 +223,7 @@ CreateClassesChangedEvent(InternalEvent* event,
|
|||
dce->length = sizeof(DeviceChangedEvent);
|
||||
dce->type = ET_DeviceChanged;
|
||||
dce->time = ms;
|
||||
dce->flags = type;
|
||||
dce->flags |= DEVCHANGE_SLAVE_SWITCH;
|
||||
dce->flags = flags;
|
||||
dce->sourceid = slave->id;
|
||||
|
||||
if (slave->button)
|
||||
|
@ -674,7 +673,7 @@ UpdateFromMaster(InternalEvent* events, DeviceIntPtr dev, int type, int *num_eve
|
|||
|
||||
if (master && master->last.slave != dev)
|
||||
{
|
||||
CreateClassesChangedEvent(events, master, dev, type);
|
||||
CreateClassesChangedEvent(events, master, dev, type | DEVCHANGE_SLAVE_SWITCH);
|
||||
if (IsPointerDevice(master))
|
||||
{
|
||||
updateSlaveDeviceCoords(master, dev);
|
||||
|
|
|
@ -427,7 +427,8 @@ extern _X_EXPORT void FreeEventList(InternalEvent *list, int num_events);
|
|||
extern void CreateClassesChangedEvent(InternalEvent *event,
|
||||
DeviceIntPtr master,
|
||||
DeviceIntPtr slave,
|
||||
int type);
|
||||
int flags);
|
||||
|
||||
extern InternalEvent * UpdateFromMaster(
|
||||
InternalEvent *events,
|
||||
DeviceIntPtr pDev,
|
||||
|
|
Loading…
Reference in New Issue
Block a user