diff options
author | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
commit | 1a6e696b08113ca17ee8e881844167cf94276846 (patch) | |
tree | 60ecdd8c9e51bff46624e48d9373686b858d2fb1 /cmd-list-windows.c | |
parent | d401340c516131ae8e07bfb978b670347486d077 (diff) | |
parent | d15d54c2c8e6b95695169442eb2a27d814efc078 (diff) | |
download | rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2 rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-list-windows.c')
-rw-r--r-- | cmd-list-windows.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cmd-list-windows.c b/cmd-list-windows.c index 9d8a615c..cd7498f0 100644 --- a/cmd-list-windows.c +++ b/cmd-list-windows.c @@ -39,11 +39,11 @@ "(#{window_panes} panes) " \ "[#{window_width}x#{window_height}] " -static enum cmd_retval cmd_list_windows_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_list_windows_exec(struct cmd *, struct cmdq_item *); -static void cmd_list_windows_server(struct cmd *, struct cmd_q *); +static void cmd_list_windows_server(struct cmd *, struct cmdq_item *); static void cmd_list_windows_session(struct cmd *, struct session *, - struct cmd_q *, int); + struct cmdq_item *, int); const struct cmd_entry cmd_list_windows_entry = { .name = "list-windows", @@ -59,30 +59,30 @@ const struct cmd_entry cmd_list_windows_entry = { }; static enum cmd_retval -cmd_list_windows_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_list_windows_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; if (args_has(args, 'a')) - cmd_list_windows_server(self, cmdq); + cmd_list_windows_server(self, item); else - cmd_list_windows_session(self, cmdq->state.tflag.s, cmdq, 0); + cmd_list_windows_session(self, item->state.tflag.s, item, 0); return (CMD_RETURN_NORMAL); } static void -cmd_list_windows_server(struct cmd *self, struct cmd_q *cmdq) +cmd_list_windows_server(struct cmd *self, struct cmdq_item *item) { struct session *s; RB_FOREACH(s, sessions, &sessions) - cmd_list_windows_session(self, s, cmdq, 1); + cmd_list_windows_session(self, s, item, 1); } static void cmd_list_windows_session(struct cmd *self, struct session *s, - struct cmd_q *cmdq, int type) + struct cmdq_item *item, int type) { struct args *args = self->args; struct winlink *wl; @@ -105,12 +105,12 @@ cmd_list_windows_session(struct cmd *self, struct session *s, n = 0; RB_FOREACH(wl, winlinks, &s->windows) { - ft = format_create(cmdq, 0); + ft = format_create(item, 0); format_add(ft, "line", "%u", n); format_defaults(ft, NULL, s, wl, NULL); line = format_expand(ft, template); - cmdq_print(cmdq, "%s", line); + cmdq_print(item, "%s", line); free(line); format_free(ft); |