mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 17:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	server.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-23 21:20:54 +00:00
parent 78a00c845c 28e72ae34d
commit d63de1e407
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
grid.c
View File

@@ -368,11 +368,8 @@ grid_clear_lines(struct grid *gd, u_int py, u_int ny)
for (yy = py; yy < py + ny; yy++) { for (yy = py; yy < py + ny; yy++) {
gl = &gd->linedata[yy]; gl = &gd->linedata[yy];
free(gl->celldata); free(gl->celldata);
memset(gl, 0, sizeof *gl);
free(gl->extddata); free(gl->extddata);
gl->extddata = NULL; memset(gl, 0, sizeof *gl);
gl->extdsize = 0;
} }
} }

2
options-table.c
View File

@@ -197,7 +197,7 @@ const struct options_table_entry options_table[] = {
{ .name = "display-time", { .name = "display-time",
.type = OPTIONS_TABLE_NUMBER, .type = OPTIONS_TABLE_NUMBER,
.scope = OPTIONS_TABLE_SESSION, .scope = OPTIONS_TABLE_SESSION,
.minimum = 1, .minimum = 0,
.maximum = INT_MAX, .maximum = INT_MAX,
.default_num = 750 .default_num = 750
}, },

4
server.c
View File

@@ -176,8 +176,8 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
tty_create_log(); tty_create_log();
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (pledge("stdio rpath wpath cpath fattr unix recvfd proc exec tty " if (pledge("stdio rpath wpath cpath fattr unix getpw recvfd proc exec "
"ps", NULL) != 0) "tty ps", NULL) != 0)
fatal("pledge failed"); fatal("pledge failed");
#endif #endif

14
status.c
View File

@@ -574,13 +574,15 @@ status_message_set(struct client *c, const char *fmt, ...)
} }
delay = options_get_number(c->session->options, "display-time"); delay = options_get_number(c->session->options, "display-time");
tv.tv_sec = delay / 1000; if (delay > 0) {
tv.tv_usec = (delay % 1000) * 1000L; tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
if (event_initialized(&c->message_timer)) if (event_initialized(&c->message_timer))
evtimer_del(&c->message_timer); evtimer_del(&c->message_timer);
evtimer_set(&c->message_timer, status_message_callback, c); evtimer_set(&c->message_timer, status_message_callback, c);
evtimer_add(&c->message_timer, &tv); evtimer_add(&c->message_timer, &tv);
}
c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE); c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE);
c->flags |= CLIENT_STATUS; c->flags |= CLIENT_STATUS;

1
tmux.1
View File

@@ -2561,6 +2561,7 @@ command appear.
.It Ic display-time Ar time .It Ic display-time Ar time
Set the amount of time for which status line messages and other on-screen Set the amount of time for which status line messages and other on-screen
indicators are displayed. indicators are displayed.
If set to 0, messages and indicators are displayed until a key is pressed.
.Ar time .Ar time
is in milliseconds. is in milliseconds.
.It Ic history-limit Ar lines .It Ic history-limit Ar lines

4
tmux.c
View File

@@ -261,8 +261,8 @@ main(int argc, char **argv)
usage(); usage();
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd " if (pledge("stdio rpath wpath cpath flock fattr unix getpw sendfd "
"proc exec tty ps", NULL) != 0) "recvfd proc exec tty ps", NULL) != 0)
err(1, "pledge"); err(1, "pledge");
#endif #endif