--- rxvt-unicode/src/background.C 2008/01/07 12:41:31 1.24 +++ rxvt-unicode/src/background.C 2010/08/31 15:14:06 1.50 @@ -3,7 +3,7 @@ *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * 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 @@ -29,17 +29,21 @@ #if DO_TIMING_TEST # include #define TIMING_TEST_START(id) \ - struct timeval timing_test_##id##_stv;\ + struct timeval timing_test_##id##_stv; \ gettimeofday (&timing_test_##id##_stv, NULL); #define TIMING_TEST_PRINT_RESULT(id) \ - do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ - fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ - tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) + do { \ + struct timeval tv; \ + gettimeofday (&tv, NULL); \ + tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \ + fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \ + tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \ + } while (0) #else -#define TIMING_TEST_START(id) do{}while (0) -#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) +#define TIMING_TEST_START(id) do {} while (0) +#define TIMING_TEST_PRINT_RESULT(id) do {} while (0) #endif /* @@ -48,7 +52,7 @@ * adjustment and may optionally be followed by a colon and one or more * colon-delimited pixmap operations. * The following table shows the valid geometry strings and their - * affects on the background image : + * effects on the background image : * * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. * W and H are percentages of the terminal window size. @@ -89,16 +93,20 @@ #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 #ifdef BG_IMAGE_FROM_FILE + have_image = false; h_scale = v_scale = 0; h_align = v_align = 0; #endif flags = 0; pixmap = None; valid_since = invalid_since = 0; + target = 0; } void @@ -122,9 +130,7 @@ # endif # ifdef BG_IMAGE_FROM_FILE -# ifdef HAVE_AFTERIMAGE - if (original_asim != NULL) -# endif + if (have_image) { if (h_scale != 0 || v_scale != 0 || h_align != 0 || v_align != 0) @@ -135,8 +141,8 @@ return false; } -bool -bgPixmap_t::window_position_sensitive () +bool +bgPixmap_t::window_position_sensitive () { # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) @@ -144,9 +150,7 @@ # endif # ifdef BG_IMAGE_FROM_FILE -# ifdef HAVE_AFTERIMAGE - if (original_asim != NULL) -# endif + if (have_image) { if (h_align == rootAlign || v_align == rootAlign) return true; @@ -159,7 +163,7 @@ bool bgPixmap_t::need_client_side_rendering () { # ifdef HAVE_AFTERIMAGE - if (original_asim != NULL) + if (original_asim) return true; # endif # ifdef ENABLE_TRANSPARENCY @@ -258,7 +262,7 @@ unsigned int w = 0, h = 0; unsigned int n; unsigned long new_flags = (flags & (~geometryFlags)); - char *p; + const char *p; # define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ if (geom == NULL) @@ -369,13 +373,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) { @@ -384,53 +389,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) @@ -438,22 +439,62 @@ flags = new_flags; changed++; } -//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", -// flags, h_scale, v_scale, h_align, v_align); + + //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", + // flags, h_scale, v_scale, h_align, v_align); return (changed > 0); } # ifdef HAVE_AFTERIMAGE bool -bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) +bgPixmap_t::render_image (unsigned long background_flags) { 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 *background = NULL; + ARGB32 background_tint = TINT_LEAVE_SAME; + +# ifdef ENABLE_TRANSPARENCY + if (background_flags) + background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); + + if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) + { + ShadingInfo as_shade; + as_shade.shading = (shade == 0) ? 100 : shade; + + rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); + if (flags & tintSet) + tint.get (c); + as_shade.tintColor.red = c.r; + as_shade.tintColor.green = c.g; + as_shade.tintColor.blue = c.b; + + background_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, + (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, + 100, ASIMAGE_QUALITY_DEFAULT); + if (tmp) + { + destroy_asimage (&background); + background = tmp; + } + } +# endif + + 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; @@ -466,17 +507,19 @@ { if (h_align == rootAlign || v_align == rootAlign) { - target->get_window_origin(x, y); + target->get_window_origin (x, y); 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) @@ -487,9 +530,10 @@ 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, + ASImage *tmp = tile_asimage (target->asv, background, 0, 0, target_width, target_height, background_tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); if (tmp) @@ -502,6 +546,7 @@ else { result = original_asim; + if ((w > 0 && w != original_asim->width) || (h > 0 && h != original_asim->height)) { @@ -511,6 +556,7 @@ background ? ASA_ASImage : ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); } + if (background == NULL) { /* if tiling - pixmap has to be sized exactly as the image, @@ -523,16 +569,17 @@ 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; } } @@ -541,13 +588,13 @@ { /* if blending background and image - pixmap has to be sized same as target window */ ASImageLayer *layers = create_image_layers (2); - ASImage *merged_im = NULL; layers[0].im = background; layers[0].clip_width = target_width; layers[0].clip_height = target_height; layers[0].tint = background_tint; layers[1].im = result; + if (w <= 0) { /* tile horizontally */ @@ -561,6 +608,7 @@ layers[1].dst_x = x; layers[1].clip_width = result->width; } + if (h <= 0) { while (y > 0) y -= (int)result->height; @@ -572,20 +620,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); } } @@ -616,7 +669,7 @@ pmap_height = new_pmap_height; pmap_depth = target->depth; } - /* fill with background color ( if result's not completely overlapping it)*/ + /* fill with background color (if result's not completely overlapping it) */ gcv.foreground = target->pix_colors[Color_bg]; gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); @@ -624,17 +677,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,6 +697,9 @@ TIMING_TEST_PRINT_RESULT (asim); } + if (background) + destroy_asimage (&background); + return true; } # endif /* HAVE_AFTERIMAGE */ @@ -655,29 +707,29 @@ 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) - 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 (const char *p = strchr (file, ';')) { - size_t len = f - file; - f = (char *)malloc (len + 1); + size_t len = p - file; + char *f = rxvt_temp_buf (len + 1); memcpy (f, file, len); f[len] = '\0'; - original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); - free (f); + file = f; } - return (original_asim != NULL); + +# ifdef HAVE_AFTERIMAGE + if (!target->asimman) + target->asimman = create_generic_imageman (target->rs[Rs_path]); + original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); + if (original_asim) + have_image = true; + return have_image; # endif } + return false; } @@ -692,6 +744,7 @@ flags |= isTransparent; return true; } + return false; } @@ -752,9 +805,9 @@ { if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) - { - flags |= bgPixmap_t::tintNeeded; - } + { + flags |= bgPixmap_t::tintNeeded; + } } if (flags & bgPixmap_t::tintNeeded) @@ -793,8 +846,8 @@ if (new_flags != (flags & tintFlags)) { - flags = (flags&~tintFlags)|new_flags; - return true; + flags = (flags&~tintFlags)|new_flags; + return true; } return false; @@ -834,7 +887,7 @@ if (target == NULL) return 0; - /* root dimentions may change from call to call - but Display structure should + /* root dimensions may change from call to call - but Display structure should * be always up-to-date, so let's use it : */ Window root = target->display->root; @@ -889,7 +942,7 @@ attr.backing_store = Always; attr.event_mask = ExposureMask; attr.override_redirect = True; - src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, + src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, CopyFromParent, CopyFromParent, CopyFromParent, CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, &attr); @@ -923,17 +976,17 @@ //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); } - if (!success) - { - XFreePixmap (dpy, tiled_root_pmap); - tiled_root_pmap = None; - } - else - result |= transpPmapTiled; + if (!success) + { + XFreePixmap (dpy, tiled_root_pmap); + tiled_root_pmap = None; + } + else + result |= transpPmapTiled; } else { - /* strightforward pixmap copy */ + /* straightforward pixmap copy */ gcv.tile = root_pixmap; gcv.fill_style = FillTiled; @@ -1056,7 +1109,7 @@ # endif # endif } - } + } } /* server side rendering completed */ if (pixmap) @@ -1094,7 +1147,7 @@ # endif /* ENABLE_TRANSPARENCY */ # ifndef HAVE_AFTERIMAGE -static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); +static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); # endif bool @@ -1107,7 +1160,7 @@ TIMING_TEST_START (tp); - invalidate(); + invalidate (); # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) { @@ -1116,67 +1169,30 @@ if (background_flags == 0) return false; else if ((background_flags & transpTransformations) == (flags & transpTransformations) - && pmap_depth == target->depth) + && pmap_depth == target->depth) flags = flags & ~isInvalid; } # endif - XImage *result = NULL; -# ifdef HAVE_AFTERIMAGE - if (original_asim +# ifdef BG_IMAGE_FROM_FILE + if (have_image || (background_flags & transpTransformations) != (flags & transpTransformations)) { - 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); - -# ifdef ENABLE_TRANSPARENCY - if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) - { - ShadingInfo as_shade; - as_shade.shading = (shade == 0) ? 100 : shade; - - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (flags & tintSet) - tint.get (c); - as_shade.tintColor.red = c.r; - as_shade.tintColor.green = c.g; - as_shade.tintColor.blue = c.b; - - 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, - (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, - 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - { - destroy_asimage (&background); - background = tmp; - } - } -# endif - - if (render_asim (background, as_tint)) + if (render_image (background_flags)) flags = flags & ~isInvalid; - if (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); } +# endif -# elif !XFT /* our own client-side tinting */ - - /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side. - This may need to be changed in need_client_side_rendering() logic is altered !!! */ + XImage *result = NULL; if (background_flags && (flags & isInvalid)) { result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); + +# if !defined(HAVE_AFTERIMAGE) && !XFT + /* our own client-side tinting */ + /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. + This may need to be changed in need_client_side_rendering() logic is altered !!! */ if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) { rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); @@ -1184,8 +1200,8 @@ tint.get (c); ShadeXImage (target, result, shade, c.r, c.g, c.b); } +# endif } -# endif /* HAVE_AFTERIMAGE */ if (result) { @@ -1227,7 +1243,7 @@ flags = flags & ~isInvalid; } - XDestroyImage (result); + XDestroyImage (result); } if (flags & isInvalid) @@ -1261,6 +1277,7 @@ # endif return true; } + return false; } @@ -1270,6 +1287,7 @@ if (target) { flags &= ~isVtOrigin; + if (pixmap != None) { /* set target's background to pixmap */ @@ -1278,10 +1296,9 @@ { 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 @@ -1291,10 +1308,9 @@ 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 @@ -1303,22 +1319,19 @@ 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) + if (target->scrollBar.state && 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; @@ -1333,7 +1346,7 @@ typedef uint32_t RUINT32T; static void -ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) +ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) { int sh_r, sh_g, sh_b; RUINT32T mask_r, mask_g, mask_b;