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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.143 by sf-exg, Sat Jan 30 20:26:04 2010 UTC vs.
Revision 1.145 by sf-exg, Sun Apr 4 18:59:19 2010 UTC

177#ifdef RXVT_SCROLLBAR 177#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 179#endif
180#ifdef OPTION_HC 180#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 183#endif
183#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 186 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
688 // fallback on hexadecimal parsing 689 // fallback on hexadecimal parsing
689 char *end; 690 char *end;
690 sym = strtol (str, &end, 16); 691 sym = strtol (str, &end, 16);
691 if (*end) 692 if (*end)
692 return -1; 693 return -1;
693 } 694 }
694 695
695 keyboard->register_user_translation (sym, state, arg); 696 keyboard->register_user_translation (sym, state, arg);
696 return 1; 697 return 1;
697} 698}
698 699

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines