--- rxvt-unicode/src/rxvtimg.C 2012/06/15 13:21:59 1.91 +++ rxvt-unicode/src/rxvtimg.C 2012/07/14 08:27:55 1.104 @@ -1,40 +1,231 @@ +/*----------------------------------------------------------------------* + * File: rxvtimg.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2012 Marc Lehmann + * Copyright (c) 2012 Emanuele Giaquinta + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + *---------------------------------------------------------------------*/ + +#include #include #include "../config.h" #include "rxvt.h" #if HAVE_IMG -#if 0 -struct pict +typedef rxvt_img::nv nv; + +namespace { - Display *dpy; - Picture pic; + struct mat3x3 + { + nv v[3][3]; + + mat3x3 () + { + } + + mat3x3 (const nv *matrix) + { + memcpy (v, matrix, sizeof (v)); + } + + mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33) + { + v[0][0] = v11; v[0][1] = v12; v[0][2] = v13; + v[1][0] = v21; v[1][1] = v22; v[1][2] = v23; + v[2][0] = v31; v[2][1] = v32; v[2][2] = v33; + } + + mat3x3 inverse (); + + nv *operator [](int i) { return &v[i][0]; } + const nv *operator [](int i) const { return &v[i][0]; } + + operator const nv * () const { return &v[0][0]; } + operator nv * () { return &v[0][0]; } + + // quite inefficient, hopefully gcc pulls the w calc out of any loops + nv apply1 (int i, nv x, nv y) + { + mat3x3 &m = *this; + + nv v = m[i][0] * x + m[i][1] * y + m[i][2]; + nv w = m[2][0] * x + m[2][1] * y + m[2][2]; + + return v * (1. / w); + } + + static mat3x3 translate (nv x, nv y); + static mat3x3 scale (nv s, nv t); + static mat3x3 rotate (nv phi); + }; + + mat3x3 + mat3x3::inverse () + { + mat3x3 &m = *this; + mat3x3 inv; + + nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2]; + nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1]; + nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2]; + + nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2); + + inv[0][0] = invdet * s0; + inv[0][1] = invdet * s1; + inv[0][2] = invdet * s2; + + inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]); + inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]); + inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]); + + inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]); + inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]); + inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]); - operator Picture () const + return inv; + } + + static mat3x3 + operator *(const mat3x3 &a, const mat3x3 &b) { - return pic; + mat3x3 r; + + for (int i = 0; i < 3; ++i) + for (int j = 0; j < 3; ++j) + r[i][j] = a[i][0] * b[0][j] + + a[i][1] * b[1][j] + + a[i][2] * b[2][j]; + + return r; } - pict () - : pic (0) + mat3x3 + mat3x3::translate (nv x, nv y) { + return mat3x3 ( + 1, 0, x, + 0, 1, y, + 0, 0, 1 + ); } - pict (rxvt_img *img, XRenderPictFormat *format = 0) - : dpy (img->s->display->dpy) + mat3x3 + mat3x3::scale (nv s, nv t) { - XRenderPictureAttributes pa; - pa.repeat = img->repeat; - pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa); + return mat3x3 ( + s, 0, 0, + 0, t, 0, + 0, 0, 1 + ); } - ~pict () + // clockwise + mat3x3 + mat3x3::rotate (nv phi) { - if (pic) - XRenderFreePicture (dpy, pic); + nv s = sin (phi); + nv c = cos (phi); + + return mat3x3 ( + c, -s, 0, + s, c, 0, + 0, 0, 1 + ); } -}; -#endif + + struct composer + { + rxvt_img *srcimg, *dstimg; + Picture src, dst, msk; + Display *dpy; + + ecb_noinline + composer (rxvt_img *srcimg, rxvt_img *dstimg = 0) + : srcimg (srcimg), dstimg (dstimg), msk (0) + { + if (!this->dstimg) + this->dstimg = srcimg->new_empty (); + else if (!this->dstimg->pm) // somewhat unsatisfying + this->dstimg->alloc (); + + dpy = srcimg->s->dpy; + src = srcimg->picture (); + dst = this->dstimg->picture (); + } + + ecb_noinline + void mask (bool rgb = true, int w = 1, int h = 1) + { + Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, w, h, rgb ? 32 : 8); + + XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8); + XRenderPictureAttributes pa; + pa.repeat = RepeatNormal; + pa.component_alpha = rgb; + msk = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa); + + XFreePixmap (dpy, pixmap); + + ecb_assume (msk); + } + + // CreateSolidFill creates a very very very weird picture + void mask (const rgba &c) + { + XRenderColor rc = { + c.r * c.a / 65535, + c.g * c.a / 65535, + c.b * c.a / 65535, + c.a + }; + msk = XRenderCreateSolidFill (dpy, &rc); + ecb_assume (msk); + } + + void fill (const rgba &c) + { + XRenderColor rc = { + c.r * c.a / 65535, + c.g * c.a / 65535, + c.b * c.a / 65535, + c.a + }; + + XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1); + } + + operator rxvt_img *() + { + return dstimg; + } + + ecb_noinline + ~composer () + { + XRenderFreePicture (dpy, src); + XRenderFreePicture (dpy, dst); + if (msk) XRenderFreePicture (dpy, msk); + } + }; +} static XRenderPictFormat * find_alpha_format_for (Display *dpy, XRenderPictFormat *format) @@ -71,11 +262,11 @@ rxvt_img * rxvt_img::new_from_root (rxvt_screen *s) { - Display *dpy = s->display->dpy; + Display *dpy = s->dpy; unsigned int root_pm_w, root_pm_h; - Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]); + Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]); if (root_pixmap == None) - root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]); + root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]); if (root_pixmap == None) return 0; @@ -108,7 +299,7 @@ rxvt_img * rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) { - Display *dpy = s->display->dpy; + Display *dpy = s->dpy; int width = gdk_pixbuf_get_width (pb); int height = gdk_pixbuf_get_height (pb); @@ -160,35 +351,28 @@ unsigned char *src = row; uint32_t *dst = (uint32_t *)line; - if (!pb_has_alpha) - for (int x = 0; x < width; x++) - { - uint8_t r = *src++; - uint8_t g = *src++; - uint8_t b = *src++; - - uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; - - if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) - v = ecb_bswap32 (v); - - *dst++ = v; - } - else - for (int x = 0; x < width; x++) - { - uint32_t v = *(uint32_t *)src; src += 4; - - if (ecb_big_endian ()) - v = ecb_bswap32 (v); + for (int x = 0; x < width; x++) + { + uint8_t r = *src++; + uint8_t g = *src++; + uint8_t b = *src++; + uint8_t a = *src; + + // this is done so it can be jump-free, but newer gcc's clone inner the loop + a = pb_has_alpha ? a : 255; + src += pb_has_alpha; - v = ecb_rotl32 (v, 8); // abgr to bgra + r = (r * a + 127) / 255; + g = (g * a + 127) / 255; + b = (b * a + 127) / 255; - if (!byte_order_mismatch) - v = ecb_bswap32 (v); + uint32_t v = (a << 24) | (r << 16) | (g << 8) | b; - *dst++ = v; - } + if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) + v = ecb_bswap32 (v); + + *dst++ = v; + } row += rowstride; line += xi.bytes_per_line; @@ -231,7 +415,7 @@ return; if (pm && ref->ours) - XFreePixmap (s->display->dpy, pm); + XFreePixmap (s->dpy, pm); delete ref; } @@ -244,14 +428,23 @@ void rxvt_img::alloc () { - pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); + pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth); ref = new pixref (w, h); } +rxvt_img * +rxvt_img::new_empty () +{ + rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); + img->alloc (); + + return img; +} + Picture rxvt_img::picture () { - Display *dpy = s->display->dpy; + Display *dpy = s->dpy; XRenderPictureAttributes pa; pa.repeat = repeat; @@ -266,10 +459,10 @@ if (ref->cnt == 1 && ref->ours) return; - Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); - GC gc = XCreateGC (s->display->dpy, pm, 0, 0); - XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); - XFreeGC (s->display->dpy, gc); + Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth); + GC gc = XCreateGC (s->dpy, pm, 0, 0); + XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); + XFreeGC (s->dpy, gc); destroy (); @@ -278,34 +471,33 @@ } void -rxvt_img::fill (const rgba &c) +rxvt_img::fill (const rgba &c, int x, int y, int w, int h) { XRenderColor rc = { c.r, c.g, c.b, c.a }; - Display *dpy = s->display->dpy; + Display *dpy = s->dpy; Picture src = picture (); - XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); + XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h); XRenderFreePicture (dpy, src); } void +rxvt_img::fill (const rgba &c) +{ + fill (c, 0, 0, w, h); +} + +void rxvt_img::add_alpha () { if (format->direct.alphaMask) return; - Display *dpy = s->display->dpy; - - rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); - img->alloc (); - - Picture src = picture (); - Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); + composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat)); - XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); + XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h); - XRenderFreePicture (dpy, src); - XRenderFreePicture (dpy, dst); + rxvt_img *img = cc; ::swap (img->ref, ref); ::swap (img->pm , pm ); @@ -314,15 +506,15 @@ } static void -get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params) +get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params) { - rxvt_img::nv sigma = radius / 2.0; - rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma; - rxvt_img::nv sum = 0.0; + nv sigma = radius / 2.0; + nv scale = sqrt (2.0 * M_PI) * sigma; + nv sum = 0.0; for (int i = 0; i < width; i++) { - rxvt_img::nv x = i - width / 2; + nv x = i - width / 2; kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; sum += kernel[i]; } @@ -340,12 +532,11 @@ if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) return clone (); - Display *dpy = s->display->dpy; + Display *dpy = s->dpy; int size = max (rh, rv) * 2 + 1; nv *kernel = (nv *)malloc (size * sizeof (nv)); XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); - rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); - img->alloc (); + rxvt_img *img = new_empty (); XRenderPictureAttributes pa; pa.repeat = RepeatPad; @@ -398,23 +589,65 @@ return img; } -static Picture -create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) +rxvt_img * +rxvt_img::muladd (nv mul, nv add) { - Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); + // STEP 1: double the image width, fill all odd columns with white (==1) - XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); - XRenderPictureAttributes pa; - pa.repeat = RepeatNormal; - pa.component_alpha = component_alpha; - Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa); + composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat)); - XFreePixmap (dpy, pixmap); + // why the hell does XRenderSetPictureTransform want a writable matrix :( + // that keeps us from just static const'ing this matrix. + XTransform h_double = { + 0x08000, 0, 0, + 0, 0x10000, 0, + 0, 0, 0x10000 + }; - return mask; + XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0); + XRenderSetPictureTransform (cc.dpy, cc.src, &h_double); + XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h); + + cc.mask (false, 2, 1); + + static const XRenderColor c0 = { 0, 0, 0, 0 }; + XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1); + static const XRenderColor c1 = { 65535, 65535, 65535, 65535 }; + XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1); + + Picture white = XRenderCreateSolidFill (cc.dpy, &c1); + + XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h); + + XRenderFreePicture (cc.dpy, white); + + // STEP 2: convolve the image with a 3x1 filter + // a 2x1 filter would obviously suffice, but given the total lack of specification + // for xrender, I expect different xrender implementations to randomly diverge. + // we also halve the image, and hope for the best (again, for lack of specs). + composer cc2 (cc.dstimg); + + XFixed kernel [] = { + XDoubleToFixed (3), XDoubleToFixed (1), + XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add) + }; + + XTransform h_halve = { + 0x20000, 0, 0, + 0, 0x10000, 0, + 0, 0, 0x10000 + }; + + XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0); + XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve); + XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel)); + + XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h); + + return cc2; } -static void +ecb_noinline static void extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) { int32_t x = clamp (c, cl0, cl1); @@ -422,7 +655,7 @@ xc = x; } -static bool +ecb_noinline static bool extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa) { extract (cl0, cl1, r, xr); @@ -438,7 +671,7 @@ { unshare (); - Display *dpy = s->display->dpy; + Display *dpy = s->dpy; Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); // loop should not be needed for brightness, as only -1..1 makes sense @@ -472,20 +705,16 @@ if (r < 0 || g < 0 || b < 0 || a < 0) rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); - rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); - img->alloc (); - img->fill (rgba (0, 0, 0, 0)); - // premultiply (yeah, these are not exact, sue me or fix it) r = (r * (a >> 8)) >> 8; g = (g * (a >> 8)) >> 8; b = (b * (a >> 8)) >> 8; - Display *dpy = s->display->dpy; + composer cc (this); + rxvt_img *img = cc; + img->fill (rgba (0, 0, 0, 0)); - Picture src = picture (); - Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); - Picture mul = create_xrender_mask (dpy, pm, True, True); + cc.mask (true); //TODO: this operator does not yet implement some useful contrast while (r | g | b | a) @@ -495,15 +724,11 @@ if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) { - XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); - XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h); + XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1); + XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h); } } - XRenderFreePicture (dpy, mul); - XRenderFreePicture (dpy, dst); - XRenderFreePicture (dpy, src); - ::swap (img->ref, ref); ::swap (img->pm , pm ); @@ -515,25 +740,12 @@ { unshare (); - Display *dpy = s->display->dpy; - Picture src = img->picture (); - Picture dst = picture (); - Picture mask_p = 0; + composer cc (img, this); if (mask != 1.) - { - mask_p = create_xrender_mask (dpy, img->pm, False, False); - XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) }; - XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); - } + cc.mask (rgba (0, 0, 0, float_to_component (mask))); - XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h); - - XRenderFreePicture (dpy, src); - XRenderFreePicture (dpy, dst); - - if (mask_p) - XRenderFreePicture (dpy, mask_p); + XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h); } rxvt_img * @@ -548,32 +760,24 @@ if (x == 0 && y == 0 && w == ref->w && h == ref->h) return clone (); - Display *dpy = s->display->dpy; - // add an alpha channel if... bool alpha = !format->direct.alphaMask // pixmap has none yet && (x || y) // we need one because of non-zero offset && repeat == RepeatNone; // and we have no good pixels to fill with - rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); - img->alloc (); + composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format, + 0, 0, w, h, repeat)); - Picture src = picture (); - Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); - - if (alpha) + if (repeat == RepeatNone) { XRenderColor rc = { 0, 0, 0, 0 }; - XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles - XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h); + XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles + XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h); } else - XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h); + XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h); - XRenderFreePicture (dpy, src); - XRenderFreePicture (dpy, dst); - - return img; + return cc; } rxvt_img * @@ -597,71 +801,28 @@ return img; } -typedef rxvt_img::nv matrix[3][3]; - -static void -mat_invert (matrix mat, rxvt_img::nv (&inv)[3][3]) -{ - rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2]; - rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1]; - rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2]; - - rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2); - - inv [0][0] = invdet * s0; - inv [0][1] = invdet * s1; - inv [0][2] = invdet * s2; - - inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]); - inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]); - inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]); - - inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]); - inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]); - inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]); -} - -static rxvt_img::nv -mat_apply (matrix mat, int i, rxvt_img::nv x, rxvt_img::nv y) -{ - rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2]; - rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2]; - - return v * (1. / w); -} - -static void -mat_mult (matrix a, matrix b, matrix r) -{ - for (int i = 0; i < 3; ++i) - for (int j = 0; j < 3; ++j) - r [i][j] = a [i][0] * b [0][j] - + a [i][1] * b [1][j] - + a [i][2] * b [2][j]; -} - -static void -mat_trans (rxvt_img::nv x, rxvt_img::nv y, matrix mat) +rxvt_img * +rxvt_img::transform (const nv matrix[3][3]) { - mat [0][0] = 1; mat [0][1] = 0; mat [0][2] = x; - mat [1][0] = 0; mat [1][1] = 1; mat [1][2] = y; - mat [2][0] = 0; mat [2][1] = 0; mat [2][2] = 1; + return transform (mat3x3 (&matrix[0][0])); } rxvt_img * -rxvt_img::transform (nv matrix[3][3]) +rxvt_img::transform (const nv *matrix) { + mat3x3 m (matrix); + // calculate new pixel bounding box coordinates - nv r[2], rmin[2], rmax[2]; + nv rmin[2], rmax[2]; for (int i = 0; i < 2; ++i) { nv v; - v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v; - v = mat_apply (matrix, i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v); - v = mat_apply (matrix, i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); - v = mat_apply (matrix, i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); + v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; + v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v); + v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); + v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); } float sx = rmin [0] - x; @@ -674,21 +835,9 @@ int new_width = ceil (rmax [0] - rmin [0]); int new_height = ceil (rmax [1] - rmin [1]); - ::matrix tr, tmp; - mat_trans (x, y, tr); - mat_mult (matrix, tr, tmp); - mat_trans (-x, -y, tr); - mat_mult (tr, tmp, matrix); + mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse (); - ::matrix inv; - mat_invert (matrix, inv); - - rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat); - img->alloc (); - - Display *dpy = s->display->dpy; - Picture src = picture (); - Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); + composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat)); XTransform xfrm; @@ -696,24 +845,11 @@ for (int j = 0; j < 3; ++j) xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); - XRenderSetPictureFilter (dpy, src, "good", 0, 0); - XRenderSetPictureTransform (dpy, src, &xfrm); - XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height); -#if 1 - { - XRenderColor rc = { 65535,0,0,65535 }; - XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, new_width, new_height); - }{ - XRenderColor rc = { 0,0,0,65535 }; - XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 1, 1, new_width - 2, new_height - 2); - } - XRenderComposite (dpy, PictOpOver, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height); -#endif + XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0); + XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm); + XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height); - XRenderFreePicture (dpy, src); - XRenderFreePicture (dpy, dst); - - return img; + return cc; } rxvt_img * @@ -722,16 +858,10 @@ if (w == new_width && h == new_height) return clone (); - nv matrix[3][3] = { - { new_width / (nv)w, 0, 0 }, - { 0, new_height / (nv)h, 0 }, - { 0, 0, 1 } - }; - int old_repeat_mode = repeat; repeat = RepeatPad; // not right, but xrender can't properly scale it seems - rxvt_img *img = transform (matrix); + rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h)); repeat = old_repeat_mode; img->repeat = repeat; @@ -742,23 +872,8 @@ rxvt_img * rxvt_img::rotate (int cx, int cy, nv phi) { - nv s = sin (phi); - nv c = cos (phi); - - nv matrix[3][3] = { -#if 0 - { c, -s, cx - c * cx + s * cy }, - { s, c, cy - s * cx - c * cy }, - { 0, 0, 1 } -#else - { c, -s, 0 }, - { s, c, 0 }, - { 0, 0, 1 } -#endif - }; - move (-cx, -cy); - rxvt_img *img = transform (matrix); + rxvt_img *img = transform (mat3x3::rotate (phi)); move ( cx, cy); img->move (cx, cy); @@ -771,55 +886,51 @@ if (new_format == format) return clone (); - rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); - img->alloc (); + composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat)); - Display *dpy = s->display->dpy; - Picture src = picture (); - Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); int op = PictOpSrc; if (format->direct.alphaMask && !new_format->direct.alphaMask) { // does it have to be that complicated XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; - XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); + XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h); op = PictOpOver; } - XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); + XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h); - XRenderFreePicture (dpy, src); - XRenderFreePicture (dpy, dst); + return cc; +} - return img; +rxvt_img * +rxvt_img::tint (const rgba &c) +{ + composer cc (this); + cc.mask (true); + cc.fill (c); + + XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h); + + return cc; } rxvt_img * -rxvt_img::blend (rxvt_img *img, nv factor) +rxvt_img::filter (const char *name, int nparams, nv *params) { - rxvt_img *img2 = clone (); - Display *dpy = s->display->dpy; - Picture src = img->picture (); - Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); - Picture mask = create_xrender_mask (dpy, img->pm, False, False); - - XRenderColor mask_c; - - mask_c.alpha = float_to_component (factor); - mask_c.red = - mask_c.green = - mask_c.blue = 0; - XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); + composer cc (this); - XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); + XFixed *xparams = rxvt_temp_buf (nparams); - XRenderFreePicture (dpy, src); - XRenderFreePicture (dpy, dst); - XRenderFreePicture (dpy, mask); + for (int i = 0; i < nparams; ++i) + xparams [i] = XDoubleToFixed (params [i]); + + XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams); + + XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h); - return img2; + return cc; } #endif