--- rxvt-unicode/src/background.C 2012/01/19 13:33:43 1.200 +++ rxvt-unicode/src/background.C 2012/05/11 08:16:58 1.208 @@ -60,15 +60,6 @@ void rxvt_term::bg_destroy () { -#ifdef HAVE_AFTERIMAGE - if (original_asim) - safe_asimage_destroy (original_asim); - if (asv) - destroy_asvisual (asv, 0); - if (asimman) - destroy_image_manager (asimman, 0); -#endif - #ifdef HAVE_PIXBUF if (pixbuf) g_object_unref (pixbuf); @@ -134,16 +125,12 @@ static inline int make_align_position (int align, int window_size, int image_size) { - int diff = window_size - image_size; - int smaller = min (image_size, window_size); - if (align >= 0 && align <= 100) - return diff * align / 100; - else if (align > 100 && align <= 200) - return (align - 100) * smaller / 100 + window_size - smaller; - else if (align >= -100 && align < 0) - return (align + 100) * smaller / 100 - image_size; - return 0; + return lerp (0, window_size - image_size, align); + else if (align > 100) + return lerp (window_size - image_size, window_size, align - 100); + else + return lerp (-image_size, 0, align + 100); } static inline int @@ -345,249 +332,14 @@ y = make_align_position (v_align, target_height, h); } - bg_flags &= ~BG_IS_SIZE_SENSITIVE; if (!(bg_flags & BG_TILE) || h_scale || v_scale || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) - || w > target_width || h > target_height) + || image_width > target_width || image_height > target_height) bg_flags |= BG_IS_SIZE_SENSITIVE; -} - -# ifdef HAVE_AFTERIMAGE -bool -rxvt_term::render_image (unsigned long tr_flags) -{ - init_asv (); - - ASImage *background = NULL; - ARGB32 background_tint = TINT_LEAVE_SAME; - -# ifdef ENABLE_TRANSPARENCY - if (tr_flags) - background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100); - - if (tr_flags & BG_NEEDS_TINT) - { - ShadingInfo as_shade; - as_shade.shading = shade; - - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (bg_flags & BG_TINT_SET) - 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 ((tr_flags & BG_NEEDS_BLUR) && background != NULL) - { - ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, - ASA_XImage, - 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - { - destroy_asimage (&background); - background = tmp; - } - } -# endif - - ASImage *result = 0; - - int target_width = szHint.width; - int target_height = szHint.height; - int new_pmap_width = target_width; - int new_pmap_height = target_height; - - int x = 0; - int y = 0; - int w = 0; - int h = 0; - - if (original_asim) - get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); - - if (!original_asim - || (!(bg_flags & BG_ROOT_ALIGN) - && (x >= target_width - || y >= target_height - || x + w <= 0 - || y + h <= 0))) - { - if (background) - { - new_pmap_width = background->width; - new_pmap_height = background->height; - result = background; - - if (background_tint != TINT_LEAVE_SAME) - { - ASImage *tmp = tile_asimage (asv, background, 0, 0, - target_width, target_height, background_tint, - ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); - if (tmp) - result = tmp; - } - } - else - new_pmap_width = new_pmap_height = 0; - } else - { - result = original_asim; - - if (w != original_asim->width - || h != original_asim->height) - { - result = scale_asimage (asv, original_asim, - w, h, - ASA_XImage, - 100, ASIMAGE_QUALITY_DEFAULT); - } - - if (background == NULL) - { - if (bg_flags & BG_TILE) - { - /* if tiling - pixmap has to be sized exactly as the image, - but there is no need to make it bigger than the window! */ - new_pmap_width = min (result->width, target_width); - new_pmap_height = min (result->height, target_height); - - /* we also need to tile our image in both directions */ - ASImage *tmp = tile_asimage (asv, result, - (int)result->width - x, - (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 */ - ASImageLayer *layers = create_image_layers (2); - - 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 (bg_flags & BG_TILE) - { - /* 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 */ - layers[1].dst_x = x; - layers[1].clip_width = result->width; - } - - if (bg_flags & BG_TILE) - { - while (y > 0) y -= (int)result->height; - layers[1].dst_y = y; - layers[1].clip_height = result->height + target_height; - } - else - { - layers[1].dst_y = y; - layers[1].clip_height = result->height; - } - - if (rs[Rs_blendtype]) - { - layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]); - if (layers[1].merge_scanlines == NULL) - layers[1].merge_scanlines = alphablend_scanlines; - } - - ASImage *tmp = merge_layers (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); - } - } - - bool ret = false; - - if (result) - { - XGCValues gcv; - GC gc; - - /* create Pixmap */ - if (bg_pixmap == None - || bg_pmap_width != new_pmap_width - || bg_pmap_height != new_pmap_height) - { - if (bg_pixmap) - XFreePixmap (dpy, bg_pixmap); - bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); - bg_pmap_width = new_pmap_width; - bg_pmap_height = new_pmap_height; - } - /* fill with background color (if result's not completely overlapping it) */ - gcv.foreground = pix_colors[Color_bg]; - gc = XCreateGC (dpy, vt, GCForeground, &gcv); - - int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; - int dst_width = result->width, dst_height = result->height; - if (background == NULL) - { - if (!(bg_flags & BG_TILE)) - { - src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); - 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 (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); - } - - /* put result on pixmap */ - if (dst_x < new_pmap_width && dst_y < new_pmap_height) - asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); - - if (result != background && result != original_asim) - destroy_asimage (&result); - - XFreeGC (dpy, gc); - - ret = true; - } - - if (background) - destroy_asimage (&background); - - return ret; + bg_flags &= ~BG_IS_SIZE_SENSITIVE; } -# endif /* HAVE_AFTERIMAGE */ # ifdef HAVE_PIXBUF bool @@ -598,8 +350,9 @@ XImage *ximage; char *data, *line; int bytes_per_pixel; - int width_r, width_g, width_b; - int sh_r, sh_g, sh_b; + int width_r, width_g, width_b, width_a; + int sh_r, sh_g, sh_b, sh_a; + uint32_t alpha_mask; int rowstride; int channels; unsigned char *row; @@ -607,6 +360,14 @@ if (visual->c_class != TrueColor) return false; +#if XRENDER + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); + if (format) + alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha; + else +#endif + alpha_mask = 0; + if (depth == 24 || depth == 32) bytes_per_pixel = 4; else if (depth == 15 || depth == 16) @@ -617,13 +378,15 @@ width_r = ecb_popcount32 (visual->red_mask); width_g = ecb_popcount32 (visual->green_mask); width_b = ecb_popcount32 (visual->blue_mask); + width_a = ecb_popcount32 (alpha_mask); - if (width_r > 8 || width_g > 8 || width_b > 8) + if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8) return false; sh_r = ecb_ctz32 (visual->red_mask); sh_g = ecb_ctz32 (visual->green_mask); sh_b = ecb_ctz32 (visual->blue_mask); + sh_a = ecb_ctz32 (alpha_mask); if (width > INT_MAX / height / bytes_per_pixel) return false; @@ -647,16 +410,43 @@ row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; line = data; + rgba c (0, 0, 0); + + if (channels == 4 && alpha_mask == 0) + { + pix_colors[Color_bg].get (c); + c.r >>= 8; + c.g >>= 8; + c.b >>= 8; + } + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { unsigned char *pixel = row + x * channels; uint32_t value; + unsigned char r, g, b, a; + + if (channels == 4) + { + a = pixel[3]; + r = (pixel[0] * a + c.r * (0xff - a)) / 0xff; + g = (pixel[1] * a + c.g * (0xff - a)) / 0xff; + b = (pixel[2] * a + c.b * (0xff - a)) / 0xff; + } + else + { + a = 0xff; + r = pixel[0]; + g = pixel[1]; + b = pixel[2]; + } - value = ((pixel[0] >> (8 - width_r)) << sh_r) - | ((pixel[1] >> (8 - width_g)) << sh_g) - | ((pixel[2] >> (8 - width_b)) << sh_b); + value = ((r >> (8 - width_r)) << sh_r) + | ((g >> (8 - width_g)) << sh_g) + | ((b >> (8 - width_b)) << sh_b) + | ((a >> (8 - width_a)) << sh_a); if (bytes_per_pixel == 4) ((uint32_t *)line)[x] = value; @@ -674,12 +464,12 @@ } bool -rxvt_term::render_image (unsigned long tr_flags) +rxvt_term::render_image (bool transparent) { if (!pixbuf) return false; - if (tr_flags + if (transparent && !(bg_flags & BG_HAS_RENDER)) return false; @@ -729,7 +519,7 @@ image_width = gdk_pixbuf_get_width (result); image_height = gdk_pixbuf_get_height (result); - if (tr_flags) + if (transparent) { root_pmap = bg_pixmap; bg_pixmap = None; @@ -797,7 +587,7 @@ } #if XRENDER - if (tr_flags) + if (transparent) { XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); @@ -831,7 +621,7 @@ if (result != pixbuf) g_object_unref (result); - if (tr_flags) + if (transparent) XFreePixmap (dpy, root_pmap); return ret; @@ -856,20 +646,6 @@ file = f; } -# ifdef HAVE_AFTERIMAGE - if (!asimman) - asimman = create_generic_imageman (rs[Rs_path]); - ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100); - if (image) - { - if (original_asim) - safe_asimage_destroy (original_asim); - original_asim = image; - bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; - ret = true; - } -# endif - # ifdef HAVE_PIXBUF GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); if (image) @@ -936,10 +712,10 @@ v_blurRadius = vr; } - if (h_blurRadius == 0 || v_blurRadius == 0) - bg_flags &= ~BG_NEEDS_BLUR; - else + if (h_blurRadius && v_blurRadius) bg_flags |= BG_NEEDS_BLUR; + else + bg_flags &= ~BG_NEEDS_BLUR; return changed; } @@ -947,23 +723,10 @@ void rxvt_term::set_tint_shade_flags () { - rgba c; - bool has_shade = shade != 100; - - bg_flags &= ~BG_TINT_FLAGS; - - if (bg_flags & BG_TINT_SET) - { - tint.get (c); - if (!has_shade - && (c.r <= 0x00ff || c.r >= 0xff00) - && (c.g <= 0x00ff || c.g >= 0xff00) - && (c.b <= 0x00ff || c.b >= 0xff00)) - bg_flags |= BG_TINT_BITAND; - } - - if (has_shade || (bg_flags & BG_TINT_SET)) + if (shade != 100 || (bg_flags & BG_TINT_SET)) bg_flags |= BG_NEEDS_TINT; + else + bg_flags &= ~BG_NEEDS_TINT; } bool @@ -973,6 +736,16 @@ { tint = new_tint; bg_flags |= BG_TINT_SET; + + rgba c; + tint.get (c); + if ((c.r <= 0x00ff || c.r >= 0xff00) + && (c.g <= 0x00ff || c.g >= 0xff00) + && (c.b <= 0x00ff || c.b >= 0xff00)) + bg_flags |= BG_TINT_BITAND; + else + bg_flags &= ~BG_TINT_BITAND; + set_tint_shade_flags (); return true; } @@ -1092,7 +865,7 @@ { bool ret = false; - if (bg_flags & BG_TINT_BITAND) + if (shade == 100 && (bg_flags & BG_TINT_BITAND)) { XGCValues gcv; GC gc; @@ -1183,10 +956,10 @@ * the tiled portion of the root pixmap that is supposed to be covered by * our window. */ -unsigned long +bool rxvt_term::make_transparency_pixmap () { - unsigned long result = 0; + bool ret = false; /* root dimensions may change from call to call - but Display structure should * be always up-to-date, so let's use it : @@ -1277,22 +1050,22 @@ if (gc) { XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); - result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); + ret = true; + unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS; if (!(bg_flags & BG_CLIENT_RENDER)) { if (bg_flags & BG_NEEDS_BLUR) { if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth)) - result &= ~BG_NEEDS_BLUR; + tr_flags &= ~BG_NEEDS_BLUR; } if (bg_flags & BG_NEEDS_TINT) { if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) - result &= ~BG_NEEDS_TINT; + tr_flags &= ~BG_NEEDS_TINT; } -# ifndef HAVE_AFTERIMAGE - if (result & BG_NEEDS_TINT) + if (tr_flags & BG_NEEDS_TINT) { XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); if (ximage) @@ -1304,7 +1077,6 @@ XDestroyImage (ximage); } } -# endif } /* server side rendering completed */ XFreeGC (dpy, gc); @@ -1313,7 +1085,7 @@ if (recoded_root_pmap != root_pixmap) XFreePixmap (dpy, recoded_root_pmap); - return result; + return ret; } void @@ -1330,24 +1102,23 @@ bool rxvt_term::bg_render () { - unsigned long tr_flags = 0; + bool transparent = false; bg_invalidate (); # ifdef ENABLE_TRANSPARENCY if (bg_flags & BG_IS_TRANSPARENT) { /* we need to re-generate transparency pixmap in that case ! */ - tr_flags = make_transparency_pixmap (); - if (tr_flags) + transparent = make_transparency_pixmap (); + if (transparent) bg_flags |= BG_IS_VALID; } # endif # ifdef BG_IMAGE_FROM_FILE - if ((bg_flags & BG_IS_FROM_FILE) - || (tr_flags & BG_EFFECTS_FLAGS)) + if (bg_flags & BG_IS_FROM_FILE) { - if (render_image (tr_flags)) + if (render_image (transparent)) bg_flags |= BG_IS_VALID; } # endif @@ -1395,7 +1166,7 @@ #endif /* HAVE_BG_PIXMAP */ -#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) +#ifdef ENABLE_TRANSPARENCY /* based on code from aterm-0.4.2 */ static inline void @@ -1518,22 +1289,20 @@ && (ximage->depth == 24 || ximage->depth == 32) && ximage->byte_order == host_byte_order) { - uint32_t *p1, *pf, *p, *pl; - p1 = (uint32_t *) ximage->data; - pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line); + char *line = ximage->data; - while (p1 < pf) + for (int y = 0; y < ximage->height; y++) { - p = p1; - pl = p1 + ximage->width; - for (; p < pl; p++) + uint32_t *p = (uint32_t *)line; + for (int x = 0; x < ximage->width; x++) { *p = lookup_r[(*p & 0xff0000) >> 16] | lookup_g[(*p & 0x00ff00) >> 8] | lookup_b[(*p & 0x0000ff)] | (*p & 0xff000000); + p++; } - p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); + line += ximage->bytes_per_line; } } else @@ -1551,4 +1320,4 @@ free (lookup); } -#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ +#endif /* ENABLE_TRANSPARENCY */