diff options
81 files changed, 185 insertions, 185 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 59c2b479..be7adb3f 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -29,7 +29,7 @@ int cmd_attach_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_attach_session_entry = { "attach-session", "attach", "[-d] " CMD_TARGET_SESSION_USAGE, - CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, CMD_CHFLAG('d'), + CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, "d", cmd_target_init, cmd_target_parse, cmd_attach_session_exec, @@ -58,7 +58,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx) return (0); if (ctx->cmdclient == NULL) { - if (data->chflags & CMD_CHFLAG('d')) { + if (cmd_check_flag(data->chflags, 'd')) { /* * Can't use server_write_session in case attaching to * the same session as currently attached to. @@ -89,7 +89,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - if (data->chflags & CMD_CHFLAG('d')) + if (cmd_check_flag(data->chflags, 'd')) server_write_session(s, MSG_DETACH, NULL, 0); ctx->cmdclient->session = s; diff --git a/cmd-bind-key.c b/cmd-bind-key.c index 041f558d..eba5125b 100644 --- a/cmd-bind-key.c +++ b/cmd-bind-key.c @@ -46,7 +46,7 @@ struct cmd_bind_key_data { const struct cmd_entry cmd_bind_key_entry = { "bind-key", "bind", "[-cnr] [-t key-table] key command [arguments]", - 0, 0, + 0, "", NULL, cmd_bind_key_parse, cmd_bind_key_exec, diff --git a/cmd-break-pane.c b/cmd-break-pane.c index 58a93de2..d465f602 100644 --- a/cmd-break-pane.c +++ b/cmd-break-pane.c @@ -31,7 +31,7 @@ int cmd_break_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_break_pane_entry = { "break-pane", "breakp", CMD_TARGET_PANE_USAGE " [-d]", - 0, CMD_CHFLAG('d'), + 0, "d", cmd_target_init, cmd_target_parse, cmd_break_pane_exec, @@ -74,7 +74,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx) base_idx = options_get_number(&s->options, "base-index"); wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */ - if (!(data->chflags & CMD_CHFLAG('d'))) + if (!cmd_check_flag(data->chflags, 'd')) session_select(s, wl->idx); server_redraw_session(s); diff --git a/cmd-choose-client.c b/cmd-choose-client.c index 0aa66622..cd5ab9ea 100644 --- a/cmd-choose-client.c +++ b/cmd-choose-client.c @@ -34,7 +34,7 @@ void cmd_choose_client_free(void *); const struct cmd_entry cmd_choose_client_entry = { "choose-client", NULL, CMD_TARGET_WINDOW_USAGE " [template]", - CMD_ARG01, 0, + CMD_ARG01, "", cmd_target_init, cmd_target_parse, cmd_choose_client_exec, diff --git a/cmd-choose-session.c b/cmd-choose-session.c index b9c7c258..23228105 100644 --- a/cmd-choose-session.c +++ b/cmd-choose-session.c @@ -34,7 +34,7 @@ void cmd_choose_session_free(void *); const struct cmd_entry cmd_choose_session_entry = { "choose-session", NULL, CMD_TARGET_WINDOW_USAGE " [template]", - CMD_ARG01, 0, + CMD_ARG01, "", cmd_target_init, cmd_target_parse, cmd_choose_session_exec, diff --git a/cmd-choose-window.c b/cmd-choose-window.c index 9d6cd932..a1540f1d 100644 --- a/cmd-choose-window.c +++ b/cmd-choose-window.c @@ -34,7 +34,7 @@ void cmd_choose_window_free(void *); const struct cmd_entry cmd_choose_window_entry = { "choose-window", NULL, CMD_TARGET_WINDOW_USAGE " [template]", - CMD_ARG01, 0, + CMD_ARG01, "", cmd_target_init, cmd_target_parse, cmd_choose_window_exec, diff --git a/cmd-clear-history.c b/cmd-clear-history.c index a9271346..9241485a 100644 --- a/cmd-clear-history.c +++ b/cmd-clear-history.c @@ -29,7 +29,7 @@ int cmd_clear_history_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_clear_history_entry = { "clear-history", "clearhist", CMD_TARGET_PANE_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_clear_history_exec, diff --git a/cmd-clock-mode.c b/cmd-clock-mode.c index b1f135a6..4df934f7 100644 --- a/cmd-clock-mode.c +++ b/cmd-clock-mode.c @@ -29,7 +29,7 @@ int cmd_clock_mode_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_clock_mode_entry = { "clock-mode", NULL, CMD_TARGET_PANE_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_clock_mode_exec, diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index bcbde064..e3774256 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -39,7 +39,7 @@ void cmd_command_prompt_cfree(void *); const struct cmd_entry cmd_command_prompt_entry = { "command-prompt", NULL, CMD_TARGET_CLIENT_USAGE " [-p prompts] [template]", - 0, 0, + 0, "", cmd_command_prompt_init, cmd_command_prompt_parse, cmd_command_prompt_exec, diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c index d0a2196a..cdde81ac 100644 --- a/cmd-confirm-before.c +++ b/cmd-confirm-before.c @@ -34,7 +34,7 @@ void cmd_confirm_before_free(void *); const struct cmd_entry cmd_confirm_before_entry = { "confirm-before", "confirm", CMD_TARGET_CLIENT_USAGE " command", - CMD_ARG1, 0, + CMD_ARG1, "", cmd_confirm_before_init, cmd_target_parse, cmd_confirm_before_exec, diff --git a/cmd-copy-buffer.c b/cmd-copy-buffer.c index 98166c4b..3a6a441e 100644 --- a/cmd-copy-buffer.c +++ b/cmd-copy-buffer.c @@ -43,7 +43,7 @@ struct cmd_copy_buffer_data { const struct cmd_entry cmd_copy_buffer_entry = { "copy-buffer", "copyb", "[-a src-index] [-b dst-index] [-s src-session] [-t dst-session]", - 0, 0, + 0, "", cmd_copy_buffer_init, cmd_copy_buffer_parse, cmd_copy_buffer_exec, diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index fda19efb..48cdd656 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -30,7 +30,7 @@ int cmd_copy_mode_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_copy_mode_entry = { "copy-mode", NULL, "[-u] " CMD_TARGET_PANE_USAGE, - 0, CMD_CHFLAG('u'), + 0, "u", cmd_copy_mode_init, cmd_target_parse, cmd_copy_mode_exec, @@ -48,7 +48,7 @@ cmd_copy_mode_init(struct cmd *self, int key) switch (key) { case KEYC_PPAGE: - data->chflags |= CMD_CHFLAG('u'); + cmd_set_flag(&data->chflags, 'u'); break; } } @@ -63,7 +63,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); window_pane_set_mode(wp, &window_copy_mode); - if (wp->mode == &window_copy_mode && data->chflags & CMD_CHFLAG('u')) + if (wp->mode == &window_copy_mode && cmd_check_flag(data->chflags, 'u')) window_copy_pageup(wp); return (0); diff --git a/cmd-delete-buffer.c b/cmd-delete-buffer.c index b193438c..1a5b6d82 100644 --- a/cmd-delete-buffer.c +++ b/cmd-delete-buffer.c @@ -31,7 +31,7 @@ int cmd_delete_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_delete_buffer_entry = { "delete-buffer", "deleteb", CMD_BUFFER_SESSION_USAGE, - 0, 0, + 0, "", cmd_buffer_init, cmd_buffer_parse, cmd_delete_buffer_exec, diff --git a/cmd-detach-client.c b/cmd-detach-client.c index dd480226..4903281f 100644 --- a/cmd-detach-client.c +++ b/cmd-detach-client.c @@ -29,7 +29,7 @@ int cmd_detach_client_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_detach_client_entry = { "detach-client", "detach", CMD_TARGET_CLIENT_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_detach_client_exec, diff --git a/cmd-display-message.c b/cmd-display-message.c index 71421ea2..1ff5718b 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -31,7 +31,7 @@ int cmd_display_message_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_display_message_entry = { "display-message", "display", CMD_TARGET_CLIENT_USAGE " [message]", - CMD_ARG01, 0, + CMD_ARG01, "", cmd_target_init, cmd_target_parse, cmd_display_message_exec, diff --git a/cmd-display-panes.c b/cmd-display-panes.c index 141e3436..42ecbb9b 100644 --- a/cmd-display-panes.c +++ b/cmd-display-panes.c @@ -29,7 +29,7 @@ int cmd_display_panes_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_display_panes_entry = { "display-panes", "displayp", CMD_TARGET_CLIENT_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_display_panes_exec, diff --git a/cmd-down-pane.c b/cmd-down-pane.c index 242c6ac3..a0f771eb 100644 --- a/cmd-down-pane.c +++ b/cmd-down-pane.c @@ -29,7 +29,7 @@ int cmd_down_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_down_pane_entry = { "down-pane", "downp", CMD_TARGET_WINDOW_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_down_pane_exec, diff --git a/cmd-find-window.c b/cmd-find-window.c index 0a1c38da..49e29337 100644 --- a/cmd-find-window.c +++ b/cmd-find-window.c @@ -34,7 +34,7 @@ void cmd_find_window_callback(void *, int); const struct cmd_entry cmd_find_window_entry = { "find-window", "findw", CMD_TARGET_WINDOW_USAGE " match-string", - CMD_ARG1, 0, + CMD_ARG1, "", cmd_target_init, cmd_target_parse, cmd_find_window_exec, diff --git a/cmd-generic.c b/cmd-generic.c index 89dc2e25..59d9bbb7 100644 --- a/cmd-generic.c +++ b/cmd-generic.c @@ -23,8 +23,8 @@ #include "tmux.h" -int cmd_getopt(int, char **, const char *, uint64_t); -int cmd_flags(int, uint64_t, uint64_t *); +int cmd_getopt(int, char **, const char *, const char *); +int cmd_parse_flags(int, const char *, uint64_t *); size_t cmd_print_flags(char *, size_t, size_t, uint64_t); int cmd_fill_argument(int, char **, char **, int, char **); @@ -36,51 +36,53 @@ cmd_prarg(char *buf, size_t len, const char *prefix, char *arg) return (xsnprintf(buf, len, "%s%s", prefix, arg)); } -/* Prepend flags from chflags onto flagstr and call getopt. */ +/* Append two flag strings together and call getopt. */ int -cmd_getopt(int argc, char **argv, const char *flagstr, uint64_t chflags) +cmd_getopt(int argc, char **argv, const char *flagstr, const char *chflagstr) { - u_char ch; - char buf[128]; - size_t len, off; - - *buf = '\0'; + char tmp[BUFSIZ]; - len = sizeof buf; - off = 0; + if (strlcpy(tmp, flagstr, sizeof tmp) >= sizeof tmp) + fatalx("strlcpy overflow"); + if (strlcat(tmp, chflagstr, sizeof tmp) >= sizeof tmp) + fatalx("strlcat overflow"); + return (getopt(argc, argv, tmp)); +} - for (ch = 0; ch < 26; ch++) { - if (chflags & CMD_CHFLAG('a' + ch)) - off += xsnprintf(buf + off, len - off, "%c", 'a' + ch); - if (chflags & CMD_CHFLAG('A' + ch)) - off += xsnprintf(buf + off, len - off, "%c", 'A' + ch); - } - - strlcat(buf, flagstr, sizeof buf); +/* Return if flag character is set. */ +int +cmd_check_flag(uint64_t chflags, int flag) +{ + if (flag >= 'A' && flag <= 'Z') + flag = 26 + flag - 'A'; + else if (flag >= 'a' && flag <= 'z') + flag = flag - 'a'; + else + return (0); + return ((chflags & (1ULL << flag)) != 0); +} - return (getopt(argc, argv, buf)); +/* Set flag character. */ +void +cmd_set_flag(uint64_t *chflags, int flag) +{ + if (flag >= 'A' && flag <= 'Z') + flag = 26 + flag - 'A'; + else if (flag >= 'a' && flag <= 'z') + flag = flag - 'a'; + else + return; + (*chflags) |= (1ULL << flag); } -/* - * If this option is expected (in ichflags), set it in ochflags, otherwise - * return -1. - */ +/* If this option is expected, set it in chflags, otherwise return -1. */ int -cmd_flags(int opt, uint64_t ichflags, uint64_t *ochflags) +cmd_parse_flags(int opt, const char *chflagstr, uint64_t *chflags) { - u_char ch; - - for (ch = 0; ch < 26; ch++) { - if (opt == 'a' + ch && ichflags & CMD_CHFLAG(opt)) { - (*ochflags) |= CMD_CHFLAG(opt); - return (0); - } - if (opt == 'A' + ch && ichflags & CMD_CHFLAG(opt)) { - (*ochflags) |= CMD_CHFLAG(opt); - return (0); - } - } - return (-1); + if (strchr(chflagstr, opt) == NULL) + return (-1); + cmd_set_flag(chflags, opt); + return (0); } /* Print the flags supported in chflags. */ @@ -95,9 +97,9 @@ cmd_print_flags(char *buf, size_t len, size_t off, uint64_t chflags) off += xsnprintf(buf + off, len - off, " -"); for (ch = 0; ch < 26; ch++) { - if (chflags & CMD_CHFLAG('a' + ch)) + if (cmd_check_flag(chflags, 'a' + ch)) off += xsnprintf(buf + off, len - off, "%c", 'a' + ch); - if (chflags & CMD_CHFLAG('A' + ch)) + if (cmd_check_flag(chflags, 'A' + ch)) off += xsnprintf(buf + off, len - off, "%c", 'A' + ch); } return (off - boff); @@ -170,7 +172,7 @@ cmd_target_parse(struct cmd *self, int argc, char **argv, char **cause) data = self->data; while ((opt = cmd_getopt(argc, argv, "t:", entry->chflags)) != -1) { - if (cmd_flags(opt, entry->chflags, &data->chflags) == 0) + if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0) continue; switch (opt) { case 't': @@ -253,7 +255,7 @@ cmd_srcdst_parse(struct cmd *self, int argc, char **argv, char **cause) data = self->data; while ((opt = cmd_getopt(argc, argv, "s:t:", entry->chflags)) != -1) { - if (cmd_flags(opt, entry->chflags, &data->chflags) == 0) + if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0) continue; switch (opt) { case 's': @@ -345,7 +347,7 @@ cmd_buffer_parse(struct cmd *self, int argc, char **argv, char **cause) data = self->data; while ((opt = cmd_getopt(argc, argv, "b:t:", entry->chflags)) != -1) { - if (cmd_flags(opt, entry->chflags, &data->chflags) == 0) + if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0) continue; switch (opt) { case 'b': diff --git a/cmd-has-session.c b/cmd-has-session.c index f279a730..00f171b7 100644 --- a/cmd-has-session.c +++ b/cmd-has-session.c @@ -29,7 +29,7 @@ int cmd_has_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_has_session_entry = { "has-session", "has", CMD_TARGET_SESSION_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_has_session_exec, diff --git a/cmd-if-shell.c b/cmd-if-shell.c index 82da814a..1779486a 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -36,7 +36,7 @@ void cmd_if_shell_free(void *); const struct cmd_entry cmd_if_shell_entry = { "if-shell", "if", "shell-command command", - CMD_ARG2, 0, + CMD_ARG2, "", cmd_target_init, cmd_target_parse, cmd_if_shell_exec, diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c index 351ef0c8..c48e4d4e 100644 --- a/cmd-kill-pane.c +++ b/cmd-kill-pane.c @@ -31,7 +31,7 @@ int cmd_kill_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_kill_pane_entry = { "kill-pane", "killp", "[-a] " CMD_TARGET_PANE_USAGE, - 0, CMD_CHFLAG('a'), + 0, "a", cmd_target_init, cmd_target_parse, cmd_kill_pane_exec, @@ -56,7 +56,7 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx) return (0); } - if (data->chflags & CMD_CHFLAG('a')) { + if (cmd_check_flag(data->chflags, 'a')) { loopwp = TAILQ_FIRST(&wl->window->panes); while (loopwp != NULL) { nextwp = TAILQ_NEXT(loopwp, entry); diff --git a/cmd-kill-server.c b/cmd-kill-server.c index d7033a06..cf206770 100644 --- a/cmd-kill-server.c +++ b/cmd-kill-server.c @@ -32,7 +32,7 @@ int cmd_kill_server_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_kill_server_entry = { "kill-server", NULL, "", - 0, 0, + 0, "", NULL, NULL, cmd_kill_server_exec, diff --git a/cmd-kill-session.c b/cmd-kill-session.c index 402b869b..ff0b95e3 100644 --- a/cmd-kill-session.c +++ b/cmd-kill-session.c @@ -32,7 +32,7 @@ int cmd_kill_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_kill_session_entry = { "kill-session", NULL, CMD_TARGET_SESSION_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_kill_session_exec, diff --git a/cmd-kill-window.c b/cmd-kill-window.c index d213a90e..aae1cc85 100644 --- a/cmd-kill-window.c +++ b/cmd-kill-window.c @@ -29,7 +29,7 @@ int cmd_kill_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_kill_window_entry = { "kill-window", "killw", CMD_TARGET_WINDOW_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_kill_window_exec, diff --git a/cmd-last-window.c b/cmd-last-window.c index 0f7a4571..5f065ccb 100644 --- a/cmd-last-window.c +++ b/cmd-last-window.c @@ -29,7 +29,7 @@ int cmd_last_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_last_window_entry = { "last-window", "last", CMD_TARGET_SESSION_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_last_window_exec, diff --git a/cmd-link-window.c b/cmd-link-window.c index a0b81dcc..f8da27dd 100644 --- a/cmd-link-window.c +++ b/cmd-link-window.c @@ -31,7 +31,7 @@ int cmd_link_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_link_window_entry = { "link-window", "linkw", "[-dk] " CMD_SRCDST_WINDOW_USAGE, - 0, CMD_CHFLAG('d')|CMD_CHFLAG('k'), + 0, "dk", cmd_srcdst_init, cmd_srcdst_parse, cmd_link_window_exec, @@ -53,8 +53,8 @@ cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx) if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2) return (-1); - kflag = data->chflags & CMD_CHFLAG('k'); - dflag = data->chflags & CMD_CHFLAG('d'); + kflag = cmd_check_flag(data->chflags, 'k'); + dflag = cmd_check_flag(data->chflags, 'd'); if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) { ctx->error(ctx, "can't link window: %s", cause); xfree(cause); diff --git a/cmd-list-buffers.c b/cmd-list-buffers.c index bb0e6a64..ab08928e 100644 --- a/cmd-list-buffers.c +++ b/cmd-list-buffers.c @@ -32,7 +32,7 @@ int cmd_list_buffers_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_buffers_entry = { "list-buffers", "lsb", CMD_TARGET_SESSION_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_list_buffers_exec, diff --git a/cmd-list-clients.c b/cmd-list-clients.c index 905edf94..4b7bc7b7 100644 --- a/cmd-list-clients.c +++ b/cmd-list-clients.c @@ -32,7 +32,7 @@ int cmd_list_clients_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_clients_entry = { "list-clients", "lsc", "", - 0, 0, + 0, "", NULL, NULL, cmd_list_clients_exec, diff --git a/cmd-list-commands.c b/cmd-list-commands.c index 9f2942ae..9b669b67 100644 --- a/cmd-list-commands.c +++ b/cmd-list-commands.c @@ -29,7 +29,7 @@ int cmd_list_commands_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_commands_entry = { "list-commands", "lscm", "", - 0, 0, + 0, "", NULL, NULL, cmd_list_commands_exec, diff --git a/cmd-list-keys.c b/cmd-list-keys.c index f4bd064a..b61951f9 100644 --- a/cmd-list-keys.c +++ b/cmd-list-keys.c @@ -33,7 +33,7 @@ int cmd_list_keys_table(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_keys_entry = { "list-keys", "lsk", "[-t key-table]", - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_list_keys_exec, diff --git a/cmd-list-panes.c b/cmd-list-panes.c index 5a06eb7a..112a2835 100644 --- a/cmd-list-panes.c +++ b/cmd-list-panes.c @@ -31,7 +31,7 @@ int cmd_list_panes_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_panes_entry = { "list-panes", "lsp", CMD_TARGET_WINDOW_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_list_panes_exec, diff --git a/cmd-list-sessions.c b/cmd-list-sessions.c index 908278d5..d0210552 100644 --- a/cmd-list-sessions.c +++ b/cmd-list-sessions.c @@ -31,7 +31,7 @@ int cmd_list_sessions_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_sessions_entry = { "list-sessions", "ls", "", - 0, 0, + 0, "", NULL, NULL, cmd_list_sessions_exec, diff --git a/cmd-list-windows.c b/cmd-list-windows.c index f8a46bcd..7e78c94e 100644 --- a/cmd-list-windows.c +++ b/cmd-list-windows.c @@ -31,7 +31,7 @@ int cmd_list_windows_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_windows_entry = { "list-windows", "lsw", CMD_TARGET_SESSION_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_list_windows_exec, diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c index a3f09ca4..354aa463 100644 --- a/cmd-load-buffer.c +++ b/cmd-load-buffer.c @@ -35,7 +35,7 @@ int cmd_load_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_load_buffer_entry = { "load-buffer", "loadb", CMD_BUFFER_SESSION_USAGE " path", - CMD_ARG1, 0, + CMD_ARG1, "", cmd_buffer_init, cmd_buffer_parse, cmd_load_buffer_exec, diff --git a/cmd-lock-client.c b/cmd-lock-client.c index e855d32c..607c9d22 100644 --- a/cmd-lock-client.c +++ b/cmd-lock-client.c @@ -29,7 +29,7 @@ int cmd_lock_client_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_lock_client_entry = { "lock-client", "lockc", CMD_TARGET_CLIENT_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_lock_client_exec, diff --git a/cmd-lock-server.c b/cmd-lock-server.c index 55c19e38..1d8f80e4 100644 --- a/cmd-lock-server.c +++ b/cmd-lock-server.c @@ -33,7 +33,7 @@ int cmd_lock_server_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_lock_server_entry = { "lock-server", "lock", "", - 0, 0, + 0, "", NULL, NULL, cmd_lock_server_exec, diff --git a/cmd-lock-session.c b/cmd-lock-session.c index c0a6569c..279ab655 100644 --- a/cmd-lock-session.c +++ b/cmd-lock-session.c @@ -29,7 +29,7 @@ int cmd_lock_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_lock_session_entry = { "lock-session", "locks", CMD_TARGET_SESSION_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_lock_session_exec, diff --git a/cmd-move-window.c b/cmd-move-window.c index 175e6576..6105812a 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -31,7 +31,7 @@ int cmd_move_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_move_window_entry = { "move-window", "movew", "[-dk] " CMD_SRCDST_WINDOW_USAGE, - 0, CMD_CHFLAG('d')|CMD_CHFLAG('k'), + 0, "dk", cmd_srcdst_init, cmd_srcdst_parse, cmd_move_window_exec, @@ -53,8 +53,8 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx) if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2) return (-1); - kflag = data->chflags & CMD_CHFLAG('k'); - dflag = data->chflags & CMD_CHFLAG('d'); + kflag = cmd_check_flag(data->chflags, 'k'); + dflag = cmd_check_flag(data->chflags, 'd'); if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) { ctx->error(ctx, "can't move window: %s", cause); xfree(cause); diff --git a/cmd-new-session.c b/cmd-new-session.c index a9657a97..8103392d 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -44,7 +44,7 @@ struct cmd_new_session_data { const struct cmd_entry cmd_new_session_entry = { "new-session", "new", "[-d] [-n window-name] [-s session-name] [-t target-session] [command]", - CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON, 0, + CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON, "", cmd_new_session_init, cmd_new_session_parse, cmd_new_session_exec, diff --git a/cmd-new-window.c b/cmd-new-window.c index 44fe6b5a..e251c8cb 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -43,7 +43,7 @@ struct cmd_new_window_data { const struct cmd_entry cmd_new_window_entry = { "new-window", "neww", "[-dk] [-n window-name] [-t target-window] [command]", - 0, 0, + 0, "", cmd_new_window_init, cmd_new_window_parse, cmd_new_window_exec, diff --git a/cmd-next-layout.c b/cmd-next-layout.c index 03459ffc..aa033a83 100644 --- a/cmd-next-layout.c +++ b/cmd-next-layout.c @@ -29,7 +29,7 @@ int cmd_next_layout_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_next_layout_entry = { "next-layout", "nextl", CMD_TARGET_WINDOW_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_next_layout_exec, diff --git a/cmd-next-window.c b/cmd-next-window.c index 94c7b1ce..cc361b62 100644 --- a/cmd-next-window.c +++ b/cmd-next-window.c @@ -30,7 +30,7 @@ int cmd_next_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_next_window_entry = { "next-window", "next", "[-a] " CMD_TARGET_SESSION_USAGE, - 0, CMD_CHFLAG('a'), + 0, "a", cmd_next_window_init, cmd_target_parse, cmd_next_window_exec, @@ -47,7 +47,7 @@ cmd_next_window_init(struct cmd *self, int key) data = self->data; if (key == ('n' | KEYC_ESCAPE)) - data->chflags |= CMD_CHFLAG('a'); + cmd_set_flag(&data->chflags, 'a'); } int @@ -61,7 +61,7 @@ cmd_next_window_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); activity = 0; - if (data->chflags & CMD_CHFLAG('a')) + if (cmd_check_flag(data->chflags, 'a')) activity = 1; if (session_next(s, activity) == 0) diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index e8e638ef..11f70f1f 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -32,7 +32,7 @@ void cmd_paste_buffer_lf2cr(struct window_pane *, const char *, size_t); const struct cmd_entry cmd_paste_buffer_entry = { "paste-buffer", "pasteb", "[-dr] " CMD_BUFFER_WINDOW_USAGE, - 0, CMD_CHFLAG('d')|CMD_CHFLAG('r'), + 0, "dr", cmd_buffer_init, cmd_buffer_parse, cmd_paste_buffer_exec, @@ -64,14 +64,14 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) if (pb != NULL && *pb->data != '\0') { /* -r means raw data without LF->CR conversion. */ - if (data->chflags & CMD_CHFLAG('r')) + if (cmd_check_flag(data->chflags, 'r')) bufferevent_write(wp->event, pb->data, pb->size); else cmd_paste_buffer_lf2cr(wp, pb->data, pb->size); } /* Delete the buffer if -d. */ - if (data->chflags & CMD_CHFLAG('d')) { + if (cmd_check_flag(data->chflags, 'd')) { if (data->buffer == -1) paste_free_top(&s->buffers); else diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c index e66ec955..135d3837 100644 --- a/cmd-pipe-pane.c +++ b/cmd-pipe-pane.c @@ -38,7 +38,7 @@ void cmd_pipe_pane_error_callback(struct bufferevent *, short, void *); const struct cmd_entry cmd_pipe_pane_entry = { "pipe-pane", "pipep", CMD_TARGET_PANE_USAGE "[-o] [command]", - CMD_ARG01, CMD_CHFLAG('o'), + CMD_ARG01, "o", cmd_target_init, cmd_target_parse, cmd_pipe_pane_exec, @@ -74,7 +74,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx) * * bind ^p pipep -o 'cat >>~/output' */ - if (data->chflags & CMD_CHFLAG('o') && old_fd != -1) + if (cmd_check_flag(data->chflags, 'o') && old_fd != -1) return (0); /* Open the new pipe. */ diff --git a/cmd-previous-layout.c b/cmd-previous-layout.c index dcdfdeae..083ac3e9 100644 --- a/cmd-previous-layout.c +++ b/cmd-previous-layout.c @@ -29,7 +29,7 @@ int cmd_previous_layout_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_previous_layout_entry = { "previous-layout", "prevl", CMD_TARGET_WINDOW_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_previous_layout_exec, diff --git a/cmd-previous-window.c b/cmd-previous-window.c index 3aa1f6a3..0357e76d 100644 --- a/cmd-previous-window.c +++ b/cmd-previous-window.c @@ -30,7 +30,7 @@ int cmd_previous_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_previous_window_entry = { "previous-window", "prev", "[-a] " CMD_TARGET_SESSION_USAGE, - 0, CMD_CHFLAG('a'), + 0, "a", cmd_previous_window_init, cmd_target_parse, cmd_previous_window_exec, @@ -47,7 +47,7 @@ cmd_previous_window_init(struct cmd *self, int key) data = self->data; if (key == ('p' | KEYC_ESCAPE)) - data->chflags |= CMD_CHFLAG('a'); + cmd_set_flag(&data->chflags, 'a'); } int @@ -61,7 +61,7 @@ cmd_previous_window_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); activity = 0; - if (data->chflags & CMD_CHFLAG('a')) + if (cmd_check_flag(data->chflags, 'a')) activity = 1; if (session_previous(s, activity) == 0) diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c index a3015f02..03662a85 100644 --- a/cmd-refresh-client.c +++ b/cmd-refresh-client.c @@ -29,7 +29,7 @@ int cmd_refresh_client_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_refresh_client_entry = { "refresh-client", "refresh", CMD_TARGET_CLIENT_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_refresh_client_exec, diff --git a/cmd-rename-session.c b/cmd-rename-session.c index ae798717..679c6109 100644 --- a/cmd-rename-session.c +++ b/cmd-rename-session.c @@ -31,7 +31,7 @@ int cmd_rename_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_rename_session_entry = { "rename-session", "rename", CMD_TARGET_SESSION_USAGE " new-name", - CMD_ARG1, 0, + CMD_ARG1, "", cmd_target_init, cmd_target_parse, cmd_rename_session_exec, diff --git a/cmd-rename-window.c b/cmd-rename-window.c index 6f4f9ab8..112bd299 100644 --- a/cmd-rename-window.c +++ b/cmd-rename-window.c @@ -31,7 +31,7 @@ int cmd_rename_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_rename_window_entry = { "rename-window", "renamew", CMD_TARGET_WINDOW_USAGE " new-name", - CMD_ARG1, 0, + CMD_ARG1, "", cmd_target_init, cmd_target_parse, cmd_rename_window_exec, diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index 30fbc76a..e8d77176 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -31,9 +31,8 @@ int cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_resize_pane_entry = { "resize-pane", "resizep", - "[-DU] " CMD_TARGET_PANE_USAGE " [adjustment]", - CMD_ARG01, - CMD_CHFLAG('D')|CMD_CHFLAG('L')|CMD_CHFLAG('R')|CMD_CHFLAG('U'), + "[-DLRU] " CMD_TARGET_PANE_USAGE " [adjustment]", + CMD_ARG01, "DLRU", cmd_resize_pane_init, cmd_target_parse, cmd_resize_pane_exec, @@ -50,28 +49,28 @@ cmd_resize_pane_init(struct cmd *self, int key) data = self->data; if (key == (KEYC_UP | KEYC_CTRL)) - data->chflags |= CMD_CHFLAG('U'); + cmd_set_flag(&data->chflags, 'U'); if (key == (KEYC_DOWN | KEYC_CTRL)) - data->chflags |= CMD_CHFLAG('D'); + cmd_set_flag(&data->chflags, 'D'); if (key == (KEYC_LEFT | KEYC_CTRL)) - data->chflags |= CMD_CHFLAG('L'); + cmd_set_flag(&data->chflags, 'L'); if (key == (KEYC_RIGHT | KEYC_CTRL)) - data->chflags |= CMD_CHFLAG('R'); + cmd_set_flag(&data->chflags, 'R'); if (key == (KEYC_UP | KEYC_ESCAPE)) { - data->chflags |= CMD_CHFLAG('U'); + cmd_set_flag(&data->chflags, 'U'); data->arg = xstrdup("5"); } if (key == (KEYC_DOWN | KEYC_ESCAPE)) { - data->chflags |= CMD_CHFLAG('D'); + cmd_set_flag(&data->chflags, 'D'); data->arg = xstrdup("5"); } if (key == (KEYC_LEFT | KEYC_ESCAPE)) { - data->chflags |= CMD_CHFLAG('L'); + cmd_set_flag(&data->chflags, 'L'); data->arg = xstrdup("5"); } if (key == (KEYC_RIGHT | KEYC_ESCAPE)) { - data->chflags |= CMD_CHFLAG('R'); + cmd_set_flag(&data->chflags, 'R'); data->arg = xstrdup("5"); } } @@ -98,15 +97,14 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx) } } - if (data->chflags & (CMD_CHFLAG('L')|CMD_CHFLAG('R'))) { - if (data->chflags & CMD_CHFLAG('L')) - adjust = -adjust; + if (cmd_check_flag(data->chflags, 'L')) + layout_resize_pane(wp, LAYOUT_LEFTRIGHT, -adjust); + else if (cmd_check_flag(data->chflags, 'R')) layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust); - } else { - if (data->chflags & CMD_CHFLAG('U')) - adjust = -adjust; + else if (cmd_check_flag(data->chflags, 'U')) + layout_resize_pane(wp, LAYOUT_TOPBOTTOM, -adjust); + else if (cmd_check_flag(data->chflags, 'D')) layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust); - } server_redraw_window(wl->window); return (0); diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index 227754c1..2810ea6c 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -31,7 +31,7 @@ int cmd_respawn_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_respawn_window_entry = { "respawn-window", "respawnw", "[-k] " CMD_TARGET_WINDOW_USAGE " [command]", - CMD_ARG01, CMD_CHFLAG('k'), + CMD_ARG01, "k", cmd_target_init, cmd_target_parse, cmd_respawn_window_exec, @@ -54,7 +54,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); w = wl->window; - if (!(data->chflags & CMD_CHFLAG('k'))) { + if (!cmd_check_flag(data->chflags, 'k')) { TAILQ_FOREACH(wp, &w->panes, entry) { if (wp->fd == -1) continue; diff --git a/cmd-rotate-window.c b/cmd-rotate-window.c index 71705a75..fbfba099 100644 --- a/cmd-rotate-window.c +++ b/cmd-rotate-window.c @@ -30,7 +30,7 @@ int cmd_rotate_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_rotate_window_entry = { "rotate-window", "rotatew", "[-DU] " CMD_TARGET_WINDOW_USAGE, - 0, CMD_CHFLAG('D')|CMD_CHFLAG('U'), + 0, "DU", cmd_rotate_window_init, cmd_target_parse, cmd_rotate_window_exec, @@ -47,7 +47,7 @@ cmd_rotate_window_init(struct cmd *self, int key) data = self->data; if (key == ('o' | KEYC_ESCAPE)) - data->chflags |= CMD_CHFLAG('D'); + cmd_set_flag(&data->chflags, 'D'); } int @@ -64,7 +64,7 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); w = wl->window; - if (data->chflags & CMD_CHFLAG('D')) { + if (cmd_check_flag(data->chflags, 'D')) { wp = TAILQ_LAST(&w->panes, window_panes); TAILQ_REMOVE(&w->panes, wp, entry); TAILQ_INSERT_HEAD(&w->panes, wp, entry); diff --git a/cmd-run-shell.c b/cmd-run-shell.c index 605b5dca..f5e834f1 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -36,7 +36,7 @@ void cmd_run_shell_free(void *); const struct cmd_entry cmd_run_shell_entry = { "run-shell", "run", "command", - CMD_ARG1, 0, + CMD_ARG1, "", cmd_target_init, cmd_target_parse, cmd_run_shell_exec, diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index 33859fd6..22bc44f8 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -33,7 +33,7 @@ int cmd_save_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_save_buffer_entry = { "save-buffer", "saveb", "[-a] " CMD_BUFFER_SESSION_USAGE " path", - CMD_ARG1, CMD_CHFLAG('a'), + CMD_ARG1, "a", cmd_buffer_init, cmd_buffer_parse, cmd_save_buffer_exec, @@ -66,7 +66,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) } mask = umask(S_IRWXG | S_IRWXO); - if (data->chflags & CMD_CHFLAG('a')) + if (cmd_check_flag(data->chflags, 'a')) f = fopen(data->arg, "ab"); else f = fopen(data->arg, "wb"); diff --git a/cmd-select-layout.c b/cmd-select-layout.c index 3613514e..0dc126f4 100644 --- a/cmd-select-layout.c +++ b/cmd-select-layout.c @@ -30,7 +30,7 @@ int cmd_select_layout_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_select_layout_entry = { "select-layout", "selectl", CMD_TARGET_WINDOW_USAGE " [layout-name]", - CMD_ARG01, 0, + CMD_ARG01, "", cmd_select_layout_init, cmd_target_parse, cmd_select_layout_exec, diff --git a/cmd-select-pane.c b/cmd-select-pane.c index 3923ea73..890cebc6 100644 --- a/cmd-select-pane.c +++ b/cmd-select-pane.c @@ -29,7 +29,7 @@ int cmd_select_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_select_pane_entry = { "select-pane", "selectp", CMD_TARGET_PANE_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_select_pane_exec, diff --git a/cmd-select-prompt.c b/cmd-select-prompt.c index bead0619..12fe711d 100644 --- a/cmd-select-prompt.c +++ b/cmd-select-prompt.c @@ -33,7 +33,7 @@ int cmd_select_prompt_callback(void *, const char *); const struct cmd_entry cmd_select_prompt_entry = { "select-prompt", NULL, CMD_TARGET_CLIENT_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_select_prompt_exec, diff --git a/cmd-select-window.c b/cmd-select-window.c index dba77c30..6aeaad22 100644 --- a/cmd-select-window.c +++ b/cmd-select-window.c @@ -32,7 +32,7 @@ int cmd_select_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_select_window_entry = { "select-window", "selectw", CMD_TARGET_WINDOW_USAGE, - 0, 0, + 0, "", cmd_select_window_init, cmd_target_parse, cmd_select_window_exec, diff --git a/cmd-send-keys.c b/cmd-send-keys.c index ff41c1ee..8b848e76 100644 --- a/cmd-send-keys.c +++ b/cmd-send-keys.c @@ -40,7 +40,7 @@ struct cmd_send_keys_data { const struct cmd_entry cmd_send_keys_entry = { "send-keys", "send", "[-t target-pane] key ...", - 0, 0, + 0, "", NULL, cmd_send_keys_parse, cmd_send_keys_exec, diff --git a/cmd-send-prefix.c b/cmd-send-prefix.c index a149fdac..ccc98151 100644 --- a/cmd-send-prefix.c +++ b/cmd-send-prefix.c @@ -29,7 +29,7 @@ int cmd_send_prefix_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_send_prefix_entry = { "send-prefix", NULL, CMD_TARGET_PANE_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_send_prefix_exec, diff --git a/cmd-server-info.c b/cmd-server-info.c index 4bd6b67f..03cd2e95 100644 --- a/cmd-server-info.c +++ b/cmd-server-info.c @@ -36,7 +36,7 @@ int cmd_server_info_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_server_info_entry = { "server-info", "info", "", - 0, 0, + 0, "", NULL, NULL, cmd_server_info_exec, diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index 2f624040..4e50cc7a 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -31,7 +31,7 @@ int cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_buffer_entry = { "set-buffer", "setb", CMD_BUFFER_SESSION_USAGE " data", - CMD_ARG1, 0, + CMD_ARG1, "", cmd_buffer_init, cmd_buffer_parse, cmd_set_buffer_exec, diff --git a/cmd-set-environment.c b/cmd-set-environment.c index 4ba66a07..fdd703c5 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -32,7 +32,7 @@ int cmd_set_environment_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_environment_entry = { "set-environment", "setenv", "[-gru] " CMD_TARGET_SESSION_USAGE " name [value]", - CMD_ARG12, CMD_CHFLAG('g')|CMD_CHFLAG('r')|CMD_CHFLAG('u'), + CMD_ARG12, "gru", NULL, cmd_target_parse, cmd_set_environment_exec, @@ -56,7 +56,7 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - if (data->chflags & CMD_CHFLAG('g')) + if (cmd_check_flag(data->chflags, 'g')) env = &global_environ; else { if ((s = cmd_find_session(ctx, data->target)) == NULL) @@ -64,13 +64,13 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_ctx *ctx) env = &s->environ; } - if (data->chflags & CMD_CHFLAG('u')) { + if (cmd_check_flag(data->chflags, 'u')) { if (data->arg2 != NULL) { ctx->error(ctx, "can't specify a value with -u"); return (-1); } environ_unset(env, data->arg); - } else if (data->chflags & CMD_CHFLAG('r')) { + } else if (cmd_check_flag(data->chflags, 'r')) { if (data->arg2 != NULL) { ctx->error(ctx, "can't specify a value with -r"); return (-1); diff --git a/cmd-set-option.c b/cmd-set-option.c index 536b623b..2e00c8d7 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -32,7 +32,7 @@ int cmd_set_option_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_option_entry = { "set-option", "set", "[-agu] " CMD_TARGET_SESSION_USAGE " option [value]", - CMD_ARG12, CMD_CHFLAG('a')|CMD_CHFLAG('g')|CMD_CHFLAG('u'), + CMD_ARG12, "agu", NULL, cmd_target_parse, cmd_set_option_exec, @@ -113,7 +113,7 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx) u_int i; int try_again; - if (data->chflags & CMD_CHFLAG('g')) + if (cmd_check_flag(data->chflags, 'g')) oo = &global_s_options; else { if ((s = cmd_find_session(ctx, data->target)) == NULL) @@ -145,8 +145,8 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - if (data->chflags & CMD_CHFLAG('u')) { - if (data->chflags & CMD_CHFLAG('g')) { + if (cmd_check_flag(data->chflags, 'u')) { + if (cmd_check_flag(data->chflags, 'g')) { ctx->error(ctx, "can't unset global option: %s", entry->name); return (-1); @@ -163,7 +163,7 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx) switch (entry->type) { case SET_OPTION_STRING: set_option_string(ctx, oo, entry, - data->arg2, data->chflags & CMD_CHFLAG('a')); + data->arg2, cmd_check_flag(data->chflags, 'a')); break; case SET_OPTION_NUMBER: set_option_number(ctx, oo, entry, data->arg2); diff --git a/cmd-set-window-option.c b/cmd-set-window-option.c index 1ac62147..1d7b8cc5 100644 --- a/cmd-set-window-option.c +++ b/cmd-set-window-option.c @@ -32,7 +32,7 @@ int cmd_set_window_option_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_window_option_entry = { "set-window-option", "setw", "[-agu] " CMD_TARGET_WINDOW_USAGE " option [value]", - CMD_ARG12, CMD_CHFLAG('a')|CMD_CHFLAG('g')|CMD_CHFLAG('u'), + CMD_ARG12, "agu", NULL, cmd_target_parse, cmd_set_window_option_exec, @@ -86,7 +86,7 @@ cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx) const struct set_option_entry *entry, *opt; u_int i; - if (data->chflags & CMD_CHFLAG('g')) + if (cmd_check_flag(data->chflags, 'g')) oo = &global_w_options; else { if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) @@ -118,8 +118,8 @@ cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - if (data->chflags & CMD_CHFLAG('u')) { - if (data->chflags & CMD_CHFLAG('g')) { + if (cmd_check_flag(data->chflags, 'u')) { + if (cmd_check_flag(data->chflags, 'g')) { ctx->error(ctx, "can't unset global option: %s", entry->name); return (-1); @@ -136,7 +136,7 @@ cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx) switch (entry->type) { case SET_OPTION_STRING: set_option_string(ctx, oo, entry, - data->arg2, data->chflags & CMD_CHFLAG('a')); + data->arg2, cmd_check_flag(data->chflags, 'a')); break; case SET_OPTION_NUMBER: set_option_number(ctx, oo, entry, data->arg2); diff --git a/cmd-show-buffer.c b/cmd-show-buffer.c index 151fc2ae..d4484f08 100644 --- a/cmd-show-buffer.c +++ b/cmd-show-buffer.c @@ -31,7 +31,7 @@ int cmd_show_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_show_buffer_entry = { "show-buffer", "showb", CMD_BUFFER_SESSION_USAGE, - 0, 0, + 0, "", cmd_buffer_init, cmd_buffer_parse, cmd_show_buffer_exec, diff --git a/cmd-show-environment.c b/cmd-show-environment.c index 6a86ec67..6d0f364c 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -32,7 +32,7 @@ int cmd_show_environment_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_show_environment_entry = { "show-environment", "showenv", "[-g] " CMD_TARGET_SESSION_USAGE, - 0, CMD_CHFLAG('g'), + 0, "g", cmd_target_init, cmd_target_parse, cmd_show_environment_exec, @@ -48,7 +48,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_ctx *ctx) struct environ *env; struct environ_entry *envent; - if (data->chflags & CMD_CHFLAG('g')) + if (cmd_check_flag(data->chflags, 'g')) env = &global_environ; else { if ((s = cmd_find_session(ctx, data->target)) == NULL) diff --git a/cmd-show-options.c b/cmd-show-options.c index 9e84c64a..9e7fd7db 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -32,7 +32,7 @@ int cmd_show_options_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_show_options_entry = { "show-options", "show", "[-g] " CMD_TARGET_SESSION_USAGE, - 0, CMD_CHFLAG('g'), + 0, "g", cmd_target_init, cmd_target_parse, cmd_show_options_exec, @@ -50,7 +50,7 @@ cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx) const struct set_option_entry *entry; const char *optval; - if (data->chflags & CMD_CHFLAG('g')) + if (cmd_check_flag(data->chflags, 'g')) oo = &global_s_options; else { if ((s = cmd_find_session(ctx, data->target)) == NULL) diff --git a/cmd-show-window-options.c b/cmd-show-window-options.c index 04477233..2609cfab 100644 --- a/cmd-show-window-options.c +++ b/cmd-show-window-options.c @@ -32,7 +32,7 @@ int cmd_show_window_options_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_show_window_options_entry = { "show-window-options", "showw", "[-g] " CMD_TARGET_WINDOW_USAGE, - 0, CMD_CHFLAG('g'), + 0, "g", cmd_target_init, cmd_target_parse, cmd_show_window_options_exec, @@ -50,7 +50,7 @@ cmd_show_window_options_exec(struct cmd *self, struct cmd_ctx *ctx) const struct set_option_entry *entry; const char *optval; - if (data->chflags & CMD_CHFLAG('g')) + if (cmd_check_flag(data->chflags, 'g')) oo = &global_w_options; else { if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) diff --git a/cmd-source-file.c b/cmd-source-file.c index 2cb47c6e..a53a1cb8 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -37,7 +37,7 @@ struct cmd_source_file_data { const struct cmd_entry cmd_source_file_entry = { "source-file", "source", "path", - 0, 0, + 0, "", cmd_source_file_init, cmd_source_file_parse, cmd_source_file_exec, diff --git a/cmd-split-window.c b/cmd-split-window.c index a1a012a2..4dd03055 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -46,7 +46,7 @@ struct cmd_split_window_data { const struct cmd_entry cmd_split_window_entry = { "split-window", "splitw", "[-dhv] [-p percentage|-l size] [-t target-window] [command]", - 0, 0, + 0, "", cmd_split_window_init, cmd_split_window_parse, cmd_split_window_exec, diff --git a/cmd-start-server.c b/cmd-start-server.c index 0fa5bc49..382ae48d 100644 --- a/cmd-start-server.c +++ b/cmd-start-server.c @@ -29,7 +29,7 @@ int cmd_start_server_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_start_server_entry = { "start-server", "start", "", - CMD_STARTSERVER, 0, + CMD_STARTSERVER, "", NULL, NULL, cmd_start_server_exec, diff --git a/cmd-suspend-client.c b/cmd-suspend-client.c index f1fc6109..5c166c37 100644 --- a/cmd-suspend-client.c +++ b/cmd-suspend-client.c @@ -37,7 +37,7 @@ struct cmd_suspend_client_data { const struct cmd_entry cmd_suspend_client_entry = { "suspend-client", "suspendc", "[-c target-client]", - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_suspend_client_exec, diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index a49e064a..a1bd3de9 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -32,7 +32,7 @@ int cmd_swap_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_swap_pane_entry = { "swap-pane", "swapp", "[-dDU] " CMD_SRCDST_PANE_USAGE, - 0, CMD_CHFLAG('d')|CMD_CHFLAG('D')|CMD_CHFLAG('U'), + 0, "dDU", cmd_swap_pane_init, cmd_srcdst_parse, cmd_swap_pane_exec, @@ -49,11 +49,12 @@ cmd_swap_pane_init(struct cmd *self, int key) data = self->data; if (key == '{') - data->chflags |= CMD_CHFLAG('U'); + cmd_set_flag(&data->chflags, 'U'); else if (key == '}') - data->chflags |= CMD_CHFLAG('D'); + cmd_set_flag(&data->chflags, 'D'); } + int cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx) { @@ -73,11 +74,11 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx) if (data->src == NULL) { src_w = dst_w; - if (data->chflags & CMD_CHFLAG('D')) { + if (cmd_check_flag(data->chflags, 'D')) { src_wp = TAILQ_NEXT(dst_wp, entry); if (src_wp == NULL) src_wp = TAILQ_FIRST(&dst_w->panes); - } else if (data->chflags & CMD_CHFLAG('U')) { + } else if (cmd_check_flag(data->chflags, 'U')) { src_wp = TAILQ_PREV(dst_wp, window_panes, entry); if (src_wp == NULL) src_wp = TAILQ_LAST(&dst_w->panes, window_panes); @@ -120,7 +121,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx) dst_wp->xoff = xoff; dst_wp->yoff = yoff; window_pane_resize(dst_wp, sx, sy); - if (!(data->chflags & CMD_CHFLAG('d'))) { + if (!cmd_check_flag(data->chflags, 'd')) { if (src_w != dst_w) { window_set_active_pane(src_w, dst_wp); window_set_active_pane(dst_w, src_wp); diff --git a/cmd-swap-window.c b/cmd-swap-window.c index f164f234..ab532eb0 100644 --- a/cmd-swap-window.c +++ b/cmd-swap-window.c @@ -31,7 +31,7 @@ int cmd_swap_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_swap_window_entry = { "swap-window", "swapw", "[-d] " CMD_SRCDST_WINDOW_USAGE, - 0, CMD_CHFLAG('d'), + 0, "d", cmd_srcdst_init, cmd_srcdst_parse, cmd_swap_window_exec, @@ -68,7 +68,7 @@ cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx) wl_dst->window = wl_src->window; wl_src->window = w; - if (!(data->chflags & CMD_CHFLAG('d'))) { + if (!cmd_check_flag(data->chflags, 'd')) { session_select(dst, wl_dst->idx); if (src != dst) session_select(src, wl_src->idx); diff --git a/cmd-switch-client.c b/cmd-switch-client.c index 80c4dc5d..9ff1c081 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -40,7 +40,7 @@ struct cmd_switch_client_data { const struct cmd_entry cmd_switch_client_entry = { "switch-client", "switchc", "[-c target-client] [-t target-session]", - 0, 0, + 0, "", NULL, cmd_switch_client_parse, cmd_switch_client_exec, diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c index 8f5e794e..4633274d 100644 --- a/cmd-unbind-key.c +++ b/cmd-unbind-key.c @@ -40,7 +40,7 @@ struct cmd_unbind_key_data { const struct cmd_entry cmd_unbind_key_entry = { "unbind-key", "unbind", "[-cn] [-t key-table] key", - 0, 0, + 0, "", NULL, cmd_unbind_key_parse, cmd_unbind_key_exec, diff --git a/cmd-unlink-window.c b/cmd-unlink-window.c index e38b6e1e..15bafc08 100644 --- a/cmd-unlink-window.c +++ b/cmd-unlink-window.c @@ -29,7 +29,7 @@ int cmd_unlink_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_unlink_window_entry = { "unlink-window", "unlinkw", "[-k] " CMD_TARGET_WINDOW_USAGE, - 0, CMD_CHFLAG('k'), + 0, "k", cmd_target_init, cmd_target_parse, cmd_unlink_window_exec, @@ -59,7 +59,7 @@ cmd_unlink_window_exec(struct cmd *self, struct cmd_ctx *ctx) } else references = 1; - if (!(data->chflags & CMD_CHFLAG('k')) && w->references == references) { + if (!cmd_check_flag(data->chflags, 'k') && w->references == references) { ctx->error(ctx, "window is only linked to one session"); return (-1); } diff --git a/cmd-up-pane.c b/cmd-up-pane.c index 966952d6..49ab49a7 100644 --- a/cmd-up-pane.c +++ b/cmd-up-pane.c @@ -29,7 +29,7 @@ int cmd_up_pane_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_up_pane_entry = { "up-pane", "upp", CMD_TARGET_WINDOW_USAGE, - 0, 0, + 0, "", cmd_target_init, cmd_target_parse, cmd_up_pane_exec, @@ -1150,10 +1150,7 @@ struct cmd_entry { #define CMD_ARG12 0x40 int flags; -#define CMD_CHFLAG(flag) \ - ((flag) >= 'a' && (flag) <= 'z' ? 1ULL << ((flag) - 'a') : \ - (flag) >= 'A' && (flag) <= 'Z' ? 1ULL << (26 + (flag) - 'A') : 0) - uint64_t chflags; + const char *chflags; void (*init)(struct cmd *, int); int (*parse)(struct cmd *, int, char **, char **); @@ -1502,6 +1499,8 @@ int cmd_string_parse(const char *, struct cmd_list **, char **); /* cmd-generic.c */ size_t cmd_prarg(char *, size_t, const char *, char *); +int cmd_check_flag(uint64_t, int); +void cmd_set_flag(uint64_t *, int); #define CMD_TARGET_PANE_USAGE "[-t target-pane]" #define CMD_TARGET_WINDOW_USAGE "[-t target-window]" #define CMD_TARGET_SESSION_USAGE "[-t target-session]" |