circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 14:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Remove reference to an option that hasn't been added yet.

Browse Source
This commit is contained in:
nicm
2026-05-27 12:52:47 +00:00
parent 00c59041ea
commit bff68fa079
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
screen-redraw.c
View File

@@ -614,8 +614,10 @@ screen_redraw_make_pane_status(struct client *c, struct window_pane *wp,
else else
width = wp->sx + sb_w - 2; width = wp->sx + sb_w - 2;
max_width = (int)w->sx - (wp->xoff + 2) - sb_w; max_width = (int)w->sx - (wp->xoff + 2) - sb_w;
if (max_width < 0) max_width = 0; if (max_width < 0)
if (width > (u_int)max_width) width = (u_int)max_width; max_width = 0;
if (width > (u_int)max_width)
width = (u_int)max_width;
wp->status_size = width; wp->status_size = width;
memcpy(&old, &wp->status_screen, sizeof old); memcpy(&old, &wp->status_screen, sizeof old);
@@ -873,7 +875,7 @@ screen_redraw_draw_borders_style(struct screen_redraw_ctx *ctx, u_int x,
struct window *w = s->curw->window; struct window *w = s->curw->window;
struct window_pane *active = server_client_get_pane(c); struct window_pane *active = server_client_get_pane(c);
struct options *wo = w->options; struct options *wo = w->options;
const char *border_opt; const char *border_option;
struct format_tree *ft; struct format_tree *ft;
if (wp->border_gc_set) if (wp->border_gc_set)
@@ -882,19 +884,13 @@ screen_redraw_draw_borders_style(struct screen_redraw_ctx *ctx, u_int x,
ft = format_create_defaults(NULL, c, s, s->curw, wp); ft = format_create_defaults(NULL, c, s, s->curw, wp);
border_opt = screen_redraw_check_is(ctx, x, y, active) ? if (screen_redraw_check_is(ctx, x, y, active))
"pane-active-border-style" : "pane-border-style"; border_option = "pane-active-border-style";
else
/* Window-level baseline. */ border_option = "pane-border-style";
style_apply(&wp->border_gc, wo, border_opt, ft); style_apply(&wp->border_gc, wo, border_option, ft);
if (options_get_only(wp->options, border_option) != NULL)
/* Floating pane window default overrides window baseline. */ style_add(&wp->border_gc, wp->options, border_option, ft);
if (wp->flags & PANE_FLOATING)
style_add(&wp->border_gc, wo, "floating-pane-border-style", ft);
/* Per-pane override (set via new-pane -S or set-option -p). */
if (options_get_only(wp->options, border_opt) != NULL)
style_add(&wp->border_gc, wp->options, border_opt, ft);
format_free(ft); format_free(ft);
return (&wp->border_gc); return (&wp->border_gc);