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.45 by sf-exg, Sun Aug 29 16:10:42 2010 UTC vs.
Revision 1.97 by sf-exg, Fri Oct 22 18:03:10 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",
447// flags, h_scale, v_scale, h_align, v_align);
448 return (changed > 0); 433 return (changed > 0);
434}
435
436void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{
439 int target_width = target->szHint.width;
440 int target_height = target->szHint.height;
441
442 if (flags & propScale)
443 {
444 float scale = (float)target_width / image_width;
445 min_it (scale, (float)target_height / image_height);
446 w = image_width * scale + 0.5;
447 h = image_height * scale + 0.5;
448 }
449 else
450 {
451 w = h_scale * target_width / 100;
452 h = v_scale * target_height / 100;
453 }
454
455 if (!w) w = image_width;
456 if (!h) h = image_height;
457
458 if (flags & rootAlign)
459 {
460 target->get_window_origin (x, y);
461 x = -x;
462 y = -y;
463 }
464 else
465 {
466 x = make_align_position (h_align, target_width, w);
467 y = make_align_position (v_align, target_height, h);
468 }
469
470 flags &= ~sizeSensitive;
471 if ((flags & propScale) || h_scale || v_scale
472 || (!(flags & rootAlign) && (h_align || v_align))
473 || w > target_width || h > target_height)
474 flags |= sizeSensitive;
449} 475}
450 476
451# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
452bool 478bool
453bgPixmap_t::render_asim (unsigned long background_flags) 479bgPixmap_t::render_image (unsigned long background_flags)
454{ 480{
455 if (target == NULL) 481 if (target == NULL)
456 return false; 482 return false;
457 483
458 target->init_asv (); 484 target->init_asv ();
465 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 491 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
466 492
467 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 493 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
468 { 494 {
469 ShadingInfo as_shade; 495 ShadingInfo as_shade;
470 as_shade.shading = (shade == 0) ? 100 : shade; 496 as_shade.shading = shade;
471 497
472 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 498 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
473 if (flags & tintSet) 499 if (flags & tintSet)
474 tint.get (c); 500 tint.get (c);
475 as_shade.tintColor.red = c.r; 501 as_shade.tintColor.red = c.r;
477 as_shade.tintColor.blue = c.b; 503 as_shade.tintColor.blue = c.b;
478 504
479 background_tint = shading2tint32 (&as_shade); 505 background_tint = shading2tint32 (&as_shade);
480 } 506 }
481 507
482 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 508 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
483 { 509 {
484 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 510 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
485 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 511 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
486 100, ASIMAGE_QUALITY_DEFAULT); 512 100, ASIMAGE_QUALITY_DEFAULT);
487 if (tmp) 513 if (tmp)
488 { 514 {
489 destroy_asimage (&background); 515 destroy_asimage (&background);
490 background = tmp; 516 background = tmp;
499 int new_pmap_width = target_width; 525 int new_pmap_width = target_width;
500 int new_pmap_height = target_height; 526 int new_pmap_height = target_height;
501 527
502 int x = 0; 528 int x = 0;
503 int y = 0; 529 int y = 0;
504 int w = h_scale * target_width / 100; 530 int w = 0;
505 int h = v_scale * target_height / 100; 531 int h = 0;
506
507 TIMING_TEST_START (asim);
508 532
509 if (original_asim) 533 if (original_asim)
510 { 534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
511 if (h_align == rootAlign || v_align == rootAlign)
512 {
513 target->get_window_origin(x, y);
514 x = -x;
515 y = -y;
516 }
517
518 if (h_align != rootAlign)
519 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
520
521 if (v_align != rootAlign)
522 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
523 }
524 535
525 if (!original_asim 536 if (!original_asim
537 || (!(flags & rootAlign)
526 || x >= target_width 538 && (x >= target_width
527 || y >= target_height 539 || y >= target_height
528 || (w > 0 && x + w <= 0) 540 || (x + w <= 0)
529 || (h > 0 && y + h <= 0)) 541 || (y + h <= 0))))
530 { 542 {
531 if (background) 543 if (background)
532 { 544 {
533 new_pmap_width = background->width; 545 new_pmap_width = background->width;
534 new_pmap_height = background->height; 546 new_pmap_height = background->height;
548 } 560 }
549 else 561 else
550 { 562 {
551 result = original_asim; 563 result = original_asim;
552 564
553 if ((w > 0 && w != original_asim->width) 565 if ((w != original_asim->width)
554 || (h > 0 && h != original_asim->height)) 566 || (h != original_asim->height))
555 { 567 {
556 result = scale_asimage (target->asv, original_asim, 568 result = scale_asimage (target->asv, original_asim,
557 w > 0 ? w : original_asim->width, 569 w, h,
558 h > 0 ? h : original_asim->height,
559 background ? ASA_ASImage : ASA_XImage, 570 background ? ASA_ASImage : ASA_XImage,
560 100, ASIMAGE_QUALITY_DEFAULT); 571 100, ASIMAGE_QUALITY_DEFAULT);
561 } 572 }
562 573
563 if (background == NULL) 574 if (background == NULL)
564 { 575 {
565 /* if tiling - pixmap has to be sized exactly as the image,
566 but there is no need to make it bigger than the window! */
567 if (h_scale == 0)
568 new_pmap_width = min (result->width, target_width);
569 if (v_scale == 0)
570 new_pmap_height = min (result->height, target_height);
571 /* we also need to tile our image in one or both directions */
572 if (h_scale == 0 || v_scale == 0) 576 if (h_scale == 0 || v_scale == 0)
573 { 577 {
578 /* if tiling - pixmap has to be sized exactly as the image,
579 but there is no need to make it bigger than the window! */
580 new_pmap_width = min (result->width, target_width);
581 new_pmap_height = min (result->height, target_height);
582
583 /* we also need to tile our image in both directions */
574 ASImage *tmp = tile_asimage (target->asv, result, 584 ASImage *tmp = tile_asimage (target->asv, result,
575 (h_scale > 0) ? 0 : (int)result->width - x, 585 (int)result->width - x,
576 (v_scale > 0) ? 0 : (int)result->height - y, 586 (int)result->height - y,
577 new_pmap_width, 587 new_pmap_width,
578 new_pmap_height, 588 new_pmap_height,
579 TINT_LEAVE_SAME, ASA_XImage, 589 TINT_LEAVE_SAME, ASA_XImage,
580 100, ASIMAGE_QUALITY_DEFAULT); 590 100, ASIMAGE_QUALITY_DEFAULT);
581 if (tmp) 591 if (tmp)
596 layers[0].clip_width = target_width; 606 layers[0].clip_width = target_width;
597 layers[0].clip_height = target_height; 607 layers[0].clip_height = target_height;
598 layers[0].tint = background_tint; 608 layers[0].tint = background_tint;
599 layers[1].im = result; 609 layers[1].im = result;
600 610
601 if (w <= 0) 611 if (h_scale == 0 || v_scale == 0)
602 { 612 {
603 /* tile horizontally */ 613 /* tile horizontally */
604 while (x > 0) x -= (int)result->width; 614 while (x > 0) x -= (int)result->width;
605 layers[1].dst_x = x; 615 layers[1].dst_x = x;
606 layers[1].clip_width = result->width+target_width; 616 layers[1].clip_width = result->width+target_width;
610 /* clip horizontally */ 620 /* clip horizontally */
611 layers[1].dst_x = x; 621 layers[1].dst_x = x;
612 layers[1].clip_width = result->width; 622 layers[1].clip_width = result->width;
613 } 623 }
614 624
615 if (h <= 0) 625 if (h_scale == 0 || v_scale == 0)
616 { 626 {
617 while (y > 0) y -= (int)result->height; 627 while (y > 0) y -= (int)result->height;
618 layers[1].dst_y = y; 628 layers[1].dst_y = y;
619 layers[1].clip_height = result->height + target_height; 629 layers[1].clip_height = result->height + target_height;
620 } 630 }
643 } 653 }
644 654
645 free (layers); 655 free (layers);
646 } 656 }
647 } 657 }
648 TIMING_TEST_PRINT_RESULT (asim);
649 658
650 if (pixmap) 659 bool ret = false;
651 {
652 if (result == NULL
653 || pmap_width != new_pmap_width
654 || pmap_height != new_pmap_height
655 || pmap_depth != target->depth)
656 {
657 XFreePixmap (target->dpy, pixmap);
658 pixmap = None;
659 }
660 }
661 660
662 if (result) 661 if (result)
663 { 662 {
664 XGCValues gcv; 663 XGCValues gcv;
665 GC gc; 664 GC gc;
665
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
666 676
667 /* create Pixmap */ 677 /* create Pixmap */
668 if (pixmap == None) 678 if (pixmap == None)
669 { 679 {
670 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
671 pmap_width = new_pmap_width; 681 pmap_width = new_pmap_width;
672 pmap_height = new_pmap_height; 682 pmap_height = new_pmap_height;
673 pmap_depth = target->depth; 683 pmap_depth = target->depth;
674 } 684 }
675 /* fill with background color ( if result's not completely overlapping it)*/ 685 /* fill with background color (if result's not completely overlapping it) */
676 gcv.foreground = target->pix_colors[Color_bg]; 686 gcv.foreground = target->pix_colors[Color_bg];
677 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 687 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
678 688
679 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 689 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
680 int dst_width = result->width, dst_height = result->height; 690 int dst_width = result->width, dst_height = result->height;
681 if (background == NULL) 691 if (background == NULL)
682 { 692 {
693 if (!(h_scale == 0 || v_scale == 0))
694 {
683 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 695 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
684 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 696 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
697 }
685 698
686 if (dst_x > 0 || dst_y > 0 699 if (dst_x > 0 || dst_y > 0
687 || dst_x + dst_width < new_pmap_width 700 || dst_x + dst_width < new_pmap_width
688 || dst_y + dst_height < new_pmap_height) 701 || dst_y + dst_height < new_pmap_height)
689 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 702 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
695 708
696 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
697 destroy_asimage (&result); 710 destroy_asimage (&result);
698 711
699 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
700 TIMING_TEST_PRINT_RESULT (asim); 713
714 ret = true;
701 } 715 }
702 716
703 if (background) 717 if (background)
704 destroy_asimage (&background); 718 destroy_asimage (&background);
705 719
706 return true; 720 return ret;
707} 721}
708# endif /* HAVE_AFTERIMAGE */ 722# endif /* HAVE_AFTERIMAGE */
723
724# ifdef HAVE_PIXBUF
725bool
726bgPixmap_t::render_image (unsigned long background_flags)
727{
728 if (target == NULL)
729 return false;
730
731 if (!pixbuf)
732 return false;
733
734#if !XFT
735 if (background_flags)
736 return false;
737#endif
738
739 GdkPixbuf *result;
740
741 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf);
743
744 int target_width = target->szHint.width;
745 int target_height = target->szHint.height;
746 int new_pmap_width = target_width;
747 int new_pmap_height = target_height;
748
749 int x = 0;
750 int y = 0;
751 int w = 0;
752 int h = 0;
753
754 get_image_geometry (image_width, image_height, w, h, x, y);
755
756 if (!(flags & rootAlign)
757 && (x >= target_width
758 || y >= target_height
759 || (x + w <= 0)
760 || (y + h <= 0)))
761 return false;
762
763 result = pixbuf;
764
765 if ((w != image_width)
766 || (h != image_height))
767 {
768 result = gdk_pixbuf_scale_simple (pixbuf,
769 w, h,
770 GDK_INTERP_BILINEAR);
771 }
772
773 bool ret = false;
774
775 if (result)
776 {
777 XGCValues gcv;
778 GC gc;
779 Pixmap root_pmap;
780
781 image_width = gdk_pixbuf_get_width (result);
782 image_height = gdk_pixbuf_get_height (result);
783
784 if (background_flags)
785 {
786 root_pmap = pixmap;
787 pixmap = None;
788 }
789 else
790 {
791 if (h_scale == 0 || v_scale == 0)
792 {
793 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height);
795 }
796 }
797
798 if (pixmap)
799 {
800 if (pmap_width != new_pmap_width
801 || pmap_height != new_pmap_height
802 || pmap_depth != target->depth)
803 {
804 XFreePixmap (target->dpy, pixmap);
805 pixmap = None;
806 }
807 }
808
809 if (pixmap == None)
810 {
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height;
814 pmap_depth = target->depth;
815 }
816
817 gcv.foreground = target->pix_colors[Color_bg];
818 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
819
820 if (h_scale == 0 || v_scale == 0)
821 {
822 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
823 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
824 0, 0,
825 0, 0,
826 image_width, image_height,
827 XLIB_RGB_DITHER_NONE,
828 0, 0);
829
830 gcv.tile = tile;
831 gcv.fill_style = FillTiled;
832 gcv.ts_x_origin = x;
833 gcv.ts_y_origin = y;
834 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
835
836 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
837 XFreePixmap (target->dpy, tile);
838 }
839 else
840 {
841 int src_x, src_y, dst_x, dst_y;
842 int dst_width, dst_height;
843
844 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
845 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
846
847 if (dst_x > 0 || dst_y > 0
848 || dst_x + dst_width < new_pmap_width
849 || dst_y + dst_height < new_pmap_height)
850 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
851
852 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
853 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
854 src_x, src_y,
855 dst_x, dst_y,
856 dst_width, dst_height,
857 XLIB_RGB_DITHER_NONE,
858 0, 0);
859 }
860
861#if XFT
862 if (background_flags)
863 {
864 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa;
866
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872
873 pa.repeat = True;
874 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
875 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
876 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
877 XFreePixmap (dpy, mask_pmap);
878
879 if (src && dst && mask)
880 {
881 XRenderColor mask_c;
882
883 mask_c.alpha = 0x8000;
884 mask_c.red = 0;
885 mask_c.green = 0;
886 mask_c.blue = 0;
887 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
888 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
889 }
890
891 XRenderFreePicture (dpy, src);
892 XRenderFreePicture (dpy, dst);
893 XRenderFreePicture (dpy, mask);
894
895 XFreePixmap (dpy, root_pmap);
896 }
897#endif
898
899 if (result != pixbuf)
900 g_object_unref (result);
901
902 XFreeGC (target->dpy, gc);
903
904 ret = true;
905 }
906
907 return ret;
908}
909# endif /* HAVE_PIXBUF */
709 910
710bool 911bool
711bgPixmap_t::set_file (const char *file) 912bgPixmap_t::set_file (const char *file)
712{ 913{
713 assert (file); 914 assert (file);
724 } 925 }
725 926
726# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
727 if (!target->asimman) 928 if (!target->asimman)
728 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730 return original_asim; 931 if (image)
932 {
933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
936 have_image = true;
937 return true;
938 }
939# endif
940
941# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
948 have_image = true;
949 return true;
950 }
731# endif 951# endif
732 } 952 }
733 953
734 return false; 954 return false;
735} 955}
755 int changed = 0; 975 int changed = 0;
756 unsigned int hr, vr; 976 unsigned int hr, vr;
757 int junk; 977 int junk;
758 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
759 979
760 if (!(geom_flags&WidthValue)) 980 if (!(geom_flags & WidthValue))
761 hr = 1; 981 hr = 1;
762 if (!(geom_flags&HeightValue)) 982 if (!(geom_flags & HeightValue))
763 vr = hr; 983 vr = hr;
984
985 min_it (hr, 128);
986 min_it (vr, 128);
764 987
765 if (h_blurRadius != hr) 988 if (h_blurRadius != hr)
766 { 989 {
767 ++changed; 990 ++changed;
768 h_blurRadius = hr; 991 h_blurRadius = hr;
777 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
778 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
779 else 1002 else
780 flags |= blurNeeded; 1003 flags |= blurNeeded;
781 1004
1005#if XFT
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
782 return (changed>0); 1017 return (changed > 0);
783} 1018}
784 1019
785static inline unsigned long 1020static inline unsigned long
786compute_tint_shade_flags (rxvt_color *tint, int shade) 1021compute_tint_shade_flags (rxvt_color *tint, int shade)
787{ 1022{
788 unsigned long flags = 0; 1023 unsigned long flags = 0;
789 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1024 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
790 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1025 bool has_shade = shade != 100;
791 1026
792 if (tint) 1027 if (tint)
793 { 1028 {
794 tint->get (c); 1029 tint->get (c);
795# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
804 flags |= bgPixmap_t::tintNeeded; 1039 flags |= bgPixmap_t::tintNeeded;
805 else if (tint) 1040 else if (tint)
806 { 1041 {
807 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1042 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
808 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1043 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
809 { 1044 {
810 flags |= bgPixmap_t::tintNeeded; 1045 flags |= bgPixmap_t::tintNeeded;
811 } 1046 }
812 } 1047 }
813 1048
814 if (flags & bgPixmap_t::tintNeeded) 1049 if (flags & bgPixmap_t::tintNeeded)
815 { 1050 {
816 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
827} 1062}
828 1063
829bool 1064bool
830bgPixmap_t::set_tint (rxvt_color &new_tint) 1065bgPixmap_t::set_tint (rxvt_color &new_tint)
831{ 1066{
832 if (tint != new_tint) 1067 if (!(flags & tintSet) || tint != new_tint)
833 { 1068 {
834 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1069 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
835 tint = new_tint; 1070 tint = new_tint;
836 flags = (flags & ~tintFlags) | new_flags | tintSet; 1071 flags = (flags & ~tintFlags) | new_flags | tintSet;
837 return true; 1072 return true;
845{ 1080{
846 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1081 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
847 1082
848 if (new_flags != (flags & tintFlags)) 1083 if (new_flags != (flags & tintFlags))
849 { 1084 {
850 flags = (flags&~tintFlags)|new_flags; 1085 flags = (flags & ~tintFlags) | new_flags;
851 return true; 1086 return true;
852 } 1087 }
853 1088
854 return false; 1089 return false;
855} 1090}
856 1091
857bool 1092bool
858bgPixmap_t::set_shade (const char *shade_str) 1093bgPixmap_t::set_shade (const char *shade_str)
859{ 1094{
860 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1095 int new_shade = (shade_str) ? atoi (shade_str) : 100;
861 1096
862 if (new_shade < 0 && new_shade > -100) 1097 clamp_it (new_shade, -100, 200);
1098 if (new_shade < 0)
863 new_shade = 200 - (100 + new_shade); 1099 new_shade = 200 - (100 + new_shade);
864 else if (new_shade == 100)
865 new_shade = 0;
866 1100
867 if (new_shade != shade) 1101 if (new_shade != shade)
868 { 1102 {
869 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1103 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
870 shade = new_shade; 1104 shade = new_shade;
871 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1105 flags = (flags & (~tintFlags | tintSet)) | new_flags;
872 return true; 1106 return true;
873 } 1107 }
874 1108
875 return false; 1109 return false;
1110}
1111
1112#if XFT
1113static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{
1116 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma;
1118 double sum = 0.0;
1119
1120 for (int i = 0; i < width; i++)
1121 {
1122 double x = i - width / 2;
1123 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1124 sum += kernel[i];
1125 }
1126
1127 params[0] = XDoubleToFixed (width);
1128 params[1] = XDoubleToFixed (1);
1129
1130 for (int i = 0; i < width; i++)
1131 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1132}
1133#endif
1134
1135bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{
1138 bool ret = false;
1139#if XFT
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143
1144 Display *dpy = target->dpy;
1145 XRenderPictureAttributes pa;
1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1147
1148 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1149 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1150
1151 if (kernel && params && src && dst)
1152 {
1153 if (h_blurRadius)
1154 {
1155 size = h_blurRadius * 2 + 1;
1156 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1157
1158 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1159 XRenderComposite (dpy,
1160 PictOpSrc,
1161 src,
1162 None,
1163 dst,
1164 0, 0,
1165 0, 0,
1166 0, 0,
1167 width, height);
1168 }
1169
1170 if (v_blurRadius)
1171 {
1172 size = v_blurRadius * 2 + 1;
1173 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1174 swap (params[0], params[1]);
1175
1176 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1177 XRenderComposite (dpy,
1178 PictOpSrc,
1179 src,
1180 None,
1181 dst,
1182 0, 0,
1183 0, 0,
1184 0, 0,
1185 width, height);
1186 }
1187
1188 ret = true;
1189 }
1190
1191 free (kernel);
1192 free (params);
1193 XRenderFreePicture (dpy, src);
1194 XRenderFreePicture (dpy, dst);
1195#endif
1196 return ret;
1197}
1198
1199bool
1200bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1201{
1202 Display *dpy = target->dpy;
1203 bool ret = false;
1204
1205 if (flags & tintWholesome)
1206 {
1207 XGCValues gcv;
1208 GC gc;
1209
1210 /* In this case we can tint image server-side getting significant
1211 * performance improvements, as we eliminate XImage transfer
1212 */
1213 gcv.foreground = Pixel (tint);
1214 gcv.function = GXand;
1215 gcv.fill_style = FillSolid;
1216 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1217 if (gc)
1218 {
1219 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1220 ret = true;
1221 XFreeGC (dpy, gc);
1222 }
1223 }
1224 else
1225 {
1226# if XFT
1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1228
1229 if (flags & tintSet)
1230 tint.get (c);
1231
1232 if (shade <= 100)
1233 {
1234 c.r = (c.r * shade) / 100;
1235 c.g = (c.g * shade) / 100;
1236 c.b = (c.b * shade) / 100;
1237 }
1238 else
1239 {
1240 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1241 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1242 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1243 }
1244
1245 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1246 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1247 XRenderPictureAttributes pa;
1248
1249 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1250
1251 pa.repeat = True;
1252
1253 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1254 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1255 XFreePixmap (dpy, overlay_pmap);
1256
1257 pa.component_alpha = True;
1258 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1259 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1260 XFreePixmap (dpy, mask_pmap);
1261
1262 if (mask_pic && overlay_pic && back_pic)
1263 {
1264 XRenderColor mask_c;
1265
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1267 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269
1270 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r;
1272 mask_c.green = 0xffff - c.g;
1273 mask_c.blue = 0xffff - c.b;
1274 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1275 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1276 ret = true;
1277 }
1278
1279 XRenderFreePicture (dpy, mask_pic);
1280 XRenderFreePicture (dpy, overlay_pic);
1281 XRenderFreePicture (dpy, back_pic);
1282# endif
1283 }
1284
1285 return ret;
876} 1286}
877 1287
878/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
879 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1289 * Builds a pixmap sized the same as terminal window, with depth same as the root window
880 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1290 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
899 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
900 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
901 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
902 int sx, sy; 1312 int sx, sy;
903 XGCValues gcv; 1313 XGCValues gcv;
1314 GC gc;
904 1315
905 TIMING_TEST_START (tp);
906 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
907 1317
908 /* check if we are outside of the visible part of the virtual screen : */ 1318 /* check if we are outside of the visible part of the virtual screen : */
909 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
910 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
911 return 0; 1321 return 0;
912 1322
913 if (root_pixmap != None) 1323 if (root_pixmap != None)
914 { 1324 {
915 /* we want to validate the pixmap and get it's size at the same time : */ 1325 /* we want to validate the pixmap and get its size at the same time : */
916 int junk; 1326 int junk;
917 unsigned int ujunk; 1327 unsigned int ujunk;
918 /* root pixmap may be bad - allow a error */ 1328 /* root pixmap may be bad - allow a error */
919 target->allowedxerror = -1; 1329 target->allowedxerror = -1;
920 1330
922 root_pixmap = None; 1332 root_pixmap = None;
923 1333
924 target->allowedxerror = 0; 1334 target->allowedxerror = 0;
925 } 1335 }
926 1336
1337 if (root_pixmap == None)
1338 return 0;
1339
927 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1340 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
928 GC gc = NULL;
929 1341
930 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1342 if (tiled_root_pmap == None) /* something really bad happened - abort */
931 return 0; 1343 return 0;
932 1344
933 if (root_pixmap == None)
934 {
935 /* use tricks to obtain the root background image :*/
936 /* we want to create Overrideredirect window overlapping out window
937 with background type of Parent Relative and then grab it */
938 XSetWindowAttributes attr;
939 Window src;
940 bool success = false;
941
942 attr.background_pixmap = ParentRelative;
943 attr.backing_store = Always;
944 attr.event_mask = ExposureMask;
945 attr.override_redirect = True;
946 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
947 CopyFromParent, CopyFromParent, CopyFromParent,
948 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
949 &attr);
950
951 if (src != None)
952 {
953 XEvent event;
954 int ev_count = 0;
955 XGrabServer (dpy);
956 XMapRaised (dpy, src);
957 XSync (dpy, False);
958
959 /* XSync should get window where it's properly exposed,
960 * but to be on the safe side - let's check for the actual event to arrive : */
961 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
962 ++ev_count;
963
964 if (ev_count > 0);
965 {
966 /* hooray! - we can grab the image! */
967 gc = XCreateGC (dpy, root, 0, NULL);
968 if (gc)
969 {
970 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
971 success = true;
972 }
973 }
974
975 XDestroyWindow (dpy, src);
976 XUngrabServer (dpy);
977 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
978 }
979
980 if (!success)
981 {
982 XFreePixmap (dpy, tiled_root_pmap);
983 tiled_root_pmap = None;
984 }
985 else
986 result |= transpPmapTiled;
987 }
988 else
989 {
990 /* straightforward pixmap copy */ 1345 /* straightforward pixmap copy */
991 gcv.tile = root_pixmap; 1346 gcv.tile = root_pixmap;
992 gcv.fill_style = FillTiled; 1347 gcv.fill_style = FillTiled;
993 1348
994 while (sx < 0) sx += (int)root_width; 1349 while (sx < 0) sx += (int)root_width;
995 while (sy < 0) sy += (int)root_height; 1350 while (sy < 0) sy += (int)root_height;
996 1351
997 gcv.ts_x_origin = -sx; 1352 gcv.ts_x_origin = -sx;
998 gcv.ts_y_origin = -sy; 1353 gcv.ts_y_origin = -sy;
999 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1354 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1000 1355
1001 if (gc) 1356 if (gc)
1002 { 1357 {
1003 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1358 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1004 result |= transpPmapTiled; 1359 result |= transpPmapTiled;
1005 } 1360 XFreeGC (dpy, gc);
1006 } 1361 }
1007 TIMING_TEST_PRINT_RESULT (tp);
1008 1362
1009 if (tiled_root_pmap != None) 1363 if (tiled_root_pmap != None)
1010 { 1364 {
1011 if (!need_client_side_rendering ()) 1365 if (!need_client_side_rendering ())
1012 { 1366 {
1013 if ((flags & tintNeeded)) 1367 if (flags & (blurNeeded | blurServerSide))
1014 {
1015 if (flags & tintWholesome)
1016 { 1368 {
1017 /* In this case we can tint image server-side getting significant 1369 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1018 * performance improvements, as we eliminate XImage transfer
1019 */
1020 gcv.foreground = Pixel (tint);
1021 gcv.function = GXand;
1022 gcv.fill_style = FillSolid;
1023 if (gc)
1024 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1025 else
1026 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1027 if (gc)
1028 {
1029 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1030 result |= transpPmapTinted; 1370 result |= transpPmapBlurred;
1031 }
1032 }
1033 else
1034 {
1035# if XFT
1036 Picture back_pic = 0;
1037 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1038
1039 if (flags & tintSet)
1040 tint.get (c);
1041
1042 if (shade > 0 && shade < 100)
1043 {
1044 c.r = (c.r * shade) / 100;
1045 c.g = (c.g * shade) / 100;
1046 c.b = (c.b * shade) / 100;
1047 }
1048 else if (shade > 100 && shade < 200)
1049 {
1050 c.r = (c.r * (200 - shade)) / 100;
1051 c.g = (c.g * (200 - shade)) / 100;
1052 c.b = (c.b * (200 - shade)) / 100;
1053 }
1054
1055 XRenderPictFormat pf;
1056 pf.type = PictTypeDirect;
1057 pf.depth = 32;
1058 pf.direct.redMask = 0xff;
1059 pf.direct.greenMask = 0xff;
1060 pf.direct.blueMask = 0xff;
1061 pf.direct.alphaMask = 0xff;
1062
1063 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1064 (PictFormatType|
1065 PictFormatDepth|
1066 PictFormatRedMask|
1067 PictFormatGreenMask|
1068 PictFormatBlueMask|
1069 PictFormatAlphaMask),
1070 &pf,
1071 0);
1072 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1073 XRenderPictureAttributes pa ;
1074
1075 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1076
1077 pa.repeat = True;
1078
1079 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1080 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1081 XFreePixmap (dpy, overlay_pmap);
1082
1083 pa.component_alpha = True;
1084 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1085 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1086 XFreePixmap (dpy, mask_pmap);
1087
1088 if (mask_pic && overlay_pic && back_pic)
1089 {
1090 XRenderColor mask_c;
1091
1092 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1093 mask_c.alpha = 0xffff;
1094 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1095
1096 mask_c.alpha = 0;
1097 mask_c.red = 0xffff - c.r;
1098 mask_c.green = 0xffff - c.g;
1099 mask_c.blue = 0xffff - c.b;
1100 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1101 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1102 result |= transpPmapTinted;
1103 }
1104
1105 XRenderFreePicture (dpy, mask_pic);
1106 XRenderFreePicture (dpy, overlay_pic);
1107 XRenderFreePicture (dpy, back_pic);
1108# if DO_TIMING_TEST
1109 XSync (dpy, False);
1110# endif
1111# endif
1112 }
1113 } 1371 }
1372 if (flags & (tintNeeded | tintServerSide))
1373 {
1374 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1375 result |= transpPmapTinted;
1376 }
1114 } /* server side rendering completed */ 1377 } /* server side rendering completed */
1115 1378
1116 if (pixmap) 1379 if (pixmap)
1117 XFreePixmap (dpy, pixmap); 1380 XFreePixmap (dpy, pixmap);
1118 1381
1120 pmap_width = window_width; 1383 pmap_width = window_width;
1121 pmap_height = window_height; 1384 pmap_height = window_height;
1122 pmap_depth = root_depth; 1385 pmap_depth = root_depth;
1123 } 1386 }
1124 1387
1125 if (gc)
1126 XFreeGC (dpy, gc);
1127
1128 TIMING_TEST_PRINT_RESULT (tp);
1129
1130 return result; 1388 return result;
1131} 1389}
1132 1390
1133bool 1391bool
1134bgPixmap_t::set_root_pixmap () 1392bgPixmap_t::set_root_pixmap ()
1146 return false; 1404 return false;
1147} 1405}
1148# endif /* ENABLE_TRANSPARENCY */ 1406# endif /* ENABLE_TRANSPARENCY */
1149 1407
1150# ifndef HAVE_AFTERIMAGE 1408# ifndef HAVE_AFTERIMAGE
1151static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1409static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1152# endif 1410# endif
1153 1411
1154bool 1412bool
1155bgPixmap_t::render () 1413bgPixmap_t::render ()
1156{ 1414{
1157 unsigned long background_flags = 0; 1415 unsigned long background_flags = 0;
1158 1416
1159 if (target == NULL) 1417 if (target == NULL)
1160 return false; 1418 return false;
1161
1162 TIMING_TEST_START (tp);
1163 1419
1164 invalidate (); 1420 invalidate ();
1165# ifdef ENABLE_TRANSPARENCY 1421# ifdef ENABLE_TRANSPARENCY
1166 if (flags & isTransparent) 1422 if (flags & isTransparent)
1167 { 1423 {
1168 /* we need to re-generate transparency pixmap in that case ! */ 1424 /* we need to re-generate transparency pixmap in that case ! */
1169 background_flags = make_transparency_pixmap (); 1425 background_flags = make_transparency_pixmap ();
1170 if (background_flags == 0) 1426 if (background_flags == 0)
1171 return false; 1427 return false;
1172 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1428 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1173 && pmap_depth == target->depth) 1429 && pmap_depth == target->depth)
1174 flags = flags & ~isInvalid; 1430 flags = flags & ~isInvalid;
1175 } 1431 }
1176# endif 1432# endif
1177 1433
1434# ifdef BG_IMAGE_FROM_FILE
1435 if (have_image
1436 || (background_flags & transpTransformations) != (flags & transpTransformations))
1437 {
1438 if (render_image (background_flags))
1439 flags = flags & ~isInvalid;
1440 }
1441# endif
1442
1178 XImage *result = NULL; 1443 XImage *result = NULL;
1179# ifdef HAVE_AFTERIMAGE
1180 if (original_asim
1181 || (background_flags & transpTransformations) != (flags & transpTransformations))
1182 {
1183 if (render_asim (background_flags))
1184 flags = flags & ~isInvalid;
1185 }
1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193 1444
1194 if (background_flags && (flags & isInvalid)) 1445 if (background_flags && (flags & isInvalid))
1195 { 1446 {
1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1447 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1448 }
1197 1449
1450 if (result)
1451 {
1452# if !defined(HAVE_AFTERIMAGE) && !XFT
1453 /* our own client-side tinting */
1454 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1455 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1456 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1199 { 1457 {
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1458 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201 if (flags & tintSet) 1459 if (flags & tintSet)
1202 tint.get (c); 1460 tint.get (c);
1203 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1461 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1204 } 1462 }
1205 } 1463# endif
1206# endif /* HAVE_AFTERIMAGE */
1207 1464
1208 if (result)
1209 {
1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211 1466
1212 if (gc) 1467 if (gc)
1213 { 1468 {
1214 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1469 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1243 1498
1244 XFreeGC (target->dpy, gc); 1499 XFreeGC (target->dpy, gc);
1245 flags = flags & ~isInvalid; 1500 flags = flags & ~isInvalid;
1246 } 1501 }
1247 1502
1248 XDestroyImage (result); 1503 XDestroyImage (result);
1249 } 1504 }
1250 1505
1251 if (flags & isInvalid) 1506 if (flags & isInvalid)
1252 { 1507 {
1253 if (pixmap != None) 1508 if (pixmap != None)
1257 } 1512 }
1258 } 1513 }
1259 1514
1260 apply (); 1515 apply ();
1261 1516
1262 XSync (target->dpy, False);
1263 valid_since = ev::now (); 1517 valid_since = ev::now ();
1264
1265 TIMING_TEST_PRINT_RESULT (tp);
1266 1518
1267 return true; 1519 return true;
1268} 1520}
1269 1521
1270bool 1522bool
1286void 1538void
1287bgPixmap_t::apply () 1539bgPixmap_t::apply ()
1288{ 1540{
1289 if (target) 1541 if (target)
1290 { 1542 {
1291 flags &= ~isVtOrigin;
1292
1293 if (pixmap != None) 1543 if (pixmap != None)
1294 { 1544 {
1295 /* set target's background to pixmap */ 1545 /* set target's background to pixmap */
1296# ifdef ENABLE_TRANSPARENCY 1546# ifdef ENABLE_TRANSPARENCY
1297 if (flags & isTransparent) 1547 if (flags & isTransparent)
1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1553 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1304 } 1554 }
1305 else 1555 else
1306# endif 1556# endif
1307 { 1557 {
1308 flags |= isVtOrigin;
1309 /* force old pixmap dereference in case it was transparent before :*/ 1558 /* force old pixmap dereference in case it was transparent before :*/
1310 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1559 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1311 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1560 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1312 /* do we also need to set scrollbar's background here ? */ 1561 /* do we also need to set scrollbar's background here ? */
1313 1562
1343#endif /* HAVE_BG_PIXMAP */ 1592#endif /* HAVE_BG_PIXMAP */
1344 1593
1345#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1594#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1346/* taken from aterm-0.4.2 */ 1595/* taken from aterm-0.4.2 */
1347 1596
1348typedef uint32_t RUINT32T;
1349
1350static void 1597static void
1351ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1598ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1352{ 1599{
1353 int sh_r, sh_g, sh_b; 1600 int sh_r, sh_g, sh_b;
1354 RUINT32T mask_r, mask_g, mask_b; 1601 uint32_t mask_r, mask_g, mask_b;
1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1602 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1603 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1357 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1604 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1358 int i; 1605 int i;
1606 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1359 1607
1360 Visual *visual = term->visual;
1361
1362 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1608 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1363
1364 if (shade == 0)
1365 shade = 100;
1366 1609
1367 /* for convenience */ 1610 /* for convenience */
1368 mask_r = visual->red_mask; 1611 mask_r = visual->red_mask;
1369 mask_g = visual->green_mask; 1612 mask_g = visual->green_mask;
1370 mask_b = visual->blue_mask; 1613 mask_b = visual->blue_mask;
1371 1614
1372 /* boring lookup table pre-initialization */ 1615 /* boring lookup table pre-initialization */
1373 switch (srcImage->bits_per_pixel) { 1616 switch (srcImage->depth)
1617 {
1374 case 15: 1618 case 15:
1375 if ((mask_r != 0x7c00) || 1619 if ((mask_r != 0x7c00) ||
1376 (mask_g != 0x03e0) || 1620 (mask_g != 0x03e0) ||
1377 (mask_b != 0x001f)) 1621 (mask_b != 0x001f))
1378 return; 1622 return;
1379 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1623 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1380 lookup_r = lookup; 1624 lookup_r = lookup;
1381 lookup_g = lookup+32; 1625 lookup_g = lookup+32;
1382 lookup_b = lookup+32+32; 1626 lookup_b = lookup+32+32;
1383 sh_r = 10; 1627 sh_r = 10;
1384 sh_g = 5; 1628 sh_g = 5;
1385 sh_b = 0; 1629 sh_b = 0;
1386 break; 1630 break;
1387 case 16: 1631 case 16:
1388 if ((mask_r != 0xf800) || 1632 if ((mask_r != 0xf800) ||
1389 (mask_g != 0x07e0) || 1633 (mask_g != 0x07e0) ||
1390 (mask_b != 0x001f)) 1634 (mask_b != 0x001f))
1391 return; 1635 return;
1392 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1636 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1393 lookup_r = lookup; 1637 lookup_r = lookup;
1394 lookup_g = lookup+32; 1638 lookup_g = lookup+32;
1395 lookup_b = lookup+32+64; 1639 lookup_b = lookup+32+64;
1396 sh_r = 11; 1640 sh_r = 11;
1397 sh_g = 5; 1641 sh_g = 5;
1398 sh_b = 0; 1642 sh_b = 0;
1399 break; 1643 break;
1400 case 24: 1644 case 24:
1401 if ((mask_r != 0xff0000) || 1645 if ((mask_r != 0xff0000) ||
1402 (mask_g != 0x00ff00) || 1646 (mask_g != 0x00ff00) ||
1403 (mask_b != 0x0000ff)) 1647 (mask_b != 0x0000ff))
1404 return; 1648 return;
1405 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1649 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1406 lookup_r = lookup; 1650 lookup_r = lookup;
1407 lookup_g = lookup+256; 1651 lookup_g = lookup+256;
1408 lookup_b = lookup+256+256; 1652 lookup_b = lookup+256+256;
1409 sh_r = 16; 1653 sh_r = 16;
1410 sh_g = 8; 1654 sh_g = 8;
1411 sh_b = 0; 1655 sh_b = 0;
1412 break; 1656 break;
1413 case 32: 1657 case 32:
1414 if ((mask_r != 0xff0000) || 1658 if ((mask_r != 0xff0000) ||
1415 (mask_g != 0x00ff00) || 1659 (mask_g != 0x00ff00) ||
1416 (mask_b != 0x0000ff)) 1660 (mask_b != 0x0000ff))
1417 return; 1661 return;
1418 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1662 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1419 lookup_r = lookup; 1663 lookup_r = lookup;
1420 lookup_g = lookup+256; 1664 lookup_g = lookup+256;
1421 lookup_b = lookup+256+256; 1665 lookup_b = lookup+256+256;
1422 sh_r = 16; 1666 sh_r = 16;
1423 sh_g = 8; 1667 sh_g = 8;
1424 sh_b = 0; 1668 sh_b = 0;
1425 break; 1669 break;
1426 default: 1670 default:
1427 return; /* we do not support this color depth */ 1671 return; /* we do not support this color depth */
1428 } 1672 }
1429 1673
1430 /* prepare limits for color transformation (each channel is handled separately) */ 1674 /* prepare limits for color transformation (each channel is handled separately) */
1431 if (shade < 0) { 1675 if (shade > 100)
1676 {
1432 shade = -shade; 1677 shade = 200 - shade;
1433 if (shade < 0) shade = 0;
1434 if (shade > 100) shade = 100;
1435 1678
1436 lower_lim_r = 65535-rm; 1679 lower_lim_r = 65535-rm;
1437 lower_lim_g = 65535-gm; 1680 lower_lim_g = 65535-gm;
1438 lower_lim_b = 65535-bm; 1681 lower_lim_b = 65535-bm;
1439 1682
1440 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1683 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1441 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1684 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1442 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1685 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1443 1686
1444 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1687 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1688 }
1445 } else { 1689 else
1446 if (shade < 0) shade = 0; 1690 {
1447 if (shade > 100) shade = 100;
1448 1691
1449 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1692 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1450 1693
1451 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1694 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1452 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1695 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1453 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1696 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1454 } 1697 }
1455
1456 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1457 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1458 {
1459 unsigned int tmp;
1460
1461 tmp = lower_lim_r;
1462 lower_lim_r = lower_lim_b;
1463 lower_lim_b = tmp;
1464
1465 tmp = upper_lim_r;
1466 upper_lim_r = upper_lim_b;
1467 upper_lim_b = tmp;
1468 }
1469 1698
1470 /* fill our lookup tables */ 1699 /* fill our lookup tables */
1471 for (i = 0; i <= mask_r>>sh_r; i++) 1700 for (i = 0; i <= mask_r>>sh_r; i++)
1472 { 1701 {
1473 RUINT32T tmp; 1702 uint32_t tmp;
1474 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1475 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1704 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1476 lookup_r[i] = (tmp/65535)<<sh_r; 1705 lookup_r[i] = (tmp/65535)<<sh_r;
1477 } 1706 }
1478 for (i = 0; i <= mask_g>>sh_g; i++) 1707 for (i = 0; i <= mask_g>>sh_g; i++)
1479 { 1708 {
1480 RUINT32T tmp; 1709 uint32_t tmp;
1481 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1710 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1482 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1711 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1483 lookup_g[i] = (tmp/65535)<<sh_g; 1712 lookup_g[i] = (tmp/65535)<<sh_g;
1484 } 1713 }
1485 for (i = 0; i <= mask_b>>sh_b; i++) 1714 for (i = 0; i <= mask_b>>sh_b; i++)
1486 { 1715 {
1487 RUINT32T tmp; 1716 uint32_t tmp;
1488 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1717 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1489 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1718 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1490 lookup_b[i] = (tmp/65535)<<sh_b; 1719 lookup_b[i] = (tmp/65535)<<sh_b;
1491 } 1720 }
1492 1721
1493 /* apply table to input image (replacing colors by newly calculated ones) */ 1722 /* apply table to input image (replacing colors by newly calculated ones) */
1494 switch (srcImage->bits_per_pixel) 1723 if (srcImage->bits_per_pixel == 32
1724 && (srcImage->depth == 24 || srcImage->depth == 32)
1725 && srcImage->byte_order == host_byte_order)
1495 { 1726 {
1496 case 15:
1497 {
1498 unsigned short *p1, *pf, *p, *pl; 1727 uint32_t *p1, *pf, *p, *pl;
1499 p1 = (unsigned short *) srcImage->data; 1728 p1 = (uint32_t *) srcImage->data;
1500 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1729 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1730
1501 while (p1 < pf) 1731 while (p1 < pf)
1502 { 1732 {
1503 p = p1; 1733 p = p1;
1504 pl = p1 + srcImage->width; 1734 pl = p1 + srcImage->width;
1505 for (; p < pl; p++) 1735 for (; p < pl; p++)
1506 { 1736 {
1507 *p = lookup_r[(*p & 0x7c00)>>10] |
1508 lookup_g[(*p & 0x03e0)>> 5] |
1509 lookup_b[(*p & 0x001f)];
1510 }
1511 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1512 }
1513 break;
1514 }
1515 case 16:
1516 {
1517 unsigned short *p1, *pf, *p, *pl;
1518 p1 = (unsigned short *) srcImage->data;
1519 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1520 while (p1 < pf)
1521 {
1522 p = p1;
1523 pl = p1 + srcImage->width;
1524 for (; p < pl; p++)
1525 {
1526 *p = lookup_r[(*p & 0xf800)>>11] |
1527 lookup_g[(*p & 0x07e0)>> 5] |
1528 lookup_b[(*p & 0x001f)];
1529 }
1530 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1531 }
1532 break;
1533 }
1534 case 24:
1535 {
1536 unsigned char *p1, *pf, *p, *pl;
1537 p1 = (unsigned char *) srcImage->data;
1538 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1539 while (p1 < pf)
1540 {
1541 p = p1;
1542 pl = p1 + srcImage->width * 3;
1543 for (; p < pl; p += 3)
1544 {
1545 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1546 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1547 p[2] = lookup_r[(p[2] & 0x0000ff)];
1548 }
1549 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1550 }
1551 break;
1552 }
1553 case 32:
1554 {
1555 RUINT32T *p1, *pf, *p, *pl;
1556 p1 = (RUINT32T *) srcImage->data;
1557 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1558
1559 while (p1 < pf)
1560 {
1561 p = p1;
1562 pl = p1 + srcImage->width;
1563 for (; p < pl; p++)
1564 {
1565 *p = lookup_r[(*p & 0xff0000)>>16] | 1737 *p = lookup_r[(*p & 0xff0000) >> 16] |
1566 lookup_g[(*p & 0x00ff00)>> 8] | 1738 lookup_g[(*p & 0x00ff00) >> 8] |
1567 lookup_b[(*p & 0x0000ff)] | 1739 lookup_b[(*p & 0x0000ff)] |
1568 (*p & ~0xffffff); 1740 (*p & 0xff000000);
1741 }
1742 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1743 }
1744 }
1745 else
1746 {
1747 for (int y = 0; y < srcImage->height; y++)
1748 for (int x = 0; x < srcImage->width; x++)
1749 {
1750 unsigned long pixel = XGetPixel (srcImage, x, y);
1751 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1752 lookup_g[(pixel & mask_g) >> sh_g] |
1753 lookup_b[(pixel & mask_b) >> sh_b];
1754 XPutPixel (srcImage, x, y, pixel);
1569 } 1755 }
1570 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1571 } 1756 }
1572 break;
1573 }
1574 }
1575 1757
1576 free (lookup); 1758 free (lookup);
1577} 1759}
1578#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1760#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines