diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-09-17 13:39:32 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-09-17 13:39:32 +0000 |
| commit | fd2a165f87d0b47e9ec0174ed1e81ebecc531686 (patch) | |
| tree | 80d71e1c2682e9584dd1c4711fe91e9b38a98f1b /driver/xf86-input-keyboard | |
| parent | f0bd47092943cb33163b44510dab1aca30a52280 (diff) | |
Cleaning of current solution for 'Kill X on Ctrl+Alt+Backspace on default'
ok matthieu@
Diffstat (limited to 'driver/xf86-input-keyboard')
| -rw-r--r-- | driver/xf86-input-keyboard/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/src/kbd.c | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/driver/xf86-input-keyboard/Makefile.bsd-wrapper b/driver/xf86-input-keyboard/Makefile.bsd-wrapper index 3c2011947..cf25f4360 100644 --- a/driver/xf86-input-keyboard/Makefile.bsd-wrapper +++ b/driver/xf86-input-keyboard/Makefile.bsd-wrapper @@ -1,7 +1,3 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2011/08/30 21:15:30 matthieu Exp $ - -.include <bsd.xconf.mk> - -CONFIGURE_ARGS+= --enable-xkeyboard-config +# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2011/09/17 13:39:30 shadchin Exp $ .include <bsd.xorg.mk> diff --git a/driver/xf86-input-keyboard/src/kbd.c b/driver/xf86-input-keyboard/src/kbd.c index dc42996a5..4496c6b5e 100644 --- a/driver/xf86-input-keyboard/src/kbd.c +++ b/driver/xf86-input-keyboard/src/kbd.c @@ -208,10 +208,6 @@ 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); |