diff options
| author | Keith Packard <keithp@keithp.com> | 2012-12-19 12:09:31 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-12-19 12:09:31 -0800 |
| commit | 014a5c8a9d86f2f992183bff9106354fac2c3b0e (patch) | |
| tree | e848fd6eb03079d6e3e8b69ba1b4237066e23749 /Xi/xichangehierarchy.c | |
| parent | f793b5fd3eb16a2ada130367c2ffebeede69a322 (diff) | |
| parent | 2eefa5d6e870c57ac6a5930883d8cfe3a3882a43 (diff) | |
Merge remote-tracking branch 'whot/barriers'
Conflicts:
Xi/xichangehierarchy.c
Small conflict with the patch from
Xi: don't use devices after removing them
Was easily resolved by hand.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xi/xichangehierarchy.c')
| -rw-r--r-- | Xi/xichangehierarchy.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 4dc3d76e9..0184eb29a 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -52,6 +52,7 @@ #include "xkbsrv.h" #include "xichangehierarchy.h" +#include "xibarriers.h" /** * Send the current state of the device hierarchy to all clients. @@ -189,6 +190,8 @@ add_master(ClientPtr client, xXIAddMasterInfo * c, int flags[MAXDEVICES]) flags[XTestptr->id] |= XISlaveAttached; flags[XTestkeybd->id] |= XISlaveAttached; + XIBarrierNewMasterDevice(client, ptr->id); + unwind: free(name); return rc; @@ -293,6 +296,8 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo * r, int flags[MAXDEVICES]) } } + XIBarrierRemoveMasterDevice(client, ptr->id); + /* disable the remove the devices, XTest devices must be done first else the sprites they rely on will be destroyed */ DisableDevice(XTestptr, FALSE); |