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.21 by root, Fri Jan 4 20:39:42 2008 UTC vs.
Revision 1.62 by sf-exg, Sun Oct 3 21:44:13 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 (flags & sizeSensitive)
129 || h_align != 0 || v_align != 0)
130 return true; 144 return true;
131 } 145 }
132# endif 146# endif
133 147
134 return false; 148 return false;
135} 149}
136 150
137bool 151bool
138bgPixmap_t::window_position_sensitive () 152bgPixmap_t::window_position_sensitive ()
139{ 153{
140# ifdef ENABLE_TRANSPARENCY 154# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 155 if (flags & isTransparent)
142 return true; 156 return true;
143# endif 157# endif
144 158
145# ifdef BG_IMAGE_FROM_FILE 159# ifdef BG_IMAGE_FROM_FILE
146# ifdef HAVE_AFTERIMAGE 160 if (have_image)
147 if (original_asim != NULL)
148# endif
149 { 161 {
150 if (h_align == rootAlign || v_align == rootAlign) 162 if (h_align == rootAlign || v_align == rootAlign)
151 return true; 163 return true;
152 } 164 }
153# endif 165# endif
156}; 168};
157 169
158bool bgPixmap_t::need_client_side_rendering () 170bool bgPixmap_t::need_client_side_rendering ()
159{ 171{
160# ifdef HAVE_AFTERIMAGE 172# ifdef HAVE_AFTERIMAGE
161 if (original_asim != NULL) 173 if (original_asim)
162 return true; 174 return true;
163# endif 175# endif
164# ifdef ENABLE_TRANSPARENCY 176# ifdef ENABLE_TRANSPARENCY
165 if (flags & isTransparent) 177 if (flags & isTransparent)
166 { 178 {
215 227
216static inline int 228static inline int
217make_align_position (int align, int window_size, int image_size) 229make_align_position (int align, int window_size, int image_size)
218{ 230{
219 int diff = window_size - image_size; 231 int diff = window_size - image_size;
220 int smaller = MIN (image_size,window_size); 232 int smaller = min (image_size, window_size);
221 233
222 if (align >= 0 && align <= 50) 234 if (align >= 0 && align <= 50)
223 return diff * align / 100; 235 return diff * align / 100;
224 else if (align > 50 && align <= 100) 236 else if (align > 50 && align <= 100)
225 return window_size - image_size - diff * (100 - align) / 100; 237 return window_size - image_size - diff * (100 - align) / 100;
234make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 246make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
235{ 247{
236 int src_pos = 0; 248 int src_pos = 0;
237 dst_pos = 0; 249 dst_pos = 0;
238 dst_size = size; 250 dst_size = size;
239 if (pos < 0 && size > target_size) 251 if (pos < 0)
240 { 252 {
241 src_pos = -pos; 253 src_pos = -pos;
242 dst_size += pos; 254 dst_size += pos;
243 } 255 }
244 else if (pos > 0) 256 else if (pos > 0)
255 int geom_flags = 0, changed = 0; 267 int geom_flags = 0, changed = 0;
256 int x = 0, y = 0; 268 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 269 unsigned int w = 0, h = 0;
258 unsigned int n; 270 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 271 unsigned long new_flags = (flags & (~geometryFlags));
260 char *p; 272 const char *p;
261# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 273# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 274
263 if (geom == NULL) 275 if (geom == NULL)
264 return false; 276 return false;
265 277
266 char str[MAXLEN_GEOM]; 278 char str[MAXLEN_GEOM];
273 if (n < MAXLEN_GEOM) 285 if (n < MAXLEN_GEOM)
274 { 286 {
275 char *ops; 287 char *ops;
276 new_flags |= geometrySet; 288 new_flags |= geometrySet;
277 289
278 strncpy (str, geom, n); 290 memcpy (str, geom, n);
279 str[n] = '\0'; 291 str[n] = '\0';
280 if (str[0] == ':') 292 if (str[0] == ':')
281 ops = &str[0]; 293 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 294 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0]; 295 ops = &str[0];
366 if (ops) 378 if (ops)
367 { 379 {
368 while (*ops) 380 while (*ops)
369 { 381 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 382 while (*ops == ':' || isspace(*ops)) ++ops;
383
371# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 384# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
372 if (CHECK_GEOM_OPS("tile")) 385 if (CHECK_GEOM_OPS ("tile"))
373 { 386 {
374 w = h = noScale; 387 w = h = noScale;
375 geom_flags |= WidthValue|HeightValue; 388 geom_flags |= WidthValue|HeightValue;
376 } 389 }
377 else if (CHECK_GEOM_OPS("propscale")) 390 else if (CHECK_GEOM_OPS ("propscale"))
378 { 391 {
379 if (w == 0 && h == 0)
380 {
381 w = windowScale;
382 geom_flags |= WidthValue;
383 }
384 new_flags |= propScale; 392 new_flags |= propScale;
385 } 393 }
386 else if (CHECK_GEOM_OPS("hscale")) 394 else if (CHECK_GEOM_OPS ("hscale"))
387 { 395 {
388 if (w == 0)
389 w = windowScale; 396 if (w == 0) w = windowScale;
397
390 h = noScale; 398 h = noScale;
391 geom_flags |= WidthValue|HeightValue; 399 geom_flags |= WidthValue|HeightValue;
392 } 400 }
393 else if (CHECK_GEOM_OPS("vscale")) 401 else if (CHECK_GEOM_OPS ("vscale"))
394 { 402 {
395 if (h == 0)
396 h = windowScale; 403 if (h == 0) h = windowScale;
404
397 w = noScale; 405 w = noScale;
398 geom_flags |= WidthValue|HeightValue; 406 geom_flags |= WidthValue|HeightValue;
399 } 407 }
400 else if (CHECK_GEOM_OPS("scale")) 408 else if (CHECK_GEOM_OPS ("scale"))
401 { 409 {
402 if (h == 0)
403 h = windowScale; 410 if (h == 0) h = windowScale;
404 if (w == 0)
405 w = windowScale; 411 if (w == 0) w = windowScale;
412
406 geom_flags |= WidthValue|HeightValue; 413 geom_flags |= WidthValue|HeightValue;
407 } 414 }
408 else if (CHECK_GEOM_OPS("auto")) 415 else if (CHECK_GEOM_OPS ("auto"))
409 { 416 {
410 w = h = windowScale; 417 w = h = windowScale;
411 x = y = centerAlign; 418 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 420 }
414 else if (CHECK_GEOM_OPS("root")) 421 else if (CHECK_GEOM_OPS ("root"))
415 { 422 {
416 w = h = noScale; 423 w = h = noScale;
417 x = y = rootAlign; 424 x = y = rootAlign;
418 geom_flags |= WidthValue|HeightValue|XValue|YValue; 425 geom_flags |= WidthValue|HeightValue|XValue|YValue;
419 } 426 }
420# undef CHECK_GEOM_OPS 427# undef CHECK_GEOM_OPS
428
421 while (*ops != ':' && *ops != '\0') ++ops; 429 while (*ops != ':' && *ops != '\0') ++ops;
422 } /* done parsing ops */ 430 } /* done parsing ops */
423 } 431 }
424 432
425 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 433 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)) 434 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)) 435 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)) 436 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
432 ++changed;
433 } 437 }
434 438
435 if (new_flags != flags) 439 if (new_flags != flags)
436 { 440 {
437 flags = new_flags; 441 flags = new_flags;
438 changed++; 442 changed++;
439 } 443 }
444
440//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 445 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
441// flags, h_scale, v_scale, h_align, v_align); 446 // flags, h_scale, v_scale, h_align, v_align);
442 return (changed > 0); 447 return (changed > 0);
448}
449
450void
451bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
452{
453 int target_width = target->szHint.width;
454 int target_height = target->szHint.height;
455
456 if (flags & propScale)
457 {
458 float scale = (float)target_width / image_width;
459 min_it (scale, (float)target_height / image_height);
460 w = image_width * scale + 0.5;
461 h = image_height * scale + 0.5;
462 }
463 else
464 {
465 w = h_scale * target_width / 100;
466 h = v_scale * target_height / 100;
467 }
468
469 if (h_align == rootAlign || v_align == rootAlign)
470 {
471 target->get_window_origin (x, y);
472 x = -x;
473 y = -y;
474 }
475
476 if (h_align != rootAlign)
477 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
478
479 if (v_align != rootAlign)
480 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
481
482 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0
484 || h_align != 0 || v_align != 0
485 || image_width > target_width || image_height > target_height)
486 flags |= sizeSensitive;
443} 487}
444 488
445# ifdef HAVE_AFTERIMAGE 489# ifdef HAVE_AFTERIMAGE
446bool 490bool
447bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 491bgPixmap_t::render_image (unsigned long background_flags)
448{ 492{
449 if (target == NULL) 493 if (target == NULL)
450 return false; 494 return false;
451 495
496 target->init_asv ();
497
498 ASImage *background = NULL;
499 ARGB32 background_tint = TINT_LEAVE_SAME;
500
501# ifdef ENABLE_TRANSPARENCY
502 if (background_flags)
503 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
504
505 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
506 {
507 ShadingInfo as_shade;
508 as_shade.shading = (shade == 0) ? 100 : shade;
509
510 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
511 if (flags & tintSet)
512 tint.get (c);
513 as_shade.tintColor.red = c.r;
514 as_shade.tintColor.green = c.g;
515 as_shade.tintColor.blue = c.b;
516
517 background_tint = shading2tint32 (&as_shade);
518 }
519
520 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
521 {
522 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
523 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
524 100, ASIMAGE_QUALITY_DEFAULT);
525 if (tmp)
526 {
527 destroy_asimage (&background);
528 background = tmp;
529 }
530 }
531# endif
532
533 ASImage *result = 0;
534
452 int target_width = (int)target->szHint.width; 535 int target_width = target->szHint.width;
453 int target_height = (int)target->szHint.height; 536 int target_height = target->szHint.height;
454 int new_pmap_width = target_width, new_pmap_height = target_height; 537 int new_pmap_width = target_width;
455 ASImage *result = NULL; 538 int new_pmap_height = target_height;
456 539
457 int x = 0; 540 int x = 0;
458 int y = 0; 541 int y = 0;
459 int w = h_scale * target_width / 100; 542 int w = 0;
460 int h = v_scale * target_height / 100; 543 int h = 0;
461 544
462 TIMING_TEST_START (asim); 545 TIMING_TEST_START (asim);
463 546
464 if (original_asim) 547 if (original_asim)
465 { 548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
466 if (h_align == rootAlign || v_align == rootAlign)
467 {
468 target->get_window_origin(x, y);
469 x = -x;
470 y = -y;
471 }
472 if (h_align != rootAlign)
473 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
474 if (v_align != rootAlign)
475 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
476 }
477 549
478 if (original_asim == NULL 550 if (!original_asim
479 || x >= target_width 551 || x >= target_width
480 || y >= target_height 552 || y >= target_height
481 || (w > 0 && x + w <= 0) 553 || (w > 0 && x + w <= 0)
482 || (h > 0 && y + h <= 0)) 554 || (h > 0 && y + h <= 0))
483 { 555 {
484 if (background) 556 if (background)
485 { 557 {
486 new_pmap_width = background->width; 558 new_pmap_width = background->width;
487 new_pmap_height = background->height; 559 new_pmap_height = background->height;
488 result = background; 560 result = background;
561
489 if (background_tint != TINT_LEAVE_SAME) 562 if (background_tint != TINT_LEAVE_SAME)
490 { 563 {
491 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 564 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
492 target_width, target_height, background_tint, 565 target_width, target_height, background_tint,
493 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 566 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
494 if (tmp) 567 if (tmp)
495 result = tmp; 568 result = tmp;
496 } 569 }
499 new_pmap_width = new_pmap_height = 0; 572 new_pmap_width = new_pmap_height = 0;
500 } 573 }
501 else 574 else
502 { 575 {
503 result = original_asim; 576 result = original_asim;
577
504 if ((w > 0 && w != original_asim->width) 578 if ((w > 0 && w != original_asim->width)
505 || (h > 0 && h != original_asim->height)) 579 || (h > 0 && h != original_asim->height))
506 { 580 {
507 result = scale_asimage (target->asv, original_asim, 581 result = scale_asimage (target->asv, original_asim,
508 w > 0 ? w : original_asim->width, 582 w > 0 ? w : original_asim->width,
509 h > 0 ? h : original_asim->height, 583 h > 0 ? h : original_asim->height,
510 background ? ASA_ASImage : ASA_XImage, 584 background ? ASA_ASImage : ASA_XImage,
511 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
512 } 586 }
587
513 if (background == NULL) 588 if (background == NULL)
514 { 589 {
515 /* if tiling - pixmap has to be sized exactly as the image,
516 but there is no need to make it bigger then the window! */
517 if (h_scale == 0)
518 new_pmap_width = min (result->width, target_width);
519 if (v_scale == 0)
520 new_pmap_height = min (result->height, target_height);
521 /* we also need to tile our image in one or both directions */
522 if (h_scale == 0 || v_scale == 0) 590 if (h_scale == 0 || v_scale == 0)
523 { 591 {
592 /* if tiling - pixmap has to be sized exactly as the image,
593 but there is no need to make it bigger than the window! */
594 new_pmap_width = min (result->width, target_width);
595 new_pmap_height = min (result->height, target_height);
596
597 /* we also need to tile our image in both directions */
524 ASImage *tmp = tile_asimage (target->asv, result, 598 ASImage *tmp = tile_asimage (target->asv, result,
525 (h_scale > 0) ? 0 : (int)result->width - x, 599 (int)result->width - x,
526 (v_scale > 0) ? 0 : (int)result->height - y, 600 (int)result->height - y,
527 new_pmap_width, 601 new_pmap_width,
528 new_pmap_height, 602 new_pmap_height,
529 TINT_LEAVE_SAME, ASA_XImage, 603 TINT_LEAVE_SAME, ASA_XImage,
530 100, ASIMAGE_QUALITY_DEFAULT); 604 100, ASIMAGE_QUALITY_DEFAULT);
531 if (tmp) 605 if (tmp)
532 { 606 {
533 if (result != original_asim) 607 if (result != original_asim)
534 destroy_asimage (&result); 608 destroy_asimage (&result);
609
535 result = tmp; 610 result = tmp;
536 } 611 }
537 } 612 }
538 } 613 }
539 else 614 else
540 { 615 {
541 /* if blending background and image - pixmap has to be sized same as target window */ 616 /* if blending background and image - pixmap has to be sized same as target window */
542 ASImageLayer *layers = create_image_layers (2); 617 ASImageLayer *layers = create_image_layers (2);
543 ASImage *merged_im = NULL;
544 618
545 layers[0].im = background; 619 layers[0].im = background;
546 layers[0].clip_width = target_width; 620 layers[0].clip_width = target_width;
547 layers[0].clip_height = target_height; 621 layers[0].clip_height = target_height;
548 layers[0].tint = background_tint; 622 layers[0].tint = background_tint;
549 layers[1].im = result; 623 layers[1].im = result;
624
550 if (w <= 0) 625 if (w <= 0)
551 { 626 {
552 /* tile horizontally */ 627 /* tile horizontally */
553 while (x > 0) x -= (int)result->width; 628 while (x > 0) x -= (int)result->width;
554 layers[1].dst_x = x; 629 layers[1].dst_x = x;
558 { 633 {
559 /* clip horizontally */ 634 /* clip horizontally */
560 layers[1].dst_x = x; 635 layers[1].dst_x = x;
561 layers[1].clip_width = result->width; 636 layers[1].clip_width = result->width;
562 } 637 }
638
563 if (h <= 0) 639 if (h <= 0)
564 { 640 {
565 while (y > 0) y -= (int)result->height; 641 while (y > 0) y -= (int)result->height;
566 layers[1].dst_y = y; 642 layers[1].dst_y = y;
567 layers[1].clip_height = result->height + target_height; 643 layers[1].clip_height = result->height + target_height;
569 else 645 else
570 { 646 {
571 layers[1].dst_y = y; 647 layers[1].dst_y = y;
572 layers[1].clip_height = result->height; 648 layers[1].clip_height = result->height;
573 } 649 }
650
574 if (target->rs[Rs_blendtype]) 651 if (target->rs[Rs_blendtype])
575 { 652 {
576 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 653 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
577 if (layers[1].merge_scanlines == NULL) 654 if (layers[1].merge_scanlines == NULL)
578 layers[1].merge_scanlines = alphablend_scanlines; 655 layers[1].merge_scanlines = alphablend_scanlines;
579 } 656 }
657
580 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 658 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
581 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 659 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
660
582 if (tmp) 661 if (tmp)
583 { 662 {
584 if (result != original_asim) 663 if (result != original_asim)
585 destroy_asimage (&result); 664 destroy_asimage (&result);
665
586 result = tmp; 666 result = tmp;
587 } 667 }
668
588 free (layers); 669 free (layers);
589 } 670 }
590 } 671 }
591 TIMING_TEST_PRINT_RESULT (asim); 672 TIMING_TEST_PRINT_RESULT (asim);
592 673
593 if (pixmap) 674 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 675
605 if (result) 676 if (result)
606 { 677 {
607 XGCValues gcv; 678 XGCValues gcv;
608 GC gc; 679 GC gc;
680
681 if (pixmap)
682 {
683 if (pmap_width != new_pmap_width
684 || pmap_height != new_pmap_height
685 || pmap_depth != target->depth)
686 {
687 XFreePixmap (target->dpy, pixmap);
688 pixmap = None;
689 }
690 }
609 691
610 /* create Pixmap */ 692 /* create Pixmap */
611 if (pixmap == None) 693 if (pixmap == None)
612 { 694 {
613 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 695 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
614 pmap_width = new_pmap_width; 696 pmap_width = new_pmap_width;
615 pmap_height = new_pmap_height; 697 pmap_height = new_pmap_height;
616 pmap_depth = target->depth; 698 pmap_depth = target->depth;
617 } 699 }
618 /* fill with background color ( if result's not completely overlapping it)*/ 700 /* fill with background color (if result's not completely overlapping it) */
619 gcv.foreground = target->pix_colors[Color_bg]; 701 gcv.foreground = target->pix_colors[Color_bg];
620 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 702 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
621 703
622 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 704 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
623 int dst_width = result->width, dst_height = result->height; 705 int dst_width = result->width, dst_height = result->height;
624 if (background == NULL) 706 if (background == NULL)
625 { 707 {
626 if (h_scale > 0) 708 if (!(h_scale == 0 || v_scale == 0))
709 {
627 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 710 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); 711 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
712 }
630 713
631 if (dst_x > 0 || dst_y > 0 714 if (dst_x > 0 || dst_y > 0
632 || dst_x + dst_width < new_pmap_width 715 || dst_x + dst_width < new_pmap_width
633 || dst_y + dst_height < new_pmap_height) 716 || dst_y + dst_height < new_pmap_height)
634 {
635 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 717 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
636 }
637 } 718 }
638 719
639 /* put result on pixmap */ 720 /* put result on pixmap */
640 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 721 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); 722 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) 724 if (result != background && result != original_asim)
644 destroy_asimage (&result); 725 destroy_asimage (&result);
645 726
646 XFreeGC (target->dpy, gc); 727 XFreeGC (target->dpy, gc);
647 TIMING_TEST_PRINT_RESULT (asim); 728 TIMING_TEST_PRINT_RESULT (asim);
648 }
649 729
730 ret = true;
731 }
732
733 if (background)
734 destroy_asimage (&background);
735
650 return true; 736 return ret;
651} 737}
652# endif /* HAVE_AFTERIMAGE */ 738# endif /* HAVE_AFTERIMAGE */
739
740# ifdef HAVE_PIXBUF
741bool
742bgPixmap_t::render_image (unsigned long background_flags)
743{
744 if (target == NULL)
745 return false;
746
747 if (!pixbuf)
748 return false;
749
750 // TODO: add alpha blending
751 if (background_flags)
752 return false;
753
754 GdkPixbuf *result;
755
756 int image_width = gdk_pixbuf_get_width (pixbuf);
757 int image_height = gdk_pixbuf_get_height (pixbuf);
758
759 int target_width = target->szHint.width;
760 int target_height = target->szHint.height;
761 int new_pmap_width = target_width;
762 int new_pmap_height = target_height;
763
764 int x = 0;
765 int y = 0;
766 int w = 0;
767 int h = 0;
768
769 get_image_geometry (image_width, image_height, w, h, x, y);
770
771 if (x >= target_width
772 || y >= target_height
773 || (w > 0 && x + w <= 0)
774 || (h > 0 && y + h <= 0))
775 return false;
776
777 result = pixbuf;
778
779 if ((w > 0 && w != image_width)
780 || (h > 0 && h != image_height))
781 {
782 result = gdk_pixbuf_scale_simple (pixbuf,
783 w > 0 ? w : image_width,
784 h > 0 ? h : image_height,
785 GDK_INTERP_BILINEAR);
786 }
787
788 bool ret = false;
789
790 if (result)
791 {
792 XGCValues gcv;
793 GC gc;
794
795 image_width = gdk_pixbuf_get_width (result);
796 image_height = gdk_pixbuf_get_height (result);
797
798 if (h_scale == 0 || v_scale == 0)
799 {
800 new_pmap_width = min (image_width, target_width);
801 new_pmap_height = min (image_height, target_height);
802 }
803
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None)
816 {
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 }
822
823 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825
826 if (h_scale == 0 || v_scale == 0)
827 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
830 0, 0,
831 0, 0,
832 image_width, image_height,
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835
836 gcv.tile = tile;
837 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y;
840 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
841
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 XFreePixmap (target->dpy, tile);
844 }
845 else
846 {
847 int src_x, src_y, dst_x, dst_y;
848 int dst_width, dst_height;
849
850 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
851 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
852
853 if (dst_x > 0 || dst_y > 0
854 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
860 src_x, src_y,
861 dst_x, dst_y,
862 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 }
866
867 if (result != pixbuf)
868 g_object_unref (result);
869
870 XFreeGC (target->dpy, gc);
871
872 ret = true;
873 }
874
875 return ret;
876}
877# endif /* HAVE_PIXBUF */
653 878
654bool 879bool
655bgPixmap_t::set_file (const char *file) 880bgPixmap_t::set_file (const char *file)
656{ 881{
657 char *f;
658
659 assert (file != NULL); 882 assert (file);
660 883
661 if (*file != '\0') 884 if (*file)
662 { 885 {
886 if (const char *p = strchr (file, ';'))
887 {
888 size_t len = p - file;
889 char *f = rxvt_temp_buf<char> (len + 1);
890 memcpy (f, file, len);
891 f[len] = '\0';
892 file = f;
893 }
894
663# ifdef HAVE_AFTERIMAGE 895# ifdef HAVE_AFTERIMAGE
664 if (target->asimman == NULL) 896 if (!target->asimman)
665 target->asimman = create_generic_imageman (target->rs[Rs_path]); 897 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); 898 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
668 else 899 if (original_asim)
669 { 900 have_image = true;
670 size_t len = f - file; 901 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 902# endif
903
904# ifdef HAVE_PIXBUF
905 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
906 if (pixbuf)
907 have_image = true;
908 return have_image;
909# endif
679 } 910 }
911
680 return false; 912 return false;
681} 913}
682 914
683# endif /* BG_IMAGE_FROM_FILE */ 915# endif /* BG_IMAGE_FROM_FILE */
684 916
689 if (!(flags & isTransparent)) 921 if (!(flags & isTransparent))
690 { 922 {
691 flags |= isTransparent; 923 flags |= isTransparent;
692 return true; 924 return true;
693 } 925 }
926
694 return false; 927 return false;
695} 928}
696 929
697bool 930bool
698bgPixmap_t::set_blur_radius (const char *geom) 931bgPixmap_t::set_blur_radius (const char *geom)
700 int changed = 0; 933 int changed = 0;
701 unsigned int hr, vr; 934 unsigned int hr, vr;
702 int junk; 935 int junk;
703 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 936 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
704 937
705 if (!(geom_flags&WidthValue)) 938 if (!(geom_flags & WidthValue))
706 hr = 1; 939 hr = 1;
707 if (!(geom_flags&HeightValue)) 940 if (!(geom_flags & HeightValue))
708 vr = hr; 941 vr = hr;
709 942
710 if (h_blurRadius != hr) 943 if (h_blurRadius != hr)
711 { 944 {
712 ++changed; 945 ++changed;
722 if (v_blurRadius == 0 && h_blurRadius == 0) 955 if (v_blurRadius == 0 && h_blurRadius == 0)
723 flags &= ~blurNeeded; 956 flags &= ~blurNeeded;
724 else 957 else
725 flags |= blurNeeded; 958 flags |= blurNeeded;
726 959
727 return (changed>0); 960 return (changed > 0);
728} 961}
729 962
730static inline unsigned long 963static inline unsigned long
731compute_tint_shade_flags (rxvt_color *tint, int shade) 964compute_tint_shade_flags (rxvt_color *tint, int shade)
732{ 965{
749 flags |= bgPixmap_t::tintNeeded; 982 flags |= bgPixmap_t::tintNeeded;
750 else if (tint) 983 else if (tint)
751 { 984 {
752 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 985 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
753 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 986 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
754 { 987 {
755 flags |= bgPixmap_t::tintNeeded; 988 flags |= bgPixmap_t::tintNeeded;
756 } 989 }
757 } 990 }
758 991
759 if (flags & bgPixmap_t::tintNeeded) 992 if (flags & bgPixmap_t::tintNeeded)
760 { 993 {
761 if (flags & bgPixmap_t::tintWholesome) 994 if (flags & bgPixmap_t::tintWholesome)
790{ 1023{
791 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1024 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
792 1025
793 if (new_flags != (flags & tintFlags)) 1026 if (new_flags != (flags & tintFlags))
794 { 1027 {
795 flags = (flags&~tintFlags)|new_flags; 1028 flags = (flags & ~tintFlags) | new_flags;
796 return true; 1029 return true;
797 } 1030 }
798 1031
799 return false; 1032 return false;
800} 1033}
801 1034
831 unsigned long result = 0; 1064 unsigned long result = 0;
832 1065
833 if (target == NULL) 1066 if (target == NULL)
834 return 0; 1067 return 0;
835 1068
836 /* root dimentions may change from call to call - but Display structure should 1069 /* root dimensions may change from call to call - but Display structure should
837 * be always up-to-date, so let's use it : 1070 * be always up-to-date, so let's use it :
838 */ 1071 */
839 Window root = target->display->root; 1072 Window root = target->display->root;
840 int screen = target->display->screen; 1073 int screen = target->display->screen;
841 Display *dpy = target->dpy; 1074 Display *dpy = target->dpy;
886 1119
887 attr.background_pixmap = ParentRelative; 1120 attr.background_pixmap = ParentRelative;
888 attr.backing_store = Always; 1121 attr.backing_store = Always;
889 attr.event_mask = ExposureMask; 1122 attr.event_mask = ExposureMask;
890 attr.override_redirect = True; 1123 attr.override_redirect = True;
891 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1124 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
892 CopyFromParent, CopyFromParent, CopyFromParent, 1125 CopyFromParent, CopyFromParent, CopyFromParent,
893 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1126 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
894 &attr); 1127 &attr);
895 1128
896 if (src != None) 1129 if (src != None)
920 XDestroyWindow (dpy, src); 1153 XDestroyWindow (dpy, src);
921 XUngrabServer (dpy); 1154 XUngrabServer (dpy);
922 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1155 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
923 } 1156 }
924 1157
925 if (!success) 1158 if (!success)
926 { 1159 {
927 XFreePixmap (dpy, tiled_root_pmap); 1160 XFreePixmap (dpy, tiled_root_pmap);
928 tiled_root_pmap = None; 1161 tiled_root_pmap = None;
929 } 1162 }
930 else 1163 else
931 result |= transpPmapTiled; 1164 result |= transpPmapTiled;
932 } 1165 }
933 else 1166 else
934 { 1167 {
935 /* strightforward pixmap copy */ 1168 /* straightforward pixmap copy */
936 gcv.tile = root_pixmap; 1169 gcv.tile = root_pixmap;
937 gcv.fill_style = FillTiled; 1170 gcv.fill_style = FillTiled;
938 1171
939 while (sx < 0) sx += (int)root_width; 1172 while (sx < 0) sx += (int)root_width;
940 while (sy < 0) sy += (int)root_height; 1173 while (sy < 0) sy += (int)root_height;
1053# if DO_TIMING_TEST 1286# if DO_TIMING_TEST
1054 XSync (dpy, False); 1287 XSync (dpy, False);
1055# endif 1288# endif
1056# endif 1289# endif
1057 } 1290 }
1058 } 1291 }
1059 } /* server side rendering completed */ 1292 } /* server side rendering completed */
1060 1293
1061 if (pixmap) 1294 if (pixmap)
1062 XFreePixmap (dpy, pixmap); 1295 XFreePixmap (dpy, pixmap);
1063 1296
1091 return false; 1324 return false;
1092} 1325}
1093# endif /* ENABLE_TRANSPARENCY */ 1326# endif /* ENABLE_TRANSPARENCY */
1094 1327
1095# ifndef HAVE_AFTERIMAGE 1328# ifndef HAVE_AFTERIMAGE
1096static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1329static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1097# endif 1330# endif
1098 1331
1099bool 1332bool
1100bgPixmap_t::render () 1333bgPixmap_t::render ()
1101{ 1334{
1104 if (target == NULL) 1337 if (target == NULL)
1105 return false; 1338 return false;
1106 1339
1107 TIMING_TEST_START (tp); 1340 TIMING_TEST_START (tp);
1108 1341
1109 invalidate(); 1342 invalidate ();
1110# ifdef ENABLE_TRANSPARENCY 1343# ifdef ENABLE_TRANSPARENCY
1111 if (flags & isTransparent) 1344 if (flags & isTransparent)
1112 { 1345 {
1113 /* we need to re-generate transparency pixmap in that case ! */ 1346 /* we need to re-generate transparency pixmap in that case ! */
1114 background_flags = make_transparency_pixmap (); 1347 background_flags = make_transparency_pixmap ();
1115 if (background_flags == 0) 1348 if (background_flags == 0)
1116 return false; 1349 return false;
1117 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1350 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1118 && pmap_depth == target->depth) 1351 && pmap_depth == target->depth)
1119 flags = flags & ~isInvalid; 1352 flags = flags & ~isInvalid;
1120 } 1353 }
1121# endif 1354# endif
1122 1355
1356# ifdef BG_IMAGE_FROM_FILE
1357 if (have_image
1358 || (background_flags & transpTransformations) != (flags & transpTransformations))
1359 {
1360 if (render_image (background_flags))
1361 flags = flags & ~isInvalid;
1362 }
1363# endif
1364
1123 XImage *result = NULL; 1365 XImage *result = NULL;
1124# ifdef HAVE_AFTERIMAGE 1366
1125 if (original_asim 1367 if (background_flags && (flags & isInvalid))
1126 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1368 {
1369 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1127 { 1370 }
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 1371
1133# ifdef ENABLE_TRANSPARENCY 1372 if (result)
1373 {
1374# if !defined(HAVE_AFTERIMAGE) && !XFT
1375 /* our own client-side tinting */
1376 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1377 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1134 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1378 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 { 1379 {
1181 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1380 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1182 if (flags & tintSet) 1381 if (flags & tintSet)
1183 tint.get (c); 1382 tint.get (c);
1184 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1383 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1185 } 1384 }
1186 } 1385# endif
1187# endif /* HAVE_AFTERIMAGE */
1188 1386
1189 if (result)
1190 {
1191 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1387 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1192 1388
1193 if (gc) 1389 if (gc)
1194 { 1390 {
1195 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1391 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1224 1420
1225 XFreeGC (target->dpy, gc); 1421 XFreeGC (target->dpy, gc);
1226 flags = flags & ~isInvalid; 1422 flags = flags & ~isInvalid;
1227 } 1423 }
1228 1424
1229 XDestroyImage (result); 1425 XDestroyImage (result);
1230 } 1426 }
1231 1427
1232 if (flags & isInvalid) 1428 if (flags & isInvalid)
1233 { 1429 {
1234 if (pixmap != None) 1430 if (pixmap != None)
1237 pixmap = None; 1433 pixmap = None;
1238 } 1434 }
1239 } 1435 }
1240 1436
1241 apply (); 1437 apply ();
1438
1439 XSync (target->dpy, False);
1440 valid_since = ev::now ();
1242 1441
1243 TIMING_TEST_PRINT_RESULT (tp); 1442 TIMING_TEST_PRINT_RESULT (tp);
1244 1443
1245 return true; 1444 return true;
1246} 1445}
1255# ifdef ENABLE_TRANSPARENCY 1454# ifdef ENABLE_TRANSPARENCY
1256 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1455 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1257# endif 1456# endif
1258 return true; 1457 return true;
1259 } 1458 }
1459
1260 return false; 1460 return false;
1261} 1461}
1262 1462
1263void 1463void
1264bgPixmap_t::apply () 1464bgPixmap_t::apply ()
1265{ 1465{
1266 if (target) 1466 if (target)
1267 { 1467 {
1268 flags &= ~isVtOrigin; 1468 flags &= ~isVtOrigin;
1469
1269 if (pixmap != None) 1470 if (pixmap != None)
1270 { 1471 {
1271 /* set target's background to pixmap */ 1472 /* set target's background to pixmap */
1272# ifdef ENABLE_TRANSPARENCY 1473# ifdef ENABLE_TRANSPARENCY
1273 if (flags & isTransparent) 1474 if (flags & isTransparent)
1274 { 1475 {
1275 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1276 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1477 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1277# if HAVE_SCROLLBARS 1478
1278 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1279 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1280# endif
1281 } 1481 }
1282 else 1482 else
1283# endif 1483# endif
1284 { 1484 {
1285 flags |= isVtOrigin; 1485 flags |= isVtOrigin;
1286 /* force old pixmap dereference in case it was transparent before :*/ 1486 /* force old pixmap dereference in case it was transparent before :*/
1287 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1487 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1288 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1488 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1289 /* do we also need to set scrollbar's background here ? */ 1489 /* do we also need to set scrollbar's background here ? */
1290# if HAVE_SCROLLBARS 1490
1291 if (target->scrollBar.win) 1491 if (target->scrollBar.win)
1292 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1492 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1293# endif
1294 } 1493 }
1295 } 1494 }
1296 else 1495 else
1297 { 1496 {
1298 /* set target background to a pixel */ 1497 /* set target background to a pixel */
1299 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1498 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1300 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1499 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1301 /* do we also need to set scrollbar's background here ? */ 1500 /* do we also need to set scrollbar's background here ? */
1302# if HAVE_SCROLLBARS
1303 if (target->scrollBar.win) 1501 if (target->scrollBar.win)
1304 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1502 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1305# endif
1306 } 1503 }
1504
1307 /* don't want Expose on the parent or vt. It is better to use 1505 /* 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: */ 1506 scr_touch or we get a great deal of flicker otherwise: */
1309 XClearWindow (target->dpy, target->parent[0]); 1507 XClearWindow (target->dpy, target->parent[0]);
1310 1508
1311# if HAVE_SCROLLBARS 1509 if (target->scrollBar.state && target->scrollBar.win)
1312 if (target->scrollBar.win)
1313 { 1510 {
1314 target->scrollBar.setIdle (); 1511 target->scrollBar.state = STATE_IDLE;
1315 target->scrollbar_show (0); 1512 target->scrollBar.show (0);
1316 } 1513 }
1317# endif
1318 1514
1319 target->want_refresh = 1; 1515 target->want_refresh = 1;
1320 flags |= hasChanged; 1516 flags |= hasChanged;
1321 } 1517 }
1322} 1518}
1327/* taken from aterm-0.4.2 */ 1523/* taken from aterm-0.4.2 */
1328 1524
1329typedef uint32_t RUINT32T; 1525typedef uint32_t RUINT32T;
1330 1526
1331static void 1527static void
1332ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1528ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1333{ 1529{
1334 int sh_r, sh_g, sh_b; 1530 int sh_r, sh_g, sh_b;
1335 RUINT32T mask_r, mask_g, mask_b; 1531 RUINT32T mask_r, mask_g, mask_b;
1336 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1532 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1337 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1533 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines