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.47 by sf-exg, Mon Aug 30 23:42:37 2010 UTC vs.
Revision 1.77 by sf-exg, Tue Oct 12 22:14:04 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;
108#endif
109#ifdef ENABLE_TRANSPARENCY
110 shade = 100;
104#endif 111#endif
105 flags = 0; 112 flags = 0;
106 pixmap = None; 113 pixmap = None;
107 valid_since = invalid_since = 0; 114 valid_since = invalid_since = 0;
108 target = 0; 115 target = 0;
… …
114#ifdef HAVE_AFTERIMAGE 121#ifdef HAVE_AFTERIMAGE
115 if (original_asim) 122 if (original_asim)
116 safe_asimage_destroy (original_asim); 123 safe_asimage_destroy (original_asim);
117#endif 124#endif
118 125
126#ifdef HAVE_PIXBUF
127 if (pixbuf)
128 g_object_unref (pixbuf);
129#endif
130
119 if (pixmap && target) 131 if (pixmap && target)
120 XFreePixmap (target->dpy, pixmap); 132 XFreePixmap (target->dpy, pixmap);
121} 133}
122 134
123bool 135bool
… …
127 if (flags & isTransparent) 139 if (flags & isTransparent)
128 return true; 140 return true;
129# endif 141# endif
130 142
131# ifdef BG_IMAGE_FROM_FILE 143# ifdef BG_IMAGE_FROM_FILE
132# ifdef HAVE_AFTERIMAGE 144 if (have_image)
133 if (original_asim)
134# endif
135 { 145 {
136 if (h_scale != 0 || v_scale != 0 146 if (flags & sizeSensitive)
137 || h_align != 0 || v_align != 0)
138 return true; 147 return true;
139 } 148 }
140# endif 149# endif
141 150
142 return false; 151 return false;
… …
149 if (flags & isTransparent) 158 if (flags & isTransparent)
150 return true; 159 return true;
151# endif 160# endif
152 161
153# ifdef BG_IMAGE_FROM_FILE 162# ifdef BG_IMAGE_FROM_FILE
154# ifdef HAVE_AFTERIMAGE 163 if (have_image)
155 if (original_asim)
156# endif
157 { 164 {
158 if (h_align == rootAlign || v_align == rootAlign) 165 if (flags & rootAlign)
159 return true; 166 return true;
160 } 167 }
161# endif 168# endif
162 169
163 return false; 170 return false;
… …
203static inline bool 210static inline bool
204check_set_align_value (int geom_flags, int flag, int &align, int new_value) 211check_set_align_value (int geom_flags, int flag, int &align, int new_value)
205{ 212{
206 if (geom_flags & flag) 213 if (geom_flags & flag)
207 { 214 {
208 if (new_value != bgPixmap_t::rootAlign)
209 {
210 if (new_value < -100) 215 if (new_value < -100)
211 new_value = -100; 216 new_value = -100;
212 else if (new_value > 200) 217 else if (new_value > 200)
213 new_value = 200; 218 new_value = 200;
214 }
215 if (new_value != align) 219 if (new_value != align)
216 { 220 {
217 align = new_value; 221 align = new_value;
218 return true; 222 return true;
219 } 223 }
… …
223 227
224static inline int 228static inline int
225make_align_position (int align, int window_size, int image_size) 229make_align_position (int align, int window_size, int image_size)
226{ 230{
227 int diff = window_size - image_size; 231 int diff = window_size - image_size;
228 int smaller = MIN (image_size,window_size); 232 int smaller = min (image_size, window_size);
229 233
230 if (align >= 0 && align <= 50) 234 if (align >= 0 && align <= 100)
231 return diff * align / 100; 235 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 ) 236 else if (align > 100 && align <= 200 )
235 return ((align - 100) * smaller / 100) + window_size - smaller; 237 return ((align - 100) * smaller / 100) + window_size - smaller;
236 else if (align > -100 && align < 0) 238 else if (align >= -100 && align < 0)
237 return ((align + 100) * smaller / 100) - image_size; 239 return ((align + 100) * smaller / 100) - image_size;
238 return 0; 240 return 0;
239} 241}
240 242
241static inline int 243static inline int
242make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 244make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
243{ 245{
244 int src_pos = 0; 246 int src_pos = 0;
245 dst_pos = 0; 247 dst_pos = pos;
246 dst_size = size; 248 dst_size = size;
247 if (pos < 0 && size > target_size) 249 if (pos < 0)
248 { 250 {
249 src_pos = -pos; 251 src_pos = -pos;
252 dst_pos = 0;
250 dst_size += pos; 253 dst_size += pos;
251 } 254 }
252 else if (pos > 0)
253 dst_pos = pos;
254 255
255 if (dst_pos + dst_size > target_size) 256 if (dst_pos + dst_size > target_size)
256 dst_size = target_size - dst_pos; 257 dst_size = target_size - dst_pos;
257 return src_pos; 258 return src_pos;
258} 259}
… …
383 w = h = noScale; 384 w = h = noScale;
384 geom_flags |= WidthValue|HeightValue; 385 geom_flags |= WidthValue|HeightValue;
385 } 386 }
386 else if (CHECK_GEOM_OPS ("propscale")) 387 else if (CHECK_GEOM_OPS ("propscale"))
387 { 388 {
388 if (w == 0 && h == 0)
389 {
390 w = windowScale;
391 geom_flags |= WidthValue;
392 }
393 new_flags |= propScale; 389 new_flags |= propScale;
394 } 390 }
395 else if (CHECK_GEOM_OPS ("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
396 { 392 {
397 if (w == 0) w = windowScale; 393 if (w == 0) w = windowScale;
… …
419 x = y = centerAlign; 415 x = y = centerAlign;
420 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
421 } 417 }
422 else if (CHECK_GEOM_OPS ("root")) 418 else if (CHECK_GEOM_OPS ("root"))
423 { 419 {
420 new_flags |= rootAlign;
424 w = h = noScale; 421 w = h = noScale;
425 x = y = rootAlign;
426 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue;
427 } 423 }
428# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
429 425
430 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
431 } /* done parsing ops */ 427 } /* done parsing ops */
… …
441 { 437 {
442 flags = new_flags; 438 flags = new_flags;
443 changed++; 439 changed++;
444 } 440 }
445 441
446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447// flags, h_scale, v_scale, h_align, v_align); 443 // flags, h_scale, v_scale, h_align, v_align);
448 return (changed > 0); 444 return (changed > 0);
445}
446
447void
448bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
449{
450 int target_width = target->szHint.width;
451 int target_height = target->szHint.height;
452
453 if (flags & propScale)
454 {
455 float scale = (float)target_width / image_width;
456 min_it (scale, (float)target_height / image_height);
457 w = image_width * scale + 0.5;
458 h = image_height * scale + 0.5;
459 }
460 else
461 {
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464 }
465
466 if (!w) w = image_width;
467 if (!h) h = image_height;
468
469 if (flags & rootAlign)
470 {
471 target->get_window_origin (x, y);
472 x = -x;
473 y = -y;
474 }
475 else
476 {
477 x = make_align_position (h_align, target_width, w);
478 y = make_align_position (v_align, target_height, h);
479 }
480
481 flags &= ~sizeSensitive;
482 if (h_scale != 0 || v_scale != 0
483 || h_align != 0 || v_align != 0
484 || w > target_width || h > target_height)
485 flags |= sizeSensitive;
449} 486}
450 487
451# ifdef HAVE_AFTERIMAGE 488# ifdef HAVE_AFTERIMAGE
452bool 489bool
453bgPixmap_t::render_asim (unsigned long background_flags) 490bgPixmap_t::render_image (unsigned long background_flags)
454{ 491{
455 if (target == NULL) 492 if (target == NULL)
456 return false; 493 return false;
457 494
458 target->init_asv (); 495 target->init_asv ();
… …
465 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 502 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
466 503
467 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 504 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
468 { 505 {
469 ShadingInfo as_shade; 506 ShadingInfo as_shade;
470 as_shade.shading = (shade == 0) ? 100 : shade; 507 as_shade.shading = shade;
471 508
472 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 509 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
473 if (flags & tintSet) 510 if (flags & tintSet)
474 tint.get (c); 511 tint.get (c);
475 as_shade.tintColor.red = c.r; 512 as_shade.tintColor.red = c.r;
… …
477 as_shade.tintColor.blue = c.b; 514 as_shade.tintColor.blue = c.b;
478 515
479 background_tint = shading2tint32 (&as_shade); 516 background_tint = shading2tint32 (&as_shade);
480 } 517 }
481 518
482 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 519 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
483 { 520 {
484 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 521 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
485 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 522 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
486 100, ASIMAGE_QUALITY_DEFAULT); 523 100, ASIMAGE_QUALITY_DEFAULT);
487 if (tmp) 524 if (tmp)
… …
499 int new_pmap_width = target_width; 536 int new_pmap_width = target_width;
500 int new_pmap_height = target_height; 537 int new_pmap_height = target_height;
501 538
502 int x = 0; 539 int x = 0;
503 int y = 0; 540 int y = 0;
504 int w = h_scale * target_width / 100; 541 int w = 0;
505 int h = v_scale * target_height / 100; 542 int h = 0;
506 543
507 TIMING_TEST_START (asim); 544 TIMING_TEST_START (asim);
508 545
509 if (original_asim) 546 if (original_asim)
510 { 547 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
511 if (h_align == rootAlign || v_align == rootAlign)
512 {
513 target->get_window_origin (x, y);
514 x = -x;
515 y = -y;
516 }
517
518 if (h_align != rootAlign)
519 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
520
521 if (v_align != rootAlign)
522 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
523 }
524 548
525 if (!original_asim 549 if (!original_asim
550 || (!(flags & rootAlign)
526 || x >= target_width 551 && (x >= target_width
527 || y >= target_height 552 || y >= target_height
528 || (w > 0 && x + w <= 0) 553 || (x + w <= 0)
529 || (h > 0 && y + h <= 0)) 554 || (y + h <= 0))))
530 { 555 {
531 if (background) 556 if (background)
532 { 557 {
533 new_pmap_width = background->width; 558 new_pmap_width = background->width;
534 new_pmap_height = background->height; 559 new_pmap_height = background->height;
… …
548 } 573 }
549 else 574 else
550 { 575 {
551 result = original_asim; 576 result = original_asim;
552 577
553 if ((w > 0 && w != original_asim->width) 578 if ((w != original_asim->width)
554 || (h > 0 && h != original_asim->height)) 579 || (h != original_asim->height))
555 { 580 {
556 result = scale_asimage (target->asv, original_asim, 581 result = scale_asimage (target->asv, original_asim,
557 w > 0 ? w : original_asim->width, 582 w, h,
558 h > 0 ? h : original_asim->height,
559 background ? ASA_ASImage : ASA_XImage, 583 background ? ASA_ASImage : ASA_XImage,
560 100, ASIMAGE_QUALITY_DEFAULT); 584 100, ASIMAGE_QUALITY_DEFAULT);
561 } 585 }
562 586
563 if (background == NULL) 587 if (background == NULL)
564 { 588 {
565 /* if tiling - pixmap has to be sized exactly as the image,
566 but there is no need to make it bigger than the window! */
567 if (h_scale == 0)
568 new_pmap_width = min (result->width, target_width);
569 if (v_scale == 0)
570 new_pmap_height = min (result->height, target_height);
571 /* we also need to tile our image in one or both directions */
572 if (h_scale == 0 || v_scale == 0) 589 if (h_scale == 0 || v_scale == 0)
573 { 590 {
591 /* if tiling - pixmap has to be sized exactly as the image,
592 but there is no need to make it bigger than the window! */
593 new_pmap_width = min (result->width, target_width);
594 new_pmap_height = min (result->height, target_height);
595
596 /* we also need to tile our image in both directions */
574 ASImage *tmp = tile_asimage (target->asv, result, 597 ASImage *tmp = tile_asimage (target->asv, result,
575 (h_scale > 0) ? 0 : (int)result->width - x, 598 (int)result->width - x,
576 (v_scale > 0) ? 0 : (int)result->height - y, 599 (int)result->height - y,
577 new_pmap_width, 600 new_pmap_width,
578 new_pmap_height, 601 new_pmap_height,
579 TINT_LEAVE_SAME, ASA_XImage, 602 TINT_LEAVE_SAME, ASA_XImage,
580 100, ASIMAGE_QUALITY_DEFAULT); 603 100, ASIMAGE_QUALITY_DEFAULT);
581 if (tmp) 604 if (tmp)
… …
596 layers[0].clip_width = target_width; 619 layers[0].clip_width = target_width;
597 layers[0].clip_height = target_height; 620 layers[0].clip_height = target_height;
598 layers[0].tint = background_tint; 621 layers[0].tint = background_tint;
599 layers[1].im = result; 622 layers[1].im = result;
600 623
601 if (w <= 0) 624 if (h_scale == 0 || v_scale == 0)
602 { 625 {
603 /* tile horizontally */ 626 /* tile horizontally */
604 while (x > 0) x -= (int)result->width; 627 while (x > 0) x -= (int)result->width;
605 layers[1].dst_x = x; 628 layers[1].dst_x = x;
606 layers[1].clip_width = result->width+target_width; 629 layers[1].clip_width = result->width+target_width;
… …
610 /* clip horizontally */ 633 /* clip horizontally */
611 layers[1].dst_x = x; 634 layers[1].dst_x = x;
612 layers[1].clip_width = result->width; 635 layers[1].clip_width = result->width;
613 } 636 }
614 637
615 if (h <= 0) 638 if (h_scale == 0 || v_scale == 0)
616 { 639 {
617 while (y > 0) y -= (int)result->height; 640 while (y > 0) y -= (int)result->height;
618 layers[1].dst_y = y; 641 layers[1].dst_y = y;
619 layers[1].clip_height = result->height + target_height; 642 layers[1].clip_height = result->height + target_height;
620 } 643 }
… …
645 free (layers); 668 free (layers);
646 } 669 }
647 } 670 }
648 TIMING_TEST_PRINT_RESULT (asim); 671 TIMING_TEST_PRINT_RESULT (asim);
649 672
650 if (pixmap) 673 bool ret = false;
651 {
652 if (result == NULL
653 || pmap_width != new_pmap_width
654 || pmap_height != new_pmap_height
655 || pmap_depth != target->depth)
656 {
657 XFreePixmap (target->dpy, pixmap);
658 pixmap = None;
659 }
660 }
661 674
662 if (result) 675 if (result)
663 { 676 {
664 XGCValues gcv; 677 XGCValues gcv;
665 GC gc; 678 GC gc;
679
680 if (pixmap)
681 {
682 if (pmap_width != new_pmap_width
683 || pmap_height != new_pmap_height
684 || pmap_depth != target->depth)
685 {
686 XFreePixmap (target->dpy, pixmap);
687 pixmap = None;
688 }
689 }
666 690
667 /* create Pixmap */ 691 /* create Pixmap */
668 if (pixmap == None) 692 if (pixmap == None)
669 { 693 {
670 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 694 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
… …
678 702
679 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 703 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
680 int dst_width = result->width, dst_height = result->height; 704 int dst_width = result->width, dst_height = result->height;
681 if (background == NULL) 705 if (background == NULL)
682 { 706 {
707 if (!(h_scale == 0 || v_scale == 0))
708 {
683 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 709 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
684 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 710 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
711 }
685 712
686 if (dst_x > 0 || dst_y > 0 713 if (dst_x > 0 || dst_y > 0
687 || dst_x + dst_width < new_pmap_width 714 || dst_x + dst_width < new_pmap_width
688 || dst_y + dst_height < new_pmap_height) 715 || dst_y + dst_height < new_pmap_height)
689 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 716 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
696 if (result != background && result != original_asim) 723 if (result != background && result != original_asim)
697 destroy_asimage (&result); 724 destroy_asimage (&result);
698 725
699 XFreeGC (target->dpy, gc); 726 XFreeGC (target->dpy, gc);
700 TIMING_TEST_PRINT_RESULT (asim); 727 TIMING_TEST_PRINT_RESULT (asim);
728
729 ret = true;
701 } 730 }
702 731
703 if (background) 732 if (background)
704 destroy_asimage (&background); 733 destroy_asimage (&background);
705 734
706 return true; 735 return ret;
707} 736}
708# endif /* HAVE_AFTERIMAGE */ 737# endif /* HAVE_AFTERIMAGE */
738
739# ifdef HAVE_PIXBUF
740bool
741bgPixmap_t::render_image (unsigned long background_flags)
742{
743 if (target == NULL)
744 return false;
745
746 if (!pixbuf)
747 return false;
748
749 // TODO: add alpha blending
750 if (background_flags)
751 return false;
752
753 GdkPixbuf *result;
754
755 int image_width = gdk_pixbuf_get_width (pixbuf);
756 int image_height = gdk_pixbuf_get_height (pixbuf);
757
758 int target_width = target->szHint.width;
759 int target_height = target->szHint.height;
760 int new_pmap_width = target_width;
761 int new_pmap_height = target_height;
762
763 int x = 0;
764 int y = 0;
765 int w = 0;
766 int h = 0;
767
768 get_image_geometry (image_width, image_height, w, h, x, y);
769
770 if (!(flags & rootAlign)
771 && (x >= target_width
772 || y >= target_height
773 || (x + w <= 0)
774 || (y + h <= 0)))
775 return false;
776
777 result = pixbuf;
778
779 if ((w != image_width)
780 || (h != image_height))
781 {
782 result = gdk_pixbuf_scale_simple (pixbuf,
783 w, h,
784 GDK_INTERP_BILINEAR);
785 }
786
787 bool ret = false;
788
789 if (result)
790 {
791 XGCValues gcv;
792 GC gc;
793
794 image_width = gdk_pixbuf_get_width (result);
795 image_height = gdk_pixbuf_get_height (result);
796
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height);
801 }
802
803 if (pixmap)
804 {
805 if (pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height
807 || pmap_depth != target->depth)
808 {
809 XFreePixmap (target->dpy, pixmap);
810 pixmap = None;
811 }
812 }
813
814 if (pixmap == None)
815 {
816 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
817 pmap_width = new_pmap_width;
818 pmap_height = new_pmap_height;
819 pmap_depth = target->depth;
820 }
821
822 gcv.foreground = target->pix_colors[Color_bg];
823 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
824
825 if (h_scale == 0 || v_scale == 0)
826 {
827 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
828 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
829 0, 0,
830 0, 0,
831 image_width, image_height,
832 XLIB_RGB_DITHER_NONE,
833 0, 0);
834
835 gcv.tile = tile;
836 gcv.fill_style = FillTiled;
837 gcv.ts_x_origin = x;
838 gcv.ts_y_origin = y;
839 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
840
841 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
842 XFreePixmap (target->dpy, tile);
843 }
844 else
845 {
846 int src_x, src_y, dst_x, dst_y;
847 int dst_width, dst_height;
848
849 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
850 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
851
852 if (dst_x > 0 || dst_y > 0
853 || dst_x + dst_width < new_pmap_width
854 || dst_y + dst_height < new_pmap_height)
855 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
856
857 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
858 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
859 src_x, src_y,
860 dst_x, dst_y,
861 dst_width, dst_height,
862 XLIB_RGB_DITHER_NONE,
863 0, 0);
864 }
865
866 if (result != pixbuf)
867 g_object_unref (result);
868
869 XFreeGC (target->dpy, gc);
870
871 ret = true;
872 }
873
874 return ret;
875}
876# endif /* HAVE_PIXBUF */
709 877
710bool 878bool
711bgPixmap_t::set_file (const char *file) 879bgPixmap_t::set_file (const char *file)
712{ 880{
713 assert (file); 881 assert (file);
… …
725 893
726# ifdef HAVE_AFTERIMAGE 894# ifdef HAVE_AFTERIMAGE
727 if (!target->asimman) 895 if (!target->asimman)
728 target->asimman = create_generic_imageman (target->rs[Rs_path]); 896 target->asimman = create_generic_imageman (target->rs[Rs_path]);
729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 897 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730 return original_asim; 898 if (original_asim)
899 have_image = true;
900 return have_image;
901# endif
902
903# ifdef HAVE_PIXBUF
904 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
905 if (pixbuf)
906 have_image = true;
907 return have_image;
731# endif 908# endif
732 } 909 }
733 910
734 return false; 911 return false;
735} 912}
… …
755 int changed = 0; 932 int changed = 0;
756 unsigned int hr, vr; 933 unsigned int hr, vr;
757 int junk; 934 int junk;
758 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 935 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
759 936
760 if (!(geom_flags&WidthValue)) 937 if (!(geom_flags & WidthValue))
761 hr = 1; 938 hr = 1;
762 if (!(geom_flags&HeightValue)) 939 if (!(geom_flags & HeightValue))
763 vr = hr; 940 vr = hr;
764 941
765 if (h_blurRadius != hr) 942 if (h_blurRadius != hr)
766 { 943 {
767 ++changed; 944 ++changed;
… …
777 if (v_blurRadius == 0 && h_blurRadius == 0) 954 if (v_blurRadius == 0 && h_blurRadius == 0)
778 flags &= ~blurNeeded; 955 flags &= ~blurNeeded;
779 else 956 else
780 flags |= blurNeeded; 957 flags |= blurNeeded;
781 958
782 return (changed>0); 959 return (changed > 0);
783} 960}
784 961
785static inline unsigned long 962static inline unsigned long
786compute_tint_shade_flags (rxvt_color *tint, int shade) 963compute_tint_shade_flags (rxvt_color *tint, int shade)
787{ 964{
788 unsigned long flags = 0; 965 unsigned long flags = 0;
789 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 966 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
790 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 967 bool has_shade = shade != 100;
791 968
792 if (tint) 969 if (tint)
793 { 970 {
794 tint->get (c); 971 tint->get (c);
795# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 972# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
804 flags |= bgPixmap_t::tintNeeded; 981 flags |= bgPixmap_t::tintNeeded;
805 else if (tint) 982 else if (tint)
806 { 983 {
807 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 984 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
808 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 985 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
809 { 986 {
810 flags |= bgPixmap_t::tintNeeded; 987 flags |= bgPixmap_t::tintNeeded;
811 } 988 }
812 } 989 }
813 990
814 if (flags & bgPixmap_t::tintNeeded) 991 if (flags & bgPixmap_t::tintNeeded)
815 { 992 {
816 if (flags & bgPixmap_t::tintWholesome) 993 if (flags & bgPixmap_t::tintWholesome)
… …
827} 1004}
828 1005
829bool 1006bool
830bgPixmap_t::set_tint (rxvt_color &new_tint) 1007bgPixmap_t::set_tint (rxvt_color &new_tint)
831{ 1008{
832 if (tint != new_tint) 1009 if (!(flags & tintSet) || tint != new_tint)
833 { 1010 {
834 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1011 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
835 tint = new_tint; 1012 tint = new_tint;
836 flags = (flags & ~tintFlags) | new_flags | tintSet; 1013 flags = (flags & ~tintFlags) | new_flags | tintSet;
837 return true; 1014 return true;
… …
845{ 1022{
846 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1023 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
847 1024
848 if (new_flags != (flags & tintFlags)) 1025 if (new_flags != (flags & tintFlags))
849 { 1026 {
850 flags = (flags&~tintFlags)|new_flags; 1027 flags = (flags & ~tintFlags) | new_flags;
851 return true; 1028 return true;
852 } 1029 }
853 1030
854 return false; 1031 return false;
855} 1032}
856 1033
857bool 1034bool
858bgPixmap_t::set_shade (const char *shade_str) 1035bgPixmap_t::set_shade (const char *shade_str)
859{ 1036{
860 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1037 int new_shade = (shade_str) ? atoi (shade_str) : 100;
861 1038
862 if (new_shade < 0 && new_shade > -100) 1039 clamp_it (new_shade, -100, 200);
1040 if (new_shade < 0)
863 new_shade = 200 - (100 + new_shade); 1041 new_shade = 200 - (100 + new_shade);
864 else if (new_shade == 100)
865 new_shade = 0;
866 1042
867 if (new_shade != shade) 1043 if (new_shade != shade)
868 { 1044 {
869 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1045 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
870 shade = new_shade; 1046 shade = new_shade;
871 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1047 flags = (flags & (~tintFlags | tintSet)) | new_flags;
872 return true; 1048 return true;
873 } 1049 }
874 1050
875 return false; 1051 return false;
1052}
1053
1054bool
1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1056{
1057 Display *dpy = target->dpy;
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, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc)
1073 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, width, 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 <= 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
1094 {
1095 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1096 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1097 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1098 }
1099
1100 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1101 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1102 XRenderPictureAttributes pa;
1103
1104 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1105
1106 pa.repeat = True;
1107
1108 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1109 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1110 XFreePixmap (dpy, overlay_pmap);
1111
1112 pa.component_alpha = True;
1113 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1114 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1115 XFreePixmap (dpy, mask_pmap);
1116
1117 if (mask_pic && overlay_pic && back_pic)
1118 {
1119 XRenderColor mask_c;
1120
1121 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1122 mask_c.alpha = 0xffff;
1123 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1124
1125 mask_c.alpha = 0;
1126 mask_c.red = 0xffff - c.r;
1127 mask_c.green = 0xffff - c.g;
1128 mask_c.blue = 0xffff - c.b;
1129 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1130 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1131 ret = true;
1132 }
1133
1134 XRenderFreePicture (dpy, mask_pic);
1135 XRenderFreePicture (dpy, overlay_pic);
1136 XRenderFreePicture (dpy, back_pic);
1137# if DO_TIMING_TEST
1138 XSync (dpy, False);
1139# endif
1140# endif
1141 }
1142
1143 return ret;
876} 1144}
877 1145
878/* make_transparency_pixmap() 1146/* make_transparency_pixmap()
879 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1147 * Builds a pixmap sized the same as terminal window, with depth same as the root window
880 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1148 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
941 1209
942 attr.background_pixmap = ParentRelative; 1210 attr.background_pixmap = ParentRelative;
943 attr.backing_store = Always; 1211 attr.backing_store = Always;
944 attr.event_mask = ExposureMask; 1212 attr.event_mask = ExposureMask;
945 attr.override_redirect = True; 1213 attr.override_redirect = True;
946 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1214 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
947 CopyFromParent, CopyFromParent, CopyFromParent, 1215 CopyFromParent, CopyFromParent, CopyFromParent,
948 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1216 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
949 &attr); 1217 &attr);
950 1218
951 if (src != None) 1219 if (src != None)
… …
975 XDestroyWindow (dpy, src); 1243 XDestroyWindow (dpy, src);
976 XUngrabServer (dpy); 1244 XUngrabServer (dpy);
977 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1245 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
978 } 1246 }
979 1247
980 if (!success) 1248 if (!success)
981 { 1249 {
982 XFreePixmap (dpy, tiled_root_pmap); 1250 XFreePixmap (dpy, tiled_root_pmap);
983 tiled_root_pmap = None; 1251 tiled_root_pmap = None;
984 } 1252 }
985 else 1253 else
986 result |= transpPmapTiled; 1254 result |= transpPmapTiled;
987 } 1255 }
988 else 1256 else
989 { 1257 {
990 /* straightforward pixmap copy */ 1258 /* straightforward pixmap copy */
991 gcv.tile = root_pixmap; 1259 gcv.tile = root_pixmap;
… …
1010 { 1278 {
1011 if (!need_client_side_rendering ()) 1279 if (!need_client_side_rendering ())
1012 { 1280 {
1013 if ((flags & tintNeeded)) 1281 if ((flags & tintNeeded))
1014 { 1282 {
1015 if (flags & tintWholesome) 1283 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1016 {
1017 /* In this case we can tint image server-side getting significant
1018 * performance improvements, as we eliminate XImage transfer
1019 */
1020 gcv.foreground = Pixel (tint);
1021 gcv.function = GXand;
1022 gcv.fill_style = FillSolid;
1023 if (gc)
1024 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1025 else
1026 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1027 if (gc)
1028 {
1029 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1030 result |= transpPmapTinted; 1284 result |= transpPmapTinted;
1031 }
1032 }
1033 else
1034 {
1035# if XFT
1036 Picture back_pic = 0;
1037 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1038
1039 if (flags & tintSet)
1040 tint.get (c);
1041
1042 if (shade > 0 && shade < 100)
1043 {
1044 c.r = (c.r * shade) / 100;
1045 c.g = (c.g * shade) / 100;
1046 c.b = (c.b * shade) / 100;
1047 }
1048 else if (shade > 100 && shade < 200)
1049 {
1050 c.r = (c.r * (200 - shade)) / 100;
1051 c.g = (c.g * (200 - shade)) / 100;
1052 c.b = (c.b * (200 - shade)) / 100;
1053 }
1054
1055 XRenderPictFormat pf;
1056 pf.type = PictTypeDirect;
1057 pf.depth = 32;
1058 pf.direct.redMask = 0xff;
1059 pf.direct.greenMask = 0xff;
1060 pf.direct.blueMask = 0xff;
1061 pf.direct.alphaMask = 0xff;
1062
1063 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1064 (PictFormatType|
1065 PictFormatDepth|
1066 PictFormatRedMask|
1067 PictFormatGreenMask|
1068 PictFormatBlueMask|
1069 PictFormatAlphaMask),
1070 &pf,
1071 0);
1072 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1073 XRenderPictureAttributes pa ;
1074
1075 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1076
1077 pa.repeat = True;
1078
1079 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1080 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1081 XFreePixmap (dpy, overlay_pmap);
1082
1083 pa.component_alpha = True;
1084 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1085 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1086 XFreePixmap (dpy, mask_pmap);
1087
1088 if (mask_pic && overlay_pic && back_pic)
1089 {
1090 XRenderColor mask_c;
1091
1092 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1093 mask_c.alpha = 0xffff;
1094 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1095
1096 mask_c.alpha = 0;
1097 mask_c.red = 0xffff - c.r;
1098 mask_c.green = 0xffff - c.g;
1099 mask_c.blue = 0xffff - c.b;
1100 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1101 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1102 result |= transpPmapTinted;
1103 }
1104
1105 XRenderFreePicture (dpy, mask_pic);
1106 XRenderFreePicture (dpy, overlay_pic);
1107 XRenderFreePicture (dpy, back_pic);
1108# if DO_TIMING_TEST
1109 XSync (dpy, False);
1110# endif
1111# endif
1112 }
1113 } 1285 }
1114 } /* server side rendering completed */ 1286 } /* server side rendering completed */
1115 1287
1116 if (pixmap) 1288 if (pixmap)
1117 XFreePixmap (dpy, pixmap); 1289 XFreePixmap (dpy, pixmap);
1118 1290
… …
1168 /* we need to re-generate transparency pixmap in that case ! */ 1340 /* we need to re-generate transparency pixmap in that case ! */
1169 background_flags = make_transparency_pixmap (); 1341 background_flags = make_transparency_pixmap ();
1170 if (background_flags == 0) 1342 if (background_flags == 0)
1171 return false; 1343 return false;
1172 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1344 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1173 && pmap_depth == target->depth) 1345 && pmap_depth == target->depth)
1174 flags = flags & ~isInvalid; 1346 flags = flags & ~isInvalid;
1175 } 1347 }
1176# endif 1348# endif
1177 1349
1178# ifdef HAVE_AFTERIMAGE 1350# ifdef BG_IMAGE_FROM_FILE
1179 if (original_asim 1351 if (have_image
1180 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1352 || (background_flags & transpTransformations) != (flags & transpTransformations))
1181 { 1353 {
1182 if (render_asim (background_flags)) 1354 if (render_image (background_flags))
1183 flags = flags & ~isInvalid; 1355 flags = flags & ~isInvalid;
1184 } 1356 }
1185# endif 1357# endif
1186 1358
1187 XImage *result = NULL; 1359 XImage *result = NULL;
1188 1360
1189 if (background_flags && (flags & isInvalid)) 1361 if (background_flags && (flags & isInvalid))
1190 { 1362 {
1191 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1363 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1364 }
1192 1365
1366 if (result)
1367 {
1193# if !defined(HAVE_AFTERIMAGE) && !XFT 1368# if !defined(HAVE_AFTERIMAGE) && !XFT
1194 /* our own client-side tinting */ 1369 /* our own client-side tinting */
1195 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. 1370 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1196 This may need to be changed in need_client_side_rendering() logic is altered !!! */ 1371 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1197 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1372 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1198 { 1373 {
1199 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1200 if (flags & tintSet) 1375 if (flags & tintSet)
1201 tint.get (c); 1376 tint.get (c);
1202 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1377 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1203 } 1378 }
1204# endif 1379# endif
1205 }
1206 1380
1207 if (result)
1208 {
1209 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1210 1382
1211 if (gc) 1383 if (gc)
1212 { 1384 {
1213 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1385 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1242 1414
1243 XFreeGC (target->dpy, gc); 1415 XFreeGC (target->dpy, gc);
1244 flags = flags & ~isInvalid; 1416 flags = flags & ~isInvalid;
1245 } 1417 }
1246 1418
1247 XDestroyImage (result); 1419 XDestroyImage (result);
1248 } 1420 }
1249 1421
1250 if (flags & isInvalid) 1422 if (flags & isInvalid)
1251 { 1423 {
1252 if (pixmap != None) 1424 if (pixmap != None)
… …
1357 int i; 1529 int i;
1358 1530
1359 Visual *visual = term->visual; 1531 Visual *visual = term->visual;
1360 1532
1361 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1362
1363 if (shade == 0)
1364 shade = 100;
1365 1534
1366 /* for convenience */ 1535 /* for convenience */
1367 mask_r = visual->red_mask; 1536 mask_r = visual->red_mask;
1368 mask_g = visual->green_mask; 1537 mask_g = visual->green_mask;
1369 mask_b = visual->blue_mask; 1538 mask_b = visual->blue_mask;
… …
1425 default: 1594 default:
1426 return; /* we do not support this color depth */ 1595 return; /* we do not support this color depth */
1427 } 1596 }
1428 1597
1429 /* prepare limits for color transformation (each channel is handled separately) */ 1598 /* prepare limits for color transformation (each channel is handled separately) */
1430 if (shade < 0) { 1599 if (shade > 100) {
1431 shade = -shade; 1600 shade = 200 - shade;
1432 if (shade < 0) shade = 0;
1433 if (shade > 100) shade = 100;
1434 1601
1435 lower_lim_r = 65535-rm; 1602 lower_lim_r = 65535-rm;
1436 lower_lim_g = 65535-gm; 1603 lower_lim_g = 65535-gm;
1437 lower_lim_b = 65535-bm; 1604 lower_lim_b = 65535-bm;
1438 1605
… …
1440 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1607 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1441 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1608 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1442 1609
1443 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1444 } else { 1611 } else {
1445 if (shade < 0) shade = 0;
1446 if (shade > 100) shade = 100;
1447 1612
1448 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1613 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1449 1614
1450 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1451 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1616 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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