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

Diff Legend

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