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.135 by sf-exg, Tue Jan 11 11:12:45 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{
… …
173 if (flags & rootAlign) 172 if (flags & rootAlign)
174 return true; 173 return true;
175 } 174 }
176# endif 175# endif
177 176
178 return false;
179};
180
181bool bgPixmap_t::need_client_side_rendering ()
182{
183# ifdef HAVE_AFTERIMAGE
184 if (original_asim)
185 return true;
186# endif
187 return false; 177 return false;
188} 178}
189 179
190# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
191static inline bool 181static inline bool
… …
254 dst_size = target_size - dst_pos; 244 dst_size = target_size - dst_pos;
255 return src_pos; 245 return src_pos;
256} 246}
257 247
258bool 248bool
259bgPixmap_t::set_geometry (const char *geom) 249bgPixmap_t::set_geometry (const char *geom, bool update)
260{ 250{
251 bool changed = false;
261 int geom_flags = 0, changed = 0; 252 int geom_flags = 0;
262 int x = 0, y = 0; 253 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 254 unsigned int w = 0, h = 0;
264 unsigned int n; 255 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 256 unsigned long new_flags = (flags & (~geometryFlags));
266 const char *p; 257 const char *ops;
267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
268 258
269 if (geom == NULL) 259 if (geom == NULL)
270 return false; 260 return false;
271 261
272 char str[MAXLEN_GEOM]; 262 char str[256];
273 263
274 while (isspace(*geom)) ++geom;
275 if ((p = strchr (geom, ';')) == NULL)
276 p = strchr (geom, '\0'); 264 ops = strchr (geom, ':');
277 265 if (ops == NULL)
266 n = strlen (geom);
267 else
278 n = (p - geom); 268 n = ops - geom;
279 if (n < MAXLEN_GEOM)
280 {
281 char *ops;
282 new_flags |= geometrySet;
283 269
270 if (n >= sizeof (str))
271 return false;
272
284 memcpy (str, geom, n); 273 memcpy (str, geom, n);
285 str[n] = '\0'; 274 str[n] = '\0';
286 if (str[0] == ':') 275 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 276
302 if (ops > str || ops == NULL) 277 if (str[0])
303 { 278 {
304 /* we have geometry string - let's handle it prior to applying ops */ 279 /* we have geometry string - let's handle it prior to applying ops */
305 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 280 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 */ 281 } /* done parsing geometry string */
362 else if (!(flags & geometrySet)) 282
363 { 283 if (!update)
364 /* default geometry - scaled and centered */ 284 {
285 if (!(geom_flags & XValue))
365 x = y = defaultAlign; 286 x = y = defaultAlign;
287 else if (!(geom_flags & YValue))
288 y = x;
289
290 if (!(geom_flags & (WidthValue|HeightValue)))
366 w = h = defaultScale; 291 w = h = defaultScale;
367 } 292 else if (!(geom_flags & HeightValue))
293 h = w;
294 else if (!(geom_flags & WidthValue))
295 w = h;
368 296
369 if (!(flags & geometrySet))
370 geom_flags |= WidthValue|HeightValue|XValue|YValue; 297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
371 299
372 if (ops) 300 if (ops)
373 { 301 {
374 while (*ops) 302 char **arr = rxvt_strsplit (':', ops + 1);
303
304 for (int i = 0; arr[i]; i++)
375 { 305 {
376 while (*ops == ':' || isspace(*ops)) ++ops; 306 if (!strcasecmp (arr[i], "tile"))
377
378# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
379 if (CHECK_GEOM_OPS ("tile"))
380 { 307 {
381 w = h = noScale; 308 w = h = noScale;
382 geom_flags |= WidthValue|HeightValue; 309 geom_flags |= WidthValue|HeightValue;
383 } 310 }
384 else if (CHECK_GEOM_OPS ("propscale")) 311 else if (!strcasecmp (arr[i], "propscale"))
385 { 312 {
386 new_flags |= propScale; 313 new_flags |= propScale;
387 } 314 }
388 else if (CHECK_GEOM_OPS ("hscale")) 315 else if (!strcasecmp (arr[i], "hscale"))
389 { 316 {
390 if (w == 0) w = windowScale; 317 if (w == 0) w = windowScale;
391 318
392 h = noScale; 319 h = noScale;
393 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
394 } 321 }
395 else if (CHECK_GEOM_OPS ("vscale")) 322 else if (!strcasecmp (arr[i], "vscale"))
396 { 323 {
397 if (h == 0) h = windowScale; 324 if (h == 0) h = windowScale;
398 325
399 w = noScale; 326 w = noScale;
400 geom_flags |= WidthValue|HeightValue; 327 geom_flags |= WidthValue|HeightValue;
401 } 328 }
402 else if (CHECK_GEOM_OPS ("scale")) 329 else if (!strcasecmp (arr[i], "scale"))
403 { 330 {
404 if (h == 0) h = windowScale; 331 if (h == 0) h = windowScale;
405 if (w == 0) w = windowScale; 332 if (w == 0) w = windowScale;
406 333
407 geom_flags |= WidthValue|HeightValue; 334 geom_flags |= WidthValue|HeightValue;
408 } 335 }
409 else if (CHECK_GEOM_OPS ("auto")) 336 else if (!strcasecmp (arr[i], "auto"))
410 { 337 {
411 w = h = windowScale; 338 w = h = windowScale;
412 x = y = centerAlign; 339 x = y = centerAlign;
413 geom_flags |= WidthValue|HeightValue|XValue|YValue; 340 geom_flags |= WidthValue|HeightValue|XValue|YValue;
414 } 341 }
415 else if (CHECK_GEOM_OPS ("root")) 342 else if (!strcasecmp (arr[i], "root"))
416 { 343 {
417 new_flags |= rootAlign; 344 new_flags |= rootAlign;
418 w = h = noScale; 345 w = h = noScale;
419 geom_flags |= WidthValue|HeightValue; 346 geom_flags |= WidthValue|HeightValue;
420 } 347 }
421# undef CHECK_GEOM_OPS
422
423 while (*ops != ':' && *ops != '\0') ++ops;
424 } /* done parsing ops */ 348 } /* done parsing ops */
425 }
426 349
350 rxvt_free_strsplit (arr);
351 }
352
427 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 353 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; 354 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; 355 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; 356 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
431 }
432 357
433 if (new_flags != flags) 358 if (new_flags != flags)
434 { 359 {
435 flags = new_flags; 360 flags = new_flags;
436 changed++; 361 changed = true;
437 } 362 }
438 363
439 return (changed > 0); 364 return changed;
440} 365}
441 366
442void 367void
443bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 368bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
444{ 369{
… …
461 if (!w) w = image_width; 386 if (!w) w = image_width;
462 if (!h) h = image_height; 387 if (!h) h = image_height;
463 388
464 if (flags & rootAlign) 389 if (flags & rootAlign)
465 { 390 {
466 target->get_window_origin (x, y);
467 x = -x; 391 x = -target_x;
468 y = -y; 392 y = -target_y;
469 } 393 }
470 else 394 else
471 { 395 {
472 x = make_align_position (h_align, target_width, w); 396 x = make_align_position (h_align, target_width, w);
473 y = make_align_position (v_align, target_height, h); 397 y = make_align_position (v_align, target_height, h);
… …
667 if (result) 591 if (result)
668 { 592 {
669 XGCValues gcv; 593 XGCValues gcv;
670 GC gc; 594 GC gc;
671 595
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 */ 596 /* create Pixmap */
684 if (pixmap == None) 597 if (pixmap == None
598 || pmap_width != new_pmap_width
599 || pmap_height != new_pmap_height)
685 { 600 {
601 if (pixmap)
602 XFreePixmap (target->dpy, pixmap);
686 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 603 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
687 pmap_width = new_pmap_width; 604 pmap_width = new_pmap_width;
688 pmap_height = new_pmap_height; 605 pmap_height = new_pmap_height;
689 pmap_depth = target->depth;
690 } 606 }
691 /* fill with background color (if result's not completely overlapping it) */ 607 /* fill with background color (if result's not completely overlapping it) */
692 gcv.foreground = target->pix_colors[Color_bg]; 608 gcv.foreground = target->pix_colors[Color_bg];
693 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 609 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
694 610
… …
727} 643}
728# endif /* HAVE_AFTERIMAGE */ 644# endif /* HAVE_AFTERIMAGE */
729 645
730# ifdef HAVE_PIXBUF 646# ifdef HAVE_PIXBUF
731bool 647bool
648bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
649 int src_x, int src_y, int dst_x, int dst_y,
650 unsigned int width, unsigned int height)
651{
652 XImage *ximage;
653 char *data, *line;
654 int bytes_per_pixel;
655 int width_r, width_g, width_b;
656 int sh_r, sh_g, sh_b;
657 int rowstride;
658 int channels;
659 unsigned char *row;
660 Visual *visual = target->visual;
661 int depth = target->depth;
662
663 if (visual->c_class != TrueColor)
664 return false;
665
666 if (depth == 24 || depth == 32)
667 bytes_per_pixel = 4;
668 else if (depth == 15 || depth == 16)
669 bytes_per_pixel = 2;
670 else
671 return false;
672
673 width_r = rxvt_popcount (visual->red_mask);
674 width_g = rxvt_popcount (visual->green_mask);
675 width_b = rxvt_popcount (visual->blue_mask);
676
677 if (width_r > 8 || width_g > 8 || width_b > 8)
678 return false;
679
680 sh_r = rxvt_ctz (visual->red_mask);
681 sh_g = rxvt_ctz (visual->green_mask);
682 sh_b = rxvt_ctz (visual->blue_mask);
683
684 if (width > INT_MAX / height / bytes_per_pixel)
685 return false;
686
687 data = (char *)malloc (width * height * bytes_per_pixel);
688 if (!data)
689 return false;
690
691 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
692 width, height, bytes_per_pixel * 8, 0);
693 if (!ximage)
694 {
695 free (data);
696 return false;
697 }
698
699 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
700
701 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
702 channels = gdk_pixbuf_get_n_channels (pixbuf);
703 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
704 line = data;
705
706 for (int y = 0; y < height; y++)
707 {
708 for (int x = 0; x < width; x++)
709 {
710 unsigned char *pixel = row + x * channels;
711 uint32_t value;
712
713 value = ((pixel[0] >> (8 - width_r)) << sh_r)
714 | ((pixel[1] >> (8 - width_g)) << sh_g)
715 | ((pixel[2] >> (8 - width_b)) << sh_b);
716
717 if (bytes_per_pixel == 4)
718 ((uint32_t *)line)[x] = value;
719 else
720 ((uint16_t *)line)[x] = value;
721 }
722
723 row += rowstride;
724 line += ximage->bytes_per_line;
725 }
726
727 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
728 XDestroyImage (ximage);
729 return true;
730}
731
732bool
732bgPixmap_t::render_image (unsigned long background_flags) 733bgPixmap_t::render_image (unsigned long background_flags)
733{ 734{
734 if (target == NULL) 735 if (target == NULL)
735 return false; 736 return false;
736 737
737 if (!pixbuf) 738 if (!pixbuf)
738 return false; 739 return false;
739 740
740#if !XRENDER
741 if (background_flags) 741 if (background_flags
742 && !(flags & HAS_RENDER))
742 return false; 743 return false;
743#endif
744 744
745 GdkPixbuf *result; 745 GdkPixbuf *result;
746 746
747 int image_width = gdk_pixbuf_get_width (pixbuf); 747 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 748 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
801 } 801 }
802 } 802 }
803 803
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) 804 if (pixmap == None
805 || pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height)
816 { 807 {
808 if (pixmap)
809 XFreePixmap (target->dpy, pixmap);
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width; 811 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 812 pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 } 813 }
822 814
823 gcv.foreground = target->pix_colors[Color_bg]; 815 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 816 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825 817
826 if (h_scale == 0 || v_scale == 0) 818 if (h_scale == 0 || v_scale == 0)
827 { 819 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 820 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 821 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 822 0, 0,
831 0, 0, 823 0, 0,
832 image_width, image_height, 824 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 825
836 gcv.tile = tile; 826 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 827 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 828 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 829 gcv.ts_y_origin = y;
… …
854 || dst_x + dst_width < new_pmap_width 844 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 845 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857 847
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 849 pixbuf_to_pixmap (result, pixmap, gc,
860 src_x, src_y, 850 src_x, src_y,
861 dst_x, dst_y, 851 dst_x, dst_y,
862 dst_width, dst_height, 852 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 } 853 }
866 854
867#if XRENDER 855#if XRENDER
868 if (background_flags) 856 if (background_flags)
869 { 857 {
… …
915# endif /* HAVE_PIXBUF */ 903# endif /* HAVE_PIXBUF */
916 904
917bool 905bool
918bgPixmap_t::set_file (const char *file) 906bgPixmap_t::set_file (const char *file)
919{ 907{
920 assert (file); 908 if (!file || !*file)
909 return false;
921 910
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 911 if (const char *p = strchr (file, ';'))
925 { 912 {
926 size_t len = p - file; 913 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 914 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 915 memcpy (f, file, len);
929 f[len] = '\0'; 916 f[len] = '\0';
930 file = f; 917 file = f;
931 } 918 }
932 919
933# ifdef HAVE_AFTERIMAGE 920# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 921 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 922 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 923 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 924 if (image)
938 { 925 {
939 if (original_asim) 926 if (original_asim)
940 safe_asimage_destroy (original_asim); 927 safe_asimage_destroy (original_asim);
941 original_asim = image; 928 original_asim = image;
929 flags |= CLIENT_RENDER;
942 have_image = true; 930 have_image = true;
943 return true; 931 return true;
944 } 932 }
945# endif 933# endif
946 934
947# ifdef HAVE_PIXBUF 935# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 936 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 937 if (image)
950 { 938 {
951 if (pixbuf) 939 if (pixbuf)
952 g_object_unref (pixbuf); 940 g_object_unref (pixbuf);
953 pixbuf = image; 941 pixbuf = image;
954 have_image = true; 942 have_image = true;
955 return true; 943 return true;
956 } 944 }
957# endif 945# endif
958 }
959 946
960 return false; 947 return false;
961} 948}
962 949
963# endif /* BG_IMAGE_FROM_FILE */ 950# endif /* BG_IMAGE_FROM_FILE */
… …
976} 963}
977 964
978bool 965bool
979bgPixmap_t::set_blur_radius (const char *geom) 966bgPixmap_t::set_blur_radius (const char *geom)
980{ 967{
981 int changed = 0; 968 bool changed = false;
982 unsigned int hr, vr; 969 unsigned int hr, vr;
983 int junk; 970 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 971 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 972
986 if (!(geom_flags & WidthValue)) 973 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 978 min_it (hr, 128);
992 min_it (vr, 128); 979 min_it (vr, 128);
993 980
994 if (h_blurRadius != hr) 981 if (h_blurRadius != hr)
995 { 982 {
996 ++changed; 983 changed = true;
997 h_blurRadius = hr; 984 h_blurRadius = hr;
998 } 985 }
999 986
1000 if (v_blurRadius != vr) 987 if (v_blurRadius != vr)
1001 { 988 {
1002 ++changed; 989 changed = true;
1003 v_blurRadius = vr; 990 v_blurRadius = vr;
1004 } 991 }
1005 992
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 993 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 994 flags &= ~blurNeeded;
1008 else 995 else
1009 flags |= blurNeeded; 996 flags |= blurNeeded;
1010 997
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); 998 return changed;
1024} 999}
1025 1000
1026static inline unsigned long 1001static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 1002compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 1003{
… …
1031 bool has_shade = shade != 100; 1006 bool has_shade = shade != 100;
1032 1007
1033 if (tint) 1008 if (tint)
1034 { 1009 {
1035 tint->get (c); 1010 tint->get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1011 if (!has_shade
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1012 && (c.r <= 0x00ff || c.r >= 0xff00)
1038 && IS_COMPONENT_WHOLESOME (c.g) 1013 && (c.g <= 0x00ff || c.g >= 0xff00)
1039 && IS_COMPONENT_WHOLESOME (c.b)) 1014 && (c.b <= 0x00ff || c.b >= 0xff00))
1040 flags |= bgPixmap_t::tintWholesome; 1015 flags |= bgPixmap_t::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME
1042 } 1016 }
1043 1017
1044 if (has_shade) 1018 if (has_shade || tint)
1045 flags |= bgPixmap_t::tintNeeded; 1019 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 1020
1067 return flags; 1021 return flags;
1068} 1022}
1069 1023
1070bool 1024bool
… …
1073 if (!(flags & tintSet) || tint != new_tint) 1027 if (!(flags & tintSet) || tint != new_tint)
1074 { 1028 {
1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1029 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1076 tint = new_tint; 1030 tint = new_tint;
1077 flags = (flags & ~tintFlags) | new_flags | tintSet; 1031 flags = (flags & ~tintFlags) | new_flags | tintSet;
1078 return true;
1079 }
1080
1081 return false;
1082}
1083
1084bool
1085bgPixmap_t::unset_tint ()
1086{
1087 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1088
1089 if (new_flags != (flags & tintFlags))
1090 {
1091 flags = (flags & ~tintFlags) | new_flags;
1092 return true; 1032 return true;
1093 } 1033 }
1094 1034
1095 return false; 1035 return false;
1096} 1036}
… …
1241 c.g = (c.g * shade) / 100; 1181 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100; 1182 c.b = (c.b * shade) / 100;
1243 } 1183 }
1244 else 1184 else
1245 { 1185 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1186 c.r = (c.r * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1187 c.g = (c.g * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1188 c.b = (c.b * (200 - shade)) / 100;
1249 } 1189 }
1250 1190
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1191 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1192 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa; 1193 XRenderPictureAttributes pa;
… …
1267 1207
1268 if (mask_pic && overlay_pic && back_pic) 1208 if (mask_pic && overlay_pic && back_pic)
1269 { 1209 {
1270 XRenderColor mask_c; 1210 XRenderColor mask_c;
1271 1211
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1212 mask_c.red = mask_c.green = mask_c.blue = 0;
1273 mask_c.alpha = 0xffff; 1213 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1214 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1215
1276 mask_c.alpha = 0; 1216 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1217 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g; 1218 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b; 1219 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1220 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); 1221 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1222
1223 if (shade > 100)
1224 {
1225 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1226 mask_c.alpha = 0;
1227 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1228
1229 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1230 }
1231
1282 ret = true; 1232 ret = true;
1283 } 1233 }
1284 1234
1285 XRenderFreePicture (dpy, mask_pic); 1235 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1236 XRenderFreePicture (dpy, overlay_pic);
… …
1307 /* root dimensions may change from call to call - but Display structure should 1257 /* root dimensions may change from call to call - but Display structure should
1308 * be always up-to-date, so let's use it : 1258 * be always up-to-date, so let's use it :
1309 */ 1259 */
1310 int screen = target->display->screen; 1260 int screen = target->display->screen;
1311 Display *dpy = target->dpy; 1261 Display *dpy = target->dpy;
1262 int root_depth = DefaultDepth (dpy, screen);
1312 int root_width = DisplayWidth (dpy, screen); 1263 int root_width = DisplayWidth (dpy, screen);
1313 int root_height = DisplayHeight (dpy, screen); 1264 int root_height = DisplayHeight (dpy, screen);
1265 unsigned int root_pmap_width, root_pmap_height;
1314 int window_width = target->szHint.width; 1266 int window_width = target->szHint.width;
1315 int window_height = target->szHint.height; 1267 int window_height = target->szHint.height;
1316 int sx, sy; 1268 int sx, sy;
1317 XGCValues gcv; 1269 XGCValues gcv;
1318 GC gc; 1270 GC gc;
1319 1271
1320 target->get_window_origin (sx, sy); 1272 sx = target_x;
1273 sy = target_y;
1321 1274
1322 /* check if we are outside of the visible part of the virtual screen : */ 1275 /* check if we are outside of the visible part of the virtual screen : */
1323 if (sx + window_width <= 0 || sy + window_height <= 0 1276 if (sx + window_width <= 0 || sy + window_height <= 0
1324 || sx >= root_width || sy >= root_height) 1277 || sx >= root_width || sy >= root_height)
1325 return 0; 1278 return 0;
1326 1279
1280 // validate root pixmap and get its size
1281 if (root_pixmap != None)
1282 {
1283 Window wdummy;
1284 int idummy;
1285 unsigned int udummy;
1286
1287 target->allowedxerror = -1;
1288
1289 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1290 root_pixmap = None;
1291
1292 target->allowedxerror = 0;
1293 }
1294
1295 Pixmap recoded_root_pmap = root_pixmap;
1296
1297 if (root_pixmap != None && root_depth != target->depth)
1298 {
1299#if XRENDER
1300 if (flags & HAS_RENDER)
1301 {
1302 XRenderPictureAttributes pa;
1303
1304 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1305 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1306
1307 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1308 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1309 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1310
1311 if (src && dst)
1312 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1313 else
1314 {
1315 XFreePixmap (dpy, recoded_root_pmap);
1316 root_pixmap = None;
1317 }
1318
1319 XRenderFreePicture (dpy, src);
1320 XRenderFreePicture (dpy, dst);
1321 }
1322 else
1323#endif
1324 root_pixmap = None;
1325 }
1326
1327 if (root_pixmap == None) 1327 if (root_pixmap == None)
1328 return 0; 1328 return 0;
1329 1329
1330 if (pixmap == None
1331 || pmap_width != window_width
1332 || pmap_height != window_height)
1333 {
1334 if (pixmap)
1335 XFreePixmap (target->dpy, pixmap);
1330 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1336 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1337 pmap_width = window_width;
1338 pmap_height = window_height;
1339 }
1331 1340
1332 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (pixmap == None)
1333 return 0; 1342 return 0;
1334 1343
1335 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1336 gcv.tile = root_pixmap;
1337 gcv.fill_style = FillTiled;
1338
1339 while (sx < 0) sx += (int)root_width; 1345 while (sx < 0) sx += (int)root_width;
1340 while (sy < 0) sy += (int)root_height; 1346 while (sy < 0) sy += (int)root_height;
1341 1347
1348 gcv.tile = recoded_root_pmap;
1349 gcv.fill_style = FillTiled;
1342 gcv.ts_x_origin = -sx; 1350 gcv.ts_x_origin = -sx;
1343 gcv.ts_y_origin = -sy; 1351 gcv.ts_y_origin = -sy;
1344 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1345 1353
1346 if (gc) 1354 if (gc)
1347 { 1355 {
1348 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1349 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1350 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1351 }
1352 1359
1353 if (tiled_root_pmap != None) 1360 if (!(flags & CLIENT_RENDER))
1354 {
1355 if (!need_client_side_rendering ())
1356 {
1357 if (flags & (blurNeeded | blurServerSide))
1358 { 1361 {
1362 if ((flags & blurNeeded)
1363 && (flags & HAS_RENDER_CONV))
1364 {
1359 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1365 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1360 result |= transpPmapBlurred; 1366 result |= transpPmapBlurred;
1361 } 1367 }
1362 if (flags & (tintNeeded | tintServerSide)) 1368 if ((flags & tintNeeded)
1369 && (flags & (tintWholesome | HAS_RENDER)))
1363 { 1370 {
1364 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1371 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1365 result |= transpPmapTinted; 1372 result |= transpPmapTinted;
1366 } 1373 }
1367 } /* server side rendering completed */ 1374 } /* server side rendering completed */
1368
1369 if (pixmap)
1370 XFreePixmap (dpy, pixmap);
1371
1372 pixmap = tiled_root_pmap;
1373 pmap_width = window_width;
1374 pmap_height = window_height;
1375 pmap_depth = target->depth;
1376 } 1375 }
1376
1377 if (recoded_root_pmap != root_pixmap)
1378 XFreePixmap (dpy, recoded_root_pmap);
1377 1379
1378 return result; 1380 return result;
1379} 1381}
1380 1382
1381void 1383void
1382bgPixmap_t::set_root_pixmap () 1384bgPixmap_t::set_root_pixmap ()
1383{ 1385{
1384 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1386 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1385 if (new_root_pixmap == None) 1387 if (new_root_pixmap == None)
1386 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1388 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1387 1389
1388 root_pixmap = new_root_pixmap; 1390 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} 1391}
1438# endif /* ENABLE_TRANSPARENCY */ 1392# endif /* ENABLE_TRANSPARENCY */
1439 1393
1440# ifndef HAVE_AFTERIMAGE 1394#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1441static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1395static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1442# endif 1396# endif
1443 1397
1444bool 1398bool
1445bgPixmap_t::render () 1399bgPixmap_t::render ()
1446{ 1400{
… …
1456 /* we need to re-generate transparency pixmap in that case ! */ 1410 /* we need to re-generate transparency pixmap in that case ! */
1457 background_flags = make_transparency_pixmap (); 1411 background_flags = make_transparency_pixmap ();
1458 if (background_flags == 0) 1412 if (background_flags == 0)
1459 return false; 1413 return false;
1460 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1414 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1461 flags = flags & ~isInvalid; 1415 flags &= ~isInvalid;
1462 } 1416 }
1463# endif 1417# endif
1464 1418
1465# ifdef BG_IMAGE_FROM_FILE 1419# ifdef BG_IMAGE_FROM_FILE
1466 if (have_image 1420 if (have_image
1467 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1421 || (background_flags & transpTransformations) != (flags & transpTransformations))
1468 { 1422 {
1469 if (render_image (background_flags)) 1423 if (render_image (background_flags))
1470 flags = flags & ~isInvalid; 1424 flags &= ~isInvalid;
1471 } 1425 }
1472# endif 1426# endif
1473 1427
1428# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1474 XImage *result = NULL; 1429 XImage *result = NULL;
1475 1430
1476 if (background_flags && (flags & isInvalid)) 1431 if (background_flags && (flags & isInvalid))
1477 { 1432 {
1478 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1433 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1479 } 1434 }
1480 1435
1481 if (result) 1436 if (result)
1482 { 1437 {
1483# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1484 /* our own client-side tinting */ 1438 /* our own client-side tinting */
1485 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1439 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1486 { 1440 {
1487 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1441 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1488 if (flags & tintSet) 1442 if (flags & tintSet)
1489 tint.get (c); 1443 tint.get (c);
1490 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1444 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1491 } 1445 }
1492# endif
1493 1446
1494 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1447 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1495 1448
1496 if (gc) 1449 if (gc)
1497 { 1450 {
1498 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1451 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1499 1452
1500 XFreeGC (target->dpy, gc); 1453 XFreeGC (target->dpy, gc);
1501 flags = flags & ~isInvalid; 1454 flags &= ~isInvalid;
1502 } 1455 }
1503 1456
1504 XDestroyImage (result); 1457 XDestroyImage (result);
1505 } 1458 }
1459# endif
1506 1460
1507 if (flags & isInvalid) 1461 if (flags & isInvalid)
1508 { 1462 {
1509 if (pixmap != None) 1463 if (pixmap != None)
1510 { 1464 {
… …
1518 valid_since = ev::now (); 1472 valid_since = ev::now ();
1519 1473
1520 return true; 1474 return true;
1521} 1475}
1522 1476
1523bool 1477void
1524bgPixmap_t::set_target (rxvt_term *new_target) 1478bgPixmap_t::set_target (rxvt_term *new_target)
1525{ 1479{
1526 if (new_target)
1527 if (target != new_target)
1528 {
1529 target = new_target; 1480 target = new_target;
1530 return true; 1481
1482 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1483#if XRENDER
1484 int major, minor;
1485 if (XRenderQueryVersion (target->dpy, &major, &minor))
1486 flags |= HAS_RENDER;
1487 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1488 if (filters)
1489 {
1490 for (int i = 0; i < filters->nfilter; i++)
1491 if (!strcmp (filters->filter[i], FilterConvolution))
1492 flags |= HAS_RENDER_CONV;
1493
1494 XFree (filters);
1531 } 1495 }
1532 1496#endif
1533 return false;
1534} 1497}
1535 1498
1536void 1499void
1537bgPixmap_t::apply () 1500bgPixmap_t::apply ()
1538{ 1501{
1539 if (target) 1502 if (target == NULL)
1540 { 1503 return;
1504
1541 if (pixmap != None) 1505 if (pixmap != None)
1542 { 1506 {
1543 /* set target's background to pixmap */ 1507 /* set target's background to pixmap */
1544# ifdef ENABLE_TRANSPARENCY 1508# ifdef ENABLE_TRANSPARENCY
1545 if (flags & isTransparent) 1509 if (flags & isTransparent)
1546 { 1510 {
1547 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1511 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1548 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1512 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1549 1513
1550 if (target->scrollBar.win) 1514 if (target->scrollBar.win)
1551 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1515 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1552 } 1516 }
1553 else 1517 else
1554# endif 1518# endif
1555 { 1519 {
1556 /* force old pixmap dereference in case it was transparent before :*/ 1520 /* 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]); 1521 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1569 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1522 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1570 /* do we also need to set scrollbar's background here ? */ 1523 /* do we also need to set scrollbar's background here ? */
1524
1571 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1572 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1526 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1573 } 1527 }
1528 }
1529 else
1530 {
1531 /* set target background to a pixel */
1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1533 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1534 /* do we also need to set scrollbar's background here ? */
1535 if (target->scrollBar.win)
1536 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1537 }
1574 1538
1575 /* don't want Expose on the parent or vt. It is better to use 1539 /* 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: */ 1540 scr_touch or we get a great deal of flicker otherwise: */
1577 XClearWindow (target->dpy, target->parent[0]); 1541 XClearWindow (target->dpy, target->parent[0]);
1578 1542
1579 if (target->scrollBar.state && target->scrollBar.win) 1543 if (target->scrollBar.state && target->scrollBar.win)
1580 { 1544 {
1581 target->scrollBar.state = STATE_IDLE; 1545 target->scrollBar.state = STATE_IDLE;
1582 target->scrollBar.show (0); 1546 target->scrollBar.show (0);
1583 } 1547 }
1584 1548
1585 target->want_refresh = 1; 1549 target->want_refresh = 1;
1586 flags |= hasChanged; 1550 flags |= hasChanged;
1587 }
1588} 1551}
1589 1552
1590#endif /* HAVE_BG_PIXMAP */ 1553#endif /* HAVE_BG_PIXMAP */
1591 1554
1592#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1555#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1593/* taken from aterm-0.4.2 */ 1556/* taken from aterm-0.4.2 */
1594 1557
1595static void 1558static void
1596ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1559shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1597{ 1560{
1598 int sh_r, sh_g, sh_b; 1561 int sh_r, sh_g, sh_b;
1599 uint32_t mask_r, mask_g, mask_b; 1562 uint32_t mask_r, mask_g, mask_b;
1600 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1563 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1601 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1564 rgba low;
1602 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1565 rgba high;
1603 int i; 1566 int i;
1604 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1567 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1605 1568
1606 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1569 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1607 1570
1608 /* for convenience */ 1571 /* for convenience */
1609 mask_r = visual->red_mask; 1572 mask_r = visual->red_mask;
1610 mask_g = visual->green_mask; 1573 mask_g = visual->green_mask;
1611 mask_b = visual->blue_mask; 1574 mask_b = visual->blue_mask;
1612 1575
1613 /* boring lookup table pre-initialization */ 1576 /* boring lookup table pre-initialization */
1614 switch (srcImage->depth) 1577 switch (ximage->depth)
1615 { 1578 {
1616 case 15: 1579 case 15:
1617 if ((mask_r != 0x7c00) || 1580 if ((mask_r != 0x7c00) ||
1618 (mask_g != 0x03e0) || 1581 (mask_g != 0x03e0) ||
1619 (mask_b != 0x001f)) 1582 (mask_b != 0x001f))
… …
1672 /* prepare limits for color transformation (each channel is handled separately) */ 1635 /* prepare limits for color transformation (each channel is handled separately) */
1673 if (shade > 100) 1636 if (shade > 100)
1674 { 1637 {
1675 shade = 200 - shade; 1638 shade = 200 - shade;
1676 1639
1677 lower_lim_r = 65535-rm; 1640 high.r = c.r * shade / 100;
1678 lower_lim_g = 65535-gm; 1641 high.g = c.g * shade / 100;
1679 lower_lim_b = 65535-bm; 1642 high.b = c.b * shade / 100;
1680 1643
1681 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1644 low.r = 65535 * (100 - shade) / 100;
1682 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1645 low.g = 65535 * (100 - shade) / 100;
1683 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1646 low.b = 65535 * (100 - shade) / 100;
1684
1685 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1686 } 1647 }
1687 else 1648 else
1688 { 1649 {
1650 high.r = c.r * shade / 100;
1651 high.g = c.g * shade / 100;
1652 high.b = c.b * shade / 100;
1689 1653
1690 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1654 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 } 1655 }
1696 1656
1697 /* fill our lookup tables */ 1657 /* fill our lookup tables */
1698 for (i = 0; i <= mask_r>>sh_r; i++) 1658 for (i = 0; i <= mask_r>>sh_r; i++)
1699 { 1659 {
1700 uint32_t tmp; 1660 uint32_t tmp;
1701 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1661 tmp = i * high.r;
1702 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1662 tmp += (mask_r>>sh_r) * low.r;
1703 lookup_r[i] = (tmp/65535)<<sh_r; 1663 lookup_r[i] = (tmp/65535)<<sh_r;
1704 } 1664 }
1705 for (i = 0; i <= mask_g>>sh_g; i++) 1665 for (i = 0; i <= mask_g>>sh_g; i++)
1706 { 1666 {
1707 uint32_t tmp; 1667 uint32_t tmp;
1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1668 tmp = i * high.g;
1709 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1669 tmp += (mask_g>>sh_g) * low.g;
1710 lookup_g[i] = (tmp/65535)<<sh_g; 1670 lookup_g[i] = (tmp/65535)<<sh_g;
1711 } 1671 }
1712 for (i = 0; i <= mask_b>>sh_b; i++) 1672 for (i = 0; i <= mask_b>>sh_b; i++)
1713 { 1673 {
1714 uint32_t tmp; 1674 uint32_t tmp;
1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1675 tmp = i * high.b;
1716 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1676 tmp += (mask_b>>sh_b) * low.b;
1717 lookup_b[i] = (tmp/65535)<<sh_b; 1677 lookup_b[i] = (tmp/65535)<<sh_b;
1718 } 1678 }
1719 1679
1720 /* apply table to input image (replacing colors by newly calculated ones) */ 1680 /* apply table to input image (replacing colors by newly calculated ones) */
1721 if (srcImage->bits_per_pixel == 32 1681 if (ximage->bits_per_pixel == 32
1722 && (srcImage->depth == 24 || srcImage->depth == 32) 1682 && (ximage->depth == 24 || ximage->depth == 32)
1723 && srcImage->byte_order == host_byte_order) 1683 && ximage->byte_order == host_byte_order)
1724 { 1684 {
1725 uint32_t *p1, *pf, *p, *pl; 1685 uint32_t *p1, *pf, *p, *pl;
1726 p1 = (uint32_t *) srcImage->data; 1686 p1 = (uint32_t *) ximage->data;
1727 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1687 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1728 1688
1729 while (p1 < pf) 1689 while (p1 < pf)
1730 { 1690 {
1731 p = p1; 1691 p = p1;
1732 pl = p1 + srcImage->width; 1692 pl = p1 + ximage->width;
1733 for (; p < pl; p++) 1693 for (; p < pl; p++)
1734 { 1694 {
1735 *p = lookup_r[(*p & 0xff0000) >> 16] | 1695 *p = lookup_r[(*p & 0xff0000) >> 16] |
1736 lookup_g[(*p & 0x00ff00) >> 8] | 1696 lookup_g[(*p & 0x00ff00) >> 8] |
1737 lookup_b[(*p & 0x0000ff)] | 1697 lookup_b[(*p & 0x0000ff)] |
1738 (*p & 0xff000000); 1698 (*p & 0xff000000);
1739 } 1699 }
1740 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1700 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1741 } 1701 }
1742 } 1702 }
1743 else 1703 else
1744 { 1704 {
1745 for (int y = 0; y < srcImage->height; y++) 1705 for (int y = 0; y < ximage->height; y++)
1746 for (int x = 0; x < srcImage->width; x++) 1706 for (int x = 0; x < ximage->width; x++)
1747 { 1707 {
1748 unsigned long pixel = XGetPixel (srcImage, x, y); 1708 unsigned long pixel = XGetPixel (ximage, x, y);
1749 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1709 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1750 lookup_g[(pixel & mask_g) >> sh_g] | 1710 lookup_g[(pixel & mask_g) >> sh_g] |
1751 lookup_b[(pixel & mask_b) >> sh_b]; 1711 lookup_b[(pixel & mask_b) >> sh_b];
1752 XPutPixel (srcImage, x, y, pixel); 1712 XPutPixel (ximage, x, y, pixel);
1753 } 1713 }
1754 } 1714 }
1755 1715
1756 free (lookup); 1716 free (lookup);
1757} 1717}

Diff Legend

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