--- rxvt-unicode/src/rxvt.h	2012/05/31 20:23:51	1.493
+++ rxvt-unicode/src/rxvt.h	2012/06/06 22:00:20	1.502
@@ -47,6 +47,7 @@
 
 #if defined (ISO_14755) || defined (ENABLE_PERL)
 # define ENABLE_OVERLAY 1
+# undef NO_RESOURCES
 #endif
 
 #if ENABLE_PERL
@@ -72,7 +73,7 @@
 #include <X11/keysymdef.h>
 #include <X11/Xatom.h>
 
-#ifdef HAVE_PIXBUF
+#if HAVE_PIXBUF
 # include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
 
@@ -85,6 +86,7 @@
 #include "rxvtutil.h"
 #include "rxvtfont.h"
 #include "rxvttoolkit.h"
+#include "rxvtimg.h"
 #include "scrollbar.h"
 #include "ev_cpp.h"
 #include "libptytty.h"
@@ -241,7 +243,7 @@
   bool set_blur (const char *geom);
 };
 
-# ifdef BG_IMAGE_FROM_FILE
+# if BG_IMAGE_FROM_FILE
 enum {
   IM_IS_SET            = 1 << 0,
   IM_IS_SIZE_SENSITIVE = 1 << 1,
@@ -274,7 +276,7 @@
             || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
   }
 
-#  ifdef HAVE_PIXBUF
+#  if HAVE_PIXBUF
   GdkPixbuf *pixbuf;
 
   void destroy ()
@@ -352,7 +354,7 @@
 
 /* COLORTERM, TERM environment variables */
 #define COLORTERMENV    "rxvt"
-#ifdef BG_IMAGE_FROM_FILE
+#if BG_IMAGE_FROM_FILE
 # define COLORTERMENVFULL COLORTERMENV "-xpm"
 #else
 # define COLORTERMENVFULL COLORTERMENV
@@ -1193,27 +1195,18 @@
 
     BG_IS_TRANSPARENT    = 1 << 1,
     BG_NEEDS_REFRESH     = 1 << 2,
-
-    BG_HAS_RENDER        = 1 << 3,
-    BG_HAS_RENDER_CONV   = 1 << 4,
   };
 
   uint8_t bg_flags;
 
-# ifdef BG_IMAGE_FROM_FILE
-  vector<rxvt_image> image_vec;
-  rxvt_image *new_image ()
-  {
-    image_vec.resize (image_vec.size () + 1);
-    return &image_vec.back ();
-  }
+# if BG_IMAGE_FROM_FILE
+  rxvt_image fimage;
   void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
   bool render_image (rxvt_image &image);
-  void parse_image (int id, const char *type, const char *arg);
 # endif
 
-# ifdef ENABLE_TRANSPARENCY
-  Pixmap      root_pixmap; /* current root pixmap set */
+# if ENABLE_TRANSPARENCY
+  Pixmap root_pixmap; /* current root pixmap set */
   image_effects root_effects;
 
   void bg_set_transparent ()
@@ -1245,7 +1238,7 @@
     bg_flags &= ~BG_IS_VALID;
   }
 #endif
-#ifdef HAVE_PIXBUF
+#if HAVE_PIXBUF
   bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
                          int src_x, int src_y, int dst_x, int dst_y,
                          unsigned int width, unsigned int height, bool argb);
@@ -1266,6 +1259,8 @@
 
   vector<void *> allocated;           // free these memory blocks with free()
 
+  int            parent_x, parent_y; // parent window position relative to root, only updated on demand
+
   char           *locale;
   char            charsets[4];
   char           *v_buffer;           /* pointer to physical buffer */
@@ -1298,7 +1293,7 @@
   unicode_t iso14755buf;
   void commit_iso14755 ();
 # if ISO_14755
-  void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
+  void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
   void iso14755_54 (int x, int y);
 # endif
 #endif
@@ -1469,7 +1464,6 @@
   void alias_color (int dst, int src);
   void set_widthheight (unsigned int newwidth, unsigned int newheight);
   void get_window_origin (int &x, int &y);
-  Pixmap get_pixmap_property (Atom property);
 
   // screen.C
 
@@ -1588,6 +1582,7 @@
   void selection_rotate (int x, int y) NOTHROW;
 
   // xdefaults.C
+  void rxvt_usage (int type);
   const char **get_options (int argc, const char *const *argv);
   int parse_keysym (const char *str, const char *arg);
   const char *x_resource (const char *name);