… | |
… | |
10 | * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> |
10 | * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> |
12 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
12 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * - extensive modifications |
14 | * - extensive modifications |
15 | * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> |
15 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
16 | * |
16 | * |
17 | * This program is free software; you can redistribute it and/or modify |
17 | * This program is free software; you can redistribute it and/or modify |
18 | * it under the terms of the GNU General Public License as published by |
18 | * it under the terms of the GNU General Public License as published by |
19 | * the Free Software Foundation; either version 2 of the License, or |
19 | * the Free Software Foundation; either version 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> |
|
|
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> |
… | |
… | |
73 | #include <netinet/in.h> |
76 | #include <netinet/in.h> |
74 | #include <arpa/inet.h> |
77 | #include <arpa/inet.h> |
75 | #include <net/if.h> |
78 | #include <net/if.h> |
76 | #include <net/if_arp.h> |
79 | #include <net/if_arp.h> |
77 | |
80 | |
78 | static char * |
81 | static char * ecb_cold |
79 | rxvt_network_display (const char *display) |
82 | rxvt_network_display (const char *display) |
80 | { |
83 | { |
81 | char buffer[1024], *rval = NULL; |
84 | char buffer[1024], *rval = NULL; |
82 | struct ifconf ifc; |
85 | struct ifconf ifc; |
83 | struct ifreq *ifr; |
86 | struct ifreq *ifr; |
… | |
… | |
516 | #endif |
519 | #endif |
517 | COLOR_SCROLLBAR, |
520 | COLOR_SCROLLBAR, |
518 | #ifdef RXVT_SCROLLBAR |
521 | #ifdef RXVT_SCROLLBAR |
519 | COLOR_SCROLLTROUGH, |
522 | COLOR_SCROLLTROUGH, |
520 | #endif |
523 | #endif |
521 | #if ENABLE_TRANSPARENCY |
524 | #if BG_IMAGE_FROM_ROOT |
522 | NULL, |
525 | NULL, |
523 | #endif |
526 | #endif |
524 | #if OFF_FOCUS_FADING |
527 | #if OFF_FOCUS_FADING |
525 | "rgb:00/00/00", |
528 | "rgb:00/00/00", |
526 | #endif |
529 | #endif |
… | |
… | |
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); |
619 | extract_resources (); |
591 | extract_resources (); |
620 | |
592 | |
621 | #if XFT |
593 | #if ENABLE_FRILLS |
622 | if (rs[Rs_depth]) |
594 | if (rs[Rs_visual]) |
623 | 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)); |
624 | #endif |
598 | #endif |
625 | |
|
|
626 | free (r_argv); |
|
|
627 | |
599 | |
628 | for (int i = NUM_RESOURCES; i--; ) |
600 | for (int i = NUM_RESOURCES; i--; ) |
629 | if (rs [i] == resval_undef) |
601 | if (rs [i] == resval_undef) |
630 | rs [i] = 0; |
602 | rs [i] = 0; |
631 | |
603 | |
632 | #ifdef HAVE_AFTERIMAGE |
|
|
633 | set_application_name ((char *)rs[Rs_name]); |
|
|
634 | set_output_threshold (OUTPUT_LEVEL_WARNING); |
|
|
635 | #endif |
|
|
636 | |
|
|
637 | #ifdef HAVE_PIXBUF |
|
|
638 | g_type_init (); |
|
|
639 | #endif |
|
|
640 | |
|
|
641 | #if ENABLE_PERL |
604 | #if ENABLE_PERL |
642 | if (!rs[Rs_perl_ext_1]) |
605 | if (!rs[Rs_perl_ext_1]) |
643 | rs[Rs_perl_ext_1] = "default"; |
606 | rs[Rs_perl_ext_1] = "default"; |
644 | |
607 | |
645 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
608 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
… | |
… | |
648 | { |
611 | { |
649 | rxvt_perl.init (this); |
612 | rxvt_perl.init (this); |
650 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
613 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
651 | } |
614 | } |
652 | #endif |
615 | #endif |
|
|
616 | |
|
|
617 | // must be called after initialising the perl interpreter as it |
|
|
618 | // may invoke the `on_register_command' hook |
|
|
619 | extract_keysym_resources (); |
653 | |
620 | |
654 | /* |
621 | /* |
655 | * set any defaults not already set |
622 | * set any defaults not already set |
656 | */ |
623 | */ |
657 | if (cmd_argv && cmd_argv[0]) |
624 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
692 | if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) |
659 | if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) |
693 | pointerBlankDelay = i; |
660 | pointerBlankDelay = i; |
694 | else |
661 | else |
695 | pointerBlankDelay = 2; |
662 | pointerBlankDelay = 2; |
696 | #endif |
663 | #endif |
|
|
664 | |
|
|
665 | if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0) |
|
|
666 | multiClickTime = i; |
|
|
667 | else |
|
|
668 | multiClickTime = 500; |
|
|
669 | |
|
|
670 | cursor_type = option (Opt_cursorUnderline) ? 1 : 0; |
697 | |
671 | |
698 | /* no point having a scrollbar without having any scrollback! */ |
672 | /* no point having a scrollbar without having any scrollback! */ |
699 | if (!saveLines) |
673 | if (!saveLines) |
700 | set_option (Opt_scrollBar, 0); |
674 | set_option (Opt_scrollBar, 0); |
701 | |
675 | |
… | |
… | |
766 | return cmd_argv; |
740 | return cmd_argv; |
767 | } |
741 | } |
768 | |
742 | |
769 | /*----------------------------------------------------------------------*/ |
743 | /*----------------------------------------------------------------------*/ |
770 | void |
744 | void |
771 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
745 | rxvt_term::init (stringvec *argv, stringvec *envv) |
772 | { |
746 | { |
|
|
747 | argv->push_back (0); |
|
|
748 | envv->push_back (0); |
|
|
749 | |
|
|
750 | this->argv = argv; |
773 | this->envv = envv; |
751 | this->envv = envv; |
774 | |
752 | |
|
|
753 | env = new char *[this->envv->size ()]; |
|
|
754 | for (int i = 0; i < this->envv->size (); i++) |
|
|
755 | env[i] = this->envv->at (i); |
|
|
756 | |
|
|
757 | init2 (argv->size () - 1, argv->begin ()); |
|
|
758 | } |
|
|
759 | |
|
|
760 | void |
|
|
761 | rxvt_term::init (int argc, const char *const *argv, const char *const *envv) |
|
|
762 | { |
|
|
763 | #if ENABLE_PERL |
|
|
764 | // perl might want to access the stringvecs later, so we need to copy them |
|
|
765 | stringvec *args = new stringvec; |
|
|
766 | for (int i = 0; i < argc; i++) |
|
|
767 | args->push_back (strdup (argv [i])); |
|
|
768 | |
|
|
769 | stringvec *envs = new stringvec; |
|
|
770 | for (const char *const *var = envv; *var; var++) |
|
|
771 | envs->push_back (strdup (*var)); |
|
|
772 | |
|
|
773 | init (args, envs); |
|
|
774 | #else |
|
|
775 | init2 (argc, argv); |
|
|
776 | #endif |
|
|
777 | } |
|
|
778 | |
|
|
779 | void |
|
|
780 | rxvt_term::init2 (int argc, const char *const *argv) |
|
|
781 | { |
775 | SET_R (this); |
782 | SET_R (this); |
776 | set_locale (""); |
783 | set_locale (""); |
777 | set_environ (envv); // a few things in X do not call setlocale :( |
784 | set_environ (env); // a few things in X do not call setlocale :( |
778 | |
785 | |
779 | init_vars (); |
786 | init_vars (); |
780 | |
787 | |
781 | const char **cmd_argv = init_resources (argc, argv); |
788 | const char **cmd_argv = init_resources (argc, argv); |
782 | |
789 | |
… | |
… | |
793 | if (chdir (path)) |
800 | if (chdir (path)) |
794 | rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); |
801 | rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); |
795 | } |
802 | } |
796 | |
803 | |
797 | if (option (Opt_scrollBar)) |
804 | if (option (Opt_scrollBar)) |
798 | scrollBar.state = STATE_IDLE; /* set existence for size calculations */ |
805 | scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ |
799 | |
806 | |
800 | pty = ptytty::create (); |
807 | pty = ptytty::create (); |
801 | |
808 | |
802 | create_windows (argc, argv); |
809 | create_windows (argc, argv); |
803 | |
810 | |
… | |
… | |
809 | XSynchronize (dpy, True); |
816 | XSynchronize (dpy, True); |
810 | #endif |
817 | #endif |
811 | |
818 | |
812 | if (option (Opt_scrollBar)) |
819 | if (option (Opt_scrollBar)) |
813 | scrollBar.resize (); /* create and map scrollbar */ |
820 | scrollBar.resize (); /* create and map scrollbar */ |
|
|
821 | |
814 | #ifdef HAVE_BG_PIXMAP |
822 | #ifdef HAVE_BG_PIXMAP |
815 | { |
823 | bg_init (); |
816 | bgPixmap.set_target (this); |
|
|
817 | bgPixmap.invalidate (); |
|
|
818 | |
|
|
819 | #ifdef ENABLE_TRANSPARENCY |
|
|
820 | if (option (Opt_transparent)) |
|
|
821 | { |
|
|
822 | bgPixmap.set_transparent (); |
|
|
823 | |
|
|
824 | if (rs [Rs_blurradius]) |
|
|
825 | bgPixmap.set_blur_radius (rs [Rs_blurradius]); |
|
|
826 | |
|
|
827 | if (ISSET_PIXCOLOR (Color_tint)) |
|
|
828 | bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
|
|
829 | |
|
|
830 | if (rs [Rs_shade]) |
|
|
831 | bgPixmap.set_shade (rs [Rs_shade]); |
|
|
832 | |
|
|
833 | bgPixmap.set_root_pixmap (); |
|
|
834 | XSelectInput (dpy, display->root, PropertyChangeMask); |
|
|
835 | rootwin_ev.start (display, display->root); |
|
|
836 | } |
|
|
837 | #endif |
|
|
838 | |
|
|
839 | #ifdef BG_IMAGE_FROM_FILE |
|
|
840 | if (rs[Rs_backgroundPixmap]) |
|
|
841 | { |
|
|
842 | const char *p = rs[Rs_backgroundPixmap]; |
|
|
843 | |
|
|
844 | if ((p = strchr (p, ';')) != 0) |
|
|
845 | { |
|
|
846 | p++; |
|
|
847 | bgPixmap.set_geometry (p); |
|
|
848 | } |
|
|
849 | else |
|
|
850 | bgPixmap.set_defaultGeometry (); |
|
|
851 | |
|
|
852 | if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) |
|
|
853 | if (!bgPixmap.window_position_sensitive ()) |
|
|
854 | update_background (); |
|
|
855 | } |
|
|
856 | #endif |
|
|
857 | } |
|
|
858 | #endif |
824 | #endif |
859 | |
825 | |
860 | #if ENABLE_PERL |
826 | #if ENABLE_PERL |
861 | rootwin_ev.start (display, display->root); |
827 | rootwin_ev.start (display, display->root); |
862 | #endif |
828 | #endif |
863 | |
829 | |
864 | set_colorfgbg (); |
830 | init_done = 1; |
865 | |
831 | |
866 | init_command (cmd_argv); |
832 | init_command (cmd_argv); |
867 | |
|
|
868 | free (cmd_argv); |
|
|
869 | |
833 | |
870 | if (pty->pty >= 0) |
834 | if (pty->pty >= 0) |
871 | pty_ev.start (pty->pty, ev::READ); |
835 | pty_ev.start (pty->pty, ev::READ); |
872 | |
836 | |
873 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
837 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
… | |
… | |
875 | #if ENABLE_XEMBED |
839 | #if ENABLE_XEMBED |
876 | if (rs[Rs_embed]) |
840 | if (rs[Rs_embed]) |
877 | { |
841 | { |
878 | long info[2] = { 0, XEMBED_MAPPED }; |
842 | long info[2] = { 0, XEMBED_MAPPED }; |
879 | |
843 | |
880 | XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
844 | XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
881 | 32, PropModeReplace, (unsigned char *)&info, 2); |
845 | 32, PropModeReplace, (unsigned char *)&info, 2); |
882 | } |
846 | } |
883 | #endif |
847 | #endif |
884 | |
848 | |
|
|
849 | #if HAVE_STARTUP_NOTIFICATION |
|
|
850 | SnDisplay *snDisplay; |
|
|
851 | SnLauncheeContext *snContext; |
|
|
852 | |
|
|
853 | snDisplay = sn_display_new (dpy, NULL, NULL); |
|
|
854 | snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy)); |
|
|
855 | |
|
|
856 | /* Tell the window manager that this window is part of the startup context */ |
|
|
857 | if (snContext) |
|
|
858 | sn_launchee_context_setup_window (snContext, parent); |
|
|
859 | #endif |
|
|
860 | |
885 | XMapWindow (dpy, vt); |
861 | XMapWindow (dpy, vt); |
886 | XMapWindow (dpy, parent[0]); |
862 | XMapWindow (dpy, parent); |
|
|
863 | |
|
|
864 | #if HAVE_STARTUP_NOTIFICATION |
|
|
865 | if (snContext) |
|
|
866 | { |
|
|
867 | /* Mark the startup process as complete */ |
|
|
868 | sn_launchee_context_complete (snContext); |
|
|
869 | |
|
|
870 | sn_launchee_context_unref (snContext); |
|
|
871 | } |
|
|
872 | |
|
|
873 | sn_display_unref (snDisplay); |
|
|
874 | #endif |
887 | |
875 | |
888 | refresh_check (); |
876 | refresh_check (); |
889 | } |
877 | } |
890 | |
878 | |
891 | /*----------------------------------------------------------------------*/ |
879 | /*----------------------------------------------------------------------*/ |
892 | void |
880 | void |
893 | rxvt_term::init_env () |
881 | rxvt_term::init_env () |
894 | { |
882 | { |
895 | int i; |
|
|
896 | char *val; |
883 | char *val; |
|
|
884 | char *env_display; |
|
|
885 | char *env_windowid; |
|
|
886 | char *env_colorfgbg; |
|
|
887 | char *env_term; |
897 | |
888 | |
898 | #ifdef DISPLAY_IS_IP |
889 | #ifdef DISPLAY_IS_IP |
899 | /* Fixup display_name for export over pty to any interested terminal |
890 | /* Fixup display_name for export over pty to any interested terminal |
900 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
891 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
901 | * (for the first non-loopback interface) that we get from |
892 | * (for the first non-loopback interface) that we get from |
… | |
… | |
914 | val = XDisplayString (dpy); |
905 | val = XDisplayString (dpy); |
915 | |
906 | |
916 | if (rs[Rs_display_name] == NULL) |
907 | if (rs[Rs_display_name] == NULL) |
917 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
908 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
918 | |
909 | |
919 | i = strlen (val); |
|
|
920 | env_display = (char *)rxvt_malloc (i + 9); |
910 | env_display = (char *)rxvt_malloc (strlen (val) + 9); |
921 | |
911 | |
922 | sprintf (env_display, "DISPLAY=%s", val); |
912 | sprintf (env_display, "DISPLAY=%s", val); |
923 | |
913 | |
|
|
914 | env_windowid = (char *)rxvt_malloc (21); |
924 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
915 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); |
925 | |
916 | |
926 | /* add entries to the environment: |
917 | /* add entries to the environment: |
927 | * @ DISPLAY: in case we started with -display |
918 | * @ DISPLAY: in case we started with -display |
928 | * @ WINDOWID: X window id number of the window |
919 | * @ WINDOWID: X window id number of the window |
929 | * @ COLORTERM: terminal sub-name and also indicates its color |
920 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
932 | * @ COLORFGBG: fg;bg color codes |
923 | * @ COLORFGBG: fg;bg color codes |
933 | */ |
924 | */ |
934 | putenv (env_display); |
925 | putenv (env_display); |
935 | putenv (env_windowid); |
926 | putenv (env_windowid); |
936 | |
927 | |
937 | if (env_colorfgbg) |
928 | env_colorfgbg = get_colorfgbg (); |
938 | putenv (env_colorfgbg); |
929 | putenv (env_colorfgbg); |
939 | |
930 | |
940 | #ifdef RXVT_TERMINFO |
931 | #ifdef RXVT_TERMINFO |
941 | putenv ("TERMINFO=" RXVT_TERMINFO); |
932 | putenv ("TERMINFO=" RXVT_TERMINFO); |
942 | #endif |
933 | #endif |
943 | |
934 | |
… | |
… | |
962 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
953 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
963 | #endif /* HAVE_UNSETENV */ |
954 | #endif /* HAVE_UNSETENV */ |
964 | } |
955 | } |
965 | |
956 | |
966 | /*----------------------------------------------------------------------*/ |
957 | /*----------------------------------------------------------------------*/ |
967 | /* |
|
|
968 | * This is more or less stolen straight from XFree86 xterm. |
|
|
969 | * This should support all European type languages. |
|
|
970 | */ |
|
|
971 | void |
958 | void |
972 | rxvt_term::set_locale (const char *locale) |
959 | rxvt_term::set_locale (const char *locale) |
973 | { |
960 | { |
974 | set_environ (envv); |
961 | set_environ (env); |
975 | |
962 | |
976 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
|
|
977 | free (this->locale); |
963 | free (this->locale); |
978 | this->locale = setlocale (LC_CTYPE, locale); |
964 | this->locale = setlocale (LC_CTYPE, locale); |
979 | |
965 | |
980 | if (!this->locale) |
966 | if (!this->locale) |
981 | { |
967 | { |
… | |
… | |
992 | |
978 | |
993 | |
979 | |
994 | this->locale = strdup (this->locale); |
980 | this->locale = strdup (this->locale); |
995 | SET_LOCALE (this->locale); |
981 | SET_LOCALE (this->locale); |
996 | mbstate.reset (); |
982 | mbstate.reset (); |
997 | #endif |
|
|
998 | |
983 | |
999 | #if HAVE_NL_LANGINFO |
984 | #if HAVE_NL_LANGINFO |
1000 | char *codeset = strdup (nl_langinfo (CODESET)); |
985 | char *codeset = nl_langinfo (CODESET); |
1001 | // /^UTF.?8/i |
986 | // /^UTF.?8/i |
1002 | enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') |
987 | enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') |
1003 | && (codeset[1] == 'T' || codeset[1] == 't') |
988 | && (codeset[1] == 'T' || codeset[1] == 't') |
1004 | && (codeset[2] == 'F' || codeset[2] == 'f') |
989 | && (codeset[2] == 'F' || codeset[2] == 'f') |
1005 | && (codeset[3] == '8' || codeset[4] == '8'); |
990 | && (codeset[3] == '8' || codeset[4] == '8'); |
1006 | free (codeset); |
|
|
1007 | #else |
991 | #else |
1008 | enc_utf8 = 0; |
992 | enc_utf8 = 0; |
1009 | #endif |
993 | #endif |
1010 | } |
994 | } |
1011 | |
995 | |
1012 | void |
996 | void |
1013 | rxvt_term::init_xlocale () |
997 | rxvt_term::init_xlocale () |
1014 | { |
998 | { |
1015 | set_environ (envv); |
999 | set_environ (env); |
1016 | |
1000 | |
1017 | #ifdef USE_XIM |
1001 | #if USE_XIM |
1018 | if (!locale) |
1002 | if (!locale) |
1019 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
1003 | rxvt_warn ("setting locale failed, continuing without locale support.\n"); |
1020 | else |
1004 | else |
1021 | { |
1005 | { |
1022 | set_string_property (xa[XA_WM_LOCALE_NAME], locale); |
1006 | set_string_property (xa[XA_WM_LOCALE_NAME], locale); |
1023 | |
1007 | |
1024 | if (!XSupportsLocale ()) |
1008 | if (!XSupportsLocale ()) |
1025 | { |
1009 | { |
1026 | rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); |
1010 | rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n"); |
1027 | return; |
1011 | return; |
1028 | } |
1012 | } |
1029 | |
1013 | |
1030 | im_ev.start (display); |
1014 | im_ev.start (display); |
1031 | |
1015 | |
… | |
… | |
1072 | run_command (argv); |
1056 | run_command (argv); |
1073 | } |
1057 | } |
1074 | |
1058 | |
1075 | /*----------------------------------------------------------------------*/ |
1059 | /*----------------------------------------------------------------------*/ |
1076 | void |
1060 | void |
1077 | rxvt_term::get_colours () |
1061 | rxvt_term::get_colors () |
1078 | { |
1062 | { |
1079 | int i; |
1063 | int i; |
1080 | |
1064 | |
1081 | #ifdef OFF_FOCUS_FADING |
1065 | #ifdef OFF_FOCUS_FADING |
1082 | pix_colors = pix_colors_focused; |
1066 | pix_colors = pix_colors_focused; |
1083 | #endif |
1067 | #endif |
1084 | |
1068 | |
1085 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
1069 | for (i = 0; i < NRS_COLORS; i++) |
1086 | { |
1070 | { |
1087 | const char *name = rs[Rs_color + i]; |
1071 | const char *name = rs[Rs_color + i]; |
1088 | |
1072 | |
1089 | if (!name) |
1073 | if (!name) |
1090 | continue; |
1074 | continue; |
… | |
… | |
1100 | #endif |
1084 | #endif |
1101 | name = def_colorName [i]; |
1085 | name = def_colorName [i]; |
1102 | |
1086 | |
1103 | if (!name) |
1087 | if (!name) |
1104 | continue; |
1088 | continue; |
|
|
1089 | |
|
|
1090 | xcol.free (this); |
1105 | |
1091 | |
1106 | if (!set_color (xcol, name)) |
1092 | if (!set_color (xcol, name)) |
1107 | { |
1093 | { |
1108 | switch (i) |
1094 | switch (i) |
1109 | { |
1095 | { |
… | |
… | |
1129 | |
1115 | |
1130 | pix_colors[i] = xcol; |
1116 | pix_colors[i] = xcol; |
1131 | rs[Rs_color + i] = name; |
1117 | rs[Rs_color + i] = name; |
1132 | } |
1118 | } |
1133 | |
1119 | |
1134 | if (depth <= 2) |
|
|
1135 | { |
|
|
1136 | if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg); |
|
|
1137 | if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg); |
|
|
1138 | if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg); |
|
|
1139 | } |
|
|
1140 | |
|
|
1141 | /* |
1120 | /* |
1142 | * get scrollBar shadow colors |
1121 | * get scrollBar shadow colors |
1143 | * |
1122 | * |
1144 | * The calculations of topShadow/bottomShadow values are adapted |
1123 | * The calculations of topShadow/bottomShadow values are adapted |
1145 | * from the fvwm window manager. |
1124 | * from the fvwm window manager. |
1146 | */ |
1125 | */ |
1147 | #ifdef RXVT_SCROLLBAR |
1126 | #ifdef RXVT_SCROLLBAR |
1148 | if (depth <= 2) |
|
|
1149 | { |
|
|
1150 | /* Monochrome */ |
|
|
1151 | alias_color (Color_scroll, Color_fg); |
|
|
1152 | alias_color (Color_topShadow, Color_bg); |
|
|
1153 | alias_color (Color_bottomShadow, Color_bg); |
|
|
1154 | } |
|
|
1155 | else |
|
|
1156 | { |
|
|
1157 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
1127 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
1158 | |
1128 | |
1159 | rgba cscroll; |
1129 | rgba cscroll; |
1160 | pix_colors [Color_scroll].get (cscroll); |
1130 | pix_colors [Color_scroll].get (cscroll); |
1161 | |
1131 | |
1162 | /* topShadowColor */ |
1132 | /* topShadowColor */ |
1163 | if (!pix_colors[Color_topShadow].set (this, |
1133 | if (!pix_colors[Color_topShadow].set (this, |
1164 | rgba ( |
1134 | rgba ( |
1165 | min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), |
1135 | min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), |
1166 | min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), |
1136 | min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), |
1167 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
1137 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
1168 | cscroll.a) |
1138 | cscroll.a) |
1169 | )) |
1139 | )) |
1170 | alias_color (Color_topShadow, Color_White); |
1140 | alias_color (Color_topShadow, Color_White); |
1171 | } |
|
|
1172 | #endif |
1141 | #endif |
1173 | |
1142 | |
1174 | #ifdef OFF_FOCUS_FADING |
1143 | #ifdef OFF_FOCUS_FADING |
1175 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
1144 | for (i = 0; i < NRS_COLORS; i++) |
1176 | update_fade_color (i); |
1145 | update_fade_color (i, true); |
1177 | #endif |
1146 | #endif |
1178 | } |
1147 | } |
1179 | |
1148 | |
1180 | /*----------------------------------------------------------------------*/ |
1149 | /*----------------------------------------------------------------------*/ |
1181 | /* color aliases, fg/bg bright-bold */ |
1150 | /* color aliases, fg/bg bright-bold */ |
1182 | void |
1151 | void |
1183 | rxvt_term::color_aliases (int idx) |
1152 | rxvt_term::color_aliases (int idx) |
1184 | { |
1153 | { |
1185 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
1154 | if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx])) |
1186 | { |
1155 | { |
1187 | int i = atoi (rs[Rs_color + idx]); |
1156 | int i = atoi (rs[Rs_color + idx]); |
1188 | |
1157 | |
1189 | if (i >= 8 && i <= 15) |
1158 | if (i >= 8 && i <= 15) |
1190 | /* bright colors */ |
1159 | /* bright colors */ |
… | |
… | |
1230 | for (j = map->max_keypermod; j--; k++) |
1199 | for (j = map->max_keypermod; j--; k++) |
1231 | { |
1200 | { |
1232 | if (kc[k] == 0) |
1201 | if (kc[k] == 0) |
1233 | break; |
1202 | break; |
1234 | |
1203 | |
1235 | switch (XKeycodeToKeysym (dpy, kc[k], 0)) |
1204 | switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0)) |
1236 | { |
1205 | { |
1237 | case XK_Num_Lock: |
1206 | case XK_Num_Lock: |
1238 | ModNumLockMask = modmasks[i - 1]; |
1207 | ModNumLockMask = modmasks[i - 1]; |
1239 | continue; |
1208 | continue; |
1240 | |
1209 | |
… | |
… | |
1285 | } |
1254 | } |
1286 | |
1255 | |
1287 | void |
1256 | void |
1288 | rxvt_term::set_icon (const char *file) |
1257 | rxvt_term::set_icon (const char *file) |
1289 | { |
1258 | { |
1290 | #ifdef HAVE_AFTERIMAGE |
|
|
1291 | init_asv (); |
|
|
1292 | |
|
|
1293 | ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL); |
|
|
1294 | if (!im) |
|
|
1295 | { |
|
|
1296 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
|
|
1297 | return; |
|
|
1298 | } |
|
|
1299 | |
|
|
1300 | unsigned int w = im->width; |
|
|
1301 | unsigned int h = im->height; |
|
|
1302 | |
|
|
1303 | if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383)) |
|
|
1304 | { |
|
|
1305 | rxvt_warn ("Icon image too big, continuing without.\n"); |
|
|
1306 | destroy_asimage (&im); |
|
|
1307 | return; |
|
|
1308 | } |
|
|
1309 | |
|
|
1310 | ASImage *result = scale_asimage (asv, im, |
|
|
1311 | w, h, ASA_ARGB32, |
|
|
1312 | 100, ASIMAGE_QUALITY_DEFAULT); |
|
|
1313 | destroy_asimage (&im); |
|
|
1314 | |
|
|
1315 | if (!result) |
|
|
1316 | { |
|
|
1317 | rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n"); |
|
|
1318 | return; |
|
|
1319 | } |
|
|
1320 | |
|
|
1321 | long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)); |
|
|
1322 | if (buffer) |
|
|
1323 | { |
|
|
1324 | ARGB32 *asbuf = result->alt.argb32; |
|
|
1325 | buffer [0] = w; |
|
|
1326 | buffer [1] = h; |
|
|
1327 | |
|
|
1328 | for (unsigned int i = 0; i < w * h; ++i) |
|
|
1329 | buffer [i + 2] = asbuf [i]; |
|
|
1330 | |
|
|
1331 | XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, |
|
|
1332 | PropModeReplace, (const unsigned char *) buffer, 2 + w * h); |
|
|
1333 | free (buffer); |
|
|
1334 | } |
|
|
1335 | else |
|
|
1336 | rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); |
|
|
1337 | |
|
|
1338 | destroy_asimage (&result); |
|
|
1339 | #endif |
|
|
1340 | |
|
|
1341 | #ifdef HAVE_PIXBUF |
1259 | #if HAVE_PIXBUF |
1342 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1260 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1343 | if (!pixbuf) |
1261 | if (!pixbuf) |
1344 | { |
1262 | { |
1345 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
1263 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
1346 | return; |
1264 | return; |
… | |
… | |
1383 | } |
1301 | } |
1384 | |
1302 | |
1385 | row += rowstride; |
1303 | row += rowstride; |
1386 | } |
1304 | } |
1387 | |
1305 | |
1388 | XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, |
1306 | XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32, |
1389 | PropModeReplace, (const unsigned char *) buffer, 2 + w * h); |
1307 | PropModeReplace, (const unsigned char *) buffer, 2 + w * h); |
1390 | free (buffer); |
1308 | free (buffer); |
1391 | } |
1309 | } |
1392 | else |
1310 | else |
1393 | rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); |
1311 | rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); |
… | |
… | |
1395 | g_object_unref (pixbuf); |
1313 | g_object_unref (pixbuf); |
1396 | #endif |
1314 | #endif |
1397 | } |
1315 | } |
1398 | |
1316 | |
1399 | /*----------------------------------------------------------------------*/ |
1317 | /*----------------------------------------------------------------------*/ |
1400 | /* rxvt_Create_Windows () - Open and map the window */ |
1318 | /* Open and map the window */ |
1401 | void |
1319 | void |
1402 | rxvt_term::create_windows (int argc, const char *const *argv) |
1320 | rxvt_term::create_windows (int argc, const char *const *argv) |
1403 | { |
1321 | { |
1404 | XClassHint classHint; |
1322 | XClassHint classHint; |
1405 | XWMHints wmHint; |
1323 | XWMHints wmHint; |
… | |
… | |
1411 | Window top, parent; |
1329 | Window top, parent; |
1412 | |
1330 | |
1413 | dLocal (Display *, dpy); |
1331 | dLocal (Display *, dpy); |
1414 | |
1332 | |
1415 | /* grab colors before netscape does */ |
1333 | /* grab colors before netscape does */ |
1416 | get_colours (); |
1334 | get_colors (); |
1417 | |
1335 | |
1418 | if (!set_fonts ()) |
1336 | if (!set_fonts ()) |
1419 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
1337 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
1420 | |
1338 | |
1421 | parent = display->root; |
1339 | parent = display->root; |
… | |
… | |
1451 | } |
1369 | } |
1452 | #endif |
1370 | #endif |
1453 | |
1371 | |
1454 | window_calc (0, 0); |
1372 | window_calc (0, 0); |
1455 | |
1373 | |
1456 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
1374 | /* sub-window placement & size in rxvt_term::resize_all_windows () */ |
1457 | attributes.background_pixel = pix_colors_focused [Color_border]; |
1375 | attributes.background_pixel = pix_colors_focused [Color_border]; |
1458 | attributes.border_pixel = pix_colors_focused [Color_border]; |
1376 | attributes.border_pixel = pix_colors_focused [Color_border]; |
1459 | attributes.colormap = cmap; |
1377 | attributes.colormap = cmap; |
1460 | |
1378 | |
1461 | top = XCreateWindow (dpy, parent, |
1379 | top = XCreateWindow (dpy, parent, |
… | |
… | |
1464 | ext_bwidth, |
1382 | ext_bwidth, |
1465 | depth, InputOutput, visual, |
1383 | depth, InputOutput, visual, |
1466 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1384 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1467 | &attributes); |
1385 | &attributes); |
1468 | |
1386 | |
1469 | this->parent[0] = top; |
1387 | this->parent = top; |
1470 | |
|
|
1471 | old_width = szHint.width; |
|
|
1472 | old_height = szHint.height; |
|
|
1473 | |
1388 | |
1474 | set_title (rs [Rs_title]); |
1389 | set_title (rs [Rs_title]); |
1475 | set_icon_name (rs [Rs_iconName]); |
1390 | set_icon_name (rs [Rs_iconName]); |
1476 | |
1391 | |
1477 | classHint.res_name = (char *)rs[Rs_name]; |
1392 | classHint.res_name = (char *)rs[Rs_name]; |
1478 | classHint.res_class = (char *)RESCLASS; |
1393 | classHint.res_class = (char *)RESCLASS; |
1479 | |
1394 | |
1480 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1395 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1481 | wmHint.input = True; |
1396 | wmHint.input = True; |
1482 | wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; |
1397 | wmHint.initial_state = option (Opt_iconic) ? IconicState |
|
|
1398 | : option (Opt_dockapp) ? WithdrawnState |
|
|
1399 | : NormalState; |
1483 | wmHint.window_group = top; |
1400 | wmHint.window_group = top; |
1484 | |
1401 | |
1485 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
1402 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
1486 | &szHint, &wmHint, &classHint); |
1403 | &szHint, &wmHint, &classHint); |
1487 | #if ENABLE_EWMH |
1404 | #if ENABLE_EWMH |
… | |
… | |
1489 | * set up icon hint |
1406 | * set up icon hint |
1490 | * rs [Rs_iconfile] is path to icon |
1407 | * rs [Rs_iconfile] is path to icon |
1491 | */ |
1408 | */ |
1492 | |
1409 | |
1493 | if (rs [Rs_iconfile]) |
1410 | if (rs [Rs_iconfile]) |
1494 | { |
|
|
1495 | set_icon (rs [Rs_iconfile]); |
1411 | set_icon (rs [Rs_iconfile]); |
1496 | } |
|
|
1497 | #endif |
1412 | #endif |
1498 | |
1413 | |
1499 | #if ENABLE_FRILLS |
1414 | #if ENABLE_FRILLS |
1500 | if (mwmhints.flags) |
1415 | if (mwmhints.flags) |
1501 | XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
1416 | XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
… | |
… | |
1507 | #if ENABLE_EWMH |
1422 | #if ENABLE_EWMH |
1508 | xa[XA_NET_WM_PING], |
1423 | xa[XA_NET_WM_PING], |
1509 | #endif |
1424 | #endif |
1510 | }; |
1425 | }; |
1511 | |
1426 | |
1512 | XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1427 | XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols)); |
1513 | |
1428 | |
1514 | #if ENABLE_FRILLS |
1429 | #if ENABLE_FRILLS |
1515 | if (rs[Rs_transient_for]) |
1430 | if (rs[Rs_transient_for]) |
1516 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1431 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1517 | #endif |
1432 | #endif |
… | |
… | |
1540 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1455 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1541 | |
1456 | |
1542 | /* the vt window */ |
1457 | /* the vt window */ |
1543 | vt = XCreateSimpleWindow (dpy, top, |
1458 | vt = XCreateSimpleWindow (dpy, top, |
1544 | window_vt_x, window_vt_y, |
1459 | window_vt_x, window_vt_y, |
1545 | width, height, |
1460 | vt_width, vt_height, |
1546 | 0, |
1461 | 0, |
1547 | pix_colors_focused[Color_fg], |
1462 | pix_colors_focused[Color_fg], |
1548 | pix_colors_focused[Color_bg]); |
1463 | pix_colors_focused[Color_bg]); |
1549 | |
1464 | |
1550 | attributes.bit_gravity = NorthWestGravity; |
1465 | attributes.bit_gravity = NorthWestGravity; |
… | |
… | |
1577 | if (rs[Rs_fade]) |
1492 | if (rs[Rs_fade]) |
1578 | pix_colors = pix_colors_unfocused; |
1493 | pix_colors = pix_colors_unfocused; |
1579 | #endif |
1494 | #endif |
1580 | |
1495 | |
1581 | pointer_unblank (); |
1496 | pointer_unblank (); |
1582 | scr_recolour (); |
1497 | scr_recolor (); |
1583 | } |
1498 | } |
1584 | |
1499 | |
1585 | /*----------------------------------------------------------------------*/ |
1500 | /*----------------------------------------------------------------------*/ |
1586 | /* |
1501 | /* |
1587 | * Run the command in a subprocess and return a file descriptor for the |
1502 | * Run the command in a subprocess and return a file descriptor for the |
… | |
… | |
1599 | if (pty->pty >= 0) |
1514 | if (pty->pty >= 0) |
1600 | { |
1515 | { |
1601 | if (getfd_hook) |
1516 | if (getfd_hook) |
1602 | pty->pty = (*getfd_hook) (pty->pty); |
1517 | pty->pty = (*getfd_hook) (pty->pty); |
1603 | |
1518 | |
1604 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1519 | if (pty->pty < 0) |
1605 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1520 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1606 | } |
1521 | } |
1607 | } |
1522 | } |
1608 | else |
1523 | else |
1609 | #endif |
1524 | #endif |
1610 | if (!pty->get ()) |
1525 | if (!pty->get ()) |
1611 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1526 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
|
|
1527 | |
|
|
1528 | fcntl (pty->pty, F_SETFL, O_NONBLOCK); |
1612 | |
1529 | |
1613 | struct termios tio = def_tio; |
1530 | struct termios tio = def_tio; |
1614 | |
1531 | |
1615 | #ifndef NO_BACKSPACE_KEY |
1532 | #ifndef NO_BACKSPACE_KEY |
1616 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
1533 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
… | |
… | |
1666 | |
1583 | |
1667 | _exit (EXIT_FAILURE); |
1584 | _exit (EXIT_FAILURE); |
1668 | |
1585 | |
1669 | default: |
1586 | default: |
1670 | if (!option (Opt_utmpInhibit)) |
1587 | if (!option (Opt_utmpInhibit)) |
|
|
1588 | { |
|
|
1589 | #ifdef LOG_ONLY_ON_LOGIN |
|
|
1590 | bool login_shell = option (Opt_loginShell); |
|
|
1591 | #else |
|
|
1592 | bool login_shell = true; |
|
|
1593 | #endif |
1671 | pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); |
1594 | pty->login (cmd_pid, login_shell, rs[Rs_display_name]); |
|
|
1595 | } |
1672 | |
1596 | |
1673 | pty->close_tty (); |
1597 | pty->close_tty (); |
1674 | |
1598 | |
1675 | child_ev.start (cmd_pid); |
1599 | child_ev.start (cmd_pid); |
1676 | |
1600 | |
… | |
… | |
1701 | #elif defined (SRIOCSREDIR) |
1625 | #elif defined (SRIOCSREDIR) |
1702 | int fd; |
1626 | int fd; |
1703 | |
1627 | |
1704 | fd = open (CONSOLE, O_WRONLY, 0); |
1628 | fd = open (CONSOLE, O_WRONLY, 0); |
1705 | if (fd >= 0) |
1629 | if (fd >= 0) |
1706 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1630 | { |
|
|
1631 | ioctl (fd, SRIOCSREDIR, STDIN_FILENO); |
1707 | close (fd); |
1632 | close (fd); |
|
|
1633 | } |
1708 | #endif /* SRIOCSREDIR */ |
1634 | #endif /* SRIOCSREDIR */ |
1709 | } |
1635 | } |
1710 | |
1636 | |
1711 | /* reset signals and spin off the command interpreter */ |
1637 | /* reset signals and spin off the command interpreter */ |
1712 | signal (SIGINT, SIG_DFL); |
1638 | signal (SIGINT, SIG_DFL); |