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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.28 by root, Wed Jun 6 20:22:03 2012 UTC vs.
Revision 1.60 by sf-exg, Fri Jun 8 10:12:45 2012 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines