Xi: use the XI2 defines for AsyncPair, SyncDevice, etc, not the XI ones.

And don't allow some values on SDs either.
This commit is contained in:
Peter Hutterer 2009-04-20 14:04:54 +10:00
parent d5ad14c8ed
commit 95628b797e

View File

@ -72,23 +72,26 @@ ProcXIAllowEvents(ClientPtr client)
time = ClientTimeToServerTime(stuff->time); time = ClientTimeToServerTime(stuff->time);
switch (stuff->mode) { switch (stuff->mode) {
case ReplayThisDevice: case ReplayDevice:
AllowSome(client, time, dev, NOT_GRABBED); AllowSome(client, time, dev, NOT_GRABBED);
break; break;
case SyncThisDevice: case SyncDevice:
AllowSome(client, time, dev, FREEZE_NEXT_EVENT); AllowSome(client, time, dev, FREEZE_NEXT_EVENT);
break; break;
case AsyncThisDevice: case AsyncDevice:
AllowSome(client, time, dev, THAWED); AllowSome(client, time, dev, THAWED);
break; break;
case AsyncOtherDevices: case AsyncPairedDevice:
AllowSome(client, time, dev, THAW_OTHERS); if (dev->isMaster)
AllowSome(client, time, dev, THAW_OTHERS);
break; break;
case SyncAll: case SyncPair:
AllowSome(client, time, dev, FREEZE_BOTH_NEXT_EVENT); if (dev->isMaster)
AllowSome(client, time, dev, FREEZE_BOTH_NEXT_EVENT);
break; break;
case AsyncAll: case AsyncPair:
AllowSome(client, time, dev, THAWED_BOTH); if (dev->isMaster)
AllowSome(client, time, dev, THAWED_BOTH);
break; break;
default: default:
client->errorValue = stuff->mode; client->errorValue = stuff->mode;