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.17 by ayin, Wed Dec 5 08:46:27 2007 UTC vs.
Revision 1.56 by sf-exg, Thu Sep 2 23:40:56 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 {
… …
214 228
215static inline int 229static inline int
216make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
217{ 231{
218 int diff = window_size - image_size; 232 int diff = window_size - image_size;
219 int smaller = MIN (image_size,window_size); 233 int smaller = min (image_size, window_size);
220 234
221 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 50)
222 return diff * align / 100; 236 return diff * align / 100;
223 else if (align > 50 && align <= 100) 237 else if (align > 50 && align <= 100)
224 return window_size - image_size - diff * (100 - align) / 100; 238 return window_size - image_size - diff * (100 - align) / 100;
… …
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];
… …
365 if (ops) 379 if (ops)
366 { 380 {
367 while (*ops) 381 while (*ops)
368 { 382 {
369 while (*ops == ':' || isspace(*ops)) ++ops; 383 while (*ops == ':' || isspace(*ops)) ++ops;
384
370# 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)
371 if (CHECK_GEOM_OPS("tile")) 386 if (CHECK_GEOM_OPS ("tile"))
372 { 387 {
373 w = h = noScale; 388 w = h = noScale;
374 geom_flags |= WidthValue|HeightValue; 389 geom_flags |= WidthValue|HeightValue;
375 } 390 }
376 else if (CHECK_GEOM_OPS("propscale")) 391 else if (CHECK_GEOM_OPS ("propscale"))
377 { 392 {
378 if (w == 0 && h == 0) 393 if (w == 0 && h == 0)
379 { 394 {
380 w = windowScale; 395 w = windowScale;
381 geom_flags |= WidthValue; 396 geom_flags |= WidthValue;
382 } 397 }
383 new_flags |= propScale; 398 new_flags |= propScale;
384 } 399 }
385 else if (CHECK_GEOM_OPS("hscale")) 400 else if (CHECK_GEOM_OPS ("hscale"))
386 { 401 {
387 if (w == 0)
388 w = windowScale; 402 if (w == 0) w = windowScale;
403
389 h = noScale; 404 h = noScale;
390 geom_flags |= WidthValue|HeightValue; 405 geom_flags |= WidthValue|HeightValue;
391 } 406 }
392 else if (CHECK_GEOM_OPS("vscale")) 407 else if (CHECK_GEOM_OPS ("vscale"))
393 { 408 {
394 if (h == 0)
395 h = windowScale; 409 if (h == 0) h = windowScale;
410
396 w = noScale; 411 w = noScale;
397 geom_flags |= WidthValue|HeightValue; 412 geom_flags |= WidthValue|HeightValue;
398 } 413 }
399 else if (CHECK_GEOM_OPS("scale")) 414 else if (CHECK_GEOM_OPS ("scale"))
400 { 415 {
401 if (h == 0)
402 h = windowScale; 416 if (h == 0) h = windowScale;
403 if (w == 0)
404 w = windowScale; 417 if (w == 0) w = windowScale;
418
405 geom_flags |= WidthValue|HeightValue; 419 geom_flags |= WidthValue|HeightValue;
406 } 420 }
407 else if (CHECK_GEOM_OPS("auto")) 421 else if (CHECK_GEOM_OPS ("auto"))
408 { 422 {
409 w = h = windowScale; 423 w = h = windowScale;
410 x = y = centerAlign; 424 x = y = centerAlign;
411 geom_flags |= WidthValue|HeightValue|XValue|YValue; 425 geom_flags |= WidthValue|HeightValue|XValue|YValue;
412 } 426 }
413 else if (CHECK_GEOM_OPS("root")) 427 else if (CHECK_GEOM_OPS ("root"))
414 { 428 {
415 w = h = noScale; 429 w = h = noScale;
416 x = y = rootAlign; 430 x = y = rootAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 431 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 432 }
419# undef CHECK_GEOM_OPS 433# undef CHECK_GEOM_OPS
434
420 while (*ops != ':' && *ops != '\0') ++ops; 435 while (*ops != ':' && *ops != '\0') ++ops;
421 } /* done parsing ops */ 436 } /* done parsing ops */
422 } 437 }
423 438
424 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 439 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
425 ++changed;
426 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 440 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
427 ++changed;
428 if (check_set_align_value (geom_flags, XValue, h_align, x)) 441 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
429 ++changed;
430 if (check_set_align_value (geom_flags, YValue, v_align, y)) 442 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
431 ++changed;
432 } 443 }
433 444
434 if (new_flags != flags) 445 if (new_flags != flags)
435 { 446 {
436 flags = new_flags; 447 flags = new_flags;
437 changed++; 448 changed++;
438 } 449 }
450
439//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 453 return (changed > 0);
442} 454}
443 455
444# ifdef HAVE_AFTERIMAGE 456# ifdef HAVE_AFTERIMAGE
445bool 457bool
446bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 458bgPixmap_t::render_image (unsigned long background_flags)
447{ 459{
448 if (target == NULL) 460 if (target == NULL)
449 return false; 461 return false;
450 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
451 int target_width = (int)target->szHint.width; 502 int target_width = target->szHint.width;
452 int target_height = (int)target->szHint.height; 503 int target_height = target->szHint.height;
453 int new_pmap_width = target_width, new_pmap_height = target_height; 504 int new_pmap_width = target_width;
454 ASImage *result = NULL; 505 int new_pmap_height = target_height;
455 506
456 int x = 0; 507 int x = 0;
457 int y = 0; 508 int y = 0;
458 int w = h_scale * target_width / 100; 509 int w = h_scale * target_width / 100;
459 int h = v_scale * target_height / 100; 510 int h = v_scale * target_height / 100;
… …
462 513
463 if (original_asim) 514 if (original_asim)
464 { 515 {
465 if (h_align == rootAlign || v_align == rootAlign) 516 if (h_align == rootAlign || v_align == rootAlign)
466 { 517 {
467 target->get_window_origin(x, y); 518 target->get_window_origin (x, y);
468 x = -x; 519 x = -x;
469 y = -y; 520 y = -y;
470 } 521 }
522
471 if (h_align != rootAlign) 523 if (h_align != rootAlign)
472 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
473 if (v_align != rootAlign) 526 if (v_align != rootAlign)
474 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);
475 } 528 }
476 529
477 if (original_asim == NULL 530 if (!original_asim
478 || x >= target_width 531 || x >= target_width
479 || y >= target_height 532 || y >= target_height
480 || (w > 0 && x + w <= 0) 533 || (w > 0 && x + w <= 0)
481 || (h > 0 && y + h <= 0)) 534 || (h > 0 && y + h <= 0))
482 { 535 {
483 if (background) 536 if (background)
484 { 537 {
485 new_pmap_width = background->width; 538 new_pmap_width = background->width;
486 new_pmap_height = background->height; 539 new_pmap_height = background->height;
487 result = background; 540 result = background;
541
488 if (background_tint != TINT_LEAVE_SAME) 542 if (background_tint != TINT_LEAVE_SAME)
489 { 543 {
490 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 544 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
491 target_width, target_height, background_tint, 545 target_width, target_height, background_tint,
492 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 546 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
493 if (tmp) 547 if (tmp)
494 result = tmp; 548 result = tmp;
495 } 549 }
… …
498 new_pmap_width = new_pmap_height = 0; 552 new_pmap_width = new_pmap_height = 0;
499 } 553 }
500 else 554 else
501 { 555 {
502 result = original_asim; 556 result = original_asim;
557
503 if ((w > 0 && w != original_asim->width) 558 if ((w > 0 && w != original_asim->width)
504 || (h > 0 && h != original_asim->height)) 559 || (h > 0 && h != original_asim->height))
505 { 560 {
506 result = scale_asimage (target->asv, original_asim, 561 result = scale_asimage (target->asv, original_asim,
507 w > 0 ? w : original_asim->width, 562 w > 0 ? w : original_asim->width,
508 h > 0 ? h : original_asim->height, 563 h > 0 ? h : original_asim->height,
509 background ? ASA_ASImage : ASA_XImage, 564 background ? ASA_ASImage : ASA_XImage,
510 100, ASIMAGE_QUALITY_DEFAULT); 565 100, ASIMAGE_QUALITY_DEFAULT);
511 } 566 }
567
512 if (background == NULL) 568 if (background == NULL)
513 { 569 {
514 /* if tiling - pixmap has to be sized exactly as the image, 570 /* if tiling - pixmap has to be sized exactly as the image,
515 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! */
516 if (h_scale == 0) 572 if (h_scale == 0)
517 new_pmap_width = min (result->width, target_width); 573 new_pmap_width = min (result->width, target_width);
518 if (v_scale == 0) 574 if (v_scale == 0)
519 new_pmap_height = min (result->height, target_height); 575 new_pmap_height = min (result->height, target_height);
520 /* 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 */
521 if (h_scale == 0 || v_scale == 0) 577 if (h_scale == 0 || v_scale == 0)
522 { 578 {
523 ASImage *tmp = tile_asimage (target->asv, result, 579 ASImage *tmp = tile_asimage (target->asv, result,
524 (h_scale > 0) ? 0 : (int)result->width - x, 580 (h_scale > 0) ? 0 : (int)result->width - x,
525 (v_scale > 0) ? 0 : (int)result->height - y, 581 (v_scale > 0) ? 0 : (int)result->height - y,
526 new_pmap_width, 582 new_pmap_width,
527 new_pmap_height, 583 new_pmap_height,
528 TINT_LEAVE_SAME, ASA_XImage, 584 TINT_LEAVE_SAME, ASA_XImage,
529 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
530 if (tmp) 586 if (tmp)
531 { 587 {
532 if (result != original_asim) 588 if (result != original_asim)
533 destroy_asimage (&result); 589 destroy_asimage (&result);
590
534 result = tmp; 591 result = tmp;
535 } 592 }
536 } 593 }
537 } 594 }
538 else 595 else
539 { 596 {
540 /* 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 */
541 ASImageLayer *layers = create_image_layers (2); 598 ASImageLayer *layers = create_image_layers (2);
542 ASImage *merged_im = NULL;
543 599
544 layers[0].im = background; 600 layers[0].im = background;
545 layers[0].clip_width = target_width; 601 layers[0].clip_width = target_width;
546 layers[0].clip_height = target_height; 602 layers[0].clip_height = target_height;
547 layers[0].tint = background_tint; 603 layers[0].tint = background_tint;
548 layers[1].im = result; 604 layers[1].im = result;
605
549 if (w <= 0) 606 if (w <= 0)
550 { 607 {
551 /* tile horizontally */ 608 /* tile horizontally */
552 while (x > 0) x -= (int)result->width; 609 while (x > 0) x -= (int)result->width;
553 layers[1].dst_x = x; 610 layers[1].dst_x = x;
… …
557 { 614 {
558 /* clip horizontally */ 615 /* clip horizontally */
559 layers[1].dst_x = x; 616 layers[1].dst_x = x;
560 layers[1].clip_width = result->width; 617 layers[1].clip_width = result->width;
561 } 618 }
619
562 if (h <= 0) 620 if (h <= 0)
563 { 621 {
564 while (y > 0) y -= (int)result->height; 622 while (y > 0) y -= (int)result->height;
565 layers[1].dst_y = y; 623 layers[1].dst_y = y;
566 layers[1].clip_height = result->height + target_height; 624 layers[1].clip_height = result->height + target_height;
… …
568 else 626 else
569 { 627 {
570 layers[1].dst_y = y; 628 layers[1].dst_y = y;
571 layers[1].clip_height = result->height; 629 layers[1].clip_height = result->height;
572 } 630 }
631
573 if (target->rs[Rs_blendtype]) 632 if (target->rs[Rs_blendtype])
574 { 633 {
575 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 634 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
576 if (layers[1].merge_scanlines == NULL) 635 if (layers[1].merge_scanlines == NULL)
577 layers[1].merge_scanlines = alphablend_scanlines; 636 layers[1].merge_scanlines = alphablend_scanlines;
578 } 637 }
638
579 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,
580 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 640 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
641
581 if (tmp) 642 if (tmp)
582 { 643 {
583 if (result != original_asim) 644 if (result != original_asim)
584 destroy_asimage (&result); 645 destroy_asimage (&result);
646
585 result = tmp; 647 result = tmp;
586 } 648 }
649
587 free (layers); 650 free (layers);
588 } 651 }
589 } 652 }
590 TIMING_TEST_PRINT_RESULT (asim); 653 TIMING_TEST_PRINT_RESULT (asim);
591 654
592 if (pixmap) 655 bool ret = false;
593 {
594 if (result == NULL
595 || pmap_width != new_pmap_width
596 || pmap_height != new_pmap_height
597 || pmap_depth != target->depth)
598 {
599 XFreePixmap (target->dpy, pixmap);
600 pixmap = None;
601 }
602 }
603 656
604 if (result) 657 if (result)
605 { 658 {
606 XGCValues gcv; 659 XGCValues gcv;
607 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 }
608 672
609 /* create Pixmap */ 673 /* create Pixmap */
610 if (pixmap == None) 674 if (pixmap == None)
611 { 675 {
612 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);
613 pmap_width = new_pmap_width; 677 pmap_width = new_pmap_width;
614 pmap_height = new_pmap_height; 678 pmap_height = new_pmap_height;
615 pmap_depth = target->depth; 679 pmap_depth = target->depth;
616 } 680 }
617 /* fill with background color ( if result's not completely overlapping it)*/ 681 /* fill with background color (if result's not completely overlapping it) */
618 gcv.foreground = target->pix_colors[Color_bg]; 682 gcv.foreground = target->pix_colors[Color_bg];
619 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 683 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
620 684
621 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;
622 int dst_width = result->width, dst_height = result->height; 686 int dst_width = result->width, dst_height = result->height;
623 if (background == NULL) 687 if (background == NULL)
624 { 688 {
625 if (h_scale > 0)
626 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 );
627 if (v_scale > 0)
628 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);
629 691
630 if (dst_x > 0 || dst_y > 0 692 if (dst_x > 0 || dst_y > 0
631 || dst_x + dst_width < new_pmap_width 693 || dst_x + dst_width < new_pmap_width
632 || dst_y + dst_height < new_pmap_height) 694 || dst_y + dst_height < new_pmap_height)
633 {
634 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);
635 }
636 } 696 }
637 697
638 /* put result on pixmap */ 698 /* put result on pixmap */
639 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 699 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
640 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);
… …
642 if (result != background && result != original_asim) 702 if (result != background && result != original_asim)
643 destroy_asimage (&result); 703 destroy_asimage (&result);
644 704
645 XFreeGC (target->dpy, gc); 705 XFreeGC (target->dpy, gc);
646 TIMING_TEST_PRINT_RESULT (asim); 706 TIMING_TEST_PRINT_RESULT (asim);
647 }
648 707
708 ret = true;
709 }
710
711 if (background)
712 destroy_asimage (&background);
713
649 return true; 714 return ret;
650} 715}
651# 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 */
652 866
653bool 867bool
654bgPixmap_t::set_file (const char *file) 868bgPixmap_t::set_file (const char *file)
655{ 869{
656 char *f;
657
658 assert (file != NULL); 870 assert (file);
659 871
660 if (*file != '\0') 872 if (*file)
661 { 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
662# ifdef HAVE_AFTERIMAGE 883# ifdef HAVE_AFTERIMAGE
663 if (target->asimman == NULL) 884 if (!target->asimman)
664 target->asimman = create_generic_imageman (target->rs[Rs_path]); 885 target->asimman = create_generic_imageman (target->rs[Rs_path]);
665 if ((f = strchr (file, ';')) == NULL)
666 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 886 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
667 else 887 if (original_asim)
668 { 888 have_image = true;
669 size_t len = f - file; 889 return have_image;
670 f = (char *)malloc (len + 1);
671 strncpy (f, file, len);
672 f[len] = '\0';
673 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
674 free (f);
675 }
676 return (original_asim != NULL);
677# 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
678 } 898 }
899
679 return false; 900 return false;
680} 901}
681 902
682# endif /* BG_IMAGE_FROM_FILE */ 903# endif /* BG_IMAGE_FROM_FILE */
683 904
… …
688 if (!(flags & isTransparent)) 909 if (!(flags & isTransparent))
689 { 910 {
690 flags |= isTransparent; 911 flags |= isTransparent;
691 return true; 912 return true;
692 } 913 }
914
693 return false; 915 return false;
694} 916}
695 917
696bool 918bool
697bgPixmap_t::set_blur_radius (const char *geom) 919bgPixmap_t::set_blur_radius (const char *geom)
… …
699 int changed = 0; 921 int changed = 0;
700 unsigned int hr, vr; 922 unsigned int hr, vr;
701 int junk; 923 int junk;
702 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 924 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
703 925
704 if (!(geom_flags&WidthValue)) 926 if (!(geom_flags & WidthValue))
705 hr = 1; 927 hr = 1;
706 if (!(geom_flags&HeightValue)) 928 if (!(geom_flags & HeightValue))
707 vr = hr; 929 vr = hr;
708 930
709 if (h_blurRadius != hr) 931 if (h_blurRadius != hr)
710 { 932 {
711 ++changed; 933 ++changed;
… …
721 if (v_blurRadius == 0 && h_blurRadius == 0) 943 if (v_blurRadius == 0 && h_blurRadius == 0)
722 flags &= ~blurNeeded; 944 flags &= ~blurNeeded;
723 else 945 else
724 flags |= blurNeeded; 946 flags |= blurNeeded;
725 947
726 return (changed>0); 948 return (changed > 0);
727} 949}
728 950
729static inline unsigned long 951static inline unsigned long
730compute_tint_shade_flags (rxvt_color *tint, int shade) 952compute_tint_shade_flags (rxvt_color *tint, int shade)
731{ 953{
… …
748 flags |= bgPixmap_t::tintNeeded; 970 flags |= bgPixmap_t::tintNeeded;
749 else if (tint) 971 else if (tint)
750 { 972 {
751 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 973 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
752 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 974 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
753 { 975 {
754 flags |= bgPixmap_t::tintNeeded; 976 flags |= bgPixmap_t::tintNeeded;
755 } 977 }
756 } 978 }
757 979
758 if (flags & bgPixmap_t::tintNeeded) 980 if (flags & bgPixmap_t::tintNeeded)
759 { 981 {
760 if (flags & bgPixmap_t::tintWholesome) 982 if (flags & bgPixmap_t::tintWholesome)
… …
778 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1000 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
779 tint = new_tint; 1001 tint = new_tint;
780 flags = (flags & ~tintFlags) | new_flags | tintSet; 1002 flags = (flags & ~tintFlags) | new_flags | tintSet;
781 return true; 1003 return true;
782 } 1004 }
1005
783 return false; 1006 return false;
784} 1007}
785 1008
786bool 1009bool
787bgPixmap_t::unset_tint () 1010bgPixmap_t::unset_tint ()
788{ 1011{
789 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1012 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
790 1013
791 if (new_flags != (flags & tintFlags)) 1014 if (new_flags != (flags & tintFlags))
792 { 1015 {
793 flags = (flags&~tintFlags)|new_flags; 1016 flags = (flags & ~tintFlags) | new_flags;
794 return true; 1017 return true;
795 } 1018 }
1019
796 return false; 1020 return false;
797} 1021}
798 1022
799bool 1023bool
800bgPixmap_t::set_shade (const char *shade_str) 1024bgPixmap_t::set_shade (const char *shade_str)
801{ 1025{
802 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1026 int new_shade = (shade_str) ? atoi (shade_str) : 0;
803 1027
804 if (new_shade < 0 && new_shade > -100) 1028 if (new_shade < 0 && new_shade > -100)
805 new_shade = 200 - (100 + new_shade); 1029 new_shade = 200 - (100 + new_shade);
806 else if (new_shade == 100) 1030 else if (new_shade == 100)
807 new_shade = 0; 1031 new_shade = 0;
808 1032
809 if (new_shade != shade) 1033 if (new_shade != shade)
810 { 1034 {
811 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);
812 shade = new_shade; 1036 shade = new_shade;
813 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1037 flags = (flags & (~tintFlags | tintSet)) | new_flags;
814 return true; 1038 return true;
815 } 1039 }
1040
816 return false; 1041 return false;
817} 1042}
818 1043
819/* make_transparency_pixmap() 1044/* make_transparency_pixmap()
820 * 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
… …
827 unsigned long result = 0; 1052 unsigned long result = 0;
828 1053
829 if (target == NULL) 1054 if (target == NULL)
830 return 0; 1055 return 0;
831 1056
832 /* 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
833 * be always up-to-date, so let's use it : 1058 * be always up-to-date, so let's use it :
834 */ 1059 */
835 Window root = target->display->root; 1060 Window root = target->display->root;
836 int screen = target->display->screen; 1061 int screen = target->display->screen;
837 Display *dpy = target->dpy; 1062 Display *dpy = target->dpy;
… …
882 1107
883 attr.background_pixmap = ParentRelative; 1108 attr.background_pixmap = ParentRelative;
884 attr.backing_store = Always; 1109 attr.backing_store = Always;
885 attr.event_mask = ExposureMask; 1110 attr.event_mask = ExposureMask;
886 attr.override_redirect = True; 1111 attr.override_redirect = True;
887 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1112 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
888 CopyFromParent, CopyFromParent, CopyFromParent, 1113 CopyFromParent, CopyFromParent, CopyFromParent,
889 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1114 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
890 &attr); 1115 &attr);
891 1116
892 if (src != None) 1117 if (src != None)
… …
896 XGrabServer (dpy); 1121 XGrabServer (dpy);
897 XMapRaised (dpy, src); 1122 XMapRaised (dpy, src);
898 XSync (dpy, False); 1123 XSync (dpy, False);
899 1124
900 /* XSync should get window where it's properly exposed, 1125 /* XSync should get window where it's properly exposed,
901 * 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 : */
902 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1127 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
903 ++ev_count; 1128 ++ev_count;
904 1129
905 if (ev_count > 0); 1130 if (ev_count > 0);
906 { 1131 {
… …
910 { 1135 {
911 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);
912 success = true; 1137 success = true;
913 } 1138 }
914 } 1139 }
1140
915 XDestroyWindow (dpy, src); 1141 XDestroyWindow (dpy, src);
916 XUngrabServer (dpy); 1142 XUngrabServer (dpy);
917 //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);
918 } 1144 }
919 1145
920 if (!success) 1146 if (!success)
921 { 1147 {
922 XFreePixmap (dpy, tiled_root_pmap); 1148 XFreePixmap (dpy, tiled_root_pmap);
923 tiled_root_pmap = None; 1149 tiled_root_pmap = None;
924 } 1150 }
925 else 1151 else
926 result |= transpPmapTiled; 1152 result |= transpPmapTiled;
927 } 1153 }
928 else 1154 else
929 { 1155 {
930 /* strightforward pixmap copy */ 1156 /* straightforward pixmap copy */
931 gcv.tile = root_pixmap; 1157 gcv.tile = root_pixmap;
932 gcv.fill_style = FillTiled; 1158 gcv.fill_style = FillTiled;
933 1159
934 while (sx < 0) sx += (int)root_width; 1160 while (sx < 0) sx += (int)root_width;
935 while (sy < 0) sy += (int)root_height; 1161 while (sy < 0) sy += (int)root_height;
… …
983 { 1209 {
984 c.r = (c.r * shade) / 100; 1210 c.r = (c.r * shade) / 100;
985 c.g = (c.g * shade) / 100; 1211 c.g = (c.g * shade) / 100;
986 c.b = (c.b * shade) / 100; 1212 c.b = (c.b * shade) / 100;
987 } 1213 }
988 else if( shade > 100 && shade < 200) 1214 else if (shade > 100 && shade < 200)
989 { 1215 {
990 c.r = (c.r * (200 - shade)) / 100; 1216 c.r = (c.r * (200 - shade)) / 100;
991 c.g = (c.g * (200 - shade)) / 100; 1217 c.g = (c.g * (200 - shade)) / 100;
992 c.b = (c.b * (200 - shade)) / 100; 1218 c.b = (c.b * (200 - shade)) / 100;
993 } 1219 }
… …
1039 mask_c.blue = 0xffff - c.b; 1265 mask_c.blue = 0xffff - c.b;
1040 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1266 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1041 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);
1042 result |= transpPmapTinted; 1268 result |= transpPmapTinted;
1043 } 1269 }
1270
1044 XRenderFreePicture (dpy, mask_pic); 1271 XRenderFreePicture (dpy, mask_pic);
1045 XRenderFreePicture (dpy, overlay_pic); 1272 XRenderFreePicture (dpy, overlay_pic);
1046 XRenderFreePicture (dpy, back_pic); 1273 XRenderFreePicture (dpy, back_pic);
1047# if DO_TIMING_TEST 1274# if DO_TIMING_TEST
1048 XSync (dpy, False); 1275 XSync (dpy, False);
1049# endif 1276# endif
1050# endif 1277# endif
1051 } 1278 }
1052 } 1279 }
1053 } /* server side rendering completed */ 1280 } /* server side rendering completed */
1054 1281
1055 if (pixmap) 1282 if (pixmap)
1056 XFreePixmap (dpy, pixmap); 1283 XFreePixmap (dpy, pixmap);
1057 1284
… …
1070} 1297}
1071 1298
1072bool 1299bool
1073bgPixmap_t::set_root_pixmap () 1300bgPixmap_t::set_root_pixmap ()
1074{ 1301{
1075 Pixmap new_root_pixmap = None;
1076
1077 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1302 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1078 if (new_root_pixmap == None) 1303 if (new_root_pixmap == None)
1079 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1304 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1080 1305
1081 if (new_root_pixmap != root_pixmap) 1306 if (new_root_pixmap != root_pixmap)
1082 { 1307 {
1083 root_pixmap = new_root_pixmap; 1308 root_pixmap = new_root_pixmap;
1084 return true; 1309 return true;
1085 } 1310 }
1311
1086 return false; 1312 return false;
1087} 1313}
1088# endif /* ENABLE_TRANSPARENCY */ 1314# endif /* ENABLE_TRANSPARENCY */
1089 1315
1090# ifndef HAVE_AFTERIMAGE 1316# ifndef HAVE_AFTERIMAGE
1091static 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);
1092# endif 1318# endif
1093
1094 1319
1095bool 1320bool
1096bgPixmap_t::render () 1321bgPixmap_t::render ()
1097{ 1322{
1098 unsigned long background_flags = 0; 1323 unsigned long background_flags = 0;
… …
1100 if (target == NULL) 1325 if (target == NULL)
1101 return false; 1326 return false;
1102 1327
1103 TIMING_TEST_START (tp); 1328 TIMING_TEST_START (tp);
1104 1329
1105 invalidate(); 1330 invalidate ();
1106# ifdef ENABLE_TRANSPARENCY 1331# ifdef ENABLE_TRANSPARENCY
1107 if (flags & isTransparent) 1332 if (flags & isTransparent)
1108 { 1333 {
1109 /* we need to re-generate transparency pixmap in that case ! */ 1334 /* we need to re-generate transparency pixmap in that case ! */
1110 background_flags = make_transparency_pixmap (); 1335 background_flags = make_transparency_pixmap ();
1111 if (background_flags == 0) 1336 if (background_flags == 0)
1112 return false; 1337 return false;
1113 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1338 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1114 && pmap_depth == target->depth) 1339 && pmap_depth == target->depth)
1115 flags = flags & ~isInvalid; 1340 flags = flags & ~isInvalid;
1116 } 1341 }
1117# endif 1342# endif
1118 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
1119 XImage *result = NULL; 1353 XImage *result = NULL;
1120# ifdef HAVE_AFTERIMAGE 1354
1121 if (original_asim 1355 if (background_flags && (flags & isInvalid))
1122 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1356 {
1357 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1123 { 1358 }
1124 ASImage *background = NULL;
1125 ARGB32 as_tint = TINT_LEAVE_SAME;
1126 if (background_flags)
1127 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1128 1359
1129# 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 !!! */
1130 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1366 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1131 {
1132 ShadingInfo as_shade;
1133 as_shade.shading = (shade == 0) ? 100 : shade;
1134
1135 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1136 if (flags & tintSet)
1137 tint.get (c);
1138 as_shade.tintColor.red = c.r;
1139 as_shade.tintColor.green = c.g;
1140 as_shade.tintColor.blue = c.b;
1141
1142 as_tint = shading2tint32 (&as_shade);
1143 }
1144 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1145 {
1146 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1147 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1148 100, ASIMAGE_QUALITY_DEFAULT);
1149 if (tmp)
1150 {
1151 destroy_asimage (&background);
1152 background = tmp;
1153 }
1154 }
1155# endif
1156
1157 if (render_asim (background, as_tint))
1158 flags = flags & ~isInvalid;
1159 if (background)
1160 destroy_asimage (&background);
1161 }
1162 else if (background_flags && pmap_depth != target->depth)
1163 {
1164 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1165 }
1166
1167# elif !XFT /* our own client-side tinting */
1168
1169 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1170 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1171
1172 if (background_flags && (flags & isInvalid))
1173 {
1174 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1175 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1176 { 1367 {
1177 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1368 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1178 if (flags & tintSet) 1369 if (flags & tintSet)
1179 tint.get (c); 1370 tint.get (c);
1180 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1371 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1181 } 1372 }
1182 } 1373# endif
1183# endif /* HAVE_AFTERIMAGE */
1184 1374
1185 if (result != NULL)
1186 {
1187 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1375 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1376
1188 if (gc) 1377 if (gc)
1189 { 1378 {
1190 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1379 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1191 { 1380 {
1192 XFreePixmap (target->dpy, pixmap); 1381 XFreePixmap (target->dpy, pixmap);
1193 pixmap = None; 1382 pixmap = None;
1194 } 1383 }
1384
1195 if (pixmap == None) 1385 if (pixmap == None)
1196 { 1386 {
1197 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);
1198 pmap_width = result->width; 1388 pmap_width = result->width;
1199 pmap_height = result->height; 1389 pmap_height = result->height;
1200 pmap_depth = target->depth; 1390 pmap_depth = target->depth;
1201 } 1391 }
1392
1202 if (pmap_depth != result->depth) 1393 if (pmap_depth != result->depth)
1203 { 1394 {
1204 /* Bad Match error will ensue ! stupid X !!!! */ 1395 /* Bad Match error will ensue ! stupid X !!!! */
1205 if( result->depth == 24 && pmap_depth == 32) 1396 if (result->depth == 24 && pmap_depth == 32)
1206 result->depth = 32; 1397 result->depth = 32;
1207 else if( result->depth == 32 && pmap_depth == 24) 1398 else if (result->depth == 32 && pmap_depth == 24)
1208 result->depth = 24; 1399 result->depth = 24;
1209 else 1400 else
1210 { 1401 {
1211 /* TODO: implement image recoding */ 1402 /* TODO: implement image recoding */
1212 } 1403 }
1213 } 1404 }
1405
1214 if (pmap_depth == result->depth) 1406 if (pmap_depth == result->depth)
1215 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
1216 XFreeGC (target->dpy, gc); 1409 XFreeGC (target->dpy, gc);
1217 flags = flags & ~isInvalid; 1410 flags = flags & ~isInvalid;
1218 } 1411 }
1412
1219 XDestroyImage (result); 1413 XDestroyImage (result);
1220 } 1414 }
1221 1415
1222 if (flags & isInvalid) 1416 if (flags & isInvalid)
1223 { 1417 {
1224 if (pixmap != None) 1418 if (pixmap != None)
… …
1227 pixmap = None; 1421 pixmap = None;
1228 } 1422 }
1229 } 1423 }
1230 1424
1231 apply (); 1425 apply ();
1426
1427 XSync (target->dpy, False);
1428 valid_since = ev::now ();
1232 1429
1233 TIMING_TEST_PRINT_RESULT (tp); 1430 TIMING_TEST_PRINT_RESULT (tp);
1234 1431
1235 return true; 1432 return true;
1236} 1433}
… …
1245# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1246 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1443 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1247# endif 1444# endif
1248 return true; 1445 return true;
1249 } 1446 }
1447
1250 return false; 1448 return false;
1251} 1449}
1252 1450
1253void 1451void
1254bgPixmap_t::apply() 1452bgPixmap_t::apply ()
1255{ 1453{
1256 if (target) 1454 if (target)
1257 { 1455 {
1258 flags &= ~isVtOrigin; 1456 flags &= ~isVtOrigin;
1457
1259 if (pixmap != None) 1458 if (pixmap != None)
1260 { 1459 {
1261 /* set target's background to pixmap */ 1460 /* set target's background to pixmap */
1262# ifdef ENABLE_TRANSPARENCY 1461# ifdef ENABLE_TRANSPARENCY
1263 if (flags & isTransparent) 1462 if (flags & isTransparent)
1264 { 1463 {
1265 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1464 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1266 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1465 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1267# if HAVE_SCROLLBARS 1466
1268 if (target->scrollBar.win) 1467 if (target->scrollBar.win)
1269 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1468 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1270# endif
1271 } 1469 }
1272 else 1470 else
1273# endif 1471# endif
1274 { 1472 {
1275 flags |= isVtOrigin; 1473 flags |= isVtOrigin;
1276 /* force old pixmap dereference in case it was transparent before :*/ 1474 /* force old pixmap dereference in case it was transparent before :*/
1277 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1475 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1278 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1279 /* do we also need to set scrollbar's background here ? */ 1477 /* do we also need to set scrollbar's background here ? */
1280# if HAVE_SCROLLBARS 1478
1281 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1282 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1480 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1283# endif
1284 } 1481 }
1285 } 1482 }
1286 else 1483 else
1287 { 1484 {
1288 /* set target background to a pixel */ 1485 /* set target background to a pixel */
1289 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1290 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1291 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1292# if HAVE_SCROLLBARS
1293 if (target->scrollBar.win) 1489 if (target->scrollBar.win)
1294 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1490 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1295# endif
1296 } 1491 }
1492
1297 /* 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
1298 scr_touch or we get a great deal of flicker otherwise: */ 1494 scr_touch or we get a great deal of flicker otherwise: */
1299 XClearWindow (target->dpy, target->parent[0]); 1495 XClearWindow (target->dpy, target->parent[0]);
1300 1496
1301# if HAVE_SCROLLBARS 1497 if (target->scrollBar.state && target->scrollBar.win)
1302 if (target->scrollBar.win)
1303 { 1498 {
1304 target->scrollBar.setIdle (); 1499 target->scrollBar.state = STATE_IDLE;
1305 target->scrollbar_show (0); 1500 target->scrollBar.show (0);
1306 } 1501 }
1307# endif
1308 1502
1309 target->want_refresh = 1; 1503 target->want_refresh = 1;
1310 flags |= hasChanged; 1504 flags |= hasChanged;
1311 } 1505 }
1312} 1506}
… …
1317/* taken from aterm-0.4.2 */ 1511/* taken from aterm-0.4.2 */
1318 1512
1319typedef uint32_t RUINT32T; 1513typedef uint32_t RUINT32T;
1320 1514
1321static void 1515static void
1322ShadeXImage(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)
1323{ 1517{
1324 int sh_r, sh_g, sh_b; 1518 int sh_r, sh_g, sh_b;
1325 RUINT32T mask_r, mask_g, mask_b; 1519 RUINT32T mask_r, mask_g, mask_b;
1326 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1520 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1327 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