diff options
Diffstat (limited to 'x11vnc/ssltools.h')
| -rw-r--r-- | x11vnc/ssltools.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index b8e4efb..19c1926 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -766,6 +766,25 @@ char find_display[] = "do\n" " d=`echo \"$p\" | sed -e 's/://' -e 's/\\..*$//'`\n" " ok=\"\"\n" +" if [ \"X$X11VNC_SKIP_DISPLAY\" != \"X\" ]; then\n" +" mat=\"\"\n" +" for skip in `echo $X11VNC_SKIP_DISPLAY | tr ',' '\\n'`\n" +" do\n" +" if echo \"$skip\" | grep \"^:\" > /dev/null; then\n" +" :\n" +" else\n" +" skip=\":$skip\"\n" +" fi\n" +" if echo \"$skip\" | grep \":$d\\>\" > /dev/null; then\n" +" mat=1\n" +" break\n" +" \n" +" fi\n" +" done\n" +" if [ \"X$mat\" = \"X1\" ]; then\n" +" continue\n" +" fi\n" +" fi\n" " xd=\"/tmp/.X11-unix/X$d\"\n" " if [ -r \"$xd\" -o -w \"$xd\" -o -x \"$xd\" ]; then\n" " if echo \"$nsout\" | grep \"/tmp/.X11-unix/X$d[ ]*\\$\" > /dev/null; then\n" @@ -1148,7 +1167,7 @@ char create_display[] = " fi\n" " fi\n" " fi\n" -" server $have_Xvfb :$N $sarg 0 ${geom}x${depth}\n" +" server $have_Xvfb :$N +kb $sarg 0 ${geom}x${depth}\n" " #have_startx=$save_have_startx\n" "\n" " if [ \"X$result\" = \"X1\" -a \"X$have_xmodmap\" != \"X\" ]; then\n" @@ -1233,6 +1252,9 @@ char create_display[] = "\n" "depth=${depth:-16}\n" "geom=${geom:-1280x1024}\n" +"if [ \"X$X11VNC_CREATE_GEOM\" != \"X\" -a \"X$FD_GEOM\" = \"X\" ]; then\n" +" FD_GEOM=$X11VNC_CREATE_GEOM\n" +"fi\n" "\n" "if [ \"X$FD_GEOM\" != \"X\" -a \"X$FD_GEOM\" != \"XNONE\" ]; then\n" " x1=`echo \"$FD_GEOM\" | awk -Fx '{print $1}'`\n" |
