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.265 by root, Sun May 23 00:02:52 2010 UTC vs.
Revision 1.278 by sf-exg, Sun Aug 29 15:04:40 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
… …
1299 1279
1300 if (i) 1280 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
1302} 1282}
1303 1283
1284void
1285rxvt_term::set_icon (const char *file)
1286{
1287#ifdef HAVE_AFTERIMAGE
1288 init_asv ();
1289
1290 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291 if (!im)
1292 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return;
1295 }
1296
1297 int w = im->width;
1298 int h = im->height;
1299
1300 ASImage *result = scale_asimage (asv, im,
1301 w, h, ASA_ARGB32,
1302 100, ASIMAGE_QUALITY_DEFAULT);
1303 destroy_asimage (&im);
1304
1305 if (!result)
1306 {
1307 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1308 return;
1309 }
1310
1311 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1312 if (buffer)
1313 {
1314 ARGB32 *asbuf = result->alt.argb32;
1315 buffer [0] = w;
1316 buffer [1] = h;
1317
1318 for (unsigned int i = 0; i < w * h; ++i)
1319 buffer [i + 2] = asbuf [i];
1320
1321 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1322 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1323 free (buffer);
1324 }
1325 else
1326 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1327
1328 destroy_asimage (&result);
1329#endif
1330}
1331
1304/*----------------------------------------------------------------------*/ 1332/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1333/* rxvt_Create_Windows () - Open and map the window */
1306void 1334void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1335rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1336{
… …
1388 wmHint.window_group = top; 1416 wmHint.window_group = top;
1389 1417
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1418 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1419 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1420#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1421 /*
1395 * set up icon hint 1422 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1423 * rs [Rs_iconfile] is path to icon
1397 */ 1424 */
1398 1425
1399 if (rs [Rs_iconfile]) 1426 if (rs [Rs_iconfile])
1400 { 1427 {
1401 init_asv (); 1428 set_icon (rs [Rs_iconfile]);
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 } 1429 }
1440# endif
1441#endif 1430#endif
1442 1431
1443#if ENABLE_FRILLS 1432#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1433 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1434 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1522 pix_colors = pix_colors_unfocused; 1511 pix_colors = pix_colors_unfocused;
1523#endif 1512#endif
1524 1513
1525 pointer_unblank (); 1514 pointer_unblank ();
1526 scr_recolour (); 1515 scr_recolour ();
1527}
1528
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 if (tcgetattr (STDIN_FILENO, tio) < 0)
1539 {
1540 // return error - use system defaults,
1541 // where possible, and zero elsewhere
1542 memset (tio, 0, sizeof (struct termios));
1543
1544 tio->c_cc[VINTR] = CINTR;
1545 tio->c_cc[VQUIT] = CQUIT;
1546 tio->c_cc[VERASE] = CERASE;
1547#ifdef VERASE2
1548 tio->c_cc[VERASE2] = CERASE2;
1549#endif
1550 tio->c_cc[VKILL] = CKILL;
1551 tio->c_cc[VSTART] = CSTART;
1552 tio->c_cc[VSTOP] = CSTOP;
1553 tio->c_cc[VSUSP] = CSUSP;
1554# ifdef VDSUSP
1555 tio->c_cc[VDSUSP] = CDSUSP;
1556# endif
1557# ifdef VREPRINT
1558 tio->c_cc[VREPRINT] = CRPRNT;
1559# endif
1560# ifdef VDISCRD
1561 tio->c_cc[VDISCRD] = CFLUSH;
1562# endif
1563# ifdef VWERSE
1564 tio->c_cc[VWERSE] = CWERASE;
1565# endif
1566# ifdef VLNEXT
1567 tio->c_cc[VLNEXT] = CLNEXT;
1568# endif
1569 }
1570
1571 tio->c_cc[VEOF] = CEOF;
1572 tio->c_cc[VEOL] = VDISABLE;
1573# ifdef VEOL2
1574 tio->c_cc[VEOL2] = VDISABLE;
1575# endif
1576# ifdef VSWTC
1577 tio->c_cc[VSWTC] = VDISABLE;
1578# endif
1579# ifdef VSWTCH
1580 tio->c_cc[VSWTCH] = VDISABLE;
1581# endif
1582# if VMIN != VEOF
1583 tio->c_cc[VMIN] = 1;
1584# endif
1585# if VTIME != VEOL
1586 tio->c_cc[VTIME] = 0;
1587# endif
1588
1589 if (erase != -1)
1590 tio->c_cc[VERASE] = (char)erase;
1591
1592 /* input modes */
1593 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1594# ifdef IMAXBEL
1595 | IMAXBEL
1596# endif
1597 | IXON);
1598
1599 /* output modes */
1600 tio->c_oflag = (OPOST | ONLCR);
1601
1602 /* control modes */
1603 tio->c_cflag = (CS8 | CREAD);
1604
1605 /* line discipline modes */
1606 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1607# if defined (ECHOCTL) && defined (ECHOKE)
1608 | ECHOCTL | ECHOKE
1609# endif
1610 | ECHOE | ECHOK);
1611
1612 /*
1613 * Debugging
1614 */
1615#ifdef DEBUG_TTYMODE
1616 /* c_iflag bits */
1617 fprintf (stderr, "Input flags\n");
1618
1619 /* cpp token stringize doesn't work on all machines <sigh> */
1620# define FOO(flag,name) \
1621 if ((tio->c_iflag) & flag) \
1622 fprintf (stderr, "%s ", name)
1623
1624 /* c_iflag bits */
1625 FOO (IGNBRK, "IGNBRK");
1626 FOO (BRKINT, "BRKINT");
1627 FOO (IGNPAR, "IGNPAR");
1628 FOO (PARMRK, "PARMRK");
1629 FOO (INPCK, "INPCK");
1630 FOO (ISTRIP, "ISTRIP");
1631 FOO (INLCR, "INLCR");
1632 FOO (IGNCR, "IGNCR");
1633 FOO (ICRNL, "ICRNL");
1634 FOO (IXON, "IXON");
1635 FOO (IXOFF, "IXOFF");
1636# ifdef IUCLC
1637 FOO (IUCLC, "IUCLC");
1638# endif
1639# ifdef IXANY
1640 FOO (IXANY, "IXANY");
1641# endif
1642# ifdef IMAXBEL
1643 FOO (IMAXBEL, "IMAXBEL");
1644# endif
1645
1646 fprintf (stderr, "\n");
1647
1648# undef FOO
1649# define FOO(entry, name) \
1650 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1651
1652 FOO (VINTR, "VINTR");
1653 FOO (VQUIT, "VQUIT");
1654 FOO (VERASE, "VERASE");
1655 FOO (VKILL, "VKILL");
1656 FOO (VEOF, "VEOF");
1657 FOO (VEOL, "VEOL");
1658# ifdef VEOL2
1659 FOO (VEOL2, "VEOL2");
1660# endif
1661# ifdef VSWTC
1662 FOO (VSWTC, "VSWTC");
1663# endif
1664# ifdef VSWTCH
1665 FOO (VSWTCH, "VSWTCH");
1666# endif
1667 FOO (VSTART, "VSTART");
1668 FOO (VSTOP, "VSTOP");
1669 FOO (VSUSP, "VSUSP");
1670# ifdef VDSUSP
1671 FOO (VDSUSP, "VDSUSP");
1672# endif
1673# ifdef VREPRINT
1674 FOO (VREPRINT, "VREPRINT");
1675# endif
1676# ifdef VDISCRD
1677 FOO (VDISCRD, "VDISCRD");
1678# endif
1679# ifdef VWERSE
1680 FOO (VWERSE, "VWERSE");
1681# endif
1682# ifdef VLNEXT
1683 FOO (VLNEXT, "VLNEXT");
1684# endif
1685
1686 fprintf (stderr, "\n");
1687# undef FOO
1688#endif /* DEBUG_TTYMODE */
1689} 1516}
1690 1517
1691/*----------------------------------------------------------------------*/ 1518/*----------------------------------------------------------------------*/
1692/* 1519/*
1693 * Run the command in a subprocess and return a file descriptor for the 1520 * Run the command in a subprocess and return a file descriptor for the
… …
1714 else 1541 else
1715#endif 1542#endif
1716 if (!pty->get ()) 1543 if (!pty->get ())
1717 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1544 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1718 1545
1719 int er; 1546 struct termios tio = def_tio;
1720 1547
1721#ifndef NO_BACKSPACE_KEY 1548#ifndef NO_BACKSPACE_KEY
1722 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1549 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1723 er = rs[Rs_backspace_key][0]; 1550 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1724 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1551 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1725 er = '\177'; /* the initial state anyway */ 1552 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1726 else
1727#endif 1553#endif
1728 er = -1;
1729 1554
1730 rxvt_get_ttymode (&tio, er);
1731 /* init terminal attributes */ 1555 /* init terminal attributes */
1732 cfsetospeed (&tio, BAUDRATE); 1556 cfsetospeed (&tio, BAUDRATE);
1733 cfsetispeed (&tio, BAUDRATE); 1557 cfsetispeed (&tio, BAUDRATE);
1734 tcsetattr (pty->tty, TCSANOW, &tio); 1558 tcsetattr (pty->tty, TCSANOW, &tio);
1735 pty->set_utf8_mode (enc_utf8); 1559 pty->set_utf8_mode (enc_utf8);
… …
1822 signal (SIGQUIT, SIG_DFL); 1646 signal (SIGQUIT, SIG_DFL);
1823 signal (SIGCHLD, SIG_DFL); 1647 signal (SIGCHLD, SIG_DFL);
1824 signal (SIGHUP, SIG_DFL); 1648 signal (SIGHUP, SIG_DFL);
1825 signal (SIGPIPE, SIG_DFL); 1649 signal (SIGPIPE, SIG_DFL);
1826 /* 1650 /*
1827 * mimick login's behavior by disabling the job control signals 1651 * mimic login's behavior by disabling the job control signals
1828 * a shell that wants them can turn them back on 1652 * a shell that wants them can turn them back on
1829 */ 1653 */
1830#ifdef SIGTSTP 1654#ifdef SIGTSTP
1831 signal (SIGTSTP, SIG_IGN); 1655 signal (SIGTSTP, SIG_IGN);
1832 signal (SIGTTIN, SIG_IGN); 1656 signal (SIGTTIN, SIG_IGN);

Diff Legend

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