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