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.112 by sf-exg, Sat Nov 6 17:16:15 2010 UTC vs.
Revision 1.137 by sf-exg, Sat Jan 15 17:41:43 2011 UTC

… …
28 28
29#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
31#endif 31#endif
32 32
33#define DO_TIMING_TEST 0 33#ifndef FilterConvolution
34 34#define FilterConvolution "convolution"
35#if DO_TIMING_TEST
36# include <sys/time.h>
37#define TIMING_TEST_START(id) \
38 struct timeval timing_test_##id##_stv; \
39 gettimeofday (&timing_test_##id##_stv, NULL);
40
41#define TIMING_TEST_PRINT_RESULT(id) \
42 do { \
43 struct timeval tv; \
44 gettimeofday (&tv, NULL); \
45 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
46 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
47 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
48 } while (0)
49
50#else
51#define TIMING_TEST_START(id) do {} while (0)
52#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
53#endif 35#endif
54 36
55/* 37/*
56 * Pixmap geometry string interpretation : 38 * Pixmap geometry string interpretation :
57 * Each geometry string contains zero or one scale/position 39 * Each geometry string contains zero or one scale/position
… …
62 * 44 *
63 * 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%.
64 * W and H are percentages of the terminal window size. 46 * W and H are percentages of the terminal window size.
65 * X and Y are also percentages; e.g., +50+50 centers 47 * X and Y are also percentages; e.g., +50+50 centers
66 * the image in the window. 48 * the image in the window.
67 * WxH+X Assumes Y == X
68 * WxH Assumes Y == X == 50 (centers the image)
69 * W+X+Y Assumes H == W
70 * W+X Assumes H == W and Y == X
71 * W Assumes H == W and Y == X == 50
72 *
73 * Adjusting position only :
74 * =+X+Y Set position to X% by Y% (absolute).
75 * =+X Set position to X% by X%.
76 * +X+Y Adjust position horizontally X% and vertically Y%
77 * from current position (relative).
78 * +X Adjust position horizontally X% and vertically X%
79 * from current position.
80 *
81 * Adjusting scale only :
82 * Wx0 Multiply horizontal scaling factor by W%
83 * 0xH Multiply vertical scaling factor by H%
84 * 0x0 No scaling (show image at normal size).
85 * 49 *
86 * Pixmap Operations : (should be prepended by a colon) 50 * Pixmap Operations : (should be prepended by a colon)
87 * tile Tile image. Scaling/position modifiers above will affect 51 * tile Tile image. Scaling/position modifiers above will affect
88 * the tile size and origin. 52 * the tile size and origin.
89 * propscale When scaling, scale proportionally. That is, maintain the 53 * propscale When scaling, scale proportionally. That is, maintain the
… …
115#ifdef ENABLE_TRANSPARENCY 79#ifdef ENABLE_TRANSPARENCY
116 shade = 100; 80 shade = 100;
117#endif 81#endif
118 flags = 0; 82 flags = 0;
119 pixmap = None; 83 pixmap = None;
120 valid_since = invalid_since = 0; 84 valid_since = 0;
121 target = 0; 85 target = 0;
86 target_x = target_y = 0;
122} 87}
123 88
124void 89void
125bgPixmap_t::destroy () 90bgPixmap_t::destroy ()
126{ 91{
… …
137 if (pixmap && target) 102 if (pixmap && target)
138 XFreePixmap (target->dpy, pixmap); 103 XFreePixmap (target->dpy, pixmap);
139} 104}
140 105
141bool 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
142bgPixmap_t::window_size_sensitive () 121bgPixmap_t::window_size_sensitive ()
143{ 122{
144# ifdef ENABLE_TRANSPARENCY 123# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 124 if (flags & isTransparent)
146 return true; 125 return true;
… …
171 if (flags & rootAlign) 150 if (flags & rootAlign)
172 return true; 151 return true;
173 } 152 }
174# endif 153# endif
175 154
176 return false;
177};
178
179bool bgPixmap_t::need_client_side_rendering ()
180{
181# ifdef HAVE_AFTERIMAGE
182 if (original_asim)
183 return true;
184# endif
185 return false; 155 return false;
186} 156}
187 157
188# ifdef BG_IMAGE_FROM_FILE 158# ifdef BG_IMAGE_FROM_FILE
189static inline bool 159static inline bool
… …
252 dst_size = target_size - dst_pos; 222 dst_size = target_size - dst_pos;
253 return src_pos; 223 return src_pos;
254} 224}
255 225
256bool 226bool
257bgPixmap_t::set_geometry (const char *geom) 227bgPixmap_t::set_geometry (const char *geom, bool update)
258{ 228{
259 bool changed = false; 229 bool changed = false;
260 int geom_flags = 0; 230 int geom_flags = 0;
261 int x = 0, y = 0; 231 int x = 0, y = 0;
262 unsigned int w = 0, h = 0; 232 unsigned int w = 0, h = 0;
263 unsigned int n; 233 unsigned int n;
264 unsigned long new_flags = (flags & (~geometryFlags)); 234 unsigned long new_flags = (flags & (~geometryFlags));
265 const char *p; 235 const char *ops;
266# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
267 236
268 if (geom == NULL) 237 if (geom == NULL)
269 return false; 238 return false;
270 239
271 char str[MAXLEN_GEOM]; 240 char str[256];
272 241
273 while (isspace(*geom)) ++geom;
274 if ((p = strchr (geom, ';')) == NULL)
275 p = strchr (geom, '\0'); 242 ops = strchr (geom, ':');
276 243 if (ops == NULL)
244 n = strlen (geom);
245 else
277 n = (p - geom); 246 n = ops - geom;
278 if (n < MAXLEN_GEOM)
279 {
280 char *ops;
281 new_flags |= geometrySet;
282 247
248 if (n >= sizeof (str))
249 return false;
250
283 memcpy (str, geom, n); 251 memcpy (str, geom, n);
284 str[n] = '\0'; 252 str[n] = '\0';
285 if (str[0] == ':') 253 rxvt_strtrim (str);
286 ops = &str[0];
287 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
288 ops = &str[0];
289 else
290 {
291 char *tmp;
292 ops = strchr (str, ':');
293 if (ops != NULL)
294 {
295 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
296 *(++tmp) = '\0';
297 if (ops == tmp) ++ops;
298 }
299 }
300 254
301 if (ops > str || ops == NULL) 255 if (str[0])
302 { 256 {
303 /* 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 */
304 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 258 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
305
306 if ((geom_flags & XValue) && !(geom_flags & YValue))
307 {
308 y = x;
309 geom_flags |= YValue;
310 }
311
312 if (flags & geometrySet)
313 {
314 /* new geometry is an adjustment to the old one ! */
315 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
316 {
317 if (w == 0 && h != 0)
318 {
319 w = h_scale;
320 h = (v_scale * h) / 100;
321 }
322 else if (h == 0 && w != 0)
323 {
324 w = (h_scale * w) / 100;
325 h = v_scale;
326 }
327 }
328 if (geom_flags & XValue)
329 {
330 if (str[0] != '=')
331 {
332 y += v_align;
333 x += h_align;
334 }
335 }
336 }
337 else /* setting up geometry from scratch */
338 {
339 if (!(geom_flags & XValue))
340 {
341 /* use default geometry - centered */
342 x = y = defaultAlign;
343 }
344 else if (!(geom_flags & YValue))
345 y = x;
346
347 if ((geom_flags & (WidthValue|HeightValue)) == 0)
348 {
349 /* use default geometry - scaled */
350 w = h = defaultScale;
351 }
352 else if (geom_flags & WidthValue)
353 {
354 if (!(geom_flags & HeightValue))
355 h = w;
356 }
357 else
358 w = h;
359 }
360 } /* done parsing geometry string */ 259 } /* done parsing geometry string */
361 else if (!(flags & geometrySet)) 260
362 { 261 if (!update)
363 /* default geometry - scaled and centered */ 262 {
263 if (!(geom_flags & XValue))
364 x = y = defaultAlign; 264 x = y = defaultAlign;
265 else if (!(geom_flags & YValue))
266 y = x;
267
268 if (!(geom_flags & (WidthValue|HeightValue)))
365 w = h = defaultScale; 269 w = h = defaultScale;
366 } 270 else if (!(geom_flags & HeightValue))
271 h = w;
272 else if (!(geom_flags & WidthValue))
273 w = h;
367 274
368 if (!(flags & geometrySet))
369 geom_flags |= WidthValue|HeightValue|XValue|YValue; 275 geom_flags |= WidthValue|HeightValue|XValue|YValue;
276 }
370 277
371 if (ops) 278 if (ops)
372 { 279 {
373 while (*ops) 280 char **arr = rxvt_strsplit (':', ops + 1);
281
282 for (int i = 0; arr[i]; i++)
374 { 283 {
375 while (*ops == ':' || isspace(*ops)) ++ops; 284 if (!strcasecmp (arr[i], "tile"))
376
377# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
378 if (CHECK_GEOM_OPS ("tile"))
379 { 285 {
380 w = h = noScale; 286 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 287 geom_flags |= WidthValue|HeightValue;
382 } 288 }
383 else if (CHECK_GEOM_OPS ("propscale")) 289 else if (!strcasecmp (arr[i], "propscale"))
384 { 290 {
385 new_flags |= propScale; 291 new_flags |= propScale;
386 } 292 }
387 else if (CHECK_GEOM_OPS ("hscale")) 293 else if (!strcasecmp (arr[i], "hscale"))
388 { 294 {
389 if (w == 0) w = windowScale; 295 if (w == 0) w = windowScale;
390 296
391 h = noScale; 297 h = noScale;
392 geom_flags |= WidthValue|HeightValue; 298 geom_flags |= WidthValue|HeightValue;
393 } 299 }
394 else if (CHECK_GEOM_OPS ("vscale")) 300 else if (!strcasecmp (arr[i], "vscale"))
395 { 301 {
396 if (h == 0) h = windowScale; 302 if (h == 0) h = windowScale;
397 303
398 w = noScale; 304 w = noScale;
399 geom_flags |= WidthValue|HeightValue; 305 geom_flags |= WidthValue|HeightValue;
400 } 306 }
401 else if (CHECK_GEOM_OPS ("scale")) 307 else if (!strcasecmp (arr[i], "scale"))
402 { 308 {
403 if (h == 0) h = windowScale; 309 if (h == 0) h = windowScale;
404 if (w == 0) w = windowScale; 310 if (w == 0) w = windowScale;
405 311
406 geom_flags |= WidthValue|HeightValue; 312 geom_flags |= WidthValue|HeightValue;
407 } 313 }
408 else if (CHECK_GEOM_OPS ("auto")) 314 else if (!strcasecmp (arr[i], "auto"))
409 { 315 {
410 w = h = windowScale; 316 w = h = windowScale;
411 x = y = centerAlign; 317 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 318 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 319 }
414 else if (CHECK_GEOM_OPS ("root")) 320 else if (!strcasecmp (arr[i], "root"))
415 { 321 {
416 new_flags |= rootAlign; 322 new_flags |= rootAlign;
417 w = h = noScale; 323 w = h = noScale;
418 geom_flags |= WidthValue|HeightValue; 324 geom_flags |= WidthValue|HeightValue;
419 } 325 }
420# undef CHECK_GEOM_OPS
421
422 while (*ops != ':' && *ops != '\0') ++ops;
423 } /* done parsing ops */ 326 } /* done parsing ops */
424 }
425 327
328 rxvt_free_strsplit (arr);
329 }
330
426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 331 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
427 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 332 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
428 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 333 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
429 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 334 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
430 }
431 335
432 if (new_flags != flags) 336 if (new_flags != flags)
433 { 337 {
434 flags = new_flags; 338 flags = new_flags;
435 changed = true; 339 changed = true;
… …
460 if (!w) w = image_width; 364 if (!w) w = image_width;
461 if (!h) h = image_height; 365 if (!h) h = image_height;
462 366
463 if (flags & rootAlign) 367 if (flags & rootAlign)
464 { 368 {
465 target->get_window_origin (x, y);
466 x = -x; 369 x = -target_x;
467 y = -y; 370 y = -target_y;
468 } 371 }
469 else 372 else
470 { 373 {
471 x = make_align_position (h_align, target_width, w); 374 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h); 375 y = make_align_position (v_align, target_height, h);
… …
666 if (result) 569 if (result)
667 { 570 {
668 XGCValues gcv; 571 XGCValues gcv;
669 GC gc; 572 GC gc;
670 573
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
681
682 /* create Pixmap */ 574 /* create Pixmap */
683 if (pixmap == None) 575 if (pixmap == None
576 || pmap_width != new_pmap_width
577 || pmap_height != new_pmap_height)
684 { 578 {
579 if (pixmap)
580 XFreePixmap (target->dpy, pixmap);
685 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);
686 pmap_width = new_pmap_width; 582 pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 583 pmap_height = new_pmap_height;
688 pmap_depth = target->depth;
689 } 584 }
690 /* fill with background color (if result's not completely overlapping it) */ 585 /* fill with background color (if result's not completely overlapping it) */
691 gcv.foreground = target->pix_colors[Color_bg]; 586 gcv.foreground = target->pix_colors[Color_bg];
692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 587 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
693 588
… …
725 return ret; 620 return ret;
726} 621}
727# endif /* HAVE_AFTERIMAGE */ 622# endif /* HAVE_AFTERIMAGE */
728 623
729# ifdef HAVE_PIXBUF 624# ifdef HAVE_PIXBUF
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
730bool 710bool
731bgPixmap_t::render_image (unsigned long background_flags) 711bgPixmap_t::render_image (unsigned long background_flags)
732{ 712{
733 if (target == NULL) 713 if (target == NULL)
734 return false; 714 return false;
… …
797 new_pmap_width = min (image_width, target_width); 777 new_pmap_width = min (image_width, target_width);
798 new_pmap_height = min (image_height, target_height); 778 new_pmap_height = min (image_height, target_height);
799 } 779 }
800 } 780 }
801 781
802 if (pixmap)
803 {
804 if (pmap_width != new_pmap_width
805 || pmap_height != new_pmap_height
806 || pmap_depth != target->depth)
807 {
808 XFreePixmap (target->dpy, pixmap);
809 pixmap = None;
810 }
811 }
812
813 if (pixmap == None) 782 if (pixmap == None
783 || pmap_width != new_pmap_width
784 || pmap_height != new_pmap_height)
814 { 785 {
786 if (pixmap)
787 XFreePixmap (target->dpy, pixmap);
815 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);
816 pmap_width = new_pmap_width; 789 pmap_width = new_pmap_width;
817 pmap_height = new_pmap_height; 790 pmap_height = new_pmap_height;
818 pmap_depth = target->depth;
819 } 791 }
820 792
821 gcv.foreground = target->pix_colors[Color_bg]; 793 gcv.foreground = target->pix_colors[Color_bg];
822 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 794 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
823 795
824 if (h_scale == 0 || v_scale == 0) 796 if (h_scale == 0 || v_scale == 0)
825 { 797 {
826 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);
827 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 799 pixbuf_to_pixmap (result, tile, gc,
828 0, 0, 800 0, 0,
829 0, 0, 801 0, 0,
830 image_width, image_height, 802 image_width, image_height);
831 XLIB_RGB_DITHER_NONE,
832 0, 0);
833 803
834 gcv.tile = tile; 804 gcv.tile = tile;
835 gcv.fill_style = FillTiled; 805 gcv.fill_style = FillTiled;
836 gcv.ts_x_origin = x; 806 gcv.ts_x_origin = x;
837 gcv.ts_y_origin = y; 807 gcv.ts_y_origin = y;
… …
852 || dst_x + dst_width < new_pmap_width 822 || dst_x + dst_width < new_pmap_width
853 || dst_y + dst_height < new_pmap_height) 823 || dst_y + dst_height < new_pmap_height)
854 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);
855 825
856 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 826 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
857 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 827 pixbuf_to_pixmap (result, pixmap, gc,
858 src_x, src_y, 828 src_x, src_y,
859 dst_x, dst_y, 829 dst_x, dst_y,
860 dst_width, dst_height, 830 dst_width, dst_height);
861 XLIB_RGB_DITHER_NONE,
862 0, 0);
863 } 831 }
864 832
865#if XRENDER 833#if XRENDER
866 if (background_flags) 834 if (background_flags)
867 { 835 {
… …
934 if (image) 902 if (image)
935 { 903 {
936 if (original_asim) 904 if (original_asim)
937 safe_asimage_destroy (original_asim); 905 safe_asimage_destroy (original_asim);
938 original_asim = image; 906 original_asim = image;
907 flags |= CLIENT_RENDER;
939 have_image = true; 908 have_image = true;
940 return true; 909 return true;
941 } 910 }
942# endif 911# endif
943 912
… …
1015 bool has_shade = shade != 100; 984 bool has_shade = shade != 100;
1016 985
1017 if (tint) 986 if (tint)
1018 { 987 {
1019 tint->get (c); 988 tint->get (c);
1020# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 989 if (!has_shade
1021 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 990 && (c.r <= 0x00ff || c.r >= 0xff00)
1022 && IS_COMPONENT_WHOLESOME (c.g) 991 && (c.g <= 0x00ff || c.g >= 0xff00)
1023 && IS_COMPONENT_WHOLESOME (c.b)) 992 && (c.b <= 0x00ff || c.b >= 0xff00))
1024 flags |= bgPixmap_t::tintWholesome; 993 flags |= bgPixmap_t::tintWholesome;
1025# undef IS_COMPONENT_WHOLESOME
1026 } 994 }
1027 995
1028 if (has_shade) 996 if (has_shade || tint)
1029 flags |= bgPixmap_t::tintNeeded; 997 flags |= bgPixmap_t::tintNeeded;
1030 else if (tint)
1031 {
1032 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1033 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1034 {
1035 flags |= bgPixmap_t::tintNeeded;
1036 }
1037 }
1038 998
1039 return flags; 999 return flags;
1040} 1000}
1041 1001
1042bool 1002bool
… …
1045 if (!(flags & tintSet) || tint != new_tint) 1005 if (!(flags & tintSet) || tint != new_tint)
1046 { 1006 {
1047 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1007 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1048 tint = new_tint; 1008 tint = new_tint;
1049 flags = (flags & ~tintFlags) | new_flags | tintSet; 1009 flags = (flags & ~tintFlags) | new_flags | tintSet;
1050 return true;
1051 }
1052
1053 return false;
1054}
1055
1056bool
1057bgPixmap_t::unset_tint ()
1058{
1059 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1060
1061 if (new_flags != (flags & tintFlags))
1062 {
1063 flags = (flags & ~tintFlags) | new_flags;
1064 return true; 1010 return true;
1065 } 1011 }
1066 1012
1067 return false; 1013 return false;
1068} 1014}
… …
1213 c.g = (c.g * shade) / 100; 1159 c.g = (c.g * shade) / 100;
1214 c.b = (c.b * shade) / 100; 1160 c.b = (c.b * shade) / 100;
1215 } 1161 }
1216 else 1162 else
1217 { 1163 {
1218 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1164 c.r = (c.r * (200 - shade)) / 100;
1219 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1165 c.g = (c.g * (200 - shade)) / 100;
1220 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1166 c.b = (c.b * (200 - shade)) / 100;
1221 } 1167 }
1222 1168
1223 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1169 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1224 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1170 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1225 XRenderPictureAttributes pa; 1171 XRenderPictureAttributes pa;
… …
1239 1185
1240 if (mask_pic && overlay_pic && back_pic) 1186 if (mask_pic && overlay_pic && back_pic)
1241 { 1187 {
1242 XRenderColor mask_c; 1188 XRenderColor mask_c;
1243 1189
1244 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1190 mask_c.red = mask_c.green = mask_c.blue = 0;
1245 mask_c.alpha = 0xffff; 1191 mask_c.alpha = 0xffff;
1246 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1192 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1247 1193
1248 mask_c.alpha = 0; 1194 mask_c.alpha = 0;
1249 mask_c.red = 0xffff - c.r; 1195 mask_c.red = 0xffff - c.r;
1250 mask_c.green = 0xffff - c.g; 1196 mask_c.green = 0xffff - c.g;
1251 mask_c.blue = 0xffff - c.b; 1197 mask_c.blue = 0xffff - c.b;
1252 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1198 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1253 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
1254 ret = true; 1210 ret = true;
1255 } 1211 }
1256 1212
1257 XRenderFreePicture (dpy, mask_pic); 1213 XRenderFreePicture (dpy, mask_pic);
1258 XRenderFreePicture (dpy, overlay_pic); 1214 XRenderFreePicture (dpy, overlay_pic);
… …
1289 int window_height = target->szHint.height; 1245 int window_height = target->szHint.height;
1290 int sx, sy; 1246 int sx, sy;
1291 XGCValues gcv; 1247 XGCValues gcv;
1292 GC gc; 1248 GC gc;
1293 1249
1294 target->get_window_origin (sx, sy); 1250 sx = target_x;
1251 sy = target_y;
1295 1252
1296 /* 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 : */
1297 if (sx + window_width <= 0 || sy + window_height <= 0 1254 if (sx + window_width <= 0 || sy + window_height <= 0
1298 || sx >= root_width || sy >= root_height) 1255 || sx >= root_width || sy >= root_height)
1299 return 0; 1256 return 0;
… …
1346 } 1303 }
1347 1304
1348 if (root_pixmap == None) 1305 if (root_pixmap == None)
1349 return 0; 1306 return 0;
1350 1307
1308 if (pixmap == None
1309 || pmap_width != window_width
1310 || pmap_height != window_height)
1311 {
1312 if (pixmap)
1313 XFreePixmap (target->dpy, pixmap);
1351 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1314 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1315 pmap_width = window_width;
1316 pmap_height = window_height;
1317 }
1352 1318
1353 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1319 if (pixmap == None)
1354 return 0; 1320 return 0;
1355 1321
1356 /* straightforward pixmap copy */ 1322 /* straightforward pixmap copy */
1323 while (sx < 0) sx += (int)root_width;
1324 while (sy < 0) sy += (int)root_height;
1325
1357 gcv.tile = recoded_root_pmap; 1326 gcv.tile = recoded_root_pmap;
1358 gcv.fill_style = FillTiled; 1327 gcv.fill_style = FillTiled;
1359
1360 while (sx < 0) sx += (int)root_width;
1361 while (sy < 0) sy += (int)root_height;
1362
1363 gcv.ts_x_origin = -sx; 1328 gcv.ts_x_origin = -sx;
1364 gcv.ts_y_origin = -sy; 1329 gcv.ts_y_origin = -sy;
1365 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1330 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1366 1331
1367 if (gc) 1332 if (gc)
1368 { 1333 {
1369 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1334 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1370 result |= transpPmapTiled; 1335 result |= transpPmapTiled;
1371 XFreeGC (dpy, gc); 1336 XFreeGC (dpy, gc);
1372 }
1373 1337
1374 if (tiled_root_pmap != None) 1338 if (!(flags & CLIENT_RENDER))
1375 {
1376 if (!need_client_side_rendering ())
1377 { 1339 {
1378 if ((flags & blurNeeded) 1340 if ((flags & blurNeeded)
1379 && (flags & HAS_RENDER_CONV)) 1341 && (flags & HAS_RENDER_CONV))
1380 { 1342 {
1381 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1343 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1382 result |= transpPmapBlurred; 1344 result |= transpPmapBlurred;
1383 } 1345 }
1384 if ((flags & tintNeeded) 1346 if ((flags & tintNeeded)
1385 && (flags & (tintWholesome | HAS_RENDER))) 1347 && (flags & (tintWholesome | HAS_RENDER)))
1386 { 1348 {
1387 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1349 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1388 result |= transpPmapTinted; 1350 result |= transpPmapTinted;
1389 } 1351 }
1390 } /* server side rendering completed */ 1352 } /* server side rendering completed */
1391
1392 if (pixmap)
1393 XFreePixmap (dpy, pixmap);
1394
1395 pixmap = tiled_root_pmap;
1396 pmap_width = window_width;
1397 pmap_height = window_height;
1398 pmap_depth = target->depth;
1399 } 1353 }
1400 1354
1401 if (recoded_root_pmap != root_pixmap) 1355 if (recoded_root_pmap != root_pixmap)
1402 XFreePixmap (dpy, recoded_root_pmap); 1356 XFreePixmap (dpy, recoded_root_pmap);
1403 1357
… …
1405} 1359}
1406 1360
1407void 1361void
1408bgPixmap_t::set_root_pixmap () 1362bgPixmap_t::set_root_pixmap ()
1409{ 1363{
1410 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]);
1411 if (new_root_pixmap == None) 1365 if (new_root_pixmap == None)
1412 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]);
1413 1367
1414 root_pixmap = new_root_pixmap; 1368 root_pixmap = new_root_pixmap;
1415} 1369}
1416# endif /* ENABLE_TRANSPARENCY */ 1370# endif /* ENABLE_TRANSPARENCY */
1417 1371
1418#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1372#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1419static 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);
1420# endif 1374# endif
1421 1375
1422bool 1376bool
1423bgPixmap_t::render () 1377bgPixmap_t::render ()
1424{ 1378{
… …
1434 /* we need to re-generate transparency pixmap in that case ! */ 1388 /* we need to re-generate transparency pixmap in that case ! */
1435 background_flags = make_transparency_pixmap (); 1389 background_flags = make_transparency_pixmap ();
1436 if (background_flags == 0) 1390 if (background_flags == 0)
1437 return false; 1391 return false;
1438 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1392 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1439 flags = flags & ~isInvalid; 1393 flags &= ~isInvalid;
1440 } 1394 }
1441# endif 1395# endif
1442 1396
1443# ifdef BG_IMAGE_FROM_FILE 1397# ifdef BG_IMAGE_FROM_FILE
1444 if (have_image 1398 if (have_image
1445 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1399 || (background_flags & transpTransformations) != (flags & transpTransformations))
1446 { 1400 {
1447 if (render_image (background_flags)) 1401 if (render_image (background_flags))
1448 flags = flags & ~isInvalid; 1402 flags &= ~isInvalid;
1449 } 1403 }
1450# endif 1404# endif
1451 1405
1452# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1406# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1453 XImage *result = NULL; 1407 XImage *result = NULL;
… …
1463 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1417 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1464 { 1418 {
1465 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1419 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1466 if (flags & tintSet) 1420 if (flags & tintSet)
1467 tint.get (c); 1421 tint.get (c);
1468 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);
1469 } 1423 }
1470 1424
1471 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1425 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1472 1426
1473 if (gc) 1427 if (gc)
1474 { 1428 {
1475 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);
1476 1430
1477 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1478 flags = flags & ~isInvalid; 1432 flags &= ~isInvalid;
1479 } 1433 }
1480 1434
1481 XDestroyImage (result); 1435 XDestroyImage (result);
1482 } 1436 }
1483# endif 1437# endif
… …
1578 1532
1579#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1533#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1580/* taken from aterm-0.4.2 */ 1534/* taken from aterm-0.4.2 */
1581 1535
1582static void 1536static void
1583ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1537shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1584{ 1538{
1585 int sh_r, sh_g, sh_b; 1539 int sh_r, sh_g, sh_b;
1586 uint32_t mask_r, mask_g, mask_b; 1540 uint32_t mask_r, mask_g, mask_b;
1587 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1541 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1588 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1542 rgba low;
1589 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1543 rgba high;
1590 int i; 1544 int i;
1591 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1545 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1592 1546
1593 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1547 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1594 1548
1595 /* for convenience */ 1549 /* for convenience */
1596 mask_r = visual->red_mask; 1550 mask_r = visual->red_mask;
1597 mask_g = visual->green_mask; 1551 mask_g = visual->green_mask;
1598 mask_b = visual->blue_mask; 1552 mask_b = visual->blue_mask;
1599 1553
1600 /* boring lookup table pre-initialization */ 1554 /* boring lookup table pre-initialization */
1601 switch (srcImage->depth) 1555 switch (ximage->depth)
1602 { 1556 {
1603 case 15: 1557 case 15:
1604 if ((mask_r != 0x7c00) || 1558 if ((mask_r != 0x7c00) ||
1605 (mask_g != 0x03e0) || 1559 (mask_g != 0x03e0) ||
1606 (mask_b != 0x001f)) 1560 (mask_b != 0x001f))
… …
1659 /* prepare limits for color transformation (each channel is handled separately) */ 1613 /* prepare limits for color transformation (each channel is handled separately) */
1660 if (shade > 100) 1614 if (shade > 100)
1661 { 1615 {
1662 shade = 200 - shade; 1616 shade = 200 - shade;
1663 1617
1664 lower_lim_r = 65535-rm; 1618 high.r = c.r * shade / 100;
1665 lower_lim_g = 65535-gm; 1619 high.g = c.g * shade / 100;
1666 lower_lim_b = 65535-bm; 1620 high.b = c.b * shade / 100;
1667 1621
1668 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1622 low.r = 65535 * (100 - shade) / 100;
1669 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1623 low.g = 65535 * (100 - shade) / 100;
1670 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1624 low.b = 65535 * (100 - shade) / 100;
1671
1672 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1673 } 1625 }
1674 else 1626 else
1675 { 1627 {
1628 high.r = c.r * shade / 100;
1629 high.g = c.g * shade / 100;
1630 high.b = c.b * shade / 100;
1676 1631
1677 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1632 low.r = low.g = low.b = 0;
1678
1679 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1680 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1681 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1682 } 1633 }
1683 1634
1684 /* fill our lookup tables */ 1635 /* fill our lookup tables */
1685 for (i = 0; i <= mask_r>>sh_r; i++) 1636 for (i = 0; i <= mask_r>>sh_r; i++)
1686 { 1637 {
1687 uint32_t tmp; 1638 uint32_t tmp;
1688 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1639 tmp = i * high.r;
1689 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1640 tmp += (mask_r>>sh_r) * low.r;
1690 lookup_r[i] = (tmp/65535)<<sh_r; 1641 lookup_r[i] = (tmp/65535)<<sh_r;
1691 } 1642 }
1692 for (i = 0; i <= mask_g>>sh_g; i++) 1643 for (i = 0; i <= mask_g>>sh_g; i++)
1693 { 1644 {
1694 uint32_t tmp; 1645 uint32_t tmp;
1695 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1646 tmp = i * high.g;
1696 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1647 tmp += (mask_g>>sh_g) * low.g;
1697 lookup_g[i] = (tmp/65535)<<sh_g; 1648 lookup_g[i] = (tmp/65535)<<sh_g;
1698 } 1649 }
1699 for (i = 0; i <= mask_b>>sh_b; i++) 1650 for (i = 0; i <= mask_b>>sh_b; i++)
1700 { 1651 {
1701 uint32_t tmp; 1652 uint32_t tmp;
1702 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1653 tmp = i * high.b;
1703 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1654 tmp += (mask_b>>sh_b) * low.b;
1704 lookup_b[i] = (tmp/65535)<<sh_b; 1655 lookup_b[i] = (tmp/65535)<<sh_b;
1705 } 1656 }
1706 1657
1707 /* apply table to input image (replacing colors by newly calculated ones) */ 1658 /* apply table to input image (replacing colors by newly calculated ones) */
1708 if (srcImage->bits_per_pixel == 32 1659 if (ximage->bits_per_pixel == 32
1709 && (srcImage->depth == 24 || srcImage->depth == 32) 1660 && (ximage->depth == 24 || ximage->depth == 32)
1710 && srcImage->byte_order == host_byte_order) 1661 && ximage->byte_order == host_byte_order)
1711 { 1662 {
1712 uint32_t *p1, *pf, *p, *pl; 1663 uint32_t *p1, *pf, *p, *pl;
1713 p1 = (uint32_t *) srcImage->data; 1664 p1 = (uint32_t *) ximage->data;
1714 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1665 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1715 1666
1716 while (p1 < pf) 1667 while (p1 < pf)
1717 { 1668 {
1718 p = p1; 1669 p = p1;
1719 pl = p1 + srcImage->width; 1670 pl = p1 + ximage->width;
1720 for (; p < pl; p++) 1671 for (; p < pl; p++)
1721 { 1672 {
1722 *p = lookup_r[(*p & 0xff0000) >> 16] | 1673 *p = lookup_r[(*p & 0xff0000) >> 16] |
1723 lookup_g[(*p & 0x00ff00) >> 8] | 1674 lookup_g[(*p & 0x00ff00) >> 8] |
1724 lookup_b[(*p & 0x0000ff)] | 1675 lookup_b[(*p & 0x0000ff)] |
1725 (*p & 0xff000000); 1676 (*p & 0xff000000);
1726 } 1677 }
1727 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1678 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1728 } 1679 }
1729 } 1680 }
1730 else 1681 else
1731 { 1682 {
1732 for (int y = 0; y < srcImage->height; y++) 1683 for (int y = 0; y < ximage->height; y++)
1733 for (int x = 0; x < srcImage->width; x++) 1684 for (int x = 0; x < ximage->width; x++)
1734 { 1685 {
1735 unsigned long pixel = XGetPixel (srcImage, x, y); 1686 unsigned long pixel = XGetPixel (ximage, x, y);
1736 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1687 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1737 lookup_g[(pixel & mask_g) >> sh_g] | 1688 lookup_g[(pixel & mask_g) >> sh_g] |
1738 lookup_b[(pixel & mask_b) >> sh_b]; 1689 lookup_b[(pixel & mask_b) >> sh_b];
1739 XPutPixel (srcImage, x, y, pixel); 1690 XPutPixel (ximage, x, y, pixel);
1740 } 1691 }
1741 } 1692 }
1742 1693
1743 free (lookup); 1694 free (lookup);
1744} 1695}

Diff Legend

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