ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.157 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.158 by root, Sun Jan 29 20:51:28 2006 UTC

737 /* xcol[0] == white 737 /* xcol[0] == white
738 * xcol[1] == top shadow 738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
740 740
741 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
742 xcol[0].set (this, 65535, 65535, 65535); 742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
743 743
744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 rxvt_rgba c0, c1;
745 745
746 xcol[0].get (this, pr0, pg0, pb0); 746 xcol[0].get (this, c0);
747 xcol[1].get (this, pr1, pg1, pb1); 747 xcol[1].get (this, c1);
748 748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 750
751 /* topShadowColor */ 751 /* topShadowColor */
752 if (!xcol[1].set (this, 752 if (!xcol[1].set (this,
753 rxvt_rgba (
753 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary
758 ));
756 xcol[1] = pix_colors[Color_White]; 759 xcol[1] = pix_colors[Color_White];
757 760
758 pix_colors[Color_topShadow] = xcol[1]; 761 pix_colors[Color_topShadow] = xcol[1];
759 } 762 }
760#endif /* KEEP_SCROLLCOLOR */ 763#endif /* KEEP_SCROLLCOLOR */
900 if (OPTION (Opt_borderLess)) 903 if (OPTION (Opt_borderLess))
901 { 904 {
902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
903 { 906 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
905 attributes.override_redirect = TRUE; 908 attributes.override_redirect = true;
906 mwmhints.flags = 0; 909 mwmhints.flags = 0;
907 } 910 }
908 else 911 else
909 { 912 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 913 mwmhints.flags = MWM_HINTS_DECORATIONS;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines