mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
setxkbmap: move keyboard config to udev
This commit is contained in:
parent
7663f74b33
commit
80374c174f
@ -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
|
||||||
|
37
packages/x11/app/setxkbmap/init.d/72_keyboard → packages/x11/app/setxkbmap/scripts/xkb-setup
Normal file → Executable file
37
packages/x11/app/setxkbmap/init.d/72_keyboard → packages/x11/app/setxkbmap/scripts/xkb-setup
Normal file → Executable 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
|
|
||||||
)&
|
|
8
packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules
Normal file
8
packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules
Normal 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"
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user