[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.271 by sf-exg, Thu Jul 1 21:50:25 2010 UTC vs.
Revision 1.322 by sf-exg, Thu May 17 10:18:32 2012 UTC

…		…
10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>	10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>	11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14	* - extensive modifications	14	* - extensive modifications
15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16	*	16	*
17	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
18	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
19	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
20	* (at your option) any later version.	20	* (at your option) any later version.
…		…
38	#include "init.h"	38	#include "init.h"
39	#include "keyboard.h"	39	#include "keyboard.h"
40		40
41	#include <limits>	41	#include <limits>
42		42
43	#include <csignal>	43	#include <signal.h>
44		44
45	#include <fcntl.h>	45	#include <fcntl.h>
46		46
47	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	48	# define X_LOCALE
49	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
50	#else	50	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	51	# include <locale.h>
53	# endif
54	#endif	52	#endif
55		53
56	#ifdef HAVE_NL_LANGINFO	54	#ifdef HAVE_NL_LANGINFO
57	# include <langinfo.h>	55	# include <langinfo.h>
		56	#endif
		57
		58	#ifdef HAVE_STARTUP_NOTIFICATION
		59	# define SN_API_NOT_YET_FROZEN
		60	# include <libsn/sn-launchee.h>
58	#endif	61	#endif
59		62
60	#ifdef DISPLAY_IS_IP	63	#ifdef DISPLAY_IS_IP
61	/* On Solaris link with -lsocket and -lnsl */	64	/* On Solaris link with -lsocket and -lnsl */
62	#include <sys/types.h>	65	#include <sys/types.h>
…		…
143		146
144	return rval;	147	return rval;
145	}	148	}
146	#endif	149	#endif
147		150
148	const char *const def_colorName[] =	151	static const char *const def_colorName[] =
149	{	152	{
150	COLOR_FOREGROUND,	153	COLOR_FOREGROUND,
151	COLOR_BACKGROUND,	154	COLOR_BACKGROUND,
152	/* low-intensity colors */	155	/* low-intensity colors */
153	"rgb:00/00/00", // 0: black (Black)	156	"rgb:00/00/00", // 0: black (Black)
…		…
558	set_option (Opt_iso14755);	561	set_option (Opt_iso14755);
559	set_option (Opt_iso14755_52);	562	set_option (Opt_iso14755_52);
560	set_option (Opt_buffered);	563	set_option (Opt_buffered);
561	}	564	}
562		565
563	static void
564	init_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	/----------------------------------------------------------------------/	566	/----------------------------------------------------------------------/
582	const char **	567	const char **
583	rxvt_term::init_resources (int argc, const char const argv)	568	rxvt_term::init_resources (int argc, const char const argv)
584	{	569	{
585	int i, r_argc;	570	int i;
586	const char cmd_argv, r_argv;	571	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		572
616	rs[Rs_name] = rxvt_basename (argv[0]);	573	rs[Rs_name] = rxvt_basename (argv[0]);
617		574
618	/*	575	/*
619	* Open display, get options/resources and create the window	576	* Open display, get options/resources and create the window
620	*/	577	*/
621		578
622	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	579	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623	rs[Rs_display_name] = ":0";	580	rs[Rs_display_name] = ":0";
624		581
625	get_options (r_argc, r_argv);	582	cmd_argv = get_options (argc, argv);
626		583
627	if (!(display = displays.get (rs[Rs_display_name])))	584	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]);	585	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631	}
632		586
633	// using a local pointer decreases code size a lot	587	// using a local pointer decreases code size a lot
634	xa = display->xa;	588	xa = display->xa;
635		589
636	set (display);	590	set (display);
…		…
639	#if XFT	593	#if XFT
640	if (rs[Rs_depth])	594	if (rs[Rs_depth])
641	select_visual (strtol (rs[Rs_depth], 0, 0));	595	select_visual (strtol (rs[Rs_depth], 0, 0));
642	#endif	596	#endif
643		597
644	free (r_argv);
645
646	for (int i = NUM_RESOURCES; i--; )	598	for (int i = NUM_RESOURCES; i--; )
647	if (rs [i] == resval_undef)	599	if (rs [i] == resval_undef)
648	rs [i] = 0;	600	rs [i] = 0;
649		601
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	602	#if ENABLE_PERL
656	if (!rs[Rs_perl_ext_1])	603	if (!rs[Rs_perl_ext_1])
657	rs[Rs_perl_ext_1] = "default";	604	rs[Rs_perl_ext_1] = "default";
658		605
659	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	606	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
662	{	609	{
663	rxvt_perl.init (this);	610	rxvt_perl.init (this);
664	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	611	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665	}	612	}
666	#endif	613	#endif
		614
		615	// must be called after initialising the perl interpreter as it
		616	// may invoke the `on_register_command' hook
		617	extract_keysym_resources ();
667		618
668	/*	619	/*
669	* set any defaults not already set	620	* set any defaults not already set
670	*/	621	*/
671	if (cmd_argv && cmd_argv[0])	622	if (cmd_argv && cmd_argv[0])
…		…
780	return cmd_argv;	731	return cmd_argv;
781	}	732	}
782		733
783	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
784	void	735	void
785	rxvt_term::init (int argc, const char const argv, stringvec *envv)	736	rxvt_term::init (stringvec argv, stringvec envv)
786	{	737	{
		738	argv->push_back (0);
		739	envv->push_back (0);
		740
		741	this->argv = argv;
787	this->envv = envv;	742	this->envv = envv;
788		743
		744	init2 (argv->size () - 1, argv->begin ());
		745	}
		746
		747	void
		748	rxvt_term::init (int argc, const char const argv, const char const envv)
		749	{
		750	#if ENABLE_PERL
		751	// perl might want to access the stringvecs later, so we need to copy them
		752	stringvec *args = new stringvec;
		753	for (int i = 0; i < argc; i++)
		754	args->push_back (strdup (argv [i]));
		755
		756	stringvec *envs = new stringvec;
		757	for (const char const var = envv; *var; var++)
		758	envs->push_back (strdup (*var));
		759
		760	init (args, envs);
		761	#else
		762	init2 (argc, argv);
		763	#endif
		764	}
		765
		766	void
		767	rxvt_term::init2 (int argc, const char const argv)
		768	{
789	SET_R (this);	769	SET_R (this);
790	set_locale ("");	770	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	771	set_environ (envv); // a few things in X do not call setlocale :(
792		772
793	init_vars ();	773	init_vars ();
794
795	init_secondary ();
796		774
797	const char **cmd_argv = init_resources (argc, argv);	775	const char **cmd_argv = init_resources (argc, argv);
798		776
799	#ifdef KEYSYM_RESOURCE	777	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	778	keyboard->register_done ();
…		…
809	if (chdir (path))	787	if (chdir (path))
810	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");	788	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811	}	789	}
812		790
813	if (option (Opt_scrollBar))	791	if (option (Opt_scrollBar))
814	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	792	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815		793
816	pty = ptytty::create ();	794	pty = ptytty::create ();
		795
		796	// must be called before create_windows, because the latter may call set_icon
		797	#ifdef HAVE_PIXBUF
		798	g_type_init ();
		799	#endif
817		800
818	create_windows (argc, argv);	801	create_windows (argc, argv);
819		802
820	init_xlocale ();	803	init_xlocale ();
821		804
…		…
827		810
828	if (option (Opt_scrollBar))	811	if (option (Opt_scrollBar))
829	scrollBar.resize (); /* create and map scrollbar */	812	scrollBar.resize (); /* create and map scrollbar */
830	#ifdef HAVE_BG_PIXMAP	813	#ifdef HAVE_BG_PIXMAP
831	{	814	{
832	bgPixmap.set_target (this);	815	bg_init ();
833	bgPixmap.invalidate ();
834		816
835	#ifdef ENABLE_TRANSPARENCY	817	#ifdef ENABLE_TRANSPARENCY
836	if (option (Opt_transparent))	818	if (option (Opt_transparent))
837	{	819	{
838	bgPixmap.set_transparent ();	820	bg_set_transparent ();
839		821
840	#ifdef HAVE_AFTERIMAGE
841	if (rs [Rs_blurradius])	822	if (rs [Rs_blurradius])
842	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	823	bg_set_blur (rs [Rs_blurradius]);
843	#endif	824
844	if (ISSET_PIXCOLOR (Color_tint))	825	if (ISSET_PIXCOLOR (Color_tint))
845	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	826	bg_set_tint (pix_colors_focused [Color_tint]);
846		827
847	if (rs [Rs_shade])	828	if (rs [Rs_shade])
848	bgPixmap.set_shade (rs [Rs_shade]);	829	bg_set_shade (rs [Rs_shade]);
849		830
850	bgPixmap.set_root_pixmap ();	831	bg_set_root_pixmap ();
851	XSelectInput (dpy, display->root, PropertyChangeMask);	832	XSelectInput (dpy, display->root, PropertyChangeMask);
852	rootwin_ev.start (display, display->root);	833	rootwin_ev.start (display, display->root);
853	}	834	}
854	#endif	835	#endif
855		836
856	#ifdef BG_IMAGE_FROM_FILE	837	#ifdef BG_IMAGE_FROM_FILE
857	if (rs[Rs_backgroundPixmap])	838	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]))	839	if (bg_image.set_file (rs[Rs_backgroundPixmap]))
870	if (!bgPixmap.window_position_sensitive ())	840	if (!bg_window_position_sensitive ())
871	update_background ();	841	update_background ();
872	}
873	#endif	842	#endif
874	}	843	}
875	#endif	844	#endif
876		845
877	#if ENABLE_PERL	846	#if ENABLE_PERL
878	rootwin_ev.start (display, display->root);	847	rootwin_ev.start (display, display->root);
879	#endif	848	#endif
880		849
881	set_colorfgbg ();	850	init_done = 1;
882		851
883	init_command (cmd_argv);	852	init_command (cmd_argv);
884
885	free (cmd_argv);
886		853
887	if (pty->pty >= 0)	854	if (pty->pty >= 0)
888	pty_ev.start (pty->pty, ev::READ);	855	pty_ev.start (pty->pty, ev::READ);
889		856
890	HOOK_INVOKE ((this, HOOK_START, DT_END));	857	HOOK_INVOKE ((this, HOOK_START, DT_END));
…		…
892	#if ENABLE_XEMBED	859	#if ENABLE_XEMBED
893	if (rs[Rs_embed])	860	if (rs[Rs_embed])
894	{	861	{
895	long info[2] = { 0, XEMBED_MAPPED };	862	long info[2] = { 0, XEMBED_MAPPED };
896		863
897	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	864	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898	32, PropModeReplace, (unsigned char *)&info, 2);	865	32, PropModeReplace, (unsigned char *)&info, 2);
899	}	866	}
900	#endif	867	#endif
901		868
		869	#if HAVE_STARTUP_NOTIFICATION
		870	SnDisplay *snDisplay;
		871	SnLauncheeContext *snContext;
		872
		873	snDisplay = sn_display_new (dpy, NULL, NULL);
		874	snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
		875
		876	/* Tell the window manager that this window is part of the startup context */
		877	if (snContext)
		878	sn_launchee_context_setup_window (snContext, parent);
		879	#endif
		880
902	XMapWindow (dpy, vt);	881	XMapWindow (dpy, vt);
903	XMapWindow (dpy, parent[0]);	882	XMapWindow (dpy, parent);
		883
		884	#if HAVE_STARTUP_NOTIFICATION
		885	if (snContext)
		886	{
		887	/* Mark the startup process as complete */
		888	sn_launchee_context_complete (snContext);
		889
		890	sn_launchee_context_unref (snContext);
		891	}
		892
		893	sn_display_unref (snDisplay);
		894	#endif
904		895
905	refresh_check ();	896	refresh_check ();
906	}	897	}
907		898
908	/----------------------------------------------------------------------/	899	/----------------------------------------------------------------------/
909	void	900	void
910	rxvt_term::init_env ()	901	rxvt_term::init_env ()
911	{	902	{
912	int i;
913	char *val;	903	char *val;
		904	char *env_display;
		905	char *env_windowid;
		906	char *env_colorfgbg;
		907	char *env_term;
914		908
915	#ifdef DISPLAY_IS_IP	909	#ifdef DISPLAY_IS_IP
916	/* Fixup display_name for export over pty to any interested terminal	910	/* 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	911	* 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	912	* (for the first non-loopback interface) that we get from
…		…
931	val = XDisplayString (dpy);	925	val = XDisplayString (dpy);
932		926
933	if (rs[Rs_display_name] == NULL)	927	if (rs[Rs_display_name] == NULL)
934	rs[Rs_display_name] = val; /* use broken `:0' value */	928	rs[Rs_display_name] = val; /* use broken `:0' value */
935		929
936	i = strlen (val);
937	env_display = (char *)rxvt_malloc (i + 9);	930	env_display = (char *)rxvt_malloc (strlen (val) + 9);
938		931
939	sprintf (env_display, "DISPLAY=%s", val);	932	sprintf (env_display, "DISPLAY=%s", val);
940		933
		934	env_windowid = (char *)rxvt_malloc (21);
941	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	935	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942		936
943	/* add entries to the environment:	937	/* add entries to the environment:
944	* @ DISPLAY: in case we started with -display	938	* @ DISPLAY: in case we started with -display
945	* @ WINDOWID: X window id number of the window	939	* @ WINDOWID: X window id number of the window
946	* @ COLORTERM: terminal sub-name and also indicates its color	940	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
949	* @ COLORFGBG: fg;bg color codes	943	* @ COLORFGBG: fg;bg color codes
950	*/	944	*/
951	putenv (env_display);	945	putenv (env_display);
952	putenv (env_windowid);	946	putenv (env_windowid);
953		947
954	if (env_colorfgbg)	948	env_colorfgbg = get_colorfgbg ();
955	putenv (env_colorfgbg);	949	putenv (env_colorfgbg);
956		950
957	#ifdef RXVT_TERMINFO	951	#ifdef RXVT_TERMINFO
958	putenv ("TERMINFO=" RXVT_TERMINFO);	952	putenv ("TERMINFO=" RXVT_TERMINFO);
959	#endif	953	#endif
960		954
…		…
979	unsetenv ("TERMCAP"); /* terminfo should be okay */	973	unsetenv ("TERMCAP"); /* terminfo should be okay */
980	#endif /* HAVE_UNSETENV */	974	#endif /* HAVE_UNSETENV */
981	}	975	}
982		976
983	/----------------------------------------------------------------------/	977	/----------------------------------------------------------------------/
984	/*
985	* This is more or less stolen straight from XFree86 xterm.
986	* This should support all European type languages.
987	*/
988	void	978	void
989	rxvt_term::set_locale (const char *locale)	979	rxvt_term::set_locale (const char *locale)
990	{	980	{
991	set_environ (envv);	981	set_environ (envv);
992		982
993	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
994	free (this->locale);	983	free (this->locale);
995	this->locale = setlocale (LC_CTYPE, locale);	984	this->locale = setlocale (LC_CTYPE, locale);
996		985
997	if (!this->locale)	986	if (!this->locale)
998	{	987	{
…		…
1009		998
1010		999
1011	this->locale = strdup (this->locale);	1000	this->locale = strdup (this->locale);
1012	SET_LOCALE (this->locale);	1001	SET_LOCALE (this->locale);
1013	mbstate.reset ();	1002	mbstate.reset ();
1014	#endif
1015		1003
1016	#if HAVE_NL_LANGINFO	1004	#if HAVE_NL_LANGINFO
1017	char *codeset = strdup (nl_langinfo (CODESET));	1005	char *codeset = nl_langinfo (CODESET);
1018	// /^UTF.?8/i	1006	// /^UTF.?8/i
1019	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')	1007	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
1020	&& (codeset[1] == 'T' \|\| codeset[1] == 't')	1008	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
1021	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')	1009	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
1022	&& (codeset[3] == '8' \|\| codeset[4] == '8');	1010	&& (codeset[3] == '8' \|\| codeset[4] == '8');
1023	free (codeset);
1024	#else	1011	#else
1025	enc_utf8 = 0;	1012	enc_utf8 = 0;
1026	#endif	1013	#endif
1027	}	1014	}
1028		1015
…		…
1031	{	1018	{
1032	set_environ (envv);	1019	set_environ (envv);
1033		1020
1034	#ifdef USE_XIM	1021	#ifdef USE_XIM
1035	if (!locale)	1022	if (!locale)
1036	rxvt_warn ("setting locale failed, working without locale support.\n");	1023	rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037	else	1024	else
1038	{	1025	{
1039	set_string_property (xa[XA_WM_LOCALE_NAME], locale);	1026	set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040		1027
1041	if (!XSupportsLocale ())	1028	if (!XSupportsLocale ())
1042	{	1029	{
1043	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");	1030	rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044	return;	1031	return;
1045	}	1032	}
1046		1033
1047	im_ev.start (display);	1034	im_ev.start (display);
1048		1035
…		…
1197	/----------------------------------------------------------------------/	1184	/----------------------------------------------------------------------/
1198	/* color aliases, fg/bg bright-bold */	1185	/* color aliases, fg/bg bright-bold */
1199	void	1186	void
1200	rxvt_term::color_aliases (int idx)	1187	rxvt_term::color_aliases (int idx)
1201	{	1188	{
1202	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	1189	if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203	{	1190	{
1204	int i = atoi (rs[Rs_color + idx]);	1191	int i = atoi (rs[Rs_color + idx]);
1205		1192
1206	if (i >= 8 && i <= 15)	1193	if (i >= 8 && i <= 15)
1207	/* bright colors */	1194	/* bright colors */
…		…
1299		1286
1300	if (i)	1287	if (i)
1301	ModMetaMask = modmasks[i - 1];	1288	ModMetaMask = modmasks[i - 1];
1302	}	1289	}
1303		1290
		1291	void
		1292	rxvt_term::set_icon (const char *file)
		1293	{
		1294	#ifdef HAVE_PIXBUF
		1295	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1296	if (!pixbuf)
		1297	{
		1298	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1299	return;
		1300	}
		1301
		1302	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1303	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1304
		1305	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1306	{
		1307	rxvt_warn ("Icon image too big, continuing without.\n");
		1308	g_object_unref (pixbuf);
		1309	return;
		1310	}
		1311
		1312	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1313	{
		1314	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1315	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1316	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1317
		1318	buffer [0] = w;
		1319	buffer [1] = h;
		1320	for (int i = 0; i < h; i++)
		1321	{
		1322	for (int j = 0; j < w; j++)
		1323	{
		1324	unsigned char pixel = row + j channels;
		1325	long value;
		1326
		1327	if (channels == 4)
		1328	value = pixel[3];
		1329	else
		1330	value = (unsigned char)0x00ff;
		1331
		1332	value = (value << 8) + pixel[0];
		1333	value = (value << 8) + pixel[1];
		1334	value = (value << 8) + pixel[2];
		1335	buffer[(i * w + j) + 2] = value;
		1336	}
		1337
		1338	row += rowstride;
		1339	}
		1340
		1341	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1342	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1343	free (buffer);
		1344	}
		1345	else
		1346	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1347
		1348	g_object_unref (pixbuf);
		1349	#endif
		1350	}
		1351
1304	/----------------------------------------------------------------------/	1352	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1353	/* Open and map the window */
1306	void	1354	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1355	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1356	{
1309	XClassHint classHint;	1357	XClassHint classHint;
1310	XWMHints wmHint;	1358	XWMHints wmHint;
…		…
1356	}	1404	}
1357	#endif	1405	#endif
1358		1406
1359	window_calc (0, 0);	1407	window_calc (0, 0);
1360		1408
1361	/* sub-window placement & size in rxvt_resize_subwindows () */	1409	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1362	attributes.background_pixel = pix_colors_focused [Color_border];	1410	attributes.background_pixel = pix_colors_focused [Color_border];
1363	attributes.border_pixel = pix_colors_focused [Color_border];	1411	attributes.border_pixel = pix_colors_focused [Color_border];
1364	attributes.colormap = cmap;	1412	attributes.colormap = cmap;
1365		1413
1366	top = XCreateWindow (dpy, parent,	1414	top = XCreateWindow (dpy, parent,
…		…
1369	ext_bwidth,	1417	ext_bwidth,
1370	depth, InputOutput, visual,	1418	depth, InputOutput, visual,
1371	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1419	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1372	&attributes);	1420	&attributes);
1373		1421
1374	this->parent[0] = top;	1422	this->parent = top;
1375
1376	old_width = szHint.width;
1377	old_height = szHint.height;
1378		1423
1379	set_title (rs [Rs_title]);	1424	set_title (rs [Rs_title]);
1380	set_icon_name (rs [Rs_iconName]);	1425	set_icon_name (rs [Rs_iconName]);
1381		1426
1382	classHint.res_name = (char *)rs[Rs_name];	1427	classHint.res_name = (char *)rs[Rs_name];
…		…
1388	wmHint.window_group = top;	1433	wmHint.window_group = top;
1389		1434
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1435	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1436	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1437	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1438	/*
1395	* set up icon hint	1439	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1440	* rs [Rs_iconfile] is path to icon
1397	*/	1441	*/
1398		1442
1399	if (rs [Rs_iconfile])	1443	if (rs [Rs_iconfile])
1400	{	1444	{
1401	init_asv ();	1445	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	}	1446	}
1440	# endif
1441	#endif	1447	#endif
1442		1448
1443	#if ENABLE_FRILLS	1449	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1450	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1451	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1451	#if ENABLE_EWMH	1457	#if ENABLE_EWMH
1452	xa[XA_NET_WM_PING],	1458	xa[XA_NET_WM_PING],
1453	#endif	1459	#endif
1454	};	1460	};
1455		1461
1456	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1462	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457		1463
1458	#if ENABLE_FRILLS	1464	#if ENABLE_FRILLS
1459	if (rs[Rs_transient_for])	1465	if (rs[Rs_transient_for])
1460	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1466	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461	#endif	1467	#endif
…		…
1484	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1490	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1485		1491
1486	/* the vt window */	1492	/* the vt window */
1487	vt = XCreateSimpleWindow (dpy, top,	1493	vt = XCreateSimpleWindow (dpy, top,
1488	window_vt_x, window_vt_y,	1494	window_vt_x, window_vt_y,
1489	width, height,	1495	vt_width, vt_height,
1490	0,	1496	0,
1491	pix_colors_focused[Color_fg],	1497	pix_colors_focused[Color_fg],
1492	pix_colors_focused[Color_bg]);	1498	pix_colors_focused[Color_bg]);
1493		1499
1494	attributes.bit_gravity = NorthWestGravity;	1500	attributes.bit_gravity = NorthWestGravity;
…		…
1522	pix_colors = pix_colors_unfocused;	1528	pix_colors = pix_colors_unfocused;
1523	#endif	1529	#endif
1524		1530
1525	pointer_unblank ();	1531	pointer_unblank ();
1526	scr_recolour ();	1532	scr_recolour ();
1527	}
1528
1529	/* ------------------------------------------------------------------------- *
1530	* GET TTY CURRENT STATE *
1531	* ------------------------------------------------------------------------- */
1532	static void
1533	rxvt_get_ttymode (struct termios *tio)
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	/* input modes */
1585	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1586	# ifdef IMAXBEL
1587	\| IMAXBEL
1588	# endif
1589	\| IXON);
1590
1591	/* output modes */
1592	tio->c_oflag = (OPOST \| ONLCR);
1593
1594	/* control modes */
1595	tio->c_cflag = (CS8 \| CREAD);
1596
1597	/* line discipline modes */
1598	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1599	# if defined (ECHOCTL) && defined (ECHOKE)
1600	\| ECHOCTL \| ECHOKE
1601	# endif
1602	\| ECHOE \| ECHOK);
1603
1604	/*
1605	* Debugging
1606	*/
1607	#ifdef DEBUG_TTYMODE
1608	/* c_iflag bits */
1609	fprintf (stderr, "Input flags\n");
1610
1611	/* cpp token stringize doesn't work on all machines <sigh> */
1612	# define FOO(flag,name) \
1613	if ((tio->c_iflag) & flag) \
1614	fprintf (stderr, "%s ", name)
1615
1616	/* c_iflag bits */
1617	FOO (IGNBRK, "IGNBRK");
1618	FOO (BRKINT, "BRKINT");
1619	FOO (IGNPAR, "IGNPAR");
1620	FOO (PARMRK, "PARMRK");
1621	FOO (INPCK, "INPCK");
1622	FOO (ISTRIP, "ISTRIP");
1623	FOO (INLCR, "INLCR");
1624	FOO (IGNCR, "IGNCR");
1625	FOO (ICRNL, "ICRNL");
1626	FOO (IXON, "IXON");
1627	FOO (IXOFF, "IXOFF");
1628	# ifdef IUCLC
1629	FOO (IUCLC, "IUCLC");
1630	# endif
1631	# ifdef IXANY
1632	FOO (IXANY, "IXANY");
1633	# endif
1634	# ifdef IMAXBEL
1635	FOO (IMAXBEL, "IMAXBEL");
1636	# endif
1637
1638	fprintf (stderr, "\n");
1639
1640	# undef FOO
1641	# define FOO(entry, name) \
1642	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1643
1644	FOO (VINTR, "VINTR");
1645	FOO (VQUIT, "VQUIT");
1646	FOO (VERASE, "VERASE");
1647	FOO (VKILL, "VKILL");
1648	FOO (VEOF, "VEOF");
1649	FOO (VEOL, "VEOL");
1650	# ifdef VEOL2
1651	FOO (VEOL2, "VEOL2");
1652	# endif
1653	# ifdef VSWTC
1654	FOO (VSWTC, "VSWTC");
1655	# endif
1656	# ifdef VSWTCH
1657	FOO (VSWTCH, "VSWTCH");
1658	# endif
1659	FOO (VSTART, "VSTART");
1660	FOO (VSTOP, "VSTOP");
1661	FOO (VSUSP, "VSUSP");
1662	# ifdef VDSUSP
1663	FOO (VDSUSP, "VDSUSP");
1664	# endif
1665	# ifdef VREPRINT
1666	FOO (VREPRINT, "VREPRINT");
1667	# endif
1668	# ifdef VDISCRD
1669	FOO (VDISCRD, "VDISCRD");
1670	# endif
1671	# ifdef VWERSE
1672	FOO (VWERSE, "VWERSE");
1673	# endif
1674	# ifdef VLNEXT
1675	FOO (VLNEXT, "VLNEXT");
1676	# endif
1677
1678	fprintf (stderr, "\n");
1679	# undef FOO
1680	#endif /* DEBUG_TTYMODE */
1681	}	1533	}
1682		1534
1683	/----------------------------------------------------------------------/	1535	/----------------------------------------------------------------------/
1684	/*	1536	/*
1685	* Run the command in a subprocess and return a file descriptor for the	1537	* Run the command in a subprocess and return a file descriptor for the
…		…
1697	if (pty->pty >= 0)	1549	if (pty->pty >= 0)
1698	{	1550	{
1699	if (getfd_hook)	1551	if (getfd_hook)
1700	pty->pty = (*getfd_hook) (pty->pty);	1552	pty->pty = (*getfd_hook) (pty->pty);
1701		1553
1702	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))	1554	if (pty->pty < 0)
1703	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1555	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1704	}	1556	}
1705	}	1557	}
1706	else	1558	else
1707	#endif	1559	#endif
1708	if (!pty->get ())	1560	if (!pty->get ())
1709	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1561	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1710		1562
1711	rxvt_get_ttymode (&tio);	1563	fcntl (pty->pty, F_SETFL, O_NONBLOCK);
		1564
		1565	struct termios tio = def_tio;
1712		1566
1713	#ifndef NO_BACKSPACE_KEY	1567	#ifndef NO_BACKSPACE_KEY
1714	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1568	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1715	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];	1569	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1716	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1570	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
…		…
1764		1618
1765	_exit (EXIT_FAILURE);	1619	_exit (EXIT_FAILURE);
1766		1620
1767	default:	1621	default:
1768	if (!option (Opt_utmpInhibit))	1622	if (!option (Opt_utmpInhibit))
		1623	{
		1624	#ifdef LOG_ONLY_ON_LOGIN
		1625	bool login_shell = option (Opt_loginShell);
		1626	#else
		1627	bool login_shell = true;
		1628	#endif
1769	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);	1629	pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
		1630	}
1770		1631
1771	pty->close_tty ();	1632	pty->close_tty ();
1772		1633
1773	child_ev.start (cmd_pid);	1634	child_ev.start (cmd_pid);
1774		1635
…		…
1799	#elif defined (SRIOCSREDIR)	1660	#elif defined (SRIOCSREDIR)
1800	int fd;	1661	int fd;
1801		1662
1802	fd = open (CONSOLE, O_WRONLY, 0);	1663	fd = open (CONSOLE, O_WRONLY, 0);
1803	if (fd >= 0)	1664	if (fd >= 0)
1804	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1665	{
		1666	ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1805	close (fd);	1667	close (fd);
		1668	}
1806	#endif /* SRIOCSREDIR */	1669	#endif /* SRIOCSREDIR */
1807	}	1670	}
1808		1671
1809	/* reset signals and spin off the command interpreter */	1672	/* reset signals and spin off the command interpreter */
1810	signal (SIGINT, SIG_DFL);	1673	signal (SIGINT, SIG_DFL);
1811	signal (SIGQUIT, SIG_DFL);	1674	signal (SIGQUIT, SIG_DFL);
1812	signal (SIGCHLD, SIG_DFL);	1675	signal (SIGCHLD, SIG_DFL);
1813	signal (SIGHUP, SIG_DFL);	1676	signal (SIGHUP, SIG_DFL);
1814	signal (SIGPIPE, SIG_DFL);	1677	signal (SIGPIPE, SIG_DFL);
1815	/*	1678	/*
1816	* mimick login's behavior by disabling the job control signals	1679	* mimic login's behavior by disabling the job control signals
1817	* a shell that wants them can turn them back on	1680	* a shell that wants them can turn them back on
1818	*/	1681	*/
1819	#ifdef SIGTSTP	1682	#ifdef SIGTSTP
1820	signal (SIGTSTP, SIG_IGN);	1683	signal (SIGTSTP, SIG_IGN);
1821	signal (SIGTTIN, SIG_IGN);	1684	signal (SIGTTIN, SIG_IGN);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.271 by sf-exg, Thu Jul 1 21:50:25 2010 UTC vs. Revision 1.322 by sf-exg, Thu May 17 10:18:32 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.271 by sf-exg, Thu Jul 1 21:50:25 2010 UTC vs.
Revision 1.322 by sf-exg, Thu May 17 10:18:32 2012 UTC