From b4f62edceb88e8fc0c2029b68ed90f97ac70a00e Mon Sep 17 00:00:00 2001
From: memotype <memotype@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 2 Jul 2008 13:54:02 +0000
Subject: [PATCH] changed slightly the commandline options for wcons and
 updated man page.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1825 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/wcons             |  4 +--
 xCAT-client/pods/man1/wcons.1.pod | 45 +++++++------------------------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/xCAT-client/bin/wcons b/xCAT-client/bin/wcons
index 853ae5531..23fd20649 100755
--- a/xCAT-client/bin/wcons
+++ b/xCAT-client/bin/wcons
@@ -82,7 +82,7 @@ if (defined($tilefact)) {
    }
 
 
-   system("xterm $xrm -bg black -fg white ".join(" ",@ARGV)." -title $firstnode -n $firstnode -geometry +0+0 -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & let SDATE=`date +%s`+5; $mydir/rcons $firstnode ".$conservers{$firstnode}."; if [ \\\$SDATE -gt \\`date +%s\\` ]; then echo Press enter to close; read SDATE; fi  \" &");
+   system("xterm $xrm -bg black -fg white -title $firstnode -n $firstnode -geometry +0+0 ".join(" ",@ARGV)." -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & let SDATE=`date +%s`+5; $mydir/rcons $firstnode ".$conservers{$firstnode}."; if [ \\\$SDATE -gt \\`date +%s\\` ]; then echo Press enter to close; read SDATE; fi  \" &");
    sleep(2); #Give time for window manager to figure out everything
    my $xinfo = `xwininfo -name $firstnode`;
    my @xinfl = split(/\n/,$xinfo);
@@ -118,7 +118,7 @@ if (defined($tilefact)) {
       $currx=0;
    }
 } else {
-   system("xterm $xrm -bg black -fg white ".join(" ",@ARGV)." -title $firstnode -n $firstnode -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & let SDATE=`date +%s`+5; $mydir/rcons $firstnode ".$conservers{$firstnode}."; if [ \\\$SDATE -gt \\`date +%s\\` ]; then echo Press enter to close; read SDATE; fi\" &");
+   system("xterm $xrm -bg black -fg white -title $firstnode -n $firstnode ".join(" ",@ARGV)." -e /bin/sh -c \"$mydir/xtcd.pl ".$ENV{DISPLAY}." $firstnode $firstnode & let SDATE=`date +%s`+5; $mydir/rcons $firstnode ".$conservers{$firstnode}."; if [ \\\$SDATE -gt \\`date +%s\\` ]; then echo Press enter to close; read SDATE; fi\" &");
 
 }
 my $geometry="";
diff --git a/xCAT-client/pods/man1/wcons.1.pod b/xCAT-client/pods/man1/wcons.1.pod
index 0ad1b3996..25d70f571 100644
--- a/xCAT-client/pods/man1/wcons.1.pod
+++ b/xCAT-client/pods/man1/wcons.1.pod
@@ -4,7 +4,7 @@ wcons - windowed remote console
 
 =head1 B<Synopsis>
 
-B<wcons>  [B<-t>|B<--tile>=I<n>] I<noderange>
+B<wcons>  [B<-t>|B<--tile>=I<n>] [I<xterm-options>] I<noderange>
 
 B<wcons> [B<-h>|B<--help>|B<-v>|B<--version>]
 
@@ -26,39 +26,6 @@ ified  then  tile  I<n> across.  If I<n> is not specified then tile to
 edge of screen.  If tiled B<wcons> windows reach bottom right, then
 the windows start at top left overlaying existing B<wcons> windows.
 
-=item B<-f>|B<--font>=I<font>
-
-B<Note:> this option is not supported yet!  Use Xwindows font I<font> for B<wcons> windows.
-B<wcons>  supports  the following font aliases:
-
-=over 25
-
-=item B<Alias>
-
-B<Font>
-
-=item I<verysmall>|I<vs>
-
-nil2
-
-=item I<small>|I<s>
-
-5x8
-
-=item I<medium>|I<med>|I<m>
-
-6x13
-
-=item I<large>|I<l>|I<big>|I<b>
-
-7x13
-
-=item I<verylarge>|I<vl>|I<verybig>|I<vb>
-
-10x20
-
-=back
-
 =item B<-h>|B<--help>
 
 Print help.
@@ -67,6 +34,14 @@ Print help.
 
 Print version.
 
+=item I<xterm options>
+
+See xterm(1). Any options other than those listed above are passed
+directly to xterm. B<Note:> when given multiple nodes, wcons will
+override B<-title> and tries to figure out optimal B<-geometry> 
+options for the xterms (however, B<-geometry> can still be
+specified).
+
 =back
 
 
@@ -99,4 +74,4 @@ Egan Ford <egan@us.ibm.com>
 
 =head1 B<See> B<Also>
 
-L<noderange(3)|noderange.3>, L<rcons(1)|rcons.1>
+L<noderange(3)|noderange.3>, L<rcons(1)|rcons.1>, xterm(1)