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.288 by sf-exg, Sat Dec 18 18:17:38 2010 UTC vs.
Revision 1.324 by root, Mon May 28 16:40:03 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;
… …
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 ();
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
801 800
802 create_windows (argc, argv); 801 create_windows (argc, argv);
803 802
804 init_xlocale (); 803 init_xlocale ();
805 804
… …
811 810
812 if (option (Opt_scrollBar)) 811 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 812 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP 813#ifdef HAVE_BG_PIXMAP
815 { 814 {
816 bgPixmap.set_target (this); 815 bg_init ();
817 bgPixmap.invalidate ();
818 816
819#ifdef ENABLE_TRANSPARENCY 817#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
821 { 819 {
822 bgPixmap.set_transparent (); 820 bg_set_transparent ();
823 821
824 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 823 bg_set_blur (rs [Rs_blurradius]);
826 824
827 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 826 bg_set_tint (pix_colors_focused [Color_tint]);
829 827
830 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]); 829 bg_set_shade (rs [Rs_shade]);
832 830
833 bgPixmap.set_root_pixmap (); 831 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
836 } 834 }
837#endif 835#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 } 836 }
858#endif 837#endif
859 838
860#if ENABLE_PERL 839#if ENABLE_PERL
861 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
862#endif 841#endif
863 842
864 set_colorfgbg (); 843 init_done = 1;
865 844
866 init_command (cmd_argv); 845 init_command (cmd_argv);
867
868 free (cmd_argv);
869 846
870 if (pty->pty >= 0) 847 if (pty->pty >= 0)
871 pty_ev.start (pty->pty, ev::READ); 848 pty_ev.start (pty->pty, ev::READ);
872 849
873 HOOK_INVOKE ((this, HOOK_START, DT_END)); 850 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
875#if ENABLE_XEMBED 852#if ENABLE_XEMBED
876 if (rs[Rs_embed]) 853 if (rs[Rs_embed])
877 { 854 {
878 long info[2] = { 0, XEMBED_MAPPED }; 855 long info[2] = { 0, XEMBED_MAPPED };
879 856
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 857 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2); 858 32, PropModeReplace, (unsigned char *)&info, 2);
882 } 859 }
883#endif 860#endif
884 861
862#if HAVE_STARTUP_NOTIFICATION
863 SnDisplay *snDisplay;
864 SnLauncheeContext *snContext;
865
866 snDisplay = sn_display_new (dpy, NULL, NULL);
867 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
868
869 /* Tell the window manager that this window is part of the startup context */
870 if (snContext)
871 sn_launchee_context_setup_window (snContext, parent);
872#endif
873
885 XMapWindow (dpy, vt); 874 XMapWindow (dpy, vt);
886 XMapWindow (dpy, parent[0]); 875 XMapWindow (dpy, parent);
876
877#if HAVE_STARTUP_NOTIFICATION
878 if (snContext)
879 {
880 /* Mark the startup process as complete */
881 sn_launchee_context_complete (snContext);
882
883 sn_launchee_context_unref (snContext);
884 }
885
886 sn_display_unref (snDisplay);
887#endif
887 888
888 refresh_check (); 889 refresh_check ();
889} 890}
890 891
891/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
892void 893void
893rxvt_term::init_env () 894rxvt_term::init_env ()
894{ 895{
895 char *val; 896 char *val;
897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
900 char *env_term;
896 901
897#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 903 /* Fixup display_name for export over pty to any interested terminal
899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 904 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
900 * (for the first non-loopback interface) that we get from 905 * (for the first non-loopback interface) that we get from
… …
917 922
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 924
920 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
921 926
927 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 929
924 /* add entries to the environment: 930 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
927 * @ COLORTERM: terminal sub-name and also indicates its color 933 * @ COLORTERM: terminal sub-name and also indicates its color
… …
930 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
931 */ 937 */
932 putenv (env_display); 938 putenv (env_display);
933 putenv (env_windowid); 939 putenv (env_windowid);
934 940
935 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
937 943
938#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 946#endif
941 947
… …
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 966 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 967#endif /* HAVE_UNSETENV */
962} 968}
963 969
964/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 971void
970rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
971{ 973{
972 set_environ (envv); 974 set_environ (envv);
973 975
974#if HAVE_XSETLOCALE || HAVE_SETLOCALE
975 free (this->locale); 976 free (this->locale);
976 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
977 978
978 if (!this->locale) 979 if (!this->locale)
979 { 980 {
… …
990 991
991 992
992 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
993 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
994 mbstate.reset (); 995 mbstate.reset ();
995#endif
996 996
997#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 998 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 999 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 1001 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 1002 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 1003 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 1004#else
1006 enc_utf8 = 0; 1005 enc_utf8 = 0;
1007#endif 1006#endif
1008} 1007}
1009 1008
… …
1012{ 1011{
1013 set_environ (envv); 1012 set_environ (envv);
1014 1013
1015#ifdef USE_XIM 1014#ifdef USE_XIM
1016 if (!locale) 1015 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 1016 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 1017 else
1019 { 1018 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 1020
1022 if (!XSupportsLocale ()) 1021 if (!XSupportsLocale ())
1023 { 1022 {
1024 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1023 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1025 return; 1024 return;
1026 } 1025 }
1027 1026
1028 im_ev.start (display); 1027 im_ev.start (display);
1029 1028
… …
1178/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
1179/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
1180void 1179void
1181rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
1182{ 1181{
1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1184 { 1183 {
1185 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
1186 1185
1187 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
1188 /* bright colors */ 1187 /* bright colors */
… …
1283} 1282}
1284 1283
1285void 1284void
1286rxvt_term::set_icon (const char *file) 1285rxvt_term::set_icon (const char *file)
1287{ 1286{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent[0], 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 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF 1287#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf) 1289 if (!pixbuf)
1342 { 1290 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1381 } 1329 }
1382 1330
1383 row += rowstride; 1331 row += rowstride;
1384 } 1332 }
1385 1333
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1334 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1335 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer); 1336 free (buffer);
1389 } 1337 }
1390 else 1338 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1339 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1393 g_object_unref (pixbuf); 1341 g_object_unref (pixbuf);
1394#endif 1342#endif
1395} 1343}
1396 1344
1397/*----------------------------------------------------------------------*/ 1345/*----------------------------------------------------------------------*/
1398/* rxvt_Create_Windows () - Open and map the window */ 1346/* Open and map the window */
1399void 1347void
1400rxvt_term::create_windows (int argc, const char *const *argv) 1348rxvt_term::create_windows (int argc, const char *const *argv)
1401{ 1349{
1402 XClassHint classHint; 1350 XClassHint classHint;
1403 XWMHints wmHint; 1351 XWMHints wmHint;
… …
1449 } 1397 }
1450#endif 1398#endif
1451 1399
1452 window_calc (0, 0); 1400 window_calc (0, 0);
1453 1401
1454 /* sub-window placement & size in rxvt_resize_subwindows () */ 1402 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1455 attributes.background_pixel = pix_colors_focused [Color_border]; 1403 attributes.background_pixel = pix_colors_focused [Color_border];
1456 attributes.border_pixel = pix_colors_focused [Color_border]; 1404 attributes.border_pixel = pix_colors_focused [Color_border];
1457 attributes.colormap = cmap; 1405 attributes.colormap = cmap;
1458 1406
1459 top = XCreateWindow (dpy, parent, 1407 top = XCreateWindow (dpy, parent,
… …
1462 ext_bwidth, 1410 ext_bwidth,
1463 depth, InputOutput, visual, 1411 depth, InputOutput, visual,
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1412 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1413 &attributes);
1466 1414
1467 this->parent[0] = top; 1415 this->parent = top;
1468
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471 1416
1472 set_title (rs [Rs_title]); 1417 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1418 set_icon_name (rs [Rs_iconName]);
1474 1419
1475 classHint.res_name = (char *)rs[Rs_name]; 1420 classHint.res_name = (char *)rs[Rs_name];
… …
1505#if ENABLE_EWMH 1450#if ENABLE_EWMH
1506 xa[XA_NET_WM_PING], 1451 xa[XA_NET_WM_PING],
1507#endif 1452#endif
1508 }; 1453 };
1509 1454
1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1455 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1511 1456
1512#if ENABLE_FRILLS 1457#if ENABLE_FRILLS
1513 if (rs[Rs_transient_for]) 1458 if (rs[Rs_transient_for])
1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1459 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1515#endif 1460#endif
… …
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1539 1484
1540 /* the vt window */ 1485 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1543 width, height, 1488 vt_width, vt_height,
1544 0, 1489 0,
1545 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1547 1492
1548 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
… …
1597 if (pty->pty >= 0) 1542 if (pty->pty >= 0)
1598 { 1543 {
1599 if (getfd_hook) 1544 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1545 pty->pty = (*getfd_hook) (pty->pty);
1601 1546
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1547 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1548 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1549 }
1605 } 1550 }
1606 else 1551 else
1607#endif 1552#endif
1608 if (!pty->get ()) 1553 if (!pty->get ())
1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1554 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1555
1556 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1610 1557
1611 struct termios tio = def_tio; 1558 struct termios tio = def_tio;
1612 1559
1613#ifndef NO_BACKSPACE_KEY 1560#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1561 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1611
1665 _exit (EXIT_FAILURE); 1612 _exit (EXIT_FAILURE);
1666 1613
1667 default: 1614 default:
1668 if (!option (Opt_utmpInhibit)) 1615 if (!option (Opt_utmpInhibit))
1616 {
1617#ifdef LOG_ONLY_ON_LOGIN
1618 bool login_shell = option (Opt_loginShell);
1619#else
1620 bool login_shell = true;
1621#endif
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1622 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1623 }
1670 1624
1671 pty->close_tty (); 1625 pty->close_tty ();
1672 1626
1673 child_ev.start (cmd_pid); 1627 child_ev.start (cmd_pid);
1674 1628
… …
1699#elif defined (SRIOCSREDIR) 1653#elif defined (SRIOCSREDIR)
1700 int fd; 1654 int fd;
1701 1655
1702 fd = open (CONSOLE, O_WRONLY, 0); 1656 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1657 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1658 {
1659 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1660 close (fd);
1661 }
1706#endif /* SRIOCSREDIR */ 1662#endif /* SRIOCSREDIR */
1707 } 1663 }
1708 1664
1709 /* reset signals and spin off the command interpreter */ 1665 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1666 signal (SIGINT, SIG_DFL);

Diff Legend

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