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.20 by root, Mon Dec 24 06:51:37 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
… …
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# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
34 34
35#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
36 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; \
37 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__, \
38 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)
39 43
40#else 44#else
41#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 47#endif
44 48
45/* 49/*
46 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
48 * 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
49 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
51 * affects on the background image : 55 * effects on the background image :
52 * 56 *
53 * 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%.
54 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 60 * the image in the window.
57 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
62 * 66 *
63 * Adjusting position only : 67 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 71 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 73 * from current position.
70 * 74 *
71 * Adjusting scale only : 75 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
75 * 79 *
76 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 82 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
82 * current background color. 86 * current background color.
83 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
87 */ 91 */
88 92
89#ifdef HAVE_BG_PIXMAP 93#ifdef HAVE_BG_PIXMAP
90bgPixmap_t::bgPixmap_t () 94bgPixmap_t::bgPixmap_t ()
91{ 95{
96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs
92#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
93 original_asim = NULL; 99 original_asim = NULL;
94#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
95#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
96 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
97 h_align = v_align = 0; 107 h_align = v_align = 0;
98#endif 108#endif
99 flags = 0; 109 flags = 0;
100 pixmap = None; 110 pixmap = None;
111 valid_since = invalid_since = 0;
112 target = 0;
101} 113}
102 114
103void 115void
104bgPixmap_t::destroy () 116bgPixmap_t::destroy ()
105{ 117{
106#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
107 if (original_asim) 119 if (original_asim)
108 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
109#endif 121#endif
110 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
111 if (pixmap && target) 128 if (pixmap && target)
112 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
113} 130}
114 131
115bool 132bool
… …
119 if (flags & isTransparent) 136 if (flags & isTransparent)
120 return true; 137 return true;
121# endif 138# endif
122 139
123# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
124# ifdef HAVE_AFTERIMAGE 141 if (have_image)
125 if (original_asim != NULL)
126# endif
127 { 142 {
128 if (h_scale != 0 || v_scale != 0 143 if (h_scale != 0 || v_scale != 0
129 || h_align != 0 || v_align != 0) 144 || h_align != 0 || v_align != 0)
130 return true; 145 return true;
131 } 146 }
132# endif 147# endif
133 148
134 return false; 149 return false;
135} 150}
136 151
137bool 152bool
138bgPixmap_t::window_position_sensitive () 153bgPixmap_t::window_position_sensitive ()
139{ 154{
140# ifdef ENABLE_TRANSPARENCY 155# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 156 if (flags & isTransparent)
142 return true; 157 return true;
143# endif 158# endif
144 159
145# ifdef BG_IMAGE_FROM_FILE 160# ifdef BG_IMAGE_FROM_FILE
146# ifdef HAVE_AFTERIMAGE 161 if (have_image)
147 if (original_asim != NULL)
148# endif
149 { 162 {
150 if (h_align == rootAlign || v_align == rootAlign) 163 if (h_align == rootAlign || v_align == rootAlign)
151 return true; 164 return true;
152 } 165 }
153# endif 166# endif
… …
156}; 169};
157 170
158bool bgPixmap_t::need_client_side_rendering () 171bool bgPixmap_t::need_client_side_rendering ()
159{ 172{
160# ifdef HAVE_AFTERIMAGE 173# ifdef HAVE_AFTERIMAGE
161 if (original_asim != NULL) 174 if (original_asim)
162 return true; 175 return true;
163# endif 176# endif
164# ifdef ENABLE_TRANSPARENCY 177# ifdef ENABLE_TRANSPARENCY
165 if (flags & isTransparent) 178 if (flags & isTransparent)
166 { 179 {
… …
255 int geom_flags = 0, changed = 0; 268 int geom_flags = 0, changed = 0;
256 int x = 0, y = 0; 269 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 270 unsigned int w = 0, h = 0;
258 unsigned int n; 271 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 272 unsigned long new_flags = (flags & (~geometryFlags));
260 char *p; 273 const char *p;
261# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 274# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 275
263 if (geom == NULL) 276 if (geom == NULL)
264 return false; 277 return false;
265 278
266 char str[MAXLEN_GEOM]; 279 char str[MAXLEN_GEOM];
… …
273 if (n < MAXLEN_GEOM) 286 if (n < MAXLEN_GEOM)
274 { 287 {
275 char *ops; 288 char *ops;
276 new_flags |= geometrySet; 289 new_flags |= geometrySet;
277 290
278 strncpy (str, geom, n); 291 memcpy (str, geom, n);
279 str[n] = '\0'; 292 str[n] = '\0';
280 if (str[0] == ':') 293 if (str[0] == ':')
281 ops = &str[0]; 294 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 295 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0]; 296 ops = &str[0];
… …
366 if (ops) 379 if (ops)
367 { 380 {
368 while (*ops) 381 while (*ops)
369 { 382 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 383 while (*ops == ':' || isspace(*ops)) ++ops;
384
371# 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)
372 if (CHECK_GEOM_OPS("tile")) 386 if (CHECK_GEOM_OPS ("tile"))
373 { 387 {
374 w = h = noScale; 388 w = h = noScale;
375 geom_flags |= WidthValue|HeightValue; 389 geom_flags |= WidthValue|HeightValue;
376 } 390 }
377 else if (CHECK_GEOM_OPS("propscale")) 391 else if (CHECK_GEOM_OPS ("propscale"))
378 { 392 {
379 if (w == 0 && h == 0) 393 if (w == 0 && h == 0)
380 { 394 {
381 w = windowScale; 395 w = windowScale;
382 geom_flags |= WidthValue; 396 geom_flags |= WidthValue;
383 } 397 }
384 new_flags |= propScale; 398 new_flags |= propScale;
385 } 399 }
386 else if (CHECK_GEOM_OPS("hscale")) 400 else if (CHECK_GEOM_OPS ("hscale"))
387 { 401 {
388 if (w == 0)
389 w = windowScale; 402 if (w == 0) w = windowScale;
403
390 h = noScale; 404 h = noScale;
391 geom_flags |= WidthValue|HeightValue; 405 geom_flags |= WidthValue|HeightValue;
392 } 406 }
393 else if (CHECK_GEOM_OPS("vscale")) 407 else if (CHECK_GEOM_OPS ("vscale"))
394 { 408 {
395 if (h == 0)
396 h = windowScale; 409 if (h == 0) h = windowScale;
410
397 w = noScale; 411 w = noScale;
398 geom_flags |= WidthValue|HeightValue; 412 geom_flags |= WidthValue|HeightValue;
399 } 413 }
400 else if (CHECK_GEOM_OPS("scale")) 414 else if (CHECK_GEOM_OPS ("scale"))
401 { 415 {
402 if (h == 0)
403 h = windowScale; 416 if (h == 0) h = windowScale;
404 if (w == 0)
405 w = windowScale; 417 if (w == 0) w = windowScale;
418
406 geom_flags |= WidthValue|HeightValue; 419 geom_flags |= WidthValue|HeightValue;
407 } 420 }
408 else if (CHECK_GEOM_OPS("auto")) 421 else if (CHECK_GEOM_OPS ("auto"))
409 { 422 {
410 w = h = windowScale; 423 w = h = windowScale;
411 x = y = centerAlign; 424 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 425 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 426 }
414 else if (CHECK_GEOM_OPS("root")) 427 else if (CHECK_GEOM_OPS ("root"))
415 { 428 {
416 w = h = noScale; 429 w = h = noScale;
417 x = y = rootAlign; 430 x = y = rootAlign;
418 geom_flags |= WidthValue|HeightValue|XValue|YValue; 431 geom_flags |= WidthValue|HeightValue|XValue|YValue;
419 } 432 }
420# undef CHECK_GEOM_OPS 433# undef CHECK_GEOM_OPS
434
421 while (*ops != ':' && *ops != '\0') ++ops; 435 while (*ops != ':' && *ops != '\0') ++ops;
422 } /* done parsing ops */ 436 } /* done parsing ops */
423 } 437 }
424 438
425 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 439 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
426 ++changed;
427 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 440 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
428 ++changed;
429 if (check_set_align_value (geom_flags, XValue, h_align, x)) 441 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
430 ++changed;
431 if (check_set_align_value (geom_flags, YValue, v_align, y)) 442 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
432 ++changed;
433 } 443 }
434 444
435 if (new_flags != flags) 445 if (new_flags != flags)
436 { 446 {
437 flags = new_flags; 447 flags = new_flags;
438 changed++; 448 changed++;
439 } 449 }
450
440//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
441// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
442 return (changed > 0); 453 return (changed > 0);
443} 454}
444 455
445# ifdef HAVE_AFTERIMAGE 456# ifdef HAVE_AFTERIMAGE
446bool 457bool
447bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 458bgPixmap_t::render_image (unsigned long background_flags)
448{ 459{
449 if (target == NULL) 460 if (target == NULL)
450 return false; 461 return false;
451 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
452 int target_width = (int)target->szHint.width; 502 int target_width = target->szHint.width;
453 int target_height = (int)target->szHint.height; 503 int target_height = target->szHint.height;
454 int new_pmap_width = target_width, new_pmap_height = target_height; 504 int new_pmap_width = target_width;
455 ASImage *result = NULL; 505 int new_pmap_height = target_height;
456 506
457 int x = 0; 507 int x = 0;
458 int y = 0; 508 int y = 0;
459 int w = h_scale * target_width / 100; 509 int w = h_scale * target_width / 100;
460 int h = v_scale * target_height / 100; 510 int h = v_scale * target_height / 100;
… …
463 513
464 if (original_asim) 514 if (original_asim)
465 { 515 {
466 if (h_align == rootAlign || v_align == rootAlign) 516 if (h_align == rootAlign || v_align == rootAlign)
467 { 517 {
468 target->get_window_origin(x, y); 518 target->get_window_origin (x, y);
469 x = -x; 519 x = -x;
470 y = -y; 520 y = -y;
471 } 521 }
522
472 if (h_align != rootAlign) 523 if (h_align != rootAlign)
473 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
474 if (v_align != rootAlign) 526 if (v_align != rootAlign)
475 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);
476 } 528 }
477 529
478 if (original_asim == NULL 530 if (!original_asim
479 || x >= target_width 531 || x >= target_width
480 || y >= target_height 532 || y >= target_height
481 || (w > 0 && x + w <= 0) 533 || (w > 0 && x + w <= 0)
482 || (h > 0 && y + h <= 0)) 534 || (h > 0 && y + h <= 0))
483 { 535 {
484 if (background) 536 if (background)
485 { 537 {
486 new_pmap_width = background->width; 538 new_pmap_width = background->width;
487 new_pmap_height = background->height; 539 new_pmap_height = background->height;
488 result = background; 540 result = background;
541
489 if (background_tint != TINT_LEAVE_SAME) 542 if (background_tint != TINT_LEAVE_SAME)
490 { 543 {
491 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 544 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
492 target_width, target_height, background_tint, 545 target_width, target_height, background_tint,
493 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 546 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
494 if (tmp) 547 if (tmp)
495 result = tmp; 548 result = tmp;
496 } 549 }
… …
499 new_pmap_width = new_pmap_height = 0; 552 new_pmap_width = new_pmap_height = 0;
500 } 553 }
501 else 554 else
502 { 555 {
503 result = original_asim; 556 result = original_asim;
557
504 if ((w > 0 && w != original_asim->width) 558 if ((w > 0 && w != original_asim->width)
505 || (h > 0 && h != original_asim->height)) 559 || (h > 0 && h != original_asim->height))
506 { 560 {
507 result = scale_asimage (target->asv, original_asim, 561 result = scale_asimage (target->asv, original_asim,
508 w > 0 ? w : original_asim->width, 562 w > 0 ? w : original_asim->width,
509 h > 0 ? h : original_asim->height, 563 h > 0 ? h : original_asim->height,
510 background ? ASA_ASImage : ASA_XImage, 564 background ? ASA_ASImage : ASA_XImage,
511 100, ASIMAGE_QUALITY_DEFAULT); 565 100, ASIMAGE_QUALITY_DEFAULT);
512 } 566 }
567
513 if (background == NULL) 568 if (background == NULL)
514 { 569 {
515 /* if tiling - pixmap has to be sized exactly as the image, 570 /* if tiling - pixmap has to be sized exactly as the image,
516 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! */
517 if (h_scale == 0) 572 if (h_scale == 0)
518 new_pmap_width = min (result->width, target_width); 573 new_pmap_width = min (result->width, target_width);
519 if (v_scale == 0) 574 if (v_scale == 0)
520 new_pmap_height = min (result->height, target_height); 575 new_pmap_height = min (result->height, target_height);
521 /* 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 */
522 if (h_scale == 0 || v_scale == 0) 577 if (h_scale == 0 || v_scale == 0)
523 { 578 {
524 ASImage *tmp = tile_asimage (target->asv, result, 579 ASImage *tmp = tile_asimage (target->asv, result,
525 (h_scale > 0) ? 0 : (int)result->width - x, 580 (h_scale > 0) ? 0 : (int)result->width - x,
526 (v_scale > 0) ? 0 : (int)result->height - y, 581 (v_scale > 0) ? 0 : (int)result->height - y,
527 new_pmap_width, 582 new_pmap_width,
528 new_pmap_height, 583 new_pmap_height,
529 TINT_LEAVE_SAME, ASA_XImage, 584 TINT_LEAVE_SAME, ASA_XImage,
530 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
531 if (tmp) 586 if (tmp)
532 { 587 {
533 if (result != original_asim) 588 if (result != original_asim)
534 destroy_asimage (&result); 589 destroy_asimage (&result);
590
535 result = tmp; 591 result = tmp;
536 } 592 }
537 } 593 }
538 } 594 }
539 else 595 else
540 { 596 {
541 /* 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 */
542 ASImageLayer *layers = create_image_layers (2); 598 ASImageLayer *layers = create_image_layers (2);
543 ASImage *merged_im = NULL;
544 599
545 layers[0].im = background; 600 layers[0].im = background;
546 layers[0].clip_width = target_width; 601 layers[0].clip_width = target_width;
547 layers[0].clip_height = target_height; 602 layers[0].clip_height = target_height;
548 layers[0].tint = background_tint; 603 layers[0].tint = background_tint;
549 layers[1].im = result; 604 layers[1].im = result;
605
550 if (w <= 0) 606 if (w <= 0)
551 { 607 {
552 /* tile horizontally */ 608 /* tile horizontally */
553 while (x > 0) x -= (int)result->width; 609 while (x > 0) x -= (int)result->width;
554 layers[1].dst_x = x; 610 layers[1].dst_x = x;
… …
558 { 614 {
559 /* clip horizontally */ 615 /* clip horizontally */
560 layers[1].dst_x = x; 616 layers[1].dst_x = x;
561 layers[1].clip_width = result->width; 617 layers[1].clip_width = result->width;
562 } 618 }
619
563 if (h <= 0) 620 if (h <= 0)
564 { 621 {
565 while (y > 0) y -= (int)result->height; 622 while (y > 0) y -= (int)result->height;
566 layers[1].dst_y = y; 623 layers[1].dst_y = y;
567 layers[1].clip_height = result->height + target_height; 624 layers[1].clip_height = result->height + target_height;
… …
569 else 626 else
570 { 627 {
571 layers[1].dst_y = y; 628 layers[1].dst_y = y;
572 layers[1].clip_height = result->height; 629 layers[1].clip_height = result->height;
573 } 630 }
631
574 if (target->rs[Rs_blendtype]) 632 if (target->rs[Rs_blendtype])
575 { 633 {
576 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 634 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
577 if (layers[1].merge_scanlines == NULL) 635 if (layers[1].merge_scanlines == NULL)
578 layers[1].merge_scanlines = alphablend_scanlines; 636 layers[1].merge_scanlines = alphablend_scanlines;
579 } 637 }
638
580 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,
581 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 640 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
641
582 if (tmp) 642 if (tmp)
583 { 643 {
584 if (result != original_asim) 644 if (result != original_asim)
585 destroy_asimage (&result); 645 destroy_asimage (&result);
646
586 result = tmp; 647 result = tmp;
587 } 648 }
649
588 free (layers); 650 free (layers);
589 } 651 }
590 } 652 }
591 TIMING_TEST_PRINT_RESULT (asim); 653 TIMING_TEST_PRINT_RESULT (asim);
592 654
593 if (pixmap) 655 bool ret = false;
594 {
595 if (result == NULL
596 || pmap_width != new_pmap_width
597 || pmap_height != new_pmap_height
598 || pmap_depth != target->depth)
599 {
600 XFreePixmap (target->dpy, pixmap);
601 pixmap = None;
602 }
603 }
604 656
605 if (result) 657 if (result)
606 { 658 {
607 XGCValues gcv; 659 XGCValues gcv;
608 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 }
609 672
610 /* create Pixmap */ 673 /* create Pixmap */
611 if (pixmap == None) 674 if (pixmap == None)
612 { 675 {
613 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);
614 pmap_width = new_pmap_width; 677 pmap_width = new_pmap_width;
615 pmap_height = new_pmap_height; 678 pmap_height = new_pmap_height;
616 pmap_depth = target->depth; 679 pmap_depth = target->depth;
617 } 680 }
618 /* fill with background color ( if result's not completely overlapping it)*/ 681 /* fill with background color (if result's not completely overlapping it) */
619 gcv.foreground = target->pix_colors[Color_bg]; 682 gcv.foreground = target->pix_colors[Color_bg];
620 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 683 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
621 684
622 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;
623 int dst_width = result->width, dst_height = result->height; 686 int dst_width = result->width, dst_height = result->height;
624 if (background == NULL) 687 if (background == NULL)
625 { 688 {
626 if (h_scale > 0)
627 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 );
628 if (v_scale > 0)
629 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);
630 691
631 if (dst_x > 0 || dst_y > 0 692 if (dst_x > 0 || dst_y > 0
632 || dst_x + dst_width < new_pmap_width 693 || dst_x + dst_width < new_pmap_width
633 || dst_y + dst_height < new_pmap_height) 694 || dst_y + dst_height < new_pmap_height)
634 {
635 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);
636 }
637 } 696 }
638 697
639 /* put result on pixmap */ 698 /* put result on pixmap */
640 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 699 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
641 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);
… …
643 if (result != background && result != original_asim) 702 if (result != background && result != original_asim)
644 destroy_asimage (&result); 703 destroy_asimage (&result);
645 704
646 XFreeGC (target->dpy, gc); 705 XFreeGC (target->dpy, gc);
647 TIMING_TEST_PRINT_RESULT (asim); 706 TIMING_TEST_PRINT_RESULT (asim);
648 }
649 707
708 ret = true;
709 }
710
711 if (background)
712 destroy_asimage (&background);
713
650 return true; 714 return ret;
651} 715}
652# 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 */
653 866
654bool 867bool
655bgPixmap_t::set_file (const char *file) 868bgPixmap_t::set_file (const char *file)
656{ 869{
657 char *f;
658
659 assert (file != NULL); 870 assert (file);
660 871
661 if (*file != '\0') 872 if (*file)
662 { 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
663# ifdef HAVE_AFTERIMAGE 883# ifdef HAVE_AFTERIMAGE
664 if (target->asimman == NULL) 884 if (!target->asimman)
665 target->asimman = create_generic_imageman (target->rs[Rs_path]); 885 target->asimman = create_generic_imageman (target->rs[Rs_path]);
666 if ((f = strchr (file, ';')) == NULL)
667 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 886 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
668 else 887 if (original_asim)
669 { 888 have_image = true;
670 size_t len = f - file; 889 return have_image;
671 f = (char *)malloc (len + 1);
672 strncpy (f, file, len);
673 f[len] = '\0';
674 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
675 free (f);
676 }
677 return (original_asim != NULL);
678# 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
679 } 898 }
899
680 return false; 900 return false;
681} 901}
682 902
683# endif /* BG_IMAGE_FROM_FILE */ 903# endif /* BG_IMAGE_FROM_FILE */
684 904
… …
689 if (!(flags & isTransparent)) 909 if (!(flags & isTransparent))
690 { 910 {
691 flags |= isTransparent; 911 flags |= isTransparent;
692 return true; 912 return true;
693 } 913 }
914
694 return false; 915 return false;
695} 916}
696 917
697bool 918bool
698bgPixmap_t::set_blur_radius (const char *geom) 919bgPixmap_t::set_blur_radius (const char *geom)
… …
700 int changed = 0; 921 int changed = 0;
701 unsigned int hr, vr; 922 unsigned int hr, vr;
702 int junk; 923 int junk;
703 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 924 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
704 925
705 if (!(geom_flags&WidthValue)) 926 if (!(geom_flags & WidthValue))
706 hr = 1; 927 hr = 1;
707 if (!(geom_flags&HeightValue)) 928 if (!(geom_flags & HeightValue))
708 vr = hr; 929 vr = hr;
709 930
710 if (h_blurRadius != hr) 931 if (h_blurRadius != hr)
711 { 932 {
712 ++changed; 933 ++changed;
… …
722 if (v_blurRadius == 0 && h_blurRadius == 0) 943 if (v_blurRadius == 0 && h_blurRadius == 0)
723 flags &= ~blurNeeded; 944 flags &= ~blurNeeded;
724 else 945 else
725 flags |= blurNeeded; 946 flags |= blurNeeded;
726 947
727 return (changed>0); 948 return (changed > 0);
728} 949}
729 950
730static inline unsigned long 951static inline unsigned long
731compute_tint_shade_flags (rxvt_color *tint, int shade) 952compute_tint_shade_flags (rxvt_color *tint, int shade)
732{ 953{
… …
749 flags |= bgPixmap_t::tintNeeded; 970 flags |= bgPixmap_t::tintNeeded;
750 else if (tint) 971 else if (tint)
751 { 972 {
752 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 973 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
753 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 974 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
754 { 975 {
755 flags |= bgPixmap_t::tintNeeded; 976 flags |= bgPixmap_t::tintNeeded;
756 } 977 }
757 } 978 }
758 979
759 if (flags & bgPixmap_t::tintNeeded) 980 if (flags & bgPixmap_t::tintNeeded)
760 { 981 {
761 if (flags & bgPixmap_t::tintWholesome) 982 if (flags & bgPixmap_t::tintWholesome)
… …
790{ 1011{
791 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1012 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
792 1013
793 if (new_flags != (flags & tintFlags)) 1014 if (new_flags != (flags & tintFlags))
794 { 1015 {
795 flags = (flags&~tintFlags)|new_flags; 1016 flags = (flags & ~tintFlags) | new_flags;
796 return true; 1017 return true;
797 } 1018 }
798 1019
799 return false; 1020 return false;
800} 1021}
801 1022
… …
831 unsigned long result = 0; 1052 unsigned long result = 0;
832 1053
833 if (target == NULL) 1054 if (target == NULL)
834 return 0; 1055 return 0;
835 1056
836 /* 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
837 * be always up-to-date, so let's use it : 1058 * be always up-to-date, so let's use it :
838 */ 1059 */
839 Window root = target->display->root; 1060 Window root = target->display->root;
840 int screen = target->display->screen; 1061 int screen = target->display->screen;
841 Display *dpy = target->dpy; 1062 Display *dpy = target->dpy;
… …
886 1107
887 attr.background_pixmap = ParentRelative; 1108 attr.background_pixmap = ParentRelative;
888 attr.backing_store = Always; 1109 attr.backing_store = Always;
889 attr.event_mask = ExposureMask; 1110 attr.event_mask = ExposureMask;
890 attr.override_redirect = True; 1111 attr.override_redirect = True;
891 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1112 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
892 CopyFromParent, CopyFromParent, CopyFromParent, 1113 CopyFromParent, CopyFromParent, CopyFromParent,
893 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1114 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
894 &attr); 1115 &attr);
895 1116
896 if (src != None) 1117 if (src != None)
… …
900 XGrabServer (dpy); 1121 XGrabServer (dpy);
901 XMapRaised (dpy, src); 1122 XMapRaised (dpy, src);
902 XSync (dpy, False); 1123 XSync (dpy, False);
903 1124
904 /* XSync should get window where it's properly exposed, 1125 /* XSync should get window where it's properly exposed,
905 * 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 : */
906 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1127 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
907 ++ev_count; 1128 ++ev_count;
908 1129
909 if (ev_count > 0); 1130 if (ev_count > 0);
910 { 1131 {
… …
920 XDestroyWindow (dpy, src); 1141 XDestroyWindow (dpy, src);
921 XUngrabServer (dpy); 1142 XUngrabServer (dpy);
922 //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);
923 } 1144 }
924 1145
925 if (!success) 1146 if (!success)
926 { 1147 {
927 XFreePixmap (dpy, tiled_root_pmap); 1148 XFreePixmap (dpy, tiled_root_pmap);
928 tiled_root_pmap = None; 1149 tiled_root_pmap = None;
929 } 1150 }
930 else 1151 else
931 result |= transpPmapTiled; 1152 result |= transpPmapTiled;
932 } 1153 }
933 else 1154 else
934 { 1155 {
935 /* strightforward pixmap copy */ 1156 /* straightforward pixmap copy */
936 gcv.tile = root_pixmap; 1157 gcv.tile = root_pixmap;
937 gcv.fill_style = FillTiled; 1158 gcv.fill_style = FillTiled;
938 1159
939 while (sx < 0) sx += (int)root_width; 1160 while (sx < 0) sx += (int)root_width;
940 while (sy < 0) sy += (int)root_height; 1161 while (sy < 0) sy += (int)root_height;
… …
1053# if DO_TIMING_TEST 1274# if DO_TIMING_TEST
1054 XSync (dpy, False); 1275 XSync (dpy, False);
1055# endif 1276# endif
1056# endif 1277# endif
1057 } 1278 }
1058 } 1279 }
1059 } /* server side rendering completed */ 1280 } /* server side rendering completed */
1060 1281
1061 if (pixmap) 1282 if (pixmap)
1062 XFreePixmap (dpy, pixmap); 1283 XFreePixmap (dpy, pixmap);
1063 1284
… …
1091 return false; 1312 return false;
1092} 1313}
1093# endif /* ENABLE_TRANSPARENCY */ 1314# endif /* ENABLE_TRANSPARENCY */
1094 1315
1095# ifndef HAVE_AFTERIMAGE 1316# ifndef HAVE_AFTERIMAGE
1096static 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);
1097# endif 1318# endif
1098 1319
1099bool 1320bool
1100bgPixmap_t::render () 1321bgPixmap_t::render ()
1101{ 1322{
… …
1104 if (target == NULL) 1325 if (target == NULL)
1105 return false; 1326 return false;
1106 1327
1107 TIMING_TEST_START (tp); 1328 TIMING_TEST_START (tp);
1108 1329
1109 invalidate(); 1330 invalidate ();
1110# ifdef ENABLE_TRANSPARENCY 1331# ifdef ENABLE_TRANSPARENCY
1111 if (flags & isTransparent) 1332 if (flags & isTransparent)
1112 { 1333 {
1113 /* we need to re-generate transparency pixmap in that case ! */ 1334 /* we need to re-generate transparency pixmap in that case ! */
1114 background_flags = make_transparency_pixmap (); 1335 background_flags = make_transparency_pixmap ();
1115 if (background_flags == 0) 1336 if (background_flags == 0)
1116 return false; 1337 return false;
1117 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1338 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1118 && pmap_depth == target->depth) 1339 && pmap_depth == target->depth)
1119 flags = flags & ~isInvalid; 1340 flags = flags & ~isInvalid;
1120 } 1341 }
1121# endif 1342# endif
1122 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
1123 XImage *result = NULL; 1353 XImage *result = NULL;
1124# ifdef HAVE_AFTERIMAGE 1354
1125 if (original_asim 1355 if (background_flags && (flags & isInvalid))
1126 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1356 {
1357 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1127 { 1358 }
1128 ASImage *background = NULL;
1129 ARGB32 as_tint = TINT_LEAVE_SAME;
1130 if (background_flags)
1131 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1132 1359
1133# 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 !!! */
1134 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1366 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1135 {
1136 ShadingInfo as_shade;
1137 as_shade.shading = (shade == 0) ? 100 : shade;
1138
1139 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1140 if (flags & tintSet)
1141 tint.get (c);
1142 as_shade.tintColor.red = c.r;
1143 as_shade.tintColor.green = c.g;
1144 as_shade.tintColor.blue = c.b;
1145
1146 as_tint = shading2tint32 (&as_shade);
1147 }
1148 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1149 {
1150 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1151 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1152 100, ASIMAGE_QUALITY_DEFAULT);
1153 if (tmp)
1154 {
1155 destroy_asimage (&background);
1156 background = tmp;
1157 }
1158 }
1159# endif
1160
1161 if (render_asim (background, as_tint))
1162 flags = flags & ~isInvalid;
1163 if (background)
1164 destroy_asimage (&background);
1165 }
1166 else if (background_flags && pmap_depth != target->depth)
1167 {
1168 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1169 }
1170
1171# elif !XFT /* our own client-side tinting */
1172
1173 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1174 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1175
1176 if (background_flags && (flags & isInvalid))
1177 {
1178 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1179 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1180 { 1367 {
1181 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1368 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1182 if (flags & tintSet) 1369 if (flags & tintSet)
1183 tint.get (c); 1370 tint.get (c);
1184 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1371 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1185 } 1372 }
1186 } 1373# endif
1187# endif /* HAVE_AFTERIMAGE */
1188 1374
1189 if (result)
1190 {
1191 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1375 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1192 1376
1193 if (gc) 1377 if (gc)
1194 { 1378 {
1195 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1379 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1224 1408
1225 XFreeGC (target->dpy, gc); 1409 XFreeGC (target->dpy, gc);
1226 flags = flags & ~isInvalid; 1410 flags = flags & ~isInvalid;
1227 } 1411 }
1228 1412
1229 XDestroyImage (result); 1413 XDestroyImage (result);
1230 } 1414 }
1231 1415
1232 if (flags & isInvalid) 1416 if (flags & isInvalid)
1233 { 1417 {
1234 if (pixmap != None) 1418 if (pixmap != None)
… …
1237 pixmap = None; 1421 pixmap = None;
1238 } 1422 }
1239 } 1423 }
1240 1424
1241 apply (); 1425 apply ();
1426
1427 XSync (target->dpy, False);
1428 valid_since = ev::now ();
1242 1429
1243 TIMING_TEST_PRINT_RESULT (tp); 1430 TIMING_TEST_PRINT_RESULT (tp);
1244 1431
1245 return true; 1432 return true;
1246} 1433}
… …
1255# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1256 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1443 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1257# endif 1444# endif
1258 return true; 1445 return true;
1259 } 1446 }
1447
1260 return false; 1448 return false;
1261} 1449}
1262 1450
1263void 1451void
1264bgPixmap_t::apply () 1452bgPixmap_t::apply ()
1265{ 1453{
1266 if (target) 1454 if (target)
1267 { 1455 {
1268 flags &= ~isVtOrigin; 1456 flags &= ~isVtOrigin;
1457
1269 if (pixmap != None) 1458 if (pixmap != None)
1270 { 1459 {
1271 /* set target's background to pixmap */ 1460 /* set target's background to pixmap */
1272# ifdef ENABLE_TRANSPARENCY 1461# ifdef ENABLE_TRANSPARENCY
1273 if (flags & isTransparent) 1462 if (flags & isTransparent)
1274 { 1463 {
1275 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1464 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1276 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1465 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1277# if HAVE_SCROLLBARS 1466
1278 if (target->scrollBar.win) 1467 if (target->scrollBar.win)
1279 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1468 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1280# endif
1281 } 1469 }
1282 else 1470 else
1283# endif 1471# endif
1284 { 1472 {
1285 flags |= isVtOrigin; 1473 flags |= isVtOrigin;
1286 /* force old pixmap dereference in case it was transparent before :*/ 1474 /* force old pixmap dereference in case it was transparent before :*/
1287 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1475 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1288 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1289 /* do we also need to set scrollbar's background here ? */ 1477 /* do we also need to set scrollbar's background here ? */
1290# if HAVE_SCROLLBARS 1478
1291 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1292 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1480 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1293# endif
1294 } 1481 }
1295 } 1482 }
1296 else 1483 else
1297 { 1484 {
1298 /* set target background to a pixel */ 1485 /* set target background to a pixel */
1299 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1300 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1301 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1302# if HAVE_SCROLLBARS
1303 if (target->scrollBar.win) 1489 if (target->scrollBar.win)
1304 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1490 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1305# endif
1306 } 1491 }
1492
1307 /* 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
1308 scr_touch or we get a great deal of flicker otherwise: */ 1494 scr_touch or we get a great deal of flicker otherwise: */
1309 XClearWindow (target->dpy, target->parent[0]); 1495 XClearWindow (target->dpy, target->parent[0]);
1310 1496
1311# if HAVE_SCROLLBARS 1497 if (target->scrollBar.state && target->scrollBar.win)
1312 if (target->scrollBar.win)
1313 { 1498 {
1314 target->scrollBar.setIdle (); 1499 target->scrollBar.state = STATE_IDLE;
1315 target->scrollbar_show (0); 1500 target->scrollBar.show (0);
1316 } 1501 }
1317# endif
1318 1502
1319 target->want_refresh = 1; 1503 target->want_refresh = 1;
1320 flags |= hasChanged; 1504 flags |= hasChanged;
1321 } 1505 }
1322} 1506}
… …
1327/* taken from aterm-0.4.2 */ 1511/* taken from aterm-0.4.2 */
1328 1512
1329typedef uint32_t RUINT32T; 1513typedef uint32_t RUINT32T;
1330 1514
1331static void 1515static void
1332ShadeXImage(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)
1333{ 1517{
1334 int sh_r, sh_g, sh_b; 1518 int sh_r, sh_g, sh_b;
1335 RUINT32T mask_r, mask_g, mask_b; 1519 RUINT32T mask_r, mask_g, mask_b;
1336 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1520 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1337 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