dix: Set core devices to ProcessOtherEvents, set sendCore and XKB.
Even the virtual core devices should send through ProcessOtherEvents.
This commit is contained in:
parent
ce9bf9a191
commit
be1565f6b8
|
@ -469,21 +469,22 @@ InitCoreDevices(void)
|
||||||
FatalError("Failed to allocate core keyboard");
|
FatalError("Failed to allocate core keyboard");
|
||||||
dev->name = strdup("Virtual core keyboard");
|
dev->name = strdup("Virtual core keyboard");
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
dev->public.processInputProc = CoreProcessKeyboardEvent;
|
dev->public.processInputProc = ProcessOtherEvent;
|
||||||
dev->public.realInputProc = CoreProcessKeyboardEvent;
|
dev->public.realInputProc = ProcessOtherEvent;
|
||||||
/*if (!noXkbExtension)*/
|
if (!noXkbExtension)
|
||||||
/*XkbSetExtension(dev, ProcessKeyboardEvent);*/
|
XkbSetExtension(dev, ProcessKeyboardEvent);
|
||||||
#else
|
#else
|
||||||
dev->public.processInputProc = ProcessKeyboardEvent;
|
dev->public.processInputProc = ProcessKeyboardEvent;
|
||||||
dev->public.realInputProc = ProcessKeyboardEvent;
|
dev->public.realInputProc = ProcessKeyboardEvent;
|
||||||
#endif
|
#endif
|
||||||
dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
|
dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
|
||||||
dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
|
dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
|
||||||
dev->coreEvents = FALSE;
|
dev->coreEvents = TRUE;
|
||||||
dev->spriteInfo->spriteOwner = FALSE;
|
dev->spriteInfo->spriteOwner = FALSE;
|
||||||
if (!AllocateDevicePrivate(dev, CoreDevicePrivatesIndex))
|
if (!AllocateDevicePrivate(dev, CoreDevicePrivatesIndex))
|
||||||
FatalError("Couldn't allocate keyboard devPrivates\n");
|
FatalError("Couldn't allocate keyboard devPrivates\n");
|
||||||
dev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
|
dev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
|
||||||
|
dev->master = NULL;
|
||||||
(void)ActivateDevice(dev);
|
(void)ActivateDevice(dev);
|
||||||
|
|
||||||
inputInfo.keyboard = dev;
|
inputInfo.keyboard = dev;
|
||||||
|
@ -495,8 +496,8 @@ InitCoreDevices(void)
|
||||||
FatalError("Failed to allocate core pointer");
|
FatalError("Failed to allocate core pointer");
|
||||||
dev->name = strdup("Virtual core pointer");
|
dev->name = strdup("Virtual core pointer");
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
dev->public.processInputProc = CoreProcessPointerEvent;
|
dev->public.processInputProc = ProcessOtherEvent;
|
||||||
dev->public.realInputProc = CoreProcessPointerEvent;
|
dev->public.realInputProc = ProcessOtherEvent;
|
||||||
if (!noXkbExtension)
|
if (!noXkbExtension)
|
||||||
XkbSetExtension(dev, ProcessPointerEvent);
|
XkbSetExtension(dev, ProcessPointerEvent);
|
||||||
#else
|
#else
|
||||||
|
@ -505,11 +506,12 @@ InitCoreDevices(void)
|
||||||
#endif
|
#endif
|
||||||
dev->deviceGrab.ActivateGrab = ActivatePointerGrab;
|
dev->deviceGrab.ActivateGrab = ActivatePointerGrab;
|
||||||
dev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
|
dev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
|
||||||
dev->coreEvents = FALSE;
|
dev->coreEvents = TRUE;
|
||||||
dev->spriteInfo->spriteOwner = TRUE;
|
dev->spriteInfo->spriteOwner = TRUE;
|
||||||
if (!AllocateDevicePrivate(dev, CoreDevicePrivatesIndex))
|
if (!AllocateDevicePrivate(dev, CoreDevicePrivatesIndex))
|
||||||
FatalError("Couldn't allocate pointer devPrivates\n");
|
FatalError("Couldn't allocate pointer devPrivates\n");
|
||||||
dev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
|
dev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
|
||||||
|
dev->master = NULL;
|
||||||
(void)ActivateDevice(dev);
|
(void)ActivateDevice(dev);
|
||||||
|
|
||||||
inputInfo.pointer = dev;
|
inputInfo.pointer = dev;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user