summaryrefslogtreecommitdiffstats
path: root/x11vnc/ssltools.h
diff options
context:
space:
mode:
Diffstat (limited to 'x11vnc/ssltools.h')
-rw-r--r--x11vnc/ssltools.h142
1 files changed, 79 insertions, 63 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h
index 1be120f..98aa1ff 100644
--- a/x11vnc/ssltools.h
+++ b/x11vnc/ssltools.h
@@ -1537,6 +1537,9 @@ char create_display[] =
" elif [ \"X$have_startkde\" != \"X\" -a \"X$FD_SESS\" = \"Xkde\" ]; then\n"
" echo \"$have_startkde\"\n"
" return\n"
+" elif [ \"X$have_startlxde\" != \"X\" -a \"X$FD_SESS\" = \"Xlxde\" ]; then\n"
+" echo \"$have_startlxde\"\n"
+" return\n"
" elif [ \"X$have_twm\" != \"X\" -a \"X$FD_SESS\" = \"Xtwm\" ]; then\n"
" echo \"$have_twm\"\n"
" return\n"
@@ -1605,6 +1608,12 @@ char create_display[] =
" return\n"
" fi\n"
" fi\n"
+" if [ \"X$have_startlxde\" != \"X\" ]; then\n"
+" if egrep -i 'Session=lxde' \"$home/.dmrc\" > /dev/null; then\n"
+" echo \"$have_startlxde\"\n"
+" return\n"
+" fi\n"
+" fi\n"
" if [ \"X$have_gnome_session\" != \"X\" ]; then\n"
" if egrep -i 'Session=gnome' \"$home/.dmrc\" > /dev/null; then\n"
" echo \"$have_gnome_session\"\n"
@@ -1990,19 +1999,6 @@ char create_display[] =
" fi\n"
"}\n"
"\n"
-"try_Xdummy() {\n"
-" if [ \"X$have_Xdummy\" = \"X\" ]; then\n"
-" return\n"
-" fi\n"
-" if [ \"X$FD_XDUMMY_NOROOT\" != \"X\" ]; then\n"
-" :\n"
-" elif [ \"X$have_root\" = \"X\" ]; then\n"
-" return\n"
-" fi\n"
-"\n"
-" server $have_Xdummy :$N -geometry $geom -depth $depth\n"
-"}\n"
-"\n"
"try_Xvnc() {\n"
" if [ \"X$have_Xvnc\" = \"X\" ]; then\n"
" return\n"
@@ -2019,6 +2015,57 @@ char create_display[] =
" server $FD_XSRV :$N -geometry $geom -depth $depth\n"
"}\n"
"\n"
+"add_modmap() {\n"
+" if [ \"X$have_root\" = \"X\" ]; then\n"
+" $have_nohup sh -c \"(\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"
+" -e 'add Control = Control_L Control_R' \\\n"
+" -e 'keycode any = Alt_L' \\\n"
+" -e 'keycode any = Alt_R' \\\n"
+" -e 'keycode any = Meta_L' \\\n"
+" -e 'clear Mod1' \\\n"
+" -e 'add Mod1 = Alt_L Alt_R Meta_L';\n"
+" if uname | grep SunOS > /dev/null; then\n"
+" for sym in SunAudioMute SunAudioLowerVolume SunAudioRaiseVolume\n"
+" do\n"
+" if $have_xmodmap -pk | grep -w \\$sym > /dev/null; then\n"
+" :\n"
+" else\n"
+" $have_xmodmap -e \\\"keycode any = \\$sym\\\"\n"
+" fi\n"
+" done\n"
+" fi\n"
+"\n"
+" )\" 1>&2 &\n"
+" else\n"
+" (\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"
+" -e 'add Control = Control_L Control_R' \\\n"
+" -e 'keycode any = Alt_L' \\\n"
+" -e 'keycode any = Alt_R' \\\n"
+" -e 'keycode any = Meta_L' \\\n"
+" -e 'clear Mod1' \\\n"
+" -e 'add Mod1 = Alt_L Alt_R Meta_L';\n"
+" # this is to workaround a bug with JDS Solaris 10 gnome-session-daemon.\n"
+" if uname | grep SunOS > /dev/null; then\n"
+" for sym in SunAudioMute SunAudioLowerVolume SunAudioRaiseVolume\n"
+" do\n"
+" if $have_xmodmap -pk | grep -w $sym > /dev/null; then\n"
+" :\n"
+" else\n"
+" $have_xmodmap -e \"keycode any = $sym\"\n"
+" fi\n"
+" done\n"
+" fi\n"
+" ) 1>&2 &\n"
+" fi\n"
+"}\n"
"\n"
"try_Xvfb() {\n"
" if [ \"X$have_Xvfb\" = \"X\" ]; then\n"
@@ -2045,58 +2092,27 @@ char create_display[] =
" server $have_Xvfb :$N $sarg 0 ${geom}x${depth} $margs\n"
"\n"
" if [ \"X$result\" = \"X1\" -a \"X$have_xmodmap\" != \"X\" ]; then\n"
-" if [ \"X$have_root\" = \"X\" ]; then\n"
-" $have_nohup sh -c \"(\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"
-" -e 'add Control = Control_L Control_R' \\\n"
-" -e 'keycode any = Alt_L' \\\n"
-" -e 'keycode any = Alt_R' \\\n"
-" -e 'keycode any = Meta_L' \\\n"
-" -e 'clear Mod1' \\\n"
-" -e 'add Mod1 = Alt_L Alt_R Meta_L';\n"
-" if uname | grep SunOS > /dev/null; then\n"
-" for sym in SunAudioMute SunAudioLowerVolume SunAudioRaiseVolume\n"
-" do\n"
-" if $have_xmodmap -pk | grep -w \\$sym > /dev/null; then\n"
-" :\n"
-" else\n"
-" $have_xmodmap -e \\\"keycode any = \\$sym\\\"\n"
-" fi\n"
-" done\n"
-" fi\n"
+" add_modmap\n"
+" fi\n"
+"}\n"
"\n"
-" )\" 1>&2 &\n"
-" else\n"
-" (\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"
-" -e 'add Control = Control_L Control_R' \\\n"
-" -e 'keycode any = Alt_L' \\\n"
-" -e 'keycode any = Alt_R' \\\n"
-" -e 'keycode any = Meta_L' \\\n"
-" -e 'clear Mod1' \\\n"
-" -e 'add Mod1 = Alt_L Alt_R Meta_L';\n"
-" # this is to workaround a bug with JDS Solaris 10 gnome-session-daemon.\n"
-" if uname | grep SunOS > /dev/null; then\n"
-" for sym in SunAudioMute SunAudioLowerVolume SunAudioRaiseVolume\n"
-" do\n"
-" if $have_xmodmap -pk | grep -w $sym > /dev/null; then\n"
-" :\n"
-" else\n"
-" $have_xmodmap -e \"keycode any = $sym\"\n"
-" fi\n"
-" done\n"
-" fi\n"
-" ) 1>&2 &\n"
-" fi\n"
+"try_Xdummy() {\n"
+" if [ \"X$have_Xdummy\" = \"X\" ]; then\n"
+" return\n"
+" fi\n"
+" if [ \"X$FD_XDUMMY_RUN_AS_ROOT\" != \"X\" -a \"X$have_root\" = \"X\" ]; then\n"
+" return\n"
+" fi\n"
+"\n"
+" server $have_Xdummy :$N -geometry $geom -depth $depth\n"
+" \n"
+" if [ \"X$result\" = \"X1\" -a \"X$have_xprop\" != \"X\" ]; then\n"
+" (sleep 1; $have_xprop -display :$N -root -f X11VNC_TRAP_XRANDR 8s -set X11VNC_TRAP_XRANDR 1 >/dev/null 2>&1) &\n"
+" sleep 1\n"
" fi\n"
"}\n"
"\n"
+"\n"
"cookie() {\n"
" cookie=\"\"\n"
" if [ \"X$have_mcookie\" != \"X\" ]; then\n"
@@ -2234,7 +2250,7 @@ char create_display[] =
" USER=`whoami`\n"
"fi\n"
"\n"
-"PATH=$PATH:/usr/X11R6/bin:/usr/bin/X11:/usr/openwin/bin:/usr/dt/bin:/opt/kde4/bin:/opt/kde3/bin:/opt/gnome/bin:/usr/bin:/bin:/usr/sfw/bin\n"
+"PATH=$PATH:/usr/X11R6/bin:/usr/bin/X11:/usr/openwin/bin:/usr/dt/bin:/opt/kde4/bin:/opt/kde3/bin:/opt/gnome/bin:/usr/bin:/bin:/usr/sfw/bin:/usr/local/bin\n"
"\n"
"have_root=\"\"\n"
"id0=`id`\n"
@@ -2247,7 +2263,7 @@ char create_display[] =
" p_ok=1\n"
"fi\n"
"\n"
-"for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb Xvnc xauth xdpyinfo mcookie md5sum xmodmap startkde dbus-launch gnome-session blackbox fvwm2 mwm openbox twm windowmaker wmaker enlightenment metacity X Xorg XFree86 Xsun Xsession dtwm netstat nohup esddsp konsole gnome-terminal x-terminal-emulator perl startxfce4 startxfce\n"
+"for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb Xvnc xauth xdpyinfo mcookie md5sum xmodmap startkde startlxde dbus-launch gnome-session blackbox fvwm2 mwm openbox twm windowmaker wmaker enlightenment metacity X Xorg XFree86 Xsun Xsession dtwm netstat nohup esddsp konsole gnome-terminal x-terminal-emulator perl startxfce4 startxfce xprop\n"
"do\n"
" p2=`echo \"$prog\" | sed -e 's/-/_/g'`\n"
" eval \"have_$p2=''\"\n"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 16:38:32 +0000