--- rxvt-unicode/src/background.C 2007/11/19 15:33:34 1.14 +++ rxvt-unicode/src/background.C 2008/11/04 13:20:40 1.31 @@ -3,10 +3,7 @@ *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 1997 Carsten Haitzler - * Copyright (c) 1997,1998 Oezguer Kesim - * Copyright (c) 1998-2001 Geoff Wing - * Copyright (c) 2005-2006 Marc Lehmann + * Copyright (c) 2005-2008 Marc Lehmann * Copyright (c) 2007 Sasha Vasko * * This program is free software; you can redistribute it and/or modify @@ -30,6 +27,7 @@ #define DO_TIMING_TEST 0 #if DO_TIMING_TEST +# include #define TIMING_TEST_START(id) \ struct timeval timing_test_##id##_stv;\ gettimeofday (&timing_test_##id##_stv, NULL); @@ -91,6 +89,8 @@ #ifdef HAVE_BG_PIXMAP bgPixmap_t::bgPixmap_t () { + // this is basically redundant as bgPixmap_t is only used in + // zero_initialised-derived structs #ifdef HAVE_AFTERIMAGE original_asim = NULL; #endif @@ -100,6 +100,8 @@ #endif flags = 0; pixmap = None; + valid_since = invalid_since = 0; + target = 0; } void @@ -124,7 +126,7 @@ # ifdef BG_IMAGE_FROM_FILE # ifdef HAVE_AFTERIMAGE - if (original_asim != NULL) + if (original_asim) # endif { if (h_scale != 0 || v_scale != 0 @@ -146,7 +148,7 @@ # ifdef BG_IMAGE_FROM_FILE # ifdef HAVE_AFTERIMAGE - if (original_asim != NULL) + if (original_asim) # endif { if (h_align == rootAlign || v_align == rootAlign) @@ -160,7 +162,7 @@ bool bgPixmap_t::need_client_side_rendering () { # ifdef HAVE_AFTERIMAGE - if (original_asim != NULL) + if (original_asim) return true; # endif # ifdef ENABLE_TRANSPARENCY @@ -260,7 +262,7 @@ unsigned int n; unsigned long new_flags = (flags & (~geometryFlags)); char *p; -# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ +# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ if (geom == NULL) return false; @@ -277,7 +279,7 @@ char *ops; new_flags |= geometrySet; - strncpy (str, geom, n); + memcpy (str, geom, n); str[n] = '\0'; if (str[0] == ':') ops = &str[0]; @@ -307,7 +309,8 @@ } if (flags & geometrySet) - {/* new geometry is an adjustment to the old one ! */ + { + /* new geometry is an adjustment to the old one ! */ if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) { if (w == 0 && h != 0) @@ -333,14 +336,16 @@ else /* setting up geometry from scratch */ { if (!(geom_flags & XValue)) - {/* use default geometry - centered */ + { + /* use default geometry - centered */ x = y = defaultAlign; } else if (!(geom_flags & YValue)) y = x; if ((geom_flags & (WidthValue|HeightValue)) == 0) - {/* use default geometry - scaled */ + { + /* use default geometry - scaled */ w = h = defaultScale; } else if (geom_flags & WidthValue) @@ -353,7 +358,8 @@ } } /* done parsing geometry string */ else if (!(flags & geometrySet)) - { /* default geometry - scaled and centered */ + { + /* default geometry - scaled and centered */ x = y = defaultAlign; w = h = defaultScale; } @@ -366,13 +372,14 @@ while (*ops) { while (*ops == ':' || isspace(*ops)) ++ops; -# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) - if (CHECK_GEOM_OPS("tile")) + +# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) + if (CHECK_GEOM_OPS ("tile")) { w = h = noScale; geom_flags |= WidthValue|HeightValue; } - else if (CHECK_GEOM_OPS("propscale")) + else if (CHECK_GEOM_OPS ("propscale")) { if (w == 0 && h == 0) { @@ -381,53 +388,49 @@ } new_flags |= propScale; } - else if (CHECK_GEOM_OPS("hscale")) + else if (CHECK_GEOM_OPS ("hscale")) { - if (w == 0) - w = windowScale; + if (w == 0) w = windowScale; + h = noScale; geom_flags |= WidthValue|HeightValue; } - else if (CHECK_GEOM_OPS("vscale")) + else if (CHECK_GEOM_OPS ("vscale")) { - if (h == 0) - h = windowScale; + if (h == 0) h = windowScale; + w = noScale; geom_flags |= WidthValue|HeightValue; } - else if (CHECK_GEOM_OPS("scale")) + else if (CHECK_GEOM_OPS ("scale")) { - if (h == 0) - h = windowScale; - if (w == 0) - w = windowScale; + if (h == 0) h = windowScale; + if (w == 0) w = windowScale; + geom_flags |= WidthValue|HeightValue; } - else if (CHECK_GEOM_OPS("auto")) + else if (CHECK_GEOM_OPS ("auto")) { w = h = windowScale; x = y = centerAlign; geom_flags |= WidthValue|HeightValue|XValue|YValue; } - else if (CHECK_GEOM_OPS("root")) + else if (CHECK_GEOM_OPS ("root")) { w = h = noScale; x = y = rootAlign; geom_flags |= WidthValue|HeightValue|XValue|YValue; } # undef CHECK_GEOM_OPS + while (*ops != ':' && *ops != '\0') ++ops; } /* done parsing ops */ } - if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) - ++changed; - if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) - ++changed; - if (check_set_align_value (geom_flags, XValue, h_align, x)) - ++changed; - if (check_set_align_value (geom_flags, YValue, v_align, y)) - ++changed; + if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; + if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; + if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; + if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; } if (new_flags != flags) @@ -435,7 +438,8 @@ flags = new_flags; changed++; } -//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", + +//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", // flags, h_scale, v_scale, h_align, v_align); return (changed > 0); } @@ -447,10 +451,14 @@ if (target == NULL) return false; - int target_width = (int)target->szHint.width; - int target_height = (int)target->szHint.height; - int new_pmap_width = target_width, new_pmap_height = target_height; - ASImage *result = NULL; + target->init_asv (); + + ASImage *result = 0; + + int target_width = target->szHint.width; + int target_height = target->szHint.height; + int new_pmap_width = target_width; + int new_pmap_height = target_height; int x = 0; int y = 0; @@ -467,13 +475,15 @@ x = -x; y = -y; } + if (h_align != rootAlign) x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); + if (v_align != rootAlign) y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); } - if (original_asim == NULL + if (!original_asim || x >= target_width || y >= target_height || (w > 0 && x + w <= 0) @@ -484,6 +494,7 @@ new_pmap_width = background->width; new_pmap_height = background->height; result = background; + if (background_tint != TINT_LEAVE_SAME) { ASImage* tmp = tile_asimage (target->asv, background, 0, 0, @@ -499,6 +510,7 @@ else { result = original_asim; + if ((w > 0 && w != original_asim->width) || (h > 0 && h != original_asim->height)) { @@ -508,9 +520,11 @@ background ? ASA_ASImage : ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); } + if (background == NULL) - {/* if tiling - pixmap has to be sized exactly as the image, - but there is no need to make it bigger then the window! */ + { + /* if tiling - pixmap has to be sized exactly as the image, + but there is no need to make it bigger than the window! */ if (h_scale == 0) new_pmap_width = min (result->width, target_width); if (v_scale == 0) @@ -519,22 +533,24 @@ if (h_scale == 0 || v_scale == 0) { ASImage *tmp = tile_asimage (target->asv, result, - (h_scale > 0) ? 0 : (int)result->width - x, - (v_scale > 0) ? 0 : (int)result->height - y, - new_pmap_width, - new_pmap_height, - TINT_LEAVE_SAME, ASA_XImage, - 100, ASIMAGE_QUALITY_DEFAULT); + (h_scale > 0) ? 0 : (int)result->width - x, + (v_scale > 0) ? 0 : (int)result->height - y, + new_pmap_width, + new_pmap_height, + TINT_LEAVE_SAME, ASA_XImage, + 100, ASIMAGE_QUALITY_DEFAULT); if (tmp) { if (result != original_asim) destroy_asimage (&result); + result = tmp; } } } else - {/* if blending background and image - pixmap has to be sized same as target window */ + { + /* if blending background and image - pixmap has to be sized same as target window */ ASImageLayer *layers = create_image_layers (2); ASImage *merged_im = NULL; @@ -543,17 +559,21 @@ layers[0].clip_height = target_height; layers[0].tint = background_tint; layers[1].im = result; + if (w <= 0) - {/* tile horizontally */ + { + /* tile horizontally */ while (x > 0) x -= (int)result->width; layers[1].dst_x = x; layers[1].clip_width = result->width+target_width; } else - {/* clip horizontally */ + { + /* clip horizontally */ layers[1].dst_x = x; layers[1].clip_width = result->width; } + if (h <= 0) { while (y > 0) y -= (int)result->height; @@ -565,20 +585,25 @@ layers[1].dst_y = y; layers[1].clip_height = result->height; } + if (target->rs[Rs_blendtype]) { layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); if (layers[1].merge_scanlines == NULL) layers[1].merge_scanlines = alphablend_scanlines; } + ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); + if (tmp) { if (result != original_asim) destroy_asimage (&result); + result = tmp; } + free (layers); } } @@ -617,17 +642,13 @@ int dst_width = result->width, dst_height = result->height; if (background == NULL) { - if (h_scale > 0) - src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); - if (v_scale > 0) - src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); + if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); + if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); if (dst_x > 0 || dst_y > 0 || dst_x + dst_width < new_pmap_width || dst_y + dst_height < new_pmap_height) - { - XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); - } + XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); } /* put result on pixmap */ @@ -648,29 +669,30 @@ bool bgPixmap_t::set_file (const char *file) { - char *f; + assert (file); - assert (file != NULL); - - if (*file != '\0') + if (*file) { # ifdef HAVE_AFTERIMAGE - if (target->asimman == NULL) + if (!target->asimman) target->asimman = create_generic_imageman (target->rs[Rs_path]); - if ((f = strchr (file, ';')) == NULL) - original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); - else + + if (char *f = strchr (file, ';')) { size_t len = f - file; f = (char *)malloc (len + 1); - strncpy (f, file, len); + memcpy (f, file, len); f[len] = '\0'; original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); free (f); } - return (original_asim != NULL); + else + original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); + + return original_asim; # endif } + return false; } @@ -685,6 +707,7 @@ flags |= isTransparent; return true; } + return false; } @@ -775,6 +798,7 @@ flags = (flags & ~tintFlags) | new_flags | tintSet; return true; } + return false; } @@ -788,6 +812,7 @@ flags = (flags&~tintFlags)|new_flags; return true; } + return false; } @@ -797,7 +822,7 @@ int new_shade = (shade_str) ? atoi (shade_str) : 0; if (new_shade < 0 && new_shade > -100) - new_shade = 200 - (100 + new_shade); + new_shade = 200 - (100 + new_shade); else if (new_shade == 100) new_shade = 0; @@ -808,6 +833,7 @@ flags = (flags & (~tintFlags | tintSet)) | new_flags; return true; } + return false; } @@ -847,7 +873,8 @@ return 0; if (root_pixmap != None) - {/* we want to validate the pixmap and get it's size at the same time : */ + { + /* we want to validate the pixmap and get it's size at the same time : */ int junk; unsigned int ujunk; /* root pixmap may be bad - allow a error */ @@ -866,7 +893,8 @@ return 0; if (root_pixmap == None) - { /* use tricks to obtain the root background image :*/ + { + /* use tricks to obtain the root background image :*/ /* we want to create Overrideredirect window overlapping out window with background type of Parent Relative and then grab it */ XSetWindowAttributes attr; @@ -891,12 +919,13 @@ XSync (dpy, False); /* XSync should get window where it's properly exposed, - * but to be on the safe side - let's check for the actuall event to arrive : */ + * but to be on the safe side - let's check for the actual event to arrive : */ while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) ++ev_count; if (ev_count > 0); - { /* hooray! - we can grab the image! */ + { + /* hooray! - we can grab the image! */ gc = XCreateGC (dpy, root, 0, NULL); if (gc) { @@ -904,6 +933,7 @@ success = true; } } + XDestroyWindow (dpy, src); XUngrabServer (dpy); //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); @@ -918,7 +948,8 @@ result |= transpPmapTiled; } else - {/* strightforward pixmap copy */ + { + /* strightforward pixmap copy */ gcv.tile = root_pixmap; gcv.fill_style = FillTiled; @@ -976,7 +1007,7 @@ c.g = (c.g * shade) / 100; c.b = (c.b * shade) / 100; } - else if( shade > 100 && shade < 200) + else if (shade > 100 && shade < 200) { c.r = (c.r * (200 - shade)) / 100; c.g = (c.g * (200 - shade)) / 100; @@ -1032,6 +1063,7 @@ XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); result |= transpPmapTinted; } + XRenderFreePicture (dpy, mask_pic); XRenderFreePicture (dpy, overlay_pic); XRenderFreePicture (dpy, back_pic); @@ -1063,9 +1095,7 @@ bool bgPixmap_t::set_root_pixmap () { - Pixmap new_root_pixmap = None; - - new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); + Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); if (new_root_pixmap == None) new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); @@ -1074,6 +1104,7 @@ root_pixmap = new_root_pixmap; return true; } + return false; } # endif /* ENABLE_TRANSPARENCY */ @@ -1082,7 +1113,6 @@ static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); # endif - bool bgPixmap_t::render () { @@ -1091,9 +1121,11 @@ if (target == NULL) return false; + target->init_asv (); + TIMING_TEST_START (tp); - invalidate(); + invalidate (); # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) { @@ -1115,7 +1147,7 @@ ASImage *background = NULL; ARGB32 as_tint = TINT_LEAVE_SAME; if (background_flags) - background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); + background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); # ifdef ENABLE_TRANSPARENCY if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) @@ -1132,6 +1164,7 @@ as_tint = shading2tint32 (&as_shade); } + if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) { ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, @@ -1148,12 +1181,10 @@ if (render_asim (background, as_tint)) flags = flags & ~isInvalid; if (background) - destroy_asimage (&background); + destroy_asimage (&background); } else if (background_flags && pmap_depth != target->depth) - { - result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); - } + result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); # elif !XFT /* our own client-side tinting */ @@ -1163,6 +1194,7 @@ if (background_flags && (flags & isInvalid)) { result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); + if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) { rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); @@ -1173,9 +1205,10 @@ } # endif /* HAVE_AFTERIMAGE */ - if (result != NULL) + if (result) { GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); + if (gc) { if (/*pmap_depth != target->depth &&*/ pixmap != None) @@ -1183,29 +1216,35 @@ XFreePixmap (target->dpy, pixmap); pixmap = None; } + if (pixmap == None) { pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); - pmap_width = result->width; + pmap_width = result->width; pmap_height = result->height; - pmap_depth = target->depth; + pmap_depth = target->depth; } + if (pmap_depth != result->depth) - { /* Bad Match error will ensue ! stupid X !!!! */ - if( result->depth == 24 && pmap_depth == 32) + { + /* Bad Match error will ensue ! stupid X !!!! */ + if (result->depth == 24 && pmap_depth == 32) result->depth = 32; - else if( result->depth == 32 && pmap_depth == 24) + else if (result->depth == 32 && pmap_depth == 24) result->depth = 24; else { /* TODO: implement image recoding */ } } + if (pmap_depth == result->depth) XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); + XFreeGC (target->dpy, gc); flags = flags & ~isInvalid; } + XDestroyImage (result); } @@ -1220,6 +1259,9 @@ apply (); + XSync (target->dpy, False); + valid_since = ev::now (); + TIMING_TEST_PRINT_RESULT (tp); return true; @@ -1237,26 +1279,28 @@ # endif return true; } + return false; } void -bgPixmap_t::apply() +bgPixmap_t::apply () { if (target) { flags &= ~isVtOrigin; + if (pixmap != None) - { /* set target's background to pixmap */ + { + /* set target's background to pixmap */ # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) { XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); -# if HAVE_SCROLLBARS + if (target->scrollBar.win) XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); -# endif } else # endif @@ -1266,33 +1310,30 @@ XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); /* do we also need to set scrollbar's background here ? */ -# if HAVE_SCROLLBARS + if (target->scrollBar.win) - XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); -# endif + XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); } } else - { /* set target background to a pixel */ + { + /* set target background to a pixel */ XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); /* do we also need to set scrollbar's background here ? */ -# if HAVE_SCROLLBARS if (target->scrollBar.win) - XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); -# endif + XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); } + /* don't want Expose on the parent or vt. It is better to use scr_touch or we get a great deal of flicker otherwise: */ XClearWindow (target->dpy, target->parent[0]); -# if HAVE_SCROLLBARS if (target->scrollBar.win) { - target->scrollBar.setIdle (); - target->scrollbar_show (0); + target->scrollBar.state = STATE_IDLE; + target->scrollBar.show (0); } -# endif target->want_refresh = 1; flags |= hasChanged;