diff options
Diffstat (limited to 'mi/mieq.c')
| -rw-r--r-- | mi/mieq.c | 26 |
1 files changed, 24 insertions, 2 deletions
@@ -323,15 +323,32 @@ ChangeDeviceID(DeviceIntPtr dev, xEvent* event) DebugF("[mi] Unknown event type (%d), cannot change id.\n", type); } +static void +FixUpEventForMaster(DeviceIntPtr mdev, DeviceIntPtr sdev, xEvent* original, + EventListPtr master, int count) +{ + /* Ensure chained button mappings, i.e. that the detail field is the + * value of the mapped button on the SD, not the physical button */ + if (original->u.u.type == DeviceButtonPress || original->u.u.type == DeviceButtonRelease) + { + int btn = original->u.u.detail; + if (!sdev->button) + return; /* Should never happen */ + + master->event->u.u.detail = sdev->button->map[btn]; + } +} + /** * Copy the given event into master. * @param mdev The master device + * @param sdev The slave device the original event comes from * @param original The event as it came from the EQ * @param master The event after being copied * @param count Number of events in original. */ void -CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original, +CopyGetMasterEvent(DeviceIntPtr mdev, DeviceIntPtr sdev, xEvent* original, EventListPtr master, int count) { int len = count * sizeof(xEvent); @@ -346,9 +363,14 @@ CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original, memcpy(master->event, original, len); while (count--) + { ChangeDeviceID(mdev, &master->event[count]); + FixUpEventForMaster(mdev, sdev, original, master, count); + } } + + /* Call this from ProcessInputEvents(). */ void mieqProcessInputEvents(void) @@ -419,7 +441,7 @@ mieqProcessInputEvents(void) } else { if (master) - CopyGetMasterEvent(master, event, masterEvents, nevents); + CopyGetMasterEvent(master, dev, event, masterEvents, nevents); /* If someone's registered a custom event handler, let them * steal it. */ |