mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Label windows which are smaller than expected with a reason.

Browse Source
This commit is contained in:
nicm
2014-11-14 02:19:47 +00:00
parent 7cc4706646
commit e0929262db
3 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resize.c
View File

@@ -50,7 +50,7 @@ recalculate_sizes(void)
struct window *w; struct window *w;
struct window_pane *wp; struct window_pane *wp;
u_int i, j, ssx, ssy, has, limit; u_int i, j, ssx, ssy, has, limit;
int flag, has_status, is_zoomed; int flag, has_status, is_zoomed, forced;
RB_FOREACH(s, sessions, &sessions) { RB_FOREACH(s, sessions, &sessions) {
has_status = options_get_number(&s->options, "status"); has_status = options_get_number(&s->options, "status");
@@ -116,18 +116,26 @@ recalculate_sizes(void)
if (ssx == UINT_MAX || ssy == UINT_MAX) if (ssx == UINT_MAX || ssy == UINT_MAX)
continue; continue;
forced = 0;
limit = options_get_number(&w->options, "force-width"); limit = options_get_number(&w->options, "force-width");
if (limit >= PANE_MINIMUM && ssx > limit) if (limit >= PANE_MINIMUM && ssx > limit) {
ssx = limit; ssx = limit;
forced |= WINDOW_FORCEWIDTH;
}
limit = options_get_number(&w->options, "force-height"); limit = options_get_number(&w->options, "force-height");
if (limit >= PANE_MINIMUM && ssy > limit) if (limit >= PANE_MINIMUM && ssy > limit) {
ssy = limit; ssy = limit;
forced |= WINDOW_FORCEHEIGHT;
}
if (w->sx == ssx && w->sy == ssy) if (w->sx == ssx && w->sy == ssy)
continue; continue;
log_debug("window size %u,%u (was %u,%u)", ssx, ssy, w->sx, log_debug("window size %u,%u (was %u,%u)", ssx, ssy, w->sx,
w->sy); w->sy);
w->flags &= ~(WINDOW_FORCEWIDTH|WINDOW_FORCEHEIGHT);
w->flags |= forced;
is_zoomed = w->flags & WINDOW_ZOOMED; is_zoomed = w->flags & WINDOW_ZOOMED;
if (is_zoomed) if (is_zoomed)
window_unzoom(w); window_unzoom(w);

43
screen-redraw.c
View File

@@ -278,8 +278,37 @@ screen_redraw_draw_borders(struct client *c, int status, u_int top)
struct options *oo = &c->session->options; struct options *oo = &c->session->options;
struct tty *tty = &c->tty; struct tty *tty = &c->tty;
struct window_pane *wp; struct window_pane *wp;
struct grid_cell active_gc, other_gc; struct grid_cell active_gc, other_gc, msg_gc;
u_int i, j, type; u_int i, j, type, msgx = 0, msgy = 0;
int small, flags;
char msg[256];
const char *tmp;
size_t msglen = 0;
small = (tty->sy - status + top > w->sy) || (tty->sx > w->sx);
if (small) {
flags = w->flags & (WINDOW_FORCEWIDTH|WINDOW_FORCEHEIGHT);
if (flags == (WINDOW_FORCEWIDTH|WINDOW_FORCEHEIGHT))
tmp = "force-width, force-height";
else if (flags == WINDOW_FORCEWIDTH)
tmp = "force-width";
else if (flags == WINDOW_FORCEHEIGHT)
tmp = "force-height";
else
tmp = "a smaller client";
xsnprintf(msg, sizeof msg, "(size %ux%u from %s)",
w->sx, w->sy, tmp);
msglen = strlen(msg);
if (tty->sy - 1 - status + top > w->sy && tty->sx >= msglen) {
msgx = tty->sx - msglen;
msgy = tty->sy - 1 - status + top;
} else if (tty->sx - w->sx > msglen) {
msgx = tty->sx - msglen;
msgy = tty->sy - 1 - status + top;
} else
small = 0;
}
style_apply(&other_gc, oo, "pane-border-style"); style_apply(&other_gc, oo, "pane-border-style");
style_apply(&active_gc, oo, "pane-active-border-style"); style_apply(&active_gc, oo, "pane-active-border-style");
@@ -290,6 +319,9 @@ screen_redraw_draw_borders(struct client *c, int status, u_int top)
type = screen_redraw_check_cell(c, i, j, &wp); type = screen_redraw_check_cell(c, i, j, &wp);
if (type == CELL_INSIDE) if (type == CELL_INSIDE)
continue; continue;
if (type == CELL_OUTSIDE &&
small && i > msgx && j == msgy)
continue;
if (screen_redraw_check_active(i, j, type, w, wp)) if (screen_redraw_check_active(i, j, type, w, wp))
tty_attributes(tty, &active_gc); tty_attributes(tty, &active_gc);
else else
@@ -298,6 +330,13 @@ screen_redraw_draw_borders(struct client *c, int status, u_int top)
tty_putc(tty, CELL_BORDERS[type]); tty_putc(tty, CELL_BORDERS[type]);
} }
} }
if (small) {
memcpy(&msg_gc, &grid_default_cell, sizeof msg_gc);
tty_attributes(tty, &msg_gc);
tty_cursor(tty, msgx, msgy);
tty_puts(tty, msg);
}
} }
/* Draw the panes. */ /* Draw the panes. */

4
tmux.h
View File

@@ -946,7 +946,9 @@ struct window {
#define WINDOW_ACTIVITY 0x2 #define WINDOW_ACTIVITY 0x2
#define WINDOW_REDRAW 0x4 #define WINDOW_REDRAW 0x4
#define WINDOW_SILENCE 0x8 #define WINDOW_SILENCE 0x8
#define WINDOW_ZOOMED 0x10 #define WINDOW_ZOOMED 0x1000
#define WINDOW_FORCEWIDTH 0x2000
#define WINDOW_FORCEHEIGHT 0x4000
#define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE) #define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE)
struct options options; struct options options;