--- sourceforge.net/trunk/rdesktop/constants.h	2000/08/15 10:23:24	10
+++ sourceforge.net/trunk/rdesktop/constants.h	2003/04/16 08:08:40	364
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Miscellaneous protocol constants
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,24 +24,24 @@
 /* ISO PDU codes */
 enum ISO_PDU_CODE
 {
-	ISO_PDU_CR = 0xE0, /* Connection Request */
-	ISO_PDU_CC = 0xD0, /* Connection Confirm */
-	ISO_PDU_DR = 0x80, /* Disconnect Request */
-	ISO_PDU_DT = 0xF0, /* Data */
-	ISO_PDU_ER = 0x70  /* Error */
+	ISO_PDU_CR = 0xE0,	/* Connection Request */
+	ISO_PDU_CC = 0xD0,	/* Connection Confirm */
+	ISO_PDU_DR = 0x80,	/* Disconnect Request */
+	ISO_PDU_DT = 0xF0,	/* Data */
+	ISO_PDU_ER = 0x70	/* Error */
 };
 
 /* 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
@@ -72,23 +72,27 @@
 
 #define SEC_TAG_CLI_INFO	0xc001
 #define SEC_TAG_CLI_CRYPT	0xc002
+#define SEC_TAG_CLI_4           0xc004
+#define SEC_TAG_CLI_CHANNELS    0xc003
 
 #define SEC_TAG_PUBKEY		0x0006
 #define SEC_TAG_KEYSIG		0x0008
 
-#define SEC_RSA_MAGIC		0x31415352 /* RSA1 */
+#define SEC_RSA_MAGIC		0x31415352	/* RSA1 */
 
 /* RDP licensing constants */
 #define LICENCE_TOKEN_SIZE	10
 #define LICENCE_HWID_SIZE	20
 #define LICENCE_SIGNATURE_SIZE	16
 
-#define LICENCE_TAG_DEMAND	0x0201
-#define LICENCE_TAG_AUTHREQ	0x0202
-#define LICENCE_TAG_ISSUE	0x0203
-#define LICENCE_TAG_REQUEST	0x0213
-#define LICENCE_TAG_AUTHRESP	0x0215
-#define LICENCE_TAG_RESULT	0x02ff
+#define LICENCE_TAG_DEMAND	0x01
+#define LICENCE_TAG_AUTHREQ	0x02
+#define LICENCE_TAG_ISSUE	0x03
+#define LICENCE_TAG_REISSUE	0x04
+#define LICENCE_TAG_PRESENT	0x12
+#define LICENCE_TAG_REQUEST	0x13
+#define LICENCE_TAG_AUTHRESP	0x15
+#define LICENCE_TAG_RESULT	0xff
 
 #define LICENCE_TAG_USER	0x000f
 #define LICENCE_TAG_HOST	0x0010
@@ -132,7 +136,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,14 +152,26 @@
 
 /* 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
 
+/* These are for synchronization; not for keystrokes */
+#define KBD_FLAG_SCROLL   0x0001
+#define KBD_FLAG_NUMLOCK  0x0002
+#define KBD_FLAG_CAPITAL  0x0004
+
+/* See T.128 */
+#define RDP_KEYPRESS 0
+#define RDP_KEYRELEASE (KBD_FLAG_DOWN | KBD_FLAG_UP)
+
 #define MOUSE_FLAG_MOVE         0x0800
 #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,15 +181,17 @@
 #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
+#define RDP_CAPSET_GENERAL	1	/* Maps to generalCapabilitySet in T.128 page 138 */
 #define RDP_CAPLEN_GENERAL	0x18
 #define OS_MAJOR_TYPE_UNIX	4
 #define OS_MINOR_TYPE_XSERVER	7
@@ -206,3 +226,36 @@
 #define RDP_CAPLEN_UNKNOWN	0x9C
 
 #define RDP_SOURCE		"MSTSC"
+
+/* Logon flags */
+#define RDP_LOGON_NORMAL	0x33
+#define RDP_LOGON_AUTO		0x8
+
+/* Keymap flags */
+#define MapRightShiftMask   (1<<0)
+#define MapLeftShiftMask    (1<<1)
+#define MapShiftMask (MapRightShiftMask | MapLeftShiftMask)
+
+#define MapRightAltMask     (1<<2)
+#define MapLeftAltMask      (1<<3)
+#define MapAltGrMask MapRightAltMask
+
+#define MapRightCtrlMask    (1<<4)
+#define MapLeftCtrlMask     (1<<5)
+#define MapCtrlMask (MapRightCtrlMask | MapLeftCtrlMask)
+
+#define MapRightWinMask     (1<<6)
+#define MapLeftWinMask      (1<<7)
+#define MapWinMask (MapRightWinMask | MapLeftWinMask)
+
+#define MapNumLockMask      (1<<8)
+#define MapCapsLockMask     (1<<9)
+
+#define MapLocalStateMask   (1<<10)
+
+#define MapInhibitMask      (1<<11)
+
+#define MASK_ADD_BITS(var, mask) (var |= mask)
+#define MASK_REMOVE_BITS(var, mask) (var &= ~mask)
+#define MASK_HAS_BITS(var, mask) ((var & mask)>0)
+#define MASK_CHANGE_BIT(var, mask, active) (var = ((var & ~mask) | (active ? mask : 0)))