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.263 by sf-exg, Thu Apr 1 00:12:33 2010 UTC vs.
Revision 1.321 by sf-exg, Sat Feb 4 21:47:06 2012 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 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
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>
… …
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)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 181
179#ifndef USE_256_COLORS 182#if !USE_256_COLORS
180 // 88 xterm colours 183 // 88 xterm colours
181 "rgb:00/00/00", 184 "rgb:00/00/00",
182 "rgb:00/00/8b", 185 "rgb:00/00/8b",
183 "rgb:00/00/cd", 186 "rgb:00/00/cd",
184 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
510#if ENABLE_FRILLS 513#if ENABLE_FRILLS
511 NULL, // Color_underline 514 NULL, // Color_underline
512#endif 515#endif
513#ifdef OPTION_HC 516#ifdef OPTION_HC
514 NULL, 517 NULL,
518 NULL,
515#endif 519#endif
516 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
517#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
518 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
519#endif 523#endif
… …
557 set_option (Opt_iso14755); 561 set_option (Opt_iso14755);
558 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
559 set_option (Opt_buffered); 563 set_option (Opt_buffered);
560} 564}
561 565
562static void
563init_secondary ()
564{
565 int i;
566
567 if ((i = open ("/dev/null", O_RDONLY)) < 0)
568 {
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 }
571 else if (i != STDIN_FILENO)
572 {
573 dup2 (i, STDIN_FILENO);
574 close (i);
575 }
576
577 dup2 (STDERR_FILENO, STDOUT_FILENO);
578}
579
580/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
581const char ** 567const char **
582rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
583{ 569{
584 int i, r_argc; 570 int i;
585 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
586
587 /*
588 * Look for -e option. Find => split and make cmd_argv[] of command args
589 */
590 for (r_argc = 0; r_argc < argc; r_argc++)
591 if (!strcmp (argv[r_argc], "-e"))
592 break;
593
594 if (r_argc == argc)
595 cmd_argv = NULL;
596 else if (!argv[r_argc + 1])
597 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
598 else
599 {
600 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
601
602 for (i = 0; i < argc - r_argc - 1; i++)
603 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
604
605 cmd_argv[i] = NULL;
606 }
607
608 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
609
610 for (i = 0; i < r_argc; i++)
611 r_argv[i] = (const char *)argv[i];
612
613 r_argv[i] = NULL;
614 572
615 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
616 574
617 /* 575 /*
618 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
619 */ 577 */
620 578
621 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
622 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
623 581
624 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
625 583
626 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
627 {
628 free (r_argv);
629 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]);
630 }
631 586
632 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
633 xa = display->xa; 588 xa = display->xa;
634 589
635 set (display); 590 set (display);
… …
638#if XFT 593#if XFT
639 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
640 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
641#endif 596#endif
642 597
643 free (r_argv);
644
645 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
646 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
647 rs [i] = 0; 600 rs [i] = 0;
648 601
649#ifdef HAVE_AFTERIMAGE
650 set_application_name ((char *)rs[Rs_name]);
651 set_output_threshold (OUTPUT_LEVEL_WARNING);
652#endif
653
654#if ENABLE_PERL 602#if ENABLE_PERL
655 if (!rs[Rs_perl_ext_1]) 603 if (!rs[Rs_perl_ext_1])
656 rs[Rs_perl_ext_1] = "default"; 604 rs[Rs_perl_ext_1] = "default";
657 605
658 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
661 { 609 {
662 rxvt_perl.init (this); 610 rxvt_perl.init (this);
663 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
664 } 612 }
665#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 ();
666 618
667 /* 619 /*
668 * set any defaults not already set 620 * set any defaults not already set
669 */ 621 */
670 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
779 return cmd_argv; 731 return cmd_argv;
780} 732}
781 733
782/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
783void 735void
784rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
785{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
786 this->envv = envv; 742 this->envv = envv;
787 743
744 init2 (argv->size () - 1, argv->begin ());
745}
746
747void
748rxvt_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
766void
767rxvt_term::init2 (int argc, const char *const *argv)
768{
788 SET_R (this); 769 SET_R (this);
789 set_locale (""); 770 set_locale ("");
790 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 :(
791 772
792 init_vars (); 773 init_vars ();
793
794 init_secondary ();
795 774
796 const char **cmd_argv = init_resources (argc, argv); 775 const char **cmd_argv = init_resources (argc, argv);
797 776
798#ifdef KEYSYM_RESOURCE 777#ifdef KEYSYM_RESOURCE
799 keyboard->register_done (); 778 keyboard->register_done ();
… …
808 if (chdir (path)) 787 if (chdir (path))
809 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");
810 } 789 }
811 790
812 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
813 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
814 793
815 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
816 800
817 create_windows (argc, argv); 801 create_windows (argc, argv);
818 802
819 init_xlocale (); 803 init_xlocale ();
820 804
… …
826 810
827 if (option (Opt_scrollBar)) 811 if (option (Opt_scrollBar))
828 scrollBar.resize (); /* create and map scrollbar */ 812 scrollBar.resize (); /* create and map scrollbar */
829#ifdef HAVE_BG_PIXMAP 813#ifdef HAVE_BG_PIXMAP
830 { 814 {
831 bgPixmap.set_target (this); 815 bg_init ();
832 bgPixmap.invalidate ();
833 816
834#ifdef ENABLE_TRANSPARENCY 817#ifdef ENABLE_TRANSPARENCY
835 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
836 { 819 {
837 bgPixmap.set_transparent (); 820 bg_set_transparent ();
838 821
839#ifdef HAVE_AFTERIMAGE
840 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
841 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 823 bg_set_blur (rs [Rs_blurradius]);
842#endif 824
843 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
844 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 826 bg_set_tint (pix_colors_focused [Color_tint]);
845 827
846 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
847 bgPixmap.set_shade (rs [Rs_shade]); 829 bg_set_shade (rs [Rs_shade]);
848 830
849 bgPixmap.set_root_pixmap (); 831 bg_set_root_pixmap ();
850 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
851 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
852 } 834 }
853#endif 835#endif
854 836
855#ifdef BG_IMAGE_FROM_FILE 837#ifdef BG_IMAGE_FROM_FILE
856 if (rs[Rs_backgroundPixmap]) 838 if (rs[Rs_backgroundPixmap])
857 {
858 const char *p = rs[Rs_backgroundPixmap];
859
860 if ((p = strchr (p, ';')) != 0)
861 {
862 p++;
863 bgPixmap.set_geometry (p);
864 }
865 else
866 bgPixmap.set_defaultGeometry ();
867
868 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 839 if (bg_set_file (rs[Rs_backgroundPixmap]))
869 if (!bgPixmap.window_position_sensitive ()) 840 if (!bg_window_position_sensitive ())
870 update_background (); 841 update_background ();
871 }
872#endif 842#endif
873 } 843 }
874#endif 844#endif
875 845
876#if ENABLE_PERL 846#if ENABLE_PERL
877 rootwin_ev.start (display, display->root); 847 rootwin_ev.start (display, display->root);
878#endif 848#endif
879 849
880 set_colorfgbg (); 850 init_done = 1;
881 851
882 init_command (cmd_argv); 852 init_command (cmd_argv);
883
884 free (cmd_argv);
885 853
886 if (pty->pty >= 0) 854 if (pty->pty >= 0)
887 pty_ev.start (pty->pty, ev::READ); 855 pty_ev.start (pty->pty, ev::READ);
888 856
889 HOOK_INVOKE ((this, HOOK_START, DT_END)); 857 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
891#if ENABLE_XEMBED 859#if ENABLE_XEMBED
892 if (rs[Rs_embed]) 860 if (rs[Rs_embed])
893 { 861 {
894 long info[2] = { 0, XEMBED_MAPPED }; 862 long info[2] = { 0, XEMBED_MAPPED };
895 863
896 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 864 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
897 32, PropModeReplace, (unsigned char *)&info, 2); 865 32, PropModeReplace, (unsigned char *)&info, 2);
898 } 866 }
899#endif 867#endif
900 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
901 XMapWindow (dpy, vt); 881 XMapWindow (dpy, vt);
902 XMapWindow (dpy, parent[0]); 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
903 895
904 refresh_check (); 896 refresh_check ();
905} 897}
906 898
907/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
908void 900void
909rxvt_term::init_env () 901rxvt_term::init_env ()
910{ 902{
911 int i;
912 char *val; 903 char *val;
904 char *env_display;
905 char *env_windowid;
906 char *env_colorfgbg;
907 char *env_term;
913 908
914#ifdef DISPLAY_IS_IP 909#ifdef DISPLAY_IS_IP
915 /* Fixup display_name for export over pty to any interested terminal 910 /* Fixup display_name for export over pty to any interested terminal
916 * 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
917 * (for the first non-loopback interface) that we get from 912 * (for the first non-loopback interface) that we get from
… …
930 val = XDisplayString (dpy); 925 val = XDisplayString (dpy);
931 926
932 if (rs[Rs_display_name] == NULL) 927 if (rs[Rs_display_name] == NULL)
933 rs[Rs_display_name] = val; /* use broken `:0' value */ 928 rs[Rs_display_name] = val; /* use broken `:0' value */
934 929
935 i = strlen (val);
936 env_display = (char *)rxvt_malloc (i + 9); 930 env_display = (char *)rxvt_malloc (strlen (val) + 9);
937 931
938 sprintf (env_display, "DISPLAY=%s", val); 932 sprintf (env_display, "DISPLAY=%s", val);
939 933
934 env_windowid = (char *)rxvt_malloc (21);
940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 935 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
941 936
942 /* add entries to the environment: 937 /* add entries to the environment:
943 * @ DISPLAY: in case we started with -display 938 * @ DISPLAY: in case we started with -display
944 * @ WINDOWID: X window id number of the window 939 * @ WINDOWID: X window id number of the window
945 * @ COLORTERM: terminal sub-name and also indicates its color 940 * @ COLORTERM: terminal sub-name and also indicates its color
… …
948 * @ COLORFGBG: fg;bg color codes 943 * @ COLORFGBG: fg;bg color codes
949 */ 944 */
950 putenv (env_display); 945 putenv (env_display);
951 putenv (env_windowid); 946 putenv (env_windowid);
952 947
953 if (env_colorfgbg) 948 env_colorfgbg = get_colorfgbg ();
954 putenv (env_colorfgbg); 949 putenv (env_colorfgbg);
955 950
956#ifdef RXVT_TERMINFO 951#ifdef RXVT_TERMINFO
957 putenv ("TERMINFO=" RXVT_TERMINFO); 952 putenv ("TERMINFO=" RXVT_TERMINFO);
958#endif 953#endif
959 954
… …
978 unsetenv ("TERMCAP"); /* terminfo should be okay */ 973 unsetenv ("TERMCAP"); /* terminfo should be okay */
979#endif /* HAVE_UNSETENV */ 974#endif /* HAVE_UNSETENV */
980} 975}
981 976
982/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
983/*
984 * This is more or less stolen straight from XFree86 xterm.
985 * This should support all European type languages.
986 */
987void 978void
988rxvt_term::set_locale (const char *locale) 979rxvt_term::set_locale (const char *locale)
989{ 980{
990 set_environ (envv); 981 set_environ (envv);
991 982
992#if HAVE_XSETLOCALE || HAVE_SETLOCALE
993 free (this->locale); 983 free (this->locale);
994 this->locale = setlocale (LC_CTYPE, locale); 984 this->locale = setlocale (LC_CTYPE, locale);
995 985
996 if (!this->locale) 986 if (!this->locale)
997 { 987 {
… …
1008 998
1009 999
1010 this->locale = strdup (this->locale); 1000 this->locale = strdup (this->locale);
1011 SET_LOCALE (this->locale); 1001 SET_LOCALE (this->locale);
1012 mbstate.reset (); 1002 mbstate.reset ();
1013#endif
1014 1003
1015#if HAVE_NL_LANGINFO 1004#if HAVE_NL_LANGINFO
1016 char *codeset = strdup (nl_langinfo (CODESET)); 1005 char *codeset = nl_langinfo (CODESET);
1017 // /^UTF.?8/i 1006 // /^UTF.?8/i
1018 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1007 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1019 && (codeset[1] == 'T' || codeset[1] == 't') 1008 && (codeset[1] == 'T' || codeset[1] == 't')
1020 && (codeset[2] == 'F' || codeset[2] == 'f') 1009 && (codeset[2] == 'F' || codeset[2] == 'f')
1021 && (codeset[3] == '8' || codeset[4] == '8'); 1010 && (codeset[3] == '8' || codeset[4] == '8');
1022 free (codeset);
1023#else 1011#else
1024 enc_utf8 = 0; 1012 enc_utf8 = 0;
1025#endif 1013#endif
1026} 1014}
1027 1015
… …
1030{ 1018{
1031 set_environ (envv); 1019 set_environ (envv);
1032 1020
1033#ifdef USE_XIM 1021#ifdef USE_XIM
1034 if (!locale) 1022 if (!locale)
1035 rxvt_warn ("setting locale failed, working without locale support.\n"); 1023 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1036 else 1024 else
1037 { 1025 {
1038 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1026 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1039 1027
1040 if (!XSupportsLocale ()) 1028 if (!XSupportsLocale ())
1041 { 1029 {
1042 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");
1043 return; 1031 return;
1044 } 1032 }
1045 1033
1046 im_ev.start (display); 1034 im_ev.start (display);
1047 1035
… …
1196/*----------------------------------------------------------------------*/ 1184/*----------------------------------------------------------------------*/
1197/* color aliases, fg/bg bright-bold */ 1185/* color aliases, fg/bg bright-bold */
1198void 1186void
1199rxvt_term::color_aliases (int idx) 1187rxvt_term::color_aliases (int idx)
1200{ 1188{
1201 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1189 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1202 { 1190 {
1203 int i = atoi (rs[Rs_color + idx]); 1191 int i = atoi (rs[Rs_color + idx]);
1204 1192
1205 if (i >= 8 && i <= 15) 1193 if (i >= 8 && i <= 15)
1206 /* bright colors */ 1194 /* bright colors */
… …
1298 1286
1299 if (i) 1287 if (i)
1300 ModMetaMask = modmasks[i - 1]; 1288 ModMetaMask = modmasks[i - 1];
1301} 1289}
1302 1290
1291void
1292rxvt_term::set_icon (const char *file)
1293{
1294#ifdef HAVE_PIXBUF
1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1296 if (!pixbuf)
1297 {
1298 rxvt_warn ("Loading image icon failed, continuing without.\n");
1299 return;
1300 }
1301
1302 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1303 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1304
1305 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1306 {
1307 rxvt_warn ("Icon image too big, continuing without.\n");
1308 g_object_unref (pixbuf);
1309 return;
1310 }
1311
1312 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1313 {
1314 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1315 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1316 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1317
1318 buffer [0] = w;
1319 buffer [1] = h;
1320 for (int i = 0; i < h; i++)
1321 {
1322 for (int j = 0; j < w; j++)
1323 {
1324 unsigned char *pixel = row + j * channels;
1325 long value;
1326
1327 if (channels == 4)
1328 value = pixel[3];
1329 else
1330 value = (unsigned char)0x00ff;
1331
1332 value = (value << 8) + pixel[0];
1333 value = (value << 8) + pixel[1];
1334 value = (value << 8) + pixel[2];
1335 buffer[(i * w + j) + 2] = value;
1336 }
1337
1338 row += rowstride;
1339 }
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 g_object_unref (pixbuf);
1349#endif
1350}
1351
1303/*----------------------------------------------------------------------*/ 1352/*----------------------------------------------------------------------*/
1304/* rxvt_Create_Windows () - Open and map the window */ 1353/* Open and map the window */
1305void 1354void
1306rxvt_term::create_windows (int argc, const char *const *argv) 1355rxvt_term::create_windows (int argc, const char *const *argv)
1307{ 1356{
1308 XClassHint classHint; 1357 XClassHint classHint;
1309 XWMHints wmHint; 1358 XWMHints wmHint;
… …
1355 } 1404 }
1356#endif 1405#endif
1357 1406
1358 window_calc (0, 0); 1407 window_calc (0, 0);
1359 1408
1360 /* sub-window placement & size in rxvt_resize_subwindows () */ 1409 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1361 attributes.background_pixel = pix_colors_focused [Color_border]; 1410 attributes.background_pixel = pix_colors_focused [Color_border];
1362 attributes.border_pixel = pix_colors_focused [Color_border]; 1411 attributes.border_pixel = pix_colors_focused [Color_border];
1363 attributes.colormap = cmap; 1412 attributes.colormap = cmap;
1364 1413
1365 top = XCreateWindow (dpy, parent, 1414 top = XCreateWindow (dpy, parent,
… …
1368 ext_bwidth, 1417 ext_bwidth,
1369 depth, InputOutput, visual, 1418 depth, InputOutput, visual,
1370 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1419 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1371 &attributes); 1420 &attributes);
1372 1421
1373 this->parent[0] = top; 1422 this->parent = top;
1374
1375 old_width = szHint.width;
1376 old_height = szHint.height;
1377 1423
1378 set_title (rs [Rs_title]); 1424 set_title (rs [Rs_title]);
1379 set_icon_name (rs [Rs_iconName]); 1425 set_icon_name (rs [Rs_iconName]);
1380 1426
1381 classHint.res_name = (char *)rs[Rs_name]; 1427 classHint.res_name = (char *)rs[Rs_name];
… …
1387 wmHint.window_group = top; 1433 wmHint.window_group = top;
1388 1434
1389 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1435 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1390 &szHint, &wmHint, &classHint); 1436 &szHint, &wmHint, &classHint);
1391#if ENABLE_EWMH 1437#if ENABLE_EWMH
1392# ifdef HAVE_AFTERIMAGE
1393 /* 1438 /*
1394 * set up icon hint 1439 * set up icon hint
1395 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1440 * rs [Rs_iconfile] is path to icon
1396 */ 1441 */
1397 1442
1398 if (rs [Rs_iconfile]) 1443 if (rs [Rs_iconfile])
1399 { 1444 {
1400 init_asv (); 1445 set_icon (rs [Rs_iconfile]);
1401
1402 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1403 if (asv && im)
1404 {
1405 int w = im->width;
1406 int h = im->height;
1407 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1408 ASImage *result = scale_asimage (asv, im,
1409 w, h, ASA_ARGB32,
1410 100, ASIMAGE_QUALITY_DEFAULT);
1411 destroy_asimage (&im);
1412
1413 if (buffer && result)
1414 {
1415 ARGB32 *asbuf = result->alt.argb32;
1416 buffer [0] = w;
1417 buffer [1] = h;
1418
1419 for (unsigned int i = 0; i < w * h; ++i)
1420 buffer [i + 2] = asbuf [i];
1421
1422 destroy_asimage (&result);
1423 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1424 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1425 free (buffer);
1426 }
1427 else
1428 {
1429 if (!buffer)
1430 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1431
1432 if (!result)
1433 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1434 }
1435 }
1436 else
1437 rxvt_warn ("Loading image icon failed, continuing without.\n");
1438 } 1446 }
1439# endif
1440#endif 1447#endif
1441 1448
1442#if ENABLE_FRILLS 1449#if ENABLE_FRILLS
1443 if (mwmhints.flags) 1450 if (mwmhints.flags)
1444 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1451 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1450#if ENABLE_EWMH 1457#if ENABLE_EWMH
1451 xa[XA_NET_WM_PING], 1458 xa[XA_NET_WM_PING],
1452#endif 1459#endif
1453 }; 1460 };
1454 1461
1455 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1462 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1456 1463
1457#if ENABLE_FRILLS 1464#if ENABLE_FRILLS
1458 if (rs[Rs_transient_for]) 1465 if (rs[Rs_transient_for])
1459 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1466 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1460#endif 1467#endif
… …
1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1490 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1484 1491
1485 /* the vt window */ 1492 /* the vt window */
1486 vt = XCreateSimpleWindow (dpy, top, 1493 vt = XCreateSimpleWindow (dpy, top,
1487 window_vt_x, window_vt_y, 1494 window_vt_x, window_vt_y,
1488 width, height, 1495 vt_width, vt_height,
1489 0, 1496 0,
1490 pix_colors_focused[Color_fg], 1497 pix_colors_focused[Color_fg],
1491 pix_colors_focused[Color_bg]); 1498 pix_colors_focused[Color_bg]);
1492 1499
1493 attributes.bit_gravity = NorthWestGravity; 1500 attributes.bit_gravity = NorthWestGravity;
… …
1521 pix_colors = pix_colors_unfocused; 1528 pix_colors = pix_colors_unfocused;
1522#endif 1529#endif
1523 1530
1524 pointer_unblank (); 1531 pointer_unblank ();
1525 scr_recolour (); 1532 scr_recolour ();
1526}
1527
1528/* ------------------------------------------------------------------------- *
1529 * GET TTY CURRENT STATE *
1530 * ------------------------------------------------------------------------- */
1531void
1532rxvt_get_ttymode (struct termios *tio, int erase)
1533{
1534 /*
1535 * standard System V termios interface
1536 */
1537 if (tcgetattr (STDIN_FILENO, tio) < 0)
1538 {
1539 // return error - use system defaults,
1540 // where possible, and zero elsewhere
1541 memset (tio, 0, sizeof (struct termios));
1542
1543 tio->c_cc[VINTR] = CINTR;
1544 tio->c_cc[VQUIT] = CQUIT;
1545 tio->c_cc[VERASE] = CERASE;
1546#ifdef VERASE2
1547 tio->c_cc[VERASE2] = CERASE2;
1548#endif
1549 tio->c_cc[VKILL] = CKILL;
1550 tio->c_cc[VSTART] = CSTART;
1551 tio->c_cc[VSTOP] = CSTOP;
1552 tio->c_cc[VSUSP] = CSUSP;
1553# ifdef VDSUSP
1554 tio->c_cc[VDSUSP] = CDSUSP;
1555# endif
1556# ifdef VREPRINT
1557 tio->c_cc[VREPRINT] = CRPRNT;
1558# endif
1559# ifdef VDISCRD
1560 tio->c_cc[VDISCRD] = CFLUSH;
1561# endif
1562# ifdef VWERSE
1563 tio->c_cc[VWERSE] = CWERASE;
1564# endif
1565# ifdef VLNEXT
1566 tio->c_cc[VLNEXT] = CLNEXT;
1567# endif
1568 }
1569
1570 tio->c_cc[VEOF] = CEOF;
1571 tio->c_cc[VEOL] = VDISABLE;
1572# ifdef VEOL2
1573 tio->c_cc[VEOL2] = VDISABLE;
1574# endif
1575# ifdef VSWTC
1576 tio->c_cc[VSWTC] = VDISABLE;
1577# endif
1578# ifdef VSWTCH
1579 tio->c_cc[VSWTCH] = VDISABLE;
1580# endif
1581# if VMIN != VEOF
1582 tio->c_cc[VMIN] = 1;
1583# endif
1584# if VTIME != VEOL
1585 tio->c_cc[VTIME] = 0;
1586# endif
1587
1588 if (erase != -1)
1589 tio->c_cc[VERASE] = (char)erase;
1590
1591 /* input modes */
1592 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1593# ifdef IMAXBEL
1594 | IMAXBEL
1595# endif
1596 | IXON);
1597
1598 /* output modes */
1599 tio->c_oflag = (OPOST | ONLCR);
1600
1601 /* control modes */
1602 tio->c_cflag = (CS8 | CREAD);
1603
1604 /* line discipline modes */
1605 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1606# if defined (ECHOCTL) && defined (ECHOKE)
1607 | ECHOCTL | ECHOKE
1608# endif
1609 | ECHOE | ECHOK);
1610
1611 /*
1612 * Debugging
1613 */
1614#ifdef DEBUG_TTYMODE
1615 /* c_iflag bits */
1616 fprintf (stderr, "Input flags\n");
1617
1618 /* cpp token stringize doesn't work on all machines <sigh> */
1619# define FOO(flag,name) \
1620 if ((tio->c_iflag) & flag) \
1621 fprintf (stderr, "%s ", name)
1622
1623 /* c_iflag bits */
1624 FOO (IGNBRK, "IGNBRK");
1625 FOO (BRKINT, "BRKINT");
1626 FOO (IGNPAR, "IGNPAR");
1627 FOO (PARMRK, "PARMRK");
1628 FOO (INPCK, "INPCK");
1629 FOO (ISTRIP, "ISTRIP");
1630 FOO (INLCR, "INLCR");
1631 FOO (IGNCR, "IGNCR");
1632 FOO (ICRNL, "ICRNL");
1633 FOO (IXON, "IXON");
1634 FOO (IXOFF, "IXOFF");
1635# ifdef IUCLC
1636 FOO (IUCLC, "IUCLC");
1637# endif
1638# ifdef IXANY
1639 FOO (IXANY, "IXANY");
1640# endif
1641# ifdef IMAXBEL
1642 FOO (IMAXBEL, "IMAXBEL");
1643# endif
1644
1645 fprintf (stderr, "\n");
1646
1647# undef FOO
1648# define FOO(entry, name) \
1649 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1650
1651 FOO (VINTR, "VINTR");
1652 FOO (VQUIT, "VQUIT");
1653 FOO (VERASE, "VERASE");
1654 FOO (VKILL, "VKILL");
1655 FOO (VEOF, "VEOF");
1656 FOO (VEOL, "VEOL");
1657# ifdef VEOL2
1658 FOO (VEOL2, "VEOL2");
1659# endif
1660# ifdef VSWTC
1661 FOO (VSWTC, "VSWTC");
1662# endif
1663# ifdef VSWTCH
1664 FOO (VSWTCH, "VSWTCH");
1665# endif
1666 FOO (VSTART, "VSTART");
1667 FOO (VSTOP, "VSTOP");
1668 FOO (VSUSP, "VSUSP");
1669# ifdef VDSUSP
1670 FOO (VDSUSP, "VDSUSP");
1671# endif
1672# ifdef VREPRINT
1673 FOO (VREPRINT, "VREPRINT");
1674# endif
1675# ifdef VDISCRD
1676 FOO (VDISCRD, "VDISCRD");
1677# endif
1678# ifdef VWERSE
1679 FOO (VWERSE, "VWERSE");
1680# endif
1681# ifdef VLNEXT
1682 FOO (VLNEXT, "VLNEXT");
1683# endif
1684
1685 fprintf (stderr, "\n");
1686# undef FOO
1687#endif /* DEBUG_TTYMODE */
1688} 1533}
1689 1534
1690/*----------------------------------------------------------------------*/ 1535/*----------------------------------------------------------------------*/
1691/* 1536/*
1692 * Run the command in a subprocess and return a file descriptor for the 1537 * Run the command in a subprocess and return a file descriptor for the
… …
1704 if (pty->pty >= 0) 1549 if (pty->pty >= 0)
1705 { 1550 {
1706 if (getfd_hook) 1551 if (getfd_hook)
1707 pty->pty = (*getfd_hook) (pty->pty); 1552 pty->pty = (*getfd_hook) (pty->pty);
1708 1553
1709 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1554 if (pty->pty < 0)
1710 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1555 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1711 } 1556 }
1712 } 1557 }
1713 else 1558 else
1714#endif 1559#endif
1715 if (!pty->get ()) 1560 if (!pty->get ())
1716 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1561 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1717 1562
1718 int er; 1563 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1564
1565 struct termios tio = def_tio;
1719 1566
1720#ifndef NO_BACKSPACE_KEY 1567#ifndef NO_BACKSPACE_KEY
1721 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1568 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1722 er = rs[Rs_backspace_key][0]; 1569 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1723 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1570 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1724 er = '\177'; /* the initial state anyway */ 1571 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1725 else
1726#endif 1572#endif
1727 er = -1;
1728 1573
1729 rxvt_get_ttymode (&tio, er);
1730 /* init terminal attributes */ 1574 /* init terminal attributes */
1731 cfsetospeed (&tio, BAUDRATE); 1575 cfsetospeed (&tio, BAUDRATE);
1732 cfsetispeed (&tio, BAUDRATE); 1576 cfsetispeed (&tio, BAUDRATE);
1733 tcsetattr (pty->tty, TCSANOW, &tio); 1577 tcsetattr (pty->tty, TCSANOW, &tio);
1734 pty->set_utf8_mode (enc_utf8); 1578 pty->set_utf8_mode (enc_utf8);
… …
1774 1618
1775 _exit (EXIT_FAILURE); 1619 _exit (EXIT_FAILURE);
1776 1620
1777 default: 1621 default:
1778 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
1779 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1629 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1630 }
1780 1631
1781 pty->close_tty (); 1632 pty->close_tty ();
1782 1633
1783 child_ev.start (cmd_pid); 1634 child_ev.start (cmd_pid);
1784 1635
… …
1809#elif defined (SRIOCSREDIR) 1660#elif defined (SRIOCSREDIR)
1810 int fd; 1661 int fd;
1811 1662
1812 fd = open (CONSOLE, O_WRONLY, 0); 1663 fd = open (CONSOLE, O_WRONLY, 0);
1813 if (fd >= 0) 1664 if (fd >= 0)
1814 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1665 {
1666 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1815 close (fd); 1667 close (fd);
1668 }
1816#endif /* SRIOCSREDIR */ 1669#endif /* SRIOCSREDIR */
1817 } 1670 }
1818 1671
1819 /* reset signals and spin off the command interpreter */ 1672 /* reset signals and spin off the command interpreter */
1820 signal (SIGINT, SIG_DFL); 1673 signal (SIGINT, SIG_DFL);
1821 signal (SIGQUIT, SIG_DFL); 1674 signal (SIGQUIT, SIG_DFL);
1822 signal (SIGCHLD, SIG_DFL); 1675 signal (SIGCHLD, SIG_DFL);
1823 signal (SIGHUP, SIG_DFL); 1676 signal (SIGHUP, SIG_DFL);
1824 signal (SIGPIPE, SIG_DFL); 1677 signal (SIGPIPE, SIG_DFL);
1825 /* 1678 /*
1826 * mimick login's behavior by disabling the job control signals 1679 * mimic login's behavior by disabling the job control signals
1827 * a shell that wants them can turn them back on 1680 * a shell that wants them can turn them back on
1828 */ 1681 */
1829#ifdef SIGTSTP 1682#ifdef SIGTSTP
1830 signal (SIGTSTP, SIG_IGN); 1683 signal (SIGTSTP, SIG_IGN);
1831 signal (SIGTTIN, SIG_IGN); 1684 signal (SIGTTIN, SIG_IGN);

Diff Legend

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