This commit is contained in:
Nicholas Marriott 2007-10-04 11:23:17 +00:00
parent 225e07fe38
commit ff56ed7bd6
5 changed files with 13 additions and 9 deletions

View File

@ -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 .SUFFIXES: .c .o .y .h
.PHONY: clean .PHONY: clean
@ -13,7 +13,6 @@ DATE!= date +%Y%m%d-%H%M
# This must be empty as OpenBSD includes it in default CFLAGS. # This must be empty as OpenBSD includes it in default CFLAGS.
DEBUG= DEBUG=
# Command prefix. This will go when we get a configuration file...
META?= \002 # C-b META?= \002 # C-b
SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ 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 \ 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-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-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 YACC= yacc -d

3
cmd.c
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -29,6 +29,7 @@ const struct cmd_entry *cmd_table[] = {
&cmd_last_window_entry, &cmd_last_window_entry,
&cmd_list_keys_entry, &cmd_list_keys_entry,
&cmd_list_sessions_entry, &cmd_list_sessions_entry,
&cmd_list_windows_entry,
&cmd_new_session_entry, &cmd_new_session_entry,
&cmd_new_window_entry, &cmd_new_window_entry,
&cmd_next_window_entry, &cmd_next_window_entry,

View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -81,6 +81,8 @@ key_bindings_init(void)
{ 'd', &cmd_detach_session_entry, NULL }, { 'd', &cmd_detach_session_entry, NULL },
{ 'S', &cmd_list_sessions_entry, NULL }, { 'S', &cmd_list_sessions_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 },
{ '/', &cmd_list_keys_entry, NULL }, { '/', &cmd_list_keys_entry, NULL },
{ 'C', &cmd_new_window_entry, NULL }, { 'C', &cmd_new_window_entry, NULL },

5
tmux.c
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -171,7 +171,7 @@ main(int argc, char **argv)
*name = '\0'; *name = '\0';
path = NULL; path = NULL;
while ((opt = getopt(argc, argv, "S:s:v?")) != EOF) { while ((opt = getopt(argc, argv, "S:s:v")) != EOF) {
switch (opt) { switch (opt) {
case 'S': case 'S':
path = xstrdup(optarg); path = xstrdup(optarg);
@ -183,7 +183,6 @@ main(int argc, char **argv)
case 'v': case 'v':
debug_level++; debug_level++;
break; break;
case '?':
default: default:
goto usage; goto usage;
} }

4
tmux.h
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -462,6 +462,7 @@ enum cmd_type {
CMD_LASTWINDOW, CMD_LASTWINDOW,
CMD_LISTKEYS, CMD_LISTKEYS,
CMD_LISTSESSIONS, CMD_LISTSESSIONS,
CMD_LISTWINDOWS,
CMD_NEWSESSION, CMD_NEWSESSION,
CMD_NEWWINDOW, CMD_NEWWINDOW,
CMD_NEXTWINDOW, 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_last_window_entry;
extern const struct cmd_entry cmd_list_keys_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_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_session_entry;
extern const struct cmd_entry cmd_new_window_entry; extern const struct cmd_entry cmd_new_window_entry;
extern const struct cmd_entry cmd_next_window_entry; extern const struct cmd_entry cmd_next_window_entry;