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.12 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.66 by sf-exg, Mon Oct 4 20:46:20 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 (flags & rootAlign)
464 {
465 target->get_window_origin (x, y);
466 x = -x;
467 y = -y;
468 }
469 else
470 {
471 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
472 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
473 }
474
475 flags &= ~sizeSensitive;
476 if (h_scale != 0 || v_scale != 0
477 || h_align != 0 || v_align != 0
478 || image_width > target_width || image_height > target_height)
479 flags |= sizeSensitive;
407} 480}
408 481
409# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
410bool 483bool
411bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 484bgPixmap_t::render_image (unsigned long background_flags)
412{ 485{
413 if (target == NULL) 486 if (target == NULL)
414 return false; 487 return false;
415 488
489 target->init_asv ();
490
491 ASImage *background = NULL;
492 ARGB32 background_tint = TINT_LEAVE_SAME;
493
494# ifdef ENABLE_TRANSPARENCY
495 if (background_flags)
496 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
497
498 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
499 {
500 ShadingInfo as_shade;
501 as_shade.shading = (shade == 0) ? 100 : shade;
502
503 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
504 if (flags & tintSet)
505 tint.get (c);
506 as_shade.tintColor.red = c.r;
507 as_shade.tintColor.green = c.g;
508 as_shade.tintColor.blue = c.b;
509
510 background_tint = shading2tint32 (&as_shade);
511 }
512
513 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
514 {
515 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
516 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
517 100, ASIMAGE_QUALITY_DEFAULT);
518 if (tmp)
519 {
520 destroy_asimage (&background);
521 background = tmp;
522 }
523 }
524# endif
525
526 ASImage *result = 0;
527
416 int target_width = (int)target->szHint.width; 528 int target_width = target->szHint.width;
417 int target_height = (int)target->szHint.height; 529 int target_height = target->szHint.height;
418 int new_pmap_width = target_width, new_pmap_height = target_height; 530 int new_pmap_width = target_width;
419 ASImage *result = NULL; 531 int new_pmap_height = target_height;
420 532
421 int x = 0; 533 int x = 0;
422 int y = 0; 534 int y = 0;
423 int w = h_scale * target_width / 100; 535 int w = 0;
424 int h = v_scale * target_height / 100; 536 int h = 0;
425 537
426 TIMING_TEST_START (asim); 538 TIMING_TEST_START (asim);
427 539
428 if (original_asim) 540 if (original_asim)
429 { 541 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 542
434 if (original_asim == NULL 543 if (!original_asim
435 || x >= target_width 544 || x >= target_width
436 || y >= target_height 545 || y >= target_height
437 || (w > 0 && x + w <= 0) 546 || (w > 0 && x + w <= 0)
438 || (h > 0 && y + h <= 0)) 547 || (h > 0 && y + h <= 0))
439 { 548 {
440 if (background) 549 if (background)
441 { 550 {
442 new_pmap_width = background->width; 551 new_pmap_width = background->width;
443 new_pmap_height = background->height; 552 new_pmap_height = background->height;
444 result = background; 553 result = background;
554
445 if (background_tint != TINT_LEAVE_SAME) 555 if (background_tint != TINT_LEAVE_SAME)
446 { 556 {
447 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 557 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
448 target_width, target_height, background_tint, 558 target_width, target_height, background_tint,
449 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 559 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
450 if (tmp) 560 if (tmp)
451 result = tmp; 561 result = tmp;
452 } 562 }
… …
455 new_pmap_width = new_pmap_height = 0; 565 new_pmap_width = new_pmap_height = 0;
456 } 566 }
457 else 567 else
458 { 568 {
459 result = original_asim; 569 result = original_asim;
570
460 if ((w > 0 && w != original_asim->width) 571 if ((w > 0 && w != original_asim->width)
461 || (h > 0 && h != original_asim->height)) 572 || (h > 0 && h != original_asim->height))
462 { 573 {
463 result = scale_asimage (target->asv, original_asim, 574 result = scale_asimage (target->asv, original_asim,
464 w > 0 ? w : original_asim->width, 575 w > 0 ? w : original_asim->width,
465 h > 0 ? h : original_asim->height, 576 h > 0 ? h : original_asim->height,
466 background ? ASA_ASImage : ASA_XImage, 577 background ? ASA_ASImage : ASA_XImage,
467 100, ASIMAGE_QUALITY_DEFAULT); 578 100, ASIMAGE_QUALITY_DEFAULT);
468 } 579 }
580
469 if (background == NULL) 581 if (background == NULL)
470 {/* if tiling - pixmap has to be sized exactly as the image */ 582 {
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) 583 if (h_scale == 0 || v_scale == 0)
477 { 584 {
585 /* if tiling - pixmap has to be sized exactly as the image,
586 but there is no need to make it bigger than the window! */
587 new_pmap_width = min (result->width, target_width);
588 new_pmap_height = min (result->height, target_height);
589
590 /* we also need to tile our image in both directions */
478 ASImage *tmp = tile_asimage (target->asv, result, 591 ASImage *tmp = tile_asimage (target->asv, result,
479 (h_scale > 0) ? 0 : (int)result->width - x, 592 (int)result->width - x,
480 (v_scale > 0) ? 0 : (int)result->height - y, 593 (int)result->height - y,
594 new_pmap_width,
481 result->width, result->height, 595 new_pmap_height,
482 TINT_LEAVE_SAME, ASA_XImage, 596 TINT_LEAVE_SAME, ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 597 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp) 598 if (tmp)
485 { 599 {
486 if (result != original_asim) 600 if (result != original_asim)
487 destroy_asimage (&result); 601 destroy_asimage (&result);
602
488 result = tmp; 603 result = tmp;
489 } 604 }
490 } 605 }
491 } 606 }
492 else 607 else
608 {
493 {/* if blending background and image - pixmap has to be sized same as target window */ 609 /* if blending background and image - pixmap has to be sized same as target window */
494 ASImageLayer *layers = create_image_layers (2); 610 ASImageLayer *layers = create_image_layers (2);
495 ASImage *merged_im = NULL;
496 611
497 layers[0].im = background; 612 layers[0].im = background;
498 layers[0].clip_width = target_width; 613 layers[0].clip_width = target_width;
499 layers[0].clip_height = target_height; 614 layers[0].clip_height = target_height;
500 layers[0].tint = background_tint; 615 layers[0].tint = background_tint;
501 layers[1].im = result; 616 layers[1].im = result;
617
502 if (w <= 0) 618 if (w <= 0)
619 {
503 {/* tile horizontally */ 620 /* tile horizontally */
504 while (x > 0) x -= (int)result->width; 621 while (x > 0) x -= (int)result->width;
505 layers[1].dst_x = x; 622 layers[1].dst_x = x;
506 layers[1].clip_width = result->width+target_width; 623 layers[1].clip_width = result->width+target_width;
507 } 624 }
508 else 625 else
626 {
509 {/* clip horizontally */ 627 /* clip horizontally */
510 layers[1].dst_x = x; 628 layers[1].dst_x = x;
511 layers[1].clip_width = result->width; 629 layers[1].clip_width = result->width;
512 } 630 }
631
513 if (h <= 0) 632 if (h <= 0)
514 { 633 {
515 while (y > 0) y -= (int)result->height; 634 while (y > 0) y -= (int)result->height;
516 layers[1].dst_y = y; 635 layers[1].dst_y = y;
517 layers[1].clip_height = result->height + target_height; 636 layers[1].clip_height = result->height + target_height;
… …
519 else 638 else
520 { 639 {
521 layers[1].dst_y = y; 640 layers[1].dst_y = y;
522 layers[1].clip_height = result->height; 641 layers[1].clip_height = result->height;
523 } 642 }
643
524 if (target->rs[Rs_blendtype]) 644 if (target->rs[Rs_blendtype])
525 { 645 {
526 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 646 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
527 if (layers[1].merge_scanlines == NULL) 647 if (layers[1].merge_scanlines == NULL)
528 layers[1].merge_scanlines = alphablend_scanlines; 648 layers[1].merge_scanlines = alphablend_scanlines;
529 } 649 }
650
530 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 651 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
531 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 652 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
653
532 if (tmp) 654 if (tmp)
533 { 655 {
534 if (result != original_asim) 656 if (result != original_asim)
535 destroy_asimage (&result); 657 destroy_asimage (&result);
658
536 result = tmp; 659 result = tmp;
537 } 660 }
661
538 free (layers); 662 free (layers);
539 } 663 }
540 } 664 }
541 TIMING_TEST_PRINT_RESULT (asim); 665 TIMING_TEST_PRINT_RESULT (asim);
542 666
543 if (pixmap) 667 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 668
555 if (result) 669 if (result)
556 { 670 {
557 XGCValues gcv; 671 XGCValues gcv;
558 GC gc; 672 GC gc;
673
674 if (pixmap)
675 {
676 if (pmap_width != new_pmap_width
677 || pmap_height != new_pmap_height
678 || pmap_depth != target->depth)
679 {
680 XFreePixmap (target->dpy, pixmap);
681 pixmap = None;
682 }
683 }
559 684
560 /* create Pixmap */ 685 /* create Pixmap */
561 if (pixmap == None) 686 if (pixmap == None)
562 { 687 {
563 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 688 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
564 pmap_width = new_pmap_width; 689 pmap_width = new_pmap_width;
565 pmap_height = new_pmap_height; 690 pmap_height = new_pmap_height;
566 pmap_depth = target->depth; 691 pmap_depth = target->depth;
567 } 692 }
568 /* fill with background color ( if result's not completely overlapping it)*/ 693 /* fill with background color (if result's not completely overlapping it) */
569 gcv.foreground = target->pix_colors[Color_bg]; 694 gcv.foreground = target->pix_colors[Color_bg];
570 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 695 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
571 696
572 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 697 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
573 int dst_width = result->width, dst_height = result->height; 698 int dst_width = result->width, dst_height = result->height;
574 if (background == NULL) 699 if (background == NULL)
575 { 700 {
576 if (h_scale > 0) 701 if (!(h_scale == 0 || v_scale == 0))
702 {
577 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 703 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); 704 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
705 }
580 706
581 if (dst_x > 0 || dst_y > 0 707 if (dst_x > 0 || dst_y > 0
582 || dst_x + dst_width < new_pmap_width 708 || dst_x + dst_width < new_pmap_width
583 || dst_y + dst_height < new_pmap_height) 709 || dst_y + dst_height < new_pmap_height)
584 {
585 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 710 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
586 }
587 } 711 }
588 712
589 /* put result on pixmap */ 713 /* put result on pixmap */
590 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 714 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); 715 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) 717 if (result != background && result != original_asim)
594 destroy_asimage (&result); 718 destroy_asimage (&result);
595 719
596 XFreeGC (target->dpy, gc); 720 XFreeGC (target->dpy, gc);
597 TIMING_TEST_PRINT_RESULT (asim); 721 TIMING_TEST_PRINT_RESULT (asim);
598 }
599 722
723 ret = true;
724 }
725
726 if (background)
727 destroy_asimage (&background);
728
600 return true; 729 return ret;
601} 730}
602# endif /* HAVE_AFTERIMAGE */ 731# endif /* HAVE_AFTERIMAGE */
732
733# ifdef HAVE_PIXBUF
734bool
735bgPixmap_t::render_image (unsigned long background_flags)
736{
737 if (target == NULL)
738 return false;
739
740 if (!pixbuf)
741 return false;
742
743 // TODO: add alpha blending
744 if (background_flags)
745 return false;
746
747 GdkPixbuf *result;
748
749 int image_width = gdk_pixbuf_get_width (pixbuf);
750 int image_height = gdk_pixbuf_get_height (pixbuf);
751
752 int target_width = target->szHint.width;
753 int target_height = target->szHint.height;
754 int new_pmap_width = target_width;
755 int new_pmap_height = target_height;
756
757 int x = 0;
758 int y = 0;
759 int w = 0;
760 int h = 0;
761
762 get_image_geometry (image_width, image_height, w, h, x, y);
763
764 if (x >= target_width
765 || y >= target_height
766 || (w > 0 && x + w <= 0)
767 || (h > 0 && y + h <= 0))
768 return false;
769
770 result = pixbuf;
771
772 if ((w > 0 && w != image_width)
773 || (h > 0 && h != image_height))
774 {
775 result = gdk_pixbuf_scale_simple (pixbuf,
776 w > 0 ? w : image_width,
777 h > 0 ? h : image_height,
778 GDK_INTERP_BILINEAR);
779 }
780
781 bool ret = false;
782
783 if (result)
784 {
785 XGCValues gcv;
786 GC gc;
787
788 image_width = gdk_pixbuf_get_width (result);
789 image_height = gdk_pixbuf_get_height (result);
790
791 if (h_scale == 0 || v_scale == 0)
792 {
793 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height);
795 }
796
797 if (pixmap)
798 {
799 if (pmap_width != new_pmap_width
800 || pmap_height != new_pmap_height
801 || pmap_depth != target->depth)
802 {
803 XFreePixmap (target->dpy, pixmap);
804 pixmap = None;
805 }
806 }
807
808 if (pixmap == None)
809 {
810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
811 pmap_width = new_pmap_width;
812 pmap_height = new_pmap_height;
813 pmap_depth = target->depth;
814 }
815
816 gcv.foreground = target->pix_colors[Color_bg];
817 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
818
819 if (h_scale == 0 || v_scale == 0)
820 {
821 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
822 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
823 0, 0,
824 0, 0,
825 image_width, image_height,
826 XLIB_RGB_DITHER_NONE,
827 0, 0);
828
829 gcv.tile = tile;
830 gcv.fill_style = FillTiled;
831 gcv.ts_x_origin = x;
832 gcv.ts_y_origin = y;
833 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
834
835 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
836 XFreePixmap (target->dpy, tile);
837 }
838 else
839 {
840 int src_x, src_y, dst_x, dst_y;
841 int dst_width, dst_height;
842
843 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
844 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
845
846 if (dst_x > 0 || dst_y > 0
847 || dst_x + dst_width < new_pmap_width
848 || dst_y + dst_height < new_pmap_height)
849 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
850
851 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
852 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
853 src_x, src_y,
854 dst_x, dst_y,
855 dst_width, dst_height,
856 XLIB_RGB_DITHER_NONE,
857 0, 0);
858 }
859
860 if (result != pixbuf)
861 g_object_unref (result);
862
863 XFreeGC (target->dpy, gc);
864
865 ret = true;
866 }
867
868 return ret;
869}
870# endif /* HAVE_PIXBUF */
603 871
604bool 872bool
605bgPixmap_t::set_file (const char *file) 873bgPixmap_t::set_file (const char *file)
606{ 874{
607 char *f;
608
609 assert (file != NULL); 875 assert (file);
610 876
611 if (*file != '\0') 877 if (*file)
612 { 878 {
879 if (const char *p = strchr (file, ';'))
880 {
881 size_t len = p - file;
882 char *f = rxvt_temp_buf<char> (len + 1);
883 memcpy (f, file, len);
884 f[len] = '\0';
885 file = f;
886 }
887
613# ifdef HAVE_AFTERIMAGE 888# ifdef HAVE_AFTERIMAGE
614 if (target->asimman == NULL) 889 if (!target->asimman)
615 target->asimman = create_generic_imageman (target->rs[Rs_path]); 890 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); 891 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
618 else 892 if (original_asim)
619 { 893 have_image = true;
620 size_t len = f - file; 894 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 895# endif
896
897# ifdef HAVE_PIXBUF
898 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
899 if (pixbuf)
900 have_image = true;
901 return have_image;
902# endif
629 } 903 }
904
630 return false; 905 return false;
631} 906}
632 907
633# endif /* BG_IMAGE_FROM_FILE */ 908# endif /* BG_IMAGE_FROM_FILE */
634 909
… …
639 if (!(flags & isTransparent)) 914 if (!(flags & isTransparent))
640 { 915 {
641 flags |= isTransparent; 916 flags |= isTransparent;
642 return true; 917 return true;
643 } 918 }
919
644 return false; 920 return false;
645} 921}
646 922
647bool 923bool
648bgPixmap_t::set_blur_radius (const char *geom) 924bgPixmap_t::set_blur_radius (const char *geom)
… …
650 int changed = 0; 926 int changed = 0;
651 unsigned int hr, vr; 927 unsigned int hr, vr;
652 int junk; 928 int junk;
653 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 929 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
654 930
655 if (!(geom_flags&WidthValue)) 931 if (!(geom_flags & WidthValue))
656 hr = 1; 932 hr = 1;
657 if (!(geom_flags&HeightValue)) 933 if (!(geom_flags & HeightValue))
658 vr = hr; 934 vr = hr;
659 935
660 if (h_blurRadius != hr) 936 if (h_blurRadius != hr)
661 { 937 {
662 ++changed; 938 ++changed;
… …
672 if (v_blurRadius == 0 && h_blurRadius == 0) 948 if (v_blurRadius == 0 && h_blurRadius == 0)
673 flags &= ~blurNeeded; 949 flags &= ~blurNeeded;
674 else 950 else
675 flags |= blurNeeded; 951 flags |= blurNeeded;
676 952
677 return (changed>0); 953 return (changed > 0);
678} 954}
679 955
680static inline unsigned long 956static inline unsigned long
681compute_tint_shade_flags (rxvt_color *tint, int shade) 957compute_tint_shade_flags (rxvt_color *tint, int shade)
682{ 958{
… …
699 flags |= bgPixmap_t::tintNeeded; 975 flags |= bgPixmap_t::tintNeeded;
700 else if (tint) 976 else if (tint)
701 { 977 {
702 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 978 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
703 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 979 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
704 { 980 {
705 flags |= bgPixmap_t::tintNeeded; 981 flags |= bgPixmap_t::tintNeeded;
706 } 982 }
707 } 983 }
708 984
709 if (flags & bgPixmap_t::tintNeeded) 985 if (flags & bgPixmap_t::tintNeeded)
710 { 986 {
711 if (flags & bgPixmap_t::tintWholesome) 987 if (flags & bgPixmap_t::tintWholesome)
… …
729 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1005 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
730 tint = new_tint; 1006 tint = new_tint;
731 flags = (flags & ~tintFlags) | new_flags | tintSet; 1007 flags = (flags & ~tintFlags) | new_flags | tintSet;
732 return true; 1008 return true;
733 } 1009 }
1010
734 return false; 1011 return false;
735} 1012}
736 1013
737bool 1014bool
738bgPixmap_t::unset_tint () 1015bgPixmap_t::unset_tint ()
739{ 1016{
740 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1017 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
741 1018
742 if (new_flags != (flags & tintFlags)) 1019 if (new_flags != (flags & tintFlags))
743 { 1020 {
744 flags = (flags&~tintFlags)|new_flags; 1021 flags = (flags & ~tintFlags) | new_flags;
745 return true; 1022 return true;
746 } 1023 }
1024
747 return false; 1025 return false;
748} 1026}
749 1027
750bool 1028bool
751bgPixmap_t::set_shade (const char *shade_str) 1029bgPixmap_t::set_shade (const char *shade_str)
752{ 1030{
753 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1031 int new_shade = (shade_str) ? atoi (shade_str) : 0;
754 1032
755 if (new_shade < 0 && new_shade > -100) 1033 if (new_shade < 0 && new_shade > -100)
756 new_shade = 200 - (100 + new_shade); 1034 new_shade = 200 - (100 + new_shade);
757 else if (new_shade == 100) 1035 else if (new_shade == 100)
758 new_shade = 0; 1036 new_shade = 0;
759 1037
760 if (new_shade != shade) 1038 if (new_shade != shade)
761 { 1039 {
762 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1040 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
763 shade = new_shade; 1041 shade = new_shade;
764 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1042 flags = (flags & (~tintFlags | tintSet)) | new_flags;
765 return true; 1043 return true;
766 } 1044 }
1045
767 return false; 1046 return false;
1047}
1048
1049bool
1050bgPixmap_t::tint_pixmap (Pixmap pixmap)
1051{
1052 Window root = target->display->root;
1053 Display *dpy = target->dpy;
1054 int window_width = target->szHint.width;
1055 int window_height = target->szHint.height;
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, window_width, window_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 = (c.r * (200 - shade)) / 100;
1094 c.g = (c.g * (200 - shade)) / 100;
1095 c.b = (c.b * (200 - shade)) / 100;
1096 }
1097
1098 XRenderPictFormat pf;
1099 pf.type = PictTypeDirect;
1100 pf.depth = 32;
1101 pf.direct.redMask = 0xff;
1102 pf.direct.greenMask = 0xff;
1103 pf.direct.blueMask = 0xff;
1104 pf.direct.alphaMask = 0xff;
1105
1106 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1107 (PictFormatType|
1108 PictFormatDepth|
1109 PictFormatRedMask|
1110 PictFormatGreenMask|
1111 PictFormatBlueMask|
1112 PictFormatAlphaMask),
1113 &pf,
1114 0);
1115 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1116 XRenderPictureAttributes pa;
1117
1118 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1119
1120 pa.repeat = True;
1121
1122 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1123 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1124 XFreePixmap (dpy, overlay_pmap);
1125
1126 pa.component_alpha = True;
1127 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1128 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1129 XFreePixmap (dpy, mask_pmap);
1130
1131 if (mask_pic && overlay_pic && back_pic)
1132 {
1133 XRenderColor mask_c;
1134
1135 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1136 mask_c.alpha = 0xffff;
1137 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1138
1139 mask_c.alpha = 0;
1140 mask_c.red = 0xffff - c.r;
1141 mask_c.green = 0xffff - c.g;
1142 mask_c.blue = 0xffff - c.b;
1143 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1144 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1145 ret = true;
1146 }
1147
1148 XRenderFreePicture (dpy, mask_pic);
1149 XRenderFreePicture (dpy, overlay_pic);
1150 XRenderFreePicture (dpy, back_pic);
1151# if DO_TIMING_TEST
1152 XSync (dpy, False);
1153# endif
1154# endif
1155 }
1156
1157 return ret;
768} 1158}
769 1159
770/* make_transparency_pixmap() 1160/* make_transparency_pixmap()
771 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1161 * 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 1162 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
778 unsigned long result = 0; 1168 unsigned long result = 0;
779 1169
780 if (target == NULL) 1170 if (target == NULL)
781 return 0; 1171 return 0;
782 1172
783 /* root dimentions may change from call to call - but Display structure should 1173 /* root dimensions may change from call to call - but Display structure should
784 * be always up-to-date, so let's use it : 1174 * be always up-to-date, so let's use it :
785 */ 1175 */
786 Window root = target->display->root; 1176 Window root = target->display->root;
787 int screen = target->display->screen; 1177 int screen = target->display->screen;
788 Display *dpy = target->dpy; 1178 Display *dpy = target->dpy;
… …
801 if (sx + window_width <= 0 || sy + window_height <= 0 1191 if (sx + window_width <= 0 || sy + window_height <= 0
802 || sx >= root_width || sy >= root_height) 1192 || sx >= root_width || sy >= root_height)
803 return 0; 1193 return 0;
804 1194
805 if (root_pixmap != None) 1195 if (root_pixmap != None)
1196 {
806 {/* we want to validate the pixmap and get it's size at the same time : */ 1197 /* we want to validate the pixmap and get it's size at the same time : */
807 int junk; 1198 int junk;
808 unsigned int ujunk; 1199 unsigned int ujunk;
809 /* root pixmap may be bad - allow a error */ 1200 /* root pixmap may be bad - allow a error */
810 target->allowedxerror = -1; 1201 target->allowedxerror = -1;
811 1202
… …
820 1211
821 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1212 if (tiled_root_pmap == None) /* something really bad happened - abort */
822 return 0; 1213 return 0;
823 1214
824 if (root_pixmap == None) 1215 if (root_pixmap == None)
1216 {
825 { /* use tricks to obtain the root background image :*/ 1217 /* use tricks to obtain the root background image :*/
826 /* we want to create Overrideredirect window overlapping out window 1218 /* we want to create Overrideredirect window overlapping out window
827 with background type of Parent Relative and then grab it */ 1219 with background type of Parent Relative and then grab it */
828 XSetWindowAttributes attr; 1220 XSetWindowAttributes attr;
829 Window src; 1221 Window src;
830 bool success = false; 1222 bool success = false;
831 1223
832 attr.background_pixmap = ParentRelative; 1224 attr.background_pixmap = ParentRelative;
833 attr.backing_store = Always; 1225 attr.backing_store = Always;
834 attr.event_mask = ExposureMask; 1226 attr.event_mask = ExposureMask;
835 attr.override_redirect = True; 1227 attr.override_redirect = True;
836 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1228 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
837 CopyFromParent, CopyFromParent, CopyFromParent, 1229 CopyFromParent, CopyFromParent, CopyFromParent,
838 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1230 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
839 &attr); 1231 &attr);
840 1232
841 if (src != None) 1233 if (src != None)
… …
845 XGrabServer (dpy); 1237 XGrabServer (dpy);
846 XMapRaised (dpy, src); 1238 XMapRaised (dpy, src);
847 XSync (dpy, False); 1239 XSync (dpy, False);
848 1240
849 /* XSync should get window where it's properly exposed, 1241 /* 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 : */ 1242 * but to be on the safe side - let's check for the actual event to arrive : */
851 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1243 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
852 ++ev_count; 1244 ++ev_count;
853 1245
854 if (ev_count > 0); 1246 if (ev_count > 0);
1247 {
855 { /* hooray! - we can grab the image! */ 1248 /* hooray! - we can grab the image! */
856 gc = XCreateGC (dpy, root, 0, NULL); 1249 gc = XCreateGC (dpy, root, 0, NULL);
857 if (gc) 1250 if (gc)
858 { 1251 {
859 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1252 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
860 success = true; 1253 success = true;
861 } 1254 }
862 } 1255 }
1256
863 XDestroyWindow (dpy, src); 1257 XDestroyWindow (dpy, src);
864 XUngrabServer (dpy); 1258 XUngrabServer (dpy);
865 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1259 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
866 } 1260 }
867 1261
868 if (!success) 1262 if (!success)
869 { 1263 {
870 XFreePixmap (dpy, tiled_root_pmap); 1264 XFreePixmap (dpy, tiled_root_pmap);
871 tiled_root_pmap = None; 1265 tiled_root_pmap = None;
872 } 1266 }
873 else 1267 else
874 result |= transpPmapTiled; 1268 result |= transpPmapTiled;
875 } 1269 }
876 else 1270 else
1271 {
877 {/* strightforward pixmap copy */ 1272 /* straightforward pixmap copy */
878 gcv.tile = root_pixmap; 1273 gcv.tile = root_pixmap;
879 gcv.fill_style = FillTiled; 1274 gcv.fill_style = FillTiled;
880 1275
881 while (sx < 0) sx += (int)root_width; 1276 while (sx < 0) sx += (int)root_width;
882 while (sy < 0) sy += (int)root_height; 1277 while (sy < 0) sy += (int)root_height;
… …
897 { 1292 {
898 if (!need_client_side_rendering ()) 1293 if (!need_client_side_rendering ())
899 { 1294 {
900 if ((flags & tintNeeded)) 1295 if ((flags & tintNeeded))
901 { 1296 {
902 if (flags & tintWholesome) 1297 if (tint_pixmap (tiled_root_pmap))
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; 1298 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 } 1299 }
1000 } /* server side rendering completed */ 1300 } /* server side rendering completed */
1001 1301
1002 if (pixmap) 1302 if (pixmap)
1003 XFreePixmap (dpy, pixmap); 1303 XFreePixmap (dpy, pixmap);
1004 1304
… …
1017} 1317}
1018 1318
1019bool 1319bool
1020bgPixmap_t::set_root_pixmap () 1320bgPixmap_t::set_root_pixmap ()
1021{ 1321{
1022 Pixmap new_root_pixmap = None;
1023
1024 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1322 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1025 if (new_root_pixmap == None) 1323 if (new_root_pixmap == None)
1026 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1324 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1027 1325
1028 if (new_root_pixmap != root_pixmap) 1326 if (new_root_pixmap != root_pixmap)
1029 { 1327 {
1030 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1031 return true; 1329 return true;
1032 } 1330 }
1331
1033 return false; 1332 return false;
1034} 1333}
1035# endif /* ENABLE_TRANSPARENCY */ 1334# endif /* ENABLE_TRANSPARENCY */
1036 1335
1037# ifndef HAVE_AFTERIMAGE 1336# ifndef HAVE_AFTERIMAGE
1038static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1337static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1039# endif 1338# endif
1040
1041 1339
1042bool 1340bool
1043bgPixmap_t::render () 1341bgPixmap_t::render ()
1044{ 1342{
1045 unsigned long background_flags = 0; 1343 unsigned long background_flags = 0;
… …
1047 if (target == NULL) 1345 if (target == NULL)
1048 return false; 1346 return false;
1049 1347
1050 TIMING_TEST_START (tp); 1348 TIMING_TEST_START (tp);
1051 1349
1052 invalidate(); 1350 invalidate ();
1053# ifdef ENABLE_TRANSPARENCY 1351# ifdef ENABLE_TRANSPARENCY
1054 if (flags & isTransparent) 1352 if (flags & isTransparent)
1055 { 1353 {
1056 /* we need to re-generate transparency pixmap in that case ! */ 1354 /* we need to re-generate transparency pixmap in that case ! */
1057 background_flags = make_transparency_pixmap (); 1355 background_flags = make_transparency_pixmap ();
1058 if (background_flags == 0) 1356 if (background_flags == 0)
1059 return false; 1357 return false;
1060 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1358 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1061 && pmap_depth == target->depth) 1359 && pmap_depth == target->depth)
1062 flags = flags & ~isInvalid; 1360 flags = flags & ~isInvalid;
1063 } 1361 }
1064# endif 1362# endif
1065 1363
1364# ifdef BG_IMAGE_FROM_FILE
1365 if (have_image
1366 || (background_flags & transpTransformations) != (flags & transpTransformations))
1367 {
1368 if (render_image (background_flags))
1369 flags = flags & ~isInvalid;
1370 }
1371# endif
1372
1066 XImage *result = NULL; 1373 XImage *result = NULL;
1067# ifdef HAVE_AFTERIMAGE 1374
1068 if (original_asim 1375 if (background_flags && (flags & isInvalid))
1069 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1376 {
1377 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1070 { 1378 }
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 1379
1076# ifdef ENABLE_TRANSPARENCY 1380 if (result)
1381 {
1382# if !defined(HAVE_AFTERIMAGE) && !XFT
1383 /* our own client-side tinting */
1384 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1385 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1077 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1386 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 { 1387 {
1124 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1388 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1125 if (flags & tintSet) 1389 if (flags & tintSet)
1126 tint.get (c); 1390 tint.get (c);
1127 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1391 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1128 } 1392 }
1129 } 1393# endif
1130# endif /* HAVE_AFTERIMAGE */
1131 1394
1132 if (result != NULL)
1133 {
1134 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1395 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1396
1135 if (gc) 1397 if (gc)
1136 { 1398 {
1137 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1399 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1138 { 1400 {
1139 XFreePixmap (target->dpy, pixmap); 1401 XFreePixmap (target->dpy, pixmap);
1140 pixmap = None; 1402 pixmap = None;
1141 } 1403 }
1404
1142 if (pixmap == None) 1405 if (pixmap == None)
1143 { 1406 {
1144 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1407 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1145 pmap_width = result->width; 1408 pmap_width = result->width;
1146 pmap_height = result->height; 1409 pmap_height = result->height;
1147 pmap_depth = target->depth; 1410 pmap_depth = target->depth;
1148 } 1411 }
1412
1149 if (pmap_depth != result->depth) 1413 if (pmap_depth != result->depth)
1414 {
1150 { /* Bad Match error will ensue ! stupid X !!!! */ 1415 /* Bad Match error will ensue ! stupid X !!!! */
1151 if( result->depth == 24 && pmap_depth == 32) 1416 if (result->depth == 24 && pmap_depth == 32)
1152 result->depth = 32; 1417 result->depth = 32;
1153 else if( result->depth == 32 && pmap_depth == 24) 1418 else if (result->depth == 32 && pmap_depth == 24)
1154 result->depth = 24; 1419 result->depth = 24;
1155 else 1420 else
1156 { 1421 {
1157 /* TODO: implement image recoding */ 1422 /* TODO: implement image recoding */
1158 } 1423 }
1159 } 1424 }
1425
1160 if (pmap_depth == result->depth) 1426 if (pmap_depth == result->depth)
1161 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1427 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1428
1162 XFreeGC (target->dpy, gc); 1429 XFreeGC (target->dpy, gc);
1163 flags = flags & ~isInvalid; 1430 flags = flags & ~isInvalid;
1164 } 1431 }
1432
1165 XDestroyImage (result); 1433 XDestroyImage (result);
1166 } 1434 }
1167 1435
1168 if (flags & isInvalid) 1436 if (flags & isInvalid)
1169 { 1437 {
1170 if (pixmap != None) 1438 if (pixmap != None)
… …
1173 pixmap = None; 1441 pixmap = None;
1174 } 1442 }
1175 } 1443 }
1176 1444
1177 apply (); 1445 apply ();
1446
1447 XSync (target->dpy, False);
1448 valid_since = ev::now ();
1178 1449
1179 TIMING_TEST_PRINT_RESULT (tp); 1450 TIMING_TEST_PRINT_RESULT (tp);
1180 1451
1181 return true; 1452 return true;
1182} 1453}
… …
1191# ifdef ENABLE_TRANSPARENCY 1462# ifdef ENABLE_TRANSPARENCY
1192 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1463 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1193# endif 1464# endif
1194 return true; 1465 return true;
1195 } 1466 }
1467
1196 return false; 1468 return false;
1197} 1469}
1198 1470
1199void 1471void
1200bgPixmap_t::apply() 1472bgPixmap_t::apply ()
1201{ 1473{
1202 if (target) 1474 if (target)
1203 { 1475 {
1204 flags &= ~isVtOrigin; 1476 flags &= ~isVtOrigin;
1477
1205 if (pixmap != None) 1478 if (pixmap != None)
1479 {
1206 { /* set target's background to pixmap */ 1480 /* set target's background to pixmap */
1207# ifdef ENABLE_TRANSPARENCY 1481# ifdef ENABLE_TRANSPARENCY
1208 if (flags & isTransparent) 1482 if (flags & isTransparent)
1209 { 1483 {
1210 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1484 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1211 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1485 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1212# if HAVE_SCROLLBARS 1486
1213 if (target->scrollBar.win) 1487 if (target->scrollBar.win)
1214 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1488 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1215# endif
1216 } 1489 }
1217 else 1490 else
1218# endif 1491# endif
1219 { 1492 {
1220 flags |= isVtOrigin; 1493 flags |= isVtOrigin;
1221 /* force old pixmap dereference in case it was transparent before :*/ 1494 /* force old pixmap dereference in case it was transparent before :*/
1222 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1495 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1223 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1496 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1224 /* do we also need to set scrollbar's background here ? */ 1497 /* do we also need to set scrollbar's background here ? */
1225# if HAVE_SCROLLBARS 1498
1226 if (target->scrollBar.win) 1499 if (target->scrollBar.win)
1227 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1500 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1228# endif
1229 } 1501 }
1230 } 1502 }
1231 else 1503 else
1504 {
1232 { /* set target background to a pixel */ 1505 /* set target background to a pixel */
1233 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1506 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1234 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1507 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1235 /* do we also need to set scrollbar's background here ? */ 1508 /* do we also need to set scrollbar's background here ? */
1236# if HAVE_SCROLLBARS
1237 if (target->scrollBar.win) 1509 if (target->scrollBar.win)
1238 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1510 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1239# endif
1240 } 1511 }
1512
1241 /* don't want Expose on the parent or vt. It is better to use 1513 /* 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: */ 1514 scr_touch or we get a great deal of flicker otherwise: */
1243 XClearWindow (target->dpy, target->parent[0]); 1515 XClearWindow (target->dpy, target->parent[0]);
1244 1516
1245# if HAVE_SCROLLBARS 1517 if (target->scrollBar.state && target->scrollBar.win)
1246 if (target->scrollBar.win)
1247 { 1518 {
1248 target->scrollBar.setIdle (); 1519 target->scrollBar.state = STATE_IDLE;
1249 target->scrollbar_show (0); 1520 target->scrollBar.show (0);
1250 } 1521 }
1251# endif
1252 1522
1253 target->want_refresh = 1; 1523 target->want_refresh = 1;
1254 flags |= hasChanged; 1524 flags |= hasChanged;
1255 } 1525 }
1256} 1526}
… …
1261/* taken from aterm-0.4.2 */ 1531/* taken from aterm-0.4.2 */
1262 1532
1263typedef uint32_t RUINT32T; 1533typedef uint32_t RUINT32T;
1264 1534
1265static void 1535static void
1266ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1536ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1267{ 1537{
1268 int sh_r, sh_g, sh_b; 1538 int sh_r, sh_g, sh_b;
1269 RUINT32T mask_r, mask_g, mask_b; 1539 RUINT32T mask_r, mask_g, mask_b;
1270 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1540 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1271 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1541 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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