lxde-keyboard-switcher

2 files changed, 19 insertions, 4 deletions

diff --git a/kanotix-lxde-extra/debian/changelog b/kanotix-lxde-extra/debian/changelog
index a2e195f..05f3ebe 100644
--- a/kanotix-lxde-extra/debian/changelog
+++ b/kanotix-lxde-extra/debian/changelog
@@ -1,3 +1,9 @@
+kanotix-lxde-extra (0.2.2update1) unstable; urgency=low
+
+  * keyboard-switcher from panel
+
+ -- Holger Paradies <retabell@gmx.de>  Tue, 25 Jun 2013 17:57:00 +0200
+
 kanotix-lxde-extra (0.2.2) unstable; urgency=low
 
   * add lightdm upstart script
diff --git a/kanotix-lxde-extra/kanotix-lxde-keyboard b/kanotix-lxde-extra/kanotix-lxde-keyboard
index df30ace..8583213 100644..100755
--- a/kanotix-lxde-extra/kanotix-lxde-keyboard
+++ b/kanotix-lxde-extra/kanotix-lxde-keyboard
@@ -1,8 +1,17 @@
 #!/bin/sh
 
 # set default for lxde-keyboard-switcher
-setxkbmap -layout de,us,fr -variant nodeadkeys,,
 
-if grep 'XKBLAYOUT="us"' /etc/default/keyboard ;then
- setxkbmap -layout us,de,fr -variant ,nodeadkeys,
-fi
+XKBMODEL="pc105"
+XKBLAYOUT="ch"
+XKBVARIANT="nodeadkeys"
+XKBOPTIONS="terminate:ctrl_alt_bksp"
+BACKSPACE="guess"
+
+[ -f  /etc/default/keyboard ] && . /etc/default/keyboard
+case $XKBLAYOUT in
+ de) setxkbmap -layout de,us,fr -variant nodeadkeys,, ;;
+ us) setxkbmap -layout us,fr,de -variant ,,nodeadkeys ;;
+ fr) setxkbmap -layout fr,de,us -variant ,nodeadkeys, ;;
+ *) setxkbmap -layout $XKBLAYOUT ;;
+esac