Fix initial xkb_options setting. Restores Ctrl+Alt+Backspace behaviour.

Strange that no one reported it beeing broken.
This commit is contained in:
matthieu
2011-08-21 09:11:07 +00:00
parent 1fbe67fd6b
commit 8f3343abae

View File

@@ -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);