From 8c6ed56af24d39df1a9082ae2f973b91503a2ddc Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Jul 2007 14:38:59 +0000 Subject: [PATCH] *** empty log message *** --- src/init.C | 1 + src/rxvt.h | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/init.C b/src/init.C index 6b284e55..1bd547b0 100644 --- 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 8289e04b..4eb6a80a 100644 --- 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 */ -- 2.34.1