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.270 by sf-exg, Tue Jun 15 13:34:52 2010 UTC vs.
Revision 1.275 by sf-exg, Sat Aug 28 11:03:30 2010 UTC

… …
558 set_option (Opt_iso14755); 558 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 560 set_option (Opt_buffered);
561} 561}
562 562
563static void
564init_secondary ()
565{
566 int i;
567
568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
569 {
570 dup2 (STDERR_FILENO, STDIN_FILENO);
571 }
572 else if (i != STDIN_FILENO)
573 {
574 dup2 (i, STDIN_FILENO);
575 close (i);
576 }
577
578 dup2 (STDERR_FILENO, STDOUT_FILENO);
579}
580
581/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
582const char ** 564const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
584{ 566{
585 int i, r_argc; 567 int i, r_argc;
… …
790 set_locale (""); 772 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
792 774
793 init_vars (); 775 init_vars ();
794 776
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
798 778
799#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 780 keyboard->register_done ();
801#endif 781#endif
… …
1391 &szHint, &wmHint, &classHint); 1371 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1372#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE 1373# ifdef HAVE_AFTERIMAGE
1394 /* 1374 /*
1395 * set up icon hint 1375 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1376 * rs [Rs_iconfile] is path to icon
1397 */ 1377 */
1398 1378
1399 if (rs [Rs_iconfile]) 1379 if (rs [Rs_iconfile])
1400 { 1380 {
1401 init_asv (); 1381 init_asv ();
… …
1522 pix_colors = pix_colors_unfocused; 1502 pix_colors = pix_colors_unfocused;
1523#endif 1503#endif
1524 1504
1525 pointer_unblank (); 1505 pointer_unblank ();
1526 scr_recolour (); 1506 scr_recolour ();
1527}
1528
1529/* ------------------------------------------------------------------------- *
1530 * GET TTY CURRENT STATE *
1531 * ------------------------------------------------------------------------- */
1532void
1533rxvt_get_ttymode (struct termios *tio)
1534{
1535 /*
1536 * standard System V termios interface
1537 */
1538 // does not work as stdin is not a tty
1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1541 {
1542 // return error - use system defaults,
1543 // where possible, and zero elsewhere
1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1548
1549 tio->c_cc[VINTR] = CINTR;
1550 tio->c_cc[VQUIT] = CQUIT;
1551 tio->c_cc[VERASE] = CERASE;
1552#ifdef VERASE2
1553 tio->c_cc[VERASE2] = CERASE2;
1554#endif
1555 tio->c_cc[VKILL] = CKILL;
1556 tio->c_cc[VSTART] = CSTART;
1557 tio->c_cc[VSTOP] = CSTOP;
1558 tio->c_cc[VSUSP] = CSUSP;
1559# ifdef VDSUSP
1560 tio->c_cc[VDSUSP] = CDSUSP;
1561# endif
1562# ifdef VREPRINT
1563 tio->c_cc[VREPRINT] = CRPRNT;
1564# endif
1565# ifdef VDISCRD
1566 tio->c_cc[VDISCRD] = CFLUSH;
1567# endif
1568# ifdef VWERSE
1569 tio->c_cc[VWERSE] = CWERASE;
1570# endif
1571# ifdef VLNEXT
1572 tio->c_cc[VLNEXT] = CLNEXT;
1573# endif
1574 }
1575
1576 tio->c_cc[VEOF] = CEOF;
1577# if VMIN != VEOF
1578 tio->c_cc[VMIN] = 1;
1579# endif
1580# if VTIME != VEOL
1581 tio->c_cc[VTIME] = 0;
1582# endif
1583
1584 /* input modes */
1585 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1586# ifdef IMAXBEL
1587 | IMAXBEL
1588# endif
1589 | IXON);
1590
1591 /* output modes */
1592 tio->c_oflag = (OPOST | ONLCR);
1593
1594 /* control modes */
1595 tio->c_cflag = (CS8 | CREAD);
1596
1597 /* line discipline modes */
1598 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1599# if defined (ECHOCTL) && defined (ECHOKE)
1600 | ECHOCTL | ECHOKE
1601# endif
1602 | ECHOE | ECHOK);
1603
1604 /*
1605 * Debugging
1606 */
1607#ifdef DEBUG_TTYMODE
1608 /* c_iflag bits */
1609 fprintf (stderr, "Input flags\n");
1610
1611 /* cpp token stringize doesn't work on all machines <sigh> */
1612# define FOO(flag,name) \
1613 if ((tio->c_iflag) & flag) \
1614 fprintf (stderr, "%s ", name)
1615
1616 /* c_iflag bits */
1617 FOO (IGNBRK, "IGNBRK");
1618 FOO (BRKINT, "BRKINT");
1619 FOO (IGNPAR, "IGNPAR");
1620 FOO (PARMRK, "PARMRK");
1621 FOO (INPCK, "INPCK");
1622 FOO (ISTRIP, "ISTRIP");
1623 FOO (INLCR, "INLCR");
1624 FOO (IGNCR, "IGNCR");
1625 FOO (ICRNL, "ICRNL");
1626 FOO (IXON, "IXON");
1627 FOO (IXOFF, "IXOFF");
1628# ifdef IUCLC
1629 FOO (IUCLC, "IUCLC");
1630# endif
1631# ifdef IXANY
1632 FOO (IXANY, "IXANY");
1633# endif
1634# ifdef IMAXBEL
1635 FOO (IMAXBEL, "IMAXBEL");
1636# endif
1637
1638 fprintf (stderr, "\n");
1639
1640# undef FOO
1641# define FOO(entry, name) \
1642 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1643
1644 FOO (VINTR, "VINTR");
1645 FOO (VQUIT, "VQUIT");
1646 FOO (VERASE, "VERASE");
1647 FOO (VKILL, "VKILL");
1648 FOO (VEOF, "VEOF");
1649 FOO (VEOL, "VEOL");
1650# ifdef VEOL2
1651 FOO (VEOL2, "VEOL2");
1652# endif
1653# ifdef VSWTC
1654 FOO (VSWTC, "VSWTC");
1655# endif
1656# ifdef VSWTCH
1657 FOO (VSWTCH, "VSWTCH");
1658# endif
1659 FOO (VSTART, "VSTART");
1660 FOO (VSTOP, "VSTOP");
1661 FOO (VSUSP, "VSUSP");
1662# ifdef VDSUSP
1663 FOO (VDSUSP, "VDSUSP");
1664# endif
1665# ifdef VREPRINT
1666 FOO (VREPRINT, "VREPRINT");
1667# endif
1668# ifdef VDISCRD
1669 FOO (VDISCRD, "VDISCRD");
1670# endif
1671# ifdef VWERSE
1672 FOO (VWERSE, "VWERSE");
1673# endif
1674# ifdef VLNEXT
1675 FOO (VLNEXT, "VLNEXT");
1676# endif
1677
1678 fprintf (stderr, "\n");
1679# undef FOO
1680#endif /* DEBUG_TTYMODE */
1681} 1507}
1682 1508
1683/*----------------------------------------------------------------------*/ 1509/*----------------------------------------------------------------------*/
1684/* 1510/*
1685 * Run the command in a subprocess and return a file descriptor for the 1511 * Run the command in a subprocess and return a file descriptor for the
… …
1706 else 1532 else
1707#endif 1533#endif
1708 if (!pty->get ()) 1534 if (!pty->get ())
1709 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1710 1536
1711 rxvt_get_ttymode (&tio); 1537 struct termios tio = def_tio;
1712 1538
1713#ifndef NO_BACKSPACE_KEY 1539#ifndef NO_BACKSPACE_KEY
1714 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1540 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1715 tio.c_cc[VERASE] = rs[Rs_backspace_key][0]; 1541 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1716 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1542 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
… …
1811 signal (SIGQUIT, SIG_DFL); 1637 signal (SIGQUIT, SIG_DFL);
1812 signal (SIGCHLD, SIG_DFL); 1638 signal (SIGCHLD, SIG_DFL);
1813 signal (SIGHUP, SIG_DFL); 1639 signal (SIGHUP, SIG_DFL);
1814 signal (SIGPIPE, SIG_DFL); 1640 signal (SIGPIPE, SIG_DFL);
1815 /* 1641 /*
1816 * mimick login's behavior by disabling the job control signals 1642 * mimic login's behavior by disabling the job control signals
1817 * a shell that wants them can turn them back on 1643 * a shell that wants them can turn them back on
1818 */ 1644 */
1819#ifdef SIGTSTP 1645#ifdef SIGTSTP
1820 signal (SIGTSTP, SIG_IGN); 1646 signal (SIGTSTP, SIG_IGN);
1821 signal (SIGTTIN, SIG_IGN); 1647 signal (SIGTTIN, SIG_IGN);

Diff Legend

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