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.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC vs.
Revision 1.351 by root, Fri Dec 23 21:46:46 2022 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * 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 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 39#include "init.h"
39#include "keyboard.h" 40#include "keyboard.h"
40 41
41#include <limits> 42#include <limits>
42 43
43#include <csignal> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 56# include <locale.h>
53# endif
54#endif 57#endif
55 58
56#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 60# include <langinfo.h>
61#endif
62
63#ifdef HAVE_STARTUP_NOTIFICATION
64# define SN_API_NOT_YET_FROZEN
65# include <libsn/sn-launchee.h>
58#endif 66#endif
59 67
60#ifdef DISPLAY_IS_IP 68#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 69/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 70#include <sys/types.h>
… …
73#include <netinet/in.h> 81#include <netinet/in.h>
74#include <arpa/inet.h> 82#include <arpa/inet.h>
75#include <net/if.h> 83#include <net/if.h>
76#include <net/if_arp.h> 84#include <net/if_arp.h>
77 85
78static char * 86static char * ecb_cold
79rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
80{ 88{
81 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 90 struct ifconf ifc;
83 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
143 151
144 return rval; 152 return rval;
145} 153}
146#endif 154#endif
147 155
156#define NULL_5 \
157 NULL, \
158 NULL, \
159 NULL, \
160 NULL, \
161 NULL,
162
163#define NULL_10 \
164 NULL_5 \
165 NULL_5
166
167#define NULL_40 \
168 NULL_10 \
169 NULL_10 \
170 NULL_10 \
171 NULL_10
172
173#define NULL_50 \
174 NULL_40 \
175 NULL_10
176
177#define NULL_100 \
178 NULL_50 \
179 NULL_50
180
148const char *const def_colorName[] = 181static const char *const def_colorName[] =
149 { 182 {
150 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
152 /* low-intensity colors */ 185 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 186 "rgb:00/00/00", // 0: black (Black)
… …
248 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
249 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
250 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
251 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
252 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
253#else 292#else
254 // 256 xterm colours 293 // 256 xterm colours
255 "rgb:00/00/00", 294 "rgb:00/00/00",
256 "rgb:00/00/5f", 295 "rgb:00/00/5f",
257 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
490 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
492 "rgb:da/da/da", 531 "rgb:da/da/da",
493 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
495#endif 538#endif
496 539
497#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
498 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
499 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
516#endif 559#endif
517 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
520#endif 563#endif
521#if ENABLE_TRANSPARENCY
522 NULL,
523#endif
524#if OFF_FOCUS_FADING 564#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 565 "rgb:00/00/00",
526#endif 566#endif
527 }; 567 };
528 568
… …
558 set_option (Opt_iso14755); 598 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 599 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 600 set_option (Opt_buffered);
561} 601}
562 602
603#if ENABLE_PERL
604static void
605rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
606{
607 rxvt_perl.parse_resource (term, k, false, false, 0, v);
608}
609#endif
610
563/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
564const char ** 612const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 613rxvt_term::init_resources (int argc, const char *const *argv)
566{ 614{
567 int i, r_argc; 615 int i;
568 const char **cmd_argv, **r_argv; 616 const char **cmd_argv;
569
570 /*
571 * Look for -e option. Find => split and make cmd_argv[] of command args
572 */
573 for (r_argc = 0; r_argc < argc; r_argc++)
574 if (!strcmp (argv[r_argc], "-e"))
575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
592
593 for (i = 0; i < r_argc; i++)
594 r_argv[i] = (const char *)argv[i];
595
596 r_argv[i] = NULL;
597 617
598 rs[Rs_name] = rxvt_basename (argv[0]); 618 rs[Rs_name] = rxvt_basename (argv[0]);
599 619
600 /* 620 /*
601 * Open display, get options/resources and create the window 621 * Open display, get options/resources and create the window
602 */ 622 */
603 623
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 624 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 625 rs[Rs_display_name] = ":0";
606 626
607 get_options (r_argc, r_argv); 627 cmd_argv = get_options (argc, argv);
608 628
609 if (!(display = displays.get (rs[Rs_display_name]))) 629 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 631
615 // using a local pointer decreases code size a lot 632 // using a local pointer decreases code size a lot
616 xa = display->xa; 633 xa = display->xa;
617 634
618 set (display); 635 set (display);
619 extract_resources (); 636 extract_resources ();
620 637
621#if XFT 638#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 639 if (rs[Rs_visual])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 640 select_visual (strtol (rs[Rs_visual], 0, 0));
641 else if (rs[Rs_depth])
642 select_depth (strtol (rs[Rs_depth], 0, 0));
624#endif 643#endif
625
626 free (r_argv);
627 644
628 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
630 rs [i] = 0; 647 rs [i] = 0;
631 648
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#if ENABLE_PERL 649#if ENABLE_PERL
638 if (!rs[Rs_perl_ext_1]) 650 if (!rs[Rs_perl_ext_1])
639 rs[Rs_perl_ext_1] = "default"; 651 rs[Rs_perl_ext_1] = "default";
640 652
641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
642 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
643 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
644 { 656 {
645 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 } 660 }
648#endif 661#endif
662
663 // must be called after initialising the perl interpreter as it
664 // may invoke the `on_register_command' hook
665 extract_keysym_resources ();
649 666
650 /* 667 /*
651 * set any defaults not already set 668 * set any defaults not already set
652 */ 669 */
653 if (cmd_argv && cmd_argv[0]) 670 if (cmd_argv && cmd_argv[0])
… …
678 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
679 696
680 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
681 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
682 699
683 if (rs[Rs_letterSpace]) 700 if (const char *v = rs[Rs_letterSpace])
684 letterSpace = atoi (rs[Rs_letterSpace]); 701 letterSpace = atoi (v);
702
703 rewrap_always = rewrap_never = 0;
704 if (const char *v = rs[Rs_rewrapMode])
705 if (!strcmp (v, "never"))
706 rewrap_never = 1;
707 else if (!strcmp (v, "always"))
708 rewrap_always = 1;
709 else if (!strcmp (v, "auto"))
710 /* nop **/;
711 else
712 rxvt_warn ("invalid rewrapMode, must be auto, always or never.\n");
685#endif 713#endif
686 714
687#ifdef POINTER_BLANK 715#ifdef POINTER_BLANK
688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 716 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
689 pointerBlankDelay = i; 717 pointerBlankDelay = i;
690 else 718 else
691 pointerBlankDelay = 2; 719 pointerBlankDelay = 2;
692#endif 720#endif
721
722 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
723 multiClickTime = i;
724 else
725 multiClickTime = 500;
726
727 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
693 728
694 /* no point having a scrollbar without having any scrollback! */ 729 /* no point having a scrollbar without having any scrollback! */
695 if (!saveLines) 730 if (!saveLines)
696 set_option (Opt_scrollBar, 0); 731 set_option (Opt_scrollBar, 0);
697 732
… …
762 return cmd_argv; 797 return cmd_argv;
763} 798}
764 799
765/*----------------------------------------------------------------------*/ 800/*----------------------------------------------------------------------*/
766void 801void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 802rxvt_term::init (stringvec *argv, stringvec *envv)
768{ 803{
804 argv->push_back (0);
805 envv->push_back (0);
806
807 this->argv = argv;
769 this->envv = envv; 808 this->envv = envv;
770 809
810 env = new char *[this->envv->size ()];
811 for (int i = 0; i < this->envv->size (); i++)
812 env[i] = this->envv->at (i);
813
814 init2 (argv->size () - 1, argv->begin ());
815}
816
817void
818rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
819{
820#if ENABLE_PERL
821 // perl might want to access the stringvecs later, so we need to copy them
822 stringvec *args = new stringvec;
823 for (int i = 0; i < argc; i++)
824 args->push_back (strdup (argv [i]));
825
826 stringvec *envs = new stringvec;
827 for (const char *const *var = envv; *var; var++)
828 envs->push_back (strdup (*var));
829
830 init (args, envs);
831#else
832 init2 (argc, argv);
833#endif
834}
835
836void
837rxvt_term::init2 (int argc, const char *const *argv)
838{
771 SET_R (this); 839 SET_R (this);
772 set_locale (""); 840 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 841 set_environ (env); // a few things in X do not call setlocale :(
774 842
775 init_vars (); 843 init_vars ();
776 844
777 const char **cmd_argv = init_resources (argc, argv); 845 const char **cmd_argv = init_resources (argc, argv);
778 846
779#ifdef KEYSYM_RESOURCE 847#ifdef KEYSYM_RESOURCE
780 keyboard->register_done (); 848 keyboard->register_done ();
781#endif 849#endif
850
851 {
852 ev_tstamp interval = 1. / 60.;
853
854#if ENABLE_FRILLS
855 if (rs[Rs_refreshRate])
856 {
857 interval = atof (rs[Rs_refreshRate]);
858 if (interval <= 0.)
859 interval = -interval;
860 else
861 interval = 1. / interval;
862 }
863#endif
864
865 flush_ev.set (interval, interval);
866 }
782 867
783 if (const char *path = rs[Rs_chdir]) 868 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty 869 if (*path) // ignored if empty
785 { 870 {
786 if (*path != '/') 871 if (*path != '/')
… …
789 if (chdir (path)) 874 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 875 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 } 876 }
792 877
793 if (option (Opt_scrollBar)) 878 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 879 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 880
796 pty = ptytty::create (); 881 pty = ptytty::create ();
797 882
798 create_windows (argc, argv); 883 create_windows (argc, argv);
799 884
… …
805 XSynchronize (dpy, True); 890 XSynchronize (dpy, True);
806#endif 891#endif
807 892
808 if (option (Opt_scrollBar)) 893 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 894 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bgPixmap.set_target (this);
813 bgPixmap.invalidate ();
814
815#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent))
817 {
818 bgPixmap.set_transparent ();
819
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823#endif
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856 895
857#if ENABLE_PERL 896#if ENABLE_PERL
858 rootwin_ev.start (display, display->root); 897 rootwin_ev.start (display, display->root);
859#endif 898#endif
860 899
861 set_colorfgbg (); 900 init_done = 1;
862 901
863 init_command (cmd_argv); 902 init_command (cmd_argv);
864
865 free (cmd_argv);
866 903
867 if (pty->pty >= 0) 904 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 905 pty_ev.start (pty->pty, ev::READ);
869 906
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 907 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
872#if ENABLE_XEMBED 909#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 910 if (rs[Rs_embed])
874 { 911 {
875 long info[2] = { 0, XEMBED_MAPPED }; 912 long info[2] = { 0, XEMBED_MAPPED };
876 913
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 914 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 915 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 916 }
880#endif 917#endif
881 918
919#if HAVE_STARTUP_NOTIFICATION
920 SnDisplay *snDisplay;
921 SnLauncheeContext *snContext;
922
923 snDisplay = sn_display_new (dpy, NULL, NULL);
924 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
925
926 /* Tell the window manager that this window is part of the startup context */
927 if (snContext)
928 sn_launchee_context_setup_window (snContext, parent);
929#endif
930
882 XMapWindow (dpy, vt); 931 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 932 XMapWindow (dpy, parent);
933
934#if HAVE_STARTUP_NOTIFICATION
935 if (snContext)
936 {
937 /* Mark the startup process as complete */
938 sn_launchee_context_complete (snContext);
939
940 sn_launchee_context_unref (snContext);
941 }
942
943 sn_display_unref (snDisplay);
944#endif
884 945
885 refresh_check (); 946 refresh_check ();
886} 947}
887 948
888/*----------------------------------------------------------------------*/ 949/*----------------------------------------------------------------------*/
889void 950void
890rxvt_term::init_env () 951rxvt_term::init_env ()
891{ 952{
892 int i;
893 char *val; 953 char *val;
954 char *env_display;
955 char *env_windowid;
956 char *env_colorfgbg;
957 char *env_term;
894 958
895#ifdef DISPLAY_IS_IP 959#ifdef DISPLAY_IS_IP
896 /* Fixup display_name for export over pty to any interested terminal 960 /* Fixup display_name for export over pty to any interested terminal
897 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 961 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
898 * (for the first non-loopback interface) that we get from 962 * (for the first non-loopback interface) that we get from
… …
911 val = XDisplayString (dpy); 975 val = XDisplayString (dpy);
912 976
913 if (rs[Rs_display_name] == NULL) 977 if (rs[Rs_display_name] == NULL)
914 rs[Rs_display_name] = val; /* use broken `:0' value */ 978 rs[Rs_display_name] = val; /* use broken `:0' value */
915 979
916 i = strlen (val);
917 env_display = (char *)rxvt_malloc (i + 9); 980 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 981
919 sprintf (env_display, "DISPLAY=%s", val); 982 sprintf (env_display, "DISPLAY=%s", val);
920 983
984 env_windowid = (char *)rxvt_malloc (21);
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 985 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 986
923 /* add entries to the environment: 987 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 988 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 989 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 990 * @ COLORTERM: terminal sub-name and also indicates its color
… …
929 * @ COLORFGBG: fg;bg color codes 993 * @ COLORFGBG: fg;bg color codes
930 */ 994 */
931 putenv (env_display); 995 putenv (env_display);
932 putenv (env_windowid); 996 putenv (env_windowid);
933 997
934 if (env_colorfgbg) 998 env_colorfgbg = get_colorfgbg ();
935 putenv (env_colorfgbg); 999 putenv (env_colorfgbg);
936 1000
937#ifdef RXVT_TERMINFO 1001#ifdef RXVT_TERMINFO
938 putenv ("TERMINFO=" RXVT_TERMINFO); 1002 putenv ("TERMINFO=" RXVT_TERMINFO);
939#endif 1003#endif
940 1004
941 if (depth <= 2) 1005 if (depth <= 2)
942 putenv ("COLORTERM=" COLORTERMENV "-mono"); 1006 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
943 else 1007 else
944 putenv ("COLORTERM=" COLORTERMENVFULL); 1008 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
945 1009
946 if (rs[Rs_term_name] != NULL) 1010 if (rs[Rs_term_name] != NULL)
947 { 1011 {
948 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 1012 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
949 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 1013 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
950 putenv (env_term); 1014 putenv (env_term);
951 } 1015 }
952 else 1016 else
953 putenv ("TERM=" TERMENV); 1017 putenv ((char *)"TERM=" TERMENV);
954 1018
955#ifdef HAVE_UNSETENV 1019#ifdef HAVE_UNSETENV
956 /* avoid passing old settings and confusing term size */ 1020 /* avoid passing old settings and confusing term size */
957 unsetenv ("LINES"); 1021 unsetenv ("LINES");
958 unsetenv ("COLUMNS"); 1022 unsetenv ("COLUMNS");
959 unsetenv ("TERMCAP"); /* terminfo should be okay */ 1023 unsetenv ("TERMCAP"); /* terminfo should be okay */
960#endif /* HAVE_UNSETENV */ 1024#endif /* HAVE_UNSETENV */
961} 1025}
962 1026
963/*----------------------------------------------------------------------*/ 1027/*----------------------------------------------------------------------*/
964/*
965 * This is more or less stolen straight from XFree86 xterm.
966 * This should support all European type languages.
967 */
968void 1028void
969rxvt_term::set_locale (const char *locale) 1029rxvt_term::set_locale (const char *locale)
970{ 1030{
971 set_environ (envv); 1031 set_environ (env);
972 1032
973#if HAVE_XSETLOCALE || HAVE_SETLOCALE
974 free (this->locale); 1033 free (this->locale);
975 this->locale = setlocale (LC_CTYPE, locale); 1034 this->locale = setlocale (LC_CTYPE, locale);
976 1035
977 if (!this->locale) 1036 if (!this->locale)
978 { 1037 {
… …
982 setlocale (LC_CTYPE, "C"); 1041 setlocale (LC_CTYPE, "C");
983 } 1042 }
984 else 1043 else
985 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 1044 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
986 1045
987 this->locale = "C"; 1046 this->locale = (char *)"C"; /* strdup'ed below */
988 } 1047 }
989 1048
990 1049
991 this->locale = strdup (this->locale); 1050 this->locale = strdup (this->locale);
992 SET_LOCALE (this->locale); 1051 SET_LOCALE (this->locale);
993 mbstate.reset (); 1052 mbstate.reset ();
994#endif
995 1053
996#if HAVE_NL_LANGINFO 1054#if HAVE_NL_LANGINFO
997 char *codeset = strdup (nl_langinfo (CODESET)); 1055 char *codeset = nl_langinfo (CODESET);
998 // /^UTF.?8/i 1056 // /^UTF.?8/i
999 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1057 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1000 && (codeset[1] == 'T' || codeset[1] == 't') 1058 && (codeset[1] == 'T' || codeset[1] == 't')
1001 && (codeset[2] == 'F' || codeset[2] == 'f') 1059 && (codeset[2] == 'F' || codeset[2] == 'f')
1002 && (codeset[3] == '8' || codeset[4] == '8'); 1060 && (codeset[3] == '8' || codeset[4] == '8');
1003 free (codeset);
1004#else 1061#else
1005 enc_utf8 = 0; 1062 enc_utf8 = 0;
1006#endif 1063#endif
1007} 1064}
1008 1065
1009void 1066void
1010rxvt_term::init_xlocale () 1067rxvt_term::init_xlocale ()
1011{ 1068{
1012 set_environ (envv); 1069 set_environ (env);
1013 1070
1014#ifdef USE_XIM 1071#if USE_XIM
1015 if (!locale) 1072 if (!locale)
1016 rxvt_warn ("setting locale failed, working without locale support.\n"); 1073 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 1074 else
1018 { 1075 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1076 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020 1077
1021 if (!XSupportsLocale ()) 1078 if (!XSupportsLocale ())
1022 { 1079 {
1023 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1080 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024 return; 1081 return;
1025 } 1082 }
1026 1083
1027 im_ev.start (display); 1084 im_ev.start (display);
1028 1085
… …
1069 run_command (argv); 1126 run_command (argv);
1070} 1127}
1071 1128
1072/*----------------------------------------------------------------------*/ 1129/*----------------------------------------------------------------------*/
1073void 1130void
1074rxvt_term::get_colours () 1131rxvt_term::get_colors ()
1075{ 1132{
1076 int i; 1133 int i;
1077 1134
1078#ifdef OFF_FOCUS_FADING 1135#ifdef OFF_FOCUS_FADING
1079 pix_colors = pix_colors_focused; 1136 pix_colors = pix_colors_focused;
1080#endif 1137#endif
1081 1138
1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1139 for (i = 0; i < NRS_COLORS; i++)
1083 {
1084 const char *name = rs[Rs_color + i]; 1140 if (const char *name = rs[Rs_color + i])
1085
1086 if (!name)
1087 continue;
1088
1089 rxvt_color xcol;
1090
1091 if (!set_color (xcol, name)) 1141 set_color (pix_colors [i], name);
1092 {
1093#ifndef XTERM_REVERSE_VIDEO
1094 if (i < 2 && option (Opt_reverseVideo))
1095 name = def_colorName [1 - i];
1096 else
1097#endif
1098 name = def_colorName [i];
1099
1100 if (!name)
1101 continue;
1102
1103 if (!set_color (xcol, name))
1104 {
1105 switch (i)
1106 {
1107 case Color_fg:
1108 case Color_bg:
1109 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1110 name = "";
1111 break;
1112#ifndef NO_CURSORCOLOR
1113 case Color_cursor2:
1114#endif
1115 case Color_pointer_fg:
1116 name = rs[Rs_color + Color_fg];
1117 xcol.set (this, name);
1118 break;
1119 default:
1120 name = rs[Rs_color + Color_bg];
1121 xcol.set (this, name);
1122 break;
1123 }
1124 }
1125 }
1126
1127 pix_colors[i] = xcol;
1128 rs[Rs_color + i] = name;
1129 }
1130
1131 if (depth <= 2)
1132 {
1133 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1134 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1135 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1136 }
1137 1142
1138 /* 1143 /*
1139 * get scrollBar shadow colors 1144 * get scrollBar shadow colors
1140 * 1145 *
1141 * The calculations of topShadow/bottomShadow values are adapted 1146 * The calculations of topShadow/bottomShadow values are adapted
1142 * from the fvwm window manager. 1147 * from the fvwm window manager.
1143 */ 1148 */
1144#ifdef RXVT_SCROLLBAR 1149#ifdef RXVT_SCROLLBAR
1145 if (depth <= 2)
1146 {
1147 /* Monochrome */
1148 alias_color (Color_scroll, Color_fg);
1149 alias_color (Color_topShadow, Color_bg);
1150 alias_color (Color_bottomShadow, Color_bg);
1151 }
1152 else
1153 {
1154 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1150 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1155 1151
1156 rgba cscroll; 1152 rgba cscroll;
1157 pix_colors [Color_scroll].get (cscroll); 1153 pix_colors [Color_scroll].get (cscroll);
1158 1154
1159 /* topShadowColor */ 1155 /* topShadowColor */
1160 if (!pix_colors[Color_topShadow].set (this, 1156 if (!pix_colors[Color_topShadow].set (this,
1161 rgba ( 1157 rgba (
1162 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1158 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1163 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1159 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1160 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1165 cscroll.a) 1161 cscroll.a)
1166 )) 1162 ))
1167 alias_color (Color_topShadow, Color_White); 1163 alias_color (Color_topShadow, Color_White);
1168 }
1169#endif 1164#endif
1170 1165
1171#ifdef OFF_FOCUS_FADING 1166#ifdef OFF_FOCUS_FADING
1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1167 for (i = 0; i < NRS_COLORS; i++)
1173 update_fade_color (i); 1168 update_fade_color (i, true);
1174#endif 1169#endif
1175} 1170}
1176 1171
1177/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
1178/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
1179void 1174void
1180rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
1181{ 1176{
1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183 { 1178 {
1184 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
1185 1180
1186 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
1187 /* bright colors */ 1182 /* bright colors */
… …
1227 for (j = map->max_keypermod; j--; k++) 1222 for (j = map->max_keypermod; j--; k++)
1228 { 1223 {
1229 if (kc[k] == 0) 1224 if (kc[k] == 0)
1230 break; 1225 break;
1231 1226
1232 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1227 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1233 { 1228 {
1234 case XK_Num_Lock: 1229 case XK_Num_Lock:
1235 ModNumLockMask = modmasks[i - 1]; 1230 ModNumLockMask = modmasks[i - 1];
1236 continue; 1231 continue;
1237 1232
… …
1282} 1277}
1283 1278
1284void 1279void
1285rxvt_term::set_icon (const char *file) 1280rxvt_term::set_icon (const char *file)
1286{ 1281{
1287#ifdef HAVE_AFTERIMAGE 1282#if HAVE_PIXBUF && ENABLE_EWMH
1288 init_asv (); 1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1289
1290 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291 if (!im) 1284 if (!pixbuf)
1292 { 1285 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return; 1287 return;
1295 } 1288 }
1296 1289
1297 int w = im->width; 1290 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1298 int h = im->height; 1291 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1299 1292
1300 if (!IN_RANGE_INC (w, 1, 32767) || !IN_RANGE_INC (h, 1, 32767)) 1293 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1301 { 1294 {
1302 rxvt_warn ("Icon image too big, continuing without.\n"); 1295 rxvt_warn ("Icon image too big, continuing without.\n");
1303 destroy_asimage (&im); 1296 g_object_unref (pixbuf);
1304 return; 1297 return;
1305 } 1298 }
1306 1299
1307 ASImage *result = scale_asimage (asv, im,
1308 w, h, ASA_ARGB32,
1309 100, ASIMAGE_QUALITY_DEFAULT);
1310 destroy_asimage (&im);
1311
1312 if (!result)
1313 {
1314 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1315 return;
1316 }
1317
1318 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)); 1300 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1319 if (buffer)
1320 { 1301 {
1321 ARGB32 *asbuf = result->alt.argb32; 1302 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1303 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1304 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1305
1322 buffer [0] = w; 1306 buffer [0] = w;
1323 buffer [1] = h; 1307 buffer [1] = h;
1324
1325 for (unsigned int i = 0; i < w * h; ++i) 1308 for (int i = 0; i < h; i++)
1326 buffer [i + 2] = asbuf [i]; 1309 {
1310 for (int j = 0; j < w; j++)
1311 {
1312 unsigned char *pixel = row + j * channels;
1313 long value;
1327 1314
1315 if (channels == 4)
1316 value = pixel[3];
1317 else
1318 value = (unsigned char)0x00ff;
1319
1320 value = (value << 8) + pixel[0];
1321 value = (value << 8) + pixel[1];
1322 value = (value << 8) + pixel[2];
1323 buffer[(i * w + j) + 2] = value;
1324 }
1325
1326 row += rowstride;
1327 }
1328
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1331 free (buffer);
1331 } 1332 }
1332 else 1333 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334 1335
1335 destroy_asimage (&result); 1336 g_object_unref (pixbuf);
1336#endif 1337#endif
1337} 1338}
1338 1339
1339/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
1340/* rxvt_Create_Windows () - Open and map the window */ 1341/* Open and map the window */
1341void 1342void
1342rxvt_term::create_windows (int argc, const char *const *argv) 1343rxvt_term::create_windows (int argc, const char *const *argv)
1343{ 1344{
1344 XClassHint classHint; 1345 XClassHint classHint;
1345 XWMHints wmHint; 1346 XWMHints wmHint;
… …
1351 Window top, parent; 1352 Window top, parent;
1352 1353
1353 dLocal (Display *, dpy); 1354 dLocal (Display *, dpy);
1354 1355
1355 /* grab colors before netscape does */ 1356 /* grab colors before netscape does */
1356 get_colours (); 1357 get_colors ();
1357 1358
1358 if (!set_fonts ()) 1359 if (!set_fonts ())
1359 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1360 1361
1361 parent = display->root; 1362 parent = display->root;
… …
1391 } 1392 }
1392#endif 1393#endif
1393 1394
1394 window_calc (0, 0); 1395 window_calc (0, 0);
1395 1396
1396 /* sub-window placement & size in rxvt_resize_subwindows () */ 1397 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1397 attributes.background_pixel = pix_colors_focused [Color_border]; 1398 attributes.background_pixel = pix_colors_focused [Color_border];
1398 attributes.border_pixel = pix_colors_focused [Color_border]; 1399 attributes.border_pixel = pix_colors_focused [Color_border];
1399 attributes.colormap = cmap; 1400 attributes.colormap = cmap;
1400 1401
1401 top = XCreateWindow (dpy, parent, 1402 top = XCreateWindow (dpy, parent,
… …
1404 ext_bwidth, 1405 ext_bwidth,
1405 depth, InputOutput, visual, 1406 depth, InputOutput, visual,
1406 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1407 &attributes); 1408 &attributes);
1408 1409
1409 this->parent[0] = top; 1410 this->parent = top;
1410
1411 old_width = szHint.width;
1412 old_height = szHint.height;
1413 1411
1414 set_title (rs [Rs_title]); 1412 set_title (rs [Rs_title]);
1415 set_icon_name (rs [Rs_iconName]); 1413 set_icon_name (rs [Rs_iconName]);
1416 1414
1417 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
1418 classHint.res_class = (char *)RESCLASS; 1416 classHint.res_class = (char *)RESCLASS;
1419 1417
1420 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1418 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1421 wmHint.input = True; 1419 wmHint.input = True;
1422 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1420 wmHint.initial_state = option (Opt_iconic) ? IconicState
1421 : option (Opt_dockapp) ? WithdrawnState
1422 : NormalState;
1423 wmHint.window_group = top; 1423 wmHint.window_group = top;
1424 1424
1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1426 &szHint, &wmHint, &classHint); 1426 &szHint, &wmHint, &classHint);
1427#if ENABLE_EWMH 1427#if ENABLE_EWMH
… …
1429 * set up icon hint 1429 * set up icon hint
1430 * rs [Rs_iconfile] is path to icon 1430 * rs [Rs_iconfile] is path to icon
1431 */ 1431 */
1432 1432
1433 if (rs [Rs_iconfile]) 1433 if (rs [Rs_iconfile])
1434 {
1435 set_icon (rs [Rs_iconfile]); 1434 set_icon (rs [Rs_iconfile]);
1436 }
1437#endif 1435#endif
1438 1436
1439#if ENABLE_FRILLS 1437#if ENABLE_FRILLS
1440 if (mwmhints.flags) 1438 if (mwmhints.flags)
1441 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1447#if ENABLE_EWMH 1445#if ENABLE_EWMH
1448 xa[XA_NET_WM_PING], 1446 xa[XA_NET_WM_PING],
1449#endif 1447#endif
1450 }; 1448 };
1451 1449
1452 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1450 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1453 1451
1454#if ENABLE_FRILLS 1452#if ENABLE_FRILLS
1455 if (rs[Rs_transient_for]) 1453 if (rs[Rs_transient_for])
1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1454 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1457#endif 1455#endif
… …
1475 | ExposureMask | StructureNotifyMask); 1473 | ExposureMask | StructureNotifyMask);
1476 1474
1477 termwin_ev.start (display, top); 1475 termwin_ev.start (display, top);
1478 1476
1479 /* vt cursor: Black-on-White is standard, but this is more popular */ 1477 /* vt cursor: Black-on-White is standard, but this is more popular */
1478 unsigned int shape = XC_xterm;
1479
1480#ifdef HAVE_XMU
1481 if (rs[Rs_pointerShape])
1482 {
1483 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1484 if (stmp >= 0)
1485 shape = stmp;
1486 }
1487#endif
1488
1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1489 TermWin_cursor = XCreateFontCursor (dpy, shape);
1481 1490
1482 /* the vt window */ 1491 /* the vt window */
1483 vt = XCreateSimpleWindow (dpy, top, 1492 vt = XCreateSimpleWindow (dpy, top,
1484 window_vt_x, window_vt_y, 1493 window_vt_x, window_vt_y,
1485 width, height, 1494 vt_width, vt_height,
1486 0, 1495 0,
1487 pix_colors_focused[Color_fg], 1496 pix_colors_focused[Color_fg],
1488 pix_colors_focused[Color_bg]); 1497 pix_colors_focused[Color_bg]);
1489 1498
1490 attributes.bit_gravity = NorthWestGravity; 1499 attributes.bit_gravity = NorthWestGravity;
… …
1517 if (rs[Rs_fade]) 1526 if (rs[Rs_fade])
1518 pix_colors = pix_colors_unfocused; 1527 pix_colors = pix_colors_unfocused;
1519#endif 1528#endif
1520 1529
1521 pointer_unblank (); 1530 pointer_unblank ();
1522 scr_recolour (); 1531 scr_recolor ();
1523} 1532}
1524 1533
1525/*----------------------------------------------------------------------*/ 1534/*----------------------------------------------------------------------*/
1526/* 1535/*
1527 * Run the command in a subprocess and return a file descriptor for the 1536 * Run the command in a subprocess and return a file descriptor for the
… …
1539 if (pty->pty >= 0) 1548 if (pty->pty >= 0)
1540 { 1549 {
1541 if (getfd_hook) 1550 if (getfd_hook)
1542 pty->pty = (*getfd_hook) (pty->pty); 1551 pty->pty = (*getfd_hook) (pty->pty);
1543 1552
1544 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1553 if (pty->pty < 0)
1545 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1554 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1546 } 1555 }
1547 } 1556 }
1548 else 1557 else
1549#endif 1558#endif
1550 if (!pty->get ()) 1559 if (!pty->get ())
1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1560 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1561
1562 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552 1563
1553 struct termios tio = def_tio; 1564 struct termios tio = def_tio;
1554 1565
1555#ifndef NO_BACKSPACE_KEY 1566#ifndef NO_BACKSPACE_KEY
1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1567 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1606 1617
1607 _exit (EXIT_FAILURE); 1618 _exit (EXIT_FAILURE);
1608 1619
1609 default: 1620 default:
1610 if (!option (Opt_utmpInhibit)) 1621 if (!option (Opt_utmpInhibit))
1622 {
1623#ifdef LOG_ONLY_ON_LOGIN
1624 bool login_shell = option (Opt_loginShell);
1625#else
1626 bool login_shell = true;
1627#endif
1611 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1628 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1629 }
1612 1630
1613 pty->close_tty (); 1631 pty->close_tty ();
1614 1632
1615 child_ev.start (cmd_pid); 1633 child_ev.start (cmd_pid);
1616 1634
… …
1641#elif defined (SRIOCSREDIR) 1659#elif defined (SRIOCSREDIR)
1642 int fd; 1660 int fd;
1643 1661
1644 fd = open (CONSOLE, O_WRONLY, 0); 1662 fd = open (CONSOLE, O_WRONLY, 0);
1645 if (fd >= 0) 1663 if (fd >= 0)
1646 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1664 {
1665 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1647 close (fd); 1666 close (fd);
1667 }
1648#endif /* SRIOCSREDIR */ 1668#endif /* SRIOCSREDIR */
1649 } 1669 }
1650 1670
1651 /* reset signals and spin off the command interpreter */ 1671 /* reset signals and spin off the command interpreter */
1652 signal (SIGINT, SIG_DFL); 1672 signal (SIGINT, SIG_DFL);

Diff Legend

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