From 17265ccb027e3f956bf7409106174f44621d1cb8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Feb 2011 12:28:43 +1000 Subject: 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 Reviewed-by: Benjamin Tissoires --- xkb/xkb.c | 2 +- xkb/xkbActions.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xkb') diff --git a/xkb/xkb.c b/xkb/xkb.c index 22417533e..15831591d 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -5885,7 +5885,7 @@ ProcXkbGetKbdByName(ClientPtr client) if (!IsMaster(dev)) { DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD); - if (master && master->u.lastSlave == dev) { + if (master && master->lastSlave == dev) { XkbCopyDeviceKeymap(master, dev); XkbSendNewKeyboardNotify(dev,&nkn); } 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; -- cgit v1.2.3