Instead of combined flags for -c, -s, -t, split into different sets

using an enum and simplify the parsing code.
tmate-io · Dec 14, 2015 · a3129fd · a3129fd
1 parent ecfeee2
commit a3129fd
Show file tree

Hide file tree

Showing 53 changed files with 347 additions and 322 deletions.
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
@@ -39,7 +39,9 @@ const struct cmd_entry cmd_attach_session_entry = {
 	.args = { "c:dErt:", 0, 0 },
 	.usage = "[-dEr] [-c working-directory] " CMD_TARGET_SESSION_USAGE,
 
-	.flags = CMD_STARTSERVER|CMD_SESSION_T|CMD_PANE_T|CMD_PREFERUNATTACHED,
+	.tflag = CMD_SESSION_WITHPANE,
+
+	.flags = CMD_STARTSERVER,
 	.exec = cmd_attach_session_exec
 };
 

diff --git a/cmd-break-pane.c b/cmd-break-pane.c
@@ -37,7 +37,10 @@ const struct cmd_entry cmd_break_pane_entry = {
 	.args = { "dPF:s:t:", 0, 0 },
 	.usage = "[-dP] [-F format] " CMD_SRCDST_PANE_USAGE,
 
-	.flags = CMD_PANE_S|CMD_INDEX_T,
+	.sflag = CMD_PANE,
+	.tflag = CMD_WINDOW_INDEX,
+
+	.flags = 0,
 	.exec = cmd_break_pane_exec
 };
 

diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c
@@ -43,7 +43,9 @@ const struct cmd_entry cmd_capture_pane_entry = {
 	.usage = "[-aCeJpPq] " CMD_BUFFER_USAGE " [-E end-line] "
 		 "[-S start-line]" CMD_TARGET_PANE_USAGE,
 
-	.flags = CMD_PANE_T,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_capture_pane_exec
 };
 

diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c
@@ -39,7 +39,9 @@ const struct cmd_entry cmd_choose_buffer_entry = {
 	.args = { "F:t:", 0, 1 },
 	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_choose_buffer_exec
 };
 

diff --git a/cmd-choose-client.c b/cmd-choose-client.c
@@ -44,7 +44,9 @@ const struct cmd_entry cmd_choose_client_entry = {
 	.args = { "F:t:", 0, 1 },
 	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_choose_client_exec
 };
 

diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
@@ -51,7 +51,9 @@ const struct cmd_entry cmd_choose_tree_entry = {
 	.usage = "[-suw] [-b session-template] [-c window template] "
 		 "[-S format] [-W format] " CMD_TARGET_WINDOW_USAGE,
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_choose_tree_exec
 };
 
@@ -60,10 +62,11 @@ const struct cmd_entry cmd_choose_session_entry = {
 	.alias = NULL,
 
 	.args = { "F:t:", 0, 1 },
-
 	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
-	.flags = CMD_WINDOW_T,
 
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_choose_tree_exec
 };
 
@@ -74,7 +77,9 @@ const struct cmd_entry cmd_choose_window_entry = {
 	.args = { "F:t:", 0, 1 },
 	.usage = CMD_TARGET_WINDOW_USAGE "[-F format] [template]",
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_choose_tree_exec
 };
 

diff --git a/cmd-clear-history.c b/cmd-clear-history.c
@@ -33,7 +33,9 @@ const struct cmd_entry cmd_clear_history_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_PANE_USAGE,
 
-	.flags = CMD_PANE_T,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_clear_history_exec
 };
 

diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
@@ -42,7 +42,9 @@ const struct cmd_entry cmd_command_prompt_entry = {
 	.usage = "[-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " "
 		 "[template]",
 
-	.flags = CMD_CLIENT_T,
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
 	.exec = cmd_command_prompt_exec
 };
 

diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
@@ -40,7 +40,9 @@ const struct cmd_entry cmd_confirm_before_entry = {
 	.args = { "p:t:", 1, 1 },
 	.usage = "[-p prompt] " CMD_TARGET_CLIENT_USAGE " command",
 
-	.flags = CMD_CLIENT_T,
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
 	.exec = cmd_confirm_before_exec
 };
 

diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
@@ -33,7 +33,9 @@ const struct cmd_entry cmd_copy_mode_entry = {
 	.args = { "Met:u", 0, 0 },
 	.usage = "[-Mu] " CMD_TARGET_PANE_USAGE,
 
-	.flags = CMD_PANE_T,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_copy_mode_exec
 };
 

diff --git a/cmd-detach-client.c b/cmd-detach-client.c
@@ -35,7 +35,10 @@ const struct cmd_entry cmd_detach_client_entry = {
 	.args = { "as:t:P", 0, 0 },
 	.usage = "[-P] [-a] [-s target-session] " CMD_TARGET_CLIENT_USAGE,
 
-	.flags = CMD_READONLY|CMD_CLIENT_T|CMD_SESSION_S,
+	.sflag = CMD_SESSION,
+	.tflag = CMD_CLIENT,
+
+	.flags = CMD_READONLY,
 	.exec = cmd_detach_client_exec
 };
 
@@ -46,7 +49,9 @@ const struct cmd_entry cmd_suspend_client_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_CLIENT_USAGE,
 
-	.flags = CMD_CLIENT_T,
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
 	.exec = cmd_detach_client_exec
 };
 

diff --git a/cmd-display-message.c b/cmd-display-message.c
@@ -42,7 +42,10 @@ const struct cmd_entry cmd_display_message_entry = {
 	.usage = "[-p] [-c target-client] [-F format] "
 		 CMD_TARGET_PANE_USAGE " [message]",
 
-	.flags = CMD_CLIENT_C|CMD_PANE_T|CMD_CLIENT_CANFAIL,
+	.cflag = CMD_CLIENT_CANFAIL,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_display_message_exec
 };
 

diff --git a/cmd-display-panes.c b/cmd-display-panes.c
@@ -33,7 +33,9 @@ const struct cmd_entry cmd_display_panes_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_CLIENT_USAGE,
 
-	.flags = CMD_CLIENT_T,
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
 	.exec = cmd_display_panes_exec
 };
 

diff --git a/cmd-find-window.c b/cmd-find-window.c
@@ -54,7 +54,9 @@ const struct cmd_entry cmd_find_window_entry = {
 	.args = { "F:CNt:T", 1, 4 },
 	.usage = "[-CNT] [-F format] " CMD_TARGET_WINDOW_USAGE " match-string",
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_find_window_exec
 };
 

diff --git a/cmd-if-shell.c b/cmd-if-shell.c
@@ -43,7 +43,9 @@ const struct cmd_entry cmd_if_shell_entry = {
 	.usage = "[-bF] " CMD_TARGET_PANE_USAGE " shell-command command "
 		 "[command]",
 
-	.flags = CMD_PANE_T|CMD_CANFAIL,
+	.tflag = CMD_PANE_CANFAIL,
+
+	.flags = 0,
 	.exec = cmd_if_shell_exec
 };
 

diff --git a/cmd-join-pane.c b/cmd-join-pane.c
@@ -40,7 +40,10 @@ const struct cmd_entry cmd_join_pane_entry = {
 	.args = { "bdhvp:l:s:t:", 0, 0 },
 	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
 
-	.flags = CMD_PANE_MARKED_S|CMD_PANE_T,
+	.sflag = CMD_PANE_MARKED,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_join_pane_exec
 };
 
@@ -51,7 +54,10 @@ const struct cmd_entry cmd_move_pane_entry = {
 	.args = { "bdhvp:l:s:t:", 0, 0 },
 	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
 
-	.flags = CMD_PANE_S|CMD_PANE_T,
+	.sflag = CMD_PANE,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_join_pane_exec
 };
 

diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
@@ -35,7 +35,9 @@ const struct cmd_entry cmd_kill_pane_entry = {
 	.args = { "at:", 0, 0 },
 	.usage = "[-a] " CMD_TARGET_PANE_USAGE,
 
-	.flags = CMD_PANE_T,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_kill_pane_exec
 };
 

diff --git a/cmd-kill-session.c b/cmd-kill-session.c
@@ -36,7 +36,9 @@ const struct cmd_entry cmd_kill_session_entry = {
 	.args = { "aCt:", 0, 0 },
 	.usage = "[-aC] " CMD_TARGET_SESSION_USAGE,
 
-	.flags = CMD_SESSION_T,
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
 	.exec = cmd_kill_session_exec
 };
 

diff --git a/cmd-kill-window.c b/cmd-kill-window.c
@@ -33,7 +33,9 @@ const struct cmd_entry cmd_kill_window_entry = {
 	.args = { "at:", 0, 0 },
 	.usage = "[-a] " CMD_TARGET_WINDOW_USAGE,
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_kill_window_exec
 };
 
@@ -44,7 +46,9 @@ const struct cmd_entry cmd_unlink_window_entry = {
 	.args = { "kt:", 0, 0 },
 	.usage = "[-k] " CMD_TARGET_WINDOW_USAGE,
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_kill_window_exec
 };
 

diff --git a/cmd-list-clients.c b/cmd-list-clients.c
@@ -42,7 +42,9 @@ const struct cmd_entry cmd_list_clients_entry = {
 	.args = { "F:t:", 0, 0 },
 	.usage = "[-F format] " CMD_TARGET_SESSION_USAGE,
 
-	.flags = CMD_READONLY|CMD_SESSION_T,
+	.tflag = CMD_SESSION,
+
+	.flags = CMD_READONLY,
 	.exec = cmd_list_clients_exec
 };
 

diff --git a/cmd-list-panes.c b/cmd-list-panes.c
@@ -41,7 +41,9 @@ const struct cmd_entry cmd_list_panes_entry = {
 	.args = { "asF:t:", 0, 0 },
 	.usage = "[-as] [-F format] " CMD_TARGET_WINDOW_USAGE,
 
-	.flags = CMD_WINDOW_T,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
 	.exec = cmd_list_panes_exec
 };
 

diff --git a/cmd-list-windows.c b/cmd-list-windows.c
@@ -52,7 +52,9 @@ const struct cmd_entry cmd_list_windows_entry = {
 	.args = { "F:at:", 0, 0 },
 	.usage = "[-a] [-F format] " CMD_TARGET_SESSION_USAGE,
 
-	.flags = CMD_SESSION_T,
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
 	.exec = cmd_list_windows_exec
 };
 

diff --git a/cmd-lock-server.c b/cmd-lock-server.c
@@ -44,7 +44,9 @@ const struct cmd_entry cmd_lock_session_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_SESSION_USAGE,
 
-	.flags = CMD_SESSION_T,
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
 	.exec = cmd_lock_server_exec
 };
 
@@ -55,7 +57,9 @@ const struct cmd_entry cmd_lock_client_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_CLIENT_USAGE,
 
-	.flags = CMD_CLIENT_T,
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
 	.exec = cmd_lock_server_exec
 };
 

diff --git a/cmd-move-window.c b/cmd-move-window.c
@@ -35,7 +35,10 @@ const struct cmd_entry cmd_move_window_entry = {
 	.args = { "adkrs:t:", 0, 0 },
 	.usage = "[-dkr] " CMD_SRCDST_WINDOW_USAGE,
 
-	.flags = CMD_WINDOW_S|CMD_MOVEW_R|CMD_INDEX_T,
+	.sflag = CMD_WINDOW,
+	.tflag = CMD_MOVEW_R,
+
+	.flags = 0,
 	.exec = cmd_move_window_exec
 };
 
@@ -46,7 +49,10 @@ const struct cmd_entry cmd_link_window_entry = {
 	.args = { "adks:t:", 0, 0 },
 	.usage = "[-dk] " CMD_SRCDST_WINDOW_USAGE,
 
-	.flags = CMD_WINDOW_S|CMD_INDEX_T,
+	.sflag = CMD_WINDOW,
+	.tflag = CMD_WINDOW_INDEX,
+
+	.flags = 0,
 	.exec = cmd_move_window_exec
 };
 

diff --git a/cmd-new-session.c b/cmd-new-session.c
@@ -44,7 +44,9 @@ const struct cmd_entry cmd_new_session_entry = {
 		 "[-s session-name] " CMD_TARGET_SESSION_USAGE " [-x width] "
 		 "[-y height] [command]",
 
-	.flags = CMD_STARTSERVER|CMD_CANFAIL|CMD_SESSION_T,
+	.tflag = CMD_SESSION_CANFAIL,
+
+	.flags = CMD_STARTSERVER,
 	.exec = cmd_new_session_exec
 };
 
@@ -55,7 +57,9 @@ const struct cmd_entry cmd_has_session_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_SESSION_USAGE,
 
-	.flags = CMD_SESSION_T,
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
 	.exec = cmd_new_session_exec
 };
 

diff --git a/cmd-new-window.c b/cmd-new-window.c
@@ -42,7 +42,9 @@ const struct cmd_entry cmd_new_window_entry = {
 	.usage = "[-adkP] [-c start-directory] [-F format] [-n window-name] "
 		 CMD_TARGET_WINDOW_USAGE " [command]",
 
-	.flags = CMD_INDEX_T,
+	.tflag = CMD_WINDOW_INDEX,
+
+	.flags = 0,
 	.exec = cmd_new_window_exec
 };
 

diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c
@@ -41,7 +41,9 @@ const struct cmd_entry cmd_paste_buffer_entry = {
 	.usage = "[-dpr] [-s separator] " CMD_BUFFER_USAGE " "
 		 CMD_TARGET_PANE_USAGE,
 
-	.flags = CMD_PANE_T,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
 	.exec = cmd_paste_buffer_exec
 };