circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-13 03:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Make status_message_set a variadic printf-like function. No functional change -

Browse Source 
helpful for a couple of things coming soon.
This commit is contained in:
Nicholas Marriott 2009-07-15 17:50:11 +00:00
parent d6908dd9c2
commit 222b8e6743
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-command-prompt.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-command-prompt.c,v 1.17 2009-07-14 06:43:32 nicm Exp $ */
/* $Id: cmd-command-prompt.c,v 1.18 2009-07-15 17:50:11 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -150,7 +150,7 @@ cmd_command_prompt_callback(void *data, const char *s)
if (cause == NULL)
return (0);
*cause = toupper((u_char) *cause);
status_message_set(c, cause);
status_message_set(c, "%s", cause);
xfree(cause);
cmdlist = NULL;
}

4
cmd-confirm-before.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-confirm-before.c,v 1.5 2009-07-14 06:43:32 nicm Exp $ */
/* $Id: cmd-confirm-before.c,v 1.6 2009-07-15 17:50:11 nicm Exp $ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@ -113,7 +113,7 @@ cmd_confirm_before_callback(void *data, const char *s)
if (cmd_string_parse(cdata->cmd, &cmdlist, &cause) != 0) {
if (cause != NULL) {
*cause = toupper((u_char) *cause);
status_message_set(c, cause);
status_message_set(c, "%s", cause);
xfree(cause);
}
goto out;

6
cmd-select-prompt.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-select-prompt.c,v 1.8 2009-07-14 06:43:32 nicm Exp $ */
/* $Id: cmd-select-prompt.c,v 1.9 2009-07-15 17:50:11 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -74,14 +74,14 @@ cmd_select_prompt_callback(void *data, const char *s)
idx = strtonum(s, 0, UINT_MAX, &errstr);
if (errstr != NULL) {
xsnprintf(msg, sizeof msg, "Index %s: %s", errstr, s);
status_message_set(c, msg);
status_message_set(c, "%s", msg);
return (0);
}
if (winlink_find_by_index(&c->session->windows, idx) == NULL) {
xsnprintf(msg, sizeof msg,
"Window not found: %s:%d", c->session->name, idx);
status_message_set(c, msg);
status_message_set(c, "%s", msg);
return (0);
}

6
key-bindings.c
View File

@ -1,4 +1,4 @@
/* $Id: key-bindings.c,v 1.73 2009-07-14 06:39:25 nicm Exp $ */
/* $Id: key-bindings.c,v 1.74 2009-07-15 17:50:11 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -194,7 +194,7 @@ key_bindings_error(struct cmd_ctx *ctx, const char *fmt, ...)
va_end(ap);
*msg = toupper((u_char) *msg);
status_message_set(ctx->curclient, msg);
status_message_set(ctx->curclient, "%s", msg);
xfree(msg);
}
@ -227,7 +227,7 @@ key_bindings_info(struct cmd_ctx *ctx, const char *fmt, ...)
va_end(ap);
*msg = toupper((u_char) *msg);
status_message_set(ctx->curclient, msg);
status_message_set(ctx->curclient, "%s", msg);
xfree(msg);
}

11
status.c
View File

@ -1,4 +1,4 @@
/* $Id: status.c,v 1.94 2009-07-15 17:44:47 nicm Exp $ */
/* $Id: status.c,v 1.95 2009-07-15 17:50:11 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -465,17 +465,20 @@ status_print(struct session *s, struct winlink *wl, struct grid_cell *gc)
return (text);
}
void
status_message_set(struct client *c, const char *msg)
void printflike2
status_message_set(struct client *c, const char *fmt, ...)
{
struct timeval tv;
va_list ap;
int delay;
delay = options_get_number(&c->session->options, "display-time");
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
c->message_string = xstrdup(msg);
va_start(ap, fmt);
xvasprintf(&c->message_string, fmt, ap);
va_end(ap);
if (gettimeofday(&c->message_timer, NULL) != 0)
fatal("gettimeofday");
timeradd(&c->message_timer, &tv, &c->message_timer);

4
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.365 2009-07-15 17:44:47 nicm Exp $ */
/* $Id: tmux.h,v 1.366 2009-07-15 17:50:11 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1274,7 +1274,7 @@ int server_unlock(const char *);
/* status.c */
int status_redraw(struct client *);
void status_message_set(struct client *, const char *);
void printflike2 status_message_set(struct client *, const char *, ...);
void status_message_clear(struct client *);
int status_message_redraw(struct client *);
void status_prompt_set(struct client *,