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 | |
| parent | f0bd47092943cb33163b44510dab1aca30a52280 (diff) | |
Cleaning of current solution for 'Kill X on Ctrl+Alt+Backspace on default'
ok matthieu@
| -rw-r--r-- | driver/xf86-input-keyboard/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | driver/xf86-input-keyboard/src/kbd.c | 4 | ||||
| -rw-r--r-- | kdrive/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | xserver/config/wscons.c | 4 |
5 files changed, 3 insertions, 19 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); diff --git a/kdrive/Makefile.bsd-wrapper b/kdrive/Makefile.bsd-wrapper index cef6da421..94187913a 100644 --- a/kdrive/Makefile.bsd-wrapper +++ b/kdrive/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2011/08/30 21:15:30 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2011/09/17 13:39:31 shadchin Exp $ .include <bsd.xconf.mk> @@ -6,13 +6,11 @@ _SRCDIR= ${.CURDIR}/../xserver XKB_PATH= ${X11BASE}/share/X11/xkb XKB_RULES= base -XKB_OPTIONS= terminate:ctrl_alt_bksp CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-xkb-path=${XKB_PATH} \ --with-xkb-output=/var/db/xkb \ --with-default-xkb-rules=${XKB_RULES} \ - --with-default-xkb-options=${XKB_OPTIONS} \ --with-dri-driver-path=${LIBDIR}/modules/dri \ --enable-dri \ --disable-xorg \ diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 6e129d841..b0fff4d03 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.38 2011/08/31 12:31:51 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.39 2011/09/17 13:39:31 shadchin Exp $ .include <bsd.xconf.mk> @@ -33,13 +33,11 @@ DRI_OPTION= --disable-dri --disable-dri2 XKB_PATH= ${X11BASE}/share/X11/xkb XKB_RULES= base -XKB_OPTIONS= terminate:ctrl_alt_bksp CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-xkb-path=${XKB_PATH} \ --with-xkb-output=/var/db/xkb \ --with-default-xkb-rules=${XKB_RULES} \ - --with-default-xkb-options=${XKB_OPTIONS} \ --with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \ --enable-install-setuid --enable-privsep \ --enable-xcsecurity \ diff --git a/xserver/config/wscons.c b/xserver/config/wscons.c index 17bece473..927b66056 100644 --- a/xserver/config/wscons.c +++ b/xserver/config/wscons.c @@ -67,11 +67,7 @@ struct nameint kbdvar[] = { }; struct nameint kbdopt[] = { -#ifndef USE_XKEYBOARD_CONFIG { KB_SWAPCTRLCAPS, "ctrl:swapcaps" }, -#else - { KB_SWAPCTRLCAPS, "ctrl:swapcaps,terminate:ctrl_alt_bksp" }, -#endif { 0 } }; |