--- rxvt-unicode/src/rxvtimg.C 2012/06/14 18:06:15 1.83 +++ rxvt-unicode/src/rxvtimg.C 2012/06/15 18:07:24 1.93 @@ -1,9 +1,139 @@ +#include #include #include "../config.h" #include "rxvt.h" #if HAVE_IMG +typedef rxvt_img::nv nv; + +namespace +{ + + struct mat3x3 + { + nv v[3][3]; + + mat3x3 () + { + } + + mat3x3 (nv matrix[3][3]) + { + 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 invert (); + + nv *operator [](int i) { return &v[i][0]; } + const nv *operator [](int i) const { return &v[i][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); + }; + + mat3x3 + mat3x3::invert () + { + 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]); + + return inv; + } + + static mat3x3 + operator *(const mat3x3 &a, const mat3x3 &b) + { + 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; + } + + mat3x3 + mat3x3::translate (nv x, nv y) + { + return mat3x3 ( + 1, 0, x, + 0, 1, y, + 0, 0, 1 + ); + } + +} + +#if 0 +struct pict +{ + Display *dpy; + Picture pic; + + operator Picture () const + { + return pic; + } + + pict () + : pic (0) + { + } + + pict (rxvt_img *img, XRenderPictFormat *format = 0) + : dpy (img->s->display->dpy) + { + XRenderPictureAttributes pa; + pa.repeat = img->repeat; + pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa); + } + + ~pict () + { + if (pic) + XRenderFreePicture (dpy, pic); + } +}; +#endif + static XRenderPictFormat * find_alpha_format_for (Display *dpy, XRenderPictFormat *format) { @@ -217,7 +347,7 @@ } Picture -rxvt_img::src_picture () +rxvt_img::picture () { Display *dpy = s->display->dpy; @@ -251,7 +381,7 @@ XRenderColor rc = { c.r, c.g, c.b, c.a }; Display *dpy = s->display->dpy; - Picture src = src_picture (); + Picture src = picture (); XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); XRenderFreePicture (dpy, src); } @@ -267,7 +397,7 @@ rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); img->alloc (); - Picture src = src_picture (); + Picture src = picture (); Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); @@ -282,15 +412,15 @@ } static void -get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) +get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params) { - double sigma = radius / 2.0; - double scale = sqrt (2.0 * M_PI) * sigma; - double 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++) { - double x = i - width / 2; + nv x = i - width / 2; kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; sum += kernel[i]; } @@ -310,7 +440,7 @@ Display *dpy = s->display->dpy; int size = max (rh, rv) * 2 + 1; - double *kernel = (double *)malloc (size * sizeof (double)); + 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 (); @@ -451,7 +581,7 @@ Display *dpy = s->display->dpy; - Picture src = src_picture (); + Picture src = picture (); Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); Picture mul = create_xrender_mask (dpy, pm, True, True); @@ -478,6 +608,32 @@ delete img; } +void +rxvt_img::draw (rxvt_img *img, int op, nv mask) +{ + unshare (); + + Display *dpy = s->display->dpy; + Picture src = img->picture (); + Picture dst = picture (); + Picture mask_p = 0; + + 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); + } + + 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); +} + rxvt_img * rxvt_img::clone () { @@ -500,17 +656,17 @@ rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); img->alloc (); - Picture src = src_picture (); + Picture src = picture (); Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); if (alpha) { 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); + XRenderComposite (dpy, PictOpSrc, src, None, 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 (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h); XRenderFreePicture (dpy, src); XRenderFreePicture (dpy, dst); @@ -523,8 +679,8 @@ { rxvt_img *img = clone (); - img->x += x; - img->y += y; + img->x -= x; + img->y -= y; if (w != width || h != height) { @@ -539,70 +695,43 @@ return img; } -static void -mat_invert (double mat[3][3], double (&inv)[3][3]) -{ - double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2]; - double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1]; - double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2]; - - double 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 double -mat_apply (double mat[3][3], int i, double x, double y) -{ - double v = mat [i][0] * x + mat [i][1] * y + mat [i][2]; - double w = mat [2][0] * x + mat [2][1] * y + mat [2][2]; - - return v * (1. / w); -} - rxvt_img * -rxvt_img::transform (double matrix[3][3]) +rxvt_img::transform (nv matrix[3][3]) { - // find new offset - int ox = mat_apply (matrix, 0, x, y); - int oy = mat_apply (matrix, 1, x, y); - // calculate new pixel bounding box coordinates - double d [2], rmin[2], rmax[2]; + nv r[2], rmin[2], rmax[2]; + + mat3x3 m (matrix); for (int i = 0; i < 2; ++i) { - double v; - v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; - v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); - v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v); - v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v); + nv v; + + v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [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); } - int dx = floor (rmin [0]); - int dy = floor (rmin [1]); + float sx = rmin [0] - x; + float sy = rmin [1] - y; + + // TODO: adjust matrix for subpixel accuracy + int nx = floor (rmin [0]); + int ny = floor (rmin [1]); - int new_width = ceil (rmax [0] - dx); - int new_height = ceil (rmax [1] - dy); + int new_width = ceil (rmax [0] - rmin [0]); + int new_height = ceil (rmax [1] - rmin [1]); - double inv[3][3]; - mat_invert (matrix, inv); + m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y); - rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat); + mat3x3 inv = m.invert (); + + rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat); img->alloc (); Display *dpy = s->display->dpy; - Picture src = src_picture (); + Picture src = picture (); Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); XTransform xfrm; @@ -613,7 +742,17 @@ XRenderSetPictureFilter (dpy, src, "good", 0, 0); XRenderSetPictureTransform (dpy, src, &xfrm); - XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); + 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 XRenderFreePicture (dpy, src); XRenderFreePicture (dpy, dst); @@ -627,10 +766,10 @@ if (w == new_width && h == new_height) return clone (); - double matrix[3][3] = { - { new_width / (double)w, 0, 0 }, - { 0, new_height / (double)h, 0 }, - { 0, 0, 1 } + nv matrix[3][3] = { + { new_width / (nv)w, 0, 0 }, + { 0, new_height / (nv)h, 0 }, + { 0, 0, 1 } }; int old_repeat_mode = repeat; @@ -645,24 +784,27 @@ } rxvt_img * -rxvt_img::rotate (int cx, int cy, double phi) +rxvt_img::rotate (int cx, int cy, nv phi) { - double s = sin (phi); - double c = cos (phi); + nv s = sin (phi); + nv c = cos (phi); - double matrix[3][3] = { + nv matrix[3][3] = { +#if 0 { c, -s, cx - c * cx + s * cy }, { s, c, cy - s * cx - c * cy }, - { 0, 0, 1 } - //{ c, -s, 0 }, - //{ s, c, 0 }, - //{ 0, 0, 1 } + { 0, 0, 1 } +#else + { c, -s, 0 }, + { s, c, 0 }, + { 0, 0, 1 } +#endif }; - //move (-cx, -cy); + move (-cx, -cy); rxvt_img *img = transform (matrix); - //move ( cx, cy); - //img->move (cx, cy); + move ( cx, cy); + img->move (cx, cy); return img; } @@ -677,7 +819,7 @@ img->alloc (); Display *dpy = s->display->dpy; - Picture src = src_picture (); + Picture src = picture (); Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); int op = PictOpSrc; @@ -699,11 +841,11 @@ } rxvt_img * -rxvt_img::blend (rxvt_img *img, double factor) +rxvt_img::blend (rxvt_img *img, nv factor) { rxvt_img *img2 = clone (); Display *dpy = s->display->dpy; - Picture src = img->src_picture (); + Picture src = img->picture (); Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); Picture mask = create_xrender_mask (dpy, img->pm, False, False);