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.306 by sf-exg, Tue Dec 6 11:39:30 2011 UTC vs.
Revision 1.337 by sf-exg, Fri Sep 5 19:02:53 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 cmd_argv = (const char **)argv + r_argc + 1;
588 572
589 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
590 574
591 /* 575 /*
592 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
593 */ 577 */
594 578
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
597 581
598 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
599 583
600 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
601 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]);
602 586
603 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
604 xa = display->xa; 588 xa = display->xa;
605 589
606 set (display); 590 set (display);
607 extract_resources (); 591 extract_resources ();
608 592
609#if XFT 593#if ENABLE_FRILLS
610 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
611 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));
612#endif 598#endif
613 599
614 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
615 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
616 rs [i] = 0; 602 rs [i] = 0;
… …
626 rxvt_perl.init (this); 612 rxvt_perl.init (this);
627 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
628 } 614 }
629#endif 615#endif
630 616
631 // must be called after initialising the perl interpreter as it
632 // may invoke the `on_register_command' hook
633 extract_keysym_resources (); 617 extract_keysym_resources ();
634 618
635 /* 619 /*
636 * set any defaults not already set 620 * set any defaults not already set
637 */ 621 */
… …
673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
674 pointerBlankDelay = i; 658 pointerBlankDelay = i;
675 else 659 else
676 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
677#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
678 669
679 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
680 if (!saveLines) 671 if (!saveLines)
681 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
682 673
… …
747 return cmd_argv; 738 return cmd_argv;
748} 739}
749 740
750/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
751void 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
752rxvt_term::init (int argc, const char *const *argv) 774rxvt_term::init2 (int argc, const char *const *argv)
753{ 775{
754 SET_R (this); 776 SET_R (this);
755 set_locale (""); 777 set_locale ("");
756 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 :(
757 779
… …
776 if (option (Opt_scrollBar)) 798 if (option (Opt_scrollBar))
777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 799 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
778 800
779 pty = ptytty::create (); 801 pty = ptytty::create ();
780 802
781#ifdef HAVE_AFTERIMAGE
782 set_application_name ((char *)rs[Rs_name]);
783 set_output_threshold (OUTPUT_LEVEL_WARNING);
784#endif
785
786 // must be called before create_windows, because the latter may call set_icon
787#ifdef HAVE_PIXBUF
788 g_type_init ();
789#endif
790
791 create_windows (argc, argv); 803 create_windows (argc, argv);
792 804
793 init_xlocale (); 805 init_xlocale ();
794 806
795 scr_poweron (); // initialize screen 807 scr_poweron (); // initialize screen
… …
798 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
799#endif 811#endif
800 812
801 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
802 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
815
803#ifdef HAVE_BG_PIXMAP 816#ifdef HAVE_BG_PIXMAP
804 {
805 bg_init (); 817 bg_init ();
806
807#ifdef ENABLE_TRANSPARENCY
808 if (option (Opt_transparent))
809 {
810 bg_set_transparent ();
811
812 if (rs [Rs_blurradius])
813 bg_set_blur (rs [Rs_blurradius]);
814
815 if (ISSET_PIXCOLOR (Color_tint))
816 bg_set_tint (pix_colors_focused [Color_tint]);
817
818 if (rs [Rs_shade])
819 bg_set_shade (rs [Rs_shade]);
820
821 bg_set_root_pixmap ();
822 XSelectInput (dpy, display->root, PropertyChangeMask);
823 rootwin_ev.start (display, display->root);
824 }
825#endif
826
827#ifdef BG_IMAGE_FROM_FILE
828 if (rs[Rs_backgroundPixmap])
829 {
830 if (bg_set_file (rs[Rs_backgroundPixmap]))
831 if (!bg_window_position_sensitive ())
832 update_background ();
833 }
834#endif
835 }
836#endif 818#endif
837 819
838#if ENABLE_PERL 820#if ENABLE_PERL
839 rootwin_ev.start (display, display->root); 821 rootwin_ev.start (display, display->root);
840#endif 822#endif
841 823
842 set_colorfgbg (); 824 init_done = 1;
843 825
844 init_command (cmd_argv); 826 init_command (cmd_argv);
845 827
846 if (pty->pty >= 0) 828 if (pty->pty >= 0)
847 pty_ev.start (pty->pty, ev::READ); 829 pty_ev.start (pty->pty, ev::READ);
… …
891/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
892void 874void
893rxvt_term::init_env () 875rxvt_term::init_env ()
894{ 876{
895 char *val; 877 char *val;
878 char *env_display;
879 char *env_windowid;
880 char *env_colorfgbg;
881 char *env_term;
896 882
897#ifdef DISPLAY_IS_IP 883#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 884 /* Fixup display_name for export over pty to any interested terminal
899 * 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
900 * (for the first non-loopback interface) that we get from 886 * (for the first non-loopback interface) that we get from
… …
917 903
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 904 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 905
920 sprintf (env_display, "DISPLAY=%s", val); 906 sprintf (env_display, "DISPLAY=%s", val);
921 907
908 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 909 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 910
924 /* add entries to the environment: 911 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 912 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 913 * @ WINDOWID: X window id number of the window
… …
930 * @ COLORFGBG: fg;bg color codes 917 * @ COLORFGBG: fg;bg color codes
931 */ 918 */
932 putenv (env_display); 919 putenv (env_display);
933 putenv (env_windowid); 920 putenv (env_windowid);
934 921
935 if (env_colorfgbg) 922 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 923 putenv (env_colorfgbg);
937 924
938#ifdef RXVT_TERMINFO 925#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 926 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 927#endif
941 928
… …
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 947 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 948#endif /* HAVE_UNSETENV */
962} 949}
963 950
964/*----------------------------------------------------------------------*/ 951/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 952void
970rxvt_term::set_locale (const char *locale) 953rxvt_term::set_locale (const char *locale)
971{ 954{
972 set_environ (envv); 955 set_environ (envv);
973 956
974#if HAVE_XSETLOCALE || HAVE_SETLOCALE
975 free (this->locale); 957 free (this->locale);
976 this->locale = setlocale (LC_CTYPE, locale); 958 this->locale = setlocale (LC_CTYPE, locale);
977 959
978 if (!this->locale) 960 if (!this->locale)
979 { 961 {
… …
990 972
991 973
992 this->locale = strdup (this->locale); 974 this->locale = strdup (this->locale);
993 SET_LOCALE (this->locale); 975 SET_LOCALE (this->locale);
994 mbstate.reset (); 976 mbstate.reset ();
995#endif
996 977
997#if HAVE_NL_LANGINFO 978#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 979 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 980 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 981 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 982 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 983 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 984 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 985#else
1006 enc_utf8 = 0; 986 enc_utf8 = 0;
1007#endif 987#endif
1008} 988}
1009 989
1010void 990void
1011rxvt_term::init_xlocale () 991rxvt_term::init_xlocale ()
1012{ 992{
1013 set_environ (envv); 993 set_environ (envv);
1014 994
1015#ifdef USE_XIM 995#if USE_XIM
1016 if (!locale) 996 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 997 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 998 else
1019 { 999 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 1001
1022 if (!XSupportsLocale ()) 1002 if (!XSupportsLocale ())
1023 { 1003 {
1024 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");
1025 return; 1005 return;
1026 } 1006 }
1027 1007
1028 im_ev.start (display); 1008 im_ev.start (display);
1029 1009
… …
1178/*----------------------------------------------------------------------*/ 1158/*----------------------------------------------------------------------*/
1179/* color aliases, fg/bg bright-bold */ 1159/* color aliases, fg/bg bright-bold */
1180void 1160void
1181rxvt_term::color_aliases (int idx) 1161rxvt_term::color_aliases (int idx)
1182{ 1162{
1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1184 { 1164 {
1185 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
1186 1166
1187 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
1188 /* bright colors */ 1168 /* bright colors */
… …
1228 for (j = map->max_keypermod; j--; k++) 1208 for (j = map->max_keypermod; j--; k++)
1229 { 1209 {
1230 if (kc[k] == 0) 1210 if (kc[k] == 0)
1231 break; 1211 break;
1232 1212
1233 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1213 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1234 { 1214 {
1235 case XK_Num_Lock: 1215 case XK_Num_Lock:
1236 ModNumLockMask = modmasks[i - 1]; 1216 ModNumLockMask = modmasks[i - 1];
1237 continue; 1217 continue;
1238 1218
… …
1283} 1263}
1284 1264
1285void 1265void
1286rxvt_term::set_icon (const char *file) 1266rxvt_term::set_icon (const char *file)
1287{ 1267{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF 1268#if HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf) 1270 if (!pixbuf)
1342 { 1271 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1272 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return; 1273 return;
… …
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1393 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1394 &attributes);
1466 1395
1467 this->parent = top; 1396 this->parent = top;
1468 1397
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471
1472 set_title (rs [Rs_title]); 1398 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1399 set_icon_name (rs [Rs_iconName]);
1474 1400
1475 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1476 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1477 1403
1478 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1479 wmHint.input = True; 1405 wmHint.input = True;
1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1481 wmHint.window_group = top; 1409 wmHint.window_group = top;
1482 1410
1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1484 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1485#if ENABLE_EWMH 1413#if ENABLE_EWMH
… …
1487 * set up icon hint 1415 * set up icon hint
1488 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1489 */ 1417 */
1490 1418
1491 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1492 {
1493 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1494 }
1495#endif 1421#endif
1496 1422
1497#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1498 if (mwmhints.flags) 1424 if (mwmhints.flags)
1499 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,
… …
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1539 1465
1540 /* the vt window */ 1466 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1543 width, height, 1469 vt_width, vt_height,
1544 0, 1470 0,
1545 pix_colors_focused[Color_fg], 1471 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1472 pix_colors_focused[Color_bg]);
1547 1473
1548 attributes.bit_gravity = NorthWestGravity; 1474 attributes.bit_gravity = NorthWestGravity;
… …
1597 if (pty->pty >= 0) 1523 if (pty->pty >= 0)
1598 { 1524 {
1599 if (getfd_hook) 1525 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1526 pty->pty = (*getfd_hook) (pty->pty);
1601 1527
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1528 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1529 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1530 }
1605 } 1531 }
1606 else 1532 else
1607#endif 1533#endif
1608 if (!pty->get ()) 1534 if (!pty->get ())
1609 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);
1610 1538
1611 struct termios tio = def_tio; 1539 struct termios tio = def_tio;
1612 1540
1613#ifndef NO_BACKSPACE_KEY 1541#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1542 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1592
1665 _exit (EXIT_FAILURE); 1593 _exit (EXIT_FAILURE);
1666 1594
1667 default: 1595 default:
1668 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
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1603 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1604 }
1670 1605
1671 pty->close_tty (); 1606 pty->close_tty ();
1672 1607
1673 child_ev.start (cmd_pid); 1608 child_ev.start (cmd_pid);
1674 1609
… …
1699#elif defined (SRIOCSREDIR) 1634#elif defined (SRIOCSREDIR)
1700 int fd; 1635 int fd;
1701 1636
1702 fd = open (CONSOLE, O_WRONLY, 0); 1637 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1638 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1639 {
1640 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1641 close (fd);
1642 }
1706#endif /* SRIOCSREDIR */ 1643#endif /* SRIOCSREDIR */
1707 } 1644 }
1708 1645
1709 /* reset signals and spin off the command interpreter */ 1646 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1647 signal (SIGINT, SIG_DFL);

Diff Legend

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