jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

setxkbmap: revert change to set keyboard layout via udev, this should partly fix the change keyboard layout issues, but needs some more work

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-12-29 22:45:09 +01:00
parent 0e39379ebd
commit 9eb0f5f195
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/x11/app/setxkbmap/scripts/xkb-setup → packages/x11/app/setxkbmap/init.d/72_keyboard Executable file → Normal file
View File

@ -1,5 +1,3 @@
#!/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)
@ -20,21 +18,28 @@
# http://www.gnu.org/copyleft/gpl.html # http://www.gnu.org/copyleft/gpl.html
################################################################################ ################################################################################
. /etc/profile # setup keyboard layout
. /var/config/settings.conf #
# runlevels: openelec
if [ -z $X11_KEYMAP ]; then (
X11_KEYMAP="us" if [ -f /var/config/settings.conf ]; then
fi . /var/config/settings.conf
if [ ! "$X11_KEYMAP2" == "-none-" ]; then progress "setup keyboard layout"
XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2"
XKBOPTIONS="grp:alt_shift_toggle"
else
XKBLAYOUT="$X11_KEYMAP"
fi
echo "XKBMODEL=\"pc105\"" if [ -z $X11_KEYMAP ]; then
echo "XKBVARIANT=\"\"" X11_KEYMAP="us"
echo "XKBLAYOUT=\"$XKBLAYOUT\"" fi
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
)&

2
packages/x11/app/setxkbmap/install
View File

@ -25,5 +25,3 @@
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

8
packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules
View File

@ -1,8 +0,0 @@
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"