Remove double-grab option. We only want one grab per device.

This commit is contained in:
Peter Hutterer 2007-05-14 12:34:53 +09:30
commit 5c680e9493
9 changed files with 121 additions and 195 deletions

View file

@ -100,16 +100,14 @@ RegisterOtherDevice(DeviceIntPtr device)
{
device->public.processInputProc = ProcessOtherEvent;
device->public.realInputProc = ProcessOtherEvent;
(device)->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
(device)->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
if (DeviceIsPointerType(device))
{
(device)->coreGrab.ActivateGrab = ActivatePointerGrab;
(device)->coreGrab.DeactivateGrab = DeactivatePointerGrab;
} else
(device)->deviceGrab.ActivateGrab = ActivatePointerGrab;
(device)->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
} else
{
(device)->coreGrab.ActivateGrab = ActivateKeyboardGrab;
(device)->coreGrab.DeactivateGrab = DeactivateKeyboardGrab;
(device)->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
(device)->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
}
}