--- sourceforge.net/trunk/rdesktop/constants.h	2000/08/15 10:23:24	10
+++ sourceforge.net/trunk/rdesktop/constants.h	2002/07/12 22:40:32	56
@@ -34,14 +34,14 @@
 /* MCS PDU codes */
 enum MCS_PDU_TYPE
 {
-	MCS_EDRQ = 1,	/* Erect Domain Request */
-	MCS_DPUM = 8,	/* Disconnect Provider Ultimatum */
-	MCS_AURQ = 10,	/* Attach User Request */
-	MCS_AUCF = 11,	/* Attach User Confirm */
-	MCS_CJRQ = 14,	/* Channel Join Request */
-	MCS_CJCF = 15,	/* Channel Join Confirm */
-	MCS_SDRQ = 25,	/* Send Data Request */
-	MCS_SDIN = 26	/* Send Data Indication */
+	MCS_EDRQ = 1,		/* Erect Domain Request */
+	MCS_DPUM = 8,		/* Disconnect Provider Ultimatum */
+	MCS_AURQ = 10,		/* Attach User Request */
+	MCS_AUCF = 11,		/* Attach User Confirm */
+	MCS_CJRQ = 14,		/* Channel Join Request */
+	MCS_CJCF = 15,		/* Channel Join Confirm */
+	MCS_SDRQ = 25,		/* Send Data Request */
+	MCS_SDIN = 26		/* Send Data Indication */
 };
 
 #define MCS_CONNECT_INITIAL	0x7f65
@@ -86,6 +86,8 @@
 #define LICENCE_TAG_DEMAND	0x0201
 #define LICENCE_TAG_AUTHREQ	0x0202
 #define LICENCE_TAG_ISSUE	0x0203
+#define LICENCE_TAG_REISSUE	0x0204
+#define LICENCE_TAG_PRESENT	0x0212
 #define LICENCE_TAG_REQUEST	0x0213
 #define LICENCE_TAG_AUTHRESP	0x0215
 #define LICENCE_TAG_RESULT	0x02ff
@@ -132,7 +134,9 @@
 
 enum RDP_POINTER_PDU_TYPE
 {
-	RDP_POINTER_MOVE = 3
+	RDP_POINTER_MOVE = 3,
+	RDP_POINTER_COLOR = 6,
+	RDP_POINTER_CACHED = 7
 };
 
 enum RDP_INPUT_DEVICE
@@ -146,6 +150,7 @@
 
 /* Device flags */
 #define KBD_FLAG_RIGHT          0x0001
+#define KBD_FLAG_EXT            0x0100
 #define KBD_FLAG_QUIET          0x1000
 #define KBD_FLAG_DOWN           0x4000
 #define KBD_FLAG_UP             0x8000
@@ -154,6 +159,8 @@
 #define MOUSE_FLAG_BUTTON1      0x1000
 #define MOUSE_FLAG_BUTTON2      0x2000
 #define MOUSE_FLAG_BUTTON3      0x4000
+#define MOUSE_FLAG_BUTTON4      0x0280
+#define MOUSE_FLAG_BUTTON5      0x0380
 #define MOUSE_FLAG_DOWN         0x8000
 
 /* Raster operation masks */
@@ -163,12 +170,14 @@
 #define ROP2_COPY	0xc
 #define ROP2_XOR	0x6
 #define ROP2_AND	0x8
+#define ROP2_NXOR	0x9
 #define ROP2_OR		0xe
 
 #define MIX_TRANSPARENT	0
 #define MIX_OPAQUE	1
 
-#define TEXT2_IMPLICIT_X 0x20
+#define TEXT2_VERTICAL		0x04
+#define TEXT2_IMPLICIT_X	0x20
 
 /* RDP capabilities */
 #define RDP_CAPSET_GENERAL	1
@@ -206,3 +215,7 @@
 #define RDP_CAPLEN_UNKNOWN	0x9C
 
 #define RDP_SOURCE		"MSTSC"
+
+/* Logon flags */
+#define RDP_LOGON_NORMAL	0x33
+#define RDP_LOGON_AUTO		0x8