--- rxvt-unicode/src/xpm.C 2007/08/15 17:05:07 1.68 +++ rxvt-unicode/src/xpm.C 2007/09/12 19:51:41 1.76 @@ -26,6 +26,23 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#define DO_TIMING_TEST 0 + +#if DO_TIMING_TEST +#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__,\ + 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) +#endif + /* * Pixmap geometry string interpretation : * Each geometry string contains zero or one scale/position @@ -79,7 +96,8 @@ if (original_asim != NULL) # endif { - if (h_scale != 0 || v_scale != 0) + if (h_scale != 0 || v_scale != 0 + || h_align != 0 || v_align != 0) return true; } # endif @@ -90,6 +108,23 @@ return false; } +bool bgPixmap_t::need_client_side_rendering () +{ +# ifdef HAVE_AFTERIMAGE + if (original_asim != NULL) + return true; +# endif +# ifdef ENABLE_TRANSPARENCY + if (flags & isTransparent) + { + if (((flags & blurNeeded) && !(flags & blurServerSide)) + || ((flags & tintNeeded) && !(flags & tintServerSide))) + return true; + } +# endif + return false; +} + # ifdef XPM_BACKGROUND static inline bool check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) @@ -361,6 +396,8 @@ int w = h_scale * target_width / 100; int h = v_scale * target_height / 100; + TIMING_TEST_START (asim); + if (original_asim) { x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); @@ -474,6 +511,7 @@ free (layers); } } + TIMING_TEST_PRINT_RESULT (asim); if (pixmap) { @@ -529,6 +567,7 @@ destroy_asimage (&result); XFreeGC (target->dpy, gc); + TIMING_TEST_PRINT_RESULT (asim); } return true; @@ -546,17 +585,17 @@ { # ifdef HAVE_AFTERIMAGE if (target->asimman == NULL) - target->asimman = create_generic_imageman(target->rs[Rs_path]); + target->asimman = create_generic_imageman (target->rs[Rs_path]); if ((f = strchr (file, ';')) == NULL) - original_asim = get_asimage( target->asimman, file, 0xFFFFFFFF, 100 ); + original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); else { size_t len = f - file; f = (char *)malloc (len + 1); strncpy (f, file, len); f[len] = '\0'; - original_asim = get_asimage( target->asimman, f, 0xFFFFFFFF, 100 ); - free( f ); + original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); + free (f); } return (original_asim != NULL); # endif @@ -575,6 +614,7 @@ flags |= isTransparent; return true; } + return false; } bool @@ -584,6 +624,7 @@ unsigned int hr, vr; int junk; int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); + if (!(geom_flags&WidthValue)) hr = 1; if (!(geom_flags&HeightValue)) @@ -594,11 +635,18 @@ ++changed; h_blurRadius = hr; } + if (v_blurRadius != vr) { ++changed; v_blurRadius = vr; } + + if (v_blurRadius == 0 && h_blurRadius == 0) + flags &= ~blurNeeded; + else + flags |= blurNeeded; + return (changed>0); } @@ -606,27 +654,39 @@ compute_tint_shade_flags (rxvt_color *tint, int shade) { unsigned long flags = 0; + rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); - if (shade > 0 && shade <100) - flags |= bgPixmap_t::tintNeeded; - else if (tint) + if (tint) { - rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); tint->get (c); +# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) + if (IS_COMPONENT_WHOLESOME (c.r) + && IS_COMPONENT_WHOLESOME (c.g) + && IS_COMPONENT_WHOLESOME (c.b)) + flags |= bgPixmap_t::tintWholesome; +# undef IS_COMPONENT_WHOLESOME + } - flags |= bgPixmap_t::tintNeeded; + if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200)) + flags |= bgPixmap_t::tintNeeded; + else if (tint) + { if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) { - flags |= bgPixmap_t::tintNeeded; -#define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) - if (IS_COMPONENT_WHOLESOME (c.r) - && IS_COMPONENT_WHOLESOME (c.g) - && IS_COMPONENT_WHOLESOME (c.b)) - flags |= bgPixmap_t::tintServerSide; -#undef IS_COMPONENT_WHOLESOME + flags |= bgPixmap_t::tintNeeded; } } + + if (flags & bgPixmap_t::tintNeeded) + { + if (flags & bgPixmap_t::tintWholesome) + flags |= bgPixmap_t::tintServerSide; +#if XFT + flags |= bgPixmap_t::tintServerSide; +#endif + } + return flags; } @@ -666,7 +726,7 @@ if (new_shade != shade) { - unsigned long new_flags = compute_tint_shade_flags (&tint, new_shade); + unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); shade = new_shade; flags = (flags & ~tintFlags) | new_flags; return true; @@ -674,7 +734,6 @@ return false; } - /* 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 @@ -702,6 +761,7 @@ int sx, sy; XGCValues gcv; + TIMING_TEST_START (tp); target->get_window_origin (sx, sy); /* check if we are outside of the visible part of the virtual screen : */ @@ -715,8 +775,10 @@ unsigned int ujunk; /* root pixmap may be bad - allow a error */ target->allowedxerror = -1; + if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) root_pixmap = None; + target->allowedxerror = 0; } @@ -750,10 +812,12 @@ XGrabServer (dpy); XMapRaised (dpy, src); 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 : */ while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) ++ev_count; + if (ev_count > 0); { /* hooray! - we can grab the image! */ gc = XCreateGC (dpy, root, 0, NULL); @@ -767,6 +831,7 @@ XUngrabServer (dpy); //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); } + if (!success) { XFreePixmap (dpy, tiled_root_pmap); @@ -779,57 +844,159 @@ {/* strightforward pixmap copy */ gcv.tile = root_pixmap; gcv.fill_style = FillTiled; + while (sx < 0) sx += (int)window_width; while (sy < 0) sy += (int)window_height; + gcv.ts_x_origin = -sx; gcv.ts_y_origin = -sy; gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); + if (gc) { XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); result |= transpPmapTiled; } } + TIMING_TEST_PRINT_RESULT (tp); - if (tiled_root_pmap != None) - { - if (flags & tintNeeded) - { - if ((flags & tintServerSide) - && h_blurRadius <= 1 && v_blurRadius <= 1 -# ifdef HAVE_AFTERIMAGE - && original_asim == NULL -# endif - ) - { /* In this case we can tint image server-side getting significant - * performance improvements, as we eliminate XImage transfer - */ - gcv.foreground = Pixel (tint); - gcv.function = GXand; - gcv.fill_style = FillSolid; - if (gc) - XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv); - else - gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); - if (gc) - { - XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); - result |= transpPmapTinted; - } - } - } - if (pixmap) - XFreePixmap (dpy, pixmap); - pixmap = tiled_root_pmap; - pmap_width = window_width; - pmap_height = window_height; - pmap_depth = root_depth; - } + if (tiled_root_pmap != None) + { + if (!need_client_side_rendering ()) + { + if ((flags & tintNeeded)) + { + if (flags & tintWholesome) + { + /* In this case we can tint image server-side getting significant + * performance improvements, as we eliminate XImage transfer + */ + gcv.foreground = Pixel (tint); + gcv.function = GXand; + gcv.fill_style = FillSolid; + if (gc) + XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv); + else + gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); + if (gc) + { + XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); + result |= transpPmapTinted; + } + } + else + { +# if XFT + Picture back_pic = 0; + rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); + + if (flags & tintSet) + tint.get (c); + + if (shade > 0 && shade < 100) + { + c.r = (c.r * shade) / 100; + c.g = (c.g * shade) / 100; + c.b = (c.b * shade) / 100; + } + else if( shade > 100 && shade < 200) + { + c.r = (c.r * (200 - shade)) / 100; + c.g = (c.g * (200 - shade)) / 100; + c.b = (c.b * (200 - shade)) / 100; + } + + XRenderPictFormat pf; + pf.type = PictTypeDirect; + pf.depth = 32; + pf.direct.redMask = 0xff; + pf.direct.greenMask = 0xff; + pf.direct.blueMask = 0xff; + pf.direct.alphaMask = 0xff; + + XRenderPictFormat *solid_format = XRenderFindFormat (dpy, + (PictFormatType| + PictFormatDepth| + PictFormatRedMask| + PictFormatGreenMask| + PictFormatBlueMask| + PictFormatAlphaMask), + &pf, + 0); + XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); + XRenderPictureAttributes pa ; + + back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); + + pa.repeat = True; + + Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); + Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); + XFreePixmap (dpy, overlay_pmap); + + 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); + + if (mask_pic && overlay_pic && back_pic) + { + XRenderColor mask_c; + + 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; + } + XRenderFreePicture (dpy, mask_pic); + XRenderFreePicture (dpy, overlay_pic); + XRenderFreePicture (dpy, back_pic); +# if DO_TIMING_TEST + XSync (dpy, False); +# endif +# endif + } + } + } /* server side rendering completed */ + + if (pixmap) + XFreePixmap (dpy, pixmap); + + pixmap = tiled_root_pmap; + pmap_width = window_width; + pmap_height = window_height; + pmap_depth = root_depth; + } - if (gc) - XFreeGC (dpy, gc); + if (gc) + XFreeGC (dpy, gc); + + TIMING_TEST_PRINT_RESULT (tp); - return result; + return result; } bool @@ -852,7 +1019,7 @@ # ifndef HAVE_AFTERIMAGE static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); -#endif +# endif bool @@ -887,6 +1054,7 @@ 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; @@ -901,6 +1069,19 @@ 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)) flags = flags & ~isInvalid; if (background) @@ -922,13 +1103,14 @@ ShadeXImage (target, result, shade, c.r, c.g, c.b); } } -# endif +# endif /* HAVE_AFTERIMAGE */ + if (result != NULL) { GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); if (gc) { - if (pmap_depth != target->depth && pixmap != None) + if (/*pmap_depth != target->depth &&*/ pixmap != None) { XFreePixmap (target->dpy, pixmap); pixmap = None; @@ -940,7 +1122,19 @@ pmap_height = result->height; pmap_depth = target->depth; } - XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); + if (pmap_depth != result->depth) + { /* 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) + 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; } @@ -954,11 +1148,7 @@ XFreePixmap (target->dpy, pixmap); pixmap = None; } -// TODO : we need to get rid of that garbadge : - target->am_transparent = target->am_pixmap_trans = 0; } - else - target->am_transparent = target->am_pixmap_trans = 1; apply (); @@ -985,6 +1175,7 @@ { if (target) { + flags &= ~isVtOrigin; if (pixmap != None) { /* set target's background to pixmap */ # ifdef ENABLE_TRANSPARENCY @@ -1000,6 +1191,7 @@ else # endif { + flags |= isVtOrigin; /* force old pixmap dereference in case it was transparent before :*/ XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); @@ -1020,29 +1212,28 @@ 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 */ - XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True); -#if HAVE_SCROLLBARS + /* do want Expose on the vt, so we get refreshed properly */ + XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True); + +# if HAVE_SCROLLBARS if (target->scrollBar.win) { target->scrollBar.setIdle (); target->scrollbar_show (0); } -#endif - target->want_refresh = target->want_full_refresh = 1; - target->flush (); +# endif } } -#endif /* HAVE_BG_PIXMAP */ - void rxvt_term::get_window_origin (int &x, int &y) { Window cr; XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); +/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ } Pixmap @@ -1051,7 +1242,7 @@ if (prop_id > 0 && prop_id < NUM_XA) if (xa[prop_id]) { - int aformat, rootdepth; + int aformat; unsigned long nitems, bytes_after; Atom atype; unsigned char *prop = NULL; @@ -1066,9 +1257,39 @@ return None; } +/* + * Check our parents are still who we think they are. + * Do transparency updates if required + */ +int +rxvt_term::update_background () +{ + bgPixmap.invalidate(); -#ifdef ENABLE_TRANSPARENCY -#ifndef HAVE_AFTERIMAGE + /* no chance of real time refresh if we are blurring ! */ + if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) + bgPixmap.render(); + else + { + update_background_ev.stop (); + if (!bgPixmap.need_client_side_rendering()) + update_background_ev.start (NOW + .05); + else if (bgPixmap.flags & bgPixmap_t::blurNeeded) + update_background_ev.start (NOW + .2); /* very slow !!! */ + else + update_background_ev.start (NOW + .07); + } + return 0; +} + +void +rxvt_term::update_background_cb (time_watcher &w) +{ + bgPixmap.render (); +} +#endif /* HAVE_BG_PIXMAP */ + +#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) /* taken from aterm-0.4.2 */ typedef uint32_t RUINT32T; @@ -1089,7 +1310,7 @@ if (shade == 0) shade = 100; - + /* for convenience */ mask_r = visual->red_mask; mask_g = visual->green_mask; @@ -1301,24 +1522,12 @@ free (lookup); } -#endif - -/* - * Check our parents are still who we think they are. - * Do transparency updates if required - */ -int -rxvt_term::check_our_parents () -{ - check_our_parents_ev.stop (); - check_our_parents_ev.start (NOW + .1); - return 0; -} +#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ +#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */ void rxvt_term::check_our_parents_cb (time_watcher &w) { -#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */ int i, aformat, rootdepth; unsigned long nitems, bytes_after; @@ -1333,16 +1542,6 @@ if (!option (Opt_transparent)) return; /* Don't try any more */ -#if 0 - struct timeval stv; - gettimeofday (&stv,NULL); -#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\ - fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\ - tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0) -#else -#define PRINT_BACKGROUND_OP_TIME do{}while(0) -#endif - XGetWindowAttributes (dpy, display->root, &wrootattr); rootdepth = wrootattr.depth; @@ -1486,7 +1685,6 @@ success = False; if (image != NULL) { - PRINT_BACKGROUND_OP_TIME; if (gc == NULL) gc = XCreateGC (dpy, vt, 0UL, &gcvalue); if (ISSET_PIXCOLOR (Color_tint) || shade != 100) @@ -1497,7 +1695,6 @@ } } #endif /* HAVE_AFTERIMAGE */ - PRINT_BACKGROUND_OP_TIME; if (gc != NULL) XFreeGC (dpy, gc); @@ -1526,6 +1723,5 @@ flush (); } } -#endif } -#endif +#endif