Fix two incorrect checks for master devices.

These two were sideeffects of lastSlave being in the same field as the
master. For devices generated by the master device directly, lastSlave was 0
and the device would (with the old checks) be interpreted as floating.

Add the required checks to safeguard against master devices.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>

Xi/exevents.c

@@ -710,6 +710,9 @@ ChangeMasterDeviceClasses(DeviceIntPtr device, DeviceChangedEvent *dce)
     if (rc != Success)
         return; /* Device has disappeared */
 
+    if (IsMaster(slave))
+        return;
+
     if (!slave->u.master)
         return; /* set floating since the event */
 

mi/mieq.c

@@ -325,7 +325,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     CHECKEVENT(original);
 
     /* ET_XQuartz has sdev == NULL */
-    if (!sdev || !sdev->u.master)
+    if (!sdev || IsMaster(sdev) || !sdev->u.master)
         return NULL;
 
 #if XFreeXDGA