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.345 by sf-exg, Tue Oct 13 08:10:43 2015 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * 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 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 39#include "init.h"
39#include "keyboard.h" 40#include "keyboard.h"
40 41
41#include <limits> 42#include <limits>
42 43
43#include <csignal> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 56# include <locale.h>
53# endif
54#endif 57#endif
55 58
56#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 60# include <langinfo.h>
61#endif
62
63#ifdef HAVE_STARTUP_NOTIFICATION
64# define SN_API_NOT_YET_FROZEN
65# include <libsn/sn-launchee.h>
58#endif 66#endif
59 67
60#ifdef DISPLAY_IS_IP 68#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 69/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 70#include <sys/types.h>
63#include <sys/socket.h> 71#include <sys/socket.h>
64 72
65/* these next is probably only on Sun (not Solaris) */ 73/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H 74#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h> 75#include <sys/sockio.h>
76#endif
77#ifdef HAVE_SYS_BYTEORDER_H
78#include <sys/byteorder.h>
68#endif 79#endif
69 80
70#include <netinet/in.h> 81#include <netinet/in.h>
71#include <arpa/inet.h> 82#include <arpa/inet.h>
72#include <net/if.h> 83#include <net/if.h>
73#include <net/if_arp.h> 84#include <net/if_arp.h>
74 85
75static char * 86static char * ecb_cold
76rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
77{ 88{
78 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
79 struct ifconf ifc; 90 struct ifconf ifc;
80 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
513#endif 524#endif
514 COLOR_SCROLLBAR, 525 COLOR_SCROLLBAR,
515#ifdef RXVT_SCROLLBAR 526#ifdef RXVT_SCROLLBAR
516 COLOR_SCROLLTROUGH, 527 COLOR_SCROLLTROUGH,
517#endif 528#endif
518#if ENABLE_TRANSPARENCY 529#if BG_IMAGE_FROM_ROOT
519 NULL, 530 NULL,
520#endif 531#endif
521#if OFF_FOCUS_FADING 532#if OFF_FOCUS_FADING
522 "rgb:00/00/00", 533 "rgb:00/00/00",
523#endif 534#endif
… …
559 570
560/*----------------------------------------------------------------------*/ 571/*----------------------------------------------------------------------*/
561const char ** 572const char **
562rxvt_term::init_resources (int argc, const char *const *argv) 573rxvt_term::init_resources (int argc, const char *const *argv)
563{ 574{
564 int i, r_argc; 575 int i;
565 const char **cmd_argv, **r_argv; 576 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 577
595 rs[Rs_name] = rxvt_basename (argv[0]); 578 rs[Rs_name] = rxvt_basename (argv[0]);
596 579
597 /* 580 /*
598 * Open display, get options/resources and create the window 581 * Open display, get options/resources and create the window
599 */ 582 */
600 583
601 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 584 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
602 rs[Rs_display_name] = ":0"; 585 rs[Rs_display_name] = ":0";
603 586
604 get_options (r_argc, r_argv); 587 cmd_argv = get_options (argc, argv);
605 588
606 if (!(display = displays.get (rs[Rs_display_name]))) 589 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]); 590 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
610 }
611 591
612 // using a local pointer decreases code size a lot 592 // using a local pointer decreases code size a lot
613 xa = display->xa; 593 xa = display->xa;
614 594
615 set (display); 595 set (display);
616 extract_resources (); 596 extract_resources ();
617 597
618#if XFT 598#if ENABLE_FRILLS
619 if (rs[Rs_depth]) 599 if (rs[Rs_visual])
620 select_visual (strtol (rs[Rs_depth], 0, 0)); 600 select_visual (strtol (rs[Rs_visual], 0, 0));
601 else if (rs[Rs_depth])
602 select_depth (strtol (rs[Rs_depth], 0, 0));
621#endif 603#endif
622
623 free (r_argv);
624 604
625 for (int i = NUM_RESOURCES; i--; ) 605 for (int i = NUM_RESOURCES; i--; )
626 if (rs [i] == resval_undef) 606 if (rs [i] == resval_undef)
627 rs [i] = 0; 607 rs [i] = 0;
628 608
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 609#if ENABLE_PERL
639 if (!rs[Rs_perl_ext_1]) 610 if (!rs[Rs_perl_ext_1])
640 rs[Rs_perl_ext_1] = "default"; 611 rs[Rs_perl_ext_1] = "default";
641 612
642 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 613 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
645 { 616 {
646 rxvt_perl.init (this); 617 rxvt_perl.init (this);
647 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 618 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
648 } 619 }
649#endif 620#endif
621
622 // must be called after initialising the perl interpreter as it
623 // may invoke the `on_register_command' hook
624 extract_keysym_resources ();
650 625
651 /* 626 /*
652 * set any defaults not already set 627 * set any defaults not already set
653 */ 628 */
654 if (cmd_argv && cmd_argv[0]) 629 if (cmd_argv && cmd_argv[0])
… …
689 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 664 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
690 pointerBlankDelay = i; 665 pointerBlankDelay = i;
691 else 666 else
692 pointerBlankDelay = 2; 667 pointerBlankDelay = 2;
693#endif 668#endif
669
670 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
671 multiClickTime = i;
672 else
673 multiClickTime = 500;
674
675 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
694 676
695 /* no point having a scrollbar without having any scrollback! */ 677 /* no point having a scrollbar without having any scrollback! */
696 if (!saveLines) 678 if (!saveLines)
697 set_option (Opt_scrollBar, 0); 679 set_option (Opt_scrollBar, 0);
698 680
… …
763 return cmd_argv; 745 return cmd_argv;
764} 746}
765 747
766/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
767void 749void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 750rxvt_term::init (stringvec *argv, stringvec *envv)
769{ 751{
752 argv->push_back (0);
753 envv->push_back (0);
754
755 this->argv = argv;
770 this->envv = envv; 756 this->envv = envv;
771 757
758 env = new char *[this->envv->size ()];
759 for (int i = 0; i < this->envv->size (); i++)
760 env[i] = this->envv->at (i);
761
762 init2 (argv->size () - 1, argv->begin ());
763}
764
765void
766rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
767{
768#if ENABLE_PERL
769 // perl might want to access the stringvecs later, so we need to copy them
770 stringvec *args = new stringvec;
771 for (int i = 0; i < argc; i++)
772 args->push_back (strdup (argv [i]));
773
774 stringvec *envs = new stringvec;
775 for (const char *const *var = envv; *var; var++)
776 envs->push_back (strdup (*var));
777
778 init (args, envs);
779#else
780 init2 (argc, argv);
781#endif
782}
783
784void
785rxvt_term::init2 (int argc, const char *const *argv)
786{
772 SET_R (this); 787 SET_R (this);
773 set_locale (""); 788 set_locale ("");
774 set_environ (envv); // a few things in X do not call setlocale :( 789 set_environ (env); // a few things in X do not call setlocale :(
775 790
776 init_vars (); 791 init_vars ();
777 792
778 const char **cmd_argv = init_resources (argc, argv); 793 const char **cmd_argv = init_resources (argc, argv);
779 794
… …
790 if (chdir (path)) 805 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 806 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 } 807 }
793 808
794 if (option (Opt_scrollBar)) 809 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 810 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
796 811
797 pty = ptytty::create (); 812 pty = ptytty::create ();
798 813
799 create_windows (argc, argv); 814 create_windows (argc, argv);
800 815
… …
806 XSynchronize (dpy, True); 821 XSynchronize (dpy, True);
807#endif 822#endif
808 823
809 if (option (Opt_scrollBar)) 824 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */ 825 scrollBar.resize (); /* create and map scrollbar */
826
811#ifdef HAVE_BG_PIXMAP 827#ifdef HAVE_BG_PIXMAP
812 { 828 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 829#endif
856 830
857#if ENABLE_PERL 831#if ENABLE_PERL
858 rootwin_ev.start (display, display->root); 832 rootwin_ev.start (display, display->root);
859#endif 833#endif
860 834
861 set_colorfgbg (); 835 init_done = 1;
862 836
863 init_command (cmd_argv); 837 init_command (cmd_argv);
864
865 free (cmd_argv);
866 838
867 if (pty->pty >= 0) 839 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 840 pty_ev.start (pty->pty, ev::READ);
869 841
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 842 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
872#if ENABLE_XEMBED 844#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 845 if (rs[Rs_embed])
874 { 846 {
875 long info[2] = { 0, XEMBED_MAPPED }; 847 long info[2] = { 0, XEMBED_MAPPED };
876 848
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 849 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 850 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 851 }
880#endif 852#endif
881 853
854#if HAVE_STARTUP_NOTIFICATION
855 SnDisplay *snDisplay;
856 SnLauncheeContext *snContext;
857
858 snDisplay = sn_display_new (dpy, NULL, NULL);
859 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
860
861 /* Tell the window manager that this window is part of the startup context */
862 if (snContext)
863 sn_launchee_context_setup_window (snContext, parent);
864#endif
865
882 XMapWindow (dpy, vt); 866 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 867 XMapWindow (dpy, parent);
868
869#if HAVE_STARTUP_NOTIFICATION
870 if (snContext)
871 {
872 /* Mark the startup process as complete */
873 sn_launchee_context_complete (snContext);
874
875 sn_launchee_context_unref (snContext);
876 }
877
878 sn_display_unref (snDisplay);
879#endif
884 880
885 refresh_check (); 881 refresh_check ();
886} 882}
887 883
888/*----------------------------------------------------------------------*/ 884/*----------------------------------------------------------------------*/
889void 885void
890rxvt_term::init_env () 886rxvt_term::init_env ()
891{ 887{
892 char *val; 888 char *val;
889 char *env_display;
890 char *env_windowid;
891 char *env_colorfgbg;
892 char *env_term;
893 893
894#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
895 /* Fixup display_name for export over pty to any interested terminal 895 /* 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 896 * 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 897 * (for the first non-loopback interface) that we get from
… …
914 914
915 env_display = (char *)rxvt_malloc (strlen (val) + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
916 916
917 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
918 918
919 env_windowid = (char *)rxvt_malloc (21);
919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 920 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
920 921
921 /* add entries to the environment: 922 /* add entries to the environment:
922 * @ DISPLAY: in case we started with -display 923 * @ DISPLAY: in case we started with -display
923 * @ WINDOWID: X window id number of the window 924 * @ WINDOWID: X window id number of the window
924 * @ COLORTERM: terminal sub-name and also indicates its color 925 * @ COLORTERM: terminal sub-name and also indicates its color
… …
927 * @ COLORFGBG: fg;bg color codes 928 * @ COLORFGBG: fg;bg color codes
928 */ 929 */
929 putenv (env_display); 930 putenv (env_display);
930 putenv (env_windowid); 931 putenv (env_windowid);
931 932
932 if (env_colorfgbg) 933 env_colorfgbg = get_colorfgbg ();
933 putenv (env_colorfgbg); 934 putenv (env_colorfgbg);
934 935
935#ifdef RXVT_TERMINFO 936#ifdef RXVT_TERMINFO
936 putenv ("TERMINFO=" RXVT_TERMINFO); 937 putenv ("TERMINFO=" RXVT_TERMINFO);
937#endif 938#endif
938 939
… …
957 unsetenv ("TERMCAP"); /* terminfo should be okay */ 958 unsetenv ("TERMCAP"); /* terminfo should be okay */
958#endif /* HAVE_UNSETENV */ 959#endif /* HAVE_UNSETENV */
959} 960}
960 961
961/*----------------------------------------------------------------------*/ 962/*----------------------------------------------------------------------*/
962/*
963 * This is more or less stolen straight from XFree86 xterm.
964 * This should support all European type languages.
965 */
966void 963void
967rxvt_term::set_locale (const char *locale) 964rxvt_term::set_locale (const char *locale)
968{ 965{
969 set_environ (envv); 966 set_environ (env);
970 967
971#if HAVE_XSETLOCALE || HAVE_SETLOCALE
972 free (this->locale); 968 free (this->locale);
973 this->locale = setlocale (LC_CTYPE, locale); 969 this->locale = setlocale (LC_CTYPE, locale);
974 970
975 if (!this->locale) 971 if (!this->locale)
976 { 972 {
… …
987 983
988 984
989 this->locale = strdup (this->locale); 985 this->locale = strdup (this->locale);
990 SET_LOCALE (this->locale); 986 SET_LOCALE (this->locale);
991 mbstate.reset (); 987 mbstate.reset ();
992#endif
993 988
994#if HAVE_NL_LANGINFO 989#if HAVE_NL_LANGINFO
995 char *codeset = strdup (nl_langinfo (CODESET)); 990 char *codeset = nl_langinfo (CODESET);
996 // /^UTF.?8/i 991 // /^UTF.?8/i
997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 992 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
998 && (codeset[1] == 'T' || codeset[1] == 't') 993 && (codeset[1] == 'T' || codeset[1] == 't')
999 && (codeset[2] == 'F' || codeset[2] == 'f') 994 && (codeset[2] == 'F' || codeset[2] == 'f')
1000 && (codeset[3] == '8' || codeset[4] == '8'); 995 && (codeset[3] == '8' || codeset[4] == '8');
1001 free (codeset);
1002#else 996#else
1003 enc_utf8 = 0; 997 enc_utf8 = 0;
1004#endif 998#endif
1005} 999}
1006 1000
1007void 1001void
1008rxvt_term::init_xlocale () 1002rxvt_term::init_xlocale ()
1009{ 1003{
1010 set_environ (envv); 1004 set_environ (env);
1011 1005
1012#ifdef USE_XIM 1006#if USE_XIM
1013 if (!locale) 1007 if (!locale)
1014 rxvt_warn ("setting locale failed, working without locale support.\n"); 1008 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1015 else 1009 else
1016 { 1010 {
1017 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1011 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1018 1012
1019 if (!XSupportsLocale ()) 1013 if (!XSupportsLocale ())
1020 { 1014 {
1021 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1015 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1022 return; 1016 return;
1023 } 1017 }
1024 1018
1025 im_ev.start (display); 1019 im_ev.start (display);
1026 1020
… …
1067 run_command (argv); 1061 run_command (argv);
1068} 1062}
1069 1063
1070/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
1071void 1065void
1072rxvt_term::get_colours () 1066rxvt_term::get_colors ()
1073{ 1067{
1074 int i; 1068 int i;
1075 1069
1076#ifdef OFF_FOCUS_FADING 1070#ifdef OFF_FOCUS_FADING
1077 pix_colors = pix_colors_focused; 1071 pix_colors = pix_colors_focused;
1078#endif 1072#endif
1079 1073
1080 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1074 for (i = 0; i < NRS_COLORS; i++)
1081 {
1082 const char *name = rs[Rs_color + i]; 1075 if (const char *name = rs[Rs_color + i])
1083
1084 if (!name)
1085 continue;
1086
1087 rxvt_color xcol;
1088
1089 if (!set_color (xcol, name)) 1076 set_color (pix_colors [i], name);
1090 {
1091#ifndef XTERM_REVERSE_VIDEO
1092 if (i < 2 && option (Opt_reverseVideo))
1093 name = def_colorName [1 - i];
1094 else
1095#endif
1096 name = def_colorName [i];
1097
1098 if (!name)
1099 continue;
1100
1101 if (!set_color (xcol, name))
1102 {
1103 switch (i)
1104 {
1105 case Color_fg:
1106 case Color_bg:
1107 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1108 name = "";
1109 break;
1110#ifndef NO_CURSORCOLOR
1111 case Color_cursor2:
1112#endif
1113 case Color_pointer_fg:
1114 name = rs[Rs_color + Color_fg];
1115 xcol.set (this, name);
1116 break;
1117 default:
1118 name = rs[Rs_color + Color_bg];
1119 xcol.set (this, name);
1120 break;
1121 }
1122 }
1123 }
1124
1125 pix_colors[i] = xcol;
1126 rs[Rs_color + i] = name;
1127 }
1128
1129 if (depth <= 2)
1130 {
1131 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1132 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1133 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1134 }
1135 1077
1136 /* 1078 /*
1137 * get scrollBar shadow colors 1079 * get scrollBar shadow colors
1138 * 1080 *
1139 * The calculations of topShadow/bottomShadow values are adapted 1081 * The calculations of topShadow/bottomShadow values are adapted
1140 * from the fvwm window manager. 1082 * from the fvwm window manager.
1141 */ 1083 */
1142#ifdef RXVT_SCROLLBAR 1084#ifdef RXVT_SCROLLBAR
1143 if (depth <= 2)
1144 {
1145 /* Monochrome */
1146 alias_color (Color_scroll, Color_fg);
1147 alias_color (Color_topShadow, Color_bg);
1148 alias_color (Color_bottomShadow, Color_bg);
1149 }
1150 else
1151 {
1152 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1085 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1153 1086
1154 rgba cscroll; 1087 rgba cscroll;
1155 pix_colors [Color_scroll].get (cscroll); 1088 pix_colors [Color_scroll].get (cscroll);
1156 1089
1157 /* topShadowColor */ 1090 /* topShadowColor */
1158 if (!pix_colors[Color_topShadow].set (this, 1091 if (!pix_colors[Color_topShadow].set (this,
1159 rgba ( 1092 rgba (
1160 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1093 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1161 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1094 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1162 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1095 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1163 cscroll.a) 1096 cscroll.a)
1164 )) 1097 ))
1165 alias_color (Color_topShadow, Color_White); 1098 alias_color (Color_topShadow, Color_White);
1166 }
1167#endif 1099#endif
1168 1100
1169#ifdef OFF_FOCUS_FADING 1101#ifdef OFF_FOCUS_FADING
1170 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < NRS_COLORS; i++)
1171 update_fade_color (i); 1103 update_fade_color (i, true);
1172#endif 1104#endif
1173} 1105}
1174 1106
1175/*----------------------------------------------------------------------*/ 1107/*----------------------------------------------------------------------*/
1176/* color aliases, fg/bg bright-bold */ 1108/* color aliases, fg/bg bright-bold */
1177void 1109void
1178rxvt_term::color_aliases (int idx) 1110rxvt_term::color_aliases (int idx)
1179{ 1111{
1180 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1112 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1181 { 1113 {
1182 int i = atoi (rs[Rs_color + idx]); 1114 int i = atoi (rs[Rs_color + idx]);
1183 1115
1184 if (i >= 8 && i <= 15) 1116 if (i >= 8 && i <= 15)
1185 /* bright colors */ 1117 /* bright colors */
… …
1225 for (j = map->max_keypermod; j--; k++) 1157 for (j = map->max_keypermod; j--; k++)
1226 { 1158 {
1227 if (kc[k] == 0) 1159 if (kc[k] == 0)
1228 break; 1160 break;
1229 1161
1230 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1162 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1231 { 1163 {
1232 case XK_Num_Lock: 1164 case XK_Num_Lock:
1233 ModNumLockMask = modmasks[i - 1]; 1165 ModNumLockMask = modmasks[i - 1];
1234 continue; 1166 continue;
1235 1167
… …
1280} 1212}
1281 1213
1282void 1214void
1283rxvt_term::set_icon (const char *file) 1215rxvt_term::set_icon (const char *file)
1284{ 1216{
1285#ifdef HAVE_AFTERIMAGE 1217#if HAVE_PIXBUF && ENABLE_EWMH
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
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1218 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf) 1219 if (!pixbuf)
1339 { 1220 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1221 rxvt_warn ("Loading image icon failed, continuing without.\n");
1341 return; 1222 return;
… …
1378 } 1259 }
1379 1260
1380 row += rowstride; 1261 row += rowstride;
1381 } 1262 }
1382 1263
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1264 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1265 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer); 1266 free (buffer);
1386 } 1267 }
1387 else 1268 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1269 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1390 g_object_unref (pixbuf); 1271 g_object_unref (pixbuf);
1391#endif 1272#endif
1392} 1273}
1393 1274
1394/*----------------------------------------------------------------------*/ 1275/*----------------------------------------------------------------------*/
1395/* rxvt_Create_Windows () - Open and map the window */ 1276/* Open and map the window */
1396void 1277void
1397rxvt_term::create_windows (int argc, const char *const *argv) 1278rxvt_term::create_windows (int argc, const char *const *argv)
1398{ 1279{
1399 XClassHint classHint; 1280 XClassHint classHint;
1400 XWMHints wmHint; 1281 XWMHints wmHint;
… …
1406 Window top, parent; 1287 Window top, parent;
1407 1288
1408 dLocal (Display *, dpy); 1289 dLocal (Display *, dpy);
1409 1290
1410 /* grab colors before netscape does */ 1291 /* grab colors before netscape does */
1411 get_colours (); 1292 get_colors ();
1412 1293
1413 if (!set_fonts ()) 1294 if (!set_fonts ())
1414 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1295 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1415 1296
1416 parent = display->root; 1297 parent = display->root;
… …
1446 } 1327 }
1447#endif 1328#endif
1448 1329
1449 window_calc (0, 0); 1330 window_calc (0, 0);
1450 1331
1451 /* sub-window placement & size in rxvt_resize_subwindows () */ 1332 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1452 attributes.background_pixel = pix_colors_focused [Color_border]; 1333 attributes.background_pixel = pix_colors_focused [Color_border];
1453 attributes.border_pixel = pix_colors_focused [Color_border]; 1334 attributes.border_pixel = pix_colors_focused [Color_border];
1454 attributes.colormap = cmap; 1335 attributes.colormap = cmap;
1455 1336
1456 top = XCreateWindow (dpy, parent, 1337 top = XCreateWindow (dpy, parent,
… …
1459 ext_bwidth, 1340 ext_bwidth,
1460 depth, InputOutput, visual, 1341 depth, InputOutput, visual,
1461 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1342 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1462 &attributes); 1343 &attributes);
1463 1344
1464 this->parent[0] = top; 1345 this->parent = top;
1465
1466 old_width = szHint.width;
1467 old_height = szHint.height;
1468 1346
1469 set_title (rs [Rs_title]); 1347 set_title (rs [Rs_title]);
1470 set_icon_name (rs [Rs_iconName]); 1348 set_icon_name (rs [Rs_iconName]);
1471 1349
1472 classHint.res_name = (char *)rs[Rs_name]; 1350 classHint.res_name = (char *)rs[Rs_name];
1473 classHint.res_class = (char *)RESCLASS; 1351 classHint.res_class = (char *)RESCLASS;
1474 1352
1475 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1353 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1476 wmHint.input = True; 1354 wmHint.input = True;
1477 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1355 wmHint.initial_state = option (Opt_iconic) ? IconicState
1356 : option (Opt_dockapp) ? WithdrawnState
1357 : NormalState;
1478 wmHint.window_group = top; 1358 wmHint.window_group = top;
1479 1359
1480 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1360 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1481 &szHint, &wmHint, &classHint); 1361 &szHint, &wmHint, &classHint);
1482#if ENABLE_EWMH 1362#if ENABLE_EWMH
… …
1484 * set up icon hint 1364 * set up icon hint
1485 * rs [Rs_iconfile] is path to icon 1365 * rs [Rs_iconfile] is path to icon
1486 */ 1366 */
1487 1367
1488 if (rs [Rs_iconfile]) 1368 if (rs [Rs_iconfile])
1489 {
1490 set_icon (rs [Rs_iconfile]); 1369 set_icon (rs [Rs_iconfile]);
1491 }
1492#endif 1370#endif
1493 1371
1494#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1495 if (mwmhints.flags) 1373 if (mwmhints.flags)
1496 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1374 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1502#if ENABLE_EWMH 1380#if ENABLE_EWMH
1503 xa[XA_NET_WM_PING], 1381 xa[XA_NET_WM_PING],
1504#endif 1382#endif
1505 }; 1383 };
1506 1384
1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1385 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1508 1386
1509#if ENABLE_FRILLS 1387#if ENABLE_FRILLS
1510 if (rs[Rs_transient_for]) 1388 if (rs[Rs_transient_for])
1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1389 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1512#endif 1390#endif
… …
1530 | ExposureMask | StructureNotifyMask); 1408 | ExposureMask | StructureNotifyMask);
1531 1409
1532 termwin_ev.start (display, top); 1410 termwin_ev.start (display, top);
1533 1411
1534 /* vt cursor: Black-on-White is standard, but this is more popular */ 1412 /* vt cursor: Black-on-White is standard, but this is more popular */
1413 unsigned int shape = XC_xterm;
1414
1415#ifdef HAVE_XMU
1416 if (rs[Rs_pointerShape])
1417 {
1418 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1419 if (stmp >= 0)
1420 shape = stmp;
1421 }
1422#endif
1423
1535 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1424 TermWin_cursor = XCreateFontCursor (dpy, shape);
1536 1425
1537 /* the vt window */ 1426 /* the vt window */
1538 vt = XCreateSimpleWindow (dpy, top, 1427 vt = XCreateSimpleWindow (dpy, top,
1539 window_vt_x, window_vt_y, 1428 window_vt_x, window_vt_y,
1540 width, height, 1429 vt_width, vt_height,
1541 0, 1430 0,
1542 pix_colors_focused[Color_fg], 1431 pix_colors_focused[Color_fg],
1543 pix_colors_focused[Color_bg]); 1432 pix_colors_focused[Color_bg]);
1544 1433
1545 attributes.bit_gravity = NorthWestGravity; 1434 attributes.bit_gravity = NorthWestGravity;
… …
1572 if (rs[Rs_fade]) 1461 if (rs[Rs_fade])
1573 pix_colors = pix_colors_unfocused; 1462 pix_colors = pix_colors_unfocused;
1574#endif 1463#endif
1575 1464
1576 pointer_unblank (); 1465 pointer_unblank ();
1577 scr_recolour (); 1466 scr_recolor ();
1578} 1467}
1579 1468
1580/*----------------------------------------------------------------------*/ 1469/*----------------------------------------------------------------------*/
1581/* 1470/*
1582 * Run the command in a subprocess and return a file descriptor for the 1471 * Run the command in a subprocess and return a file descriptor for the
… …
1594 if (pty->pty >= 0) 1483 if (pty->pty >= 0)
1595 { 1484 {
1596 if (getfd_hook) 1485 if (getfd_hook)
1597 pty->pty = (*getfd_hook) (pty->pty); 1486 pty->pty = (*getfd_hook) (pty->pty);
1598 1487
1599 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1488 if (pty->pty < 0)
1600 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1489 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1601 } 1490 }
1602 } 1491 }
1603 else 1492 else
1604#endif 1493#endif
1605 if (!pty->get ()) 1494 if (!pty->get ())
1606 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1495 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1496
1497 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1607 1498
1608 struct termios tio = def_tio; 1499 struct termios tio = def_tio;
1609 1500
1610#ifndef NO_BACKSPACE_KEY 1501#ifndef NO_BACKSPACE_KEY
1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1502 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1661 1552
1662 _exit (EXIT_FAILURE); 1553 _exit (EXIT_FAILURE);
1663 1554
1664 default: 1555 default:
1665 if (!option (Opt_utmpInhibit)) 1556 if (!option (Opt_utmpInhibit))
1557 {
1558#ifdef LOG_ONLY_ON_LOGIN
1559 bool login_shell = option (Opt_loginShell);
1560#else
1561 bool login_shell = true;
1562#endif
1666 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1563 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1564 }
1667 1565
1668 pty->close_tty (); 1566 pty->close_tty ();
1669 1567
1670 child_ev.start (cmd_pid); 1568 child_ev.start (cmd_pid);
1671 1569
… …
1696#elif defined (SRIOCSREDIR) 1594#elif defined (SRIOCSREDIR)
1697 int fd; 1595 int fd;
1698 1596
1699 fd = open (CONSOLE, O_WRONLY, 0); 1597 fd = open (CONSOLE, O_WRONLY, 0);
1700 if (fd >= 0) 1598 if (fd >= 0)
1701 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1599 {
1600 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1702 close (fd); 1601 close (fd);
1602 }
1703#endif /* SRIOCSREDIR */ 1603#endif /* SRIOCSREDIR */
1704 } 1604 }
1705 1605
1706 /* reset signals and spin off the command interpreter */ 1606 /* reset signals and spin off the command interpreter */
1707 signal (SIGINT, SIG_DFL); 1607 signal (SIGINT, SIG_DFL);

Diff Legend

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