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

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