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.91 by sf-exg, Mon Oct 18 16:10:35 2010 UTC vs.
Revision 1.139 by sf-exg, Sat Jan 22 15:41:19 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 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 342 return changed;
436} 343}
437 344
438void 345void
439bgPixmap_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)
440{ 347{
… …
457 if (!w) w = image_width; 364 if (!w) w = image_width;
458 if (!h) h = image_height; 365 if (!h) h = image_height;
459 366
460 if (flags & rootAlign) 367 if (flags & rootAlign)
461 { 368 {
462 target->get_window_origin (x, y);
463 x = -x; 369 x = -target_x;
464 y = -y; 370 y = -target_y;
465 } 371 }
466 else 372 else
467 { 373 {
468 x = make_align_position (h_align, target_width, w); 374 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 375 y = make_align_position (v_align, target_height, h);
… …
529 435
530 int x = 0; 436 int x = 0;
531 int y = 0; 437 int y = 0;
532 int w = 0; 438 int w = 0;
533 int h = 0; 439 int h = 0;
534
535 TIMING_TEST_START (asim);
536 440
537 if (original_asim) 441 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 442 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 443
540 if (!original_asim 444 if (!original_asim
… …
657 } 561 }
658 562
659 free (layers); 563 free (layers);
660 } 564 }
661 } 565 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 566
664 bool ret = false; 567 bool ret = false;
665 568
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
… …
713 608
714 if (result != background && result != original_asim) 609 if (result != background && result != original_asim)
715 destroy_asimage (&result); 610 destroy_asimage (&result);
716 611
717 XFreeGC (target->dpy, gc); 612 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 613
720 ret = true; 614 ret = true;
721 } 615 }
722 616
723 if (background) 617 if (background)
… …
727} 621}
728# endif /* HAVE_AFTERIMAGE */ 622# endif /* HAVE_AFTERIMAGE */
729 623
730# ifdef HAVE_PIXBUF 624# ifdef HAVE_PIXBUF
731bool 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
732bgPixmap_t::render_image (unsigned long background_flags) 711bgPixmap_t::render_image (unsigned long background_flags)
733{ 712{
734 if (target == NULL) 713 if (target == NULL)
735 return false; 714 return false;
736 715
737 if (!pixbuf) 716 if (!pixbuf)
738 return false; 717 return false;
739 718
740#if !XFT
741 if (background_flags) 719 if (background_flags
720 && !(flags & HAS_RENDER))
742 return false; 721 return false;
743#endif
744 722
745 GdkPixbuf *result; 723 GdkPixbuf *result;
746 724
747 int image_width = gdk_pixbuf_get_width (pixbuf); 725 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 726 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 777 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 778 new_pmap_height = min (image_height, target_height);
801 } 779 }
802 } 780 }
803 781
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) 782 if (pixmap == None
783 || pmap_width != new_pmap_width
784 || pmap_height != new_pmap_height)
816 { 785 {
786 if (pixmap)
787 XFreePixmap (target->dpy, pixmap);
817 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);
818 pmap_width = new_pmap_width; 789 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 790 pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 } 791 }
822 792
823 gcv.foreground = target->pix_colors[Color_bg]; 793 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 794 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825 795
826 if (h_scale == 0 || v_scale == 0) 796 if (h_scale == 0 || v_scale == 0)
827 { 797 {
828 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);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 799 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 800 0, 0,
831 0, 0, 801 0, 0,
832 image_width, image_height, 802 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 803
836 gcv.tile = tile; 804 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 805 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 806 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 807 gcv.ts_y_origin = y;
… …
854 || dst_x + dst_width < new_pmap_width 822 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 823 || dst_y + dst_height < new_pmap_height)
856 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);
857 825
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 826 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 827 pixbuf_to_pixmap (result, pixmap, gc,
860 src_x, src_y, 828 src_x, src_y,
861 dst_x, dst_y, 829 dst_x, dst_y,
862 dst_width, dst_height, 830 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 } 831 }
866 832
867#if XFT 833#if XRENDER
868 if (background_flags) 834 if (background_flags)
869 { 835 {
870 Display *dpy = target->dpy; 836 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 837 XRenderPictureAttributes pa;
872 838
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 839 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 840 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 841
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 842 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 843 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 844
… …
915# endif /* HAVE_PIXBUF */ 881# endif /* HAVE_PIXBUF */
916 882
917bool 883bool
918bgPixmap_t::set_file (const char *file) 884bgPixmap_t::set_file (const char *file)
919{ 885{
920 assert (file); 886 if (!file || !*file)
887 return false;
921 888
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 889 if (const char *p = strchr (file, ';'))
925 { 890 {
926 size_t len = p - file; 891 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 892 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 893 memcpy (f, file, len);
929 f[len] = '\0'; 894 f[len] = '\0';
930 file = f; 895 file = f;
931 } 896 }
932 897
933# ifdef HAVE_AFTERIMAGE 898# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 899 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 900 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 901 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 902 if (image)
938 { 903 {
939 if (original_asim) 904 if (original_asim)
940 safe_asimage_destroy (original_asim); 905 safe_asimage_destroy (original_asim);
941 original_asim = image; 906 original_asim = image;
907 flags |= CLIENT_RENDER;
942 have_image = true; 908 have_image = true;
943 return true; 909 return true;
944 } 910 }
945# endif 911# endif
946 912
947# ifdef HAVE_PIXBUF 913# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 914 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 915 if (image)
950 { 916 {
951 if (pixbuf) 917 if (pixbuf)
952 g_object_unref (pixbuf); 918 g_object_unref (pixbuf);
953 pixbuf = image; 919 pixbuf = image;
954 have_image = true; 920 have_image = true;
955 return true; 921 return true;
956 } 922 }
957# endif 923# endif
958 }
959 924
960 return false; 925 return false;
961} 926}
962 927
963# endif /* BG_IMAGE_FROM_FILE */ 928# endif /* BG_IMAGE_FROM_FILE */
… …
976} 941}
977 942
978bool 943bool
979bgPixmap_t::set_blur_radius (const char *geom) 944bgPixmap_t::set_blur_radius (const char *geom)
980{ 945{
981 int changed = 0; 946 bool changed = false;
982 unsigned int hr, vr; 947 unsigned int hr, vr;
983 int junk; 948 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 949 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 950
986 if (!(geom_flags & WidthValue)) 951 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 956 min_it (hr, 128);
992 min_it (vr, 128); 957 min_it (vr, 128);
993 958
994 if (h_blurRadius != hr) 959 if (h_blurRadius != hr)
995 { 960 {
996 ++changed; 961 changed = true;
997 h_blurRadius = hr; 962 h_blurRadius = hr;
998 } 963 }
999 964
1000 if (v_blurRadius != vr) 965 if (v_blurRadius != vr)
1001 { 966 {
1002 ++changed; 967 changed = true;
1003 v_blurRadius = vr; 968 v_blurRadius = vr;
1004 } 969 }
1005 970
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 971 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 972 flags &= ~blurNeeded;
1008 else 973 else
1009 flags |= blurNeeded; 974 flags |= blurNeeded;
1010 975
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
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); 976 return changed;
1024} 977}
1025 978
1026static inline unsigned long 979static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 980compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 981{
… …
1031 bool has_shade = shade != 100; 984 bool has_shade = shade != 100;
1032 985
1033 if (tint) 986 if (tint)
1034 { 987 {
1035 tint->get (c); 988 tint->get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 989 if (!has_shade
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 990 && (c.r <= 0x00ff || c.r >= 0xff00)
1038 && IS_COMPONENT_WHOLESOME (c.g) 991 && (c.g <= 0x00ff || c.g >= 0xff00)
1039 && IS_COMPONENT_WHOLESOME (c.b)) 992 && (c.b <= 0x00ff || c.b >= 0xff00))
1040 flags |= bgPixmap_t::tintWholesome; 993 flags |= bgPixmap_t::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME
1042 } 994 }
1043 995
1044 if (has_shade) 996 if (has_shade || tint)
1045 flags |= bgPixmap_t::tintNeeded; 997 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 XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066 998
1067 return flags; 999 return flags;
1068} 1000}
1069 1001
1070bool 1002bool
… …
1080 1012
1081 return false; 1013 return false;
1082} 1014}
1083 1015
1084bool 1016bool
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;
1093 }
1094
1095 return false;
1096}
1097
1098bool
1099bgPixmap_t::set_shade (const char *shade_str) 1017bgPixmap_t::set_shade (const char *shade_str)
1100{ 1018{
1101 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1019 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1102 1020
1103 clamp_it (new_shade, -100, 200); 1021 clamp_it (new_shade, -100, 200);
… …
1106 1024
1107 if (new_shade != shade) 1025 if (new_shade != shade)
1108 { 1026 {
1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1027 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1110 shade = new_shade; 1028 shade = new_shade;
1111 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1029 flags = (flags & ~tintFlags) | new_flags;
1112 return true; 1030 return true;
1113 } 1031 }
1114 1032
1115 return false; 1033 return false;
1116} 1034}
1117 1035
1118#if XFT 1036#if XRENDER
1119static void 1037static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1038get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1039{
1122 double sigma = radius / 2.0; 1040 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1041 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1140 1058
1141bool 1059bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1060bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1061{
1144 bool ret = false; 1062 bool ret = false;
1145#if XFT 1063#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1064 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1065 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1066 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1067
1150 Display *dpy = target->dpy; 1068 Display *dpy = target->dpy;
… …
1227 XFreeGC (dpy, gc); 1145 XFreeGC (dpy, gc);
1228 } 1146 }
1229 } 1147 }
1230 else 1148 else
1231 { 1149 {
1232# if XFT 1150# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1151 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1152
1235 if (flags & tintSet) 1153 if (flags & tintSet)
1236 tint.get (c); 1154 tint.get (c);
1237 1155
… …
1241 c.g = (c.g * shade) / 100; 1159 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100; 1160 c.b = (c.b * shade) / 100;
1243 } 1161 }
1244 else 1162 else
1245 { 1163 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1164 c.r = (c.r * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1165 c.g = (c.g * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1166 c.b = (c.b * (200 - shade)) / 100;
1249 } 1167 }
1250 1168
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1169 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1170 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa; 1171 XRenderPictureAttributes pa;
… …
1267 1185
1268 if (mask_pic && overlay_pic && back_pic) 1186 if (mask_pic && overlay_pic && back_pic)
1269 { 1187 {
1270 XRenderColor mask_c; 1188 XRenderColor mask_c;
1271 1189
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1190 mask_c.red = mask_c.green = mask_c.blue = 0;
1273 mask_c.alpha = 0xffff; 1191 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1192 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1193
1276 mask_c.alpha = 0; 1194 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1195 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g; 1196 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b; 1197 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1198 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); 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
1282 ret = true; 1210 ret = true;
1283 } 1211 }
1284 1212
1285 XRenderFreePicture (dpy, mask_pic); 1213 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1214 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1215 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1216# endif
1292 } 1217 }
1293 1218
1294 return ret; 1219 return ret;
1295} 1220}
1296 1221
1297/* make_transparency_pixmap() 1222/* make_transparency_pixmap()
1298 * 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
1299 * 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
1300 * our window. 1225 * our window.
1301 */ 1226 */
1302unsigned long 1227unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1228bgPixmap_t::make_transparency_pixmap ()
1304{ 1229{
… …
1308 return 0; 1233 return 0;
1309 1234
1310 /* 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
1311 * be always up-to-date, so let's use it : 1236 * be always up-to-date, so let's use it :
1312 */ 1237 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1238 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1239 Display *dpy = target->dpy;
1240 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1241 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1242 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1243 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1244 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1245 int window_height = target->szHint.height;
1321 int sx, sy; 1246 int sx, sy;
1322 XGCValues gcv; 1247 XGCValues gcv;
1323 GC gc; 1248 GC gc;
1324 1249
1325 TIMING_TEST_START (tp); 1250 sx = target_x;
1326 target->get_window_origin (sx, sy); 1251 sy = target_y;
1327 1252
1328 /* 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 : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1254 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1255 || sx >= root_width || sy >= root_height)
1331 return 0; 1256 return 0;
1332 1257
1258 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1259 if (root_pixmap != None)
1334 { 1260 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1261 Window wdummy;
1336 int junk; 1262 int idummy;
1337 unsigned int ujunk; 1263 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1264
1339 target->allowedxerror = -1; 1265 target->allowedxerror = -1;
1340 1266
1341 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))
1342 root_pixmap = None; 1268 root_pixmap = None;
1343 1269
1344 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;
1345 } 1303 }
1346 1304
1347 if (root_pixmap == None) 1305 if (root_pixmap == None)
1348 return 0; 1306 return 0;
1349 1307
1350 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 }
1351 1318
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1319 if (pixmap == None)
1353 return 0; 1320 return 0;
1354 1321
1355 /* straightforward pixmap copy */ 1322 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap;
1357 gcv.fill_style = FillTiled;
1358
1359 while (sx < 0) sx += (int)root_width; 1323 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1324 while (sy < 0) sy += (int)root_height;
1361 1325
1326 gcv.tile = recoded_root_pmap;
1327 gcv.fill_style = FillTiled;
1362 gcv.ts_x_origin = -sx; 1328 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1329 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1330 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1331
1366 if (gc) 1332 if (gc)
1367 { 1333 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1334 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1335 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1336 XFreeGC (dpy, gc);
1371 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1337
1374 if (tiled_root_pmap != None) 1338 if (!(flags & CLIENT_RENDER))
1375 {
1376 if (!need_client_side_rendering ())
1377 {
1378 if (flags & (blurNeeded | blurServerSide))
1379 { 1339 {
1340 if ((flags & blurNeeded)
1341 && (flags & HAS_RENDER_CONV))
1342 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1343 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1344 result |= transpPmapBlurred;
1382 } 1345 }
1383 if (flags & (tintNeeded | tintServerSide)) 1346 if ((flags & tintNeeded)
1347 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1348 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1349 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1350 result |= transpPmapTinted;
1387 } 1351 }
1388 } /* server side rendering completed */ 1352 } /* server side rendering completed */
1389
1390 if (pixmap)
1391 XFreePixmap (dpy, pixmap);
1392
1393 pixmap = tiled_root_pmap;
1394 pmap_width = window_width;
1395 pmap_height = window_height;
1396 pmap_depth = root_depth;
1397 } 1353 }
1398 1354
1399 TIMING_TEST_PRINT_RESULT (tp); 1355 if (recoded_root_pmap != root_pixmap)
1356 XFreePixmap (dpy, recoded_root_pmap);
1400 1357
1401 return result; 1358 return result;
1402} 1359}
1403 1360
1404bool 1361void
1405bgPixmap_t::set_root_pixmap () 1362bgPixmap_t::set_root_pixmap ()
1406{ 1363{
1407 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]);
1408 if (new_root_pixmap == None) 1365 if (new_root_pixmap == None)
1409 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]);
1410 1367
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1368 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1369}
1419# endif /* ENABLE_TRANSPARENCY */ 1370# endif /* ENABLE_TRANSPARENCY */
1420 1371
1421# ifndef HAVE_AFTERIMAGE 1372#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static 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);
1423# endif 1374# endif
1424 1375
1425bool 1376bool
1426bgPixmap_t::render () 1377bgPixmap_t::render ()
1427{ 1378{
1428 unsigned long background_flags = 0; 1379 unsigned long background_flags = 0;
1429 1380
1430 if (target == NULL) 1381 if (target == NULL)
1431 return false; 1382 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1383
1435 invalidate (); 1384 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1385# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1386 if (flags & isTransparent)
1438 { 1387 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1388 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1389 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1390 if (background_flags == 0)
1442 return false; 1391 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1392 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1393 flags &= ~isInvalid;
1446 } 1394 }
1447# endif 1395# endif
1448 1396
1449# ifdef BG_IMAGE_FROM_FILE 1397# ifdef BG_IMAGE_FROM_FILE
1450 if (have_image 1398 if (have_image
1451 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1399 || (background_flags & transpTransformations) != (flags & transpTransformations))
1452 { 1400 {
1453 if (render_image (background_flags)) 1401 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1402 flags &= ~isInvalid;
1455 } 1403 }
1456# endif 1404# endif
1457 1405
1406# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1407 XImage *result = NULL;
1459 1408
1460 if (background_flags && (flags & isInvalid)) 1409 if (background_flags && (flags & isInvalid))
1461 { 1410 {
1462 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);
1463 } 1412 }
1464 1413
1465 if (result) 1414 if (result)
1466 { 1415 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1416 /* our own client-side tinting */
1469 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1470 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1417 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1418 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1419 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1420 if (flags & tintSet)
1475 tint.get (c); 1421 tint.get (c);
1476 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);
1477 } 1423 }
1478# endif
1479 1424
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1425 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1426
1482 if (gc) 1427 if (gc)
1483 { 1428 {
1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1485 {
1486 XFreePixmap (target->dpy, pixmap);
1487 pixmap = None;
1488 }
1489
1490 if (pixmap == None)
1491 {
1492 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1493 pmap_width = result->width;
1494 pmap_height = result->height;
1495 pmap_depth = target->depth;
1496 }
1497
1498 if (pmap_depth != result->depth)
1499 {
1500 /* Bad Match error will ensue ! stupid X !!!! */
1501 if (result->depth == 24 && pmap_depth == 32)
1502 result->depth = 32;
1503 else if (result->depth == 32 && pmap_depth == 24)
1504 result->depth = 24;
1505 else
1506 {
1507 /* TODO: implement image recoding */
1508 }
1509 }
1510
1511 if (pmap_depth == result->depth)
1512 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);
1513 1430
1514 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1432 flags &= ~isInvalid;
1516 } 1433 }
1517 1434
1518 XDestroyImage (result); 1435 XDestroyImage (result);
1519 } 1436 }
1437# endif
1520 1438
1521 if (flags & isInvalid) 1439 if (flags & isInvalid)
1522 { 1440 {
1523 if (pixmap != None) 1441 if (pixmap != None)
1524 { 1442 {
1525 XFreePixmap (target->dpy, pixmap); 1443 XFreePixmap (target->dpy, pixmap);
1526 pixmap = None; 1444 pixmap = None;
1527 } 1445 }
1528 } 1446 }
1529 1447
1530 apply (); 1448 target->scr_recolour (false);
1449 flags |= hasChanged;
1531 1450
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1451 valid_since = ev::now ();
1534 1452
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1453 return true;
1538} 1454}
1539 1455
1540bool 1456void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1457bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1458{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1459 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1460
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1461 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1462#if XRENDER
1463 int major, minor;
1464 if (XRenderQueryVersion (target->dpy, &major, &minor))
1465 flags |= HAS_RENDER;
1466 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1467 if (filters)
1468 {
1469 for (int i = 0; i < filters->nfilter; i++)
1470 if (!strcmp (filters->filter[i], FilterConvolution))
1471 flags |= HAS_RENDER_CONV;
1472
1473 XFree (filters);
1474 }
1549# endif 1475#endif
1550 return true;
1551 }
1552
1553 return false;
1554}
1555
1556void
1557bgPixmap_t::apply ()
1558{
1559 if (target)
1560 {
1561 flags &= ~isVtOrigin;
1562
1563 if (pixmap != None)
1564 {
1565 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent)
1568 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571
1572 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 }
1575 else
1576# endif
1577 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/
1580 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582 /* do we also need to set scrollbar's background here ? */
1583
1584 if (target->scrollBar.win)
1585 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1586 }
1587 }
1588 else
1589 {
1590 /* set target background to a pixel */
1591 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1593 /* do we also need to set scrollbar's background here ? */
1594 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 }
1597
1598 /* don't want Expose on the parent or vt. It is better to use
1599 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]);
1601
1602 if (target->scrollBar.state && target->scrollBar.win)
1603 {
1604 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0);
1606 }
1607
1608 target->want_refresh = 1;
1609 flags |= hasChanged;
1610 }
1611} 1476}
1612 1477
1613#endif /* HAVE_BG_PIXMAP */ 1478#endif /* HAVE_BG_PIXMAP */
1614 1479
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1480#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1481/* taken from aterm-0.4.2 */
1617 1482
1618typedef uint32_t RUINT32T;
1619
1620static void 1483static void
1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1484shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1622{ 1485{
1623 int sh_r, sh_g, sh_b; 1486 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1487 uint32_t mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1488 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1489 rgba low;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1490 rgba high;
1628 int i; 1491 int i;
1492 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1629 1493
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1494 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1631 1495
1632 /* for convenience */ 1496 /* for convenience */
1633 mask_r = visual->red_mask; 1497 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1498 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1499 mask_b = visual->blue_mask;
1636 1500
1637 /* boring lookup table pre-initialization */ 1501 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) 1502 switch (ximage->depth)
1639 { 1503 {
1640 case 15: 1504 case 15:
1641 if ((mask_r != 0x7c00) || 1505 if ((mask_r != 0x7c00) ||
1642 (mask_g != 0x03e0) || 1506 (mask_g != 0x03e0) ||
1643 (mask_b != 0x001f)) 1507 (mask_b != 0x001f))
1644 return; 1508 return;
1645 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1509 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1646 lookup_r = lookup; 1510 lookup_r = lookup;
1647 lookup_g = lookup+32; 1511 lookup_g = lookup+32;
1648 lookup_b = lookup+32+32; 1512 lookup_b = lookup+32+32;
1649 sh_r = 10; 1513 sh_r = 10;
1650 sh_g = 5; 1514 sh_g = 5;
… …
1653 case 16: 1517 case 16:
1654 if ((mask_r != 0xf800) || 1518 if ((mask_r != 0xf800) ||
1655 (mask_g != 0x07e0) || 1519 (mask_g != 0x07e0) ||
1656 (mask_b != 0x001f)) 1520 (mask_b != 0x001f))
1657 return; 1521 return;
1658 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1522 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1659 lookup_r = lookup; 1523 lookup_r = lookup;
1660 lookup_g = lookup+32; 1524 lookup_g = lookup+32;
1661 lookup_b = lookup+32+64; 1525 lookup_b = lookup+32+64;
1662 sh_r = 11; 1526 sh_r = 11;
1663 sh_g = 5; 1527 sh_g = 5;
… …
1666 case 24: 1530 case 24:
1667 if ((mask_r != 0xff0000) || 1531 if ((mask_r != 0xff0000) ||
1668 (mask_g != 0x00ff00) || 1532 (mask_g != 0x00ff00) ||
1669 (mask_b != 0x0000ff)) 1533 (mask_b != 0x0000ff))
1670 return; 1534 return;
1671 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1535 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1672 lookup_r = lookup; 1536 lookup_r = lookup;
1673 lookup_g = lookup+256; 1537 lookup_g = lookup+256;
1674 lookup_b = lookup+256+256; 1538 lookup_b = lookup+256+256;
1675 sh_r = 16; 1539 sh_r = 16;
1676 sh_g = 8; 1540 sh_g = 8;
… …
1679 case 32: 1543 case 32:
1680 if ((mask_r != 0xff0000) || 1544 if ((mask_r != 0xff0000) ||
1681 (mask_g != 0x00ff00) || 1545 (mask_g != 0x00ff00) ||
1682 (mask_b != 0x0000ff)) 1546 (mask_b != 0x0000ff))
1683 return; 1547 return;
1684 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1548 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1685 lookup_r = lookup; 1549 lookup_r = lookup;
1686 lookup_g = lookup+256; 1550 lookup_g = lookup+256;
1687 lookup_b = lookup+256+256; 1551 lookup_b = lookup+256+256;
1688 sh_r = 16; 1552 sh_r = 16;
1689 sh_g = 8; 1553 sh_g = 8;
… …
1696 /* prepare limits for color transformation (each channel is handled separately) */ 1560 /* prepare limits for color transformation (each channel is handled separately) */
1697 if (shade > 100) 1561 if (shade > 100)
1698 { 1562 {
1699 shade = 200 - shade; 1563 shade = 200 - shade;
1700 1564
1701 lower_lim_r = 65535-rm; 1565 high.r = c.r * shade / 100;
1702 lower_lim_g = 65535-gm; 1566 high.g = c.g * shade / 100;
1703 lower_lim_b = 65535-bm; 1567 high.b = c.b * shade / 100;
1704 1568
1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1569 low.r = 65535 * (100 - shade) / 100;
1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1570 low.g = 65535 * (100 - shade) / 100;
1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1571 low.b = 65535 * (100 - shade) / 100;
1708
1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710 } 1572 }
1711 else 1573 else
1712 { 1574 {
1575 high.r = c.r * shade / 100;
1576 high.g = c.g * shade / 100;
1577 high.b = c.b * shade / 100;
1713 1578
1714 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1579 low.r = low.g = low.b = 0;
1715
1716 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1717 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1718 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1719 }
1720
1721 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1722 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1723 {
1724 unsigned int tmp;
1725
1726 tmp = lower_lim_r;
1727 lower_lim_r = lower_lim_b;
1728 lower_lim_b = tmp;
1729
1730 tmp = upper_lim_r;
1731 upper_lim_r = upper_lim_b;
1732 upper_lim_b = tmp;
1733 } 1580 }
1734 1581
1735 /* fill our lookup tables */ 1582 /* fill our lookup tables */
1736 for (i = 0; i <= mask_r>>sh_r; i++) 1583 for (i = 0; i <= mask_r>>sh_r; i++)
1737 { 1584 {
1738 RUINT32T tmp; 1585 uint32_t tmp;
1739 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1586 tmp = i * high.r;
1740 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1587 tmp += (mask_r>>sh_r) * low.r;
1741 lookup_r[i] = (tmp/65535)<<sh_r; 1588 lookup_r[i] = (tmp/65535)<<sh_r;
1742 } 1589 }
1743 for (i = 0; i <= mask_g>>sh_g; i++) 1590 for (i = 0; i <= mask_g>>sh_g; i++)
1744 { 1591 {
1745 RUINT32T tmp; 1592 uint32_t tmp;
1746 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1593 tmp = i * high.g;
1747 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1594 tmp += (mask_g>>sh_g) * low.g;
1748 lookup_g[i] = (tmp/65535)<<sh_g; 1595 lookup_g[i] = (tmp/65535)<<sh_g;
1749 } 1596 }
1750 for (i = 0; i <= mask_b>>sh_b; i++) 1597 for (i = 0; i <= mask_b>>sh_b; i++)
1751 { 1598 {
1752 RUINT32T tmp; 1599 uint32_t tmp;
1753 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1600 tmp = i * high.b;
1754 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1601 tmp += (mask_b>>sh_b) * low.b;
1755 lookup_b[i] = (tmp/65535)<<sh_b; 1602 lookup_b[i] = (tmp/65535)<<sh_b;
1756 } 1603 }
1757 1604
1758 /* apply table to input image (replacing colors by newly calculated ones) */ 1605 /* apply table to input image (replacing colors by newly calculated ones) */
1759 switch (srcImage->bits_per_pixel) 1606 if (ximage->bits_per_pixel == 32
1607 && (ximage->depth == 24 || ximage->depth == 32)
1608 && ximage->byte_order == host_byte_order)
1760 { 1609 {
1761 case 15: 1610 uint32_t *p1, *pf, *p, *pl;
1762 { 1611 p1 = (uint32_t *) ximage->data;
1763 unsigned short *p1, *pf, *p, *pl;
1764 p1 = (unsigned short *) srcImage->data;
1765 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1612 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1613
1766 while (p1 < pf) 1614 while (p1 < pf)
1767 { 1615 {
1768 p = p1; 1616 p = p1;
1769 pl = p1 + srcImage->width; 1617 pl = p1 + ximage->width;
1770 for (; p < pl; p++) 1618 for (; p < pl; p++)
1771 {
1772 *p = lookup_r[(*p & 0x7c00)>>10] |
1773 lookup_g[(*p & 0x03e0)>> 5] |
1774 lookup_b[(*p & 0x001f)];
1775 }
1776 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1777 } 1619 {
1778 break;
1779 }
1780 case 16:
1781 {
1782 unsigned short *p1, *pf, *p, *pl;
1783 p1 = (unsigned short *) srcImage->data;
1784 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1785 while (p1 < pf)
1786 {
1787 p = p1;
1788 pl = p1 + srcImage->width;
1789 for (; p < pl; p++)
1790 {
1791 *p = lookup_r[(*p & 0xf800)>>11] |
1792 lookup_g[(*p & 0x07e0)>> 5] |
1793 lookup_b[(*p & 0x001f)];
1794 }
1795 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1796 }
1797 break;
1798 }
1799 case 24:
1800 {
1801 unsigned char *p1, *pf, *p, *pl;
1802 p1 = (unsigned char *) srcImage->data;
1803 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1804 while (p1 < pf)
1805 {
1806 p = p1;
1807 pl = p1 + srcImage->width * 3;
1808 for (; p < pl; p += 3)
1809 {
1810 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1811 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1812 p[2] = lookup_r[(p[2] & 0x0000ff)];
1813 }
1814 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1815 }
1816 break;
1817 }
1818 case 32:
1819 {
1820 RUINT32T *p1, *pf, *p, *pl;
1821 p1 = (RUINT32T *) srcImage->data;
1822 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1823
1824 while (p1 < pf)
1825 {
1826 p = p1;
1827 pl = p1 + srcImage->width;
1828 for (; p < pl; p++)
1829 {
1830 *p = lookup_r[(*p & 0xff0000)>>16] | 1620 *p = lookup_r[(*p & 0xff0000) >> 16] |
1831 lookup_g[(*p & 0x00ff00)>> 8] | 1621 lookup_g[(*p & 0x00ff00) >> 8] |
1832 lookup_b[(*p & 0x0000ff)] | 1622 lookup_b[(*p & 0x0000ff)] |
1833 (*p & ~0xffffff); 1623 (*p & 0xff000000);
1834 } 1624 }
1835 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1625 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1626 }
1627 }
1628 else
1629 {
1630 for (int y = 0; y < ximage->height; y++)
1631 for (int x = 0; x < ximage->width; x++)
1632 {
1633 unsigned long pixel = XGetPixel (ximage, x, y);
1634 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1635 lookup_g[(pixel & mask_g) >> sh_g] |
1636 lookup_b[(pixel & mask_b) >> sh_b];
1637 XPutPixel (ximage, x, y, pixel);
1836 } 1638 }
1837 break;
1838 }
1839 } 1639 }
1840 1640
1841 free (lookup); 1641 free (lookup);
1842} 1642}
1843#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1643#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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