ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

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

Diff Legend

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