extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-02-23 05:41:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 1097:

Browse Source 
Add window-status-separator option, from Thomas Adam.
This commit is contained in:
Tiago Cunha 2012-04-24 16:20:18 +00:00
parent 00e2e35740
commit 6df8953f4f
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
options-table.c
View File

@ -690,6 +690,11 @@ const struct options_table_entry window_options_table[] = {
.default_str = "#I:#W#F" .default_str = "#I:#W#F"
}, },
{ .name = "window-status-separator",
.type = OPTIONS_TABLE_STRING,
.default_str = " "
},
{ .name = "wrap-search", { .name = "wrap-search",
.type = OPTIONS_TABLE_FLAG, .type = OPTIONS_TABLE_FLAG,
.default_num = 1 .default_num = 1

16
status.c
View File

@ -160,11 +160,12 @@ status_redraw(struct client *c)
struct winlink *wl; struct winlink *wl;
struct screen old_status, window_list; struct screen old_status, window_list;
struct grid_cell stdgc, lgc, rgc, gc; struct grid_cell stdgc, lgc, rgc, gc;
struct options *oo;
time_t t; time_t t;
char *left, *right; char *left, *right, *sep;
u_int offset, needed; u_int offset, needed;
u_int wlstart, wlwidth, wlavailable, wloffset, wlsize; u_int wlstart, wlwidth, wlavailable, wloffset, wlsize;
size_t llen, rlen; size_t llen, rlen, seplen;
int larrow, rarrow, utf8flag; int larrow, rarrow, utf8flag;
/* No status line? */ /* No status line? */
@ -230,7 +231,11 @@ status_redraw(struct client *c)
if (wl == s->curw) if (wl == s->curw)
wloffset = wlwidth; wloffset = wlwidth;
wlwidth += wl->status_width + 1;
oo = &wl->window->options;
sep = options_get_string(oo, "window-status-separator");
seplen = screen_write_strlen(utf8flag, "%s", sep);
wlwidth += wl->status_width + seplen;
} }
/* Create a new screen for the window list. */ /* Create a new screen for the window list. */
@ -241,7 +246,10 @@ status_redraw(struct client *c)
RB_FOREACH(wl, winlinks, &s->windows) { RB_FOREACH(wl, winlinks, &s->windows) {
screen_write_cnputs(&ctx, screen_write_cnputs(&ctx,
-1, &wl->status_cell, utf8flag, "%s", wl->status_text); -1, &wl->status_cell, utf8flag, "%s", wl->status_text);
screen_write_putc(&ctx, &stdgc, ' ');
oo = &wl->window->options;
sep = options_get_string(oo, "window-status-separator");
screen_write_nputs(&ctx, -1, &stdgc, utf8flag, "%s", sep);
} }
screen_write_stop(&ctx); screen_write_stop(&ctx);

4
tmux.1
View File

@ -2704,6 +2704,10 @@ option for details of special character sequences available.
The default is The default is
.Ql #I:#W#F . .Ql #I:#W#F .
.Pp .Pp
.It Ic window-status-separator Ar string
Sets the separator drawn between windows in the status line.
The default is a single space character.
.Pp
.It Xo Ic xterm-keys .It Xo Ic xterm-keys
.Op Ic on | off .Op Ic on | off
.Xc .Xc