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.80 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.123 by sf-exg, Tue Nov 23 08:37:37 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
23 24
24#include <cmath> 25#include <cmath>
25#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
27 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
28#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
29 38
30#if DO_TIMING_TEST 39#if DO_TIMING_TEST
31# include <sys/time.h> 40# include <sys/time.h>
32#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
57 * 66 *
58 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
59 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
60 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
61 * the image in the window. 70 * the image in the window.
62 * WxH+X Assumes Y == X
63 * WxH Assumes Y == X == 50 (centers the image)
64 * W+X+Y Assumes H == W
65 * W+X Assumes H == W and Y == X
66 * W Assumes H == W and Y == X == 50
67 *
68 * Adjusting position only :
69 * =+X+Y Set position to X% by Y% (absolute).
70 * =+X Set position to X% by X%.
71 * +X+Y Adjust position horizontally X% and vertically Y%
72 * from current position (relative).
73 * +X Adjust position horizontally X% and vertically X%
74 * from current position.
75 *
76 * Adjusting scale only :
77 * Wx0 Multiply horizontal scaling factor by W%
78 * 0xH Multiply vertical scaling factor by H%
79 * 0x0 No scaling (show image at normal size).
80 * 71 *
81 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
82 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
83 * the tile size and origin. 74 * the tile size and origin.
84 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
112#endif 103#endif
113 flags = 0; 104 flags = 0;
114 pixmap = None; 105 pixmap = None;
115 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
116 target = 0; 107 target = 0;
108 target_x = target_y = 0;
117} 109}
118 110
119void 111void
120bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
121{ 113{
… …
132 if (pixmap && target) 124 if (pixmap && target)
133 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
134} 126}
135 127
136bool 128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
140}
141
142bool
137bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
138{ 144{
139# ifdef ENABLE_TRANSPARENCY 145# ifdef ENABLE_TRANSPARENCY
140 if (flags & isTransparent) 146 if (flags & isTransparent)
141 return true; 147 return true;
… …
167 return true; 173 return true;
168 } 174 }
169# endif 175# endif
170 176
171 return false; 177 return false;
172}; 178}
173 179
174bool bgPixmap_t::need_client_side_rendering () 180bool bgPixmap_t::need_client_side_rendering ()
175{ 181{
176# ifdef HAVE_AFTERIMAGE 182# ifdef HAVE_AFTERIMAGE
177 if (original_asim) 183 if (original_asim)
178 return true; 184 return true;
179# endif
180# ifdef ENABLE_TRANSPARENCY
181 if (flags & isTransparent)
182 {
183# ifdef HAVE_AFTERIMAGE
184 if ((flags & blurNeeded) && !(flags & blurServerSide))
185 return true;
186# endif
187 if ((flags & tintNeeded) && !(flags & tintServerSide))
188 return true;
189 }
190# endif 185# endif
191 return false; 186 return false;
192} 187}
193 188
194# ifdef BG_IMAGE_FROM_FILE 189# ifdef BG_IMAGE_FROM_FILE
… …
232 int diff = window_size - image_size; 227 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 228 int smaller = min (image_size, window_size);
234 229
235 if (align >= 0 && align <= 100) 230 if (align >= 0 && align <= 100)
236 return diff * align / 100; 231 return diff * align / 100;
237 else if (align > 100 && align <= 200 ) 232 else if (align > 100 && align <= 200)
238 return ((align - 100) * smaller / 100) + window_size - smaller; 233 return ((align - 100) * smaller / 100) + window_size - smaller;
239 else if (align >= -100 && align < 0) 234 else if (align >= -100 && align < 0)
240 return ((align + 100) * smaller / 100) - image_size; 235 return ((align + 100) * smaller / 100) - image_size;
241 return 0; 236 return 0;
242} 237}
… …
258 dst_size = target_size - dst_pos; 253 dst_size = target_size - dst_pos;
259 return src_pos; 254 return src_pos;
260} 255}
261 256
262bool 257bool
263bgPixmap_t::set_geometry (const char *geom) 258bgPixmap_t::set_geometry (const char *geom, bool update)
264{ 259{
260 bool changed = false;
265 int geom_flags = 0, changed = 0; 261 int geom_flags = 0;
266 int x = 0, y = 0; 262 int x = 0, y = 0;
267 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
268 unsigned int n; 264 unsigned int n;
269 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
270 const char *p; 266 const char *ops;
271# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
272 268
273 if (geom == NULL) 269 if (geom == NULL)
274 return false; 270 return false;
275 271
276 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
277 273
278 while (isspace(*geom)) ++geom;
279 if ((p = strchr (geom, ';')) == NULL)
280 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
281 275 if (ops == NULL)
276 n = strlen (geom);
277 else
282 n = (p - geom); 278 n = ops - geom;
279
283 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
284 { 281 return false;
285 char *ops;
286 new_flags |= geometrySet;
287 282
288 memcpy (str, geom, n); 283 memcpy (str, geom, n);
289 str[n] = '\0'; 284 str[n] = '\0';
290 if (str[0] == ':') 285 rxvt_strtrim (str);
291 ops = &str[0];
292 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
293 ops = &str[0];
294 else
295 {
296 char *tmp;
297 ops = strchr (str, ':');
298 if (ops != NULL)
299 {
300 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
301 *(++tmp) = '\0';
302 if (ops == tmp) ++ops;
303 }
304 }
305 286
306 if (ops > str || ops == NULL) 287 if (str[0])
307 { 288 {
308 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
309 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
310
311 if ((geom_flags & XValue) && !(geom_flags & YValue))
312 {
313 y = x;
314 geom_flags |= YValue;
315 }
316
317 if (flags & geometrySet)
318 {
319 /* new geometry is an adjustment to the old one ! */
320 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
321 {
322 if (w == 0 && h != 0)
323 {
324 w = h_scale;
325 h = (v_scale * h) / 100;
326 }
327 else if (h == 0 && w != 0)
328 {
329 w = (h_scale * w) / 100;
330 h = v_scale;
331 }
332 }
333 if (geom_flags & XValue)
334 {
335 if (str[0] != '=')
336 {
337 y += v_align;
338 x += h_align;
339 }
340 }
341 }
342 else /* setting up geometry from scratch */
343 {
344 if (!(geom_flags & XValue))
345 {
346 /* use default geometry - centered */
347 x = y = defaultAlign;
348 }
349 else if (!(geom_flags & YValue))
350 y = x;
351
352 if ((geom_flags & (WidthValue|HeightValue)) == 0)
353 {
354 /* use default geometry - scaled */
355 w = h = defaultScale;
356 }
357 else if (geom_flags & WidthValue)
358 {
359 if (!(geom_flags & HeightValue))
360 h = w;
361 }
362 else
363 w = h;
364 }
365 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
366 else if (!(flags & geometrySet)) 292
367 { 293 if (!update)
368 /* default geometry - scaled and centered */ 294 {
295 if (!(geom_flags & XValue))
369 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
370 w = h = defaultScale; 301 w = h = defaultScale;
371 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
372 306
373 if (!(flags & geometrySet))
374 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
375 309
376 if (ops) 310 if (ops)
377 { 311 {
378 while (*ops) 312 while (*ops)
379 { 313 {
380 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
381 315
382# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
383 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
384 { 318 {
385 w = h = noScale; 319 w = h = noScale;
386 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
387 } 321 }
388 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
389 { 323 {
390 new_flags |= propScale; 324 new_flags |= propScale;
391 } 325 }
392 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
393 { 327 {
394 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
395 329
396 h = noScale; 330 h = noScale;
397 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
398 } 332 }
399 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
400 { 334 {
401 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
402 336
403 w = noScale; 337 w = noScale;
404 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
405 } 339 }
406 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
407 { 341 {
408 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
409 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
410 344
411 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
412 } 346 }
413 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
414 { 348 {
415 w = h = windowScale; 349 w = h = windowScale;
416 x = y = centerAlign; 350 x = y = centerAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 352 }
419 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
420 { 354 {
421 new_flags |= rootAlign; 355 new_flags |= rootAlign;
422 w = h = noScale; 356 w = h = noScale;
423 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
424 } 358 }
425# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
426 360
427 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 362 } /* done parsing ops */
429 } 363 }
430 364
431 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
432 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
433 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
434 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
435 }
436 369
437 if (new_flags != flags) 370 if (new_flags != flags)
438 { 371 {
439 flags = new_flags; 372 flags = new_flags;
440 changed++; 373 changed = true;
441 } 374 }
442 375
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align);
445 return (changed > 0); 376 return changed;
446} 377}
447 378
448void 379void
449bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 380bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
450{ 381{
… …
467 if (!w) w = image_width; 398 if (!w) w = image_width;
468 if (!h) h = image_height; 399 if (!h) h = image_height;
469 400
470 if (flags & rootAlign) 401 if (flags & rootAlign)
471 { 402 {
472 target->get_window_origin (x, y);
473 x = -x; 403 x = -target_x;
474 y = -y; 404 y = -target_y;
475 } 405 }
476 else 406 else
477 { 407 {
478 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
480 } 410 }
481 411
482 flags &= ~sizeSensitive; 412 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 413 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 414 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 415 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 416 flags |= sizeSensitive;
487} 417}
488 418
489# ifdef HAVE_AFTERIMAGE 419# ifdef HAVE_AFTERIMAGE
… …
539 469
540 int x = 0; 470 int x = 0;
541 int y = 0; 471 int y = 0;
542 int w = 0; 472 int w = 0;
543 int h = 0; 473 int h = 0;
544
545 TIMING_TEST_START (asim);
546 474
547 if (original_asim) 475 if (original_asim)
548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 476 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
549 477
550 if (!original_asim 478 if (!original_asim
… …
667 } 595 }
668 596
669 free (layers); 597 free (layers);
670 } 598 }
671 } 599 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 600
674 bool ret = false; 601 bool ret = false;
675 602
676 if (result) 603 if (result)
677 { 604 {
678 XGCValues gcv; 605 XGCValues gcv;
679 GC gc; 606 GC gc;
680 607
681 if (pixmap)
682 {
683 if (pmap_width != new_pmap_width
684 || pmap_height != new_pmap_height
685 || pmap_depth != target->depth)
686 {
687 XFreePixmap (target->dpy, pixmap);
688 pixmap = None;
689 }
690 }
691
692 /* create Pixmap */ 608 /* create Pixmap */
693 if (pixmap == None) 609 if (pixmap == None
610 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height
612 || pmap_depth != target->depth)
694 { 613 {
614 if (pixmap)
615 XFreePixmap (target->dpy, pixmap);
695 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 616 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
696 pmap_width = new_pmap_width; 617 pmap_width = new_pmap_width;
697 pmap_height = new_pmap_height; 618 pmap_height = new_pmap_height;
698 pmap_depth = target->depth; 619 pmap_depth = target->depth;
699 } 620 }
… …
723 644
724 if (result != background && result != original_asim) 645 if (result != background && result != original_asim)
725 destroy_asimage (&result); 646 destroy_asimage (&result);
726 647
727 XFreeGC (target->dpy, gc); 648 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 649
730 ret = true; 650 ret = true;
731 } 651 }
732 652
733 if (background) 653 if (background)
… …
745 return false; 665 return false;
746 666
747 if (!pixbuf) 667 if (!pixbuf)
748 return false; 668 return false;
749 669
750#if !XFT
751 if (background_flags) 670 if (background_flags
671 && !(flags & HAS_RENDER))
752 return false; 672 return false;
753#endif
754 673
755 GdkPixbuf *result; 674 GdkPixbuf *result;
756 675
757 int image_width = gdk_pixbuf_get_width (pixbuf); 676 int image_width = gdk_pixbuf_get_width (pixbuf);
758 int image_height = gdk_pixbuf_get_height (pixbuf); 677 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
809 new_pmap_width = min (image_width, target_width); 728 new_pmap_width = min (image_width, target_width);
810 new_pmap_height = min (image_height, target_height); 729 new_pmap_height = min (image_height, target_height);
811 } 730 }
812 } 731 }
813 732
814 if (pixmap)
815 {
816 if (pmap_width != new_pmap_width
817 || pmap_height != new_pmap_height
818 || pmap_depth != target->depth)
819 {
820 XFreePixmap (target->dpy, pixmap);
821 pixmap = None;
822 }
823 }
824
825 if (pixmap == None) 733 if (pixmap == None
734 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height
736 || pmap_depth != target->depth)
826 { 737 {
738 if (pixmap)
739 XFreePixmap (target->dpy, pixmap);
827 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 740 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
828 pmap_width = new_pmap_width; 741 pmap_width = new_pmap_width;
829 pmap_height = new_pmap_height; 742 pmap_height = new_pmap_height;
830 pmap_depth = target->depth; 743 pmap_depth = target->depth;
831 } 744 }
… …
872 dst_width, dst_height, 785 dst_width, dst_height,
873 XLIB_RGB_DITHER_NONE, 786 XLIB_RGB_DITHER_NONE,
874 0, 0); 787 0, 0);
875 } 788 }
876 789
877#if XFT 790#if XRENDER
878 if (background_flags) 791 if (background_flags)
879 { 792 {
880 Display *dpy = target->dpy; 793 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa; 794 XRenderPictureAttributes pa;
882 795
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 796 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 797 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885 798
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 799 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 800 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888 801
… …
925# endif /* HAVE_PIXBUF */ 838# endif /* HAVE_PIXBUF */
926 839
927bool 840bool
928bgPixmap_t::set_file (const char *file) 841bgPixmap_t::set_file (const char *file)
929{ 842{
930 assert (file); 843 if (!file || !*file)
844 return false;
931 845
932 if (*file)
933 {
934 if (const char *p = strchr (file, ';')) 846 if (const char *p = strchr (file, ';'))
935 { 847 {
936 size_t len = p - file; 848 size_t len = p - file;
937 char *f = rxvt_temp_buf<char> (len + 1); 849 char *f = rxvt_temp_buf<char> (len + 1);
938 memcpy (f, file, len); 850 memcpy (f, file, len);
939 f[len] = '\0'; 851 f[len] = '\0';
940 file = f; 852 file = f;
941 } 853 }
942 854
943# ifdef HAVE_AFTERIMAGE 855# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 856 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 857 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 858 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
859 if (image)
860 {
947 if (original_asim) 861 if (original_asim)
862 safe_asimage_destroy (original_asim);
863 original_asim = image;
948 have_image = true; 864 have_image = true;
949 return have_image; 865 return true;
866 }
950# endif 867# endif
951 868
952# ifdef HAVE_PIXBUF 869# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 870 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
871 if (image)
872 {
954 if (pixbuf) 873 if (pixbuf)
874 g_object_unref (pixbuf);
875 pixbuf = image;
955 have_image = true; 876 have_image = true;
956 return have_image; 877 return true;
878 }
957# endif 879# endif
958 }
959 880
960 return false; 881 return false;
961} 882}
962 883
963# endif /* BG_IMAGE_FROM_FILE */ 884# endif /* BG_IMAGE_FROM_FILE */
… …
976} 897}
977 898
978bool 899bool
979bgPixmap_t::set_blur_radius (const char *geom) 900bgPixmap_t::set_blur_radius (const char *geom)
980{ 901{
981 int changed = 0; 902 bool changed = false;
982 unsigned int hr, vr; 903 unsigned int hr, vr;
983 int junk; 904 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 905 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 906
986 if (!(geom_flags & WidthValue)) 907 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 912 min_it (hr, 128);
992 min_it (vr, 128); 913 min_it (vr, 128);
993 914
994 if (h_blurRadius != hr) 915 if (h_blurRadius != hr)
995 { 916 {
996 ++changed; 917 changed = true;
997 h_blurRadius = hr; 918 h_blurRadius = hr;
998 } 919 }
999 920
1000 if (v_blurRadius != vr) 921 if (v_blurRadius != vr)
1001 { 922 {
1002 ++changed; 923 changed = true;
1003 v_blurRadius = vr; 924 v_blurRadius = vr;
1004 } 925 }
1005 926
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 927 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 928 flags &= ~blurNeeded;
1008 else 929 else
1009 flags |= blurNeeded; 930 flags |= blurNeeded;
1010 931
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); 932 return changed;
1024} 933}
1025 934
1026static inline unsigned long 935static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 936compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 937{
… …
1032 941
1033 if (tint) 942 if (tint)
1034 { 943 {
1035 tint->get (c); 944 tint->get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
946 if (!has_shade
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
1038 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
1039 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
1040 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
1042 } 952 }
1043 953
1044 if (has_shade) 954 if (has_shade || tint)
1045 flags |= bgPixmap_t::tintNeeded; 955 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 956
1067 return flags; 957 return flags;
1068} 958}
1069 959
1070bool 960bool
… …
1113 } 1003 }
1114 1004
1115 return false; 1005 return false;
1116} 1006}
1117 1007
1008#if XRENDER
1118static void 1009static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1010get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1011{
1121 double sigma = radius / 2.0; 1012 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1013 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1014 double sum = 0.0;
1124 1015
1125 for (int i = 0; i < width; i++) 1016 for (int i = 0; i < width; i++)
1126 { 1017 {
1127 double x = i - width / 2; 1018 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1019 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1020 sum += kernel[i];
1130 } 1021 }
1131 1022
1132 params[0] = XDoubleToFixed (width); 1023 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1024 params[1] = XDoubleToFixed (1);
1134 1025
1135 for (int i = 0; i < width; i++) 1026 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1027 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1028}
1029#endif
1138 1030
1139bool 1031bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1032bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1033{
1142 bool ret = false; 1034 bool ret = false;
1143#if XFT 1035#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1036 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1037 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1038 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1039
1148 Display *dpy = target->dpy; 1040 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1041 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1042 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1043
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1044 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1045 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1046
1155 if (kernel && params && src && dst) 1047 if (kernel && params && src && dst)
… …
1225 XFreeGC (dpy, gc); 1117 XFreeGC (dpy, gc);
1226 } 1118 }
1227 } 1119 }
1228 else 1120 else
1229 { 1121 {
1230# if XFT 1122# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1123 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232 1124
1233 if (flags & tintSet) 1125 if (flags & tintSet)
1234 tint.get (c); 1126 tint.get (c);
1235 1127
… …
1265 1157
1266 if (mask_pic && overlay_pic && back_pic) 1158 if (mask_pic && overlay_pic && back_pic)
1267 { 1159 {
1268 XRenderColor mask_c; 1160 XRenderColor mask_c;
1269 1161
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1162 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1271 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273 1165
1274 mask_c.alpha = 0; 1166 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r; 1167 mask_c.red = 0xffff - c.r;
… …
1281 } 1173 }
1282 1174
1283 XRenderFreePicture (dpy, mask_pic); 1175 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1176 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1177 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1178# endif
1290 } 1179 }
1291 1180
1292 return ret; 1181 return ret;
1293} 1182}
1294 1183
1295/* make_transparency_pixmap() 1184/* make_transparency_pixmap()
1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1185 * Builds a pixmap of the same size as the terminal window that contains
1297 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1186 * the tiled portion of the root pixmap that is supposed to be covered by
1298 * our window. 1187 * our window.
1299 */ 1188 */
1300unsigned long 1189unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1190bgPixmap_t::make_transparency_pixmap ()
1302{ 1191{
… …
1306 return 0; 1195 return 0;
1307 1196
1308 /* root dimensions may change from call to call - but Display structure should 1197 /* root dimensions may change from call to call - but Display structure should
1309 * be always up-to-date, so let's use it : 1198 * be always up-to-date, so let's use it :
1310 */ 1199 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1200 int screen = target->display->screen;
1313 Display *dpy = target->dpy; 1201 Display *dpy = target->dpy;
1202 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1203 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1204 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1205 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1206 int window_width = target->szHint.width;
1318 int window_height = target->szHint.height; 1207 int window_height = target->szHint.height;
1319 int sx, sy; 1208 int sx, sy;
1320 XGCValues gcv; 1209 XGCValues gcv;
1210 GC gc;
1321 1211
1322 TIMING_TEST_START (tp); 1212 sx = target_x;
1323 target->get_window_origin (sx, sy); 1213 sy = target_y;
1324 1214
1325 /* check if we are outside of the visible part of the virtual screen : */ 1215 /* check if we are outside of the visible part of the virtual screen : */
1326 if (sx + window_width <= 0 || sy + window_height <= 0 1216 if (sx + window_width <= 0 || sy + window_height <= 0
1327 || sx >= root_width || sy >= root_height) 1217 || sx >= root_width || sy >= root_height)
1328 return 0; 1218 return 0;
1329 1219
1220 // validate root pixmap and get its size
1330 if (root_pixmap != None) 1221 if (root_pixmap != None)
1331 { 1222 {
1332 /* we want to validate the pixmap and get its size at the same time : */ 1223 Window wdummy;
1333 int junk; 1224 int idummy;
1334 unsigned int ujunk; 1225 unsigned int udummy;
1335 /* root pixmap may be bad - allow a error */ 1226
1336 target->allowedxerror = -1; 1227 target->allowedxerror = -1;
1337 1228
1338 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1229 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1339 root_pixmap = None; 1230 root_pixmap = None;
1340 1231
1341 target->allowedxerror = 0; 1232 target->allowedxerror = 0;
1342 } 1233 }
1343 1234
1235 Pixmap recoded_root_pmap = root_pixmap;
1236
1237 if (root_pixmap != None && root_depth != target->depth)
1238 {
1239#if XRENDER
1240 if (flags & HAS_RENDER)
1241 {
1242 XRenderPictureAttributes pa;
1243
1244 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1245 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1246
1247 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1248 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1249 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1250
1251 if (src && dst)
1252 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1253 else
1254 {
1255 XFreePixmap (dpy, recoded_root_pmap);
1256 root_pixmap = None;
1257 }
1258
1259 XRenderFreePicture (dpy, src);
1260 XRenderFreePicture (dpy, dst);
1261 }
1262 else
1263#endif
1264 root_pixmap = None;
1265 }
1266
1267 if (root_pixmap == None)
1268 return 0;
1269
1344 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1270 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1345 GC gc = NULL;
1346 1271
1347 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1272 if (tiled_root_pmap == None) /* something really bad happened - abort */
1348 return 0; 1273 return 0;
1349 1274
1350 if (root_pixmap == None)
1351 {
1352 /* use tricks to obtain the root background image :*/
1353 /* we want to create Overrideredirect window overlapping out window
1354 with background type of Parent Relative and then grab it */
1355 XSetWindowAttributes attr;
1356 Window src;
1357 bool success = false;
1358
1359 attr.background_pixmap = ParentRelative;
1360 attr.backing_store = Always;
1361 attr.event_mask = ExposureMask;
1362 attr.override_redirect = True;
1363 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1364 CopyFromParent, CopyFromParent, CopyFromParent,
1365 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1366 &attr);
1367
1368 if (src != None)
1369 {
1370 XEvent event;
1371 int ev_count = 0;
1372 XGrabServer (dpy);
1373 XMapRaised (dpy, src);
1374 XSync (dpy, False);
1375
1376 /* XSync should get window where it's properly exposed,
1377 * but to be on the safe side - let's check for the actual event to arrive : */
1378 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1379 ++ev_count;
1380
1381 if (ev_count > 0);
1382 {
1383 /* hooray! - we can grab the image! */
1384 gc = XCreateGC (dpy, root, 0, NULL);
1385 if (gc)
1386 {
1387 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1388 success = true;
1389 }
1390 }
1391
1392 XDestroyWindow (dpy, src);
1393 XUngrabServer (dpy);
1394 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1395 }
1396
1397 if (!success)
1398 {
1399 XFreePixmap (dpy, tiled_root_pmap);
1400 tiled_root_pmap = None;
1401 }
1402 else
1403 result |= transpPmapTiled;
1404 }
1405 else
1406 {
1407 /* straightforward pixmap copy */ 1275 /* straightforward pixmap copy */
1408 gcv.tile = root_pixmap;
1409 gcv.fill_style = FillTiled;
1410
1411 while (sx < 0) sx += (int)root_width; 1276 while (sx < 0) sx += (int)root_width;
1412 while (sy < 0) sy += (int)root_height; 1277 while (sy < 0) sy += (int)root_height;
1413 1278
1279 gcv.tile = recoded_root_pmap;
1280 gcv.fill_style = FillTiled;
1414 gcv.ts_x_origin = -sx; 1281 gcv.ts_x_origin = -sx;
1415 gcv.ts_y_origin = -sy; 1282 gcv.ts_y_origin = -sy;
1416 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1283 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1417 1284
1418 if (gc) 1285 if (gc)
1419 { 1286 {
1420 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1287 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1421 result |= transpPmapTiled; 1288 result |= transpPmapTiled;
1422 } 1289 XFreeGC (dpy, gc);
1423 }
1424 TIMING_TEST_PRINT_RESULT (tp);
1425 1290
1426 if (tiled_root_pmap != None)
1427 {
1428 if (!need_client_side_rendering ()) 1291 if (!need_client_side_rendering ())
1429 { 1292 {
1430 if ((flags & blurNeeded)) 1293 if ((flags & blurNeeded)
1294 && (flags & HAS_RENDER_CONV))
1431 { 1295 {
1432 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1296 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1433 result |= transpPmapBlurred; 1297 result |= transpPmapBlurred;
1434 } 1298 }
1435 if ((flags & tintNeeded)) 1299 if ((flags & tintNeeded)
1300 && (flags & (tintWholesome | HAS_RENDER)))
1436 { 1301 {
1437 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1302 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1438 result |= transpPmapTinted; 1303 result |= transpPmapTinted;
1439 } 1304 }
1440 } /* server side rendering completed */ 1305 } /* server side rendering completed */
1441 1306
1442 if (pixmap) 1307 if (pixmap)
1443 XFreePixmap (dpy, pixmap); 1308 XFreePixmap (dpy, pixmap);
1444 1309
1445 pixmap = tiled_root_pmap; 1310 pixmap = tiled_root_pmap;
1446 pmap_width = window_width; 1311 pmap_width = window_width;
1447 pmap_height = window_height; 1312 pmap_height = window_height;
1448 pmap_depth = root_depth; 1313 pmap_depth = target->depth;
1449 } 1314 }
1315 else
1316 XFreePixmap (dpy, tiled_root_pmap);
1450 1317
1451 if (gc) 1318 if (recoded_root_pmap != root_pixmap)
1452 XFreeGC (dpy, gc); 1319 XFreePixmap (dpy, recoded_root_pmap);
1453
1454 TIMING_TEST_PRINT_RESULT (tp);
1455 1320
1456 return result; 1321 return result;
1457} 1322}
1458 1323
1459bool 1324void
1460bgPixmap_t::set_root_pixmap () 1325bgPixmap_t::set_root_pixmap ()
1461{ 1326{
1462 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1327 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1463 if (new_root_pixmap == None) 1328 if (new_root_pixmap == None)
1464 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1329 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1465 1330
1466 if (new_root_pixmap != root_pixmap)
1467 {
1468 root_pixmap = new_root_pixmap; 1331 root_pixmap = new_root_pixmap;
1469 return true;
1470 }
1471
1472 return false;
1473} 1332}
1474# endif /* ENABLE_TRANSPARENCY */ 1333# endif /* ENABLE_TRANSPARENCY */
1475 1334
1476# ifndef HAVE_AFTERIMAGE 1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1477static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1336static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1478# endif 1337# endif
1479 1338
1480bool 1339bool
1481bgPixmap_t::render () 1340bgPixmap_t::render ()
1482{ 1341{
1483 unsigned long background_flags = 0; 1342 unsigned long background_flags = 0;
1484 1343
1485 if (target == NULL) 1344 if (target == NULL)
1486 return false; 1345 return false;
1487
1488 TIMING_TEST_START (tp);
1489 1346
1490 invalidate (); 1347 invalidate ();
1491# ifdef ENABLE_TRANSPARENCY 1348# ifdef ENABLE_TRANSPARENCY
1492 if (flags & isTransparent) 1349 if (flags & isTransparent)
1493 { 1350 {
1494 /* we need to re-generate transparency pixmap in that case ! */ 1351 /* we need to re-generate transparency pixmap in that case ! */
1495 background_flags = make_transparency_pixmap (); 1352 background_flags = make_transparency_pixmap ();
1496 if (background_flags == 0) 1353 if (background_flags == 0)
1497 return false; 1354 return false;
1498 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1355 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1499 && pmap_depth == target->depth)
1500 flags = flags & ~isInvalid; 1356 flags &= ~isInvalid;
1501 } 1357 }
1502# endif 1358# endif
1503 1359
1504# ifdef BG_IMAGE_FROM_FILE 1360# ifdef BG_IMAGE_FROM_FILE
1505 if (have_image 1361 if (have_image
1506 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1362 || (background_flags & transpTransformations) != (flags & transpTransformations))
1507 { 1363 {
1508 if (render_image (background_flags)) 1364 if (render_image (background_flags))
1509 flags = flags & ~isInvalid; 1365 flags &= ~isInvalid;
1510 } 1366 }
1511# endif 1367# endif
1512 1368
1369# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1513 XImage *result = NULL; 1370 XImage *result = NULL;
1514 1371
1515 if (background_flags && (flags & isInvalid)) 1372 if (background_flags && (flags & isInvalid))
1516 { 1373 {
1517 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1374 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1518 } 1375 }
1519 1376
1520 if (result) 1377 if (result)
1521 { 1378 {
1522# if !defined(HAVE_AFTERIMAGE) && !XFT
1523 /* our own client-side tinting */ 1379 /* our own client-side tinting */
1524 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1525 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1526 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1380 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1527 { 1381 {
1528 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1529 if (flags & tintSet) 1383 if (flags & tintSet)
1530 tint.get (c); 1384 tint.get (c);
1531 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1385 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1532 } 1386 }
1533# endif
1534 1387
1535 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1388 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1536 1389
1537 if (gc) 1390 if (gc)
1538 { 1391 {
1539 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1540 {
1541 XFreePixmap (target->dpy, pixmap);
1542 pixmap = None;
1543 }
1544
1545 if (pixmap == None)
1546 {
1547 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1548 pmap_width = result->width;
1549 pmap_height = result->height;
1550 pmap_depth = target->depth;
1551 }
1552
1553 if (pmap_depth != result->depth)
1554 {
1555 /* Bad Match error will ensue ! stupid X !!!! */
1556 if (result->depth == 24 && pmap_depth == 32)
1557 result->depth = 32;
1558 else if (result->depth == 32 && pmap_depth == 24)
1559 result->depth = 24;
1560 else
1561 {
1562 /* TODO: implement image recoding */
1563 }
1564 }
1565
1566 if (pmap_depth == result->depth)
1567 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1392 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1568 1393
1569 XFreeGC (target->dpy, gc); 1394 XFreeGC (target->dpy, gc);
1570 flags = flags & ~isInvalid; 1395 flags &= ~isInvalid;
1571 } 1396 }
1572 1397
1573 XDestroyImage (result); 1398 XDestroyImage (result);
1574 } 1399 }
1400# endif
1575 1401
1576 if (flags & isInvalid) 1402 if (flags & isInvalid)
1577 { 1403 {
1578 if (pixmap != None) 1404 if (pixmap != None)
1579 { 1405 {
… …
1582 } 1408 }
1583 } 1409 }
1584 1410
1585 apply (); 1411 apply ();
1586 1412
1587 XSync (target->dpy, False);
1588 valid_since = ev::now (); 1413 valid_since = ev::now ();
1589 1414
1590 TIMING_TEST_PRINT_RESULT (tp);
1591
1592 return true; 1415 return true;
1593} 1416}
1594 1417
1595bool 1418void
1596bgPixmap_t::set_target (rxvt_term *new_target) 1419bgPixmap_t::set_target (rxvt_term *new_target)
1597{ 1420{
1598 if (new_target)
1599 if (target != new_target)
1600 {
1601 target = new_target; 1421 target = new_target;
1602# ifdef ENABLE_TRANSPARENCY 1422
1603 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1423 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1424#if XRENDER
1425 int major, minor;
1426 if (XRenderQueryVersion (target->dpy, &major, &minor))
1427 flags |= HAS_RENDER;
1428 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1429 if (filters)
1430 {
1431 for (int i = 0; i < filters->nfilter; i++)
1432 if (!strcmp (filters->filter[i], FilterConvolution))
1433 flags |= HAS_RENDER_CONV;
1434
1435 XFree (filters);
1436 }
1604# endif 1437#endif
1605 return true;
1606 }
1607
1608 return false;
1609} 1438}
1610 1439
1611void 1440void
1612bgPixmap_t::apply () 1441bgPixmap_t::apply ()
1613{ 1442{
1614 if (target) 1443 if (target == NULL)
1615 { 1444 return;
1616 flags &= ~isVtOrigin;
1617 1445
1618 if (pixmap != None) 1446 if (pixmap != None)
1619 { 1447 {
1620 /* set target's background to pixmap */ 1448 /* set target's background to pixmap */
1621# ifdef ENABLE_TRANSPARENCY 1449# ifdef ENABLE_TRANSPARENCY
1622 if (flags & isTransparent) 1450 if (flags & isTransparent)
1623 { 1451 {
1624 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1452 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1625 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1453 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1626 1454
1627 if (target->scrollBar.win) 1455 if (target->scrollBar.win)
1628 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1456 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1629 } 1457 }
1630 else 1458 else
1631# endif 1459# endif
1632 { 1460 {
1633 flags |= isVtOrigin;
1634 /* force old pixmap dereference in case it was transparent before :*/ 1461 /* force old pixmap dereference in case it was transparent before :*/
1635 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1636 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1637 /* do we also need to set scrollbar's background here ? */
1638
1639 if (target->scrollBar.win)
1640 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1641 }
1642 }
1643 else
1644 {
1645 /* set target background to a pixel */
1646 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1462 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1647 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1463 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1648 /* do we also need to set scrollbar's background here ? */ 1464 /* do we also need to set scrollbar's background here ? */
1465
1649 if (target->scrollBar.win) 1466 if (target->scrollBar.win)
1650 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1467 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1651 } 1468 }
1469 }
1470 else
1471 {
1472 /* set target background to a pixel */
1473 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1474 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1475 /* do we also need to set scrollbar's background here ? */
1476 if (target->scrollBar.win)
1477 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1478 }
1652 1479
1653 /* don't want Expose on the parent or vt. It is better to use 1480 /* don't want Expose on the parent or vt. It is better to use
1654 scr_touch or we get a great deal of flicker otherwise: */ 1481 scr_touch or we get a great deal of flicker otherwise: */
1655 XClearWindow (target->dpy, target->parent[0]); 1482 XClearWindow (target->dpy, target->parent[0]);
1656 1483
1657 if (target->scrollBar.state && target->scrollBar.win) 1484 if (target->scrollBar.state && target->scrollBar.win)
1658 { 1485 {
1659 target->scrollBar.state = STATE_IDLE; 1486 target->scrollBar.state = STATE_IDLE;
1660 target->scrollBar.show (0); 1487 target->scrollBar.show (0);
1661 } 1488 }
1662 1489
1663 target->want_refresh = 1; 1490 target->want_refresh = 1;
1664 flags |= hasChanged; 1491 flags |= hasChanged;
1665 }
1666} 1492}
1667 1493
1668#endif /* HAVE_BG_PIXMAP */ 1494#endif /* HAVE_BG_PIXMAP */
1669 1495
1670#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1496#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1671/* taken from aterm-0.4.2 */ 1497/* taken from aterm-0.4.2 */
1672 1498
1673typedef uint32_t RUINT32T;
1674
1675static void 1499static void
1676ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1500ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1677{ 1501{
1678 int sh_r, sh_g, sh_b; 1502 int sh_r, sh_g, sh_b;
1679 RUINT32T mask_r, mask_g, mask_b; 1503 uint32_t mask_r, mask_g, mask_b;
1680 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1504 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1681 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1505 rgba low;
1682 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1506 rgba high;
1683 int i; 1507 int i;
1508 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1684 1509
1685 Visual *visual = term->visual;
1686
1687 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1510 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1688 1511
1689 /* for convenience */ 1512 /* for convenience */
1690 mask_r = visual->red_mask; 1513 mask_r = visual->red_mask;
1691 mask_g = visual->green_mask; 1514 mask_g = visual->green_mask;
1692 mask_b = visual->blue_mask; 1515 mask_b = visual->blue_mask;
1693 1516
1694 /* boring lookup table pre-initialization */ 1517 /* boring lookup table pre-initialization */
1695 switch (srcImage->bits_per_pixel) { 1518 switch (srcImage->depth)
1519 {
1696 case 15: 1520 case 15:
1697 if ((mask_r != 0x7c00) || 1521 if ((mask_r != 0x7c00) ||
1698 (mask_g != 0x03e0) || 1522 (mask_g != 0x03e0) ||
1699 (mask_b != 0x001f)) 1523 (mask_b != 0x001f))
1700 return; 1524 return;
1701 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1525 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1702 lookup_r = lookup; 1526 lookup_r = lookup;
1703 lookup_g = lookup+32; 1527 lookup_g = lookup+32;
1704 lookup_b = lookup+32+32; 1528 lookup_b = lookup+32+32;
1705 sh_r = 10; 1529 sh_r = 10;
1706 sh_g = 5; 1530 sh_g = 5;
1707 sh_b = 0; 1531 sh_b = 0;
1708 break; 1532 break;
1709 case 16: 1533 case 16:
1710 if ((mask_r != 0xf800) || 1534 if ((mask_r != 0xf800) ||
1711 (mask_g != 0x07e0) || 1535 (mask_g != 0x07e0) ||
1712 (mask_b != 0x001f)) 1536 (mask_b != 0x001f))
1713 return; 1537 return;
1714 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1538 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1715 lookup_r = lookup; 1539 lookup_r = lookup;
1716 lookup_g = lookup+32; 1540 lookup_g = lookup+32;
1717 lookup_b = lookup+32+64; 1541 lookup_b = lookup+32+64;
1718 sh_r = 11; 1542 sh_r = 11;
1719 sh_g = 5; 1543 sh_g = 5;
1720 sh_b = 0; 1544 sh_b = 0;
1721 break; 1545 break;
1722 case 24: 1546 case 24:
1723 if ((mask_r != 0xff0000) || 1547 if ((mask_r != 0xff0000) ||
1724 (mask_g != 0x00ff00) || 1548 (mask_g != 0x00ff00) ||
1725 (mask_b != 0x0000ff)) 1549 (mask_b != 0x0000ff))
1726 return; 1550 return;
1727 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1551 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1728 lookup_r = lookup; 1552 lookup_r = lookup;
1729 lookup_g = lookup+256; 1553 lookup_g = lookup+256;
1730 lookup_b = lookup+256+256; 1554 lookup_b = lookup+256+256;
1731 sh_r = 16; 1555 sh_r = 16;
1732 sh_g = 8; 1556 sh_g = 8;
1733 sh_b = 0; 1557 sh_b = 0;
1734 break; 1558 break;
1735 case 32: 1559 case 32:
1736 if ((mask_r != 0xff0000) || 1560 if ((mask_r != 0xff0000) ||
1737 (mask_g != 0x00ff00) || 1561 (mask_g != 0x00ff00) ||
1738 (mask_b != 0x0000ff)) 1562 (mask_b != 0x0000ff))
1739 return; 1563 return;
1740 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1564 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1741 lookup_r = lookup; 1565 lookup_r = lookup;
1742 lookup_g = lookup+256; 1566 lookup_g = lookup+256;
1743 lookup_b = lookup+256+256; 1567 lookup_b = lookup+256+256;
1744 sh_r = 16; 1568 sh_r = 16;
1745 sh_g = 8; 1569 sh_g = 8;
1746 sh_b = 0; 1570 sh_b = 0;
1747 break; 1571 break;
1748 default: 1572 default:
1749 return; /* we do not support this color depth */ 1573 return; /* we do not support this color depth */
1750 } 1574 }
1751 1575
1752 /* prepare limits for color transformation (each channel is handled separately) */ 1576 /* prepare limits for color transformation (each channel is handled separately) */
1753 if (shade > 100) { 1577 if (shade > 100)
1578 {
1754 shade = 200 - shade; 1579 shade = 200 - shade;
1755 1580
1756 lower_lim_r = 65535-rm; 1581 high.r = (65535 - c.r) * shade / 100;
1757 lower_lim_g = 65535-gm; 1582 high.g = (65535 - c.g) * shade / 100;
1758 lower_lim_b = 65535-bm; 1583 high.b = (65535 - c.b) * shade / 100;
1759 1584
1760 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1585 low.r = 65535 - high.r;
1761 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1586 low.g = 65535 - high.g;
1762 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1587 low.b = 65535 - high.b;
1763
1764 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1765 } else {
1766
1767 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1768
1769 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1770 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1771 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1772 } 1588 }
1773 1589 else
1774 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1775 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1776 { 1590 {
1777 unsigned int tmp; 1591 high.r = c.r * shade / 100;
1592 high.g = c.g * shade / 100;
1593 high.b = c.b * shade / 100;
1778 1594
1779 tmp = lower_lim_r; 1595 low.r = low.g = low.b = 0;
1780 lower_lim_r = lower_lim_b;
1781 lower_lim_b = tmp;
1782
1783 tmp = upper_lim_r;
1784 upper_lim_r = upper_lim_b;
1785 upper_lim_b = tmp;
1786 } 1596 }
1787 1597
1788 /* fill our lookup tables */ 1598 /* fill our lookup tables */
1789 for (i = 0; i <= mask_r>>sh_r; i++) 1599 for (i = 0; i <= mask_r>>sh_r; i++)
1790 { 1600 {
1791 RUINT32T tmp; 1601 uint32_t tmp;
1792 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1602 tmp = i * high.r;
1793 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1603 tmp += (mask_r>>sh_r) * low.r;
1794 lookup_r[i] = (tmp/65535)<<sh_r; 1604 lookup_r[i] = (tmp/65535)<<sh_r;
1795 } 1605 }
1796 for (i = 0; i <= mask_g>>sh_g; i++) 1606 for (i = 0; i <= mask_g>>sh_g; i++)
1797 { 1607 {
1798 RUINT32T tmp; 1608 uint32_t tmp;
1799 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1609 tmp = i * high.g;
1800 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1610 tmp += (mask_g>>sh_g) * low.g;
1801 lookup_g[i] = (tmp/65535)<<sh_g; 1611 lookup_g[i] = (tmp/65535)<<sh_g;
1802 } 1612 }
1803 for (i = 0; i <= mask_b>>sh_b; i++) 1613 for (i = 0; i <= mask_b>>sh_b; i++)
1804 { 1614 {
1805 RUINT32T tmp; 1615 uint32_t tmp;
1806 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1616 tmp = i * high.b;
1807 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1617 tmp += (mask_b>>sh_b) * low.b;
1808 lookup_b[i] = (tmp/65535)<<sh_b; 1618 lookup_b[i] = (tmp/65535)<<sh_b;
1809 } 1619 }
1810 1620
1811 /* apply table to input image (replacing colors by newly calculated ones) */ 1621 /* apply table to input image (replacing colors by newly calculated ones) */
1812 switch (srcImage->bits_per_pixel) 1622 if (srcImage->bits_per_pixel == 32
1623 && (srcImage->depth == 24 || srcImage->depth == 32)
1624 && srcImage->byte_order == host_byte_order)
1813 { 1625 {
1814 case 15:
1815 {
1816 unsigned short *p1, *pf, *p, *pl; 1626 uint32_t *p1, *pf, *p, *pl;
1817 p1 = (unsigned short *) srcImage->data; 1627 p1 = (uint32_t *) srcImage->data;
1818 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1628 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1629
1819 while (p1 < pf) 1630 while (p1 < pf)
1820 { 1631 {
1821 p = p1; 1632 p = p1;
1822 pl = p1 + srcImage->width; 1633 pl = p1 + srcImage->width;
1823 for (; p < pl; p++) 1634 for (; p < pl; p++)
1824 { 1635 {
1825 *p = lookup_r[(*p & 0x7c00)>>10] |
1826 lookup_g[(*p & 0x03e0)>> 5] |
1827 lookup_b[(*p & 0x001f)];
1828 }
1829 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1830 }
1831 break;
1832 }
1833 case 16:
1834 {
1835 unsigned short *p1, *pf, *p, *pl;
1836 p1 = (unsigned short *) srcImage->data;
1837 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1838 while (p1 < pf)
1839 {
1840 p = p1;
1841 pl = p1 + srcImage->width;
1842 for (; p < pl; p++)
1843 {
1844 *p = lookup_r[(*p & 0xf800)>>11] |
1845 lookup_g[(*p & 0x07e0)>> 5] |
1846 lookup_b[(*p & 0x001f)];
1847 }
1848 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1849 }
1850 break;
1851 }
1852 case 24:
1853 {
1854 unsigned char *p1, *pf, *p, *pl;
1855 p1 = (unsigned char *) srcImage->data;
1856 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1857 while (p1 < pf)
1858 {
1859 p = p1;
1860 pl = p1 + srcImage->width * 3;
1861 for (; p < pl; p += 3)
1862 {
1863 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1864 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1865 p[2] = lookup_r[(p[2] & 0x0000ff)];
1866 }
1867 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1868 }
1869 break;
1870 }
1871 case 32:
1872 {
1873 RUINT32T *p1, *pf, *p, *pl;
1874 p1 = (RUINT32T *) srcImage->data;
1875 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1876
1877 while (p1 < pf)
1878 {
1879 p = p1;
1880 pl = p1 + srcImage->width;
1881 for (; p < pl; p++)
1882 {
1883 *p = lookup_r[(*p & 0xff0000)>>16] | 1636 *p = lookup_r[(*p & 0xff0000) >> 16] |
1884 lookup_g[(*p & 0x00ff00)>> 8] | 1637 lookup_g[(*p & 0x00ff00) >> 8] |
1885 lookup_b[(*p & 0x0000ff)] | 1638 lookup_b[(*p & 0x0000ff)] |
1886 (*p & ~0xffffff); 1639 (*p & 0xff000000);
1640 }
1641 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1642 }
1643 }
1644 else
1645 {
1646 for (int y = 0; y < srcImage->height; y++)
1647 for (int x = 0; x < srcImage->width; x++)
1648 {
1649 unsigned long pixel = XGetPixel (srcImage, x, y);
1650 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1651 lookup_g[(pixel & mask_g) >> sh_g] |
1652 lookup_b[(pixel & mask_b) >> sh_b];
1653 XPutPixel (srcImage, x, y, pixel);
1887 } 1654 }
1888 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1889 } 1655 }
1890 break;
1891 }
1892 }
1893 1656
1894 free (lookup); 1657 free (lookup);
1895} 1658}
1896#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1659#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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