Make message-limit a server option.

This commit is contained in:
nicm 2014-03-31 21:41:35 +00:00
parent 1704d4a6b7
commit dca7d1c0fd
3 changed files with 13 additions and 17 deletions

View File

@ -81,6 +81,13 @@ const struct options_table_entry server_options_table[] = {
.default_num = 0
},
{ .name = "message-limit",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 0,
.maximum = INT_MAX,
.default_num = 100
},
{ .name = "quiet",
.type = OPTIONS_TABLE_FLAG,
.default_num = 0 /* overridden in main() */
@ -243,13 +250,6 @@ const struct options_table_entry session_options_table[] = {
.style = "message-style"
},
{ .name = "message-limit",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 0,
.maximum = INT_MAX,
.default_num = 20
},
{ .name = "message-style",
.type = OPTIONS_TABLE_STYLE,
.default_str = "bg=yellow,fg=black"

View File

@ -655,7 +655,6 @@ void printflike2
status_message_set(struct client *c, const char *fmt, ...)
{
struct timeval tv;
struct session *s = c->session;
struct message_entry *msg;
va_list ap;
int delay;
@ -673,10 +672,7 @@ status_message_set(struct client *c, const char *fmt, ...)
msg->msg_time = time(NULL);
msg->msg = xstrdup(c->message_string);
if (s == NULL)
limit = 0;
else
limit = options_get_number(&s->options, "message-limit");
limit = options_get_number(&global_options, "message-limit");
if (ARRAY_LENGTH(&c->message_log) > limit) {
limit = ARRAY_LENGTH(&c->message_log) - limit;
for (i = 0; i < limit; i++) {

10
tmux.1
View File

@ -778,7 +778,7 @@ Show client messages or server information.
Any messages displayed on the status line are saved in a per-client message
log, up to a maximum of the limit set by the
.Ar message-limit
session option for the session attached to that client.
server option.
With
.Fl t ,
display the log for
@ -2134,6 +2134,10 @@ passed through to applications running in
.Nm .
Attached clients should be detached and attached again after changing this
option.
.It Ic message-limit Ar number
Set the number of error or information messages to save in the message log for
each client.
The default is 100.
.It Xo Ic quiet
.Op Ic on | off
.Xc
@ -2391,10 +2395,6 @@ With the
flag to the
.Ic set-option
command the new style is added otherwise the existing style is replaced.
.It Ic message-limit Ar number
Set the number of error or information messages to save in the message log for
each client.
The default is 20.
.It Ic message-style Ar style
Set status line message style.
For how to specify