--- rxvt-unicode/src/rxvt.h	2006/02/02 18:04:46	1.254
+++ rxvt-unicode/src/rxvt.h	2006/12/02 16:57:16	1.264
@@ -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 */
@@ -699,9 +702,13 @@
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
 #define OPTION(opt)		(options & (opt))
-#define DEFAULT_OPTIONS		(Opt_scrollBar | Opt_scrollTtyOutput \
-				 | Opt_jumpScroll | Opt_secondaryScreen \
-				 | Opt_pastableTabs | Opt_intensityStyles)
+#define DEFAULT_OPTIONS		(Opt_scrollBar		\
+                                | Opt_scrollTtyOutput	\
+				| Opt_jumpScroll	\
+                                | Opt_secondaryScreen	\
+                                | Opt_secondaryScroll	\
+				| Opt_pastableTabs	\
+                                | Opt_intensityStyles)
 
 // for m >= -n, ensure remainder lies between 0..n-1
 #define MOD(m,n) (((m) + (n)) % (n))
@@ -775,8 +782,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;
@@ -788,6 +795,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
@@ -1100,7 +1109,7 @@
     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
@@ -1172,8 +1181,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 ();
@@ -1208,13 +1217,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;
@@ -1228,6 +1238,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 ();