--- rxvt-unicode/src/background.C 2010/09/02 23:40:56 1.56 +++ rxvt-unicode/src/background.C 2010/10/04 20:46:20 1.66 @@ -140,8 +140,7 @@ # ifdef BG_IMAGE_FROM_FILE if (have_image) { - if (h_scale != 0 || v_scale != 0 - || h_align != 0 || v_align != 0) + if (flags & sizeSensitive) return true; } # endif @@ -160,7 +159,7 @@ # ifdef BG_IMAGE_FROM_FILE if (have_image) { - if (h_align == rootAlign || v_align == rootAlign) + if (flags & rootAlign) return true; } # endif @@ -210,13 +209,10 @@ { if (geom_flags & flag) { - if (new_value != bgPixmap_t::rootAlign) - { - if (new_value < -100) - new_value = -100; - else if (new_value > 200) - new_value = 200; - } + if (new_value < -100) + new_value = -100; + else if (new_value > 200) + new_value = 200; if (new_value != align) { align = new_value; @@ -232,13 +228,11 @@ int diff = window_size - image_size; int smaller = min (image_size, window_size); - if (align >= 0 && align <= 50) + if (align >= 0 && align <= 100) return diff * align / 100; - else if (align > 50 && align <= 100) - return window_size - image_size - diff * (100 - align) / 100; else if (align > 100 && align <= 200 ) return ((align - 100) * smaller / 100) + window_size - smaller; - else if (align > -100 && align < 0) + else if (align >= -100 && align < 0) return ((align + 100) * smaller / 100) - image_size; return 0; } @@ -247,15 +241,14 @@ make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) { int src_pos = 0; - dst_pos = 0; + dst_pos = pos; dst_size = size; - if (pos < 0 && size > target_size) + if (pos < 0) { src_pos = -pos; + dst_pos = 0; dst_size += pos; } - else if (pos > 0) - dst_pos = pos; if (dst_pos + dst_size > target_size) dst_size = target_size - dst_pos; @@ -390,11 +383,6 @@ } else if (CHECK_GEOM_OPS ("propscale")) { - if (w == 0 && h == 0) - { - w = windowScale; - geom_flags |= WidthValue; - } new_flags |= propScale; } else if (CHECK_GEOM_OPS ("hscale")) @@ -426,9 +414,9 @@ } else if (CHECK_GEOM_OPS ("root")) { + new_flags |= rootAlign; w = h = noScale; - x = y = rootAlign; - geom_flags |= WidthValue|HeightValue|XValue|YValue; + geom_flags |= WidthValue|HeightValue; } # undef CHECK_GEOM_OPS @@ -453,6 +441,44 @@ return (changed > 0); } +void +bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) +{ + int target_width = target->szHint.width; + int target_height = target->szHint.height; + + if (flags & propScale) + { + float scale = (float)target_width / image_width; + min_it (scale, (float)target_height / image_height); + w = image_width * scale + 0.5; + h = image_height * scale + 0.5; + } + else + { + w = h_scale * target_width / 100; + h = v_scale * target_height / 100; + } + + if (flags & rootAlign) + { + target->get_window_origin (x, y); + x = -x; + y = -y; + } + else + { + x = make_align_position (h_align, target_width, w > 0 ? w : image_width); + y = make_align_position (v_align, target_height, h > 0 ? h : image_height); + } + + flags &= ~sizeSensitive; + if (h_scale != 0 || v_scale != 0 + || h_align != 0 || v_align != 0 + || image_width > target_width || image_height > target_height) + flags |= sizeSensitive; +} + # ifdef HAVE_AFTERIMAGE bool bgPixmap_t::render_image (unsigned long background_flags) @@ -506,26 +532,13 @@ int x = 0; int y = 0; - int w = h_scale * target_width / 100; - int h = v_scale * target_height / 100; + int w = 0; + int h = 0; TIMING_TEST_START (asim); if (original_asim) - { - if (h_align == rootAlign || v_align == rootAlign) - { - 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); - } + get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); if (!original_asim || x >= target_width @@ -567,18 +580,17 @@ if (background == NULL) { - /* 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) - new_pmap_height = min (result->height, target_height); - /* we also need to tile our image in one or both directions */ if (h_scale == 0 || v_scale == 0) { + /* 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 (target->asv, result, - (h_scale > 0) ? 0 : (int)result->width - x, - (v_scale > 0) ? 0 : (int)result->height - y, + (int)result->width - x, + (int)result->height - y, new_pmap_width, new_pmap_height, TINT_LEAVE_SAME, ASA_XImage, @@ -686,8 +698,11 @@ 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 || v_scale == 0)) + { + 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 @@ -741,21 +756,10 @@ int x = 0; int y = 0; - int w = h_scale * target_width / 100; - int h = v_scale * target_height / 100; + int w = 0; + int h = 0; - if (h_align == rootAlign || v_align == rootAlign) - { - 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 : image_width); - - if (v_align != rootAlign) - y = make_align_position (v_align, target_height, h > 0 ? h : image_height); + get_image_geometry (image_width, image_height, w, h, x, y); if (x >= target_width || y >= target_height @@ -784,10 +788,11 @@ image_width = gdk_pixbuf_get_width (result); image_height = gdk_pixbuf_get_height (result); - if (h_scale == 0) - new_pmap_width = min (image_width, target_width); - if (v_scale == 0) - new_pmap_height = min (image_height, target_height); + if (h_scale == 0 || v_scale == 0) + { + new_pmap_width = min (image_width, target_width); + new_pmap_height = min (image_height, target_height); + } if (pixmap) { @@ -1041,6 +1046,117 @@ return false; } +bool +bgPixmap_t::tint_pixmap (Pixmap pixmap) +{ + Window root = target->display->root; + Display *dpy = target->dpy; + int window_width = target->szHint.width; + int window_height = target->szHint.height; + bool ret = false; + + if (flags & tintWholesome) + { + XGCValues gcv; + GC gc; + + /* 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; + gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); + if (gc) + { + XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); + ret = true; + XFreeGC (dpy, gc); + } + } + else + { +# if XFT + 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; + + Picture back_pic = XRenderCreatePicture (dpy, pixmap, 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); + + 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); + ret = true; + } + + XRenderFreePicture (dpy, mask_pic); + XRenderFreePicture (dpy, overlay_pic); + XRenderFreePicture (dpy, back_pic); +# if DO_TIMING_TEST + XSync (dpy, False); +# endif +# endif + } + + return ret; +} + /* 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 @@ -1178,104 +1294,8 @@ { 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); - - 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 - } + if (tint_pixmap (tiled_root_pmap)) + result |= transpPmapTinted; } } /* server side rendering completed */