From 01a47525030ec6fa4f53dc2c0cb6786f63881679 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sun, 6 Oct 2013 00:10:40 +0100
Subject: Merge IDENTIFY_* flags with CLIENT_* flags.

---
 tmux.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 345efaba..3b4f8150 100644
--- a/tmux.h
+++ b/tmux.h
@@ -484,11 +484,6 @@ struct msg_identify_data {
 	char		ttyname[TTY_NAME_MAX];
 #endif
 
-#define IDENTIFY_UTF8 0x1
-#define IDENTIFY_256COLOURS 0x2
-/* 0x4 unused */
-#define IDENTIFY_CONTROL 0x8
-#define IDENTIFY_TERMIOS 0x10
 	int		flags;
 };
 
@@ -1341,7 +1336,11 @@ struct client {
 #define CLIENT_READONLY 0x800
 #define CLIENT_REDRAWWINDOW 0x1000
 #define CLIENT_CONTROL 0x2000
-#define CLIENT_FOCUSED 0x4000
+#define CLIENT_CONTROLCONTROL 0x4000
+#define CLIENT_FOCUSED 0x8000
+#define CLIENT_UTF8 0x10000
+#define CLIENT_256COLOURS 0x20000
+#define CLIENT_IDENTIFIED 0x40000
 	int		 flags;
 
 	struct event	 identify_timer;
-- 
cgit