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.16 by ayin, Mon Nov 26 11:20:13 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) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * 8 *
9 * 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
10 * 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
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26 26
27#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
28 28
29#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
30#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
31 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
32 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
33 34
34#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
35 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; \
36 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__, \
37 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)
38 43
39#else 44#else
40#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
41#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
42#endif 47#endif
43 48
44/* 49/*
45 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
46 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
47 * 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
48 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
49 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
50 * affects on the background image : 55 * effects on the background image :
51 * 56 *
52 * 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%.
53 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
54 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
55 * the image in the window. 60 * the image in the window.
56 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
57 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
58 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
59 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
60 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
61 * 66 *
62 * Adjusting position only : 67 * Adjusting position only :
63 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
64 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
65 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
66 * from current position (relative). 71 * from current position (relative).
67 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
68 * from current position. 73 * from current position.
69 * 74 *
70 * Adjusting scale only : 75 * Adjusting scale only :
71 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
72 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
73 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
74 * 79 *
75 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
76 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
77 * the tile size and origin. 82 * the tile size and origin.
78 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
79 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
80 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
81 * current background color. 86 * current background color.
82 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
83 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
86 */ 91 */
87 92
88#ifdef HAVE_BG_PIXMAP 93#ifdef HAVE_BG_PIXMAP
89bgPixmap_t::bgPixmap_t () 94bgPixmap_t::bgPixmap_t ()
90{ 95{
96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs
91#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
92 original_asim = NULL; 99 original_asim = NULL;
93#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
94#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
95 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
96 h_align = v_align = 0; 107 h_align = v_align = 0;
97#endif 108#endif
98 flags = 0; 109 flags = 0;
99 pixmap = None; 110 pixmap = None;
111 valid_since = invalid_since = 0;
112 target = 0;
100} 113}
101 114
102void 115void
103bgPixmap_t::destroy () 116bgPixmap_t::destroy ()
104{ 117{
105#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
106 if (original_asim) 119 if (original_asim)
107 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
108#endif 121#endif
109 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
110 if (pixmap && target) 128 if (pixmap && target)
111 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
112} 130}
113 131
114bool 132bool
… …
118 if (flags & isTransparent) 136 if (flags & isTransparent)
119 return true; 137 return true;
120# endif 138# endif
121 139
122# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
123# ifdef HAVE_AFTERIMAGE 141 if (have_image)
124 if (original_asim != NULL)
125# endif
126 { 142 {
127 if (h_scale != 0 || v_scale != 0 143 if (h_scale != 0 || v_scale != 0
128 || h_align != 0 || v_align != 0) 144 || h_align != 0 || v_align != 0)
129 return true; 145 return true;
130 } 146 }
131# endif 147# endif
132 148
133 return false; 149 return false;
134} 150}
135 151
136bool 152bool
137bgPixmap_t::window_position_sensitive () 153bgPixmap_t::window_position_sensitive ()
138{ 154{
139# ifdef ENABLE_TRANSPARENCY 155# ifdef ENABLE_TRANSPARENCY
140 if (flags & isTransparent) 156 if (flags & isTransparent)
141 return true; 157 return true;
142# endif 158# endif
143 159
144# ifdef BG_IMAGE_FROM_FILE 160# ifdef BG_IMAGE_FROM_FILE
145# ifdef HAVE_AFTERIMAGE 161 if (have_image)
146 if (original_asim != NULL)
147# endif
148 { 162 {
149 if (h_align == rootAlign || v_align == rootAlign) 163 if (h_align == rootAlign || v_align == rootAlign)
150 return true; 164 return true;
151 } 165 }
152# endif 166# endif
… …
155}; 169};
156 170
157bool bgPixmap_t::need_client_side_rendering () 171bool bgPixmap_t::need_client_side_rendering ()
158{ 172{
159# ifdef HAVE_AFTERIMAGE 173# ifdef HAVE_AFTERIMAGE
160 if (original_asim != NULL) 174 if (original_asim)
161 return true; 175 return true;
162# endif 176# endif
163# ifdef ENABLE_TRANSPARENCY 177# ifdef ENABLE_TRANSPARENCY
164 if (flags & isTransparent) 178 if (flags & isTransparent)
165 { 179 {
… …
254 int geom_flags = 0, changed = 0; 268 int geom_flags = 0, changed = 0;
255 int x = 0, y = 0; 269 int x = 0, y = 0;
256 unsigned int w = 0, h = 0; 270 unsigned int w = 0, h = 0;
257 unsigned int n; 271 unsigned int n;
258 unsigned long new_flags = (flags & (~geometryFlags)); 272 unsigned long new_flags = (flags & (~geometryFlags));
259 char *p; 273 const char *p;
260# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 274# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
261 275
262 if (geom == NULL) 276 if (geom == NULL)
263 return false; 277 return false;
264 278
265 char str[MAXLEN_GEOM]; 279 char str[MAXLEN_GEOM];
… …
272 if (n < MAXLEN_GEOM) 286 if (n < MAXLEN_GEOM)
273 { 287 {
274 char *ops; 288 char *ops;
275 new_flags |= geometrySet; 289 new_flags |= geometrySet;
276 290
277 strncpy (str, geom, n); 291 memcpy (str, geom, n);
278 str[n] = '\0'; 292 str[n] = '\0';
279 if (str[0] == ':') 293 if (str[0] == ':')
280 ops = &str[0]; 294 ops = &str[0];
281 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 295 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
282 ops = &str[0]; 296 ops = &str[0];
… …
302 y = x; 316 y = x;
303 geom_flags |= YValue; 317 geom_flags |= YValue;
304 } 318 }
305 319
306 if (flags & geometrySet) 320 if (flags & geometrySet)
321 {
307 {/* new geometry is an adjustment to the old one ! */ 322 /* new geometry is an adjustment to the old one ! */
308 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 323 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
309 { 324 {
310 if (w == 0 && h != 0) 325 if (w == 0 && h != 0)
311 { 326 {
312 w = h_scale; 327 w = h_scale;
… …
328 } 343 }
329 } 344 }
330 else /* setting up geometry from scratch */ 345 else /* setting up geometry from scratch */
331 { 346 {
332 if (!(geom_flags & XValue)) 347 if (!(geom_flags & XValue))
348 {
333 {/* use default geometry - centered */ 349 /* use default geometry - centered */
334 x = y = defaultAlign; 350 x = y = defaultAlign;
335 } 351 }
336 else if (!(geom_flags & YValue)) 352 else if (!(geom_flags & YValue))
337 y = x; 353 y = x;
338 354
339 if ((geom_flags & (WidthValue|HeightValue)) == 0) 355 if ((geom_flags & (WidthValue|HeightValue)) == 0)
356 {
340 {/* use default geometry - scaled */ 357 /* use default geometry - scaled */
341 w = h = defaultScale; 358 w = h = defaultScale;
342 } 359 }
343 else if (geom_flags & WidthValue) 360 else if (geom_flags & WidthValue)
344 { 361 {
345 if (!(geom_flags & HeightValue)) 362 if (!(geom_flags & HeightValue))
… …
362 if (ops) 379 if (ops)
363 { 380 {
364 while (*ops) 381 while (*ops)
365 { 382 {
366 while (*ops == ':' || isspace(*ops)) ++ops; 383 while (*ops == ':' || isspace(*ops)) ++ops;
384
367# 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)
368 if (CHECK_GEOM_OPS("tile")) 386 if (CHECK_GEOM_OPS ("tile"))
369 { 387 {
370 w = h = noScale; 388 w = h = noScale;
371 geom_flags |= WidthValue|HeightValue; 389 geom_flags |= WidthValue|HeightValue;
372 } 390 }
373 else if (CHECK_GEOM_OPS("propscale")) 391 else if (CHECK_GEOM_OPS ("propscale"))
374 { 392 {
375 if (w == 0 && h == 0) 393 if (w == 0 && h == 0)
376 { 394 {
377 w = windowScale; 395 w = windowScale;
378 geom_flags |= WidthValue; 396 geom_flags |= WidthValue;
379 } 397 }
380 new_flags |= propScale; 398 new_flags |= propScale;
381 } 399 }
382 else if (CHECK_GEOM_OPS("hscale")) 400 else if (CHECK_GEOM_OPS ("hscale"))
383 { 401 {
384 if (w == 0)
385 w = windowScale; 402 if (w == 0) w = windowScale;
403
386 h = noScale; 404 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 405 geom_flags |= WidthValue|HeightValue;
388 } 406 }
389 else if (CHECK_GEOM_OPS("vscale")) 407 else if (CHECK_GEOM_OPS ("vscale"))
390 { 408 {
391 if (h == 0)
392 h = windowScale; 409 if (h == 0) h = windowScale;
410
393 w = noScale; 411 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 412 geom_flags |= WidthValue|HeightValue;
395 } 413 }
396 else if (CHECK_GEOM_OPS("scale")) 414 else if (CHECK_GEOM_OPS ("scale"))
397 { 415 {
398 if (h == 0)
399 h = windowScale; 416 if (h == 0) h = windowScale;
400 if (w == 0)
401 w = windowScale; 417 if (w == 0) w = windowScale;
418
402 geom_flags |= WidthValue|HeightValue; 419 geom_flags |= WidthValue|HeightValue;
403 } 420 }
404 else if (CHECK_GEOM_OPS("auto")) 421 else if (CHECK_GEOM_OPS ("auto"))
405 { 422 {
406 w = h = windowScale; 423 w = h = windowScale;
407 x = y = centerAlign; 424 x = y = centerAlign;
408 geom_flags |= WidthValue|HeightValue|XValue|YValue; 425 geom_flags |= WidthValue|HeightValue|XValue|YValue;
409 } 426 }
410 else if (CHECK_GEOM_OPS("root")) 427 else if (CHECK_GEOM_OPS ("root"))
411 { 428 {
412 w = h = noScale; 429 w = h = noScale;
413 x = y = rootAlign; 430 x = y = rootAlign;
414 geom_flags |= WidthValue|HeightValue|XValue|YValue; 431 geom_flags |= WidthValue|HeightValue|XValue|YValue;
415 } 432 }
416# undef CHECK_GEOM_OPS 433# undef CHECK_GEOM_OPS
434
417 while (*ops != ':' && *ops != '\0') ++ops; 435 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 436 } /* done parsing ops */
419 } 437 }
420 438
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 439 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
422 ++changed;
423 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 440 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
424 ++changed;
425 if (check_set_align_value (geom_flags, XValue, h_align, x)) 441 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
426 ++changed;
427 if (check_set_align_value (geom_flags, YValue, v_align, y)) 442 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
428 ++changed;
429 } 443 }
430 444
431 if (new_flags != flags) 445 if (new_flags != flags)
432 { 446 {
433 flags = new_flags; 447 flags = new_flags;
434 changed++; 448 changed++;
435 } 449 }
450
436//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
437// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
438 return (changed > 0); 453 return (changed > 0);
439} 454}
440 455
441# ifdef HAVE_AFTERIMAGE 456# ifdef HAVE_AFTERIMAGE
442bool 457bool
443bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 458bgPixmap_t::render_image (unsigned long background_flags)
444{ 459{
445 if (target == NULL) 460 if (target == NULL)
446 return false; 461 return false;
447 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
448 int target_width = (int)target->szHint.width; 502 int target_width = target->szHint.width;
449 int target_height = (int)target->szHint.height; 503 int target_height = target->szHint.height;
450 int new_pmap_width = target_width, new_pmap_height = target_height; 504 int new_pmap_width = target_width;
451 ASImage *result = NULL; 505 int new_pmap_height = target_height;
452 506
453 int x = 0; 507 int x = 0;
454 int y = 0; 508 int y = 0;
455 int w = h_scale * target_width / 100; 509 int w = h_scale * target_width / 100;
456 int h = v_scale * target_height / 100; 510 int h = v_scale * target_height / 100;
… …
459 513
460 if (original_asim) 514 if (original_asim)
461 { 515 {
462 if (h_align == rootAlign || v_align == rootAlign) 516 if (h_align == rootAlign || v_align == rootAlign)
463 { 517 {
464 target->get_window_origin(x, y); 518 target->get_window_origin (x, y);
465 x = -x; 519 x = -x;
466 y = -y; 520 y = -y;
467 } 521 }
522
468 if (h_align != rootAlign) 523 if (h_align != rootAlign)
469 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
470 if (v_align != rootAlign) 526 if (v_align != rootAlign)
471 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);
472 } 528 }
473 529
474 if (original_asim == NULL 530 if (!original_asim
475 || x >= target_width 531 || x >= target_width
476 || y >= target_height 532 || y >= target_height
477 || (w > 0 && x + w <= 0) 533 || (w > 0 && x + w <= 0)
478 || (h > 0 && y + h <= 0)) 534 || (h > 0 && y + h <= 0))
479 { 535 {
480 if (background) 536 if (background)
481 { 537 {
482 new_pmap_width = background->width; 538 new_pmap_width = background->width;
483 new_pmap_height = background->height; 539 new_pmap_height = background->height;
484 result = background; 540 result = background;
541
485 if (background_tint != TINT_LEAVE_SAME) 542 if (background_tint != TINT_LEAVE_SAME)
486 { 543 {
487 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 544 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
488 target_width, target_height, background_tint, 545 target_width, target_height, background_tint,
489 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 546 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
490 if (tmp) 547 if (tmp)
491 result = tmp; 548 result = tmp;
492 } 549 }
… …
495 new_pmap_width = new_pmap_height = 0; 552 new_pmap_width = new_pmap_height = 0;
496 } 553 }
497 else 554 else
498 { 555 {
499 result = original_asim; 556 result = original_asim;
557
500 if ((w > 0 && w != original_asim->width) 558 if ((w > 0 && w != original_asim->width)
501 || (h > 0 && h != original_asim->height)) 559 || (h > 0 && h != original_asim->height))
502 { 560 {
503 result = scale_asimage (target->asv, original_asim, 561 result = scale_asimage (target->asv, original_asim,
504 w > 0 ? w : original_asim->width, 562 w > 0 ? w : original_asim->width,
505 h > 0 ? h : original_asim->height, 563 h > 0 ? h : original_asim->height,
506 background ? ASA_ASImage : ASA_XImage, 564 background ? ASA_ASImage : ASA_XImage,
507 100, ASIMAGE_QUALITY_DEFAULT); 565 100, ASIMAGE_QUALITY_DEFAULT);
508 } 566 }
567
509 if (background == NULL) 568 if (background == NULL)
569 {
510 {/* if tiling - pixmap has to be sized exactly as the image, 570 /* if tiling - pixmap has to be sized exactly as the image,
511 but there is no need to make it bigger then the window! */ 571 but there is no need to make it bigger than the window! */
512 if (h_scale == 0) 572 if (h_scale == 0)
513 new_pmap_width = min (result->width, target_width); 573 new_pmap_width = min (result->width, target_width);
514 if (v_scale == 0) 574 if (v_scale == 0)
515 new_pmap_height = min (result->height, target_height); 575 new_pmap_height = min (result->height, target_height);
516 /* 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 */
517 if (h_scale == 0 || v_scale == 0) 577 if (h_scale == 0 || v_scale == 0)
518 { 578 {
519 ASImage *tmp = tile_asimage (target->asv, result, 579 ASImage *tmp = tile_asimage (target->asv, result,
520 (h_scale > 0) ? 0 : (int)result->width - x, 580 (h_scale > 0) ? 0 : (int)result->width - x,
521 (v_scale > 0) ? 0 : (int)result->height - y, 581 (v_scale > 0) ? 0 : (int)result->height - y,
522 new_pmap_width, 582 new_pmap_width,
523 new_pmap_height, 583 new_pmap_height,
524 TINT_LEAVE_SAME, ASA_XImage, 584 TINT_LEAVE_SAME, ASA_XImage,
525 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
526 if (tmp) 586 if (tmp)
527 { 587 {
528 if (result != original_asim) 588 if (result != original_asim)
529 destroy_asimage (&result); 589 destroy_asimage (&result);
590
530 result = tmp; 591 result = tmp;
531 } 592 }
532 } 593 }
533 } 594 }
534 else 595 else
596 {
535 {/* 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 */
536 ASImageLayer *layers = create_image_layers (2); 598 ASImageLayer *layers = create_image_layers (2);
537 ASImage *merged_im = NULL;
538 599
539 layers[0].im = background; 600 layers[0].im = background;
540 layers[0].clip_width = target_width; 601 layers[0].clip_width = target_width;
541 layers[0].clip_height = target_height; 602 layers[0].clip_height = target_height;
542 layers[0].tint = background_tint; 603 layers[0].tint = background_tint;
543 layers[1].im = result; 604 layers[1].im = result;
605
544 if (w <= 0) 606 if (w <= 0)
607 {
545 {/* tile horizontally */ 608 /* tile horizontally */
546 while (x > 0) x -= (int)result->width; 609 while (x > 0) x -= (int)result->width;
547 layers[1].dst_x = x; 610 layers[1].dst_x = x;
548 layers[1].clip_width = result->width+target_width; 611 layers[1].clip_width = result->width+target_width;
549 } 612 }
550 else 613 else
614 {
551 {/* clip horizontally */ 615 /* clip horizontally */
552 layers[1].dst_x = x; 616 layers[1].dst_x = x;
553 layers[1].clip_width = result->width; 617 layers[1].clip_width = result->width;
554 } 618 }
619
555 if (h <= 0) 620 if (h <= 0)
556 { 621 {
557 while (y > 0) y -= (int)result->height; 622 while (y > 0) y -= (int)result->height;
558 layers[1].dst_y = y; 623 layers[1].dst_y = y;
559 layers[1].clip_height = result->height + target_height; 624 layers[1].clip_height = result->height + target_height;
… …
561 else 626 else
562 { 627 {
563 layers[1].dst_y = y; 628 layers[1].dst_y = y;
564 layers[1].clip_height = result->height; 629 layers[1].clip_height = result->height;
565 } 630 }
631
566 if (target->rs[Rs_blendtype]) 632 if (target->rs[Rs_blendtype])
567 { 633 {
568 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 634 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
569 if (layers[1].merge_scanlines == NULL) 635 if (layers[1].merge_scanlines == NULL)
570 layers[1].merge_scanlines = alphablend_scanlines; 636 layers[1].merge_scanlines = alphablend_scanlines;
571 } 637 }
638
572 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,
573 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 640 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
641
574 if (tmp) 642 if (tmp)
575 { 643 {
576 if (result != original_asim) 644 if (result != original_asim)
577 destroy_asimage (&result); 645 destroy_asimage (&result);
646
578 result = tmp; 647 result = tmp;
579 } 648 }
649
580 free (layers); 650 free (layers);
581 } 651 }
582 } 652 }
583 TIMING_TEST_PRINT_RESULT (asim); 653 TIMING_TEST_PRINT_RESULT (asim);
584 654
585 if (pixmap) 655 bool ret = false;
586 {
587 if (result == NULL
588 || pmap_width != new_pmap_width
589 || pmap_height != new_pmap_height
590 || pmap_depth != target->depth)
591 {
592 XFreePixmap (target->dpy, pixmap);
593 pixmap = None;
594 }
595 }
596 656
597 if (result) 657 if (result)
598 { 658 {
599 XGCValues gcv; 659 XGCValues gcv;
600 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 }
601 672
602 /* create Pixmap */ 673 /* create Pixmap */
603 if (pixmap == None) 674 if (pixmap == None)
604 { 675 {
605 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);
606 pmap_width = new_pmap_width; 677 pmap_width = new_pmap_width;
607 pmap_height = new_pmap_height; 678 pmap_height = new_pmap_height;
608 pmap_depth = target->depth; 679 pmap_depth = target->depth;
609 } 680 }
610 /* fill with background color ( if result's not completely overlapping it)*/ 681 /* fill with background color (if result's not completely overlapping it) */
611 gcv.foreground = target->pix_colors[Color_bg]; 682 gcv.foreground = target->pix_colors[Color_bg];
612 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 683 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
613 684
614 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;
615 int dst_width = result->width, dst_height = result->height; 686 int dst_width = result->width, dst_height = result->height;
616 if (background == NULL) 687 if (background == NULL)
617 { 688 {
618 if (h_scale > 0)
619 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 );
620 if (v_scale > 0)
621 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);
622 691
623 if (dst_x > 0 || dst_y > 0 692 if (dst_x > 0 || dst_y > 0
624 || dst_x + dst_width < new_pmap_width 693 || dst_x + dst_width < new_pmap_width
625 || dst_y + dst_height < new_pmap_height) 694 || dst_y + dst_height < new_pmap_height)
626 {
627 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);
628 }
629 } 696 }
630 697
631 /* put result on pixmap */ 698 /* put result on pixmap */
632 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 699 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
633 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);
… …
635 if (result != background && result != original_asim) 702 if (result != background && result != original_asim)
636 destroy_asimage (&result); 703 destroy_asimage (&result);
637 704
638 XFreeGC (target->dpy, gc); 705 XFreeGC (target->dpy, gc);
639 TIMING_TEST_PRINT_RESULT (asim); 706 TIMING_TEST_PRINT_RESULT (asim);
640 }
641 707
708 ret = true;
709 }
710
711 if (background)
712 destroy_asimage (&background);
713
642 return true; 714 return ret;
643} 715}
644# 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 */
645 866
646bool 867bool
647bgPixmap_t::set_file (const char *file) 868bgPixmap_t::set_file (const char *file)
648{ 869{
649 char *f;
650
651 assert (file != NULL); 870 assert (file);
652 871
653 if (*file != '\0') 872 if (*file)
654 { 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
655# ifdef HAVE_AFTERIMAGE 883# ifdef HAVE_AFTERIMAGE
656 if (target->asimman == NULL) 884 if (!target->asimman)
657 target->asimman = create_generic_imageman (target->rs[Rs_path]); 885 target->asimman = create_generic_imageman (target->rs[Rs_path]);
658 if ((f = strchr (file, ';')) == NULL)
659 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 886 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
660 else 887 if (original_asim)
661 { 888 have_image = true;
662 size_t len = f - file; 889 return have_image;
663 f = (char *)malloc (len + 1);
664 strncpy (f, file, len);
665 f[len] = '\0';
666 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
667 free (f);
668 }
669 return (original_asim != NULL);
670# 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
671 } 898 }
899
672 return false; 900 return false;
673} 901}
674 902
675# endif /* BG_IMAGE_FROM_FILE */ 903# endif /* BG_IMAGE_FROM_FILE */
676 904
… …
681 if (!(flags & isTransparent)) 909 if (!(flags & isTransparent))
682 { 910 {
683 flags |= isTransparent; 911 flags |= isTransparent;
684 return true; 912 return true;
685 } 913 }
914
686 return false; 915 return false;
687} 916}
688 917
689bool 918bool
690bgPixmap_t::set_blur_radius (const char *geom) 919bgPixmap_t::set_blur_radius (const char *geom)
… …
692 int changed = 0; 921 int changed = 0;
693 unsigned int hr, vr; 922 unsigned int hr, vr;
694 int junk; 923 int junk;
695 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 924 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
696 925
697 if (!(geom_flags&WidthValue)) 926 if (!(geom_flags & WidthValue))
698 hr = 1; 927 hr = 1;
699 if (!(geom_flags&HeightValue)) 928 if (!(geom_flags & HeightValue))
700 vr = hr; 929 vr = hr;
701 930
702 if (h_blurRadius != hr) 931 if (h_blurRadius != hr)
703 { 932 {
704 ++changed; 933 ++changed;
… …
714 if (v_blurRadius == 0 && h_blurRadius == 0) 943 if (v_blurRadius == 0 && h_blurRadius == 0)
715 flags &= ~blurNeeded; 944 flags &= ~blurNeeded;
716 else 945 else
717 flags |= blurNeeded; 946 flags |= blurNeeded;
718 947
719 return (changed>0); 948 return (changed > 0);
720} 949}
721 950
722static inline unsigned long 951static inline unsigned long
723compute_tint_shade_flags (rxvt_color *tint, int shade) 952compute_tint_shade_flags (rxvt_color *tint, int shade)
724{ 953{
… …
741 flags |= bgPixmap_t::tintNeeded; 970 flags |= bgPixmap_t::tintNeeded;
742 else if (tint) 971 else if (tint)
743 { 972 {
744 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 973 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
745 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 974 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
746 { 975 {
747 flags |= bgPixmap_t::tintNeeded; 976 flags |= bgPixmap_t::tintNeeded;
748 } 977 }
749 } 978 }
750 979
751 if (flags & bgPixmap_t::tintNeeded) 980 if (flags & bgPixmap_t::tintNeeded)
752 { 981 {
753 if (flags & bgPixmap_t::tintWholesome) 982 if (flags & bgPixmap_t::tintWholesome)
… …
771 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1000 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
772 tint = new_tint; 1001 tint = new_tint;
773 flags = (flags & ~tintFlags) | new_flags | tintSet; 1002 flags = (flags & ~tintFlags) | new_flags | tintSet;
774 return true; 1003 return true;
775 } 1004 }
1005
776 return false; 1006 return false;
777} 1007}
778 1008
779bool 1009bool
780bgPixmap_t::unset_tint () 1010bgPixmap_t::unset_tint ()
781{ 1011{
782 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1012 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
783 1013
784 if (new_flags != (flags & tintFlags)) 1014 if (new_flags != (flags & tintFlags))
785 { 1015 {
786 flags = (flags&~tintFlags)|new_flags; 1016 flags = (flags & ~tintFlags) | new_flags;
787 return true; 1017 return true;
788 } 1018 }
1019
789 return false; 1020 return false;
790} 1021}
791 1022
792bool 1023bool
793bgPixmap_t::set_shade (const char *shade_str) 1024bgPixmap_t::set_shade (const char *shade_str)
794{ 1025{
795 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1026 int new_shade = (shade_str) ? atoi (shade_str) : 0;
796 1027
797 if (new_shade < 0 && new_shade > -100) 1028 if (new_shade < 0 && new_shade > -100)
798 new_shade = 200 - (100 + new_shade); 1029 new_shade = 200 - (100 + new_shade);
799 else if (new_shade == 100) 1030 else if (new_shade == 100)
800 new_shade = 0; 1031 new_shade = 0;
801 1032
802 if (new_shade != shade) 1033 if (new_shade != shade)
803 { 1034 {
804 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);
805 shade = new_shade; 1036 shade = new_shade;
806 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1037 flags = (flags & (~tintFlags | tintSet)) | new_flags;
807 return true; 1038 return true;
808 } 1039 }
1040
809 return false; 1041 return false;
810} 1042}
811 1043
812/* make_transparency_pixmap() 1044/* make_transparency_pixmap()
813 * 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
… …
820 unsigned long result = 0; 1052 unsigned long result = 0;
821 1053
822 if (target == NULL) 1054 if (target == NULL)
823 return 0; 1055 return 0;
824 1056
825 /* 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
826 * be always up-to-date, so let's use it : 1058 * be always up-to-date, so let's use it :
827 */ 1059 */
828 Window root = target->display->root; 1060 Window root = target->display->root;
829 int screen = target->display->screen; 1061 int screen = target->display->screen;
830 Display *dpy = target->dpy; 1062 Display *dpy = target->dpy;
… …
843 if (sx + window_width <= 0 || sy + window_height <= 0 1075 if (sx + window_width <= 0 || sy + window_height <= 0
844 || sx >= root_width || sy >= root_height) 1076 || sx >= root_width || sy >= root_height)
845 return 0; 1077 return 0;
846 1078
847 if (root_pixmap != None) 1079 if (root_pixmap != None)
1080 {
848 {/* 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 : */
849 int junk; 1082 int junk;
850 unsigned int ujunk; 1083 unsigned int ujunk;
851 /* root pixmap may be bad - allow a error */ 1084 /* root pixmap may be bad - allow a error */
852 target->allowedxerror = -1; 1085 target->allowedxerror = -1;
853 1086
… …
874 1107
875 attr.background_pixmap = ParentRelative; 1108 attr.background_pixmap = ParentRelative;
876 attr.backing_store = Always; 1109 attr.backing_store = Always;
877 attr.event_mask = ExposureMask; 1110 attr.event_mask = ExposureMask;
878 attr.override_redirect = True; 1111 attr.override_redirect = True;
879 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1112 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
880 CopyFromParent, CopyFromParent, CopyFromParent, 1113 CopyFromParent, CopyFromParent, CopyFromParent,
881 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1114 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
882 &attr); 1115 &attr);
883 1116
884 if (src != None) 1117 if (src != None)
… …
888 XGrabServer (dpy); 1121 XGrabServer (dpy);
889 XMapRaised (dpy, src); 1122 XMapRaised (dpy, src);
890 XSync (dpy, False); 1123 XSync (dpy, False);
891 1124
892 /* XSync should get window where it's properly exposed, 1125 /* XSync should get window where it's properly exposed,
893 * 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 : */
894 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1127 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
895 ++ev_count; 1128 ++ev_count;
896 1129
897 if (ev_count > 0); 1130 if (ev_count > 0);
898 { 1131 {
… …
902 { 1135 {
903 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);
904 success = true; 1137 success = true;
905 } 1138 }
906 } 1139 }
1140
907 XDestroyWindow (dpy, src); 1141 XDestroyWindow (dpy, src);
908 XUngrabServer (dpy); 1142 XUngrabServer (dpy);
909 //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);
910 } 1144 }
911 1145
912 if (!success) 1146 if (!success)
913 { 1147 {
914 XFreePixmap (dpy, tiled_root_pmap); 1148 XFreePixmap (dpy, tiled_root_pmap);
915 tiled_root_pmap = None; 1149 tiled_root_pmap = None;
916 } 1150 }
917 else 1151 else
918 result |= transpPmapTiled; 1152 result |= transpPmapTiled;
919 } 1153 }
920 else 1154 else
1155 {
921 {/* strightforward pixmap copy */ 1156 /* straightforward pixmap copy */
922 gcv.tile = root_pixmap; 1157 gcv.tile = root_pixmap;
923 gcv.fill_style = FillTiled; 1158 gcv.fill_style = FillTiled;
924 1159
925 while (sx < 0) sx += (int)root_width; 1160 while (sx < 0) sx += (int)root_width;
926 while (sy < 0) sy += (int)root_height; 1161 while (sy < 0) sy += (int)root_height;
… …
974 { 1209 {
975 c.r = (c.r * shade) / 100; 1210 c.r = (c.r * shade) / 100;
976 c.g = (c.g * shade) / 100; 1211 c.g = (c.g * shade) / 100;
977 c.b = (c.b * shade) / 100; 1212 c.b = (c.b * shade) / 100;
978 } 1213 }
979 else if( shade > 100 && shade < 200) 1214 else if (shade > 100 && shade < 200)
980 { 1215 {
981 c.r = (c.r * (200 - shade)) / 100; 1216 c.r = (c.r * (200 - shade)) / 100;
982 c.g = (c.g * (200 - shade)) / 100; 1217 c.g = (c.g * (200 - shade)) / 100;
983 c.b = (c.b * (200 - shade)) / 100; 1218 c.b = (c.b * (200 - shade)) / 100;
984 } 1219 }
… …
1030 mask_c.blue = 0xffff - c.b; 1265 mask_c.blue = 0xffff - c.b;
1031 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1266 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1032 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);
1033 result |= transpPmapTinted; 1268 result |= transpPmapTinted;
1034 } 1269 }
1270
1035 XRenderFreePicture (dpy, mask_pic); 1271 XRenderFreePicture (dpy, mask_pic);
1036 XRenderFreePicture (dpy, overlay_pic); 1272 XRenderFreePicture (dpy, overlay_pic);
1037 XRenderFreePicture (dpy, back_pic); 1273 XRenderFreePicture (dpy, back_pic);
1038# if DO_TIMING_TEST 1274# if DO_TIMING_TEST
1039 XSync (dpy, False); 1275 XSync (dpy, False);
1040# endif 1276# endif
1041# endif 1277# endif
1042 } 1278 }
1043 } 1279 }
1044 } /* server side rendering completed */ 1280 } /* server side rendering completed */
1045 1281
1046 if (pixmap) 1282 if (pixmap)
1047 XFreePixmap (dpy, pixmap); 1283 XFreePixmap (dpy, pixmap);
1048 1284
… …
1061} 1297}
1062 1298
1063bool 1299bool
1064bgPixmap_t::set_root_pixmap () 1300bgPixmap_t::set_root_pixmap ()
1065{ 1301{
1066 Pixmap new_root_pixmap = None;
1067
1068 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1302 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1069 if (new_root_pixmap == None) 1303 if (new_root_pixmap == None)
1070 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1304 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1071 1305
1072 if (new_root_pixmap != root_pixmap) 1306 if (new_root_pixmap != root_pixmap)
1073 { 1307 {
1074 root_pixmap = new_root_pixmap; 1308 root_pixmap = new_root_pixmap;
1075 return true; 1309 return true;
1076 } 1310 }
1311
1077 return false; 1312 return false;
1078} 1313}
1079# endif /* ENABLE_TRANSPARENCY */ 1314# endif /* ENABLE_TRANSPARENCY */
1080 1315
1081# ifndef HAVE_AFTERIMAGE 1316# ifndef HAVE_AFTERIMAGE
1082static 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);
1083# endif 1318# endif
1084
1085 1319
1086bool 1320bool
1087bgPixmap_t::render () 1321bgPixmap_t::render ()
1088{ 1322{
1089 unsigned long background_flags = 0; 1323 unsigned long background_flags = 0;
… …
1091 if (target == NULL) 1325 if (target == NULL)
1092 return false; 1326 return false;
1093 1327
1094 TIMING_TEST_START (tp); 1328 TIMING_TEST_START (tp);
1095 1329
1096 invalidate(); 1330 invalidate ();
1097# ifdef ENABLE_TRANSPARENCY 1331# ifdef ENABLE_TRANSPARENCY
1098 if (flags & isTransparent) 1332 if (flags & isTransparent)
1099 { 1333 {
1100 /* we need to re-generate transparency pixmap in that case ! */ 1334 /* we need to re-generate transparency pixmap in that case ! */
1101 background_flags = make_transparency_pixmap (); 1335 background_flags = make_transparency_pixmap ();
1102 if (background_flags == 0) 1336 if (background_flags == 0)
1103 return false; 1337 return false;
1104 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1338 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1105 && pmap_depth == target->depth) 1339 && pmap_depth == target->depth)
1106 flags = flags & ~isInvalid; 1340 flags = flags & ~isInvalid;
1107 } 1341 }
1108# endif 1342# endif
1109 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
1110 XImage *result = NULL; 1353 XImage *result = NULL;
1111# ifdef HAVE_AFTERIMAGE 1354
1112 if (original_asim 1355 if (background_flags && (flags & isInvalid))
1113 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1356 {
1357 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1114 { 1358 }
1115 ASImage *background = NULL;
1116 ARGB32 as_tint = TINT_LEAVE_SAME;
1117 if (background_flags)
1118 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1119 1359
1120# 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 !!! */
1121 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1366 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1122 {
1123 ShadingInfo as_shade;
1124 as_shade.shading = (shade == 0) ? 100 : shade;
1125
1126 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1127 if (flags & tintSet)
1128 tint.get (c);
1129 as_shade.tintColor.red = c.r;
1130 as_shade.tintColor.green = c.g;
1131 as_shade.tintColor.blue = c.b;
1132
1133 as_tint = shading2tint32 (&as_shade);
1134 }
1135 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1136 {
1137 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1138 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1139 100, ASIMAGE_QUALITY_DEFAULT);
1140 if (tmp)
1141 {
1142 destroy_asimage (&background);
1143 background = tmp;
1144 }
1145 }
1146# endif
1147
1148 if (render_asim (background, as_tint))
1149 flags = flags & ~isInvalid;
1150 if (background)
1151 destroy_asimage (&background);
1152 }
1153 else if (background_flags && pmap_depth != target->depth)
1154 {
1155 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1156 }
1157
1158# elif !XFT /* our own client-side tinting */
1159
1160 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1161 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1162
1163 if (background_flags && (flags & isInvalid))
1164 {
1165 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1166 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1167 { 1367 {
1168 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1368 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1169 if (flags & tintSet) 1369 if (flags & tintSet)
1170 tint.get (c); 1370 tint.get (c);
1171 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1371 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1172 } 1372 }
1173 } 1373# endif
1174# endif /* HAVE_AFTERIMAGE */
1175 1374
1176 if (result != NULL)
1177 {
1178 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1375 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1376
1179 if (gc) 1377 if (gc)
1180 { 1378 {
1181 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1379 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1182 { 1380 {
1183 XFreePixmap (target->dpy, pixmap); 1381 XFreePixmap (target->dpy, pixmap);
1184 pixmap = None; 1382 pixmap = None;
1185 } 1383 }
1384
1186 if (pixmap == None) 1385 if (pixmap == None)
1187 { 1386 {
1188 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);
1189 pmap_width = result->width; 1388 pmap_width = result->width;
1190 pmap_height = result->height; 1389 pmap_height = result->height;
1191 pmap_depth = target->depth; 1390 pmap_depth = target->depth;
1192 } 1391 }
1392
1193 if (pmap_depth != result->depth) 1393 if (pmap_depth != result->depth)
1194 { 1394 {
1195 /* Bad Match error will ensue ! stupid X !!!! */ 1395 /* Bad Match error will ensue ! stupid X !!!! */
1196 if( result->depth == 24 && pmap_depth == 32) 1396 if (result->depth == 24 && pmap_depth == 32)
1197 result->depth = 32; 1397 result->depth = 32;
1198 else if( result->depth == 32 && pmap_depth == 24) 1398 else if (result->depth == 32 && pmap_depth == 24)
1199 result->depth = 24; 1399 result->depth = 24;
1200 else 1400 else
1201 { 1401 {
1202 /* TODO: implement image recoding */ 1402 /* TODO: implement image recoding */
1203 } 1403 }
1204 } 1404 }
1405
1205 if (pmap_depth == result->depth) 1406 if (pmap_depth == result->depth)
1206 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
1207 XFreeGC (target->dpy, gc); 1409 XFreeGC (target->dpy, gc);
1208 flags = flags & ~isInvalid; 1410 flags = flags & ~isInvalid;
1209 } 1411 }
1412
1210 XDestroyImage (result); 1413 XDestroyImage (result);
1211 } 1414 }
1212 1415
1213 if (flags & isInvalid) 1416 if (flags & isInvalid)
1214 { 1417 {
1215 if (pixmap != None) 1418 if (pixmap != None)
… …
1218 pixmap = None; 1421 pixmap = None;
1219 } 1422 }
1220 } 1423 }
1221 1424
1222 apply (); 1425 apply ();
1426
1427 XSync (target->dpy, False);
1428 valid_since = ev::now ();
1223 1429
1224 TIMING_TEST_PRINT_RESULT (tp); 1430 TIMING_TEST_PRINT_RESULT (tp);
1225 1431
1226 return true; 1432 return true;
1227} 1433}
… …
1236# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1237 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1443 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1238# endif 1444# endif
1239 return true; 1445 return true;
1240 } 1446 }
1447
1241 return false; 1448 return false;
1242} 1449}
1243 1450
1244void 1451void
1245bgPixmap_t::apply() 1452bgPixmap_t::apply ()
1246{ 1453{
1247 if (target) 1454 if (target)
1248 { 1455 {
1249 flags &= ~isVtOrigin; 1456 flags &= ~isVtOrigin;
1457
1250 if (pixmap != None) 1458 if (pixmap != None)
1251 { 1459 {
1252 /* set target's background to pixmap */ 1460 /* set target's background to pixmap */
1253# ifdef ENABLE_TRANSPARENCY 1461# ifdef ENABLE_TRANSPARENCY
1254 if (flags & isTransparent) 1462 if (flags & isTransparent)
1255 { 1463 {
1256 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1464 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1257 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1465 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1258# if HAVE_SCROLLBARS 1466
1259 if (target->scrollBar.win) 1467 if (target->scrollBar.win)
1260 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1468 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1261# endif
1262 } 1469 }
1263 else 1470 else
1264# endif 1471# endif
1265 { 1472 {
1266 flags |= isVtOrigin; 1473 flags |= isVtOrigin;
1267 /* force old pixmap dereference in case it was transparent before :*/ 1474 /* force old pixmap dereference in case it was transparent before :*/
1268 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1475 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1269 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1270 /* do we also need to set scrollbar's background here ? */ 1477 /* do we also need to set scrollbar's background here ? */
1271# if HAVE_SCROLLBARS 1478
1272 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1273 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1480 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1274# endif
1275 } 1481 }
1276 } 1482 }
1277 else 1483 else
1278 { 1484 {
1279 /* set target background to a pixel */ 1485 /* set target background to a pixel */
1280 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1281 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1282 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1283# if HAVE_SCROLLBARS
1284 if (target->scrollBar.win) 1489 if (target->scrollBar.win)
1285 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1490 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1286# endif
1287 } 1491 }
1492
1288 /* 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
1289 scr_touch or we get a great deal of flicker otherwise: */ 1494 scr_touch or we get a great deal of flicker otherwise: */
1290 XClearWindow (target->dpy, target->parent[0]); 1495 XClearWindow (target->dpy, target->parent[0]);
1291 1496
1292# if HAVE_SCROLLBARS 1497 if (target->scrollBar.state && target->scrollBar.win)
1293 if (target->scrollBar.win)
1294 { 1498 {
1295 target->scrollBar.setIdle (); 1499 target->scrollBar.state = STATE_IDLE;
1296 target->scrollbar_show (0); 1500 target->scrollBar.show (0);
1297 } 1501 }
1298# endif
1299 1502
1300 target->want_refresh = 1; 1503 target->want_refresh = 1;
1301 flags |= hasChanged; 1504 flags |= hasChanged;
1302 } 1505 }
1303} 1506}
… …
1308/* taken from aterm-0.4.2 */ 1511/* taken from aterm-0.4.2 */
1309 1512
1310typedef uint32_t RUINT32T; 1513typedef uint32_t RUINT32T;
1311 1514
1312static void 1515static void
1313ShadeXImage(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)
1314{ 1517{
1315 int sh_r, sh_g, sh_b; 1518 int sh_r, sh_g, sh_b;
1316 RUINT32T mask_r, mask_g, mask_b; 1519 RUINT32T mask_r, mask_g, mask_b;
1317 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1520 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1318 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