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.37 by sf-exg, Sun Jan 31 09:02:48 2010 UTC vs.
Revision 1.67 by sf-exg, Mon Oct 4 21:56:42 2010 UTC

… …
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 ?
… …
92 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 97 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 99 original_asim = NULL;
96#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
97#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
98 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
99 h_align = v_align = 0; 107 h_align = v_align = 0;
100#endif 108#endif
101 flags = 0; 109 flags = 0;
102 pixmap = None; 110 pixmap = None;
… …
110#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 119 if (original_asim)
112 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
113#endif 121#endif
114 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
115 if (pixmap && target) 128 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
117} 130}
118 131
119bool 132bool
… …
123 if (flags & isTransparent) 136 if (flags & isTransparent)
124 return true; 137 return true;
125# endif 138# endif
126 139
127# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 141 if (have_image)
129 if (original_asim)
130# endif
131 { 142 {
132 if (h_scale != 0 || v_scale != 0 143 if (flags & sizeSensitive)
133 || h_align != 0 || v_align != 0)
134 return true; 144 return true;
135 } 145 }
136# endif 146# endif
137 147
138 return false; 148 return false;
… …
145 if (flags & isTransparent) 155 if (flags & isTransparent)
146 return true; 156 return true;
147# endif 157# endif
148 158
149# ifdef BG_IMAGE_FROM_FILE 159# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 160 if (have_image)
151 if (original_asim)
152# endif
153 { 161 {
154 if (h_align == rootAlign || v_align == rootAlign) 162 if (flags & rootAlign)
155 return true; 163 return true;
156 } 164 }
157# endif 165# endif
158 166
159 return false; 167 return false;
… …
199static inline bool 207static inline bool
200check_set_align_value (int geom_flags, int flag, int &align, int new_value) 208check_set_align_value (int geom_flags, int flag, int &align, int new_value)
201{ 209{
202 if (geom_flags & flag) 210 if (geom_flags & flag)
203 { 211 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
206 if (new_value < -100) 212 if (new_value < -100)
207 new_value = -100; 213 new_value = -100;
208 else if (new_value > 200) 214 else if (new_value > 200)
209 new_value = 200; 215 new_value = 200;
210 }
211 if (new_value != align) 216 if (new_value != align)
212 { 217 {
213 align = new_value; 218 align = new_value;
214 return true; 219 return true;
215 } 220 }
… …
219 224
220static inline int 225static inline int
221make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
222{ 227{
223 int diff = window_size - image_size; 228 int diff = window_size - image_size;
224 int smaller = MIN (image_size,window_size); 229 int smaller = min (image_size, window_size);
225 230
226 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
227 return diff * align / 100; 232 return diff * align / 100;
228 else if (align > 50 && align <= 100)
229 return window_size - image_size - diff * (100 - align) / 100;
230 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
231 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
232 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
233 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
234 return 0; 237 return 0;
235} 238}
236 239
237static inline int 240static inline int
238make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 241make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
239{ 242{
240 int src_pos = 0; 243 int src_pos = 0;
241 dst_pos = 0; 244 dst_pos = pos;
242 dst_size = size; 245 dst_size = size;
243 if (pos < 0 && size > target_size) 246 if (pos < 0)
244 { 247 {
245 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
246 dst_size += pos; 250 dst_size += pos;
247 } 251 }
248 else if (pos > 0)
249 dst_pos = pos;
250 252
251 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
252 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
253 return src_pos; 255 return src_pos;
254} 256}
… …
379 w = h = noScale; 381 w = h = noScale;
380 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
381 } 383 }
382 else if (CHECK_GEOM_OPS ("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
383 { 385 {
384 if (w == 0 && h == 0)
385 {
386 w = windowScale;
387 geom_flags |= WidthValue;
388 }
389 new_flags |= propScale; 386 new_flags |= propScale;
390 } 387 }
391 else if (CHECK_GEOM_OPS ("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
392 { 389 {
393 if (w == 0) w = windowScale; 390 if (w == 0) w = windowScale;
… …
415 x = y = centerAlign; 412 x = y = centerAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 414 }
418 else if (CHECK_GEOM_OPS ("root")) 415 else if (CHECK_GEOM_OPS ("root"))
419 { 416 {
417 new_flags |= rootAlign;
420 w = h = noScale; 418 w = h = noScale;
421 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue;
423 } 420 }
424# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
425 422
426 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
427 } /* done parsing ops */ 424 } /* done parsing ops */
… …
437 { 434 {
438 flags = new_flags; 435 flags = new_flags;
439 changed++; 436 changed++;
440 } 437 }
441 438
442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443// flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 441 return (changed > 0);
442}
443
444void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{
447 int target_width = target->szHint.width;
448 int target_height = target->szHint.height;
449
450 if (flags & propScale)
451 {
452 float scale = (float)target_width / image_width;
453 min_it (scale, (float)target_height / image_height);
454 w = image_width * scale + 0.5;
455 h = image_height * scale + 0.5;
456 }
457 else
458 {
459 w = h_scale * target_width / 100;
460 h = v_scale * target_height / 100;
461 }
462
463 if (flags & rootAlign)
464 {
465 target->get_window_origin (x, y);
466 x = -x;
467 y = -y;
468 }
469 else
470 {
471 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
472 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
473 }
474
475 flags &= ~sizeSensitive;
476 if (h_scale != 0 || v_scale != 0
477 || h_align != 0 || v_align != 0
478 || image_width > target_width || image_height > target_height)
479 flags |= sizeSensitive;
445} 480}
446 481
447# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
448bool 483bool
449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 484bgPixmap_t::render_image (unsigned long background_flags)
450{ 485{
451 if (target == NULL) 486 if (target == NULL)
452 return false; 487 return false;
453 488
454 target->init_asv (); 489 target->init_asv ();
490
491 ASImage *background = NULL;
492 ARGB32 background_tint = TINT_LEAVE_SAME;
493
494# ifdef ENABLE_TRANSPARENCY
495 if (background_flags)
496 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
497
498 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
499 {
500 ShadingInfo as_shade;
501 as_shade.shading = (shade == 0) ? 100 : shade;
502
503 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
504 if (flags & tintSet)
505 tint.get (c);
506 as_shade.tintColor.red = c.r;
507 as_shade.tintColor.green = c.g;
508 as_shade.tintColor.blue = c.b;
509
510 background_tint = shading2tint32 (&as_shade);
511 }
512
513 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
514 {
515 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
516 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
517 100, ASIMAGE_QUALITY_DEFAULT);
518 if (tmp)
519 {
520 destroy_asimage (&background);
521 background = tmp;
522 }
523 }
524# endif
455 525
456 ASImage *result = 0; 526 ASImage *result = 0;
457 527
458 int target_width = target->szHint.width; 528 int target_width = target->szHint.width;
459 int target_height = target->szHint.height; 529 int target_height = target->szHint.height;
460 int new_pmap_width = target_width; 530 int new_pmap_width = target_width;
461 int new_pmap_height = target_height; 531 int new_pmap_height = target_height;
462 532
463 int x = 0; 533 int x = 0;
464 int y = 0; 534 int y = 0;
465 int w = h_scale * target_width / 100; 535 int w = 0;
466 int h = v_scale * target_height / 100; 536 int h = 0;
467 537
468 TIMING_TEST_START (asim); 538 TIMING_TEST_START (asim);
469 539
470 if (original_asim) 540 if (original_asim)
471 { 541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
472 if (h_align == rootAlign || v_align == rootAlign)
473 {
474 target->get_window_origin(x, y);
475 x = -x;
476 y = -y;
477 }
478
479 if (h_align != rootAlign)
480 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
481
482 if (v_align != rootAlign)
483 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
484 }
485 542
486 if (!original_asim 543 if (!original_asim
544 || (!(flags & rootAlign)
487 || x >= target_width 545 && (x >= target_width
488 || y >= target_height 546 || y >= target_height
489 || (w > 0 && x + w <= 0) 547 || (w > 0 && x + w <= 0)
490 || (h > 0 && y + h <= 0)) 548 || (h > 0 && y + h <= 0))))
491 { 549 {
492 if (background) 550 if (background)
493 { 551 {
494 new_pmap_width = background->width; 552 new_pmap_width = background->width;
495 new_pmap_height = background->height; 553 new_pmap_height = background->height;
… …
521 100, ASIMAGE_QUALITY_DEFAULT); 579 100, ASIMAGE_QUALITY_DEFAULT);
522 } 580 }
523 581
524 if (background == NULL) 582 if (background == NULL)
525 { 583 {
526 /* if tiling - pixmap has to be sized exactly as the image,
527 but there is no need to make it bigger than the window! */
528 if (h_scale == 0)
529 new_pmap_width = min (result->width, target_width);
530 if (v_scale == 0)
531 new_pmap_height = min (result->height, target_height);
532 /* we also need to tile our image in one or both directions */
533 if (h_scale == 0 || v_scale == 0) 584 if (h_scale == 0 || v_scale == 0)
534 { 585 {
586 /* if tiling - pixmap has to be sized exactly as the image,
587 but there is no need to make it bigger than the window! */
588 new_pmap_width = min (result->width, target_width);
589 new_pmap_height = min (result->height, target_height);
590
591 /* we also need to tile our image in both directions */
535 ASImage *tmp = tile_asimage (target->asv, result, 592 ASImage *tmp = tile_asimage (target->asv, result,
536 (h_scale > 0) ? 0 : (int)result->width - x, 593 (int)result->width - x,
537 (v_scale > 0) ? 0 : (int)result->height - y, 594 (int)result->height - y,
538 new_pmap_width, 595 new_pmap_width,
539 new_pmap_height, 596 new_pmap_height,
540 TINT_LEAVE_SAME, ASA_XImage, 597 TINT_LEAVE_SAME, ASA_XImage,
541 100, ASIMAGE_QUALITY_DEFAULT); 598 100, ASIMAGE_QUALITY_DEFAULT);
542 if (tmp) 599 if (tmp)
… …
550 } 607 }
551 else 608 else
552 { 609 {
553 /* if blending background and image - pixmap has to be sized same as target window */ 610 /* if blending background and image - pixmap has to be sized same as target window */
554 ASImageLayer *layers = create_image_layers (2); 611 ASImageLayer *layers = create_image_layers (2);
555 ASImage *merged_im = NULL;
556 612
557 layers[0].im = background; 613 layers[0].im = background;
558 layers[0].clip_width = target_width; 614 layers[0].clip_width = target_width;
559 layers[0].clip_height = target_height; 615 layers[0].clip_height = target_height;
560 layers[0].tint = background_tint; 616 layers[0].tint = background_tint;
… …
607 free (layers); 663 free (layers);
608 } 664 }
609 } 665 }
610 TIMING_TEST_PRINT_RESULT (asim); 666 TIMING_TEST_PRINT_RESULT (asim);
611 667
612 if (pixmap) 668 bool ret = false;
613 {
614 if (result == NULL
615 || pmap_width != new_pmap_width
616 || pmap_height != new_pmap_height
617 || pmap_depth != target->depth)
618 {
619 XFreePixmap (target->dpy, pixmap);
620 pixmap = None;
621 }
622 }
623 669
624 if (result) 670 if (result)
625 { 671 {
626 XGCValues gcv; 672 XGCValues gcv;
627 GC gc; 673 GC gc;
674
675 if (pixmap)
676 {
677 if (pmap_width != new_pmap_width
678 || pmap_height != new_pmap_height
679 || pmap_depth != target->depth)
680 {
681 XFreePixmap (target->dpy, pixmap);
682 pixmap = None;
683 }
684 }
628 685
629 /* create Pixmap */ 686 /* create Pixmap */
630 if (pixmap == None) 687 if (pixmap == None)
631 { 688 {
632 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 689 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
633 pmap_width = new_pmap_width; 690 pmap_width = new_pmap_width;
634 pmap_height = new_pmap_height; 691 pmap_height = new_pmap_height;
635 pmap_depth = target->depth; 692 pmap_depth = target->depth;
636 } 693 }
637 /* fill with background color ( if result's not completely overlapping it)*/ 694 /* fill with background color (if result's not completely overlapping it) */
638 gcv.foreground = target->pix_colors[Color_bg]; 695 gcv.foreground = target->pix_colors[Color_bg];
639 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 696 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
640 697
641 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 698 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
642 int dst_width = result->width, dst_height = result->height; 699 int dst_width = result->width, dst_height = result->height;
643 if (background == NULL) 700 if (background == NULL)
644 { 701 {
702 if (!(h_scale == 0 || v_scale == 0))
703 {
645 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 704 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
646 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 705 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
706 }
647 707
648 if (dst_x > 0 || dst_y > 0 708 if (dst_x > 0 || dst_y > 0
649 || dst_x + dst_width < new_pmap_width 709 || dst_x + dst_width < new_pmap_width
650 || dst_y + dst_height < new_pmap_height) 710 || dst_y + dst_height < new_pmap_height)
651 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 711 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
658 if (result != background && result != original_asim) 718 if (result != background && result != original_asim)
659 destroy_asimage (&result); 719 destroy_asimage (&result);
660 720
661 XFreeGC (target->dpy, gc); 721 XFreeGC (target->dpy, gc);
662 TIMING_TEST_PRINT_RESULT (asim); 722 TIMING_TEST_PRINT_RESULT (asim);
663 }
664 723
724 ret = true;
725 }
726
727 if (background)
728 destroy_asimage (&background);
729
665 return true; 730 return ret;
666} 731}
667# endif /* HAVE_AFTERIMAGE */ 732# endif /* HAVE_AFTERIMAGE */
733
734# ifdef HAVE_PIXBUF
735bool
736bgPixmap_t::render_image (unsigned long background_flags)
737{
738 if (target == NULL)
739 return false;
740
741 if (!pixbuf)
742 return false;
743
744 // TODO: add alpha blending
745 if (background_flags)
746 return false;
747
748 GdkPixbuf *result;
749
750 int image_width = gdk_pixbuf_get_width (pixbuf);
751 int image_height = gdk_pixbuf_get_height (pixbuf);
752
753 int target_width = target->szHint.width;
754 int target_height = target->szHint.height;
755 int new_pmap_width = target_width;
756 int new_pmap_height = target_height;
757
758 int x = 0;
759 int y = 0;
760 int w = 0;
761 int h = 0;
762
763 get_image_geometry (image_width, image_height, w, h, x, y);
764
765 if (!(flags & rootAlign)
766 && (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 */
668 873
669bool 874bool
670bgPixmap_t::set_file (const char *file) 875bgPixmap_t::set_file (const char *file)
671{ 876{
672 assert (file); 877 assert (file);
673 878
674 if (*file) 879 if (*file)
675 { 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
676# ifdef HAVE_AFTERIMAGE 890# ifdef HAVE_AFTERIMAGE
677 if (!target->asimman) 891 if (!target->asimman)
678 target->asimman = create_generic_imageman (target->rs[Rs_path]); 892 target->asimman = create_generic_imageman (target->rs[Rs_path]);
679
680 if (const char *p = strchr (file, ';'))
681 {
682 size_t len = p - file;
683 char *f = (char *)malloc (len + 1);
684 memcpy (f, file, len);
685 f[len] = '\0';
686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
687 free (f);
688 }
689 else
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 893 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
894 if (original_asim)
895 have_image = true;
896 return have_image;
897# endif
691 898
692 return original_asim; 899# ifdef HAVE_PIXBUF
900 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
901 if (pixbuf)
902 have_image = true;
903 return have_image;
693# endif 904# endif
694 } 905 }
695 906
696 return false; 907 return false;
697} 908}
… …
717 int changed = 0; 928 int changed = 0;
718 unsigned int hr, vr; 929 unsigned int hr, vr;
719 int junk; 930 int junk;
720 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 931 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
721 932
722 if (!(geom_flags&WidthValue)) 933 if (!(geom_flags & WidthValue))
723 hr = 1; 934 hr = 1;
724 if (!(geom_flags&HeightValue)) 935 if (!(geom_flags & HeightValue))
725 vr = hr; 936 vr = hr;
726 937
727 if (h_blurRadius != hr) 938 if (h_blurRadius != hr)
728 { 939 {
729 ++changed; 940 ++changed;
… …
739 if (v_blurRadius == 0 && h_blurRadius == 0) 950 if (v_blurRadius == 0 && h_blurRadius == 0)
740 flags &= ~blurNeeded; 951 flags &= ~blurNeeded;
741 else 952 else
742 flags |= blurNeeded; 953 flags |= blurNeeded;
743 954
744 return (changed>0); 955 return (changed > 0);
745} 956}
746 957
747static inline unsigned long 958static inline unsigned long
748compute_tint_shade_flags (rxvt_color *tint, int shade) 959compute_tint_shade_flags (rxvt_color *tint, int shade)
749{ 960{
… …
766 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
767 else if (tint) 978 else if (tint)
768 { 979 {
769 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 980 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
770 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 981 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
771 { 982 {
772 flags |= bgPixmap_t::tintNeeded; 983 flags |= bgPixmap_t::tintNeeded;
773 } 984 }
774 } 985 }
775 986
776 if (flags & bgPixmap_t::tintNeeded) 987 if (flags & bgPixmap_t::tintNeeded)
777 { 988 {
778 if (flags & bgPixmap_t::tintWholesome) 989 if (flags & bgPixmap_t::tintWholesome)
… …
807{ 1018{
808 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1019 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
809 1020
810 if (new_flags != (flags & tintFlags)) 1021 if (new_flags != (flags & tintFlags))
811 { 1022 {
812 flags = (flags&~tintFlags)|new_flags; 1023 flags = (flags & ~tintFlags) | new_flags;
813 return true; 1024 return true;
814 } 1025 }
815 1026
816 return false; 1027 return false;
817} 1028}
818 1029
… …
833 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1044 flags = (flags & (~tintFlags | tintSet)) | new_flags;
834 return true; 1045 return true;
835 } 1046 }
836 1047
837 return false; 1048 return false;
1049}
1050
1051bool
1052bgPixmap_t::tint_pixmap (Pixmap pixmap)
1053{
1054 Window root = target->display->root;
1055 Display *dpy = target->dpy;
1056 int window_width = target->szHint.width;
1057 int window_height = target->szHint.height;
1058 bool ret = false;
1059
1060 if (flags & tintWholesome)
1061 {
1062 XGCValues gcv;
1063 GC gc;
1064
1065 /* In this case we can tint image server-side getting significant
1066 * performance improvements, as we eliminate XImage transfer
1067 */
1068 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand;
1070 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc)
1073 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1075 ret = true;
1076 XFreeGC (dpy, gc);
1077 }
1078 }
1079 else
1080 {
1081# if XFT
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083
1084 if (flags & tintSet)
1085 tint.get (c);
1086
1087 if (shade > 0 && shade < 100)
1088 {
1089 c.r = (c.r * shade) / 100;
1090 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100;
1092 }
1093 else if (shade > 100 && shade < 200)
1094 {
1095 c.r = (c.r * (200 - shade)) / 100;
1096 c.g = (c.g * (200 - shade)) / 100;
1097 c.b = (c.b * (200 - shade)) / 100;
1098 }
1099
1100 XRenderPictFormat pf;
1101 pf.type = PictTypeDirect;
1102 pf.depth = 32;
1103 pf.direct.redMask = 0xff;
1104 pf.direct.greenMask = 0xff;
1105 pf.direct.blueMask = 0xff;
1106 pf.direct.alphaMask = 0xff;
1107
1108 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1109 (PictFormatType|
1110 PictFormatDepth|
1111 PictFormatRedMask|
1112 PictFormatGreenMask|
1113 PictFormatBlueMask|
1114 PictFormatAlphaMask),
1115 &pf,
1116 0);
1117 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1118 XRenderPictureAttributes pa;
1119
1120 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1121
1122 pa.repeat = True;
1123
1124 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1125 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1126 XFreePixmap (dpy, overlay_pmap);
1127
1128 pa.component_alpha = True;
1129 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1130 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1131 XFreePixmap (dpy, mask_pmap);
1132
1133 if (mask_pic && overlay_pic && back_pic)
1134 {
1135 XRenderColor mask_c;
1136
1137 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1138 mask_c.alpha = 0xffff;
1139 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1140
1141 mask_c.alpha = 0;
1142 mask_c.red = 0xffff - c.r;
1143 mask_c.green = 0xffff - c.g;
1144 mask_c.blue = 0xffff - c.b;
1145 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1146 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1147 ret = true;
1148 }
1149
1150 XRenderFreePicture (dpy, mask_pic);
1151 XRenderFreePicture (dpy, overlay_pic);
1152 XRenderFreePicture (dpy, back_pic);
1153# if DO_TIMING_TEST
1154 XSync (dpy, False);
1155# endif
1156# endif
1157 }
1158
1159 return ret;
838} 1160}
839 1161
840/* make_transparency_pixmap() 1162/* make_transparency_pixmap()
841 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1163 * Builds a pixmap sized the same as terminal window, with depth same as the root window
842 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1164 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
848 unsigned long result = 0; 1170 unsigned long result = 0;
849 1171
850 if (target == NULL) 1172 if (target == NULL)
851 return 0; 1173 return 0;
852 1174
853 /* root dimentions may change from call to call - but Display structure should 1175 /* root dimensions may change from call to call - but Display structure should
854 * be always up-to-date, so let's use it : 1176 * be always up-to-date, so let's use it :
855 */ 1177 */
856 Window root = target->display->root; 1178 Window root = target->display->root;
857 int screen = target->display->screen; 1179 int screen = target->display->screen;
858 Display *dpy = target->dpy; 1180 Display *dpy = target->dpy;
… …
903 1225
904 attr.background_pixmap = ParentRelative; 1226 attr.background_pixmap = ParentRelative;
905 attr.backing_store = Always; 1227 attr.backing_store = Always;
906 attr.event_mask = ExposureMask; 1228 attr.event_mask = ExposureMask;
907 attr.override_redirect = True; 1229 attr.override_redirect = True;
908 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1230 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
909 CopyFromParent, CopyFromParent, CopyFromParent, 1231 CopyFromParent, CopyFromParent, CopyFromParent,
910 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1232 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
911 &attr); 1233 &attr);
912 1234
913 if (src != None) 1235 if (src != None)
… …
937 XDestroyWindow (dpy, src); 1259 XDestroyWindow (dpy, src);
938 XUngrabServer (dpy); 1260 XUngrabServer (dpy);
939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1261 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
940 } 1262 }
941 1263
942 if (!success) 1264 if (!success)
943 { 1265 {
944 XFreePixmap (dpy, tiled_root_pmap); 1266 XFreePixmap (dpy, tiled_root_pmap);
945 tiled_root_pmap = None; 1267 tiled_root_pmap = None;
946 } 1268 }
947 else 1269 else
948 result |= transpPmapTiled; 1270 result |= transpPmapTiled;
949 } 1271 }
950 else 1272 else
951 { 1273 {
952 /* strightforward pixmap copy */ 1274 /* straightforward pixmap copy */
953 gcv.tile = root_pixmap; 1275 gcv.tile = root_pixmap;
954 gcv.fill_style = FillTiled; 1276 gcv.fill_style = FillTiled;
955 1277
956 while (sx < 0) sx += (int)root_width; 1278 while (sx < 0) sx += (int)root_width;
957 while (sy < 0) sy += (int)root_height; 1279 while (sy < 0) sy += (int)root_height;
… …
972 { 1294 {
973 if (!need_client_side_rendering ()) 1295 if (!need_client_side_rendering ())
974 { 1296 {
975 if ((flags & tintNeeded)) 1297 if ((flags & tintNeeded))
976 { 1298 {
977 if (flags & tintWholesome) 1299 if (tint_pixmap (tiled_root_pmap))
978 {
979 /* In this case we can tint image server-side getting significant
980 * performance improvements, as we eliminate XImage transfer
981 */
982 gcv.foreground = Pixel (tint);
983 gcv.function = GXand;
984 gcv.fill_style = FillSolid;
985 if (gc)
986 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
987 else
988 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
989 if (gc)
990 {
991 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
992 result |= transpPmapTinted; 1300 result |= transpPmapTinted;
993 }
994 }
995 else
996 {
997# if XFT
998 Picture back_pic = 0;
999 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1000
1001 if (flags & tintSet)
1002 tint.get (c);
1003
1004 if (shade > 0 && shade < 100)
1005 {
1006 c.r = (c.r * shade) / 100;
1007 c.g = (c.g * shade) / 100;
1008 c.b = (c.b * shade) / 100;
1009 }
1010 else if (shade > 100 && shade < 200)
1011 {
1012 c.r = (c.r * (200 - shade)) / 100;
1013 c.g = (c.g * (200 - shade)) / 100;
1014 c.b = (c.b * (200 - shade)) / 100;
1015 }
1016
1017 XRenderPictFormat pf;
1018 pf.type = PictTypeDirect;
1019 pf.depth = 32;
1020 pf.direct.redMask = 0xff;
1021 pf.direct.greenMask = 0xff;
1022 pf.direct.blueMask = 0xff;
1023 pf.direct.alphaMask = 0xff;
1024
1025 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1026 (PictFormatType|
1027 PictFormatDepth|
1028 PictFormatRedMask|
1029 PictFormatGreenMask|
1030 PictFormatBlueMask|
1031 PictFormatAlphaMask),
1032 &pf,
1033 0);
1034 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1035 XRenderPictureAttributes pa ;
1036
1037 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1038
1039 pa.repeat = True;
1040
1041 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1042 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1043 XFreePixmap (dpy, overlay_pmap);
1044
1045 pa.component_alpha = True;
1046 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1047 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1048 XFreePixmap (dpy, mask_pmap);
1049
1050 if (mask_pic && overlay_pic && back_pic)
1051 {
1052 XRenderColor mask_c;
1053
1054 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1055 mask_c.alpha = 0xffff;
1056 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1057
1058 mask_c.alpha = 0;
1059 mask_c.red = 0xffff - c.r;
1060 mask_c.green = 0xffff - c.g;
1061 mask_c.blue = 0xffff - c.b;
1062 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1063 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1064 result |= transpPmapTinted;
1065 }
1066
1067 XRenderFreePicture (dpy, mask_pic);
1068 XRenderFreePicture (dpy, overlay_pic);
1069 XRenderFreePicture (dpy, back_pic);
1070# if DO_TIMING_TEST
1071 XSync (dpy, False);
1072# endif
1073# endif
1074 }
1075 } 1301 }
1076 } /* server side rendering completed */ 1302 } /* server side rendering completed */
1077 1303
1078 if (pixmap) 1304 if (pixmap)
1079 XFreePixmap (dpy, pixmap); 1305 XFreePixmap (dpy, pixmap);
1080 1306
… …
1130 /* we need to re-generate transparency pixmap in that case ! */ 1356 /* we need to re-generate transparency pixmap in that case ! */
1131 background_flags = make_transparency_pixmap (); 1357 background_flags = make_transparency_pixmap ();
1132 if (background_flags == 0) 1358 if (background_flags == 0)
1133 return false; 1359 return false;
1134 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1360 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1135 && pmap_depth == target->depth) 1361 && pmap_depth == target->depth)
1136 flags = flags & ~isInvalid; 1362 flags = flags & ~isInvalid;
1137 } 1363 }
1138# endif 1364# endif
1139 1365
1366# ifdef BG_IMAGE_FROM_FILE
1367 if (have_image
1368 || (background_flags & transpTransformations) != (flags & transpTransformations))
1369 {
1370 if (render_image (background_flags))
1371 flags = flags & ~isInvalid;
1372 }
1373# endif
1374
1140 XImage *result = NULL; 1375 XImage *result = NULL;
1141# ifdef HAVE_AFTERIMAGE 1376
1142 if (original_asim 1377 if (background_flags && (flags & isInvalid))
1143 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1378 {
1379 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1144 { 1380 }
1145 target->init_asv ();
1146 1381
1147 ASImage *background = NULL; 1382 if (result)
1148 ARGB32 as_tint = TINT_LEAVE_SAME; 1383 {
1149 if (background_flags) 1384# if !defined(HAVE_AFTERIMAGE) && !XFT
1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1385 /* our own client-side tinting */
1151 1386 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1152# ifdef ENABLE_TRANSPARENCY 1387 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1154 {
1155 ShadingInfo as_shade;
1156 as_shade.shading = (shade == 0) ? 100 : shade;
1157
1158 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1159 if (flags & tintSet)
1160 tint.get (c);
1161 as_shade.tintColor.red = c.r;
1162 as_shade.tintColor.green = c.g;
1163 as_shade.tintColor.blue = c.b;
1164
1165 as_tint = shading2tint32 (&as_shade);
1166 }
1167
1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1169 {
1170 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1172 100, ASIMAGE_QUALITY_DEFAULT);
1173 if (tmp)
1174 {
1175 destroy_asimage (&background);
1176 background = tmp;
1177 }
1178 }
1179# endif
1180
1181 if (render_asim (background, as_tint))
1182 flags = flags & ~isInvalid;
1183 if (background)
1184 destroy_asimage (&background);
1185 }
1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1195 {
1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1197
1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1199 { 1389 {
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201 if (flags & tintSet) 1391 if (flags & tintSet)
1202 tint.get (c); 1392 tint.get (c);
1203 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1393 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1204 } 1394 }
1205 } 1395# endif
1206# endif /* HAVE_AFTERIMAGE */
1207 1396
1208 if (result)
1209 {
1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1397 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211 1398
1212 if (gc) 1399 if (gc)
1213 { 1400 {
1214 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1401 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1243 1430
1244 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1245 flags = flags & ~isInvalid; 1432 flags = flags & ~isInvalid;
1246 } 1433 }
1247 1434
1248 XDestroyImage (result); 1435 XDestroyImage (result);
1249 } 1436 }
1250 1437
1251 if (flags & isInvalid) 1438 if (flags & isInvalid)
1252 { 1439 {
1253 if (pixmap != None) 1440 if (pixmap != None)

Diff Legend

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