summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-display-message.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-04-13 10:59:58 +0000
committernicm <nicm@openbsd.org>2020-04-13 10:59:58 +0000
commit040343ae18e7aa6a49c6acf6e4add8a0b76f6fff (patch)
tree8ed8ccb63639c656437cc1539d3d2b96b405d399 /usr.bin/tmux/cmd-display-message.c
parentMake struct cmd local to cmd.c and move it out of tmux.h. (diff)
downloadwireguard-openbsd-040343ae18e7aa6a49c6acf6e4add8a0b76f6fff.tar.xz
wireguard-openbsd-040343ae18e7aa6a49c6acf6e4add8a0b76f6fff.zip
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its
use more clearly defined and preparation for some future work).
Diffstat (limited to 'usr.bin/tmux/cmd-display-message.c')
-rw-r--r--usr.bin/tmux/cmd-display-message.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-display-message.c b/usr.bin/tmux/cmd-display-message.c
index b8390ded740..f4f32ed7dda 100644
--- a/usr.bin/tmux/cmd-display-message.c
+++ b/usr.bin/tmux/cmd-display-message.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-message.c,v 1.51 2020/04/13 08:26:27 nicm Exp $ */
+/* $OpenBSD: cmd-display-message.c,v 1.52 2020/04/13 10:59:58 nicm Exp $ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -61,10 +61,11 @@ static enum cmd_retval
cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = cmd_get_args(self);
+ struct cmd_find_state *target = cmdq_get_target(item);
struct client *c, *target_c;
- struct session *s = item->target.s;
- struct winlink *wl = item->target.wl;
- struct window_pane *wp = item->target.wp;
+ struct session *s = target->s;
+ struct winlink *wl = target->wl;
+ struct window_pane *wp = target->wp;
const char *template;
char *msg, *cause;
struct format_tree *ft;
@@ -105,7 +106,7 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
flags = FORMAT_VERBOSE;
else
flags = 0;
- ft = format_create(item->client, item, FORMAT_NONE, flags);
+ ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, flags);
format_defaults(ft, target_c, s, wl, wp);
if (args_has(args, 'a')) {