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.50 by sf-exg, Tue Aug 31 15:14:06 2010 UTC vs.
Revision 1.101 by sf-exg, Sun Oct 31 08:28:04 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
102 have_image = false; 107 have_image = false;
103 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
104 h_align = v_align = 0; 109 h_align = v_align = 0;
105#endif 110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
106 flags = 0; 114 flags = 0;
107 pixmap = None; 115 pixmap = None;
108 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
109 target = 0; 117 target = 0;
110} 118}
115#ifdef HAVE_AFTERIMAGE 123#ifdef HAVE_AFTERIMAGE
116 if (original_asim) 124 if (original_asim)
117 safe_asimage_destroy (original_asim); 125 safe_asimage_destroy (original_asim);
118#endif 126#endif
119 127
128#ifdef HAVE_PIXBUF
129 if (pixbuf)
130 g_object_unref (pixbuf);
131#endif
132
120 if (pixmap && target) 133 if (pixmap && target)
121 XFreePixmap (target->dpy, pixmap); 134 XFreePixmap (target->dpy, pixmap);
122} 135}
123 136
124bool 137bool
130# endif 143# endif
131 144
132# ifdef BG_IMAGE_FROM_FILE 145# ifdef BG_IMAGE_FROM_FILE
133 if (have_image) 146 if (have_image)
134 { 147 {
135 if (h_scale != 0 || v_scale != 0 148 if (flags & sizeSensitive)
136 || h_align != 0 || v_align != 0)
137 return true; 149 return true;
138 } 150 }
139# endif 151# endif
140 152
141 return false; 153 return false;
150# endif 162# endif
151 163
152# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
153 if (have_image) 165 if (have_image)
154 { 166 {
155 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
156 return true; 168 return true;
157 } 169 }
158# endif 170# endif
159 171
160 return false; 172 return false;
164{ 176{
165# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
166 if (original_asim) 178 if (original_asim)
167 return true; 179 return true;
168# endif 180# endif
169# ifdef ENABLE_TRANSPARENCY
170 if (flags & isTransparent)
171 {
172# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
173 if ((flags & blurNeeded) && !(flags & blurServerSide))
174 return true;
175# endif
176 if ((flags & tintNeeded) && !(flags & tintServerSide))
177 return true;
178 }
179# endif
180 return false; 181 return false;
181} 182}
182 183
183# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
184static inline bool 185static inline bool
200static inline bool 201static inline bool
201check_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)
202{ 203{
203 if (geom_flags & flag) 204 if (geom_flags & flag)
204 { 205 {
205 if (new_value != bgPixmap_t::rootAlign)
206 {
207 if (new_value < -100) 206 if (new_value < -100)
208 new_value = -100; 207 new_value = -100;
209 else if (new_value > 200) 208 else if (new_value > 200)
210 new_value = 200; 209 new_value = 200;
211 }
212 if (new_value != align) 210 if (new_value != align)
213 { 211 {
214 align = new_value; 212 align = new_value;
215 return true; 213 return true;
216 } 214 }
220 218
221static inline int 219static inline int
222make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
223{ 221{
224 int diff = window_size - image_size; 222 int diff = window_size - image_size;
225 int smaller = MIN (image_size,window_size); 223 int smaller = min (image_size, window_size);
226 224
227 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
228 return diff * align / 100; 226 return diff * align / 100;
229 else if (align > 50 && align <= 100)
230 return window_size - image_size - diff * (100 - align) / 100;
231 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
232 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
233 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
234 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
235 return 0; 231 return 0;
236} 232}
237 233
238static inline int 234static inline int
239make_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)
240{ 236{
241 int src_pos = 0; 237 int src_pos = 0;
242 dst_pos = 0; 238 dst_pos = pos;
243 dst_size = size; 239 dst_size = size;
244 if (pos < 0 && size > target_size) 240 if (pos < 0)
245 { 241 {
246 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
247 dst_size += pos; 244 dst_size += pos;
248 } 245 }
249 else if (pos > 0)
250 dst_pos = pos;
251 246
252 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
253 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
254 return src_pos; 249 return src_pos;
255} 250}
380 w = h = noScale; 375 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 376 geom_flags |= WidthValue|HeightValue;
382 } 377 }
383 else if (CHECK_GEOM_OPS ("propscale")) 378 else if (CHECK_GEOM_OPS ("propscale"))
384 { 379 {
385 if (w == 0 && h == 0)
386 {
387 w = windowScale;
388 geom_flags |= WidthValue;
389 }
390 new_flags |= propScale; 380 new_flags |= propScale;
391 } 381 }
392 else if (CHECK_GEOM_OPS ("hscale")) 382 else if (CHECK_GEOM_OPS ("hscale"))
393 { 383 {
394 if (w == 0) w = windowScale; 384 if (w == 0) w = windowScale;
416 x = y = centerAlign; 406 x = y = centerAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 408 }
419 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
420 { 410 {
411 new_flags |= rootAlign;
421 w = h = noScale; 412 w = h = noScale;
422 x = y = rootAlign;
423 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
424 } 414 }
425# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
426 416
427 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 418 } /* done parsing ops */
438 { 428 {
439 flags = new_flags; 429 flags = new_flags;
440 changed++; 430 changed++;
441 } 431 }
442 432
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align);
445 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;
446} 475}
447 476
448# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
449bool 478bool
450bgPixmap_t::render_image (unsigned long background_flags) 479bgPixmap_t::render_image (unsigned long background_flags)
462 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);
463 492
464 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 493 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
465 { 494 {
466 ShadingInfo as_shade; 495 ShadingInfo as_shade;
467 as_shade.shading = (shade == 0) ? 100 : shade; 496 as_shade.shading = shade;
468 497
469 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 498 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
470 if (flags & tintSet) 499 if (flags & tintSet)
471 tint.get (c); 500 tint.get (c);
472 as_shade.tintColor.red = c.r; 501 as_shade.tintColor.red = c.r;
474 as_shade.tintColor.blue = c.b; 503 as_shade.tintColor.blue = c.b;
475 504
476 background_tint = shading2tint32 (&as_shade); 505 background_tint = shading2tint32 (&as_shade);
477 } 506 }
478 507
479 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 508 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
480 { 509 {
481 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,
482 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 511 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 512 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp) 513 if (tmp)
496 int new_pmap_width = target_width; 525 int new_pmap_width = target_width;
497 int new_pmap_height = target_height; 526 int new_pmap_height = target_height;
498 527
499 int x = 0; 528 int x = 0;
500 int y = 0; 529 int y = 0;
501 int w = h_scale * target_width / 100; 530 int w = 0;
502 int h = v_scale * target_height / 100; 531 int h = 0;
503
504 TIMING_TEST_START (asim);
505 532
506 if (original_asim) 533 if (original_asim)
507 { 534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
508 if (h_align == rootAlign || v_align == rootAlign)
509 {
510 target->get_window_origin (x, y);
511 x = -x;
512 y = -y;
513 }
514
515 if (h_align != rootAlign)
516 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
517
518 if (v_align != rootAlign)
519 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
520 }
521 535
522 if (!original_asim 536 if (!original_asim
537 || (!(flags & rootAlign)
523 || x >= target_width 538 && (x >= target_width
524 || y >= target_height 539 || y >= target_height
525 || (w > 0 && x + w <= 0) 540 || (x + w <= 0)
526 || (h > 0 && y + h <= 0)) 541 || (y + h <= 0))))
527 { 542 {
528 if (background) 543 if (background)
529 { 544 {
530 new_pmap_width = background->width; 545 new_pmap_width = background->width;
531 new_pmap_height = background->height; 546 new_pmap_height = background->height;
545 } 560 }
546 else 561 else
547 { 562 {
548 result = original_asim; 563 result = original_asim;
549 564
550 if ((w > 0 && w != original_asim->width) 565 if ((w != original_asim->width)
551 || (h > 0 && h != original_asim->height)) 566 || (h != original_asim->height))
552 { 567 {
553 result = scale_asimage (target->asv, original_asim, 568 result = scale_asimage (target->asv, original_asim,
554 w > 0 ? w : original_asim->width, 569 w, h,
555 h > 0 ? h : original_asim->height,
556 background ? ASA_ASImage : ASA_XImage, 570 background ? ASA_ASImage : ASA_XImage,
557 100, ASIMAGE_QUALITY_DEFAULT); 571 100, ASIMAGE_QUALITY_DEFAULT);
558 } 572 }
559 573
560 if (background == NULL) 574 if (background == NULL)
561 { 575 {
562 /* if tiling - pixmap has to be sized exactly as the image,
563 but there is no need to make it bigger than the window! */
564 if (h_scale == 0)
565 new_pmap_width = min (result->width, target_width);
566 if (v_scale == 0)
567 new_pmap_height = min (result->height, target_height);
568 /* we also need to tile our image in one or both directions */
569 if (h_scale == 0 || v_scale == 0) 576 if (h_scale == 0 || v_scale == 0)
570 { 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 */
571 ASImage *tmp = tile_asimage (target->asv, result, 584 ASImage *tmp = tile_asimage (target->asv, result,
572 (h_scale > 0) ? 0 : (int)result->width - x, 585 (int)result->width - x,
573 (v_scale > 0) ? 0 : (int)result->height - y, 586 (int)result->height - y,
574 new_pmap_width, 587 new_pmap_width,
575 new_pmap_height, 588 new_pmap_height,
576 TINT_LEAVE_SAME, ASA_XImage, 589 TINT_LEAVE_SAME, ASA_XImage,
577 100, ASIMAGE_QUALITY_DEFAULT); 590 100, ASIMAGE_QUALITY_DEFAULT);
578 if (tmp) 591 if (tmp)
593 layers[0].clip_width = target_width; 606 layers[0].clip_width = target_width;
594 layers[0].clip_height = target_height; 607 layers[0].clip_height = target_height;
595 layers[0].tint = background_tint; 608 layers[0].tint = background_tint;
596 layers[1].im = result; 609 layers[1].im = result;
597 610
598 if (w <= 0) 611 if (h_scale == 0 || v_scale == 0)
599 { 612 {
600 /* tile horizontally */ 613 /* tile horizontally */
601 while (x > 0) x -= (int)result->width; 614 while (x > 0) x -= (int)result->width;
602 layers[1].dst_x = x; 615 layers[1].dst_x = x;
603 layers[1].clip_width = result->width+target_width; 616 layers[1].clip_width = result->width+target_width;
607 /* clip horizontally */ 620 /* clip horizontally */
608 layers[1].dst_x = x; 621 layers[1].dst_x = x;
609 layers[1].clip_width = result->width; 622 layers[1].clip_width = result->width;
610 } 623 }
611 624
612 if (h <= 0) 625 if (h_scale == 0 || v_scale == 0)
613 { 626 {
614 while (y > 0) y -= (int)result->height; 627 while (y > 0) y -= (int)result->height;
615 layers[1].dst_y = y; 628 layers[1].dst_y = y;
616 layers[1].clip_height = result->height + target_height; 629 layers[1].clip_height = result->height + target_height;
617 } 630 }
640 } 653 }
641 654
642 free (layers); 655 free (layers);
643 } 656 }
644 } 657 }
645 TIMING_TEST_PRINT_RESULT (asim);
646 658
647 if (pixmap) 659 bool ret = false;
648 {
649 if (result == NULL
650 || pmap_width != new_pmap_width
651 || pmap_height != new_pmap_height
652 || pmap_depth != target->depth)
653 {
654 XFreePixmap (target->dpy, pixmap);
655 pixmap = None;
656 }
657 }
658 660
659 if (result) 661 if (result)
660 { 662 {
661 XGCValues gcv; 663 XGCValues gcv;
662 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 }
663 676
664 /* create Pixmap */ 677 /* create Pixmap */
665 if (pixmap == None) 678 if (pixmap == None)
666 { 679 {
667 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);
675 688
676 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;
677 int dst_width = result->width, dst_height = result->height; 690 int dst_width = result->width, dst_height = result->height;
678 if (background == NULL) 691 if (background == NULL)
679 { 692 {
693 if (!(h_scale == 0 || v_scale == 0))
694 {
680 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 );
681 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 }
682 698
683 if (dst_x > 0 || dst_y > 0 699 if (dst_x > 0 || dst_y > 0
684 || dst_x + dst_width < new_pmap_width 700 || dst_x + dst_width < new_pmap_width
685 || dst_y + dst_height < new_pmap_height) 701 || dst_y + dst_height < new_pmap_height)
686 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);
692 708
693 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
694 destroy_asimage (&result); 710 destroy_asimage (&result);
695 711
696 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
697 TIMING_TEST_PRINT_RESULT (asim); 713
714 ret = true;
698 } 715 }
699 716
700 if (background) 717 if (background)
701 destroy_asimage (&background); 718 destroy_asimage (&background);
702 719
703 return true; 720 return ret;
704} 721}
705# 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 !XRENDER
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 XRENDER
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 */
706 910
707bool 911bool
708bgPixmap_t::set_file (const char *file) 912bgPixmap_t::set_file (const char *file)
709{ 913{
710 assert (file); 914 assert (file);
721 } 925 }
722 926
723# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
724 if (!target->asimman) 928 if (!target->asimman)
725 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
726 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
727 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
728 have_image = true; 936 have_image = true;
729 return have_image; 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 }
730# endif 951# endif
731 } 952 }
732 953
733 return false; 954 return false;
734} 955}
754 int changed = 0; 975 int changed = 0;
755 unsigned int hr, vr; 976 unsigned int hr, vr;
756 int junk; 977 int junk;
757 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
758 979
759 if (!(geom_flags&WidthValue)) 980 if (!(geom_flags & WidthValue))
760 hr = 1; 981 hr = 1;
761 if (!(geom_flags&HeightValue)) 982 if (!(geom_flags & HeightValue))
762 vr = hr; 983 vr = hr;
984
985 min_it (hr, 128);
986 min_it (vr, 128);
763 987
764 if (h_blurRadius != hr) 988 if (h_blurRadius != hr)
765 { 989 {
766 ++changed; 990 ++changed;
767 h_blurRadius = hr; 991 h_blurRadius = hr;
776 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
777 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
778 else 1002 else
779 flags |= blurNeeded; 1003 flags |= blurNeeded;
780 1004
1005#if XRENDER
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
781 return (changed>0); 1017 return (changed > 0);
782} 1018}
783 1019
784static inline unsigned long 1020static inline unsigned long
785compute_tint_shade_flags (rxvt_color *tint, int shade) 1021compute_tint_shade_flags (rxvt_color *tint, int shade)
786{ 1022{
787 unsigned long flags = 0; 1023 unsigned long flags = 0;
788 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1024 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
789 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1025 bool has_shade = shade != 100;
790 1026
791 if (tint) 1027 if (tint)
792 { 1028 {
793 tint->get (c); 1029 tint->get (c);
794# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
814 { 1050 {
815 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
816 flags |= bgPixmap_t::tintServerSide; 1052 flags |= bgPixmap_t::tintServerSide;
817 else 1053 else
818 { 1054 {
819#if XFT 1055#if XRENDER
820 flags |= bgPixmap_t::tintServerSide; 1056 flags |= bgPixmap_t::tintServerSide;
821#endif 1057#endif
822 } 1058 }
823 } 1059 }
824 1060
826} 1062}
827 1063
828bool 1064bool
829bgPixmap_t::set_tint (rxvt_color &new_tint) 1065bgPixmap_t::set_tint (rxvt_color &new_tint)
830{ 1066{
831 if (tint != new_tint) 1067 if (!(flags & tintSet) || tint != new_tint)
832 { 1068 {
833 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1069 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
834 tint = new_tint; 1070 tint = new_tint;
835 flags = (flags & ~tintFlags) | new_flags | tintSet; 1071 flags = (flags & ~tintFlags) | new_flags | tintSet;
836 return true; 1072 return true;
844{ 1080{
845 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1081 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
846 1082
847 if (new_flags != (flags & tintFlags)) 1083 if (new_flags != (flags & tintFlags))
848 { 1084 {
849 flags = (flags&~tintFlags)|new_flags; 1085 flags = (flags & ~tintFlags) | new_flags;
850 return true; 1086 return true;
851 } 1087 }
852 1088
853 return false; 1089 return false;
854} 1090}
855 1091
856bool 1092bool
857bgPixmap_t::set_shade (const char *shade_str) 1093bgPixmap_t::set_shade (const char *shade_str)
858{ 1094{
859 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1095 int new_shade = (shade_str) ? atoi (shade_str) : 100;
860 1096
861 if (new_shade < 0 && new_shade > -100) 1097 clamp_it (new_shade, -100, 200);
1098 if (new_shade < 0)
862 new_shade = 200 - (100 + new_shade); 1099 new_shade = 200 - (100 + new_shade);
863 else if (new_shade == 100)
864 new_shade = 0;
865 1100
866 if (new_shade != shade) 1101 if (new_shade != shade)
867 { 1102 {
868 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);
869 shade = new_shade; 1104 shade = new_shade;
872 } 1107 }
873 1108
874 return false; 1109 return false;
875} 1110}
876 1111
1112#if XRENDER
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 XRENDER
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 XRENDER
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;
1286}
1287
877/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
878 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1289 * Builds a pixmap of the same size as the terminal window that contains
879 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1290 * the tiled portion of the root pixmap that is supposed to be covered by
880 * our window. 1291 * our window.
881 */ 1292 */
882unsigned long 1293unsigned long
883bgPixmap_t::make_transparency_pixmap () 1294bgPixmap_t::make_transparency_pixmap ()
884{ 1295{
893 Window root = target->display->root; 1304 Window root = target->display->root;
894 int screen = target->display->screen; 1305 int screen = target->display->screen;
895 Display *dpy = target->dpy; 1306 Display *dpy = target->dpy;
896 int root_width = DisplayWidth (dpy, screen); 1307 int root_width = DisplayWidth (dpy, screen);
897 int root_height = DisplayHeight (dpy, screen); 1308 int root_height = DisplayHeight (dpy, screen);
898 unsigned int root_pmap_width, root_pmap_height;
899 int window_width = target->szHint.width; 1309 int window_width = target->szHint.width;
900 int window_height = target->szHint.height; 1310 int window_height = target->szHint.height;
901 int sx, sy; 1311 int sx, sy;
902 XGCValues gcv; 1312 XGCValues gcv;
1313 GC gc;
903 1314
904 TIMING_TEST_START (tp);
905 target->get_window_origin (sx, sy); 1315 target->get_window_origin (sx, sy);
906 1316
907 /* check if we are outside of the visible part of the virtual screen : */ 1317 /* check if we are outside of the visible part of the virtual screen : */
908 if (sx + window_width <= 0 || sy + window_height <= 0 1318 if (sx + window_width <= 0 || sy + window_height <= 0
909 || sx >= root_width || sy >= root_height) 1319 || sx >= root_width || sy >= root_height)
910 return 0; 1320 return 0;
911 1321
912 if (root_pixmap != None) 1322 if (root_pixmap == None)
913 { 1323 return 0;
914 /* we want to validate the pixmap and get it's size at the same time : */
915 int junk;
916 unsigned int ujunk;
917 /* root pixmap may be bad - allow a error */
918 target->allowedxerror = -1;
919
920 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))
921 root_pixmap = None;
922
923 target->allowedxerror = 0;
924 }
925 1324
926 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1325 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
927 GC gc = NULL;
928 1326
929 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1327 if (tiled_root_pmap == None) /* something really bad happened - abort */
930 return 0; 1328 return 0;
931 1329
932 if (root_pixmap == None)
933 {
934 /* use tricks to obtain the root background image :*/
935 /* we want to create Overrideredirect window overlapping out window
936 with background type of Parent Relative and then grab it */
937 XSetWindowAttributes attr;
938 Window src;
939 bool success = false;
940
941 attr.background_pixmap = ParentRelative;
942 attr.backing_store = Always;
943 attr.event_mask = ExposureMask;
944 attr.override_redirect = True;
945 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
946 CopyFromParent, CopyFromParent, CopyFromParent,
947 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
948 &attr);
949
950 if (src != None)
951 {
952 XEvent event;
953 int ev_count = 0;
954 XGrabServer (dpy);
955 XMapRaised (dpy, src);
956 XSync (dpy, False);
957
958 /* XSync should get window where it's properly exposed,
959 * but to be on the safe side - let's check for the actual event to arrive : */
960 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
961 ++ev_count;
962
963 if (ev_count > 0);
964 {
965 /* hooray! - we can grab the image! */
966 gc = XCreateGC (dpy, root, 0, NULL);
967 if (gc)
968 {
969 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
970 success = true;
971 }
972 }
973
974 XDestroyWindow (dpy, src);
975 XUngrabServer (dpy);
976 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
977 }
978
979 if (!success)
980 {
981 XFreePixmap (dpy, tiled_root_pmap);
982 tiled_root_pmap = None;
983 }
984 else
985 result |= transpPmapTiled;
986 }
987 else
988 {
989 /* straightforward pixmap copy */ 1330 /* straightforward pixmap copy */
990 gcv.tile = root_pixmap; 1331 gcv.tile = root_pixmap;
991 gcv.fill_style = FillTiled; 1332 gcv.fill_style = FillTiled;
992 1333
993 while (sx < 0) sx += (int)root_width; 1334 while (sx < 0) sx += (int)root_width;
994 while (sy < 0) sy += (int)root_height; 1335 while (sy < 0) sy += (int)root_height;
995 1336
996 gcv.ts_x_origin = -sx; 1337 gcv.ts_x_origin = -sx;
997 gcv.ts_y_origin = -sy; 1338 gcv.ts_y_origin = -sy;
998 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1339 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
999 1340
1000 if (gc) 1341 if (gc)
1001 { 1342 {
1002 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1343 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1003 result |= transpPmapTiled; 1344 result |= transpPmapTiled;
1004 } 1345 XFreeGC (dpy, gc);
1005 } 1346 }
1006 TIMING_TEST_PRINT_RESULT (tp);
1007 1347
1008 if (tiled_root_pmap != None) 1348 if (tiled_root_pmap != None)
1009 { 1349 {
1010 if (!need_client_side_rendering ()) 1350 if (!need_client_side_rendering ())
1011 { 1351 {
1012 if ((flags & tintNeeded)) 1352 if (flags & (blurNeeded | blurServerSide))
1353 {
1354 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1355 result |= transpPmapBlurred;
1013 { 1356 }
1014 if (flags & tintWholesome) 1357 if (flags & (tintNeeded | tintServerSide))
1015 { 1358 {
1016 /* In this case we can tint image server-side getting significant 1359 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1017 * performance improvements, as we eliminate XImage transfer
1018 */
1019 gcv.foreground = Pixel (tint);
1020 gcv.function = GXand;
1021 gcv.fill_style = FillSolid;
1022 if (gc)
1023 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1024 else
1025 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1026 if (gc)
1027 {
1028 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1029 result |= transpPmapTinted; 1360 result |= transpPmapTinted;
1030 }
1031 }
1032 else
1033 {
1034# if XFT
1035 Picture back_pic = 0;
1036 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1037
1038 if (flags & tintSet)
1039 tint.get (c);
1040
1041 if (shade > 0 && shade < 100)
1042 {
1043 c.r = (c.r * shade) / 100;
1044 c.g = (c.g * shade) / 100;
1045 c.b = (c.b * shade) / 100;
1046 }
1047 else if (shade > 100 && shade < 200)
1048 {
1049 c.r = (c.r * (200 - shade)) / 100;
1050 c.g = (c.g * (200 - shade)) / 100;
1051 c.b = (c.b * (200 - shade)) / 100;
1052 }
1053
1054 XRenderPictFormat pf;
1055 pf.type = PictTypeDirect;
1056 pf.depth = 32;
1057 pf.direct.redMask = 0xff;
1058 pf.direct.greenMask = 0xff;
1059 pf.direct.blueMask = 0xff;
1060 pf.direct.alphaMask = 0xff;
1061
1062 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1063 (PictFormatType|
1064 PictFormatDepth|
1065 PictFormatRedMask|
1066 PictFormatGreenMask|
1067 PictFormatBlueMask|
1068 PictFormatAlphaMask),
1069 &pf,
1070 0);
1071 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1072 XRenderPictureAttributes pa ;
1073
1074 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1075
1076 pa.repeat = True;
1077
1078 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1079 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1080 XFreePixmap (dpy, overlay_pmap);
1081
1082 pa.component_alpha = True;
1083 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1084 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1085 XFreePixmap (dpy, mask_pmap);
1086
1087 if (mask_pic && overlay_pic && back_pic)
1088 {
1089 XRenderColor mask_c;
1090
1091 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1092 mask_c.alpha = 0xffff;
1093 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1094
1095 mask_c.alpha = 0;
1096 mask_c.red = 0xffff - c.r;
1097 mask_c.green = 0xffff - c.g;
1098 mask_c.blue = 0xffff - c.b;
1099 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1100 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1101 result |= transpPmapTinted;
1102 }
1103
1104 XRenderFreePicture (dpy, mask_pic);
1105 XRenderFreePicture (dpy, overlay_pic);
1106 XRenderFreePicture (dpy, back_pic);
1107# if DO_TIMING_TEST
1108 XSync (dpy, False);
1109# endif
1110# endif
1111 }
1112 } 1361 }
1113 } /* server side rendering completed */ 1362 } /* server side rendering completed */
1114 1363
1115 if (pixmap) 1364 if (pixmap)
1116 XFreePixmap (dpy, pixmap); 1365 XFreePixmap (dpy, pixmap);
1119 pmap_width = window_width; 1368 pmap_width = window_width;
1120 pmap_height = window_height; 1369 pmap_height = window_height;
1121 pmap_depth = root_depth; 1370 pmap_depth = root_depth;
1122 } 1371 }
1123 1372
1124 if (gc)
1125 XFreeGC (dpy, gc);
1126
1127 TIMING_TEST_PRINT_RESULT (tp);
1128
1129 return result; 1373 return result;
1130} 1374}
1131 1375
1132bool 1376void
1133bgPixmap_t::set_root_pixmap () 1377bgPixmap_t::set_root_pixmap ()
1134{ 1378{
1135 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1379 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1136 if (new_root_pixmap == None) 1380 if (new_root_pixmap == None)
1137 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1381 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1138 1382
1139 if (new_root_pixmap != root_pixmap)
1140 {
1141 root_pixmap = new_root_pixmap; 1383 root_pixmap = new_root_pixmap;
1142 return true; 1384
1385 // validate root pixmap
1386 if (root_pixmap != None)
1143 } 1387 {
1388 unsigned int width, height;
1389 Window wdummy;
1390 int idummy;
1391 unsigned int udummy;
1144 1392
1145 return false; 1393 target->allowedxerror = -1;
1394
1395 if (!XGetGeometry (target->dpy, root_pixmap, &wdummy, &idummy, &idummy, &width, &height, &udummy, &udummy))
1396 root_pixmap = None;
1397
1398 target->allowedxerror = 0;
1399 }
1146} 1400}
1147# endif /* ENABLE_TRANSPARENCY */ 1401# endif /* ENABLE_TRANSPARENCY */
1148 1402
1149# ifndef HAVE_AFTERIMAGE 1403# ifndef HAVE_AFTERIMAGE
1150static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1404static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1151# endif 1405# endif
1152 1406
1153bool 1407bool
1154bgPixmap_t::render () 1408bgPixmap_t::render ()
1155{ 1409{
1156 unsigned long background_flags = 0; 1410 unsigned long background_flags = 0;
1157 1411
1158 if (target == NULL) 1412 if (target == NULL)
1159 return false; 1413 return false;
1160
1161 TIMING_TEST_START (tp);
1162 1414
1163 invalidate (); 1415 invalidate ();
1164# ifdef ENABLE_TRANSPARENCY 1416# ifdef ENABLE_TRANSPARENCY
1165 if (flags & isTransparent) 1417 if (flags & isTransparent)
1166 { 1418 {
1186 XImage *result = NULL; 1438 XImage *result = NULL;
1187 1439
1188 if (background_flags && (flags & isInvalid)) 1440 if (background_flags && (flags & isInvalid))
1189 { 1441 {
1190 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1442 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1443 }
1191 1444
1445 if (result)
1446 {
1192# if !defined(HAVE_AFTERIMAGE) && !XFT 1447# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1193 /* our own client-side tinting */ 1448 /* our own client-side tinting */
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 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1197 { 1450 {
1198 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1199 if (flags & tintSet) 1452 if (flags & tintSet)
1200 tint.get (c); 1453 tint.get (c);
1201 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1454 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1202 } 1455 }
1203# endif 1456# endif
1204 }
1205 1457
1206 if (result)
1207 {
1208 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1209 1459
1210 if (gc) 1460 if (gc)
1211 { 1461 {
1212 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1462 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1255 } 1505 }
1256 } 1506 }
1257 1507
1258 apply (); 1508 apply ();
1259 1509
1260 XSync (target->dpy, False);
1261 valid_since = ev::now (); 1510 valid_since = ev::now ();
1262
1263 TIMING_TEST_PRINT_RESULT (tp);
1264 1511
1265 return true; 1512 return true;
1266} 1513}
1267 1514
1268bool 1515bool
1284void 1531void
1285bgPixmap_t::apply () 1532bgPixmap_t::apply ()
1286{ 1533{
1287 if (target) 1534 if (target)
1288 { 1535 {
1289 flags &= ~isVtOrigin;
1290
1291 if (pixmap != None) 1536 if (pixmap != None)
1292 { 1537 {
1293 /* set target's background to pixmap */ 1538 /* set target's background to pixmap */
1294# ifdef ENABLE_TRANSPARENCY 1539# ifdef ENABLE_TRANSPARENCY
1295 if (flags & isTransparent) 1540 if (flags & isTransparent)
1301 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1546 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1302 } 1547 }
1303 else 1548 else
1304# endif 1549# endif
1305 { 1550 {
1306 flags |= isVtOrigin;
1307 /* force old pixmap dereference in case it was transparent before :*/ 1551 /* force old pixmap dereference in case it was transparent before :*/
1308 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1552 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1309 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1553 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1310 /* do we also need to set scrollbar's background here ? */ 1554 /* do we also need to set scrollbar's background here ? */
1311 1555
1338 } 1582 }
1339} 1583}
1340 1584
1341#endif /* HAVE_BG_PIXMAP */ 1585#endif /* HAVE_BG_PIXMAP */
1342 1586
1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1344/* taken from aterm-0.4.2 */ 1588/* taken from aterm-0.4.2 */
1345 1589
1346typedef uint32_t RUINT32T;
1347
1348static void 1590static void
1349ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1591ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1350{ 1592{
1351 int sh_r, sh_g, sh_b; 1593 int sh_r, sh_g, sh_b;
1352 RUINT32T mask_r, mask_g, mask_b; 1594 uint32_t mask_r, mask_g, mask_b;
1353 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1354 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1596 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1355 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1597 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1356 int i; 1598 int i;
1599 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1357 1600
1358 Visual *visual = term->visual;
1359
1360 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1601 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1361
1362 if (shade == 0)
1363 shade = 100;
1364 1602
1365 /* for convenience */ 1603 /* for convenience */
1366 mask_r = visual->red_mask; 1604 mask_r = visual->red_mask;
1367 mask_g = visual->green_mask; 1605 mask_g = visual->green_mask;
1368 mask_b = visual->blue_mask; 1606 mask_b = visual->blue_mask;
1369 1607
1370 /* boring lookup table pre-initialization */ 1608 /* boring lookup table pre-initialization */
1371 switch (srcImage->bits_per_pixel) { 1609 switch (srcImage->depth)
1610 {
1372 case 15: 1611 case 15:
1373 if ((mask_r != 0x7c00) || 1612 if ((mask_r != 0x7c00) ||
1374 (mask_g != 0x03e0) || 1613 (mask_g != 0x03e0) ||
1375 (mask_b != 0x001f)) 1614 (mask_b != 0x001f))
1376 return; 1615 return;
1377 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1616 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1378 lookup_r = lookup; 1617 lookup_r = lookup;
1379 lookup_g = lookup+32; 1618 lookup_g = lookup+32;
1380 lookup_b = lookup+32+32; 1619 lookup_b = lookup+32+32;
1381 sh_r = 10; 1620 sh_r = 10;
1382 sh_g = 5; 1621 sh_g = 5;
1383 sh_b = 0; 1622 sh_b = 0;
1384 break; 1623 break;
1385 case 16: 1624 case 16:
1386 if ((mask_r != 0xf800) || 1625 if ((mask_r != 0xf800) ||
1387 (mask_g != 0x07e0) || 1626 (mask_g != 0x07e0) ||
1388 (mask_b != 0x001f)) 1627 (mask_b != 0x001f))
1389 return; 1628 return;
1390 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1629 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1391 lookup_r = lookup; 1630 lookup_r = lookup;
1392 lookup_g = lookup+32; 1631 lookup_g = lookup+32;
1393 lookup_b = lookup+32+64; 1632 lookup_b = lookup+32+64;
1394 sh_r = 11; 1633 sh_r = 11;
1395 sh_g = 5; 1634 sh_g = 5;
1396 sh_b = 0; 1635 sh_b = 0;
1397 break; 1636 break;
1398 case 24: 1637 case 24:
1399 if ((mask_r != 0xff0000) || 1638 if ((mask_r != 0xff0000) ||
1400 (mask_g != 0x00ff00) || 1639 (mask_g != 0x00ff00) ||
1401 (mask_b != 0x0000ff)) 1640 (mask_b != 0x0000ff))
1402 return; 1641 return;
1403 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1642 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1404 lookup_r = lookup; 1643 lookup_r = lookup;
1405 lookup_g = lookup+256; 1644 lookup_g = lookup+256;
1406 lookup_b = lookup+256+256; 1645 lookup_b = lookup+256+256;
1407 sh_r = 16; 1646 sh_r = 16;
1408 sh_g = 8; 1647 sh_g = 8;
1409 sh_b = 0; 1648 sh_b = 0;
1410 break; 1649 break;
1411 case 32: 1650 case 32:
1412 if ((mask_r != 0xff0000) || 1651 if ((mask_r != 0xff0000) ||
1413 (mask_g != 0x00ff00) || 1652 (mask_g != 0x00ff00) ||
1414 (mask_b != 0x0000ff)) 1653 (mask_b != 0x0000ff))
1415 return; 1654 return;
1416 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1655 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1417 lookup_r = lookup; 1656 lookup_r = lookup;
1418 lookup_g = lookup+256; 1657 lookup_g = lookup+256;
1419 lookup_b = lookup+256+256; 1658 lookup_b = lookup+256+256;
1420 sh_r = 16; 1659 sh_r = 16;
1421 sh_g = 8; 1660 sh_g = 8;
1422 sh_b = 0; 1661 sh_b = 0;
1423 break; 1662 break;
1424 default: 1663 default:
1425 return; /* we do not support this color depth */ 1664 return; /* we do not support this color depth */
1426 } 1665 }
1427 1666
1428 /* prepare limits for color transformation (each channel is handled separately) */ 1667 /* prepare limits for color transformation (each channel is handled separately) */
1429 if (shade < 0) { 1668 if (shade > 100)
1669 {
1430 shade = -shade; 1670 shade = 200 - shade;
1431 if (shade < 0) shade = 0;
1432 if (shade > 100) shade = 100;
1433 1671
1434 lower_lim_r = 65535-rm; 1672 lower_lim_r = 65535-rm;
1435 lower_lim_g = 65535-gm; 1673 lower_lim_g = 65535-gm;
1436 lower_lim_b = 65535-bm; 1674 lower_lim_b = 65535-bm;
1437 1675
1438 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1676 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1439 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1677 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1440 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1678 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1441 1679
1442 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1680 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1681 }
1443 } else { 1682 else
1444 if (shade < 0) shade = 0; 1683 {
1445 if (shade > 100) shade = 100;
1446 1684
1447 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1685 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1448 1686
1449 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1687 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1450 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1688 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1451 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1689 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1452 } 1690 }
1453
1454 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1455 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1456 {
1457 unsigned int tmp;
1458
1459 tmp = lower_lim_r;
1460 lower_lim_r = lower_lim_b;
1461 lower_lim_b = tmp;
1462
1463 tmp = upper_lim_r;
1464 upper_lim_r = upper_lim_b;
1465 upper_lim_b = tmp;
1466 }
1467 1691
1468 /* fill our lookup tables */ 1692 /* fill our lookup tables */
1469 for (i = 0; i <= mask_r>>sh_r; i++) 1693 for (i = 0; i <= mask_r>>sh_r; i++)
1470 { 1694 {
1471 RUINT32T tmp; 1695 uint32_t tmp;
1472 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1696 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1473 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1697 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1474 lookup_r[i] = (tmp/65535)<<sh_r; 1698 lookup_r[i] = (tmp/65535)<<sh_r;
1475 } 1699 }
1476 for (i = 0; i <= mask_g>>sh_g; i++) 1700 for (i = 0; i <= mask_g>>sh_g; i++)
1477 { 1701 {
1478 RUINT32T tmp; 1702 uint32_t tmp;
1479 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1480 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1704 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1481 lookup_g[i] = (tmp/65535)<<sh_g; 1705 lookup_g[i] = (tmp/65535)<<sh_g;
1482 } 1706 }
1483 for (i = 0; i <= mask_b>>sh_b; i++) 1707 for (i = 0; i <= mask_b>>sh_b; i++)
1484 { 1708 {
1485 RUINT32T tmp; 1709 uint32_t tmp;
1486 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1710 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1487 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1711 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1488 lookup_b[i] = (tmp/65535)<<sh_b; 1712 lookup_b[i] = (tmp/65535)<<sh_b;
1489 } 1713 }
1490 1714
1491 /* apply table to input image (replacing colors by newly calculated ones) */ 1715 /* apply table to input image (replacing colors by newly calculated ones) */
1492 switch (srcImage->bits_per_pixel) 1716 if (srcImage->bits_per_pixel == 32
1717 && (srcImage->depth == 24 || srcImage->depth == 32)
1718 && srcImage->byte_order == host_byte_order)
1493 { 1719 {
1494 case 15:
1495 {
1496 unsigned short *p1, *pf, *p, *pl; 1720 uint32_t *p1, *pf, *p, *pl;
1497 p1 = (unsigned short *) srcImage->data; 1721 p1 = (uint32_t *) srcImage->data;
1498 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1722 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1723
1499 while (p1 < pf) 1724 while (p1 < pf)
1500 { 1725 {
1501 p = p1; 1726 p = p1;
1502 pl = p1 + srcImage->width; 1727 pl = p1 + srcImage->width;
1503 for (; p < pl; p++) 1728 for (; p < pl; p++)
1504 { 1729 {
1505 *p = lookup_r[(*p & 0x7c00)>>10] |
1506 lookup_g[(*p & 0x03e0)>> 5] |
1507 lookup_b[(*p & 0x001f)];
1508 }
1509 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1510 }
1511 break;
1512 }
1513 case 16:
1514 {
1515 unsigned short *p1, *pf, *p, *pl;
1516 p1 = (unsigned short *) srcImage->data;
1517 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1518 while (p1 < pf)
1519 {
1520 p = p1;
1521 pl = p1 + srcImage->width;
1522 for (; p < pl; p++)
1523 {
1524 *p = lookup_r[(*p & 0xf800)>>11] |
1525 lookup_g[(*p & 0x07e0)>> 5] |
1526 lookup_b[(*p & 0x001f)];
1527 }
1528 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1529 }
1530 break;
1531 }
1532 case 24:
1533 {
1534 unsigned char *p1, *pf, *p, *pl;
1535 p1 = (unsigned char *) srcImage->data;
1536 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1537 while (p1 < pf)
1538 {
1539 p = p1;
1540 pl = p1 + srcImage->width * 3;
1541 for (; p < pl; p += 3)
1542 {
1543 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1544 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1545 p[2] = lookup_r[(p[2] & 0x0000ff)];
1546 }
1547 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1548 }
1549 break;
1550 }
1551 case 32:
1552 {
1553 RUINT32T *p1, *pf, *p, *pl;
1554 p1 = (RUINT32T *) srcImage->data;
1555 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1556
1557 while (p1 < pf)
1558 {
1559 p = p1;
1560 pl = p1 + srcImage->width;
1561 for (; p < pl; p++)
1562 {
1563 *p = lookup_r[(*p & 0xff0000)>>16] | 1730 *p = lookup_r[(*p & 0xff0000) >> 16] |
1564 lookup_g[(*p & 0x00ff00)>> 8] | 1731 lookup_g[(*p & 0x00ff00) >> 8] |
1565 lookup_b[(*p & 0x0000ff)] | 1732 lookup_b[(*p & 0x0000ff)] |
1566 (*p & ~0xffffff); 1733 (*p & 0xff000000);
1734 }
1735 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1736 }
1737 }
1738 else
1739 {
1740 for (int y = 0; y < srcImage->height; y++)
1741 for (int x = 0; x < srcImage->width; x++)
1742 {
1743 unsigned long pixel = XGetPixel (srcImage, x, y);
1744 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1745 lookup_g[(pixel & mask_g) >> sh_g] |
1746 lookup_b[(pixel & mask_b) >> sh_b];
1747 XPutPixel (srcImage, x, y, pixel);
1567 } 1748 }
1568 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1569 } 1749 }
1570 break;
1571 }
1572 }
1573 1750
1574 free (lookup); 1751 free (lookup);
1575} 1752}
1576#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1753#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines