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.289 by root, Mon Jan 3 03:05:47 2011 UTC vs.
Revision 1.321 by sf-exg, Sat Feb 4 21:47:06 2012 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
63#include <sys/socket.h> 66#include <sys/socket.h>
64 67
65/* these next is probably only on Sun (not Solaris) */ 68/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H 69#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h> 70#include <sys/sockio.h>
71#endif
72#ifdef HAVE_SYS_BYTEORDER_H
73#include <sys/byteorder.h>
68#endif 74#endif
69 75
70#include <netinet/in.h> 76#include <netinet/in.h>
71#include <arpa/inet.h> 77#include <arpa/inet.h>
72#include <net/if.h> 78#include <net/if.h>
… …
559 565
560/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
561const char ** 567const char **
562rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
563{ 569{
564 int i, r_argc; 570 int i;
565 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
566
567 /*
568 * Look for -e option. Find => split and make cmd_argv[] of command args
569 */
570 for (r_argc = 0; r_argc < argc; r_argc++)
571 if (!strcmp (argv[r_argc], "-e"))
572 break;
573
574 if (r_argc == argc)
575 cmd_argv = NULL;
576 else if (!argv[r_argc + 1])
577 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
578 else
579 {
580 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
581
582 for (i = 0; i < argc - r_argc - 1; i++)
583 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
584
585 cmd_argv[i] = NULL;
586 }
587
588 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
589
590 for (i = 0; i < r_argc; i++)
591 r_argv[i] = (const char *)argv[i];
592
593 r_argv[i] = NULL;
594 572
595 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
596 574
597 /* 575 /*
598 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
599 */ 577 */
600 578
601 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
602 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
603 581
604 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
605 583
606 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
607 {
608 free (r_argv);
609 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]);
610 }
611 586
612 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
613 xa = display->xa; 588 xa = display->xa;
614 589
615 set (display); 590 set (display);
… …
618#if XFT 593#if XFT
619 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
620 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
621#endif 596#endif
622 597
623 free (r_argv);
624
625 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
626 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
627 rs [i] = 0; 600 rs [i] = 0;
628 601
629#ifdef HAVE_AFTERIMAGE
630 set_application_name ((char *)rs[Rs_name]);
631 set_output_threshold (OUTPUT_LEVEL_WARNING);
632#endif
633
634#ifdef HAVE_PIXBUF
635 g_type_init ();
636#endif
637
638#if ENABLE_PERL 602#if ENABLE_PERL
639 if (!rs[Rs_perl_ext_1]) 603 if (!rs[Rs_perl_ext_1])
640 rs[Rs_perl_ext_1] = "default"; 604 rs[Rs_perl_ext_1] = "default";
641 605
642 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
645 { 609 {
646 rxvt_perl.init (this); 610 rxvt_perl.init (this);
647 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
648 } 612 }
649#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 ();
650 618
651 /* 619 /*
652 * set any defaults not already set 620 * set any defaults not already set
653 */ 621 */
654 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
763 return cmd_argv; 731 return cmd_argv;
764} 732}
765 733
766/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
767void 735void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
769{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
770 this->envv = envv; 742 this->envv = envv;
771 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{
772 SET_R (this); 769 SET_R (this);
773 set_locale (""); 770 set_locale ("");
774 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 :(
775 772
776 init_vars (); 773 init_vars ();
… …
790 if (chdir (path)) 787 if (chdir (path))
791 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");
792 } 789 }
793 790
794 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
796 793
797 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
798 800
799 create_windows (argc, argv); 801 create_windows (argc, argv);
800 802
801 init_xlocale (); 803 init_xlocale ();
802 804
… …
808 810
809 if (option (Opt_scrollBar)) 811 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */ 812 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP 813#ifdef HAVE_BG_PIXMAP
812 { 814 {
813 bgPixmap.set_target (this); 815 bg_init ();
814 bgPixmap.invalidate ();
815 816
816#ifdef ENABLE_TRANSPARENCY 817#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
818 { 819 {
819 bgPixmap.set_transparent (); 820 bg_set_transparent ();
820 821
821 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 823 bg_set_blur (rs [Rs_blurradius]);
823 824
824 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 826 bg_set_tint (pix_colors_focused [Color_tint]);
826 827
827 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 829 bg_set_shade (rs [Rs_shade]);
829 830
830 bgPixmap.set_root_pixmap (); 831 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
833 } 834 }
834#endif 835#endif
835 836
836#ifdef BG_IMAGE_FROM_FILE 837#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 838 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 839 if (bg_set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ()) 840 if (!bg_window_position_sensitive ())
851 update_background (); 841 update_background ();
852 }
853#endif 842#endif
854 } 843 }
855#endif 844#endif
856 845
857#if ENABLE_PERL 846#if ENABLE_PERL
858 rootwin_ev.start (display, display->root); 847 rootwin_ev.start (display, display->root);
859#endif 848#endif
860 849
861 set_colorfgbg (); 850 init_done = 1;
862 851
863 init_command (cmd_argv); 852 init_command (cmd_argv);
864
865 free (cmd_argv);
866 853
867 if (pty->pty >= 0) 854 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 855 pty_ev.start (pty->pty, ev::READ);
869 856
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 857 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
872#if ENABLE_XEMBED 859#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 860 if (rs[Rs_embed])
874 { 861 {
875 long info[2] = { 0, XEMBED_MAPPED }; 862 long info[2] = { 0, XEMBED_MAPPED };
876 863
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 864 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 865 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 866 }
880#endif 867#endif
881 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
882 XMapWindow (dpy, vt); 881 XMapWindow (dpy, vt);
883 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
884 895
885 refresh_check (); 896 refresh_check ();
886} 897}
887 898
888/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
889void 900void
890rxvt_term::init_env () 901rxvt_term::init_env ()
891{ 902{
892 char *val; 903 char *val;
904 char *env_display;
905 char *env_windowid;
906 char *env_colorfgbg;
907 char *env_term;
893 908
894#ifdef DISPLAY_IS_IP 909#ifdef DISPLAY_IS_IP
895 /* Fixup display_name for export over pty to any interested terminal 910 /* Fixup display_name for export over pty to any interested terminal
896 * 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
897 * (for the first non-loopback interface) that we get from 912 * (for the first non-loopback interface) that we get from
… …
914 929
915 env_display = (char *)rxvt_malloc (strlen (val) + 9); 930 env_display = (char *)rxvt_malloc (strlen (val) + 9);
916 931
917 sprintf (env_display, "DISPLAY=%s", val); 932 sprintf (env_display, "DISPLAY=%s", val);
918 933
934 env_windowid = (char *)rxvt_malloc (21);
919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 935 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
920 936
921 /* add entries to the environment: 937 /* add entries to the environment:
922 * @ DISPLAY: in case we started with -display 938 * @ DISPLAY: in case we started with -display
923 * @ WINDOWID: X window id number of the window 939 * @ WINDOWID: X window id number of the window
924 * @ COLORTERM: terminal sub-name and also indicates its color 940 * @ COLORTERM: terminal sub-name and also indicates its color
… …
927 * @ COLORFGBG: fg;bg color codes 943 * @ COLORFGBG: fg;bg color codes
928 */ 944 */
929 putenv (env_display); 945 putenv (env_display);
930 putenv (env_windowid); 946 putenv (env_windowid);
931 947
932 if (env_colorfgbg) 948 env_colorfgbg = get_colorfgbg ();
933 putenv (env_colorfgbg); 949 putenv (env_colorfgbg);
934 950
935#ifdef RXVT_TERMINFO 951#ifdef RXVT_TERMINFO
936 putenv ("TERMINFO=" RXVT_TERMINFO); 952 putenv ("TERMINFO=" RXVT_TERMINFO);
937#endif 953#endif
938 954
… …
957 unsetenv ("TERMCAP"); /* terminfo should be okay */ 973 unsetenv ("TERMCAP"); /* terminfo should be okay */
958#endif /* HAVE_UNSETENV */ 974#endif /* HAVE_UNSETENV */
959} 975}
960 976
961/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
962/*
963 * This is more or less stolen straight from XFree86 xterm.
964 * This should support all European type languages.
965 */
966void 978void
967rxvt_term::set_locale (const char *locale) 979rxvt_term::set_locale (const char *locale)
968{ 980{
969 set_environ (envv); 981 set_environ (envv);
970 982
971#if HAVE_XSETLOCALE || HAVE_SETLOCALE
972 free (this->locale); 983 free (this->locale);
973 this->locale = setlocale (LC_CTYPE, locale); 984 this->locale = setlocale (LC_CTYPE, locale);
974 985
975 if (!this->locale) 986 if (!this->locale)
976 { 987 {
… …
987 998
988 999
989 this->locale = strdup (this->locale); 1000 this->locale = strdup (this->locale);
990 SET_LOCALE (this->locale); 1001 SET_LOCALE (this->locale);
991 mbstate.reset (); 1002 mbstate.reset ();
992#endif
993 1003
994#if HAVE_NL_LANGINFO 1004#if HAVE_NL_LANGINFO
995 char *codeset = strdup (nl_langinfo (CODESET)); 1005 char *codeset = nl_langinfo (CODESET);
996 // /^UTF.?8/i 1006 // /^UTF.?8/i
997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1007 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
998 && (codeset[1] == 'T' || codeset[1] == 't') 1008 && (codeset[1] == 'T' || codeset[1] == 't')
999 && (codeset[2] == 'F' || codeset[2] == 'f') 1009 && (codeset[2] == 'F' || codeset[2] == 'f')
1000 && (codeset[3] == '8' || codeset[4] == '8'); 1010 && (codeset[3] == '8' || codeset[4] == '8');
1001 free (codeset);
1002#else 1011#else
1003 enc_utf8 = 0; 1012 enc_utf8 = 0;
1004#endif 1013#endif
1005} 1014}
1006 1015
… …
1009{ 1018{
1010 set_environ (envv); 1019 set_environ (envv);
1011 1020
1012#ifdef USE_XIM 1021#ifdef USE_XIM
1013 if (!locale) 1022 if (!locale)
1014 rxvt_warn ("setting locale failed, working without locale support.\n"); 1023 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1015 else 1024 else
1016 { 1025 {
1017 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1026 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1018 1027
1019 if (!XSupportsLocale ()) 1028 if (!XSupportsLocale ())
1020 { 1029 {
1021 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");
1022 return; 1031 return;
1023 } 1032 }
1024 1033
1025 im_ev.start (display); 1034 im_ev.start (display);
1026 1035
… …
1175/*----------------------------------------------------------------------*/ 1184/*----------------------------------------------------------------------*/
1176/* color aliases, fg/bg bright-bold */ 1185/* color aliases, fg/bg bright-bold */
1177void 1186void
1178rxvt_term::color_aliases (int idx) 1187rxvt_term::color_aliases (int idx)
1179{ 1188{
1180 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1189 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1181 { 1190 {
1182 int i = atoi (rs[Rs_color + idx]); 1191 int i = atoi (rs[Rs_color + idx]);
1183 1192
1184 if (i >= 8 && i <= 15) 1193 if (i >= 8 && i <= 15)
1185 /* bright colors */ 1194 /* bright colors */
… …
1280} 1289}
1281 1290
1282void 1291void
1283rxvt_term::set_icon (const char *file) 1292rxvt_term::set_icon (const char *file)
1284{ 1293{
1285#ifdef HAVE_AFTERIMAGE
1286 init_asv ();
1287
1288 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1289 if (!im)
1290 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return;
1293 }
1294
1295 unsigned int w = im->width;
1296 unsigned int h = im->height;
1297
1298 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1299 {
1300 rxvt_warn ("Icon image too big, continuing without.\n");
1301 destroy_asimage (&im);
1302 return;
1303 }
1304
1305 ASImage *result = scale_asimage (asv, im,
1306 w, h, ASA_ARGB32,
1307 100, ASIMAGE_QUALITY_DEFAULT);
1308 destroy_asimage (&im);
1309
1310 if (!result)
1311 {
1312 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1313 return;
1314 }
1315
1316 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1317 if (buffer)
1318 {
1319 ARGB32 *asbuf = result->alt.argb32;
1320 buffer [0] = w;
1321 buffer [1] = h;
1322
1323 for (unsigned int i = 0; i < w * h; ++i)
1324 buffer [i + 2] = asbuf [i];
1325
1326 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1327 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1328 free (buffer);
1329 }
1330 else
1331 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1332
1333 destroy_asimage (&result);
1334#endif
1335
1336#ifdef HAVE_PIXBUF 1294#ifdef HAVE_PIXBUF
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf) 1296 if (!pixbuf)
1339 { 1297 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1298 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1378 } 1336 }
1379 1337
1380 row += rowstride; 1338 row += rowstride;
1381 } 1339 }
1382 1340
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer); 1343 free (buffer);
1386 } 1344 }
1387 else 1345 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1390 g_object_unref (pixbuf); 1348 g_object_unref (pixbuf);
1391#endif 1349#endif
1392} 1350}
1393 1351
1394/*----------------------------------------------------------------------*/ 1352/*----------------------------------------------------------------------*/
1395/* rxvt_Create_Windows () - Open and map the window */ 1353/* Open and map the window */
1396void 1354void
1397rxvt_term::create_windows (int argc, const char *const *argv) 1355rxvt_term::create_windows (int argc, const char *const *argv)
1398{ 1356{
1399 XClassHint classHint; 1357 XClassHint classHint;
1400 XWMHints wmHint; 1358 XWMHints wmHint;
… …
1446 } 1404 }
1447#endif 1405#endif
1448 1406
1449 window_calc (0, 0); 1407 window_calc (0, 0);
1450 1408
1451 /* sub-window placement & size in rxvt_resize_subwindows () */ 1409 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1452 attributes.background_pixel = pix_colors_focused [Color_border]; 1410 attributes.background_pixel = pix_colors_focused [Color_border];
1453 attributes.border_pixel = pix_colors_focused [Color_border]; 1411 attributes.border_pixel = pix_colors_focused [Color_border];
1454 attributes.colormap = cmap; 1412 attributes.colormap = cmap;
1455 1413
1456 top = XCreateWindow (dpy, parent, 1414 top = XCreateWindow (dpy, parent,
… …
1459 ext_bwidth, 1417 ext_bwidth,
1460 depth, InputOutput, visual, 1418 depth, InputOutput, visual,
1461 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1419 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1462 &attributes); 1420 &attributes);
1463 1421
1464 this->parent[0] = top; 1422 this->parent = top;
1465
1466 old_width = szHint.width;
1467 old_height = szHint.height;
1468 1423
1469 set_title (rs [Rs_title]); 1424 set_title (rs [Rs_title]);
1470 set_icon_name (rs [Rs_iconName]); 1425 set_icon_name (rs [Rs_iconName]);
1471 1426
1472 classHint.res_name = (char *)rs[Rs_name]; 1427 classHint.res_name = (char *)rs[Rs_name];
… …
1502#if ENABLE_EWMH 1457#if ENABLE_EWMH
1503 xa[XA_NET_WM_PING], 1458 xa[XA_NET_WM_PING],
1504#endif 1459#endif
1505 }; 1460 };
1506 1461
1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1462 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1508 1463
1509#if ENABLE_FRILLS 1464#if ENABLE_FRILLS
1510 if (rs[Rs_transient_for]) 1465 if (rs[Rs_transient_for])
1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1466 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1512#endif 1467#endif
… …
1535 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1490 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1536 1491
1537 /* the vt window */ 1492 /* the vt window */
1538 vt = XCreateSimpleWindow (dpy, top, 1493 vt = XCreateSimpleWindow (dpy, top,
1539 window_vt_x, window_vt_y, 1494 window_vt_x, window_vt_y,
1540 width, height, 1495 vt_width, vt_height,
1541 0, 1496 0,
1542 pix_colors_focused[Color_fg], 1497 pix_colors_focused[Color_fg],
1543 pix_colors_focused[Color_bg]); 1498 pix_colors_focused[Color_bg]);
1544 1499
1545 attributes.bit_gravity = NorthWestGravity; 1500 attributes.bit_gravity = NorthWestGravity;
… …
1594 if (pty->pty >= 0) 1549 if (pty->pty >= 0)
1595 { 1550 {
1596 if (getfd_hook) 1551 if (getfd_hook)
1597 pty->pty = (*getfd_hook) (pty->pty); 1552 pty->pty = (*getfd_hook) (pty->pty);
1598 1553
1599 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1554 if (pty->pty < 0)
1600 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1555 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1601 } 1556 }
1602 } 1557 }
1603 else 1558 else
1604#endif 1559#endif
1605 if (!pty->get ()) 1560 if (!pty->get ())
1606 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);
1607 1564
1608 struct termios tio = def_tio; 1565 struct termios tio = def_tio;
1609 1566
1610#ifndef NO_BACKSPACE_KEY 1567#ifndef NO_BACKSPACE_KEY
1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1568 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1661 1618
1662 _exit (EXIT_FAILURE); 1619 _exit (EXIT_FAILURE);
1663 1620
1664 default: 1621 default:
1665 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
1666 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1629 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1630 }
1667 1631
1668 pty->close_tty (); 1632 pty->close_tty ();
1669 1633
1670 child_ev.start (cmd_pid); 1634 child_ev.start (cmd_pid);
1671 1635
… …
1696#elif defined (SRIOCSREDIR) 1660#elif defined (SRIOCSREDIR)
1697 int fd; 1661 int fd;
1698 1662
1699 fd = open (CONSOLE, O_WRONLY, 0); 1663 fd = open (CONSOLE, O_WRONLY, 0);
1700 if (fd >= 0) 1664 if (fd >= 0)
1701 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1665 {
1666 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1702 close (fd); 1667 close (fd);
1668 }
1703#endif /* SRIOCSREDIR */ 1669#endif /* SRIOCSREDIR */
1704 } 1670 }
1705 1671
1706 /* reset signals and spin off the command interpreter */ 1672 /* reset signals and spin off the command interpreter */
1707 signal (SIGINT, SIG_DFL); 1673 signal (SIGINT, SIG_DFL);

Diff Legend

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