circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-05 08:07:03 +00:00
Code Issues Projects Releases Wiki Activity

Allow #[] in window-status-separator.

Browse Source
This commit is contained in:
nicm
2016-06-06 07:23:36 +00:00
parent 1921fac814
commit 3c10df4f87
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
status.c
View File

@ -257,16 +257,19 @@ status_get_window_at(struct client *c, u_int x)
struct session *s = c->session; struct session *s = c->session;
struct winlink *wl; struct winlink *wl;
struct options *oo; struct options *oo;
size_t len; const char *sep;
size_t seplen;
x += c->wlmouse; x += c->wlmouse;
RB_FOREACH(wl, winlinks, &s->windows) { RB_FOREACH(wl, winlinks, &s->windows) {
oo = wl->window->options; oo = wl->window->options;
len = strlen(options_get_string(oo, "window-status-separator"));
sep = options_get_string(oo, "window-status-separator");
seplen = screen_write_cstrlen("%s", sep);
if (x < wl->status_width) if (x < wl->status_width)
return (wl->window); return (wl->window);
x -= wl->status_width + len; x -= wl->status_width + seplen;
} }
return (NULL); return (NULL);
} }
@ -344,7 +347,7 @@ status_redraw(struct client *c)
oo = wl->window->options; oo = wl->window->options;
sep = options_get_string(oo, "window-status-separator"); sep = options_get_string(oo, "window-status-separator");
seplen = screen_write_strlen("%s", sep); seplen = screen_write_cstrlen("%s", sep);
wlwidth += wl->status_width + seplen; wlwidth += wl->status_width + seplen;
} }
@ -359,7 +362,7 @@ status_redraw(struct client *c)
oo = wl->window->options; oo = wl->window->options;
sep = options_get_string(oo, "window-status-separator"); sep = options_get_string(oo, "window-status-separator");
screen_write_nputs(&ctx, -1, &stdgc, "%s", sep); screen_write_cnputs(&ctx, -1, &stdgc, "%s", sep);
} }
screen_write_stop(&ctx); screen_write_stop(&ctx);