===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/spawn.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/tmux/spawn.c	2019/11/14 07:55:01	1.11
--- src/usr.bin/tmux/spawn.c	2019/11/28 09:45:16	1.12
***************
*** 1,4 ****
! /* $OpenBSD: spawn.c,v 1.11 2019/11/14 07:55:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: spawn.c,v 1.12 2019/11/28 09:45:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 85,91 ****
  	struct window_pane	*wp;
  	struct winlink		*wl;
  	int			 idx = sc->idx;
! 	u_int			 sx, sy;
  
  	spawn_log(__func__, sc);
  
--- 85,91 ----
  	struct window_pane	*wp;
  	struct winlink		*wl;
  	int			 idx = sc->idx;
! 	u_int			 sx, sy, xpixel, ypixel;
  
  	spawn_log(__func__, sc);
  
***************
*** 155,162 ****
  			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) {
  			winlink_remove(&s->windows, sc->wl);
  			xasprintf(cause, "couldn't create window %d", idx);
  			return (NULL);
--- 155,163 ----
  			xasprintf(cause, "couldn't add window %d", idx);
  			return (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,343 ****
--- 339,346 ----
  	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);