--- rxvt-unicode/src/rxvt.h	2004/12/11 23:01:36	1.128
+++ rxvt-unicode/src/rxvt.h	2004/12/20 18:07:19	1.135
@@ -502,6 +502,9 @@
   Color_UL,
   Color_RV,
 #endif
+#if ENABLE_FRILLS
+  Color_underline,
+#endif
 #ifdef OPTION_HC
   Color_HC,
 #endif
@@ -640,15 +643,24 @@
   XA_VT_SELECTION,
   XA_INCR,
   XA_WMDELETEWINDOW,
-#ifdef TRANSPARENT
-  XA_XROOTPMAPID,
-  XA_XSETROOTID,
+  XA_CLIPBOARD,
+#if ENABLE_FRILLS
+  XA_NET_WM_PID,
+  XA_MOTIF_WM_HINTS,
+  XA_NET_WM_NAME,
+  XA_NET_WM_ICON_NAME,
+#endif
+#if USE_XIM
+  XA_WM_LOCALE_NAME,
+#endif
+#if TRANSPARENT
+  XA_XROOTPMAP_ID,
+  XA_ESETROOT_PMAP_ID,
 #endif
-#ifdef OFFIX_DND                /* OffiX Dnd (drag 'n' drop) support */
+#if OFFIX_DND                /* OffiX Dnd (drag 'n' drop) support */
   XA_DNDPROTOCOL,
   XA_DNDSELECTION,
-#endif                          /* OFFIX_DND */
-  XA_CLIPBOARD,
+#endif
   NUM_XA
 };
 
@@ -944,6 +956,8 @@
   mbstate () { reset (); }
 };
 
+#define UNICODE_MASK 0x1fffffUL
+
 #if UNICODE3
 # define COMPOSE_LO 0x40000000UL
 # define COMPOSE_HI 0x400fffffUL
@@ -1104,6 +1118,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
@@ -1200,7 +1216,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 +1273,7 @@
 
   void tt_printf (const char *fmt,...);
   void tt_write (const unsigned char *data, unsigned int len);
+  void pty_write ();
 
   void tt_winch ();
 
@@ -1450,7 +1468,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);