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.322 by sf-exg, Thu May 17 10:18:32 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>
… …
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 836
839#ifdef BG_IMAGE_FROM_FILE 837#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap]) 838 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])) 839 if (bg_image.set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ()) 840 if (!bg_window_position_sensitive ())
854 update_background (); 841 update_background ();
855 }
856#endif 842#endif
857 } 843 }
858#endif 844#endif
859 845
860#if ENABLE_PERL 846#if ENABLE_PERL
861 rootwin_ev.start (display, display->root); 847 rootwin_ev.start (display, display->root);
862#endif 848#endif
863 849
864 set_colorfgbg (); 850 init_done = 1;
865 851
866 init_command (cmd_argv); 852 init_command (cmd_argv);
867
868 free (cmd_argv);
869 853
870 if (pty->pty >= 0) 854 if (pty->pty >= 0)
871 pty_ev.start (pty->pty, ev::READ); 855 pty_ev.start (pty->pty, ev::READ);
872 856
873 HOOK_INVOKE ((this, HOOK_START, DT_END)); 857 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
875#if ENABLE_XEMBED 859#if ENABLE_XEMBED
876 if (rs[Rs_embed]) 860 if (rs[Rs_embed])
877 { 861 {
878 long info[2] = { 0, XEMBED_MAPPED }; 862 long info[2] = { 0, XEMBED_MAPPED };
879 863
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 864 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2); 865 32, PropModeReplace, (unsigned char *)&info, 2);
882 } 866 }
883#endif 867#endif
884 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
885 XMapWindow (dpy, vt); 881 XMapWindow (dpy, vt);
886 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
887 895
888 refresh_check (); 896 refresh_check ();
889} 897}
890 898
891/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
892void 900void
893rxvt_term::init_env () 901rxvt_term::init_env ()
894{ 902{
895 char *val; 903 char *val;
904 char *env_display;
905 char *env_windowid;
906 char *env_colorfgbg;
907 char *env_term;
896 908
897#ifdef DISPLAY_IS_IP 909#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 910 /* 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 911 * 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 912 * (for the first non-loopback interface) that we get from
… …
917 929
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 930 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 931
920 sprintf (env_display, "DISPLAY=%s", val); 932 sprintf (env_display, "DISPLAY=%s", val);
921 933
934 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 935 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 936
924 /* add entries to the environment: 937 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 938 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 939 * @ WINDOWID: X window id number of the window
927 * @ COLORTERM: terminal sub-name and also indicates its color 940 * @ COLORTERM: terminal sub-name and also indicates its color
… …
930 * @ COLORFGBG: fg;bg color codes 943 * @ COLORFGBG: fg;bg color codes
931 */ 944 */
932 putenv (env_display); 945 putenv (env_display);
933 putenv (env_windowid); 946 putenv (env_windowid);
934 947
935 if (env_colorfgbg) 948 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 949 putenv (env_colorfgbg);
937 950
938#ifdef RXVT_TERMINFO 951#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 952 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 953#endif
941 954
… …
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 973 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 974#endif /* HAVE_UNSETENV */
962} 975}
963 976
964/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 978void
970rxvt_term::set_locale (const char *locale) 979rxvt_term::set_locale (const char *locale)
971{ 980{
972 set_environ (envv); 981 set_environ (envv);
973 982
974#if HAVE_XSETLOCALE || HAVE_SETLOCALE
975 free (this->locale); 983 free (this->locale);
976 this->locale = setlocale (LC_CTYPE, locale); 984 this->locale = setlocale (LC_CTYPE, locale);
977 985
978 if (!this->locale) 986 if (!this->locale)
979 { 987 {
… …
990 998
991 999
992 this->locale = strdup (this->locale); 1000 this->locale = strdup (this->locale);
993 SET_LOCALE (this->locale); 1001 SET_LOCALE (this->locale);
994 mbstate.reset (); 1002 mbstate.reset ();
995#endif
996 1003
997#if HAVE_NL_LANGINFO 1004#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 1005 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 1006 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1007 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 1008 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 1009 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 1010 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 1011#else
1006 enc_utf8 = 0; 1012 enc_utf8 = 0;
1007#endif 1013#endif
1008} 1014}
1009 1015
… …
1012{ 1018{
1013 set_environ (envv); 1019 set_environ (envv);
1014 1020
1015#ifdef USE_XIM 1021#ifdef USE_XIM
1016 if (!locale) 1022 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 1023 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 1024 else
1019 { 1025 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1026 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 1027
1022 if (!XSupportsLocale ()) 1028 if (!XSupportsLocale ())
1023 { 1029 {
1024 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");
1025 return; 1031 return;
1026 } 1032 }
1027 1033
1028 im_ev.start (display); 1034 im_ev.start (display);
1029 1035
… …
1178/*----------------------------------------------------------------------*/ 1184/*----------------------------------------------------------------------*/
1179/* color aliases, fg/bg bright-bold */ 1185/* color aliases, fg/bg bright-bold */
1180void 1186void
1181rxvt_term::color_aliases (int idx) 1187rxvt_term::color_aliases (int idx)
1182{ 1188{
1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1189 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1184 { 1190 {
1185 int i = atoi (rs[Rs_color + idx]); 1191 int i = atoi (rs[Rs_color + idx]);
1186 1192
1187 if (i >= 8 && i <= 15) 1193 if (i >= 8 && i <= 15)
1188 /* bright colors */ 1194 /* bright colors */
… …
1283} 1289}
1284 1290
1285void 1291void
1286rxvt_term::set_icon (const char *file) 1292rxvt_term::set_icon (const char *file)
1287{ 1293{
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 1294#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf) 1296 if (!pixbuf)
1342 { 1297 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1298 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1381 } 1336 }
1382 1337
1383 row += rowstride; 1338 row += rowstride;
1384 } 1339 }
1385 1340
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer); 1343 free (buffer);
1389 } 1344 }
1390 else 1345 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1393 g_object_unref (pixbuf); 1348 g_object_unref (pixbuf);
1394#endif 1349#endif
1395} 1350}
1396 1351
1397/*----------------------------------------------------------------------*/ 1352/*----------------------------------------------------------------------*/
1398/* rxvt_Create_Windows () - Open and map the window */ 1353/* Open and map the window */
1399void 1354void
1400rxvt_term::create_windows (int argc, const char *const *argv) 1355rxvt_term::create_windows (int argc, const char *const *argv)
1401{ 1356{
1402 XClassHint classHint; 1357 XClassHint classHint;
1403 XWMHints wmHint; 1358 XWMHints wmHint;
… …
1449 } 1404 }
1450#endif 1405#endif
1451 1406
1452 window_calc (0, 0); 1407 window_calc (0, 0);
1453 1408
1454 /* sub-window placement & size in rxvt_resize_subwindows () */ 1409 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1455 attributes.background_pixel = pix_colors_focused [Color_border]; 1410 attributes.background_pixel = pix_colors_focused [Color_border];
1456 attributes.border_pixel = pix_colors_focused [Color_border]; 1411 attributes.border_pixel = pix_colors_focused [Color_border];
1457 attributes.colormap = cmap; 1412 attributes.colormap = cmap;
1458 1413
1459 top = XCreateWindow (dpy, parent, 1414 top = XCreateWindow (dpy, parent,
… …
1462 ext_bwidth, 1417 ext_bwidth,
1463 depth, InputOutput, visual, 1418 depth, InputOutput, visual,
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1419 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1420 &attributes);
1466 1421
1467 this->parent[0] = top; 1422 this->parent = top;
1468
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471 1423
1472 set_title (rs [Rs_title]); 1424 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1425 set_icon_name (rs [Rs_iconName]);
1474 1426
1475 classHint.res_name = (char *)rs[Rs_name]; 1427 classHint.res_name = (char *)rs[Rs_name];
… …
1505#if ENABLE_EWMH 1457#if ENABLE_EWMH
1506 xa[XA_NET_WM_PING], 1458 xa[XA_NET_WM_PING],
1507#endif 1459#endif
1508 }; 1460 };
1509 1461
1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1462 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1511 1463
1512#if ENABLE_FRILLS 1464#if ENABLE_FRILLS
1513 if (rs[Rs_transient_for]) 1465 if (rs[Rs_transient_for])
1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1466 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1515#endif 1467#endif
… …
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1490 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1539 1491
1540 /* the vt window */ 1492 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1493 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1494 window_vt_x, window_vt_y,
1543 width, height, 1495 vt_width, vt_height,
1544 0, 1496 0,
1545 pix_colors_focused[Color_fg], 1497 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1498 pix_colors_focused[Color_bg]);
1547 1499
1548 attributes.bit_gravity = NorthWestGravity; 1500 attributes.bit_gravity = NorthWestGravity;
… …
1597 if (pty->pty >= 0) 1549 if (pty->pty >= 0)
1598 { 1550 {
1599 if (getfd_hook) 1551 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1552 pty->pty = (*getfd_hook) (pty->pty);
1601 1553
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1554 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1555 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1556 }
1605 } 1557 }
1606 else 1558 else
1607#endif 1559#endif
1608 if (!pty->get ()) 1560 if (!pty->get ())
1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1561 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1562
1563 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1610 1564
1611 struct termios tio = def_tio; 1565 struct termios tio = def_tio;
1612 1566
1613#ifndef NO_BACKSPACE_KEY 1567#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1568 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1618
1665 _exit (EXIT_FAILURE); 1619 _exit (EXIT_FAILURE);
1666 1620
1667 default: 1621 default:
1668 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
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1629 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1630 }
1670 1631
1671 pty->close_tty (); 1632 pty->close_tty ();
1672 1633
1673 child_ev.start (cmd_pid); 1634 child_ev.start (cmd_pid);
1674 1635
… …
1699#elif defined (SRIOCSREDIR) 1660#elif defined (SRIOCSREDIR)
1700 int fd; 1661 int fd;
1701 1662
1702 fd = open (CONSOLE, O_WRONLY, 0); 1663 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1664 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1665 {
1666 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1667 close (fd);
1668 }
1706#endif /* SRIOCSREDIR */ 1669#endif /* SRIOCSREDIR */
1707 } 1670 }
1708 1671
1709 /* reset signals and spin off the command interpreter */ 1672 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1673 signal (SIGINT, SIG_DFL);

Diff Legend

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