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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.102 by sf-exg, Sun Oct 31 09:34:23 2010 UTC vs.
Revision 1.129 by root, Mon Jan 3 03:05:47 2011 UTC

… …
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
29#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
30 38
31#if DO_TIMING_TEST 39#if DO_TIMING_TEST
32# include <sys/time.h> 40# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
58 * 66 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 70 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 * 71 *
82 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 74 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
108 h_scale = v_scale = 0; 98 h_scale = v_scale = 0;
109 h_align = v_align = 0; 99 h_align = v_align = 0;
110#endif 100#endif
111#ifdef ENABLE_TRANSPARENCY 101#ifdef ENABLE_TRANSPARENCY
112 shade = 100; 102 shade = 100;
113 recoded_root_pmap = None;
114#endif 103#endif
115 flags = 0; 104 flags = 0;
116 pixmap = None; 105 pixmap = None;
117 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
118 target = 0; 107 target = 0;
108 target_x = target_y = 0;
119} 109}
120 110
121void 111void
122bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
123{ 113{
… …
129#ifdef HAVE_PIXBUF 119#ifdef HAVE_PIXBUF
130 if (pixbuf) 120 if (pixbuf)
131 g_object_unref (pixbuf); 121 g_object_unref (pixbuf);
132#endif 122#endif
133 123
134#ifdef ENABLE_TRANSPARENCY
135 if (recoded_root_pmap && target)
136 XFreePixmap (target->dpy, recoded_root_pmap);
137#endif
138
139 if (pixmap && target) 124 if (pixmap && target)
140 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
126}
127
128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
141} 140}
142 141
143bool 142bool
144bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
145{ 144{
… …
174 return true; 173 return true;
175 } 174 }
176# endif 175# endif
177 176
178 return false; 177 return false;
179}; 178}
180 179
181bool bgPixmap_t::need_client_side_rendering () 180bool bgPixmap_t::need_client_side_rendering ()
182{ 181{
183# ifdef HAVE_AFTERIMAGE 182# ifdef HAVE_AFTERIMAGE
184 if (original_asim) 183 if (original_asim)
… …
254 dst_size = target_size - dst_pos; 253 dst_size = target_size - dst_pos;
255 return src_pos; 254 return src_pos;
256} 255}
257 256
258bool 257bool
259bgPixmap_t::set_geometry (const char *geom) 258bgPixmap_t::set_geometry (const char *geom, bool update)
260{ 259{
260 bool changed = false;
261 int geom_flags = 0, changed = 0; 261 int geom_flags = 0;
262 int x = 0, y = 0; 262 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
264 unsigned int n; 264 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
266 const char *p; 266 const char *ops;
267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
268 268
269 if (geom == NULL) 269 if (geom == NULL)
270 return false; 270 return false;
271 271
272 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
273 273
274 while (isspace(*geom)) ++geom;
275 if ((p = strchr (geom, ';')) == NULL)
276 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
277 275 if (ops == NULL)
276 n = strlen (geom);
277 else
278 n = (p - geom); 278 n = ops - geom;
279
279 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
280 { 281 return false;
281 char *ops;
282 new_flags |= geometrySet;
283 282
284 memcpy (str, geom, n); 283 memcpy (str, geom, n);
285 str[n] = '\0'; 284 str[n] = '\0';
286 if (str[0] == ':') 285 rxvt_strtrim (str);
287 ops = &str[0];
288 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
289 ops = &str[0];
290 else
291 {
292 char *tmp;
293 ops = strchr (str, ':');
294 if (ops != NULL)
295 {
296 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
297 *(++tmp) = '\0';
298 if (ops == tmp) ++ops;
299 }
300 }
301 286
302 if (ops > str || ops == NULL) 287 if (str[0])
303 { 288 {
304 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
305 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
306
307 if ((geom_flags & XValue) && !(geom_flags & YValue))
308 {
309 y = x;
310 geom_flags |= YValue;
311 }
312
313 if (flags & geometrySet)
314 {
315 /* new geometry is an adjustment to the old one ! */
316 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
317 {
318 if (w == 0 && h != 0)
319 {
320 w = h_scale;
321 h = (v_scale * h) / 100;
322 }
323 else if (h == 0 && w != 0)
324 {
325 w = (h_scale * w) / 100;
326 h = v_scale;
327 }
328 }
329 if (geom_flags & XValue)
330 {
331 if (str[0] != '=')
332 {
333 y += v_align;
334 x += h_align;
335 }
336 }
337 }
338 else /* setting up geometry from scratch */
339 {
340 if (!(geom_flags & XValue))
341 {
342 /* use default geometry - centered */
343 x = y = defaultAlign;
344 }
345 else if (!(geom_flags & YValue))
346 y = x;
347
348 if ((geom_flags & (WidthValue|HeightValue)) == 0)
349 {
350 /* use default geometry - scaled */
351 w = h = defaultScale;
352 }
353 else if (geom_flags & WidthValue)
354 {
355 if (!(geom_flags & HeightValue))
356 h = w;
357 }
358 else
359 w = h;
360 }
361 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
362 else if (!(flags & geometrySet)) 292
363 { 293 if (!update)
364 /* default geometry - scaled and centered */ 294 {
295 if (!(geom_flags & XValue))
365 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
366 w = h = defaultScale; 301 w = h = defaultScale;
367 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
368 306
369 if (!(flags & geometrySet))
370 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
371 309
372 if (ops) 310 if (ops)
373 { 311 {
374 while (*ops) 312 while (*ops)
375 { 313 {
376 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
377 315
378# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
379 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
380 { 318 {
381 w = h = noScale; 319 w = h = noScale;
382 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
383 } 321 }
384 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
385 { 323 {
386 new_flags |= propScale; 324 new_flags |= propScale;
387 } 325 }
388 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
389 { 327 {
390 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
391 329
392 h = noScale; 330 h = noScale;
393 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
394 } 332 }
395 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
396 { 334 {
397 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
398 336
399 w = noScale; 337 w = noScale;
400 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
401 } 339 }
402 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
403 { 341 {
404 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
405 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
406 344
407 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
408 } 346 }
409 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
410 { 348 {
411 w = h = windowScale; 349 w = h = windowScale;
412 x = y = centerAlign; 350 x = y = centerAlign;
413 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
414 } 352 }
415 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
416 { 354 {
417 new_flags |= rootAlign; 355 new_flags |= rootAlign;
418 w = h = noScale; 356 w = h = noScale;
419 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
420 } 358 }
421# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
422 360
423 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
424 } /* done parsing ops */ 362 } /* done parsing ops */
425 } 363 }
426 364
427 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
428 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
429 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
431 }
432 369
433 if (new_flags != flags) 370 if (new_flags != flags)
434 { 371 {
435 flags = new_flags; 372 flags = new_flags;
436 changed++; 373 changed = true;
437 } 374 }
438 375
439 return (changed > 0); 376 return changed;
440} 377}
441 378
442void 379void
443bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 380bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
444{ 381{
… …
461 if (!w) w = image_width; 398 if (!w) w = image_width;
462 if (!h) h = image_height; 399 if (!h) h = image_height;
463 400
464 if (flags & rootAlign) 401 if (flags & rootAlign)
465 { 402 {
466 target->get_window_origin (x, y);
467 x = -x; 403 x = -target_x;
468 y = -y; 404 y = -target_y;
469 } 405 }
470 else 406 else
471 { 407 {
472 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
473 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
667 if (result) 603 if (result)
668 { 604 {
669 XGCValues gcv; 605 XGCValues gcv;
670 GC gc; 606 GC gc;
671 607
672 if (pixmap)
673 {
674 if (pmap_width != new_pmap_width
675 || pmap_height != new_pmap_height
676 || pmap_depth != target->depth)
677 {
678 XFreePixmap (target->dpy, pixmap);
679 pixmap = None;
680 }
681 }
682
683 /* create Pixmap */ 608 /* create Pixmap */
684 if (pixmap == None) 609 if (pixmap == None
610 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height
612 || pmap_depth != target->depth)
685 { 613 {
614 if (pixmap)
615 XFreePixmap (target->dpy, pixmap);
686 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 616 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
687 pmap_width = new_pmap_width; 617 pmap_width = new_pmap_width;
688 pmap_height = new_pmap_height; 618 pmap_height = new_pmap_height;
689 pmap_depth = target->depth; 619 pmap_depth = target->depth;
690 } 620 }
… …
727} 657}
728# endif /* HAVE_AFTERIMAGE */ 658# endif /* HAVE_AFTERIMAGE */
729 659
730# ifdef HAVE_PIXBUF 660# ifdef HAVE_PIXBUF
731bool 661bool
662bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
663 int src_x, int src_y, int dst_x, int dst_y,
664 unsigned int width, unsigned int height)
665{
666 XImage *ximage;
667 char *data, *line;
668 int bytes_per_pixel;
669 int width_r, width_g, width_b;
670 int sh_r, sh_g, sh_b;
671 int rowstride;
672 int channels;
673 unsigned char *row;
674 Visual *visual = target->visual;
675 int depth = target->depth;
676
677 if (visual->c_class != TrueColor)
678 return false;
679
680 if (depth == 24 || depth == 32)
681 bytes_per_pixel = 4;
682 else if (depth == 15 || depth == 16)
683 bytes_per_pixel = 2;
684 else
685 return false;
686
687 width_r = rxvt_popcount (visual->red_mask);
688 width_g = rxvt_popcount (visual->green_mask);
689 width_b = rxvt_popcount (visual->blue_mask);
690
691 if (width_r > 8 || width_g > 8 || width_b > 8)
692 return false;
693
694 sh_r = rxvt_ctz (visual->red_mask);
695 sh_g = rxvt_ctz (visual->green_mask);
696 sh_b = rxvt_ctz (visual->blue_mask);
697
698 if (width > INT_MAX / height / bytes_per_pixel)
699 return false;
700
701 data = (char *)malloc (width * height * bytes_per_pixel);
702 if (!data)
703 return false;
704
705 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
706 width, height, bytes_per_pixel * 8, 0);
707 if (!ximage)
708 {
709 free (data);
710 return false;
711 }
712
713 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
714
715 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
716 channels = gdk_pixbuf_get_n_channels (pixbuf);
717 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
718 line = data;
719
720 for (int y = 0; y < height; y++)
721 {
722 for (int x = 0; x < width; x++)
723 {
724 unsigned char *pixel = row + x * channels;
725 uint32_t value;
726
727 value = ((pixel[0] >> (8 - width_r)) << sh_r)
728 | ((pixel[1] >> (8 - width_g)) << sh_g)
729 | ((pixel[2] >> (8 - width_b)) << sh_b);
730
731 if (bytes_per_pixel == 4)
732 ((uint32_t *)line)[x] = value;
733 else
734 ((uint16_t *)line)[x] = value;
735 }
736
737 row += rowstride;
738 line += ximage->bytes_per_line;
739 }
740
741 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
742 XDestroyImage (ximage);
743 return true;
744}
745
746bool
732bgPixmap_t::render_image (unsigned long background_flags) 747bgPixmap_t::render_image (unsigned long background_flags)
733{ 748{
734 if (target == NULL) 749 if (target == NULL)
735 return false; 750 return false;
736 751
737 if (!pixbuf) 752 if (!pixbuf)
738 return false; 753 return false;
739 754
740#if !XRENDER
741 if (background_flags) 755 if (background_flags
756 && !(flags & HAS_RENDER))
742 return false; 757 return false;
743#endif
744 758
745 GdkPixbuf *result; 759 GdkPixbuf *result;
746 760
747 int image_width = gdk_pixbuf_get_width (pixbuf); 761 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 762 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 813 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 814 new_pmap_height = min (image_height, target_height);
801 } 815 }
802 } 816 }
803 817
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None) 818 if (pixmap == None
819 || pmap_width != new_pmap_width
820 || pmap_height != new_pmap_height
821 || pmap_depth != target->depth)
816 { 822 {
823 if (pixmap)
824 XFreePixmap (target->dpy, pixmap);
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 825 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width; 826 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 827 pmap_height = new_pmap_height;
820 pmap_depth = target->depth; 828 pmap_depth = target->depth;
821 } 829 }
… …
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 832 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825 833
826 if (h_scale == 0 || v_scale == 0) 834 if (h_scale == 0 || v_scale == 0)
827 { 835 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 836 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 837 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 838 0, 0,
831 0, 0, 839 0, 0,
832 image_width, image_height, 840 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 841
836 gcv.tile = tile; 842 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 843 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 844 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 845 gcv.ts_y_origin = y;
… …
854 || dst_x + dst_width < new_pmap_width 860 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 861 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 862 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857 863
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 864 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 865 pixbuf_to_pixmap (result, pixmap, gc,
860 src_x, src_y, 866 src_x, src_y,
861 dst_x, dst_y, 867 dst_x, dst_y,
862 dst_width, dst_height, 868 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 } 869 }
866 870
867#if XRENDER 871#if XRENDER
868 if (background_flags) 872 if (background_flags)
869 { 873 {
… …
915# endif /* HAVE_PIXBUF */ 919# endif /* HAVE_PIXBUF */
916 920
917bool 921bool
918bgPixmap_t::set_file (const char *file) 922bgPixmap_t::set_file (const char *file)
919{ 923{
920 assert (file); 924 if (!file || !*file)
925 return false;
921 926
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 927 if (const char *p = strchr (file, ';'))
925 { 928 {
926 size_t len = p - file; 929 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 930 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 931 memcpy (f, file, len);
929 f[len] = '\0'; 932 f[len] = '\0';
930 file = f; 933 file = f;
931 } 934 }
932 935
933# ifdef HAVE_AFTERIMAGE 936# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 937 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 938 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 939 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 940 if (image)
938 { 941 {
939 if (original_asim) 942 if (original_asim)
940 safe_asimage_destroy (original_asim); 943 safe_asimage_destroy (original_asim);
941 original_asim = image; 944 original_asim = image;
942 have_image = true; 945 have_image = true;
943 return true; 946 return true;
944 } 947 }
945# endif 948# endif
946 949
947# ifdef HAVE_PIXBUF 950# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 951 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 952 if (image)
950 { 953 {
951 if (pixbuf) 954 if (pixbuf)
952 g_object_unref (pixbuf); 955 g_object_unref (pixbuf);
953 pixbuf = image; 956 pixbuf = image;
954 have_image = true; 957 have_image = true;
955 return true; 958 return true;
956 } 959 }
957# endif 960# endif
958 }
959 961
960 return false; 962 return false;
961} 963}
962 964
963# endif /* BG_IMAGE_FROM_FILE */ 965# endif /* BG_IMAGE_FROM_FILE */
… …
976} 978}
977 979
978bool 980bool
979bgPixmap_t::set_blur_radius (const char *geom) 981bgPixmap_t::set_blur_radius (const char *geom)
980{ 982{
981 int changed = 0; 983 bool changed = false;
982 unsigned int hr, vr; 984 unsigned int hr, vr;
983 int junk; 985 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 986 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 987
986 if (!(geom_flags & WidthValue)) 988 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 993 min_it (hr, 128);
992 min_it (vr, 128); 994 min_it (vr, 128);
993 995
994 if (h_blurRadius != hr) 996 if (h_blurRadius != hr)
995 { 997 {
996 ++changed; 998 changed = true;
997 h_blurRadius = hr; 999 h_blurRadius = hr;
998 } 1000 }
999 1001
1000 if (v_blurRadius != vr) 1002 if (v_blurRadius != vr)
1001 { 1003 {
1002 ++changed; 1004 changed = true;
1003 v_blurRadius = vr; 1005 v_blurRadius = vr;
1004 } 1006 }
1005 1007
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 1008 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 1009 flags &= ~blurNeeded;
1008 else 1010 else
1009 flags |= blurNeeded; 1011 flags |= blurNeeded;
1010 1012
1011#if XRENDER
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 1013 return changed;
1024} 1014}
1025 1015
1026static inline unsigned long 1016static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 1017compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 1018{
… …
1031 bool has_shade = shade != 100; 1021 bool has_shade = shade != 100;
1032 1022
1033 if (tint) 1023 if (tint)
1034 { 1024 {
1035 tint->get (c); 1025 tint->get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1026# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1027 if (!has_shade
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1028 && IS_COMPONENT_WHOLESOME (c.r)
1038 && IS_COMPONENT_WHOLESOME (c.g) 1029 && IS_COMPONENT_WHOLESOME (c.g)
1039 && IS_COMPONENT_WHOLESOME (c.b)) 1030 && IS_COMPONENT_WHOLESOME (c.b))
1040 flags |= bgPixmap_t::tintWholesome; 1031 flags |= bgPixmap_t::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME 1032# undef IS_COMPONENT_WHOLESOME
1042 } 1033 }
1043 1034
1044 if (has_shade) 1035 if (has_shade || tint)
1045 flags |= bgPixmap_t::tintNeeded; 1036 flags |= bgPixmap_t::tintNeeded;
1046 else if (tint)
1047 {
1048 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1049 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1050 {
1051 flags |= bgPixmap_t::tintNeeded;
1052 }
1053 }
1054
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XRENDER
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066 1037
1067 return flags; 1038 return flags;
1068} 1039}
1069 1040
1070bool 1041bool
… …
1241 c.g = (c.g * shade) / 100; 1212 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100; 1213 c.b = (c.b * shade) / 100;
1243 } 1214 }
1244 else 1215 else
1245 { 1216 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1217 c.r = (c.r * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1218 c.g = (c.g * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1219 c.b = (c.b * (200 - shade)) / 100;
1249 } 1220 }
1250 1221
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1222 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1223 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa; 1224 XRenderPictureAttributes pa;
… …
1267 1238
1268 if (mask_pic && overlay_pic && back_pic) 1239 if (mask_pic && overlay_pic && back_pic)
1269 { 1240 {
1270 XRenderColor mask_c; 1241 XRenderColor mask_c;
1271 1242
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1243 mask_c.red = mask_c.green = mask_c.blue = 0;
1273 mask_c.alpha = 0xffff; 1244 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1245 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1246
1276 mask_c.alpha = 0; 1247 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1248 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g; 1249 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b; 1250 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1251 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1281 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1252 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1253
1254 if (shade > 100)
1255 {
1256 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1257 mask_c.alpha = 0;
1258 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1259
1260 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1261 }
1262
1282 ret = true; 1263 ret = true;
1283 } 1264 }
1284 1265
1285 XRenderFreePicture (dpy, mask_pic); 1266 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1267 XRenderFreePicture (dpy, overlay_pic);
… …
1307 /* root dimensions may change from call to call - but Display structure should 1288 /* root dimensions may change from call to call - but Display structure should
1308 * be always up-to-date, so let's use it : 1289 * be always up-to-date, so let's use it :
1309 */ 1290 */
1310 int screen = target->display->screen; 1291 int screen = target->display->screen;
1311 Display *dpy = target->dpy; 1292 Display *dpy = target->dpy;
1293 int root_depth = DefaultDepth (dpy, screen);
1312 int root_width = DisplayWidth (dpy, screen); 1294 int root_width = DisplayWidth (dpy, screen);
1313 int root_height = DisplayHeight (dpy, screen); 1295 int root_height = DisplayHeight (dpy, screen);
1296 unsigned int root_pmap_width, root_pmap_height;
1314 int window_width = target->szHint.width; 1297 int window_width = target->szHint.width;
1315 int window_height = target->szHint.height; 1298 int window_height = target->szHint.height;
1316 int sx, sy; 1299 int sx, sy;
1317 XGCValues gcv; 1300 XGCValues gcv;
1318 GC gc; 1301 GC gc;
1319 1302
1320 target->get_window_origin (sx, sy); 1303 sx = target_x;
1304 sy = target_y;
1321 1305
1322 /* check if we are outside of the visible part of the virtual screen : */ 1306 /* check if we are outside of the visible part of the virtual screen : */
1323 if (sx + window_width <= 0 || sy + window_height <= 0 1307 if (sx + window_width <= 0 || sy + window_height <= 0
1324 || sx >= root_width || sy >= root_height) 1308 || sx >= root_width || sy >= root_height)
1325 return 0; 1309 return 0;
1326 1310
1311 // validate root pixmap and get its size
1312 if (root_pixmap != None)
1313 {
1314 Window wdummy;
1315 int idummy;
1316 unsigned int udummy;
1317
1318 target->allowedxerror = -1;
1319
1320 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1321 root_pixmap = None;
1322
1323 target->allowedxerror = 0;
1324 }
1325
1326 Pixmap recoded_root_pmap = root_pixmap;
1327
1328 if (root_pixmap != None && root_depth != target->depth)
1329 {
1330#if XRENDER
1331 if (flags & HAS_RENDER)
1332 {
1333 XRenderPictureAttributes pa;
1334
1335 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1336 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1337
1338 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1339 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1340 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1341
1342 if (src && dst)
1343 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1344 else
1345 {
1346 XFreePixmap (dpy, recoded_root_pmap);
1347 root_pixmap = None;
1348 }
1349
1350 XRenderFreePicture (dpy, src);
1351 XRenderFreePicture (dpy, dst);
1352 }
1353 else
1354#endif
1355 root_pixmap = None;
1356 }
1357
1327 if (root_pixmap == None) 1358 if (root_pixmap == None)
1328 return 0; 1359 return 0;
1329 1360
1330 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1361 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1331 1362
1332 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1363 if (tiled_root_pmap == None) /* something really bad happened - abort */
1333 return 0; 1364 return 0;
1334 1365
1335 /* straightforward pixmap copy */ 1366 /* straightforward pixmap copy */
1336 gcv.tile = root_pixmap;
1337 gcv.fill_style = FillTiled;
1338
1339 while (sx < 0) sx += (int)root_width; 1367 while (sx < 0) sx += (int)root_width;
1340 while (sy < 0) sy += (int)root_height; 1368 while (sy < 0) sy += (int)root_height;
1341 1369
1370 gcv.tile = recoded_root_pmap;
1371 gcv.fill_style = FillTiled;
1342 gcv.ts_x_origin = -sx; 1372 gcv.ts_x_origin = -sx;
1343 gcv.ts_y_origin = -sy; 1373 gcv.ts_y_origin = -sy;
1344 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1374 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1345 1375
1346 if (gc) 1376 if (gc)
1347 { 1377 {
1348 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1378 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1349 result |= transpPmapTiled; 1379 result |= transpPmapTiled;
1350 XFreeGC (dpy, gc); 1380 XFreeGC (dpy, gc);
1351 }
1352 1381
1353 if (tiled_root_pmap != None)
1354 {
1355 if (!need_client_side_rendering ()) 1382 if (!need_client_side_rendering ())
1356 { 1383 {
1357 if (flags & (blurNeeded | blurServerSide)) 1384 if ((flags & blurNeeded)
1385 && (flags & HAS_RENDER_CONV))
1358 { 1386 {
1359 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1387 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1360 result |= transpPmapBlurred; 1388 result |= transpPmapBlurred;
1361 } 1389 }
1362 if (flags & (tintNeeded | tintServerSide)) 1390 if ((flags & tintNeeded)
1391 && (flags & (tintWholesome | HAS_RENDER)))
1363 { 1392 {
1364 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1393 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1365 result |= transpPmapTinted; 1394 result |= transpPmapTinted;
1366 } 1395 }
1367 } /* server side rendering completed */ 1396 } /* server side rendering completed */
… …
1372 pixmap = tiled_root_pmap; 1401 pixmap = tiled_root_pmap;
1373 pmap_width = window_width; 1402 pmap_width = window_width;
1374 pmap_height = window_height; 1403 pmap_height = window_height;
1375 pmap_depth = target->depth; 1404 pmap_depth = target->depth;
1376 } 1405 }
1406 else
1407 XFreePixmap (dpy, tiled_root_pmap);
1408
1409 if (recoded_root_pmap != root_pixmap)
1410 XFreePixmap (dpy, recoded_root_pmap);
1377 1411
1378 return result; 1412 return result;
1379} 1413}
1380 1414
1381void 1415void
1382bgPixmap_t::set_root_pixmap () 1416bgPixmap_t::set_root_pixmap ()
1383{ 1417{
1384 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1418 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1385 if (new_root_pixmap == None) 1419 if (new_root_pixmap == None)
1386 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1420 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1387 1421
1388 root_pixmap = new_root_pixmap; 1422 root_pixmap = new_root_pixmap;
1389
1390 unsigned int width, height;
1391 int depth = DefaultDepth (target->dpy, target->display->screen);
1392
1393 // validate root pixmap
1394 if (root_pixmap != None)
1395 {
1396 Window wdummy;
1397 int idummy;
1398 unsigned int udummy;
1399
1400 target->allowedxerror = -1;
1401
1402 if (!XGetGeometry (target->dpy, root_pixmap, &wdummy, &idummy, &idummy, &width, &height, &udummy, &udummy))
1403 root_pixmap = None;
1404
1405 target->allowedxerror = 0;
1406 }
1407
1408 if (root_pixmap != None && depth != target->depth)
1409 {
1410#if XRENDER
1411 Display *dpy = target->dpy;
1412 XRenderPictureAttributes pa;
1413
1414 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
1415 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1416
1417 if (recoded_root_pmap)
1418 XFreePixmap (dpy, recoded_root_pmap);
1419 recoded_root_pmap = XCreatePixmap (dpy, target->vt, width, height, target->depth);
1420 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1421 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1422
1423 if (src && dst)
1424 {
1425 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, width, height);
1426 root_pixmap = recoded_root_pmap;
1427 }
1428 else
1429 root_pixmap = None;
1430
1431 XRenderFreePicture (dpy, src);
1432 XRenderFreePicture (dpy, dst);
1433#else
1434 root_pixmap = None;
1435#endif
1436 }
1437} 1423}
1438# endif /* ENABLE_TRANSPARENCY */ 1424# endif /* ENABLE_TRANSPARENCY */
1439 1425
1440# ifndef HAVE_AFTERIMAGE 1426#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1441static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1427static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1442# endif 1428# endif
1443 1429
1444bool 1430bool
1445bgPixmap_t::render () 1431bgPixmap_t::render ()
1446{ 1432{
… …
1456 /* we need to re-generate transparency pixmap in that case ! */ 1442 /* we need to re-generate transparency pixmap in that case ! */
1457 background_flags = make_transparency_pixmap (); 1443 background_flags = make_transparency_pixmap ();
1458 if (background_flags == 0) 1444 if (background_flags == 0)
1459 return false; 1445 return false;
1460 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1446 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1461 flags = flags & ~isInvalid; 1447 flags &= ~isInvalid;
1462 } 1448 }
1463# endif 1449# endif
1464 1450
1465# ifdef BG_IMAGE_FROM_FILE 1451# ifdef BG_IMAGE_FROM_FILE
1466 if (have_image 1452 if (have_image
1467 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1453 || (background_flags & transpTransformations) != (flags & transpTransformations))
1468 { 1454 {
1469 if (render_image (background_flags)) 1455 if (render_image (background_flags))
1470 flags = flags & ~isInvalid; 1456 flags &= ~isInvalid;
1471 } 1457 }
1472# endif 1458# endif
1473 1459
1460# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1474 XImage *result = NULL; 1461 XImage *result = NULL;
1475 1462
1476 if (background_flags && (flags & isInvalid)) 1463 if (background_flags && (flags & isInvalid))
1477 { 1464 {
1478 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1465 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1479 } 1466 }
1480 1467
1481 if (result) 1468 if (result)
1482 { 1469 {
1483# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1484 /* our own client-side tinting */ 1470 /* our own client-side tinting */
1485 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1486 { 1472 {
1487 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1488 if (flags & tintSet) 1474 if (flags & tintSet)
1489 tint.get (c); 1475 tint.get (c);
1490 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1476 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1491 } 1477 }
1492# endif
1493 1478
1494 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1479 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1495 1480
1496 if (gc) 1481 if (gc)
1497 { 1482 {
1498 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1483 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1499 1484
1500 XFreeGC (target->dpy, gc); 1485 XFreeGC (target->dpy, gc);
1501 flags = flags & ~isInvalid; 1486 flags &= ~isInvalid;
1502 } 1487 }
1503 1488
1504 XDestroyImage (result); 1489 XDestroyImage (result);
1505 } 1490 }
1491# endif
1506 1492
1507 if (flags & isInvalid) 1493 if (flags & isInvalid)
1508 { 1494 {
1509 if (pixmap != None) 1495 if (pixmap != None)
1510 { 1496 {
… …
1518 valid_since = ev::now (); 1504 valid_since = ev::now ();
1519 1505
1520 return true; 1506 return true;
1521} 1507}
1522 1508
1523bool 1509void
1524bgPixmap_t::set_target (rxvt_term *new_target) 1510bgPixmap_t::set_target (rxvt_term *new_target)
1525{ 1511{
1526 if (new_target)
1527 if (target != new_target)
1528 {
1529 target = new_target; 1512 target = new_target;
1530 return true; 1513
1514 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1515#if XRENDER
1516 int major, minor;
1517 if (XRenderQueryVersion (target->dpy, &major, &minor))
1518 flags |= HAS_RENDER;
1519 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1520 if (filters)
1521 {
1522 for (int i = 0; i < filters->nfilter; i++)
1523 if (!strcmp (filters->filter[i], FilterConvolution))
1524 flags |= HAS_RENDER_CONV;
1525
1526 XFree (filters);
1531 } 1527 }
1532 1528#endif
1533 return false;
1534} 1529}
1535 1530
1536void 1531void
1537bgPixmap_t::apply () 1532bgPixmap_t::apply ()
1538{ 1533{
1539 if (target) 1534 if (target == NULL)
1540 { 1535 return;
1536
1541 if (pixmap != None) 1537 if (pixmap != None)
1542 { 1538 {
1543 /* set target's background to pixmap */ 1539 /* set target's background to pixmap */
1544# ifdef ENABLE_TRANSPARENCY 1540# ifdef ENABLE_TRANSPARENCY
1545 if (flags & isTransparent) 1541 if (flags & isTransparent)
1546 { 1542 {
1547 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1543 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1548 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1544 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1549 1545
1550 if (target->scrollBar.win) 1546 if (target->scrollBar.win)
1551 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1547 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1552 } 1548 }
1553 else 1549 else
1554# endif 1550# endif
1555 { 1551 {
1556 /* force old pixmap dereference in case it was transparent before :*/ 1552 /* force old pixmap dereference in case it was transparent before :*/
1557 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1558 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1559 /* do we also need to set scrollbar's background here ? */
1560
1561 if (target->scrollBar.win)
1562 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1563 }
1564 }
1565 else
1566 {
1567 /* set target background to a pixel */
1568 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1553 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1569 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1554 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1570 /* do we also need to set scrollbar's background here ? */ 1555 /* do we also need to set scrollbar's background here ? */
1556
1571 if (target->scrollBar.win) 1557 if (target->scrollBar.win)
1572 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1558 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1573 } 1559 }
1560 }
1561 else
1562 {
1563 /* set target background to a pixel */
1564 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1565 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1566 /* do we also need to set scrollbar's background here ? */
1567 if (target->scrollBar.win)
1568 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1569 }
1574 1570
1575 /* don't want Expose on the parent or vt. It is better to use 1571 /* don't want Expose on the parent or vt. It is better to use
1576 scr_touch or we get a great deal of flicker otherwise: */ 1572 scr_touch or we get a great deal of flicker otherwise: */
1577 XClearWindow (target->dpy, target->parent[0]); 1573 XClearWindow (target->dpy, target->parent[0]);
1578 1574
1579 if (target->scrollBar.state && target->scrollBar.win) 1575 if (target->scrollBar.state && target->scrollBar.win)
1580 { 1576 {
1581 target->scrollBar.state = STATE_IDLE; 1577 target->scrollBar.state = STATE_IDLE;
1582 target->scrollBar.show (0); 1578 target->scrollBar.show (0);
1583 } 1579 }
1584 1580
1585 target->want_refresh = 1; 1581 target->want_refresh = 1;
1586 flags |= hasChanged; 1582 flags |= hasChanged;
1587 }
1588} 1583}
1589 1584
1590#endif /* HAVE_BG_PIXMAP */ 1585#endif /* HAVE_BG_PIXMAP */
1591 1586
1592#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1593/* taken from aterm-0.4.2 */ 1588/* taken from aterm-0.4.2 */
1594 1589
1595static void 1590static void
1596ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1591shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1597{ 1592{
1598 int sh_r, sh_g, sh_b; 1593 int sh_r, sh_g, sh_b;
1599 uint32_t mask_r, mask_g, mask_b; 1594 uint32_t mask_r, mask_g, mask_b;
1600 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1601 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1596 rgba low;
1602 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1597 rgba high;
1603 int i; 1598 int i;
1604 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1599 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1605 1600
1606 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1601 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1607 1602
1608 /* for convenience */ 1603 /* for convenience */
1609 mask_r = visual->red_mask; 1604 mask_r = visual->red_mask;
1610 mask_g = visual->green_mask; 1605 mask_g = visual->green_mask;
1611 mask_b = visual->blue_mask; 1606 mask_b = visual->blue_mask;
1612 1607
1613 /* boring lookup table pre-initialization */ 1608 /* boring lookup table pre-initialization */
1614 switch (srcImage->depth) 1609 switch (ximage->depth)
1615 { 1610 {
1616 case 15: 1611 case 15:
1617 if ((mask_r != 0x7c00) || 1612 if ((mask_r != 0x7c00) ||
1618 (mask_g != 0x03e0) || 1613 (mask_g != 0x03e0) ||
1619 (mask_b != 0x001f)) 1614 (mask_b != 0x001f))
… …
1672 /* prepare limits for color transformation (each channel is handled separately) */ 1667 /* prepare limits for color transformation (each channel is handled separately) */
1673 if (shade > 100) 1668 if (shade > 100)
1674 { 1669 {
1675 shade = 200 - shade; 1670 shade = 200 - shade;
1676 1671
1677 lower_lim_r = 65535-rm; 1672 high.r = c.r * shade / 100;
1678 lower_lim_g = 65535-gm; 1673 high.g = c.g * shade / 100;
1679 lower_lim_b = 65535-bm; 1674 high.b = c.b * shade / 100;
1680 1675
1681 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1676 low.r = 65535 * (100 - shade) / 100;
1682 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1677 low.g = 65535 * (100 - shade) / 100;
1683 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1678 low.b = 65535 * (100 - shade) / 100;
1684
1685 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1686 } 1679 }
1687 else 1680 else
1688 { 1681 {
1682 high.r = c.r * shade / 100;
1683 high.g = c.g * shade / 100;
1684 high.b = c.b * shade / 100;
1689 1685
1690 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1686 low.r = low.g = low.b = 0;
1691
1692 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1693 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1694 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1695 } 1687 }
1696 1688
1697 /* fill our lookup tables */ 1689 /* fill our lookup tables */
1698 for (i = 0; i <= mask_r>>sh_r; i++) 1690 for (i = 0; i <= mask_r>>sh_r; i++)
1699 { 1691 {
1700 uint32_t tmp; 1692 uint32_t tmp;
1701 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1693 tmp = i * high.r;
1702 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1694 tmp += (mask_r>>sh_r) * low.r;
1703 lookup_r[i] = (tmp/65535)<<sh_r; 1695 lookup_r[i] = (tmp/65535)<<sh_r;
1704 } 1696 }
1705 for (i = 0; i <= mask_g>>sh_g; i++) 1697 for (i = 0; i <= mask_g>>sh_g; i++)
1706 { 1698 {
1707 uint32_t tmp; 1699 uint32_t tmp;
1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1700 tmp = i * high.g;
1709 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1701 tmp += (mask_g>>sh_g) * low.g;
1710 lookup_g[i] = (tmp/65535)<<sh_g; 1702 lookup_g[i] = (tmp/65535)<<sh_g;
1711 } 1703 }
1712 for (i = 0; i <= mask_b>>sh_b; i++) 1704 for (i = 0; i <= mask_b>>sh_b; i++)
1713 { 1705 {
1714 uint32_t tmp; 1706 uint32_t tmp;
1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1707 tmp = i * high.b;
1716 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1708 tmp += (mask_b>>sh_b) * low.b;
1717 lookup_b[i] = (tmp/65535)<<sh_b; 1709 lookup_b[i] = (tmp/65535)<<sh_b;
1718 } 1710 }
1719 1711
1720 /* apply table to input image (replacing colors by newly calculated ones) */ 1712 /* apply table to input image (replacing colors by newly calculated ones) */
1721 if (srcImage->bits_per_pixel == 32 1713 if (ximage->bits_per_pixel == 32
1722 && (srcImage->depth == 24 || srcImage->depth == 32) 1714 && (ximage->depth == 24 || ximage->depth == 32)
1723 && srcImage->byte_order == host_byte_order) 1715 && ximage->byte_order == host_byte_order)
1724 { 1716 {
1725 uint32_t *p1, *pf, *p, *pl; 1717 uint32_t *p1, *pf, *p, *pl;
1726 p1 = (uint32_t *) srcImage->data; 1718 p1 = (uint32_t *) ximage->data;
1727 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1719 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1728 1720
1729 while (p1 < pf) 1721 while (p1 < pf)
1730 { 1722 {
1731 p = p1; 1723 p = p1;
1732 pl = p1 + srcImage->width; 1724 pl = p1 + ximage->width;
1733 for (; p < pl; p++) 1725 for (; p < pl; p++)
1734 { 1726 {
1735 *p = lookup_r[(*p & 0xff0000) >> 16] | 1727 *p = lookup_r[(*p & 0xff0000) >> 16] |
1736 lookup_g[(*p & 0x00ff00) >> 8] | 1728 lookup_g[(*p & 0x00ff00) >> 8] |
1737 lookup_b[(*p & 0x0000ff)] | 1729 lookup_b[(*p & 0x0000ff)] |
1738 (*p & 0xff000000); 1730 (*p & 0xff000000);
1739 } 1731 }
1740 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1732 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1741 } 1733 }
1742 } 1734 }
1743 else 1735 else
1744 { 1736 {
1745 for (int y = 0; y < srcImage->height; y++) 1737 for (int y = 0; y < ximage->height; y++)
1746 for (int x = 0; x < srcImage->width; x++) 1738 for (int x = 0; x < ximage->width; x++)
1747 { 1739 {
1748 unsigned long pixel = XGetPixel (srcImage, x, y); 1740 unsigned long pixel = XGetPixel (ximage, x, y);
1749 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1741 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1750 lookup_g[(pixel & mask_g) >> sh_g] | 1742 lookup_g[(pixel & mask_g) >> sh_g] |
1751 lookup_b[(pixel & mask_b) >> sh_b]; 1743 lookup_b[(pixel & mask_b) >> sh_b];
1752 XPutPixel (srcImage, x, y, pixel); 1744 XPutPixel (ximage, x, y, pixel);
1753 } 1745 }
1754 } 1746 }
1755 1747
1756 free (lookup); 1748 free (lookup);
1757} 1749}

Diff Legend

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