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.8 by ayin, Sat Oct 27 15:14:55 2007 UTC vs.
Revision 1.115 by sf-exg, Thu Nov 11 10:42:45 2010 UTC

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

Diff Legend

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