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

Revert "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 
This reverts commit 9eb0f5f1951a03fd25e691ea8fbda0356cf858f0.
This commit is contained in:
Stephan Raue 2013-01-29 03:15:15 +01:00
parent 4c2c481e28
commit 7338855b9b
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/x11/app/setxkbmap/install
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

39
packages/x11/app/setxkbmap/init.d/72_keyboard → packages/x11/app/setxkbmap/scripts/xkb-setup Normal file → Executable file
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,21 @@
# 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 X11_KEYMAP="us"
. /var/config/settings.conf fi
progress "setup keyboard layout" if [ ! "$X11_KEYMAP2" == "-none-" ]; then
XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2"
XKBOPTIONS="grp:alt_shift_toggle"
else
XKBLAYOUT="$X11_KEYMAP"
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
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"