--- rxvt-unicode/src/command.C	2012/05/25 08:27:47	1.510
+++ rxvt-unicode/src/command.C	2012/06/05 11:00:40	1.515
@@ -133,7 +133,7 @@
   0,
 };
 
-void
+void ecb_cold
 rxvt_term::iso14755_54 (int x, int y)
 {
   x = Pixel2Col (x);
@@ -160,7 +160,7 @@
     }
 }
 
-void
+void ecb_cold
 rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
 {
   rxvt_fontset *fs = FONTSET (r);
@@ -256,7 +256,7 @@
 }
 #endif
 
-void
+void ecb_cold
 rxvt_term::commit_iso14755 ()
 {
   wchar_t ch = iso14755buf & ISO_14755_MASK;
@@ -284,7 +284,7 @@
   iso14755buf = 0;
 }
 
-static int
+static int ecb_cold
 hex_keyval (XKeyEvent &ev)
 {
   // check whether this event corresponds to a hex digit
@@ -303,7 +303,7 @@
 }
 #endif
 
-static inline KeySym
+static inline KeySym ecb_cold
 translate_keypad (KeySym keysym, bool kp)
 {
 #ifdef XK_KP_Home
@@ -339,7 +339,7 @@
   return keysym;
 }
 
-static inline int
+static inline int ecb_cold
 map_function_key (KeySym keysym)
 {
   int param = 0;
@@ -398,7 +398,7 @@
   return param;
 }
 
-void
+void ecb_cold
 rxvt_term::key_press (XKeyEvent &ev)
 {
   int ctrl, meta, shft, len;
@@ -423,7 +423,7 @@
 
   kbuf[0] = 0;
 
-#ifdef USE_XIM
+#if USE_XIM
   if (Input_Context)
     {
       Status status_return;
@@ -857,7 +857,7 @@
   tt_write (kbuf, (unsigned int)len);
 }
 
-void
+void ecb_cold
 rxvt_term::key_release (XKeyEvent &ev)
 {
 #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
@@ -989,7 +989,7 @@
 
       scr_refresh ();
       scrollBar.show (1);
-#ifdef USE_XIM
+#if USE_XIM
       im_send_spot ();
 #endif
     }
@@ -1221,7 +1221,7 @@
   refresh_check ();
 }
 
-void
+void ecb_cold
 rxvt_term::pointer_unblank ()
 {
   XDefineCursor (dpy, vt, TermWin_cursor);
@@ -1236,7 +1236,7 @@
 }
 
 #ifdef POINTER_BLANK
-void
+void ecb_cold
 rxvt_term::pointer_blank ()
 {
   if (!option (Opt_pointerBlank))
@@ -1248,7 +1248,7 @@
   hidden_pointer = 1;
 }
 
-void
+void ecb_cold
 rxvt_term::pointer_cb (ev::timer &w, int revents)
 {
   make_current ();
@@ -1350,7 +1350,7 @@
 }
 
 /*{{{ process an X event */
-void
+void ecb_hot
 rxvt_term::x_cb (XEvent &ev)
 {
   make_current ();
@@ -1463,11 +1463,19 @@
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
 
+            bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
+
 #ifdef HAVE_BG_PIXMAP
-            bool moved = false;
             if (bg_window_position_sensitive ())
+              want_position_change = true;
+#endif
+
+            bool moved = false;
+
+            if (want_position_change)
               {
                 int x, y;
+
                 if (ev.xconfigure.send_event)
                   {
                     x = ev.xconfigure.x;
@@ -1476,11 +1484,17 @@
                 else
                   get_window_origin (x, y);
 
+                if (x != parent_x || y != parent_y)
+                  {
+                    HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
+                    parent_x = x;
+                    parent_y = y;
+                  }
+
                 if (bg_set_position (x, y)
                     || !(bg_flags & BG_IS_VALID))
                   moved = true;
               }
-#endif
 
             if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
               {
@@ -1715,7 +1729,7 @@
 }
 
 #if ENABLE_FRILLS
-void
+void ecb_cold
 rxvt_term::set_urgency (bool enable)
 {
   if (enable == urgency_hint)
@@ -1731,7 +1745,7 @@
 }
 #endif
 
-void
+void ecb_cold
 rxvt_term::focus_in ()
 {
   if (!focus)
@@ -1766,7 +1780,7 @@
     }
 }
 
-void
+void ecb_cold
 rxvt_term::focus_out ()
 {
   if (focus)
@@ -1809,7 +1823,7 @@
     }
 }
 
-void
+void ecb_cold
 rxvt_term::update_fade_color (unsigned int idx)
 {
 #if OFF_FOCUS_FADING
@@ -1823,7 +1837,7 @@
 }
 
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
-void
+void ecb_hot
 rxvt_term::rootwin_cb (XEvent &ev)
 {
   make_current ();
@@ -2217,7 +2231,7 @@
 
 /*}}} */
 
-void
+void ecb_hot
 rxvt_term::cmd_parse ()
 {
   wchar_t ch = NOCHAR;
@@ -2346,7 +2360,7 @@
 }
 
 // read the next character
-wchar_t
+wchar_t ecb_hot
 rxvt_term::next_char () NOTHROW
 {
   while (cmdbuf_ptr < cmdbuf_endp)
@@ -2380,7 +2394,7 @@
 }
 
 // read the next octet
-uint32_t
+uint32_t ecb_hot
 rxvt_term::next_octet () NOTHROW
 {
   return cmdbuf_ptr < cmdbuf_endp
@@ -2390,7 +2404,7 @@
 
 static class out_of_input out_of_input;
 
-wchar_t
+wchar_t ecb_hot
 rxvt_term::cmd_getc () THROW ((class out_of_input))
 {
   wchar_t c = next_char ();
@@ -2401,7 +2415,7 @@
   return c;
 }
 
-uint32_t
+uint32_t ecb_hot
 rxvt_term::cmd_get8 () THROW ((class out_of_input))
 {
   uint32_t c = next_octet ();
@@ -2415,7 +2429,7 @@
 /*{{{ print pipe */
 /*----------------------------------------------------------------------*/
 #ifdef PRINTPIPE
-FILE *
+FILE * ecb_cold
 rxvt_term::popen_printer ()
 {
   FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
@@ -2426,7 +2440,7 @@
   return stream;
 }
 
-int
+int ecb_cold
 rxvt_term::pclose_printer (FILE *stream)
 {
   fflush (stream);
@@ -2436,7 +2450,7 @@
 /*
  * simulate attached vt100 printer
  */
-void
+void ecb_cold
 rxvt_term::process_print_pipe ()
 {
   FILE *fd = popen_printer ();
@@ -2501,7 +2515,7 @@
 };
 
 /*{{{ process non-printing single characters */
-void
+void ecb_hot
 rxvt_term::process_nonprinting (unicode_t ch)
 {
   switch (ch)
@@ -2557,7 +2571,7 @@
 
 
 /*{{{ process VT52 escape sequences */
-void
+void ecb_cold
 rxvt_term::process_escape_vt52 (unicode_t ch)
 {
   int row, col;
@@ -2617,7 +2631,7 @@
 
 
 /*{{{ process escape sequences */
-void
+void ecb_hot
 rxvt_term::process_escape_seq ()
 {
   unicode_t ch = cmd_getc ();
@@ -2779,7 +2793,7 @@
     make_byte (0,0,0,0,0,0,0,0),	/* x, y, z, {, |, }, ~,    */
   };
 
-void
+void ecb_hot
 rxvt_term::process_csi_seq ()
 {
   unicode_t ch, priv, i;
@@ -3439,7 +3453,7 @@
           bool changed = false;
 
           if (ISSET_PIXCOLOR (Color_tint))
-            changed = bg_set_tint (pix_colors_focused [Color_tint]);
+            changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
 
           if (changed)
             update_background ();
@@ -3474,9 +3488,8 @@
 
             if (*str != ';')
               {
-                if (image_vec.size () > 0
-                    && image_vec[0].set_file_geometry (str))
-                  changed = true;
+                if (image_vec.size () > 0)
+                  changed = image_vec[0].set_file_geometry (str);
                 else
                   {
                     rxvt_image *image = new_image ();
@@ -3489,9 +3502,8 @@
             else
               {
                 str++;
-                if (image_vec.size () > 0
-                    && image_vec[0].set_geometry (str, true))
-                  changed = true;
+                if (image_vec.size () > 0)
+                  changed = image_vec[0].set_geometry (str, true);
               }
 
             if (changed)
@@ -3600,7 +3612,7 @@
  *      't' = toggle
  * so no need for fancy checking
  */
-int
+int ecb_cold
 rxvt_term::privcases (int mode, unsigned long bit)
 {
   int state;
@@ -3830,7 +3842,7 @@
 /*}}} */
 
 /*{{{ process sgr sequences */
-void
+void ecb_hot
 rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
 {
   unsigned int i;