ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.49 by root, Thu Jun 7 19:24:13 2012 UTC vs.
Revision 1.81 by root, Tue Jun 12 19:00:57 2012 UTC

13rxvt_img::rxvt_img (const rxvt_img &img) 13rxvt_img::rxvt_img (const rxvt_img &img)
14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref) 14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15{ 15{
16 ++ref->cnt; 16 ++ref->cnt;
17} 17}
18
19#if 0
20rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22{
23}
24#endif
25 18
26rxvt_img * 19rxvt_img *
27rxvt_img::new_from_root (rxvt_screen *s) 20rxvt_img::new_from_root (rxvt_screen *s)
28{ 21{
29 Display *dpy = s->display->dpy; 22 Display *dpy = s->display->dpy;
56 img->ref->ours = false; 49 img->ref->ours = false;
57 50
58 return img; 51 return img;
59} 52}
60 53
54# if HAVE_PIXBUF
55
61rxvt_img * 56rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 57rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{ 58{
64 Display *dpy = s->display->dpy; 59 Display *dpy = s->display->dpy;
65 60
69 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 64 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
70 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n"); 65 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71 66
72 // since we require rgb24/argb32 formats from xrender we assume 67 // since we require rgb24/argb32 formats from xrender we assume
73 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender 68 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24; 69
70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
75 71
76 XImage xi; 72 XImage xi;
77 73
78 xi.width = width; 74 xi.width = width;
79 xi.height = height; 75 xi.height = height;
80 xi.xoffset = 0; 76 xi.xoffset = 0;
81 xi.format = ZPixmap; 77 xi.format = ZPixmap;
82 xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local? 78 xi.byte_order = ImageByteOrder (dpy);
83 xi.bitmap_unit = 32; 79 xi.bitmap_unit = 0; //XY only, unused
84 xi.bitmap_bit_order = MSBFirst; 80 xi.bitmap_bit_order = 0; //XY only, unused
85 xi.bitmap_pad = BitmapPad (dpy); 81 xi.bitmap_pad = BitmapPad (dpy);
86 xi.depth = depth; 82 xi.depth = 32;
87 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
88 xi.bits_per_pixel = 32; 84 xi.bits_per_pixel = 32; //Z only
89 xi.red_mask = 0x00ff0000; 85 xi.red_mask = 0x00000000; //Z only, unused
90 xi.green_mask = 0x0000ff00; 86 xi.green_mask = 0x00000000; //Z only, unused
91 xi.blue_mask = 0x000000ff; 87 xi.blue_mask = 0x00000000; //Z only, unused
88 xi.obdata = 0; // probably unused
89
90 bool byte_order_mismatch = byte_order != xi.byte_order;
92 91
93 if (!XInitImage (&xi)) 92 if (!XInitImage (&xi))
94 rxvt_fatal ("unable to initialise ximage, please report.\n"); 93 rxvt_fatal ("unable to initialise ximage, please report.\n");
95 94
96 if (height > INT_MAX / xi.bytes_per_line) 95 if (height > INT_MAX / xi.bytes_per_line)
97 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 96 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
98 97
99 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
100 99
101 int rowstride = gdk_pixbuf_get_rowstride (pb); 100 int rowstride = gdk_pixbuf_get_rowstride (pb);
102 101 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
103 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
104 unsigned char *row = gdk_pixbuf_get_pixels (pb); 102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103
105 char *line = xi.data; 104 char *line = xi.data;
106 105
107 for (int y = 0; y < height; y++) 106 for (int y = 0; y < height; y++)
108 { 107 {
109 unsigned char r, g, b, a;
110 unsigned char *data = row; 108 unsigned char *src = row;
109 uint32_t *dst = (uint32_t *)line;
111 110
112 if (depth == 24) 111 if (!pb_has_alpha)
113 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
114 { 113 {
115 r = *data++; 114 uint8_t r = *src++;
116 g = *data++; 115 uint8_t g = *src++;
117 b = *data++; 116 uint8_t b = *src++;
117
118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
119
120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121 v = ecb_bswap32 (v);
122
118 *line++ = 0; 123 *dst++ = v;
119 *line++ = r;
120 *line++ = g;
121 *line++ = b;
122 } 124 }
123 else 125 else
124 for (int x = 0; x < width; x++) 126 for (int x = 0; x < width; x++)
125 { 127 {
126 uint32_t v = *(uint32_t *)data; data += 4; 128 uint32_t v = *(uint32_t *)src; src += 4;
127 v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8); 129
128 *(uint32_t *)line = x; line += 4; 130 if (ecb_big_endian ())
131 v = ecb_bswap32 (v);
132
133 v = ecb_rotl32 (v, 8); // abgr to bgra
134
135 if (!byte_order_mismatch)
136 v = ecb_bswap32 (v);
137
138 *dst++ = v;
129 } 139 }
130 140
131 row += rowstride; 141 row += rowstride;
142 line += xi.bytes_per_line;
132 } 143 }
133 144
134 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 145 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
135 img->alloc (); 146 img->alloc ();
136 147
137 GC gc = XCreateGC (dpy, img->pm, 0, 0); 148 GC gc = XCreateGC (dpy, img->pm, 0, 0);
138 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 149 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
139 XFreeGC (dpy, gc); 150 XFreeGC (dpy, gc);
157 g_object_unref (pb); 168 g_object_unref (pb);
158 169
159 return img; 170 return img;
160} 171}
161 172
173# endif
174
162void 175void
163rxvt_img::destroy () 176rxvt_img::destroy ()
164{ 177{
165 if (--ref->cnt) 178 if (--ref->cnt)
166 return; 179 return;
199rxvt_img::unshare () 212rxvt_img::unshare ()
200{ 213{
201 if (ref->cnt == 1 && ref->ours) 214 if (ref->cnt == 1 && ref->ours)
202 return; 215 return;
203 216
204 //TODO: maybe should reify instead
205 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 217 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
206 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 218 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
207 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 219 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
208 XFreeGC (s->display->dpy, gc); 220 XFreeGC (s->display->dpy, gc);
209 221
214} 226}
215 227
216void 228void
217rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rxvt_color &c)
218{ 230{
219 XGCValues gcv; 231 rgba cc;
220 gcv.foreground = c; 232 c.get (cc);
221 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
222 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234
223 XFreeGC (s->display->dpy, gc); 235 Display *dpy = s->display->dpy;
236 Picture src = src_picture ();
237 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
238 XRenderFreePicture (dpy, src);
224} 239}
225 240
226static void 241static void
227get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
228{ 243{
255 double *kernel = (double *)malloc (size * sizeof (double)); 270 double *kernel = (double *)malloc (size * sizeof (double));
256 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 271 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
257 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 272 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
258 img->alloc (); 273 img->alloc ();
259 274
260 Picture src = src_picture ();
261
262 XRenderPictureAttributes pa; 275 XRenderPictureAttributes pa;
263 pa.repeat = RepeatPad; 276 pa.repeat = RepeatPad;
264 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 277 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
278 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
265 279
266 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 280 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
267 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 281 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
268 XFreePixmap (dpy, tmp_pm); 282 XFreePixmap (dpy, tmp_pm);
269 283
285 299
286 size = rv * 2 + 1; 300 size = rv * 2 + 1;
287 get_gaussian_kernel (rv, size, kernel, params); 301 get_gaussian_kernel (rv, size, kernel, params);
288 ::swap (params[0], params[1]); 302 ::swap (params[0], params[1]);
289 303
290 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 304 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
291 XRenderComposite (dpy, 305 XRenderComposite (dpy,
292 PictOpSrc, 306 PictOpSrc,
293 tmp, 307 tmp,
294 None, 308 None,
295 dst, 309 dst,
299 w, h); 313 w, h);
300 } 314 }
301 315
302 free (kernel); 316 free (kernel);
303 free (params); 317 free (params);
318
304 XRenderFreePicture (dpy, src); 319 XRenderFreePicture (dpy, src);
305 XRenderFreePicture (dpy, dst); 320 XRenderFreePicture (dpy, dst);
306 XRenderFreePicture (dpy, tmp); 321 XRenderFreePicture (dpy, tmp);
307 322
308 return img; 323 return img;
309} 324}
310 325
311static Picture 326static Picture
312create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 327create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
313{ 328{
314 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 329 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
315 330
316 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 331 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
317 XRenderPictureAttributes pa; 332 XRenderPictureAttributes pa;
318 pa.repeat = True; 333 pa.repeat = RepeatNormal;
334 pa.component_alpha = component_alpha;
319 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 335 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
320 336
321 XFreePixmap (dpy, pixmap); 337 XFreePixmap (dpy, pixmap);
322 338
323 return mask; 339 return mask;
324} 340}
325 341
342static void
343extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
344{
345 int32_t x = clamp (c, cl0, cl1);
346 c -= x;
347 xc = x;
348}
349
350static bool
351extract (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)
352{
353 extract (cl0, cl1, r, xr);
354 extract (cl0, cl1, g, xg);
355 extract (cl0, cl1, b, xb);
356 extract (cl0, cl1, a, xa);
357
358 return xr | xg | xb | xa;
359}
360
326void 361void
327rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 362rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
328{ 363{
364 unshare ();
365
329 Display *dpy = s->display->dpy; 366 Display *dpy = s->display->dpy;
330 Picture src = create_xrender_mask (dpy, pm, True);
331 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 367 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
332 368
369 // loop should not be needed for brightness, as only -1..1 makes sense
370 //while (r | g | b | a)
371 {
372 unsigned short xr, xg, xb, xa;
333 XRenderColor mask_c; 373 XRenderColor mask_c;
334 mask_c.red = r; 374
335 mask_c.green = g; 375 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
336 mask_c.blue = b; 376 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
337 mask_c.alpha = a; 377
378 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
379 {
380 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
381 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
382 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
383 mask_c.green = -mask_c.green;
384 mask_c.blue = -mask_c.blue;
385 mask_c.alpha = -mask_c.alpha;
386 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
387 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
388 }
389 }
390
391 XRenderFreePicture (dpy, dst);
392}
393
394void
395rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
396{
397 if (r < 0 || g < 0 || b < 0 || a < 0)
398 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
399
400 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
401 img->alloc ();
402
403 {
404 rxvt_color empty;
405 empty.set (s, rgba (0, 0, 0, 0));
406 img->fill (empty);
407 }
408
409 // premultiply (yeah, these are not exact, sue me or fix it)
410 r = (r * (a >> 8)) >> 8;
411 g = (g * (a >> 8)) >> 8;
412 b = (b * (a >> 8)) >> 8;
413
414 Display *dpy = s->display->dpy;
415
416 Picture src = src_picture ();
417 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
418 Picture mul = create_xrender_mask (dpy, pm, True, True);
419
420 //TODO: this operator does not yet implement some useful contrast
421 while (r | g | b | a)
422 {
423 unsigned short xr, xg, xb, xa;
424 XRenderColor mask_c;
425
426 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
427 {
338 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 428 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
339
340 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 429 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
430 }
431 }
341 432
433 XRenderFreePicture (dpy, mul);
434 XRenderFreePicture (dpy, dst);
342 XRenderFreePicture (dpy, src); 435 XRenderFreePicture (dpy, src);
343 XRenderFreePicture (dpy, dst);
344}
345 436
346void 437 ::swap (img->ref, ref);
347rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 438 ::swap (img->pm , pm );
348{
349 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
350 return;
351 439
352 Display *dpy = s->display->dpy; 440 delete img;
353 Picture src = create_xrender_mask (dpy, pm, True);
354 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
355
356 XRenderColor mask_c;
357 mask_c.red = r;
358 mask_c.green = g;
359 mask_c.blue = b;
360 mask_c.alpha = a;
361 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
362
363 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
364
365 XRenderFreePicture (dpy, src);
366 XRenderFreePicture (dpy, dst);
367} 441}
368 442
369rxvt_img * 443rxvt_img *
370rxvt_img::clone () 444rxvt_img::clone ()
371{ 445{
398 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 472 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
399 return clone (); 473 return clone ();
400 474
401 Display *dpy = s->display->dpy; 475 Display *dpy = s->display->dpy;
402 476
477 // add an alpha channel if...
403 bool alpha = !format->direct.alphaMask 478 bool alpha = !format->direct.alphaMask // pixmap has none yet
404 && (x || y) 479 && (x || y) // we need one because of non-zero offset
405 && repeat == RepeatNone; 480 && repeat == RepeatNone; // and we have no good pixels to fill with
406 481
407 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 482 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
408 img->alloc (); 483 img->alloc ();
409 484
410 Picture src = src_picture (); 485 Picture src = src_picture ();
444 } 519 }
445 520
446 return img; 521 return img;
447} 522}
448 523
449rxvt_img * 524static void
450rxvt_img::transform (int new_width, int new_height, double matrix[9]) 525mat_invert (double mat[3][3], double (&inv)[3][3])
451{ 526{
527 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
528 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
529 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
530
531 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
532
533 inv [0][0] = invdet * s0;
534 inv [0][1] = invdet * s1;
535 inv [0][2] = invdet * s2;
536
537 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
538 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
539 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
540
541 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
542 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
543 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
544}
545
546static double
547mat_apply (double mat[3][3], int i, double x, double y)
548{
549 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
550 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
551
552 return v * (1. / w);
553}
554
555rxvt_img *
556rxvt_img::transform (double matrix[3][3])
557{
558 // find new offset
559 int ox = mat_apply (matrix, 0, x, y);
560 int oy = mat_apply (matrix, 1, x, y);
561
562 // calculate new pixel bounding box coordinates
563 double d [2], rmin[2], rmax[2];
564
565 for (int i = 0; i < 2; ++i)
566 {
567 double v;
568 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;
569 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
570 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
571 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
572 }
573
574 int dx = floor (rmin [0]);
575 int dy = floor (rmin [1]);
576
577 int new_width = ceil (rmax [0] - dx);
578 int new_height = ceil (rmax [1] - dy);
579
580 double inv[3][3];
581 mat_invert (matrix, inv);
582
452 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 583 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
453 img->alloc (); 584 img->alloc ();
454 585
455 Display *dpy = s->display->dpy; 586 Display *dpy = s->display->dpy;
456 Picture src = src_picture (); 587 Picture src = src_picture ();
457 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 588 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
458 589
459 XTransform xfrm; 590 XTransform xfrm;
460 591
461 for (int i = 0; i < 3; ++i) 592 for (int i = 0; i < 3; ++i)
462 for (int j = 0; j < 3; ++j) 593 for (int j = 0; j < 3; ++j)
463 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 594 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
464
465#if 0
466 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
467 xfrm.matrix [1][2] -= XDoubleToFixed (y);
468#endif
469 595
470 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 596 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
471 XRenderSetPictureTransform (dpy, src, &xfrm); 597 XRenderSetPictureTransform (dpy, src, &xfrm);
472 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 598 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
473 599
474 XRenderFreePicture (dpy, src); 600 XRenderFreePicture (dpy, src);
475 XRenderFreePicture (dpy, dst); 601 XRenderFreePicture (dpy, dst);
476 602
477 return img; 603 return img;
481rxvt_img::scale (int new_width, int new_height) 607rxvt_img::scale (int new_width, int new_height)
482{ 608{
483 if (w == new_width && h == new_height) 609 if (w == new_width && h == new_height)
484 return clone (); 610 return clone ();
485 611
486 double matrix[9] = { 612 double matrix[3][3] = {
487 w / (double)new_width, 0, 0, 613 { new_width / (double)w, 0, 0 },
488 0, h / (double)new_height, 0, 614 { 0, new_height / (double)h, 0 },
489 0, 0, 1 615 { 0, 0, 1 }
490 }; 616 };
491 617
492 int old_repeat_mode = repeat; 618 int old_repeat_mode = repeat;
493 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 619 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
494 620
495 rxvt_img *img = transform (new_width, new_height, matrix); 621 rxvt_img *img = transform (matrix);
496 622
497 repeat = old_repeat_mode; 623 repeat = old_repeat_mode;
498 img->repeat = repeat; 624 img->repeat = repeat;
499 625
500 return img; 626 return img;
501} 627}
502 628
503rxvt_img * 629rxvt_img *
504rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 630rxvt_img::rotate (int cx, int cy, double phi)
505{ 631{
506 double s = sin (phi); 632 double s = sin (phi);
507 double c = cos (phi); 633 double c = cos (phi);
508 634
509 double matrix[9] = { 635 double matrix[3][3] = {
510 c, -s, -c * x + s * y + x, 636 { c, -s, cx - c * cx + s * cy },
511 s, c, -s * x - c * y + y, 637 { s, c, cy - s * cx - c * cy },
512 0, 0, 1 638 { 0, 0, 1 }
639 //{ c, -s, 0 },
640 //{ s, c, 0 },
641 //{ 0, 0, 1 }
513 }; 642 };
514 643
515 return transform (new_width, new_height, matrix); 644 //move (-cx, -cy);
645 rxvt_img *img = transform (matrix);
646 //move ( cx, cy);
647 //img->move (cx, cy);
648
649 return img;
516} 650}
517 651
518rxvt_img * 652rxvt_img *
519rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 653rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
520{ 654{
554{ 688{
555 rxvt_img *img2 = clone (); 689 rxvt_img *img2 = clone ();
556 Display *dpy = s->display->dpy; 690 Display *dpy = s->display->dpy;
557 Picture src = img->src_picture (); 691 Picture src = img->src_picture ();
558 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 692 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
559 Picture mask = create_xrender_mask (dpy, img->pm, False); 693 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
560 694
561 XRenderColor mask_c; 695 XRenderColor mask_c;
562 696
563 mask_c.alpha = float_to_component (factor); 697 mask_c.alpha = float_to_component (factor);
564 mask_c.red = 698 mask_c.red =

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines