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

Diff Legend

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