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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.129 by sf-exg, Mon Jan 2 19:30:50 2012 UTC vs.
Revision 1.130 by sf-exg, Fri Jan 13 12:40:53 2012 UTC

725 d.red = color.r; 725 d.red = color.r;
726 d.green = color.g; 726 d.green = color.g;
727 d.blue = color.b; 727 d.blue = color.b;
728 d.alpha = alpha; 728 d.alpha = alpha;
729 729
730 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 730 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
731 return true;
731 } 732 }
732#else 733#else
733 c.red = color.r; 734 c.red = color.r;
734 c.green = color.g; 735 c.green = color.g;
735 c.blue = color.b; 736 c.blue = color.b;
742 743
743 return true; 744 return true;
744 } 745 }
745 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 746 else if (XAllocColor (screen->dpy, screen->cmap, &c))
746 return true; 747 return true;
747 else 748#endif
749
748 c.pixel = (color.r + color.g + color.b) > 128*3 750 c.pixel = (color.r + color.g + color.b) > 128*3
749 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) 751 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
750 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); 752 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
751#endif
752 753
753 return false; 754 return false;
754} 755}
755 756
756bool 757bool

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines