--- sourceforge.net/trunk/rdesktop/proto.h	2002/09/14 13:47:24	123
+++ sourceforge.net/trunk/rdesktop/proto.h	2003/03/27 13:33:16	353
@@ -1,6 +1,6 @@
 /* bitmap.c */
-BOOL bitmap_decompress(unsigned char *output, int width, int height, unsigned char *input,
-		       int size);
+BOOL bitmap_decompress(unsigned char *output, int width, int height, unsigned char *input, int size,
+		       int Bpp);
 /* cache.c */
 HBITMAP cache_get_bitmap(uint8 cache_id, uint16 cache_idx);
 void cache_put_bitmap(uint8 cache_id, uint16 cache_idx, HBITMAP bitmap);
@@ -14,22 +14,24 @@
 		       uint8 * data);
 HCURSOR cache_get_cursor(uint16 cache_idx);
 void cache_put_cursor(uint16 cache_idx, HCURSOR cursor);
+/* ewmhints.c */
+int get_current_workarea(uint32 * x, uint32 * y, uint32 * width, uint32 * height);
 /* iso.c */
 STREAM iso_init(int length);
 void iso_send(STREAM s);
 STREAM iso_recv(void);
-BOOL iso_connect(char *server);
+BOOL iso_connect(char *server, char *username);
 void iso_disconnect(void);
 /* licence.c */
 void licence_process(STREAM s);
 /* mcs.c */
 STREAM mcs_init(int length);
 void mcs_send(STREAM s);
-STREAM mcs_recv(void);
-BOOL mcs_connect(char *server, STREAM mcs_data);
+STREAM mcs_recv(uint16 * channel);
+BOOL mcs_connect(char *server, STREAM mcs_data, char *username);
 void mcs_disconnect(void);
 /* orders.c */
-void process_orders(STREAM s);
+void process_orders(STREAM s, uint16 count);
 void reset_order_state(void);
 /* rdesktop.c */
 int main(int argc, char *argv[]);
@@ -38,6 +40,7 @@
 void *xrealloc(void *oldmem, int size);
 void xfree(void *mem);
 void error(char *format, ...);
+void warning(char *format, ...);
 void unimpl(char *format, ...);
 void hexdump(unsigned char *p, unsigned int len);
 int load_licence(unsigned char **data);
@@ -46,12 +49,18 @@
 void rdp_out_unistr(STREAM s, char *string, int len);
 void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1,
 		    uint16 param2);
+void process_bitmap_updates(STREAM s);
+void process_colour_pointer_pdu(STREAM s);
+void process_cached_pointer_pdu(STREAM s);
+void process_null_system_pointer_pdu(STREAM s);
+void process_palette(STREAM s);
 void rdp_main_loop(void);
 BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command,
 		 char *directory);
 void rdp_disconnect(void);
-/* readpass.c */
-char *askpass(char *askpass, const char *msg);
+/* rdp5.c */
+void rdp5_process(STREAM s, BOOL encryption, BOOL shortform);
+void rdp5_process_channel(STREAM s, uint16 channel);
 /* secure.c */
 void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt);
 void sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2);
@@ -61,8 +70,10 @@
 STREAM sec_init(uint32 flags, int maxlen);
 void sec_send(STREAM s, uint32 flags);
 STREAM sec_recv(void);
-BOOL sec_connect(char *server);
+BOOL sec_connect(char *server, char *username);
 void sec_disconnect(void);
+void sec_process_mcs_data(STREAM s);
+void sec_decrypt(uint8 * data, int length);
 /* tcp.c */
 STREAM tcp_init(int maxlen);
 void tcp_send(STREAM s);
@@ -71,20 +82,21 @@
 void tcp_disconnect(void);
 /* xkeymap.c */
 void xkeymap_init(void);
-BOOL handle_special_keys(KeySym keysym, uint32 ev_time, BOOL pressed);
-key_translation xkeymap_translate_key(KeySym keysym, unsigned int keycode, unsigned int state);
+BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed);
+key_translation xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state);
 uint16 xkeymap_translate_button(unsigned int button);
-char *get_ksname(KeySym keysym);
+char *get_ksname(uint32 keysym);
 void ensure_remote_modifiers(uint32 ev_time, key_translation tr);
-void rdp_send_scancode(uint32 time, uint16 flags, uint16 scancode);
+void reset_modifier_keys(unsigned int state);
+void rdp_send_scancode(uint32 time, uint16 flags, uint8 scancode);
 /* xwin.c */
-BOOL get_key_state(int keysym);
+BOOL get_key_state(unsigned int state, uint32 keysym);
 BOOL ui_init(void);
-void ui_create_window_obj(int xpos, int ypos, int width, int height, int valuemask);
+void ui_deinit(void);
 BOOL ui_create_window(void);
 void ui_destroy_window(void);
 void xwin_toggle_fullscreen(void);
-void ui_select(int rdp_socket);
+int ui_select(int rdp_socket);
 void ui_move_pointer(int x, int y);
 HBITMAP ui_create_bitmap(int width, int height, uint8 * data);
 void ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, uint8 * data);