diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-21 09:11:08 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-21 09:11:08 +0000 |
| commit | 704f0247404c4a93287c4d852b1f972179f17e49 (patch) | |
| tree | 21e7a908ad31a54a862e8da452dbf1ca3b00ff41 | |
| parent | 2e5ba10003e1f44a96a4059c65c0ef42dcc7a2e7 (diff) | |
Fix initial xkb_options setting. Restores Ctrl+Alt+Backspace behaviour.
Strange that no one reported it beeing broken.
| -rw-r--r-- | driver/xf86-input-keyboard/src/kbd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/driver/xf86-input-keyboard/src/kbd.c b/driver/xf86-input-keyboard/src/kbd.c index 4496c6b5e..dc42996a5 100644 --- a/driver/xf86-input-keyboard/src/kbd.c +++ b/driver/xf86-input-keyboard/src/kbd.c @@ -208,6 +208,10 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) xkb_layout = xf86SetStrOption(pInfo->options, "XkbLayout", NULL); xkb_variant = xf86SetStrOption(pInfo->options, "XkbVariant", NULL); xkb_options = xf86SetStrOption(pInfo->options, "XkbOptions", NULL); +#ifdef USE_XKEYBOARD_CONFIG + if (xkb_options == NULL) + xkb_options = strdup("terminate:ctrl_alt_bksp"); +#endif pKbd->CustomKeycodes = xf86SetBoolOption(pInfo->options, "CustomKeycodes", FALSE); |