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.268 by root, Mon Jun 14 15:50:08 2010 UTC vs.
Revision 1.319 by sf-exg, Thu Jan 19 13:33:43 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 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <locale.h>
53# endif 53# endif
54#endif 54#endif
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
58#endif 63#endif
59 64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
558 set_option (Opt_iso14755); 563 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 565 set_option (Opt_buffered);
561} 566}
562 567
563static void
564init_secondary ()
565{
566 int i;
567
568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
569 {
570 dup2 (STDERR_FILENO, STDIN_FILENO);
571 }
572 else if (i != STDIN_FILENO)
573 {
574 dup2 (i, STDIN_FILENO);
575 close (i);
576 }
577
578 dup2 (STDERR_FILENO, STDOUT_FILENO);
579}
580
581/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
582const char ** 569const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
584{ 571{
585 int i, r_argc; 572 int i;
586 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
587
588 /*
589 * Look for -e option. Find => split and make cmd_argv[] of command args
590 */
591 for (r_argc = 0; r_argc < argc; r_argc++)
592 if (!strcmp (argv[r_argc], "-e"))
593 break;
594
595 if (r_argc == argc)
596 cmd_argv = NULL;
597 else if (!argv[r_argc + 1])
598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599 else
600 {
601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
602
603 for (i = 0; i < argc - r_argc - 1; i++)
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605
606 cmd_argv[i] = NULL;
607 }
608
609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
610
611 for (i = 0; i < r_argc; i++)
612 r_argv[i] = (const char *)argv[i];
613
614 r_argv[i] = NULL;
615 574
616 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
617 576
618 /* 577 /*
619 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
620 */ 579 */
621 580
622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
624 583
625 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
626 585
627 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
632 588
633 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
634 xa = display->xa; 590 xa = display->xa;
635 591
636 set (display); 592 set (display);
… …
639#if XFT 595#if XFT
640 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
641 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
642#endif 598#endif
643 599
644 free (r_argv);
645
646 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
648 rs [i] = 0; 602 rs [i] = 0;
649 603
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
654
655#if ENABLE_PERL 604#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
658 607
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 611 {
663 rxvt_perl.init (this); 612 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 614 }
666#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 ();
667 620
668 /* 621 /*
669 * set any defaults not already set 622 * set any defaults not already set
670 */ 623 */
671 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
780 return cmd_argv; 733 return cmd_argv;
781} 734}
782 735
783/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
784void 737void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
786{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
787 this->envv = envv; 744 this->envv = envv;
788 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{
789 SET_R (this); 771 SET_R (this);
790 set_locale (""); 772 set_locale ("");
791 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 :(
792 774
793 init_vars (); 775 init_vars ();
794
795 init_secondary ();
796 776
797 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
798 778
799#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 780 keyboard->register_done ();
… …
809 if (chdir (path)) 789 if (chdir (path))
810 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");
811 } 791 }
812 792
813 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 795
816 pty = ptytty::create (); 796 pty = ptytty::create ();
797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
817 807
818 create_windows (argc, argv); 808 create_windows (argc, argv);
819 809
820 init_xlocale (); 810 init_xlocale ();
821 811
… …
827 817
828 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
831 { 821 {
832 bgPixmap.set_target (this); 822 bg_init ();
833 bgPixmap.invalidate ();
834 823
835#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
837 { 826 {
838 bgPixmap.set_transparent (); 827 bg_set_transparent ();
839 828
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
843#endif 831
844 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
846 834
847 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
849 837
850 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
853 } 841 }
854#endif 842#endif
855 843
856#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
871 update_background (); 848 update_background ();
872 }
873#endif 849#endif
874 } 850 }
875#endif 851#endif
876 852
877#if ENABLE_PERL 853#if ENABLE_PERL
878 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
879#endif 855#endif
880 856
881 set_colorfgbg (); 857 init_done = 1;
882 858
883 init_command (cmd_argv); 859 init_command (cmd_argv);
884
885 free (cmd_argv);
886 860
887 if (pty->pty >= 0) 861 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
889 863
890 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
892#if ENABLE_XEMBED 866#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
894 { 868 {
895 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
896 870
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 873 }
900#endif 874#endif
901 875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
902 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
904 902
905 refresh_check (); 903 refresh_check ();
906} 904}
907 905
908/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
909void 907void
910rxvt_term::init_env () 908rxvt_term::init_env ()
911{ 909{
912 int i;
913 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
914 915
915#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 918 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
918 * (for the first non-loopback interface) that we get from 919 * (for the first non-loopback interface) that we get from
… …
931 val = XDisplayString (dpy); 932 val = XDisplayString (dpy);
932 933
933 if (rs[Rs_display_name] == NULL) 934 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 935 rs[Rs_display_name] = val; /* use broken `:0' value */
935 936
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 938
939 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
940 940
941 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 943
943 /* add entries to the environment: 944 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 947 * @ COLORTERM: terminal sub-name and also indicates its color
… …
949 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
950 */ 951 */
951 putenv (env_display); 952 putenv (env_display);
952 putenv (env_windowid); 953 putenv (env_windowid);
953 954
954 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
956 957
957#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 960#endif
960 961
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
981} 982}
982 983
983/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 985void
989rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
990{ 987{
991 set_environ (envv); 988 set_environ (envv);
992 989
… …
1012 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
1013 mbstate.reset (); 1010 mbstate.reset ();
1014#endif 1011#endif
1015 1012
1016#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 1015 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 1020#else
1025 enc_utf8 = 0; 1021 enc_utf8 = 0;
1026#endif 1022#endif
1027} 1023}
1028 1024
… …
1031{ 1027{
1032 set_environ (envv); 1028 set_environ (envv);
1033 1029
1034#ifdef USE_XIM 1030#ifdef USE_XIM
1035 if (!locale) 1031 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1033 else
1038 { 1034 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1036
1041 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
1042 { 1038 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1039 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1040 return;
1045 } 1041 }
1046 1042
1047 im_ev.start (display); 1043 im_ev.start (display);
1048 1044
… …
1197/*----------------------------------------------------------------------*/ 1193/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1194/* color aliases, fg/bg bright-bold */
1199void 1195void
1200rxvt_term::color_aliases (int idx) 1196rxvt_term::color_aliases (int idx)
1201{ 1197{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1198 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1199 {
1204 int i = atoi (rs[Rs_color + idx]); 1200 int i = atoi (rs[Rs_color + idx]);
1205 1201
1206 if (i >= 8 && i <= 15) 1202 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1203 /* bright colors */
… …
1299 1295
1300 if (i) 1296 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1297 ModMetaMask = modmasks[i - 1];
1302} 1298}
1303 1299
1300void
1301rxvt_term::set_icon (const char *file)
1302{
1303#ifdef HAVE_AFTERIMAGE
1304 init_asv ();
1305
1306 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1307 if (!im)
1308 {
1309 rxvt_warn ("Loading image icon failed, continuing without.\n");
1310 return;
1311 }
1312
1313 unsigned int w = im->width;
1314 unsigned int h = im->height;
1315
1316 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1317 {
1318 rxvt_warn ("Icon image too big, continuing without.\n");
1319 destroy_asimage (&im);
1320 return;
1321 }
1322
1323 ASImage *result = scale_asimage (asv, im,
1324 w, h, ASA_ARGB32,
1325 100, ASIMAGE_QUALITY_DEFAULT);
1326 destroy_asimage (&im);
1327
1328 if (!result)
1329 {
1330 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1331 return;
1332 }
1333
1334 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1335 if (buffer)
1336 {
1337 ARGB32 *asbuf = result->alt.argb32;
1338 buffer [0] = w;
1339 buffer [1] = h;
1340
1341 for (unsigned int i = 0; i < w * h; ++i)
1342 buffer [i + 2] = asbuf [i];
1343
1344 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1345 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1346 free (buffer);
1347 }
1348 else
1349 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1350
1351 destroy_asimage (&result);
1352#endif
1353
1354#ifdef HAVE_PIXBUF
1355 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1356 if (!pixbuf)
1357 {
1358 rxvt_warn ("Loading image icon failed, continuing without.\n");
1359 return;
1360 }
1361
1362 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1363 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1364
1365 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1366 {
1367 rxvt_warn ("Icon image too big, continuing without.\n");
1368 g_object_unref (pixbuf);
1369 return;
1370 }
1371
1372 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1373 {
1374 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1375 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1376 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1377
1378 buffer [0] = w;
1379 buffer [1] = h;
1380 for (int i = 0; i < h; i++)
1381 {
1382 for (int j = 0; j < w; j++)
1383 {
1384 unsigned char *pixel = row + j * channels;
1385 long value;
1386
1387 if (channels == 4)
1388 value = pixel[3];
1389 else
1390 value = (unsigned char)0x00ff;
1391
1392 value = (value << 8) + pixel[0];
1393 value = (value << 8) + pixel[1];
1394 value = (value << 8) + pixel[2];
1395 buffer[(i * w + j) + 2] = value;
1396 }
1397
1398 row += rowstride;
1399 }
1400
1401 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1402 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1403 free (buffer);
1404 }
1405 else
1406 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1407
1408 g_object_unref (pixbuf);
1409#endif
1410}
1411
1304/*----------------------------------------------------------------------*/ 1412/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1413/* Open and map the window */
1306void 1414void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1415rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1416{
1309 XClassHint classHint; 1417 XClassHint classHint;
1310 XWMHints wmHint; 1418 XWMHints wmHint;
… …
1356 } 1464 }
1357#endif 1465#endif
1358 1466
1359 window_calc (0, 0); 1467 window_calc (0, 0);
1360 1468
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1469 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1470 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1471 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1472 attributes.colormap = cmap;
1365 1473
1366 top = XCreateWindow (dpy, parent, 1474 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1477 ext_bwidth,
1370 depth, InputOutput, visual, 1478 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1480 &attributes);
1373 1481
1374 this->parent[0] = top; 1482 this->parent = top;
1375
1376 old_width = szHint.width;
1377 old_height = szHint.height;
1378 1483
1379 set_title (rs [Rs_title]); 1484 set_title (rs [Rs_title]);
1380 set_icon_name (rs [Rs_iconName]); 1485 set_icon_name (rs [Rs_iconName]);
1381 1486
1382 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
… …
1388 wmHint.window_group = top; 1493 wmHint.window_group = top;
1389 1494
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1495 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1496 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1497#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1498 /*
1395 * set up icon hint 1499 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1500 * rs [Rs_iconfile] is path to icon
1397 */ 1501 */
1398 1502
1399 if (rs [Rs_iconfile]) 1503 if (rs [Rs_iconfile])
1400 { 1504 {
1401 init_asv (); 1505 set_icon (rs [Rs_iconfile]);
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 } 1506 }
1440# endif
1441#endif 1507#endif
1442 1508
1443#if ENABLE_FRILLS 1509#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1510 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1511 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1517#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1518 xa[XA_NET_WM_PING],
1453#endif 1519#endif
1454 }; 1520 };
1455 1521
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1522 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1523
1458#if ENABLE_FRILLS 1524#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1525 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1526 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1527#endif
… …
1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1485 1551
1486 /* the vt window */ 1552 /* the vt window */
1487 vt = XCreateSimpleWindow (dpy, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1488 window_vt_x, window_vt_y, 1554 window_vt_x, window_vt_y,
1489 width, height, 1555 vt_width, vt_height,
1490 0, 1556 0,
1491 pix_colors_focused[Color_fg], 1557 pix_colors_focused[Color_fg],
1492 pix_colors_focused[Color_bg]); 1558 pix_colors_focused[Color_bg]);
1493 1559
1494 attributes.bit_gravity = NorthWestGravity; 1560 attributes.bit_gravity = NorthWestGravity;
… …
1522 pix_colors = pix_colors_unfocused; 1588 pix_colors = pix_colors_unfocused;
1523#endif 1589#endif
1524 1590
1525 pointer_unblank (); 1591 pointer_unblank ();
1526 scr_recolour (); 1592 scr_recolour ();
1527}
1528
1529/* ------------------------------------------------------------------------- *
1530 * GET TTY CURRENT STATE *
1531 * ------------------------------------------------------------------------- */
1532void
1533rxvt_get_ttymode (struct termios *tio, int erase)
1534{
1535 /*
1536 * standard System V termios interface
1537 */
1538 // does not work as stdin is not a tty
1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1541 {
1542 // return error - use system defaults,
1543 // where possible, and zero elsewhere
1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1548
1549 tio->c_cc[VINTR] = CINTR;
1550 tio->c_cc[VQUIT] = CQUIT;
1551 tio->c_cc[VERASE] = CERASE;
1552#ifdef VERASE2
1553 tio->c_cc[VERASE2] = CERASE2;
1554#endif
1555 tio->c_cc[VKILL] = CKILL;
1556 tio->c_cc[VSTART] = CSTART;
1557 tio->c_cc[VSTOP] = CSTOP;
1558 tio->c_cc[VSUSP] = CSUSP;
1559# ifdef VDSUSP
1560 tio->c_cc[VDSUSP] = CDSUSP;
1561# endif
1562# ifdef VREPRINT
1563 tio->c_cc[VREPRINT] = CRPRNT;
1564# endif
1565# ifdef VDISCRD
1566 tio->c_cc[VDISCRD] = CFLUSH;
1567# endif
1568# ifdef VWERSE
1569 tio->c_cc[VWERSE] = CWERASE;
1570# endif
1571# ifdef VLNEXT
1572 tio->c_cc[VLNEXT] = CLNEXT;
1573# endif
1574 }
1575
1576 tio->c_cc[VEOF] = CEOF;
1577# if VMIN != VEOF
1578 tio->c_cc[VMIN] = 1;
1579# endif
1580# if VTIME != VEOL
1581 tio->c_cc[VTIME] = 0;
1582# endif
1583
1584 if (erase != -1)
1585 tio->c_cc[VERASE] = (char)erase;
1586
1587 /* input modes */
1588 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1589# ifdef IMAXBEL
1590 | IMAXBEL
1591# endif
1592 | IXON);
1593
1594 /* output modes */
1595 tio->c_oflag = (OPOST | ONLCR);
1596
1597 /* control modes */
1598 tio->c_cflag = (CS8 | CREAD);
1599
1600 /* line discipline modes */
1601 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1602# if defined (ECHOCTL) && defined (ECHOKE)
1603 | ECHOCTL | ECHOKE
1604# endif
1605 | ECHOE | ECHOK);
1606
1607 /*
1608 * Debugging
1609 */
1610#ifdef DEBUG_TTYMODE
1611 /* c_iflag bits */
1612 fprintf (stderr, "Input flags\n");
1613
1614 /* cpp token stringize doesn't work on all machines <sigh> */
1615# define FOO(flag,name) \
1616 if ((tio->c_iflag) & flag) \
1617 fprintf (stderr, "%s ", name)
1618
1619 /* c_iflag bits */
1620 FOO (IGNBRK, "IGNBRK");
1621 FOO (BRKINT, "BRKINT");
1622 FOO (IGNPAR, "IGNPAR");
1623 FOO (PARMRK, "PARMRK");
1624 FOO (INPCK, "INPCK");
1625 FOO (ISTRIP, "ISTRIP");
1626 FOO (INLCR, "INLCR");
1627 FOO (IGNCR, "IGNCR");
1628 FOO (ICRNL, "ICRNL");
1629 FOO (IXON, "IXON");
1630 FOO (IXOFF, "IXOFF");
1631# ifdef IUCLC
1632 FOO (IUCLC, "IUCLC");
1633# endif
1634# ifdef IXANY
1635 FOO (IXANY, "IXANY");
1636# endif
1637# ifdef IMAXBEL
1638 FOO (IMAXBEL, "IMAXBEL");
1639# endif
1640
1641 fprintf (stderr, "\n");
1642
1643# undef FOO
1644# define FOO(entry, name) \
1645 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1646
1647 FOO (VINTR, "VINTR");
1648 FOO (VQUIT, "VQUIT");
1649 FOO (VERASE, "VERASE");
1650 FOO (VKILL, "VKILL");
1651 FOO (VEOF, "VEOF");
1652 FOO (VEOL, "VEOL");
1653# ifdef VEOL2
1654 FOO (VEOL2, "VEOL2");
1655# endif
1656# ifdef VSWTC
1657 FOO (VSWTC, "VSWTC");
1658# endif
1659# ifdef VSWTCH
1660 FOO (VSWTCH, "VSWTCH");
1661# endif
1662 FOO (VSTART, "VSTART");
1663 FOO (VSTOP, "VSTOP");
1664 FOO (VSUSP, "VSUSP");
1665# ifdef VDSUSP
1666 FOO (VDSUSP, "VDSUSP");
1667# endif
1668# ifdef VREPRINT
1669 FOO (VREPRINT, "VREPRINT");
1670# endif
1671# ifdef VDISCRD
1672 FOO (VDISCRD, "VDISCRD");
1673# endif
1674# ifdef VWERSE
1675 FOO (VWERSE, "VWERSE");
1676# endif
1677# ifdef VLNEXT
1678 FOO (VLNEXT, "VLNEXT");
1679# endif
1680
1681 fprintf (stderr, "\n");
1682# undef FOO
1683#endif /* DEBUG_TTYMODE */
1684} 1593}
1685 1594
1686/*----------------------------------------------------------------------*/ 1595/*----------------------------------------------------------------------*/
1687/* 1596/*
1688 * Run the command in a subprocess and return a file descriptor for the 1597 * Run the command in a subprocess and return a file descriptor for the
… …
1700 if (pty->pty >= 0) 1609 if (pty->pty >= 0)
1701 { 1610 {
1702 if (getfd_hook) 1611 if (getfd_hook)
1703 pty->pty = (*getfd_hook) (pty->pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1704 1613
1705 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1706 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1707 } 1616 }
1708 } 1617 }
1709 else 1618 else
1710#endif 1619#endif
1711 if (!pty->get ()) 1620 if (!pty->get ())
1712 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1621 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1713 1622
1714 int er; 1623 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1624
1625 struct termios tio = def_tio;
1715 1626
1716#ifndef NO_BACKSPACE_KEY 1627#ifndef NO_BACKSPACE_KEY
1717 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718 er = rs[Rs_backspace_key][0]; 1629 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1719 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1630 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720 er = '\177'; /* the initial state anyway */ 1631 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1721 else
1722#endif 1632#endif
1723 er = -1;
1724 1633
1725 rxvt_get_ttymode (&tio, er);
1726 /* init terminal attributes */ 1634 /* init terminal attributes */
1727 cfsetospeed (&tio, BAUDRATE); 1635 cfsetospeed (&tio, BAUDRATE);
1728 cfsetispeed (&tio, BAUDRATE); 1636 cfsetispeed (&tio, BAUDRATE);
1729 tcsetattr (pty->tty, TCSANOW, &tio); 1637 tcsetattr (pty->tty, TCSANOW, &tio);
1730 pty->set_utf8_mode (enc_utf8); 1638 pty->set_utf8_mode (enc_utf8);
… …
1770 1678
1771 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1772 1680
1773 default: 1681 default:
1774 if (!option (Opt_utmpInhibit)) 1682 if (!option (Opt_utmpInhibit))
1683 {
1684#ifdef LOG_ONLY_ON_LOGIN
1685 bool login_shell = option (Opt_loginShell);
1686#else
1687 bool login_shell = true;
1688#endif
1775 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1690 }
1776 1691
1777 pty->close_tty (); 1692 pty->close_tty ();
1778 1693
1779 child_ev.start (cmd_pid); 1694 child_ev.start (cmd_pid);
1780 1695
… …
1805#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1806 int fd; 1721 int fd;
1807 1722
1808 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1809 if (fd >= 0) 1724 if (fd >= 0)
1810 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1811 close (fd); 1727 close (fd);
1728 }
1812#endif /* SRIOCSREDIR */ 1729#endif /* SRIOCSREDIR */
1813 } 1730 }
1814 1731
1815 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1816 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);
1817 signal (SIGQUIT, SIG_DFL); 1734 signal (SIGQUIT, SIG_DFL);
1818 signal (SIGCHLD, SIG_DFL); 1735 signal (SIGCHLD, SIG_DFL);
1819 signal (SIGHUP, SIG_DFL); 1736 signal (SIGHUP, SIG_DFL);
1820 signal (SIGPIPE, SIG_DFL); 1737 signal (SIGPIPE, SIG_DFL);
1821 /* 1738 /*
1822 * mimick login's behavior by disabling the job control signals 1739 * mimic login's behavior by disabling the job control signals
1823 * a shell that wants them can turn them back on 1740 * a shell that wants them can turn them back on
1824 */ 1741 */
1825#ifdef SIGTSTP 1742#ifdef SIGTSTP
1826 signal (SIGTSTP, SIG_IGN); 1743 signal (SIGTSTP, SIG_IGN);
1827 signal (SIGTTIN, SIG_IGN); 1744 signal (SIGTTIN, SIG_IGN);

Diff Legend

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