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.23 by sf-exg, Tue Jun 5 18:48:21 2012 UTC vs.
Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines