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.221 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.222 by ayin, Thu Nov 15 11:36:15 2007 UTC

250 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
251 251
252#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
256 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
257 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
258 NULL, /* Color_border */ 258 NULL, /* Color_border */
259#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
260 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
261 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
262 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
263 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265#if ENABLE_FRILLS 265#if ENABLE_FRILLS
266 NULL, // Color_underline 266 NULL, // Color_underline
267#endif 267#endif
268#ifdef OPTION_HC 268#ifdef OPTION_HC
269 NULL, 269 NULL,
270#endif 270#endif
271#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
275#if ENABLE_TRANSPARENCY 275#if ENABLE_TRANSPARENCY
276 NULL, 276 NULL,
277#endif 277#endif
278#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 279 "rgb:00/00/00",
538 color_aliases (Color_fg); 538 color_aliases (Color_fg);
539 color_aliases (Color_bg); 539 color_aliases (Color_bg);
540#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
541 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
542 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
543#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
544 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
545 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
546 color_aliases (Color_border); 546 color_aliases (Color_border);
547#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
548 color_aliases (Color_BD); 548 color_aliases (Color_BD);
549 color_aliases (Color_UL); 549 color_aliases (Color_UL);
550 color_aliases (Color_RV); 550 color_aliases (Color_RV);
551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552 552
553 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555 555
556 return cmd_argv; 556 return cmd_argv;
576 */ 576 */
577 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
578 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
579 579
580 if (val == NULL) 580 if (val == NULL)
581#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
582 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
583 583
584 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
586 586
626#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
627 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
628 unsetenv ("LINES"); 628 unsetenv ("LINES");
629 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
632} 632}
633 633
634/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
635/* 635/*
636 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 836 cscroll.a)
837 )) 837 ))
838 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
839 } 839 }
840#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
841 841
842#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 844 update_fade_color (i);
845#endif 845#endif
1302 FOO (VLNEXT, "VLNEXT"); 1302 FOO (VLNEXT, "VLNEXT");
1303# endif 1303# endif
1304 1304
1305 fprintf (stderr, "\n"); 1305 fprintf (stderr, "\n");
1306# undef FOO 1306# undef FOO
1307# endif /* HAVE_TERMIOS_H */ 1307# endif /* HAVE_TERMIOS_H */
1308#endif /* DEBUG_TTYMODE */ 1308#endif /* DEBUG_TTYMODE */
1309} 1309}
1310 1310
1311/*----------------------------------------------------------------------*/ 1311/*----------------------------------------------------------------------*/
1312/* 1312/*
1313 * Run the command in a subprocess and return a file descriptor for the 1313 * Run the command in a subprocess and return a file descriptor for the
1428 1428
1429 fd = open (CONSOLE, O_WRONLY, 0); 1429 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1430 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432 close (fd); 1432 close (fd);
1433#endif /* SRIOCSREDIR */ 1433#endif /* SRIOCSREDIR */
1434 } 1434 }
1435 1435
1436 /* reset signals and spin off the command interpreter */ 1436 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1437 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1438 signal (SIGQUIT, SIG_DFL);
1445 */ 1445 */
1446#ifdef SIGTSTP 1446#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1447 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1448 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1449 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1450#endif /* SIGTSTP */
1451 1451
1452 // unblock signals (signals are blocked by iom.C 1452 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss; 1453 sigset_t ss;
1454 sigemptyset (&ss); 1454 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0); 1455 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines