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

Diff Legend

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