Merge branch 'master' into floating_panes

tmux.h

@@ -1753,9 +1753,20 @@ struct tty_ctx {
 #define TTY_CTX_CELL_INVALIDATE 0x40
 #define TTY_CTX_PANE_OBSCURED 0x80
 
-	u_int		 num;
-	void		*ptr;
-	void		*ptr2;
+	union {
+		u_int			 n;
+
+		struct {
+			const char	*data;
+			size_t		 size;
+		} data;
+
+		struct {
+			const char	*clip;
+			const char	*data;
+			size_t		 size;
+		} sel;
+	};
 
 	/*
 	 * Cursor and region position before the screen was updated - this is