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

Diff Legend

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