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