summaryrefslogtreecommitdiff
path: root/xserver/xkb/xkbInit.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2013-08-24 19:44:53 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2013-08-24 19:44:53 +0000
commitdf24d8ef31d08c702cd0d7836ef963d7f8860d64 (patch)
treeba5e32b23c40192e85bacee63da561977a1b5e77 /xserver/xkb/xkbInit.c
parent8aac304d65480d9e64293babdcf7cfa3c30188fd (diff)
Uodate to xserver 1.14.2. Tested by krw@, shadchin@, todd@
Diffstat (limited to 'xserver/xkb/xkbInit.c')
-rw-r--r--xserver/xkb/xkbInit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xserver/xkb/xkbInit.c b/xserver/xkb/xkbInit.c
index 4e8e267da..ed01114b6 100644
--- a/xserver/xkb/xkbInit.c
+++ b/xserver/xkb/xkbInit.c
@@ -574,7 +574,8 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet * rmlvo,
XkbUpdateActions(dev, xkb->min_key_code, XkbNumKeys(xkb), &changes,
&check, &cause);
- InitFocusClassDeviceStruct(dev);
+ if (!dev->focus)
+ InitFocusClassDeviceStruct(dev);
xkbi->kbdProc = ctrl_func;
dev->kbdfeed->BellProc = bell_func;