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.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs.
Revision 1.94 by sf-exg, Wed Oct 20 09:04:55 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 */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
52 * adjustment and may optionally be followed by a colon and one or more 54 * adjustment and may optionally be followed by a colon and one or more
53 * colon-delimited pixmap operations. 55 * colon-delimited pixmap operations.
54 * The following table shows the valid geometry strings and their 56 * The following table shows the valid geometry strings and their
55 * effects on the background image : 57 * effects on the background image :
56 * 58 *
57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 59 * 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. 60 * W and H are percentages of the terminal window size.
59 * X and Y are also percentages; e.g., +50+50 centers 61 * X and Y are also percentages; e.g., +50+50 centers
60 * the image in the window. 62 * the image in the window.
61 * WxH+X Assumes Y == X 63 * WxH+X Assumes Y == X
62 * WxH Assumes Y == X == 50 (centers the image) 64 * WxH Assumes Y == X == 50 (centers the image)
63 * W+X+Y Assumes H == W 65 * W+X+Y Assumes H == W
64 * W+X Assumes H == W and Y == X 66 * W+X Assumes H == W and Y == X
65 * W Assumes H == W and Y == X == 50 67 * W Assumes H == W and Y == X == 50
66 * 68 *
67 * Adjusting position only : 69 * Adjusting position only :
68 * =+X+Y Set position to X% by Y% (absolute). 70 * =+X+Y Set position to X% by Y% (absolute).
69 * =+X Set position to X% by X%. 71 * =+X Set position to X% by X%.
70 * +X+Y Adjust position horizontally X% and vertically Y% 72 * +X+Y Adjust position horizontally X% and vertically Y%
71 * from current position (relative). 73 * from current position (relative).
72 * +X Adjust position horizontally X% and vertically X% 74 * +X Adjust position horizontally X% and vertically X%
73 * from current position. 75 * from current position.
74 * 76 *
75 * Adjusting scale only : 77 * Adjusting scale only :
76 * Wx0 Multiply horizontal scaling factor by W% 78 * Wx0 Multiply horizontal scaling factor by W%
77 * 0xH Multiply vertical scaling factor by H% 79 * 0xH Multiply vertical scaling factor by H%
78 * 0x0 No scaling (show image at normal size). 80 * 0x0 No scaling (show image at normal size).
79 * 81 *
80 * Pixmap Operations : (should be prepended by a colon) 82 * Pixmap Operations : (should be prepended by a colon)
81 * tile Tile image. Scaling/position modifiers above will affect 83 * tile Tile image. Scaling/position modifiers above will affect
82 * the tile size and origin. 84 * the tile size and origin.
83 * propscale When scaling, scale proportionally. That is, maintain the 85 * propscale When scaling, scale proportionally. That is, maintain the
84 * proper aspect ratio for the image. Any portion of the 86 * proper aspect ratio for the image. Any portion of the
85 * background not covered by the image is filled with the 87 * background not covered by the image is filled with the
86 * current background color. 88 * current background color.
87 * hscale Scale horizontally, tile vertically ? 89 * hscale Scale horizontally, tile vertically ?
88 * vscale Tile horizontally, scale vertically ? 90 * vscale Tile horizontally, scale vertically ?
96 // this is basically redundant as bgPixmap_t is only used in 98 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs 99 // zero_initialised-derived structs
98#ifdef HAVE_AFTERIMAGE 100#ifdef HAVE_AFTERIMAGE
99 original_asim = NULL; 101 original_asim = NULL;
100#endif 102#endif
103#ifdef HAVE_PIXBUF
104 pixbuf = NULL;
105#endif
101#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
107 have_image = false;
102 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
103 h_align = v_align = 0; 109 h_align = v_align = 0;
110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
104#endif 113#endif
105 flags = 0; 114 flags = 0;
106 pixmap = None; 115 pixmap = None;
107 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
108 target = 0; 117 target = 0;
114#ifdef HAVE_AFTERIMAGE 123#ifdef HAVE_AFTERIMAGE
115 if (original_asim) 124 if (original_asim)
116 safe_asimage_destroy (original_asim); 125 safe_asimage_destroy (original_asim);
117#endif 126#endif
118 127
128#ifdef HAVE_PIXBUF
129 if (pixbuf)
130 g_object_unref (pixbuf);
131#endif
132
119 if (pixmap && target) 133 if (pixmap && target)
120 XFreePixmap (target->dpy, pixmap); 134 XFreePixmap (target->dpy, pixmap);
121} 135}
122 136
123bool 137bool
127 if (flags & isTransparent) 141 if (flags & isTransparent)
128 return true; 142 return true;
129# endif 143# endif
130 144
131# ifdef BG_IMAGE_FROM_FILE 145# ifdef BG_IMAGE_FROM_FILE
132# ifdef HAVE_AFTERIMAGE 146 if (have_image)
133 if (original_asim)
134# endif
135 { 147 {
136 if (h_scale != 0 || v_scale != 0 148 if (flags & sizeSensitive)
137 || h_align != 0 || v_align != 0)
138 return true; 149 return true;
139 } 150 }
140# endif 151# endif
141 152
142 return false; 153 return false;
149 if (flags & isTransparent) 160 if (flags & isTransparent)
150 return true; 161 return true;
151# endif 162# endif
152 163
153# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
154# ifdef HAVE_AFTERIMAGE 165 if (have_image)
155 if (original_asim)
156# endif
157 { 166 {
158 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
159 return true; 168 return true;
160 } 169 }
161# endif 170# endif
162 171
163 return false; 172 return false;
167{ 176{
168# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
169 if (original_asim) 178 if (original_asim)
170 return true; 179 return true;
171# endif 180# endif
172# ifdef ENABLE_TRANSPARENCY
173 if (flags & isTransparent)
174 {
175# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
176 if ((flags & blurNeeded) && !(flags & blurServerSide))
177 return true;
178# endif
179 if ((flags & tintNeeded) && !(flags & tintServerSide))
180 return true;
181 }
182# endif
183 return false; 181 return false;
184} 182}
185 183
186# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
187static inline bool 185static inline bool
203static inline bool 201static inline bool
204check_set_align_value (int geom_flags, int flag, int &align, int new_value) 202check_set_align_value (int geom_flags, int flag, int &align, int new_value)
205{ 203{
206 if (geom_flags & flag) 204 if (geom_flags & flag)
207 { 205 {
208 if (new_value != bgPixmap_t::rootAlign)
209 {
210 if (new_value < -100) 206 if (new_value < -100)
211 new_value = -100; 207 new_value = -100;
212 else if (new_value > 200) 208 else if (new_value > 200)
213 new_value = 200; 209 new_value = 200;
214 }
215 if (new_value != align) 210 if (new_value != align)
216 { 211 {
217 align = new_value; 212 align = new_value;
218 return true; 213 return true;
219 } 214 }
223 218
224static inline int 219static inline int
225make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
226{ 221{
227 int diff = window_size - image_size; 222 int diff = window_size - image_size;
228 int smaller = MIN (image_size,window_size); 223 int smaller = min (image_size, window_size);
229 224
230 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
231 return diff * align / 100; 226 return diff * align / 100;
232 else if (align > 50 && align <= 100)
233 return window_size - image_size - diff * (100 - align) / 100;
234 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
235 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
236 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
237 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
238 return 0; 231 return 0;
239} 232}
240 233
241static inline int 234static inline int
242make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
243{ 236{
244 int src_pos = 0; 237 int src_pos = 0;
245 dst_pos = 0; 238 dst_pos = pos;
246 dst_size = size; 239 dst_size = size;
247 if (pos < 0 && size > target_size) 240 if (pos < 0)
248 { 241 {
249 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
250 dst_size += pos; 244 dst_size += pos;
251 } 245 }
252 else if (pos > 0)
253 dst_pos = pos;
254 246
255 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
256 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
257 return src_pos; 249 return src_pos;
258} 250}
383 w = h = noScale; 375 w = h = noScale;
384 geom_flags |= WidthValue|HeightValue; 376 geom_flags |= WidthValue|HeightValue;
385 } 377 }
386 else if (CHECK_GEOM_OPS ("propscale")) 378 else if (CHECK_GEOM_OPS ("propscale"))
387 { 379 {
388 if (w == 0 && h == 0)
389 {
390 w = windowScale;
391 geom_flags |= WidthValue;
392 }
393 new_flags |= propScale; 380 new_flags |= propScale;
394 } 381 }
395 else if (CHECK_GEOM_OPS ("hscale")) 382 else if (CHECK_GEOM_OPS ("hscale"))
396 { 383 {
397 if (w == 0) w = windowScale; 384 if (w == 0) w = windowScale;
419 x = y = centerAlign; 406 x = y = centerAlign;
420 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
421 } 408 }
422 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
423 { 410 {
411 new_flags |= rootAlign;
424 w = h = noScale; 412 w = h = noScale;
425 x = y = rootAlign;
426 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
427 } 414 }
428# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
429 416
430 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
431 } /* done parsing ops */ 418 } /* done parsing ops */
441 { 428 {
442 flags = new_flags; 429 flags = new_flags;
443 changed++; 430 changed++;
444 } 431 }
445 432
446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447// flags, h_scale, v_scale, h_align, v_align); 434 // flags, h_scale, v_scale, h_align, v_align);
448 return (changed > 0); 435 return (changed > 0);
436}
437
438void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{
441 int target_width = target->szHint.width;
442 int target_height = target->szHint.height;
443
444 if (flags & propScale)
445 {
446 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5;
450 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
460 if (flags & rootAlign)
461 {
462 target->get_window_origin (x, y);
463 x = -x;
464 y = -y;
465 }
466 else
467 {
468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h);
470 }
471
472 flags &= ~sizeSensitive;
473 if ((flags & propScale) || h_scale || v_scale
474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height)
476 flags |= sizeSensitive;
449} 477}
450 478
451# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
452bool 480bool
453bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
454{ 482{
455 if (target == NULL) 483 if (target == NULL)
456 return false; 484 return false;
457 485
458 target->init_asv (); 486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
459 522
460 ASImage *result = 0; 523 ASImage *result = 0;
461 524
462 int target_width = target->szHint.width; 525 int target_width = target->szHint.width;
463 int target_height = target->szHint.height; 526 int target_height = target->szHint.height;
464 int new_pmap_width = target_width; 527 int new_pmap_width = target_width;
465 int new_pmap_height = target_height; 528 int new_pmap_height = target_height;
466 529
467 int x = 0; 530 int x = 0;
468 int y = 0; 531 int y = 0;
469 int w = h_scale * target_width / 100; 532 int w = 0;
470 int h = v_scale * target_height / 100; 533 int h = 0;
471 534
472 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
473 536
474 if (original_asim) 537 if (original_asim)
475 { 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
476 if (h_align == rootAlign || v_align == rootAlign)
477 {
478 target->get_window_origin(x, y);
479 x = -x;
480 y = -y;
481 }
482
483 if (h_align != rootAlign)
484 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
485
486 if (v_align != rootAlign)
487 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
488 }
489 539
490 if (!original_asim 540 if (!original_asim
541 || (!(flags & rootAlign)
491 || x >= target_width 542 && (x >= target_width
492 || y >= target_height 543 || y >= target_height
493 || (w > 0 && x + w <= 0) 544 || (x + w <= 0)
494 || (h > 0 && y + h <= 0)) 545 || (y + h <= 0))))
495 { 546 {
496 if (background) 547 if (background)
497 { 548 {
498 new_pmap_width = background->width; 549 new_pmap_width = background->width;
499 new_pmap_height = background->height; 550 new_pmap_height = background->height;
513 } 564 }
514 else 565 else
515 { 566 {
516 result = original_asim; 567 result = original_asim;
517 568
518 if ((w > 0 && w != original_asim->width) 569 if ((w != original_asim->width)
519 || (h > 0 && h != original_asim->height)) 570 || (h != original_asim->height))
520 { 571 {
521 result = scale_asimage (target->asv, original_asim, 572 result = scale_asimage (target->asv, original_asim,
522 w > 0 ? w : original_asim->width, 573 w, h,
523 h > 0 ? h : original_asim->height,
524 background ? ASA_ASImage : ASA_XImage, 574 background ? ASA_ASImage : ASA_XImage,
525 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
526 } 576 }
527 577
528 if (background == NULL) 578 if (background == NULL)
529 { 579 {
530 /* if tiling - pixmap has to be sized exactly as the image,
531 but there is no need to make it bigger than the window! */
532 if (h_scale == 0)
533 new_pmap_width = min (result->width, target_width);
534 if (v_scale == 0)
535 new_pmap_height = min (result->height, target_height);
536 /* we also need to tile our image in one or both directions */
537 if (h_scale == 0 || v_scale == 0) 580 if (h_scale == 0 || v_scale == 0)
538 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
539 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
540 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
541 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
542 new_pmap_width, 591 new_pmap_width,
543 new_pmap_height, 592 new_pmap_height,
544 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
545 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
546 if (tmp) 595 if (tmp)
561 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
562 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
563 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
564 layers[1].im = result; 613 layers[1].im = result;
565 614
566 if (w <= 0) 615 if (h_scale == 0 || v_scale == 0)
567 { 616 {
568 /* tile horizontally */ 617 /* tile horizontally */
569 while (x > 0) x -= (int)result->width; 618 while (x > 0) x -= (int)result->width;
570 layers[1].dst_x = x; 619 layers[1].dst_x = x;
571 layers[1].clip_width = result->width+target_width; 620 layers[1].clip_width = result->width+target_width;
575 /* clip horizontally */ 624 /* clip horizontally */
576 layers[1].dst_x = x; 625 layers[1].dst_x = x;
577 layers[1].clip_width = result->width; 626 layers[1].clip_width = result->width;
578 } 627 }
579 628
580 if (h <= 0) 629 if (h_scale == 0 || v_scale == 0)
581 { 630 {
582 while (y > 0) y -= (int)result->height; 631 while (y > 0) y -= (int)result->height;
583 layers[1].dst_y = y; 632 layers[1].dst_y = y;
584 layers[1].clip_height = result->height + target_height; 633 layers[1].clip_height = result->height + target_height;
585 } 634 }
610 free (layers); 659 free (layers);
611 } 660 }
612 } 661 }
613 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
614 663
615 if (pixmap) 664 bool ret = false;
616 {
617 if (result == NULL
618 || pmap_width != new_pmap_width
619 || pmap_height != new_pmap_height
620 || pmap_depth != target->depth)
621 {
622 XFreePixmap (target->dpy, pixmap);
623 pixmap = None;
624 }
625 }
626 665
627 if (result) 666 if (result)
628 { 667 {
629 XGCValues gcv; 668 XGCValues gcv;
630 GC gc; 669 GC gc;
670
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
631 681
632 /* create Pixmap */ 682 /* create Pixmap */
633 if (pixmap == None) 683 if (pixmap == None)
634 { 684 {
635 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
636 pmap_width = new_pmap_width; 686 pmap_width = new_pmap_width;
637 pmap_height = new_pmap_height; 687 pmap_height = new_pmap_height;
638 pmap_depth = target->depth; 688 pmap_depth = target->depth;
639 } 689 }
640 /* fill with background color ( if result's not completely overlapping it)*/ 690 /* fill with background color (if result's not completely overlapping it) */
641 gcv.foreground = target->pix_colors[Color_bg]; 691 gcv.foreground = target->pix_colors[Color_bg];
642 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
643 693
644 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
645 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
646 if (background == NULL) 696 if (background == NULL)
647 { 697 {
698 if (!(h_scale == 0 || v_scale == 0))
699 {
648 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
649 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
650 703
651 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
652 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
653 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
654 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
661 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
662 destroy_asimage (&result); 715 destroy_asimage (&result);
663 716
664 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
665 TIMING_TEST_PRINT_RESULT (asim); 718 TIMING_TEST_PRINT_RESULT (asim);
666 }
667 719
720 ret = true;
721 }
722
723 if (background)
724 destroy_asimage (&background);
725
668 return true; 726 return ret;
669} 727}
670# endif /* HAVE_AFTERIMAGE */ 728# endif /* HAVE_AFTERIMAGE */
729
730# ifdef HAVE_PIXBUF
731bool
732bgPixmap_t::render_image (unsigned long background_flags)
733{
734 if (target == NULL)
735 return false;
736
737 if (!pixbuf)
738 return false;
739
740#if !XFT
741 if (background_flags)
742 return false;
743#endif
744
745 GdkPixbuf *result;
746
747 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf);
749
750 int target_width = target->szHint.width;
751 int target_height = target->szHint.height;
752 int new_pmap_width = target_width;
753 int new_pmap_height = target_height;
754
755 int x = 0;
756 int y = 0;
757 int w = 0;
758 int h = 0;
759
760 get_image_geometry (image_width, image_height, w, h, x, y);
761
762 if (!(flags & rootAlign)
763 && (x >= target_width
764 || y >= target_height
765 || (x + w <= 0)
766 || (y + h <= 0)))
767 return false;
768
769 result = pixbuf;
770
771 if ((w != image_width)
772 || (h != image_height))
773 {
774 result = gdk_pixbuf_scale_simple (pixbuf,
775 w, h,
776 GDK_INTERP_BILINEAR);
777 }
778
779 bool ret = false;
780
781 if (result)
782 {
783 XGCValues gcv;
784 GC gc;
785 Pixmap root_pmap;
786
787 image_width = gdk_pixbuf_get_width (result);
788 image_height = gdk_pixbuf_get_height (result);
789
790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
796 {
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height);
801 }
802 }
803
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None)
816 {
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 }
822
823 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825
826 if (h_scale == 0 || v_scale == 0)
827 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
830 0, 0,
831 0, 0,
832 image_width, image_height,
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835
836 gcv.tile = tile;
837 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y;
840 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
841
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 XFreePixmap (target->dpy, tile);
844 }
845 else
846 {
847 int src_x, src_y, dst_x, dst_y;
848 int dst_width, dst_height;
849
850 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
851 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
852
853 if (dst_x > 0 || dst_y > 0
854 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
860 src_x, src_y,
861 dst_x, dst_y,
862 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 }
866
867#if XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878
879 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c;
888
889 mask_c.alpha = 0x8000;
890 mask_c.red = 0;
891 mask_c.green = 0;
892 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896
897 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 }
903#endif
904
905 if (result != pixbuf)
906 g_object_unref (result);
907
908 XFreeGC (target->dpy, gc);
909
910 ret = true;
911 }
912
913 return ret;
914}
915# endif /* HAVE_PIXBUF */
671 916
672bool 917bool
673bgPixmap_t::set_file (const char *file) 918bgPixmap_t::set_file (const char *file)
674{ 919{
675 assert (file); 920 assert (file);
676 921
677 if (*file) 922 if (*file)
678 { 923 {
924 if (const char *p = strchr (file, ';'))
925 {
926 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len);
929 f[len] = '\0';
930 file = f;
931 }
932
679# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
680 if (!target->asimman) 934 if (!target->asimman)
681 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
682
683 if (const char *p = strchr (file, ';'))
684 {
685 size_t len = p - file;
686 char *f = (char *)malloc (len + 1);
687 memcpy (f, file, len);
688 f[len] = '\0';
689 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
690 free (f); 937 if (image)
691 } 938 {
692 else 939 if (original_asim)
693 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 940 safe_asimage_destroy (original_asim);
941 original_asim = image;
942 have_image = true;
943 return true;
944 }
945# endif
694 946
695 return original_asim; 947# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
954 have_image = true;
955 return true;
956 }
696# endif 957# endif
697 } 958 }
698 959
699 return false; 960 return false;
700} 961}
720 int changed = 0; 981 int changed = 0;
721 unsigned int hr, vr; 982 unsigned int hr, vr;
722 int junk; 983 int junk;
723 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
724 985
725 if (!(geom_flags&WidthValue)) 986 if (!(geom_flags & WidthValue))
726 hr = 1; 987 hr = 1;
727 if (!(geom_flags&HeightValue)) 988 if (!(geom_flags & HeightValue))
728 vr = hr; 989 vr = hr;
990
991 min_it (hr, 128);
992 min_it (vr, 128);
729 993
730 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
731 { 995 {
732 ++changed; 996 ++changed;
733 h_blurRadius = hr; 997 h_blurRadius = hr;
742 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
743 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
744 else 1008 else
745 flags |= blurNeeded; 1009 flags |= blurNeeded;
746 1010
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
747 return (changed>0); 1023 return (changed > 0);
748} 1024}
749 1025
750static inline unsigned long 1026static inline unsigned long
751compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
752{ 1028{
753 unsigned long flags = 0; 1029 unsigned long flags = 0;
754 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
755 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
756 1032
757 if (tint) 1033 if (tint)
758 { 1034 {
759 tint->get (c); 1035 tint->get (c);
760# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
769 flags |= bgPixmap_t::tintNeeded; 1045 flags |= bgPixmap_t::tintNeeded;
770 else if (tint) 1046 else if (tint)
771 { 1047 {
772 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1048 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
773 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1049 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
774 { 1050 {
775 flags |= bgPixmap_t::tintNeeded; 1051 flags |= bgPixmap_t::tintNeeded;
776 } 1052 }
777 } 1053 }
778 1054
779 if (flags & bgPixmap_t::tintNeeded) 1055 if (flags & bgPixmap_t::tintNeeded)
780 { 1056 {
781 if (flags & bgPixmap_t::tintWholesome) 1057 if (flags & bgPixmap_t::tintWholesome)
792} 1068}
793 1069
794bool 1070bool
795bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
796{ 1072{
797 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
798 { 1074 {
799 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
800 tint = new_tint; 1076 tint = new_tint;
801 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
802 return true; 1078 return true;
810{ 1086{
811 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1087 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
812 1088
813 if (new_flags != (flags & tintFlags)) 1089 if (new_flags != (flags & tintFlags))
814 { 1090 {
815 flags = (flags&~tintFlags)|new_flags; 1091 flags = (flags & ~tintFlags) | new_flags;
816 return true; 1092 return true;
817 } 1093 }
818 1094
819 return false; 1095 return false;
820} 1096}
821 1097
822bool 1098bool
823bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
824{ 1100{
825 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
826 1102
827 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
828 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
829 else if (new_shade == 100)
830 new_shade = 0;
831 1106
832 if (new_shade != shade) 1107 if (new_shade != shade)
833 { 1108 {
834 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
835 shade = new_shade; 1110 shade = new_shade;
836 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
837 return true; 1112 return true;
838 } 1113 }
839 1114
840 return false; 1115 return false;
1116}
1117
1118#if XFT
1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{
1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0;
1125
1126 for (int i = 0; i < width; i++)
1127 {
1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i];
1131 }
1132
1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1);
1135
1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138}
1139#endif
1140
1141bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{
1144 bool ret = false;
1145#if XFT
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149
1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156
1157 if (kernel && params && src && dst)
1158 {
1159 if (h_blurRadius)
1160 {
1161 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1163
1164 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1165 XRenderComposite (dpy,
1166 PictOpSrc,
1167 src,
1168 None,
1169 dst,
1170 0, 0,
1171 0, 0,
1172 0, 0,
1173 width, height);
1174 }
1175
1176 if (v_blurRadius)
1177 {
1178 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]);
1181
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy,
1184 PictOpSrc,
1185 src,
1186 None,
1187 dst,
1188 0, 0,
1189 0, 0,
1190 0, 0,
1191 width, height);
1192 }
1193
1194 ret = true;
1195 }
1196
1197 free (kernel);
1198 free (params);
1199 XRenderFreePicture (dpy, src);
1200 XRenderFreePicture (dpy, dst);
1201#endif
1202 return ret;
1203}
1204
1205bool
1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1207{
1208 Display *dpy = target->dpy;
1209 bool ret = false;
1210
1211 if (flags & tintWholesome)
1212 {
1213 XGCValues gcv;
1214 GC gc;
1215
1216 /* In this case we can tint image server-side getting significant
1217 * performance improvements, as we eliminate XImage transfer
1218 */
1219 gcv.foreground = Pixel (tint);
1220 gcv.function = GXand;
1221 gcv.fill_style = FillSolid;
1222 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1223 if (gc)
1224 {
1225 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1226 ret = true;
1227 XFreeGC (dpy, gc);
1228 }
1229 }
1230 else
1231 {
1232# if XFT
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234
1235 if (flags & tintSet)
1236 tint.get (c);
1237
1238 if (shade <= 100)
1239 {
1240 c.r = (c.r * shade) / 100;
1241 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100;
1243 }
1244 else
1245 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1249 }
1250
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa;
1254
1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1256
1257 pa.repeat = True;
1258
1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1261 XFreePixmap (dpy, overlay_pmap);
1262
1263 pa.component_alpha = True;
1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1265 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1266 XFreePixmap (dpy, mask_pmap);
1267
1268 if (mask_pic && overlay_pic && back_pic)
1269 {
1270 XRenderColor mask_c;
1271
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1273 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275
1276 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1281 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1282 ret = true;
1283 }
1284
1285 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif
1292 }
1293
1294 return ret;
841} 1295}
842 1296
843/* make_transparency_pixmap() 1297/* make_transparency_pixmap()
844 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window
845 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1299 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
864 unsigned int root_pmap_width, root_pmap_height; 1318 unsigned int root_pmap_width, root_pmap_height;
865 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
866 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
867 int sx, sy; 1321 int sx, sy;
868 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
869 1324
870 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
871 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
872 1327
873 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
875 || sx >= root_width || sy >= root_height) 1330 || sx >= root_width || sy >= root_height)
876 return 0; 1331 return 0;
877 1332
878 if (root_pixmap != None) 1333 if (root_pixmap != None)
879 { 1334 {
880 /* we want to validate the pixmap and get it's size at the same time : */ 1335 /* we want to validate the pixmap and get its size at the same time : */
881 int junk; 1336 int junk;
882 unsigned int ujunk; 1337 unsigned int ujunk;
883 /* root pixmap may be bad - allow a error */ 1338 /* root pixmap may be bad - allow a error */
884 target->allowedxerror = -1; 1339 target->allowedxerror = -1;
885 1340
887 root_pixmap = None; 1342 root_pixmap = None;
888 1343
889 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
890 } 1345 }
891 1346
1347 if (root_pixmap == None)
1348 return 0;
1349
892 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
893 GC gc = NULL;
894 1351
895 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
896 return 0; 1353 return 0;
897 1354
898 if (root_pixmap == None)
899 {
900 /* use tricks to obtain the root background image :*/
901 /* we want to create Overrideredirect window overlapping out window
902 with background type of Parent Relative and then grab it */
903 XSetWindowAttributes attr;
904 Window src;
905 bool success = false;
906
907 attr.background_pixmap = ParentRelative;
908 attr.backing_store = Always;
909 attr.event_mask = ExposureMask;
910 attr.override_redirect = True;
911 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
912 CopyFromParent, CopyFromParent, CopyFromParent,
913 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
914 &attr);
915
916 if (src != None)
917 {
918 XEvent event;
919 int ev_count = 0;
920 XGrabServer (dpy);
921 XMapRaised (dpy, src);
922 XSync (dpy, False);
923
924 /* XSync should get window where it's properly exposed,
925 * but to be on the safe side - let's check for the actual event to arrive : */
926 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
927 ++ev_count;
928
929 if (ev_count > 0);
930 {
931 /* hooray! - we can grab the image! */
932 gc = XCreateGC (dpy, root, 0, NULL);
933 if (gc)
934 {
935 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
936 success = true;
937 }
938 }
939
940 XDestroyWindow (dpy, src);
941 XUngrabServer (dpy);
942 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
943 }
944
945 if (!success)
946 {
947 XFreePixmap (dpy, tiled_root_pmap);
948 tiled_root_pmap = None;
949 }
950 else
951 result |= transpPmapTiled;
952 }
953 else
954 {
955 /* straightforward pixmap copy */ 1355 /* straightforward pixmap copy */
956 gcv.tile = root_pixmap; 1356 gcv.tile = root_pixmap;
957 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
958 1358
959 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
960 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
961 1361
962 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
963 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
964 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
965 1365
966 if (gc) 1366 if (gc)
967 { 1367 {
968 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
969 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
970 } 1370 XFreeGC (dpy, gc);
971 } 1371 }
972 TIMING_TEST_PRINT_RESULT (tp); 1372 TIMING_TEST_PRINT_RESULT (tp);
973 1373
974 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
975 { 1375 {
976 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
977 { 1377 {
978 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
979 {
980 if (flags & tintWholesome)
981 { 1379 {
982 /* In this case we can tint image server-side getting significant 1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
983 * performance improvements, as we eliminate XImage transfer
984 */
985 gcv.foreground = Pixel (tint);
986 gcv.function = GXand;
987 gcv.fill_style = FillSolid;
988 if (gc)
989 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
990 else
991 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
992 if (gc)
993 {
994 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
995 result |= transpPmapTinted; 1381 result |= transpPmapBlurred;
996 }
997 }
998 else
999 {
1000# if XFT
1001 Picture back_pic = 0;
1002 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1003
1004 if (flags & tintSet)
1005 tint.get (c);
1006
1007 if (shade > 0 && shade < 100)
1008 {
1009 c.r = (c.r * shade) / 100;
1010 c.g = (c.g * shade) / 100;
1011 c.b = (c.b * shade) / 100;
1012 }
1013 else if (shade > 100 && shade < 200)
1014 {
1015 c.r = (c.r * (200 - shade)) / 100;
1016 c.g = (c.g * (200 - shade)) / 100;
1017 c.b = (c.b * (200 - shade)) / 100;
1018 }
1019
1020 XRenderPictFormat pf;
1021 pf.type = PictTypeDirect;
1022 pf.depth = 32;
1023 pf.direct.redMask = 0xff;
1024 pf.direct.greenMask = 0xff;
1025 pf.direct.blueMask = 0xff;
1026 pf.direct.alphaMask = 0xff;
1027
1028 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1029 (PictFormatType|
1030 PictFormatDepth|
1031 PictFormatRedMask|
1032 PictFormatGreenMask|
1033 PictFormatBlueMask|
1034 PictFormatAlphaMask),
1035 &pf,
1036 0);
1037 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1038 XRenderPictureAttributes pa ;
1039
1040 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1041
1042 pa.repeat = True;
1043
1044 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1045 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1046 XFreePixmap (dpy, overlay_pmap);
1047
1048 pa.component_alpha = True;
1049 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1050 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1051 XFreePixmap (dpy, mask_pmap);
1052
1053 if (mask_pic && overlay_pic && back_pic)
1054 {
1055 XRenderColor mask_c;
1056
1057 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1058 mask_c.alpha = 0xffff;
1059 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1060
1061 mask_c.alpha = 0;
1062 mask_c.red = 0xffff - c.r;
1063 mask_c.green = 0xffff - c.g;
1064 mask_c.blue = 0xffff - c.b;
1065 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1066 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1067 result |= transpPmapTinted;
1068 }
1069
1070 XRenderFreePicture (dpy, mask_pic);
1071 XRenderFreePicture (dpy, overlay_pic);
1072 XRenderFreePicture (dpy, back_pic);
1073# if DO_TIMING_TEST
1074 XSync (dpy, False);
1075# endif
1076# endif
1077 }
1078 } 1382 }
1383 if (flags & (tintNeeded | tintServerSide))
1384 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1386 result |= transpPmapTinted;
1387 }
1079 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1080 1389
1081 if (pixmap) 1390 if (pixmap)
1082 XFreePixmap (dpy, pixmap); 1391 XFreePixmap (dpy, pixmap);
1083 1392
1085 pmap_width = window_width; 1394 pmap_width = window_width;
1086 pmap_height = window_height; 1395 pmap_height = window_height;
1087 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1088 } 1397 }
1089 1398
1090 if (gc)
1091 XFreeGC (dpy, gc);
1092
1093 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1094 1400
1095 return result; 1401 return result;
1096} 1402}
1097 1403
1111 return false; 1417 return false;
1112} 1418}
1113# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1114 1420
1115# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1116static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1117# endif 1423# endif
1118 1424
1119bool 1425bool
1120bgPixmap_t::render () 1426bgPixmap_t::render ()
1121{ 1427{
1133 /* we need to re-generate transparency pixmap in that case ! */ 1439 /* we need to re-generate transparency pixmap in that case ! */
1134 background_flags = make_transparency_pixmap (); 1440 background_flags = make_transparency_pixmap ();
1135 if (background_flags == 0) 1441 if (background_flags == 0)
1136 return false; 1442 return false;
1137 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1138 && pmap_depth == target->depth) 1444 && pmap_depth == target->depth)
1139 flags = flags & ~isInvalid; 1445 flags = flags & ~isInvalid;
1140 } 1446 }
1141# endif 1447# endif
1142 1448
1449# ifdef BG_IMAGE_FROM_FILE
1450 if (have_image
1451 || (background_flags & transpTransformations) != (flags & transpTransformations))
1452 {
1453 if (render_image (background_flags))
1454 flags = flags & ~isInvalid;
1455 }
1456# endif
1457
1143 XImage *result = NULL; 1458 XImage *result = NULL;
1144# ifdef HAVE_AFTERIMAGE 1459
1145 if (original_asim 1460 if (background_flags && (flags & isInvalid))
1146 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1461 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1147 { 1463 }
1148 target->init_asv ();
1149 1464
1150 ASImage *background = NULL; 1465 if (result)
1151 ARGB32 as_tint = TINT_LEAVE_SAME; 1466 {
1152 if (background_flags) 1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1153 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1468 /* our own client-side tinting */
1154 1469 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1155# ifdef ENABLE_TRANSPARENCY 1470 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1156 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1157 { 1472 {
1158 ShadingInfo as_shade;
1159 as_shade.shading = (shade == 0) ? 100 : shade;
1160
1161 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1162 if (flags & tintSet) 1474 if (flags & tintSet)
1163 tint.get (c); 1475 tint.get (c);
1164 as_shade.tintColor.red = c.r; 1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1165 as_shade.tintColor.green = c.g;
1166 as_shade.tintColor.blue = c.b;
1167
1168 as_tint = shading2tint32 (&as_shade);
1169 }
1170
1171 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1172 {
1173 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1174 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1175 100, ASIMAGE_QUALITY_DEFAULT);
1176 if (tmp)
1177 {
1178 destroy_asimage (&background);
1179 background = tmp;
1180 }
1181 } 1477 }
1182# endif 1478# endif
1183 1479
1184 if (render_asim (background, as_tint))
1185 flags = flags & ~isInvalid;
1186 if (background)
1187 destroy_asimage (&background);
1188 }
1189 else if (background_flags && pmap_depth != target->depth)
1190 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1191
1192# elif !XFT /* our own client-side tinting */
1193
1194 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1195 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196
1197 if (background_flags && (flags & isInvalid))
1198 {
1199 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1200
1201 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1202 {
1203 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204 if (flags & tintSet)
1205 tint.get (c);
1206 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1207 }
1208 }
1209# endif /* HAVE_AFTERIMAGE */
1210
1211 if (result)
1212 {
1213 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1214 1481
1215 if (gc) 1482 if (gc)
1216 { 1483 {
1217 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1246 1513
1247 XFreeGC (target->dpy, gc); 1514 XFreeGC (target->dpy, gc);
1248 flags = flags & ~isInvalid; 1515 flags = flags & ~isInvalid;
1249 } 1516 }
1250 1517
1251 XDestroyImage (result); 1518 XDestroyImage (result);
1252 } 1519 }
1253 1520
1254 if (flags & isInvalid) 1521 if (flags & isInvalid)
1255 { 1522 {
1256 if (pixmap != None) 1523 if (pixmap != None)
1346#endif /* HAVE_BG_PIXMAP */ 1613#endif /* HAVE_BG_PIXMAP */
1347 1614
1348#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1349/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1350 1617
1351typedef uint32_t RUINT32T;
1352
1353static void 1618static void
1354ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1619ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1355{ 1620{
1356 int sh_r, sh_g, sh_b; 1621 int sh_r, sh_g, sh_b;
1357 RUINT32T mask_r, mask_g, mask_b; 1622 uint32_t mask_r, mask_g, mask_b;
1358 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1623 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1359 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1360 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1361 int i; 1626 int i;
1627 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1362 1628
1363 Visual *visual = term->visual;
1364
1365 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1629 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1366
1367 if (shade == 0)
1368 shade = 100;
1369 1630
1370 /* for convenience */ 1631 /* for convenience */
1371 mask_r = visual->red_mask; 1632 mask_r = visual->red_mask;
1372 mask_g = visual->green_mask; 1633 mask_g = visual->green_mask;
1373 mask_b = visual->blue_mask; 1634 mask_b = visual->blue_mask;
1374 1635
1375 /* boring lookup table pre-initialization */ 1636 /* boring lookup table pre-initialization */
1376 switch (srcImage->bits_per_pixel) { 1637 switch (srcImage->depth)
1638 {
1377 case 15: 1639 case 15:
1378 if ((mask_r != 0x7c00) || 1640 if ((mask_r != 0x7c00) ||
1379 (mask_g != 0x03e0) || 1641 (mask_g != 0x03e0) ||
1380 (mask_b != 0x001f)) 1642 (mask_b != 0x001f))
1381 return; 1643 return;
1382 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1644 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1383 lookup_r = lookup; 1645 lookup_r = lookup;
1384 lookup_g = lookup+32; 1646 lookup_g = lookup+32;
1385 lookup_b = lookup+32+32; 1647 lookup_b = lookup+32+32;
1386 sh_r = 10; 1648 sh_r = 10;
1387 sh_g = 5; 1649 sh_g = 5;
1388 sh_b = 0; 1650 sh_b = 0;
1389 break; 1651 break;
1390 case 16: 1652 case 16:
1391 if ((mask_r != 0xf800) || 1653 if ((mask_r != 0xf800) ||
1392 (mask_g != 0x07e0) || 1654 (mask_g != 0x07e0) ||
1393 (mask_b != 0x001f)) 1655 (mask_b != 0x001f))
1394 return; 1656 return;
1395 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1657 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1396 lookup_r = lookup; 1658 lookup_r = lookup;
1397 lookup_g = lookup+32; 1659 lookup_g = lookup+32;
1398 lookup_b = lookup+32+64; 1660 lookup_b = lookup+32+64;
1399 sh_r = 11; 1661 sh_r = 11;
1400 sh_g = 5; 1662 sh_g = 5;
1401 sh_b = 0; 1663 sh_b = 0;
1402 break; 1664 break;
1403 case 24: 1665 case 24:
1404 if ((mask_r != 0xff0000) || 1666 if ((mask_r != 0xff0000) ||
1405 (mask_g != 0x00ff00) || 1667 (mask_g != 0x00ff00) ||
1406 (mask_b != 0x0000ff)) 1668 (mask_b != 0x0000ff))
1407 return; 1669 return;
1408 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1670 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1409 lookup_r = lookup; 1671 lookup_r = lookup;
1410 lookup_g = lookup+256; 1672 lookup_g = lookup+256;
1411 lookup_b = lookup+256+256; 1673 lookup_b = lookup+256+256;
1412 sh_r = 16; 1674 sh_r = 16;
1413 sh_g = 8; 1675 sh_g = 8;
1414 sh_b = 0; 1676 sh_b = 0;
1415 break; 1677 break;
1416 case 32: 1678 case 32:
1417 if ((mask_r != 0xff0000) || 1679 if ((mask_r != 0xff0000) ||
1418 (mask_g != 0x00ff00) || 1680 (mask_g != 0x00ff00) ||
1419 (mask_b != 0x0000ff)) 1681 (mask_b != 0x0000ff))
1420 return; 1682 return;
1421 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1683 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1422 lookup_r = lookup; 1684 lookup_r = lookup;
1423 lookup_g = lookup+256; 1685 lookup_g = lookup+256;
1424 lookup_b = lookup+256+256; 1686 lookup_b = lookup+256+256;
1425 sh_r = 16; 1687 sh_r = 16;
1426 sh_g = 8; 1688 sh_g = 8;
1427 sh_b = 0; 1689 sh_b = 0;
1428 break; 1690 break;
1429 default: 1691 default:
1430 return; /* we do not support this color depth */ 1692 return; /* we do not support this color depth */
1431 } 1693 }
1432 1694
1433 /* prepare limits for color transformation (each channel is handled separately) */ 1695 /* prepare limits for color transformation (each channel is handled separately) */
1434 if (shade < 0) { 1696 if (shade > 100)
1697 {
1435 shade = -shade; 1698 shade = 200 - shade;
1436 if (shade < 0) shade = 0;
1437 if (shade > 100) shade = 100;
1438 1699
1439 lower_lim_r = 65535-rm; 1700 lower_lim_r = 65535-rm;
1440 lower_lim_g = 65535-gm; 1701 lower_lim_g = 65535-gm;
1441 lower_lim_b = 65535-bm; 1702 lower_lim_b = 65535-bm;
1442 1703
1443 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1704 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1444 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1705 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1445 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1706 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1446 1707
1447 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1708 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1709 }
1448 } else { 1710 else
1449 if (shade < 0) shade = 0; 1711 {
1450 if (shade > 100) shade = 100;
1451 1712
1452 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1713 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1453 1714
1454 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1715 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1455 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1716 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1456 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1717 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1457 } 1718 }
1458
1459 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1460 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1461 {
1462 unsigned int tmp;
1463
1464 tmp = lower_lim_r;
1465 lower_lim_r = lower_lim_b;
1466 lower_lim_b = tmp;
1467
1468 tmp = upper_lim_r;
1469 upper_lim_r = upper_lim_b;
1470 upper_lim_b = tmp;
1471 }
1472 1719
1473 /* fill our lookup tables */ 1720 /* fill our lookup tables */
1474 for (i = 0; i <= mask_r>>sh_r; i++) 1721 for (i = 0; i <= mask_r>>sh_r; i++)
1475 { 1722 {
1476 RUINT32T tmp; 1723 uint32_t tmp;
1477 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1724 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1478 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1725 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1479 lookup_r[i] = (tmp/65535)<<sh_r; 1726 lookup_r[i] = (tmp/65535)<<sh_r;
1480 } 1727 }
1481 for (i = 0; i <= mask_g>>sh_g; i++) 1728 for (i = 0; i <= mask_g>>sh_g; i++)
1482 { 1729 {
1483 RUINT32T tmp; 1730 uint32_t tmp;
1484 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1731 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1485 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1732 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1486 lookup_g[i] = (tmp/65535)<<sh_g; 1733 lookup_g[i] = (tmp/65535)<<sh_g;
1487 } 1734 }
1488 for (i = 0; i <= mask_b>>sh_b; i++) 1735 for (i = 0; i <= mask_b>>sh_b; i++)
1489 { 1736 {
1490 RUINT32T tmp; 1737 uint32_t tmp;
1491 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1738 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1492 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1739 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1493 lookup_b[i] = (tmp/65535)<<sh_b; 1740 lookup_b[i] = (tmp/65535)<<sh_b;
1494 } 1741 }
1495 1742
1496 /* apply table to input image (replacing colors by newly calculated ones) */ 1743 /* apply table to input image (replacing colors by newly calculated ones) */
1497 switch (srcImage->bits_per_pixel) 1744 if (srcImage->bits_per_pixel == 32
1745 && (srcImage->depth == 24 || srcImage->depth == 32)
1746 && srcImage->byte_order == host_byte_order)
1498 { 1747 {
1499 case 15:
1500 {
1501 unsigned short *p1, *pf, *p, *pl; 1748 uint32_t *p1, *pf, *p, *pl;
1502 p1 = (unsigned short *) srcImage->data; 1749 p1 = (uint32_t *) srcImage->data;
1503 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1750 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751
1504 while (p1 < pf) 1752 while (p1 < pf)
1505 { 1753 {
1506 p = p1; 1754 p = p1;
1507 pl = p1 + srcImage->width; 1755 pl = p1 + srcImage->width;
1508 for (; p < pl; p++) 1756 for (; p < pl; p++)
1509 { 1757 {
1510 *p = lookup_r[(*p & 0x7c00)>>10] |
1511 lookup_g[(*p & 0x03e0)>> 5] |
1512 lookup_b[(*p & 0x001f)];
1513 }
1514 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1515 }
1516 break;
1517 }
1518 case 16:
1519 {
1520 unsigned short *p1, *pf, *p, *pl;
1521 p1 = (unsigned short *) srcImage->data;
1522 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1523 while (p1 < pf)
1524 {
1525 p = p1;
1526 pl = p1 + srcImage->width;
1527 for (; p < pl; p++)
1528 {
1529 *p = lookup_r[(*p & 0xf800)>>11] |
1530 lookup_g[(*p & 0x07e0)>> 5] |
1531 lookup_b[(*p & 0x001f)];
1532 }
1533 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1534 }
1535 break;
1536 }
1537 case 24:
1538 {
1539 unsigned char *p1, *pf, *p, *pl;
1540 p1 = (unsigned char *) srcImage->data;
1541 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1542 while (p1 < pf)
1543 {
1544 p = p1;
1545 pl = p1 + srcImage->width * 3;
1546 for (; p < pl; p += 3)
1547 {
1548 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1549 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1550 p[2] = lookup_r[(p[2] & 0x0000ff)];
1551 }
1552 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1553 }
1554 break;
1555 }
1556 case 32:
1557 {
1558 RUINT32T *p1, *pf, *p, *pl;
1559 p1 = (RUINT32T *) srcImage->data;
1560 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1561
1562 while (p1 < pf)
1563 {
1564 p = p1;
1565 pl = p1 + srcImage->width;
1566 for (; p < pl; p++)
1567 {
1568 *p = lookup_r[(*p & 0xff0000)>>16] | 1758 *p = lookup_r[(*p & 0xff0000) >> 16] |
1569 lookup_g[(*p & 0x00ff00)>> 8] | 1759 lookup_g[(*p & 0x00ff00) >> 8] |
1570 lookup_b[(*p & 0x0000ff)] | 1760 lookup_b[(*p & 0x0000ff)] |
1571 (*p & ~0xffffff); 1761 (*p & 0xff000000);
1762 }
1763 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1764 }
1765 }
1766 else
1767 {
1768 for (int y = 0; y < srcImage->height; y++)
1769 for (int x = 0; x < srcImage->width; x++)
1770 {
1771 unsigned long pixel = XGetPixel (srcImage, x, y);
1772 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1773 lookup_g[(pixel & mask_g) >> sh_g] |
1774 lookup_b[(pixel & mask_b) >> sh_b];
1775 XPutPixel (srcImage, x, y, pixel);
1572 } 1776 }
1573 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1574 } 1777 }
1575 break;
1576 }
1577 }
1578 1778
1579 free (lookup); 1779 free (lookup);
1580} 1780}
1581#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1781#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines