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

Diff Legend

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