--- sourceforge.net/trunk/rdesktop/proto.h	2002/09/11 11:45:20	118
+++ sourceforge.net/trunk/rdesktop/proto.h	2003/02/07 23:43:37	314
@@ -1,6 +1,6 @@
 /* bitmap.c */
 BOOL bitmap_decompress(unsigned char *output, int width, int height, unsigned char *input,
-		       int size);
+		       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,6 +14,8 @@
 		       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);
@@ -38,10 +40,9 @@
 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);
-void save_licence(unsigned char *data, int length);
 /* rdp.c */
 void rdp_out_unistr(STREAM s, char *string, int len);
 void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1,
@@ -50,8 +51,6 @@
 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);
 /* 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);
@@ -70,23 +69,23 @@
 BOOL tcp_connect(char *server);
 void tcp_disconnect(void);
 /* xkeymap.c */
-void xkeymap_init1(void);
-void xkeymap_init2(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);
+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);
 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);
+void mwm_hide_decorations(void);
+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 reset_keys(void);
-void toggle_fullscreen(void);
-void ui_select(int rdp_socket);
+void xwin_toggle_fullscreen(void);
+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);