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

Diff Legend

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