… | |
… | |
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; |
… | |
… | |
959 | static inline unsigned long |
962 | static inline unsigned long |
960 | compute_tint_shade_flags (rxvt_color *tint, int shade) |
963 | compute_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 | |
1031 | bool |
1034 | bool |
1032 | bgPixmap_t::set_shade (const char *shade_str) |
1035 | bgPixmap_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; |
… | |
… | |
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 | } |
… | |
… | |
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); |