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

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

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.268 by root, Mon Jun 14 15:50:08 2010 UTC vs. Revision 1.314 by sf-exg, Mon Jan 9 15:30:17 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.268 by root, Mon Jun 14 15:50:08 2010 UTC vs.
Revision 1.314 by sf-exg, Mon Jan 9 15:30:17 2012 UTC