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.271 by sf-exg, Thu Jul 1 21:50:25 2010 UTC vs.
Revision 1.326 by root, Sun Jun 3 10:42:34 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>
… …
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)
… …
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);
… …
639#if XFT 593#if XFT
640 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
641 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
642#endif 596#endif
643 597
644 free (r_argv);
645
646 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
648 rs [i] = 0; 600 rs [i] = 0;
649 601
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 602#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 603 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 604 rs[Rs_perl_ext_1] = "default";
658 605
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 609 {
663 rxvt_perl.init (this); 610 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 612 }
666#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 ();
667 618
668 /* 619 /*
669 * set any defaults not already set 620 * set any defaults not already set
670 */ 621 */
671 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
780 return cmd_argv; 731 return cmd_argv;
781} 732}
782 733
783/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
784void 735void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
786{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
787 this->envv = envv; 742 this->envv = envv;
788 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{
789 SET_R (this); 769 SET_R (this);
790 set_locale (""); 770 set_locale ("");
791 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 :(
792 772
793 init_vars (); 773 init_vars ();
794
795 init_secondary ();
796 774
797 const char **cmd_argv = init_resources (argc, argv); 775 const char **cmd_argv = init_resources (argc, argv);
798 776
799#ifdef KEYSYM_RESOURCE 777#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 778 keyboard->register_done ();
… …
809 if (chdir (path)) 787 if (chdir (path))
810 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");
811 } 789 }
812 790
813 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 793
816 pty = ptytty::create (); 794 pty = ptytty::create ();
817 795
818 create_windows (argc, argv); 796 create_windows (argc, argv);
819 797
… …
827 805
828 if (option (Opt_scrollBar)) 806 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 807 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP 808#ifdef HAVE_BG_PIXMAP
831 { 809 {
832 bgPixmap.set_target (this); 810 bg_init ();
833 bgPixmap.invalidate ();
834 811
835#ifdef ENABLE_TRANSPARENCY 812#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent)) 813 if (option (Opt_transparent))
837 { 814 {
838 bgPixmap.set_transparent (); 815 bg_set_transparent ();
839 816
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius]) 817 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 818 root_effects.set_blur (rs [Rs_blurradius]);
843#endif 819
844 if (ISSET_PIXCOLOR (Color_tint)) 820 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 821 root_effects.set_tint (pix_colors_focused [Color_tint]);
846 822
847 if (rs [Rs_shade]) 823 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]); 824 root_effects.set_shade (rs [Rs_shade]);
849 825
850 bgPixmap.set_root_pixmap (); 826 bg_set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask); 827 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root); 828 rootwin_ev.start (display, display->root);
853 } 829 }
854#endif 830#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 } 831 }
875#endif 832#endif
876 833
877#if ENABLE_PERL 834#if ENABLE_PERL
878 rootwin_ev.start (display, display->root); 835 rootwin_ev.start (display, display->root);
879#endif 836#endif
880 837
881 set_colorfgbg (); 838 init_done = 1;
882 839
883 init_command (cmd_argv); 840 init_command (cmd_argv);
884
885 free (cmd_argv);
886 841
887 if (pty->pty >= 0) 842 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ); 843 pty_ev.start (pty->pty, ev::READ);
889 844
890 HOOK_INVOKE ((this, HOOK_START, DT_END)); 845 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
892#if ENABLE_XEMBED 847#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 848 if (rs[Rs_embed])
894 { 849 {
895 long info[2] = { 0, XEMBED_MAPPED }; 850 long info[2] = { 0, XEMBED_MAPPED };
896 851
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 852 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 853 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 854 }
900#endif 855#endif
901 856
857#if HAVE_STARTUP_NOTIFICATION
858 SnDisplay *snDisplay;
859 SnLauncheeContext *snContext;
860
861 snDisplay = sn_display_new (dpy, NULL, NULL);
862 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
863
864 /* Tell the window manager that this window is part of the startup context */
865 if (snContext)
866 sn_launchee_context_setup_window (snContext, parent);
867#endif
868
902 XMapWindow (dpy, vt); 869 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 870 XMapWindow (dpy, parent);
871
872#if HAVE_STARTUP_NOTIFICATION
873 if (snContext)
874 {
875 /* Mark the startup process as complete */
876 sn_launchee_context_complete (snContext);
877
878 sn_launchee_context_unref (snContext);
879 }
880
881 sn_display_unref (snDisplay);
882#endif
904 883
905 refresh_check (); 884 refresh_check ();
906} 885}
907 886
908/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
909void 888void
910rxvt_term::init_env () 889rxvt_term::init_env ()
911{ 890{
912 int i;
913 char *val; 891 char *val;
892 char *env_display;
893 char *env_windowid;
894 char *env_colorfgbg;
895 char *env_term;
914 896
915#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 898 /* 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 899 * 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 900 * (for the first non-loopback interface) that we get from
… …
931 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
932 914
933 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
935 917
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 919
939 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
940 921
922 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 923 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 924
943 /* add entries to the environment: 925 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 926 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 927 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 928 * @ COLORTERM: terminal sub-name and also indicates its color
… …
949 * @ COLORFGBG: fg;bg color codes 931 * @ COLORFGBG: fg;bg color codes
950 */ 932 */
951 putenv (env_display); 933 putenv (env_display);
952 putenv (env_windowid); 934 putenv (env_windowid);
953 935
954 if (env_colorfgbg) 936 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 937 putenv (env_colorfgbg);
956 938
957#ifdef RXVT_TERMINFO 939#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 940 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 941#endif
960 942
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 961 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 962#endif /* HAVE_UNSETENV */
981} 963}
982 964
983/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 966void
989rxvt_term::set_locale (const char *locale) 967rxvt_term::set_locale (const char *locale)
990{ 968{
991 set_environ (envv); 969 set_environ (envv);
992 970
993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
994 free (this->locale); 971 free (this->locale);
995 this->locale = setlocale (LC_CTYPE, locale); 972 this->locale = setlocale (LC_CTYPE, locale);
996 973
997 if (!this->locale) 974 if (!this->locale)
998 { 975 {
… …
1009 986
1010 987
1011 this->locale = strdup (this->locale); 988 this->locale = strdup (this->locale);
1012 SET_LOCALE (this->locale); 989 SET_LOCALE (this->locale);
1013 mbstate.reset (); 990 mbstate.reset ();
1014#endif
1015 991
1016#if HAVE_NL_LANGINFO 992#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 993 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 994 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 995 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 996 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 997 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 998 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 999#else
1025 enc_utf8 = 0; 1000 enc_utf8 = 0;
1026#endif 1001#endif
1027} 1002}
1028 1003
… …
1031{ 1006{
1032 set_environ (envv); 1007 set_environ (envv);
1033 1008
1034#ifdef USE_XIM 1009#ifdef USE_XIM
1035 if (!locale) 1010 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1011 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1012 else
1038 { 1013 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1015
1041 if (!XSupportsLocale ()) 1016 if (!XSupportsLocale ())
1042 { 1017 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1018 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1019 return;
1045 } 1020 }
1046 1021
1047 im_ev.start (display); 1022 im_ev.start (display);
1048 1023
… …
1197/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
1199void 1174void
1200rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
1201{ 1176{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1178 {
1204 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
1205 1180
1206 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1182 /* bright colors */
… …
1299 1274
1300 if (i) 1275 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1276 ModMetaMask = modmasks[i - 1];
1302} 1277}
1303 1278
1279void
1280rxvt_term::set_icon (const char *file)
1281{
1282#ifdef HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf)
1285 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return;
1288 }
1289
1290 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1291 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1292
1293 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1294 {
1295 rxvt_warn ("Icon image too big, continuing without.\n");
1296 g_object_unref (pixbuf);
1297 return;
1298 }
1299
1300 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1301 {
1302 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1303 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1304 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1305
1306 buffer [0] = w;
1307 buffer [1] = h;
1308 for (int i = 0; i < h; i++)
1309 {
1310 for (int j = 0; j < w; j++)
1311 {
1312 unsigned char *pixel = row + j * channels;
1313 long value;
1314
1315 if (channels == 4)
1316 value = pixel[3];
1317 else
1318 value = (unsigned char)0x00ff;
1319
1320 value = (value << 8) + pixel[0];
1321 value = (value << 8) + pixel[1];
1322 value = (value << 8) + pixel[2];
1323 buffer[(i * w + j) + 2] = value;
1324 }
1325
1326 row += rowstride;
1327 }
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 g_object_unref (pixbuf);
1337#endif
1338}
1339
1304/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1341/* Open and map the window */
1306void 1342void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1343rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1344{
1309 XClassHint classHint; 1345 XClassHint classHint;
1310 XWMHints wmHint; 1346 XWMHints wmHint;
… …
1356 } 1392 }
1357#endif 1393#endif
1358 1394
1359 window_calc (0, 0); 1395 window_calc (0, 0);
1360 1396
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1397 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1398 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1399 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1400 attributes.colormap = cmap;
1365 1401
1366 top = XCreateWindow (dpy, parent, 1402 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1405 ext_bwidth,
1370 depth, InputOutput, visual, 1406 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1408 &attributes);
1373 1409
1374 this->parent[0] = top; 1410 this->parent = top;
1375
1376 old_width = szHint.width;
1377 old_height = szHint.height;
1378 1411
1379 set_title (rs [Rs_title]); 1412 set_title (rs [Rs_title]);
1380 set_icon_name (rs [Rs_iconName]); 1413 set_icon_name (rs [Rs_iconName]);
1381 1414
1382 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
… …
1388 wmHint.window_group = top; 1421 wmHint.window_group = top;
1389 1422
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1424 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1425#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1426 /*
1395 * set up icon hint 1427 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1428 * rs [Rs_iconfile] is path to icon
1397 */ 1429 */
1398 1430
1399 if (rs [Rs_iconfile]) 1431 if (rs [Rs_iconfile])
1400 { 1432 {
1401 init_asv (); 1433 set_icon (rs [Rs_iconfile]);
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 } 1434 }
1440# endif
1441#endif 1435#endif
1442 1436
1443#if ENABLE_FRILLS 1437#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1438 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1445#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1446 xa[XA_NET_WM_PING],
1453#endif 1447#endif
1454 }; 1448 };
1455 1449
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1450 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1451
1458#if ENABLE_FRILLS 1452#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1453 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1454 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1455#endif
… …
1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1485 1479
1486 /* the vt window */ 1480 /* the vt window */
1487 vt = XCreateSimpleWindow (dpy, top, 1481 vt = XCreateSimpleWindow (dpy, top,
1488 window_vt_x, window_vt_y, 1482 window_vt_x, window_vt_y,
1489 width, height, 1483 vt_width, vt_height,
1490 0, 1484 0,
1491 pix_colors_focused[Color_fg], 1485 pix_colors_focused[Color_fg],
1492 pix_colors_focused[Color_bg]); 1486 pix_colors_focused[Color_bg]);
1493 1487
1494 attributes.bit_gravity = NorthWestGravity; 1488 attributes.bit_gravity = NorthWestGravity;
… …
1522 pix_colors = pix_colors_unfocused; 1516 pix_colors = pix_colors_unfocused;
1523#endif 1517#endif
1524 1518
1525 pointer_unblank (); 1519 pointer_unblank ();
1526 scr_recolour (); 1520 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} 1521}
1682 1522
1683/*----------------------------------------------------------------------*/ 1523/*----------------------------------------------------------------------*/
1684/* 1524/*
1685 * Run the command in a subprocess and return a file descriptor for the 1525 * Run the command in a subprocess and return a file descriptor for the
… …
1697 if (pty->pty >= 0) 1537 if (pty->pty >= 0)
1698 { 1538 {
1699 if (getfd_hook) 1539 if (getfd_hook)
1700 pty->pty = (*getfd_hook) (pty->pty); 1540 pty->pty = (*getfd_hook) (pty->pty);
1701 1541
1702 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1542 if (pty->pty < 0)
1703 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1543 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1704 } 1544 }
1705 } 1545 }
1706 else 1546 else
1707#endif 1547#endif
1708 if (!pty->get ()) 1548 if (!pty->get ())
1709 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1710 1550
1711 rxvt_get_ttymode (&tio); 1551 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552
1553 struct termios tio = def_tio;
1712 1554
1713#ifndef NO_BACKSPACE_KEY 1555#ifndef NO_BACKSPACE_KEY
1714 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1715 tio.c_cc[VERASE] = rs[Rs_backspace_key][0]; 1557 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1716 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1558 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
… …
1764 1606
1765 _exit (EXIT_FAILURE); 1607 _exit (EXIT_FAILURE);
1766 1608
1767 default: 1609 default:
1768 if (!option (Opt_utmpInhibit)) 1610 if (!option (Opt_utmpInhibit))
1611 {
1612#ifdef LOG_ONLY_ON_LOGIN
1613 bool login_shell = option (Opt_loginShell);
1614#else
1615 bool login_shell = true;
1616#endif
1769 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1617 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1618 }
1770 1619
1771 pty->close_tty (); 1620 pty->close_tty ();
1772 1621
1773 child_ev.start (cmd_pid); 1622 child_ev.start (cmd_pid);
1774 1623
… …
1799#elif defined (SRIOCSREDIR) 1648#elif defined (SRIOCSREDIR)
1800 int fd; 1649 int fd;
1801 1650
1802 fd = open (CONSOLE, O_WRONLY, 0); 1651 fd = open (CONSOLE, O_WRONLY, 0);
1803 if (fd >= 0) 1652 if (fd >= 0)
1804 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1653 {
1654 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1805 close (fd); 1655 close (fd);
1656 }
1806#endif /* SRIOCSREDIR */ 1657#endif /* SRIOCSREDIR */
1807 } 1658 }
1808 1659
1809 /* reset signals and spin off the command interpreter */ 1660 /* reset signals and spin off the command interpreter */
1810 signal (SIGINT, SIG_DFL); 1661 signal (SIGINT, SIG_DFL);
1811 signal (SIGQUIT, SIG_DFL); 1662 signal (SIGQUIT, SIG_DFL);
1812 signal (SIGCHLD, SIG_DFL); 1663 signal (SIGCHLD, SIG_DFL);
1813 signal (SIGHUP, SIG_DFL); 1664 signal (SIGHUP, SIG_DFL);
1814 signal (SIGPIPE, SIG_DFL); 1665 signal (SIGPIPE, SIG_DFL);
1815 /* 1666 /*
1816 * mimick login's behavior by disabling the job control signals 1667 * mimic login's behavior by disabling the job control signals
1817 * a shell that wants them can turn them back on 1668 * a shell that wants them can turn them back on
1818 */ 1669 */
1819#ifdef SIGTSTP 1670#ifdef SIGTSTP
1820 signal (SIGTSTP, SIG_IGN); 1671 signal (SIGTSTP, SIG_IGN);
1821 signal (SIGTTIN, SIG_IGN); 1672 signal (SIGTTIN, SIG_IGN);

Diff Legend

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