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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.274 by sf-exg, Wed Jul 28 17:56:16 2010 UTC vs.
Revision 1.328 by root, Thu Jun 7 16:04:31 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);
619	extract_resources ();	591	extract_resources ();
620		592
621	#if XFT	593	#if ENABLE_FRILLS
622	if (rs[Rs_depth])	594	if (rs[Rs_visual])
623	select_visual (strtol (rs[Rs_depth], 0, 0));	595	select_visual (strtol (rs[Rs_visual], 0, 0));
		596	else if (rs[Rs_depth])
		597	select_depth (strtol (rs[Rs_depth], 0, 0));
624	#endif	598	#endif
625
626	free (r_argv);
627		599
628	for (int i = NUM_RESOURCES; i--; )	600	for (int i = NUM_RESOURCES; i--; )
629	if (rs [i] == resval_undef)	601	if (rs [i] == resval_undef)
630	rs [i] = 0;	602	rs [i] = 0;
631		603
632	#ifdef HAVE_AFTERIMAGE
633	set_application_name ((char *)rs[Rs_name]);
634	set_output_threshold (OUTPUT_LEVEL_WARNING);
635	#endif
636
637	#if ENABLE_PERL	604	#if ENABLE_PERL
638	if (!rs[Rs_perl_ext_1])	605	if (!rs[Rs_perl_ext_1])
639	rs[Rs_perl_ext_1] = "default";	606	rs[Rs_perl_ext_1] = "default";
640		607
641	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	608	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
644	{	611	{
645	rxvt_perl.init (this);	612	rxvt_perl.init (this);
646	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	613	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647	}	614	}
648	#endif	615	#endif
		616
		617	// must be called after initialising the perl interpreter as it
		618	// may invoke the `on_register_command' hook
		619	extract_keysym_resources ();
649		620
650	/*	621	/*
651	* set any defaults not already set	622	* set any defaults not already set
652	*/	623	*/
653	if (cmd_argv && cmd_argv[0])	624	if (cmd_argv && cmd_argv[0])
…		…
762	return cmd_argv;	733	return cmd_argv;
763	}	734	}
764		735
765	/----------------------------------------------------------------------/	736	/----------------------------------------------------------------------/
766	void	737	void
767	rxvt_term::init (int argc, const char const argv, stringvec *envv)	738	rxvt_term::init (stringvec argv, stringvec envv)
768	{	739	{
		740	argv->push_back (0);
		741	envv->push_back (0);
		742
		743	this->argv = argv;
769	this->envv = envv;	744	this->envv = envv;
770		745
		746	init2 (argv->size () - 1, argv->begin ());
		747	}
		748
		749	void
		750	rxvt_term::init (int argc, const char const argv, const char const envv)
		751	{
		752	#if ENABLE_PERL
		753	// perl might want to access the stringvecs later, so we need to copy them
		754	stringvec *args = new stringvec;
		755	for (int i = 0; i < argc; i++)
		756	args->push_back (strdup (argv [i]));
		757
		758	stringvec *envs = new stringvec;
		759	for (const char const var = envv; *var; var++)
		760	envs->push_back (strdup (*var));
		761
		762	init (args, envs);
		763	#else
		764	init2 (argc, argv);
		765	#endif
		766	}
		767
		768	void
		769	rxvt_term::init2 (int argc, const char const argv)
		770	{
771	SET_R (this);	771	SET_R (this);
772	set_locale ("");	772	set_locale ("");
773	set_environ (envv); // a few things in X do not call setlocale :(	773	set_environ (envv); // a few things in X do not call setlocale :(
774		774
775	init_vars ();	775	init_vars ();
…		…
789	if (chdir (path))	789	if (chdir (path))
790	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");	790	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791	}	791	}
792		792
793	if (option (Opt_scrollBar))	793	if (option (Opt_scrollBar))
794	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	794	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795		795
796	pty = ptytty::create ();	796	pty = ptytty::create ();
797		797
798	create_windows (argc, argv);	798	create_windows (argc, argv);
799		799
…		…
807		807
808	if (option (Opt_scrollBar))	808	if (option (Opt_scrollBar))
809	scrollBar.resize (); /* create and map scrollbar */	809	scrollBar.resize (); /* create and map scrollbar */
810	#ifdef HAVE_BG_PIXMAP	810	#ifdef HAVE_BG_PIXMAP
811	{	811	{
812	bgPixmap.set_target (this);	812	bg_init ();
813	bgPixmap.invalidate ();
814		813
815	#ifdef ENABLE_TRANSPARENCY	814	#if ENABLE_TRANSPARENCY
816	if (option (Opt_transparent))	815	if (option (Opt_transparent))
817	{	816	{
818	bgPixmap.set_transparent ();	817	bg_set_transparent ();
819		818
820	#ifdef HAVE_AFTERIMAGE
821	if (rs [Rs_blurradius])	819	if (rs [Rs_blurradius])
822	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	820	root_effects.set_blur (rs [Rs_blurradius]);
823	#endif	821
824	if (ISSET_PIXCOLOR (Color_tint))	822	if (ISSET_PIXCOLOR (Color_tint))
825	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	823	root_effects.set_tint (pix_colors_focused [Color_tint]);
826		824
827	if (rs [Rs_shade])	825	if (rs [Rs_shade])
828	bgPixmap.set_shade (rs [Rs_shade]);	826	root_effects.set_shade (rs [Rs_shade]);
829		827
830	bgPixmap.set_root_pixmap ();	828	bg_set_root_pixmap ();
831	XSelectInput (dpy, display->root, PropertyChangeMask);	829	XSelectInput (dpy, display->root, PropertyChangeMask);
832	rootwin_ev.start (display, display->root);	830	rootwin_ev.start (display, display->root);
833	}	831	}
834	#endif	832	#endif
835
836	#ifdef BG_IMAGE_FROM_FILE
837	if (rs[Rs_backgroundPixmap])
838	{
839	const char *p = rs[Rs_backgroundPixmap];
840
841	if ((p = strchr (p, ';')) != 0)
842	{
843	p++;
844	bgPixmap.set_geometry (p);
845	}
846	else
847	bgPixmap.set_defaultGeometry ();
848
849	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850	if (!bgPixmap.window_position_sensitive ())
851	update_background ();
852	}
853	#endif
854	}	833	}
855	#endif	834	#endif
856		835
857	#if ENABLE_PERL	836	#if ENABLE_PERL
858	rootwin_ev.start (display, display->root);	837	rootwin_ev.start (display, display->root);
859	#endif	838	#endif
860		839
861	set_colorfgbg ();	840	init_done = 1;
862		841
863	init_command (cmd_argv);	842	init_command (cmd_argv);
864
865	free (cmd_argv);
866		843
867	if (pty->pty >= 0)	844	if (pty->pty >= 0)
868	pty_ev.start (pty->pty, ev::READ);	845	pty_ev.start (pty->pty, ev::READ);
869		846
870	HOOK_INVOKE ((this, HOOK_START, DT_END));	847	HOOK_INVOKE ((this, HOOK_START, DT_END));
…		…
872	#if ENABLE_XEMBED	849	#if ENABLE_XEMBED
873	if (rs[Rs_embed])	850	if (rs[Rs_embed])
874	{	851	{
875	long info[2] = { 0, XEMBED_MAPPED };	852	long info[2] = { 0, XEMBED_MAPPED };
876		853
877	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	854	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878	32, PropModeReplace, (unsigned char *)&info, 2);	855	32, PropModeReplace, (unsigned char *)&info, 2);
879	}	856	}
880	#endif	857	#endif
881		858
		859	#if HAVE_STARTUP_NOTIFICATION
		860	SnDisplay *snDisplay;
		861	SnLauncheeContext *snContext;
		862
		863	snDisplay = sn_display_new (dpy, NULL, NULL);
		864	snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
		865
		866	/* Tell the window manager that this window is part of the startup context */
		867	if (snContext)
		868	sn_launchee_context_setup_window (snContext, parent);
		869	#endif
		870
882	XMapWindow (dpy, vt);	871	XMapWindow (dpy, vt);
883	XMapWindow (dpy, parent[0]);	872	XMapWindow (dpy, parent);
		873
		874	#if HAVE_STARTUP_NOTIFICATION
		875	if (snContext)
		876	{
		877	/* Mark the startup process as complete */
		878	sn_launchee_context_complete (snContext);
		879
		880	sn_launchee_context_unref (snContext);
		881	}
		882
		883	sn_display_unref (snDisplay);
		884	#endif
884		885
885	refresh_check ();	886	refresh_check ();
886	}	887	}
887		888
888	/----------------------------------------------------------------------/	889	/----------------------------------------------------------------------/
889	void	890	void
890	rxvt_term::init_env ()	891	rxvt_term::init_env ()
891	{	892	{
892	int i;
893	char *val;	893	char *val;
		894	char *env_display;
		895	char *env_windowid;
		896	char *env_colorfgbg;
		897	char *env_term;
894		898
895	#ifdef DISPLAY_IS_IP	899	#ifdef DISPLAY_IS_IP
896	/* Fixup display_name for export over pty to any interested terminal	900	/* Fixup display_name for export over pty to any interested terminal
897	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	901	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
898	* (for the first non-loopback interface) that we get from	902	* (for the first non-loopback interface) that we get from
…		…
911	val = XDisplayString (dpy);	915	val = XDisplayString (dpy);
912		916
913	if (rs[Rs_display_name] == NULL)	917	if (rs[Rs_display_name] == NULL)
914	rs[Rs_display_name] = val; /* use broken `:0' value */	918	rs[Rs_display_name] = val; /* use broken `:0' value */
915		919
916	i = strlen (val);
917	env_display = (char *)rxvt_malloc (i + 9);	920	env_display = (char *)rxvt_malloc (strlen (val) + 9);
918		921
919	sprintf (env_display, "DISPLAY=%s", val);	922	sprintf (env_display, "DISPLAY=%s", val);
920		923
		924	env_windowid = (char *)rxvt_malloc (21);
921	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	925	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922		926
923	/* add entries to the environment:	927	/* add entries to the environment:
924	* @ DISPLAY: in case we started with -display	928	* @ DISPLAY: in case we started with -display
925	* @ WINDOWID: X window id number of the window	929	* @ WINDOWID: X window id number of the window
926	* @ COLORTERM: terminal sub-name and also indicates its color	930	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
929	* @ COLORFGBG: fg;bg color codes	933	* @ COLORFGBG: fg;bg color codes
930	*/	934	*/
931	putenv (env_display);	935	putenv (env_display);
932	putenv (env_windowid);	936	putenv (env_windowid);
933		937
934	if (env_colorfgbg)	938	env_colorfgbg = get_colorfgbg ();
935	putenv (env_colorfgbg);	939	putenv (env_colorfgbg);
936		940
937	#ifdef RXVT_TERMINFO	941	#ifdef RXVT_TERMINFO
938	putenv ("TERMINFO=" RXVT_TERMINFO);	942	putenv ("TERMINFO=" RXVT_TERMINFO);
939	#endif	943	#endif
940		944
…		…
959	unsetenv ("TERMCAP"); /* terminfo should be okay */	963	unsetenv ("TERMCAP"); /* terminfo should be okay */
960	#endif /* HAVE_UNSETENV */	964	#endif /* HAVE_UNSETENV */
961	}	965	}
962		966
963	/----------------------------------------------------------------------/	967	/----------------------------------------------------------------------/
964	/*
965	* This is more or less stolen straight from XFree86 xterm.
966	* This should support all European type languages.
967	*/
968	void	968	void
969	rxvt_term::set_locale (const char *locale)	969	rxvt_term::set_locale (const char *locale)
970	{	970	{
971	set_environ (envv);	971	set_environ (envv);
972		972
973	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
974	free (this->locale);	973	free (this->locale);
975	this->locale = setlocale (LC_CTYPE, locale);	974	this->locale = setlocale (LC_CTYPE, locale);
976		975
977	if (!this->locale)	976	if (!this->locale)
978	{	977	{
…		…
989		988
990		989
991	this->locale = strdup (this->locale);	990	this->locale = strdup (this->locale);
992	SET_LOCALE (this->locale);	991	SET_LOCALE (this->locale);
993	mbstate.reset ();	992	mbstate.reset ();
994	#endif
995		993
996	#if HAVE_NL_LANGINFO	994	#if HAVE_NL_LANGINFO
997	char *codeset = strdup (nl_langinfo (CODESET));	995	char *codeset = nl_langinfo (CODESET);
998	// /^UTF.?8/i	996	// /^UTF.?8/i
999	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')	997	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
1000	&& (codeset[1] == 'T' \|\| codeset[1] == 't')	998	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
1001	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')	999	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
1002	&& (codeset[3] == '8' \|\| codeset[4] == '8');	1000	&& (codeset[3] == '8' \|\| codeset[4] == '8');
1003	free (codeset);
1004	#else	1001	#else
1005	enc_utf8 = 0;	1002	enc_utf8 = 0;
1006	#endif	1003	#endif
1007	}	1004	}
1008		1005
1009	void	1006	void
1010	rxvt_term::init_xlocale ()	1007	rxvt_term::init_xlocale ()
1011	{	1008	{
1012	set_environ (envv);	1009	set_environ (envv);
1013		1010
1014	#ifdef USE_XIM	1011	#if USE_XIM
1015	if (!locale)	1012	if (!locale)
1016	rxvt_warn ("setting locale failed, working without locale support.\n");	1013	rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017	else	1014	else
1018	{	1015	{
1019	set_string_property (xa[XA_WM_LOCALE_NAME], locale);	1016	set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020		1017
1021	if (!XSupportsLocale ())	1018	if (!XSupportsLocale ())
1022	{	1019	{
1023	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");	1020	rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024	return;	1021	return;
1025	}	1022	}
1026		1023
1027	im_ev.start (display);	1024	im_ev.start (display);
1028		1025
…		…
1177	/----------------------------------------------------------------------/	1174	/----------------------------------------------------------------------/
1178	/* color aliases, fg/bg bright-bold */	1175	/* color aliases, fg/bg bright-bold */
1179	void	1176	void
1180	rxvt_term::color_aliases (int idx)	1177	rxvt_term::color_aliases (int idx)
1181	{	1178	{
1182	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	1179	if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183	{	1180	{
1184	int i = atoi (rs[Rs_color + idx]);	1181	int i = atoi (rs[Rs_color + idx]);
1185		1182
1186	if (i >= 8 && i <= 15)	1183	if (i >= 8 && i <= 15)
1187	/* bright colors */	1184	/* bright colors */
…		…
1279		1276
1280	if (i)	1277	if (i)
1281	ModMetaMask = modmasks[i - 1];	1278	ModMetaMask = modmasks[i - 1];
1282	}	1279	}
1283		1280
		1281	void
		1282	rxvt_term::set_icon (const char *file)
		1283	{
		1284	#if HAVE_PIXBUF
		1285	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1286	if (!pixbuf)
		1287	{
		1288	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1289	return;
		1290	}
		1291
		1292	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1293	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1294
		1295	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1296	{
		1297	rxvt_warn ("Icon image too big, continuing without.\n");
		1298	g_object_unref (pixbuf);
		1299	return;
		1300	}
		1301
		1302	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1303	{
		1304	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1305	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1306	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1307
		1308	buffer [0] = w;
		1309	buffer [1] = h;
		1310	for (int i = 0; i < h; i++)
		1311	{
		1312	for (int j = 0; j < w; j++)
		1313	{
		1314	unsigned char pixel = row + j channels;
		1315	long value;
		1316
		1317	if (channels == 4)
		1318	value = pixel[3];
		1319	else
		1320	value = (unsigned char)0x00ff;
		1321
		1322	value = (value << 8) + pixel[0];
		1323	value = (value << 8) + pixel[1];
		1324	value = (value << 8) + pixel[2];
		1325	buffer[(i * w + j) + 2] = value;
		1326	}
		1327
		1328	row += rowstride;
		1329	}
		1330
		1331	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1332	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1333	free (buffer);
		1334	}
		1335	else
		1336	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1337
		1338	g_object_unref (pixbuf);
		1339	#endif
		1340	}
		1341
1284	/----------------------------------------------------------------------/	1342	/----------------------------------------------------------------------/
1285	/* rxvt_Create_Windows () - Open and map the window */	1343	/* Open and map the window */
1286	void	1344	void
1287	rxvt_term::create_windows (int argc, const char const argv)	1345	rxvt_term::create_windows (int argc, const char const argv)
1288	{	1346	{
1289	XClassHint classHint;	1347	XClassHint classHint;
1290	XWMHints wmHint;	1348	XWMHints wmHint;
…		…
1336	}	1394	}
1337	#endif	1395	#endif
1338		1396
1339	window_calc (0, 0);	1397	window_calc (0, 0);
1340		1398
1341	/* sub-window placement & size in rxvt_resize_subwindows () */	1399	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1342	attributes.background_pixel = pix_colors_focused [Color_border];	1400	attributes.background_pixel = pix_colors_focused [Color_border];
1343	attributes.border_pixel = pix_colors_focused [Color_border];	1401	attributes.border_pixel = pix_colors_focused [Color_border];
1344	attributes.colormap = cmap;	1402	attributes.colormap = cmap;
1345		1403
1346	top = XCreateWindow (dpy, parent,	1404	top = XCreateWindow (dpy, parent,
…		…
1349	ext_bwidth,	1407	ext_bwidth,
1350	depth, InputOutput, visual,	1408	depth, InputOutput, visual,
1351	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1409	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1352	&attributes);	1410	&attributes);
1353		1411
1354	this->parent[0] = top;	1412	this->parent = top;
1355
1356	old_width = szHint.width;
1357	old_height = szHint.height;
1358		1413
1359	set_title (rs [Rs_title]);	1414	set_title (rs [Rs_title]);
1360	set_icon_name (rs [Rs_iconName]);	1415	set_icon_name (rs [Rs_iconName]);
1361		1416
1362	classHint.res_name = (char *)rs[Rs_name];	1417	classHint.res_name = (char *)rs[Rs_name];
…		…
1368	wmHint.window_group = top;	1423	wmHint.window_group = top;
1369		1424
1370	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1425	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1371	&szHint, &wmHint, &classHint);	1426	&szHint, &wmHint, &classHint);
1372	#if ENABLE_EWMH	1427	#if ENABLE_EWMH
1373	# ifdef HAVE_AFTERIMAGE
1374	/*	1428	/*
1375	* set up icon hint	1429	* set up icon hint
1376	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1430	* rs [Rs_iconfile] is path to icon
1377	*/	1431	*/
1378		1432
1379	if (rs [Rs_iconfile])	1433	if (rs [Rs_iconfile])
1380	{	1434	{
1381	init_asv ();	1435	set_icon (rs [Rs_iconfile]);
1382
1383	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1384	if (asv && im)
1385	{
1386	int w = im->width;
1387	int h = im->height;
1388	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
1389	ASImage *result = scale_asimage (asv, im,
1390	w, h, ASA_ARGB32,
1391	100, ASIMAGE_QUALITY_DEFAULT);
1392	destroy_asimage (&im);
1393
1394	if (buffer && result)
1395	{
1396	ARGB32 *asbuf = result->alt.argb32;
1397	buffer [0] = w;
1398	buffer [1] = h;
1399
1400	for (unsigned int i = 0; i < w * h; ++i)
1401	buffer [i + 2] = asbuf [i];
1402
1403	destroy_asimage (&result);
1404	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1405	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1406	free (buffer);
1407	}
1408	else
1409	{
1410	if (!buffer)
1411	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1412
1413	if (!result)
1414	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1415	}
1416	}
1417	else
1418	rxvt_warn ("Loading image icon failed, continuing without.\n");
1419	}	1436	}
1420	# endif
1421	#endif	1437	#endif
1422		1438
1423	#if ENABLE_FRILLS	1439	#if ENABLE_FRILLS
1424	if (mwmhints.flags)	1440	if (mwmhints.flags)
1425	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1441	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1431	#if ENABLE_EWMH	1447	#if ENABLE_EWMH
1432	xa[XA_NET_WM_PING],	1448	xa[XA_NET_WM_PING],
1433	#endif	1449	#endif
1434	};	1450	};
1435		1451
1436	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1452	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1437		1453
1438	#if ENABLE_FRILLS	1454	#if ENABLE_FRILLS
1439	if (rs[Rs_transient_for])	1455	if (rs[Rs_transient_for])
1440	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1456	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1441	#endif	1457	#endif
…		…
1464	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1480	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1465		1481
1466	/* the vt window */	1482	/* the vt window */
1467	vt = XCreateSimpleWindow (dpy, top,	1483	vt = XCreateSimpleWindow (dpy, top,
1468	window_vt_x, window_vt_y,	1484	window_vt_x, window_vt_y,
1469	width, height,	1485	vt_width, vt_height,
1470	0,	1486	0,
1471	pix_colors_focused[Color_fg],	1487	pix_colors_focused[Color_fg],
1472	pix_colors_focused[Color_bg]);	1488	pix_colors_focused[Color_bg]);
1473		1489
1474	attributes.bit_gravity = NorthWestGravity;	1490	attributes.bit_gravity = NorthWestGravity;
…		…
1523	if (pty->pty >= 0)	1539	if (pty->pty >= 0)
1524	{	1540	{
1525	if (getfd_hook)	1541	if (getfd_hook)
1526	pty->pty = (*getfd_hook) (pty->pty);	1542	pty->pty = (*getfd_hook) (pty->pty);
1527		1543
1528	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))	1544	if (pty->pty < 0)
1529	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1545	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1530	}	1546	}
1531	}	1547	}
1532	else	1548	else
1533	#endif	1549	#endif
1534	if (!pty->get ())	1550	if (!pty->get ())
1535	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1551	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1552
		1553	fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1536		1554
1537	struct termios tio = def_tio;	1555	struct termios tio = def_tio;
1538		1556
1539	#ifndef NO_BACKSPACE_KEY	1557	#ifndef NO_BACKSPACE_KEY
1540	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1558	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
…		…
1590		1608
1591	_exit (EXIT_FAILURE);	1609	_exit (EXIT_FAILURE);
1592		1610
1593	default:	1611	default:
1594	if (!option (Opt_utmpInhibit))	1612	if (!option (Opt_utmpInhibit))
		1613	{
		1614	#ifdef LOG_ONLY_ON_LOGIN
		1615	bool login_shell = option (Opt_loginShell);
		1616	#else
		1617	bool login_shell = true;
		1618	#endif
1595	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);	1619	pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
		1620	}
1596		1621
1597	pty->close_tty ();	1622	pty->close_tty ();
1598		1623
1599	child_ev.start (cmd_pid);	1624	child_ev.start (cmd_pid);
1600		1625
…		…
1625	#elif defined (SRIOCSREDIR)	1650	#elif defined (SRIOCSREDIR)
1626	int fd;	1651	int fd;
1627		1652
1628	fd = open (CONSOLE, O_WRONLY, 0);	1653	fd = open (CONSOLE, O_WRONLY, 0);
1629	if (fd >= 0)	1654	if (fd >= 0)
1630	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1655	{
		1656	ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1631	close (fd);	1657	close (fd);
		1658	}
1632	#endif /* SRIOCSREDIR */	1659	#endif /* SRIOCSREDIR */
1633	}	1660	}
1634		1661
1635	/* reset signals and spin off the command interpreter */	1662	/* reset signals and spin off the command interpreter */
1636	signal (SIGINT, SIG_DFL);	1663	signal (SIGINT, SIG_DFL);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.274 by sf-exg, Wed Jul 28 17:56:16 2010 UTC vs. Revision 1.328 by root, Thu Jun 7 16:04:31 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.274 by sf-exg, Wed Jul 28 17:56:16 2010 UTC vs.
Revision 1.328 by root, Thu Jun 7 16:04:31 2012 UTC