--- rxvt-unicode/src/rxvt.h	2012/01/19 13:33:43	1.466
+++ rxvt-unicode/src/rxvt.h	2012/05/13 15:28:44	1.472
@@ -26,8 +26,6 @@
 // stdlib.h might provide it
 #endif
 
-using namespace std;
-
 // we assume that Xlib.h defines XPointer, and it does since at least 1994...
 
 extern "C" {
@@ -74,12 +72,6 @@
 #include <X11/keysymdef.h>
 #include <X11/Xatom.h>
 
-#ifdef HAVE_AFTERIMAGE
-# include <afterimage.h>
-# undef min
-# undef max
-#endif
-
 #ifdef HAVE_PIXBUF
 # include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
@@ -1092,7 +1084,6 @@
   void bg_destroy ();
 
   enum {
-    //subset returned by make_transparency_pixmap
     BG_IS_VALID          = 1 <<  0,
     BG_NEEDS_TINT        = 1 <<  1,
     BG_NEEDS_BLUR        = 1 <<  2,
@@ -1106,7 +1097,6 @@
 
     BG_TINT_SET          = 1 <<  5,
     BG_TINT_BITAND       = 1 <<  6,
-    BG_TINT_FLAGS        = BG_NEEDS_TINT | BG_TINT_BITAND,
 
     BG_HAS_RENDER        = 1 <<  7,
     BG_HAS_RENDER_CONV   = 1 <<  8,
@@ -1122,7 +1112,7 @@
 
 # ifdef BG_IMAGE_FROM_FILE
   void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
-  bool render_image (unsigned long tr_flags);
+  bool render_image (bool transparent);
 
   enum {
     noScale = 0,
@@ -1152,7 +1142,10 @@
   int         shade;
   int         h_blurRadius, v_blurRadius;
 
-  bool bg_set_transparent ();
+  void bg_set_transparent ()
+  {
+    bg_flags |= BG_IS_TRANSPARENT;
+  }
   void bg_set_root_pixmap ();
   void set_tint_shade_flags ();
   bool bg_set_tint (rxvt_color &new_tint);
@@ -1162,7 +1155,7 @@
   bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
   bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
   void tint_ximage (Visual *visual, XImage *ximage);
-  unsigned long make_transparency_pixmap ();
+  bool make_transparency_pixmap ();
 # endif
 
   ev_tstamp bg_valid_since;
@@ -1182,17 +1175,6 @@
     bg_flags &= ~BG_IS_VALID;
   }
 #endif
-#ifdef HAVE_AFTERIMAGE
-  ASImage        *original_asim;
-  ASVisual       *asv;
-  ASImageManager *asimman;
-
-  void init_asv ()
-  {
-    if (!asv)
-      asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
-  }
-#endif
 #ifdef HAVE_PIXBUF
   GdkPixbuf *pixbuf;
   bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
@@ -1283,6 +1265,7 @@
   void pty_cb (ev::io &w, int revents); ev::io pty_ev;
 
 #ifdef CURSOR_BLINK
+  void cursor_blink_reset ();
   void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
 #endif
 #ifdef TEXT_BLINK