--- sourceforge.net/trunk/rdesktop/proto.h	2005/08/03 09:56:17	962
+++ sourceforge.net/trunk/rdesktop/proto.h	2005/11/07 13:15:19	1025
@@ -1,3 +1,30 @@
+/* -*- c-basic-offset: 8 -*-
+   rdesktop: A Remote Desktop Protocol client.
+   Copyright (C) Matthew Chapman 1999-2005
+
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef RDESKTOP_PROTO_H
+#define RDESKTOP_PROTO_H
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
 /* bitmap.c */
 BOOL bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp);
 /* cache.c */
@@ -23,9 +50,8 @@
 void channel_send(STREAM s, VCHANNEL * channel);
 void channel_process(STREAM s, uint16 mcs_channel);
 /* cliprdr.c */
-void cliprdr_send_text_format_announce(void);
-void cliprdr_send_blah_format_announce(void);
-void cliprdr_send_native_format_announce(uint8 * data, uint32 length);
+void cliprdr_send_native_format_announce(uint8 * formats_data, uint32 formats_data_length);
+void cliprdr_send_simple_native_format_announce(uint32 format);
 void cliprdr_send_data_request(uint32 format);
 void cliprdr_send_data(uint8 * data, uint32 length);
 BOOL cliprdr_init(void);
@@ -46,7 +72,9 @@
 void iso_send(STREAM s);
 STREAM iso_recv(uint8 * rdpver);
 BOOL iso_connect(char *server, char *username);
+BOOL iso_reconnect(char *server);
 void iso_disconnect(void);
+void iso_reset_state(void);
 /* licence.c */
 void licence_process(STREAM s);
 /* mcs.c */
@@ -55,7 +83,9 @@
 void mcs_send(STREAM s);
 STREAM mcs_recv(uint16 * channel, uint8 * rdpver);
 BOOL mcs_connect(char *server, STREAM mcs_data, char *username);
+BOOL mcs_reconnect(char *server, STREAM mcs_data);
 void mcs_disconnect(void);
+void mcs_reset_state(void);
 /* orders.c */
 void process_orders(STREAM s, uint16 num_orders);
 void reset_order_state(void);
@@ -77,6 +107,7 @@
 int main(int argc, char *argv[]);
 void generate_random(uint8 * random);
 void *xmalloc(int size);
+char *xstrdup(const char *s);
 void *xrealloc(void *oldmem, int size);
 void xfree(void *mem);
 void error(char *format, ...);
@@ -85,6 +116,7 @@
 void hexdump(unsigned char *p, unsigned int len);
 char *next_arg(char *src, char needle);
 void toupper_str(char *p);
+BOOL str_startswith(const char *s, const char *prefix);
 char *l_to_a(long N, int base);
 int load_licence(unsigned char **data);
 void save_licence(unsigned char *data, int length);
@@ -113,6 +145,9 @@
 BOOL rdp_loop(BOOL * deactivated, uint32 * ext_disc_reason);
 BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command,
 		 char *directory);
+BOOL rdp_reconnect(char *server, uint32 flags, char *domain, char *password, char *command,
+		   char *directory, char *cookie);
+void rdp_reset_state(void);
 void rdp_disconnect(void);
 /* rdpdr.c */
 int get_device_index(NTHANDLE handle);
@@ -147,7 +182,9 @@
 void sec_process_mcs_data(STREAM s);
 STREAM sec_recv(uint8 * rdpver);
 BOOL sec_connect(char *server, char *username);
+BOOL sec_reconnect(char *server);
 void sec_disconnect(void);
+void sec_reset_state(void);
 /* serial.c */
 int serial_enum_devices(uint32 * id, char *optarg);
 BOOL serial_get_event(NTHANDLE handle, uint32 * result);
@@ -159,6 +196,7 @@
 BOOL tcp_connect(char *server);
 void tcp_disconnect(void);
 char *tcp_get_address(void);
+void tcp_reset_state(void);
 /* xclip.c */
 void ui_clip_format_announce(uint8 * data, uint32 length);
 void ui_clip_handle_data(uint8 * data, uint32 length);
@@ -166,13 +204,13 @@
 void ui_clip_sync(void);
 void xclip_init(void);
 /* xkeymap.c */
-void xkeymap_from_locale(const char *locale);
+BOOL xkeymap_from_locale(const char *locale);
 FILE *xkeymap_open(const char *filename);
 void xkeymap_init(void);
 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);
 void xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
-		       BOOL pressed);
+		       BOOL pressed, uint8 nesting);
 uint16 xkeymap_translate_button(unsigned int button);
 char *get_ksname(uint32 keysym);
 void save_remote_modifiers(uint8 scancode);
@@ -231,3 +269,11 @@
 void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy);
 void ui_begin_update(void);
 void ui_end_update(void);
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif