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.328 by root, Thu Jun 7 16:04:31 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>
73#include <net/if_arp.h> 79#include <net/if_arp.h>
74 80
75static char * 81static char * ecb_cold
76rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
77{ 83{
78 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
79 struct ifconf ifc; 85 struct ifconf ifc;
80 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
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);
616 extract_resources (); 591 extract_resources ();
617 592
618#if XFT 593#if ENABLE_FRILLS
619 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
620 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
621#endif 598#endif
622
623 free (r_argv);
624 599
625 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
626 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
627 rs [i] = 0; 602 rs [i] = 0;
628 603
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 604#if ENABLE_PERL
639 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
640 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
641 607
642 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
645 { 611 {
646 rxvt_perl.init (this); 612 rxvt_perl.init (this);
647 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
648 } 614 }
649#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
650 620
651 /* 621 /*
652 * set any defaults not already set 622 * set any defaults not already set
653 */ 623 */
654 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
763 return cmd_argv; 733 return cmd_argv;
764} 734}
765 735
766/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
767void 737void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
769{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
770 this->envv = envv; 744 this->envv = envv;
771 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
772 SET_R (this); 771 SET_R (this);
773 set_locale (""); 772 set_locale ("");
774 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
775 774
776 init_vars (); 775 init_vars ();
… …
790 if (chdir (path)) 789 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 } 791 }
793 792
794 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
796 795
797 pty = ptytty::create (); 796 pty = ptytty::create ();
798 797
799 create_windows (argc, argv); 798 create_windows (argc, argv);
800 799
… …
808 807
809 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP 810#ifdef HAVE_BG_PIXMAP
812 { 811 {
813 bgPixmap.set_target (this); 812 bg_init ();
814 bgPixmap.invalidate ();
815 813
816#ifdef ENABLE_TRANSPARENCY 814#if ENABLE_TRANSPARENCY
817 if (option (Opt_transparent)) 815 if (option (Opt_transparent))
818 { 816 {
819 bgPixmap.set_transparent (); 817 bg_set_transparent ();
820 818
821 if (rs [Rs_blurradius]) 819 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 820 root_effects.set_blur (rs [Rs_blurradius]);
823 821
824 if (ISSET_PIXCOLOR (Color_tint)) 822 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 823 root_effects.set_tint (pix_colors_focused [Color_tint]);
826 824
827 if (rs [Rs_shade]) 825 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 826 root_effects.set_shade (rs [Rs_shade]);
829 827
830 bgPixmap.set_root_pixmap (); 828 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 829 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 830 rootwin_ev.start (display, display->root);
833 } 831 }
834#endif 832#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 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]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 } 833 }
855#endif 834#endif
856 835
857#if ENABLE_PERL 836#if ENABLE_PERL
858 rootwin_ev.start (display, display->root); 837 rootwin_ev.start (display, display->root);
859#endif 838#endif
860 839
861 set_colorfgbg (); 840 init_done = 1;
862 841
863 init_command (cmd_argv); 842 init_command (cmd_argv);
864
865 free (cmd_argv);
866 843
867 if (pty->pty >= 0) 844 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 845 pty_ev.start (pty->pty, ev::READ);
869 846
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 847 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
872#if ENABLE_XEMBED 849#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 850 if (rs[Rs_embed])
874 { 851 {
875 long info[2] = { 0, XEMBED_MAPPED }; 852 long info[2] = { 0, XEMBED_MAPPED };
876 853
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 854 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 855 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 856 }
880#endif 857#endif
881 858
859#if HAVE_STARTUP_NOTIFICATION
860 SnDisplay *snDisplay;
861 SnLauncheeContext *snContext;
862
863 snDisplay = sn_display_new (dpy, NULL, NULL);
864 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
865
866 /* Tell the window manager that this window is part of the startup context */
867 if (snContext)
868 sn_launchee_context_setup_window (snContext, parent);
869#endif
870
882 XMapWindow (dpy, vt); 871 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 872 XMapWindow (dpy, parent);
873
874#if HAVE_STARTUP_NOTIFICATION
875 if (snContext)
876 {
877 /* Mark the startup process as complete */
878 sn_launchee_context_complete (snContext);
879
880 sn_launchee_context_unref (snContext);
881 }
882
883 sn_display_unref (snDisplay);
884#endif
884 885
885 refresh_check (); 886 refresh_check ();
886} 887}
887 888
888/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
889void 890void
890rxvt_term::init_env () 891rxvt_term::init_env ()
891{ 892{
892 char *val; 893 char *val;
894 char *env_display;
895 char *env_windowid;
896 char *env_colorfgbg;
897 char *env_term;
893 898
894#ifdef DISPLAY_IS_IP 899#ifdef DISPLAY_IS_IP
895 /* Fixup display_name for export over pty to any interested terminal 900 /* 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 901 * 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 902 * (for the first non-loopback interface) that we get from
… …
914 919
915 env_display = (char *)rxvt_malloc (strlen (val) + 9); 920 env_display = (char *)rxvt_malloc (strlen (val) + 9);
916 921
917 sprintf (env_display, "DISPLAY=%s", val); 922 sprintf (env_display, "DISPLAY=%s", val);
918 923
924 env_windowid = (char *)rxvt_malloc (21);
919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
920 926
921 /* add entries to the environment: 927 /* add entries to the environment:
922 * @ DISPLAY: in case we started with -display 928 * @ DISPLAY: in case we started with -display
923 * @ WINDOWID: X window id number of the window 929 * @ WINDOWID: X window id number of the window
924 * @ COLORTERM: terminal sub-name and also indicates its color 930 * @ COLORTERM: terminal sub-name and also indicates its color
… …
927 * @ COLORFGBG: fg;bg color codes 933 * @ COLORFGBG: fg;bg color codes
928 */ 934 */
929 putenv (env_display); 935 putenv (env_display);
930 putenv (env_windowid); 936 putenv (env_windowid);
931 937
932 if (env_colorfgbg) 938 env_colorfgbg = get_colorfgbg ();
933 putenv (env_colorfgbg); 939 putenv (env_colorfgbg);
934 940
935#ifdef RXVT_TERMINFO 941#ifdef RXVT_TERMINFO
936 putenv ("TERMINFO=" RXVT_TERMINFO); 942 putenv ("TERMINFO=" RXVT_TERMINFO);
937#endif 943#endif
938 944
… …
957 unsetenv ("TERMCAP"); /* terminfo should be okay */ 963 unsetenv ("TERMCAP"); /* terminfo should be okay */
958#endif /* HAVE_UNSETENV */ 964#endif /* HAVE_UNSETENV */
959} 965}
960 966
961/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
962/*
963 * This is more or less stolen straight from XFree86 xterm.
964 * This should support all European type languages.
965 */
966void 968void
967rxvt_term::set_locale (const char *locale) 969rxvt_term::set_locale (const char *locale)
968{ 970{
969 set_environ (envv); 971 set_environ (envv);
970 972
971#if HAVE_XSETLOCALE || HAVE_SETLOCALE
972 free (this->locale); 973 free (this->locale);
973 this->locale = setlocale (LC_CTYPE, locale); 974 this->locale = setlocale (LC_CTYPE, locale);
974 975
975 if (!this->locale) 976 if (!this->locale)
976 { 977 {
… …
987 988
988 989
989 this->locale = strdup (this->locale); 990 this->locale = strdup (this->locale);
990 SET_LOCALE (this->locale); 991 SET_LOCALE (this->locale);
991 mbstate.reset (); 992 mbstate.reset ();
992#endif
993 993
994#if HAVE_NL_LANGINFO 994#if HAVE_NL_LANGINFO
995 char *codeset = strdup (nl_langinfo (CODESET)); 995 char *codeset = nl_langinfo (CODESET);
996 // /^UTF.?8/i 996 // /^UTF.?8/i
997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
998 && (codeset[1] == 'T' || codeset[1] == 't') 998 && (codeset[1] == 'T' || codeset[1] == 't')
999 && (codeset[2] == 'F' || codeset[2] == 'f') 999 && (codeset[2] == 'F' || codeset[2] == 'f')
1000 && (codeset[3] == '8' || codeset[4] == '8'); 1000 && (codeset[3] == '8' || codeset[4] == '8');
1001 free (codeset);
1002#else 1001#else
1003 enc_utf8 = 0; 1002 enc_utf8 = 0;
1004#endif 1003#endif
1005} 1004}
1006 1005
1007void 1006void
1008rxvt_term::init_xlocale () 1007rxvt_term::init_xlocale ()
1009{ 1008{
1010 set_environ (envv); 1009 set_environ (envv);
1011 1010
1012#ifdef USE_XIM 1011#if USE_XIM
1013 if (!locale) 1012 if (!locale)
1014 rxvt_warn ("setting locale failed, working without locale support.\n"); 1013 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1015 else 1014 else
1016 { 1015 {
1017 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1016 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1018 1017
1019 if (!XSupportsLocale ()) 1018 if (!XSupportsLocale ())
1020 { 1019 {
1021 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1020 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1022 return; 1021 return;
1023 } 1022 }
1024 1023
1025 im_ev.start (display); 1024 im_ev.start (display);
1026 1025
… …
1175/*----------------------------------------------------------------------*/ 1174/*----------------------------------------------------------------------*/
1176/* color aliases, fg/bg bright-bold */ 1175/* color aliases, fg/bg bright-bold */
1177void 1176void
1178rxvt_term::color_aliases (int idx) 1177rxvt_term::color_aliases (int idx)
1179{ 1178{
1180 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1179 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1181 { 1180 {
1182 int i = atoi (rs[Rs_color + idx]); 1181 int i = atoi (rs[Rs_color + idx]);
1183 1182
1184 if (i >= 8 && i <= 15) 1183 if (i >= 8 && i <= 15)
1185 /* bright colors */ 1184 /* bright colors */
… …
1280} 1279}
1281 1280
1282void 1281void
1283rxvt_term::set_icon (const char *file) 1282rxvt_term::set_icon (const char *file)
1284{ 1283{
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 1284#if HAVE_PIXBUF
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1285 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf) 1286 if (!pixbuf)
1339 { 1287 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1288 rxvt_warn ("Loading image icon failed, continuing without.\n");
1341 return; 1289 return;
… …
1378 } 1326 }
1379 1327
1380 row += rowstride; 1328 row += rowstride;
1381 } 1329 }
1382 1330
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1331 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1332 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer); 1333 free (buffer);
1386 } 1334 }
1387 else 1335 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1336 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1390 g_object_unref (pixbuf); 1338 g_object_unref (pixbuf);
1391#endif 1339#endif
1392} 1340}
1393 1341
1394/*----------------------------------------------------------------------*/ 1342/*----------------------------------------------------------------------*/
1395/* rxvt_Create_Windows () - Open and map the window */ 1343/* Open and map the window */
1396void 1344void
1397rxvt_term::create_windows (int argc, const char *const *argv) 1345rxvt_term::create_windows (int argc, const char *const *argv)
1398{ 1346{
1399 XClassHint classHint; 1347 XClassHint classHint;
1400 XWMHints wmHint; 1348 XWMHints wmHint;
… …
1446 } 1394 }
1447#endif 1395#endif
1448 1396
1449 window_calc (0, 0); 1397 window_calc (0, 0);
1450 1398
1451 /* sub-window placement & size in rxvt_resize_subwindows () */ 1399 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1452 attributes.background_pixel = pix_colors_focused [Color_border]; 1400 attributes.background_pixel = pix_colors_focused [Color_border];
1453 attributes.border_pixel = pix_colors_focused [Color_border]; 1401 attributes.border_pixel = pix_colors_focused [Color_border];
1454 attributes.colormap = cmap; 1402 attributes.colormap = cmap;
1455 1403
1456 top = XCreateWindow (dpy, parent, 1404 top = XCreateWindow (dpy, parent,
… …
1459 ext_bwidth, 1407 ext_bwidth,
1460 depth, InputOutput, visual, 1408 depth, InputOutput, visual,
1461 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1409 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1462 &attributes); 1410 &attributes);
1463 1411
1464 this->parent[0] = top; 1412 this->parent = top;
1465
1466 old_width = szHint.width;
1467 old_height = szHint.height;
1468 1413
1469 set_title (rs [Rs_title]); 1414 set_title (rs [Rs_title]);
1470 set_icon_name (rs [Rs_iconName]); 1415 set_icon_name (rs [Rs_iconName]);
1471 1416
1472 classHint.res_name = (char *)rs[Rs_name]; 1417 classHint.res_name = (char *)rs[Rs_name];
… …
1502#if ENABLE_EWMH 1447#if ENABLE_EWMH
1503 xa[XA_NET_WM_PING], 1448 xa[XA_NET_WM_PING],
1504#endif 1449#endif
1505 }; 1450 };
1506 1451
1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1452 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1508 1453
1509#if ENABLE_FRILLS 1454#if ENABLE_FRILLS
1510 if (rs[Rs_transient_for]) 1455 if (rs[Rs_transient_for])
1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1512#endif 1457#endif
… …
1535 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1536 1481
1537 /* the vt window */ 1482 /* the vt window */
1538 vt = XCreateSimpleWindow (dpy, top, 1483 vt = XCreateSimpleWindow (dpy, top,
1539 window_vt_x, window_vt_y, 1484 window_vt_x, window_vt_y,
1540 width, height, 1485 vt_width, vt_height,
1541 0, 1486 0,
1542 pix_colors_focused[Color_fg], 1487 pix_colors_focused[Color_fg],
1543 pix_colors_focused[Color_bg]); 1488 pix_colors_focused[Color_bg]);
1544 1489
1545 attributes.bit_gravity = NorthWestGravity; 1490 attributes.bit_gravity = NorthWestGravity;
… …
1594 if (pty->pty >= 0) 1539 if (pty->pty >= 0)
1595 { 1540 {
1596 if (getfd_hook) 1541 if (getfd_hook)
1597 pty->pty = (*getfd_hook) (pty->pty); 1542 pty->pty = (*getfd_hook) (pty->pty);
1598 1543
1599 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1544 if (pty->pty < 0)
1600 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1545 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1601 } 1546 }
1602 } 1547 }
1603 else 1548 else
1604#endif 1549#endif
1605 if (!pty->get ()) 1550 if (!pty->get ())
1606 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1552
1553 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1607 1554
1608 struct termios tio = def_tio; 1555 struct termios tio = def_tio;
1609 1556
1610#ifndef NO_BACKSPACE_KEY 1557#ifndef NO_BACKSPACE_KEY
1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1558 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1661 1608
1662 _exit (EXIT_FAILURE); 1609 _exit (EXIT_FAILURE);
1663 1610
1664 default: 1611 default:
1665 if (!option (Opt_utmpInhibit)) 1612 if (!option (Opt_utmpInhibit))
1613 {
1614#ifdef LOG_ONLY_ON_LOGIN
1615 bool login_shell = option (Opt_loginShell);
1616#else
1617 bool login_shell = true;
1618#endif
1666 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1619 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1620 }
1667 1621
1668 pty->close_tty (); 1622 pty->close_tty ();
1669 1623
1670 child_ev.start (cmd_pid); 1624 child_ev.start (cmd_pid);
1671 1625
… …
1696#elif defined (SRIOCSREDIR) 1650#elif defined (SRIOCSREDIR)
1697 int fd; 1651 int fd;
1698 1652
1699 fd = open (CONSOLE, O_WRONLY, 0); 1653 fd = open (CONSOLE, O_WRONLY, 0);
1700 if (fd >= 0) 1654 if (fd >= 0)
1701 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1655 {
1656 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1702 close (fd); 1657 close (fd);
1658 }
1703#endif /* SRIOCSREDIR */ 1659#endif /* SRIOCSREDIR */
1704 } 1660 }
1705 1661
1706 /* reset signals and spin off the command interpreter */ 1662 /* reset signals and spin off the command interpreter */
1707 signal (SIGINT, SIG_DFL); 1663 signal (SIGINT, SIG_DFL);

Diff Legend

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