… | |
… | |
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> |
|
|
56 | #endif |
|
|
57 | |
|
|
58 | #ifdef HAVE_STARTUP_NOTIFICATION |
|
|
59 | # define SN_API_NOT_YET_FROZEN |
|
|
60 | # include <libsn/sn-launchee.h> |
58 | #endif |
61 | #endif |
59 | |
62 | |
60 | #ifdef DISPLAY_IS_IP |
63 | #ifdef DISPLAY_IS_IP |
61 | /* On Solaris link with -lsocket and -lnsl */ |
64 | /* On Solaris link with -lsocket and -lnsl */ |
62 | #include <sys/types.h> |
65 | #include <sys/types.h> |
… | |
… | |
562 | |
565 | |
563 | /*----------------------------------------------------------------------*/ |
566 | /*----------------------------------------------------------------------*/ |
564 | const char ** |
567 | const char ** |
565 | rxvt_term::init_resources (int argc, const char *const *argv) |
568 | rxvt_term::init_resources (int argc, const char *const *argv) |
566 | { |
569 | { |
567 | int i, r_argc; |
570 | int i; |
568 | const char **cmd_argv, **r_argv; |
571 | 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 | |
572 | |
598 | rs[Rs_name] = rxvt_basename (argv[0]); |
573 | rs[Rs_name] = rxvt_basename (argv[0]); |
599 | |
574 | |
600 | /* |
575 | /* |
601 | * Open display, get options/resources and create the window |
576 | * Open display, get options/resources and create the window |
602 | */ |
577 | */ |
603 | |
578 | |
604 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
579 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
605 | rs[Rs_display_name] = ":0"; |
580 | rs[Rs_display_name] = ":0"; |
606 | |
581 | |
607 | get_options (r_argc, r_argv); |
582 | cmd_argv = get_options (argc, argv); |
608 | |
583 | |
609 | if (!(display = displays.get (rs[Rs_display_name]))) |
584 | 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]); |
585 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
613 | } |
|
|
614 | |
586 | |
615 | // using a local pointer decreases code size a lot |
587 | // using a local pointer decreases code size a lot |
616 | xa = display->xa; |
588 | xa = display->xa; |
617 | |
589 | |
618 | set (display); |
590 | set (display); |
… | |
… | |
621 | #if XFT |
593 | #if XFT |
622 | if (rs[Rs_depth]) |
594 | if (rs[Rs_depth]) |
623 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
595 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
624 | #endif |
596 | #endif |
625 | |
597 | |
626 | free (r_argv); |
|
|
627 | |
|
|
628 | for (int i = NUM_RESOURCES; i--; ) |
598 | for (int i = NUM_RESOURCES; i--; ) |
629 | if (rs [i] == resval_undef) |
599 | if (rs [i] == resval_undef) |
630 | rs [i] = 0; |
600 | rs [i] = 0; |
631 | |
601 | |
632 | #if ENABLE_PERL |
602 | #if ENABLE_PERL |
… | |
… | |
639 | { |
609 | { |
640 | rxvt_perl.init (this); |
610 | rxvt_perl.init (this); |
641 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
611 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
642 | } |
612 | } |
643 | #endif |
613 | #endif |
|
|
614 | |
|
|
615 | // must be called after initialising the perl interpreter as it |
|
|
616 | // may invoke the `on_register_command' hook |
|
|
617 | extract_keysym_resources (); |
644 | |
618 | |
645 | /* |
619 | /* |
646 | * set any defaults not already set |
620 | * set any defaults not already set |
647 | */ |
621 | */ |
648 | if (cmd_argv && cmd_argv[0]) |
622 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
757 | return cmd_argv; |
731 | return cmd_argv; |
758 | } |
732 | } |
759 | |
733 | |
760 | /*----------------------------------------------------------------------*/ |
734 | /*----------------------------------------------------------------------*/ |
761 | void |
735 | void |
762 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
736 | rxvt_term::init (stringvec *argv, stringvec *envv) |
763 | { |
737 | { |
|
|
738 | argv->push_back (0); |
|
|
739 | envv->push_back (0); |
|
|
740 | |
|
|
741 | this->argv = argv; |
764 | this->envv = envv; |
742 | this->envv = envv; |
765 | |
743 | |
|
|
744 | init2 (argv->size () - 1, argv->begin ()); |
|
|
745 | } |
|
|
746 | |
|
|
747 | void |
|
|
748 | rxvt_term::init (int argc, const char *const *argv, const char *const *envv) |
|
|
749 | { |
|
|
750 | #if ENABLE_PERL |
|
|
751 | // perl might want to access the stringvecs later, so we need to copy them |
|
|
752 | stringvec *args = new stringvec; |
|
|
753 | for (int i = 0; i < argc; i++) |
|
|
754 | args->push_back (strdup (argv [i])); |
|
|
755 | |
|
|
756 | stringvec *envs = new stringvec; |
|
|
757 | for (const char *const *var = envv; *var; var++) |
|
|
758 | envs->push_back (strdup (*var)); |
|
|
759 | |
|
|
760 | init (args, envs); |
|
|
761 | #else |
|
|
762 | init2 (argc, argv); |
|
|
763 | #endif |
|
|
764 | } |
|
|
765 | |
|
|
766 | void |
|
|
767 | rxvt_term::init2 (int argc, const char *const *argv) |
|
|
768 | { |
766 | SET_R (this); |
769 | SET_R (this); |
767 | set_locale (""); |
770 | set_locale (""); |
768 | set_environ (envv); // a few things in X do not call setlocale :( |
771 | set_environ (envv); // a few things in X do not call setlocale :( |
769 | |
772 | |
770 | init_vars (); |
773 | init_vars (); |
… | |
… | |
784 | if (chdir (path)) |
787 | if (chdir (path)) |
785 | rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); |
788 | rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); |
786 | } |
789 | } |
787 | |
790 | |
788 | if (option (Opt_scrollBar)) |
791 | if (option (Opt_scrollBar)) |
789 | scrollBar.state = STATE_IDLE; /* set existence for size calculations */ |
792 | scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ |
790 | |
793 | |
791 | pty = ptytty::create (); |
794 | pty = ptytty::create (); |
|
|
795 | |
|
|
796 | // must be called before create_windows, because the latter may call set_icon |
|
|
797 | #ifdef HAVE_PIXBUF |
|
|
798 | g_type_init (); |
|
|
799 | #endif |
792 | |
800 | |
793 | create_windows (argc, argv); |
801 | create_windows (argc, argv); |
794 | |
802 | |
795 | init_xlocale (); |
803 | init_xlocale (); |
796 | |
804 | |
… | |
… | |
826 | } |
834 | } |
827 | #endif |
835 | #endif |
828 | |
836 | |
829 | #ifdef BG_IMAGE_FROM_FILE |
837 | #ifdef BG_IMAGE_FROM_FILE |
830 | if (rs[Rs_backgroundPixmap]) |
838 | if (rs[Rs_backgroundPixmap]) |
831 | { |
|
|
832 | if (bg_set_file (rs[Rs_backgroundPixmap])) |
839 | if (bg_set_file (rs[Rs_backgroundPixmap])) |
833 | if (!bg_window_position_sensitive ()) |
840 | if (!bg_window_position_sensitive ()) |
834 | update_background (); |
841 | update_background (); |
835 | } |
|
|
836 | #endif |
842 | #endif |
837 | } |
843 | } |
838 | #endif |
844 | #endif |
839 | |
845 | |
840 | #if ENABLE_PERL |
846 | #if ENABLE_PERL |
841 | rootwin_ev.start (display, display->root); |
847 | rootwin_ev.start (display, display->root); |
842 | #endif |
848 | #endif |
843 | |
849 | |
844 | set_colorfgbg (); |
850 | init_done = 1; |
845 | |
851 | |
846 | init_command (cmd_argv); |
852 | init_command (cmd_argv); |
847 | |
|
|
848 | free (cmd_argv); |
|
|
849 | |
853 | |
850 | if (pty->pty >= 0) |
854 | if (pty->pty >= 0) |
851 | pty_ev.start (pty->pty, ev::READ); |
855 | pty_ev.start (pty->pty, ev::READ); |
852 | |
856 | |
853 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
857 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
… | |
… | |
860 | XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
864 | XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
861 | 32, PropModeReplace, (unsigned char *)&info, 2); |
865 | 32, PropModeReplace, (unsigned char *)&info, 2); |
862 | } |
866 | } |
863 | #endif |
867 | #endif |
864 | |
868 | |
|
|
869 | #if HAVE_STARTUP_NOTIFICATION |
|
|
870 | SnDisplay *snDisplay; |
|
|
871 | SnLauncheeContext *snContext; |
|
|
872 | |
|
|
873 | snDisplay = sn_display_new (dpy, NULL, NULL); |
|
|
874 | snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy)); |
|
|
875 | |
|
|
876 | /* Tell the window manager that this window is part of the startup context */ |
|
|
877 | if (snContext) |
|
|
878 | sn_launchee_context_setup_window (snContext, parent); |
|
|
879 | #endif |
|
|
880 | |
865 | XMapWindow (dpy, vt); |
881 | XMapWindow (dpy, vt); |
866 | XMapWindow (dpy, parent); |
882 | XMapWindow (dpy, parent); |
|
|
883 | |
|
|
884 | #if HAVE_STARTUP_NOTIFICATION |
|
|
885 | if (snContext) |
|
|
886 | { |
|
|
887 | /* Mark the startup process as complete */ |
|
|
888 | sn_launchee_context_complete (snContext); |
|
|
889 | |
|
|
890 | sn_launchee_context_unref (snContext); |
|
|
891 | } |
|
|
892 | |
|
|
893 | sn_display_unref (snDisplay); |
|
|
894 | #endif |
867 | |
895 | |
868 | refresh_check (); |
896 | refresh_check (); |
869 | } |
897 | } |
870 | |
898 | |
871 | /*----------------------------------------------------------------------*/ |
899 | /*----------------------------------------------------------------------*/ |
872 | void |
900 | void |
873 | rxvt_term::init_env () |
901 | rxvt_term::init_env () |
874 | { |
902 | { |
875 | char *val; |
903 | char *val; |
|
|
904 | char *env_display; |
|
|
905 | char *env_windowid; |
|
|
906 | char *env_colorfgbg; |
|
|
907 | char *env_term; |
876 | |
908 | |
877 | #ifdef DISPLAY_IS_IP |
909 | #ifdef DISPLAY_IS_IP |
878 | /* Fixup display_name for export over pty to any interested terminal |
910 | /* Fixup display_name for export over pty to any interested terminal |
879 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
911 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
880 | * (for the first non-loopback interface) that we get from |
912 | * (for the first non-loopback interface) that we get from |
… | |
… | |
897 | |
929 | |
898 | env_display = (char *)rxvt_malloc (strlen (val) + 9); |
930 | env_display = (char *)rxvt_malloc (strlen (val) + 9); |
899 | |
931 | |
900 | sprintf (env_display, "DISPLAY=%s", val); |
932 | sprintf (env_display, "DISPLAY=%s", val); |
901 | |
933 | |
|
|
934 | env_windowid = (char *)rxvt_malloc (21); |
902 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); |
935 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); |
903 | |
936 | |
904 | /* add entries to the environment: |
937 | /* add entries to the environment: |
905 | * @ DISPLAY: in case we started with -display |
938 | * @ DISPLAY: in case we started with -display |
906 | * @ WINDOWID: X window id number of the window |
939 | * @ WINDOWID: X window id number of the window |
… | |
… | |
910 | * @ COLORFGBG: fg;bg color codes |
943 | * @ COLORFGBG: fg;bg color codes |
911 | */ |
944 | */ |
912 | putenv (env_display); |
945 | putenv (env_display); |
913 | putenv (env_windowid); |
946 | putenv (env_windowid); |
914 | |
947 | |
915 | if (env_colorfgbg) |
948 | env_colorfgbg = get_colorfgbg (); |
916 | putenv (env_colorfgbg); |
949 | putenv (env_colorfgbg); |
917 | |
950 | |
918 | #ifdef RXVT_TERMINFO |
951 | #ifdef RXVT_TERMINFO |
919 | putenv ("TERMINFO=" RXVT_TERMINFO); |
952 | putenv ("TERMINFO=" RXVT_TERMINFO); |
920 | #endif |
953 | #endif |
921 | |
954 | |
… | |
… | |
940 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
973 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
941 | #endif /* HAVE_UNSETENV */ |
974 | #endif /* HAVE_UNSETENV */ |
942 | } |
975 | } |
943 | |
976 | |
944 | /*----------------------------------------------------------------------*/ |
977 | /*----------------------------------------------------------------------*/ |
945 | /* |
|
|
946 | * This is more or less stolen straight from XFree86 xterm. |
|
|
947 | * This should support all European type languages. |
|
|
948 | */ |
|
|
949 | void |
978 | void |
950 | rxvt_term::set_locale (const char *locale) |
979 | rxvt_term::set_locale (const char *locale) |
951 | { |
980 | { |
952 | set_environ (envv); |
981 | set_environ (envv); |
953 | |
982 | |
954 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
|
|
955 | free (this->locale); |
983 | free (this->locale); |
956 | this->locale = setlocale (LC_CTYPE, locale); |
984 | this->locale = setlocale (LC_CTYPE, locale); |
957 | |
985 | |
958 | if (!this->locale) |
986 | if (!this->locale) |
959 | { |
987 | { |
… | |
… | |
970 | |
998 | |
971 | |
999 | |
972 | this->locale = strdup (this->locale); |
1000 | this->locale = strdup (this->locale); |
973 | SET_LOCALE (this->locale); |
1001 | SET_LOCALE (this->locale); |
974 | mbstate.reset (); |
1002 | mbstate.reset (); |
975 | #endif |
|
|
976 | |
1003 | |
977 | #if HAVE_NL_LANGINFO |
1004 | #if HAVE_NL_LANGINFO |
978 | char *codeset = strdup (nl_langinfo (CODESET)); |
1005 | char *codeset = nl_langinfo (CODESET); |
979 | // /^UTF.?8/i |
1006 | // /^UTF.?8/i |
980 | enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') |
1007 | enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') |
981 | && (codeset[1] == 'T' || codeset[1] == 't') |
1008 | && (codeset[1] == 'T' || codeset[1] == 't') |
982 | && (codeset[2] == 'F' || codeset[2] == 'f') |
1009 | && (codeset[2] == 'F' || codeset[2] == 'f') |
983 | && (codeset[3] == '8' || codeset[4] == '8'); |
1010 | && (codeset[3] == '8' || codeset[4] == '8'); |
984 | free (codeset); |
|
|
985 | #else |
1011 | #else |
986 | enc_utf8 = 0; |
1012 | enc_utf8 = 0; |
987 | #endif |
1013 | #endif |
988 | } |
1014 | } |
989 | |
1015 | |
… | |
… | |
992 | { |
1018 | { |
993 | set_environ (envv); |
1019 | set_environ (envv); |
994 | |
1020 | |
995 | #ifdef USE_XIM |
1021 | #ifdef USE_XIM |
996 | if (!locale) |
1022 | if (!locale) |
997 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
1023 | rxvt_warn ("setting locale failed, continuing without locale support.\n"); |
998 | else |
1024 | else |
999 | { |
1025 | { |
1000 | set_string_property (xa[XA_WM_LOCALE_NAME], locale); |
1026 | set_string_property (xa[XA_WM_LOCALE_NAME], locale); |
1001 | |
1027 | |
1002 | if (!XSupportsLocale ()) |
1028 | if (!XSupportsLocale ()) |
1003 | { |
1029 | { |
1004 | rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); |
1030 | rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n"); |
1005 | return; |
1031 | return; |
1006 | } |
1032 | } |
1007 | |
1033 | |
1008 | im_ev.start (display); |
1034 | im_ev.start (display); |
1009 | |
1035 | |
… | |
… | |
1158 | /*----------------------------------------------------------------------*/ |
1184 | /*----------------------------------------------------------------------*/ |
1159 | /* color aliases, fg/bg bright-bold */ |
1185 | /* color aliases, fg/bg bright-bold */ |
1160 | void |
1186 | void |
1161 | rxvt_term::color_aliases (int idx) |
1187 | rxvt_term::color_aliases (int idx) |
1162 | { |
1188 | { |
1163 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
1189 | if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx])) |
1164 | { |
1190 | { |
1165 | int i = atoi (rs[Rs_color + idx]); |
1191 | int i = atoi (rs[Rs_color + idx]); |
1166 | |
1192 | |
1167 | if (i >= 8 && i <= 15) |
1193 | if (i >= 8 && i <= 15) |
1168 | /* bright colors */ |
1194 | /* bright colors */ |
… | |
… | |
1263 | } |
1289 | } |
1264 | |
1290 | |
1265 | void |
1291 | void |
1266 | rxvt_term::set_icon (const char *file) |
1292 | rxvt_term::set_icon (const char *file) |
1267 | { |
1293 | { |
1268 | #ifdef HAVE_AFTERIMAGE |
|
|
1269 | init_asv (); |
|
|
1270 | |
|
|
1271 | ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL); |
|
|
1272 | if (!im) |
|
|
1273 | { |
|
|
1274 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
|
|
1275 | return; |
|
|
1276 | } |
|
|
1277 | |
|
|
1278 | unsigned int w = im->width; |
|
|
1279 | unsigned int h = im->height; |
|
|
1280 | |
|
|
1281 | if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383)) |
|
|
1282 | { |
|
|
1283 | rxvt_warn ("Icon image too big, continuing without.\n"); |
|
|
1284 | destroy_asimage (&im); |
|
|
1285 | return; |
|
|
1286 | } |
|
|
1287 | |
|
|
1288 | ASImage *result = scale_asimage (asv, im, |
|
|
1289 | w, h, ASA_ARGB32, |
|
|
1290 | 100, ASIMAGE_QUALITY_DEFAULT); |
|
|
1291 | destroy_asimage (&im); |
|
|
1292 | |
|
|
1293 | if (!result) |
|
|
1294 | { |
|
|
1295 | rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n"); |
|
|
1296 | return; |
|
|
1297 | } |
|
|
1298 | |
|
|
1299 | long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)); |
|
|
1300 | if (buffer) |
|
|
1301 | { |
|
|
1302 | ARGB32 *asbuf = result->alt.argb32; |
|
|
1303 | buffer [0] = w; |
|
|
1304 | buffer [1] = h; |
|
|
1305 | |
|
|
1306 | for (unsigned int i = 0; i < w * h; ++i) |
|
|
1307 | buffer [i + 2] = asbuf [i]; |
|
|
1308 | |
|
|
1309 | XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32, |
|
|
1310 | PropModeReplace, (const unsigned char *) buffer, 2 + w * h); |
|
|
1311 | free (buffer); |
|
|
1312 | } |
|
|
1313 | else |
|
|
1314 | rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); |
|
|
1315 | |
|
|
1316 | destroy_asimage (&result); |
|
|
1317 | #endif |
|
|
1318 | |
|
|
1319 | #ifdef HAVE_PIXBUF |
1294 | #ifdef HAVE_PIXBUF |
1320 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1295 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1321 | if (!pixbuf) |
1296 | if (!pixbuf) |
1322 | { |
1297 | { |
1323 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
1298 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
… | |
… | |
1444 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1419 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1445 | &attributes); |
1420 | &attributes); |
1446 | |
1421 | |
1447 | this->parent = top; |
1422 | this->parent = top; |
1448 | |
1423 | |
1449 | old_width = szHint.width; |
|
|
1450 | old_height = szHint.height; |
|
|
1451 | |
|
|
1452 | set_title (rs [Rs_title]); |
1424 | set_title (rs [Rs_title]); |
1453 | set_icon_name (rs [Rs_iconName]); |
1425 | set_icon_name (rs [Rs_iconName]); |
1454 | |
1426 | |
1455 | classHint.res_name = (char *)rs[Rs_name]; |
1427 | classHint.res_name = (char *)rs[Rs_name]; |
1456 | classHint.res_class = (char *)RESCLASS; |
1428 | classHint.res_class = (char *)RESCLASS; |
… | |
… | |
1518 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1490 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1519 | |
1491 | |
1520 | /* the vt window */ |
1492 | /* the vt window */ |
1521 | vt = XCreateSimpleWindow (dpy, top, |
1493 | vt = XCreateSimpleWindow (dpy, top, |
1522 | window_vt_x, window_vt_y, |
1494 | window_vt_x, window_vt_y, |
1523 | width, height, |
1495 | vt_width, vt_height, |
1524 | 0, |
1496 | 0, |
1525 | pix_colors_focused[Color_fg], |
1497 | pix_colors_focused[Color_fg], |
1526 | pix_colors_focused[Color_bg]); |
1498 | pix_colors_focused[Color_bg]); |
1527 | |
1499 | |
1528 | attributes.bit_gravity = NorthWestGravity; |
1500 | attributes.bit_gravity = NorthWestGravity; |
… | |
… | |
1577 | if (pty->pty >= 0) |
1549 | if (pty->pty >= 0) |
1578 | { |
1550 | { |
1579 | if (getfd_hook) |
1551 | if (getfd_hook) |
1580 | pty->pty = (*getfd_hook) (pty->pty); |
1552 | pty->pty = (*getfd_hook) (pty->pty); |
1581 | |
1553 | |
1582 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1554 | if (pty->pty < 0) |
1583 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1555 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1584 | } |
1556 | } |
1585 | } |
1557 | } |
1586 | else |
1558 | else |
1587 | #endif |
1559 | #endif |
1588 | if (!pty->get ()) |
1560 | if (!pty->get ()) |
1589 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1561 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
|
|
1562 | |
|
|
1563 | fcntl (pty->pty, F_SETFL, O_NONBLOCK); |
1590 | |
1564 | |
1591 | struct termios tio = def_tio; |
1565 | struct termios tio = def_tio; |
1592 | |
1566 | |
1593 | #ifndef NO_BACKSPACE_KEY |
1567 | #ifndef NO_BACKSPACE_KEY |
1594 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
1568 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
… | |
… | |
1644 | |
1618 | |
1645 | _exit (EXIT_FAILURE); |
1619 | _exit (EXIT_FAILURE); |
1646 | |
1620 | |
1647 | default: |
1621 | default: |
1648 | if (!option (Opt_utmpInhibit)) |
1622 | if (!option (Opt_utmpInhibit)) |
|
|
1623 | { |
|
|
1624 | #ifdef LOG_ONLY_ON_LOGIN |
|
|
1625 | bool login_shell = option (Opt_loginShell); |
|
|
1626 | #else |
|
|
1627 | bool login_shell = true; |
|
|
1628 | #endif |
1649 | pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); |
1629 | pty->login (cmd_pid, login_shell, rs[Rs_display_name]); |
|
|
1630 | } |
1650 | |
1631 | |
1651 | pty->close_tty (); |
1632 | pty->close_tty (); |
1652 | |
1633 | |
1653 | child_ev.start (cmd_pid); |
1634 | child_ev.start (cmd_pid); |
1654 | |
1635 | |
… | |
… | |
1679 | #elif defined (SRIOCSREDIR) |
1660 | #elif defined (SRIOCSREDIR) |
1680 | int fd; |
1661 | int fd; |
1681 | |
1662 | |
1682 | fd = open (CONSOLE, O_WRONLY, 0); |
1663 | fd = open (CONSOLE, O_WRONLY, 0); |
1683 | if (fd >= 0) |
1664 | if (fd >= 0) |
1684 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1665 | { |
|
|
1666 | ioctl (fd, SRIOCSREDIR, STDIN_FILENO); |
1685 | close (fd); |
1667 | close (fd); |
|
|
1668 | } |
1686 | #endif /* SRIOCSREDIR */ |
1669 | #endif /* SRIOCSREDIR */ |
1687 | } |
1670 | } |
1688 | |
1671 | |
1689 | /* reset signals and spin off the command interpreter */ |
1672 | /* reset signals and spin off the command interpreter */ |
1690 | signal (SIGINT, SIG_DFL); |
1673 | signal (SIGINT, SIG_DFL); |