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

Diff Legend

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