===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -c -r1.1104 -r1.1105
*** src/usr.bin/tmux/tmux.h	2021/06/10 07:28:45	1.1104
--- src/usr.bin/tmux/tmux.h	2021/06/10 07:33:41	1.1105
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.1104 2021/06/10 07:28:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.1105 2021/06/10 07:33:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 918,924 ****
  	struct screen			*screen;
  	u_int				 prefix;
  
! 	TAILQ_ENTRY (window_mode_entry)	 entry;
  };
  
  /* Offsets into pane buffer. */
--- 918,924 ----
  	struct screen			*screen;
  	u_int				 prefix;
  
! 	TAILQ_ENTRY(window_mode_entry)	 entry;
  };
  
  /* Offsets into pane buffer. */
***************
*** 926,931 ****
--- 926,943 ----
  	size_t	used;
  };
  
+ /* Queued pane resize. */
+ struct window_pane_resize {
+ 	u_int				sx;
+ 	u_int				sy;
+ 
+ 	u_int				osx;
+ 	u_int				osy;
+ 
+ 	TAILQ_ENTRY(window_pane_resize)	entry;
+ };
+ TAILQ_HEAD(window_pane_resizes, window_pane_resize);
+ 
  /* Child window structure. */
  struct window_pane {
  	u_int		 id;
***************
*** 950,957 ****
  #define PANE_REDRAW 0x1
  #define PANE_DROP 0x2
  #define PANE_FOCUSED 0x4
! #define PANE_RESIZE 0x8
! #define PANE_RESIZEFORCE 0x10
  #define PANE_FOCUSPUSH 0x20
  #define PANE_INPUTOFF 0x40
  #define PANE_CHANGED 0x80
--- 962,969 ----
  #define PANE_REDRAW 0x1
  #define PANE_DROP 0x2
  #define PANE_FOCUSED 0x4
! /* 0x8 unused */
! /* 0x10 unused */
  #define PANE_FOCUSPUSH 0x20
  #define PANE_INPUTOFF 0x40
  #define PANE_CHANGED 0x80
***************
*** 960,966 ****
  #define PANE_STATUSDRAWN 0x400
  #define PANE_EMPTY 0x800
  #define PANE_STYLECHANGED 0x1000
- #define PANE_RESIZENOW 0x2000
  
  	int		 argc;
  	char	       **argv;
--- 972,977 ----
***************
*** 977,984 ****
  	struct window_pane_offset offset;
  	size_t		 base_offset;
  
  	struct event	 resize_timer;
- 	struct event	 force_timer;
  
  	struct input_ctx *ictx;
  
--- 988,995 ----
  	struct window_pane_offset offset;
  	size_t		 base_offset;
  
+ 	struct window_pane_resizes resize_queue;
  	struct event	 resize_timer;
  
  	struct input_ctx *ictx;
  
***************
*** 996,1002 ****
  	struct screen	 status_screen;
  	size_t		 status_size;
  
! 	TAILQ_HEAD (, window_mode_entry) modes;
  
  	char		*searchstr;
  	int		 searchregex;
--- 1007,1013 ----
  	struct screen	 status_screen;
  	size_t		 status_size;
  
! 	TAILQ_HEAD(, window_mode_entry) modes;
  
  	char		*searchstr;
  	int		 searchregex;
***************
*** 2755,2761 ****
  struct window_pane *window_add_pane(struct window *, struct window_pane *,
  		     u_int, 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, int);
--- 2766,2772 ----
  struct window_pane *window_add_pane(struct window *, struct window_pane *,
  		     u_int, int);
  void		 window_resize(struct window *, u_int, u_int, int, int);
! void		 window_pane_send_resize(struct window_pane *, u_int, u_int);
  int		 window_zoom(struct window_pane *);
  int		 window_unzoom(struct window *);
  int		 window_push_zoom(struct window *, int, int);