From 5f366e6d54c4825eb760424f86388e8813bb6189 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sat, 28 Nov 2009 14:39:53 +0000 Subject: Sync OpenBSD patchset 561: Add a -p flag to display-message to print the output rather than displaying in the status line, this allows things like "display -p '#W'" to find the current window index. --- cmd-display-message.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'cmd-display-message.c') diff --git a/cmd-display-message.c b/cmd-display-message.c index 36266d32..13e68be7 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -1,4 +1,4 @@ -/* $Id: cmd-display-message.c,v 1.6 2009-11-19 22:35:10 tcunha Exp $ */ +/* $Id: cmd-display-message.c,v 1.7 2009-11-28 14:39:53 tcunha Exp $ */ /* * Copyright (c) 2009 Tiago Cunha @@ -30,8 +30,8 @@ int cmd_display_message_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_display_message_entry = { "display-message", "display", - CMD_TARGET_CLIENT_USAGE " [message]", - CMD_ARG01, "", + "[-p] " CMD_TARGET_CLIENT_USAGE " [message]", + CMD_ARG01, "p", cmd_target_init, cmd_target_parse, cmd_display_message_exec, @@ -56,7 +56,10 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx) template = data->arg; msg = status_replace(c, NULL, template, time(NULL), 0); - status_message_set(c, "%s", msg); + if (cmd_check_flag(data->chflags, 'p')) + ctx->print(ctx, "%s", msg); + else + status_message_set(c, "%s", msg); xfree(msg); return (0); -- cgit