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.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC vs.
Revision 1.334 by sf-exg, Sat Aug 16 10:51:23 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 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 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
58#endif 56#endif
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
521#endif 519#endif
522 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
525#endif 523#endif
526#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
527 NULL, 525 NULL,
528#endif 526#endif
529#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 528 "rgb:00/00/00",
531#endif 529#endif
… …
567 565
568/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
569const char ** 567const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
571{ 569{
572 int i, r_argc; 570 int i;
573 const char **cmd_argv; 571 const char **cmd_argv;
574
575 /*
576 * Look for -e option. Find => split and make cmd_argv[] of command args
577 */
578 for (r_argc = 0; r_argc < argc; r_argc++)
579 if (!strcmp (argv[r_argc], "-e"))
580 break;
581
582 if (r_argc == argc)
583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
586 else
587 {
588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
589
590 for (i = 0; i < argc - r_argc - 1; i++)
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592
593 cmd_argv[i] = NULL;
594 }
595 572
596 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
597 574
598 /* 575 /*
599 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
600 */ 577 */
601 578
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
604 581
605 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
606 583
607 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
609 586
610 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
611 xa = display->xa; 588 xa = display->xa;
612 589
613 set (display); 590 set (display);
614 extract_resources (); 591 extract_resources ();
615 592
616#if XFT 593#if ENABLE_FRILLS
617 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
618 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
619#endif 598#endif
620 599
621 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
622 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
623 rs [i] = 0; 602 rs [i] = 0;
… …
680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
681 pointerBlankDelay = i; 660 pointerBlankDelay = i;
682 else 661 else
683 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
684#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
685 669
686 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
687 if (!saveLines) 671 if (!saveLines)
688 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
689 673
… …
754 return cmd_argv; 738 return cmd_argv;
755} 739}
756 740
757/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
758void 742void
743rxvt_term::init (stringvec *argv, stringvec *envv)
744{
745 argv->push_back (0);
746 envv->push_back (0);
747
748 this->argv = argv;
749 this->envv = envv;
750
751 init2 (argv->size () - 1, argv->begin ());
752}
753
754void
755rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
756{
757#if ENABLE_PERL
758 // perl might want to access the stringvecs later, so we need to copy them
759 stringvec *args = new stringvec;
760 for (int i = 0; i < argc; i++)
761 args->push_back (strdup (argv [i]));
762
763 stringvec *envs = new stringvec;
764 for (const char *const *var = envv; *var; var++)
765 envs->push_back (strdup (*var));
766
767 init (args, envs);
768#else
769 init2 (argc, argv);
770#endif
771}
772
773void
759rxvt_term::init (int argc, const char *const *argv) 774rxvt_term::init2 (int argc, const char *const *argv)
760{ 775{
761 SET_R (this); 776 SET_R (this);
762 set_locale (""); 777 set_locale ("");
763 set_environ (envv); // a few things in X do not call setlocale :( 778 set_environ (envv); // a few things in X do not call setlocale :(
764 779
… …
783 if (option (Opt_scrollBar)) 798 if (option (Opt_scrollBar))
784 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 799 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
785 800
786 pty = ptytty::create (); 801 pty = ptytty::create ();
787 802
788#ifdef HAVE_AFTERIMAGE
789 set_application_name ((char *)rs[Rs_name]);
790 set_output_threshold (OUTPUT_LEVEL_WARNING);
791#endif
792
793 // must be called before create_windows, because the latter may call set_icon
794#ifdef HAVE_PIXBUF
795 g_type_init ();
796#endif
797
798 create_windows (argc, argv); 803 create_windows (argc, argv);
799 804
800 init_xlocale (); 805 init_xlocale ();
801 806
802 scr_poweron (); // initialize screen 807 scr_poweron (); // initialize screen
… …
805 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
806#endif 811#endif
807 812
808 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
815
810#ifdef HAVE_BG_PIXMAP 816#ifdef HAVE_BG_PIXMAP
811 {
812 bg_init (); 817 bg_init ();
813
814#ifdef ENABLE_TRANSPARENCY
815 if (option (Opt_transparent))
816 {
817 bg_set_transparent ();
818
819 if (rs [Rs_blurradius])
820 bg_set_blur (rs [Rs_blurradius]);
821
822 if (ISSET_PIXCOLOR (Color_tint))
823 bg_set_tint (pix_colors_focused [Color_tint]);
824
825 if (rs [Rs_shade])
826 bg_set_shade (rs [Rs_shade]);
827
828 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root);
831 }
832#endif
833
834#ifdef BG_IMAGE_FROM_FILE
835 if (rs[Rs_backgroundPixmap])
836 {
837 if (bg_set_file (rs[Rs_backgroundPixmap]))
838 if (!bg_window_position_sensitive ())
839 update_background ();
840 }
841#endif
842 }
843#endif 818#endif
844 819
845#if ENABLE_PERL 820#if ENABLE_PERL
846 rootwin_ev.start (display, display->root); 821 rootwin_ev.start (display, display->root);
847#endif 822#endif
848 823
849 set_colorfgbg (); 824 init_done = 1;
850 825
851 init_command (cmd_argv); 826 init_command (cmd_argv);
852
853 free (cmd_argv);
854 827
855 if (pty->pty >= 0) 828 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ); 829 pty_ev.start (pty->pty, ev::READ);
857 830
858 HOOK_INVOKE ((this, HOOK_START, DT_END)); 831 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
900/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
901void 874void
902rxvt_term::init_env () 875rxvt_term::init_env ()
903{ 876{
904 char *val; 877 char *val;
878 char *env_display;
879 char *env_windowid;
880 char *env_colorfgbg;
881 char *env_term;
905 882
906#ifdef DISPLAY_IS_IP 883#ifdef DISPLAY_IS_IP
907 /* Fixup display_name for export over pty to any interested terminal 884 /* Fixup display_name for export over pty to any interested terminal
908 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 885 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
909 * (for the first non-loopback interface) that we get from 886 * (for the first non-loopback interface) that we get from
… …
926 903
927 env_display = (char *)rxvt_malloc (strlen (val) + 9); 904 env_display = (char *)rxvt_malloc (strlen (val) + 9);
928 905
929 sprintf (env_display, "DISPLAY=%s", val); 906 sprintf (env_display, "DISPLAY=%s", val);
930 907
908 env_windowid = (char *)rxvt_malloc (21);
931 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 909 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
932 910
933 /* add entries to the environment: 911 /* add entries to the environment:
934 * @ DISPLAY: in case we started with -display 912 * @ DISPLAY: in case we started with -display
935 * @ WINDOWID: X window id number of the window 913 * @ WINDOWID: X window id number of the window
… …
939 * @ COLORFGBG: fg;bg color codes 917 * @ COLORFGBG: fg;bg color codes
940 */ 918 */
941 putenv (env_display); 919 putenv (env_display);
942 putenv (env_windowid); 920 putenv (env_windowid);
943 921
944 if (env_colorfgbg) 922 env_colorfgbg = get_colorfgbg ();
945 putenv (env_colorfgbg); 923 putenv (env_colorfgbg);
946 924
947#ifdef RXVT_TERMINFO 925#ifdef RXVT_TERMINFO
948 putenv ("TERMINFO=" RXVT_TERMINFO); 926 putenv ("TERMINFO=" RXVT_TERMINFO);
949#endif 927#endif
950 928
… …
969 unsetenv ("TERMCAP"); /* terminfo should be okay */ 947 unsetenv ("TERMCAP"); /* terminfo should be okay */
970#endif /* HAVE_UNSETENV */ 948#endif /* HAVE_UNSETENV */
971} 949}
972 950
973/*----------------------------------------------------------------------*/ 951/*----------------------------------------------------------------------*/
974/*
975 * This is more or less stolen straight from XFree86 xterm.
976 * This should support all European type languages.
977 */
978void 952void
979rxvt_term::set_locale (const char *locale) 953rxvt_term::set_locale (const char *locale)
980{ 954{
981 set_environ (envv); 955 set_environ (envv);
982 956
983#if HAVE_XSETLOCALE || HAVE_SETLOCALE
984 free (this->locale); 957 free (this->locale);
985 this->locale = setlocale (LC_CTYPE, locale); 958 this->locale = setlocale (LC_CTYPE, locale);
986 959
987 if (!this->locale) 960 if (!this->locale)
988 { 961 {
… …
999 972
1000 973
1001 this->locale = strdup (this->locale); 974 this->locale = strdup (this->locale);
1002 SET_LOCALE (this->locale); 975 SET_LOCALE (this->locale);
1003 mbstate.reset (); 976 mbstate.reset ();
1004#endif
1005 977
1006#if HAVE_NL_LANGINFO 978#if HAVE_NL_LANGINFO
1007 char *codeset = strdup (nl_langinfo (CODESET)); 979 char *codeset = nl_langinfo (CODESET);
1008 // /^UTF.?8/i 980 // /^UTF.?8/i
1009 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 981 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1010 && (codeset[1] == 'T' || codeset[1] == 't') 982 && (codeset[1] == 'T' || codeset[1] == 't')
1011 && (codeset[2] == 'F' || codeset[2] == 'f') 983 && (codeset[2] == 'F' || codeset[2] == 'f')
1012 && (codeset[3] == '8' || codeset[4] == '8'); 984 && (codeset[3] == '8' || codeset[4] == '8');
1013 free (codeset);
1014#else 985#else
1015 enc_utf8 = 0; 986 enc_utf8 = 0;
1016#endif 987#endif
1017} 988}
1018 989
1019void 990void
1020rxvt_term::init_xlocale () 991rxvt_term::init_xlocale ()
1021{ 992{
1022 set_environ (envv); 993 set_environ (envv);
1023 994
1024#ifdef USE_XIM 995#if USE_XIM
1025 if (!locale) 996 if (!locale)
1026 rxvt_warn ("setting locale failed, working without locale support.\n"); 997 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1027 else 998 else
1028 { 999 {
1029 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1030 1001
1031 if (!XSupportsLocale ()) 1002 if (!XSupportsLocale ())
1032 { 1003 {
1033 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1004 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1034 return; 1005 return;
1035 } 1006 }
1036 1007
1037 im_ev.start (display); 1008 im_ev.start (display);
1038 1009
… …
1187/*----------------------------------------------------------------------*/ 1158/*----------------------------------------------------------------------*/
1188/* color aliases, fg/bg bright-bold */ 1159/* color aliases, fg/bg bright-bold */
1189void 1160void
1190rxvt_term::color_aliases (int idx) 1161rxvt_term::color_aliases (int idx)
1191{ 1162{
1192 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1193 { 1164 {
1194 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
1195 1166
1196 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
1197 /* bright colors */ 1168 /* bright colors */
… …
1292} 1263}
1293 1264
1294void 1265void
1295rxvt_term::set_icon (const char *file) 1266rxvt_term::set_icon (const char *file)
1296{ 1267{
1297#ifdef HAVE_AFTERIMAGE
1298 init_asv ();
1299
1300 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1301 if (!im)
1302 {
1303 rxvt_warn ("Loading image icon failed, continuing without.\n");
1304 return;
1305 }
1306
1307 unsigned int w = im->width;
1308 unsigned int h = im->height;
1309
1310 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1311 {
1312 rxvt_warn ("Icon image too big, continuing without.\n");
1313 destroy_asimage (&im);
1314 return;
1315 }
1316
1317 ASImage *result = scale_asimage (asv, im,
1318 w, h, ASA_ARGB32,
1319 100, ASIMAGE_QUALITY_DEFAULT);
1320 destroy_asimage (&im);
1321
1322 if (!result)
1323 {
1324 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1325 return;
1326 }
1327
1328 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1329 if (buffer)
1330 {
1331 ARGB32 *asbuf = result->alt.argb32;
1332 buffer [0] = w;
1333 buffer [1] = h;
1334
1335 for (unsigned int i = 0; i < w * h; ++i)
1336 buffer [i + 2] = asbuf [i];
1337
1338 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1339 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1340 free (buffer);
1341 }
1342 else
1343 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1344
1345 destroy_asimage (&result);
1346#endif
1347
1348#ifdef HAVE_PIXBUF 1268#if HAVE_PIXBUF
1349 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1350 if (!pixbuf) 1270 if (!pixbuf)
1351 { 1271 {
1352 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1272 rxvt_warn ("Loading image icon failed, continuing without.\n");
1353 return; 1273 return;
… …
1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1393 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1474 &attributes); 1394 &attributes);
1475 1395
1476 this->parent = top; 1396 this->parent = top;
1477 1397
1478 old_width = szHint.width;
1479 old_height = szHint.height;
1480
1481 set_title (rs [Rs_title]); 1398 set_title (rs [Rs_title]);
1482 set_icon_name (rs [Rs_iconName]); 1399 set_icon_name (rs [Rs_iconName]);
1483 1400
1484 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1486 1403
1487 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1488 wmHint.input = True; 1405 wmHint.input = True;
1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1490 wmHint.window_group = top; 1409 wmHint.window_group = top;
1491 1410
1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1493 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH 1413#if ENABLE_EWMH
… …
1496 * set up icon hint 1415 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1498 */ 1417 */
1499 1418
1500 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif 1421#endif
1505 1422
1506#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1507 if (mwmhints.flags) 1424 if (mwmhints.flags)
1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1548 1465
1549 /* the vt window */ 1466 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1552 width, height, 1469 vt_width, vt_height,
1553 0, 1470 0,
1554 pix_colors_focused[Color_fg], 1471 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1472 pix_colors_focused[Color_bg]);
1556 1473
1557 attributes.bit_gravity = NorthWestGravity; 1474 attributes.bit_gravity = NorthWestGravity;
… …
1606 if (pty->pty >= 0) 1523 if (pty->pty >= 0)
1607 { 1524 {
1608 if (getfd_hook) 1525 if (getfd_hook)
1609 pty->pty = (*getfd_hook) (pty->pty); 1526 pty->pty = (*getfd_hook) (pty->pty);
1610 1527
1611 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1528 if (pty->pty < 0)
1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1529 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1613 } 1530 }
1614 } 1531 }
1615 else 1532 else
1616#endif 1533#endif
1617 if (!pty->get ()) 1534 if (!pty->get ())
1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1536
1537 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1619 1538
1620 struct termios tio = def_tio; 1539 struct termios tio = def_tio;
1621 1540
1622#ifndef NO_BACKSPACE_KEY 1541#ifndef NO_BACKSPACE_KEY
1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1542 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1673 1592
1674 _exit (EXIT_FAILURE); 1593 _exit (EXIT_FAILURE);
1675 1594
1676 default: 1595 default:
1677 if (!option (Opt_utmpInhibit)) 1596 if (!option (Opt_utmpInhibit))
1597 {
1598#ifdef LOG_ONLY_ON_LOGIN
1599 bool login_shell = option (Opt_loginShell);
1600#else
1601 bool login_shell = true;
1602#endif
1678 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1603 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1604 }
1679 1605
1680 pty->close_tty (); 1606 pty->close_tty ();
1681 1607
1682 child_ev.start (cmd_pid); 1608 child_ev.start (cmd_pid);
1683 1609
… …
1708#elif defined (SRIOCSREDIR) 1634#elif defined (SRIOCSREDIR)
1709 int fd; 1635 int fd;
1710 1636
1711 fd = open (CONSOLE, O_WRONLY, 0); 1637 fd = open (CONSOLE, O_WRONLY, 0);
1712 if (fd >= 0) 1638 if (fd >= 0)
1713 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1639 {
1640 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1714 close (fd); 1641 close (fd);
1642 }
1715#endif /* SRIOCSREDIR */ 1643#endif /* SRIOCSREDIR */
1716 } 1644 }
1717 1645
1718 /* reset signals and spin off the command interpreter */ 1646 /* reset signals and spin off the command interpreter */
1719 signal (SIGINT, SIG_DFL); 1647 signal (SIGINT, SIG_DFL);

Diff Legend

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