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.44 by sf-exg, Sun Aug 29 15:12:41 2010 UTC vs.
Revision 1.74 by sf-exg, Sun Oct 10 21:56:09 2010 UTC

… …
52 * 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
53 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
54 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
55 * effects on the background image : 55 * effects on the background image :
56 * 56 *
57 * 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%.
58 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
59 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
60 * the image in the window. 60 * the image in the window.
61 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
62 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
63 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
64 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
65 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
66 * 66 *
67 * Adjusting position only : 67 * Adjusting position only :
68 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
69 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
70 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
71 * from current position (relative). 71 * from current position (relative).
72 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
73 * from current position. 73 * from current position.
74 * 74 *
75 * Adjusting scale only : 75 * Adjusting scale only :
76 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
77 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
78 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
79 * 79 *
80 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
81 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
82 * the tile size and origin. 82 * the tile size and origin.
83 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
84 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
85 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
86 * current background color. 86 * current background color.
87 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
88 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
96 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs 97 // zero_initialised-derived structs
98#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
99 original_asim = NULL; 99 original_asim = NULL;
100#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
101#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
102 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
103 h_align = v_align = 0; 107 h_align = v_align = 0;
104#endif 108#endif
105 flags = 0; 109 flags = 0;
106 pixmap = None; 110 pixmap = None;
… …
114#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
115 if (original_asim) 119 if (original_asim)
116 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
117#endif 121#endif
118 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
119 if (pixmap && target) 128 if (pixmap && target)
120 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
121} 130}
122 131
123bool 132bool
… …
127 if (flags & isTransparent) 136 if (flags & isTransparent)
128 return true; 137 return true;
129# endif 138# endif
130 139
131# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
132# ifdef HAVE_AFTERIMAGE 141 if (have_image)
133 if (original_asim)
134# endif
135 { 142 {
136 if (h_scale != 0 || v_scale != 0 143 if (flags & sizeSensitive)
137 || h_align != 0 || v_align != 0)
138 return true; 144 return true;
139 } 145 }
140# endif 146# endif
141 147
142 return false; 148 return false;
… …
149 if (flags & isTransparent) 155 if (flags & isTransparent)
150 return true; 156 return true;
151# endif 157# endif
152 158
153# ifdef BG_IMAGE_FROM_FILE 159# ifdef BG_IMAGE_FROM_FILE
154# ifdef HAVE_AFTERIMAGE 160 if (have_image)
155 if (original_asim)
156# endif
157 { 161 {
158 if (h_align == rootAlign || v_align == rootAlign) 162 if (flags & rootAlign)
159 return true; 163 return true;
160 } 164 }
161# endif 165# endif
162 166
163 return false; 167 return false;
… …
203static inline bool 207static inline bool
204check_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)
205{ 209{
206 if (geom_flags & flag) 210 if (geom_flags & flag)
207 { 211 {
208 if (new_value != bgPixmap_t::rootAlign)
209 {
210 if (new_value < -100) 212 if (new_value < -100)
211 new_value = -100; 213 new_value = -100;
212 else if (new_value > 200) 214 else if (new_value > 200)
213 new_value = 200; 215 new_value = 200;
214 }
215 if (new_value != align) 216 if (new_value != align)
216 { 217 {
217 align = new_value; 218 align = new_value;
218 return true; 219 return true;
219 } 220 }
… …
223 224
224static inline int 225static inline int
225make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
226{ 227{
227 int diff = window_size - image_size; 228 int diff = window_size - image_size;
228 int smaller = MIN (image_size,window_size); 229 int smaller = min (image_size, window_size);
229 230
230 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
231 return diff * align / 100; 232 return diff * align / 100;
232 else if (align > 50 && align <= 100)
233 return window_size - image_size - diff * (100 - align) / 100;
234 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
235 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
236 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
237 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
238 return 0; 237 return 0;
239} 238}
240 239
241static inline int 240static inline int
242make_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)
243{ 242{
244 int src_pos = 0; 243 int src_pos = 0;
245 dst_pos = 0; 244 dst_pos = pos;
246 dst_size = size; 245 dst_size = size;
247 if (pos < 0 && size > target_size) 246 if (pos < 0)
248 { 247 {
249 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
250 dst_size += pos; 250 dst_size += pos;
251 } 251 }
252 else if (pos > 0)
253 dst_pos = pos;
254 252
255 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
256 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
257 return src_pos; 255 return src_pos;
258} 256}
… …
383 w = h = noScale; 381 w = h = noScale;
384 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
385 } 383 }
386 else if (CHECK_GEOM_OPS ("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
387 { 385 {
388 if (w == 0 && h == 0)
389 {
390 w = windowScale;
391 geom_flags |= WidthValue;
392 }
393 new_flags |= propScale; 386 new_flags |= propScale;
394 } 387 }
395 else if (CHECK_GEOM_OPS ("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
396 { 389 {
397 if (w == 0) w = windowScale; 390 if (w == 0) w = windowScale;
… …
419 x = y = centerAlign; 412 x = y = centerAlign;
420 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
421 } 414 }
422 else if (CHECK_GEOM_OPS ("root")) 415 else if (CHECK_GEOM_OPS ("root"))
423 { 416 {
417 new_flags |= rootAlign;
424 w = h = noScale; 418 w = h = noScale;
425 x = y = rootAlign;
426 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue;
427 } 420 }
428# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
429 422
430 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
431 } /* done parsing ops */ 424 } /* done parsing ops */
… …
441 { 434 {
442 flags = new_flags; 435 flags = new_flags;
443 changed++; 436 changed++;
444 } 437 }
445 438
446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447// flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
448 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 (!w) w = image_width;
464 if (!h) h = image_height;
465
466 if (flags & rootAlign)
467 {
468 target->get_window_origin (x, y);
469 x = -x;
470 y = -y;
471 }
472 else
473 {
474 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || w > target_width || h > target_height)
482 flags |= sizeSensitive;
449} 483}
450 484
451# ifdef HAVE_AFTERIMAGE 485# ifdef HAVE_AFTERIMAGE
452bool 486bool
453bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 487bgPixmap_t::render_image (unsigned long background_flags)
454{ 488{
455 if (target == NULL) 489 if (target == NULL)
456 return false; 490 return false;
457 491
458 target->init_asv (); 492 target->init_asv ();
493
494 ASImage *background = NULL;
495 ARGB32 background_tint = TINT_LEAVE_SAME;
496
497# ifdef ENABLE_TRANSPARENCY
498 if (background_flags)
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 {
503 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade;
505
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet)
508 tint.get (c);
509 as_shade.tintColor.red = c.r;
510 as_shade.tintColor.green = c.g;
511 as_shade.tintColor.blue = c.b;
512
513 background_tint = shading2tint32 (&as_shade);
514 }
515
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
517 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp)
522 {
523 destroy_asimage (&background);
524 background = tmp;
525 }
526 }
527# endif
459 528
460 ASImage *result = 0; 529 ASImage *result = 0;
461 530
462 int target_width = target->szHint.width; 531 int target_width = target->szHint.width;
463 int target_height = target->szHint.height; 532 int target_height = target->szHint.height;
464 int new_pmap_width = target_width; 533 int new_pmap_width = target_width;
465 int new_pmap_height = target_height; 534 int new_pmap_height = target_height;
466 535
467 int x = 0; 536 int x = 0;
468 int y = 0; 537 int y = 0;
469 int w = h_scale * target_width / 100; 538 int w = 0;
470 int h = v_scale * target_height / 100; 539 int h = 0;
471 540
472 TIMING_TEST_START (asim); 541 TIMING_TEST_START (asim);
473 542
474 if (original_asim) 543 if (original_asim)
475 { 544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
476 if (h_align == rootAlign || v_align == rootAlign)
477 {
478 target->get_window_origin(x, y);
479 x = -x;
480 y = -y;
481 }
482
483 if (h_align != rootAlign)
484 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
485
486 if (v_align != rootAlign)
487 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
488 }
489 545
490 if (!original_asim 546 if (!original_asim
547 || (!(flags & rootAlign)
491 || x >= target_width 548 && (x >= target_width
492 || y >= target_height 549 || y >= target_height
493 || (w > 0 && x + w <= 0) 550 || (x + w <= 0)
494 || (h > 0 && y + h <= 0)) 551 || (y + h <= 0))))
495 { 552 {
496 if (background) 553 if (background)
497 { 554 {
498 new_pmap_width = background->width; 555 new_pmap_width = background->width;
499 new_pmap_height = background->height; 556 new_pmap_height = background->height;
… …
513 } 570 }
514 else 571 else
515 { 572 {
516 result = original_asim; 573 result = original_asim;
517 574
518 if ((w > 0 && w != original_asim->width) 575 if ((w != original_asim->width)
519 || (h > 0 && h != original_asim->height)) 576 || (h != original_asim->height))
520 { 577 {
521 result = scale_asimage (target->asv, original_asim, 578 result = scale_asimage (target->asv, original_asim,
522 w > 0 ? w : original_asim->width, 579 w, h,
523 h > 0 ? h : original_asim->height,
524 background ? ASA_ASImage : ASA_XImage, 580 background ? ASA_ASImage : ASA_XImage,
525 100, ASIMAGE_QUALITY_DEFAULT); 581 100, ASIMAGE_QUALITY_DEFAULT);
526 } 582 }
527 583
528 if (background == NULL) 584 if (background == NULL)
529 { 585 {
530 /* if tiling - pixmap has to be sized exactly as the image,
531 but there is no need to make it bigger than the window! */
532 if (h_scale == 0)
533 new_pmap_width = min (result->width, target_width);
534 if (v_scale == 0)
535 new_pmap_height = min (result->height, target_height);
536 /* we also need to tile our image in one or both directions */
537 if (h_scale == 0 || v_scale == 0) 586 if (h_scale == 0 || v_scale == 0)
538 { 587 {
588 /* if tiling - pixmap has to be sized exactly as the image,
589 but there is no need to make it bigger than the window! */
590 new_pmap_width = min (result->width, target_width);
591 new_pmap_height = min (result->height, target_height);
592
593 /* we also need to tile our image in both directions */
539 ASImage *tmp = tile_asimage (target->asv, result, 594 ASImage *tmp = tile_asimage (target->asv, result,
540 (h_scale > 0) ? 0 : (int)result->width - x, 595 (int)result->width - x,
541 (v_scale > 0) ? 0 : (int)result->height - y, 596 (int)result->height - y,
542 new_pmap_width, 597 new_pmap_width,
543 new_pmap_height, 598 new_pmap_height,
544 TINT_LEAVE_SAME, ASA_XImage, 599 TINT_LEAVE_SAME, ASA_XImage,
545 100, ASIMAGE_QUALITY_DEFAULT); 600 100, ASIMAGE_QUALITY_DEFAULT);
546 if (tmp) 601 if (tmp)
… …
561 layers[0].clip_width = target_width; 616 layers[0].clip_width = target_width;
562 layers[0].clip_height = target_height; 617 layers[0].clip_height = target_height;
563 layers[0].tint = background_tint; 618 layers[0].tint = background_tint;
564 layers[1].im = result; 619 layers[1].im = result;
565 620
566 if (w <= 0) 621 if (h_scale == 0 || v_scale == 0)
567 { 622 {
568 /* tile horizontally */ 623 /* tile horizontally */
569 while (x > 0) x -= (int)result->width; 624 while (x > 0) x -= (int)result->width;
570 layers[1].dst_x = x; 625 layers[1].dst_x = x;
571 layers[1].clip_width = result->width+target_width; 626 layers[1].clip_width = result->width+target_width;
… …
575 /* clip horizontally */ 630 /* clip horizontally */
576 layers[1].dst_x = x; 631 layers[1].dst_x = x;
577 layers[1].clip_width = result->width; 632 layers[1].clip_width = result->width;
578 } 633 }
579 634
580 if (h <= 0) 635 if (h_scale == 0 || v_scale == 0)
581 { 636 {
582 while (y > 0) y -= (int)result->height; 637 while (y > 0) y -= (int)result->height;
583 layers[1].dst_y = y; 638 layers[1].dst_y = y;
584 layers[1].clip_height = result->height + target_height; 639 layers[1].clip_height = result->height + target_height;
585 } 640 }
… …
610 free (layers); 665 free (layers);
611 } 666 }
612 } 667 }
613 TIMING_TEST_PRINT_RESULT (asim); 668 TIMING_TEST_PRINT_RESULT (asim);
614 669
615 if (pixmap) 670 bool ret = false;
616 {
617 if (result == NULL
618 || pmap_width != new_pmap_width
619 || pmap_height != new_pmap_height
620 || pmap_depth != target->depth)
621 {
622 XFreePixmap (target->dpy, pixmap);
623 pixmap = None;
624 }
625 }
626 671
627 if (result) 672 if (result)
628 { 673 {
629 XGCValues gcv; 674 XGCValues gcv;
630 GC gc; 675 GC gc;
676
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
631 687
632 /* create Pixmap */ 688 /* create Pixmap */
633 if (pixmap == None) 689 if (pixmap == None)
634 { 690 {
635 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
636 pmap_width = new_pmap_width; 692 pmap_width = new_pmap_width;
637 pmap_height = new_pmap_height; 693 pmap_height = new_pmap_height;
638 pmap_depth = target->depth; 694 pmap_depth = target->depth;
639 } 695 }
640 /* fill with background color ( if result's not completely overlapping it)*/ 696 /* fill with background color (if result's not completely overlapping it) */
641 gcv.foreground = target->pix_colors[Color_bg]; 697 gcv.foreground = target->pix_colors[Color_bg];
642 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 698 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
643 699
644 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 700 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
645 int dst_width = result->width, dst_height = result->height; 701 int dst_width = result->width, dst_height = result->height;
646 if (background == NULL) 702 if (background == NULL)
647 { 703 {
704 if (!(h_scale == 0 || v_scale == 0))
705 {
648 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 706 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
649 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 707 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
708 }
650 709
651 if (dst_x > 0 || dst_y > 0 710 if (dst_x > 0 || dst_y > 0
652 || dst_x + dst_width < new_pmap_width 711 || dst_x + dst_width < new_pmap_width
653 || dst_y + dst_height < new_pmap_height) 712 || dst_y + dst_height < new_pmap_height)
654 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 713 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
661 if (result != background && result != original_asim) 720 if (result != background && result != original_asim)
662 destroy_asimage (&result); 721 destroy_asimage (&result);
663 722
664 XFreeGC (target->dpy, gc); 723 XFreeGC (target->dpy, gc);
665 TIMING_TEST_PRINT_RESULT (asim); 724 TIMING_TEST_PRINT_RESULT (asim);
666 }
667 725
726 ret = true;
727 }
728
729 if (background)
730 destroy_asimage (&background);
731
668 return true; 732 return ret;
669} 733}
670# endif /* HAVE_AFTERIMAGE */ 734# endif /* HAVE_AFTERIMAGE */
735
736# ifdef HAVE_PIXBUF
737bool
738bgPixmap_t::render_image (unsigned long background_flags)
739{
740 if (target == NULL)
741 return false;
742
743 if (!pixbuf)
744 return false;
745
746 // TODO: add alpha blending
747 if (background_flags)
748 return false;
749
750 GdkPixbuf *result;
751
752 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf);
754
755 int target_width = target->szHint.width;
756 int target_height = target->szHint.height;
757 int new_pmap_width = target_width;
758 int new_pmap_height = target_height;
759
760 int x = 0;
761 int y = 0;
762 int w = 0;
763 int h = 0;
764
765 get_image_geometry (image_width, image_height, w, h, x, y);
766
767 if (!(flags & rootAlign)
768 && (x >= target_width
769 || y >= target_height
770 || (x + w <= 0)
771 || (y + h <= 0)))
772 return false;
773
774 result = pixbuf;
775
776 if ((w != image_width)
777 || (h != image_height))
778 {
779 result = gdk_pixbuf_scale_simple (pixbuf,
780 w, h,
781 GDK_INTERP_BILINEAR);
782 }
783
784 bool ret = false;
785
786 if (result)
787 {
788 XGCValues gcv;
789 GC gc;
790
791 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result);
793
794 if (h_scale == 0 || v_scale == 0)
795 {
796 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None)
812 {
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height;
816 pmap_depth = target->depth;
817 }
818
819 gcv.foreground = target->pix_colors[Color_bg];
820 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
821
822 if (h_scale == 0 || v_scale == 0)
823 {
824 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
825 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
826 0, 0,
827 0, 0,
828 image_width, image_height,
829 XLIB_RGB_DITHER_NONE,
830 0, 0);
831
832 gcv.tile = tile;
833 gcv.fill_style = FillTiled;
834 gcv.ts_x_origin = x;
835 gcv.ts_y_origin = y;
836 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
837
838 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
839 XFreePixmap (target->dpy, tile);
840 }
841 else
842 {
843 int src_x, src_y, dst_x, dst_y;
844 int dst_width, dst_height;
845
846 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
847 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
848
849 if (dst_x > 0 || dst_y > 0
850 || dst_x + dst_width < new_pmap_width
851 || dst_y + dst_height < new_pmap_height)
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853
854 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
855 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
856 src_x, src_y,
857 dst_x, dst_y,
858 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE,
860 0, 0);
861 }
862
863 if (result != pixbuf)
864 g_object_unref (result);
865
866 XFreeGC (target->dpy, gc);
867
868 ret = true;
869 }
870
871 return ret;
872}
873# endif /* HAVE_PIXBUF */
671 874
672bool 875bool
673bgPixmap_t::set_file (const char *file) 876bgPixmap_t::set_file (const char *file)
674{ 877{
675 assert (file); 878 assert (file);
… …
687 890
688# ifdef HAVE_AFTERIMAGE 891# ifdef HAVE_AFTERIMAGE
689 if (!target->asimman) 892 if (!target->asimman)
690 target->asimman = create_generic_imageman (target->rs[Rs_path]); 893 target->asimman = create_generic_imageman (target->rs[Rs_path]);
691 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
692 return original_asim; 895 if (original_asim)
896 have_image = true;
897 return have_image;
898# endif
899
900# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
902 if (pixbuf)
903 have_image = true;
904 return have_image;
693# endif 905# endif
694 } 906 }
695 907
696 return false; 908 return false;
697} 909}
… …
717 int changed = 0; 929 int changed = 0;
718 unsigned int hr, vr; 930 unsigned int hr, vr;
719 int junk; 931 int junk;
720 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
721 933
722 if (!(geom_flags&WidthValue)) 934 if (!(geom_flags & WidthValue))
723 hr = 1; 935 hr = 1;
724 if (!(geom_flags&HeightValue)) 936 if (!(geom_flags & HeightValue))
725 vr = hr; 937 vr = hr;
726 938
727 if (h_blurRadius != hr) 939 if (h_blurRadius != hr)
728 { 940 {
729 ++changed; 941 ++changed;
… …
739 if (v_blurRadius == 0 && h_blurRadius == 0) 951 if (v_blurRadius == 0 && h_blurRadius == 0)
740 flags &= ~blurNeeded; 952 flags &= ~blurNeeded;
741 else 953 else
742 flags |= blurNeeded; 954 flags |= blurNeeded;
743 955
744 return (changed>0); 956 return (changed > 0);
745} 957}
746 958
747static inline unsigned long 959static inline unsigned long
748compute_tint_shade_flags (rxvt_color *tint, int shade) 960compute_tint_shade_flags (rxvt_color *tint, int shade)
749{ 961{
… …
766 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
767 else if (tint) 979 else if (tint)
768 { 980 {
769 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 981 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
770 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 982 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
771 { 983 {
772 flags |= bgPixmap_t::tintNeeded; 984 flags |= bgPixmap_t::tintNeeded;
773 } 985 }
774 } 986 }
775 987
776 if (flags & bgPixmap_t::tintNeeded) 988 if (flags & bgPixmap_t::tintNeeded)
777 { 989 {
778 if (flags & bgPixmap_t::tintWholesome) 990 if (flags & bgPixmap_t::tintWholesome)
… …
789} 1001}
790 1002
791bool 1003bool
792bgPixmap_t::set_tint (rxvt_color &new_tint) 1004bgPixmap_t::set_tint (rxvt_color &new_tint)
793{ 1005{
794 if (tint != new_tint) 1006 if (!(flags & tintSet) || tint != new_tint)
795 { 1007 {
796 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
797 tint = new_tint; 1009 tint = new_tint;
798 flags = (flags & ~tintFlags) | new_flags | tintSet; 1010 flags = (flags & ~tintFlags) | new_flags | tintSet;
799 return true; 1011 return true;
… …
807{ 1019{
808 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1020 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
809 1021
810 if (new_flags != (flags & tintFlags)) 1022 if (new_flags != (flags & tintFlags))
811 { 1023 {
812 flags = (flags&~tintFlags)|new_flags; 1024 flags = (flags & ~tintFlags) | new_flags;
813 return true; 1025 return true;
814 } 1026 }
815 1027
816 return false; 1028 return false;
817} 1029}
818 1030
… …
833 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1045 flags = (flags & (~tintFlags | tintSet)) | new_flags;
834 return true; 1046 return true;
835 } 1047 }
836 1048
837 return false; 1049 return false;
1050}
1051
1052bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height)
1054{
1055 Display *dpy = target->dpy;
1056 bool ret = false;
1057
1058 if (flags & tintWholesome)
1059 {
1060 XGCValues gcv;
1061 GC gc;
1062
1063 /* In this case we can tint image server-side getting significant
1064 * performance improvements, as we eliminate XImage transfer
1065 */
1066 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand;
1068 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc)
1071 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true;
1074 XFreeGC (dpy, gc);
1075 }
1076 }
1077 else
1078 {
1079# if XFT
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081
1082 if (flags & tintSet)
1083 tint.get (c);
1084
1085 if (shade > 0 && shade < 100)
1086 {
1087 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100;
1090 }
1091 else if (shade > 100 && shade < 200)
1092 {
1093 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1096 }
1097
1098 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1099 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1100 XRenderPictureAttributes pa;
1101
1102 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1103
1104 pa.repeat = True;
1105
1106 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1107 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1108 XFreePixmap (dpy, overlay_pmap);
1109
1110 pa.component_alpha = True;
1111 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1112 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1113 XFreePixmap (dpy, mask_pmap);
1114
1115 if (mask_pic && overlay_pic && back_pic)
1116 {
1117 XRenderColor mask_c;
1118
1119 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1120 mask_c.alpha = 0xffff;
1121 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1122
1123 mask_c.alpha = 0;
1124 mask_c.red = 0xffff - c.r;
1125 mask_c.green = 0xffff - c.g;
1126 mask_c.blue = 0xffff - c.b;
1127 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1128 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1129 ret = true;
1130 }
1131
1132 XRenderFreePicture (dpy, mask_pic);
1133 XRenderFreePicture (dpy, overlay_pic);
1134 XRenderFreePicture (dpy, back_pic);
1135# if DO_TIMING_TEST
1136 XSync (dpy, False);
1137# endif
1138# endif
1139 }
1140
1141 return ret;
838} 1142}
839 1143
840/* make_transparency_pixmap() 1144/* make_transparency_pixmap()
841 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1145 * 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 1146 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
903 1207
904 attr.background_pixmap = ParentRelative; 1208 attr.background_pixmap = ParentRelative;
905 attr.backing_store = Always; 1209 attr.backing_store = Always;
906 attr.event_mask = ExposureMask; 1210 attr.event_mask = ExposureMask;
907 attr.override_redirect = True; 1211 attr.override_redirect = True;
908 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1212 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
909 CopyFromParent, CopyFromParent, CopyFromParent, 1213 CopyFromParent, CopyFromParent, CopyFromParent,
910 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1214 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
911 &attr); 1215 &attr);
912 1216
913 if (src != None) 1217 if (src != None)
… …
937 XDestroyWindow (dpy, src); 1241 XDestroyWindow (dpy, src);
938 XUngrabServer (dpy); 1242 XUngrabServer (dpy);
939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1243 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
940 } 1244 }
941 1245
942 if (!success) 1246 if (!success)
943 { 1247 {
944 XFreePixmap (dpy, tiled_root_pmap); 1248 XFreePixmap (dpy, tiled_root_pmap);
945 tiled_root_pmap = None; 1249 tiled_root_pmap = None;
946 } 1250 }
947 else 1251 else
948 result |= transpPmapTiled; 1252 result |= transpPmapTiled;
949 } 1253 }
950 else 1254 else
951 { 1255 {
952 /* straightforward pixmap copy */ 1256 /* straightforward pixmap copy */
953 gcv.tile = root_pixmap; 1257 gcv.tile = root_pixmap;
… …
972 { 1276 {
973 if (!need_client_side_rendering ()) 1277 if (!need_client_side_rendering ())
974 { 1278 {
975 if ((flags & tintNeeded)) 1279 if ((flags & tintNeeded))
976 { 1280 {
977 if (flags & tintWholesome) 1281 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height))
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; 1282 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 } 1283 }
1076 } /* server side rendering completed */ 1284 } /* server side rendering completed */
1077 1285
1078 if (pixmap) 1286 if (pixmap)
1079 XFreePixmap (dpy, pixmap); 1287 XFreePixmap (dpy, pixmap);
1080 1288
… …
1130 /* we need to re-generate transparency pixmap in that case ! */ 1338 /* we need to re-generate transparency pixmap in that case ! */
1131 background_flags = make_transparency_pixmap (); 1339 background_flags = make_transparency_pixmap ();
1132 if (background_flags == 0) 1340 if (background_flags == 0)
1133 return false; 1341 return false;
1134 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1342 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1135 && pmap_depth == target->depth) 1343 && pmap_depth == target->depth)
1136 flags = flags & ~isInvalid; 1344 flags = flags & ~isInvalid;
1137 } 1345 }
1138# endif 1346# endif
1139 1347
1348# ifdef BG_IMAGE_FROM_FILE
1349 if (have_image
1350 || (background_flags & transpTransformations) != (flags & transpTransformations))
1351 {
1352 if (render_image (background_flags))
1353 flags = flags & ~isInvalid;
1354 }
1355# endif
1356
1140 XImage *result = NULL; 1357 XImage *result = NULL;
1141# ifdef HAVE_AFTERIMAGE 1358
1142 if (original_asim 1359 if (background_flags && (flags & isInvalid))
1143 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1360 {
1361 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1144 { 1362 }
1145 target->init_asv ();
1146 1363
1147 ASImage *background = NULL; 1364 if (result)
1148 ARGB32 as_tint = TINT_LEAVE_SAME; 1365 {
1149 if (background_flags) 1366# if !defined(HAVE_AFTERIMAGE) && !XFT
1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1367 /* our own client-side tinting */
1151 1368 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1152# ifdef ENABLE_TRANSPARENCY 1369 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1370 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 necessary 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 { 1371 {
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1372 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201 if (flags & tintSet) 1373 if (flags & tintSet)
1202 tint.get (c); 1374 tint.get (c);
1203 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1375 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1204 } 1376 }
1205 } 1377# endif
1206# endif /* HAVE_AFTERIMAGE */
1207 1378
1208 if (result)
1209 {
1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1379 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211 1380
1212 if (gc) 1381 if (gc)
1213 { 1382 {
1214 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1383 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1243 1412
1244 XFreeGC (target->dpy, gc); 1413 XFreeGC (target->dpy, gc);
1245 flags = flags & ~isInvalid; 1414 flags = flags & ~isInvalid;
1246 } 1415 }
1247 1416
1248 XDestroyImage (result); 1417 XDestroyImage (result);
1249 } 1418 }
1250 1419
1251 if (flags & isInvalid) 1420 if (flags & isInvalid)
1252 { 1421 {
1253 if (pixmap != None) 1422 if (pixmap != None)

Diff Legend

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