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.266 by sf-exg, Mon Jun 14 15:40:03 2010 UTC vs.
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 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.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
558 set_option (Opt_iso14755); 563 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 565 set_option (Opt_buffered);
561} 566}
562 567
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/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
582const char ** 569const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
584{ 571{
585 int i, r_argc; 572 int i, r_argc;
… …
645 632
646 for (int i = NUM_RESOURCES; i--; ) 633 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 634 if (rs [i] == resval_undef)
648 rs [i] = 0; 635 rs [i] = 0;
649 636
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
654
655#if ENABLE_PERL 637#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 638 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 639 rs[Rs_perl_ext_1] = "default";
658 640
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 644 {
663 rxvt_perl.init (this); 645 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 646 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 647 }
666#endif 648#endif
649
650 // must be called after initialising the perl interpreter as it
651 // may invoke the `on_register_command' hook
652 extract_keysym_resources ();
667 653
668 /* 654 /*
669 * set any defaults not already set 655 * set any defaults not already set
670 */ 656 */
671 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
… …
790 set_locale (""); 776 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 777 set_environ (envv); // a few things in X do not call setlocale :(
792 778
793 init_vars (); 779 init_vars ();
794 780
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv); 781 const char **cmd_argv = init_resources (argc, argv);
798 782
799#ifdef KEYSYM_RESOURCE 783#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 784 keyboard->register_done ();
801#endif 785#endif
… …
809 if (chdir (path)) 793 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 } 795 }
812 796
813 if (option (Opt_scrollBar)) 797 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 798 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 799
816 pty = ptytty::create (); 800 pty = ptytty::create ();
801
802#ifdef HAVE_AFTERIMAGE
803 set_application_name ((char *)rs[Rs_name]);
804 set_output_threshold (OUTPUT_LEVEL_WARNING);
805#endif
806
807 // must be called before create_windows, because the latter may call set_icon
808#ifdef HAVE_PIXBUF
809 g_type_init ();
810#endif
817 811
818 create_windows (argc, argv); 812 create_windows (argc, argv);
819 813
820 init_xlocale (); 814 init_xlocale ();
821 815
… …
827 821
828 if (option (Opt_scrollBar)) 822 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 823 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP 824#ifdef HAVE_BG_PIXMAP
831 { 825 {
832 bgPixmap.set_target (this); 826 bg_init ();
833 bgPixmap.invalidate ();
834 827
835#ifdef ENABLE_TRANSPARENCY 828#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent)) 829 if (option (Opt_transparent))
837 { 830 {
838 bgPixmap.set_transparent (); 831 bg_set_transparent ();
839 832
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius]) 833 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 834 bg_set_blur (rs [Rs_blurradius]);
843#endif 835
844 if (ISSET_PIXCOLOR (Color_tint)) 836 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 837 bg_set_tint (pix_colors_focused [Color_tint]);
846 838
847 if (rs [Rs_shade]) 839 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]); 840 bg_set_shade (rs [Rs_shade]);
849 841
850 bgPixmap.set_root_pixmap (); 842 bg_set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask); 843 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root); 844 rootwin_ev.start (display, display->root);
853 } 845 }
854#endif 846#endif
855 847
856#ifdef BG_IMAGE_FROM_FILE 848#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap]) 849 if (rs[Rs_backgroundPixmap])
858 { 850 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 851 if (bg_set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ()) 852 if (!bg_window_position_sensitive ())
871 update_background (); 853 update_background ();
872 } 854 }
873#endif 855#endif
874 } 856 }
875#endif 857#endif
… …
892#if ENABLE_XEMBED 874#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 875 if (rs[Rs_embed])
894 { 876 {
895 long info[2] = { 0, XEMBED_MAPPED }; 877 long info[2] = { 0, XEMBED_MAPPED };
896 878
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 880 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 881 }
900#endif 882#endif
901 883
884#if HAVE_STARTUP_NOTIFICATION
885 SnDisplay *snDisplay;
886 SnLauncheeContext *snContext;
887
888 snDisplay = sn_display_new (dpy, NULL, NULL);
889 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
890
891 /* Tell the window manager that this window is part of the startup context */
892 if (snContext)
893 sn_launchee_context_setup_window (snContext, parent);
894#endif
895
902 XMapWindow (dpy, vt); 896 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 897 XMapWindow (dpy, parent);
898
899#if HAVE_STARTUP_NOTIFICATION
900 if (snContext)
901 {
902 /* Mark the startup process as complete */
903 sn_launchee_context_complete (snContext);
904
905 sn_launchee_context_unref (snContext);
906 }
907
908 sn_display_unref (snDisplay);
909#endif
904 910
905 refresh_check (); 911 refresh_check ();
906} 912}
907 913
908/*----------------------------------------------------------------------*/ 914/*----------------------------------------------------------------------*/
909void 915void
910rxvt_term::init_env () 916rxvt_term::init_env ()
911{ 917{
912 int i;
913 char *val; 918 char *val;
914 919
915#ifdef DISPLAY_IS_IP 920#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 921 /* 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 922 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
931 val = XDisplayString (dpy); 936 val = XDisplayString (dpy);
932 937
933 if (rs[Rs_display_name] == NULL) 938 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 939 rs[Rs_display_name] = val; /* use broken `:0' value */
935 940
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 941 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 942
939 sprintf (env_display, "DISPLAY=%s", val); 943 sprintf (env_display, "DISPLAY=%s", val);
940 944
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 945 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 946
943 /* add entries to the environment: 947 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 948 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 949 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 950 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1299 1303
1300 if (i) 1304 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1305 ModMetaMask = modmasks[i - 1];
1302} 1306}
1303 1307
1308void
1309rxvt_term::set_icon (const char *file)
1310{
1311#ifdef HAVE_AFTERIMAGE
1312 init_asv ();
1313
1314 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1315 if (!im)
1316 {
1317 rxvt_warn ("Loading image icon failed, continuing without.\n");
1318 return;
1319 }
1320
1321 unsigned int w = im->width;
1322 unsigned int h = im->height;
1323
1324 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1325 {
1326 rxvt_warn ("Icon image too big, continuing without.\n");
1327 destroy_asimage (&im);
1328 return;
1329 }
1330
1331 ASImage *result = scale_asimage (asv, im,
1332 w, h, ASA_ARGB32,
1333 100, ASIMAGE_QUALITY_DEFAULT);
1334 destroy_asimage (&im);
1335
1336 if (!result)
1337 {
1338 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1339 return;
1340 }
1341
1342 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1343 if (buffer)
1344 {
1345 ARGB32 *asbuf = result->alt.argb32;
1346 buffer [0] = w;
1347 buffer [1] = h;
1348
1349 for (unsigned int i = 0; i < w * h; ++i)
1350 buffer [i + 2] = asbuf [i];
1351
1352 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1353 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1354 free (buffer);
1355 }
1356 else
1357 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1358
1359 destroy_asimage (&result);
1360#endif
1361
1362#ifdef HAVE_PIXBUF
1363 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1364 if (!pixbuf)
1365 {
1366 rxvt_warn ("Loading image icon failed, continuing without.\n");
1367 return;
1368 }
1369
1370 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1371 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1372
1373 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1374 {
1375 rxvt_warn ("Icon image too big, continuing without.\n");
1376 g_object_unref (pixbuf);
1377 return;
1378 }
1379
1380 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1381 {
1382 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1383 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1384 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1385
1386 buffer [0] = w;
1387 buffer [1] = h;
1388 for (int i = 0; i < h; i++)
1389 {
1390 for (int j = 0; j < w; j++)
1391 {
1392 unsigned char *pixel = row + j * channels;
1393 long value;
1394
1395 if (channels == 4)
1396 value = pixel[3];
1397 else
1398 value = (unsigned char)0x00ff;
1399
1400 value = (value << 8) + pixel[0];
1401 value = (value << 8) + pixel[1];
1402 value = (value << 8) + pixel[2];
1403 buffer[(i * w + j) + 2] = value;
1404 }
1405
1406 row += rowstride;
1407 }
1408
1409 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1410 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1411 free (buffer);
1412 }
1413 else
1414 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1415
1416 g_object_unref (pixbuf);
1417#endif
1418}
1419
1304/*----------------------------------------------------------------------*/ 1420/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1421/* Open and map the window */
1306void 1422void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1423rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1424{
1309 XClassHint classHint; 1425 XClassHint classHint;
1310 XWMHints wmHint; 1426 XWMHints wmHint;
… …
1356 } 1472 }
1357#endif 1473#endif
1358 1474
1359 window_calc (0, 0); 1475 window_calc (0, 0);
1360 1476
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1477 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1478 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1479 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1480 attributes.colormap = cmap;
1365 1481
1366 top = XCreateWindow (dpy, parent, 1482 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1485 ext_bwidth,
1370 depth, InputOutput, visual, 1486 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1488 &attributes);
1373 1489
1374 this->parent[0] = top; 1490 this->parent = top;
1375 1491
1376 old_width = szHint.width; 1492 old_width = szHint.width;
1377 old_height = szHint.height; 1493 old_height = szHint.height;
1378 1494
1379 set_title (rs [Rs_title]); 1495 set_title (rs [Rs_title]);
… …
1388 wmHint.window_group = top; 1504 wmHint.window_group = top;
1389 1505
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1506 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1507 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1508#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1509 /*
1395 * set up icon hint 1510 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1511 * rs [Rs_iconfile] is path to icon
1397 */ 1512 */
1398 1513
1399 if (rs [Rs_iconfile]) 1514 if (rs [Rs_iconfile])
1400 { 1515 {
1401 init_asv (); 1516 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 } 1517 }
1440# endif
1441#endif 1518#endif
1442 1519
1443#if ENABLE_FRILLS 1520#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1521 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1522 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1528#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1529 xa[XA_NET_WM_PING],
1453#endif 1530#endif
1454 }; 1531 };
1455 1532
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1533 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1534
1458#if ENABLE_FRILLS 1535#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1536 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1537 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1538#endif
… …
1522 pix_colors = pix_colors_unfocused; 1599 pix_colors = pix_colors_unfocused;
1523#endif 1600#endif
1524 1601
1525 pointer_unblank (); 1602 pointer_unblank ();
1526 scr_recolour (); 1603 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
1546 tio->c_cc[VINTR] = CINTR;
1547 tio->c_cc[VQUIT] = CQUIT;
1548 tio->c_cc[VERASE] = CERASE;
1549#ifdef VERASE2
1550 tio->c_cc[VERASE2] = CERASE2;
1551#endif
1552 tio->c_cc[VKILL] = CKILL;
1553 tio->c_cc[VSTART] = CSTART;
1554 tio->c_cc[VSTOP] = CSTOP;
1555 tio->c_cc[VSUSP] = CSUSP;
1556# ifdef VDSUSP
1557 tio->c_cc[VDSUSP] = CDSUSP;
1558# endif
1559# ifdef VREPRINT
1560 tio->c_cc[VREPRINT] = CRPRNT;
1561# endif
1562# ifdef VDISCRD
1563 tio->c_cc[VDISCRD] = CFLUSH;
1564# endif
1565# ifdef VWERSE
1566 tio->c_cc[VWERSE] = CWERASE;
1567# endif
1568# ifdef VLNEXT
1569 tio->c_cc[VLNEXT] = CLNEXT;
1570# endif
1571 }
1572
1573 tio->c_cc[VEOF] = CEOF;
1574 tio->c_cc[VEOL] = VDISABLE;
1575# ifdef VEOL2
1576 tio->c_cc[VEOL2] = VDISABLE;
1577# endif
1578# ifdef VSWTC
1579 tio->c_cc[VSWTC] = VDISABLE;
1580# endif
1581# ifdef VSWTCH
1582 tio->c_cc[VSWTCH] = VDISABLE;
1583# endif
1584# if VMIN != VEOF
1585 tio->c_cc[VMIN] = 1;
1586# endif
1587# if VTIME != VEOL
1588 tio->c_cc[VTIME] = 0;
1589# endif
1590
1591 if (erase != -1)
1592 tio->c_cc[VERASE] = (char)erase;
1593
1594 /* input modes */
1595 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1596# ifdef IMAXBEL
1597 | IMAXBEL
1598# endif
1599 | IXON);
1600
1601 /* output modes */
1602 tio->c_oflag = (OPOST | ONLCR);
1603
1604 /* control modes */
1605 tio->c_cflag = (CS8 | CREAD);
1606
1607 /* line discipline modes */
1608 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1609# if defined (ECHOCTL) && defined (ECHOKE)
1610 | ECHOCTL | ECHOKE
1611# endif
1612 | ECHOE | ECHOK);
1613
1614 /*
1615 * Debugging
1616 */
1617#ifdef DEBUG_TTYMODE
1618 /* c_iflag bits */
1619 fprintf (stderr, "Input flags\n");
1620
1621 /* cpp token stringize doesn't work on all machines <sigh> */
1622# define FOO(flag,name) \
1623 if ((tio->c_iflag) & flag) \
1624 fprintf (stderr, "%s ", name)
1625
1626 /* c_iflag bits */
1627 FOO (IGNBRK, "IGNBRK");
1628 FOO (BRKINT, "BRKINT");
1629 FOO (IGNPAR, "IGNPAR");
1630 FOO (PARMRK, "PARMRK");
1631 FOO (INPCK, "INPCK");
1632 FOO (ISTRIP, "ISTRIP");
1633 FOO (INLCR, "INLCR");
1634 FOO (IGNCR, "IGNCR");
1635 FOO (ICRNL, "ICRNL");
1636 FOO (IXON, "IXON");
1637 FOO (IXOFF, "IXOFF");
1638# ifdef IUCLC
1639 FOO (IUCLC, "IUCLC");
1640# endif
1641# ifdef IXANY
1642 FOO (IXANY, "IXANY");
1643# endif
1644# ifdef IMAXBEL
1645 FOO (IMAXBEL, "IMAXBEL");
1646# endif
1647
1648 fprintf (stderr, "\n");
1649
1650# undef FOO
1651# define FOO(entry, name) \
1652 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1653
1654 FOO (VINTR, "VINTR");
1655 FOO (VQUIT, "VQUIT");
1656 FOO (VERASE, "VERASE");
1657 FOO (VKILL, "VKILL");
1658 FOO (VEOF, "VEOF");
1659 FOO (VEOL, "VEOL");
1660# ifdef VEOL2
1661 FOO (VEOL2, "VEOL2");
1662# endif
1663# ifdef VSWTC
1664 FOO (VSWTC, "VSWTC");
1665# endif
1666# ifdef VSWTCH
1667 FOO (VSWTCH, "VSWTCH");
1668# endif
1669 FOO (VSTART, "VSTART");
1670 FOO (VSTOP, "VSTOP");
1671 FOO (VSUSP, "VSUSP");
1672# ifdef VDSUSP
1673 FOO (VDSUSP, "VDSUSP");
1674# endif
1675# ifdef VREPRINT
1676 FOO (VREPRINT, "VREPRINT");
1677# endif
1678# ifdef VDISCRD
1679 FOO (VDISCRD, "VDISCRD");
1680# endif
1681# ifdef VWERSE
1682 FOO (VWERSE, "VWERSE");
1683# endif
1684# ifdef VLNEXT
1685 FOO (VLNEXT, "VLNEXT");
1686# endif
1687
1688 fprintf (stderr, "\n");
1689# undef FOO
1690#endif /* DEBUG_TTYMODE */
1691} 1604}
1692 1605
1693/*----------------------------------------------------------------------*/ 1606/*----------------------------------------------------------------------*/
1694/* 1607/*
1695 * Run the command in a subprocess and return a file descriptor for the 1608 * Run the command in a subprocess and return a file descriptor for the
… …
1716 else 1629 else
1717#endif 1630#endif
1718 if (!pty->get ()) 1631 if (!pty->get ())
1719 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1632 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1720 1633
1721 int er; 1634 struct termios tio = def_tio;
1722 1635
1723#ifndef NO_BACKSPACE_KEY 1636#ifndef NO_BACKSPACE_KEY
1724 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1637 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1725 er = rs[Rs_backspace_key][0]; 1638 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1726 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1639 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1727 er = '\177'; /* the initial state anyway */ 1640 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1728 else
1729#endif 1641#endif
1730 er = -1;
1731 1642
1732 rxvt_get_ttymode (&tio, er);
1733 /* init terminal attributes */ 1643 /* init terminal attributes */
1734 cfsetospeed (&tio, BAUDRATE); 1644 cfsetospeed (&tio, BAUDRATE);
1735 cfsetispeed (&tio, BAUDRATE); 1645 cfsetispeed (&tio, BAUDRATE);
1736 tcsetattr (pty->tty, TCSANOW, &tio); 1646 tcsetattr (pty->tty, TCSANOW, &tio);
1737 pty->set_utf8_mode (enc_utf8); 1647 pty->set_utf8_mode (enc_utf8);
… …
1824 signal (SIGQUIT, SIG_DFL); 1734 signal (SIGQUIT, SIG_DFL);
1825 signal (SIGCHLD, SIG_DFL); 1735 signal (SIGCHLD, SIG_DFL);
1826 signal (SIGHUP, SIG_DFL); 1736 signal (SIGHUP, SIG_DFL);
1827 signal (SIGPIPE, SIG_DFL); 1737 signal (SIGPIPE, SIG_DFL);
1828 /* 1738 /*
1829 * mimick login's behavior by disabling the job control signals 1739 * mimic login's behavior by disabling the job control signals
1830 * a shell that wants them can turn them back on 1740 * a shell that wants them can turn them back on
1831 */ 1741 */
1832#ifdef SIGTSTP 1742#ifdef SIGTSTP
1833 signal (SIGTSTP, SIG_IGN); 1743 signal (SIGTSTP, SIG_IGN);
1834 signal (SIGTTIN, SIG_IGN); 1744 signal (SIGTTIN, SIG_IGN);

Diff Legend

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