--xtest, --xcomposite: Experimental options to add X extensions #117

mviereck · Feb 4, 2019 · 700a7e2 · 700a7e2
1 parent 3ac61a5
commit 700a7e2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ Project website: https://github.com/mviereck/x11docker
  - `--border`: New option to draw a colored border into `--xpra` windows.
    Helps to distinguish between host and container applications.
    [(#91)](https://github.com/mviereck/x11docker/issues/91)
+ - `--xtest`: Enable X extension XTEST. (Experimental, might be removed again)
+   [(#117)](https://github.com/mviereck/x11docker/issues/117)
+ - `--xcomposite`: Enable X extension COMPOSITE. (Experimental, might be removed again)
+   [(#117)](https://github.com/mviereck/x11docker/issues/117)
 ### Changed
  - Copy `/etc/skel/.` to `HOME` if `HOME` is empty.
  - Changed shebang `#! /bin/bash` to `#! /usr/bin/env bash` for portability.
@@ -32,6 +36,8 @@ Project website: https://github.com/mviereck/x11docker
    [(#106)](https://github.com/mviereck/x11docker/issues/106)
  - docker-for-win: `--interactive`: Use `winpty` wrapper.
    [(#87)](https://github.com/mviereck/x11docker/issues/87)
+ - `--xvfb` in Cygwin: Removed `-nolisten local` in X command.
+   [(#123)](https://github.com/mviereck/x11docker/issues/123)
 
 ## [5.3.3](https://github.com/mviereck/x11docker/releases/tag/v5.3.3) - 2018-11-17
 ### Added
@@ -141,7 +147,7 @@ Project website: https://github.com/mviereck/x11docker
 ```
    x11docker [OPTIONS] --  DOCKER_RUN_OPTIONS -- IMAGE [COMMAND [ARG1 ARG2 ...]]
 ```
-   Previous, still valid:
+   Previous syntax, still valid, but deprecated:
 ```
    x11docker [OPTIONS] -- "DOCKER_RUN_OPTIONS"   IMAGE [COMMAND [ARG1 ARG2 ...]]
    x11docker [OPTIONS] -- IMAGE COMMAND ARG1 -- ARG2

diff --git a/x11docker b/x11docker
@@ -2556,12 +2556,13 @@ create_xcommand() {             # create command to start X server and/or Waylan
     --vcxsrv|--xwin) Xserveroptions="$Xserveroptions \\
   -listen tcp" ;;
     *) Xserveroptions="$Xserveroptions \\
-  -nolisten tcp -nolisten local" ;;
+  -nolisten tcp" ;;
   esac
 
   # X extension COMPOSITE
-  case $Xserver in
+  [ "$Xcomposite" ] || case $Xserver in
     --nxagent|--vcxsrv|--xwin) Xcomposite="no" ;;
+    *) Xcomposite="yes" ;;
   esac
   case $Xcomposite in
     yes)
@@ -3347,7 +3348,7 @@ store_runoption() {             # store env, cap, volume or device for docker co
       [ -e "$(convertpath --subsystem "${2:-}")" ] && {
         Sharevolumescount=$((Sharevolumescount + 1))
         Sharevolumes[$Sharevolumescount]="${2:-}"
-      } || warning "File or folder not found:
+      } || warning "File or folder not found. Will not share volume:
   ${2:-}"
     ;;
     device) 
@@ -6340,7 +6341,7 @@ declare_variables() {           # declare global variables
   Xfishtank="no"                                  # option --xfishtank: fish tank on new X server
   Xtest=""                                        # enable extension Xtest yes/no. If empty, yes for --xpra/--xdummy/--xvfb, otherwise no
   Xkblayout=""                                    # option '--keymap': Layout for keymap, compare /usr/share/X11/xkb/symbols
-  Xcomposite="yes"                                # +extension COMPOSITE yes/no
+  Xcomposite=""                                   # +extension COMPOSITE yes/no
   Xauthexe="xauth"                                # either 'xauth' or 'xauth.exe'
 
   # Main options influencing --auto
@@ -6509,6 +6510,7 @@ parse_options() {               # parse cli options
   Longoptions="$Longoptions,hostipc,hostnet,ps,cap-default,sudouser,hostuser:,user:,group-add:,name:"                      # capabilities, users
   Longoptions="$Longoptions,keymap:,name:,no-entrypoint,runfromhost:,runasroot:,westonini:,interactive"                    # developer options
   Longoptions="$Longoptions,cachedir:,starter,trusted,untrusted,xtest,no-xtest,stdout,stderr,silent,nothing"               # deprecated
+  Longoptions="$Longoptions,xtest,xcomposite"                                                                              # experimental
 
   Parsedoptions="$(getopt --options $Shortoptions --longoptions $Longoptions --name "$0" -- "$@" 2>/tmp/x11docker_parsererror)"
   [ -e /tmp/x11docker_parsererror ] && Parsererror=$(cat /tmp/x11docker_parsererror) && rm /tmp/x11docker_parsererror
@@ -6645,6 +6647,8 @@ ${2:-}"                ; shift ;;        # add custom root command in container
                        [ "$(echo $Newdisplaynumber | cut -c1)" = ":" ] && Newdisplaynumber="$(echo $Newdisplaynumber | cut -c2-)"
                        shift ;;
          --keymap)     Xkblayout="${2:-}" ; shift ;;       # keymap layout for xkbcomp. Compare /usr/share/X11/xkb/symbols
+         --xtest)      Xtest="yes" ;;
+         --xcomposite) Xcomposite="yes" ;;
 
        ## X Authentication
          --xhost)      Xhost="$2" ; shift ;;               # custom xhost setting on new X server
@@ -6686,8 +6690,8 @@ ${2:-}"                ; shift ;;        # add custom root command in container
   Fallback: enabling option --clipboard." ;;
          --untrusted)  warning "Option --untrusted is deprecated."
                        Trusted="no"  ;;                    # create untrusted cookies
-         --xtest)      warning "Option --xtest is deprecated."
-                       Xtest="yes" ;;                      # allow extension XTEST. default for xvfb, xdummy and xpra
+#         --xtest)      warning "Option --xtest is deprecated."
+#                       Xtest="yes" ;;                      # allow extension XTEST. default for xvfb, xdummy and xpra
          --no-xtest)   warning "Option --no-xtest is deprecated."
                        Xtest="no" ;;                       # disable extension XTEST. default for most X server options
          --stdout)     note "Option --stdout is deprecated.