summaryrefslogtreecommitdiffstats
path: root/cmd-resize-pane.c
diff options
context:
space:
mode:
authornicm <nicm>2015-12-13 14:32:38 +0000
committernicm <nicm>2015-12-13 14:32:38 +0000
commit4a4daf13031673870341c68b990e20c314140118 (patch)
tree2457218fe3b49af2401cb78cde064b2a7ff62916 /cmd-resize-pane.c
parent5ed17e84faed0a7655ec1eb3de291b60839dcb12 (diff)
Instead of every command resolving the target (-t or -s) itself, prepare
the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
Diffstat (limited to 'cmd-resize-pane.c')
-rw-r--r--cmd-resize-pane.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c
index b342307d..a4de32df 100644
--- a/cmd-resize-pane.c
+++ b/cmd-resize-pane.c
@@ -33,9 +33,8 @@ void cmd_resize_pane_mouse_update(struct client *, struct mouse_event *);
const struct cmd_entry cmd_resize_pane_entry = {
"resize-pane", "resizep",
"DLMRt:Ux:y:Z", 0, 1,
- "[-DLMRUZ] [-x width] [-y height] " CMD_TARGET_PANE_USAGE
- " [adjustment]",
- 0,
+ "[-DLMRUZ] [-x width] [-y height] " CMD_TARGET_PANE_USAGE " [adjustment]",
+ CMD_PANE_T,
cmd_resize_pane_exec
};
@@ -43,13 +42,13 @@ enum cmd_retval
cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
+ struct window_pane *wp = cmdq->state.tflag.wp;
+ struct winlink *wl = cmdq->state.tflag.wl;
+ struct window *w = wl->window;
struct client *c = cmdq->client;
- struct session *s;
- struct winlink *wl;
- struct window *w;
+ struct session *s = cmdq->state.tflag.s;
const char *errstr;
char *cause;
- struct window_pane *wp;
u_int adjust;
int x, y;
@@ -63,10 +62,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_NORMAL);
}
- if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
- return (CMD_RETURN_ERROR);
w = wl->window;
-
if (args_has(args, 'Z')) {
if (w->flags & WINDOW_ZOOMED)
window_unzoom(w);