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.263 by sf-exg, Thu Apr 1 00:12:33 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)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 178
179#ifndef USE_256_COLORS 179#if !USE_256_COLORS
180 // 88 xterm colours 180 // 88 xterm colours
181 "rgb:00/00/00", 181 "rgb:00/00/00",
182 "rgb:00/00/8b", 182 "rgb:00/00/8b",
183 "rgb:00/00/cd", 183 "rgb:00/00/cd",
184 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
510#if ENABLE_FRILLS 510#if ENABLE_FRILLS
511 NULL, // Color_underline 511 NULL, // Color_underline
512#endif 512#endif
513#ifdef OPTION_HC 513#ifdef OPTION_HC
514 NULL, 514 NULL,
515 NULL,
515#endif 516#endif
516 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
517#ifdef RXVT_SCROLLBAR 518#ifdef RXVT_SCROLLBAR
518 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
519#endif 520#endif
… …
557 set_option (Opt_iso14755); 558 set_option (Opt_iso14755);
558 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
559 set_option (Opt_buffered); 560 set_option (Opt_buffered);
560} 561}
561 562
562static void
563init_secondary ()
564{
565 int i;
566
567 if ((i = open ("/dev/null", O_RDONLY)) < 0)
568 {
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 }
571 else if (i != STDIN_FILENO)
572 {
573 dup2 (i, STDIN_FILENO);
574 close (i);
575 }
576
577 dup2 (STDERR_FILENO, STDOUT_FILENO);
578}
579
580/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
581const char ** 564const char **
582rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
583{ 566{
584 int i, r_argc; 567 int i, r_argc;
… …
643 free (r_argv); 626 free (r_argv);
644 627
645 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
646 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
647 rs [i] = 0; 630 rs [i] = 0;
648
649#ifdef HAVE_AFTERIMAGE
650 set_application_name ((char *)rs[Rs_name]);
651 set_output_threshold (OUTPUT_LEVEL_WARNING);
652#endif
653 631
654#if ENABLE_PERL 632#if ENABLE_PERL
655 if (!rs[Rs_perl_ext_1]) 633 if (!rs[Rs_perl_ext_1])
656 rs[Rs_perl_ext_1] = "default"; 634 rs[Rs_perl_ext_1] = "default";
657 635
… …
789 set_locale (""); 767 set_locale ("");
790 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 :(
791 769
792 init_vars (); 770 init_vars ();
793 771
794 init_secondary ();
795
796 const char **cmd_argv = init_resources (argc, argv); 772 const char **cmd_argv = init_resources (argc, argv);
797 773
798#ifdef KEYSYM_RESOURCE 774#ifdef KEYSYM_RESOURCE
799 keyboard->register_done (); 775 keyboard->register_done ();
800#endif 776#endif
… …
826 802
827 if (option (Opt_scrollBar)) 803 if (option (Opt_scrollBar))
828 scrollBar.resize (); /* create and map scrollbar */ 804 scrollBar.resize (); /* create and map scrollbar */
829#ifdef HAVE_BG_PIXMAP 805#ifdef HAVE_BG_PIXMAP
830 { 806 {
831 bgPixmap.set_target (this); 807 bg_init ();
832 bgPixmap.invalidate ();
833 808
834#ifdef ENABLE_TRANSPARENCY 809#ifdef ENABLE_TRANSPARENCY
835 if (option (Opt_transparent)) 810 if (option (Opt_transparent))
836 { 811 {
837 bgPixmap.set_transparent (); 812 bg_set_transparent ();
838 813
839#ifdef HAVE_AFTERIMAGE
840 if (rs [Rs_blurradius]) 814 if (rs [Rs_blurradius])
841 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 815 bg_set_blur (rs [Rs_blurradius]);
842#endif 816
843 if (ISSET_PIXCOLOR (Color_tint)) 817 if (ISSET_PIXCOLOR (Color_tint))
844 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 818 bg_set_tint (pix_colors_focused [Color_tint]);
845 819
846 if (rs [Rs_shade]) 820 if (rs [Rs_shade])
847 bgPixmap.set_shade (rs [Rs_shade]); 821 bg_set_shade (rs [Rs_shade]);
848 822
849 bgPixmap.set_root_pixmap (); 823 bg_set_root_pixmap ();
850 XSelectInput (dpy, display->root, PropertyChangeMask); 824 XSelectInput (dpy, display->root, PropertyChangeMask);
851 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
852 } 826 }
853#endif 827#endif
854 828
… …
858 const char *p = rs[Rs_backgroundPixmap]; 832 const char *p = rs[Rs_backgroundPixmap];
859 833
860 if ((p = strchr (p, ';')) != 0) 834 if ((p = strchr (p, ';')) != 0)
861 { 835 {
862 p++; 836 p++;
863 bgPixmap.set_geometry (p); 837 bg_set_geometry (p);
864 } 838 }
865 else 839 else
866 bgPixmap.set_defaultGeometry (); 840 bg_set_default_geometry ();
867 841
868 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 842 if (bg_set_file (rs[Rs_backgroundPixmap]))
869 if (!bgPixmap.window_position_sensitive ()) 843 if (!bg_window_position_sensitive ())
870 update_background (); 844 update_background ();
871 } 845 }
872#endif 846#endif
873 } 847 }
874#endif 848#endif
… …
891#if ENABLE_XEMBED 865#if ENABLE_XEMBED
892 if (rs[Rs_embed]) 866 if (rs[Rs_embed])
893 { 867 {
894 long info[2] = { 0, XEMBED_MAPPED }; 868 long info[2] = { 0, XEMBED_MAPPED };
895 869
896 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
897 32, PropModeReplace, (unsigned char *)&info, 2); 871 32, PropModeReplace, (unsigned char *)&info, 2);
898 } 872 }
899#endif 873#endif
900 874
901 XMapWindow (dpy, vt); 875 XMapWindow (dpy, vt);
902 XMapWindow (dpy, parent[0]); 876 XMapWindow (dpy, parent);
903 877
904 refresh_check (); 878 refresh_check ();
905} 879}
906 880
907/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
908void 882void
909rxvt_term::init_env () 883rxvt_term::init_env ()
910{ 884{
911 int i;
912 char *val; 885 char *val;
913 886
914#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
915 /* Fixup display_name for export over pty to any interested terminal 888 /* Fixup display_name for export over pty to any interested terminal
916 * 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
… …
930 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
931 904
932 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
933 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
934 907
935 i = strlen (val);
936 env_display = (char *)rxvt_malloc (i + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
937 909
938 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
939 911
940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
941 913
942 /* add entries to the environment: 914 /* add entries to the environment:
943 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
944 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
945 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1298 1270
1299 if (i) 1271 if (i)
1300 ModMetaMask = modmasks[i - 1]; 1272 ModMetaMask = modmasks[i - 1];
1301} 1273}
1302 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
1303/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1304/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
1305void 1389void
1306rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
1307{ 1391{
1308 XClassHint classHint; 1392 XClassHint classHint;
1309 XWMHints wmHint; 1393 XWMHints wmHint;
… …
1355 } 1439 }
1356#endif 1440#endif
1357 1441
1358 window_calc (0, 0); 1442 window_calc (0, 0);
1359 1443
1360 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1361 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1362 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1363 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1364 1448
1365 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
1368 ext_bwidth, 1452 ext_bwidth,
1369 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
1370 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1371 &attributes); 1455 &attributes);
1372 1456
1373 this->parent[0] = top; 1457 this->parent = top;
1374 1458
1375 old_width = szHint.width; 1459 old_width = szHint.width;
1376 old_height = szHint.height; 1460 old_height = szHint.height;
1377 1461
1378 set_title (rs [Rs_title]); 1462 set_title (rs [Rs_title]);
… …
1387 wmHint.window_group = top; 1471 wmHint.window_group = top;
1388 1472
1389 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1390 &szHint, &wmHint, &classHint); 1474 &szHint, &wmHint, &classHint);
1391#if ENABLE_EWMH 1475#if ENABLE_EWMH
1392# ifdef HAVE_AFTERIMAGE
1393 /* 1476 /*
1394 * set up icon hint 1477 * set up icon hint
1395 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1478 * rs [Rs_iconfile] is path to icon
1396 */ 1479 */
1397 1480
1398 if (rs [Rs_iconfile]) 1481 if (rs [Rs_iconfile])
1399 { 1482 {
1400 init_asv (); 1483 set_icon (rs [Rs_iconfile]);
1401
1402 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1403 if (asv && im)
1404 {
1405 int w = im->width;
1406 int h = im->height;
1407 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1408 ASImage *result = scale_asimage (asv, im,
1409 w, h, ASA_ARGB32,
1410 100, ASIMAGE_QUALITY_DEFAULT);
1411 destroy_asimage (&im);
1412
1413 if (buffer && result)
1414 {
1415 ARGB32 *asbuf = result->alt.argb32;
1416 buffer [0] = w;
1417 buffer [1] = h;
1418
1419 for (unsigned int i = 0; i < w * h; ++i)
1420 buffer [i + 2] = asbuf [i];
1421
1422 destroy_asimage (&result);
1423 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1424 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1425 free (buffer);
1426 }
1427 else
1428 {
1429 if (!buffer)
1430 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1431
1432 if (!result)
1433 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1434 }
1435 }
1436 else
1437 rxvt_warn ("Loading image icon failed, continuing without.\n");
1438 } 1484 }
1439# endif
1440#endif 1485#endif
1441 1486
1442#if ENABLE_FRILLS 1487#if ENABLE_FRILLS
1443 if (mwmhints.flags) 1488 if (mwmhints.flags)
1444 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,
… …
1450#if ENABLE_EWMH 1495#if ENABLE_EWMH
1451 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1452#endif 1497#endif
1453 }; 1498 };
1454 1499
1455 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1456 1501
1457#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1458 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1459 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1460#endif 1505#endif
… …
1521 pix_colors = pix_colors_unfocused; 1566 pix_colors = pix_colors_unfocused;
1522#endif 1567#endif
1523 1568
1524 pointer_unblank (); 1569 pointer_unblank ();
1525 scr_recolour (); 1570 scr_recolour ();
1526}
1527
1528/* ------------------------------------------------------------------------- *
1529 * GET TTY CURRENT STATE *
1530 * ------------------------------------------------------------------------- */
1531void
1532rxvt_get_ttymode (struct termios *tio, int erase)
1533{
1534 /*
1535 * standard System V termios interface
1536 */
1537 if (tcgetattr (STDIN_FILENO, tio) < 0)
1538 {
1539 // return error - use system defaults,
1540 // where possible, and zero elsewhere
1541 memset (tio, 0, sizeof (struct termios));
1542
1543 tio->c_cc[VINTR] = CINTR;
1544 tio->c_cc[VQUIT] = CQUIT;
1545 tio->c_cc[VERASE] = CERASE;
1546#ifdef VERASE2
1547 tio->c_cc[VERASE2] = CERASE2;
1548#endif
1549 tio->c_cc[VKILL] = CKILL;
1550 tio->c_cc[VSTART] = CSTART;
1551 tio->c_cc[VSTOP] = CSTOP;
1552 tio->c_cc[VSUSP] = CSUSP;
1553# ifdef VDSUSP
1554 tio->c_cc[VDSUSP] = CDSUSP;
1555# endif
1556# ifdef VREPRINT
1557 tio->c_cc[VREPRINT] = CRPRNT;
1558# endif
1559# ifdef VDISCRD
1560 tio->c_cc[VDISCRD] = CFLUSH;
1561# endif
1562# ifdef VWERSE
1563 tio->c_cc[VWERSE] = CWERASE;
1564# endif
1565# ifdef VLNEXT
1566 tio->c_cc[VLNEXT] = CLNEXT;
1567# endif
1568 }
1569
1570 tio->c_cc[VEOF] = CEOF;
1571 tio->c_cc[VEOL] = VDISABLE;
1572# ifdef VEOL2
1573 tio->c_cc[VEOL2] = VDISABLE;
1574# endif
1575# ifdef VSWTC
1576 tio->c_cc[VSWTC] = VDISABLE;
1577# endif
1578# ifdef VSWTCH
1579 tio->c_cc[VSWTCH] = VDISABLE;
1580# endif
1581# if VMIN != VEOF
1582 tio->c_cc[VMIN] = 1;
1583# endif
1584# if VTIME != VEOL
1585 tio->c_cc[VTIME] = 0;
1586# endif
1587
1588 if (erase != -1)
1589 tio->c_cc[VERASE] = (char)erase;
1590
1591 /* input modes */
1592 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1593# ifdef IMAXBEL
1594 | IMAXBEL
1595# endif
1596 | IXON);
1597
1598 /* output modes */
1599 tio->c_oflag = (OPOST | ONLCR);
1600
1601 /* control modes */
1602 tio->c_cflag = (CS8 | CREAD);
1603
1604 /* line discipline modes */
1605 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1606# if defined (ECHOCTL) && defined (ECHOKE)
1607 | ECHOCTL | ECHOKE
1608# endif
1609 | ECHOE | ECHOK);
1610
1611 /*
1612 * Debugging
1613 */
1614#ifdef DEBUG_TTYMODE
1615 /* c_iflag bits */
1616 fprintf (stderr, "Input flags\n");
1617
1618 /* cpp token stringize doesn't work on all machines <sigh> */
1619# define FOO(flag,name) \
1620 if ((tio->c_iflag) & flag) \
1621 fprintf (stderr, "%s ", name)
1622
1623 /* c_iflag bits */
1624 FOO (IGNBRK, "IGNBRK");
1625 FOO (BRKINT, "BRKINT");
1626 FOO (IGNPAR, "IGNPAR");
1627 FOO (PARMRK, "PARMRK");
1628 FOO (INPCK, "INPCK");
1629 FOO (ISTRIP, "ISTRIP");
1630 FOO (INLCR, "INLCR");
1631 FOO (IGNCR, "IGNCR");
1632 FOO (ICRNL, "ICRNL");
1633 FOO (IXON, "IXON");
1634 FOO (IXOFF, "IXOFF");
1635# ifdef IUCLC
1636 FOO (IUCLC, "IUCLC");
1637# endif
1638# ifdef IXANY
1639 FOO (IXANY, "IXANY");
1640# endif
1641# ifdef IMAXBEL
1642 FOO (IMAXBEL, "IMAXBEL");
1643# endif
1644
1645 fprintf (stderr, "\n");
1646
1647# undef FOO
1648# define FOO(entry, name) \
1649 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1650
1651 FOO (VINTR, "VINTR");
1652 FOO (VQUIT, "VQUIT");
1653 FOO (VERASE, "VERASE");
1654 FOO (VKILL, "VKILL");
1655 FOO (VEOF, "VEOF");
1656 FOO (VEOL, "VEOL");
1657# ifdef VEOL2
1658 FOO (VEOL2, "VEOL2");
1659# endif
1660# ifdef VSWTC
1661 FOO (VSWTC, "VSWTC");
1662# endif
1663# ifdef VSWTCH
1664 FOO (VSWTCH, "VSWTCH");
1665# endif
1666 FOO (VSTART, "VSTART");
1667 FOO (VSTOP, "VSTOP");
1668 FOO (VSUSP, "VSUSP");
1669# ifdef VDSUSP
1670 FOO (VDSUSP, "VDSUSP");
1671# endif
1672# ifdef VREPRINT
1673 FOO (VREPRINT, "VREPRINT");
1674# endif
1675# ifdef VDISCRD
1676 FOO (VDISCRD, "VDISCRD");
1677# endif
1678# ifdef VWERSE
1679 FOO (VWERSE, "VWERSE");
1680# endif
1681# ifdef VLNEXT
1682 FOO (VLNEXT, "VLNEXT");
1683# endif
1684
1685 fprintf (stderr, "\n");
1686# undef FOO
1687#endif /* DEBUG_TTYMODE */
1688} 1571}
1689 1572
1690/*----------------------------------------------------------------------*/ 1573/*----------------------------------------------------------------------*/
1691/* 1574/*
1692 * 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
… …
1713 else 1596 else
1714#endif 1597#endif
1715 if (!pty->get ()) 1598 if (!pty->get ())
1716 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1717 1600
1718 int er; 1601 struct termios tio = def_tio;
1719 1602
1720#ifndef NO_BACKSPACE_KEY 1603#ifndef NO_BACKSPACE_KEY
1721 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1722 er = rs[Rs_backspace_key][0]; 1605 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1723 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1606 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1724 er = '\177'; /* the initial state anyway */ 1607 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1725 else
1726#endif 1608#endif
1727 er = -1;
1728 1609
1729 rxvt_get_ttymode (&tio, er);
1730 /* init terminal attributes */ 1610 /* init terminal attributes */
1731 cfsetospeed (&tio, BAUDRATE); 1611 cfsetospeed (&tio, BAUDRATE);
1732 cfsetispeed (&tio, BAUDRATE); 1612 cfsetispeed (&tio, BAUDRATE);
1733 tcsetattr (pty->tty, TCSANOW, &tio); 1613 tcsetattr (pty->tty, TCSANOW, &tio);
1734 pty->set_utf8_mode (enc_utf8); 1614 pty->set_utf8_mode (enc_utf8);
… …
1821 signal (SIGQUIT, SIG_DFL); 1701 signal (SIGQUIT, SIG_DFL);
1822 signal (SIGCHLD, SIG_DFL); 1702 signal (SIGCHLD, SIG_DFL);
1823 signal (SIGHUP, SIG_DFL); 1703 signal (SIGHUP, SIG_DFL);
1824 signal (SIGPIPE, SIG_DFL); 1704 signal (SIGPIPE, SIG_DFL);
1825 /* 1705 /*
1826 * mimick login's behavior by disabling the job control signals 1706 * mimic login's behavior by disabling the job control signals
1827 * a shell that wants them can turn them back on 1707 * a shell that wants them can turn them back on
1828 */ 1708 */
1829#ifdef SIGTSTP 1709#ifdef SIGTSTP
1830 signal (SIGTSTP, SIG_IGN); 1710 signal (SIGTSTP, SIG_IGN);
1831 signal (SIGTTIN, SIG_IGN); 1711 signal (SIGTTIN, SIG_IGN);

Diff Legend

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