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.5 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.114 by sf-exg, Wed Nov 10 13:15:08 2010 UTC

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

Diff Legend

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