--- rxvt-unicode/src/rxvt.h	2012/06/07 09:34:51	1.504
+++ rxvt-unicode/src/rxvt.h	2013/01/13 22:30:47	1.518
@@ -77,10 +77,19 @@
 # include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
 
-#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
+#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
 # define HAVE_BG_PIXMAP 1
 #endif
 
+#if HAVE_BG_PIXMAP
+# if HAVE_PIXBUF
+#  define BG_IMAGE_FROM_FILE 1
+# endif
+# if ENABLE_TRANSPARENCY
+#  define BG_IMAGE_FROM_ROOT 1
+# endif
+#endif
+
 #include <ecb.h>
 #include "encoding.h"
 #include "rxvtutil.h"
@@ -245,7 +254,6 @@
 
 # if BG_IMAGE_FROM_FILE
 enum {
-  IM_IS_SET            = 1 << 0,
   IM_IS_SIZE_SENSITIVE = 1 << 1,
   IM_KEEP_ASPECT       = 1 << 2,
   IM_ROOT_ALIGN        = 1 << 3,
@@ -276,28 +284,17 @@
             || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
   }
 
-#  if HAVE_PIXBUF
-  GdkPixbuf *pixbuf;
+  rxvt_img *img;
 
   void destroy ()
   {
-    if (pixbuf)
-      g_object_unref (pixbuf);
+    delete img;
+    img = 0;
   }
 
-  int width ()
-  {
-    return gdk_pixbuf_get_width (pixbuf);
-  }
-  int height ()
-  {
-    return gdk_pixbuf_get_height (pixbuf);
-  }
-#  endif
-
   rxvt_image ();
-  bool set_file_geometry (const char *file);
-  bool set_file (const char *file);
+  void set_file_geometry (rxvt_screen *s, const char *file);
+  void set_file (rxvt_screen *s, const char *file);
   bool set_geometry (const char *geom, bool update = false);
 };
 # endif
@@ -594,7 +591,7 @@
 #ifdef RXVT_SCROLLBAR
   Color_trough,
 #endif
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT
   Color_tint,
 #endif
 #if OFF_FOCUS_FADING
@@ -1186,63 +1183,43 @@
   XComposeStatus  compose;
   static struct termios def_tio;
   row_col_t       oldcursor;
+
 #ifdef HAVE_BG_PIXMAP
   void bg_init ();
   void bg_destroy ();
 
-  enum {
-    BG_IS_VALID          = 1 << 0,
-
-    BG_IS_TRANSPARENT    = 1 << 1,
-    BG_NEEDS_REFRESH     = 1 << 2,
-    BG_INHIBIT_RENDER    = 1 << 3,
-  };
-
-  uint8_t bg_flags;
-
 # 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 render_image (rxvt_image &image);
 # endif
 
-# if ENABLE_TRANSPARENCY
-  Pixmap root_pixmap; /* current root pixmap set */
+# if BG_IMAGE_FROM_ROOT
+  rxvt_img *root_img;
   image_effects root_effects;
 
-  void bg_set_transparent ()
-  {
-    bg_flags |= BG_IS_TRANSPARENT;
-  }
-  void bg_set_root_pixmap ();
-  bool render_root_image ();
+  void render_root_image ();
 # endif
 
-  bool blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius);
-  bool tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade);
-  void tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade);
+  void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
 
   ev_tstamp bg_valid_since;
 
-  Pixmap bg_pixmap;
-  unsigned int bg_pmap_width, bg_pmap_height;
-
-  int target_x;
-  int target_y;
-  bool bg_set_position (int x, int y);
   bool bg_window_size_sensitive ();
   bool bg_window_position_sensitive ();
 
   void bg_render ();
-  void bg_invalidate ()
-  {
-    bg_flags &= ~BG_IS_VALID;
-  }
 #endif
-#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);
+
+#ifdef HAVE_IMG
+  enum {
+    BG_IS_TRANSPARENT    = 1 << 1,
+    BG_NEEDS_REFRESH     = 1 << 2,
+    BG_INHIBIT_RENDER    = 1 << 3,
+  };
+
+  uint8_t bg_flags;
+
+  rxvt_img *bg_img;
 #endif
 
 #if ENABLE_OVERLAY
@@ -1306,7 +1283,7 @@
     XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
   }
 
-#if ENABLE_TRANSPARENCY || ENABLE_PERL
+#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
   void rootwin_cb (XEvent &xev);
   xevent_watcher rootwin_ev;
 #endif
@@ -1468,6 +1445,13 @@
 
   // screen.C
 
+  bool option (uint8_t opt) const NOTHROW
+  {
+    return options[opt >> 3] & (1 << (opt & 7));
+  }
+
+  void set_option (uint8_t opt, bool set = true) NOTHROW;
+
   int fgcolor_of (rend_t r) const NOTHROW
   {
     int base = GET_BASEFG (r);
@@ -1496,13 +1480,6 @@
     return base;
   }
 
-  bool option (uint8_t opt) const NOTHROW
-  {
-    return options[opt >> 3] & (1 << (opt & 7));
-  }
-
-  void set_option (uint8_t opt, bool set = true) NOTHROW;
-
   // modifies first argument(!)
   void tt_paste (char *data, unsigned int len) NOTHROW;
   void paste (char *data, unsigned int len) NOTHROW;
@@ -1511,6 +1488,7 @@
   void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
   void scr_kill_char (line_t &l, int col) const NOTHROW;
   int scr_scroll_text (int row1, int row2, int count) NOTHROW;
+  void copy_line (line_t &dst, line_t &src);
   void scr_reset ();
   void scr_release () NOTHROW;
   void scr_clear (bool really = false) NOTHROW;
@@ -1589,15 +1567,6 @@
   const char *x_resource (const char *name);
   void extract_resources ();
   void extract_keysym_resources ();
-  void find_resources (const char *n_prefix, const char *c_prefix, int mode,
-                       Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
-  bool parse_bool_resource (const char *str)
-  {
-    return (!strcasecmp (str, "TRUE")
-            || !strcasecmp (str, "YES")
-            || !strcasecmp (str, "ON")
-            || !strcasecmp (str, "1"));
-  }
 };
 
 #endif /* _RXVT_H_ */