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.25 by sf-exg, Tue Jun 5 22:00:15 2012 UTC vs.
Revision 1.44 by root, Thu Jun 7 13:12:08 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) 8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0)
11{ 10{
12 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
13} 11}
14 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;
17}
18
19#if 0
15rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) 20rxvt_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) 21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
17{ 22{
18} 23}
24#endif
19 25
20rxvt_img * 26rxvt_img *
21rxvt_img::new_from_root (rxvt_screen *s) 27rxvt_img::new_from_root (rxvt_screen *s)
22{ 28{
23 Display *dpy = s->display->dpy; 29 Display *dpy = s->display->dpy;
… …
37 return 0; 43 return 0;
38 44
39 rxvt_img *img = new rxvt_img ( 45 rxvt_img *img = new rxvt_img (
40 s, 46 s,
41 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)), 47 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
48 0,
49 0,
42 root_pm_w, 50 root_pm_w,
43 root_pm_h, 51 root_pm_h
44 root_pixmap
45 ); 52 );
46 53
47 img->shared = true; 54 img->pm = root_pixmap;
55 img->ref = new pixref (root_pm_w, root_pm_h);
56 img->ref->ours = false;
48 57
49 return img; 58 return img;
50} 59}
51 60
52rxvt_img * 61rxvt_img *
… …
59 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
60 69
61 rxvt_img *img = new rxvt_img ( 70 rxvt_img *img = new rxvt_img (
62 s, 71 s,
63 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24), 72 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73 0,
74 0,
64 gdk_pixbuf_get_width (pb), 75 gdk_pixbuf_get_width (pb),
65 gdk_pixbuf_get_height (pb) 76 gdk_pixbuf_get_height (pb)
66 ); 77 );
67 78 img->alloc ();
68 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0); 79 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
69 80
81 g_object_unref (pb);
82
83 return img;
84}
85
86void
87rxvt_img::destroy ()
88{
89 if (--ref->cnt)
70 return img; 90 return;
91
92 if (pm && ref->ours)
93 XFreePixmap (s->display->dpy, pm);
94
95 delete ref;
71} 96}
72 97
73rxvt_img::~rxvt_img () 98rxvt_img::~rxvt_img ()
74{ 99{
75 if (!shared) 100 destroy ();
76 XFreePixmap (s->display->dpy, pm); 101}
102
103void
104rxvt_img::alloc ()
105{
106 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
107 ref = new pixref (w, h);
108}
109
110Picture
111rxvt_img::src_picture ()
112{
113 Display *dpy = s->display->dpy;
114
115 XRenderPictureAttributes pa;
116 pa.repeat = repeat;
117 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
118
119 return pic;
77} 120}
78 121
79void 122void
80rxvt_img::unshare () 123rxvt_img::unshare ()
81{ 124{
82 if (!shared) 125 if (ref->cnt == 1 && ref->ours)
83 return; 126 return;
84 127
85 rxvt_img *img = clone (); 128 //TODO: maybe should reify instead
129 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
130 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
131 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
132 XFreeGC (s->display->dpy, gc);
86 133
87 ::swap (pm , img->pm); 134 destroy ();
88 ::swap (shared, img->shared);
89 135
90 delete img; 136 pm = pm2;
137 ref = new pixref (ref->w, ref->h);
91} 138}
92 139
93void 140void
94rxvt_img::fill (const rxvt_color &c) 141rxvt_img::fill (const rxvt_color &c)
95{ 142{
… …
129 176
130 Display *dpy = s->display->dpy; 177 Display *dpy = s->display->dpy;
131 int size = max (rh, rv) * 2 + 1; 178 int size = max (rh, rv) * 2 + 1;
132 double *kernel = (double *)malloc (size * sizeof (double)); 179 double *kernel = (double *)malloc (size * sizeof (double));
133 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
134 rxvt_img *img = new rxvt_img (s, format, w, h); 181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182 img->alloc ();
183
184 Picture src = src_picture ();
135 185
136 XRenderPictureAttributes pa; 186 XRenderPictureAttributes pa;
137
138 pa.repeat = RepeatPad; 187 pa.repeat = RepeatPad;
139 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
140 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 188 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
141 189
142 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 190 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
143 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 191 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
144 XFreePixmap (dpy, tmp_pm); 192 XFreePixmap (dpy, tmp_pm);
… …
198 246
199 return mask; 247 return mask;
200} 248}
201 249
202void 250void
203rxvt_img::brightness (double r, double g, double b, double a) 251rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
204{ 252{
205 Display *dpy = s->display->dpy; 253 Display *dpy = s->display->dpy;
206 Picture src = create_xrender_mask (dpy, pm, True); 254 Picture src = create_xrender_mask (dpy, pm, True);
207 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 255 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
208 256
209 XRenderColor mask_c; 257 XRenderColor mask_c;
210 mask_c.red = float_to_component (r); 258 mask_c.red = r;
211 mask_c.green = float_to_component (g); 259 mask_c.green = g;
212 mask_c.blue = float_to_component (b); 260 mask_c.blue = b;
213 mask_c.alpha = float_to_component (a); 261 mask_c.alpha = a;
214 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 262 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
215 263
216 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 264 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
217 265
218 XRenderFreePicture (dpy, src); 266 XRenderFreePicture (dpy, src);
219 XRenderFreePicture (dpy, dst); 267 XRenderFreePicture (dpy, dst);
220} 268}
221 269
222void 270void
223rxvt_img::contrast (double r, double g, double b, double a) 271rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
224{ 272{
225 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 273 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
226 return; 274 return;
227 275
228 Display *dpy = s->display->dpy; 276 Display *dpy = s->display->dpy;
229 Picture src = create_xrender_mask (dpy, pm, True); 277 Picture src = create_xrender_mask (dpy, pm, True);
230 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 278 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
231 279
232 XRenderColor mask_c; 280 XRenderColor mask_c;
233 mask_c.red = float_to_component (r); 281 mask_c.red = r;
234 mask_c.green = float_to_component (g); 282 mask_c.green = g;
235 mask_c.blue = float_to_component (b); 283 mask_c.blue = b;
236 mask_c.alpha = float_to_component (a); 284 mask_c.alpha = a;
237 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 285 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
238 286
239 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 287 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
240 288
241 XRenderFreePicture (dpy, src); 289 XRenderFreePicture (dpy, src);
… …
340} 388}
341 389
342rxvt_img * 390rxvt_img *
343rxvt_img::clone () 391rxvt_img::clone ()
344{ 392{
345 rxvt_img *img = new rxvt_img (s, format, w, h); 393 return new rxvt_img (*this);
346
347 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
348 XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
349 XFreeGC (s->display->dpy, gc);
350
351 return img;
352} 394}
353 395
354rxvt_img * 396rxvt_img *
355rxvt_img::sub_rect (int x, int y, int width, int height, int repeat) 397rxvt_img::reify ()
356{ 398{
357 rxvt_img *img = new rxvt_img (s, format, width, height); 399 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400 return clone ();
358 401
359 Display *dpy = s->display->dpy; 402 Display *dpy = s->display->dpy;
360 XRenderPictureAttributes pa; 403
361 pa.repeat = repeat; 404 bool alpha = !format->direct.alphaMask
362 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 405 && (x || y)
406 && repeat == RepeatNone;
407
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat);
409 img->alloc ();
410
411 Picture src = src_picture ();
363 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
364 413
414 if (alpha)
415 {
416 XRenderColor rc = { 0, 0, 0, 0 };
417 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
418 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
419 }
420 else
365 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height); 421 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
366 422
367 XRenderFreePicture (dpy, src);
368 XRenderFreePicture (dpy, dst); 423 XRenderFreePicture (dpy, src);
424 XRenderFreePicture (dpy, dst);
369 425
370 return img; 426 return img;
371} 427}
372 428
373rxvt_img * 429rxvt_img *
430rxvt_img::sub_rect (int x, int y, int width, int height)
431{
432 rxvt_img *img = clone ();
433
434 img->x += x;
435 img->y += y;
436
437 if (w != width || h != height)
438 {
439 img->w = width;
440 img->h = height;
441
442 rxvt_img *img2 = img->reify ();
443 delete img;
444 img = img2;
445 }
446
447 return img;
448}
449
450rxvt_img *
374rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat) 451rxvt_img::transform (int new_width, int new_height, double matrix[9])
375{ 452{
376 rxvt_img *img = new rxvt_img (s, format, new_width, new_height); 453 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
454 img->alloc ();
377 455
378 Display *dpy = s->display->dpy; 456 Display *dpy = s->display->dpy;
379 XRenderPictureAttributes pa; 457 Picture src = src_picture ();
380 pa.repeat = repeat;
381 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
382 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 458 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
383 459
384 XTransform xfrm; 460 XTransform xfrm;
385 461
386 for (int i = 0; i < 3; ++i) 462 for (int i = 0; i < 3; ++i)
387 for (int j = 0; j < 3; ++j) 463 for (int j = 0; j < 3; ++j)
388 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 464 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
389 465
466#if 0
467 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
468 xfrm.matrix [1][2] -= XDoubleToFixed (y);
469#endif
470
390 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 471 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
391 XRenderSetPictureTransform (dpy, src, &xfrm); 472 XRenderSetPictureTransform (dpy, src, &xfrm);
392 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 473 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
393 474
394 XRenderFreePicture (dpy, src); 475 XRenderFreePicture (dpy, src);
… …
398} 479}
399 480
400rxvt_img * 481rxvt_img *
401rxvt_img::scale (int new_width, int new_height) 482rxvt_img::scale (int new_width, int new_height)
402{ 483{
484 if (w == new_width && h == new_height)
485 return clone ();
486
403 double matrix[9] = { 487 double matrix[9] = {
404 w / (double)new_width, 0, 0, 488 w / (double)new_width, 0, 0,
405 0, h / (double)new_height, 0, 489 0, h / (double)new_height, 0,
406 0, 0, 1 490 0, 0, 1
407 }; 491 };
408 492
493 int old_repeat_mode = repeat;
494 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
495
409 return transform (new_width, new_height, matrix); 496 rxvt_img *img = transform (new_width, new_height, matrix);
410}
411 497
498 repeat = old_repeat_mode;
499 img->repeat = repeat;
500
501 return img;
502}
503
412rxvt_img * 504rxvt_img *
413rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat) 505rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
414{ 506{
415 double s = sin (phi); 507 double s = sin (phi);
416 double c = cos (phi); 508 double c = cos (phi);
417 509
418 double matrix[9] = { 510 double matrix[9] = {
419 c, -s, -c * x + s * y + x, 511 c, -s, -c * x + s * y + x,
420 s, c, -s * x - c * y + y, 512 s, c, -s * x - c * y + y,
421 0, 0, 1 513 0, 0, 1
422 }; 514 };
423 515
424 return transform (new_width, new_height, matrix, repeat); 516 return transform (new_width, new_height, matrix);
425} 517}
426 518
427rxvt_img * 519rxvt_img *
428rxvt_img::convert_to (XRenderPictFormat *new_format) 520rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
429{ 521{
522 if (new_format == format)
523 return clone ();
524
430 rxvt_img *img = new rxvt_img (s, new_format, w, h); 525 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);
526 img->alloc ();
431 527
432 Display *dpy = s->display->dpy; 528 Display *dpy = s->display->dpy;
433 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); 529 Picture src = src_picture ();
434 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 530 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
531 int op = PictOpSrc;
435 532
533 if (format->direct.alphaMask && !new_format->direct.alphaMask)
534 {
535 // does it have to be that complicated
536 rgba c;
537 bg.get (c);
538
539 XRenderColor rc = { c.r, c.g, c.b, 0xffff };
540 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
541
542 op = PictOpOver;
543 }
544
436 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 545 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
437 546
438 XRenderFreePicture (dpy, src); 547 XRenderFreePicture (dpy, src);
439 XRenderFreePicture (dpy, dst); 548 XRenderFreePicture (dpy, dst);
440 549
441 return img; 550 return img;
… …
444rxvt_img * 553rxvt_img *
445rxvt_img::blend (rxvt_img *img, double factor) 554rxvt_img::blend (rxvt_img *img, double factor)
446{ 555{
447 rxvt_img *img2 = clone (); 556 rxvt_img *img2 = clone ();
448 Display *dpy = s->display->dpy; 557 Display *dpy = s->display->dpy;
449 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 558 Picture src = img->src_picture ();
450 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 559 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
451 Picture mask = create_xrender_mask (dpy, img->pm, False); 560 Picture mask = create_xrender_mask (dpy, img->pm, False);
452 561
453 XRenderColor mask_c; 562 XRenderColor mask_c;
454 563

Diff Legend

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