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.3 by sasha, Wed Sep 12 22:12:54 2007 UTC vs.
Revision 1.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC

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

Diff Legend

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