… | |
… | |
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 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height) |
7 | 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(RepeatNormal), |
8 | : s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat), |
9 | pm(0), refcnt(0) |
9 | pm(0), ref(0) |
10 | { |
10 | { |
11 | } |
11 | } |
12 | |
12 | |
13 | rxvt_img::rxvt_img (const rxvt_img &img) |
13 | 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), refcnt(img.refcnt) |
14 | : s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref) |
15 | { |
15 | { |
16 | if (refcnt) |
|
|
17 | ++*refcnt; |
16 | ++ref->cnt; |
18 | } |
17 | } |
19 | |
18 | |
20 | #if 0 |
19 | #if 0 |
21 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) |
20 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) |
22 | : s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap) |
21 | : s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap) |
… | |
… | |
51 | root_pm_w, |
50 | root_pm_w, |
52 | root_pm_h |
51 | root_pm_h |
53 | ); |
52 | ); |
54 | |
53 | |
55 | img->pm = root_pixmap; |
54 | img->pm = root_pixmap; |
|
|
55 | img->ref = new pixref (root_pm_w, root_pm_h); |
|
|
56 | img->ref->ours = false; |
|
|
57 | |
|
|
58 | return img; |
|
|
59 | } |
|
|
60 | |
|
|
61 | rxvt_img * |
|
|
62 | rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) |
|
|
63 | { |
|
|
64 | int width = gdk_pixbuf_get_width (pb); |
|
|
65 | int height = gdk_pixbuf_get_height (pb); |
|
|
66 | |
|
|
67 | if (width > 32767 || height > 32767) // well, we *could* upload in chunks |
|
|
68 | rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n"); |
|
|
69 | |
|
|
70 | // since we require rgb24/argb32 formats from xrender we assume |
|
|
71 | // that both 24 and 32 bpp MUST be supported by any screen that supports xrender |
|
|
72 | int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24; |
|
|
73 | |
|
|
74 | XImage xi; |
|
|
75 | |
|
|
76 | xi.width = width; |
|
|
77 | xi.height = height; |
|
|
78 | xi.xoffset = 0; |
|
|
79 | xi.format = ZPixmap; |
|
|
80 | xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local? |
|
|
81 | xi.bitmap_unit = 32; |
|
|
82 | xi.bitmap_bit_order = MSBFirst; |
|
|
83 | xi.bitmap_pad = 32; |
|
|
84 | xi.depth = depth; |
|
|
85 | xi.bytes_per_line = 0; |
|
|
86 | xi.bits_per_pixel = 32; |
|
|
87 | xi.red_mask = 0x00ff0000; |
|
|
88 | xi.green_mask = 0x0000ff00; |
|
|
89 | xi.blue_mask = 0x000000ff; |
|
|
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 | |
|
|
101 | assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb)); |
|
|
102 | unsigned char *row = gdk_pixbuf_get_pixels (pb); |
|
|
103 | char *line = xi.data; |
|
|
104 | |
|
|
105 | for (int y = 0; y < height; y++) |
|
|
106 | { |
|
|
107 | unsigned char r, g, b, a; |
|
|
108 | unsigned char *data = row; |
|
|
109 | |
|
|
110 | if (depth == 24) |
|
|
111 | for (int x = 0; x < width; x++) |
|
|
112 | { |
|
|
113 | r = *data++; |
|
|
114 | g = *data++; |
|
|
115 | b = *data++; |
|
|
116 | *line++ = 0; |
|
|
117 | *line++ = r; |
|
|
118 | *line++ = g; |
|
|
119 | *line++ = b; |
|
|
120 | } |
|
|
121 | else |
|
|
122 | for (int x = 0; x < width; x++) |
|
|
123 | { |
|
|
124 | r = *data++; |
|
|
125 | g = *data++; |
|
|
126 | b = *data++; |
|
|
127 | a = *data++; |
|
|
128 | *line++ = a; |
|
|
129 | *line++ = r; |
|
|
130 | *line++ = g; |
|
|
131 | *line++ = b; |
|
|
132 | } |
|
|
133 | |
|
|
134 | row += rowstride; |
|
|
135 | } |
|
|
136 | |
|
|
137 | Display *dpy = s->display->dpy; |
|
|
138 | |
|
|
139 | rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); |
|
|
140 | img->alloc (); |
|
|
141 | |
|
|
142 | GC gc = XCreateGC (dpy, img->pm, 0, 0); |
|
|
143 | XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); |
|
|
144 | XFreeGC (dpy, gc); |
|
|
145 | |
|
|
146 | free (xi.data); |
56 | |
147 | |
57 | return img; |
148 | return img; |
58 | } |
149 | } |
59 | |
150 | |
60 | rxvt_img * |
151 | rxvt_img * |
… | |
… | |
64 | GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); |
155 | GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); |
65 | |
156 | |
66 | if (!pb) |
157 | if (!pb) |
67 | rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); |
158 | rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); |
68 | |
159 | |
69 | rxvt_img *img = new rxvt_img ( |
160 | rxvt_img *img = new_from_pixbuf (s, pb); |
70 | s, |
|
|
71 | XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24), |
|
|
72 | 0, |
|
|
73 | 0, |
|
|
74 | gdk_pixbuf_get_width (pb), |
|
|
75 | gdk_pixbuf_get_height (pb) |
|
|
76 | ); |
|
|
77 | img->alloc (); |
|
|
78 | img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0); |
|
|
79 | |
161 | |
80 | g_object_unref (pb); |
162 | g_object_unref (pb); |
81 | |
163 | |
82 | return img; |
164 | return img; |
83 | } |
165 | } |
84 | |
166 | |
85 | void |
167 | void |
86 | rxvt_img::destroy () |
168 | rxvt_img::destroy () |
87 | { |
169 | { |
88 | if (!refcnt || --*refcnt) |
170 | if (--ref->cnt) |
89 | return; |
171 | return; |
90 | |
172 | |
91 | if (pm) |
173 | if (pm && ref->ours) |
92 | XFreePixmap (s->display->dpy, pm); |
174 | XFreePixmap (s->display->dpy, pm); |
93 | |
175 | |
94 | delete refcnt; |
176 | delete ref; |
95 | } |
177 | } |
96 | |
178 | |
97 | rxvt_img::~rxvt_img () |
179 | rxvt_img::~rxvt_img () |
98 | { |
180 | { |
99 | destroy (); |
181 | destroy (); |
… | |
… | |
101 | |
183 | |
102 | void |
184 | void |
103 | rxvt_img::alloc () |
185 | rxvt_img::alloc () |
104 | { |
186 | { |
105 | pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); |
187 | pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); |
106 | refcnt = new int (1); |
188 | ref = new pixref (w, h); |
|
|
189 | } |
|
|
190 | |
|
|
191 | Picture |
|
|
192 | rxvt_img::src_picture () |
|
|
193 | { |
|
|
194 | Display *dpy = s->display->dpy; |
|
|
195 | |
|
|
196 | XRenderPictureAttributes pa; |
|
|
197 | pa.repeat = repeat; |
|
|
198 | Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); |
|
|
199 | |
|
|
200 | return pic; |
107 | } |
201 | } |
108 | |
202 | |
109 | void |
203 | void |
110 | rxvt_img::unshare () |
204 | rxvt_img::unshare () |
111 | { |
205 | { |
112 | if (refcnt && *refcnt == 1) |
206 | if (ref->cnt == 1 && ref->ours) |
113 | return; |
207 | return; |
114 | |
208 | |
|
|
209 | //TODO: maybe should reify instead |
115 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); |
210 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
116 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
211 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
117 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0); |
212 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
118 | XFreeGC (s->display->dpy, gc); |
213 | XFreeGC (s->display->dpy, gc); |
119 | |
214 | |
120 | destroy (); |
215 | destroy (); |
121 | |
216 | |
122 | pm = pm2; |
217 | pm = pm2; |
123 | refcnt = new int (1); |
218 | ref = new pixref (ref->w, ref->h); |
124 | } |
219 | } |
125 | |
220 | |
126 | void |
221 | void |
127 | rxvt_img::fill (const rxvt_color &c) |
222 | rxvt_img::fill (const rxvt_color &c) |
128 | { |
223 | { |
… | |
… | |
162 | |
257 | |
163 | Display *dpy = s->display->dpy; |
258 | Display *dpy = s->display->dpy; |
164 | int size = max (rh, rv) * 2 + 1; |
259 | int size = max (rh, rv) * 2 + 1; |
165 | double *kernel = (double *)malloc (size * sizeof (double)); |
260 | double *kernel = (double *)malloc (size * sizeof (double)); |
166 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
261 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
167 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h); |
262 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
168 | img->alloc (); |
263 | img->alloc (); |
169 | |
264 | |
|
|
265 | Picture src = src_picture (); |
|
|
266 | |
170 | XRenderPictureAttributes pa; |
267 | XRenderPictureAttributes pa; |
171 | |
|
|
172 | pa.repeat = RepeatPad; |
268 | pa.repeat = RepeatPad; |
173 | Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa); |
|
|
174 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); |
269 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); |
175 | |
270 | |
176 | Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); |
271 | Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); |
177 | Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); |
272 | Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); |
178 | XFreePixmap (dpy, tmp_pm); |
273 | XFreePixmap (dpy, tmp_pm); |
… | |
… | |
274 | |
369 | |
275 | XRenderFreePicture (dpy, src); |
370 | XRenderFreePicture (dpy, src); |
276 | XRenderFreePicture (dpy, dst); |
371 | XRenderFreePicture (dpy, dst); |
277 | } |
372 | } |
278 | |
373 | |
279 | bool |
374 | rxvt_img * |
280 | rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y) |
375 | rxvt_img::clone () |
281 | { |
376 | { |
282 | Display *dpy = s->display->dpy; |
377 | return new rxvt_img (*this); |
|
|
378 | } |
283 | |
379 | |
284 | if (s->visual->c_class != TrueColor) |
380 | static XRenderPictFormat * |
|
|
381 | find_alpha_format_for (Display *dpy, XRenderPictFormat *format) |
|
|
382 | { |
|
|
383 | if (format->direct.alphaMask) |
|
|
384 | return format; // already has alpha |
|
|
385 | |
|
|
386 | // try to find a suitable alpha format, one bit alpha is enough for our purposes |
|
|
387 | if (format->type == PictTypeDirect) |
|
|
388 | for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n) |
|
|
389 | if (f->direct.alphaMask |
|
|
390 | && f->type == PictTypeDirect |
|
|
391 | && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask ) |
|
|
392 | && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask) |
|
|
393 | && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask )) |
285 | return false; |
394 | return f; |
286 | |
395 | |
287 | uint32_t red_mask, green_mask, blue_mask, alpha_mask; |
396 | // should be a very good fallback |
|
|
397 | return XRenderFindStandardFormat (dpy, PictStandardARGB32); |
|
|
398 | } |
288 | |
399 | |
289 | red_mask = (uint32_t)format->direct.redMask << format->direct.red; |
400 | rxvt_img * |
290 | green_mask = (uint32_t)format->direct.greenMask << format->direct.green; |
401 | rxvt_img::reify () |
291 | blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue; |
402 | { |
292 | alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha; |
403 | if (x == 0 && y == 0 && w == ref->w && h == ref->h) |
293 | |
|
|
294 | int width_r = ecb_popcount32 (red_mask); |
|
|
295 | int width_g = ecb_popcount32 (green_mask); |
|
|
296 | int width_b = ecb_popcount32 (blue_mask); |
|
|
297 | int width_a = ecb_popcount32 (alpha_mask); |
|
|
298 | |
|
|
299 | if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8) |
|
|
300 | return false; |
404 | return clone (); |
301 | |
405 | |
302 | int sh_r = ecb_ctz32 (red_mask); |
406 | Display *dpy = s->display->dpy; |
303 | int sh_g = ecb_ctz32 (green_mask); |
|
|
304 | int sh_b = ecb_ctz32 (blue_mask); |
|
|
305 | int sh_a = ecb_ctz32 (alpha_mask); |
|
|
306 | |
407 | |
307 | if (width > 32767 || height > 32767) |
408 | bool alpha = !format->direct.alphaMask |
308 | return false; |
409 | && (x || y) |
|
|
410 | && repeat == RepeatNone; |
309 | |
411 | |
310 | XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0, |
412 | rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); |
311 | width, height, 32, 0); |
413 | img->alloc (); |
312 | if (!ximage) |
|
|
313 | return false; |
|
|
314 | |
414 | |
315 | if (height > INT_MAX / ximage->bytes_per_line |
415 | Picture src = src_picture (); |
316 | || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line))) |
416 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
|
|
417 | |
|
|
418 | if (alpha) |
317 | { |
419 | { |
318 | XDestroyImage (ximage); |
420 | XRenderColor rc = { 0, 0, 0, 0 }; |
319 | return false; |
421 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles |
|
|
422 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); |
320 | } |
423 | } |
321 | |
424 | else |
322 | GC gc = XCreateGC (dpy, pm, 0, 0); |
|
|
323 | |
|
|
324 | ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; |
|
|
325 | |
|
|
326 | int rowstride = gdk_pixbuf_get_rowstride (pixbuf); |
|
|
327 | int channels = gdk_pixbuf_get_n_channels (pixbuf); |
|
|
328 | unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; |
|
|
329 | char *line = ximage->data; |
|
|
330 | |
|
|
331 | for (int y = 0; y < height; y++) |
|
|
332 | { |
|
|
333 | for (int x = 0; x < width; x++) |
|
|
334 | { |
|
|
335 | unsigned char *pixel = row + x * channels; |
|
|
336 | uint32_t value; |
|
|
337 | unsigned char r, g, b, a; |
|
|
338 | |
|
|
339 | if (channels == 4) |
|
|
340 | { |
|
|
341 | a = pixel[3]; |
|
|
342 | r = pixel[0] * a / 0xff; |
|
|
343 | g = pixel[1] * a / 0xff; |
|
|
344 | b = pixel[2] * a / 0xff; |
|
|
345 | } |
|
|
346 | else |
|
|
347 | { |
|
|
348 | a = 0xff; |
|
|
349 | r = pixel[0]; |
|
|
350 | g = pixel[1]; |
|
|
351 | b = pixel[2]; |
|
|
352 | } |
|
|
353 | |
|
|
354 | value = ((r >> (8 - width_r)) << sh_r) |
|
|
355 | | ((g >> (8 - width_g)) << sh_g) |
|
|
356 | | ((b >> (8 - width_b)) << sh_b) |
|
|
357 | | ((a >> (8 - width_a)) << sh_a); |
|
|
358 | |
|
|
359 | if (ximage->bits_per_pixel == 32) |
|
|
360 | ((uint32_t *)line)[x] = value; |
|
|
361 | else |
|
|
362 | XPutPixel (ximage, x, y, value); |
|
|
363 | } |
|
|
364 | |
|
|
365 | row += rowstride; |
|
|
366 | line += ximage->bytes_per_line; |
|
|
367 | } |
|
|
368 | |
|
|
369 | XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height); |
|
|
370 | XDestroyImage (ximage); |
|
|
371 | XFreeGC (dpy, gc); |
|
|
372 | |
|
|
373 | return true; |
|
|
374 | } |
|
|
375 | |
|
|
376 | rxvt_img * |
|
|
377 | rxvt_img::clone () |
|
|
378 | { |
|
|
379 | return new rxvt_img (*this); |
|
|
380 | } |
|
|
381 | |
|
|
382 | rxvt_img * |
|
|
383 | rxvt_img::reify () |
|
|
384 | { |
|
|
385 | rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); |
|
|
386 | img->alloc (); |
|
|
387 | |
|
|
388 | // todo, if x==0 and y==0 and w==real width we could clone |
|
|
389 | // but that involves an rtt to find pixmap width. |
|
|
390 | |
|
|
391 | Display *dpy = s->display->dpy; |
|
|
392 | XRenderPictureAttributes pa; |
|
|
393 | pa.repeat = repeat; |
|
|
394 | Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); |
|
|
395 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
|
|
396 | |
|
|
397 | XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); |
425 | XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); |
398 | |
426 | |
399 | XRenderFreePicture (dpy, src); |
427 | XRenderFreePicture (dpy, src); |
400 | XRenderFreePicture (dpy, dst); |
428 | XRenderFreePicture (dpy, dst); |
401 | |
429 | |
402 | return img; |
430 | return img; |
403 | } |
431 | } |
… | |
… | |
407 | { |
435 | { |
408 | rxvt_img *img = clone (); |
436 | rxvt_img *img = clone (); |
409 | |
437 | |
410 | img->x += x; |
438 | img->x += x; |
411 | img->y += y; |
439 | img->y += y; |
|
|
440 | |
|
|
441 | if (w != width || h != height) |
|
|
442 | { |
412 | img->w = width; |
443 | img->w = width; |
413 | img->h = height; |
444 | img->h = height; |
|
|
445 | |
|
|
446 | rxvt_img *img2 = img->reify (); |
|
|
447 | delete img; |
|
|
448 | img = img2; |
|
|
449 | } |
414 | |
450 | |
415 | return img; |
451 | return img; |
416 | } |
452 | } |
417 | |
453 | |
418 | rxvt_img * |
454 | rxvt_img * |
419 | rxvt_img::transform (int new_width, int new_height, double matrix[9]) |
455 | rxvt_img::transform (int new_width, int new_height, double matrix[9]) |
420 | { |
456 | { |
421 | rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); |
457 | rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); |
422 | img->alloc (); |
458 | img->alloc (); |
423 | |
459 | |
424 | Display *dpy = s->display->dpy; |
460 | Display *dpy = s->display->dpy; |
425 | XRenderPictureAttributes pa; |
461 | Picture src = src_picture (); |
426 | pa.repeat = repeat; |
|
|
427 | Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); |
|
|
428 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
462 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
429 | |
463 | |
430 | XTransform xfrm; |
464 | XTransform xfrm; |
431 | |
465 | |
432 | for (int i = 0; i < 3; ++i) |
466 | for (int i = 0; i < 3; ++i) |
433 | for (int j = 0; j < 3; ++j) |
467 | for (int j = 0; j < 3; ++j) |
434 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
468 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
435 | |
469 | |
|
|
470 | #if 0 |
436 | xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO |
471 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
437 | xfrm.matrix [0][3] += XDoubleToFixed (y); |
472 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
|
|
473 | #endif |
438 | |
474 | |
439 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
475 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
440 | XRenderSetPictureTransform (dpy, src, &xfrm); |
476 | XRenderSetPictureTransform (dpy, src, &xfrm); |
441 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
477 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
442 | |
478 | |
… | |
… | |
447 | } |
483 | } |
448 | |
484 | |
449 | rxvt_img * |
485 | rxvt_img * |
450 | rxvt_img::scale (int new_width, int new_height) |
486 | rxvt_img::scale (int new_width, int new_height) |
451 | { |
487 | { |
|
|
488 | if (w == new_width && h == new_height) |
|
|
489 | return clone (); |
|
|
490 | |
452 | double matrix[9] = { |
491 | double matrix[9] = { |
453 | w / (double)new_width, 0, 0, |
492 | w / (double)new_width, 0, 0, |
454 | 0, h / (double)new_height, 0, |
493 | 0, h / (double)new_height, 0, |
455 | 0, 0, 1 |
494 | 0, 0, 1 |
456 | }; |
495 | }; |
457 | |
496 | |
|
|
497 | int old_repeat_mode = repeat; |
|
|
498 | repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems |
|
|
499 | |
458 | return transform (new_width, new_height, matrix); |
500 | rxvt_img *img = transform (new_width, new_height, matrix); |
|
|
501 | |
|
|
502 | repeat = old_repeat_mode; |
|
|
503 | img->repeat = repeat; |
|
|
504 | |
|
|
505 | return img; |
459 | } |
506 | } |
460 | |
507 | |
461 | rxvt_img * |
508 | rxvt_img * |
462 | rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) |
509 | rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) |
463 | { |
510 | { |
… | |
… | |
472 | |
519 | |
473 | return transform (new_width, new_height, matrix); |
520 | return transform (new_width, new_height, matrix); |
474 | } |
521 | } |
475 | |
522 | |
476 | rxvt_img * |
523 | rxvt_img * |
477 | rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) |
524 | rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) |
478 | { |
525 | { |
479 | if (new_format == format) |
526 | if (new_format == format) |
480 | return clone (); |
527 | return clone (); |
481 | |
528 | |
482 | rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h); |
529 | rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); |
483 | img->alloc (); |
530 | img->alloc (); |
484 | |
531 | |
485 | Display *dpy = s->display->dpy; |
532 | Display *dpy = s->display->dpy; |
486 | Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); |
533 | Picture src = src_picture (); |
487 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |
534 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |
488 | int op = PictOpSrc; |
535 | int op = PictOpSrc; |
489 | |
536 | |
490 | if (format->direct.alphaMask && !new_format->direct.alphaMask) |
537 | if (format->direct.alphaMask && !new_format->direct.alphaMask) |
491 | { |
538 | { |
… | |
… | |
510 | rxvt_img * |
557 | rxvt_img * |
511 | rxvt_img::blend (rxvt_img *img, double factor) |
558 | rxvt_img::blend (rxvt_img *img, double factor) |
512 | { |
559 | { |
513 | rxvt_img *img2 = clone (); |
560 | rxvt_img *img2 = clone (); |
514 | Display *dpy = s->display->dpy; |
561 | Display *dpy = s->display->dpy; |
515 | Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
562 | Picture src = img->src_picture (); |
516 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
563 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
517 | Picture mask = create_xrender_mask (dpy, img->pm, False); |
564 | Picture mask = create_xrender_mask (dpy, img->pm, False); |
518 | |
565 | |
519 | XRenderColor mask_c; |
566 | XRenderColor mask_c; |
520 | |
567 | |