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.117 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC

169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
737 } 740 }
738 } 741 }
739 } 742 }
740 743
741 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
742#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 752#endif
746 SET_PIXCOLOR (i);
747 }
748 753
749 if (display->depth <= 2) 754 if (display->depth <= 2)
750 { 755 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
752 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
760 * from the fvwm window manager. 765 * from the fvwm window manager.
761 */ 766 */
762#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
763 768
764 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
765 { /* Monochrome */ 771 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 775 }
770 else 776 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines