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.218 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.226 by ayin, Tue Dec 11 17:42:04 2007 UTC

… …
41 41
42#include <limits> 42#include <limits>
43 43
44#include <csignal> 44#include <csignal>
45 45
46#include <fcntl.h>
47
46#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 49# define X_LOCALE
48# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
49#else 51#else
50# ifdef HAVE_SETLOCALE 52# ifdef HAVE_SETLOCALE
… …
154 "rgb:00/cd/00", // 2: green (Green3) 156 "rgb:00/cd/00", // 2: green (Green3)
155 "rgb:cd/cd/00", // 3: yellow (Yellow3) 157 "rgb:cd/cd/00", // 3: yellow (Yellow3)
156 "rgb:00/00/cd", // 4: blue (Blue3) 158 "rgb:00/00/cd", // 4: blue (Blue3)
157 "rgb:cd/00/cd", // 5: magenta (Magenta3) 159 "rgb:cd/00/cd", // 5: magenta (Magenta3)
158 "rgb:00/cd/cd", // 6: cyan (Cyan3) 160 "rgb:00/cd/cd", // 6: cyan (Cyan3)
159# ifdef XTERM_COLORS 161# ifdef XTERM_COLORS
160 "rgb:e5/e5/e5", // 7: white (Grey90) 162 "rgb:e5/e5/e5", // 7: white (Grey90)
161# else 163# else
162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 164 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163# endif 165# endif
164 /* high-intensity colors */ 166 /* high-intensity colors */
165# ifdef XTERM_COLORS 167# ifdef XTERM_COLORS
166 "rgb:4d/4d/4d", // 8: bright black (Grey30) 168 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
250 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
251 253
252#ifndef NO_CURSORCOLOR 254#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 255 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 256 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 257#endif /* ! NO_CURSORCOLOR */
256 NULL, /* Color_pointer_fg */ 258 NULL, /* Color_pointer_fg */
257 NULL, /* Color_pointer_bg */ 259 NULL, /* Color_pointer_bg */
258 NULL, /* Color_border */ 260 NULL, /* Color_border */
259#ifndef NO_BOLD_UNDERLINE_REVERSE 261#ifndef NO_BOLD_UNDERLINE_REVERSE
260 NULL, /* Color_BD */ 262 NULL, /* Color_BD */
261 NULL, /* Color_IT */ 263 NULL, /* Color_IT */
262 NULL, /* Color_UL */ 264 NULL, /* Color_UL */
263 NULL, /* Color_RV */ 265 NULL, /* Color_RV */
264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 266#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265#if ENABLE_FRILLS 267#if ENABLE_FRILLS
266 NULL, // Color_underline 268 NULL, // Color_underline
267#endif 269#endif
268#ifdef OPTION_HC 270#ifdef OPTION_HC
269 NULL, 271 NULL,
270#endif 272#endif
271#ifdef KEEP_SCROLLCOLOR 273#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 274 COLOR_SCROLLBAR,
273 COLOR_SCROLLTROUGH, 275 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 276#endif /* KEEP_SCROLLCOLOR */
275#if ENABLE_TRANSPARENCY 277#if ENABLE_TRANSPARENCY
276 NULL, 278 NULL,
277#endif 279#endif
278#if OFF_FOCUS_FADING 280#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 281 "rgb:00/00/00",
… …
369 break; 371 break;
370 372
371 if (r_argc == argc) 373 if (r_argc == argc)
372 cmd_argv = NULL; 374 cmd_argv = NULL;
373 else if (!argv[r_argc + 1]) 375 else if (!argv[r_argc + 1])
374 rxvt_fatal ("-e requires an argument\n"); 376 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else 377 else
376 { 378 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 379 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378 380
379 for (i = 0; i < argc - r_argc - 1; i++) 381 for (i = 0; i < argc - r_argc - 1; i++)
… …
538 color_aliases (Color_fg); 540 color_aliases (Color_fg);
539 color_aliases (Color_bg); 541 color_aliases (Color_bg);
540#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
541 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
542 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
543#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
544 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
545 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
546 color_aliases (Color_border); 548 color_aliases (Color_border);
547#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
548 color_aliases (Color_BD); 550 color_aliases (Color_BD);
549 color_aliases (Color_UL); 551 color_aliases (Color_UL);
550 color_aliases (Color_RV); 552 color_aliases (Color_RV);
551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552 554
553 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555 557
556 return cmd_argv; 558 return cmd_argv;
… …
576 */ 578 */
577 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
578 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
579 581
580 if (val == NULL) 582 if (val == NULL)
581#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
582 val = XDisplayString (dpy); 584 val = XDisplayString (dpy);
583 585
584 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
586 588
… …
626#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
627 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
628 unsetenv ("LINES"); 630 unsetenv ("LINES");
629 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
632} 634}
633 635
634/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
635/* 637/*
636 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
657 659
658 this->locale = "C"; 660 this->locale = "C";
659 } 661 }
660 662
661 663
662 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
663 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
664 mbstate.reset (); 666 mbstate.reset ();
665#endif 667#endif
666 668
667#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
747 int i; 749 int i;
748 750
749#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
751#endif 753#endif
752 754
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 { 756 {
755 const char *name = rs[Rs_color + i]; 757 const char *name = rs[Rs_color + i];
756 758
757 if (!name) 759 if (!name)
… …
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 838 cscroll.a)
837 )) 839 ))
838 alias_color (Color_topShadow, Color_White); 840 alias_color (Color_topShadow, Color_White);
839 } 841 }
840#endif /* KEEP_SCROLLCOLOR */ 842#endif /* KEEP_SCROLLCOLOR */
841 843
842#ifdef OFF_FOCUS_FADING 844#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 846 update_fade_color (i);
845#endif 847#endif
… …
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 855 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854 { 856 {
855 int i = atoi (rs[Rs_color + idx]); 857 int i = atoi (rs[Rs_color + idx]);
856 858
857 if (i >= 8 && i <= 15) 859 if (i >= 8 && i <= 15)
858 { /* bright colors */ 860 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 861 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 862 else if (i >= 0 && i <= 7)
862 } 863 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 864 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 865 }
867} 866}
868 867
869/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
1229 1228
1230 /* 1229 /*
1231 * Debugging 1230 * Debugging
1232 */ 1231 */
1233#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */ 1233 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1237 1235
1238 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1302 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1303# endif 1301# endif
1304 1302
1305 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1306# undef FOO 1304# undef FOO
1307# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1308#endif /* DEBUG_TTYMODE */
1309} 1306}
1310 1307
1311/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1312/* 1309/*
1313 * Run the command in a subprocess and return a file descriptor for the 1310 * Run the command in a subprocess and return a file descriptor for the
… …
1416rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1417{ 1414{
1418 char *login; 1415 char *login;
1419 1416
1420 if (option (Opt_console)) 1417 if (option (Opt_console))
1418 {
1421 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1420#ifdef TIOCCONS
1423 unsigned int on = 1; 1421 unsigned int on = 1;
1424 1422
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1428 1426
1429 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1428 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432 close (fd); 1430 close (fd);
1433#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1434 } 1432 }
1435 1433
1436 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1445 */ 1443 */
1446#ifdef SIGTSTP 1444#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1451 1449
1452 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss; 1451 sigset_t ss;
1454 sigemptyset (&ss); 1452 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines