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.267 by sf-exg, Mon Jun 14 15:47:52 2010 UTC vs.
Revision 1.274 by sf-exg, Wed Jul 28 17:56:16 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
… …
1524 1504
1525 pointer_unblank (); 1505 pointer_unblank ();
1526 scr_recolour (); 1506 scr_recolour ();
1527} 1507}
1528 1508
1529/* ------------------------------------------------------------------------- *
1530 * GET TTY CURRENT STATE *
1531 * ------------------------------------------------------------------------- */
1532void
1533rxvt_get_ttymode (struct termios *tio, int erase)
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 for (int i = 0; i < NCCS; i++)
1546 tio->c_cc[i] = VDISABLE;
1547
1548 tio->c_cc[VINTR] = CINTR;
1549 tio->c_cc[VQUIT] = CQUIT;
1550 tio->c_cc[VERASE] = CERASE;
1551#ifdef VERASE2
1552 tio->c_cc[VERASE2] = CERASE2;
1553#endif
1554 tio->c_cc[VKILL] = CKILL;
1555 tio->c_cc[VSTART] = CSTART;
1556 tio->c_cc[VSTOP] = CSTOP;
1557 tio->c_cc[VSUSP] = CSUSP;
1558# ifdef VDSUSP
1559 tio->c_cc[VDSUSP] = CDSUSP;
1560# endif
1561# ifdef VREPRINT
1562 tio->c_cc[VREPRINT] = CRPRNT;
1563# endif
1564# ifdef VDISCRD
1565 tio->c_cc[VDISCRD] = CFLUSH;
1566# endif
1567# ifdef VWERSE
1568 tio->c_cc[VWERSE] = CWERASE;
1569# endif
1570# ifdef VLNEXT
1571 tio->c_cc[VLNEXT] = CLNEXT;
1572# endif
1573 }
1574
1575 tio->c_cc[VEOF] = CEOF;
1576# if VMIN != VEOF
1577 tio->c_cc[VMIN] = 1;
1578# endif
1579# if VTIME != VEOL
1580 tio->c_cc[VTIME] = 0;
1581# endif
1582
1583 if (erase != -1)
1584 tio->c_cc[VERASE] = (char)erase;
1585
1586 /* input modes */
1587 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1588# ifdef IMAXBEL
1589 | IMAXBEL
1590# endif
1591 | IXON);
1592
1593 /* output modes */
1594 tio->c_oflag = (OPOST | ONLCR);
1595
1596 /* control modes */
1597 tio->c_cflag = (CS8 | CREAD);
1598
1599 /* line discipline modes */
1600 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1601# if defined (ECHOCTL) && defined (ECHOKE)
1602 | ECHOCTL | ECHOKE
1603# endif
1604 | ECHOE | ECHOK);
1605
1606 /*
1607 * Debugging
1608 */
1609#ifdef DEBUG_TTYMODE
1610 /* c_iflag bits */
1611 fprintf (stderr, "Input flags\n");
1612
1613 /* cpp token stringize doesn't work on all machines <sigh> */
1614# define FOO(flag,name) \
1615 if ((tio->c_iflag) & flag) \
1616 fprintf (stderr, "%s ", name)
1617
1618 /* c_iflag bits */
1619 FOO (IGNBRK, "IGNBRK");
1620 FOO (BRKINT, "BRKINT");
1621 FOO (IGNPAR, "IGNPAR");
1622 FOO (PARMRK, "PARMRK");
1623 FOO (INPCK, "INPCK");
1624 FOO (ISTRIP, "ISTRIP");
1625 FOO (INLCR, "INLCR");
1626 FOO (IGNCR, "IGNCR");
1627 FOO (ICRNL, "ICRNL");
1628 FOO (IXON, "IXON");
1629 FOO (IXOFF, "IXOFF");
1630# ifdef IUCLC
1631 FOO (IUCLC, "IUCLC");
1632# endif
1633# ifdef IXANY
1634 FOO (IXANY, "IXANY");
1635# endif
1636# ifdef IMAXBEL
1637 FOO (IMAXBEL, "IMAXBEL");
1638# endif
1639
1640 fprintf (stderr, "\n");
1641
1642# undef FOO
1643# define FOO(entry, name) \
1644 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1645
1646 FOO (VINTR, "VINTR");
1647 FOO (VQUIT, "VQUIT");
1648 FOO (VERASE, "VERASE");
1649 FOO (VKILL, "VKILL");
1650 FOO (VEOF, "VEOF");
1651 FOO (VEOL, "VEOL");
1652# ifdef VEOL2
1653 FOO (VEOL2, "VEOL2");
1654# endif
1655# ifdef VSWTC
1656 FOO (VSWTC, "VSWTC");
1657# endif
1658# ifdef VSWTCH
1659 FOO (VSWTCH, "VSWTCH");
1660# endif
1661 FOO (VSTART, "VSTART");
1662 FOO (VSTOP, "VSTOP");
1663 FOO (VSUSP, "VSUSP");
1664# ifdef VDSUSP
1665 FOO (VDSUSP, "VDSUSP");
1666# endif
1667# ifdef VREPRINT
1668 FOO (VREPRINT, "VREPRINT");
1669# endif
1670# ifdef VDISCRD
1671 FOO (VDISCRD, "VDISCRD");
1672# endif
1673# ifdef VWERSE
1674 FOO (VWERSE, "VWERSE");
1675# endif
1676# ifdef VLNEXT
1677 FOO (VLNEXT, "VLNEXT");
1678# endif
1679
1680 fprintf (stderr, "\n");
1681# undef FOO
1682#endif /* DEBUG_TTYMODE */
1683}
1684
1685/*----------------------------------------------------------------------*/ 1509/*----------------------------------------------------------------------*/
1686/* 1510/*
1687 * 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
1688 * master end of the pseudo-teletype pair with the command talking to 1512 * master end of the pseudo-teletype pair with the command talking to
1689 * the slave. 1513 * the slave.
… …
1708 else 1532 else
1709#endif 1533#endif
1710 if (!pty->get ()) 1534 if (!pty->get ())
1711 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1712 1536
1713 int er; 1537 struct termios tio = def_tio;
1714 1538
1715#ifndef NO_BACKSPACE_KEY 1539#ifndef NO_BACKSPACE_KEY
1716 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1540 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1717 er = rs[Rs_backspace_key][0]; 1541 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1718 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1542 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1719 er = '\177'; /* the initial state anyway */ 1543 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1720 else
1721#endif 1544#endif
1722 er = -1;
1723 1545
1724 rxvt_get_ttymode (&tio, er);
1725 /* init terminal attributes */ 1546 /* init terminal attributes */
1726 cfsetospeed (&tio, BAUDRATE); 1547 cfsetospeed (&tio, BAUDRATE);
1727 cfsetispeed (&tio, BAUDRATE); 1548 cfsetispeed (&tio, BAUDRATE);
1728 tcsetattr (pty->tty, TCSANOW, &tio); 1549 tcsetattr (pty->tty, TCSANOW, &tio);
1729 pty->set_utf8_mode (enc_utf8); 1550 pty->set_utf8_mode (enc_utf8);
… …
1816 signal (SIGQUIT, SIG_DFL); 1637 signal (SIGQUIT, SIG_DFL);
1817 signal (SIGCHLD, SIG_DFL); 1638 signal (SIGCHLD, SIG_DFL);
1818 signal (SIGHUP, SIG_DFL); 1639 signal (SIGHUP, SIG_DFL);
1819 signal (SIGPIPE, SIG_DFL); 1640 signal (SIGPIPE, SIG_DFL);
1820 /* 1641 /*
1821 * mimick login's behavior by disabling the job control signals 1642 * mimic login's behavior by disabling the job control signals
1822 * a shell that wants them can turn them back on 1643 * a shell that wants them can turn them back on
1823 */ 1644 */
1824#ifdef SIGTSTP 1645#ifdef SIGTSTP
1825 signal (SIGTSTP, SIG_IGN); 1646 signal (SIGTSTP, SIG_IGN);
1826 signal (SIGTTIN, SIG_IGN); 1647 signal (SIGTTIN, SIG_IGN);

Diff Legend

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