diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-09-26 18:01:17 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-09-26 18:01:17 +0930 |
| commit | e2cb8515661b1f7826981931d82dee6e05529f04 (patch) | |
| tree | 4d2b4fd848d1e97c176e216d48c99a7f0c976990 | |
| parent | 27bc1a8fef2bfd3d62fb44f7c7eb0d463ed08632 (diff) | |
xfree86: pass in the XKB event processing proc instead of the XI one.
We need to pass ProcessPointerEvent or ProcessKeyboardEvent to
XkbSetExtension, otherwise we lose the xkb layer.
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 31c300811..a43230e14 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -205,7 +205,7 @@ xf86ActivateDevice(LocalDevicePtr local) RegisterOtherDevice(dev); if (!noXkbExtension) - XkbSetExtension(dev, ProcessOtherEvent); + XkbSetExtension(dev, (DeviceIsPointerType(dev)) ? ProcessPointerEvent : ProcessKeyboardEvent); if (serverGeneration == 1) xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n", |