Merge branch 'master' into floating_panes

tmux.h

@@ -1743,18 +1743,18 @@ struct tty_ctx {
 	void			*arg;
 
 	const struct grid_cell	*cell;
-	int			 wrapped;
+	int                      flags;
+#define TTY_CTX_WRAPPED 0x1
+#define TTY_CTX_INVISIBLE_PANES 0x2
+#define TTY_CTX_WINDOW_BIGGER 0x4
+#define TTY_CTX_SYNC 0x8
+#define TTY_CTX_OVERLAY_SYNC 0x10
+#define TTY_CTX_CELL_DRAW_LINE 0x20
+#define TTY_CTX_CELL_INVALIDATE 0x40
 
-	u_int			 num;
-	void			*ptr;
-	void			*ptr2;
-
-	/*
-	 * Whether this command should be sent even when the pane is not
-	 * visible (used for a passthrough sequence when allow-passthrough is
-	 * "all").
-	 */
-	int			 allow_invisible_panes;
+	u_int		 num;
+	void		*ptr;
+	void		*ptr2;
 
 	/*
 	 * Cursor and region position before the screen was updated - this is
@@ -1783,7 +1783,6 @@ struct tty_ctx {
 	struct colour_palette	*palette;
 
 	/* Containing region (usually window) offset and size. */
-	int			 bigger;
 	u_int			 wox;
 	u_int			 woy;
 	u_int			 wsx;