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.69 by sf-exg, Mon Oct 4 22:06:26 2010 UTC vs.
Revision 1.120 by sf-exg, Thu Nov 18 17:29:25 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
… …
104#ifdef BG_IMAGE_FROM_FILE 96#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 97 have_image = false;
106 h_scale = v_scale = 0; 98 h_scale = v_scale = 0;
107 h_align = v_align = 0; 99 h_align = v_align = 0;
108#endif 100#endif
101#ifdef ENABLE_TRANSPARENCY
102 shade = 100;
103#endif
109 flags = 0; 104 flags = 0;
110 pixmap = None; 105 pixmap = None;
111 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
112 target = 0; 107 target = 0;
113} 108}
… …
163 return true; 158 return true;
164 } 159 }
165# endif 160# endif
166 161
167 return false; 162 return false;
168}; 163}
169 164
170bool bgPixmap_t::need_client_side_rendering () 165bool bgPixmap_t::need_client_side_rendering ()
171{ 166{
172# ifdef HAVE_AFTERIMAGE 167# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 168 if (original_asim)
174 return true; 169 return true;
175# endif
176# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent)
178 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true;
185 }
186# endif 170# endif
187 return false; 171 return false;
188} 172}
189 173
190# ifdef BG_IMAGE_FROM_FILE 174# ifdef BG_IMAGE_FROM_FILE
… …
228 int diff = window_size - image_size; 212 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 213 int smaller = min (image_size, window_size);
230 214
231 if (align >= 0 && align <= 100) 215 if (align >= 0 && align <= 100)
232 return diff * align / 100; 216 return diff * align / 100;
233 else if (align > 100 && align <= 200 ) 217 else if (align > 100 && align <= 200)
234 return ((align - 100) * smaller / 100) + window_size - smaller; 218 return ((align - 100) * smaller / 100) + window_size - smaller;
235 else if (align >= -100 && align < 0) 219 else if (align >= -100 && align < 0)
236 return ((align + 100) * smaller / 100) - image_size; 220 return ((align + 100) * smaller / 100) - image_size;
237 return 0; 221 return 0;
238} 222}
… …
254 dst_size = target_size - dst_pos; 238 dst_size = target_size - dst_pos;
255 return src_pos; 239 return src_pos;
256} 240}
257 241
258bool 242bool
259bgPixmap_t::set_geometry (const char *geom) 243bgPixmap_t::set_geometry (const char *geom, bool update)
260{ 244{
245 bool changed = false;
261 int geom_flags = 0, changed = 0; 246 int geom_flags = 0;
262 int x = 0, y = 0; 247 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 248 unsigned int w = 0, h = 0;
264 unsigned int n; 249 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 250 unsigned long new_flags = (flags & (~geometryFlags));
266 const char *p; 251 const char *ops;
267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 252# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
268 253
269 if (geom == NULL) 254 if (geom == NULL)
270 return false; 255 return false;
271 256
272 char str[MAXLEN_GEOM]; 257 char str[MAXLEN_GEOM];
273 258
274 while (isspace(*geom)) ++geom;
275 if ((p = strchr (geom, ';')) == NULL)
276 p = strchr (geom, '\0'); 259 ops = strchr (geom, ':');
277 260 if (ops == NULL)
261 n = strlen (geom);
262 else
278 n = (p - geom); 263 n = ops - geom;
264
279 if (n < MAXLEN_GEOM) 265 if (n < MAXLEN_GEOM)
280 { 266 {
281 char *ops;
282 new_flags |= geometrySet;
283
284 memcpy (str, geom, n); 267 memcpy (str, geom, n);
285 str[n] = '\0'; 268 str[n] = '\0';
269 rxvt_strtrim (str);
270
286 if (str[0] == ':') 271 if (str[0])
287 ops = &str[0];
288 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
289 ops = &str[0];
290 else
291 {
292 char *tmp;
293 ops = strchr (str, ':');
294 if (ops != NULL)
295 {
296 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
297 *(++tmp) = '\0';
298 if (ops == tmp) ++ops;
299 }
300 }
301
302 if (ops > str || ops == NULL)
303 { 272 {
304 /* we have geometry string - let's handle it prior to applying ops */ 273 /* we have geometry string - let's handle it prior to applying ops */
305 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 274 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
306
307 if ((geom_flags & XValue) && !(geom_flags & YValue))
308 {
309 y = x;
310 geom_flags |= YValue;
311 }
312
313 if (flags & geometrySet)
314 {
315 /* new geometry is an adjustment to the old one ! */
316 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
317 {
318 if (w == 0 && h != 0)
319 {
320 w = h_scale;
321 h = (v_scale * h) / 100;
322 }
323 else if (h == 0 && w != 0)
324 {
325 w = (h_scale * w) / 100;
326 h = v_scale;
327 }
328 }
329 if (geom_flags & XValue)
330 {
331 if (str[0] != '=')
332 {
333 y += v_align;
334 x += h_align;
335 }
336 }
337 }
338 else /* setting up geometry from scratch */
339 {
340 if (!(geom_flags & XValue))
341 {
342 /* use default geometry - centered */
343 x = y = defaultAlign;
344 }
345 else if (!(geom_flags & YValue))
346 y = x;
347
348 if ((geom_flags & (WidthValue|HeightValue)) == 0)
349 {
350 /* use default geometry - scaled */
351 w = h = defaultScale;
352 }
353 else if (geom_flags & WidthValue)
354 {
355 if (!(geom_flags & HeightValue))
356 h = w;
357 }
358 else
359 w = h;
360 }
361 } /* done parsing geometry string */ 275 } /* done parsing geometry string */
362 else if (!(flags & geometrySet)) 276
277 if (!update)
363 { 278 {
364 /* default geometry - scaled and centered */ 279 if (!(geom_flags & XValue))
365 x = y = defaultAlign; 280 x = y = defaultAlign;
281 else if (!(geom_flags & YValue))
282 y = x;
283
284 if (!(geom_flags & (WidthValue|HeightValue)))
366 w = h = defaultScale; 285 w = h = defaultScale;
367 } 286 else if (!(geom_flags & HeightValue))
287 h = w;
288 else if (!(geom_flags & WidthValue))
289 w = h;
368 290
369 if (!(flags & geometrySet))
370 geom_flags |= WidthValue|HeightValue|XValue|YValue; 291 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 }
371 293
372 if (ops) 294 if (ops)
373 { 295 {
374 while (*ops) 296 while (*ops)
375 { 297 {
… …
422 344
423 while (*ops != ':' && *ops != '\0') ++ops; 345 while (*ops != ':' && *ops != '\0') ++ops;
424 } /* done parsing ops */ 346 } /* done parsing ops */
425 } 347 }
426 348
427 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 349 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
428 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 350 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
429 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 351 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 352 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
431 } 353 }
432 354
433 if (new_flags != flags) 355 if (new_flags != flags)
434 { 356 {
435 flags = new_flags; 357 flags = new_flags;
436 changed++; 358 changed = true;
437 } 359 }
438 360
439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440 // flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 361 return changed;
442} 362}
443 363
444void 364void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 365bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{ 366{
… …
474 x = make_align_position (h_align, target_width, w); 394 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h); 395 y = make_align_position (v_align, target_height, h);
476 } 396 }
477 397
478 flags &= ~sizeSensitive; 398 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 399 if ((flags & propScale) || h_scale || v_scale
480 || h_align != 0 || v_align != 0 400 || (!(flags & rootAlign) && (h_align || v_align))
481 || w > target_width || h > target_height) 401 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 402 flags |= sizeSensitive;
483} 403}
484 404
485# ifdef HAVE_AFTERIMAGE 405# ifdef HAVE_AFTERIMAGE
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 419 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 420
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 421 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 422 {
503 ShadingInfo as_shade; 423 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 424 as_shade.shading = shade;
505 425
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 426 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 427 if (flags & tintSet)
508 tint.get (c); 428 tint.get (c);
509 as_shade.tintColor.red = c.r; 429 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 431 as_shade.tintColor.blue = c.b;
512 432
513 background_tint = shading2tint32 (&as_shade); 433 background_tint = shading2tint32 (&as_shade);
514 } 434 }
515 435
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 436 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 437 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 438 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 439 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 440 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 441 if (tmp)
… …
535 455
536 int x = 0; 456 int x = 0;
537 int y = 0; 457 int y = 0;
538 int w = 0; 458 int w = 0;
539 int h = 0; 459 int h = 0;
540
541 TIMING_TEST_START (asim);
542 460
543 if (original_asim) 461 if (original_asim)
544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 462 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
545 463
546 if (!original_asim 464 if (!original_asim
… …
616 layers[0].clip_width = target_width; 534 layers[0].clip_width = target_width;
617 layers[0].clip_height = target_height; 535 layers[0].clip_height = target_height;
618 layers[0].tint = background_tint; 536 layers[0].tint = background_tint;
619 layers[1].im = result; 537 layers[1].im = result;
620 538
621 if (w <= 0) 539 if (h_scale == 0 || v_scale == 0)
622 { 540 {
623 /* tile horizontally */ 541 /* tile horizontally */
624 while (x > 0) x -= (int)result->width; 542 while (x > 0) x -= (int)result->width;
625 layers[1].dst_x = x; 543 layers[1].dst_x = x;
626 layers[1].clip_width = result->width+target_width; 544 layers[1].clip_width = result->width+target_width;
… …
630 /* clip horizontally */ 548 /* clip horizontally */
631 layers[1].dst_x = x; 549 layers[1].dst_x = x;
632 layers[1].clip_width = result->width; 550 layers[1].clip_width = result->width;
633 } 551 }
634 552
635 if (h <= 0) 553 if (h_scale == 0 || v_scale == 0)
636 { 554 {
637 while (y > 0) y -= (int)result->height; 555 while (y > 0) y -= (int)result->height;
638 layers[1].dst_y = y; 556 layers[1].dst_y = y;
639 layers[1].clip_height = result->height + target_height; 557 layers[1].clip_height = result->height + target_height;
640 } 558 }
… …
663 } 581 }
664 582
665 free (layers); 583 free (layers);
666 } 584 }
667 } 585 }
668 TIMING_TEST_PRINT_RESULT (asim);
669 586
670 bool ret = false; 587 bool ret = false;
671 588
672 if (result) 589 if (result)
673 { 590 {
674 XGCValues gcv; 591 XGCValues gcv;
675 GC gc; 592 GC gc;
676 593
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
687
688 /* create Pixmap */ 594 /* create Pixmap */
689 if (pixmap == None) 595 if (pixmap == None
596 || pmap_width != new_pmap_width
597 || pmap_height != new_pmap_height
598 || pmap_depth != target->depth)
690 { 599 {
600 if (pixmap)
601 XFreePixmap (target->dpy, pixmap);
691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 602 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
692 pmap_width = new_pmap_width; 603 pmap_width = new_pmap_width;
693 pmap_height = new_pmap_height; 604 pmap_height = new_pmap_height;
694 pmap_depth = target->depth; 605 pmap_depth = target->depth;
695 } 606 }
… …
719 630
720 if (result != background && result != original_asim) 631 if (result != background && result != original_asim)
721 destroy_asimage (&result); 632 destroy_asimage (&result);
722 633
723 XFreeGC (target->dpy, gc); 634 XFreeGC (target->dpy, gc);
724 TIMING_TEST_PRINT_RESULT (asim);
725 635
726 ret = true; 636 ret = true;
727 } 637 }
728 638
729 if (background) 639 if (background)
… …
741 return false; 651 return false;
742 652
743 if (!pixbuf) 653 if (!pixbuf)
744 return false; 654 return false;
745 655
746 // TODO: add alpha blending
747 if (background_flags) 656 if (background_flags
657 && !(flags & HAS_RENDER))
748 return false; 658 return false;
749 659
750 GdkPixbuf *result; 660 GdkPixbuf *result;
751 661
752 int image_width = gdk_pixbuf_get_width (pixbuf); 662 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
785 695
786 if (result) 696 if (result)
787 { 697 {
788 XGCValues gcv; 698 XGCValues gcv;
789 GC gc; 699 GC gc;
700 Pixmap root_pmap;
790 701
791 image_width = gdk_pixbuf_get_width (result); 702 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 703 image_height = gdk_pixbuf_get_height (result);
793 704
705 if (background_flags)
706 {
707 root_pmap = pixmap;
708 pixmap = None;
709 }
710 else
711 {
794 if (h_scale == 0 || v_scale == 0) 712 if (h_scale == 0 || v_scale == 0)
795 {
796 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 { 713 {
806 XFreePixmap (target->dpy, pixmap); 714 new_pmap_width = min (image_width, target_width);
807 pixmap = None; 715 new_pmap_height = min (image_height, target_height);
808 } 716 }
809 } 717 }
810 718
811 if (pixmap == None) 719 if (pixmap == None
720 || pmap_width != new_pmap_width
721 || pmap_height != new_pmap_height
722 || pmap_depth != target->depth)
812 { 723 {
724 if (pixmap)
725 XFreePixmap (target->dpy, pixmap);
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 726 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width; 727 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 728 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 729 pmap_depth = target->depth;
817 } 730 }
… …
858 dst_width, dst_height, 771 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 772 XLIB_RGB_DITHER_NONE,
860 0, 0); 773 0, 0);
861 } 774 }
862 775
776#if XRENDER
777 if (background_flags)
778 {
779 Display *dpy = target->dpy;
780 XRenderPictureAttributes pa;
781
782 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
783 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
784
785 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
786 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
787
788 pa.repeat = True;
789 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
790 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
791 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
792 XFreePixmap (dpy, mask_pmap);
793
794 if (src && dst && mask)
795 {
796 XRenderColor mask_c;
797
798 mask_c.alpha = 0x8000;
799 mask_c.red = 0;
800 mask_c.green = 0;
801 mask_c.blue = 0;
802 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
803 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
804 }
805
806 XRenderFreePicture (dpy, src);
807 XRenderFreePicture (dpy, dst);
808 XRenderFreePicture (dpy, mask);
809
810 XFreePixmap (dpy, root_pmap);
811 }
812#endif
813
863 if (result != pixbuf) 814 if (result != pixbuf)
864 g_object_unref (result); 815 g_object_unref (result);
865 816
866 XFreeGC (target->dpy, gc); 817 XFreeGC (target->dpy, gc);
867 818
… …
873# endif /* HAVE_PIXBUF */ 824# endif /* HAVE_PIXBUF */
874 825
875bool 826bool
876bgPixmap_t::set_file (const char *file) 827bgPixmap_t::set_file (const char *file)
877{ 828{
878 assert (file); 829 if (!file || !*file)
830 return false;
879 831
880 if (*file)
881 {
882 if (const char *p = strchr (file, ';')) 832 if (const char *p = strchr (file, ';'))
883 { 833 {
884 size_t len = p - file; 834 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1); 835 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len); 836 memcpy (f, file, len);
887 f[len] = '\0'; 837 f[len] = '\0';
888 file = f; 838 file = f;
889 } 839 }
890 840
891# ifdef HAVE_AFTERIMAGE 841# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 842 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 843 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 844 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
845 if (image)
846 {
895 if (original_asim) 847 if (original_asim)
848 safe_asimage_destroy (original_asim);
849 original_asim = image;
896 have_image = true; 850 have_image = true;
897 return have_image; 851 return true;
852 }
898# endif 853# endif
899 854
900# ifdef HAVE_PIXBUF 855# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 856 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
857 if (image)
858 {
902 if (pixbuf) 859 if (pixbuf)
860 g_object_unref (pixbuf);
861 pixbuf = image;
903 have_image = true; 862 have_image = true;
904 return have_image; 863 return true;
864 }
905# endif 865# endif
906 }
907 866
908 return false; 867 return false;
909} 868}
910 869
911# endif /* BG_IMAGE_FROM_FILE */ 870# endif /* BG_IMAGE_FROM_FILE */
… …
924} 883}
925 884
926bool 885bool
927bgPixmap_t::set_blur_radius (const char *geom) 886bgPixmap_t::set_blur_radius (const char *geom)
928{ 887{
929 int changed = 0; 888 bool changed = false;
930 unsigned int hr, vr; 889 unsigned int hr, vr;
931 int junk; 890 int junk;
932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 891 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
933 892
934 if (!(geom_flags & WidthValue)) 893 if (!(geom_flags & WidthValue))
935 hr = 1; 894 hr = 1;
936 if (!(geom_flags & HeightValue)) 895 if (!(geom_flags & HeightValue))
937 vr = hr; 896 vr = hr;
938 897
898 min_it (hr, 128);
899 min_it (vr, 128);
900
939 if (h_blurRadius != hr) 901 if (h_blurRadius != hr)
940 { 902 {
941 ++changed; 903 changed = true;
942 h_blurRadius = hr; 904 h_blurRadius = hr;
943 } 905 }
944 906
945 if (v_blurRadius != vr) 907 if (v_blurRadius != vr)
946 { 908 {
947 ++changed; 909 changed = true;
948 v_blurRadius = vr; 910 v_blurRadius = vr;
949 } 911 }
950 912
951 if (v_blurRadius == 0 && h_blurRadius == 0) 913 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 914 flags &= ~blurNeeded;
953 else 915 else
954 flags |= blurNeeded; 916 flags |= blurNeeded;
955 917
956 return (changed > 0); 918 return changed;
957} 919}
958 920
959static inline unsigned long 921static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 922compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 923{
962 unsigned long flags = 0; 924 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 925 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 926 bool has_shade = shade != 100;
965 927
966 if (tint) 928 if (tint)
967 { 929 {
968 tint->get (c); 930 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 931# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
983 { 945 {
984 flags |= bgPixmap_t::tintNeeded; 946 flags |= bgPixmap_t::tintNeeded;
985 } 947 }
986 } 948 }
987 949
988 if (flags & bgPixmap_t::tintNeeded)
989 {
990 if (flags & bgPixmap_t::tintWholesome)
991 flags |= bgPixmap_t::tintServerSide;
992 else
993 {
994#if XFT
995 flags |= bgPixmap_t::tintServerSide;
996#endif
997 }
998 }
999
1000 return flags; 950 return flags;
1001} 951}
1002 952
1003bool 953bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 954bgPixmap_t::set_tint (rxvt_color &new_tint)
1005{ 955{
1006 if (tint != new_tint) 956 if (!(flags & tintSet) || tint != new_tint)
1007 { 957 {
1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 958 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1009 tint = new_tint; 959 tint = new_tint;
1010 flags = (flags & ~tintFlags) | new_flags | tintSet; 960 flags = (flags & ~tintFlags) | new_flags | tintSet;
1011 return true; 961 return true;
… …
1029} 979}
1030 980
1031bool 981bool
1032bgPixmap_t::set_shade (const char *shade_str) 982bgPixmap_t::set_shade (const char *shade_str)
1033{ 983{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 984 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 985
1036 if (new_shade < 0 && new_shade > -100) 986 clamp_it (new_shade, -100, 200);
987 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 988 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 989
1041 if (new_shade != shade) 990 if (new_shade != shade)
1042 { 991 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 992 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 993 shade = new_shade;
… …
1047 } 996 }
1048 997
1049 return false; 998 return false;
1050} 999}
1051 1000
1001#if XRENDER
1002static void
1003get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1004{
1005 double sigma = radius / 2.0;
1006 double scale = sqrt (2.0 * M_PI) * sigma;
1007 double sum = 0.0;
1008
1009 for (int i = 0; i < width; i++)
1010 {
1011 double x = i - width / 2;
1012 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1013 sum += kernel[i];
1014 }
1015
1016 params[0] = XDoubleToFixed (width);
1017 params[1] = XDoubleToFixed (1);
1018
1019 for (int i = 0; i < width; i++)
1020 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1021}
1022#endif
1023
1052bool 1024bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap) 1025bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1026{
1055 Window root = target->display->root; 1027 bool ret = false;
1028#if XRENDER
1029 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1030 double *kernel = (double *)malloc (size * sizeof (double));
1031 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1032
1056 Display *dpy = target->dpy; 1033 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width; 1034 XRenderPictureAttributes pa;
1058 int window_height = target->szHint.height; 1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1036
1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1039
1040 if (kernel && params && src && dst)
1041 {
1042 if (h_blurRadius)
1043 {
1044 size = h_blurRadius * 2 + 1;
1045 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1046
1047 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1048 XRenderComposite (dpy,
1049 PictOpSrc,
1050 src,
1051 None,
1052 dst,
1053 0, 0,
1054 0, 0,
1055 0, 0,
1056 width, height);
1057 }
1058
1059 if (v_blurRadius)
1060 {
1061 size = v_blurRadius * 2 + 1;
1062 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1063 swap (params[0], params[1]);
1064
1065 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1066 XRenderComposite (dpy,
1067 PictOpSrc,
1068 src,
1069 None,
1070 dst,
1071 0, 0,
1072 0, 0,
1073 0, 0,
1074 width, height);
1075 }
1076
1077 ret = true;
1078 }
1079
1080 free (kernel);
1081 free (params);
1082 XRenderFreePicture (dpy, src);
1083 XRenderFreePicture (dpy, dst);
1084#endif
1085 return ret;
1086}
1087
1088bool
1089bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1090{
1091 Display *dpy = target->dpy;
1059 bool ret = false; 1092 bool ret = false;
1060 1093
1061 if (flags & tintWholesome) 1094 if (flags & tintWholesome)
1062 { 1095 {
1063 XGCValues gcv; 1096 XGCValues gcv;
… …
1067 * performance improvements, as we eliminate XImage transfer 1100 * performance improvements, as we eliminate XImage transfer
1068 */ 1101 */
1069 gcv.foreground = Pixel (tint); 1102 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand; 1103 gcv.function = GXand;
1071 gcv.fill_style = FillSolid; 1104 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1105 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc) 1106 if (gc)
1074 { 1107 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1108 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1076 ret = true; 1109 ret = true;
1077 XFreeGC (dpy, gc); 1110 XFreeGC (dpy, gc);
1078 } 1111 }
1079 } 1112 }
1080 else 1113 else
1081 { 1114 {
1082# if XFT 1115# if XRENDER
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1116 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084 1117
1085 if (flags & tintSet) 1118 if (flags & tintSet)
1086 tint.get (c); 1119 tint.get (c);
1087 1120
1088 if (shade > 0 && shade < 100) 1121 if (shade <= 100)
1089 { 1122 {
1090 c.r = (c.r * shade) / 100; 1123 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100; 1124 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100; 1125 c.b = (c.b * shade) / 100;
1093 } 1126 }
1094 else if (shade > 100 && shade < 200) 1127 else
1095 {
1096 c.r = (c.r * (200 - shade)) / 100;
1097 c.g = (c.g * (200 - shade)) / 100;
1098 c.b = (c.b * (200 - shade)) / 100;
1099 } 1128 {
1129 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1130 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1131 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1132 }
1100 1133
1101 XRenderPictFormat pf; 1134 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1102 pf.type = PictTypeDirect;
1103 pf.depth = 32;
1104 pf.direct.redMask = 0xff;
1105 pf.direct.greenMask = 0xff;
1106 pf.direct.blueMask = 0xff;
1107 pf.direct.alphaMask = 0xff;
1108
1109 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1135 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1110 (PictFormatType|
1111 PictFormatDepth|
1112 PictFormatRedMask|
1113 PictFormatGreenMask|
1114 PictFormatBlueMask|
1115 PictFormatAlphaMask),
1116 &pf,
1117 0);
1118 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1119 XRenderPictureAttributes pa; 1136 XRenderPictureAttributes pa;
1120 1137
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1138 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1122 1139
1123 pa.repeat = True; 1140 pa.repeat = True;
1124 1141
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1142 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1143 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap); 1144 XFreePixmap (dpy, overlay_pmap);
1128 1145
1129 pa.component_alpha = True; 1146 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1147 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1148 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap); 1149 XFreePixmap (dpy, mask_pmap);
1133 1150
1134 if (mask_pic && overlay_pic && back_pic) 1151 if (mask_pic && overlay_pic && back_pic)
1135 { 1152 {
1136 XRenderColor mask_c; 1153 XRenderColor mask_c;
1137 1154
1138 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1155 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1139 mask_c.alpha = 0xffff; 1156 mask_c.alpha = 0xffff;
1140 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1157 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1141 1158
1142 mask_c.alpha = 0; 1159 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r; 1160 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g; 1161 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b; 1162 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1163 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1147 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1164 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1148 ret = true; 1165 ret = true;
1149 } 1166 }
1150 1167
1151 XRenderFreePicture (dpy, mask_pic); 1168 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic); 1169 XRenderFreePicture (dpy, overlay_pic);
1153 XRenderFreePicture (dpy, back_pic); 1170 XRenderFreePicture (dpy, back_pic);
1154# if DO_TIMING_TEST
1155 XSync (dpy, False);
1156# endif
1157# endif 1171# endif
1158 } 1172 }
1159 1173
1160 return ret; 1174 return ret;
1161} 1175}
1162 1176
1163/* make_transparency_pixmap() 1177/* make_transparency_pixmap()
1164 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1178 * Builds a pixmap of the same size as the terminal window that contains
1165 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1179 * the tiled portion of the root pixmap that is supposed to be covered by
1166 * our window. 1180 * our window.
1167 */ 1181 */
1168unsigned long 1182unsigned long
1169bgPixmap_t::make_transparency_pixmap () 1183bgPixmap_t::make_transparency_pixmap ()
1170{ 1184{
… …
1174 return 0; 1188 return 0;
1175 1189
1176 /* root dimensions may change from call to call - but Display structure should 1190 /* root dimensions may change from call to call - but Display structure should
1177 * be always up-to-date, so let's use it : 1191 * be always up-to-date, so let's use it :
1178 */ 1192 */
1179 Window root = target->display->root;
1180 int screen = target->display->screen; 1193 int screen = target->display->screen;
1181 Display *dpy = target->dpy; 1194 Display *dpy = target->dpy;
1195 int root_depth = DefaultDepth (dpy, screen);
1182 int root_width = DisplayWidth (dpy, screen); 1196 int root_width = DisplayWidth (dpy, screen);
1183 int root_height = DisplayHeight (dpy, screen); 1197 int root_height = DisplayHeight (dpy, screen);
1184 unsigned int root_pmap_width, root_pmap_height; 1198 unsigned int root_pmap_width, root_pmap_height;
1185 int window_width = target->szHint.width; 1199 int window_width = target->szHint.width;
1186 int window_height = target->szHint.height; 1200 int window_height = target->szHint.height;
1187 int sx, sy; 1201 int sx, sy;
1188 XGCValues gcv; 1202 XGCValues gcv;
1203 GC gc;
1189 1204
1190 TIMING_TEST_START (tp);
1191 target->get_window_origin (sx, sy); 1205 target->get_window_origin (sx, sy);
1192 1206
1193 /* check if we are outside of the visible part of the virtual screen : */ 1207 /* check if we are outside of the visible part of the virtual screen : */
1194 if (sx + window_width <= 0 || sy + window_height <= 0 1208 if (sx + window_width <= 0 || sy + window_height <= 0
1195 || sx >= root_width || sy >= root_height) 1209 || sx >= root_width || sy >= root_height)
1196 return 0; 1210 return 0;
1197 1211
1212 // validate root pixmap and get its size
1198 if (root_pixmap != None) 1213 if (root_pixmap != None)
1199 { 1214 {
1200 /* we want to validate the pixmap and get it's size at the same time : */ 1215 Window wdummy;
1201 int junk; 1216 int idummy;
1202 unsigned int ujunk; 1217 unsigned int udummy;
1203 /* root pixmap may be bad - allow a error */ 1218
1204 target->allowedxerror = -1; 1219 target->allowedxerror = -1;
1205 1220
1206 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1221 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1207 root_pixmap = None; 1222 root_pixmap = None;
1208 1223
1209 target->allowedxerror = 0; 1224 target->allowedxerror = 0;
1210 } 1225 }
1211 1226
1227 Pixmap recoded_root_pmap = root_pixmap;
1228
1229 if (root_pixmap != None && root_depth != target->depth)
1230 {
1231#if XRENDER
1232 if (flags & HAS_RENDER)
1233 {
1234 XRenderPictureAttributes pa;
1235
1236 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1237 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1238
1239 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1240 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1241 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1242
1243 if (src && dst)
1244 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1245 else
1246 {
1247 XFreePixmap (dpy, recoded_root_pmap);
1248 root_pixmap = None;
1249 }
1250
1251 XRenderFreePicture (dpy, src);
1252 XRenderFreePicture (dpy, dst);
1253 }
1254 else
1255#endif
1256 root_pixmap = None;
1257 }
1258
1259 if (root_pixmap == None)
1260 return 0;
1261
1212 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1262 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1213 GC gc = NULL;
1214 1263
1215 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1264 if (tiled_root_pmap == None) /* something really bad happened - abort */
1216 return 0; 1265 return 0;
1217 1266
1218 if (root_pixmap == None) 1267 /* straightforward pixmap copy */
1219 { 1268 gcv.tile = recoded_root_pmap;
1220 /* use tricks to obtain the root background image :*/ 1269 gcv.fill_style = FillTiled;
1221 /* we want to create Overrideredirect window overlapping out window
1222 with background type of Parent Relative and then grab it */
1223 XSetWindowAttributes attr;
1224 Window src;
1225 bool success = false;
1226 1270
1227 attr.background_pixmap = ParentRelative; 1271 while (sx < 0) sx += (int)root_width;
1228 attr.backing_store = Always; 1272 while (sy < 0) sy += (int)root_height;
1229 attr.event_mask = ExposureMask;
1230 attr.override_redirect = True;
1231 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1232 CopyFromParent, CopyFromParent, CopyFromParent,
1233 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1234 &attr);
1235 1273
1236 if (src != None) 1274 gcv.ts_x_origin = -sx;
1237 { 1275 gcv.ts_y_origin = -sy;
1238 XEvent event; 1276 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1239 int ev_count = 0;
1240 XGrabServer (dpy);
1241 XMapRaised (dpy, src);
1242 XSync (dpy, False);
1243 1277
1244 /* XSync should get window where it's properly exposed, 1278 if (gc)
1245 * but to be on the safe side - let's check for the actual event to arrive : */ 1279 {
1246 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1280 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1247 ++ev_count; 1281 result |= transpPmapTiled;
1282 XFreeGC (dpy, gc);
1248 1283
1249 if (ev_count > 0); 1284 if (!need_client_side_rendering ())
1285 {
1286 if ((flags & blurNeeded)
1287 && (flags & HAS_RENDER_CONV))
1250 { 1288 {
1251 /* hooray! - we can grab the image! */ 1289 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1252 gc = XCreateGC (dpy, root, 0, NULL); 1290 result |= transpPmapBlurred;
1253 if (gc)
1254 {
1255 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1256 success = true;
1257 }
1258 } 1291 }
1259
1260 XDestroyWindow (dpy, src);
1261 XUngrabServer (dpy);
1262 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1263 }
1264
1265 if (!success)
1266 {
1267 XFreePixmap (dpy, tiled_root_pmap);
1268 tiled_root_pmap = None;
1269 }
1270 else
1271 result |= transpPmapTiled;
1272 }
1273 else
1274 {
1275 /* straightforward pixmap copy */
1276 gcv.tile = root_pixmap;
1277 gcv.fill_style = FillTiled;
1278
1279 while (sx < 0) sx += (int)root_width;
1280 while (sy < 0) sy += (int)root_height;
1281
1282 gcv.ts_x_origin = -sx;
1283 gcv.ts_y_origin = -sy;
1284 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1285
1286 if (gc)
1287 {
1288 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1289 result |= transpPmapTiled;
1290 }
1291 }
1292 TIMING_TEST_PRINT_RESULT (tp);
1293
1294 if (tiled_root_pmap != None)
1295 {
1296 if (!need_client_side_rendering ())
1297 {
1298 if ((flags & tintNeeded)) 1292 if ((flags & tintNeeded)
1293 && (flags & (tintWholesome | HAS_RENDER)))
1299 { 1294 {
1300 if (tint_pixmap (tiled_root_pmap)) 1295 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1301 result |= transpPmapTinted; 1296 result |= transpPmapTinted;
1302 } 1297 }
1303 } /* server side rendering completed */ 1298 } /* server side rendering completed */
1304 1299
1305 if (pixmap) 1300 if (pixmap)
1306 XFreePixmap (dpy, pixmap); 1301 XFreePixmap (dpy, pixmap);
1307 1302
1308 pixmap = tiled_root_pmap; 1303 pixmap = tiled_root_pmap;
1309 pmap_width = window_width; 1304 pmap_width = window_width;
1310 pmap_height = window_height; 1305 pmap_height = window_height;
1311 pmap_depth = root_depth; 1306 pmap_depth = target->depth;
1312 } 1307 }
1308 else
1309 XFreePixmap (dpy, tiled_root_pmap);
1313 1310
1314 if (gc) 1311 if (recoded_root_pmap != root_pixmap)
1315 XFreeGC (dpy, gc); 1312 XFreePixmap (dpy, recoded_root_pmap);
1316
1317 TIMING_TEST_PRINT_RESULT (tp);
1318 1313
1319 return result; 1314 return result;
1320} 1315}
1321 1316
1322bool 1317void
1323bgPixmap_t::set_root_pixmap () 1318bgPixmap_t::set_root_pixmap ()
1324{ 1319{
1325 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1320 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1326 if (new_root_pixmap == None) 1321 if (new_root_pixmap == None)
1327 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1322 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1328 1323
1329 if (new_root_pixmap != root_pixmap)
1330 {
1331 root_pixmap = new_root_pixmap; 1324 root_pixmap = new_root_pixmap;
1332 return true;
1333 }
1334
1335 return false;
1336} 1325}
1337# endif /* ENABLE_TRANSPARENCY */ 1326# endif /* ENABLE_TRANSPARENCY */
1338 1327
1339# ifndef HAVE_AFTERIMAGE 1328#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1340static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1329static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1341# endif 1330# endif
1342 1331
1343bool 1332bool
1344bgPixmap_t::render () 1333bgPixmap_t::render ()
1345{ 1334{
1346 unsigned long background_flags = 0; 1335 unsigned long background_flags = 0;
1347 1336
1348 if (target == NULL) 1337 if (target == NULL)
1349 return false; 1338 return false;
1350
1351 TIMING_TEST_START (tp);
1352 1339
1353 invalidate (); 1340 invalidate ();
1354# ifdef ENABLE_TRANSPARENCY 1341# ifdef ENABLE_TRANSPARENCY
1355 if (flags & isTransparent) 1342 if (flags & isTransparent)
1356 { 1343 {
1357 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1358 background_flags = make_transparency_pixmap (); 1345 background_flags = make_transparency_pixmap ();
1359 if (background_flags == 0) 1346 if (background_flags == 0)
1360 return false; 1347 return false;
1361 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1348 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1362 && pmap_depth == target->depth)
1363 flags = flags & ~isInvalid; 1349 flags = flags & ~isInvalid;
1364 } 1350 }
1365# endif 1351# endif
1366 1352
1367# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
… …
1371 if (render_image (background_flags)) 1357 if (render_image (background_flags))
1372 flags = flags & ~isInvalid; 1358 flags = flags & ~isInvalid;
1373 } 1359 }
1374# endif 1360# endif
1375 1361
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1376 XImage *result = NULL; 1363 XImage *result = NULL;
1377 1364
1378 if (background_flags && (flags & isInvalid)) 1365 if (background_flags && (flags & isInvalid))
1379 { 1366 {
1380 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1367 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1381 } 1368 }
1382 1369
1383 if (result) 1370 if (result)
1384 { 1371 {
1385# if !defined(HAVE_AFTERIMAGE) && !XFT
1386 /* our own client-side tinting */ 1372 /* our own client-side tinting */
1387 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1388 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1389 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1373 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1390 { 1374 {
1391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1392 if (flags & tintSet) 1376 if (flags & tintSet)
1393 tint.get (c); 1377 tint.get (c);
1394 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1378 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1395 } 1379 }
1396# endif
1397 1380
1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1399 1382
1400 if (gc) 1383 if (gc)
1401 { 1384 {
1402 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1403 {
1404 XFreePixmap (target->dpy, pixmap);
1405 pixmap = None;
1406 }
1407
1408 if (pixmap == None)
1409 {
1410 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1411 pmap_width = result->width;
1412 pmap_height = result->height;
1413 pmap_depth = target->depth;
1414 }
1415
1416 if (pmap_depth != result->depth)
1417 {
1418 /* Bad Match error will ensue ! stupid X !!!! */
1419 if (result->depth == 24 && pmap_depth == 32)
1420 result->depth = 32;
1421 else if (result->depth == 32 && pmap_depth == 24)
1422 result->depth = 24;
1423 else
1424 {
1425 /* TODO: implement image recoding */
1426 }
1427 }
1428
1429 if (pmap_depth == result->depth)
1430 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1385 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1431 1386
1432 XFreeGC (target->dpy, gc); 1387 XFreeGC (target->dpy, gc);
1433 flags = flags & ~isInvalid; 1388 flags = flags & ~isInvalid;
1434 } 1389 }
1435 1390
1436 XDestroyImage (result); 1391 XDestroyImage (result);
1437 } 1392 }
1393# endif
1438 1394
1439 if (flags & isInvalid) 1395 if (flags & isInvalid)
1440 { 1396 {
1441 if (pixmap != None) 1397 if (pixmap != None)
1442 { 1398 {
… …
1445 } 1401 }
1446 } 1402 }
1447 1403
1448 apply (); 1404 apply ();
1449 1405
1450 XSync (target->dpy, False);
1451 valid_since = ev::now (); 1406 valid_since = ev::now ();
1452 1407
1453 TIMING_TEST_PRINT_RESULT (tp);
1454
1455 return true; 1408 return true;
1456} 1409}
1457 1410
1458bool 1411void
1459bgPixmap_t::set_target (rxvt_term *new_target) 1412bgPixmap_t::set_target (rxvt_term *new_target)
1460{ 1413{
1461 if (new_target)
1462 if (target != new_target)
1463 {
1464 target = new_target; 1414 target = new_target;
1465# ifdef ENABLE_TRANSPARENCY 1415
1466 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1416 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1417#if XRENDER
1418 int major, minor;
1419 if (XRenderQueryVersion (target->dpy, &major, &minor))
1420 flags |= HAS_RENDER;
1421 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1422 if (filters)
1423 {
1424 for (int i = 0; i < filters->nfilter; i++)
1425 if (!strcmp (filters->filter[i], FilterConvolution))
1426 flags |= HAS_RENDER_CONV;
1427
1428 XFree (filters);
1429 }
1467# endif 1430#endif
1468 return true;
1469 }
1470
1471 return false;
1472} 1431}
1473 1432
1474void 1433void
1475bgPixmap_t::apply () 1434bgPixmap_t::apply ()
1476{ 1435{
1477 if (target) 1436 if (target == NULL)
1478 { 1437 return;
1479 flags &= ~isVtOrigin;
1480 1438
1481 if (pixmap != None) 1439 if (pixmap != None)
1482 { 1440 {
1483 /* set target's background to pixmap */ 1441 /* set target's background to pixmap */
1484# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1485 if (flags & isTransparent) 1443 if (flags & isTransparent)
1486 { 1444 {
1487 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1445 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1488 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1446 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1489 1447
1490 if (target->scrollBar.win) 1448 if (target->scrollBar.win)
1491 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1449 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1492 } 1450 }
1493 else 1451 else
1494# endif 1452# endif
1495 { 1453 {
1496 flags |= isVtOrigin;
1497 /* force old pixmap dereference in case it was transparent before :*/ 1454 /* force old pixmap dereference in case it was transparent before :*/
1498 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1499 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1500 /* do we also need to set scrollbar's background here ? */
1501
1502 if (target->scrollBar.win)
1503 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1504 }
1505 }
1506 else
1507 {
1508 /* set target background to a pixel */
1509 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1455 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1510 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1456 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1511 /* do we also need to set scrollbar's background here ? */ 1457 /* do we also need to set scrollbar's background here ? */
1458
1512 if (target->scrollBar.win) 1459 if (target->scrollBar.win)
1513 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1460 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1514 } 1461 }
1462 }
1463 else
1464 {
1465 /* set target background to a pixel */
1466 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1467 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1468 /* do we also need to set scrollbar's background here ? */
1469 if (target->scrollBar.win)
1470 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1471 }
1515 1472
1516 /* don't want Expose on the parent or vt. It is better to use 1473 /* don't want Expose on the parent or vt. It is better to use
1517 scr_touch or we get a great deal of flicker otherwise: */ 1474 scr_touch or we get a great deal of flicker otherwise: */
1518 XClearWindow (target->dpy, target->parent[0]); 1475 XClearWindow (target->dpy, target->parent[0]);
1519 1476
1520 if (target->scrollBar.state && target->scrollBar.win) 1477 if (target->scrollBar.state && target->scrollBar.win)
1521 { 1478 {
1522 target->scrollBar.state = STATE_IDLE; 1479 target->scrollBar.state = STATE_IDLE;
1523 target->scrollBar.show (0); 1480 target->scrollBar.show (0);
1524 } 1481 }
1525 1482
1526 target->want_refresh = 1; 1483 target->want_refresh = 1;
1527 flags |= hasChanged; 1484 flags |= hasChanged;
1528 }
1529} 1485}
1530 1486
1531#endif /* HAVE_BG_PIXMAP */ 1487#endif /* HAVE_BG_PIXMAP */
1532 1488
1533#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1489#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1534/* taken from aterm-0.4.2 */ 1490/* taken from aterm-0.4.2 */
1535 1491
1536typedef uint32_t RUINT32T;
1537
1538static void 1492static void
1539ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1493ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1540{ 1494{
1541 int sh_r, sh_g, sh_b; 1495 int sh_r, sh_g, sh_b;
1542 RUINT32T mask_r, mask_g, mask_b; 1496 uint32_t mask_r, mask_g, mask_b;
1543 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1497 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1544 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1498 rgba low;
1545 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1499 rgba high;
1546 int i; 1500 int i;
1501 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1547 1502
1548 Visual *visual = term->visual;
1549
1550 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1503 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1551
1552 if (shade == 0)
1553 shade = 100;
1554 1504
1555 /* for convenience */ 1505 /* for convenience */
1556 mask_r = visual->red_mask; 1506 mask_r = visual->red_mask;
1557 mask_g = visual->green_mask; 1507 mask_g = visual->green_mask;
1558 mask_b = visual->blue_mask; 1508 mask_b = visual->blue_mask;
1559 1509
1560 /* boring lookup table pre-initialization */ 1510 /* boring lookup table pre-initialization */
1561 switch (srcImage->bits_per_pixel) { 1511 switch (srcImage->depth)
1512 {
1562 case 15: 1513 case 15:
1563 if ((mask_r != 0x7c00) || 1514 if ((mask_r != 0x7c00) ||
1564 (mask_g != 0x03e0) || 1515 (mask_g != 0x03e0) ||
1565 (mask_b != 0x001f)) 1516 (mask_b != 0x001f))
1566 return; 1517 return;
1567 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1518 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1568 lookup_r = lookup; 1519 lookup_r = lookup;
1569 lookup_g = lookup+32; 1520 lookup_g = lookup+32;
1570 lookup_b = lookup+32+32; 1521 lookup_b = lookup+32+32;
1571 sh_r = 10; 1522 sh_r = 10;
1572 sh_g = 5; 1523 sh_g = 5;
1573 sh_b = 0; 1524 sh_b = 0;
1574 break; 1525 break;
1575 case 16: 1526 case 16:
1576 if ((mask_r != 0xf800) || 1527 if ((mask_r != 0xf800) ||
1577 (mask_g != 0x07e0) || 1528 (mask_g != 0x07e0) ||
1578 (mask_b != 0x001f)) 1529 (mask_b != 0x001f))
1579 return; 1530 return;
1580 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1531 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1581 lookup_r = lookup; 1532 lookup_r = lookup;
1582 lookup_g = lookup+32; 1533 lookup_g = lookup+32;
1583 lookup_b = lookup+32+64; 1534 lookup_b = lookup+32+64;
1584 sh_r = 11; 1535 sh_r = 11;
1585 sh_g = 5; 1536 sh_g = 5;
1586 sh_b = 0; 1537 sh_b = 0;
1587 break; 1538 break;
1588 case 24: 1539 case 24:
1589 if ((mask_r != 0xff0000) || 1540 if ((mask_r != 0xff0000) ||
1590 (mask_g != 0x00ff00) || 1541 (mask_g != 0x00ff00) ||
1591 (mask_b != 0x0000ff)) 1542 (mask_b != 0x0000ff))
1592 return; 1543 return;
1593 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1544 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1594 lookup_r = lookup; 1545 lookup_r = lookup;
1595 lookup_g = lookup+256; 1546 lookup_g = lookup+256;
1596 lookup_b = lookup+256+256; 1547 lookup_b = lookup+256+256;
1597 sh_r = 16; 1548 sh_r = 16;
1598 sh_g = 8; 1549 sh_g = 8;
1599 sh_b = 0; 1550 sh_b = 0;
1600 break; 1551 break;
1601 case 32: 1552 case 32:
1602 if ((mask_r != 0xff0000) || 1553 if ((mask_r != 0xff0000) ||
1603 (mask_g != 0x00ff00) || 1554 (mask_g != 0x00ff00) ||
1604 (mask_b != 0x0000ff)) 1555 (mask_b != 0x0000ff))
1605 return; 1556 return;
1606 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1557 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1607 lookup_r = lookup; 1558 lookup_r = lookup;
1608 lookup_g = lookup+256; 1559 lookup_g = lookup+256;
1609 lookup_b = lookup+256+256; 1560 lookup_b = lookup+256+256;
1610 sh_r = 16; 1561 sh_r = 16;
1611 sh_g = 8; 1562 sh_g = 8;
1612 sh_b = 0; 1563 sh_b = 0;
1613 break; 1564 break;
1614 default: 1565 default:
1615 return; /* we do not support this color depth */ 1566 return; /* we do not support this color depth */
1616 } 1567 }
1617 1568
1618 /* prepare limits for color transformation (each channel is handled separately) */ 1569 /* prepare limits for color transformation (each channel is handled separately) */
1619 if (shade < 0) { 1570 if (shade > 100)
1571 {
1620 shade = -shade; 1572 shade = 200 - shade;
1621 if (shade < 0) shade = 0;
1622 if (shade > 100) shade = 100;
1623 1573
1624 lower_lim_r = 65535-rm; 1574 high.r = (65535 - c.r) * shade / 100;
1625 lower_lim_g = 65535-gm; 1575 high.g = (65535 - c.g) * shade / 100;
1626 lower_lim_b = 65535-bm; 1576 high.b = (65535 - c.b) * shade / 100;
1627 1577
1628 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1578 low.r = 65535 - high.r;
1629 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1579 low.g = 65535 - high.g;
1630 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1580 low.b = 65535 - high.b;
1631
1632 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1633 } else {
1634 if (shade < 0) shade = 0;
1635 if (shade > 100) shade = 100;
1636
1637 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1638
1639 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1640 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1641 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1642 } 1581 }
1643 1582 else
1644 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1645 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1646 { 1583 {
1647 unsigned int tmp; 1584 high.r = c.r * shade / 100;
1585 high.g = c.g * shade / 100;
1586 high.b = c.b * shade / 100;
1648 1587
1649 tmp = lower_lim_r; 1588 low.r = low.g = low.b = 0;
1650 lower_lim_r = lower_lim_b;
1651 lower_lim_b = tmp;
1652
1653 tmp = upper_lim_r;
1654 upper_lim_r = upper_lim_b;
1655 upper_lim_b = tmp;
1656 } 1589 }
1657 1590
1658 /* fill our lookup tables */ 1591 /* fill our lookup tables */
1659 for (i = 0; i <= mask_r>>sh_r; i++) 1592 for (i = 0; i <= mask_r>>sh_r; i++)
1660 { 1593 {
1661 RUINT32T tmp; 1594 uint32_t tmp;
1662 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1595 tmp = i * high.r;
1663 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1596 tmp += (mask_r>>sh_r) * low.r;
1664 lookup_r[i] = (tmp/65535)<<sh_r; 1597 lookup_r[i] = (tmp/65535)<<sh_r;
1665 } 1598 }
1666 for (i = 0; i <= mask_g>>sh_g; i++) 1599 for (i = 0; i <= mask_g>>sh_g; i++)
1667 { 1600 {
1668 RUINT32T tmp; 1601 uint32_t tmp;
1669 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1602 tmp = i * high.g;
1670 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1603 tmp += (mask_g>>sh_g) * low.g;
1671 lookup_g[i] = (tmp/65535)<<sh_g; 1604 lookup_g[i] = (tmp/65535)<<sh_g;
1672 } 1605 }
1673 for (i = 0; i <= mask_b>>sh_b; i++) 1606 for (i = 0; i <= mask_b>>sh_b; i++)
1674 { 1607 {
1675 RUINT32T tmp; 1608 uint32_t tmp;
1676 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1609 tmp = i * high.b;
1677 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1610 tmp += (mask_b>>sh_b) * low.b;
1678 lookup_b[i] = (tmp/65535)<<sh_b; 1611 lookup_b[i] = (tmp/65535)<<sh_b;
1679 } 1612 }
1680 1613
1681 /* apply table to input image (replacing colors by newly calculated ones) */ 1614 /* apply table to input image (replacing colors by newly calculated ones) */
1682 switch (srcImage->bits_per_pixel) 1615 if (srcImage->bits_per_pixel == 32
1616 && (srcImage->depth == 24 || srcImage->depth == 32)
1617 && srcImage->byte_order == host_byte_order)
1683 { 1618 {
1684 case 15:
1685 {
1686 unsigned short *p1, *pf, *p, *pl; 1619 uint32_t *p1, *pf, *p, *pl;
1687 p1 = (unsigned short *) srcImage->data; 1620 p1 = (uint32_t *) srcImage->data;
1688 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1621 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1622
1689 while (p1 < pf) 1623 while (p1 < pf)
1690 { 1624 {
1691 p = p1; 1625 p = p1;
1692 pl = p1 + srcImage->width; 1626 pl = p1 + srcImage->width;
1693 for (; p < pl; p++) 1627 for (; p < pl; p++)
1694 { 1628 {
1695 *p = lookup_r[(*p & 0x7c00)>>10] |
1696 lookup_g[(*p & 0x03e0)>> 5] |
1697 lookup_b[(*p & 0x001f)];
1698 }
1699 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1700 }
1701 break;
1702 }
1703 case 16:
1704 {
1705 unsigned short *p1, *pf, *p, *pl;
1706 p1 = (unsigned short *) srcImage->data;
1707 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1708 while (p1 < pf)
1709 {
1710 p = p1;
1711 pl = p1 + srcImage->width;
1712 for (; p < pl; p++)
1713 {
1714 *p = lookup_r[(*p & 0xf800)>>11] |
1715 lookup_g[(*p & 0x07e0)>> 5] |
1716 lookup_b[(*p & 0x001f)];
1717 }
1718 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1719 }
1720 break;
1721 }
1722 case 24:
1723 {
1724 unsigned char *p1, *pf, *p, *pl;
1725 p1 = (unsigned char *) srcImage->data;
1726 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1727 while (p1 < pf)
1728 {
1729 p = p1;
1730 pl = p1 + srcImage->width * 3;
1731 for (; p < pl; p += 3)
1732 {
1733 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1734 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1735 p[2] = lookup_r[(p[2] & 0x0000ff)];
1736 }
1737 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1738 }
1739 break;
1740 }
1741 case 32:
1742 {
1743 RUINT32T *p1, *pf, *p, *pl;
1744 p1 = (RUINT32T *) srcImage->data;
1745 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1746
1747 while (p1 < pf)
1748 {
1749 p = p1;
1750 pl = p1 + srcImage->width;
1751 for (; p < pl; p++)
1752 {
1753 *p = lookup_r[(*p & 0xff0000)>>16] | 1629 *p = lookup_r[(*p & 0xff0000) >> 16] |
1754 lookup_g[(*p & 0x00ff00)>> 8] | 1630 lookup_g[(*p & 0x00ff00) >> 8] |
1755 lookup_b[(*p & 0x0000ff)] | 1631 lookup_b[(*p & 0x0000ff)] |
1756 (*p & ~0xffffff); 1632 (*p & 0xff000000);
1633 }
1634 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1635 }
1636 }
1637 else
1638 {
1639 for (int y = 0; y < srcImage->height; y++)
1640 for (int x = 0; x < srcImage->width; x++)
1641 {
1642 unsigned long pixel = XGetPixel (srcImage, x, y);
1643 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1644 lookup_g[(pixel & mask_g) >> sh_g] |
1645 lookup_b[(pixel & mask_b) >> sh_b];
1646 XPutPixel (srcImage, x, y, pixel);
1757 } 1647 }
1758 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1759 } 1648 }
1760 break;
1761 }
1762 }
1763 1649
1764 free (lookup); 1650 free (lookup);
1765} 1651}
1766#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1652#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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