Merge remote branch 'whot/for-keith'

This commit is contained in:
Keith Packard
2010-06-10 18:39:10 -07:00
16 changed files with 719 additions and 144 deletions

View File

@@ -193,16 +193,12 @@ void
CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
{
KeyClassPtr mk = master->key;
KeyClassPtr dk = device->key;
int i;
if (device == master)
return;
mk->sourceid = device->id;
for (i = 0; i < 8; i++)
mk->modifierKeyCount[i] = dk->modifierKeyCount[i];
if (!XkbCopyDeviceKeymap(master, device))
FatalError("Couldn't pivot keymap from device to core!\n");