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.25 by root, Sat Jan 19 00:21:59 2008 UTC vs.
Revision 1.115 by sf-exg, Thu Nov 11 10:42:45 2010 UTC

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

Diff Legend

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