making the default system.fvwmrc a bit less obsolete.

- remove xman (was removed from xenocara base)
- replace rlogin with ssh in modules
- make the fg color for ssh / telnet prompts black so that's it's
  readable.

ok deraadt@

1 files changed, 40 insertions, 42 deletions

diff --git a/app/fvwm/sample.fvwmrc/system.fvwmrc b/app/fvwm/sample.fvwmrc/system.fvwmrc
index d772a7bee..af4fea743 100644
--- a/app/fvwm/sample.fvwmrc/system.fvwmrc
+++ b/app/fvwm/sample.fvwmrc/system.fvwmrc
@@ -55,7 +55,6 @@ Style "xbiff"       NoTitle, Sticky, WindowListSkip, ClickToFocus
 Style "xcalc"       Icon xcalc.xpm, NoButton 2,RandomPlacement,ClickToFocus
 Style "xmh"         Icon mail1.xpm, NoIconTitle,StickyIcon
 Style "xmh"	    RandomPlacement, NoButton 2
-Style "xman"	    Icon xman.xpm, RandomPlacement, ClickToFocus
 Style "xmag"	    Icon mag_glass.xpm, RandomPlacement, ClickToFocus
 Style "xgraph"      Icon graphs.xpm, RandomPlacement, ClickToFocus
 Style "xmosaic"     Color Green/Yellow, ClickToFocus
@@ -115,13 +114,12 @@ AddToMenu RootMenu	"Root Menu"	Title
 AddToMenu Utilities     "Utilities" Title
 +			"Top"		Exec exec xterm -T Top -n Top -e top
 +			"Calculator"	Exec exec xcalc
-+			"Xman"		Exec exec xman
 +			"Xmag"		Exec exec xmag
 +                       "Editres"       Exec exec editres
 +			""		Nop
 #+			"XEmacs"	Exec exec xemacs
 #+                       "Mail"          MailFunction xmh "-font fixed"
-+			""		Nop
+#+			""		Nop
 +                       "XLock%mini.xlock.xpm%"         Exec exec xlock
 +			""		Nop
 +                       "Reset X defaults" Exec xrdb -load $HOME/.Xdefaults
@@ -200,7 +198,7 @@ AddToMenu Module-Popup	"FvwmModules"	Title
 +			"IconBox"	Module	FvwmIconBox
 +                       "IconMan"       Module  FvwmIconMan
 +			""		Nop
-+                       "Form - Rlogin"      Module FvwmForm Rlogin
++                       "Form - Ssh"	     Module FvwmForm Ssh
 +                       "Form - MyFvwmTalk"  Module FvwmForm MyFvwmTalk
 +                       "Form - QuitVerify"  Module FvwmForm QuitVerify
 
@@ -259,8 +257,8 @@ AddToFunc PrintReverseFunction  "I" Raise
 AddToFunc Iconify-and-Raise     "I" Iconify
 +                               "I" Raise
 
-# RLOGIN machine fg bg
-AddToFunc RLOGIN "I" Exec xterm -fg $1 -bg $2 -e rlogin $0 -8
+# SSH machine fg bg
+AddToFunc SSH "I" Exec xterm -fg $1 -bg $2 -e ssh $0
 
 # TELNET machine fg bg
 AddToFunc TELNET "I" Exec xterm -fg $1 -bg $2 -e telnet $0
@@ -421,43 +419,43 @@ Key F8		A	M	CirculateDown
 #
 *FvwmIconBox            "Fvwm*"         -
 
-# FvwmForm alias - rlogin or telnet to host via xterm
-*RloginWarpPointer
-*RloginFont         *helvetica*m*r*n*12*
-*RloginButtonFont   *helvetica*m*o*n*12*
-*RloginInputFont    *cour*m*r*n*12*
-*RloginFore         Black
-*RloginBack         White
-*RloginItemFore     Yellow
-*RloginItemBack     Wheat
+# FvwmForm alias - ssh or telnet to host via xterm
+*SshWarpPointer
+*SshFont         *helvetica*m*r*n*12*
+*SshButtonFont   *helvetica*m*o*n*12*
+*SshInputFont    *cour*m*r*n*12*
+*SshFore         Black
+*SshBack         White
+*SshItemFore     Black
+*SshItemBack     Wheat
 # begin items
-*RloginLine         center
-*RloginText         "Login to Remote Host"
-*RloginLine         center
-*RloginText         "Host:"
-*RloginInput        HostName  30   ""
-*RloginLine         center
-*RloginSelection    meth single
-*RloginChoice       TN TN off "telnet"
-*RloginChoice       RL RL on "rlogin"
-*RloginSelection    UserSel   single
-#*RloginChoice       Default   Default   on   "same user"
-#*RloginChoice       Custom    Custom    off  "user:"
-*RloginText         "(Userid:"
-*RloginInput        UserName  10   ""
-*RloginText         ")"
-*RloginLine         center
-*RloginText         "FG:"
-*RloginInput        FgColor 15 ""
-*RloginText         "BG:"
-*RloginInput        BgColor 15 ""
-*RloginLine         expand
-*RloginButton       quit "Login" ^M
-*RloginCommand Exec xterm  $(FgColor?-fg $(FgColor)) $(BgColor?-bg $(BgColor)) -T xterm@$(HostName) -e $(RL?rlogin) $(TN?telnet) $(HostName) $(RL?-8 $(UserName?-l $(UserName)))
-*RloginButton       restart   "Clear"
-*RloginCommand Beep
-*RloginButton       quit "Cancel"
-*RloginCommand Nop
+*SshLine         center
+*SshText         "Login to Remote Host"
+*SshLine         center
+*SshText         "Host:"
+*SshInput        HostName  30   ""
+*SshLine         center
+*SshSelection    meth single
+*SshChoice       TN TN off "telnet"
+*SshChoice       RL RL on "ssh"
+*SshSelection    UserSel   single
+#*SshChoice       Default   Default   on   "same user"
+#*SshChoice       Custom    Custom    off  "user:"
+*SshText         "(Userid:"
+*SshInput        UserName  10   ""
+*SshText         ")"
+*SshLine         center
+*SshText         "FG:"
+*SshInput        FgColor 15 ""
+*SshText         "BG:"
+*SshInput        BgColor 15 ""
+*SshLine         expand
+*SshButton       quit "Login" ^M
+*SshCommand Exec xterm  $(FgColor?-fg $(FgColor)) $(BgColor?-bg $(BgColor)) -T xterm@$(HostName) -e $(RL?ssh) $(TN?telnet) $(HostName) $(UserName?-l $(UserName))
+*SshButton       restart   "Clear"
+*SshCommand Beep
+*SshButton       quit "Cancel"
+*SshCommand Nop
 
 # FvwmForm alias - query exit ala mwm
 *QuitVerifyGrabServer