--- rxvt-unicode/src/rxvt.h	2006/01/28 20:33:31	1.246
+++ rxvt-unicode/src/rxvt.h	2006/01/31 01:21:21	1.250
@@ -34,6 +34,7 @@
 #endif
 
 #include "encoding.h"
+#include "rxvtutil.h"
 #include "rxvtfont.h"
 #include "rxvttoolkit.h"
 #include "iom.h"
@@ -100,27 +101,6 @@
 
 /****************************************************************************/
 
-#ifndef __attribute__
-# if __GNUC__
-#  if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
-#   define __attribute__(x)
-#  endif
-# endif
-# define __attribute__(x)
-#endif
-
-#define NORETURN __attribute__ ((noreturn))
-#define UNUSED   __attribute__ ((unused))
-
-// increases code size unless -fno-enforce-eh-specs
-#if __GNUC__
-# define NOTHROW
-# define THROW(x)
-#else
-# define NOTHROW  throw()
-# define THROW(x) throw x
-#endif
-
 // exception thrown on fatal (per-instance) errors
 class rxvt_failure_exception { };
 
@@ -434,6 +414,9 @@
 #define RS_RVid                 0x00020000UL    // reverse video
 #define RS_Uline                0x00040000UL    // underline
 
+// toggle this to force redraw, must be != RS_Careful
+#define RS_redraw               0x01000000UL
+
 // 5 custom bits for extensions
 #define RS_customCount          32
 #define RS_customMask           0x00f80000UL
@@ -871,7 +854,7 @@
 # define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
 #else
 # if ENABLE_PERL
-#  define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
+#  define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
 #  define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
 # else
 #  define COMPOSE_LO 0xd800UL
@@ -1275,7 +1258,7 @@
   void set_icon_name (const char *str);
   void set_window_color (int idx, const char *color);
   void set_colorfgbg ();
-  int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
+  bool set_color (rxvt_color &color, const char *name);
   void set_widthheight (unsigned int newwidth, unsigned int newheight);
 
   // screen.C