Skip to content

Commit

Permalink
--keymap=clone: Disable for others than --nxagent #208
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Dec 27, 2019
1 parent a0c54bb commit af7140b
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -6694,6 +6694,20 @@ check_option_interferences() { # check multiple option interferences, change se
It only restricts memory and CPU usage."
}

# --keymap: XKB keyboard layount
[ -n "$Xkblayout" ] && {
case $Xserver in
--kwin|--kwin-xwayland)
[ "$Runsonconsole" = "yes" ] && note "Option --keymap does not work with option $Xserver
if running from console."
;;
esac
[ "$Xkblayout" = "clone" ] && case $Xserver in
nxagent) ;;
*) Xkblayout="" ;;
esac
}

# --pulseaudio
case $Pulseaudiomode in
auto|tcp|socket|"") ;;
Expand Down Expand Up @@ -7212,15 +7226,7 @@ option_messages() { # some messages depending on options, but not ch
Different window managers handle this different. Just try out." ;;
esac
}

# --keymap: XKB keyboard layount
[ -n "$Xkblayout" ] && case $Xserver in
--kwin|--kwin-xwayland)
[ "$Runsonconsole" = "yes" ] && note "Option --keymap does not work with option $Xserver
if running from console."
;;
esac


# --hostipc
[ "$Sharehostipc" = "yes" ] && warning "Option --hostipc severely degrades
container isolation. IPC namespace remapping is disabled."
Expand Down

0 comments on commit af7140b

Please sign in to comment.