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.97 by sf-exg, Fri Oct 22 18:03:10 2010 UTC vs.
Revision 1.137 by sf-exg, Sat Jan 15 17:41:43 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#define DO_TIMING_TEST 0 29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
30 32
31#if DO_TIMING_TEST 33#ifndef FilterConvolution
32# include <sys/time.h> 34#define FilterConvolution "convolution"
33#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL);
36
37#define TIMING_TEST_PRINT_RESULT(id) \
38 do { \
39 struct timeval tv; \
40 gettimeofday (&tv, NULL); \
41 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
42 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
43 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
44 } while (0)
45
46#else
47#define TIMING_TEST_START(id) do {} while (0)
48#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
49#endif 35#endif
50 36
51/* 37/*
52 * Pixmap geometry string interpretation : 38 * Pixmap geometry string interpretation :
53 * Each geometry string contains zero or one scale/position 39 * Each geometry string contains zero or one scale/position
… …
58 * 44 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 45 * 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. 46 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 47 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 48 * 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 * 49 *
82 * Pixmap Operations : (should be prepended by a colon) 50 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 51 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 52 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 53 * propscale When scaling, scale proportionally. That is, maintain the
… …
111#ifdef ENABLE_TRANSPARENCY 79#ifdef ENABLE_TRANSPARENCY
112 shade = 100; 80 shade = 100;
113#endif 81#endif
114 flags = 0; 82 flags = 0;
115 pixmap = None; 83 pixmap = None;
116 valid_since = invalid_since = 0; 84 valid_since = 0;
117 target = 0; 85 target = 0;
86 target_x = target_y = 0;
118} 87}
119 88
120void 89void
121bgPixmap_t::destroy () 90bgPixmap_t::destroy ()
122{ 91{
… …
133 if (pixmap && target) 102 if (pixmap && target)
134 XFreePixmap (target->dpy, pixmap); 103 XFreePixmap (target->dpy, pixmap);
135} 104}
136 105
137bool 106bool
107bgPixmap_t::set_position (int x, int y)
108{
109
110 if (target_x != x
111 || target_y != y)
112 {
113 target_x = x;
114 target_y = y;
115 return true;
116 }
117 return false;
118}
119
120bool
138bgPixmap_t::window_size_sensitive () 121bgPixmap_t::window_size_sensitive ()
139{ 122{
140# ifdef ENABLE_TRANSPARENCY 123# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 124 if (flags & isTransparent)
142 return true; 125 return true;
… …
167 if (flags & rootAlign) 150 if (flags & rootAlign)
168 return true; 151 return true;
169 } 152 }
170# endif 153# endif
171 154
172 return false;
173};
174
175bool bgPixmap_t::need_client_side_rendering ()
176{
177# ifdef HAVE_AFTERIMAGE
178 if (original_asim)
179 return true;
180# endif
181 return false; 155 return false;
182} 156}
183 157
184# ifdef BG_IMAGE_FROM_FILE 158# ifdef BG_IMAGE_FROM_FILE
185static inline bool 159static inline bool
… …
248 dst_size = target_size - dst_pos; 222 dst_size = target_size - dst_pos;
249 return src_pos; 223 return src_pos;
250} 224}
251 225
252bool 226bool
253bgPixmap_t::set_geometry (const char *geom) 227bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 228{
229 bool changed = false;
255 int geom_flags = 0, changed = 0; 230 int geom_flags = 0;
256 int x = 0, y = 0; 231 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 232 unsigned int w = 0, h = 0;
258 unsigned int n; 233 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 234 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 235 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 236
263 if (geom == NULL) 237 if (geom == NULL)
264 return false; 238 return false;
265 239
266 char str[MAXLEN_GEOM]; 240 char str[256];
267 241
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 242 ops = strchr (geom, ':');
271 243 if (ops == NULL)
244 n = strlen (geom);
245 else
272 n = (p - geom); 246 n = ops - geom;
273 if (n < MAXLEN_GEOM)
274 {
275 char *ops;
276 new_flags |= geometrySet;
277 247
248 if (n >= sizeof (str))
249 return false;
250
278 memcpy (str, geom, n); 251 memcpy (str, geom, n);
279 str[n] = '\0'; 252 str[n] = '\0';
280 if (str[0] == ':') 253 rxvt_strtrim (str);
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 }
294 }
295 254
296 if (ops > str || ops == NULL) 255 if (str[0])
297 { 256 {
298 /* we have geometry string - let's handle it prior to applying ops */ 257 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 258 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 {
303 y = x;
304 geom_flags |= YValue;
305 }
306
307 if (flags & geometrySet)
308 {
309 /* new geometry is an adjustment to the old one ! */
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 }
332 else /* setting up geometry from scratch */
333 {
334 if (!(geom_flags & XValue))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 }
355 } /* done parsing geometry string */ 259 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 260
357 { 261 if (!update)
358 /* default geometry - scaled and centered */ 262 {
263 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 264 x = y = defaultAlign;
265 else if (!(geom_flags & YValue))
266 y = x;
267
268 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 269 w = h = defaultScale;
361 } 270 else if (!(geom_flags & HeightValue))
271 h = w;
272 else if (!(geom_flags & WidthValue))
273 w = h;
362 274
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 275 geom_flags |= WidthValue|HeightValue|XValue|YValue;
276 }
365 277
366 if (ops) 278 if (ops)
367 { 279 {
368 while (*ops) 280 char **arr = rxvt_strsplit (':', ops + 1);
281
282 for (int i = 0; arr[i]; i++)
369 { 283 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 284 if (!strcasecmp (arr[i], "tile"))
371
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile"))
374 { 285 {
375 w = h = noScale; 286 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 287 geom_flags |= WidthValue|HeightValue;
377 } 288 }
378 else if (CHECK_GEOM_OPS ("propscale")) 289 else if (!strcasecmp (arr[i], "propscale"))
379 { 290 {
380 new_flags |= propScale; 291 new_flags |= propScale;
381 } 292 }
382 else if (CHECK_GEOM_OPS ("hscale")) 293 else if (!strcasecmp (arr[i], "hscale"))
383 { 294 {
384 if (w == 0) w = windowScale; 295 if (w == 0) w = windowScale;
385 296
386 h = noScale; 297 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 298 geom_flags |= WidthValue|HeightValue;
388 } 299 }
389 else if (CHECK_GEOM_OPS ("vscale")) 300 else if (!strcasecmp (arr[i], "vscale"))
390 { 301 {
391 if (h == 0) h = windowScale; 302 if (h == 0) h = windowScale;
392 303
393 w = noScale; 304 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 305 geom_flags |= WidthValue|HeightValue;
395 } 306 }
396 else if (CHECK_GEOM_OPS ("scale")) 307 else if (!strcasecmp (arr[i], "scale"))
397 { 308 {
398 if (h == 0) h = windowScale; 309 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale; 310 if (w == 0) w = windowScale;
400 311
401 geom_flags |= WidthValue|HeightValue; 312 geom_flags |= WidthValue|HeightValue;
402 } 313 }
403 else if (CHECK_GEOM_OPS ("auto")) 314 else if (!strcasecmp (arr[i], "auto"))
404 { 315 {
405 w = h = windowScale; 316 w = h = windowScale;
406 x = y = centerAlign; 317 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 318 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 319 }
409 else if (CHECK_GEOM_OPS ("root")) 320 else if (!strcasecmp (arr[i], "root"))
410 { 321 {
411 new_flags |= rootAlign; 322 new_flags |= rootAlign;
412 w = h = noScale; 323 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue; 324 geom_flags |= WidthValue|HeightValue;
414 } 325 }
415# undef CHECK_GEOM_OPS
416
417 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 326 } /* done parsing ops */
419 }
420 327
328 rxvt_free_strsplit (arr);
329 }
330
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 331 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 332 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 333 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 334 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 335
427 if (new_flags != flags) 336 if (new_flags != flags)
428 { 337 {
429 flags = new_flags; 338 flags = new_flags;
430 changed++; 339 changed = true;
431 } 340 }
432 341
433 return (changed > 0); 342 return changed;
434} 343}
435 344
436void 345void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 346bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 347{
… …
455 if (!w) w = image_width; 364 if (!w) w = image_width;
456 if (!h) h = image_height; 365 if (!h) h = image_height;
457 366
458 if (flags & rootAlign) 367 if (flags & rootAlign)
459 { 368 {
460 target->get_window_origin (x, y);
461 x = -x; 369 x = -target_x;
462 y = -y; 370 y = -target_y;
463 } 371 }
464 else 372 else
465 { 373 {
466 x = make_align_position (h_align, target_width, w); 374 x = make_align_position (h_align, target_width, w);
467 y = make_align_position (v_align, target_height, h); 375 y = make_align_position (v_align, target_height, h);
… …
661 if (result) 569 if (result)
662 { 570 {
663 XGCValues gcv; 571 XGCValues gcv;
664 GC gc; 572 GC gc;
665 573
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 574 /* create Pixmap */
678 if (pixmap == None) 575 if (pixmap == None
576 || pmap_width != new_pmap_width
577 || pmap_height != new_pmap_height)
679 { 578 {
579 if (pixmap)
580 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 581 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 582 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 583 pmap_height = new_pmap_height;
683 pmap_depth = target->depth;
684 } 584 }
685 /* fill with background color (if result's not completely overlapping it) */ 585 /* fill with background color (if result's not completely overlapping it) */
686 gcv.foreground = target->pix_colors[Color_bg]; 586 gcv.foreground = target->pix_colors[Color_bg];
687 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 587 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
688 588
… …
721} 621}
722# endif /* HAVE_AFTERIMAGE */ 622# endif /* HAVE_AFTERIMAGE */
723 623
724# ifdef HAVE_PIXBUF 624# ifdef HAVE_PIXBUF
725bool 625bool
626bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
627 int src_x, int src_y, int dst_x, int dst_y,
628 unsigned int width, unsigned int height)
629{
630 XImage *ximage;
631 char *data, *line;
632 int bytes_per_pixel;
633 int width_r, width_g, width_b;
634 int sh_r, sh_g, sh_b;
635 int rowstride;
636 int channels;
637 unsigned char *row;
638 Visual *visual = target->visual;
639 int depth = target->depth;
640
641 if (visual->c_class != TrueColor)
642 return false;
643
644 if (depth == 24 || depth == 32)
645 bytes_per_pixel = 4;
646 else if (depth == 15 || depth == 16)
647 bytes_per_pixel = 2;
648 else
649 return false;
650
651 width_r = rxvt_popcount (visual->red_mask);
652 width_g = rxvt_popcount (visual->green_mask);
653 width_b = rxvt_popcount (visual->blue_mask);
654
655 if (width_r > 8 || width_g > 8 || width_b > 8)
656 return false;
657
658 sh_r = rxvt_ctz (visual->red_mask);
659 sh_g = rxvt_ctz (visual->green_mask);
660 sh_b = rxvt_ctz (visual->blue_mask);
661
662 if (width > INT_MAX / height / bytes_per_pixel)
663 return false;
664
665 data = (char *)malloc (width * height * bytes_per_pixel);
666 if (!data)
667 return false;
668
669 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
670 width, height, bytes_per_pixel * 8, 0);
671 if (!ximage)
672 {
673 free (data);
674 return false;
675 }
676
677 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
678
679 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
680 channels = gdk_pixbuf_get_n_channels (pixbuf);
681 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
682 line = data;
683
684 for (int y = 0; y < height; y++)
685 {
686 for (int x = 0; x < width; x++)
687 {
688 unsigned char *pixel = row + x * channels;
689 uint32_t value;
690
691 value = ((pixel[0] >> (8 - width_r)) << sh_r)
692 | ((pixel[1] >> (8 - width_g)) << sh_g)
693 | ((pixel[2] >> (8 - width_b)) << sh_b);
694
695 if (bytes_per_pixel == 4)
696 ((uint32_t *)line)[x] = value;
697 else
698 ((uint16_t *)line)[x] = value;
699 }
700
701 row += rowstride;
702 line += ximage->bytes_per_line;
703 }
704
705 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
706 XDestroyImage (ximage);
707 return true;
708}
709
710bool
726bgPixmap_t::render_image (unsigned long background_flags) 711bgPixmap_t::render_image (unsigned long background_flags)
727{ 712{
728 if (target == NULL) 713 if (target == NULL)
729 return false; 714 return false;
730 715
731 if (!pixbuf) 716 if (!pixbuf)
732 return false; 717 return false;
733 718
734#if !XFT
735 if (background_flags) 719 if (background_flags
720 && !(flags & HAS_RENDER))
736 return false; 721 return false;
737#endif
738 722
739 GdkPixbuf *result; 723 GdkPixbuf *result;
740 724
741 int image_width = gdk_pixbuf_get_width (pixbuf); 725 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 726 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 777 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 778 new_pmap_height = min (image_height, target_height);
795 } 779 }
796 } 780 }
797 781
798 if (pixmap)
799 {
800 if (pmap_width != new_pmap_width
801 || pmap_height != new_pmap_height
802 || pmap_depth != target->depth)
803 {
804 XFreePixmap (target->dpy, pixmap);
805 pixmap = None;
806 }
807 }
808
809 if (pixmap == None) 782 if (pixmap == None
783 || pmap_width != new_pmap_width
784 || pmap_height != new_pmap_height)
810 { 785 {
786 if (pixmap)
787 XFreePixmap (target->dpy, pixmap);
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 788 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width; 789 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 790 pmap_height = new_pmap_height;
814 pmap_depth = target->depth;
815 } 791 }
816 792
817 gcv.foreground = target->pix_colors[Color_bg]; 793 gcv.foreground = target->pix_colors[Color_bg];
818 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 794 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
819 795
820 if (h_scale == 0 || v_scale == 0) 796 if (h_scale == 0 || v_scale == 0)
821 { 797 {
822 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 798 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
823 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 799 pixbuf_to_pixmap (result, tile, gc,
824 0, 0, 800 0, 0,
825 0, 0, 801 0, 0,
826 image_width, image_height, 802 image_width, image_height);
827 XLIB_RGB_DITHER_NONE,
828 0, 0);
829 803
830 gcv.tile = tile; 804 gcv.tile = tile;
831 gcv.fill_style = FillTiled; 805 gcv.fill_style = FillTiled;
832 gcv.ts_x_origin = x; 806 gcv.ts_x_origin = x;
833 gcv.ts_y_origin = y; 807 gcv.ts_y_origin = y;
… …
848 || dst_x + dst_width < new_pmap_width 822 || dst_x + dst_width < new_pmap_width
849 || dst_y + dst_height < new_pmap_height) 823 || dst_y + dst_height < new_pmap_height)
850 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 824 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
851 825
852 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 826 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
853 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 827 pixbuf_to_pixmap (result, pixmap, gc,
854 src_x, src_y, 828 src_x, src_y,
855 dst_x, dst_y, 829 dst_x, dst_y,
856 dst_width, dst_height, 830 dst_width, dst_height);
857 XLIB_RGB_DITHER_NONE,
858 0, 0);
859 } 831 }
860 832
861#if XFT 833#if XRENDER
862 if (background_flags) 834 if (background_flags)
863 { 835 {
864 Display *dpy = target->dpy; 836 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa; 837 XRenderPictureAttributes pa;
866 838
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 839 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 840 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869 841
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 842 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 843 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872 844
… …
909# endif /* HAVE_PIXBUF */ 881# endif /* HAVE_PIXBUF */
910 882
911bool 883bool
912bgPixmap_t::set_file (const char *file) 884bgPixmap_t::set_file (const char *file)
913{ 885{
914 assert (file); 886 if (!file || !*file)
887 return false;
915 888
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 889 if (const char *p = strchr (file, ';'))
919 { 890 {
920 size_t len = p - file; 891 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 892 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 893 memcpy (f, file, len);
923 f[len] = '\0'; 894 f[len] = '\0';
924 file = f; 895 file = f;
925 } 896 }
926 897
927# ifdef HAVE_AFTERIMAGE 898# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 899 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 900 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 901 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 902 if (image)
932 { 903 {
933 if (original_asim) 904 if (original_asim)
934 safe_asimage_destroy (original_asim); 905 safe_asimage_destroy (original_asim);
935 original_asim = image; 906 original_asim = image;
907 flags |= CLIENT_RENDER;
936 have_image = true; 908 have_image = true;
937 return true; 909 return true;
938 } 910 }
939# endif 911# endif
940 912
941# ifdef HAVE_PIXBUF 913# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 914 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 915 if (image)
944 { 916 {
945 if (pixbuf) 917 if (pixbuf)
946 g_object_unref (pixbuf); 918 g_object_unref (pixbuf);
947 pixbuf = image; 919 pixbuf = image;
948 have_image = true; 920 have_image = true;
949 return true; 921 return true;
950 } 922 }
951# endif 923# endif
952 }
953 924
954 return false; 925 return false;
955} 926}
956 927
957# endif /* BG_IMAGE_FROM_FILE */ 928# endif /* BG_IMAGE_FROM_FILE */
… …
970} 941}
971 942
972bool 943bool
973bgPixmap_t::set_blur_radius (const char *geom) 944bgPixmap_t::set_blur_radius (const char *geom)
974{ 945{
975 int changed = 0; 946 bool changed = false;
976 unsigned int hr, vr; 947 unsigned int hr, vr;
977 int junk; 948 int junk;
978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 949 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
979 950
980 if (!(geom_flags & WidthValue)) 951 if (!(geom_flags & WidthValue))
… …
985 min_it (hr, 128); 956 min_it (hr, 128);
986 min_it (vr, 128); 957 min_it (vr, 128);
987 958
988 if (h_blurRadius != hr) 959 if (h_blurRadius != hr)
989 { 960 {
990 ++changed; 961 changed = true;
991 h_blurRadius = hr; 962 h_blurRadius = hr;
992 } 963 }
993 964
994 if (v_blurRadius != vr) 965 if (v_blurRadius != vr)
995 { 966 {
996 ++changed; 967 changed = true;
997 v_blurRadius = vr; 968 v_blurRadius = vr;
998 } 969 }
999 970
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 971 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 972 flags &= ~blurNeeded;
1002 else 973 else
1003 flags |= blurNeeded; 974 flags |= blurNeeded;
1004 975
1005#if XFT
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
1017 return (changed > 0); 976 return changed;
1018} 977}
1019 978
1020static inline unsigned long 979static inline unsigned long
1021compute_tint_shade_flags (rxvt_color *tint, int shade) 980compute_tint_shade_flags (rxvt_color *tint, int shade)
1022{ 981{
… …
1025 bool has_shade = shade != 100; 984 bool has_shade = shade != 100;
1026 985
1027 if (tint) 986 if (tint)
1028 { 987 {
1029 tint->get (c); 988 tint->get (c);
1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 989 if (!has_shade
1031 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 990 && (c.r <= 0x00ff || c.r >= 0xff00)
1032 && IS_COMPONENT_WHOLESOME (c.g) 991 && (c.g <= 0x00ff || c.g >= 0xff00)
1033 && IS_COMPONENT_WHOLESOME (c.b)) 992 && (c.b <= 0x00ff || c.b >= 0xff00))
1034 flags |= bgPixmap_t::tintWholesome; 993 flags |= bgPixmap_t::tintWholesome;
1035# undef IS_COMPONENT_WHOLESOME
1036 } 994 }
1037 995
1038 if (has_shade) 996 if (has_shade || tint)
1039 flags |= bgPixmap_t::tintNeeded; 997 flags |= bgPixmap_t::tintNeeded;
1040 else if (tint)
1041 {
1042 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1043 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1044 {
1045 flags |= bgPixmap_t::tintNeeded;
1046 }
1047 }
1048
1049 if (flags & bgPixmap_t::tintNeeded)
1050 {
1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide;
1053 else
1054 {
1055#if XFT
1056 flags |= bgPixmap_t::tintServerSide;
1057#endif
1058 }
1059 }
1060 998
1061 return flags; 999 return flags;
1062} 1000}
1063 1001
1064bool 1002bool
… …
1074 1012
1075 return false; 1013 return false;
1076} 1014}
1077 1015
1078bool 1016bool
1079bgPixmap_t::unset_tint ()
1080{
1081 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1082
1083 if (new_flags != (flags & tintFlags))
1084 {
1085 flags = (flags & ~tintFlags) | new_flags;
1086 return true;
1087 }
1088
1089 return false;
1090}
1091
1092bool
1093bgPixmap_t::set_shade (const char *shade_str) 1017bgPixmap_t::set_shade (const char *shade_str)
1094{ 1018{
1095 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1019 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1096 1020
1097 clamp_it (new_shade, -100, 200); 1021 clamp_it (new_shade, -100, 200);
… …
1107 } 1031 }
1108 1032
1109 return false; 1033 return false;
1110} 1034}
1111 1035
1112#if XFT 1036#if XRENDER
1113static void 1037static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1038get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{ 1039{
1116 double sigma = radius / 2.0; 1040 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma; 1041 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1134 1058
1135bool 1059bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1060bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{ 1061{
1138 bool ret = false; 1062 bool ret = false;
1139#if XFT 1063#if XRENDER
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1064 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double)); 1065 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1066 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143 1067
1144 Display *dpy = target->dpy; 1068 Display *dpy = target->dpy;
… …
1221 XFreeGC (dpy, gc); 1145 XFreeGC (dpy, gc);
1222 } 1146 }
1223 } 1147 }
1224 else 1148 else
1225 { 1149 {
1226# if XFT 1150# if XRENDER
1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1151 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1228 1152
1229 if (flags & tintSet) 1153 if (flags & tintSet)
1230 tint.get (c); 1154 tint.get (c);
1231 1155
… …
1235 c.g = (c.g * shade) / 100; 1159 c.g = (c.g * shade) / 100;
1236 c.b = (c.b * shade) / 100; 1160 c.b = (c.b * shade) / 100;
1237 } 1161 }
1238 else 1162 else
1239 { 1163 {
1240 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1164 c.r = (c.r * (200 - shade)) / 100;
1241 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1165 c.g = (c.g * (200 - shade)) / 100;
1242 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1166 c.b = (c.b * (200 - shade)) / 100;
1243 } 1167 }
1244 1168
1245 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1169 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1246 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1170 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1247 XRenderPictureAttributes pa; 1171 XRenderPictureAttributes pa;
… …
1261 1185
1262 if (mask_pic && overlay_pic && back_pic) 1186 if (mask_pic && overlay_pic && back_pic)
1263 { 1187 {
1264 XRenderColor mask_c; 1188 XRenderColor mask_c;
1265 1189
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1190 mask_c.red = mask_c.green = mask_c.blue = 0;
1267 mask_c.alpha = 0xffff; 1191 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1192 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269 1193
1270 mask_c.alpha = 0; 1194 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r; 1195 mask_c.red = 0xffff - c.r;
1272 mask_c.green = 0xffff - c.g; 1196 mask_c.green = 0xffff - c.g;
1273 mask_c.blue = 0xffff - c.b; 1197 mask_c.blue = 0xffff - c.b;
1274 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1198 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1275 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1199 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1200
1201 if (shade > 100)
1202 {
1203 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1204 mask_c.alpha = 0;
1205 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1206
1207 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1208 }
1209
1276 ret = true; 1210 ret = true;
1277 } 1211 }
1278 1212
1279 XRenderFreePicture (dpy, mask_pic); 1213 XRenderFreePicture (dpy, mask_pic);
1280 XRenderFreePicture (dpy, overlay_pic); 1214 XRenderFreePicture (dpy, overlay_pic);
… …
1284 1218
1285 return ret; 1219 return ret;
1286} 1220}
1287 1221
1288/* make_transparency_pixmap() 1222/* make_transparency_pixmap()
1289 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1223 * Builds a pixmap of the same size as the terminal window that contains
1290 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1224 * the tiled portion of the root pixmap that is supposed to be covered by
1291 * our window. 1225 * our window.
1292 */ 1226 */
1293unsigned long 1227unsigned long
1294bgPixmap_t::make_transparency_pixmap () 1228bgPixmap_t::make_transparency_pixmap ()
1295{ 1229{
… …
1299 return 0; 1233 return 0;
1300 1234
1301 /* root dimensions may change from call to call - but Display structure should 1235 /* root dimensions may change from call to call - but Display structure should
1302 * be always up-to-date, so let's use it : 1236 * be always up-to-date, so let's use it :
1303 */ 1237 */
1304 Window root = target->display->root;
1305 int screen = target->display->screen; 1238 int screen = target->display->screen;
1306 Display *dpy = target->dpy; 1239 Display *dpy = target->dpy;
1240 int root_depth = DefaultDepth (dpy, screen);
1307 int root_width = DisplayWidth (dpy, screen); 1241 int root_width = DisplayWidth (dpy, screen);
1308 int root_height = DisplayHeight (dpy, screen); 1242 int root_height = DisplayHeight (dpy, screen);
1309 unsigned int root_pmap_width, root_pmap_height; 1243 unsigned int root_pmap_width, root_pmap_height;
1310 int window_width = target->szHint.width; 1244 int window_width = target->szHint.width;
1311 int window_height = target->szHint.height; 1245 int window_height = target->szHint.height;
1312 int sx, sy; 1246 int sx, sy;
1313 XGCValues gcv; 1247 XGCValues gcv;
1314 GC gc; 1248 GC gc;
1315 1249
1316 target->get_window_origin (sx, sy); 1250 sx = target_x;
1251 sy = target_y;
1317 1252
1318 /* check if we are outside of the visible part of the virtual screen : */ 1253 /* check if we are outside of the visible part of the virtual screen : */
1319 if (sx + window_width <= 0 || sy + window_height <= 0 1254 if (sx + window_width <= 0 || sy + window_height <= 0
1320 || sx >= root_width || sy >= root_height) 1255 || sx >= root_width || sy >= root_height)
1321 return 0; 1256 return 0;
1322 1257
1258 // validate root pixmap and get its size
1323 if (root_pixmap != None) 1259 if (root_pixmap != None)
1324 { 1260 {
1325 /* we want to validate the pixmap and get its size at the same time : */ 1261 Window wdummy;
1326 int junk; 1262 int idummy;
1327 unsigned int ujunk; 1263 unsigned int udummy;
1328 /* root pixmap may be bad - allow a error */ 1264
1329 target->allowedxerror = -1; 1265 target->allowedxerror = -1;
1330 1266
1331 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1267 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1332 root_pixmap = None; 1268 root_pixmap = None;
1333 1269
1334 target->allowedxerror = 0; 1270 target->allowedxerror = 0;
1271 }
1272
1273 Pixmap recoded_root_pmap = root_pixmap;
1274
1275 if (root_pixmap != None && root_depth != target->depth)
1276 {
1277#if XRENDER
1278 if (flags & HAS_RENDER)
1279 {
1280 XRenderPictureAttributes pa;
1281
1282 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1283 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1284
1285 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1286 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1287 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1288
1289 if (src && dst)
1290 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1291 else
1292 {
1293 XFreePixmap (dpy, recoded_root_pmap);
1294 root_pixmap = None;
1295 }
1296
1297 XRenderFreePicture (dpy, src);
1298 XRenderFreePicture (dpy, dst);
1299 }
1300 else
1301#endif
1302 root_pixmap = None;
1335 } 1303 }
1336 1304
1337 if (root_pixmap == None) 1305 if (root_pixmap == None)
1338 return 0; 1306 return 0;
1339 1307
1340 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1308 if (pixmap == None
1309 || pmap_width != window_width
1310 || pmap_height != window_height)
1311 {
1312 if (pixmap)
1313 XFreePixmap (target->dpy, pixmap);
1314 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1315 pmap_width = window_width;
1316 pmap_height = window_height;
1317 }
1341 1318
1342 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1319 if (pixmap == None)
1343 return 0; 1320 return 0;
1344 1321
1345 /* straightforward pixmap copy */ 1322 /* straightforward pixmap copy */
1346 gcv.tile = root_pixmap;
1347 gcv.fill_style = FillTiled;
1348
1349 while (sx < 0) sx += (int)root_width; 1323 while (sx < 0) sx += (int)root_width;
1350 while (sy < 0) sy += (int)root_height; 1324 while (sy < 0) sy += (int)root_height;
1351 1325
1326 gcv.tile = recoded_root_pmap;
1327 gcv.fill_style = FillTiled;
1352 gcv.ts_x_origin = -sx; 1328 gcv.ts_x_origin = -sx;
1353 gcv.ts_y_origin = -sy; 1329 gcv.ts_y_origin = -sy;
1354 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1330 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1355 1331
1356 if (gc) 1332 if (gc)
1357 { 1333 {
1358 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1334 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1359 result |= transpPmapTiled; 1335 result |= transpPmapTiled;
1360 XFreeGC (dpy, gc); 1336 XFreeGC (dpy, gc);
1361 }
1362 1337
1363 if (tiled_root_pmap != None) 1338 if (!(flags & CLIENT_RENDER))
1364 {
1365 if (!need_client_side_rendering ())
1366 {
1367 if (flags & (blurNeeded | blurServerSide))
1368 { 1339 {
1340 if ((flags & blurNeeded)
1341 && (flags & HAS_RENDER_CONV))
1342 {
1369 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1343 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1370 result |= transpPmapBlurred; 1344 result |= transpPmapBlurred;
1371 } 1345 }
1372 if (flags & (tintNeeded | tintServerSide)) 1346 if ((flags & tintNeeded)
1347 && (flags & (tintWholesome | HAS_RENDER)))
1373 { 1348 {
1374 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1349 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1375 result |= transpPmapTinted; 1350 result |= transpPmapTinted;
1376 } 1351 }
1377 } /* server side rendering completed */ 1352 } /* server side rendering completed */
1378
1379 if (pixmap)
1380 XFreePixmap (dpy, pixmap);
1381
1382 pixmap = tiled_root_pmap;
1383 pmap_width = window_width;
1384 pmap_height = window_height;
1385 pmap_depth = root_depth;
1386 } 1353 }
1354
1355 if (recoded_root_pmap != root_pixmap)
1356 XFreePixmap (dpy, recoded_root_pmap);
1387 1357
1388 return result; 1358 return result;
1389} 1359}
1390 1360
1391bool 1361void
1392bgPixmap_t::set_root_pixmap () 1362bgPixmap_t::set_root_pixmap ()
1393{ 1363{
1394 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1364 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1395 if (new_root_pixmap == None) 1365 if (new_root_pixmap == None)
1396 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1366 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1397 1367
1398 if (new_root_pixmap != root_pixmap)
1399 {
1400 root_pixmap = new_root_pixmap; 1368 root_pixmap = new_root_pixmap;
1401 return true;
1402 }
1403
1404 return false;
1405} 1369}
1406# endif /* ENABLE_TRANSPARENCY */ 1370# endif /* ENABLE_TRANSPARENCY */
1407 1371
1408# ifndef HAVE_AFTERIMAGE 1372#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1409static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1373static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1410# endif 1374# endif
1411 1375
1412bool 1376bool
1413bgPixmap_t::render () 1377bgPixmap_t::render ()
1414{ 1378{
… …
1423 { 1387 {
1424 /* we need to re-generate transparency pixmap in that case ! */ 1388 /* we need to re-generate transparency pixmap in that case ! */
1425 background_flags = make_transparency_pixmap (); 1389 background_flags = make_transparency_pixmap ();
1426 if (background_flags == 0) 1390 if (background_flags == 0)
1427 return false; 1391 return false;
1428 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1392 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1429 && pmap_depth == target->depth)
1430 flags = flags & ~isInvalid; 1393 flags &= ~isInvalid;
1431 } 1394 }
1432# endif 1395# endif
1433 1396
1434# ifdef BG_IMAGE_FROM_FILE 1397# ifdef BG_IMAGE_FROM_FILE
1435 if (have_image 1398 if (have_image
1436 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1399 || (background_flags & transpTransformations) != (flags & transpTransformations))
1437 { 1400 {
1438 if (render_image (background_flags)) 1401 if (render_image (background_flags))
1439 flags = flags & ~isInvalid; 1402 flags &= ~isInvalid;
1440 } 1403 }
1441# endif 1404# endif
1442 1405
1406# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1443 XImage *result = NULL; 1407 XImage *result = NULL;
1444 1408
1445 if (background_flags && (flags & isInvalid)) 1409 if (background_flags && (flags & isInvalid))
1446 { 1410 {
1447 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1411 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1448 } 1412 }
1449 1413
1450 if (result) 1414 if (result)
1451 { 1415 {
1452# if !defined(HAVE_AFTERIMAGE) && !XFT
1453 /* our own client-side tinting */ 1416 /* our own client-side tinting */
1454 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1455 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1456 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1417 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1457 { 1418 {
1458 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1419 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1459 if (flags & tintSet) 1420 if (flags & tintSet)
1460 tint.get (c); 1421 tint.get (c);
1461 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1422 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1462 } 1423 }
1463# endif
1464 1424
1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1425 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1466 1426
1467 if (gc) 1427 if (gc)
1468 { 1428 {
1469 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1470 {
1471 XFreePixmap (target->dpy, pixmap);
1472 pixmap = None;
1473 }
1474
1475 if (pixmap == None)
1476 {
1477 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1478 pmap_width = result->width;
1479 pmap_height = result->height;
1480 pmap_depth = target->depth;
1481 }
1482
1483 if (pmap_depth != result->depth)
1484 {
1485 /* Bad Match error will ensue ! stupid X !!!! */
1486 if (result->depth == 24 && pmap_depth == 32)
1487 result->depth = 32;
1488 else if (result->depth == 32 && pmap_depth == 24)
1489 result->depth = 24;
1490 else
1491 {
1492 /* TODO: implement image recoding */
1493 }
1494 }
1495
1496 if (pmap_depth == result->depth)
1497 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1429 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1498 1430
1499 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1500 flags = flags & ~isInvalid; 1432 flags &= ~isInvalid;
1501 } 1433 }
1502 1434
1503 XDestroyImage (result); 1435 XDestroyImage (result);
1504 } 1436 }
1437# endif
1505 1438
1506 if (flags & isInvalid) 1439 if (flags & isInvalid)
1507 { 1440 {
1508 if (pixmap != None) 1441 if (pixmap != None)
1509 { 1442 {
… …
1517 valid_since = ev::now (); 1450 valid_since = ev::now ();
1518 1451
1519 return true; 1452 return true;
1520} 1453}
1521 1454
1522bool 1455void
1523bgPixmap_t::set_target (rxvt_term *new_target) 1456bgPixmap_t::set_target (rxvt_term *new_target)
1524{ 1457{
1525 if (new_target)
1526 if (target != new_target)
1527 {
1528 target = new_target; 1458 target = new_target;
1529# ifdef ENABLE_TRANSPARENCY 1459
1530 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1460 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1461#if XRENDER
1462 int major, minor;
1463 if (XRenderQueryVersion (target->dpy, &major, &minor))
1464 flags |= HAS_RENDER;
1465 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1466 if (filters)
1467 {
1468 for (int i = 0; i < filters->nfilter; i++)
1469 if (!strcmp (filters->filter[i], FilterConvolution))
1470 flags |= HAS_RENDER_CONV;
1471
1472 XFree (filters);
1473 }
1531# endif 1474#endif
1532 return true;
1533 }
1534
1535 return false;
1536} 1475}
1537 1476
1538void 1477void
1539bgPixmap_t::apply () 1478bgPixmap_t::apply ()
1540{ 1479{
1541 if (target) 1480 if (target == NULL)
1542 { 1481 return;
1482
1543 if (pixmap != None) 1483 if (pixmap != None)
1544 { 1484 {
1545 /* set target's background to pixmap */ 1485 /* set target's background to pixmap */
1546# ifdef ENABLE_TRANSPARENCY 1486# ifdef ENABLE_TRANSPARENCY
1547 if (flags & isTransparent) 1487 if (flags & isTransparent)
1548 { 1488 {
1549 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1489 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1550 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1490 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1551 1491
1552 if (target->scrollBar.win) 1492 if (target->scrollBar.win)
1553 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1493 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1554 } 1494 }
1555 else 1495 else
1556# endif 1496# endif
1557 { 1497 {
1558 /* force old pixmap dereference in case it was transparent before :*/ 1498 /* force old pixmap dereference in case it was transparent before :*/
1559 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1560 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1561 /* do we also need to set scrollbar's background here ? */
1562
1563 if (target->scrollBar.win)
1564 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1565 }
1566 }
1567 else
1568 {
1569 /* set target background to a pixel */
1570 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1499 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1571 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1500 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1572 /* do we also need to set scrollbar's background here ? */ 1501 /* do we also need to set scrollbar's background here ? */
1502
1573 if (target->scrollBar.win) 1503 if (target->scrollBar.win)
1574 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1504 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1575 } 1505 }
1506 }
1507 else
1508 {
1509 /* set target background to a pixel */
1510 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1511 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1512 /* do we also need to set scrollbar's background here ? */
1513 if (target->scrollBar.win)
1514 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1515 }
1576 1516
1577 /* don't want Expose on the parent or vt. It is better to use 1517 /* don't want Expose on the parent or vt. It is better to use
1578 scr_touch or we get a great deal of flicker otherwise: */ 1518 scr_touch or we get a great deal of flicker otherwise: */
1579 XClearWindow (target->dpy, target->parent[0]); 1519 XClearWindow (target->dpy, target->parent[0]);
1580 1520
1581 if (target->scrollBar.state && target->scrollBar.win) 1521 if (target->scrollBar.state && target->scrollBar.win)
1582 { 1522 {
1583 target->scrollBar.state = STATE_IDLE; 1523 target->scrollBar.state = STATE_IDLE;
1584 target->scrollBar.show (0); 1524 target->scrollBar.show (0);
1585 } 1525 }
1586 1526
1587 target->want_refresh = 1; 1527 target->want_refresh = 1;
1588 flags |= hasChanged; 1528 flags |= hasChanged;
1589 }
1590} 1529}
1591 1530
1592#endif /* HAVE_BG_PIXMAP */ 1531#endif /* HAVE_BG_PIXMAP */
1593 1532
1594#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1533#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1595/* taken from aterm-0.4.2 */ 1534/* taken from aterm-0.4.2 */
1596 1535
1597static void 1536static void
1598ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1537shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1599{ 1538{
1600 int sh_r, sh_g, sh_b; 1539 int sh_r, sh_g, sh_b;
1601 uint32_t mask_r, mask_g, mask_b; 1540 uint32_t mask_r, mask_g, mask_b;
1602 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1541 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1603 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1542 rgba low;
1604 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1543 rgba high;
1605 int i; 1544 int i;
1606 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1545 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1607 1546
1608 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1547 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1609 1548
1610 /* for convenience */ 1549 /* for convenience */
1611 mask_r = visual->red_mask; 1550 mask_r = visual->red_mask;
1612 mask_g = visual->green_mask; 1551 mask_g = visual->green_mask;
1613 mask_b = visual->blue_mask; 1552 mask_b = visual->blue_mask;
1614 1553
1615 /* boring lookup table pre-initialization */ 1554 /* boring lookup table pre-initialization */
1616 switch (srcImage->depth) 1555 switch (ximage->depth)
1617 { 1556 {
1618 case 15: 1557 case 15:
1619 if ((mask_r != 0x7c00) || 1558 if ((mask_r != 0x7c00) ||
1620 (mask_g != 0x03e0) || 1559 (mask_g != 0x03e0) ||
1621 (mask_b != 0x001f)) 1560 (mask_b != 0x001f))
… …
1674 /* prepare limits for color transformation (each channel is handled separately) */ 1613 /* prepare limits for color transformation (each channel is handled separately) */
1675 if (shade > 100) 1614 if (shade > 100)
1676 { 1615 {
1677 shade = 200 - shade; 1616 shade = 200 - shade;
1678 1617
1679 lower_lim_r = 65535-rm; 1618 high.r = c.r * shade / 100;
1680 lower_lim_g = 65535-gm; 1619 high.g = c.g * shade / 100;
1681 lower_lim_b = 65535-bm; 1620 high.b = c.b * shade / 100;
1682 1621
1683 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1622 low.r = 65535 * (100 - shade) / 100;
1684 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1623 low.g = 65535 * (100 - shade) / 100;
1685 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1624 low.b = 65535 * (100 - shade) / 100;
1686
1687 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1688 } 1625 }
1689 else 1626 else
1690 { 1627 {
1628 high.r = c.r * shade / 100;
1629 high.g = c.g * shade / 100;
1630 high.b = c.b * shade / 100;
1691 1631
1692 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1632 low.r = low.g = low.b = 0;
1693
1694 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1695 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1696 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1697 } 1633 }
1698 1634
1699 /* fill our lookup tables */ 1635 /* fill our lookup tables */
1700 for (i = 0; i <= mask_r>>sh_r; i++) 1636 for (i = 0; i <= mask_r>>sh_r; i++)
1701 { 1637 {
1702 uint32_t tmp; 1638 uint32_t tmp;
1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1639 tmp = i * high.r;
1704 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1640 tmp += (mask_r>>sh_r) * low.r;
1705 lookup_r[i] = (tmp/65535)<<sh_r; 1641 lookup_r[i] = (tmp/65535)<<sh_r;
1706 } 1642 }
1707 for (i = 0; i <= mask_g>>sh_g; i++) 1643 for (i = 0; i <= mask_g>>sh_g; i++)
1708 { 1644 {
1709 uint32_t tmp; 1645 uint32_t tmp;
1710 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1646 tmp = i * high.g;
1711 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1647 tmp += (mask_g>>sh_g) * low.g;
1712 lookup_g[i] = (tmp/65535)<<sh_g; 1648 lookup_g[i] = (tmp/65535)<<sh_g;
1713 } 1649 }
1714 for (i = 0; i <= mask_b>>sh_b; i++) 1650 for (i = 0; i <= mask_b>>sh_b; i++)
1715 { 1651 {
1716 uint32_t tmp; 1652 uint32_t tmp;
1717 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1653 tmp = i * high.b;
1718 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1654 tmp += (mask_b>>sh_b) * low.b;
1719 lookup_b[i] = (tmp/65535)<<sh_b; 1655 lookup_b[i] = (tmp/65535)<<sh_b;
1720 } 1656 }
1721 1657
1722 /* apply table to input image (replacing colors by newly calculated ones) */ 1658 /* apply table to input image (replacing colors by newly calculated ones) */
1723 if (srcImage->bits_per_pixel == 32 1659 if (ximage->bits_per_pixel == 32
1724 && (srcImage->depth == 24 || srcImage->depth == 32) 1660 && (ximage->depth == 24 || ximage->depth == 32)
1725 && srcImage->byte_order == host_byte_order) 1661 && ximage->byte_order == host_byte_order)
1726 { 1662 {
1727 uint32_t *p1, *pf, *p, *pl; 1663 uint32_t *p1, *pf, *p, *pl;
1728 p1 = (uint32_t *) srcImage->data; 1664 p1 = (uint32_t *) ximage->data;
1729 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1665 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1730 1666
1731 while (p1 < pf) 1667 while (p1 < pf)
1732 { 1668 {
1733 p = p1; 1669 p = p1;
1734 pl = p1 + srcImage->width; 1670 pl = p1 + ximage->width;
1735 for (; p < pl; p++) 1671 for (; p < pl; p++)
1736 { 1672 {
1737 *p = lookup_r[(*p & 0xff0000) >> 16] | 1673 *p = lookup_r[(*p & 0xff0000) >> 16] |
1738 lookup_g[(*p & 0x00ff00) >> 8] | 1674 lookup_g[(*p & 0x00ff00) >> 8] |
1739 lookup_b[(*p & 0x0000ff)] | 1675 lookup_b[(*p & 0x0000ff)] |
1740 (*p & 0xff000000); 1676 (*p & 0xff000000);
1741 } 1677 }
1742 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1678 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1743 } 1679 }
1744 } 1680 }
1745 else 1681 else
1746 { 1682 {
1747 for (int y = 0; y < srcImage->height; y++) 1683 for (int y = 0; y < ximage->height; y++)
1748 for (int x = 0; x < srcImage->width; x++) 1684 for (int x = 0; x < ximage->width; x++)
1749 { 1685 {
1750 unsigned long pixel = XGetPixel (srcImage, x, y); 1686 unsigned long pixel = XGetPixel (ximage, x, y);
1751 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1687 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1752 lookup_g[(pixel & mask_g) >> sh_g] | 1688 lookup_g[(pixel & mask_g) >> sh_g] |
1753 lookup_b[(pixel & mask_b) >> sh_b]; 1689 lookup_b[(pixel & mask_b) >> sh_b];
1754 XPutPixel (srcImage, x, y, pixel); 1690 XPutPixel (ximage, x, y, pixel);
1755 } 1691 }
1756 } 1692 }
1757 1693
1758 free (lookup); 1694 free (lookup);
1759} 1695}

Diff Legend

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