diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-08-04 21:45:33 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-08-04 21:45:33 +0000 |
| commit | 4adb4e81095d5a7ca3dd710d39d6b3de7c1079a8 (patch) | |
| tree | 3766d5a797bb5cac228d8429a6522a9e960b265a /driver/xf86-input-keyboard | |
| parent | cf922418a7a4cc8ed07e8f896b0f32accb9ec844 (diff) | |
Fix the fix of the fix.
Previous iteration would again ignore wscons keyboard.encoding setting.
Now no default xkbLayout is set, unless keyboard.encoding=user.
Diffstat (limited to 'driver/xf86-input-keyboard')
| -rw-r--r-- | driver/xf86-input-keyboard/src/bsd_kbd.c | 1 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/src/kbd.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/driver/xf86-input-keyboard/src/bsd_kbd.c b/driver/xf86-input-keyboard/src/bsd_kbd.c index daf2e9fe0..c59c4a12d 100644 --- a/driver/xf86-input-keyboard/src/bsd_kbd.c +++ b/driver/xf86-input-keyboard/src/bsd_kbd.c @@ -511,6 +511,7 @@ OpenKeyboard(InputInfoPtr pInfo) if (KB_ENCODING(wsenc) == KB_USER) { /* Ignore wscons "user" layout */ xf86Msg(X_INFO, "%s: ignoring \"user\" wscons layout\n", pInfo->name); + xf86addNewOption(pInfo->options, "XkbLayout", "us"); return TRUE; } diff --git a/driver/xf86-input-keyboard/src/kbd.c b/driver/xf86-input-keyboard/src/kbd.c index 1e2981a8e..6fd2ff1b8 100644 --- a/driver/xf86-input-keyboard/src/kbd.c +++ b/driver/xf86-input-keyboard/src/kbd.c @@ -121,7 +121,6 @@ static const char *kbdDefaults[] = { #endif "AutoRepeat", "500 30", "XkbRules", "xorg", - "XkbModel", "pc105", "XkbLayout", "us", "CustomKeycodes", "off", NULL |