--- rxvt-unicode/src/rxvt.h	2004/12/01 02:12:18	1.126
+++ rxvt-unicode/src/rxvt.h	2004/12/13 19:16:36	1.131
@@ -88,7 +88,10 @@
 void           * rxvt_malloc                      (size_t size);
 void           * rxvt_calloc                      (size_t number, size_t size);
 void           * rxvt_realloc                     (void *ptr, size_t size);
-char *           rxvt_wcstombs                    (const wchar_t *str, int len);
+char *           rxvt_wcstombs                    (const wchar_t *str, int len = -1);
+wchar_t *        rxvt_mbstowcs                    (const char *str, int len = -1);
+char *           rxvt_wcstoutf8                   (const wchar_t *str, int len = -1);
+wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1);
 char *           rxvt_strdup                      (const char *str);
 char *           rxvt_r_basename                  (const char *str);
 void             rxvt_vlog                        (const char *fmt, va_list arg_ptr);
@@ -134,8 +137,8 @@
 
 #ifdef XPM_BACKGROUND
 typedef struct {
-  short           w, h, x, y;
-  Pixmap          pixmap;
+  short w, h, x, y;
+  Pixmap pixmap;
 } bgPixmap_t;
 #endif
 
@@ -144,10 +147,10 @@
  * pared down from XButtonEvent
  */
 struct mouse_event {
-  int             clicks;
-  Time            time;       /* milliseconds */
-  unsigned int    state;      /* key or button mask */
-  unsigned int    button;     /* detail */
+  int clicks;
+  Time time;             /* milliseconds */
+  unsigned int state;    /* key or button mask */
+  unsigned int button;   /* detail */
 };
 
 #define MAX_IT(current, other)  if ((other) > (current)) (current) = (other)
@@ -1005,7 +1008,7 @@
 #ifdef POINTER_BLANK
                   hidden_pointer:1,
 #endif
-//                  enc_utf8:1,		/* wether terminal reads/writes utf-8 */
+//                  enc_utf8:1,		/* wether locale uses utf-8 */
                   seen_input:1,         /* wether we have seen some program output yet */
                   seen_resize:1,	/* wether we had a resize event */
                   parsed_geometry:1;
@@ -1101,6 +1104,8 @@
   Time            selection_time,
                   selection_request_time;
   pid_t           cmd_pid;    /* process id of child */
+  char *          incr_buf;
+  size_t          incr_buf_size, incr_buf_fill;
 /* ---------- */
   Cursor          leftptr_cursor;
 #ifdef POINTER_BLANK
@@ -1169,9 +1174,6 @@
   char           *env_term;           /* environmental variable TERM     */
   char           *env_colorfgbg;
   char           *locale;
-#if 0
-  char           *codeset;
-#endif
   char            charsets[4];
   unsigned char  *v_buffer;           /* pointer to physical buffer */
   unsigned int    v_buflen;           /* size of area to write */
@@ -1200,7 +1202,8 @@
 # endif
 #endif
 
-  void paste (const unsigned char *data, unsigned int len);
+  // modifies first argument(!)
+  void paste (unsigned char *data, unsigned int len);
 
   void flush ();
 
@@ -1256,6 +1259,7 @@
 
   void tt_printf (const char *fmt,...);
   void tt_write (const unsigned char *data, unsigned int len);
+  void pty_write ();
 
   void tt_winch ();
 
@@ -1354,6 +1358,8 @@
   // main.C
   void privileged_utmp (rxvt_privaction action);
   bool set_fonts ();
+  void set_string_property (Atom prop, const char *str, int len = -1);
+  void set_utf8_property (Atom prop, const char *str, int len = -1);
   void set_title (const char *str);
   void set_icon_name (const char *str);
   void set_window_color (int idx, const char *color);
@@ -1448,7 +1454,7 @@
   void scr_reverse_selection ();
   void scr_dump (int fd);
   void selection_check (int check_more);
-  int selection_paste (Window win, Atom prop, bool delete_prop);
+  void selection_paste (Window win, Atom prop, bool delete_prop);
   void selection_property (Window win, Atom prop);
   void selection_request (Time tm, int x, int y);
   int selection_request_other (Atom target, int selnum);