circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2022-06-17 10:01:10 +01:00
parent 89fe2680a9 d9f84854ac
commit 8ff3091d16
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
options.c
View File

@@ -1106,7 +1106,6 @@ options_push_changes(const char *name)
struct session *s; struct session *s;
struct window *w; struct window *w;
struct window_pane *wp; struct window_pane *wp;
int c;
log_debug("%s: %s", __func__, name); log_debug("%s: %s", __func__, name);
@@ -1119,18 +1118,12 @@ options_push_changes(const char *name)
} }
} }
if (strcmp(name, "cursor-colour") == 0) { if (strcmp(name, "cursor-colour") == 0) {
RB_FOREACH(wp, window_pane_tree, &all_window_panes) { RB_FOREACH(wp, window_pane_tree, &all_window_panes)
c = options_get_number(wp->options, name); window_pane_default_cursor(wp);
wp->screen->default_ccolour = c;
}
} }
if (strcmp(name, "cursor-style") == 0) { if (strcmp(name, "cursor-style") == 0) {
RB_FOREACH(wp, window_pane_tree, &all_window_panes) { RB_FOREACH(wp, window_pane_tree, &all_window_panes)
wp->screen->default_mode = 0; window_pane_default_cursor(wp);
screen_set_cursor_style(options_get_number(wp->options,
name), &wp->screen->default_cstyle,
&wp->screen->default_mode);
}
} }
if (strcmp(name, "fill-character") == 0) { if (strcmp(name, "fill-character") == 0) {
RB_FOREACH(w, windows, &windows) RB_FOREACH(w, windows, &windows)

1
tmux.h
View File

@@ -2999,6 +2999,7 @@ void *window_pane_get_new_data(struct window_pane *,
void window_pane_update_used_data(struct window_pane *, void window_pane_update_used_data(struct window_pane *,
struct window_pane_offset *, size_t); struct window_pane_offset *, size_t);
void window_set_fill_character(struct window *); void window_set_fill_character(struct window *);
void window_pane_default_cursor(struct window_pane *);
/* layout.c */ /* layout.c */
u_int layout_count_cells(struct layout_cell *); u_int layout_count_cells(struct layout_cell *);

15
window.c
View File

@@ -940,6 +940,7 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)
screen_init(&wp->base, sx, sy, hlimit); screen_init(&wp->base, sx, sy, hlimit);
wp->screen = &wp->base; wp->screen = &wp->base;
window_pane_default_cursor(wp);
screen_init(&wp->status_screen, 1, 1, 0); screen_init(&wp->status_screen, 1, 1, 0);
@@ -1618,3 +1619,17 @@ window_set_fill_character(struct window *w)
w->fill_character = ud; w->fill_character = ud;
} }
} }
void
window_pane_default_cursor(struct window_pane *wp)
{
struct screen *s = wp->screen;
int c;
c = options_get_number(wp->options, "cursor-colour");
s->default_ccolour = c;
c = options_get_number(wp->options, "cursor-style");
s->default_mode = 0;
screen_set_cursor_style(c, &s->default_cstyle, &s->default_mode);
}