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.285 by sf-exg, Thu Dec 2 11:02:17 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)
… …
562 565
563/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
564const char ** 567const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
566{ 569{
567 int i, r_argc; 570 int i;
568 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
569
570 /*
571 * Look for -e option. Find => split and make cmd_argv[] of command args
572 */
573 for (r_argc = 0; r_argc < argc; r_argc++)
574 if (!strcmp (argv[r_argc], "-e"))
575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
592
593 for (i = 0; i < r_argc; i++)
594 r_argv[i] = (const char *)argv[i];
595
596 r_argv[i] = NULL;
597 572
598 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
599 574
600 /* 575 /*
601 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
602 */ 577 */
603 578
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
606 581
607 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
608 583
609 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 586
615 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
616 xa = display->xa; 588 xa = display->xa;
617 589
618 set (display); 590 set (display);
… …
621#if XFT 593#if XFT
622 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
624#endif 596#endif
625 597
626 free (r_argv);
627
628 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
630 rs [i] = 0; 600 rs [i] = 0;
631 601
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
640
641#if ENABLE_PERL 602#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 603 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 604 rs[Rs_perl_ext_1] = "default";
644 605
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
648 { 609 {
649 rxvt_perl.init (this); 610 rxvt_perl.init (this);
650 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
651 } 612 }
652#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 ();
653 618
654 /* 619 /*
655 * set any defaults not already set 620 * set any defaults not already set
656 */ 621 */
657 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
766 return cmd_argv; 731 return cmd_argv;
767} 732}
768 733
769/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
770void 735void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
773 this->envv = envv; 742 this->envv = envv;
774 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{
775 SET_R (this); 769 SET_R (this);
776 set_locale (""); 770 set_locale ("");
777 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 :(
778 772
779 init_vars (); 773 init_vars ();
… …
793 if (chdir (path)) 787 if (chdir (path))
794 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");
795 } 789 }
796 790
797 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 793
800 pty = ptytty::create (); 794 pty = ptytty::create ();
801 795
802 create_windows (argc, argv); 796 create_windows (argc, argv);
803 797
… …
811 805
812 if (option (Opt_scrollBar)) 806 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 807 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP 808#ifdef HAVE_BG_PIXMAP
815 { 809 {
816 bgPixmap.set_target (this); 810 bg_init ();
817 bgPixmap.invalidate ();
818 811
819#ifdef ENABLE_TRANSPARENCY 812#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent)) 813 if (option (Opt_transparent))
821 { 814 {
822 bgPixmap.set_transparent (); 815 bg_set_transparent ();
823 816
824 if (rs [Rs_blurradius]) 817 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 818 root_effects.set_blur (rs [Rs_blurradius]);
826 819
827 if (ISSET_PIXCOLOR (Color_tint)) 820 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 821 root_effects.set_tint (pix_colors_focused [Color_tint]);
829 822
830 if (rs [Rs_shade]) 823 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]); 824 root_effects.set_shade (rs [Rs_shade]);
832 825
833 bgPixmap.set_root_pixmap (); 826 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask); 827 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root); 828 rootwin_ev.start (display, display->root);
836 } 829 }
837#endif 830#endif
838
839#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap])
841 {
842 const char *p = rs[Rs_backgroundPixmap];
843
844 if ((p = strchr (p, ';')) != 0)
845 {
846 p++;
847 bgPixmap.set_geometry (p);
848 }
849 else
850 bgPixmap.set_defaultGeometry ();
851
852 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ())
854 update_background ();
855 }
856#endif
857 } 831 }
858#endif 832#endif
859 833
860#if ENABLE_PERL 834#if ENABLE_PERL
861 rootwin_ev.start (display, display->root); 835 rootwin_ev.start (display, display->root);
862#endif 836#endif
863 837
864 set_colorfgbg (); 838 init_done = 1;
865 839
866 init_command (cmd_argv); 840 init_command (cmd_argv);
867
868 free (cmd_argv);
869 841
870 if (pty->pty >= 0) 842 if (pty->pty >= 0)
871 pty_ev.start (pty->pty, ev::READ); 843 pty_ev.start (pty->pty, ev::READ);
872 844
873 HOOK_INVOKE ((this, HOOK_START, DT_END)); 845 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
875#if ENABLE_XEMBED 847#if ENABLE_XEMBED
876 if (rs[Rs_embed]) 848 if (rs[Rs_embed])
877 { 849 {
878 long info[2] = { 0, XEMBED_MAPPED }; 850 long info[2] = { 0, XEMBED_MAPPED };
879 851
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 852 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2); 853 32, PropModeReplace, (unsigned char *)&info, 2);
882 } 854 }
883#endif 855#endif
884 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
885 XMapWindow (dpy, vt); 869 XMapWindow (dpy, vt);
886 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
887 883
888 refresh_check (); 884 refresh_check ();
889} 885}
890 886
891/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
892void 888void
893rxvt_term::init_env () 889rxvt_term::init_env ()
894{ 890{
895 int i;
896 char *val; 891 char *val;
892 char *env_display;
893 char *env_windowid;
894 char *env_colorfgbg;
895 char *env_term;
897 896
898#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
899 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
900 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
901 * (for the first non-loopback interface) that we get from 900 * (for the first non-loopback interface) that we get from
… …
914 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
915 914
916 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
917 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
918 917
919 i = strlen (val);
920 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
921 919
922 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
923 921
922 env_windowid = (char *)rxvt_malloc (21);
924 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 923 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
925 924
926 /* add entries to the environment: 925 /* add entries to the environment:
927 * @ DISPLAY: in case we started with -display 926 * @ DISPLAY: in case we started with -display
928 * @ WINDOWID: X window id number of the window 927 * @ WINDOWID: X window id number of the window
929 * @ COLORTERM: terminal sub-name and also indicates its color 928 * @ COLORTERM: terminal sub-name and also indicates its color
… …
932 * @ COLORFGBG: fg;bg color codes 931 * @ COLORFGBG: fg;bg color codes
933 */ 932 */
934 putenv (env_display); 933 putenv (env_display);
935 putenv (env_windowid); 934 putenv (env_windowid);
936 935
937 if (env_colorfgbg) 936 env_colorfgbg = get_colorfgbg ();
938 putenv (env_colorfgbg); 937 putenv (env_colorfgbg);
939 938
940#ifdef RXVT_TERMINFO 939#ifdef RXVT_TERMINFO
941 putenv ("TERMINFO=" RXVT_TERMINFO); 940 putenv ("TERMINFO=" RXVT_TERMINFO);
942#endif 941#endif
943 942
… …
962 unsetenv ("TERMCAP"); /* terminfo should be okay */ 961 unsetenv ("TERMCAP"); /* terminfo should be okay */
963#endif /* HAVE_UNSETENV */ 962#endif /* HAVE_UNSETENV */
964} 963}
965 964
966/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
967/*
968 * This is more or less stolen straight from XFree86 xterm.
969 * This should support all European type languages.
970 */
971void 966void
972rxvt_term::set_locale (const char *locale) 967rxvt_term::set_locale (const char *locale)
973{ 968{
974 set_environ (envv); 969 set_environ (envv);
975 970
976#if HAVE_XSETLOCALE || HAVE_SETLOCALE
977 free (this->locale); 971 free (this->locale);
978 this->locale = setlocale (LC_CTYPE, locale); 972 this->locale = setlocale (LC_CTYPE, locale);
979 973
980 if (!this->locale) 974 if (!this->locale)
981 { 975 {
… …
992 986
993 987
994 this->locale = strdup (this->locale); 988 this->locale = strdup (this->locale);
995 SET_LOCALE (this->locale); 989 SET_LOCALE (this->locale);
996 mbstate.reset (); 990 mbstate.reset ();
997#endif
998 991
999#if HAVE_NL_LANGINFO 992#if HAVE_NL_LANGINFO
1000 char *codeset = strdup (nl_langinfo (CODESET)); 993 char *codeset = nl_langinfo (CODESET);
1001 // /^UTF.?8/i 994 // /^UTF.?8/i
1002 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 995 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1003 && (codeset[1] == 'T' || codeset[1] == 't') 996 && (codeset[1] == 'T' || codeset[1] == 't')
1004 && (codeset[2] == 'F' || codeset[2] == 'f') 997 && (codeset[2] == 'F' || codeset[2] == 'f')
1005 && (codeset[3] == '8' || codeset[4] == '8'); 998 && (codeset[3] == '8' || codeset[4] == '8');
1006 free (codeset);
1007#else 999#else
1008 enc_utf8 = 0; 1000 enc_utf8 = 0;
1009#endif 1001#endif
1010} 1002}
1011 1003
… …
1014{ 1006{
1015 set_environ (envv); 1007 set_environ (envv);
1016 1008
1017#ifdef USE_XIM 1009#ifdef USE_XIM
1018 if (!locale) 1010 if (!locale)
1019 rxvt_warn ("setting locale failed, working without locale support.\n"); 1011 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1020 else 1012 else
1021 { 1013 {
1022 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1023 1015
1024 if (!XSupportsLocale ()) 1016 if (!XSupportsLocale ())
1025 { 1017 {
1026 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");
1027 return; 1019 return;
1028 } 1020 }
1029 1021
1030 im_ev.start (display); 1022 im_ev.start (display);
1031 1023
… …
1180/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
1181/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
1182void 1174void
1183rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
1184{ 1176{
1185 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1186 { 1178 {
1187 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
1188 1180
1189 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
1190 /* bright colors */ 1182 /* bright colors */
… …
1285} 1277}
1286 1278
1287void 1279void
1288rxvt_term::set_icon (const char *file) 1280rxvt_term::set_icon (const char *file)
1289{ 1281{
1290#ifdef HAVE_AFTERIMAGE
1291 init_asv ();
1292
1293 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1294 if (!im)
1295 {
1296 rxvt_warn ("Loading image icon failed, continuing without.\n");
1297 return;
1298 }
1299
1300 unsigned int w = im->width;
1301 unsigned int h = im->height;
1302
1303 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1304 {
1305 rxvt_warn ("Icon image too big, continuing without.\n");
1306 destroy_asimage (&im);
1307 return;
1308 }
1309
1310 ASImage *result = scale_asimage (asv, im,
1311 w, h, ASA_ARGB32,
1312 100, ASIMAGE_QUALITY_DEFAULT);
1313 destroy_asimage (&im);
1314
1315 if (!result)
1316 {
1317 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1318 return;
1319 }
1320
1321 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1322 if (buffer)
1323 {
1324 ARGB32 *asbuf = result->alt.argb32;
1325 buffer [0] = w;
1326 buffer [1] = h;
1327
1328 for (unsigned int i = 0; i < w * h; ++i)
1329 buffer [i + 2] = asbuf [i];
1330
1331 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1332 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1333 free (buffer);
1334 }
1335 else
1336 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1337
1338 destroy_asimage (&result);
1339#endif
1340
1341#ifdef HAVE_PIXBUF 1282#ifdef HAVE_PIXBUF
1342 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1343 if (!pixbuf) 1284 if (!pixbuf)
1344 { 1285 {
1345 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1383 } 1324 }
1384 1325
1385 row += rowstride; 1326 row += rowstride;
1386 } 1327 }
1387 1328
1388 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1389 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1390 free (buffer); 1331 free (buffer);
1391 } 1332 }
1392 else 1333 else
1393 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1395 g_object_unref (pixbuf); 1336 g_object_unref (pixbuf);
1396#endif 1337#endif
1397} 1338}
1398 1339
1399/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
1400/* rxvt_Create_Windows () - Open and map the window */ 1341/* Open and map the window */
1401void 1342void
1402rxvt_term::create_windows (int argc, const char *const *argv) 1343rxvt_term::create_windows (int argc, const char *const *argv)
1403{ 1344{
1404 XClassHint classHint; 1345 XClassHint classHint;
1405 XWMHints wmHint; 1346 XWMHints wmHint;
… …
1451 } 1392 }
1452#endif 1393#endif
1453 1394
1454 window_calc (0, 0); 1395 window_calc (0, 0);
1455 1396
1456 /* sub-window placement & size in rxvt_resize_subwindows () */ 1397 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1457 attributes.background_pixel = pix_colors_focused [Color_border]; 1398 attributes.background_pixel = pix_colors_focused [Color_border];
1458 attributes.border_pixel = pix_colors_focused [Color_border]; 1399 attributes.border_pixel = pix_colors_focused [Color_border];
1459 attributes.colormap = cmap; 1400 attributes.colormap = cmap;
1460 1401
1461 top = XCreateWindow (dpy, parent, 1402 top = XCreateWindow (dpy, parent,
… …
1464 ext_bwidth, 1405 ext_bwidth,
1465 depth, InputOutput, visual, 1406 depth, InputOutput, visual,
1466 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1467 &attributes); 1408 &attributes);
1468 1409
1469 this->parent[0] = top; 1410 this->parent = top;
1470
1471 old_width = szHint.width;
1472 old_height = szHint.height;
1473 1411
1474 set_title (rs [Rs_title]); 1412 set_title (rs [Rs_title]);
1475 set_icon_name (rs [Rs_iconName]); 1413 set_icon_name (rs [Rs_iconName]);
1476 1414
1477 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
… …
1507#if ENABLE_EWMH 1445#if ENABLE_EWMH
1508 xa[XA_NET_WM_PING], 1446 xa[XA_NET_WM_PING],
1509#endif 1447#endif
1510 }; 1448 };
1511 1449
1512 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1450 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1513 1451
1514#if ENABLE_FRILLS 1452#if ENABLE_FRILLS
1515 if (rs[Rs_transient_for]) 1453 if (rs[Rs_transient_for])
1516 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1454 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1517#endif 1455#endif
… …
1540 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1541 1479
1542 /* the vt window */ 1480 /* the vt window */
1543 vt = XCreateSimpleWindow (dpy, top, 1481 vt = XCreateSimpleWindow (dpy, top,
1544 window_vt_x, window_vt_y, 1482 window_vt_x, window_vt_y,
1545 width, height, 1483 vt_width, vt_height,
1546 0, 1484 0,
1547 pix_colors_focused[Color_fg], 1485 pix_colors_focused[Color_fg],
1548 pix_colors_focused[Color_bg]); 1486 pix_colors_focused[Color_bg]);
1549 1487
1550 attributes.bit_gravity = NorthWestGravity; 1488 attributes.bit_gravity = NorthWestGravity;
… …
1599 if (pty->pty >= 0) 1537 if (pty->pty >= 0)
1600 { 1538 {
1601 if (getfd_hook) 1539 if (getfd_hook)
1602 pty->pty = (*getfd_hook) (pty->pty); 1540 pty->pty = (*getfd_hook) (pty->pty);
1603 1541
1604 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1542 if (pty->pty < 0)
1605 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1543 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1606 } 1544 }
1607 } 1545 }
1608 else 1546 else
1609#endif 1547#endif
1610 if (!pty->get ()) 1548 if (!pty->get ())
1611 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1550
1551 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1612 1552
1613 struct termios tio = def_tio; 1553 struct termios tio = def_tio;
1614 1554
1615#ifndef NO_BACKSPACE_KEY 1555#ifndef NO_BACKSPACE_KEY
1616 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1666 1606
1667 _exit (EXIT_FAILURE); 1607 _exit (EXIT_FAILURE);
1668 1608
1669 default: 1609 default:
1670 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
1671 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1617 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1618 }
1672 1619
1673 pty->close_tty (); 1620 pty->close_tty ();
1674 1621
1675 child_ev.start (cmd_pid); 1622 child_ev.start (cmd_pid);
1676 1623
… …
1701#elif defined (SRIOCSREDIR) 1648#elif defined (SRIOCSREDIR)
1702 int fd; 1649 int fd;
1703 1650
1704 fd = open (CONSOLE, O_WRONLY, 0); 1651 fd = open (CONSOLE, O_WRONLY, 0);
1705 if (fd >= 0) 1652 if (fd >= 0)
1706 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1653 {
1654 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1707 close (fd); 1655 close (fd);
1656 }
1708#endif /* SRIOCSREDIR */ 1657#endif /* SRIOCSREDIR */
1709 } 1658 }
1710 1659
1711 /* reset signals and spin off the command interpreter */ 1660 /* reset signals and spin off the command interpreter */
1712 signal (SIGINT, SIG_DFL); 1661 signal (SIGINT, SIG_DFL);

Diff Legend

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