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.43 by sf-exg, Thu Jun 7 13:02:50 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
70 g_object_unref (pb); 81 g_object_unref (pb);
71 82
72 return img; 83 return img;
73} 84}
74 85
86void
87rxvt_img::destroy ()
88{
89 if (--ref->cnt)
90 return;
91
92 if (pm && ref->ours)
93 XFreePixmap (s->display->dpy, pm);
94
95 delete ref;
96}
97
75rxvt_img::~rxvt_img () 98rxvt_img::~rxvt_img ()
76{ 99{
77 if (!shared) 100 destroy ();
78 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;
79} 120}
80 121
81void 122void
82rxvt_img::unshare () 123rxvt_img::unshare ()
83{ 124{
84 if (!shared) 125 if (ref->cnt == 1 && ref->ours)
85 return; 126 return;
86 127
87 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);
88 133
89 ::swap (pm , img->pm); 134 destroy ();
90 ::swap (shared, img->shared);
91 135
92 delete img; 136 pm = pm2;
137 ref = new pixref (ref->w, ref->h);
93} 138}
94 139
95void 140void
96rxvt_img::fill (const rxvt_color &c) 141rxvt_img::fill (const rxvt_color &c)
97{ 142{
… …
131 176
132 Display *dpy = s->display->dpy; 177 Display *dpy = s->display->dpy;
133 int size = max (rh, rv) * 2 + 1; 178 int size = max (rh, rv) * 2 + 1;
134 double *kernel = (double *)malloc (size * sizeof (double)); 179 double *kernel = (double *)malloc (size * sizeof (double));
135 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
136 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 ();
137 185
138 XRenderPictureAttributes pa; 186 XRenderPictureAttributes pa;
139
140 pa.repeat = RepeatPad; 187 pa.repeat = RepeatPad;
141 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
142 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 188 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
143 189
144 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 190 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
145 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 191 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
146 XFreePixmap (dpy, tmp_pm); 192 XFreePixmap (dpy, tmp_pm);
… …
200 246
201 return mask; 247 return mask;
202} 248}
203 249
204void 250void
205rxvt_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)
206{ 252{
207 Display *dpy = s->display->dpy; 253 Display *dpy = s->display->dpy;
208 Picture src = create_xrender_mask (dpy, pm, True); 254 Picture src = create_xrender_mask (dpy, pm, True);
209 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 255 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
210 256
211 XRenderColor mask_c; 257 XRenderColor mask_c;
212 mask_c.red = float_to_component (r); 258 mask_c.red = r;
213 mask_c.green = float_to_component (g); 259 mask_c.green = g;
214 mask_c.blue = float_to_component (b); 260 mask_c.blue = b;
215 mask_c.alpha = float_to_component (a); 261 mask_c.alpha = a;
216 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 262 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
217 263
218 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);
219 265
220 XRenderFreePicture (dpy, src); 266 XRenderFreePicture (dpy, src);
221 XRenderFreePicture (dpy, dst); 267 XRenderFreePicture (dpy, dst);
222} 268}
223 269
224void 270void
225rxvt_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)
226{ 272{
227 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 273 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
228 return; 274 return;
229 275
230 Display *dpy = s->display->dpy; 276 Display *dpy = s->display->dpy;
231 Picture src = create_xrender_mask (dpy, pm, True); 277 Picture src = create_xrender_mask (dpy, pm, True);
232 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 278 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
233 279
234 XRenderColor mask_c; 280 XRenderColor mask_c;
235 mask_c.red = float_to_component (r); 281 mask_c.red = r;
236 mask_c.green = float_to_component (g); 282 mask_c.green = g;
237 mask_c.blue = float_to_component (b); 283 mask_c.blue = b;
238 mask_c.alpha = float_to_component (a); 284 mask_c.alpha = a;
239 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 285 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
240 286
241 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);
242 288
243 XRenderFreePicture (dpy, src); 289 XRenderFreePicture (dpy, src);
… …
342} 388}
343 389
344rxvt_img * 390rxvt_img *
345rxvt_img::clone () 391rxvt_img::clone ()
346{ 392{
347 rxvt_img *img = new rxvt_img (s, format, w, h); 393 return new rxvt_img (*this);
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;
354} 394}
355 395
356rxvt_img * 396rxvt_img *
357rxvt_img::sub_rect (int x, int y, int width, int height, int repeat) 397rxvt_img::reify ()
358{ 398{
359 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 ();
360 401
361 Display *dpy = s->display->dpy; 402 Display *dpy = s->display->dpy;
362 XRenderPictureAttributes pa; 403
363 pa.repeat = repeat; 404 bool alpha = !format->direct.alphaMask
364 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 ();
365 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
366 413
414 if (alpha)
415 {
416 XRenderColor rc = { 0, 0, 0, 0 };
417 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
418 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
419 }
420 else
367 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);
368 422
369 XRenderFreePicture (dpy, src);
370 XRenderFreePicture (dpy, dst); 423 XRenderFreePicture (dpy, src);
424 XRenderFreePicture (dpy, dst);
371 425
372 return img; 426 return img;
373} 427}
374 428
375rxvt_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 *
376rxvt_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])
377{ 452{
378 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 ();
379 455
380 Display *dpy = s->display->dpy; 456 Display *dpy = s->display->dpy;
381 XRenderPictureAttributes pa; 457 Picture src = src_picture ();
382 pa.repeat = repeat;
383 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
384 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 458 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
385 459
386 XTransform xfrm; 460 XTransform xfrm;
387 461
388 for (int i = 0; i < 3; ++i) 462 for (int i = 0; i < 3; ++i)
389 for (int j = 0; j < 3; ++j) 463 for (int j = 0; j < 3; ++j)
390 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 464 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
391 465
466 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
467 xfrm.matrix [0][3] += XDoubleToFixed (y);
468
392 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 469 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
393 XRenderSetPictureTransform (dpy, src, &xfrm); 470 XRenderSetPictureTransform (dpy, src, &xfrm);
394 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 471 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
395 472
396 XRenderFreePicture (dpy, src); 473 XRenderFreePicture (dpy, src);
… …
400} 477}
401 478
402rxvt_img * 479rxvt_img *
403rxvt_img::scale (int new_width, int new_height) 480rxvt_img::scale (int new_width, int new_height)
404{ 481{
482 if (w == new_width && h == new_height)
483 return clone ();
484
405 double matrix[9] = { 485 double matrix[9] = {
406 w / (double)new_width, 0, 0, 486 w / (double)new_width, 0, 0,
407 0, h / (double)new_height, 0, 487 0, h / (double)new_height, 0,
408 0, 0, 1 488 0, 0, 1
409 }; 489 };
410 490
491 int old_repeat_mode = repeat;
492 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
493
411 return transform (new_width, new_height, matrix); 494 rxvt_img *img = transform (new_width, new_height, matrix);
412}
413 495
496 repeat = old_repeat_mode;
497 img->repeat = repeat;
498
499 return img;
500}
501
414rxvt_img * 502rxvt_img *
415rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat) 503rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
416{ 504{
417 double s = sin (phi); 505 double s = sin (phi);
418 double c = cos (phi); 506 double c = cos (phi);
419 507
420 double matrix[9] = { 508 double matrix[9] = {
421 c, -s, -c * x + s * y + x, 509 c, -s, -c * x + s * y + x,
422 s, c, -s * x - c * y + y, 510 s, c, -s * x - c * y + y,
423 0, 0, 1 511 0, 0, 1
424 }; 512 };
425 513
426 return transform (new_width, new_height, matrix, repeat); 514 return transform (new_width, new_height, matrix);
427} 515}
428 516
429rxvt_img * 517rxvt_img *
430rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 518rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
431{ 519{
520 if (new_format == format)
521 return clone ();
522
432 rxvt_img *img = new rxvt_img (s, new_format, w, h); 523 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);
524 img->alloc ();
433 525
526 printf ("convert %d to %d\n", format->direct.alphaMask, new_format->direct.alphaMask);//D
527
434 Display *dpy = s->display->dpy; 528 Display *dpy = s->display->dpy;
435 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); 529 Picture src = src_picture ();
436 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 530 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
437 int op = PictOpSrc; 531 int op = PictOpSrc;
438 532
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) 533 if (format->direct.alphaMask && !new_format->direct.alphaMask)
442 { 534 {
443 // does it have to be that complicated 535 // does it have to be that complicated
444 rgba c; 536 rgba c;
445 bg.get (c); 537 bg.get (c);
446 538
… …
461rxvt_img * 553rxvt_img *
462rxvt_img::blend (rxvt_img *img, double factor) 554rxvt_img::blend (rxvt_img *img, double factor)
463{ 555{
464 rxvt_img *img2 = clone (); 556 rxvt_img *img2 = clone ();
465 Display *dpy = s->display->dpy; 557 Display *dpy = s->display->dpy;
466 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 558 Picture src = img->src_picture ();
467 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 559 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
468 Picture mask = create_xrender_mask (dpy, img->pm, False); 560 Picture mask = create_xrender_mask (dpy, img->pm, False);
469 561
470 XRenderColor mask_c; 562 XRenderColor mask_c;
471 563

Diff Legend

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