aboutsummaryrefslogtreecommitdiff
path: root/cmd-display-message.c
diff options
context:
space:
mode:
Diffstat (limited to 'cmd-display-message.c')
-rw-r--r--cmd-display-message.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c
index f0cd66c0..319280ba 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -27,7 +27,7 @@
* Displays a message in the status line.
*/
-enum cmd_retval cmd_display_message_exec(struct cmd *, struct cmd_ctx *);
+enum cmd_retval cmd_display_message_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_display_message_entry = {
"display-message", "display",
@@ -41,7 +41,7 @@ const struct cmd_entry cmd_display_message_entry = {
};
enum cmd_retval
-cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
+cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
struct client *c;
@@ -56,17 +56,17 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
size_t len;
if (args_has(args, 't')) {
- wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp);
+ wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
if (wl == NULL)
return (CMD_RETURN_ERROR);
} else {
- wl = cmd_find_pane(ctx, NULL, &s, &wp);
+ wl = cmd_find_pane(cmdq, NULL, &s, &wp);
if (wl == NULL)
return (CMD_RETURN_ERROR);
}
if (args_has(args, 'F') && args->argc != 0) {
- ctx->error(ctx, "only one of -F or argument must be given");
+ cmdq_error(cmdq, "only one of -F or argument must be given");
return (CMD_RETURN_ERROR);
}
@@ -77,7 +77,7 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
template = DISPLAY_MESSAGE_TEMPLATE;
ft = format_create();
- if ((c = cmd_find_client(ctx, args_get(args, 'c'), 1)) != NULL)
+ if ((c = cmd_find_client(cmdq, args_get(args, 'c'), 1)) != NULL)
format_client(ft, c);
format_session(ft, s);
format_winlink(ft, s, wl);
@@ -89,11 +89,11 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
msg = format_expand(ft, out);
if (args_has(self->args, 'p'))
- ctx->print(ctx, "%s", msg);
+ cmdq_print(cmdq, "%s", msg);
else
status_message_set(c, "%s", msg);
-
free(msg);
format_free(ft);
+
return (CMD_RETURN_NORMAL);
}