Sort options from Pierre Riteau.

6 files changed, 27 insertions, 15 deletions

diff --git a/GNUmakefile b/GNUmakefile
index f86836b3..629eb3ee 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,9 +1,9 @@
-# $Id: GNUmakefile,v 1.19 2008-06-16 06:10:02 nicm Exp $
+# $Id: GNUmakefile,v 1.20 2008-06-18 16:39:15 nicm Exp $
 
 .PHONY: clean
 
 PROG= tmux
-VERSION= 0.2
+VERSION= 0.4
 
 DATE= $(shell date +%Y%m%d-%H%M)
 
diff --git a/TODO b/TODO
index 9bc95259..7002d4e0 100644
--- a/TODO
+++ b/TODO
@@ -67,10 +67,22 @@
 - figure out Linux tcsetattr problem, remove header bodge if unnecessary
 - flags to centre screen in window
 - get rid of DEFDATA etc
+- scroll status line to show current window. mark beginning end with "<-"/"->"
+  and highlight this if any off-screen are active
 
--- For 0.3 --------------------------------------------------------------------
+---
+support window title commands properly:
+
+\033]0;string\007
+\033]1;string\007
+\033]2;string\007
+\033_string\033\\
+
+accept them all, save to window title
+option to pass through to xterm window when switching window
 
 -- For 0.4 --------------------------------------------------------------------
+- document status-left/status-right/status-interval
 - test and fix wsvt25
 - clear EOL etc CANNOT rely on term using the current colour/attr and probably
   should not emulate it doing so
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 479cc01a..119f090b 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.27 2008-06-05 21:25:00 nicm Exp $ */
+/* $Id: cmd-new-session.c,v 1.28 2008-06-18 16:39:15 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -43,7 +43,7 @@ struct cmd_new_session_data {
 
 const struct cmd_entry cmd_new_session_entry = {
 	"new-session", "new",
-	"[-d] [-s session-name] [-n window-name] [command]",
+	"[-d] [-n window-name] [-s session-name] [command]",
 	CMD_STARTSERVER|CMD_CANTNEST,
 	cmd_new_session_init,
 	cmd_new_session_parse,
diff --git a/cmd-new-window.c b/cmd-new-window.c
index 2f30f35b..d139e94f 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-window.c,v 1.23 2008-06-05 21:25:00 nicm Exp $ */
+/* $Id: cmd-new-window.c,v 1.24 2008-06-18 16:39:15 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,7 +44,7 @@ struct cmd_new_window_data {
 
 const struct cmd_entry cmd_new_window_entry = {
 	"new-window", "neww",
-	"[-d] [-t target-window] [-n window-name] [command]",
+	"[-d] [-n window-name] [-t target-window] [command]",
 	0,
 	cmd_new_window_init,
 	cmd_new_window_parse,
diff --git a/tmux.1 b/tmux.1
index 36698ae4..d3fb1266 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.38 2008-06-17 06:22:15 nicm Exp $
+.\" $Id: tmux.1,v 1.39 2008-06-18 16:39:15 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm tmux
 .Bk -words
-.Op Fl vVq
+.Op Fl qVv
 .Op Fl f Ar file
 .Op Fl S Ar socket-path
 .Op Ar command Op Ar flags
@@ -70,6 +70,8 @@ where
 .Em UID
 is the uid of the user who invoked
 .Nm .
+.It Fl V
+Print program version.
 .It Fl v
 Request verbose logging.
 This option may be specified multiple times for increasing verbosity.
@@ -80,8 +82,6 @@ and
 files in the current directory, where
 .Em PID
 is the pid of the server or client process.
-.It Fl V
-Print program version.
 .It Ar command Op Ar flags
 This specifies one of a set of commands used to control
 .Nm ,
@@ -417,8 +417,8 @@ List windows in the current session or in
 .Ar target-session .
 .It Xo Ic new-session
 .Op Fl d
-.Op Fl s Ar session-name
 .Op Fl n Ar window-name
+.Op Fl s Ar session-name
 .Op Ar command
 .Xc
 .D1 (alias: Ic new )
@@ -433,8 +433,8 @@ and
 are the name of and command to execute in the initial window.
 .It Xo Ic new-window
 .Op Fl d
-.Op Fl t Ar target-window
 .Op Fl n Ar window-name
+.Op Fl t Ar target-window
 .Op Ar command
 .Xc
 .D1 (alias: Ic neww )
diff --git a/tmux.c b/tmux.c
index edc2a81a..0621a020 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.56 2008-06-16 17:35:40 nicm Exp $ */
+/* $Id: tmux.c,v 1.57 2008-06-18 16:39:15 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -175,7 +175,7 @@ main(int argc, char **argv)
 	int	 		 n, opt;
 
 	client = path = name = NULL;
-        while ((opt = getopt(argc, argv, "f:S:qvV")) != EOF) {
+        while ((opt = getopt(argc, argv, "f:qS:Vv")) != EOF) {
                 switch (opt) {
 		case 'f':
 			cfg_file = xstrdup(optarg);