Commit 201ff45c authored by Peter Hutterer's avatar Peter Hutterer Committed by Adam Jackson

Xi: when creating a new master device, update barries for all clients

The previous code only worked when the barrier was created by the same client
as the one calling XIChangeDeviceHierarchy. Peter Hutterer's avatarPeter Hutterer <>
Reviewed-by: Daniel Stone's avatarDaniel Stone <>
(cherry picked from commit d6a6e1d6)
parent 738c17b7
......@@ -194,7 +194,8 @@ add_master(ClientPtr client, xXIAddMasterInfo * c, int flags[MAXDEVICES])
flags[XTestptr->id] |= XISlaveAttached;
flags[XTestkeybd->id] |= XISlaveAttached;
XIBarrierNewMasterDevice(client, ptr->id);
for (int i = 0; i < currentMaxClients; i++)
XIBarrierNewMasterDevice(clients[i], ptr->id);
......@@ -300,7 +301,8 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo * r, int flags[MAXDEVICES])
XIBarrierRemoveMasterDevice(client, ptr->id);
for (int i = 0; i < currentMaxClients; i++)
XIBarrierRemoveMasterDevice(clients[i], ptr->id);
/* disable the remove the devices, XTest devices must be done first
else the sprites they rely on will be destroyed */
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment