--- rxvt-unicode/src/background.C 2007/09/12 21:06:08 1.2 +++ rxvt-unicode/src/background.C 2007/10/31 09:55:23 1.10 @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------* - * File: background.C - former xmp.C + * File: background.C - former xpm.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -33,7 +33,7 @@ #define TIMING_TEST_START(id) \ 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__,\ @@ -132,9 +132,12 @@ # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) { - if (((flags & blurNeeded) && !(flags & blurServerSide)) - || ((flags & tintNeeded) && !(flags & tintServerSide))) - return true; +# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways + if ((flags & blurNeeded) && !(flags & blurServerSide)) + return true; +# endif + if ((flags & tintNeeded) && !(flags & tintServerSide)) + return true; } # endif return false; @@ -317,7 +320,7 @@ x = y = defaultAlign; w = h = defaultScale; } - + if (!(flags & geometrySet)) geom_flags |= WidthValue|HeightValue|XValue|YValue; @@ -448,8 +451,8 @@ if ((w > 0 && w != original_asim->width) || (h > 0 && h != original_asim->height)) { - result = scale_asimage (target->asv, original_asim, - w > 0 ? w : original_asim->width, + result = scale_asimage (target->asv, original_asim, + w > 0 ? w : original_asim->width, h > 0 ? h : original_asim->height, background ? ASA_ASImage : ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); @@ -464,8 +467,8 @@ 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, + (h_scale > 0) ? 0 : (int)result->width - x, + (v_scale > 0) ? 0 : (int)result->height - y, result->width, result->height, TINT_LEAVE_SAME, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); @@ -577,7 +580,7 @@ /* put result on pixmap */ if (dst_x < new_pmap_width && dst_y < new_pmap_height) asimage2drawable (target->asv, 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); @@ -613,7 +616,7 @@ free (f); } return (original_asim != NULL); -# endif +# endif } return false; } @@ -621,7 +624,7 @@ # endif /* BG_IMAGE_FROM_FILE */ # ifdef ENABLE_TRANSPARENCY -bool +bool bgPixmap_t::set_transparent () { if (!(flags & isTransparent)) @@ -656,7 +659,7 @@ ++changed; v_blurRadius = vr; } - + if (v_blurRadius == 0 && h_blurRadius == 0) flags &= ~blurNeeded; else @@ -670,19 +673,20 @@ { unsigned long flags = 0; rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); + bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); if (tint) { tint->get (c); # define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) - if (IS_COMPONENT_WHOLESOME (c.r) + if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) && IS_COMPONENT_WHOLESOME (c.g) && IS_COMPONENT_WHOLESOME (c.b)) flags |= bgPixmap_t::tintWholesome; # undef IS_COMPONENT_WHOLESOME } - if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200)) + if (has_shade) flags |= bgPixmap_t::tintNeeded; else if (tint) { @@ -692,14 +696,17 @@ flags |= bgPixmap_t::tintNeeded; } } - + if (flags & bgPixmap_t::tintNeeded) { if (flags & bgPixmap_t::tintWholesome) flags |= bgPixmap_t::tintServerSide; + else + { #if XFT - flags |= bgPixmap_t::tintServerSide; + flags |= bgPixmap_t::tintServerSide; #endif + } } return flags; @@ -736,22 +743,24 @@ { int new_shade = (shade_str) ? atoi (shade_str) : 0; - if (new_shade == 100) + if (new_shade < 0 && new_shade > -100) + new_shade = 200 - (100 + new_shade); + else if (new_shade == 100) new_shade = 0; if (new_shade != shade) { unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); shade = new_shade; - flags = (flags & ~tintFlags) | new_flags; + flags = (flags & (~tintFlags | tintSet)) | new_flags; return true; } return false; } -/* make_transparency_pixmap() +/* make_transparency_pixmap() * Builds a pixmap sized the same as terminal window, with depth same as the root window - * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by + * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by * our window. */ unsigned long @@ -860,8 +869,8 @@ gcv.tile = root_pixmap; gcv.fill_style = FillTiled; - while (sx < 0) sx += (int)window_width; - while (sy < 0) sy += (int)window_height; + while (sx < 0) sx += (int)root_width; + while (sy < 0) sy += (int)root_height; gcv.ts_x_origin = -sx; gcv.ts_y_origin = -sy; @@ -877,9 +886,9 @@ if (tiled_root_pmap != None) { - if (!need_client_side_rendering ()) + if (!need_client_side_rendering ()) { - if ((flags & tintNeeded)) + if ((flags & tintNeeded)) { if (flags & tintWholesome) { @@ -930,14 +939,14 @@ pf.direct.alphaMask = 0xff; XRenderPictFormat *solid_format = XRenderFindFormat (dpy, - (PictFormatType| - PictFormatDepth| - PictFormatRedMask| - PictFormatGreenMask| - PictFormatBlueMask| - PictFormatAlphaMask), - &pf, - 0); + (PictFormatType| + PictFormatDepth| + PictFormatRedMask| + PictFormatGreenMask| + PictFormatBlueMask| + PictFormatAlphaMask), + &pf, + 0); XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); XRenderPictureAttributes pa ; @@ -949,7 +958,7 @@ Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); XFreePixmap (dpy, overlay_pmap); - pa.component_alpha = True; + pa.component_alpha = True; Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); XFreePixmap (dpy, mask_pmap); @@ -961,37 +970,21 @@ memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); mask_c.alpha = 0xffff; XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); - memset (&mask_c, 0x0, sizeof (mask_c)); - mask_c.alpha = 0; - if (c.r == c.b && c.b == c.g) /* pure shading */ - { - mask_c.red = mask_c.green = mask_c.blue = 0xffff - c.r; - XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); - XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); - } - else - { - mask_c.red = 0xffff - c.r; - XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); - XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); - mask_c.red = 0; - mask_c.green = 0xffff - c.g; - XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); - XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); - mask_c.green = 0; - mask_c.blue = 0xffff - c.b; - XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); - XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); - } - result |= transpPmapTinted; + mask_c.alpha = 0; + mask_c.red = 0xffff - c.r; + mask_c.green = 0xffff - c.g; + mask_c.blue = 0xffff - c.b; + XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); + 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); # if DO_TIMING_TEST XSync (dpy, False); -# endif +# endif # endif } } @@ -1005,20 +998,20 @@ pmap_height = window_height; pmap_depth = root_depth; } - + if (gc) XFreeGC (dpy, gc); TIMING_TEST_PRINT_RESULT (tp); - - return result; + + return result; } bool bgPixmap_t::set_root_pixmap () { Pixmap new_root_pixmap = None; - + 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); @@ -1045,6 +1038,8 @@ if (target == NULL) return false; + TIMING_TEST_START (tp); + invalidate(); # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) @@ -1106,7 +1101,12 @@ { result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); } -# else /* our own client-side tinting */ + +# 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 !!! */ + if (background_flags && (flags & isInvalid)) { result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); @@ -1167,10 +1167,12 @@ apply (); - return true; + TIMING_TEST_PRINT_RESULT (tp); + + return true; } -bool +bool bgPixmap_t::set_target (rxvt_term *new_target) { if (new_target) @@ -1227,11 +1229,9 @@ XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); # endif } - - /* don't want Expose on the parent */ - XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); - /* do want Expose on the vt, so we get refreshed properly */ - XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True); + /* 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) @@ -1240,12 +1240,15 @@ target->scrollbar_show (0); } # endif + + target->want_refresh = 1; + flags |= hasChanged; } } #endif /* HAVE_BG_PIXMAP */ -#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) +#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT /* taken from aterm-0.4.2 */ typedef uint32_t RUINT32T;