--- sourceforge.net/trunk/rdesktop/proto.h	2003/06/06 10:42:21	405
+++ sourceforge.net/trunk/rdesktop/proto.h	2003/07/09 09:18:20	435
@@ -15,27 +15,18 @@
 HCURSOR cache_get_cursor(uint16 cache_idx);
 void cache_put_cursor(uint16 cache_idx, HCURSOR cursor);
 /* channels.c */
-uint16 get_num_channels(void);
-void register_channel(char *name, uint32 flags, void (*callback) (STREAM, uint16));
-rdp5_channel *find_channel_by_channelno(uint16 channelno);
-rdp5_channel *find_channel_by_num(uint16 num);
-void dummy_callback(STREAM s, uint16 channelno);
-void channels_init(void);
+VCHANNEL *channel_register(char *name, uint32 flags, void (*callback) (STREAM));
+STREAM channel_init(VCHANNEL * channel, uint32 length);
+void channel_send(STREAM s, VCHANNEL * channel);
+void channel_process(STREAM s, uint16 mcs_channel);
 /* cliprdr.c */
-void cliprdr_ipc_format_announce(unsigned char *data, uint16 length);
-void cliprdr_handle_SelectionClear(void);
-void cliprdr_handle_server_data(uint32 length, uint32 flags, STREAM s);
-void cliprdr_handle_server_data_request(STREAM s);
-void cliprdr_callback(STREAM s, uint16 channelno);
-void cliprdr_ipc_primary_lost(unsigned char *data, uint16 length);
-void cliprdr_init(void);
+void cliprdr_send_text_format_announce(void);
+void cliprdr_send_native_format_announce(uint8 * data, uint32 length);
+void cliprdr_send_data_request(uint32 format);
+void cliprdr_send_data(uint8 * data, uint32 length);
+BOOL cliprdr_init(void);
 /* ewmhints.c */
 int get_current_workarea(uint32 * x, uint32 * y, uint32 * width, uint32 * height);
-/* ipc.c */
-void ipc_register_ipcnotify(uint16 messagetype, void (*notifycallback) (unsigned char *, uint16));
-void ipc_deregister_ipcnotify(uint16 messagetype);
-void ipc_init(void);
-void ipc_send_message(uint16 messagetype, unsigned char *data, uint16 length);
 /* iso.c */
 STREAM iso_init(int length);
 void iso_send(STREAM s);
@@ -75,13 +66,19 @@
 void process_cached_pointer_pdu(STREAM s);
 void process_bitmap_updates(STREAM s);
 void process_palette(STREAM s);
-void rdp_main_loop(void);
+BOOL rdp_main_loop(void);
 BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command,
 		 char *directory);
 void rdp_disconnect(void);
 /* rdp5.c */
-void rdp5_process(STREAM s, BOOL encryption, BOOL shortform);
-void rdp5_process_channel(STREAM s, uint16 channelno);
+void rdp5_process(STREAM s, BOOL encryption);
+/* rdpdr.c */
+void rdpdr_send_connect(void);
+void rdpdr_send_name(void);
+void rdpdr_send_available(void);
+void rdpdr_send_completion(uint32 device, uint32 id, uint32 status, uint32 result, uint8 * buffer,
+			   uint32 length);
+BOOL rdpdr_init(void);
 /* 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);
@@ -99,9 +96,15 @@
 /* tcp.c */
 STREAM tcp_init(uint32 maxlen);
 void tcp_send(STREAM s);
-STREAM tcp_recv(uint32 length);
+STREAM tcp_recv(STREAM s, uint32 length);
 BOOL tcp_connect(char *server);
 void tcp_disconnect(void);
+/* xclip.c */
+void ui_clip_format_announce(char *data, uint32 length);
+void ui_clip_handle_data(char *data, uint32 length);
+void ui_clip_request_data(uint32 format);
+void ui_clip_sync(void);
+void xclip_init(void);
 /* xkeymap.c */
 void xkeymap_init(void);
 BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed);