From 672df72b715117e9994e72f0248c530eda8fbb8d Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 4 May 2015 13:04:10 +0000 Subject: [PATCH 1/3] Use the right index when expanding/collapsing tree, from Thomas Adam. --- window-choose.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/window-choose.c b/window-choose.c index 5de87572..8672212a 100644 --- a/window-choose.c +++ b/window-choose.c @@ -559,10 +559,10 @@ window_choose_key(struct window_pane *wp, unused struct client *c, break; if (item->state & TREE_EXPANDED) { window_choose_collapse(wp, item->wcd->tree_session, - item->wcd->idx); + data->selected); } else { window_choose_expand(wp, item->wcd->tree_session, - item->wcd->idx); + data->selected); } window_choose_redraw_screen(wp); break; From 33a585c47fcceb55e79a67a5fc47902d6992e68d Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 6 May 2015 07:52:06 +0000 Subject: [PATCH 2/3] Turn cursor off during redraw, pointed out by George Nachman. --- server-client.c | 24 +++++++++++++++++------- tty.c | 33 +++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/server-client.c b/server-client.c index b24e1afd..ce3f3d5e 100644 --- a/server-client.c +++ b/server-client.c @@ -875,15 +875,13 @@ void server_client_check_redraw(struct client *c) { struct session *s = c->session; + struct tty *tty = &c->tty; struct window_pane *wp; int flags, redraw; if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED)) return; - flags = c->tty.flags & TTY_FREEZE; - c->tty.flags &= ~TTY_FREEZE; - if (c->flags & (CLIENT_REDRAW|CLIENT_STATUS)) { if (options_get_number(&s->options, "set-titles")) server_client_set_title(c); @@ -898,27 +896,39 @@ server_client_check_redraw(struct client *c) c->flags &= ~CLIENT_STATUS; } + flags = tty->flags & (TTY_FREEZE|TTY_NOCURSOR); + tty->flags = (tty->flags & ~TTY_FREEZE) | TTY_NOCURSOR; + if (c->flags & CLIENT_REDRAW) { + tty_update_mode(tty, tty->mode, NULL); screen_redraw_screen(c, 1, 1, 1); c->flags &= ~(CLIENT_STATUS|CLIENT_BORDERS); } else if (c->flags & CLIENT_REDRAWWINDOW) { + tty_update_mode(tty, tty->mode, NULL); TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) screen_redraw_pane(c, wp); c->flags &= ~CLIENT_REDRAWWINDOW; } else { TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) { - if (wp->flags & PANE_REDRAW) + if (wp->flags & PANE_REDRAW) { + tty_update_mode(tty, tty->mode, NULL); screen_redraw_pane(c, wp); + } } } - if (c->flags & CLIENT_BORDERS) + if (c->flags & CLIENT_BORDERS) { + tty_update_mode(tty, tty->mode, NULL); screen_redraw_screen(c, 0, 0, 1); + } - if (c->flags & CLIENT_STATUS) + if (c->flags & CLIENT_STATUS) { + tty_update_mode(tty, tty->mode, NULL); screen_redraw_screen(c, 0, 1, 0); + } - c->tty.flags |= flags; + tty->flags = (tty->flags & ~(TTY_FREEZE|TTY_NOCURSOR)) | flags; + tty_update_mode(tty, tty->mode, NULL); c->flags &= ~(CLIENT_REDRAW|CLIENT_STATUS|CLIENT_BORDERS); } diff --git a/tty.c b/tty.c index f6db8e20..a9f49c9b 100644 --- a/tty.c +++ b/tty.c @@ -500,7 +500,7 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s) { int changed; - if (strcmp(s->ccolour, tty->ccolour)) + if (s != NULL && strcmp(s->ccolour, tty->ccolour)) tty_force_cursor_colour(tty, s->ccolour); if (tty->flags & TTY_NOCURSOR) @@ -517,7 +517,7 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s) } else tty_putcode(tty, TTYC_CIVIS); } - if (tty->cstyle != s->cstyle) { + if (s != NULL && tty->cstyle != s->cstyle) { if (tty_term_has(tty->term, TTYC_SS)) { if (s->cstyle == 0 && tty_term_has(tty->term, TTYC_SE)) @@ -667,8 +667,11 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp, struct grid_cell tmpgc; struct utf8_data ud; u_int i, sx; + int flags; - tty_update_mode(tty, tty->mode & ~MODE_CURSOR, s); + flags = tty->flags & TTY_NOCURSOR; + tty->flags |= TTY_NOCURSOR; + tty_update_mode(tty, tty->mode, s); sx = screen_size_x(s); if (sx > s->grid->linedata[s->grid->hsize + py].cellsize) @@ -703,18 +706,20 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp, tty_cell(tty, gc, wp); } - if (sx >= tty->sx) { - tty_update_mode(tty, tty->mode, s); - return; - } - tty_attributes(tty, &grid_default_cell, wp); + if (sx < tty->sx) { + tty_attributes(tty, &grid_default_cell, wp); - tty_cursor(tty, ox + sx, oy + py); - if (sx != screen_size_x(s) && ox + screen_size_x(s) >= tty->sx && - tty_term_has(tty->term, TTYC_EL) && !tty_fake_bce(tty, wp)) - tty_putcode(tty, TTYC_EL); - else - tty_repeat_space(tty, screen_size_x(s) - sx); + tty_cursor(tty, ox + sx, oy + py); + if (sx != screen_size_x(s) && + ox + screen_size_x(s) >= tty->sx && + tty_term_has(tty->term, TTYC_EL) && + !tty_fake_bce(tty, wp)) + tty_putcode(tty, TTYC_EL); + else + tty_repeat_space(tty, screen_size_x(s) - sx); + } + + tty->flags = (tty->flags & ~TTY_NOCURSOR) | flags; tty_update_mode(tty, tty->mode, s); } From 31b1ab48521b4b608d87abd5413441905da84da8 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 6 May 2015 08:35:39 +0000 Subject: [PATCH 3/3] Add a format window_linked which is 1 if a window has been linked multiple times, also remove the default space in window_flags and use a conditional to add it in window-status-format (this means additional flags can be added in the option without extra spaces). From Thomas Adam with tweaks by me. --- cmd-kill-window.c | 17 +++++------------ format.c | 1 + options-table.c | 4 ++-- session.c | 14 ++++++++++++++ tmux.1 | 1 + tmux.h | 1 + window.c | 4 +--- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/cmd-kill-window.c b/cmd-kill-window.c index d402acce..4d346a71 100644 --- a/cmd-kill-window.c +++ b/cmd-kill-window.c @@ -45,24 +45,17 @@ const struct cmd_entry cmd_unlink_window_entry = { enum cmd_retval cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq) { - struct args *args = self->args; - struct winlink *wl, *wl2, *wl3; - struct window *w; - struct session *s; - struct session_group *sg; - u_int references; + struct args *args = self->args; + struct winlink *wl, *wl2, *wl3; + struct window *w; + struct session *s; if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL) return (CMD_RETURN_ERROR); w = wl->window; if (self->entry == &cmd_unlink_window_entry) { - sg = session_group_find(s); - if (sg != NULL) - references = session_group_count(sg); - else - references = 1; - if (!args_has(self->args, 'k') && w->references == references) { + if (!args_has(self->args, 'k') && !session_is_linked(s, w)) { cmdq_error(cmdq, "window only linked to one session"); return (CMD_RETURN_ERROR); } diff --git a/format.c b/format.c index 7ded05d2..ac28604d 100644 --- a/format.c +++ b/format.c @@ -621,6 +621,7 @@ format_defaults_winlink(struct format_tree *ft, struct session *s, !!(wl->flags & WINLINK_SILENCE)); format_add(ft, "window_last_flag", "%d", !!(wl == TAILQ_FIRST(&s->lastw))); + format_add(ft, "window_linked", "%d", session_is_linked(s, wl->window)); free(flags); } diff --git a/options-table.c b/options-table.c index 089a9b86..21758543 100644 --- a/options-table.c +++ b/options-table.c @@ -737,7 +737,7 @@ const struct options_table_entry window_options_table[] = { { .name = "window-status-current-format", .type = OPTIONS_TABLE_STRING, - .default_str = "#I:#W#F" + .default_str = "#I:#W#{?window_flags,#{window_flags}, }" }, { .name = "window-status-current-style", @@ -753,7 +753,7 @@ const struct options_table_entry window_options_table[] = { { .name = "window-status-format", .type = OPTIONS_TABLE_STRING, - .default_str = "#I:#W#F" + .default_str = "#I:#W#{?window_flags,#{window_flags}, }" }, { .name = "window-status-last-attr", diff --git a/session.c b/session.c index 224f1f32..907bdee9 100644 --- a/session.c +++ b/session.c @@ -337,6 +337,20 @@ session_has(struct session *s, struct window *w) return (0); } +/* + * Return 1 if a window is linked outside this session (not including session + * groups). The window must be in this session! + */ +int +session_is_linked(struct session *s, struct window *w) +{ + struct session_group *sg; + + if ((sg = session_group_find(s)) != NULL) + return (w->references != session_group_count(sg)); + return (w->references != 1); +} + struct winlink * session_next_alert(struct winlink *wl) { diff --git a/tmux.1 b/tmux.1 index a7f5f3ef..ea178b78 100644 --- a/tmux.1 +++ b/tmux.1 @@ -3345,6 +3345,7 @@ The following variables are available, where appropriate: .It Li "window_index" Ta "#I" Ta "Index of window" .It Li "window_last_flag" Ta "" Ta "1 if window is the last used" .It Li "window_layout" Ta "" Ta "Window layout description" +.It Li "window_linked" Ta "" Ta "1 if window is linked across sessions" .It Li "window_name" Ta "#W" Ta "Name of window" .It Li "window_panes" Ta "" Ta "Number of panes in window" .It Li "window_silence_flag" Ta "" Ta "1 if window has silence alert" diff --git a/tmux.h b/tmux.h index b315114e..83b6e4a8 100644 --- a/tmux.h +++ b/tmux.h @@ -2328,6 +2328,7 @@ struct winlink *session_attach(struct session *, struct window *, int, char **); int session_detach(struct session *, struct winlink *); int session_has(struct session *, struct window *); +int session_is_linked(struct session *, struct window *); int session_next(struct session *, int); int session_previous(struct session *, int); int session_select(struct session *, int); diff --git a/window.c b/window.c index e4e41155..a2277e2e 100644 --- a/window.c +++ b/window.c @@ -643,7 +643,7 @@ window_destroy_panes(struct window *w) } } -/* Return list of printable window flag symbols. No flags is just a space. */ +/* Retuns the printable flags on a window, empty string if no flags set. */ char * window_printable_flags(struct session *s, struct winlink *wl) { @@ -663,8 +663,6 @@ window_printable_flags(struct session *s, struct winlink *wl) flags[pos++] = '-'; if (wl->window->flags & WINDOW_ZOOMED) flags[pos++] = 'Z'; - if (pos == 0) - flags[pos++] = ' '; flags[pos] = '\0'; return (xstrdup(flags)); }