qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaning of current solution for 'Kill X on Ctrl+Alt+Backspace on default'

Browse Source 
ok matthieu@
This commit is contained in:
shadchin 2011-09-17 13:39:30 +00:00
parent c516620bcf
commit 4e607c59bd
5 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
driver/xf86-input-keyboard/Makefile.bsd-wrapper
View File

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

4
driver/xf86-input-keyboard/src/kbd.c
View File

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

4
kdrive/Makefile.bsd-wrapper
View File

@ -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 \

4
xserver/Makefile.bsd-wrapper
View File

@ -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 \

4
xserver/config/wscons.c
View File

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