--- rxvt-unicode/src/rxvt.h	2006/01/30 16:12:58	1.248
+++ rxvt-unicode/src/rxvt.h	2006/11/02 17:23:50	1.263
@@ -10,15 +10,16 @@
 #endif
 
 #if ENABLE_PERL
-# define ENABLE_FRILLS 1
+# define ENABLE_FRILLS    1
 # define ENABLE_COMBINING 1
 #endif
 
 #if ENABLE_FRILLS
-# define ENABLE_XEMBED 1
-# define ENABLE_EWMH   1
+# define ENABLE_XEMBED        1
+# define ENABLE_EWMH          1
 # define ENABLE_XIM_ONTHESPOT 1
-# define CURSOR_BLINK  1
+# define CURSOR_BLINK         1
+# define OPTION_HC            1
 #else
 # define ENABLE_MINIMAL 1
 #endif
@@ -521,6 +522,8 @@
  */
 
 enum colour_list {
+  Color_none = -2,
+  Color_transparent = -1,
   Color_fg = 0,
   Color_bg,
   minCOLOR,                   /* 2 */
@@ -590,9 +593,6 @@
 
 #define Color_Bits      7 // 0 .. maxTermCOLOR
 
-#define NPIXCLR_SETS    ((TOTAL_COLORS + 31) / 32)
-#define NPIXCLR_BITS    32
-
 /*
  * Resource list
  */
@@ -733,8 +733,8 @@
 
 #define RS_SAME(a,b)		(!(((a) ^ (b)) & ~RS_Careful))
 
-#define SET_PIXCOLOR(x)         (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
-#define ISSET_PIXCOLOR(x)       (pixcolor_set[(x) / NPIXCLR_BITS] &  (1 << ((x) % NPIXCLR_BITS)))
+#define PIXCOLOR_NAME(idx)      rs[Rs_color + (idx)]
+#define ISSET_PIXCOLOR(idx)     (!!rs[Rs_color + (idx)])
 
 #if ENABLE_STYLES
 # define FONTSET(style) fontset[GET_STYLE (style)]
@@ -778,8 +778,8 @@
 # define XPMClearArea(a, b, c, d, e, f, g)
 #endif
 
-typedef callback1<void, const char *> log_callback;
-typedef callback1<int, int> getfd_callback;
+typedef callback<void (const char *)> log_callback;
+typedef callback<int (int)> getfd_callback;
 
 #define SET_LOCALE(locale) rxvt_set_locale (locale)
 extern bool rxvt_set_locale (const char *locale) NOTHROW;
@@ -791,6 +791,8 @@
 #define LINE_LONGER     0x0001 // line is continued on the next row
 #define LINE_FILTERED   0x0002 // line has been filtered
 #define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
+#define LINE_FILTER     0x0008 // line needs to be filtered before display (NYI)
+#define LINE_BIDI       0x0010 // line needs bidi (NYI)
 
 struct line_t {
    text_t *t; // terminal the text
@@ -854,7 +856,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
@@ -893,11 +895,17 @@
 /****************************************************************************/
 
 #ifdef KEYSYM_RESOURCE
-  class keyboard_manager;
+class keyboard_manager;
 #endif
 
 struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
-  log_callback   *log_hook;               // log error messages through this hook, if != 0
+
+  // special markers with magic addresses
+  static const char resval_undef [];    // options specifically unset
+  static const char resval_on [];       // boolean options switched on
+  static const char resval_off [];      // or off
+  
+  log_callback   *log_hook;             // log error messages through this hook, if != 0
   getfd_callback *getfd_hook;           // convert remote to local fd, if != 0
 #if ENABLE_PERL
   rxvt_perl_term  perl;
@@ -947,8 +955,6 @@
 /* ---------- */
   rend_t          rstyle;
 /* ---------- */
-  uint32_t        pixcolor_set[NPIXCLR_SETS];
-/* ---------- */
 #ifdef SELECTION_SCROLLING
   int             scroll_selection_lines;
   enum page_dirn  scroll_selection_dir;
@@ -1096,10 +1102,10 @@
 
   void vt_select_input () const NOTHROW
   {
-    XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
+    XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
   }
 
-#if TRANSPARENT
+#if TRANSPARENT || ENABLE_PERL
   void rootwin_cb (XEvent &xev);
   xevent_watcher rootwin_ev;
 #endif
@@ -1171,8 +1177,8 @@
   void make_current () const // make this the "currently active" urxvt instance
   {
     SET_R (this);
-    rxvt_set_locale (locale);
     set_environ (envv);
+    rxvt_set_locale (locale);
   }
 
   void init_secondary ();
@@ -1207,13 +1213,14 @@
   bool IMisRunning ();
   void IMSendSpot ();
   bool IM_get_IC (const char *modifiers);
-  void IMSetStatusPosition ();
+  void IMSetPosition ();
 #endif
 
   void resize_scrollbar ();
 
   // command.C
-  void lookup_key (XKeyEvent &ev);
+  void key_press (XKeyEvent &ev);
+  void key_release (XKeyEvent &ev);
   unsigned int cmd_write (const char *str, unsigned int count);
 
   wchar_t next_char () NOTHROW;
@@ -1227,6 +1234,7 @@
   void button_release (XButtonEvent &ev);
   void focus_in ();
   void focus_out ();
+  void update_fade_color (unsigned int idx);
   int check_our_parents ();
 #ifdef PRINTPIPE
   FILE *popen_printer ();
@@ -1258,7 +1266,8 @@
   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 alias_color (int dst, int src);
   void set_widthheight (unsigned int newwidth, unsigned int newheight);
 
   // screen.C