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.76 by sf-exg, Tue Oct 12 21:26:57 2010 UTC vs.
Revision 1.125 by sf-exg, Tue Nov 23 18:31:13 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 // TODO: add alpha blending
750 if (background_flags) 670 if (background_flags
671 && !(flags & HAS_RENDER))
751 return false; 672 return false;
752 673
753 GdkPixbuf *result; 674 GdkPixbuf *result;
754 675
755 int image_width = gdk_pixbuf_get_width (pixbuf); 676 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
788 709
789 if (result) 710 if (result)
790 { 711 {
791 XGCValues gcv; 712 XGCValues gcv;
792 GC gc; 713 GC gc;
714 Pixmap root_pmap;
793 715
794 image_width = gdk_pixbuf_get_width (result); 716 image_width = gdk_pixbuf_get_width (result);
795 image_height = gdk_pixbuf_get_height (result); 717 image_height = gdk_pixbuf_get_height (result);
796 718
719 if (background_flags)
720 {
721 root_pmap = pixmap;
722 pixmap = None;
723 }
724 else
725 {
797 if (h_scale == 0 || v_scale == 0) 726 if (h_scale == 0 || v_scale == 0)
798 { 727 {
799 new_pmap_width = min (image_width, target_width); 728 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 729 new_pmap_height = min (image_height, target_height);
801 }
802
803 if (pixmap)
804 {
805 if (pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height
807 || pmap_depth != target->depth)
808 { 730 }
809 XFreePixmap (target->dpy, pixmap);
810 pixmap = None;
811 } 731 }
812 }
813 732
814 if (pixmap == None) 733 if (pixmap == None
734 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height
736 || pmap_depth != target->depth)
815 { 737 {
738 if (pixmap)
739 XFreePixmap (target->dpy, pixmap);
816 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);
817 pmap_width = new_pmap_width; 741 pmap_width = new_pmap_width;
818 pmap_height = new_pmap_height; 742 pmap_height = new_pmap_height;
819 pmap_depth = target->depth; 743 pmap_depth = target->depth;
820 } 744 }
… …
861 dst_width, dst_height, 785 dst_width, dst_height,
862 XLIB_RGB_DITHER_NONE, 786 XLIB_RGB_DITHER_NONE,
863 0, 0); 787 0, 0);
864 } 788 }
865 789
790#if XRENDER
791 if (background_flags)
792 {
793 Display *dpy = target->dpy;
794 XRenderPictureAttributes pa;
795
796 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
797 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
798
799 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
800 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
801
802 pa.repeat = True;
803 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
804 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
805 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
806 XFreePixmap (dpy, mask_pmap);
807
808 if (src && dst && mask)
809 {
810 XRenderColor mask_c;
811
812 mask_c.alpha = 0x8000;
813 mask_c.red = 0;
814 mask_c.green = 0;
815 mask_c.blue = 0;
816 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
817 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
818 }
819
820 XRenderFreePicture (dpy, src);
821 XRenderFreePicture (dpy, dst);
822 XRenderFreePicture (dpy, mask);
823
824 XFreePixmap (dpy, root_pmap);
825 }
826#endif
827
866 if (result != pixbuf) 828 if (result != pixbuf)
867 g_object_unref (result); 829 g_object_unref (result);
868 830
869 XFreeGC (target->dpy, gc); 831 XFreeGC (target->dpy, gc);
870 832
… …
876# endif /* HAVE_PIXBUF */ 838# endif /* HAVE_PIXBUF */
877 839
878bool 840bool
879bgPixmap_t::set_file (const char *file) 841bgPixmap_t::set_file (const char *file)
880{ 842{
881 assert (file); 843 if (!file || !*file)
844 return false;
882 845
883 if (*file)
884 {
885 if (const char *p = strchr (file, ';')) 846 if (const char *p = strchr (file, ';'))
886 { 847 {
887 size_t len = p - file; 848 size_t len = p - file;
888 char *f = rxvt_temp_buf<char> (len + 1); 849 char *f = rxvt_temp_buf<char> (len + 1);
889 memcpy (f, file, len); 850 memcpy (f, file, len);
890 f[len] = '\0'; 851 f[len] = '\0';
891 file = f; 852 file = f;
892 } 853 }
893 854
894# ifdef HAVE_AFTERIMAGE 855# ifdef HAVE_AFTERIMAGE
895 if (!target->asimman) 856 if (!target->asimman)
896 target->asimman = create_generic_imageman (target->rs[Rs_path]); 857 target->asimman = create_generic_imageman (target->rs[Rs_path]);
897 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 858 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
859 if (image)
860 {
898 if (original_asim) 861 if (original_asim)
862 safe_asimage_destroy (original_asim);
863 original_asim = image;
899 have_image = true; 864 have_image = true;
900 return have_image; 865 return true;
866 }
901# endif 867# endif
902 868
903# ifdef HAVE_PIXBUF 869# ifdef HAVE_PIXBUF
904 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 870 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
871 if (image)
872 {
905 if (pixbuf) 873 if (pixbuf)
874 g_object_unref (pixbuf);
875 pixbuf = image;
906 have_image = true; 876 have_image = true;
907 return have_image; 877 return true;
878 }
908# endif 879# endif
909 }
910 880
911 return false; 881 return false;
912} 882}
913 883
914# endif /* BG_IMAGE_FROM_FILE */ 884# endif /* BG_IMAGE_FROM_FILE */
… …
927} 897}
928 898
929bool 899bool
930bgPixmap_t::set_blur_radius (const char *geom) 900bgPixmap_t::set_blur_radius (const char *geom)
931{ 901{
932 int changed = 0; 902 bool changed = false;
933 unsigned int hr, vr; 903 unsigned int hr, vr;
934 int junk; 904 int junk;
935 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 905 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
936 906
937 if (!(geom_flags & WidthValue)) 907 if (!(geom_flags & WidthValue))
938 hr = 1; 908 hr = 1;
939 if (!(geom_flags & HeightValue)) 909 if (!(geom_flags & HeightValue))
940 vr = hr; 910 vr = hr;
941 911
912 min_it (hr, 128);
913 min_it (vr, 128);
914
942 if (h_blurRadius != hr) 915 if (h_blurRadius != hr)
943 { 916 {
944 ++changed; 917 changed = true;
945 h_blurRadius = hr; 918 h_blurRadius = hr;
946 } 919 }
947 920
948 if (v_blurRadius != vr) 921 if (v_blurRadius != vr)
949 { 922 {
950 ++changed; 923 changed = true;
951 v_blurRadius = vr; 924 v_blurRadius = vr;
952 } 925 }
953 926
954 if (v_blurRadius == 0 && h_blurRadius == 0) 927 if (v_blurRadius == 0 && h_blurRadius == 0)
955 flags &= ~blurNeeded; 928 flags &= ~blurNeeded;
956 else 929 else
957 flags |= blurNeeded; 930 flags |= blurNeeded;
958 931
959 return (changed > 0); 932 return changed;
960} 933}
961 934
962static inline unsigned long 935static inline unsigned long
963compute_tint_shade_flags (rxvt_color *tint, int shade) 936compute_tint_shade_flags (rxvt_color *tint, int shade)
964{ 937{
… …
967 bool has_shade = shade != 100; 940 bool has_shade = shade != 100;
968 941
969 if (tint) 942 if (tint)
970 { 943 {
971 tint->get (c); 944 tint->get (c);
972# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
946 if (!has_shade
973 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
974 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
975 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
976 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
977# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
978 } 952 }
979 953
980 if (has_shade) 954 if (has_shade || tint)
981 flags |= bgPixmap_t::tintNeeded; 955 flags |= bgPixmap_t::tintNeeded;
982 else if (tint)
983 {
984 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
985 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
986 {
987 flags |= bgPixmap_t::tintNeeded;
988 }
989 }
990
991 if (flags & bgPixmap_t::tintNeeded)
992 {
993 if (flags & bgPixmap_t::tintWholesome)
994 flags |= bgPixmap_t::tintServerSide;
995 else
996 {
997#if XFT
998 flags |= bgPixmap_t::tintServerSide;
999#endif
1000 }
1001 }
1002 956
1003 return flags; 957 return flags;
1004} 958}
1005 959
1006bool 960bool
… …
1049 } 1003 }
1050 1004
1051 return false; 1005 return false;
1052} 1006}
1053 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
1054bool 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;
1093}
1094
1095bool
1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height) 1096bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1056{ 1097{
1057 Display *dpy = target->dpy; 1098 Display *dpy = target->dpy;
1058 bool ret = false; 1099 bool ret = false;
1059 1100
1060 if (flags & tintWholesome) 1101 if (flags & tintWholesome)
… …
1066 * performance improvements, as we eliminate XImage transfer 1107 * performance improvements, as we eliminate XImage transfer
1067 */ 1108 */
1068 gcv.foreground = Pixel (tint); 1109 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand; 1110 gcv.function = GXand;
1070 gcv.fill_style = FillSolid; 1111 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1112 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc) 1113 if (gc)
1073 { 1114 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1115 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1075 ret = true; 1116 ret = true;
1076 XFreeGC (dpy, gc); 1117 XFreeGC (dpy, gc);
1077 } 1118 }
1078 } 1119 }
1079 else 1120 else
1080 { 1121 {
1081# if XFT 1122# if XRENDER
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1123 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083 1124
1084 if (flags & tintSet) 1125 if (flags & tintSet)
1085 tint.get (c); 1126 tint.get (c);
1086 1127
… …
1090 c.g = (c.g * shade) / 100; 1131 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100; 1132 c.b = (c.b * shade) / 100;
1092 } 1133 }
1093 else 1134 else
1094 { 1135 {
1095 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1136 c.r = (c.r * (200 - shade)) / 100;
1096 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1137 c.g = (c.g * (200 - shade)) / 100;
1097 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1138 c.b = (c.b * (200 - shade)) / 100;
1098 } 1139 }
1099 1140
1100 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1141 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1101 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1142 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1102 XRenderPictureAttributes pa; 1143 XRenderPictureAttributes pa;
1103 1144
1104 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1145 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1105 1146
1106 pa.repeat = True; 1147 pa.repeat = True;
1107 1148
1108 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1149 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1109 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1150 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1110 XFreePixmap (dpy, overlay_pmap); 1151 XFreePixmap (dpy, overlay_pmap);
1111 1152
1112 pa.component_alpha = True; 1153 pa.component_alpha = True;
1113 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1154 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1114 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1155 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1115 XFreePixmap (dpy, mask_pmap); 1156 XFreePixmap (dpy, mask_pmap);
1116 1157
1117 if (mask_pic && overlay_pic && back_pic) 1158 if (mask_pic && overlay_pic && back_pic)
1118 { 1159 {
1119 XRenderColor mask_c; 1160 XRenderColor mask_c;
1120 1161
1121 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1162 mask_c.red = mask_c.green = mask_c.blue = 0;
1122 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1123 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1124 1165
1125 mask_c.alpha = 0; 1166 mask_c.alpha = 0;
1126 mask_c.red = 0xffff - c.r; 1167 mask_c.red = 0xffff - c.r;
1127 mask_c.green = 0xffff - c.g; 1168 mask_c.green = 0xffff - c.g;
1128 mask_c.blue = 0xffff - c.b; 1169 mask_c.blue = 0xffff - c.b;
1129 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1130 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1171 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172
1173 if (shade > 100)
1174 {
1175 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1176 mask_c.alpha = 0;
1177 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1178
1179 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1180 }
1181
1131 ret = true; 1182 ret = true;
1132 } 1183 }
1133 1184
1134 XRenderFreePicture (dpy, mask_pic); 1185 XRenderFreePicture (dpy, mask_pic);
1135 XRenderFreePicture (dpy, overlay_pic); 1186 XRenderFreePicture (dpy, overlay_pic);
1136 XRenderFreePicture (dpy, back_pic); 1187 XRenderFreePicture (dpy, back_pic);
1137# if DO_TIMING_TEST
1138 XSync (dpy, False);
1139# endif
1140# endif 1188# endif
1141 } 1189 }
1142 1190
1143 return ret; 1191 return ret;
1144} 1192}
1145 1193
1146/* make_transparency_pixmap() 1194/* make_transparency_pixmap()
1147 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1195 * Builds a pixmap of the same size as the terminal window that contains
1148 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1196 * the tiled portion of the root pixmap that is supposed to be covered by
1149 * our window. 1197 * our window.
1150 */ 1198 */
1151unsigned long 1199unsigned long
1152bgPixmap_t::make_transparency_pixmap () 1200bgPixmap_t::make_transparency_pixmap ()
1153{ 1201{
… …
1157 return 0; 1205 return 0;
1158 1206
1159 /* root dimensions may change from call to call - but Display structure should 1207 /* root dimensions may change from call to call - but Display structure should
1160 * be always up-to-date, so let's use it : 1208 * be always up-to-date, so let's use it :
1161 */ 1209 */
1162 Window root = target->display->root;
1163 int screen = target->display->screen; 1210 int screen = target->display->screen;
1164 Display *dpy = target->dpy; 1211 Display *dpy = target->dpy;
1212 int root_depth = DefaultDepth (dpy, screen);
1165 int root_width = DisplayWidth (dpy, screen); 1213 int root_width = DisplayWidth (dpy, screen);
1166 int root_height = DisplayHeight (dpy, screen); 1214 int root_height = DisplayHeight (dpy, screen);
1167 unsigned int root_pmap_width, root_pmap_height; 1215 unsigned int root_pmap_width, root_pmap_height;
1168 int window_width = target->szHint.width; 1216 int window_width = target->szHint.width;
1169 int window_height = target->szHint.height; 1217 int window_height = target->szHint.height;
1170 int sx, sy; 1218 int sx, sy;
1171 XGCValues gcv; 1219 XGCValues gcv;
1220 GC gc;
1172 1221
1173 TIMING_TEST_START (tp); 1222 sx = target_x;
1174 target->get_window_origin (sx, sy); 1223 sy = target_y;
1175 1224
1176 /* check if we are outside of the visible part of the virtual screen : */ 1225 /* check if we are outside of the visible part of the virtual screen : */
1177 if (sx + window_width <= 0 || sy + window_height <= 0 1226 if (sx + window_width <= 0 || sy + window_height <= 0
1178 || sx >= root_width || sy >= root_height) 1227 || sx >= root_width || sy >= root_height)
1179 return 0; 1228 return 0;
1180 1229
1230 // validate root pixmap and get its size
1181 if (root_pixmap != None) 1231 if (root_pixmap != None)
1182 { 1232 {
1183 /* we want to validate the pixmap and get it's size at the same time : */ 1233 Window wdummy;
1184 int junk; 1234 int idummy;
1185 unsigned int ujunk; 1235 unsigned int udummy;
1186 /* root pixmap may be bad - allow a error */ 1236
1187 target->allowedxerror = -1; 1237 target->allowedxerror = -1;
1188 1238
1189 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1239 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1190 root_pixmap = None; 1240 root_pixmap = None;
1191 1241
1192 target->allowedxerror = 0; 1242 target->allowedxerror = 0;
1193 } 1243 }
1194 1244
1245 Pixmap recoded_root_pmap = root_pixmap;
1246
1247 if (root_pixmap != None && root_depth != target->depth)
1248 {
1249#if XRENDER
1250 if (flags & HAS_RENDER)
1251 {
1252 XRenderPictureAttributes pa;
1253
1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1256
1257 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1258 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1259 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1260
1261 if (src && dst)
1262 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1263 else
1264 {
1265 XFreePixmap (dpy, recoded_root_pmap);
1266 root_pixmap = None;
1267 }
1268
1269 XRenderFreePicture (dpy, src);
1270 XRenderFreePicture (dpy, dst);
1271 }
1272 else
1273#endif
1274 root_pixmap = None;
1275 }
1276
1277 if (root_pixmap == None)
1278 return 0;
1279
1195 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1280 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1196 GC gc = NULL;
1197 1281
1198 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1282 if (tiled_root_pmap == None) /* something really bad happened - abort */
1199 return 0; 1283 return 0;
1200 1284
1201 if (root_pixmap == None)
1202 {
1203 /* use tricks to obtain the root background image :*/
1204 /* we want to create Overrideredirect window overlapping out window
1205 with background type of Parent Relative and then grab it */
1206 XSetWindowAttributes attr;
1207 Window src;
1208 bool success = false;
1209
1210 attr.background_pixmap = ParentRelative;
1211 attr.backing_store = Always;
1212 attr.event_mask = ExposureMask;
1213 attr.override_redirect = True;
1214 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1215 CopyFromParent, CopyFromParent, CopyFromParent,
1216 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1217 &attr);
1218
1219 if (src != None)
1220 {
1221 XEvent event;
1222 int ev_count = 0;
1223 XGrabServer (dpy);
1224 XMapRaised (dpy, src);
1225 XSync (dpy, False);
1226
1227 /* XSync should get window where it's properly exposed,
1228 * but to be on the safe side - let's check for the actual event to arrive : */
1229 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1230 ++ev_count;
1231
1232 if (ev_count > 0);
1233 {
1234 /* hooray! - we can grab the image! */
1235 gc = XCreateGC (dpy, root, 0, NULL);
1236 if (gc)
1237 {
1238 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1239 success = true;
1240 }
1241 }
1242
1243 XDestroyWindow (dpy, src);
1244 XUngrabServer (dpy);
1245 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1246 }
1247
1248 if (!success)
1249 {
1250 XFreePixmap (dpy, tiled_root_pmap);
1251 tiled_root_pmap = None;
1252 }
1253 else
1254 result |= transpPmapTiled;
1255 }
1256 else
1257 {
1258 /* straightforward pixmap copy */ 1285 /* straightforward pixmap copy */
1259 gcv.tile = root_pixmap;
1260 gcv.fill_style = FillTiled;
1261
1262 while (sx < 0) sx += (int)root_width; 1286 while (sx < 0) sx += (int)root_width;
1263 while (sy < 0) sy += (int)root_height; 1287 while (sy < 0) sy += (int)root_height;
1264 1288
1289 gcv.tile = recoded_root_pmap;
1290 gcv.fill_style = FillTiled;
1265 gcv.ts_x_origin = -sx; 1291 gcv.ts_x_origin = -sx;
1266 gcv.ts_y_origin = -sy; 1292 gcv.ts_y_origin = -sy;
1267 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1293 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1268 1294
1269 if (gc) 1295 if (gc)
1270 { 1296 {
1271 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1297 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1272 result |= transpPmapTiled; 1298 result |= transpPmapTiled;
1273 } 1299 XFreeGC (dpy, gc);
1274 }
1275 TIMING_TEST_PRINT_RESULT (tp);
1276 1300
1277 if (tiled_root_pmap != None)
1278 {
1279 if (!need_client_side_rendering ()) 1301 if (!need_client_side_rendering ())
1280 { 1302 {
1303 if ((flags & blurNeeded)
1304 && (flags & HAS_RENDER_CONV))
1305 {
1306 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1307 result |= transpPmapBlurred;
1308 }
1281 if ((flags & tintNeeded)) 1309 if ((flags & tintNeeded)
1310 && (flags & (tintWholesome | HAS_RENDER)))
1282 { 1311 {
1283 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) 1312 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1284 result |= transpPmapTinted; 1313 result |= transpPmapTinted;
1285 } 1314 }
1286 } /* server side rendering completed */ 1315 } /* server side rendering completed */
1287 1316
1288 if (pixmap) 1317 if (pixmap)
1289 XFreePixmap (dpy, pixmap); 1318 XFreePixmap (dpy, pixmap);
1290 1319
1291 pixmap = tiled_root_pmap; 1320 pixmap = tiled_root_pmap;
1292 pmap_width = window_width; 1321 pmap_width = window_width;
1293 pmap_height = window_height; 1322 pmap_height = window_height;
1294 pmap_depth = root_depth; 1323 pmap_depth = target->depth;
1295 } 1324 }
1325 else
1326 XFreePixmap (dpy, tiled_root_pmap);
1296 1327
1297 if (gc) 1328 if (recoded_root_pmap != root_pixmap)
1298 XFreeGC (dpy, gc); 1329 XFreePixmap (dpy, recoded_root_pmap);
1299
1300 TIMING_TEST_PRINT_RESULT (tp);
1301 1330
1302 return result; 1331 return result;
1303} 1332}
1304 1333
1305bool 1334void
1306bgPixmap_t::set_root_pixmap () 1335bgPixmap_t::set_root_pixmap ()
1307{ 1336{
1308 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1337 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1309 if (new_root_pixmap == None) 1338 if (new_root_pixmap == None)
1310 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1339 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1311 1340
1312 if (new_root_pixmap != root_pixmap)
1313 {
1314 root_pixmap = new_root_pixmap; 1341 root_pixmap = new_root_pixmap;
1315 return true;
1316 }
1317
1318 return false;
1319} 1342}
1320# endif /* ENABLE_TRANSPARENCY */ 1343# endif /* ENABLE_TRANSPARENCY */
1321 1344
1322# ifndef HAVE_AFTERIMAGE 1345#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1323static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1346static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1324# endif 1347# endif
1325 1348
1326bool 1349bool
1327bgPixmap_t::render () 1350bgPixmap_t::render ()
1328{ 1351{
1329 unsigned long background_flags = 0; 1352 unsigned long background_flags = 0;
1330 1353
1331 if (target == NULL) 1354 if (target == NULL)
1332 return false; 1355 return false;
1333
1334 TIMING_TEST_START (tp);
1335 1356
1336 invalidate (); 1357 invalidate ();
1337# ifdef ENABLE_TRANSPARENCY 1358# ifdef ENABLE_TRANSPARENCY
1338 if (flags & isTransparent) 1359 if (flags & isTransparent)
1339 { 1360 {
1340 /* we need to re-generate transparency pixmap in that case ! */ 1361 /* we need to re-generate transparency pixmap in that case ! */
1341 background_flags = make_transparency_pixmap (); 1362 background_flags = make_transparency_pixmap ();
1342 if (background_flags == 0) 1363 if (background_flags == 0)
1343 return false; 1364 return false;
1344 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1365 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1345 && pmap_depth == target->depth)
1346 flags = flags & ~isInvalid; 1366 flags &= ~isInvalid;
1347 } 1367 }
1348# endif 1368# endif
1349 1369
1350# ifdef BG_IMAGE_FROM_FILE 1370# ifdef BG_IMAGE_FROM_FILE
1351 if (have_image 1371 if (have_image
1352 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1372 || (background_flags & transpTransformations) != (flags & transpTransformations))
1353 { 1373 {
1354 if (render_image (background_flags)) 1374 if (render_image (background_flags))
1355 flags = flags & ~isInvalid; 1375 flags &= ~isInvalid;
1356 } 1376 }
1357# endif 1377# endif
1358 1378
1379# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1359 XImage *result = NULL; 1380 XImage *result = NULL;
1360 1381
1361 if (background_flags && (flags & isInvalid)) 1382 if (background_flags && (flags & isInvalid))
1362 { 1383 {
1363 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1384 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1364 } 1385 }
1365 1386
1366 if (result) 1387 if (result)
1367 { 1388 {
1368# if !defined(HAVE_AFTERIMAGE) && !XFT
1369 /* our own client-side tinting */ 1389 /* our own client-side tinting */
1370 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1371 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1372 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1390 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1373 { 1391 {
1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1392 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1375 if (flags & tintSet) 1393 if (flags & tintSet)
1376 tint.get (c); 1394 tint.get (c);
1377 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1395 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1378 } 1396 }
1379# endif
1380 1397
1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1382 1399
1383 if (gc) 1400 if (gc)
1384 { 1401 {
1385 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1386 {
1387 XFreePixmap (target->dpy, pixmap);
1388 pixmap = None;
1389 }
1390
1391 if (pixmap == None)
1392 {
1393 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1394 pmap_width = result->width;
1395 pmap_height = result->height;
1396 pmap_depth = target->depth;
1397 }
1398
1399 if (pmap_depth != result->depth)
1400 {
1401 /* Bad Match error will ensue ! stupid X !!!! */
1402 if (result->depth == 24 && pmap_depth == 32)
1403 result->depth = 32;
1404 else if (result->depth == 32 && pmap_depth == 24)
1405 result->depth = 24;
1406 else
1407 {
1408 /* TODO: implement image recoding */
1409 }
1410 }
1411
1412 if (pmap_depth == result->depth)
1413 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1402 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1414 1403
1415 XFreeGC (target->dpy, gc); 1404 XFreeGC (target->dpy, gc);
1416 flags = flags & ~isInvalid; 1405 flags &= ~isInvalid;
1417 } 1406 }
1418 1407
1419 XDestroyImage (result); 1408 XDestroyImage (result);
1420 } 1409 }
1410# endif
1421 1411
1422 if (flags & isInvalid) 1412 if (flags & isInvalid)
1423 { 1413 {
1424 if (pixmap != None) 1414 if (pixmap != None)
1425 { 1415 {
… …
1428 } 1418 }
1429 } 1419 }
1430 1420
1431 apply (); 1421 apply ();
1432 1422
1433 XSync (target->dpy, False);
1434 valid_since = ev::now (); 1423 valid_since = ev::now ();
1435 1424
1436 TIMING_TEST_PRINT_RESULT (tp);
1437
1438 return true; 1425 return true;
1439} 1426}
1440 1427
1441bool 1428void
1442bgPixmap_t::set_target (rxvt_term *new_target) 1429bgPixmap_t::set_target (rxvt_term *new_target)
1443{ 1430{
1444 if (new_target)
1445 if (target != new_target)
1446 {
1447 target = new_target; 1431 target = new_target;
1448# ifdef ENABLE_TRANSPARENCY 1432
1449 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1433 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1434#if XRENDER
1435 int major, minor;
1436 if (XRenderQueryVersion (target->dpy, &major, &minor))
1437 flags |= HAS_RENDER;
1438 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1439 if (filters)
1440 {
1441 for (int i = 0; i < filters->nfilter; i++)
1442 if (!strcmp (filters->filter[i], FilterConvolution))
1443 flags |= HAS_RENDER_CONV;
1444
1445 XFree (filters);
1446 }
1450# endif 1447#endif
1451 return true;
1452 }
1453
1454 return false;
1455} 1448}
1456 1449
1457void 1450void
1458bgPixmap_t::apply () 1451bgPixmap_t::apply ()
1459{ 1452{
1460 if (target) 1453 if (target == NULL)
1461 { 1454 return;
1462 flags &= ~isVtOrigin;
1463 1455
1464 if (pixmap != None) 1456 if (pixmap != None)
1465 { 1457 {
1466 /* set target's background to pixmap */ 1458 /* set target's background to pixmap */
1467# ifdef ENABLE_TRANSPARENCY 1459# ifdef ENABLE_TRANSPARENCY
1468 if (flags & isTransparent) 1460 if (flags & isTransparent)
1469 { 1461 {
1470 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1462 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1471 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1463 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1472 1464
1473 if (target->scrollBar.win) 1465 if (target->scrollBar.win)
1474 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1466 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1475 } 1467 }
1476 else 1468 else
1477# endif 1469# endif
1478 { 1470 {
1479 flags |= isVtOrigin;
1480 /* force old pixmap dereference in case it was transparent before :*/ 1471 /* force old pixmap dereference in case it was transparent before :*/
1481 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1482 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1483 /* do we also need to set scrollbar's background here ? */
1484
1485 if (target->scrollBar.win)
1486 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1487 }
1488 }
1489 else
1490 {
1491 /* set target background to a pixel */
1492 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1472 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1493 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1473 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1494 /* do we also need to set scrollbar's background here ? */ 1474 /* do we also need to set scrollbar's background here ? */
1475
1495 if (target->scrollBar.win) 1476 if (target->scrollBar.win)
1496 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1477 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1497 } 1478 }
1479 }
1480 else
1481 {
1482 /* set target background to a pixel */
1483 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1484 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1485 /* do we also need to set scrollbar's background here ? */
1486 if (target->scrollBar.win)
1487 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1488 }
1498 1489
1499 /* don't want Expose on the parent or vt. It is better to use 1490 /* don't want Expose on the parent or vt. It is better to use
1500 scr_touch or we get a great deal of flicker otherwise: */ 1491 scr_touch or we get a great deal of flicker otherwise: */
1501 XClearWindow (target->dpy, target->parent[0]); 1492 XClearWindow (target->dpy, target->parent[0]);
1502 1493
1503 if (target->scrollBar.state && target->scrollBar.win) 1494 if (target->scrollBar.state && target->scrollBar.win)
1504 { 1495 {
1505 target->scrollBar.state = STATE_IDLE; 1496 target->scrollBar.state = STATE_IDLE;
1506 target->scrollBar.show (0); 1497 target->scrollBar.show (0);
1507 } 1498 }
1508 1499
1509 target->want_refresh = 1; 1500 target->want_refresh = 1;
1510 flags |= hasChanged; 1501 flags |= hasChanged;
1511 }
1512} 1502}
1513 1503
1514#endif /* HAVE_BG_PIXMAP */ 1504#endif /* HAVE_BG_PIXMAP */
1515 1505
1516#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1506#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1517/* taken from aterm-0.4.2 */ 1507/* taken from aterm-0.4.2 */
1518 1508
1519typedef uint32_t RUINT32T;
1520
1521static void 1509static void
1522ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1510ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1523{ 1511{
1524 int sh_r, sh_g, sh_b; 1512 int sh_r, sh_g, sh_b;
1525 RUINT32T mask_r, mask_g, mask_b; 1513 uint32_t mask_r, mask_g, mask_b;
1526 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1514 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1527 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1515 rgba low;
1528 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1516 rgba high;
1529 int i; 1517 int i;
1518 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1530 1519
1531 Visual *visual = term->visual;
1532
1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1520 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1534 1521
1535 /* for convenience */ 1522 /* for convenience */
1536 mask_r = visual->red_mask; 1523 mask_r = visual->red_mask;
1537 mask_g = visual->green_mask; 1524 mask_g = visual->green_mask;
1538 mask_b = visual->blue_mask; 1525 mask_b = visual->blue_mask;
1539 1526
1540 /* boring lookup table pre-initialization */ 1527 /* boring lookup table pre-initialization */
1541 switch (srcImage->bits_per_pixel) { 1528 switch (srcImage->depth)
1529 {
1542 case 15: 1530 case 15:
1543 if ((mask_r != 0x7c00) || 1531 if ((mask_r != 0x7c00) ||
1544 (mask_g != 0x03e0) || 1532 (mask_g != 0x03e0) ||
1545 (mask_b != 0x001f)) 1533 (mask_b != 0x001f))
1546 return; 1534 return;
1547 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1535 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1548 lookup_r = lookup; 1536 lookup_r = lookup;
1549 lookup_g = lookup+32; 1537 lookup_g = lookup+32;
1550 lookup_b = lookup+32+32; 1538 lookup_b = lookup+32+32;
1551 sh_r = 10; 1539 sh_r = 10;
1552 sh_g = 5; 1540 sh_g = 5;
1553 sh_b = 0; 1541 sh_b = 0;
1554 break; 1542 break;
1555 case 16: 1543 case 16:
1556 if ((mask_r != 0xf800) || 1544 if ((mask_r != 0xf800) ||
1557 (mask_g != 0x07e0) || 1545 (mask_g != 0x07e0) ||
1558 (mask_b != 0x001f)) 1546 (mask_b != 0x001f))
1559 return; 1547 return;
1560 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1548 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1561 lookup_r = lookup; 1549 lookup_r = lookup;
1562 lookup_g = lookup+32; 1550 lookup_g = lookup+32;
1563 lookup_b = lookup+32+64; 1551 lookup_b = lookup+32+64;
1564 sh_r = 11; 1552 sh_r = 11;
1565 sh_g = 5; 1553 sh_g = 5;
1566 sh_b = 0; 1554 sh_b = 0;
1567 break; 1555 break;
1568 case 24: 1556 case 24:
1569 if ((mask_r != 0xff0000) || 1557 if ((mask_r != 0xff0000) ||
1570 (mask_g != 0x00ff00) || 1558 (mask_g != 0x00ff00) ||
1571 (mask_b != 0x0000ff)) 1559 (mask_b != 0x0000ff))
1572 return; 1560 return;
1573 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1561 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1574 lookup_r = lookup; 1562 lookup_r = lookup;
1575 lookup_g = lookup+256; 1563 lookup_g = lookup+256;
1576 lookup_b = lookup+256+256; 1564 lookup_b = lookup+256+256;
1577 sh_r = 16; 1565 sh_r = 16;
1578 sh_g = 8; 1566 sh_g = 8;
1579 sh_b = 0; 1567 sh_b = 0;
1580 break; 1568 break;
1581 case 32: 1569 case 32:
1582 if ((mask_r != 0xff0000) || 1570 if ((mask_r != 0xff0000) ||
1583 (mask_g != 0x00ff00) || 1571 (mask_g != 0x00ff00) ||
1584 (mask_b != 0x0000ff)) 1572 (mask_b != 0x0000ff))
1585 return; 1573 return;
1586 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1574 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1587 lookup_r = lookup; 1575 lookup_r = lookup;
1588 lookup_g = lookup+256; 1576 lookup_g = lookup+256;
1589 lookup_b = lookup+256+256; 1577 lookup_b = lookup+256+256;
1590 sh_r = 16; 1578 sh_r = 16;
1591 sh_g = 8; 1579 sh_g = 8;
1592 sh_b = 0; 1580 sh_b = 0;
1593 break; 1581 break;
1594 default: 1582 default:
1595 return; /* we do not support this color depth */ 1583 return; /* we do not support this color depth */
1596 } 1584 }
1597 1585
1598 /* prepare limits for color transformation (each channel is handled separately) */ 1586 /* prepare limits for color transformation (each channel is handled separately) */
1599 if (shade > 100) { 1587 if (shade > 100)
1588 {
1600 shade = 200 - shade; 1589 shade = 200 - shade;
1601 1590
1602 lower_lim_r = 65535-rm; 1591 high.r = c.r * shade / 100;
1603 lower_lim_g = 65535-gm; 1592 high.g = c.g * shade / 100;
1604 lower_lim_b = 65535-bm; 1593 high.b = c.b * shade / 100;
1605 1594
1606 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1595 low.r = 65535 * (100 - shade) / 100;
1607 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1596 low.g = 65535 * (100 - shade) / 100;
1608 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1597 low.b = 65535 * (100 - shade) / 100;
1609
1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1611 } else {
1612
1613 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1614
1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1616 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1617 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1618 } 1598 }
1619 1599 else
1620 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1621 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1622 { 1600 {
1623 unsigned int tmp; 1601 high.r = c.r * shade / 100;
1602 high.g = c.g * shade / 100;
1603 high.b = c.b * shade / 100;
1624 1604
1625 tmp = lower_lim_r; 1605 low.r = low.g = low.b = 0;
1626 lower_lim_r = lower_lim_b;
1627 lower_lim_b = tmp;
1628
1629 tmp = upper_lim_r;
1630 upper_lim_r = upper_lim_b;
1631 upper_lim_b = tmp;
1632 } 1606 }
1633 1607
1634 /* fill our lookup tables */ 1608 /* fill our lookup tables */
1635 for (i = 0; i <= mask_r>>sh_r; i++) 1609 for (i = 0; i <= mask_r>>sh_r; i++)
1636 { 1610 {
1637 RUINT32T tmp; 1611 uint32_t tmp;
1638 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1612 tmp = i * high.r;
1639 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1613 tmp += (mask_r>>sh_r) * low.r;
1640 lookup_r[i] = (tmp/65535)<<sh_r; 1614 lookup_r[i] = (tmp/65535)<<sh_r;
1641 } 1615 }
1642 for (i = 0; i <= mask_g>>sh_g; i++) 1616 for (i = 0; i <= mask_g>>sh_g; i++)
1643 { 1617 {
1644 RUINT32T tmp; 1618 uint32_t tmp;
1645 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1619 tmp = i * high.g;
1646 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1620 tmp += (mask_g>>sh_g) * low.g;
1647 lookup_g[i] = (tmp/65535)<<sh_g; 1621 lookup_g[i] = (tmp/65535)<<sh_g;
1648 } 1622 }
1649 for (i = 0; i <= mask_b>>sh_b; i++) 1623 for (i = 0; i <= mask_b>>sh_b; i++)
1650 { 1624 {
1651 RUINT32T tmp; 1625 uint32_t tmp;
1652 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1626 tmp = i * high.b;
1653 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1627 tmp += (mask_b>>sh_b) * low.b;
1654 lookup_b[i] = (tmp/65535)<<sh_b; 1628 lookup_b[i] = (tmp/65535)<<sh_b;
1655 } 1629 }
1656 1630
1657 /* apply table to input image (replacing colors by newly calculated ones) */ 1631 /* apply table to input image (replacing colors by newly calculated ones) */
1658 switch (srcImage->bits_per_pixel) 1632 if (srcImage->bits_per_pixel == 32
1633 && (srcImage->depth == 24 || srcImage->depth == 32)
1634 && srcImage->byte_order == host_byte_order)
1659 { 1635 {
1660 case 15:
1661 {
1662 unsigned short *p1, *pf, *p, *pl; 1636 uint32_t *p1, *pf, *p, *pl;
1663 p1 = (unsigned short *) srcImage->data; 1637 p1 = (uint32_t *) srcImage->data;
1664 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1638 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1639
1665 while (p1 < pf) 1640 while (p1 < pf)
1666 { 1641 {
1667 p = p1; 1642 p = p1;
1668 pl = p1 + srcImage->width; 1643 pl = p1 + srcImage->width;
1669 for (; p < pl; p++) 1644 for (; p < pl; p++)
1670 { 1645 {
1671 *p = lookup_r[(*p & 0x7c00)>>10] |
1672 lookup_g[(*p & 0x03e0)>> 5] |
1673 lookup_b[(*p & 0x001f)];
1674 }
1675 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1676 }
1677 break;
1678 }
1679 case 16:
1680 {
1681 unsigned short *p1, *pf, *p, *pl;
1682 p1 = (unsigned short *) srcImage->data;
1683 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1684 while (p1 < pf)
1685 {
1686 p = p1;
1687 pl = p1 + srcImage->width;
1688 for (; p < pl; p++)
1689 {
1690 *p = lookup_r[(*p & 0xf800)>>11] |
1691 lookup_g[(*p & 0x07e0)>> 5] |
1692 lookup_b[(*p & 0x001f)];
1693 }
1694 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1695 }
1696 break;
1697 }
1698 case 24:
1699 {
1700 unsigned char *p1, *pf, *p, *pl;
1701 p1 = (unsigned char *) srcImage->data;
1702 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1703 while (p1 < pf)
1704 {
1705 p = p1;
1706 pl = p1 + srcImage->width * 3;
1707 for (; p < pl; p += 3)
1708 {
1709 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1710 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1711 p[2] = lookup_r[(p[2] & 0x0000ff)];
1712 }
1713 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1714 }
1715 break;
1716 }
1717 case 32:
1718 {
1719 RUINT32T *p1, *pf, *p, *pl;
1720 p1 = (RUINT32T *) srcImage->data;
1721 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1722
1723 while (p1 < pf)
1724 {
1725 p = p1;
1726 pl = p1 + srcImage->width;
1727 for (; p < pl; p++)
1728 {
1729 *p = lookup_r[(*p & 0xff0000)>>16] | 1646 *p = lookup_r[(*p & 0xff0000) >> 16] |
1730 lookup_g[(*p & 0x00ff00)>> 8] | 1647 lookup_g[(*p & 0x00ff00) >> 8] |
1731 lookup_b[(*p & 0x0000ff)] | 1648 lookup_b[(*p & 0x0000ff)] |
1732 (*p & ~0xffffff); 1649 (*p & 0xff000000);
1650 }
1651 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1652 }
1653 }
1654 else
1655 {
1656 for (int y = 0; y < srcImage->height; y++)
1657 for (int x = 0; x < srcImage->width; x++)
1658 {
1659 unsigned long pixel = XGetPixel (srcImage, x, y);
1660 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1661 lookup_g[(pixel & mask_g) >> sh_g] |
1662 lookup_b[(pixel & mask_b) >> sh_b];
1663 XPutPixel (srcImage, x, y, pixel);
1733 } 1664 }
1734 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1735 } 1665 }
1736 break;
1737 }
1738 }
1739 1666
1740 free (lookup); 1667 free (lookup);
1741} 1668}
1742#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1669#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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