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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.280 by sf-exg, Sun Aug 29 17:58:54 2010 UTC vs.
Revision 1.312 by sf-exg, Tue Dec 27 11:09:31 2011 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.
…		…
55		55
56	#ifdef HAVE_NL_LANGINFO	56	#ifdef HAVE_NL_LANGINFO
57	# include <langinfo.h>	57	# include <langinfo.h>
58	#endif	58	#endif
59		59
		60	#ifdef HAVE_STARTUP_NOTIFICATION
		61	# define SN_API_NOT_YET_FROZEN
		62	# include <libsn/sn-launchee.h>
		63	#endif
		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>
63	#include <sys/socket.h>	68	#include <sys/socket.h>
64		69
…		…
143		148
144	return rval;	149	return rval;
145	}	150	}
146	#endif	151	#endif
147		152
148	const char *const def_colorName[] =	153	static 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)
…		…
562		567
563	/----------------------------------------------------------------------/	568	/----------------------------------------------------------------------/
564	const char **	569	const char **
565	rxvt_term::init_resources (int argc, const char const argv)	570	rxvt_term::init_resources (int argc, const char const argv)
566	{	571	{
567	int i, r_argc;	572	int i;
568	const char cmd_argv, r_argv;	573	const char **cmd_argv;
569
570	/*
571	* Look for -e option. Find => split and make cmd_argv[] of command args
572	*/
573	for (r_argc = 0; r_argc < argc; r_argc++)
574	if (!strcmp (argv[r_argc], "-e"))
575	break;
576
577	if (r_argc == argc)
578	cmd_argv = NULL;
579	else if (!argv[r_argc + 1])
580	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581	else
582	{
583	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
584
585	for (i = 0; i < argc - r_argc - 1; i++)
586	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588	cmd_argv[i] = NULL;
589	}
590
591	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
592
593	for (i = 0; i < r_argc; i++)
594	r_argv[i] = (const char *)argv[i];
595
596	r_argv[i] = NULL;
597		574
598	rs[Rs_name] = rxvt_basename (argv[0]);	575	rs[Rs_name] = rxvt_basename (argv[0]);
599		576
600	/*	577	/*
601	* Open display, get options/resources and create the window	578	* Open display, get options/resources and create the window
602	*/	579	*/
603		580
604	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	581	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605	rs[Rs_display_name] = ":0";	582	rs[Rs_display_name] = ":0";
606		583
607	get_options (r_argc, r_argv);	584	cmd_argv = get_options (argc, argv);
608		585
609	if (!(display = displays.get (rs[Rs_display_name])))	586	if (!(display = displays.get (rs[Rs_display_name])))
610	{
611	free (r_argv);
612	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]);
613	}
614		588
615	// using a local pointer decreases code size a lot	589	// using a local pointer decreases code size a lot
616	xa = display->xa;	590	xa = display->xa;
617		591
618	set (display);	592	set (display);
…		…
621	#if XFT	595	#if XFT
622	if (rs[Rs_depth])	596	if (rs[Rs_depth])
623	select_visual (strtol (rs[Rs_depth], 0, 0));	597	select_visual (strtol (rs[Rs_depth], 0, 0));
624	#endif	598	#endif
625		599
626	free (r_argv);
627
628	for (int i = NUM_RESOURCES; i--; )	600	for (int i = NUM_RESOURCES; i--; )
629	if (rs [i] == resval_undef)	601	if (rs [i] == resval_undef)
630	rs [i] = 0;	602	rs [i] = 0;
631		603
632	#ifdef HAVE_AFTERIMAGE
633	set_application_name ((char *)rs[Rs_name]);
634	set_output_threshold (OUTPUT_LEVEL_WARNING);
635	#endif
636
637	#if ENABLE_PERL	604	#if ENABLE_PERL
638	if (!rs[Rs_perl_ext_1])	605	if (!rs[Rs_perl_ext_1])
639	rs[Rs_perl_ext_1] = "default";	606	rs[Rs_perl_ext_1] = "default";
640		607
641	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	608	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
644	{	611	{
645	rxvt_perl.init (this);	612	rxvt_perl.init (this);
646	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	613	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647	}	614	}
648	#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 ();
649		620
650	/*	621	/*
651	* set any defaults not already set	622	* set any defaults not already set
652	*/	623	*/
653	if (cmd_argv && cmd_argv[0])	624	if (cmd_argv && cmd_argv[0])
…		…
762	return cmd_argv;	733	return cmd_argv;
763	}	734	}
764		735
765	/----------------------------------------------------------------------/	736	/----------------------------------------------------------------------/
766	void	737	void
767	rxvt_term::init (int argc, const char const argv, stringvec *envv)	738	rxvt_term::init (stringvec argv, stringvec envv)
768	{	739	{
		740	argv->push_back (0);
		741	envv->push_back (0);
		742
		743	this->argv = argv;
769	this->envv = envv;	744	this->envv = envv;
770		745
		746	init2 (argv->size () - 1, argv->begin ());
		747	}
		748
		749	void
		750	rxvt_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
		768	void
		769	rxvt_term::init2 (int argc, const char const argv)
		770	{
771	SET_R (this);	771	SET_R (this);
772	set_locale ("");	772	set_locale ("");
773	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 :(
774		774
775	init_vars ();	775	init_vars ();
…		…
789	if (chdir (path))	789	if (chdir (path))
790	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");
791	}	791	}
792		792
793	if (option (Opt_scrollBar))	793	if (option (Opt_scrollBar))
794	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	794	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795		795
796	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
797		807
798	create_windows (argc, argv);	808	create_windows (argc, argv);
799		809
800	init_xlocale ();	810	init_xlocale ();
801		811
…		…
807		817
808	if (option (Opt_scrollBar))	818	if (option (Opt_scrollBar))
809	scrollBar.resize (); /* create and map scrollbar */	819	scrollBar.resize (); /* create and map scrollbar */
810	#ifdef HAVE_BG_PIXMAP	820	#ifdef HAVE_BG_PIXMAP
811	{	821	{
812	bgPixmap.set_target (this);	822	bg_init ();
813	bgPixmap.invalidate ();
814		823
815	#ifdef ENABLE_TRANSPARENCY	824	#ifdef ENABLE_TRANSPARENCY
816	if (option (Opt_transparent))	825	if (option (Opt_transparent))
817	{	826	{
818	bgPixmap.set_transparent ();	827	bg_set_transparent ();
819		828
820	#ifdef HAVE_AFTERIMAGE
821	if (rs [Rs_blurradius])	829	if (rs [Rs_blurradius])
822	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	830	bg_set_blur (rs [Rs_blurradius]);
823	#endif	831
824	if (ISSET_PIXCOLOR (Color_tint))	832	if (ISSET_PIXCOLOR (Color_tint))
825	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	833	bg_set_tint (pix_colors_focused [Color_tint]);
826		834
827	if (rs [Rs_shade])	835	if (rs [Rs_shade])
828	bgPixmap.set_shade (rs [Rs_shade]);	836	bg_set_shade (rs [Rs_shade]);
829		837
830	bgPixmap.set_root_pixmap ();	838	bg_set_root_pixmap ();
831	XSelectInput (dpy, display->root, PropertyChangeMask);	839	XSelectInput (dpy, display->root, PropertyChangeMask);
832	rootwin_ev.start (display, display->root);	840	rootwin_ev.start (display, display->root);
833	}	841	}
834	#endif	842	#endif
835		843
836	#ifdef BG_IMAGE_FROM_FILE	844	#ifdef BG_IMAGE_FROM_FILE
837	if (rs[Rs_backgroundPixmap])	845	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]))	846	if (bg_set_file (rs[Rs_backgroundPixmap]))
850	if (!bgPixmap.window_position_sensitive ())	847	if (!bg_window_position_sensitive ())
851	update_background ();	848	update_background ();
852	}
853	#endif	849	#endif
854	}	850	}
855	#endif	851	#endif
856		852
857	#if ENABLE_PERL	853	#if ENABLE_PERL
…		…
860		856
861	set_colorfgbg ();	857	set_colorfgbg ();
862		858
863	init_command (cmd_argv);	859	init_command (cmd_argv);
864		860
865	free (cmd_argv);
866
867	if (pty->pty >= 0)	861	if (pty->pty >= 0)
868	pty_ev.start (pty->pty, ev::READ);	862	pty_ev.start (pty->pty, ev::READ);
869		863
870	HOOK_INVOKE ((this, HOOK_START, DT_END));	864	HOOK_INVOKE ((this, HOOK_START, DT_END));
871		865
872	#if ENABLE_XEMBED	866	#if ENABLE_XEMBED
873	if (rs[Rs_embed])	867	if (rs[Rs_embed])
874	{	868	{
875	long info[2] = { 0, XEMBED_MAPPED };	869	long info[2] = { 0, XEMBED_MAPPED };
876		870
877	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	871	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878	32, PropModeReplace, (unsigned char *)&info, 2);	872	32, PropModeReplace, (unsigned char *)&info, 2);
879	}	873	}
880	#endif	874	#endif
881		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
882	XMapWindow (dpy, vt);	888	XMapWindow (dpy, vt);
883	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
884		902
885	refresh_check ();	903	refresh_check ();
886	}	904	}
887		905
888	/----------------------------------------------------------------------/	906	/----------------------------------------------------------------------/
889	void	907	void
890	rxvt_term::init_env ()	908	rxvt_term::init_env ()
891	{	909	{
892	int i;
893	char *val;	910	char *val;
894		911
895	#ifdef DISPLAY_IS_IP	912	#ifdef DISPLAY_IS_IP
896	/* Fixup display_name for export over pty to any interested terminal	913	/* Fixup display_name for export over pty to any interested terminal
897	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	914	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
911	val = XDisplayString (dpy);	928	val = XDisplayString (dpy);
912		929
913	if (rs[Rs_display_name] == NULL)	930	if (rs[Rs_display_name] == NULL)
914	rs[Rs_display_name] = val; /* use broken `:0' value */	931	rs[Rs_display_name] = val; /* use broken `:0' value */
915		932
916	i = strlen (val);
917	env_display = (char *)rxvt_malloc (i + 9);	933	env_display = (char *)rxvt_malloc (strlen (val) + 9);
918		934
919	sprintf (env_display, "DISPLAY=%s", val);	935	sprintf (env_display, "DISPLAY=%s", val);
920		936
921	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	937	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922		938
923	/* add entries to the environment:	939	/* add entries to the environment:
924	* @ DISPLAY: in case we started with -display	940	* @ DISPLAY: in case we started with -display
925	* @ WINDOWID: X window id number of the window	941	* @ WINDOWID: X window id number of the window
926	* @ COLORTERM: terminal sub-name and also indicates its color	942	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
959	unsetenv ("TERMCAP"); /* terminfo should be okay */	975	unsetenv ("TERMCAP"); /* terminfo should be okay */
960	#endif /* HAVE_UNSETENV */	976	#endif /* HAVE_UNSETENV */
961	}	977	}
962		978
963	/----------------------------------------------------------------------/	979	/----------------------------------------------------------------------/
964	/*
965	* This is more or less stolen straight from XFree86 xterm.
966	* This should support all European type languages.
967	*/
968	void	980	void
969	rxvt_term::set_locale (const char *locale)	981	rxvt_term::set_locale (const char *locale)
970	{	982	{
971	set_environ (envv);	983	set_environ (envv);
972		984
…		…
992	SET_LOCALE (this->locale);	1004	SET_LOCALE (this->locale);
993	mbstate.reset ();	1005	mbstate.reset ();
994	#endif	1006	#endif
995		1007
996	#if HAVE_NL_LANGINFO	1008	#if HAVE_NL_LANGINFO
997	char *codeset = strdup (nl_langinfo (CODESET));	1009	char *codeset = nl_langinfo (CODESET);
998	// /^UTF.?8/i	1010	// /^UTF.?8/i
999	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')	1011	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
1000	&& (codeset[1] == 'T' \|\| codeset[1] == 't')	1012	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
1001	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')	1013	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
1002	&& (codeset[3] == '8' \|\| codeset[4] == '8');	1014	&& (codeset[3] == '8' \|\| codeset[4] == '8');
1003	free (codeset);
1004	#else	1015	#else
1005	enc_utf8 = 0;	1016	enc_utf8 = 0;
1006	#endif	1017	#endif
1007	}	1018	}
1008		1019
…		…
1011	{	1022	{
1012	set_environ (envv);	1023	set_environ (envv);
1013		1024
1014	#ifdef USE_XIM	1025	#ifdef USE_XIM
1015	if (!locale)	1026	if (!locale)
1016	rxvt_warn ("setting locale failed, working without locale support.\n");	1027	rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017	else	1028	else
1018	{	1029	{
1019	set_string_property (xa[XA_WM_LOCALE_NAME], locale);	1030	set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020		1031
1021	if (!XSupportsLocale ())	1032	if (!XSupportsLocale ())
1022	{	1033	{
1023	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");	1034	rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024	return;	1035	return;
1025	}	1036	}
1026		1037
1027	im_ev.start (display);	1038	im_ev.start (display);
1028		1039
…		…
1292	{	1303	{
1293	rxvt_warn ("Loading image icon failed, continuing without.\n");	1304	rxvt_warn ("Loading image icon failed, continuing without.\n");
1294	return;	1305	return;
1295	}	1306	}
1296		1307
1297	int w = im->width;	1308	unsigned int w = im->width;
1298	int h = im->height;	1309	unsigned int h = im->height;
1299		1310
1300	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))	1311	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
1301	{	1312	{
1302	rxvt_warn ("Icon image too big, continuing without.\n");	1313	rxvt_warn ("Icon image too big, continuing without.\n");
1303	destroy_asimage (&im);	1314	destroy_asimage (&im);
…		…
1323	buffer [1] = h;	1334	buffer [1] = h;
1324		1335
1325	for (unsigned int i = 0; i < w * h; ++i)	1336	for (unsigned int i = 0; i < w * h; ++i)
1326	buffer [i + 2] = asbuf [i];	1337	buffer [i + 2] = asbuf [i];
1327		1338
1328	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,	1339	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329	PropModeReplace, (const unsigned char ) buffer, 2 + w h);	1340	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1330	free (buffer);	1341	free (buffer);
1331	}	1342	}
1332	else	1343	else
1333	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");	1344	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334		1345
1335	destroy_asimage (&result);	1346	destroy_asimage (&result);
1336	#endif	1347	#endif
		1348
		1349	#ifdef HAVE_PIXBUF
		1350	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1351	if (!pixbuf)
		1352	{
		1353	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1354	return;
		1355	}
		1356
		1357	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1358	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1359
		1360	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1361	{
		1362	rxvt_warn ("Icon image too big, continuing without.\n");
		1363	g_object_unref (pixbuf);
		1364	return;
		1365	}
		1366
		1367	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1368	{
		1369	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1370	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1371	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1372
		1373	buffer [0] = w;
		1374	buffer [1] = h;
		1375	for (int i = 0; i < h; i++)
		1376	{
		1377	for (int j = 0; j < w; j++)
		1378	{
		1379	unsigned char pixel = row + j channels;
		1380	long value;
		1381
		1382	if (channels == 4)
		1383	value = pixel[3];
		1384	else
		1385	value = (unsigned char)0x00ff;
		1386
		1387	value = (value << 8) + pixel[0];
		1388	value = (value << 8) + pixel[1];
		1389	value = (value << 8) + pixel[2];
		1390	buffer[(i * w + j) + 2] = value;
		1391	}
		1392
		1393	row += rowstride;
		1394	}
		1395
		1396	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1397	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1398	free (buffer);
		1399	}
		1400	else
		1401	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1402
		1403	g_object_unref (pixbuf);
		1404	#endif
1337	}	1405	}
1338		1406
1339	/----------------------------------------------------------------------/	1407	/----------------------------------------------------------------------/
1340	/* rxvt_Create_Windows () - Open and map the window */	1408	/* Open and map the window */
1341	void	1409	void
1342	rxvt_term::create_windows (int argc, const char const argv)	1410	rxvt_term::create_windows (int argc, const char const argv)
1343	{	1411	{
1344	XClassHint classHint;	1412	XClassHint classHint;
1345	XWMHints wmHint;	1413	XWMHints wmHint;
…		…
1391	}	1459	}
1392	#endif	1460	#endif
1393		1461
1394	window_calc (0, 0);	1462	window_calc (0, 0);
1395		1463
1396	/* sub-window placement & size in rxvt_resize_subwindows () */	1464	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1397	attributes.background_pixel = pix_colors_focused [Color_border];	1465	attributes.background_pixel = pix_colors_focused [Color_border];
1398	attributes.border_pixel = pix_colors_focused [Color_border];	1466	attributes.border_pixel = pix_colors_focused [Color_border];
1399	attributes.colormap = cmap;	1467	attributes.colormap = cmap;
1400		1468
1401	top = XCreateWindow (dpy, parent,	1469	top = XCreateWindow (dpy, parent,
…		…
1404	ext_bwidth,	1472	ext_bwidth,
1405	depth, InputOutput, visual,	1473	depth, InputOutput, visual,
1406	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1474	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1407	&attributes);	1475	&attributes);
1408		1476
1409	this->parent[0] = top;	1477	this->parent = top;
1410		1478
1411	old_width = szHint.width;	1479	old_width = szHint.width;
1412	old_height = szHint.height;	1480	old_height = szHint.height;
1413		1481
1414	set_title (rs [Rs_title]);	1482	set_title (rs [Rs_title]);
…		…
1447	#if ENABLE_EWMH	1515	#if ENABLE_EWMH
1448	xa[XA_NET_WM_PING],	1516	xa[XA_NET_WM_PING],
1449	#endif	1517	#endif
1450	};	1518	};
1451		1519
1452	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1520	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1453		1521
1454	#if ENABLE_FRILLS	1522	#if ENABLE_FRILLS
1455	if (rs[Rs_transient_for])	1523	if (rs[Rs_transient_for])
1456	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1524	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1457	#endif	1525	#endif
…		…
1539	if (pty->pty >= 0)	1607	if (pty->pty >= 0)
1540	{	1608	{
1541	if (getfd_hook)	1609	if (getfd_hook)
1542	pty->pty = (*getfd_hook) (pty->pty);	1610	pty->pty = (*getfd_hook) (pty->pty);
1543		1611
1544	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))	1612	if (pty->pty < 0)
1545	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1613	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1546	}	1614	}
1547	}	1615	}
1548	else	1616	else
1549	#endif	1617	#endif
1550	if (!pty->get ())	1618	if (!pty->get ())
1551	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1619	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1620
		1621	fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552		1622
1553	struct termios tio = def_tio;	1623	struct termios tio = def_tio;
1554		1624
1555	#ifndef NO_BACKSPACE_KEY	1625	#ifndef NO_BACKSPACE_KEY
1556	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1626	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
…		…
1606		1676
1607	_exit (EXIT_FAILURE);	1677	_exit (EXIT_FAILURE);
1608		1678
1609	default:	1679	default:
1610	if (!option (Opt_utmpInhibit))	1680	if (!option (Opt_utmpInhibit))
		1681	{
		1682	#ifdef LOG_ONLY_ON_LOGIN
		1683	bool login_shell = option (Opt_loginShell);
		1684	#else
		1685	bool login_shell = true;
		1686	#endif
1611	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);	1687	pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
		1688	}
1612		1689
1613	pty->close_tty ();	1690	pty->close_tty ();
1614		1691
1615	child_ev.start (cmd_pid);	1692	child_ev.start (cmd_pid);
1616		1693
…		…
1641	#elif defined (SRIOCSREDIR)	1718	#elif defined (SRIOCSREDIR)
1642	int fd;	1719	int fd;
1643		1720
1644	fd = open (CONSOLE, O_WRONLY, 0);	1721	fd = open (CONSOLE, O_WRONLY, 0);
1645	if (fd >= 0)	1722	if (fd >= 0)
1646	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1723	{
		1724	ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1647	close (fd);	1725	close (fd);
		1726	}
1648	#endif /* SRIOCSREDIR */	1727	#endif /* SRIOCSREDIR */
1649	}	1728	}
1650		1729
1651	/* reset signals and spin off the command interpreter */	1730	/* reset signals and spin off the command interpreter */
1652	signal (SIGINT, SIG_DFL);	1731	signal (SIGINT, SIG_DFL);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.280 by sf-exg, Sun Aug 29 17:58:54 2010 UTC vs. Revision 1.312 by sf-exg, Tue Dec 27 11:09:31 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.280 by sf-exg, Sun Aug 29 17:58:54 2010 UTC vs.
Revision 1.312 by sf-exg, Tue Dec 27 11:09:31 2011 UTC