*** empty log message ***

diff --git a/src/init.C b/src/init.C
index 6b284e555c342d569d6a12d790daa2ba0ffafbe3..1bd547b0d8dabc48c2cdf898250f6a57f09b35af 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -319,6 +319,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
 #endif
 
 #ifdef HAVE_AFTERIMAGE
+  //TODO: is this neccessary for future versions who check the global var whern the macro doesn'T set it?
   ::dpy = NULL ; /* init global var from libAfter... */
   asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
 #endif

diff --git a/src/rxvt.h b/src/rxvt.h
index 8289e04bb3455bf4fd8c3a63569379f4d921e175..4eb6a80a3eba365fdb41189e5a8503810f8f59cc 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -885,6 +885,10 @@ extern class rxvt_composite_vec rxvt_composite;
 class keyboard_manager;
 #endif
 
+/* to get libAfterImage to work with multiple displays we use that hack :  */
+/* should not need that with libAfterImage  version >= 1.15 */
+#define AFTERIMAGE_DPY_OP(op) ((::dpy = dpy), (op))
+
 struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
 
   // special markers with magic addresses
@@ -1023,9 +1027,6 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   bgPixmap_t      bgPixmap;
 #ifdef HAVE_AFTERIMAGE  
   struct ASVisual  *asv;
-  /* to get libAfterImage to work with multiple displays we use that hack :  */
-  /* should not need that with libAfterImage  version >= 1.15 */
-#define AFTERIMAGE_DPY_OP(_op)  ({::dpy = dpy; _op;})
   ASImageManager *asimman;
   ASImage        *original_asim;
   struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */