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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.282 by sf-exg, Thu Sep 2 15:48:11 2010 UTC vs.
Revision 1.325 by sf-exg, Thu May 31 05:53:46 2012 UTC

…		…
10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>	10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>	11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14	* - extensive modifications	14	* - extensive modifications
15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16	*	16	*
17	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
18	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
19	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
20	* (at your option) any later version.	20	* (at your option) any later version.
…		…
38	#include "init.h"	38	#include "init.h"
39	#include "keyboard.h"	39	#include "keyboard.h"
40		40
41	#include <limits>	41	#include <limits>
42		42
43	#include <csignal>	43	#include <signal.h>
44		44
45	#include <fcntl.h>	45	#include <fcntl.h>
46		46
47	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	48	# define X_LOCALE
49	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
50	#else	50	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	51	# include <locale.h>
53	# endif
54	#endif	52	#endif
55		53
56	#ifdef HAVE_NL_LANGINFO	54	#ifdef HAVE_NL_LANGINFO
57	# include <langinfo.h>	55	# include <langinfo.h>
		56	#endif
		57
		58	#ifdef HAVE_STARTUP_NOTIFICATION
		59	# define SN_API_NOT_YET_FROZEN
		60	# include <libsn/sn-launchee.h>
58	#endif	61	#endif
59		62
60	#ifdef DISPLAY_IS_IP	63	#ifdef DISPLAY_IS_IP
61	/* On Solaris link with -lsocket and -lnsl */	64	/* On Solaris link with -lsocket and -lnsl */
62	#include <sys/types.h>	65	#include <sys/types.h>
…		…
73	#include <netinet/in.h>	76	#include <netinet/in.h>
74	#include <arpa/inet.h>	77	#include <arpa/inet.h>
75	#include <net/if.h>	78	#include <net/if.h>
76	#include <net/if_arp.h>	79	#include <net/if_arp.h>
77		80
78	static char *	81	static char * ecb_cold
79	rxvt_network_display (const char *display)	82	rxvt_network_display (const char *display)
80	{	83	{
81	char buffer[1024], *rval = NULL;	84	char buffer[1024], *rval = NULL;
82	struct ifconf ifc;	85	struct ifconf ifc;
83	struct ifreq *ifr;	86	struct ifreq *ifr;
…		…
143		146
144	return rval;	147	return rval;
145	}	148	}
146	#endif	149	#endif
147		150
148	const char *const def_colorName[] =	151	static const char *const def_colorName[] =
149	{	152	{
150	COLOR_FOREGROUND,	153	COLOR_FOREGROUND,
151	COLOR_BACKGROUND,	154	COLOR_BACKGROUND,
152	/* low-intensity colors */	155	/* low-intensity colors */
153	"rgb:00/00/00", // 0: black (Black)	156	"rgb:00/00/00", // 0: black (Black)
…		…
562		565
563	/----------------------------------------------------------------------/	566	/----------------------------------------------------------------------/
564	const char **	567	const char **
565	rxvt_term::init_resources (int argc, const char const argv)	568	rxvt_term::init_resources (int argc, const char const argv)
566	{	569	{
567	int i, r_argc;	570	int i;
568	const char cmd_argv, r_argv;	571	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		572
598	rs[Rs_name] = rxvt_basename (argv[0]);	573	rs[Rs_name] = rxvt_basename (argv[0]);
599		574
600	/*	575	/*
601	* Open display, get options/resources and create the window	576	* Open display, get options/resources and create the window
602	*/	577	*/
603		578
604	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	579	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605	rs[Rs_display_name] = ":0";	580	rs[Rs_display_name] = ":0";
606		581
607	get_options (r_argc, r_argv);	582	cmd_argv = get_options (argc, argv);
608		583
609	if (!(display = displays.get (rs[Rs_display_name])))	584	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]);	585	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613	}
614		586
615	// using a local pointer decreases code size a lot	587	// using a local pointer decreases code size a lot
616	xa = display->xa;	588	xa = display->xa;
617		589
618	set (display);	590	set (display);
…		…
621	#if XFT	593	#if XFT
622	if (rs[Rs_depth])	594	if (rs[Rs_depth])
623	select_visual (strtol (rs[Rs_depth], 0, 0));	595	select_visual (strtol (rs[Rs_depth], 0, 0));
624	#endif	596	#endif
625		597
626	free (r_argv);
627
628	for (int i = NUM_RESOURCES; i--; )	598	for (int i = NUM_RESOURCES; i--; )
629	if (rs [i] == resval_undef)	599	if (rs [i] == resval_undef)
630	rs [i] = 0;	600	rs [i] = 0;
631		601
632	#ifdef HAVE_AFTERIMAGE
633	set_application_name ((char *)rs[Rs_name]);
634	set_output_threshold (OUTPUT_LEVEL_WARNING);
635	#endif
636
637	#ifdef HAVE_PIXBUF
638	g_type_init ();
639	gdk_pixbuf_xlib_init (dpy, display->screen);
640	#endif
641
642	#if ENABLE_PERL	602	#if ENABLE_PERL
643	if (!rs[Rs_perl_ext_1])	603	if (!rs[Rs_perl_ext_1])
644	rs[Rs_perl_ext_1] = "default";	604	rs[Rs_perl_ext_1] = "default";
645		605
646	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	606	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
649	{	609	{
650	rxvt_perl.init (this);	610	rxvt_perl.init (this);
651	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	611	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
652	}	612	}
653	#endif	613	#endif
		614
		615	// must be called after initialising the perl interpreter as it
		616	// may invoke the `on_register_command' hook
		617	extract_keysym_resources ();
654		618
655	/*	619	/*
656	* set any defaults not already set	620	* set any defaults not already set
657	*/	621	*/
658	if (cmd_argv && cmd_argv[0])	622	if (cmd_argv && cmd_argv[0])
…		…
767	return cmd_argv;	731	return cmd_argv;
768	}	732	}
769		733
770	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
771	void	735	void
772	rxvt_term::init (int argc, const char const argv, stringvec *envv)	736	rxvt_term::init (stringvec argv, stringvec envv)
773	{	737	{
		738	argv->push_back (0);
		739	envv->push_back (0);
		740
		741	this->argv = argv;
774	this->envv = envv;	742	this->envv = envv;
775		743
		744	init2 (argv->size () - 1, argv->begin ());
		745	}
		746
		747	void
		748	rxvt_term::init (int argc, const char const argv, const char const envv)
		749	{
		750	#if ENABLE_PERL
		751	// perl might want to access the stringvecs later, so we need to copy them
		752	stringvec *args = new stringvec;
		753	for (int i = 0; i < argc; i++)
		754	args->push_back (strdup (argv [i]));
		755
		756	stringvec *envs = new stringvec;
		757	for (const char const var = envv; *var; var++)
		758	envs->push_back (strdup (*var));
		759
		760	init (args, envs);
		761	#else
		762	init2 (argc, argv);
		763	#endif
		764	}
		765
		766	void
		767	rxvt_term::init2 (int argc, const char const argv)
		768	{
776	SET_R (this);	769	SET_R (this);
777	set_locale ("");	770	set_locale ("");
778	set_environ (envv); // a few things in X do not call setlocale :(	771	set_environ (envv); // a few things in X do not call setlocale :(
779		772
780	init_vars ();	773	init_vars ();
…		…
794	if (chdir (path))	787	if (chdir (path))
795	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");	788	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
796	}	789	}
797		790
798	if (option (Opt_scrollBar))	791	if (option (Opt_scrollBar))
799	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	792	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
800		793
801	pty = ptytty::create ();	794	pty = ptytty::create ();
		795
		796	// must be called before create_windows, because the latter may call set_icon
		797	#ifdef HAVE_PIXBUF
		798	g_type_init ();
		799	#endif
802		800
803	create_windows (argc, argv);	801	create_windows (argc, argv);
804		802
805	init_xlocale ();	803	init_xlocale ();
806		804
…		…
812		810
813	if (option (Opt_scrollBar))	811	if (option (Opt_scrollBar))
814	scrollBar.resize (); /* create and map scrollbar */	812	scrollBar.resize (); /* create and map scrollbar */
815	#ifdef HAVE_BG_PIXMAP	813	#ifdef HAVE_BG_PIXMAP
816	{	814	{
817	bgPixmap.set_target (this);	815	bg_init ();
818	bgPixmap.invalidate ();
819		816
820	#ifdef ENABLE_TRANSPARENCY	817	#ifdef ENABLE_TRANSPARENCY
821	if (option (Opt_transparent))	818	if (option (Opt_transparent))
822	{	819	{
823	bgPixmap.set_transparent ();	820	bg_set_transparent ();
824		821
825	#ifdef HAVE_AFTERIMAGE
826	if (rs [Rs_blurradius])	822	if (rs [Rs_blurradius])
827	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	823	root_effects.set_blur (rs [Rs_blurradius]);
828	#endif	824
829	if (ISSET_PIXCOLOR (Color_tint))	825	if (ISSET_PIXCOLOR (Color_tint))
830	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	826	root_effects.set_tint (pix_colors_focused [Color_tint]);
831		827
832	if (rs [Rs_shade])	828	if (rs [Rs_shade])
833	bgPixmap.set_shade (rs [Rs_shade]);	829	root_effects.set_shade (rs [Rs_shade]);
834		830
835	bgPixmap.set_root_pixmap ();	831	bg_set_root_pixmap ();
836	XSelectInput (dpy, display->root, PropertyChangeMask);	832	XSelectInput (dpy, display->root, PropertyChangeMask);
837	rootwin_ev.start (display, display->root);	833	rootwin_ev.start (display, display->root);
838	}	834	}
839	#endif	835	#endif
840
841	#ifdef BG_IMAGE_FROM_FILE
842	if (rs[Rs_backgroundPixmap])
843	{
844	const char *p = rs[Rs_backgroundPixmap];
845
846	if ((p = strchr (p, ';')) != 0)
847	{
848	p++;
849	bgPixmap.set_geometry (p);
850	}
851	else
852	bgPixmap.set_defaultGeometry ();
853
854	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
855	if (!bgPixmap.window_position_sensitive ())
856	update_background ();
857	}
858	#endif
859	}	836	}
860	#endif	837	#endif
861		838
862	#if ENABLE_PERL	839	#if ENABLE_PERL
863	rootwin_ev.start (display, display->root);	840	rootwin_ev.start (display, display->root);
864	#endif	841	#endif
865		842
866	set_colorfgbg ();	843	init_done = 1;
867		844
868	init_command (cmd_argv);	845	init_command (cmd_argv);
869
870	free (cmd_argv);
871		846
872	if (pty->pty >= 0)	847	if (pty->pty >= 0)
873	pty_ev.start (pty->pty, ev::READ);	848	pty_ev.start (pty->pty, ev::READ);
874		849
875	HOOK_INVOKE ((this, HOOK_START, DT_END));	850	HOOK_INVOKE ((this, HOOK_START, DT_END));
…		…
877	#if ENABLE_XEMBED	852	#if ENABLE_XEMBED
878	if (rs[Rs_embed])	853	if (rs[Rs_embed])
879	{	854	{
880	long info[2] = { 0, XEMBED_MAPPED };	855	long info[2] = { 0, XEMBED_MAPPED };
881		856
882	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	857	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
883	32, PropModeReplace, (unsigned char *)&info, 2);	858	32, PropModeReplace, (unsigned char *)&info, 2);
884	}	859	}
885	#endif	860	#endif
886		861
		862	#if HAVE_STARTUP_NOTIFICATION
		863	SnDisplay *snDisplay;
		864	SnLauncheeContext *snContext;
		865
		866	snDisplay = sn_display_new (dpy, NULL, NULL);
		867	snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
		868
		869	/* Tell the window manager that this window is part of the startup context */
		870	if (snContext)
		871	sn_launchee_context_setup_window (snContext, parent);
		872	#endif
		873
887	XMapWindow (dpy, vt);	874	XMapWindow (dpy, vt);
888	XMapWindow (dpy, parent[0]);	875	XMapWindow (dpy, parent);
		876
		877	#if HAVE_STARTUP_NOTIFICATION
		878	if (snContext)
		879	{
		880	/* Mark the startup process as complete */
		881	sn_launchee_context_complete (snContext);
		882
		883	sn_launchee_context_unref (snContext);
		884	}
		885
		886	sn_display_unref (snDisplay);
		887	#endif
889		888
890	refresh_check ();	889	refresh_check ();
891	}	890	}
892		891
893	/----------------------------------------------------------------------/	892	/----------------------------------------------------------------------/
894	void	893	void
895	rxvt_term::init_env ()	894	rxvt_term::init_env ()
896	{	895	{
897	int i;
898	char *val;	896	char *val;
		897	char *env_display;
		898	char *env_windowid;
		899	char *env_colorfgbg;
		900	char *env_term;
899		901
900	#ifdef DISPLAY_IS_IP	902	#ifdef DISPLAY_IS_IP
901	/* Fixup display_name for export over pty to any interested terminal	903	/* Fixup display_name for export over pty to any interested terminal
902	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	904	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
903	* (for the first non-loopback interface) that we get from	905	* (for the first non-loopback interface) that we get from
…		…
916	val = XDisplayString (dpy);	918	val = XDisplayString (dpy);
917		919
918	if (rs[Rs_display_name] == NULL)	920	if (rs[Rs_display_name] == NULL)
919	rs[Rs_display_name] = val; /* use broken `:0' value */	921	rs[Rs_display_name] = val; /* use broken `:0' value */
920		922
921	i = strlen (val);
922	env_display = (char *)rxvt_malloc (i + 9);	923	env_display = (char *)rxvt_malloc (strlen (val) + 9);
923		924
924	sprintf (env_display, "DISPLAY=%s", val);	925	sprintf (env_display, "DISPLAY=%s", val);
925		926
		927	env_windowid = (char *)rxvt_malloc (21);
926	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	928	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
927		929
928	/* add entries to the environment:	930	/* add entries to the environment:
929	* @ DISPLAY: in case we started with -display	931	* @ DISPLAY: in case we started with -display
930	* @ WINDOWID: X window id number of the window	932	* @ WINDOWID: X window id number of the window
931	* @ COLORTERM: terminal sub-name and also indicates its color	933	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
934	* @ COLORFGBG: fg;bg color codes	936	* @ COLORFGBG: fg;bg color codes
935	*/	937	*/
936	putenv (env_display);	938	putenv (env_display);
937	putenv (env_windowid);	939	putenv (env_windowid);
938		940
939	if (env_colorfgbg)	941	env_colorfgbg = get_colorfgbg ();
940	putenv (env_colorfgbg);	942	putenv (env_colorfgbg);
941		943
942	#ifdef RXVT_TERMINFO	944	#ifdef RXVT_TERMINFO
943	putenv ("TERMINFO=" RXVT_TERMINFO);	945	putenv ("TERMINFO=" RXVT_TERMINFO);
944	#endif	946	#endif
945		947
…		…
964	unsetenv ("TERMCAP"); /* terminfo should be okay */	966	unsetenv ("TERMCAP"); /* terminfo should be okay */
965	#endif /* HAVE_UNSETENV */	967	#endif /* HAVE_UNSETENV */
966	}	968	}
967		969
968	/----------------------------------------------------------------------/	970	/----------------------------------------------------------------------/
969	/*
970	* This is more or less stolen straight from XFree86 xterm.
971	* This should support all European type languages.
972	*/
973	void	971	void
974	rxvt_term::set_locale (const char *locale)	972	rxvt_term::set_locale (const char *locale)
975	{	973	{
976	set_environ (envv);	974	set_environ (envv);
977		975
978	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
979	free (this->locale);	976	free (this->locale);
980	this->locale = setlocale (LC_CTYPE, locale);	977	this->locale = setlocale (LC_CTYPE, locale);
981		978
982	if (!this->locale)	979	if (!this->locale)
983	{	980	{
…		…
994		991
995		992
996	this->locale = strdup (this->locale);	993	this->locale = strdup (this->locale);
997	SET_LOCALE (this->locale);	994	SET_LOCALE (this->locale);
998	mbstate.reset ();	995	mbstate.reset ();
999	#endif
1000		996
1001	#if HAVE_NL_LANGINFO	997	#if HAVE_NL_LANGINFO
1002	char *codeset = strdup (nl_langinfo (CODESET));	998	char *codeset = nl_langinfo (CODESET);
1003	// /^UTF.?8/i	999	// /^UTF.?8/i
1004	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')	1000	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
1005	&& (codeset[1] == 'T' \|\| codeset[1] == 't')	1001	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
1006	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')	1002	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
1007	&& (codeset[3] == '8' \|\| codeset[4] == '8');	1003	&& (codeset[3] == '8' \|\| codeset[4] == '8');
1008	free (codeset);
1009	#else	1004	#else
1010	enc_utf8 = 0;	1005	enc_utf8 = 0;
1011	#endif	1006	#endif
1012	}	1007	}
1013		1008
…		…
1016	{	1011	{
1017	set_environ (envv);	1012	set_environ (envv);
1018		1013
1019	#ifdef USE_XIM	1014	#ifdef USE_XIM
1020	if (!locale)	1015	if (!locale)
1021	rxvt_warn ("setting locale failed, working without locale support.\n");	1016	rxvt_warn ("setting locale failed, continuing without locale support.\n");
1022	else	1017	else
1023	{	1018	{
1024	set_string_property (xa[XA_WM_LOCALE_NAME], locale);	1019	set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1025		1020
1026	if (!XSupportsLocale ())	1021	if (!XSupportsLocale ())
1027	{	1022	{
1028	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");	1023	rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1029	return;	1024	return;
1030	}	1025	}
1031		1026
1032	im_ev.start (display);	1027	im_ev.start (display);
1033		1028
…		…
1182	/----------------------------------------------------------------------/	1177	/----------------------------------------------------------------------/
1183	/* color aliases, fg/bg bright-bold */	1178	/* color aliases, fg/bg bright-bold */
1184	void	1179	void
1185	rxvt_term::color_aliases (int idx)	1180	rxvt_term::color_aliases (int idx)
1186	{	1181	{
1187	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	1182	if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1188	{	1183	{
1189	int i = atoi (rs[Rs_color + idx]);	1184	int i = atoi (rs[Rs_color + idx]);
1190		1185
1191	if (i >= 8 && i <= 15)	1186	if (i >= 8 && i <= 15)
1192	/* bright colors */	1187	/* bright colors */
…		…
1287	}	1282	}
1288		1283
1289	void	1284	void
1290	rxvt_term::set_icon (const char *file)	1285	rxvt_term::set_icon (const char *file)
1291	{	1286	{
1292	#ifdef HAVE_AFTERIMAGE
1293	init_asv ();
1294
1295	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1296	if (!im)
1297	{
1298	rxvt_warn ("Loading image icon failed, continuing without.\n");
1299	return;
1300	}
1301
1302	unsigned int w = im->width;
1303	unsigned int h = im->height;
1304
1305	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
1306	{
1307	rxvt_warn ("Icon image too big, continuing without.\n");
1308	destroy_asimage (&im);
1309	return;
1310	}
1311
1312	ASImage *result = scale_asimage (asv, im,
1313	w, h, ASA_ARGB32,
1314	100, ASIMAGE_QUALITY_DEFAULT);
1315	destroy_asimage (&im);
1316
1317	if (!result)
1318	{
1319	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1320	return;
1321	}
1322
1323	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
1324	if (buffer)
1325	{
1326	ARGB32 *asbuf = result->alt.argb32;
1327	buffer [0] = w;
1328	buffer [1] = h;
1329
1330	for (unsigned int i = 0; i < w * h; ++i)
1331	buffer [i + 2] = asbuf [i];
1332
1333	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1334	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1335	free (buffer);
1336	}
1337	else
1338	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1339
1340	destroy_asimage (&result);
1341	#endif
1342
1343	#ifdef HAVE_PIXBUF	1287	#ifdef HAVE_PIXBUF
1344	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);	1288	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1345	if (!pixbuf)	1289	if (!pixbuf)
1346	{	1290	{
1347	rxvt_warn ("Loading image icon failed, continuing without.\n");	1291	rxvt_warn ("Loading image icon failed, continuing without.\n");
…		…
1385	}	1329	}
1386		1330
1387	row += rowstride;	1331	row += rowstride;
1388	}	1332	}
1389		1333
1390	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,	1334	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1391	PropModeReplace, (const unsigned char ) buffer, 2 + w h);	1335	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1392	free (buffer);	1336	free (buffer);
1393	}	1337	}
1394	else	1338	else
1395	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");	1339	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
…		…
1397	g_object_unref (pixbuf);	1341	g_object_unref (pixbuf);
1398	#endif	1342	#endif
1399	}	1343	}
1400		1344
1401	/----------------------------------------------------------------------/	1345	/----------------------------------------------------------------------/
1402	/* rxvt_Create_Windows () - Open and map the window */	1346	/* Open and map the window */
1403	void	1347	void
1404	rxvt_term::create_windows (int argc, const char const argv)	1348	rxvt_term::create_windows (int argc, const char const argv)
1405	{	1349	{
1406	XClassHint classHint;	1350	XClassHint classHint;
1407	XWMHints wmHint;	1351	XWMHints wmHint;
…		…
1453	}	1397	}
1454	#endif	1398	#endif
1455		1399
1456	window_calc (0, 0);	1400	window_calc (0, 0);
1457		1401
1458	/* sub-window placement & size in rxvt_resize_subwindows () */	1402	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1459	attributes.background_pixel = pix_colors_focused [Color_border];	1403	attributes.background_pixel = pix_colors_focused [Color_border];
1460	attributes.border_pixel = pix_colors_focused [Color_border];	1404	attributes.border_pixel = pix_colors_focused [Color_border];
1461	attributes.colormap = cmap;	1405	attributes.colormap = cmap;
1462		1406
1463	top = XCreateWindow (dpy, parent,	1407	top = XCreateWindow (dpy, parent,
…		…
1466	ext_bwidth,	1410	ext_bwidth,
1467	depth, InputOutput, visual,	1411	depth, InputOutput, visual,
1468	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1412	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1469	&attributes);	1413	&attributes);
1470		1414
1471	this->parent[0] = top;	1415	this->parent = top;
1472
1473	old_width = szHint.width;
1474	old_height = szHint.height;
1475		1416
1476	set_title (rs [Rs_title]);	1417	set_title (rs [Rs_title]);
1477	set_icon_name (rs [Rs_iconName]);	1418	set_icon_name (rs [Rs_iconName]);
1478		1419
1479	classHint.res_name = (char *)rs[Rs_name];	1420	classHint.res_name = (char *)rs[Rs_name];
…		…
1509	#if ENABLE_EWMH	1450	#if ENABLE_EWMH
1510	xa[XA_NET_WM_PING],	1451	xa[XA_NET_WM_PING],
1511	#endif	1452	#endif
1512	};	1453	};
1513		1454
1514	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1455	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1515		1456
1516	#if ENABLE_FRILLS	1457	#if ENABLE_FRILLS
1517	if (rs[Rs_transient_for])	1458	if (rs[Rs_transient_for])
1518	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1459	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1519	#endif	1460	#endif
…		…
1542	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1483	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1543		1484
1544	/* the vt window */	1485	/* the vt window */
1545	vt = XCreateSimpleWindow (dpy, top,	1486	vt = XCreateSimpleWindow (dpy, top,
1546	window_vt_x, window_vt_y,	1487	window_vt_x, window_vt_y,
1547	width, height,	1488	vt_width, vt_height,
1548	0,	1489	0,
1549	pix_colors_focused[Color_fg],	1490	pix_colors_focused[Color_fg],
1550	pix_colors_focused[Color_bg]);	1491	pix_colors_focused[Color_bg]);
1551		1492
1552	attributes.bit_gravity = NorthWestGravity;	1493	attributes.bit_gravity = NorthWestGravity;
…		…
1601	if (pty->pty >= 0)	1542	if (pty->pty >= 0)
1602	{	1543	{
1603	if (getfd_hook)	1544	if (getfd_hook)
1604	pty->pty = (*getfd_hook) (pty->pty);	1545	pty->pty = (*getfd_hook) (pty->pty);
1605		1546
1606	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))	1547	if (pty->pty < 0)
1607	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1548	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1608	}	1549	}
1609	}	1550	}
1610	else	1551	else
1611	#endif	1552	#endif
1612	if (!pty->get ())	1553	if (!pty->get ())
1613	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1554	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1555
		1556	fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1614		1557
1615	struct termios tio = def_tio;	1558	struct termios tio = def_tio;
1616		1559
1617	#ifndef NO_BACKSPACE_KEY	1560	#ifndef NO_BACKSPACE_KEY
1618	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1561	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
…		…
1668		1611
1669	_exit (EXIT_FAILURE);	1612	_exit (EXIT_FAILURE);
1670		1613
1671	default:	1614	default:
1672	if (!option (Opt_utmpInhibit))	1615	if (!option (Opt_utmpInhibit))
		1616	{
		1617	#ifdef LOG_ONLY_ON_LOGIN
		1618	bool login_shell = option (Opt_loginShell);
		1619	#else
		1620	bool login_shell = true;
		1621	#endif
1673	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);	1622	pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
		1623	}
1674		1624
1675	pty->close_tty ();	1625	pty->close_tty ();
1676		1626
1677	child_ev.start (cmd_pid);	1627	child_ev.start (cmd_pid);
1678		1628
…		…
1703	#elif defined (SRIOCSREDIR)	1653	#elif defined (SRIOCSREDIR)
1704	int fd;	1654	int fd;
1705		1655
1706	fd = open (CONSOLE, O_WRONLY, 0);	1656	fd = open (CONSOLE, O_WRONLY, 0);
1707	if (fd >= 0)	1657	if (fd >= 0)
1708	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1658	{
		1659	ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1709	close (fd);	1660	close (fd);
		1661	}
1710	#endif /* SRIOCSREDIR */	1662	#endif /* SRIOCSREDIR */
1711	}	1663	}
1712		1664
1713	/* reset signals and spin off the command interpreter */	1665	/* reset signals and spin off the command interpreter */
1714	signal (SIGINT, SIG_DFL);	1666	signal (SIGINT, SIG_DFL);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.282 by sf-exg, Thu Sep 2 15:48:11 2010 UTC vs. Revision 1.325 by sf-exg, Thu May 31 05:53:46 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.282 by sf-exg, Thu Sep 2 15:48:11 2010 UTC vs.
Revision 1.325 by sf-exg, Thu May 31 05:53:46 2012 UTC