diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-18 12:28:43 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-22 14:35:45 +1000 |
| commit | 17265ccb027e3f956bf7409106174f44621d1cb8 (patch) | |
| tree | c7094a1c7e4b158a0777075fca00cc8724d875a1 /xkb/xkbActions.c | |
| parent | 77113dd3eef03dd65b556b672d976817b3f4542e (diff) | |
Move master/lastSlave out of the union into separate fields.
The removal of the double-use will cause some suble bugs as some conditions
to check for the dev->u.master case were broken and also evaluated as true
if lastSlave was set (instead of master).
Also breaks the input ABI.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
Diffstat (limited to 'xkb/xkbActions.c')
| -rw-r--r-- | xkb/xkbActions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index eda409c07..65c678af8 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -1365,7 +1365,7 @@ InjectPointerKeyEvents(DeviceIntPtr dev, int type, int button, int flags, Valuat if (IsMaster(dev)) { mpointer = GetMaster(dev, MASTER_POINTER); - lastSlave = mpointer->u.lastSlave; + lastSlave = mpointer->lastSlave; ptr = GetXTestDevice(mpointer); } else if (IsFloating(dev)) ptr = dev; |