diff options
Diffstat (limited to 'x11vnc/ssltools.h')
| -rw-r--r-- | x11vnc/ssltools.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index 19c1926..ea26478 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -954,6 +954,22 @@ char create_display[] = " echo \"$session\"\n" " return\n" " fi\n" +" if [ \"X$have_gnome_session\" != \"X\" -a \"X$FD_SESS\" = \"Xgnome\" ]; then\n" +" echo \"$have_gnome_session\"\n" +" return\n" +" elif [ \"X$have_startkde\" != \"X\" -a \"X$FD_SESS\" = \"Xkde\" ]; then\n" +" echo \"$have_startkde\"\n" +" return\n" +" elif [ \"X$have_twm\" != \"X\" -a \"X$FD_SESS\" = \"Xtwm\" ]; then\n" +" echo \"$have_twm\"\n" +" return\n" +" elif [ \"X$have_fvwm2\" != \"X\" -a \"X$FD_SESS\" = \"Xfvwm\" ]; then\n" +" echo \"$have_fvwm2\"\n" +" return\n" +" elif [ \"X$have_xterm\" != \"X\" -a \"X$FD_SESS\" = \"Xfailsafe\" ]; then\n" +" echo \"$have_xterm\"\n" +" return\n" +" fi\n" " home=`csh -f -c \"echo ~$USER\"`\n" " if [ \"X$home\" = \"X\" -o ! -d \"$home\" ]; then\n" " if [ \"X$have_root\" != \"X\" -a \"X$USER\" != \"Xroot\" ]; then\n" @@ -1173,7 +1189,7 @@ char create_display[] = " if [ \"X$result\" = \"X1\" -a \"X$have_xmodmap\" != \"X\" ]; then\n" " if [ \"X$have_root\" = \"X\" ]; then\n" " nohup sh -c \"(\n" -" sleep 6;\n" +" sleep 10;\n" " $have_xmodmap -display :$N -e 'keycode any = Shift_R' \\\n" " -e 'add Shift = Shift_L Shift_R' \\\n" " -e 'keycode any = Control_R' \\\n" @@ -1186,7 +1202,7 @@ char create_display[] = " )\" 1>&2 &\n" " else\n" " (\n" -" sleep 1;\n" +" sleep 6;\n" " $have_xmodmap -display :$N -e 'keycode any = Shift_R' \\\n" " -e 'add Shift = Shift_L Shift_R' \\\n" " -e 'keycode any = Control_R' \\\n" @@ -1288,7 +1304,7 @@ char create_display[] = " p_ok=1\n" "fi\n" "\n" -"for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb xauth mcookie md5sum xmodmap startkde gnome-session blackbox fvwm mwm openbox twm windowmaker metacity X Xorg XFree86 Xsun Xsession netstat\n" +"for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb xauth mcookie md5sum xmodmap startkde gnome-session blackbox fvwm2 mwm openbox twm windowmaker metacity X Xorg XFree86 Xsun Xsession netstat\n" "do\n" " p2=`echo \"$prog\" | sed -e 's/-/_/g'`\n" " eval \"have_$p2=''\"\n" |