--- rxvt-unicode/src/main.C	2012/06/03 10:42:34	1.374
+++ rxvt-unicode/src/main.C	2012/06/05 11:00:40	1.377
@@ -174,7 +174,7 @@
   rootwin_ev.set          <rxvt_term, &rxvt_term::rootwin_cb> (this),
 #endif
   scrollbar_ev.set        <rxvt_term, &rxvt_term::x_cb>       (this),
-#ifdef USE_XIM
+#if USE_XIM
   im_ev.set               <rxvt_term, &rxvt_term::im_cb>      (this),
 #endif
 #ifdef POINTER_BLANK
@@ -233,7 +233,7 @@
       selection_clear ();
       selection_clear (true);
 
-#ifdef USE_XIM
+#if USE_XIM
       im_destroy ();
 #endif
       scrollBar.destroy ();
@@ -574,7 +574,7 @@
 
   XrmInitialize ();
 
-#ifdef HAVE_PIXBUF
+#if HAVE_PIXBUF
   g_type_init ();
 #endif
 }
@@ -967,7 +967,7 @@
     if (pix_colors[Color_bg] == pix_colors[i])
       {
         sprintf (bstr, "%d", i - Color_Black);
-#ifdef BG_IMAGE_FROM_FILE
+#if BG_IMAGE_FROM_FILE
         xpmb = "default;";
 #endif
         break;
@@ -1080,6 +1080,8 @@
                          window_vt_x, window_vt_y,
                          vt_width, vt_height);
 
+      HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
+
 #ifdef HAVE_BG_PIXMAP
       if (bg_window_size_sensitive ())
         update_background ();
@@ -1089,7 +1091,7 @@
   if (fix_screen || old_height == 0)
     scr_reset ();
 
-#ifdef USE_XIM
+#if USE_XIM
   im_set_position ();
 #endif
 }
@@ -1124,7 +1126,7 @@
 /* -------------------------------------------------------------------- *
  * -                      X INPUT METHOD ROUTINES                     - *
  * -------------------------------------------------------------------- */
-#ifdef USE_XIM
+#if USE_XIM
 
 void
 rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
@@ -1626,28 +1628,6 @@
   XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
 }
 
-Pixmap
-rxvt_term::get_pixmap_property (Atom property)
-{
-  Pixmap pixmap = None;
-
-  int aformat;
-  unsigned long nitems, bytes_after;
-  Atom atype;
-  unsigned char *prop;
-  int result = XGetWindowProperty (dpy, display->root, property,
-                                   0L, 1L, False, XA_PIXMAP, &atype, &aformat,
-                                   &nitems, &bytes_after, &prop);
-  if (result == Success)
-    {
-      if (atype == XA_PIXMAP)
-        pixmap = *(Pixmap *)prop;
-      XFree (prop);
-    }
-
-  return pixmap;
-}
-
 #ifdef HAVE_BG_PIXMAP
 
 void