Nuke ?.

5 files changed, 13 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 31127c64..95f5e7d8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 2007-10-04 10:54:20 nicm Exp $
+# $Id: Makefile,v 1.21 2007-10-04 11:23:17 nicm Exp $
 
 .SUFFIXES: .c .o .y .h
 .PHONY: clean
@@ -13,7 +13,6 @@ DATE!= date +%Y%m%d-%H%M
 # This must be empty as OpenBSD includes it in default CFLAGS.
 DEBUG=
 
-# Command prefix. This will go when we get a configuration file...
 META?= \002 # C-b
 
 SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \
@@ -22,7 +21,8 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \
       key-bindings.c cmd.c cmd-new-session.c cmd-detach-session.c \
       cmd-list-sessions.c cmd-new-window.c cmd-next-window.c cmd-bind-key.c \
       cmd-unbind-key.c cmd-previous-window.c cmd-last-window.c cmd-list-keys.c \
-      cmd-set-option.c cmd-rename-window.c cmd-select-window.c
+      cmd-set-option.c cmd-rename-window.c cmd-select-window.c \
+      cmd-list-windows.c
 
 YACC= yacc -d
 
diff --git a/cmd.c b/cmd.c
index 8b5cb649..63aea9ca 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.10 2007-10-04 10:54:21 nicm Exp $ */
+/* $Id: cmd.c,v 1.11 2007-10-04 11:23:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,6 +29,7 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_last_window_entry,
 	&cmd_list_keys_entry,
 	&cmd_list_sessions_entry,
+	&cmd_list_windows_entry,
 	&cmd_new_session_entry,
 	&cmd_new_window_entry,
 	&cmd_next_window_entry,
diff --git a/key-bindings.c b/key-bindings.c
index 6103fe14..d62166ae 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -1,4 +1,4 @@
-/* $Id: key-bindings.c,v 1.5 2007-10-04 10:54:21 nicm Exp $ */
+/* $Id: key-bindings.c,v 1.6 2007-10-04 11:23:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -81,6 +81,8 @@ key_bindings_init(void)
 		{ 'd', &cmd_detach_session_entry, NULL },
 		{ 'S', &cmd_list_sessions_entry, NULL },
 		{ 's', &cmd_list_sessions_entry, NULL },
+		{ 'W', &cmd_list_windows_entry, NULL },
+		{ 'w', &cmd_list_windows_entry, NULL },	
 		{ '?', &cmd_list_keys_entry, NULL },
 		{ '/', &cmd_list_keys_entry, NULL },
 		{ 'C', &cmd_new_window_entry, NULL },
diff --git a/tmux.c b/tmux.c
index 7a0124d0..e4d3f57a 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.27 2007-10-03 22:32:24 nicm Exp $ */
+/* $Id: tmux.c,v 1.28 2007-10-04 11:23:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -171,7 +171,7 @@ main(int argc, char **argv)
 
 	*name = '\0';
 	path = NULL;
-        while ((opt = getopt(argc, argv, "S:s:v?")) != EOF) {
+        while ((opt = getopt(argc, argv, "S:s:v")) != EOF) {
                 switch (opt) {
 		case 'S':
 			path = xstrdup(optarg);
@@ -183,7 +183,6 @@ main(int argc, char **argv)
 		case 'v':
 			debug_level++;
 			break;
-                case '?':
                 default:
 			goto usage;
                 }
diff --git a/tmux.h b/tmux.h
index 94ad6253..706da178 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.45 2007-10-04 10:54:21 nicm Exp $ */
+/* $Id: tmux.h,v 1.46 2007-10-04 11:23:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -462,6 +462,7 @@ enum cmd_type {
 	CMD_LASTWINDOW,
 	CMD_LISTKEYS,
 	CMD_LISTSESSIONS,
+	CMD_LISTWINDOWS,
 	CMD_NEWSESSION,
 	CMD_NEWWINDOW,
 	CMD_NEXTWINDOW,
@@ -537,6 +538,7 @@ extern const struct cmd_entry cmd_detach_session_entry;
 extern const struct cmd_entry cmd_last_window_entry;
 extern const struct cmd_entry cmd_list_keys_entry;
 extern const struct cmd_entry cmd_list_sessions_entry;
+extern const struct cmd_entry cmd_list_windows_entry;
 extern const struct cmd_entry cmd_new_session_entry;
 extern const struct cmd_entry cmd_new_window_entry;
 extern const struct cmd_entry cmd_next_window_entry;