diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-04-20 19:28:15 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-04-20 19:28:15 +0000 |
| commit | 0d6703119d7e7a77fa25bb47b60dcc78fee80ccb (patch) | |
| tree | e0aea0918d4aec3cda9e3f0341dd0dea9ff8c8eb /driver/xf86-input-keyboard | |
| parent | 0ba14fa06bc34973da67a7d194a869bd9bf0d51d (diff) | |
If the wskbd map is 'user' don't try to set the xkb layout.
Tested by okan@ ok oga@.
Diffstat (limited to 'driver/xf86-input-keyboard')
| -rw-r--r-- | driver/xf86-input-keyboard/src/bsd_kbd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/driver/xf86-input-keyboard/src/bsd_kbd.c b/driver/xf86-input-keyboard/src/bsd_kbd.c index 852debab0..0151e4273 100644 --- a/driver/xf86-input-keyboard/src/bsd_kbd.c +++ b/driver/xf86-input-keyboard/src/bsd_kbd.c @@ -531,8 +531,12 @@ OpenKeyboard(InputInfoPtr pInfo) pInfo->name, strerror(errno)); return TRUE; } + if (KB_ENCODING(wsenc) == KB_USER) + /* Don't try to set XkbLayout */ + return TRUE; + for (i = 0; kbdenc[i].val; i++) - if (KB_ENCODING(wsenc) == kbdenc[i].val) { + if(KB_ENCODING(wsenc) == kbdenc[i].val) { xf86Msg(X_PROBED, "%s: using wscons layout %s\n", pInfo->name, kbdenc[i].name); xf86addNewOption(pInfo->options, "XkbLayout", kbdenc[i].name); |