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.74 by sf-exg, Sun Oct 10 21:56:09 2010 UTC vs.
Revision 1.77 by sf-exg, Tue Oct 12 22:14:04 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}
… …
499 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);
500 503
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 504 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 505 {
503 ShadingInfo as_shade; 506 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 507 as_shade.shading = shade;
505 508
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 509 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 510 if (flags & tintSet)
508 tint.get (c); 511 tint.get (c);
509 as_shade.tintColor.red = c.r; 512 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 514 as_shade.tintColor.blue = c.b;
512 515
513 background_tint = shading2tint32 (&as_shade); 516 background_tint = shading2tint32 (&as_shade);
514 } 517 }
515 518
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 519 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 520 {
518 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,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 522 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 523 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 524 if (tmp)
… …
959static inline unsigned long 962static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 963compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 964{
962 unsigned long flags = 0; 965 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 966 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 967 bool has_shade = shade != 100;
965 968
966 if (tint) 969 if (tint)
967 { 970 {
968 tint->get (c); 971 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 972# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
1029} 1032}
1030 1033
1031bool 1034bool
1032bgPixmap_t::set_shade (const char *shade_str) 1035bgPixmap_t::set_shade (const char *shade_str)
1033{ 1036{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1037 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1038
1036 if (new_shade < 0 && new_shade > -100) 1039 clamp_it (new_shade, -100, 200);
1040 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1041 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1042
1041 if (new_shade != shade) 1043 if (new_shade != shade)
1042 { 1044 {
1043 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);
1044 shade = new_shade; 1046 shade = new_shade;
… …
1048 1050
1049 return false; 1051 return false;
1050} 1052}
1051 1053
1052bool 1054bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height) 1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1056{
1055 Display *dpy = target->dpy; 1057 Display *dpy = target->dpy;
1056 bool ret = false; 1058 bool ret = false;
1057 1059
1058 if (flags & tintWholesome) 1060 if (flags & tintWholesome)
… …
1064 * performance improvements, as we eliminate XImage transfer 1066 * performance improvements, as we eliminate XImage transfer
1065 */ 1067 */
1066 gcv.foreground = Pixel (tint); 1068 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand; 1069 gcv.function = GXand;
1068 gcv.fill_style = FillSolid; 1070 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1071 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc) 1072 if (gc)
1071 { 1073 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1074 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true; 1075 ret = true;
1074 XFreeGC (dpy, gc); 1076 XFreeGC (dpy, gc);
… …
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081 1083
1082 if (flags & tintSet) 1084 if (flags & tintSet)
1083 tint.get (c); 1085 tint.get (c);
1084 1086
1085 if (shade > 0 && shade < 100) 1087 if (shade <= 100)
1086 { 1088 {
1087 c.r = (c.r * shade) / 100; 1089 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100; 1090 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100; 1091 c.b = (c.b * shade) / 100;
1090 } 1092 }
1091 else if (shade > 100 && shade < 200) 1093 else
1092 { 1094 {
1093 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1095 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1096 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1097 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1096 } 1098 }
1097 1099
1098 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1100 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1099 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1101 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1100 XRenderPictureAttributes pa; 1102 XRenderPictureAttributes pa;
1101 1103
1102 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1104 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1103 1105
1104 pa.repeat = True; 1106 pa.repeat = True;
1105 1107
1106 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1108 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1107 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1109 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1108 XFreePixmap (dpy, overlay_pmap); 1110 XFreePixmap (dpy, overlay_pmap);
1109 1111
1110 pa.component_alpha = True; 1112 pa.component_alpha = True;
1111 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1113 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1112 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1114 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1113 XFreePixmap (dpy, mask_pmap); 1115 XFreePixmap (dpy, mask_pmap);
1114 1116
1115 if (mask_pic && overlay_pic && back_pic) 1117 if (mask_pic && overlay_pic && back_pic)
1116 { 1118 {
… …
1276 { 1278 {
1277 if (!need_client_side_rendering ()) 1279 if (!need_client_side_rendering ())
1278 { 1280 {
1279 if ((flags & tintNeeded)) 1281 if ((flags & tintNeeded))
1280 { 1282 {
1281 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) 1283 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1282 result |= transpPmapTinted; 1284 result |= transpPmapTinted;
1283 } 1285 }
1284 } /* server side rendering completed */ 1286 } /* server side rendering completed */
1285 1287
1286 if (pixmap) 1288 if (pixmap)
… …
1527 int i; 1529 int i;
1528 1530
1529 Visual *visual = term->visual; 1531 Visual *visual = term->visual;
1530 1532
1531 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1532
1533 if (shade == 0)
1534 shade = 100;
1535 1534
1536 /* for convenience */ 1535 /* for convenience */
1537 mask_r = visual->red_mask; 1536 mask_r = visual->red_mask;
1538 mask_g = visual->green_mask; 1537 mask_g = visual->green_mask;
1539 mask_b = visual->blue_mask; 1538 mask_b = visual->blue_mask;
… …
1595 default: 1594 default:
1596 return; /* we do not support this color depth */ 1595 return; /* we do not support this color depth */
1597 } 1596 }
1598 1597
1599 /* prepare limits for color transformation (each channel is handled separately) */ 1598 /* prepare limits for color transformation (each channel is handled separately) */
1600 if (shade < 0) { 1599 if (shade > 100) {
1601 shade = -shade; 1600 shade = 200 - shade;
1602 if (shade < 0) shade = 0;
1603 if (shade > 100) shade = 100;
1604 1601
1605 lower_lim_r = 65535-rm; 1602 lower_lim_r = 65535-rm;
1606 lower_lim_g = 65535-gm; 1603 lower_lim_g = 65535-gm;
1607 lower_lim_b = 65535-bm; 1604 lower_lim_b = 65535-bm;
1608 1605
… …
1610 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);
1611 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);
1612 1609
1613 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1614 } else { 1611 } else {
1615 if (shade < 0) shade = 0;
1616 if (shade > 100) shade = 100;
1617 1612
1618 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1613 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1619 1614
1620 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1621 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