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.269 by root, Tue Jun 15 10:33:47 2010 UTC vs.
Revision 1.297 by sf-exg, Mon Aug 15 11:01:54 2011 UTC

10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
143 143
144 return rval; 144 return rval;
145} 145}
146#endif 146#endif
147 147
148const char *const def_colorName[] = 148static const char *const def_colorName[] =
149 { 149 {
150 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
152 /* low-intensity colors */ 152 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
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;
644 free (r_argv); 626 free (r_argv);
645 627
646 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
648 rs [i] = 0; 630 rs [i] = 0;
649
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
654 631
655#if ENABLE_PERL 632#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 633 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 634 rs[Rs_perl_ext_1] = "default";
658 635
790 set_locale (""); 767 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 768 set_environ (envv); // a few things in X do not call setlocale :(
792 769
793 init_vars (); 770 init_vars ();
794 771
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv); 772 const char **cmd_argv = init_resources (argc, argv);
798 773
799#ifdef KEYSYM_RESOURCE 774#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 775 keyboard->register_done ();
801#endif 776#endif
827 802
828 if (option (Opt_scrollBar)) 803 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 804 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP 805#ifdef HAVE_BG_PIXMAP
831 { 806 {
832 bgPixmap.set_target (this); 807 bg_init ();
833 bgPixmap.invalidate ();
834 808
835#ifdef ENABLE_TRANSPARENCY 809#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent)) 810 if (option (Opt_transparent))
837 { 811 {
838 bgPixmap.set_transparent (); 812 bg_set_transparent ();
839 813
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius]) 814 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 815 bg_set_blur (rs [Rs_blurradius]);
843#endif 816
844 if (ISSET_PIXCOLOR (Color_tint)) 817 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 818 bg_set_tint (pix_colors_focused [Color_tint]);
846 819
847 if (rs [Rs_shade]) 820 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]); 821 bg_set_shade (rs [Rs_shade]);
849 822
850 bgPixmap.set_root_pixmap (); 823 bg_set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask); 824 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
853 } 826 }
854#endif 827#endif
855 828
859 const char *p = rs[Rs_backgroundPixmap]; 832 const char *p = rs[Rs_backgroundPixmap];
860 833
861 if ((p = strchr (p, ';')) != 0) 834 if ((p = strchr (p, ';')) != 0)
862 { 835 {
863 p++; 836 p++;
864 bgPixmap.set_geometry (p); 837 bg_set_geometry (p);
865 } 838 }
866 else 839 else
867 bgPixmap.set_defaultGeometry (); 840 bg_set_default_geometry ();
868 841
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 842 if (bg_set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ()) 843 if (!bg_window_position_sensitive ())
871 update_background (); 844 update_background ();
872 } 845 }
873#endif 846#endif
874 } 847 }
875#endif 848#endif
892#if ENABLE_XEMBED 865#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 866 if (rs[Rs_embed])
894 { 867 {
895 long info[2] = { 0, XEMBED_MAPPED }; 868 long info[2] = { 0, XEMBED_MAPPED };
896 869
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 871 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 872 }
900#endif 873#endif
901 874
902 XMapWindow (dpy, vt); 875 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 876 XMapWindow (dpy, parent);
904 877
905 refresh_check (); 878 refresh_check ();
906} 879}
907 880
908/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
909void 882void
910rxvt_term::init_env () 883rxvt_term::init_env ()
911{ 884{
912 int i;
913 char *val; 885 char *val;
914 886
915#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 888 /* Fixup display_name for export over pty to any interested terminal
917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
931 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
932 904
933 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
935 907
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 909
939 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
940 911
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 913
943 /* add entries to the environment: 914 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
1299 1270
1300 if (i) 1271 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1272 ModMetaMask = modmasks[i - 1];
1302} 1273}
1303 1274
1275void
1276rxvt_term::set_icon (const char *file)
1277{
1278#ifdef HAVE_AFTERIMAGE
1279 init_asv ();
1280
1281 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1282 if (!im)
1283 {
1284 rxvt_warn ("Loading image icon failed, continuing without.\n");
1285 return;
1286 }
1287
1288 unsigned int w = im->width;
1289 unsigned int h = im->height;
1290
1291 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1292 {
1293 rxvt_warn ("Icon image too big, continuing without.\n");
1294 destroy_asimage (&im);
1295 return;
1296 }
1297
1298 ASImage *result = scale_asimage (asv, im,
1299 w, h, ASA_ARGB32,
1300 100, ASIMAGE_QUALITY_DEFAULT);
1301 destroy_asimage (&im);
1302
1303 if (!result)
1304 {
1305 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1306 return;
1307 }
1308
1309 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1310 if (buffer)
1311 {
1312 ARGB32 *asbuf = result->alt.argb32;
1313 buffer [0] = w;
1314 buffer [1] = h;
1315
1316 for (unsigned int i = 0; i < w * h; ++i)
1317 buffer [i + 2] = asbuf [i];
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 destroy_asimage (&result);
1327#endif
1328
1329#ifdef HAVE_PIXBUF
1330 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf)
1332 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return;
1335 }
1336
1337 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1338 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1339
1340 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1341 {
1342 rxvt_warn ("Icon image too big, continuing without.\n");
1343 g_object_unref (pixbuf);
1344 return;
1345 }
1346
1347 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1348 {
1349 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1350 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1351 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1352
1353 buffer [0] = w;
1354 buffer [1] = h;
1355 for (int i = 0; i < h; i++)
1356 {
1357 for (int j = 0; j < w; j++)
1358 {
1359 unsigned char *pixel = row + j * channels;
1360 long value;
1361
1362 if (channels == 4)
1363 value = pixel[3];
1364 else
1365 value = (unsigned char)0x00ff;
1366
1367 value = (value << 8) + pixel[0];
1368 value = (value << 8) + pixel[1];
1369 value = (value << 8) + pixel[2];
1370 buffer[(i * w + j) + 2] = value;
1371 }
1372
1373 row += rowstride;
1374 }
1375
1376 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1377 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1378 free (buffer);
1379 }
1380 else
1381 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1382
1383 g_object_unref (pixbuf);
1384#endif
1385}
1386
1304/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
1306void 1389void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1391{
1309 XClassHint classHint; 1392 XClassHint classHint;
1310 XWMHints wmHint; 1393 XWMHints wmHint;
1356 } 1439 }
1357#endif 1440#endif
1358 1441
1359 window_calc (0, 0); 1442 window_calc (0, 0);
1360 1443
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1365 1448
1366 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
1369 ext_bwidth, 1452 ext_bwidth,
1370 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1455 &attributes);
1373 1456
1374 this->parent[0] = top; 1457 this->parent = top;
1375 1458
1376 old_width = szHint.width; 1459 old_width = szHint.width;
1377 old_height = szHint.height; 1460 old_height = szHint.height;
1378 1461
1379 set_title (rs [Rs_title]); 1462 set_title (rs [Rs_title]);
1388 wmHint.window_group = top; 1471 wmHint.window_group = top;
1389 1472
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1474 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1475#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1476 /*
1395 * set up icon hint 1477 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1478 * rs [Rs_iconfile] is path to icon
1397 */ 1479 */
1398 1480
1399 if (rs [Rs_iconfile]) 1481 if (rs [Rs_iconfile])
1400 { 1482 {
1401 init_asv (); 1483 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 } 1484 }
1440# endif
1441#endif 1485#endif
1442 1486
1443#if ENABLE_FRILLS 1487#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1488 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1489 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1451#if ENABLE_EWMH 1495#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1453#endif 1497#endif
1454 }; 1498 };
1455 1499
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1501
1458#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1505#endif
1522 pix_colors = pix_colors_unfocused; 1566 pix_colors = pix_colors_unfocused;
1523#endif 1567#endif
1524 1568
1525 pointer_unblank (); 1569 pointer_unblank ();
1526 scr_recolour (); 1570 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 // 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 if (erase != -1)
1585 tio->c_cc[VERASE] = erase;
1586
1587 /* input modes */
1588 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1589# ifdef IMAXBEL
1590 | IMAXBEL
1591# endif
1592 | IXON);
1593
1594 /* output modes */
1595 tio->c_oflag = (OPOST | ONLCR);
1596
1597 /* control modes */
1598 tio->c_cflag = (CS8 | CREAD);
1599
1600 /* line discipline modes */
1601 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1602# if defined (ECHOCTL) && defined (ECHOKE)
1603 | ECHOCTL | ECHOKE
1604# endif
1605 | ECHOE | ECHOK);
1606
1607 /*
1608 * Debugging
1609 */
1610#ifdef DEBUG_TTYMODE
1611 /* c_iflag bits */
1612 fprintf (stderr, "Input flags\n");
1613
1614 /* cpp token stringize doesn't work on all machines <sigh> */
1615# define FOO(flag,name) \
1616 if ((tio->c_iflag) & flag) \
1617 fprintf (stderr, "%s ", name)
1618
1619 /* c_iflag bits */
1620 FOO (IGNBRK, "IGNBRK");
1621 FOO (BRKINT, "BRKINT");
1622 FOO (IGNPAR, "IGNPAR");
1623 FOO (PARMRK, "PARMRK");
1624 FOO (INPCK, "INPCK");
1625 FOO (ISTRIP, "ISTRIP");
1626 FOO (INLCR, "INLCR");
1627 FOO (IGNCR, "IGNCR");
1628 FOO (ICRNL, "ICRNL");
1629 FOO (IXON, "IXON");
1630 FOO (IXOFF, "IXOFF");
1631# ifdef IUCLC
1632 FOO (IUCLC, "IUCLC");
1633# endif
1634# ifdef IXANY
1635 FOO (IXANY, "IXANY");
1636# endif
1637# ifdef IMAXBEL
1638 FOO (IMAXBEL, "IMAXBEL");
1639# endif
1640
1641 fprintf (stderr, "\n");
1642
1643# undef FOO
1644# define FOO(entry, name) \
1645 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1646
1647 FOO (VINTR, "VINTR");
1648 FOO (VQUIT, "VQUIT");
1649 FOO (VERASE, "VERASE");
1650 FOO (VKILL, "VKILL");
1651 FOO (VEOF, "VEOF");
1652 FOO (VEOL, "VEOL");
1653# ifdef VEOL2
1654 FOO (VEOL2, "VEOL2");
1655# endif
1656# ifdef VSWTC
1657 FOO (VSWTC, "VSWTC");
1658# endif
1659# ifdef VSWTCH
1660 FOO (VSWTCH, "VSWTCH");
1661# endif
1662 FOO (VSTART, "VSTART");
1663 FOO (VSTOP, "VSTOP");
1664 FOO (VSUSP, "VSUSP");
1665# ifdef VDSUSP
1666 FOO (VDSUSP, "VDSUSP");
1667# endif
1668# ifdef VREPRINT
1669 FOO (VREPRINT, "VREPRINT");
1670# endif
1671# ifdef VDISCRD
1672 FOO (VDISCRD, "VDISCRD");
1673# endif
1674# ifdef VWERSE
1675 FOO (VWERSE, "VWERSE");
1676# endif
1677# ifdef VLNEXT
1678 FOO (VLNEXT, "VLNEXT");
1679# endif
1680
1681 fprintf (stderr, "\n");
1682# undef FOO
1683#endif /* DEBUG_TTYMODE */
1684} 1571}
1685 1572
1686/*----------------------------------------------------------------------*/ 1573/*----------------------------------------------------------------------*/
1687/* 1574/*
1688 * Run the command in a subprocess and return a file descriptor for the 1575 * Run the command in a subprocess and return a file descriptor for the
1709 else 1596 else
1710#endif 1597#endif
1711 if (!pty->get ()) 1598 if (!pty->get ())
1712 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1713 1600
1714 int er; 1601 struct termios tio = def_tio;
1715 1602
1716#ifndef NO_BACKSPACE_KEY 1603#ifndef NO_BACKSPACE_KEY
1717 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718 er = rs[Rs_backspace_key][0]; 1605 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1719 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1606 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720 er = '\177'; /* the initial state anyway */ 1607 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1721 else
1722#endif 1608#endif
1723 er = -1;
1724 1609
1725 rxvt_get_ttymode (&tio, er);
1726 /* init terminal attributes */ 1610 /* init terminal attributes */
1727 cfsetospeed (&tio, BAUDRATE); 1611 cfsetospeed (&tio, BAUDRATE);
1728 cfsetispeed (&tio, BAUDRATE); 1612 cfsetispeed (&tio, BAUDRATE);
1729 tcsetattr (pty->tty, TCSANOW, &tio); 1613 tcsetattr (pty->tty, TCSANOW, &tio);
1730 pty->set_utf8_mode (enc_utf8); 1614 pty->set_utf8_mode (enc_utf8);
1817 signal (SIGQUIT, SIG_DFL); 1701 signal (SIGQUIT, SIG_DFL);
1818 signal (SIGCHLD, SIG_DFL); 1702 signal (SIGCHLD, SIG_DFL);
1819 signal (SIGHUP, SIG_DFL); 1703 signal (SIGHUP, SIG_DFL);
1820 signal (SIGPIPE, SIG_DFL); 1704 signal (SIGPIPE, SIG_DFL);
1821 /* 1705 /*
1822 * mimick login's behavior by disabling the job control signals 1706 * mimic login's behavior by disabling the job control signals
1823 * a shell that wants them can turn them back on 1707 * a shell that wants them can turn them back on
1824 */ 1708 */
1825#ifdef SIGTSTP 1709#ifdef SIGTSTP
1826 signal (SIGTSTP, SIG_IGN); 1710 signal (SIGTSTP, SIG_IGN);
1827 signal (SIGTTIN, SIG_IGN); 1711 signal (SIGTTIN, SIG_IGN);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines