|
|
1 | #include <string.h> |
1 | #include <math.h> |
2 | #include <math.h> |
2 | #include "../config.h" |
3 | #include "../config.h" |
3 | #include "rxvt.h" |
4 | #include "rxvt.h" |
4 | |
5 | |
5 | #if HAVE_IMG |
6 | #if HAVE_IMG |
6 | |
7 | |
|
|
8 | typedef rxvt_img::nv nv; |
|
|
9 | |
|
|
10 | namespace |
|
|
11 | { |
|
|
12 | |
|
|
13 | struct mat3x3 |
|
|
14 | { |
|
|
15 | nv v[3][3]; |
|
|
16 | |
|
|
17 | mat3x3 () |
|
|
18 | { |
|
|
19 | } |
|
|
20 | |
|
|
21 | mat3x3 (nv matrix[3][3]) |
|
|
22 | { |
|
|
23 | memcpy (v, matrix, sizeof (v)); |
|
|
24 | } |
|
|
25 | |
|
|
26 | mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33) |
|
|
27 | { |
|
|
28 | v[0][0] = v11; v[0][1] = v12; v[0][2] = v13; |
|
|
29 | v[1][0] = v21; v[1][1] = v22; v[1][2] = v23; |
|
|
30 | v[2][0] = v31; v[2][1] = v32; v[2][2] = v33; |
|
|
31 | } |
|
|
32 | |
|
|
33 | mat3x3 invert (); |
|
|
34 | |
|
|
35 | nv *operator [](int i) { return &v[i][0]; } |
|
|
36 | const nv *operator [](int i) const { return &v[i][0]; } |
|
|
37 | |
|
|
38 | // quite inefficient, hopefully gcc pulls the w calc out of any loops |
|
|
39 | nv apply1 (int i, nv x, nv y) |
|
|
40 | { |
|
|
41 | mat3x3 &m = *this; |
|
|
42 | |
|
|
43 | nv v = m[i][0] * x + m[i][1] * y + m[i][2]; |
|
|
44 | nv w = m[2][0] * x + m[2][1] * y + m[2][2]; |
|
|
45 | |
|
|
46 | return v * (1. / w); |
|
|
47 | } |
|
|
48 | |
|
|
49 | static mat3x3 translate (nv x, nv y); |
|
|
50 | }; |
|
|
51 | |
|
|
52 | mat3x3 |
|
|
53 | mat3x3::invert () |
|
|
54 | { |
|
|
55 | mat3x3 &m = *this; |
|
|
56 | mat3x3 inv; |
|
|
57 | |
|
|
58 | nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2]; |
|
|
59 | nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1]; |
|
|
60 | nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2]; |
|
|
61 | |
|
|
62 | nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2); |
|
|
63 | |
|
|
64 | inv[0][0] = invdet * s0; |
|
|
65 | inv[0][1] = invdet * s1; |
|
|
66 | inv[0][2] = invdet * s2; |
|
|
67 | |
|
|
68 | inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]); |
|
|
69 | inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]); |
|
|
70 | inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]); |
|
|
71 | |
|
|
72 | inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]); |
|
|
73 | inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]); |
|
|
74 | inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]); |
|
|
75 | |
|
|
76 | return inv; |
|
|
77 | } |
|
|
78 | |
|
|
79 | static mat3x3 |
|
|
80 | operator *(const mat3x3 &a, const mat3x3 &b) |
|
|
81 | { |
|
|
82 | mat3x3 r; |
|
|
83 | |
|
|
84 | for (int i = 0; i < 3; ++i) |
|
|
85 | for (int j = 0; j < 3; ++j) |
|
|
86 | r[i][j] = a[i][0] * b[0][j] |
|
|
87 | + a[i][1] * b[1][j] |
|
|
88 | + a[i][2] * b[2][j]; |
|
|
89 | |
|
|
90 | return r; |
|
|
91 | } |
|
|
92 | |
|
|
93 | mat3x3 |
|
|
94 | mat3x3::translate (nv x, nv y) |
|
|
95 | { |
|
|
96 | return mat3x3 ( |
|
|
97 | 1, 0, x, |
|
|
98 | 0, 1, y, |
|
|
99 | 0, 0, 1 |
|
|
100 | ); |
|
|
101 | } |
|
|
102 | |
|
|
103 | } |
|
|
104 | |
|
|
105 | #if 0 |
|
|
106 | struct pict |
|
|
107 | { |
|
|
108 | Display *dpy; |
|
|
109 | Picture pic; |
|
|
110 | |
|
|
111 | operator Picture () const |
|
|
112 | { |
|
|
113 | return pic; |
|
|
114 | } |
|
|
115 | |
|
|
116 | pict () |
|
|
117 | : pic (0) |
|
|
118 | { |
|
|
119 | } |
|
|
120 | |
|
|
121 | pict (rxvt_img *img, XRenderPictFormat *format = 0) |
|
|
122 | : dpy (img->s->display->dpy) |
|
|
123 | { |
|
|
124 | XRenderPictureAttributes pa; |
|
|
125 | pa.repeat = img->repeat; |
|
|
126 | pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa); |
|
|
127 | } |
|
|
128 | |
|
|
129 | ~pict () |
|
|
130 | { |
|
|
131 | if (pic) |
|
|
132 | XRenderFreePicture (dpy, pic); |
|
|
133 | } |
|
|
134 | }; |
|
|
135 | #endif |
|
|
136 | |
|
|
137 | static XRenderPictFormat * |
|
|
138 | find_alpha_format_for (Display *dpy, XRenderPictFormat *format) |
|
|
139 | { |
|
|
140 | if (format->direct.alphaMask) |
|
|
141 | return format; // already has alpha |
|
|
142 | |
|
|
143 | // try to find a suitable alpha format, one bit alpha is enough for our purposes |
|
|
144 | if (format->type == PictTypeDirect) |
|
|
145 | for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n) |
|
|
146 | if (f->direct.alphaMask |
|
|
147 | && f->type == PictTypeDirect |
|
|
148 | && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask ) |
|
|
149 | && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask) |
|
|
150 | && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask )) |
|
|
151 | return f; |
|
|
152 | |
|
|
153 | // should be a very good fallback |
|
|
154 | return XRenderFindStandardFormat (dpy, PictStandardARGB32); |
|
|
155 | } |
|
|
156 | |
7 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) |
157 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) |
8 | : s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat), |
158 | : s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat), |
9 | pm(0), ref(0) |
159 | pm(0), ref(0) |
10 | { |
160 | { |
11 | } |
161 | } |
… | |
… | |
13 | rxvt_img::rxvt_img (const rxvt_img &img) |
163 | rxvt_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) |
164 | : 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 | { |
165 | { |
16 | ++ref->cnt; |
166 | ++ref->cnt; |
17 | } |
167 | } |
18 | |
|
|
19 | #if 0 |
|
|
20 | rxvt_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 | |
168 | |
26 | rxvt_img * |
169 | rxvt_img * |
27 | rxvt_img::new_from_root (rxvt_screen *s) |
170 | rxvt_img::new_from_root (rxvt_screen *s) |
28 | { |
171 | { |
29 | Display *dpy = s->display->dpy; |
172 | Display *dpy = s->display->dpy; |
… | |
… | |
56 | img->ref->ours = false; |
199 | img->ref->ours = false; |
57 | |
200 | |
58 | return img; |
201 | return img; |
59 | } |
202 | } |
60 | |
203 | |
|
|
204 | # if HAVE_PIXBUF |
|
|
205 | |
61 | rxvt_img * |
206 | rxvt_img * |
62 | rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) |
207 | rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) |
63 | { |
208 | { |
64 | Display *dpy = s->display->dpy; |
209 | Display *dpy = s->display->dpy; |
65 | |
210 | |
… | |
… | |
69 | if (width > 32767 || height > 32767) // well, we *could* upload in chunks |
214 | 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"); |
215 | rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n"); |
71 | |
216 | |
72 | // since we require rgb24/argb32 formats from xrender we assume |
217 | // 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 |
218 | // 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; |
|
|
75 | |
219 | |
76 | int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; |
220 | int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; |
77 | |
221 | |
78 | XImage xi; |
222 | XImage xi; |
79 | |
223 | |
… | |
… | |
83 | xi.format = ZPixmap; |
227 | xi.format = ZPixmap; |
84 | xi.byte_order = ImageByteOrder (dpy); |
228 | xi.byte_order = ImageByteOrder (dpy); |
85 | xi.bitmap_unit = 0; //XY only, unused |
229 | xi.bitmap_unit = 0; //XY only, unused |
86 | xi.bitmap_bit_order = 0; //XY only, unused |
230 | xi.bitmap_bit_order = 0; //XY only, unused |
87 | xi.bitmap_pad = BitmapPad (dpy); |
231 | xi.bitmap_pad = BitmapPad (dpy); |
88 | xi.depth = depth; |
232 | xi.depth = 32; |
89 | xi.bytes_per_line = 0; |
233 | xi.bytes_per_line = 0; |
90 | xi.bits_per_pixel = 32; //Z only |
234 | xi.bits_per_pixel = 32; //Z only |
91 | xi.red_mask = 0x00000000; //Z only, unused |
235 | xi.red_mask = 0x00000000; //Z only, unused |
92 | xi.green_mask = 0x00000000; //Z only, unused |
236 | xi.green_mask = 0x00000000; //Z only, unused |
93 | xi.blue_mask = 0x00000000; //Z only, unused |
237 | xi.blue_mask = 0x00000000; //Z only, unused |
… | |
… | |
102 | rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); |
246 | rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); |
103 | |
247 | |
104 | xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); |
248 | xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); |
105 | |
249 | |
106 | int rowstride = gdk_pixbuf_get_rowstride (pb); |
250 | int rowstride = gdk_pixbuf_get_rowstride (pb); |
107 | |
251 | bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb); |
108 | assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb)); |
|
|
109 | unsigned char *row = gdk_pixbuf_get_pixels (pb); |
252 | unsigned char *row = gdk_pixbuf_get_pixels (pb); |
|
|
253 | |
110 | char *line = xi.data; |
254 | char *line = xi.data; |
111 | |
255 | |
112 | for (int y = 0; y < height; y++) |
256 | for (int y = 0; y < height; y++) |
113 | { |
257 | { |
114 | unsigned char *src = row; |
258 | unsigned char *src = row; |
115 | uint32_t *dst = (uint32_t *)line; |
259 | uint32_t *dst = (uint32_t *)line; |
116 | |
260 | |
117 | if (depth == 24) |
261 | if (!pb_has_alpha) |
118 | for (int x = 0; x < width; x++) |
262 | for (int x = 0; x < width; x++) |
119 | { |
263 | { |
120 | uint8_t r = *src++; |
264 | uint8_t r = *src++; |
121 | uint8_t g = *src++; |
265 | uint8_t g = *src++; |
122 | uint8_t b = *src++; |
266 | uint8_t b = *src++; |
123 | |
267 | |
124 | uint32_t v = (r << 16) | (g << 8) | b; |
268 | uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; |
125 | |
269 | |
126 | if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) |
270 | if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) |
127 | v = ecb_bswap32 (v); |
271 | v = ecb_bswap32 (v); |
128 | |
272 | |
129 | *dst++ = v; |
273 | *dst++ = v; |
… | |
… | |
146 | |
290 | |
147 | row += rowstride; |
291 | row += rowstride; |
148 | line += xi.bytes_per_line; |
292 | line += xi.bytes_per_line; |
149 | } |
293 | } |
150 | |
294 | |
151 | rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); |
295 | rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height); |
152 | img->alloc (); |
296 | img->alloc (); |
153 | |
297 | |
154 | GC gc = XCreateGC (dpy, img->pm, 0, 0); |
298 | GC gc = XCreateGC (dpy, img->pm, 0, 0); |
155 | XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); |
299 | XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); |
156 | XFreeGC (dpy, gc); |
300 | XFreeGC (dpy, gc); |
… | |
… | |
174 | g_object_unref (pb); |
318 | g_object_unref (pb); |
175 | |
319 | |
176 | return img; |
320 | return img; |
177 | } |
321 | } |
178 | |
322 | |
|
|
323 | # endif |
|
|
324 | |
179 | void |
325 | void |
180 | rxvt_img::destroy () |
326 | rxvt_img::destroy () |
181 | { |
327 | { |
182 | if (--ref->cnt) |
328 | if (--ref->cnt) |
183 | return; |
329 | return; |
… | |
… | |
199 | pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); |
345 | pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); |
200 | ref = new pixref (w, h); |
346 | ref = new pixref (w, h); |
201 | } |
347 | } |
202 | |
348 | |
203 | Picture |
349 | Picture |
204 | rxvt_img::src_picture () |
350 | rxvt_img::picture () |
205 | { |
351 | { |
206 | Display *dpy = s->display->dpy; |
352 | Display *dpy = s->display->dpy; |
207 | |
353 | |
208 | XRenderPictureAttributes pa; |
354 | XRenderPictureAttributes pa; |
209 | pa.repeat = repeat; |
355 | pa.repeat = repeat; |
… | |
… | |
216 | rxvt_img::unshare () |
362 | rxvt_img::unshare () |
217 | { |
363 | { |
218 | if (ref->cnt == 1 && ref->ours) |
364 | if (ref->cnt == 1 && ref->ours) |
219 | return; |
365 | return; |
220 | |
366 | |
221 | //TODO: maybe should reify instead |
|
|
222 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
367 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
223 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
368 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
224 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
369 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
225 | XFreeGC (s->display->dpy, gc); |
370 | XFreeGC (s->display->dpy, gc); |
226 | |
371 | |
… | |
… | |
229 | pm = pm2; |
374 | pm = pm2; |
230 | ref = new pixref (ref->w, ref->h); |
375 | ref = new pixref (ref->w, ref->h); |
231 | } |
376 | } |
232 | |
377 | |
233 | void |
378 | void |
234 | rxvt_img::fill (const rxvt_color &c) |
379 | rxvt_img::fill (const rgba &c) |
235 | { |
380 | { |
236 | XGCValues gcv; |
381 | XRenderColor rc = { c.r, c.g, c.b, c.a }; |
237 | gcv.foreground = c; |
382 | |
238 | GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); |
383 | Display *dpy = s->display->dpy; |
239 | XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); |
384 | Picture src = picture (); |
240 | XFreeGC (s->display->dpy, gc); |
385 | XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); |
|
|
386 | XRenderFreePicture (dpy, src); |
|
|
387 | } |
|
|
388 | |
|
|
389 | void |
|
|
390 | rxvt_img::add_alpha () |
|
|
391 | { |
|
|
392 | if (format->direct.alphaMask) |
|
|
393 | return; |
|
|
394 | |
|
|
395 | Display *dpy = s->display->dpy; |
|
|
396 | |
|
|
397 | rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); |
|
|
398 | img->alloc (); |
|
|
399 | |
|
|
400 | Picture src = picture (); |
|
|
401 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
|
|
402 | |
|
|
403 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
404 | |
|
|
405 | XRenderFreePicture (dpy, src); |
|
|
406 | XRenderFreePicture (dpy, dst); |
|
|
407 | |
|
|
408 | ::swap (img->ref, ref); |
|
|
409 | ::swap (img->pm , pm ); |
|
|
410 | |
|
|
411 | delete img; |
241 | } |
412 | } |
242 | |
413 | |
243 | static void |
414 | static void |
244 | get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) |
415 | get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params) |
245 | { |
416 | { |
246 | double sigma = radius / 2.0; |
417 | nv sigma = radius / 2.0; |
247 | double scale = sqrt (2.0 * M_PI) * sigma; |
418 | nv scale = sqrt (2.0 * M_PI) * sigma; |
248 | double sum = 0.0; |
419 | nv sum = 0.0; |
249 | |
420 | |
250 | for (int i = 0; i < width; i++) |
421 | for (int i = 0; i < width; i++) |
251 | { |
422 | { |
252 | double x = i - width / 2; |
423 | nv x = i - width / 2; |
253 | kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; |
424 | kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; |
254 | sum += kernel[i]; |
425 | sum += kernel[i]; |
255 | } |
426 | } |
256 | |
427 | |
257 | params[0] = XDoubleToFixed (width); |
428 | params[0] = XDoubleToFixed (width); |
… | |
… | |
267 | if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) |
438 | if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) |
268 | return clone (); |
439 | return clone (); |
269 | |
440 | |
270 | Display *dpy = s->display->dpy; |
441 | Display *dpy = s->display->dpy; |
271 | int size = max (rh, rv) * 2 + 1; |
442 | int size = max (rh, rv) * 2 + 1; |
272 | double *kernel = (double *)malloc (size * sizeof (double)); |
443 | nv *kernel = (nv *)malloc (size * sizeof (nv)); |
273 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
444 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
274 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
445 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
275 | img->alloc (); |
446 | img->alloc (); |
276 | |
447 | |
277 | Picture src = src_picture (); |
|
|
278 | |
|
|
279 | XRenderPictureAttributes pa; |
448 | XRenderPictureAttributes pa; |
280 | pa.repeat = RepeatPad; |
449 | pa.repeat = RepeatPad; |
281 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); |
450 | Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); |
|
|
451 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); |
282 | |
452 | |
283 | Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); |
453 | Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); |
284 | Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); |
454 | Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); |
285 | XFreePixmap (dpy, tmp_pm); |
455 | XFreePixmap (dpy, tmp_pm); |
286 | |
456 | |
… | |
… | |
302 | |
472 | |
303 | size = rv * 2 + 1; |
473 | size = rv * 2 + 1; |
304 | get_gaussian_kernel (rv, size, kernel, params); |
474 | get_gaussian_kernel (rv, size, kernel, params); |
305 | ::swap (params[0], params[1]); |
475 | ::swap (params[0], params[1]); |
306 | |
476 | |
307 | XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); |
477 | XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2); |
308 | XRenderComposite (dpy, |
478 | XRenderComposite (dpy, |
309 | PictOpSrc, |
479 | PictOpSrc, |
310 | tmp, |
480 | tmp, |
311 | None, |
481 | None, |
312 | dst, |
482 | dst, |
… | |
… | |
316 | w, h); |
486 | w, h); |
317 | } |
487 | } |
318 | |
488 | |
319 | free (kernel); |
489 | free (kernel); |
320 | free (params); |
490 | free (params); |
|
|
491 | |
321 | XRenderFreePicture (dpy, src); |
492 | XRenderFreePicture (dpy, src); |
322 | XRenderFreePicture (dpy, dst); |
493 | XRenderFreePicture (dpy, dst); |
323 | XRenderFreePicture (dpy, tmp); |
494 | XRenderFreePicture (dpy, tmp); |
324 | |
495 | |
325 | return img; |
496 | return img; |
326 | } |
497 | } |
327 | |
498 | |
328 | static Picture |
499 | static Picture |
329 | create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) |
500 | create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) |
330 | { |
501 | { |
331 | Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); |
502 | Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); |
332 | |
503 | |
333 | XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); |
504 | XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); |
334 | XRenderPictureAttributes pa; |
505 | XRenderPictureAttributes pa; |
335 | pa.repeat = True; |
506 | pa.repeat = RepeatNormal; |
|
|
507 | pa.component_alpha = component_alpha; |
336 | Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); |
508 | Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa); |
337 | |
509 | |
338 | XFreePixmap (dpy, pixmap); |
510 | XFreePixmap (dpy, pixmap); |
339 | |
511 | |
340 | return mask; |
512 | return mask; |
341 | } |
513 | } |
342 | |
514 | |
|
|
515 | static void |
|
|
516 | extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) |
|
|
517 | { |
|
|
518 | int32_t x = clamp (c, cl0, cl1); |
|
|
519 | c -= x; |
|
|
520 | xc = x; |
|
|
521 | } |
|
|
522 | |
|
|
523 | static bool |
|
|
524 | 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) |
|
|
525 | { |
|
|
526 | extract (cl0, cl1, r, xr); |
|
|
527 | extract (cl0, cl1, g, xg); |
|
|
528 | extract (cl0, cl1, b, xb); |
|
|
529 | extract (cl0, cl1, a, xa); |
|
|
530 | |
|
|
531 | return xr | xg | xb | xa; |
|
|
532 | } |
|
|
533 | |
343 | void |
534 | void |
344 | rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) |
535 | rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) |
345 | { |
536 | { |
|
|
537 | unshare (); |
|
|
538 | |
346 | Display *dpy = s->display->dpy; |
539 | Display *dpy = s->display->dpy; |
347 | Picture src = create_xrender_mask (dpy, pm, True); |
|
|
348 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
540 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
349 | |
541 | |
|
|
542 | // loop should not be needed for brightness, as only -1..1 makes sense |
|
|
543 | //while (r | g | b | a) |
|
|
544 | { |
|
|
545 | unsigned short xr, xg, xb, xa; |
350 | XRenderColor mask_c; |
546 | XRenderColor mask_c; |
351 | mask_c.red = r; |
547 | |
352 | mask_c.green = g; |
548 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
353 | mask_c.blue = b; |
549 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
354 | mask_c.alpha = a; |
550 | |
|
|
551 | if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
552 | { |
|
|
553 | XRenderColor mask_w = { 65535, 65535, 65535, 65535 }; |
|
|
554 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
555 | mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing |
|
|
556 | mask_c.green = -mask_c.green; |
|
|
557 | mask_c.blue = -mask_c.blue; |
|
|
558 | mask_c.alpha = -mask_c.alpha; |
|
|
559 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
|
|
560 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
561 | } |
|
|
562 | } |
|
|
563 | |
|
|
564 | XRenderFreePicture (dpy, dst); |
|
|
565 | } |
|
|
566 | |
|
|
567 | void |
|
|
568 | rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) |
|
|
569 | { |
|
|
570 | if (r < 0 || g < 0 || b < 0 || a < 0) |
|
|
571 | rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); |
|
|
572 | |
|
|
573 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
|
|
574 | img->alloc (); |
|
|
575 | img->fill (rgba (0, 0, 0, 0)); |
|
|
576 | |
|
|
577 | // premultiply (yeah, these are not exact, sue me or fix it) |
|
|
578 | r = (r * (a >> 8)) >> 8; |
|
|
579 | g = (g * (a >> 8)) >> 8; |
|
|
580 | b = (b * (a >> 8)) >> 8; |
|
|
581 | |
|
|
582 | Display *dpy = s->display->dpy; |
|
|
583 | |
|
|
584 | Picture src = picture (); |
|
|
585 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); |
|
|
586 | Picture mul = create_xrender_mask (dpy, pm, True, True); |
|
|
587 | |
|
|
588 | //TODO: this operator does not yet implement some useful contrast |
|
|
589 | while (r | g | b | a) |
|
|
590 | { |
|
|
591 | unsigned short xr, xg, xb, xa; |
|
|
592 | XRenderColor mask_c; |
|
|
593 | |
|
|
594 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
595 | { |
|
|
596 | XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); |
|
|
597 | XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
598 | } |
|
|
599 | } |
|
|
600 | |
|
|
601 | XRenderFreePicture (dpy, mul); |
|
|
602 | XRenderFreePicture (dpy, dst); |
|
|
603 | XRenderFreePicture (dpy, src); |
|
|
604 | |
|
|
605 | ::swap (img->ref, ref); |
|
|
606 | ::swap (img->pm , pm ); |
|
|
607 | |
|
|
608 | delete img; |
|
|
609 | } |
|
|
610 | |
|
|
611 | void |
|
|
612 | rxvt_img::draw (rxvt_img *img, int op, nv mask) |
|
|
613 | { |
|
|
614 | unshare (); |
|
|
615 | |
|
|
616 | Display *dpy = s->display->dpy; |
|
|
617 | Picture src = img->picture (); |
|
|
618 | Picture dst = picture (); |
|
|
619 | Picture mask_p = 0; |
|
|
620 | |
|
|
621 | if (mask != 1.) |
|
|
622 | { |
|
|
623 | mask_p = create_xrender_mask (dpy, img->pm, False, False); |
|
|
624 | XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) }; |
355 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
625 | XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); |
|
|
626 | } |
356 | |
627 | |
357 | XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
628 | XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h); |
358 | |
629 | |
359 | XRenderFreePicture (dpy, src); |
630 | XRenderFreePicture (dpy, src); |
360 | XRenderFreePicture (dpy, dst); |
631 | XRenderFreePicture (dpy, dst); |
361 | } |
|
|
362 | |
632 | |
363 | void |
633 | if (mask_p) |
364 | rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) |
|
|
365 | { |
|
|
366 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
|
|
367 | return; |
|
|
368 | |
|
|
369 | Display *dpy = s->display->dpy; |
|
|
370 | Picture src = create_xrender_mask (dpy, pm, True); |
|
|
371 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
|
|
372 | |
|
|
373 | XRenderColor mask_c; |
|
|
374 | mask_c.red = r; |
|
|
375 | mask_c.green = g; |
|
|
376 | mask_c.blue = b; |
|
|
377 | mask_c.alpha = a; |
|
|
378 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
|
|
379 | |
|
|
380 | XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
381 | |
|
|
382 | XRenderFreePicture (dpy, src); |
634 | XRenderFreePicture (dpy, mask_p); |
383 | XRenderFreePicture (dpy, dst); |
|
|
384 | } |
635 | } |
385 | |
636 | |
386 | rxvt_img * |
637 | rxvt_img * |
387 | rxvt_img::clone () |
638 | rxvt_img::clone () |
388 | { |
639 | { |
389 | return new rxvt_img (*this); |
640 | return new rxvt_img (*this); |
390 | } |
|
|
391 | |
|
|
392 | static XRenderPictFormat * |
|
|
393 | find_alpha_format_for (Display *dpy, XRenderPictFormat *format) |
|
|
394 | { |
|
|
395 | if (format->direct.alphaMask) |
|
|
396 | return format; // already has alpha |
|
|
397 | |
|
|
398 | // try to find a suitable alpha format, one bit alpha is enough for our purposes |
|
|
399 | if (format->type == PictTypeDirect) |
|
|
400 | for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n) |
|
|
401 | if (f->direct.alphaMask |
|
|
402 | && f->type == PictTypeDirect |
|
|
403 | && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask ) |
|
|
404 | && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask) |
|
|
405 | && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask )) |
|
|
406 | return f; |
|
|
407 | |
|
|
408 | // should be a very good fallback |
|
|
409 | return XRenderFindStandardFormat (dpy, PictStandardARGB32); |
|
|
410 | } |
641 | } |
411 | |
642 | |
412 | rxvt_img * |
643 | rxvt_img * |
413 | rxvt_img::reify () |
644 | rxvt_img::reify () |
414 | { |
645 | { |
415 | if (x == 0 && y == 0 && w == ref->w && h == ref->h) |
646 | if (x == 0 && y == 0 && w == ref->w && h == ref->h) |
416 | return clone (); |
647 | return clone (); |
417 | |
648 | |
418 | Display *dpy = s->display->dpy; |
649 | Display *dpy = s->display->dpy; |
419 | |
650 | |
|
|
651 | // add an alpha channel if... |
420 | bool alpha = !format->direct.alphaMask |
652 | bool alpha = !format->direct.alphaMask // pixmap has none yet |
421 | && (x || y) |
653 | && (x || y) // we need one because of non-zero offset |
422 | && repeat == RepeatNone; |
654 | && repeat == RepeatNone; // and we have no good pixels to fill with |
423 | |
655 | |
424 | rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); |
656 | rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); |
425 | img->alloc (); |
657 | img->alloc (); |
426 | |
658 | |
427 | Picture src = src_picture (); |
659 | Picture src = picture (); |
428 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
660 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
429 | |
661 | |
430 | if (alpha) |
662 | if (alpha) |
431 | { |
663 | { |
432 | XRenderColor rc = { 0, 0, 0, 0 }; |
664 | XRenderColor rc = { 0, 0, 0, 0 }; |
433 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles |
665 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles |
434 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); |
666 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h); |
435 | } |
667 | } |
436 | else |
668 | else |
437 | XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); |
669 | XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h); |
438 | |
670 | |
439 | XRenderFreePicture (dpy, src); |
671 | XRenderFreePicture (dpy, src); |
440 | XRenderFreePicture (dpy, dst); |
672 | XRenderFreePicture (dpy, dst); |
441 | |
673 | |
442 | return img; |
674 | return img; |
… | |
… | |
445 | rxvt_img * |
677 | rxvt_img * |
446 | rxvt_img::sub_rect (int x, int y, int width, int height) |
678 | rxvt_img::sub_rect (int x, int y, int width, int height) |
447 | { |
679 | { |
448 | rxvt_img *img = clone (); |
680 | rxvt_img *img = clone (); |
449 | |
681 | |
450 | img->x += x; |
682 | img->x -= x; |
451 | img->y += y; |
683 | img->y -= y; |
452 | |
684 | |
453 | if (w != width || h != height) |
685 | if (w != width || h != height) |
454 | { |
686 | { |
455 | img->w = width; |
687 | img->w = width; |
456 | img->h = height; |
688 | img->h = height; |
… | |
… | |
462 | |
694 | |
463 | return img; |
695 | return img; |
464 | } |
696 | } |
465 | |
697 | |
466 | rxvt_img * |
698 | rxvt_img * |
467 | rxvt_img::transform (int new_width, int new_height, double matrix[9]) |
699 | rxvt_img::transform (nv matrix[3][3]) |
468 | { |
700 | { |
|
|
701 | // calculate new pixel bounding box coordinates |
|
|
702 | nv r[2], rmin[2], rmax[2]; |
|
|
703 | |
|
|
704 | mat3x3 m (matrix); |
|
|
705 | |
|
|
706 | for (int i = 0; i < 2; ++i) |
|
|
707 | { |
|
|
708 | nv v; |
|
|
709 | |
|
|
710 | v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v; |
|
|
711 | v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v); |
|
|
712 | v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); |
|
|
713 | v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); |
|
|
714 | } |
|
|
715 | |
|
|
716 | float sx = rmin [0] - x; |
|
|
717 | float sy = rmin [1] - y; |
|
|
718 | |
|
|
719 | // TODO: adjust matrix for subpixel accuracy |
|
|
720 | int nx = floor (rmin [0]); |
|
|
721 | int ny = floor (rmin [1]); |
|
|
722 | |
|
|
723 | int new_width = ceil (rmax [0] - rmin [0]); |
|
|
724 | int new_height = ceil (rmax [1] - rmin [1]); |
|
|
725 | |
|
|
726 | m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y); |
|
|
727 | |
|
|
728 | mat3x3 inv = m.invert (); |
|
|
729 | |
469 | rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); |
730 | rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat); |
470 | img->alloc (); |
731 | img->alloc (); |
471 | |
732 | |
472 | Display *dpy = s->display->dpy; |
733 | Display *dpy = s->display->dpy; |
473 | Picture src = src_picture (); |
734 | Picture src = picture (); |
474 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
735 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
475 | |
736 | |
476 | XTransform xfrm; |
737 | XTransform xfrm; |
477 | |
738 | |
478 | for (int i = 0; i < 3; ++i) |
739 | for (int i = 0; i < 3; ++i) |
479 | for (int j = 0; j < 3; ++j) |
740 | for (int j = 0; j < 3; ++j) |
480 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
741 | xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); |
481 | |
|
|
482 | #if 0 |
|
|
483 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
|
|
484 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
|
|
485 | #endif |
|
|
486 | |
742 | |
487 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
743 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
488 | XRenderSetPictureTransform (dpy, src, &xfrm); |
744 | XRenderSetPictureTransform (dpy, src, &xfrm); |
489 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
745 | XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height); |
|
|
746 | #if 1 |
|
|
747 | { |
|
|
748 | XRenderColor rc = { 65535,0,0,65535 }; |
|
|
749 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, new_width, new_height); |
|
|
750 | }{ |
|
|
751 | XRenderColor rc = { 0,0,0,65535 }; |
|
|
752 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 1, 1, new_width - 2, new_height - 2); |
|
|
753 | } |
|
|
754 | XRenderComposite (dpy, PictOpOver, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height); |
|
|
755 | #endif |
490 | |
756 | |
491 | XRenderFreePicture (dpy, src); |
757 | XRenderFreePicture (dpy, src); |
492 | XRenderFreePicture (dpy, dst); |
758 | XRenderFreePicture (dpy, dst); |
493 | |
759 | |
494 | return img; |
760 | return img; |
… | |
… | |
498 | rxvt_img::scale (int new_width, int new_height) |
764 | rxvt_img::scale (int new_width, int new_height) |
499 | { |
765 | { |
500 | if (w == new_width && h == new_height) |
766 | if (w == new_width && h == new_height) |
501 | return clone (); |
767 | return clone (); |
502 | |
768 | |
503 | double matrix[9] = { |
769 | nv matrix[3][3] = { |
504 | w / (double)new_width, 0, 0, |
770 | { new_width / (nv)w, 0, 0 }, |
505 | 0, h / (double)new_height, 0, |
771 | { 0, new_height / (nv)h, 0 }, |
506 | 0, 0, 1 |
772 | { 0, 0, 1 } |
507 | }; |
773 | }; |
508 | |
774 | |
509 | int old_repeat_mode = repeat; |
775 | int old_repeat_mode = repeat; |
510 | repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems |
776 | repeat = RepeatPad; // not right, but xrender can't properly scale it seems |
511 | |
777 | |
512 | rxvt_img *img = transform (new_width, new_height, matrix); |
778 | rxvt_img *img = transform (matrix); |
513 | |
779 | |
514 | repeat = old_repeat_mode; |
780 | repeat = old_repeat_mode; |
515 | img->repeat = repeat; |
781 | img->repeat = repeat; |
516 | |
782 | |
517 | return img; |
783 | return img; |
518 | } |
784 | } |
519 | |
785 | |
520 | rxvt_img * |
786 | rxvt_img * |
521 | rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) |
787 | rxvt_img::rotate (int cx, int cy, nv phi) |
522 | { |
788 | { |
523 | double s = sin (phi); |
789 | nv s = sin (phi); |
524 | double c = cos (phi); |
790 | nv c = cos (phi); |
525 | |
791 | |
526 | double matrix[9] = { |
792 | nv matrix[3][3] = { |
|
|
793 | #if 0 |
527 | c, -s, -c * x + s * y + x, |
794 | { c, -s, cx - c * cx + s * cy }, |
528 | s, c, -s * x - c * y + y, |
795 | { s, c, cy - s * cx - c * cy }, |
529 | 0, 0, 1 |
796 | { 0, 0, 1 } |
|
|
797 | #else |
|
|
798 | { c, -s, 0 }, |
|
|
799 | { s, c, 0 }, |
|
|
800 | { 0, 0, 1 } |
|
|
801 | #endif |
530 | }; |
802 | }; |
531 | |
803 | |
532 | return transform (new_width, new_height, matrix); |
804 | move (-cx, -cy); |
533 | } |
805 | rxvt_img *img = transform (matrix); |
|
|
806 | move ( cx, cy); |
|
|
807 | img->move (cx, cy); |
534 | |
808 | |
|
|
809 | return img; |
|
|
810 | } |
|
|
811 | |
535 | rxvt_img * |
812 | rxvt_img * |
536 | rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) |
813 | rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) |
537 | { |
814 | { |
538 | if (new_format == format) |
815 | if (new_format == format) |
539 | return clone (); |
816 | return clone (); |
540 | |
817 | |
541 | rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); |
818 | rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); |
542 | img->alloc (); |
819 | img->alloc (); |
543 | |
820 | |
544 | Display *dpy = s->display->dpy; |
821 | Display *dpy = s->display->dpy; |
545 | Picture src = src_picture (); |
822 | Picture src = picture (); |
546 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |
823 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |
547 | int op = PictOpSrc; |
824 | int op = PictOpSrc; |
548 | |
825 | |
549 | if (format->direct.alphaMask && !new_format->direct.alphaMask) |
826 | if (format->direct.alphaMask && !new_format->direct.alphaMask) |
550 | { |
827 | { |
551 | // does it have to be that complicated |
828 | // does it have to be that complicated |
552 | rgba c; |
|
|
553 | bg.get (c); |
|
|
554 | |
|
|
555 | XRenderColor rc = { c.r, c.g, c.b, 0xffff }; |
829 | XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; |
556 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); |
830 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); |
557 | |
831 | |
558 | op = PictOpOver; |
832 | op = PictOpOver; |
559 | } |
833 | } |
560 | |
834 | |
… | |
… | |
565 | |
839 | |
566 | return img; |
840 | return img; |
567 | } |
841 | } |
568 | |
842 | |
569 | rxvt_img * |
843 | rxvt_img * |
570 | rxvt_img::blend (rxvt_img *img, double factor) |
844 | rxvt_img::blend (rxvt_img *img, nv factor) |
571 | { |
845 | { |
572 | rxvt_img *img2 = clone (); |
846 | rxvt_img *img2 = clone (); |
573 | Display *dpy = s->display->dpy; |
847 | Display *dpy = s->display->dpy; |
574 | Picture src = img->src_picture (); |
848 | Picture src = img->picture (); |
575 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
849 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
576 | Picture mask = create_xrender_mask (dpy, img->pm, False); |
850 | Picture mask = create_xrender_mask (dpy, img->pm, False, False); |
577 | |
851 | |
578 | XRenderColor mask_c; |
852 | XRenderColor mask_c; |
579 | |
853 | |
580 | mask_c.alpha = float_to_component (factor); |
854 | mask_c.alpha = float_to_component (factor); |
581 | mask_c.red = |
855 | mask_c.red = |