circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-24 01:58:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-05-06 10:03:52 +01:00
commit f10d3675f8
10 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd-kill-window.c
View File

@ -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);
}

1
format.c
View File

@ -622,6 +622,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);
}

4
options-table.c
View File

@ -736,7 +736,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",
@ -752,7 +752,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",

24
server-client.c
View File

@ -884,15 +884,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);
@ -907,27 +905,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);
}

14
session.c
View File

@ -336,6 +336,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)
{

1
tmux.1
View File

@ -3350,6 +3350,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"

1
tmux.h
View File

@ -2326,6 +2326,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);

33
tty.c
View File

@ -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);
}

4
window-choose.c
View File

@ -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;

4
window.c
View File

@ -642,7 +642,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)
{
@ -662,8 +662,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));
}