setxkbmap: move keyboard config to udev

This commit is contained in:
Stefan Saraev 2012-05-05 15:21:36 +03:00
parent 7663f74b33
commit 80374c174f
3 changed files with 25 additions and 22 deletions

View File

@ -25,3 +25,5 @@
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/$1 $INSTALL/usr/bin cp $PKG_BUILD/$1 $INSTALL/usr/bin
mkdir -p $INSTALL/lib/udev
cp $PKG_DIR/scripts/xkb-setup $INSTALL/lib/udev

View File

@ -1,3 +1,5 @@
#!/bin/sh
################################################################################ ################################################################################
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@ -18,28 +20,19 @@
# http://www.gnu.org/copyleft/gpl.html # http://www.gnu.org/copyleft/gpl.html
################################################################################ ################################################################################
# setup keyboard layout . /etc/profile
# . /var/config/settings.conf
# runlevels: openelec
( if [ -z $X11_KEYMAP ]; then
if [ -f /var/config/settings.conf ]; then XKBLAYOUT="us"
. /var/config/settings.conf fi
progress "setup keyboard layout" if [ ! -z $X11_KEYMAP2 ]; then
XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2"
XKBOPTIONS="grp:alt_shift_toggle"
fi
if [ -z $X11_KEYMAP ]; then echo "XKBMODEL=\"pc105\""
X11_KEYMAP="us" echo "XKBVARIANT=\"\""
fi echo "XKBLAYOUT=\"$XKBLAYOUT\""
echo "XKBOPTIONS=\"$XKBOPTIONS\""
# waiting for Xorg to start
wait_for_xorg
# setup keymap
if [ -z $X11_KEYMAP2 ]; then
setxkbmap -display $DISPLAY $X11_KEYMAP;
else
setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
fi
fi
)&

View File

@ -0,0 +1,8 @@
ACTION!="add|change", GOTO="xorg_xkb_end"
SUBSYSTEM!="input", GOTO="xorg_xkb_end"
KERNEL!="event*", GOTO="xorg_xkb_end"
ENV{ID_INPUT_KEY}=="?*", IMPORT{program}="xkb-setup"
LABEL="xorg_xkb_end"