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.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs.
Revision 1.36 by root, Thu Jun 7 08:45:34 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)
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(RepeatNormal),
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);
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);
… …
291 339
292 int rowstride = gdk_pixbuf_get_rowstride (pixbuf); 340 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
293 int channels = gdk_pixbuf_get_n_channels (pixbuf); 341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
294 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 342 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
295 char *line = ximage->data; 343 char *line = ximage->data;
296
297 rgba c (0, 0, 0);
298
299 if (channels == 4 && alpha_mask == 0)
300 {
301 //pix_colors[Color_bg].get (c);
302 //TODO
303 c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D
304 c.r >>= 8;
305 c.g >>= 8;
306 c.b >>= 8;
307 }
308 344
309 for (int y = 0; y < height; y++) 345 for (int y = 0; y < height; y++)
310 { 346 {
311 for (int x = 0; x < width; x++) 347 for (int x = 0; x < width; x++)
312 { 348 {
… …
315 unsigned char r, g, b, a; 351 unsigned char r, g, b, a;
316 352
317 if (channels == 4) 353 if (channels == 4)
318 { 354 {
319 a = pixel[3]; 355 a = pixel[3];
320 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff; 356 r = pixel[0] * a / 0xff;
321 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff; 357 g = pixel[1] * a / 0xff;
322 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff; 358 b = pixel[2] * a / 0xff;
323 } 359 }
324 else 360 else
325 { 361 {
326 a = 0xff; 362 a = 0xff;
327 r = pixel[0]; 363 r = pixel[0];
… …
352} 388}
353 389
354rxvt_img * 390rxvt_img *
355rxvt_img::clone () 391rxvt_img::clone ()
356{ 392{
393 return new rxvt_img (*this);
394}
395
396rxvt_img *
397rxvt_img::reify ()
398{
399 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400 return clone ();
401
357 rxvt_img *img = new rxvt_img (s, format, w, h); 402 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);
403 img->alloc ();
358 404
359 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
360 XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
361 XFreeGC (s->display->dpy, gc);
362
363 return img;
364}
365
366rxvt_img *
367rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)
368{
369 rxvt_img *img = new rxvt_img (s, format, width, height);
370
371 Display *dpy = s->display->dpy; 405 Display *dpy = s->display->dpy;
372 XRenderPictureAttributes pa; 406
373 pa.repeat = repeat; 407 Picture src = src_picture ();
374 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
375 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 408 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
376 409
377 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height); 410 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
378 411
379 XRenderFreePicture (dpy, src);
380 XRenderFreePicture (dpy, dst); 412 XRenderFreePicture (dpy, src);
413 XRenderFreePicture (dpy, dst);
381 414
382 return img; 415 return img;
383} 416}
384 417
385rxvt_img * 418rxvt_img *
419rxvt_img::sub_rect (int x, int y, int width, int height)
420{
421 bool need_reify = w < width || h < height;
422
423 rxvt_img *img = clone ();
424
425 img->x += x;
426 img->y += y;
427 img->w = width;
428 img->h = height;
429
430 if (need_reify)
431 img->reify ();
432
433 return img;
434}
435
436rxvt_img *
386rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat) 437rxvt_img::transform (int new_width, int new_height, double matrix[9])
387{ 438{
388 rxvt_img *img = new rxvt_img (s, format, new_width, new_height); 439 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height);
440 img->alloc ();
389 441
390 Display *dpy = s->display->dpy; 442 Display *dpy = s->display->dpy;
391 XRenderPictureAttributes pa; 443 Picture src = src_picture ();
392 pa.repeat = repeat;
393 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
394 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 444 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
395 445
396 XTransform xfrm; 446 XTransform xfrm;
397 447
398 for (int i = 0; i < 3; ++i) 448 for (int i = 0; i < 3; ++i)
399 for (int j = 0; j < 3; ++j) 449 for (int j = 0; j < 3; ++j)
400 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 450 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
451
452 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
453 xfrm.matrix [0][3] += XDoubleToFixed (y);
401 454
402 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 455 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
403 XRenderSetPictureTransform (dpy, src, &xfrm); 456 XRenderSetPictureTransform (dpy, src, &xfrm);
404 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 457 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
405 458
… …
420 473
421 return transform (new_width, new_height, matrix); 474 return transform (new_width, new_height, matrix);
422} 475}
423 476
424rxvt_img * 477rxvt_img *
425rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat) 478rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
426{ 479{
427 double s = sin (phi); 480 double s = sin (phi);
428 double c = cos (phi); 481 double c = cos (phi);
429 482
430 double matrix[9] = { 483 double matrix[9] = {
431 c, -s, -c * x + s * y + x, 484 c, -s, -c * x + s * y + x,
432 s, c, -s * x - c * y + y, 485 s, c, -s * x - c * y + y,
433 0, 0, 1 486 0, 0, 1
434 }; 487 };
435 488
436 return transform (new_width, new_height, matrix, repeat); 489 return transform (new_width, new_height, matrix);
437} 490}
438 491
439rxvt_img * 492rxvt_img *
440rxvt_img::convert_to (XRenderPictFormat *new_format) 493rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
441{ 494{
495 if (new_format == format)
496 return clone ();
497
442 rxvt_img *img = new rxvt_img (s, new_format, w, h); 498 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h);
499 img->alloc ();
443 500
444 Display *dpy = s->display->dpy; 501 Display *dpy = s->display->dpy;
445 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); 502 Picture src = src_picture ();
446 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 503 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
504 int op = PictOpSrc;
447 505
506 if (format->direct.alphaMask && !new_format->direct.alphaMask)
507 {
508 // does it have to be that complicated
509 rgba c;
510 bg.get (c);
511
512 XRenderColor rc = { c.r, c.g, c.b, 0xffff };
513 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
514
515 op = PictOpOver;
516 }
517
448 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 518 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
449 519
450 XRenderFreePicture (dpy, src); 520 XRenderFreePicture (dpy, src);
451 XRenderFreePicture (dpy, dst); 521 XRenderFreePicture (dpy, dst);
452 522
453 return img; 523 return img;
… …
456rxvt_img * 526rxvt_img *
457rxvt_img::blend (rxvt_img *img, double factor) 527rxvt_img::blend (rxvt_img *img, double factor)
458{ 528{
459 rxvt_img *img2 = clone (); 529 rxvt_img *img2 = clone ();
460 Display *dpy = s->display->dpy; 530 Display *dpy = s->display->dpy;
461 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 531 Picture src = src_picture ();
462 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 532 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
463 Picture mask = create_xrender_mask (dpy, img->pm, False); 533 Picture mask = create_xrender_mask (dpy, img->pm, False);
464 534
465 XRenderColor mask_c; 535 XRenderColor mask_c;
466 536

Diff Legend

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