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.340 by root, Sat Dec 13 12:24:32 2014 UTC vs.
Revision 1.342 by root, Mon Dec 15 02:04:02 2014 UTC

1065#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1066 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1067#endif 1067#endif
1068 1068
1069 for (i = 0; i < NRS_COLORS; i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1070 {
1071 const char *name = rs[Rs_color + i]; 1070 if (const char *name = rs[Rs_color + i])
1072
1073 if (!name)
1074 continue;
1075
1076 rxvt_color xcol;
1077
1078 if (!set_color (xcol, name)) 1071 set_color (pix_colors [i], name);
1079 {
1080#ifndef XTERM_REVERSE_VIDEO
1081 if (i < 2 && option (Opt_reverseVideo))
1082 name = def_colorName [1 - i];
1083 else
1084#endif
1085 name = def_colorName [i];
1086
1087 if (!name)
1088 continue;
1089
1090 xcol.free (this);
1091
1092 if (!set_color (xcol, name))
1093 {
1094 switch (i)
1095 {
1096 case Color_fg:
1097 case Color_bg:
1098 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1099 name = "";
1100 break;
1101#ifndef NO_CURSORCOLOR
1102 case Color_cursor2:
1103#endif
1104 case Color_pointer_fg:
1105 name = rs[Rs_color + Color_fg];
1106 xcol.set (this, name);
1107 break;
1108 default:
1109 name = rs[Rs_color + Color_bg];
1110 xcol.set (this, name);
1111 break;
1112 }
1113 }
1114 }
1115
1116 pix_colors[i] = xcol;
1117 rs[Rs_color + i] = name;
1118 }
1119 1072
1120 /* 1073 /*
1121 * get scrollBar shadow colors 1074 * get scrollBar shadow colors
1122 * 1075 *
1123 * The calculations of topShadow/bottomShadow values are adapted 1076 * The calculations of topShadow/bottomShadow values are adapted

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines