diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-20 14:04:54 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-20 14:07:08 +1000 |
| commit | 95628b797e2b326ae15406df4f736e25f5d2f12f (patch) | |
| tree | a380b900d01b29651fa16cbea3a15c5747e13641 | |
| parent | d5ad14c8ed4d8360e1df8cd0bacf6a7c9c31df91 (diff) | |
Xi: use the XI2 defines for AsyncPair, SyncDevice, etc, not the XI ones.
And don't allow some values on SDs either.
| -rw-r--r-- | Xi/xiallowev.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c index 571255759..a8cf1b67f 100644 --- a/Xi/xiallowev.c +++ b/Xi/xiallowev.c @@ -72,23 +72,26 @@ ProcXIAllowEvents(ClientPtr client) time = ClientTimeToServerTime(stuff->time); switch (stuff->mode) { - case ReplayThisDevice: + case ReplayDevice: AllowSome(client, time, dev, NOT_GRABBED); break; - case SyncThisDevice: + case SyncDevice: AllowSome(client, time, dev, FREEZE_NEXT_EVENT); break; - case AsyncThisDevice: + case AsyncDevice: AllowSome(client, time, dev, THAWED); break; - case AsyncOtherDevices: - AllowSome(client, time, dev, THAW_OTHERS); + case AsyncPairedDevice: + if (dev->isMaster) + AllowSome(client, time, dev, THAW_OTHERS); break; - case SyncAll: - AllowSome(client, time, dev, FREEZE_BOTH_NEXT_EVENT); + case SyncPair: + if (dev->isMaster) + AllowSome(client, time, dev, FREEZE_BOTH_NEXT_EVENT); break; - case AsyncAll: - AllowSome(client, time, dev, THAWED_BOTH); + case AsyncPair: + if (dev->isMaster) + AllowSome(client, time, dev, THAWED_BOTH); break; default: client->errorValue = stuff->mode; |