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.55 by sf-exg, Thu Sep 2 15:48:10 2010 UTC vs.
Revision 1.76 by sf-exg, Tue Oct 12 21:26:57 2010 UTC

… …
104#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 105 have_image = false;
106 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
107 h_align = v_align = 0; 107 h_align = v_align = 0;
108#endif 108#endif
109#ifdef ENABLE_TRANSPARENCY
110 shade = 100;
111#endif
109 flags = 0; 112 flags = 0;
110 pixmap = None; 113 pixmap = None;
111 valid_since = invalid_since = 0; 114 valid_since = invalid_since = 0;
112 target = 0; 115 target = 0;
113} 116}
… …
138# endif 141# endif
139 142
140# ifdef BG_IMAGE_FROM_FILE 143# ifdef BG_IMAGE_FROM_FILE
141 if (have_image) 144 if (have_image)
142 { 145 {
143 if (h_scale != 0 || v_scale != 0 146 if (flags & sizeSensitive)
144 || h_align != 0 || v_align != 0)
145 return true; 147 return true;
146 } 148 }
147# endif 149# endif
148 150
149 return false; 151 return false;
… …
158# endif 160# endif
159 161
160# ifdef BG_IMAGE_FROM_FILE 162# ifdef BG_IMAGE_FROM_FILE
161 if (have_image) 163 if (have_image)
162 { 164 {
163 if (h_align == rootAlign || v_align == rootAlign) 165 if (flags & rootAlign)
164 return true; 166 return true;
165 } 167 }
166# endif 168# endif
167 169
168 return false; 170 return false;
… …
208static inline bool 210static inline bool
209check_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)
210{ 212{
211 if (geom_flags & flag) 213 if (geom_flags & flag)
212 { 214 {
213 if (new_value != bgPixmap_t::rootAlign)
214 {
215 if (new_value < -100) 215 if (new_value < -100)
216 new_value = -100; 216 new_value = -100;
217 else if (new_value > 200) 217 else if (new_value > 200)
218 new_value = 200; 218 new_value = 200;
219 }
220 if (new_value != align) 219 if (new_value != align)
221 { 220 {
222 align = new_value; 221 align = new_value;
223 return true; 222 return true;
224 } 223 }
… …
228 227
229static inline int 228static inline int
230make_align_position (int align, int window_size, int image_size) 229make_align_position (int align, int window_size, int image_size)
231{ 230{
232 int diff = window_size - image_size; 231 int diff = window_size - image_size;
233 int smaller = MIN (image_size,window_size); 232 int smaller = min (image_size, window_size);
234 233
235 if (align >= 0 && align <= 50) 234 if (align >= 0 && align <= 100)
236 return diff * align / 100; 235 return diff * align / 100;
237 else if (align > 50 && align <= 100)
238 return window_size - image_size - diff * (100 - align) / 100;
239 else if (align > 100 && align <= 200 ) 236 else if (align > 100 && align <= 200 )
240 return ((align - 100) * smaller / 100) + window_size - smaller; 237 return ((align - 100) * smaller / 100) + window_size - smaller;
241 else if (align > -100 && align < 0) 238 else if (align >= -100 && align < 0)
242 return ((align + 100) * smaller / 100) - image_size; 239 return ((align + 100) * smaller / 100) - image_size;
243 return 0; 240 return 0;
244} 241}
245 242
246static inline int 243static inline int
247make_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)
248{ 245{
249 int src_pos = 0; 246 int src_pos = 0;
250 dst_pos = 0; 247 dst_pos = pos;
251 dst_size = size; 248 dst_size = size;
252 if (pos < 0 && size > target_size) 249 if (pos < 0)
253 { 250 {
254 src_pos = -pos; 251 src_pos = -pos;
252 dst_pos = 0;
255 dst_size += pos; 253 dst_size += pos;
256 } 254 }
257 else if (pos > 0)
258 dst_pos = pos;
259 255
260 if (dst_pos + dst_size > target_size) 256 if (dst_pos + dst_size > target_size)
261 dst_size = target_size - dst_pos; 257 dst_size = target_size - dst_pos;
262 return src_pos; 258 return src_pos;
263} 259}
… …
388 w = h = noScale; 384 w = h = noScale;
389 geom_flags |= WidthValue|HeightValue; 385 geom_flags |= WidthValue|HeightValue;
390 } 386 }
391 else if (CHECK_GEOM_OPS ("propscale")) 387 else if (CHECK_GEOM_OPS ("propscale"))
392 { 388 {
393 if (w == 0 && h == 0)
394 {
395 w = windowScale;
396 geom_flags |= WidthValue;
397 }
398 new_flags |= propScale; 389 new_flags |= propScale;
399 } 390 }
400 else if (CHECK_GEOM_OPS ("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
401 { 392 {
402 if (w == 0) w = windowScale; 393 if (w == 0) w = windowScale;
… …
424 x = y = centerAlign; 415 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 } 417 }
427 else if (CHECK_GEOM_OPS ("root")) 418 else if (CHECK_GEOM_OPS ("root"))
428 { 419 {
420 new_flags |= rootAlign;
429 w = h = noScale; 421 w = h = noScale;
430 x = y = rootAlign;
431 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue;
432 } 423 }
433# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
434 425
435 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
436 } /* done parsing ops */ 427 } /* done parsing ops */
… …
451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
452 // flags, h_scale, v_scale, h_align, v_align); 443 // flags, h_scale, v_scale, h_align, v_align);
453 return (changed > 0); 444 return (changed > 0);
454} 445}
455 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;
486}
487
456# ifdef HAVE_AFTERIMAGE 488# ifdef HAVE_AFTERIMAGE
457bool 489bool
458bgPixmap_t::render_image (unsigned long background_flags) 490bgPixmap_t::render_image (unsigned long background_flags)
459{ 491{
460 if (target == NULL) 492 if (target == NULL)
… …
470 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);
471 503
472 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 504 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
473 { 505 {
474 ShadingInfo as_shade; 506 ShadingInfo as_shade;
475 as_shade.shading = (shade == 0) ? 100 : shade; 507 as_shade.shading = shade;
476 508
477 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 509 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
478 if (flags & tintSet) 510 if (flags & tintSet)
479 tint.get (c); 511 tint.get (c);
480 as_shade.tintColor.red = c.r; 512 as_shade.tintColor.red = c.r;
… …
482 as_shade.tintColor.blue = c.b; 514 as_shade.tintColor.blue = c.b;
483 515
484 background_tint = shading2tint32 (&as_shade); 516 background_tint = shading2tint32 (&as_shade);
485 } 517 }
486 518
487 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 519 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
488 { 520 {
489 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,
490 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 522 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
491 100, ASIMAGE_QUALITY_DEFAULT); 523 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 524 if (tmp)
… …
504 int new_pmap_width = target_width; 536 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 537 int new_pmap_height = target_height;
506 538
507 int x = 0; 539 int x = 0;
508 int y = 0; 540 int y = 0;
509 int w = h_scale * target_width / 100; 541 int w = 0;
510 int h = v_scale * target_height / 100; 542 int h = 0;
511 543
512 TIMING_TEST_START (asim); 544 TIMING_TEST_START (asim);
513 545
514 if (original_asim) 546 if (original_asim)
515 { 547 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
516 if (h_align == rootAlign || v_align == rootAlign)
517 {
518 target->get_window_origin (x, y);
519 x = -x;
520 y = -y;
521 }
522
523 if (h_align != rootAlign)
524 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
525
526 if (v_align != rootAlign)
527 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
528 }
529 548
530 if (!original_asim 549 if (!original_asim
550 || (!(flags & rootAlign)
531 || x >= target_width 551 && (x >= target_width
532 || y >= target_height 552 || y >= target_height
533 || (w > 0 && x + w <= 0) 553 || (x + w <= 0)
534 || (h > 0 && y + h <= 0)) 554 || (y + h <= 0))))
535 { 555 {
536 if (background) 556 if (background)
537 { 557 {
538 new_pmap_width = background->width; 558 new_pmap_width = background->width;
539 new_pmap_height = background->height; 559 new_pmap_height = background->height;
… …
553 } 573 }
554 else 574 else
555 { 575 {
556 result = original_asim; 576 result = original_asim;
557 577
558 if ((w > 0 && w != original_asim->width) 578 if ((w != original_asim->width)
559 || (h > 0 && h != original_asim->height)) 579 || (h != original_asim->height))
560 { 580 {
561 result = scale_asimage (target->asv, original_asim, 581 result = scale_asimage (target->asv, original_asim,
562 w > 0 ? w : original_asim->width, 582 w, h,
563 h > 0 ? h : original_asim->height,
564 background ? ASA_ASImage : ASA_XImage, 583 background ? ASA_ASImage : ASA_XImage,
565 100, ASIMAGE_QUALITY_DEFAULT); 584 100, ASIMAGE_QUALITY_DEFAULT);
566 } 585 }
567 586
568 if (background == NULL) 587 if (background == NULL)
569 { 588 {
570 /* if tiling - pixmap has to be sized exactly as the image,
571 but there is no need to make it bigger than the window! */
572 if (h_scale == 0)
573 new_pmap_width = min (result->width, target_width);
574 if (v_scale == 0)
575 new_pmap_height = min (result->height, target_height);
576 /* we also need to tile our image in one or both directions */
577 if (h_scale == 0 || v_scale == 0) 589 if (h_scale == 0 || v_scale == 0)
578 { 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 */
579 ASImage *tmp = tile_asimage (target->asv, result, 597 ASImage *tmp = tile_asimage (target->asv, result,
580 (h_scale > 0) ? 0 : (int)result->width - x, 598 (int)result->width - x,
581 (v_scale > 0) ? 0 : (int)result->height - y, 599 (int)result->height - y,
582 new_pmap_width, 600 new_pmap_width,
583 new_pmap_height, 601 new_pmap_height,
584 TINT_LEAVE_SAME, ASA_XImage, 602 TINT_LEAVE_SAME, ASA_XImage,
585 100, ASIMAGE_QUALITY_DEFAULT); 603 100, ASIMAGE_QUALITY_DEFAULT);
586 if (tmp) 604 if (tmp)
… …
601 layers[0].clip_width = target_width; 619 layers[0].clip_width = target_width;
602 layers[0].clip_height = target_height; 620 layers[0].clip_height = target_height;
603 layers[0].tint = background_tint; 621 layers[0].tint = background_tint;
604 layers[1].im = result; 622 layers[1].im = result;
605 623
606 if (w <= 0) 624 if (h_scale == 0 || v_scale == 0)
607 { 625 {
608 /* tile horizontally */ 626 /* tile horizontally */
609 while (x > 0) x -= (int)result->width; 627 while (x > 0) x -= (int)result->width;
610 layers[1].dst_x = x; 628 layers[1].dst_x = x;
611 layers[1].clip_width = result->width+target_width; 629 layers[1].clip_width = result->width+target_width;
… …
615 /* clip horizontally */ 633 /* clip horizontally */
616 layers[1].dst_x = x; 634 layers[1].dst_x = x;
617 layers[1].clip_width = result->width; 635 layers[1].clip_width = result->width;
618 } 636 }
619 637
620 if (h <= 0) 638 if (h_scale == 0 || v_scale == 0)
621 { 639 {
622 while (y > 0) y -= (int)result->height; 640 while (y > 0) y -= (int)result->height;
623 layers[1].dst_y = y; 641 layers[1].dst_y = y;
624 layers[1].clip_height = result->height + target_height; 642 layers[1].clip_height = result->height + target_height;
625 } 643 }
… …
684 702
685 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;
686 int dst_width = result->width, dst_height = result->height; 704 int dst_width = result->width, dst_height = result->height;
687 if (background == NULL) 705 if (background == NULL)
688 { 706 {
707 if (!(h_scale == 0 || v_scale == 0))
708 {
689 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 );
690 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 }
691 712
692 if (dst_x > 0 || dst_y > 0 713 if (dst_x > 0 || dst_y > 0
693 || dst_x + dst_width < new_pmap_width 714 || dst_x + dst_width < new_pmap_width
694 || dst_y + dst_height < new_pmap_height) 715 || dst_y + dst_height < new_pmap_height)
695 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);
… …
739 int new_pmap_width = target_width; 760 int new_pmap_width = target_width;
740 int new_pmap_height = target_height; 761 int new_pmap_height = target_height;
741 762
742 int x = 0; 763 int x = 0;
743 int y = 0; 764 int y = 0;
744 int w = h_scale * target_width / 100; 765 int w = 0;
745 int h = v_scale * target_height / 100; 766 int h = 0;
746 767
747 if (h_align == rootAlign || v_align == rootAlign) 768 get_image_geometry (image_width, image_height, w, h, x, y);
748 {
749 target->get_window_origin (x, y);
750 x = -x;
751 y = -y;
752 }
753 769
754 if (h_align != rootAlign) 770 if (!(flags & rootAlign)
755 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
756
757 if (v_align != rootAlign)
758 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
759
760 if (x >= target_width 771 && (x >= target_width
761 || y >= target_height 772 || y >= target_height
762 || (w > 0 && x + w <= 0) 773 || (x + w <= 0)
763 || (h > 0 && y + h <= 0)) 774 || (y + h <= 0)))
764 return false; 775 return false;
765 776
766 result = pixbuf; 777 result = pixbuf;
767 778
768 if ((w > 0 && w != image_width) 779 if ((w != image_width)
769 || (h > 0 && h != image_height)) 780 || (h != image_height))
770 { 781 {
771 result = gdk_pixbuf_scale_simple (pixbuf, 782 result = gdk_pixbuf_scale_simple (pixbuf,
772 w > 0 ? w : image_width, 783 w, h,
773 h > 0 ? h : image_height,
774 GDK_INTERP_BILINEAR); 784 GDK_INTERP_BILINEAR);
775 } 785 }
776 786
777 bool ret = false; 787 bool ret = false;
778 788
… …
782 GC gc; 792 GC gc;
783 793
784 image_width = gdk_pixbuf_get_width (result); 794 image_width = gdk_pixbuf_get_width (result);
785 image_height = gdk_pixbuf_get_height (result); 795 image_height = gdk_pixbuf_get_height (result);
786 796
787 if (h_scale == 0) 797 if (h_scale == 0 || v_scale == 0)
798 {
788 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
789 if (v_scale == 0)
790 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
801 }
791 802
792 if (pixmap) 803 if (pixmap)
793 { 804 {
794 if (pmap_width != new_pmap_width 805 if (pmap_width != new_pmap_width
795 || pmap_height != new_pmap_height 806 || pmap_height != new_pmap_height
… …
951static inline unsigned long 962static inline unsigned long
952compute_tint_shade_flags (rxvt_color *tint, int shade) 963compute_tint_shade_flags (rxvt_color *tint, int shade)
953{ 964{
954 unsigned long flags = 0; 965 unsigned long flags = 0;
955 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 966 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
956 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 967 bool has_shade = shade != 100;
957 968
958 if (tint) 969 if (tint)
959 { 970 {
960 tint->get (c); 971 tint->get (c);
961# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 972# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
993} 1004}
994 1005
995bool 1006bool
996bgPixmap_t::set_tint (rxvt_color &new_tint) 1007bgPixmap_t::set_tint (rxvt_color &new_tint)
997{ 1008{
998 if (tint != new_tint) 1009 if (!(flags & tintSet) || tint != new_tint)
999 { 1010 {
1000 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1011 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1001 tint = new_tint; 1012 tint = new_tint;
1002 flags = (flags & ~tintFlags) | new_flags | tintSet; 1013 flags = (flags & ~tintFlags) | new_flags | tintSet;
1003 return true; 1014 return true;
… …
1021} 1032}
1022 1033
1023bool 1034bool
1024bgPixmap_t::set_shade (const char *shade_str) 1035bgPixmap_t::set_shade (const char *shade_str)
1025{ 1036{
1026 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1037 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1027 1038
1028 if (new_shade < 0 && new_shade > -100) 1039 clamp_it (new_shade, -100, 200);
1040 if (new_shade < 0)
1029 new_shade = 200 - (100 + new_shade); 1041 new_shade = 200 - (100 + new_shade);
1030 else if (new_shade == 100)
1031 new_shade = 0;
1032 1042
1033 if (new_shade != shade) 1043 if (new_shade != shade)
1034 { 1044 {
1035 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);
1036 shade = new_shade; 1046 shade = new_shade;
1037 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1047 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1038 return true; 1048 return true;
1039 } 1049 }
1040 1050
1041 return false; 1051 return false;
1052}
1053
1054bool
1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, 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, root, 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 *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1102 XRenderPictureAttributes pa;
1103
1104 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1105
1106 pa.repeat = True;
1107
1108 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 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, root, 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;
1042} 1144}
1043 1145
1044/* make_transparency_pixmap() 1146/* make_transparency_pixmap()
1045 * 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
1046 * 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
… …
1176 { 1278 {
1177 if (!need_client_side_rendering ()) 1279 if (!need_client_side_rendering ())
1178 { 1280 {
1179 if ((flags & tintNeeded)) 1281 if ((flags & tintNeeded))
1180 { 1282 {
1181 if (flags & tintWholesome) 1283 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height))
1182 {
1183 /* In this case we can tint image server-side getting significant
1184 * performance improvements, as we eliminate XImage transfer
1185 */
1186 gcv.foreground = Pixel (tint);
1187 gcv.function = GXand;
1188 gcv.fill_style = FillSolid;
1189 if (gc)
1190 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1191 else
1192 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1193 if (gc)
1194 {
1195 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1196 result |= transpPmapTinted; 1284 result |= transpPmapTinted;
1197 }
1198 }
1199 else
1200 {
1201# if XFT
1202 Picture back_pic = 0;
1203 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204
1205 if (flags & tintSet)
1206 tint.get (c);
1207
1208 if (shade > 0 && shade < 100)
1209 {
1210 c.r = (c.r * shade) / 100;
1211 c.g = (c.g * shade) / 100;
1212 c.b = (c.b * shade) / 100;
1213 }
1214 else if (shade > 100 && shade < 200)
1215 {
1216 c.r = (c.r * (200 - shade)) / 100;
1217 c.g = (c.g * (200 - shade)) / 100;
1218 c.b = (c.b * (200 - shade)) / 100;
1219 }
1220
1221 XRenderPictFormat pf;
1222 pf.type = PictTypeDirect;
1223 pf.depth = 32;
1224 pf.direct.redMask = 0xff;
1225 pf.direct.greenMask = 0xff;
1226 pf.direct.blueMask = 0xff;
1227 pf.direct.alphaMask = 0xff;
1228
1229 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1230 (PictFormatType|
1231 PictFormatDepth|
1232 PictFormatRedMask|
1233 PictFormatGreenMask|
1234 PictFormatBlueMask|
1235 PictFormatAlphaMask),
1236 &pf,
1237 0);
1238 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1239 XRenderPictureAttributes pa ;
1240
1241 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1242
1243 pa.repeat = True;
1244
1245 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1246 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1247 XFreePixmap (dpy, overlay_pmap);
1248
1249 pa.component_alpha = True;
1250 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1251 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1252 XFreePixmap (dpy, mask_pmap);
1253
1254 if (mask_pic && overlay_pic && back_pic)
1255 {
1256 XRenderColor mask_c;
1257
1258 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1259 mask_c.alpha = 0xffff;
1260 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1261
1262 mask_c.alpha = 0;
1263 mask_c.red = 0xffff - c.r;
1264 mask_c.green = 0xffff - c.g;
1265 mask_c.blue = 0xffff - c.b;
1266 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1267 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1268 result |= transpPmapTinted;
1269 }
1270
1271 XRenderFreePicture (dpy, mask_pic);
1272 XRenderFreePicture (dpy, overlay_pic);
1273 XRenderFreePicture (dpy, back_pic);
1274# if DO_TIMING_TEST
1275 XSync (dpy, False);
1276# endif
1277# endif
1278 }
1279 } 1285 }
1280 } /* server side rendering completed */ 1286 } /* server side rendering completed */
1281 1287
1282 if (pixmap) 1288 if (pixmap)
1283 XFreePixmap (dpy, pixmap); 1289 XFreePixmap (dpy, pixmap);
… …
1523 int i; 1529 int i;
1524 1530
1525 Visual *visual = term->visual; 1531 Visual *visual = term->visual;
1526 1532
1527 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1528
1529 if (shade == 0)
1530 shade = 100;
1531 1534
1532 /* for convenience */ 1535 /* for convenience */
1533 mask_r = visual->red_mask; 1536 mask_r = visual->red_mask;
1534 mask_g = visual->green_mask; 1537 mask_g = visual->green_mask;
1535 mask_b = visual->blue_mask; 1538 mask_b = visual->blue_mask;
… …
1591 default: 1594 default:
1592 return; /* we do not support this color depth */ 1595 return; /* we do not support this color depth */
1593 } 1596 }
1594 1597
1595 /* prepare limits for color transformation (each channel is handled separately) */ 1598 /* prepare limits for color transformation (each channel is handled separately) */
1596 if (shade < 0) { 1599 if (shade > 100) {
1597 shade = -shade; 1600 shade = 200 - shade;
1598 if (shade < 0) shade = 0;
1599 if (shade > 100) shade = 100;
1600 1601
1601 lower_lim_r = 65535-rm; 1602 lower_lim_r = 65535-rm;
1602 lower_lim_g = 65535-gm; 1603 lower_lim_g = 65535-gm;
1603 lower_lim_b = 65535-bm; 1604 lower_lim_b = 65535-bm;
1604 1605
… …
1606 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);
1607 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);
1608 1609
1609 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1610 } else { 1611 } else {
1611 if (shade < 0) shade = 0;
1612 if (shade > 100) shade = 100;
1613 1612
1614 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1613 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1615 1614
1616 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1617 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