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

Diff Legend

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