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.272 by sf-exg, Wed Jul 21 23:50:22 2010 UTC vs.
Revision 1.333 by mikachu, Tue Jul 29 13:50:05 2014 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 * 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
78static char * 81static char * ecb_cold
79rxvt_network_display (const char *display) 82rxvt_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;
… …
143 146
144 return rval; 147 return rval;
145} 148}
146#endif 149#endif
147 150
148const char *const def_colorName[] = 151static const char *const def_colorName[] =
149 { 152 {
150 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
152 /* low-intensity colors */ 155 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
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
… …
558 set_option (Opt_iso14755); 561 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 563 set_option (Opt_buffered);
561} 564}
562 565
563static void
564init_secondary ()
565{
566 int i;
567
568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
569 {
570 dup2 (STDERR_FILENO, STDIN_FILENO);
571 }
572 else if (i != STDIN_FILENO)
573 {
574 dup2 (i, STDIN_FILENO);
575 close (i);
576 }
577
578 dup2 (STDERR_FILENO, STDOUT_FILENO);
579}
580
581/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
582const char ** 567const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
584{ 569{
585 int i, r_argc; 570 int i;
586 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
587
588 /*
589 * Look for -e option. Find => split and make cmd_argv[] of command args
590 */
591 for (r_argc = 0; r_argc < argc; r_argc++)
592 if (!strcmp (argv[r_argc], "-e"))
593 break;
594
595 if (r_argc == argc)
596 cmd_argv = NULL;
597 else if (!argv[r_argc + 1])
598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599 else
600 {
601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
602
603 for (i = 0; i < argc - r_argc - 1; i++)
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605
606 cmd_argv[i] = NULL;
607 }
608
609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
610
611 for (i = 0; i < r_argc; i++)
612 r_argv[i] = (const char *)argv[i];
613
614 r_argv[i] = NULL;
615 572
616 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
617 574
618 /* 575 /*
619 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
620 */ 577 */
621 578
622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
624 581
625 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
626 583
627 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
630 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]);
631 }
632 586
633 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
634 xa = display->xa; 588 xa = display->xa;
635 589
636 set (display); 590 set (display);
637 extract_resources (); 591 extract_resources ();
638 592
639#if XFT 593#if ENABLE_FRILLS
640 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
641 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));
642#endif 598#endif
643
644 free (r_argv);
645 599
646 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
648 rs [i] = 0; 602 rs [i] = 0;
649 603
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
654
655#if ENABLE_PERL 604#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
658 607
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 611 {
663 rxvt_perl.init (this); 612 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 614 }
666#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 ();
667 620
668 /* 621 /*
669 * set any defaults not already set 622 * set any defaults not already set
670 */ 623 */
671 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
780 return cmd_argv; 733 return cmd_argv;
781} 734}
782 735
783/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
784void 737void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
786{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
787 this->envv = envv; 744 this->envv = envv;
788 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
789 SET_R (this); 771 SET_R (this);
790 set_locale (""); 772 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
792 774
793 init_vars (); 775 init_vars ();
794
795 init_secondary ();
796 776
797 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
798 778
799#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 780 keyboard->register_done ();
… …
809 if (chdir (path)) 789 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 } 791 }
812 792
813 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 795
816 pty = ptytty::create (); 796 pty = ptytty::create ();
817 797
818 create_windows (argc, argv); 798 create_windows (argc, argv);
819 799
… …
825 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
826#endif 806#endif
827 807
828 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
830#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
831 { 812 bg_init ();
832 bgPixmap.set_target (this);
833 bgPixmap.invalidate ();
834
835#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent))
837 {
838 bgPixmap.set_transparent ();
839
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843#endif
844 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846
847 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]);
849
850 bgPixmap.set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root);
853 }
854#endif
855
856#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ())
871 update_background ();
872 }
873#endif
874 }
875#endif 813#endif
876 814
877#if ENABLE_PERL 815#if ENABLE_PERL
878 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
879#endif 817#endif
880 818
881 set_colorfgbg (); 819 init_done = 1;
882 820
883 init_command (cmd_argv); 821 init_command (cmd_argv);
884
885 free (cmd_argv);
886 822
887 if (pty->pty >= 0) 823 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ); 824 pty_ev.start (pty->pty, ev::READ);
889 825
890 HOOK_INVOKE ((this, HOOK_START, DT_END)); 826 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
892#if ENABLE_XEMBED 828#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 829 if (rs[Rs_embed])
894 { 830 {
895 long info[2] = { 0, XEMBED_MAPPED }; 831 long info[2] = { 0, XEMBED_MAPPED };
896 832
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 833 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 834 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 835 }
900#endif 836#endif
901 837
838#if HAVE_STARTUP_NOTIFICATION
839 SnDisplay *snDisplay;
840 SnLauncheeContext *snContext;
841
842 snDisplay = sn_display_new (dpy, NULL, NULL);
843 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
844
845 /* Tell the window manager that this window is part of the startup context */
846 if (snContext)
847 sn_launchee_context_setup_window (snContext, parent);
848#endif
849
902 XMapWindow (dpy, vt); 850 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 851 XMapWindow (dpy, parent);
852
853#if HAVE_STARTUP_NOTIFICATION
854 if (snContext)
855 {
856 /* Mark the startup process as complete */
857 sn_launchee_context_complete (snContext);
858
859 sn_launchee_context_unref (snContext);
860 }
861
862 sn_display_unref (snDisplay);
863#endif
904 864
905 refresh_check (); 865 refresh_check ();
906} 866}
907 867
908/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
909void 869void
910rxvt_term::init_env () 870rxvt_term::init_env ()
911{ 871{
912 int i;
913 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
914 877
915#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
918 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
931 val = XDisplayString (dpy); 894 val = XDisplayString (dpy);
932 895
933 if (rs[Rs_display_name] == NULL) 896 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 897 rs[Rs_display_name] = val; /* use broken `:0' value */
935 898
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 900
939 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
940 902
903 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 905
943 /* add entries to the environment: 906 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 909 * @ COLORTERM: terminal sub-name and also indicates its color
… …
949 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
950 */ 913 */
951 putenv (env_display); 914 putenv (env_display);
952 putenv (env_windowid); 915 putenv (env_windowid);
953 916
954 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
956 919
957#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 922#endif
960 923
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
981} 944}
982 945
983/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 947void
989rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
990{ 949{
991 set_environ (envv); 950 set_environ (envv);
992 951
993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
994 free (this->locale); 952 free (this->locale);
995 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
996 954
997 if (!this->locale) 955 if (!this->locale)
998 { 956 {
… …
1009 967
1010 968
1011 this->locale = strdup (this->locale); 969 this->locale = strdup (this->locale);
1012 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
1013 mbstate.reset (); 971 mbstate.reset ();
1014#endif
1015 972
1016#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 975 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 980#else
1025 enc_utf8 = 0; 981 enc_utf8 = 0;
1026#endif 982#endif
1027} 983}
1028 984
1029void 985void
1030rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1031{ 987{
1032 set_environ (envv); 988 set_environ (envv);
1033 989
1034#ifdef USE_XIM 990#if USE_XIM
1035 if (!locale) 991 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 993 else
1038 { 994 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 996
1041 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
1042 { 998 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1000 return;
1045 } 1001 }
1046 1002
1047 im_ev.start (display); 1003 im_ev.start (display);
1048 1004
… …
1197/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
1199void 1155void
1200rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
1201{ 1157{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1159 {
1204 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
1205 1161
1206 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1163 /* bright colors */
… …
1299 1255
1300 if (i) 1256 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1257 ModMetaMask = modmasks[i - 1];
1302} 1258}
1303 1259
1260void
1261rxvt_term::set_icon (const char *file)
1262{
1263#if HAVE_PIXBUF
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf)
1266 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return;
1269 }
1270
1271 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1272 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1273
1274 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1275 {
1276 rxvt_warn ("Icon image too big, continuing without.\n");
1277 g_object_unref (pixbuf);
1278 return;
1279 }
1280
1281 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1282 {
1283 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1284 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1285 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1286
1287 buffer [0] = w;
1288 buffer [1] = h;
1289 for (int i = 0; i < h; i++)
1290 {
1291 for (int j = 0; j < w; j++)
1292 {
1293 unsigned char *pixel = row + j * channels;
1294 long value;
1295
1296 if (channels == 4)
1297 value = pixel[3];
1298 else
1299 value = (unsigned char)0x00ff;
1300
1301 value = (value << 8) + pixel[0];
1302 value = (value << 8) + pixel[1];
1303 value = (value << 8) + pixel[2];
1304 buffer[(i * w + j) + 2] = value;
1305 }
1306
1307 row += rowstride;
1308 }
1309
1310 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1311 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1312 free (buffer);
1313 }
1314 else
1315 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1316
1317 g_object_unref (pixbuf);
1318#endif
1319}
1320
1304/*----------------------------------------------------------------------*/ 1321/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1322/* Open and map the window */
1306void 1323void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1324rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1325{
1309 XClassHint classHint; 1326 XClassHint classHint;
1310 XWMHints wmHint; 1327 XWMHints wmHint;
… …
1356 } 1373 }
1357#endif 1374#endif
1358 1375
1359 window_calc (0, 0); 1376 window_calc (0, 0);
1360 1377
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1378 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1379 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1380 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1381 attributes.colormap = cmap;
1365 1382
1366 top = XCreateWindow (dpy, parent, 1383 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1386 ext_bwidth,
1370 depth, InputOutput, visual, 1387 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1389 &attributes);
1373 1390
1374 this->parent[0] = top; 1391 this->parent = top;
1375
1376 old_width = szHint.width;
1377 old_height = szHint.height;
1378 1392
1379 set_title (rs [Rs_title]); 1393 set_title (rs [Rs_title]);
1380 set_icon_name (rs [Rs_iconName]); 1394 set_icon_name (rs [Rs_iconName]);
1381 1395
1382 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1383 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
1384 1398
1385 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1386 wmHint.input = True; 1400 wmHint.input = True;
1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState
1402 : option (Opt_dockapp) ? WithdrawnState
1403 : NormalState;
1388 wmHint.window_group = top; 1404 wmHint.window_group = top;
1389 1405
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1406 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1407 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1408#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1409 /*
1395 * set up icon hint 1410 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1411 * rs [Rs_iconfile] is path to icon
1397 */ 1412 */
1398 1413
1399 if (rs [Rs_iconfile]) 1414 if (rs [Rs_iconfile])
1400 { 1415 set_icon (rs [Rs_iconfile]);
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif 1416#endif
1442 1417
1443#if ENABLE_FRILLS 1418#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1419 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1426#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1427 xa[XA_NET_WM_PING],
1453#endif 1428#endif
1454 }; 1429 };
1455 1430
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1431 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1432
1458#if ENABLE_FRILLS 1433#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1434 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1435 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1436#endif
… …
1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1485 1460
1486 /* the vt window */ 1461 /* the vt window */
1487 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1488 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1489 width, height, 1464 vt_width, vt_height,
1490 0, 1465 0,
1491 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1492 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1493 1468
1494 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1522 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1523#endif 1498#endif
1524 1499
1525 pointer_unblank (); 1500 pointer_unblank ();
1526 scr_recolour (); 1501 scr_recolour ();
1527}
1528
1529/* ------------------------------------------------------------------------- *
1530 * GET TTY CURRENT STATE *
1531 * ------------------------------------------------------------------------- */
1532static void
1533rxvt_get_ttymode (struct termios *tio)
1534{
1535 /*
1536 * standard System V termios interface
1537 */
1538 // does not work as stdin is not a tty
1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1541 {
1542 // return error - use system defaults,
1543 // where possible, and zero elsewhere
1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1548
1549 tio->c_cc[VINTR] = CINTR;
1550 tio->c_cc[VQUIT] = CQUIT;
1551 tio->c_cc[VERASE] = CERASE;
1552#ifdef VERASE2
1553 tio->c_cc[VERASE2] = CERASE2;
1554#endif
1555 tio->c_cc[VKILL] = CKILL;
1556 tio->c_cc[VSTART] = CSTART;
1557 tio->c_cc[VSTOP] = CSTOP;
1558 tio->c_cc[VSUSP] = CSUSP;
1559# ifdef VDSUSP
1560 tio->c_cc[VDSUSP] = CDSUSP;
1561# endif
1562# ifdef VREPRINT
1563 tio->c_cc[VREPRINT] = CRPRNT;
1564# endif
1565# ifdef VDISCRD
1566 tio->c_cc[VDISCRD] = CFLUSH;
1567# endif
1568# ifdef VWERSE
1569 tio->c_cc[VWERSE] = CWERASE;
1570# endif
1571# ifdef VLNEXT
1572 tio->c_cc[VLNEXT] = CLNEXT;
1573# endif
1574 }
1575
1576 tio->c_cc[VEOF] = CEOF;
1577# if VMIN != VEOF
1578 tio->c_cc[VMIN] = 1;
1579# endif
1580# if VTIME != VEOL
1581 tio->c_cc[VTIME] = 0;
1582# endif
1583
1584 /* input modes */
1585 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1586# ifdef IMAXBEL
1587 | IMAXBEL
1588# endif
1589 | IXON);
1590
1591 /* output modes */
1592 tio->c_oflag = (OPOST | ONLCR);
1593
1594 /* control modes */
1595 tio->c_cflag = (CS8 | CREAD);
1596
1597 /* line discipline modes */
1598 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1599# if defined (ECHOCTL) && defined (ECHOKE)
1600 | ECHOCTL | ECHOKE
1601# endif
1602 | ECHOE | ECHOK);
1603
1604 /*
1605 * Debugging
1606 */
1607#ifdef DEBUG_TTYMODE
1608 /* c_iflag bits */
1609 fprintf (stderr, "Input flags\n");
1610
1611 /* cpp token stringize doesn't work on all machines <sigh> */
1612# define FOO(flag,name) \
1613 if ((tio->c_iflag) & flag) \
1614 fprintf (stderr, "%s ", name)
1615
1616 /* c_iflag bits */
1617 FOO (IGNBRK, "IGNBRK");
1618 FOO (BRKINT, "BRKINT");
1619 FOO (IGNPAR, "IGNPAR");
1620 FOO (PARMRK, "PARMRK");
1621 FOO (INPCK, "INPCK");
1622 FOO (ISTRIP, "ISTRIP");
1623 FOO (INLCR, "INLCR");
1624 FOO (IGNCR, "IGNCR");
1625 FOO (ICRNL, "ICRNL");
1626 FOO (IXON, "IXON");
1627 FOO (IXOFF, "IXOFF");
1628# ifdef IUCLC
1629 FOO (IUCLC, "IUCLC");
1630# endif
1631# ifdef IXANY
1632 FOO (IXANY, "IXANY");
1633# endif
1634# ifdef IMAXBEL
1635 FOO (IMAXBEL, "IMAXBEL");
1636# endif
1637
1638 fprintf (stderr, "\n");
1639
1640# undef FOO
1641# define FOO(entry, name) \
1642 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1643
1644 FOO (VINTR, "VINTR");
1645 FOO (VQUIT, "VQUIT");
1646 FOO (VERASE, "VERASE");
1647 FOO (VKILL, "VKILL");
1648 FOO (VEOF, "VEOF");
1649 FOO (VEOL, "VEOL");
1650# ifdef VEOL2
1651 FOO (VEOL2, "VEOL2");
1652# endif
1653# ifdef VSWTC
1654 FOO (VSWTC, "VSWTC");
1655# endif
1656# ifdef VSWTCH
1657 FOO (VSWTCH, "VSWTCH");
1658# endif
1659 FOO (VSTART, "VSTART");
1660 FOO (VSTOP, "VSTOP");
1661 FOO (VSUSP, "VSUSP");
1662# ifdef VDSUSP
1663 FOO (VDSUSP, "VDSUSP");
1664# endif
1665# ifdef VREPRINT
1666 FOO (VREPRINT, "VREPRINT");
1667# endif
1668# ifdef VDISCRD
1669 FOO (VDISCRD, "VDISCRD");
1670# endif
1671# ifdef VWERSE
1672 FOO (VWERSE, "VWERSE");
1673# endif
1674# ifdef VLNEXT
1675 FOO (VLNEXT, "VLNEXT");
1676# endif
1677
1678 fprintf (stderr, "\n");
1679# undef FOO
1680#endif /* DEBUG_TTYMODE */
1681} 1502}
1682 1503
1683/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1684/* 1505/*
1685 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the
… …
1697 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1698 { 1519 {
1699 if (getfd_hook) 1520 if (getfd_hook)
1700 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1701 1522
1702 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1703 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1704 } 1525 }
1705 } 1526 }
1706 else 1527 else
1707#endif 1528#endif
1708 if (!pty->get ()) 1529 if (!pty->get ())
1709 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1710 1531
1711 rxvt_get_ttymode (&tio); 1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1533
1534 struct termios tio = def_tio;
1712 1535
1713#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1714 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1715 tio.c_cc[VERASE] = rs[Rs_backspace_key][0]; 1538 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1716 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1539 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
… …
1764 1587
1765 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1766 1589
1767 default: 1590 default:
1768 if (!option (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1769 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1770 1600
1771 pty->close_tty (); 1601 pty->close_tty ();
1772 1602
1773 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1774 1604
… …
1799#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1800 int fd; 1630 int fd;
1801 1631
1802 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1803 if (fd >= 0) 1633 if (fd >= 0)
1804 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1805 close (fd); 1636 close (fd);
1637 }
1806#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1807 } 1639 }
1808 1640
1809 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1810 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);

Diff Legend

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