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.336 by sf-exg, Wed Sep 3 18:20:37 2014 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 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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;
… …
513#endif 519#endif
514 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
515#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
516 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
517#endif 523#endif
518#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
519 NULL, 525 NULL,
520#endif 526#endif
521#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
522 "rgb:00/00/00", 528 "rgb:00/00/00",
523#endif 529#endif
… …
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 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])
… …
689 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
690 pointerBlankDelay = i; 658 pointerBlankDelay = i;
691 else 659 else
692 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
693#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
694 669
695 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
696 if (!saveLines) 671 if (!saveLines)
697 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
698 673
… …
763 return cmd_argv; 738 return cmd_argv;
764} 739}
765 740
766/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
767void 742void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 743rxvt_term::init (stringvec *argv, stringvec *envv)
769{ 744{
745 argv->push_back (0);
746 envv->push_back (0);
747
748 this->argv = argv;
770 this->envv = envv; 749 this->envv = envv;
771 750
751 init2 (argv->size () - 1, argv->begin ());
752}
753
754void
755rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
756{
757#if ENABLE_PERL
758 // perl might want to access the stringvecs later, so we need to copy them
759 stringvec *args = new stringvec;
760 for (int i = 0; i < argc; i++)
761 args->push_back (strdup (argv [i]));
762
763 stringvec *envs = new stringvec;
764 for (const char *const *var = envv; *var; var++)
765 envs->push_back (strdup (*var));
766
767 init (args, envs);
768#else
769 init2 (argc, argv);
770#endif
771}
772
773void
774rxvt_term::init2 (int argc, const char *const *argv)
775{
772 SET_R (this); 776 SET_R (this);
773 set_locale (""); 777 set_locale ("");
774 set_environ (envv); // a few things in X do not call setlocale :( 778 set_environ (envv); // a few things in X do not call setlocale :(
775 779
776 init_vars (); 780 init_vars ();
… …
790 if (chdir (path)) 794 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 795 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 } 796 }
793 797
794 if (option (Opt_scrollBar)) 798 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 799 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
796 800
797 pty = ptytty::create (); 801 pty = ptytty::create ();
798 802
799 create_windows (argc, argv); 803 create_windows (argc, argv);
800 804
… …
806 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
807#endif 811#endif
808 812
809 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
815
811#ifdef HAVE_BG_PIXMAP 816#ifdef HAVE_BG_PIXMAP
812 { 817 bg_init ();
813 bgPixmap.set_target (this);
814 bgPixmap.invalidate ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bgPixmap.set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#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 }
855#endif 818#endif
856 819
857#if ENABLE_PERL 820#if ENABLE_PERL
858 rootwin_ev.start (display, display->root); 821 rootwin_ev.start (display, display->root);
859#endif 822#endif
860 823
861 set_colorfgbg (); 824 init_done = 1;
862 825
863 init_command (cmd_argv); 826 init_command (cmd_argv);
864
865 free (cmd_argv);
866 827
867 if (pty->pty >= 0) 828 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 829 pty_ev.start (pty->pty, ev::READ);
869 830
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 831 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
872#if ENABLE_XEMBED 833#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 834 if (rs[Rs_embed])
874 { 835 {
875 long info[2] = { 0, XEMBED_MAPPED }; 836 long info[2] = { 0, XEMBED_MAPPED };
876 837
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 838 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 839 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 840 }
880#endif 841#endif
881 842
843#if HAVE_STARTUP_NOTIFICATION
844 SnDisplay *snDisplay;
845 SnLauncheeContext *snContext;
846
847 snDisplay = sn_display_new (dpy, NULL, NULL);
848 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
849
850 /* Tell the window manager that this window is part of the startup context */
851 if (snContext)
852 sn_launchee_context_setup_window (snContext, parent);
853#endif
854
882 XMapWindow (dpy, vt); 855 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 856 XMapWindow (dpy, parent);
857
858#if HAVE_STARTUP_NOTIFICATION
859 if (snContext)
860 {
861 /* Mark the startup process as complete */
862 sn_launchee_context_complete (snContext);
863
864 sn_launchee_context_unref (snContext);
865 }
866
867 sn_display_unref (snDisplay);
868#endif
884 869
885 refresh_check (); 870 refresh_check ();
886} 871}
887 872
888/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
889void 874void
890rxvt_term::init_env () 875rxvt_term::init_env ()
891{ 876{
892 char *val; 877 char *val;
878 char *env_display;
879 char *env_windowid;
880 char *env_colorfgbg;
881 char *env_term;
893 882
894#ifdef DISPLAY_IS_IP 883#ifdef DISPLAY_IS_IP
895 /* Fixup display_name for export over pty to any interested terminal 884 /* 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 885 * 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 886 * (for the first non-loopback interface) that we get from
… …
914 903
915 env_display = (char *)rxvt_malloc (strlen (val) + 9); 904 env_display = (char *)rxvt_malloc (strlen (val) + 9);
916 905
917 sprintf (env_display, "DISPLAY=%s", val); 906 sprintf (env_display, "DISPLAY=%s", val);
918 907
908 env_windowid = (char *)rxvt_malloc (21);
919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 909 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
920 910
921 /* add entries to the environment: 911 /* add entries to the environment:
922 * @ DISPLAY: in case we started with -display 912 * @ DISPLAY: in case we started with -display
923 * @ WINDOWID: X window id number of the window 913 * @ WINDOWID: X window id number of the window
924 * @ COLORTERM: terminal sub-name and also indicates its color 914 * @ COLORTERM: terminal sub-name and also indicates its color
… …
927 * @ COLORFGBG: fg;bg color codes 917 * @ COLORFGBG: fg;bg color codes
928 */ 918 */
929 putenv (env_display); 919 putenv (env_display);
930 putenv (env_windowid); 920 putenv (env_windowid);
931 921
932 if (env_colorfgbg) 922 env_colorfgbg = get_colorfgbg ();
933 putenv (env_colorfgbg); 923 putenv (env_colorfgbg);
934 924
935#ifdef RXVT_TERMINFO 925#ifdef RXVT_TERMINFO
936 putenv ("TERMINFO=" RXVT_TERMINFO); 926 putenv ("TERMINFO=" RXVT_TERMINFO);
937#endif 927#endif
938 928
… …
957 unsetenv ("TERMCAP"); /* terminfo should be okay */ 947 unsetenv ("TERMCAP"); /* terminfo should be okay */
958#endif /* HAVE_UNSETENV */ 948#endif /* HAVE_UNSETENV */
959} 949}
960 950
961/*----------------------------------------------------------------------*/ 951/*----------------------------------------------------------------------*/
962/*
963 * This is more or less stolen straight from XFree86 xterm.
964 * This should support all European type languages.
965 */
966void 952void
967rxvt_term::set_locale (const char *locale) 953rxvt_term::set_locale (const char *locale)
968{ 954{
969 set_environ (envv); 955 set_environ (envv);
970 956
971#if HAVE_XSETLOCALE || HAVE_SETLOCALE
972 free (this->locale); 957 free (this->locale);
973 this->locale = setlocale (LC_CTYPE, locale); 958 this->locale = setlocale (LC_CTYPE, locale);
974 959
975 if (!this->locale) 960 if (!this->locale)
976 { 961 {
… …
987 972
988 973
989 this->locale = strdup (this->locale); 974 this->locale = strdup (this->locale);
990 SET_LOCALE (this->locale); 975 SET_LOCALE (this->locale);
991 mbstate.reset (); 976 mbstate.reset ();
992#endif
993 977
994#if HAVE_NL_LANGINFO 978#if HAVE_NL_LANGINFO
995 char *codeset = strdup (nl_langinfo (CODESET)); 979 char *codeset = nl_langinfo (CODESET);
996 // /^UTF.?8/i 980 // /^UTF.?8/i
997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 981 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
998 && (codeset[1] == 'T' || codeset[1] == 't') 982 && (codeset[1] == 'T' || codeset[1] == 't')
999 && (codeset[2] == 'F' || codeset[2] == 'f') 983 && (codeset[2] == 'F' || codeset[2] == 'f')
1000 && (codeset[3] == '8' || codeset[4] == '8'); 984 && (codeset[3] == '8' || codeset[4] == '8');
1001 free (codeset);
1002#else 985#else
1003 enc_utf8 = 0; 986 enc_utf8 = 0;
1004#endif 987#endif
1005} 988}
1006 989
1007void 990void
1008rxvt_term::init_xlocale () 991rxvt_term::init_xlocale ()
1009{ 992{
1010 set_environ (envv); 993 set_environ (envv);
1011 994
1012#ifdef USE_XIM 995#if USE_XIM
1013 if (!locale) 996 if (!locale)
1014 rxvt_warn ("setting locale failed, working without locale support.\n"); 997 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1015 else 998 else
1016 { 999 {
1017 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1018 1001
1019 if (!XSupportsLocale ()) 1002 if (!XSupportsLocale ())
1020 { 1003 {
1021 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1004 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1022 return; 1005 return;
1023 } 1006 }
1024 1007
1025 im_ev.start (display); 1008 im_ev.start (display);
1026 1009
… …
1175/*----------------------------------------------------------------------*/ 1158/*----------------------------------------------------------------------*/
1176/* color aliases, fg/bg bright-bold */ 1159/* color aliases, fg/bg bright-bold */
1177void 1160void
1178rxvt_term::color_aliases (int idx) 1161rxvt_term::color_aliases (int idx)
1179{ 1162{
1180 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1181 { 1164 {
1182 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
1183 1166
1184 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
1185 /* bright colors */ 1168 /* bright colors */
… …
1280} 1263}
1281 1264
1282void 1265void
1283rxvt_term::set_icon (const char *file) 1266rxvt_term::set_icon (const char *file)
1284{ 1267{
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 1268#if HAVE_PIXBUF
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf) 1270 if (!pixbuf)
1339 { 1271 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1272 rxvt_warn ("Loading image icon failed, continuing without.\n");
1341 return; 1273 return;
… …
1378 } 1310 }
1379 1311
1380 row += rowstride; 1312 row += rowstride;
1381 } 1313 }
1382 1314
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1315 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1316 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer); 1317 free (buffer);
1386 } 1318 }
1387 else 1319 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1320 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1390 g_object_unref (pixbuf); 1322 g_object_unref (pixbuf);
1391#endif 1323#endif
1392} 1324}
1393 1325
1394/*----------------------------------------------------------------------*/ 1326/*----------------------------------------------------------------------*/
1395/* rxvt_Create_Windows () - Open and map the window */ 1327/* Open and map the window */
1396void 1328void
1397rxvt_term::create_windows (int argc, const char *const *argv) 1329rxvt_term::create_windows (int argc, const char *const *argv)
1398{ 1330{
1399 XClassHint classHint; 1331 XClassHint classHint;
1400 XWMHints wmHint; 1332 XWMHints wmHint;
… …
1446 } 1378 }
1447#endif 1379#endif
1448 1380
1449 window_calc (0, 0); 1381 window_calc (0, 0);
1450 1382
1451 /* sub-window placement & size in rxvt_resize_subwindows () */ 1383 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1452 attributes.background_pixel = pix_colors_focused [Color_border]; 1384 attributes.background_pixel = pix_colors_focused [Color_border];
1453 attributes.border_pixel = pix_colors_focused [Color_border]; 1385 attributes.border_pixel = pix_colors_focused [Color_border];
1454 attributes.colormap = cmap; 1386 attributes.colormap = cmap;
1455 1387
1456 top = XCreateWindow (dpy, parent, 1388 top = XCreateWindow (dpy, parent,
… …
1459 ext_bwidth, 1391 ext_bwidth,
1460 depth, InputOutput, visual, 1392 depth, InputOutput, visual,
1461 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1393 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1462 &attributes); 1394 &attributes);
1463 1395
1464 this->parent[0] = top; 1396 this->parent = top;
1465
1466 old_width = szHint.width;
1467 old_height = szHint.height;
1468 1397
1469 set_title (rs [Rs_title]); 1398 set_title (rs [Rs_title]);
1470 set_icon_name (rs [Rs_iconName]); 1399 set_icon_name (rs [Rs_iconName]);
1471 1400
1472 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1473 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1474 1403
1475 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1476 wmHint.input = True; 1405 wmHint.input = True;
1477 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1478 wmHint.window_group = top; 1409 wmHint.window_group = top;
1479 1410
1480 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1481 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1482#if ENABLE_EWMH 1413#if ENABLE_EWMH
… …
1484 * set up icon hint 1415 * set up icon hint
1485 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1486 */ 1417 */
1487 1418
1488 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1489 {
1490 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1491 }
1492#endif 1421#endif
1493 1422
1494#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1495 if (mwmhints.flags) 1424 if (mwmhints.flags)
1496 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1502#if ENABLE_EWMH 1431#if ENABLE_EWMH
1503 xa[XA_NET_WM_PING], 1432 xa[XA_NET_WM_PING],
1504#endif 1433#endif
1505 }; 1434 };
1506 1435
1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1436 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1508 1437
1509#if ENABLE_FRILLS 1438#if ENABLE_FRILLS
1510 if (rs[Rs_transient_for]) 1439 if (rs[Rs_transient_for])
1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1440 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1512#endif 1441#endif
… …
1535 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1536 1465
1537 /* the vt window */ 1466 /* the vt window */
1538 vt = XCreateSimpleWindow (dpy, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1539 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1540 width, height, 1469 vt_width, vt_height,
1541 0, 1470 0,
1542 pix_colors_focused[Color_fg], 1471 pix_colors_focused[Color_fg],
1543 pix_colors_focused[Color_bg]); 1472 pix_colors_focused[Color_bg]);
1544 1473
1545 attributes.bit_gravity = NorthWestGravity; 1474 attributes.bit_gravity = NorthWestGravity;
… …
1594 if (pty->pty >= 0) 1523 if (pty->pty >= 0)
1595 { 1524 {
1596 if (getfd_hook) 1525 if (getfd_hook)
1597 pty->pty = (*getfd_hook) (pty->pty); 1526 pty->pty = (*getfd_hook) (pty->pty);
1598 1527
1599 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1528 if (pty->pty < 0)
1600 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1529 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1601 } 1530 }
1602 } 1531 }
1603 else 1532 else
1604#endif 1533#endif
1605 if (!pty->get ()) 1534 if (!pty->get ())
1606 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1536
1537 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1607 1538
1608 struct termios tio = def_tio; 1539 struct termios tio = def_tio;
1609 1540
1610#ifndef NO_BACKSPACE_KEY 1541#ifndef NO_BACKSPACE_KEY
1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1542 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1661 1592
1662 _exit (EXIT_FAILURE); 1593 _exit (EXIT_FAILURE);
1663 1594
1664 default: 1595 default:
1665 if (!option (Opt_utmpInhibit)) 1596 if (!option (Opt_utmpInhibit))
1597 {
1598#ifdef LOG_ONLY_ON_LOGIN
1599 bool login_shell = option (Opt_loginShell);
1600#else
1601 bool login_shell = true;
1602#endif
1666 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1603 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1604 }
1667 1605
1668 pty->close_tty (); 1606 pty->close_tty ();
1669 1607
1670 child_ev.start (cmd_pid); 1608 child_ev.start (cmd_pid);
1671 1609
… …
1696#elif defined (SRIOCSREDIR) 1634#elif defined (SRIOCSREDIR)
1697 int fd; 1635 int fd;
1698 1636
1699 fd = open (CONSOLE, O_WRONLY, 0); 1637 fd = open (CONSOLE, O_WRONLY, 0);
1700 if (fd >= 0) 1638 if (fd >= 0)
1701 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1639 {
1640 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1702 close (fd); 1641 close (fd);
1642 }
1703#endif /* SRIOCSREDIR */ 1643#endif /* SRIOCSREDIR */
1704 } 1644 }
1705 1645
1706 /* reset signals and spin off the command interpreter */ 1646 /* reset signals and spin off the command interpreter */
1707 signal (SIGINT, SIG_DFL); 1647 signal (SIGINT, SIG_DFL);

Diff Legend

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