Make a best effort to set xpixel and ypixel for each pane and add

formats for them.

11 files changed, 122 insertions, 40 deletions

diff --git a/cmd-break-pane.c b/cmd-break-pane.c
index 8b430ff7..6c638103 100644
--- a/cmd-break-pane.c
+++ b/cmd-break-pane.c
@@ -76,7 +76,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	window_lost_pane(w, wp);
 	layout_close_pane(wp);
 
-	w = wp->window = window_create(w->sx, w->sy);
+	w = wp->window = window_create(w->sx, w->sy, w->xpixel, w->ypixel);
 	options_set_parent(wp->options, w->options);
 	wp->flags |= PANE_STYLECHANGED;
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
diff --git a/cmd-resize-window.c b/cmd-resize-window.c
index c5a7c5a1..9cc74e82 100644
--- a/cmd-resize-window.c
+++ b/cmd-resize-window.c
@@ -53,6 +53,7 @@ cmd_resize_window_exec(struct cmd *self, struct cmdq_item *item)
 	const char	       	*errstr;
 	char			*cause;
 	u_int			 adjust, sx, sy;
+	int			 xpixel = -1, ypixel = -1;
 
 	if (args->argc == 0)
 		adjust = 1;
@@ -97,13 +98,16 @@ cmd_resize_window_exec(struct cmd *self, struct cmdq_item *item)
 	} else if (args_has(args, 'D'))
 		sy += adjust;
 
-	if (args_has(args, 'A'))
-		default_window_size(NULL, s, w, &sx, &sy, WINDOW_SIZE_LARGEST);
-	else if (args_has(args, 'a'))
-		default_window_size(NULL, s, w, &sx, &sy, WINDOW_SIZE_SMALLEST);
+	if (args_has(args, 'A')) {
+		default_window_size(NULL, s, w, &sx, &sy, &xpixel, &ypixel,
+		    WINDOW_SIZE_LARGEST);
+	} else if (args_has(args, 'a')) {
+		default_window_size(NULL, s, w, &sx, &sy, &xpixel, &ypixel,
+		    WINDOW_SIZE_SMALLEST);
+	}
 
 	options_set_number(w->options, "window-size", WINDOW_SIZE_MANUAL);
-	resize_window(w, sx, sy);
+	resize_window(w, sx, sy, xpixel, ypixel);
 
 	return (CMD_RETURN_NORMAL);
 }
diff --git a/format.c b/format.c
index 45320bf5..86878cda 100644
--- a/format.c
+++ b/format.c
@@ -2211,6 +2211,8 @@ format_defaults_window(struct format_tree *ft, struct window *w)
 	format_add(ft, "window_name", "%s", w->name);
 	format_add(ft, "window_width", "%u", w->sx);
 	format_add(ft, "window_height", "%u", w->sy);
+	format_add(ft, "window_cell_width", "%u", w->xpixel);
+	format_add(ft, "window_cell_height", "%u", w->ypixel);
 	format_add_cb(ft, "window_layout", format_cb_window_layout);
 	format_add_cb(ft, "window_visible_layout",
 	    format_cb_window_visible_layout);
diff --git a/layout-custom.c b/layout-custom.c
index d7371292..097dabe6 100644
--- a/layout-custom.c
+++ b/layout-custom.c
@@ -221,7 +221,7 @@ layout_parse(struct window *w, const char *layout)
 		return (-1);
 
 	/* Resize to the layout size. */
-	window_resize(w, lc->sx, lc->sy);
+	window_resize(w, lc->sx, lc->sy, -1, -1);
 
 	/* Destroy the old layout and swap to the new. */
 	layout_free_cell(w->layout_root);
diff --git a/layout-set.c b/layout-set.c
index 82247149..f712b059 100644
--- a/layout-set.c
+++ b/layout-set.c
@@ -163,7 +163,7 @@ layout_set_even(struct window *w, enum layout_type type)
 
 	layout_print_cell(w->layout_root, __func__, 1);
 
-	window_resize(w, lc->sx, lc->sy);
+	window_resize(w, lc->sx, lc->sy, -1, -1);
 	notify_window("window-layout-changed", w);
 	server_redraw_window(w);
 }
@@ -262,7 +262,7 @@ layout_set_main_h(struct window *w)
 
 	layout_print_cell(w->layout_root, __func__, 1);
 
-	window_resize(w, lc->sx, lc->sy);
+	window_resize(w, lc->sx, lc->sy, -1, -1);
 	notify_window("window-layout-changed", w);
 	server_redraw_window(w);
 }
@@ -349,7 +349,7 @@ layout_set_main_v(struct window *w)
 
 	layout_print_cell(w->layout_root, __func__, 1);
 
-	window_resize(w, lc->sx, lc->sy);
+	window_resize(w, lc->sx, lc->sy, -1, -1);
 	notify_window("window-layout-changed", w);
 	server_redraw_window(w);
 }
@@ -458,7 +458,7 @@ layout_set_tiled(struct window *w)
 
 	layout_print_cell(w->layout_root, __func__, 1);
 
-	window_resize(w, lc->sx, lc->sy);
+	window_resize(w, lc->sx, lc->sy, -1, -1);
 	notify_window("window-layout-changed", w);
 	server_redraw_window(w);
 }
diff --git a/resize.c b/resize.c
index 6432f003..9f74b33e 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);
 
@@ -77,7 +77,7 @@ ignore_client_size(struct client *c)
 
 void
 default_window_size(struct client *c, struct session *s, struct window *w,
-    u_int *sx, u_int *sy, int type)
+    u_int *sx, u_int *sy, u_int *xpixel, u_int *ypixel, int type)
 {
 	struct client	*loop;
 	u_int		 cx, cy;
@@ -88,6 +88,7 @@ default_window_size(struct client *c, struct session *s, struct window *w,
 	switch (type) {
 	case WINDOW_SIZE_LARGEST:
 		*sx = *sy = 0;
+		*xpixel = *ypixel = 0;
 		TAILQ_FOREACH(loop, &clients, entry) {
 			if (ignore_client_size(loop))
 				continue;
@@ -103,12 +104,19 @@ default_window_size(struct client *c, struct session *s, struct window *w,
 				*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;
 		break;
 	case WINDOW_SIZE_SMALLEST:
 		*sx = *sy = UINT_MAX;
+		*xpixel = *ypixel = 0;
 		TAILQ_FOREACH(loop, &clients, entry) {
 			if (ignore_client_size(loop))
 				continue;
@@ -124,6 +132,12 @@ default_window_size(struct client *c, struct session *s, struct window *w,
 				*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;
@@ -132,8 +146,11 @@ default_window_size(struct client *c, struct session *s, struct window *w,
 		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 {
 			*sx = *sy = UINT_MAX;
+			*xpixel = *ypixel = 0;
 			TAILQ_FOREACH(loop, &clients, entry) {
 				if (ignore_client_size(loop))
 					continue;
@@ -148,6 +165,12 @@ default_window_size(struct client *c, struct session *s, struct window *w,
 					*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;
@@ -181,7 +204,7 @@ recalculate_size(struct window *w)
 {
 	struct session	*s;
 	struct client	*c;
-	u_int		 sx, sy, cx, cy;
+	u_int		 sx, sy, cx, cy, xpixel = 0, ypixel = 0;
 	int		 type, current, has, changed;
 
 	if (w->active == NULL)
@@ -214,6 +237,11 @@ recalculate_size(struct window *w)
 				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;
@@ -239,6 +267,11 @@ recalculate_size(struct window *w)
 				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;
@@ -266,6 +299,11 @@ recalculate_size(struct window *w)
 				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;
@@ -281,8 +319,9 @@ recalculate_size(struct window *w)
 		tty_update_window_offset(w);
 		return;
 	}
-	log_debug("%s: @%u changed to %u,%u", __func__, w->id, sx, sy);
-	resize_window(w, sx, sy);
+	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
diff --git a/server-client.c b/server-client.c
index 26b246c1..27173ef1 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1321,7 +1321,6 @@ static int
 server_client_resize_force(struct window_pane *wp)
 {
 	struct timeval	tv = { .tv_usec = 100000 };
-	struct winsize	ws;
 
 	/*
 	 * If we are resizing to the same size as when we entered the loop
@@ -1342,12 +1341,8 @@ server_client_resize_force(struct window_pane *wp)
 	    wp->sy <= 1)
 		return (0);
 
-	memset(&ws, 0, sizeof ws);
-	ws.ws_col = wp->sx;
-	ws.ws_row = wp->sy - 1;
-	if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
-		fatal("ioctl failed");
 	log_debug("%s: %%%u forcing resize", __func__, wp->id);
+	window_pane_send_resize(wp, -1);
 
 	evtimer_add(&wp->resize_timer, &tv);
 	wp->flags |= PANE_RESIZEFORCE;
@@ -1358,14 +1353,8 @@ server_client_resize_force(struct window_pane *wp)
 static void
 server_client_resize_pane(struct window_pane *wp)
 {
-	struct winsize	ws;
-
-	memset(&ws, 0, sizeof ws);
-	ws.ws_col = wp->sx;
-	ws.ws_row = wp->sy;
-	if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
-		fatal("ioctl failed");
 	log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy);
+	window_pane_send_resize(wp, 0);
 
 	wp->flags &= ~PANE_RESIZE;
 
diff --git a/spawn.c b/spawn.c
index dfa39ad7..6cf7c73b 100644
--- a/spawn.c
+++ b/spawn.c
@@ -85,7 +85,7 @@ spawn_window(struct spawn_context *sc, char **cause)
 	struct window_pane	*wp;
 	struct winlink		*wl;
 	int			 idx = sc->idx;
-	u_int			 sx, sy;
+	u_int			 sx, sy, xpixel, ypixel;
 
 	spawn_log(__func__, sc);
 
@@ -155,8 +155,9 @@ spawn_window(struct spawn_context *sc, char **cause)
 			xasprintf(cause, "couldn't add window %d", idx);
 			return (NULL);
 		}
-		default_window_size(sc->c, s, NULL, &sx, &sy, -1);
-		if ((w = window_create(sx, sy)) == NULL) {
+		default_window_size(sc->c, s, NULL, &sx, &sy, &xpixel, &ypixel,
+		    -1);
+		if ((w = window_create(sx, sy, xpixel, ypixel)) == NULL) {
 			winlink_remove(&s->windows, sc->wl);
 			xasprintf(cause, "couldn't create window %d", idx);
 			return (NULL);
@@ -338,6 +339,8 @@ spawn_pane(struct spawn_context *sc, char **cause)
 	memset(&ws, 0, sizeof ws);
 	ws.ws_col = screen_size_x(&new_wp->base);
 	ws.ws_row = screen_size_y(&new_wp->base);
+	ws.ws_xpixel = w->xpixel * ws.ws_col;
+	ws.ws_ypixel = w->ypixel * ws.ws_row;
 
 	/* Block signals until fork has completed. */
 	sigfillset(&set);
diff --git a/tmux.1 b/tmux.1
index fc42b393..56ebeb87 100644
--- a/tmux.1
+++ b/tmux.1
@@ -4329,6 +4329,8 @@ The following variables are available, where appropriate:
 .It Li "window_activity_flag" Ta "" Ta "1 if window has activity"
 .It Li "window_bell_flag" Ta "" Ta "1 if window has bell"
 .It Li "window_bigger" Ta "" Ta "1 if window is larger than client"
+.It Li "window_cell_height" Ta "" Ta "Height of each cell in pixels"
+.It Li "window_cell_width" Ta "" Ta "Width of each cell in pixels"
 .It Li "window_end_flag" Ta "" Ta "1 if window has the highest index"
 .It Li "window_flags" Ta "#F" Ta "Window flags"
 .It Li "window_format" Ta "" Ta "1 if format is for a window"
diff --git a/tmux.h b/tmux.h
index d2a4196a..6d142ab9 100644
--- a/tmux.h
+++ b/tmux.h
@@ -78,6 +78,10 @@ struct winlink;
 /* Maximum size of data to hold from a pane. */
 #define READ_SIZE 4096
 
+/* Default pixel cell sizes. */
+#define DEFAULT_XPIXEL 16
+#define DEFAULT_YPIXEL 32
+
 /* Attribute to make GCC check printf-like arguments. */
 #define printflike(a, b) __attribute__ ((format (printf, a, b)))
 
@@ -928,6 +932,8 @@ struct window {
 
 	u_int		 sx;
 	u_int		 sy;
+	u_int		 xpixel;
+	u_int		 ypixel;
 
 	int		 flags;
 #define WINDOW_BELL 0x1
@@ -2208,9 +2214,9 @@ void	 status_prompt_load_history(void);
 void	 status_prompt_save_history(void);
 
 /* resize.c */
-void	 resize_window(struct window *, u_int, u_int);
+void	 resize_window(struct window *, u_int, u_int, int, int);
 void	 default_window_size(struct client *, struct session *, struct window *,
-	     u_int *, u_int *, int);
+	     u_int *, u_int *, u_int *, u_int *, int);
 void	 recalculate_size(struct window *);
 void	 recalculate_sizes(void);
 
@@ -2402,7 +2408,7 @@ void		 winlink_stack_remove(struct winlink_stack *, struct winlink *);
 struct window	*window_find_by_id_str(const char *);
 struct window	*window_find_by_id(u_int);
 void		 window_update_activity(struct window *);
-struct window	*window_create(u_int, u_int);
+struct window	*window_create(u_int, u_int, u_int, u_int);
 void		 window_pane_set_event(struct window_pane *);
 struct window_pane *window_get_active_at(struct window *, u_int, u_int);
 struct window_pane *window_find_string(struct window *, const char *);
@@ -2413,7 +2419,8 @@ void		 window_redraw_active_switch(struct window *,
 		     struct window_pane *);
 struct window_pane *window_add_pane(struct window *, struct window_pane *,
 		     u_int, int);
-void		 window_resize(struct window *, u_int, u_int);
+void		 window_resize(struct window *, u_int, u_int, int, int);
+void		 window_pane_send_resize(struct window_pane *, int);
 int		 window_zoom(struct window_pane *);
 int		 window_unzoom(struct window *);
 int		 window_push_zoom(struct window *, int);
diff --git a/window.c b/window.c
index 21bf366f..bde9693b 100644
--- a/window.c
+++ b/window.c
@@ -308,10 +308,15 @@ window_update_activity(struct window *w)
 }
 
 struct window *
-window_create(u_int sx, u_int sy)
+window_create(u_int sx, u_int sy, u_int xpixel, u_int ypixel)
 {
 	struct window	*w;
 
+	if (xpixel == 0)
+		xpixel = DEFAULT_XPIXEL;
+	if (ypixel == 0)
+		ypixel = DEFAULT_YPIXEL;
+
 	w = xcalloc(1, sizeof *w);
 	w->name = xstrdup("");
 	w->flags = 0;
@@ -324,6 +329,8 @@ window_create(u_int sx, u_int sy)
 
 	w->sx = sx;
 	w->sy = sy;
+	w->xpixel = xpixel;
+	w->ypixel = ypixel;
 
 	w->options = options_create(global_w_options);
 
@@ -410,11 +417,40 @@ window_set_name(struct window *w, const char *new_name)
 }
 
 void
-window_resize(struct window *w, u_int sx, u_int sy)
+window_resize(struct window *w, u_int sx, u_int sy, int xpixel, int ypixel)
 {
-	log_debug("%s: @%u resize %ux%u", __func__, w->id, sx, sy);
+	if (xpixel == 0)
+		xpixel = DEFAULT_XPIXEL;
+	if (ypixel == 0)
+		ypixel = DEFAULT_YPIXEL;
+
+	log_debug("%s: @%u resize %ux%u (%ux%u)", __func__, w->id, sx, sy,
+	    xpixel == -1 ? w->xpixel : xpixel,
+	    ypixel == -1 ? w->ypixel : ypixel);
 	w->sx = sx;
 	w->sy = sy;
+	if (xpixel != -1)
+		w->xpixel = xpixel;
+	if (ypixel != -1)
+		w->ypixel = ypixel;
+}
+
+void
+window_pane_send_resize(struct window_pane *wp, int yadjust)
+{
+	struct window	*w = wp->window;
+	struct winsize	 ws;
+
+	if (wp->fd == -1)
+		return;
+
+	memset(&ws, 0, sizeof ws);
+	ws.ws_col = wp->sx;
+	ws.ws_row = wp->sy + yadjust;
+	ws.ws_xpixel = w->xpixel * ws.ws_col;
+	ws.ws_ypixel = w->ypixel * ws.ws_row;
+	if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
+		fatal("ioctl failed");
 }
 
 int