aboutsummaryrefslogtreecommitdiff
path: root/resize.c
diff options
context:
space:
mode:
Diffstat (limited to 'resize.c')
-rw-r--r--resize.c313
1 files changed, 218 insertions, 95 deletions
diff --git a/resize.c b/resize.c
index 0e0b070d..054b025f 100644
--- a/resize.c
+++ b/resize.c
@@ -23,7 +23,7 @@
#include "tmux.h"
void
-resize_window(struct window *w, u_int sx, u_int sy)
+resize_window(struct window *w, u_int sx, u_int sy, int xpixel, int ypixel)
{
int zoomed;
@@ -50,7 +50,7 @@ resize_window(struct window *w, u_int sx, u_int sy)
sx = w->layout_root->sx;
if (sy < w->layout_root->sy)
sy = w->layout_root->sy;
- window_resize(w, sx, sy);
+ window_resize(w, sx, sy, xpixel, ypixel);
log_debug("%s: @%u resized to %u,%u; layout %u,%u", __func__, w->id,
sx, sy, w->layout_root->sx, w->layout_root->sy);
@@ -76,58 +76,118 @@ ignore_client_size(struct client *c)
}
void
-default_window_size(struct session *s, struct window *w, u_int *sx, u_int *sy,
- int type)
+default_window_size(struct client *c, struct session *s, struct window *w,
+ u_int *sx, u_int *sy, u_int *xpixel, u_int *ypixel, int type)
{
- struct client *c;
- u_int cx, cy;
+ struct client *loop;
+ u_int cx, cy, n;
const char *value;
if (type == -1)
type = options_get_number(global_w_options, "window-size");
- if (type == WINDOW_SIZE_MANUAL)
- goto manual;
-
- if (type == WINDOW_SIZE_LARGEST) {
+ switch (type) {
+ case WINDOW_SIZE_LARGEST:
*sx = *sy = 0;
- TAILQ_FOREACH(c, &clients, entry) {
- if (ignore_client_size(c))
+ *xpixel = *ypixel = 0;
+ TAILQ_FOREACH(loop, &clients, entry) {
+ if (ignore_client_size(loop))
continue;
- if (w != NULL && !session_has(c->session, w))
+ if (w != NULL && !session_has(loop->session, w))
continue;
- if (w == NULL && c->session != s)
+ if (w == NULL && loop->session != s)
continue;
- cx = c->tty.sx;
- cy = c->tty.sy - status_line_size(c);
+ cx = loop->tty.sx;
+ cy = loop->tty.sy - status_line_size(loop);
if (cx > *sx)
*sx = cx;
if (cy > *sy)
*sy = cy;
+
+ if (loop->tty.xpixel > *xpixel &&
+ loop->tty.ypixel > *ypixel) {
+ *xpixel = loop->tty.xpixel;
+ *ypixel = loop->tty.ypixel;
+ }
}
if (*sx == 0 || *sy == 0)
goto manual;
- } else {
+ break;
+ case WINDOW_SIZE_SMALLEST:
*sx = *sy = UINT_MAX;
- TAILQ_FOREACH(c, &clients, entry) {
- if (ignore_client_size(c))
+ *xpixel = *ypixel = 0;
+ TAILQ_FOREACH(loop, &clients, entry) {
+ if (ignore_client_size(loop))
continue;
- if (w != NULL && !session_has(c->session, w))
+ if (w != NULL && !session_has(loop->session, w))
continue;
- if (w == NULL && c->session != s)
+ if (w == NULL && loop->session != s)
continue;
- cx = c->tty.sx;
- cy = c->tty.sy - status_line_size(c);
+ cx = loop->tty.sx;
+ cy = loop->tty.sy - status_line_size(loop);
if (cx < *sx)
*sx = cx;
if (cy < *sy)
*sy = cy;
+
+ if (loop->tty.xpixel > *xpixel &&
+ loop->tty.ypixel > *ypixel) {
+ *xpixel = loop->tty.xpixel;
+ *ypixel = loop->tty.ypixel;
+ }
}
if (*sx == UINT_MAX || *sy == UINT_MAX)
goto manual;
+ break;
+ case WINDOW_SIZE_LATEST:
+ if (c != NULL && !ignore_client_size(c)) {
+ *sx = c->tty.sx;
+ *sy = c->tty.sy - status_line_size(c);
+ *xpixel = c->tty.xpixel;
+ *ypixel = c->tty.ypixel;
+ } else {
+ if (w == NULL)
+ goto manual;
+ n = 0;
+ TAILQ_FOREACH(loop, &clients, entry) {
+ if (!ignore_client_size(loop) &&
+ session_has(loop->session, w)) {
+ if (++n > 1)
+ break;
+ }
+ }
+ *sx = *sy = UINT_MAX;
+ *xpixel = *ypixel = 0;
+ TAILQ_FOREACH(loop, &clients, entry) {
+ if (ignore_client_size(loop))
+ continue;
+ if (n > 1 && loop != w->latest)
+ continue;
+ s = loop->session;
+
+ cx = loop->tty.sx;
+ cy = loop->tty.sy - status_line_size(loop);
+
+ if (cx < *sx)
+ *sx = cx;
+ if (cy < *sy)
+ *sy = cy;
+
+ if (loop->tty.xpixel > *xpixel &&
+ loop->tty.ypixel > *ypixel) {
+ *xpixel = loop->tty.xpixel;
+ *ypixel = loop->tty.ypixel;
+ }
+ }
+ if (*sx == UINT_MAX || *sy == UINT_MAX)
+ goto manual;
+ }
+ break;
+ case WINDOW_SIZE_MANUAL:
+ goto manual;
}
goto done;
@@ -150,13 +210,144 @@ done:
}
void
+recalculate_size(struct window *w)
+{
+ struct session *s;
+ struct client *c;
+ u_int sx, sy, cx, cy, xpixel = 0, ypixel = 0, n;
+ int type, current, has, changed;
+
+ if (w->active == NULL)
+ return;
+ log_debug("%s: @%u is %u,%u", __func__, w->id, w->sx, w->sy);
+
+ type = options_get_number(w->options, "window-size");
+ current = options_get_number(w->options, "aggressive-resize");
+
+ changed = 1;
+ switch (type) {
+ case WINDOW_SIZE_LARGEST:
+ sx = sy = 0;
+ TAILQ_FOREACH(c, &clients, entry) {
+ if (ignore_client_size(c))
+ continue;
+ s = c->session;
+
+ if (current)
+ has = (s->curw->window == w);
+ else
+ has = session_has(s, w);
+ if (!has)
+ continue;
+
+ cx = c->tty.sx;
+ cy = c->tty.sy - status_line_size(c);
+
+ if (cx > sx)
+ sx = cx;
+ if (cy > sy)
+ sy = cy;
+
+ if (c->tty.xpixel > xpixel && c->tty.ypixel > ypixel) {
+ xpixel = c->tty.xpixel;
+ ypixel = c->tty.ypixel;
+ }
+ }
+ if (sx == 0 || sy == 0)
+ changed = 0;
+ break;
+ case WINDOW_SIZE_SMALLEST:
+ sx = sy = UINT_MAX;
+ TAILQ_FOREACH(c, &clients, entry) {
+ if (ignore_client_size(c))
+ continue;
+ s = c->session;
+
+ if (current)
+ has = (s->curw->window == w);
+ else
+ has = session_has(s, w);
+ if (!has)
+ continue;
+
+ cx = c->tty.sx;
+ cy = c->tty.sy - status_line_size(c);
+
+ if (cx < sx)
+ sx = cx;
+ if (cy < sy)
+ sy = cy;
+
+ if (c->tty.xpixel > xpixel && c->tty.ypixel > ypixel) {
+ xpixel = c->tty.xpixel;
+ ypixel = c->tty.ypixel;
+ }
+ }
+ if (sx == UINT_MAX || sy == UINT_MAX)
+ changed = 0;
+ break;
+ case WINDOW_SIZE_LATEST:
+ n = 0;
+ TAILQ_FOREACH(c, &clients, entry) {
+ if (!ignore_client_size(c) &&
+ session_has(c->session, w)) {
+ if (++n > 1)
+ break;
+ }
+ }
+ sx = sy = UINT_MAX;
+ TAILQ_FOREACH(c, &clients, entry) {
+ if (ignore_client_size(c))
+ continue;
+ if (n > 1 && c != w->latest)
+ continue;
+ s = c->session;
+
+ if (current)
+ has = (s->curw->window == w);
+ else
+ has = session_has(s, w);
+ if (!has)
+ continue;
+
+ cx = c->tty.sx;
+ cy = c->tty.sy - status_line_size(c);
+
+ if (cx < sx)
+ sx = cx;
+ if (cy < sy)
+ sy = cy;
+
+ if (c->tty.xpixel > xpixel && c->tty.ypixel > ypixel) {
+ xpixel = c->tty.xpixel;
+ ypixel = c->tty.ypixel;
+ }
+ }
+ if (sx == UINT_MAX || sy == UINT_MAX)
+ changed = 0;
+ break;
+ case WINDOW_SIZE_MANUAL:
+ changed = 0;
+ break;
+ }
+ if (changed && w->sx == sx && w->sy == sy)
+ changed = 0;
+
+ if (!changed) {
+ tty_update_window_offset(w);
+ return;
+ }
+ log_debug("%s: @%u changed to %u,%u (%ux%u)", __func__, w->id, sx, sy,
+ xpixel, ypixel);
+ resize_window(w, sx, sy, xpixel, ypixel);
+}
+
+void
recalculate_sizes(void)
{
struct session *s;
struct client *c;
struct window *w;
- u_int sx, sy, cx, cy;
- int type, current, has, changed;
/*
* Clear attached count and update saved status line information for
@@ -183,74 +374,6 @@ recalculate_sizes(void)
}
/* Walk each window and adjust the size. */
- RB_FOREACH(w, windows, &windows) {
- if (w->active == NULL)
- continue;
- log_debug("%s: @%u is %u,%u", __func__, w->id, w->sx, w->sy);
-
- type = options_get_number(w->options, "window-size");
- if (type == WINDOW_SIZE_MANUAL)
- continue;
- current = options_get_number(w->options, "aggressive-resize");
-
- changed = 1;
- if (type == WINDOW_SIZE_LARGEST) {
- sx = sy = 0;
- TAILQ_FOREACH(c, &clients, entry) {
- if (ignore_client_size(c))
- continue;
- s = c->session;
-
- if (current)
- has = (s->curw->window == w);
- else
- has = session_has(s, w);
- if (!has)
- continue;
-
- cx = c->tty.sx;
- cy = c->tty.sy - status_line_size(c);
-
- if (cx > sx)
- sx = cx;
- if (cy > sy)
- sy = cy;
- }
- if (sx == 0 || sy == 0)
- changed = 0;
- } else {
- sx = sy = UINT_MAX;
- TAILQ_FOREACH(c, &clients, entry) {
- if (ignore_client_size(c))
- continue;
- s = c->session;
-
- if (current)
- has = (s->curw->window == w);
- else
- has = session_has(s, w);
- if (!has)
- continue;
-
- cx = c->tty.sx;
- cy = c->tty.sy - status_line_size(c);
-
- if (cx < sx)
- sx = cx;
- if (cy < sy)
- sy = cy;
- }
- if (sx == UINT_MAX || sy == UINT_MAX)
- changed = 0;
- }
- if (w->sx == sx && w->sy == sy)
- changed = 0;
-
- if (!changed) {
- tty_update_window_offset(w);
- continue;
- }
- log_debug("%s: @%u changed to %u,%u", __func__, w->id, sx, sy);
- resize_window(w, sx, sy);
- }
+ RB_FOREACH(w, windows, &windows)
+ recalculate_size(w);
}
generated by cgit (git 2.34.1) at 2025-06-29 13:21:02 +0000