Rename some flags I'm not happy about.

This commit is contained in:
Nicholas Marriott 2009-01-14 22:16:57 +00:00
parent 145b2685a1
commit 78c96751e6
10 changed files with 22 additions and 22 deletions

View File

@ -1,4 +1,4 @@
/* $Id: cmd-command-prompt.c,v 1.8 2009-01-13 01:08:40 nicm Exp $ */ /* $Id: cmd-command-prompt.c,v 1.9 2009-01-14 22:16:56 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -35,7 +35,7 @@ int cmd_command_prompt_callback(void *, const char *);
const struct cmd_entry cmd_command_prompt_entry = { const struct cmd_entry cmd_command_prompt_entry = {
"command-prompt", NULL, "command-prompt", NULL,
CMD_TARGET_CLIENT_USAGE " [template]", CMD_TARGET_CLIENT_USAGE " [template]",
CMD_ZEROONEARG, CMD_ARG01,
cmd_command_prompt_init, cmd_command_prompt_init,
cmd_target_parse, cmd_target_parse,
cmd_command_prompt_exec, cmd_command_prompt_exec,

View File

@ -1,4 +1,4 @@
/* $Id: cmd-generic.c,v 1.20 2009-01-12 19:23:14 nicm Exp $ */ /* $Id: cmd-generic.c,v 1.21 2009-01-14 22:16:56 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -90,14 +90,14 @@ cmd_fill_argument(int flags, char **arg, int argc, char **argv)
{ {
*arg = NULL; *arg = NULL;
if (flags & CMD_ONEARG) { if (flags & CMD_ARG1) {
if (argc != 1) if (argc != 1)
return (-1); return (-1);
*arg = xstrdup(argv[0]); *arg = xstrdup(argv[0]);
return (0); return (0);
} }
if (flags & CMD_ZEROONEARG) { if (flags & CMD_ARG01) {
if (argc != 0 && argc != 1) if (argc != 0 && argc != 1)
return (-1); return (-1);
if (argc == 1) if (argc == 1)

View File

@ -1,4 +1,4 @@
/* $Id: cmd-rename-session.c,v 1.13 2008-12-10 20:25:41 nicm Exp $ */ /* $Id: cmd-rename-session.c,v 1.14 2009-01-14 22:16:56 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -31,7 +31,7 @@ void cmd_rename_session_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_rename_session_entry = { const struct cmd_entry cmd_rename_session_entry = {
"rename-session", "rename", "rename-session", "rename",
CMD_TARGET_SESSION_USAGE " new-name", CMD_TARGET_SESSION_USAGE " new-name",
CMD_ONEARG, CMD_ARG1,
cmd_target_init, cmd_target_init,
cmd_target_parse, cmd_target_parse,
cmd_rename_session_exec, cmd_rename_session_exec,

View File

@ -1,4 +1,4 @@
/* $Id: cmd-rename-window.c,v 1.23 2008-12-10 20:25:41 nicm Exp $ */ /* $Id: cmd-rename-window.c,v 1.24 2009-01-14 22:16:57 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -31,7 +31,7 @@ void cmd_rename_window_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_rename_window_entry = { const struct cmd_entry cmd_rename_window_entry = {
"rename-window", "renamew", "rename-window", "renamew",
CMD_TARGET_WINDOW_USAGE " new-name", CMD_TARGET_WINDOW_USAGE " new-name",
CMD_ONEARG, CMD_ARG1,
cmd_target_init, cmd_target_init,
cmd_target_parse, cmd_target_parse,
cmd_rename_window_exec, cmd_rename_window_exec,

View File

@ -1,4 +1,4 @@
/* $Id: cmd-resize-pane-down.c,v 1.4 2009-01-14 22:13:30 nicm Exp $ */ /* $Id: cmd-resize-pane-down.c,v 1.5 2009-01-14 22:16:57 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -32,7 +32,7 @@ void cmd_resize_pane_down_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_resize_pane_down_entry = { const struct cmd_entry cmd_resize_pane_down_entry = {
"resize-pane-down", "resizep-down", "resize-pane-down", "resizep-down",
CMD_PANE_WINDOW_USAGE " [adjustment]", CMD_PANE_WINDOW_USAGE " [adjustment]",
CMD_ZEROONEARG|CMD_CANREPEAT, CMD_ARG01|CMD_CANREPEAT,
cmd_resize_pane_down_init, cmd_resize_pane_down_init,
cmd_pane_parse, cmd_pane_parse,
cmd_resize_pane_down_exec, cmd_resize_pane_down_exec,

View File

@ -1,4 +1,4 @@
/* $Id: cmd-resize-pane-up.c,v 1.4 2009-01-14 22:13:30 nicm Exp $ */ /* $Id: cmd-resize-pane-up.c,v 1.5 2009-01-14 22:16:57 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -32,7 +32,7 @@ void cmd_resize_pane_up_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_resize_pane_up_entry = { const struct cmd_entry cmd_resize_pane_up_entry = {
"resize-pane-up", "resizep-up", "resize-pane-up", "resizep-up",
CMD_PANE_WINDOW_USAGE " [adjustment]", CMD_PANE_WINDOW_USAGE " [adjustment]",
CMD_ZEROONEARG|CMD_CANREPEAT, CMD_ARG01|CMD_CANREPEAT,
cmd_resize_pane_up_init, cmd_resize_pane_up_init,
cmd_pane_parse, cmd_pane_parse,
cmd_resize_pane_up_exec, cmd_resize_pane_up_exec,

View File

@ -1,4 +1,4 @@
/* $Id: cmd-respawn-window.c,v 1.10 2009-01-14 19:29:32 nicm Exp $ */ /* $Id: cmd-respawn-window.c,v 1.11 2009-01-14 22:16:57 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -31,7 +31,7 @@ void cmd_respawn_window_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_respawn_window_entry = { const struct cmd_entry cmd_respawn_window_entry = {
"respawn-window", "respawnw", "respawn-window", "respawnw",
"[-k] " CMD_TARGET_WINDOW_USAGE " [command]", "[-k] " CMD_TARGET_WINDOW_USAGE " [command]",
CMD_ZEROONEARG|CMD_KFLAG, CMD_ARG01|CMD_KFLAG,
cmd_target_init, cmd_target_init,
cmd_target_parse, cmd_target_parse,
cmd_respawn_window_exec, cmd_respawn_window_exec,

View File

@ -1,4 +1,4 @@
/* $Id: cmd-save-buffer.c,v 1.1 2009-01-11 23:14:57 nicm Exp $ */ /* $Id: cmd-save-buffer.c,v 1.2 2009-01-14 22:16:57 nicm Exp $ */
/* /*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@ -33,7 +33,7 @@ void cmd_save_buffer_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_save_buffer_entry = { const struct cmd_entry cmd_save_buffer_entry = {
"save-buffer", "saveb", "save-buffer", "saveb",
"[-a] " CMD_BUFFER_SESSION_USAGE " path", "[-a] " CMD_BUFFER_SESSION_USAGE " path",
CMD_AFLAG|CMD_ONEARG, CMD_AFLAG|CMD_ARG1,
cmd_buffer_init, cmd_buffer_init,
cmd_buffer_parse, cmd_buffer_parse,
cmd_save_buffer_exec, cmd_save_buffer_exec,

View File

@ -1,4 +1,4 @@
/* $Id: cmd-set-buffer.c,v 1.4 2008-12-10 20:25:41 nicm Exp $ */ /* $Id: cmd-set-buffer.c,v 1.5 2009-01-14 22:16:57 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -31,7 +31,7 @@ void cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_set_buffer_entry = { const struct cmd_entry cmd_set_buffer_entry = {
"set-buffer", "setb", "set-buffer", "setb",
CMD_BUFFER_SESSION_USAGE " data", CMD_BUFFER_SESSION_USAGE " data",
CMD_ONEARG, CMD_ARG1,
cmd_buffer_init, cmd_buffer_init,
cmd_buffer_parse, cmd_buffer_parse,
cmd_set_buffer_exec, cmd_set_buffer_exec,

6
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.233 2009-01-14 22:13:30 nicm Exp $ */ /* $Id: tmux.h,v 1.234 2009-01-14 22:16:57 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -813,8 +813,8 @@ struct cmd_entry {
#define CMD_STARTSERVER 0x1 #define CMD_STARTSERVER 0x1
#define CMD_CANTNEST 0x2 #define CMD_CANTNEST 0x2
#define CMD_ONEARG 0x4 #define CMD_ARG1 0x4
#define CMD_ZEROONEARG 0x8 #define CMD_ARG01 0x8
#define CMD_CANREPEAT 0x10 #define CMD_CANREPEAT 0x10
#define CMD_KFLAG 0x10 #define CMD_KFLAG 0x10
#define CMD_DFLAG 0x20 #define CMD_DFLAG 0x20