From 9b7697db62dc1c809955e8f8fea2868c230cc503 Mon Sep 17 00:00:00 2001 From: nicm Date: Sun, 13 Dec 2015 16:44:35 +0000 Subject: [PATCH] Change cmd_find_target to use a state struct from the caller. --- cmd-find.c | 102 ++++++++++++++++++++++++++++------------------------- cmd.c | 100 ++++++++++++++++++++++++++------------------------- tmux.h | 4 +-- 3 files changed, 108 insertions(+), 98 deletions(-) diff --git a/cmd-find.c b/cmd-find.c index 8059957b..139ec069 100644 --- a/cmd-find.c +++ b/cmd-find.c @@ -789,15 +789,18 @@ cmd_find_clear_state(struct cmd_find_state *fs, struct cmd_q *cmdq, int flags) fs->idx = -1; } -/* Split target into pieces and resolve for the given type. */ -struct cmd_find_state * -cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, - int flags) +/* + * Split target into pieces and resolve for the given type. Fills in the given + * state. Returns 0 on success or -1 on error. + */ +int +cmd_find_target(struct cmd_find_state *fs, struct cmd_q *cmdq, + const char *target, enum cmd_find_type type, int flags) { - static struct cmd_find_state fs, current; - struct mouse_event *m; - char *colon, *period, *copy = NULL; - const char *session, *window, *pane; + struct cmd_find_state current; + struct mouse_event *m; + char *colon, *period, *copy = NULL; + const char *session, *window, *pane; /* Log the arguments. */ if (target == NULL) @@ -822,8 +825,8 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, } /* Clear new state. */ - cmd_find_clear_state(&fs, cmdq, flags); - fs.current = ¤t; + cmd_find_clear_state(fs, cmdq, flags); + fs->current = ¤t; /* An empty or NULL target is the current. */ if (target == NULL || *target == '\0') @@ -834,20 +837,20 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, m = &cmdq->item->mouse; switch (type) { case CMD_FIND_PANE: - fs.wp = cmd_mouse_pane(m, &fs.s, &fs.wl); - if (fs.wp != NULL) - fs.w = fs.wl->window; + fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl); + if (fs->wp != NULL) + fs->w = fs->wl->window; break; case CMD_FIND_WINDOW: case CMD_FIND_SESSION: - fs.wl = cmd_mouse_window(m, &fs.s); - if (fs.wl != NULL) { - fs.w = fs.wl->window; - fs.wp = fs.w->active; + fs->wl = cmd_mouse_window(m, &fs->s); + if (fs->wl != NULL) { + fs->w = fs->wl->window; + fs->wp = fs->w->active; } break; } - if (fs.wp == NULL) { + if (fs->wp == NULL) { if (~flags & CMD_FIND_QUIET) cmdq_error(cmdq, "no mouse target"); goto error; @@ -862,11 +865,11 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, cmdq_error(cmdq, "no marked target"); goto error; } - fs.s = marked_session; - fs.wl = marked_winlink; - fs.idx = fs.wl->idx; - fs.w = fs.wl->window; - fs.wp = marked_window_pane; + fs->s = marked_session; + fs->wl = marked_winlink; + fs->idx = fs->wl->idx; + fs->w = fs->wl->window; + fs->wp = marked_window_pane; goto found; } @@ -919,11 +922,11 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, /* Set exact match flags. */ if (session != NULL && *session == '=') { session++; - fs.flags |= CMD_FIND_EXACT_SESSION; + fs->flags |= CMD_FIND_EXACT_SESSION; } if (window != NULL && *window == '=') { window++; - fs.flags |= CMD_FIND_EXACT_WINDOW; + fs->flags |= CMD_FIND_EXACT_WINDOW; } /* Empty is the same as NULL. */ @@ -956,32 +959,32 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, /* If the session isn't NULL, look it up. */ if (session != NULL) { /* This will fill in session. */ - if (cmd_find_get_session(&fs, session) != 0) + if (cmd_find_get_session(fs, session) != 0) goto no_session; /* If window and pane are NULL, use that session's current. */ if (window == NULL && pane == NULL) { - fs.wl = fs.s->curw; - fs.idx = -1; - fs.w = fs.wl->window; - fs.wp = fs.w->active; + fs->wl = fs->s->curw; + fs->idx = -1; + fs->w = fs->wl->window; + fs->wp = fs->w->active; goto found; } /* If window is present but pane not, find window in session. */ if (window != NULL && pane == NULL) { /* This will fill in winlink and window. */ - if (cmd_find_get_window_with_session(&fs, window) != 0) + if (cmd_find_get_window_with_session(fs, window) != 0) goto no_window; if (~flags & CMD_FIND_WINDOW_INDEX) - fs.wp = fs.wl->window->active; + fs->wp = fs->wl->window->active; goto found; } /* If pane is present but window not, find pane. */ if (window == NULL && pane != NULL) { /* This will fill in winlink and window and pane. */ - if (cmd_find_get_pane_with_session(&fs, pane) != 0) + if (cmd_find_get_pane_with_session(fs, pane) != 0) goto no_pane; goto found; } @@ -990,10 +993,10 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, * If window and pane are present, find both in session. This * will fill in winlink and window. */ - if (cmd_find_get_window_with_session(&fs, window) != 0) + if (cmd_find_get_window_with_session(fs, window) != 0) goto no_window; /* This will fill in pane. */ - if (cmd_find_get_pane_with_window(&fs, pane) != 0) + if (cmd_find_get_pane_with_window(fs, pane) != 0) goto no_pane; goto found; } @@ -1001,10 +1004,10 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, /* No session. If window and pane, try them. */ if (window != NULL && pane != NULL) { /* This will fill in session, winlink and window. */ - if (cmd_find_get_window(&fs, window) != 0) + if (cmd_find_get_window(fs, window) != 0) goto no_window; /* This will fill in pane. */ - if (cmd_find_get_pane_with_window(&fs, pane) != 0) + if (cmd_find_get_pane_with_window(fs, pane) != 0) goto no_pane; goto found; } @@ -1012,38 +1015,41 @@ cmd_find_target(struct cmd_q *cmdq, const char *target, enum cmd_find_type type, /* If just window is present, try it. */ if (window != NULL && pane == NULL) { /* This will fill in session, winlink and window. */ - if (cmd_find_get_window(&fs, window) != 0) + if (cmd_find_get_window(fs, window) != 0) goto no_window; if (~flags & CMD_FIND_WINDOW_INDEX) - fs.wp = fs.wl->window->active; + fs->wp = fs->wl->window->active; goto found; } /* If just pane is present, try it. */ if (window == NULL && pane != NULL) { /* This will fill in session, winlink, window and pane. */ - if (cmd_find_get_pane(&fs, pane) != 0) + if (cmd_find_get_pane(fs, pane) != 0) goto no_pane; goto found; } current: - /* None is the current session. */ - free(copy); + /* Use the current session. */ if (flags & CMD_FIND_WINDOW_INDEX) current.idx = -1; - cmd_find_log_state(__func__, ¤t); - return (¤t); + memcpy(fs, ¤t, sizeof *fs); + goto found; error: - free(copy); + fs->current = NULL; log_debug(" error"); - return (NULL); + + free(copy); + return (-1); found: - cmd_find_log_state(__func__, &fs); + fs->current = NULL; + cmd_find_log_state(__func__, fs); + free(copy); - return (&fs); + return (0); no_session: if (~flags & CMD_FIND_QUIET) diff --git a/cmd.c b/cmd.c index 0bb804ef..43002eb3 100644 --- a/cmd.c +++ b/cmd.c @@ -433,12 +433,12 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c) struct cmd_state_flag *statef = NULL; const char *flag; int flags = cmd->entry->flags, everything = 0; - int allflags = 0, targetflags; + int allflags = 0, targetflags, error; struct session *s; struct window *w; struct winlink *wl; struct window_pane *wp; - struct cmd_find_state *fs; + struct cmd_find_state fs; /* Set up state for either -t or -s. */ if (c == 't') { @@ -480,19 +480,19 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c) case CMD_SESSION_T|CMD_PANE_T: case CMD_SESSION_S|CMD_PANE_S: if (flag != NULL && flag[strcspn(flag, ":.")] != '\0') { - fs = cmd_find_target(cmdq, flag, CMD_FIND_PANE, + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_PANE, targetflags); - if (fs == NULL) + if (error != 0) return (-1); - statef->s = fs->s; - statef->wl = fs->wl; - statef->wp = fs->wp; + statef->s = fs.s; + statef->wl = fs.wl; + statef->wp = fs.wp; } else { - fs = cmd_find_target(cmdq, flag, CMD_FIND_SESSION, - targetflags); - if (fs == NULL) + error = cmd_find_target(&fs, cmdq, flag, + CMD_FIND_SESSION, targetflags); + if (error != 0) return (-1); - statef->s = fs->s; + statef->s = fs.s; if (flag == NULL) { statef->wl = statef->s->curw; @@ -516,24 +516,26 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c) break; case CMD_MOVEW_R|CMD_INDEX_T: case CMD_MOVEW_R|CMD_INDEX_S: - fs = cmd_find_target(cmdq, flag, CMD_FIND_SESSION, targetflags); - if (fs != NULL) - statef->s = fs->s; + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_SESSION, + targetflags); + if (error == 0) + statef->s = fs.s; else { - fs = cmd_find_target(cmdq, flag, CMD_FIND_WINDOW, - CMD_FIND_WINDOW_INDEX); - if (fs == NULL) + error = cmd_find_target(&fs, cmdq, flag, + CMD_FIND_WINDOW, CMD_FIND_WINDOW_INDEX); + if (error != 0) return (-1); - statef->s = fs->s; - statef->idx = fs->idx; + statef->s = fs.s; + statef->idx = fs.idx; } break; case CMD_SESSION_T: case CMD_SESSION_S: - fs = cmd_find_target(cmdq, flag, CMD_FIND_SESSION, targetflags); - if (fs == NULL) + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_SESSION, + targetflags); + if (error != 0) return (-1); - statef->s = fs->s; + statef->s = fs.s; break; case CMD_WINDOW_MARKED_T: case CMD_WINDOW_MARKED_S: @@ -541,11 +543,12 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c) /* FALLTHROUGH */ case CMD_WINDOW_T: case CMD_WINDOW_S: - fs = cmd_find_target(cmdq, flag, CMD_FIND_WINDOW, targetflags); - if (fs == NULL) + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_WINDOW, + targetflags); + if (error != 0) return (-1); - statef->s = fs->s; - statef->wl = fs->wl; + statef->s = fs.s; + statef->wl = fs.wl; break; case CMD_PANE_MARKED_T: case CMD_PANE_MARKED_S: @@ -553,21 +556,22 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c) /* FALLTHROUGH */ case CMD_PANE_T: case CMD_PANE_S: - fs = cmd_find_target(cmdq, flag, CMD_FIND_PANE, targetflags); - if (fs == NULL) + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_PANE, + targetflags); + if (error != 0) return (-1); - statef->s = fs->s; - statef->wl = fs->wl; - statef->wp = fs->wp; + statef->s = fs.s; + statef->wl = fs.wl; + statef->wp = fs.wp; break; case CMD_INDEX_T: case CMD_INDEX_S: - fs = cmd_find_target(cmdq, flag, CMD_FIND_WINDOW, + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_WINDOW, CMD_FIND_WINDOW_INDEX); - if (fs == NULL) + if (error != 0) return (-1); - statef->s = fs->s; - statef->idx = fs->idx; + statef->s = fs.s; + statef->idx = fs.idx; break; default: fatalx("too many -%c for %s", c, cmd->entry->name); @@ -586,10 +590,10 @@ complete_everything: if (state->c != NULL) statef->s = state->c->session; if (statef->s == NULL) { - fs = cmd_find_target(cmdq, NULL, CMD_FIND_SESSION, - CMD_FIND_QUIET); - if (fs != NULL) - statef->s = fs->s; + error = cmd_find_target(&fs, cmdq, NULL, + CMD_FIND_SESSION, CMD_FIND_QUIET); + if (error == 0) + statef->s = fs.s; } if (statef->s == NULL) { if (flags & CMD_CANFAIL) @@ -599,18 +603,18 @@ complete_everything: } } if (statef->wl == NULL) { - fs = cmd_find_target(cmdq, flag, CMD_FIND_WINDOW, 0); - if (fs != NULL) { - statef->s = fs->s; - statef->wl = fs->wl; + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_WINDOW, 0); + if (error != 0) { + statef->s = fs.s; + statef->wl = fs.wl; } } if (statef->wp == NULL) { - fs = cmd_find_target(cmdq, flag, CMD_FIND_PANE, 0); - if (fs != NULL) { - statef->s = fs->s; - statef->wl = fs->wl; - statef->wp = fs->wp; + error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_PANE, 0); + if (error != 0) { + statef->s = fs.s; + statef->wl = fs.wl; + statef->wp = fs.wp; } } return (0); diff --git a/tmux.h b/tmux.h index 7a30fc71..e6fb521e 100644 --- a/tmux.h +++ b/tmux.h @@ -1760,8 +1760,8 @@ long long args_strtonum(struct args *, u_char, long long, long long, char **); /* cmd-find.c */ -struct cmd_find_state *cmd_find_target(struct cmd_q *, const char *, - enum cmd_find_type, int); +int cmd_find_target(struct cmd_find_state *, struct cmd_q *, + const char *, enum cmd_find_type, int); struct client *cmd_find_client(struct cmd_q *, const char *, int); /* cmd.c */