| … | |
… | |
| 154 | "rgb:00/cd/00", // 2: green (Green3) |
154 | "rgb:00/cd/00", // 2: green (Green3) |
| 155 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
155 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
| 156 | "rgb:00/00/cd", // 4: blue (Blue3) |
156 | "rgb:00/00/cd", // 4: blue (Blue3) |
| 157 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
157 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
| 158 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
158 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
| 159 | # ifdef XTERM_COLORS |
159 | # ifdef XTERM_COLORS |
| 160 | "rgb:e5/e5/e5", // 7: white (Grey90) |
160 | "rgb:e5/e5/e5", // 7: white (Grey90) |
| 161 | # else |
161 | # else |
| 162 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
162 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
| 163 | # endif |
163 | # endif |
| 164 | /* high-intensity colors */ |
164 | /* high-intensity colors */ |
| 165 | # ifdef XTERM_COLORS |
165 | # ifdef XTERM_COLORS |
| 166 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
166 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
| … | |
… | |
| 369 | break; |
369 | break; |
| 370 | |
370 | |
| 371 | if (r_argc == argc) |
371 | if (r_argc == argc) |
| 372 | cmd_argv = NULL; |
372 | cmd_argv = NULL; |
| 373 | else if (!argv[r_argc + 1]) |
373 | else if (!argv[r_argc + 1]) |
| 374 | rxvt_fatal ("-e requires an argument\n"); |
374 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
| 375 | else |
375 | else |
| 376 | { |
376 | { |
| 377 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
377 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
| 378 | |
378 | |
| 379 | for (i = 0; i < argc - r_argc - 1; i++) |
379 | for (i = 0; i < argc - r_argc - 1; i++) |
| … | |
… | |
| 657 | |
657 | |
| 658 | this->locale = "C"; |
658 | this->locale = "C"; |
| 659 | } |
659 | } |
| 660 | |
660 | |
| 661 | |
661 | |
| 662 | this->locale = rxvt_strdup (this->locale); |
662 | this->locale = strdup (this->locale); |
| 663 | SET_LOCALE (this->locale); |
663 | SET_LOCALE (this->locale); |
| 664 | mbstate.reset (); |
664 | mbstate.reset (); |
| 665 | #endif |
665 | #endif |
| 666 | |
666 | |
| 667 | #if HAVE_NL_LANGINFO |
667 | #if HAVE_NL_LANGINFO |
| … | |
… | |
| 747 | int i; |
747 | int i; |
| 748 | |
748 | |
| 749 | #ifdef OFF_FOCUS_FADING |
749 | #ifdef OFF_FOCUS_FADING |
| 750 | pix_colors = pix_colors_focused; |
750 | pix_colors = pix_colors_focused; |
| 751 | #endif |
751 | #endif |
| 752 | |
752 | |
| 753 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
753 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
| 754 | { |
754 | { |
| 755 | const char *name = rs[Rs_color + i]; |
755 | const char *name = rs[Rs_color + i]; |
| 756 | |
756 | |
| 757 | if (!name) |
757 | if (!name) |
