--nxagent: Revert previous commit. Allow --keymap=clone #208

mviereck · Dec 26, 2019 · a0c54bb · a0c54bb
1 parent d9dbf55
commit a0c54bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@ Project website: https://github.com/mviereck/x11docker
 
 ## [Unreleased]
 ### Changed
- - `--nxagent`: Use `keyboard='clone'` for xkb settings. 
+ - `--nxagent --keymap=clone`: Clone xkb settings from host in nxagent.
    [(#208)](https://github.com/mviereck/x11docker/issues/208)
 
 

diff --git a/x11docker b/x11docker
@@ -2979,10 +2979,17 @@ mode=$Screensize
       # set keyboard layout
       case $Xkblayout in
         "") # set layout from host.
-          Nxagentoptions="$Nxagentoptions,keyboard='clone'"
+          command -v setxkbmap >/dev/null && {
+            Nxagentoptions="$Nxagentoptions,keyboard=$(setxkbmap -query | grep rules | awk '{print $2}')/$(setxkbmap -query | grep layout | awk '{print $2}')"
+          } || note "Could not check your keyboard layout due to missing setxkbmap
+  If you get mismatching keys, please install setxkbmap.
+  $Wikipackages"
         ;;
         *) # --keymap
-          Nxagentoptions="$Nxagentoptions,keyboard='evdev/$Xkblayout'"
+          case $Xkblayout in
+            clone) Nxagentoptions="$Nxagentoptions,keyboard='clone'" ;;
+            *)     Nxagentoptions="$Nxagentoptions,keyboard='evdev/$Xkblayout'" ;;
+          esac
         ;;
       esac