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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC vs.
Revision 1.326 by root, Sun Jun 3 10:42:34 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	#if ENABLE_PERL	602	#if ENABLE_PERL
638	if (!rs[Rs_perl_ext_1])	603	if (!rs[Rs_perl_ext_1])
639	rs[Rs_perl_ext_1] = "default";	604	rs[Rs_perl_ext_1] = "default";
640		605
641	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	606	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
644	{	609	{
645	rxvt_perl.init (this);	610	rxvt_perl.init (this);
646	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	611	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647	}	612	}
648	#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 ();
649		618
650	/*	619	/*
651	* set any defaults not already set	620	* set any defaults not already set
652	*/	621	*/
653	if (cmd_argv && cmd_argv[0])	622	if (cmd_argv && cmd_argv[0])
…		…
762	return cmd_argv;	731	return cmd_argv;
763	}	732	}
764		733
765	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
766	void	735	void
767	rxvt_term::init (int argc, const char const argv, stringvec *envv)	736	rxvt_term::init (stringvec argv, stringvec envv)
768	{	737	{
		738	argv->push_back (0);
		739	envv->push_back (0);
		740
		741	this->argv = argv;
769	this->envv = envv;	742	this->envv = envv;
770		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	{
771	SET_R (this);	769	SET_R (this);
772	set_locale ("");	770	set_locale ("");
773	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 :(
774		772
775	init_vars ();	773	init_vars ();
…		…
789	if (chdir (path))	787	if (chdir (path))
790	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");
791	}	789	}
792		790
793	if (option (Opt_scrollBar))	791	if (option (Opt_scrollBar))
794	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	792	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795		793
796	pty = ptytty::create ();	794	pty = ptytty::create ();
797		795
798	create_windows (argc, argv);	796	create_windows (argc, argv);
799		797
…		…
807		805
808	if (option (Opt_scrollBar))	806	if (option (Opt_scrollBar))
809	scrollBar.resize (); /* create and map scrollbar */	807	scrollBar.resize (); /* create and map scrollbar */
810	#ifdef HAVE_BG_PIXMAP	808	#ifdef HAVE_BG_PIXMAP
811	{	809	{
812	bgPixmap.set_target (this);	810	bg_init ();
813	bgPixmap.invalidate ();
814		811
815	#ifdef ENABLE_TRANSPARENCY	812	#ifdef ENABLE_TRANSPARENCY
816	if (option (Opt_transparent))	813	if (option (Opt_transparent))
817	{	814	{
818	bgPixmap.set_transparent ();	815	bg_set_transparent ();
819		816
820	#ifdef HAVE_AFTERIMAGE
821	if (rs [Rs_blurradius])	817	if (rs [Rs_blurradius])
822	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	818	root_effects.set_blur (rs [Rs_blurradius]);
823	#endif	819
824	if (ISSET_PIXCOLOR (Color_tint))	820	if (ISSET_PIXCOLOR (Color_tint))
825	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	821	root_effects.set_tint (pix_colors_focused [Color_tint]);
826		822
827	if (rs [Rs_shade])	823	if (rs [Rs_shade])
828	bgPixmap.set_shade (rs [Rs_shade]);	824	root_effects.set_shade (rs [Rs_shade]);
829		825
830	bgPixmap.set_root_pixmap ();	826	bg_set_root_pixmap ();
831	XSelectInput (dpy, display->root, PropertyChangeMask);	827	XSelectInput (dpy, display->root, PropertyChangeMask);
832	rootwin_ev.start (display, display->root);	828	rootwin_ev.start (display, display->root);
833	}	829	}
834	#endif	830	#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	}	831	}
855	#endif	832	#endif
856		833
857	#if ENABLE_PERL	834	#if ENABLE_PERL
858	rootwin_ev.start (display, display->root);	835	rootwin_ev.start (display, display->root);
859	#endif	836	#endif
860		837
861	set_colorfgbg ();	838	init_done = 1;
862		839
863	init_command (cmd_argv);	840	init_command (cmd_argv);
864
865	free (cmd_argv);
866		841
867	if (pty->pty >= 0)	842	if (pty->pty >= 0)
868	pty_ev.start (pty->pty, ev::READ);	843	pty_ev.start (pty->pty, ev::READ);
869		844
870	HOOK_INVOKE ((this, HOOK_START, DT_END));	845	HOOK_INVOKE ((this, HOOK_START, DT_END));
…		…
872	#if ENABLE_XEMBED	847	#if ENABLE_XEMBED
873	if (rs[Rs_embed])	848	if (rs[Rs_embed])
874	{	849	{
875	long info[2] = { 0, XEMBED_MAPPED };	850	long info[2] = { 0, XEMBED_MAPPED };
876		851
877	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	852	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878	32, PropModeReplace, (unsigned char *)&info, 2);	853	32, PropModeReplace, (unsigned char *)&info, 2);
879	}	854	}
880	#endif	855	#endif
881		856
		857	#if HAVE_STARTUP_NOTIFICATION
		858	SnDisplay *snDisplay;
		859	SnLauncheeContext *snContext;
		860
		861	snDisplay = sn_display_new (dpy, NULL, NULL);
		862	snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
		863
		864	/* Tell the window manager that this window is part of the startup context */
		865	if (snContext)
		866	sn_launchee_context_setup_window (snContext, parent);
		867	#endif
		868
882	XMapWindow (dpy, vt);	869	XMapWindow (dpy, vt);
883	XMapWindow (dpy, parent[0]);	870	XMapWindow (dpy, parent);
		871
		872	#if HAVE_STARTUP_NOTIFICATION
		873	if (snContext)
		874	{
		875	/* Mark the startup process as complete */
		876	sn_launchee_context_complete (snContext);
		877
		878	sn_launchee_context_unref (snContext);
		879	}
		880
		881	sn_display_unref (snDisplay);
		882	#endif
884		883
885	refresh_check ();	884	refresh_check ();
886	}	885	}
887		886
888	/----------------------------------------------------------------------/	887	/----------------------------------------------------------------------/
889	void	888	void
890	rxvt_term::init_env ()	889	rxvt_term::init_env ()
891	{	890	{
892	int i;
893	char *val;	891	char *val;
		892	char *env_display;
		893	char *env_windowid;
		894	char *env_colorfgbg;
		895	char *env_term;
894		896
895	#ifdef DISPLAY_IS_IP	897	#ifdef DISPLAY_IS_IP
896	/* Fixup display_name for export over pty to any interested terminal	898	/* 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	899	* 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	900	* (for the first non-loopback interface) that we get from
…		…
911	val = XDisplayString (dpy);	913	val = XDisplayString (dpy);
912		914
913	if (rs[Rs_display_name] == NULL)	915	if (rs[Rs_display_name] == NULL)
914	rs[Rs_display_name] = val; /* use broken `:0' value */	916	rs[Rs_display_name] = val; /* use broken `:0' value */
915		917
916	i = strlen (val);
917	env_display = (char *)rxvt_malloc (i + 9);	918	env_display = (char *)rxvt_malloc (strlen (val) + 9);
918		919
919	sprintf (env_display, "DISPLAY=%s", val);	920	sprintf (env_display, "DISPLAY=%s", val);
920		921
		922	env_windowid = (char *)rxvt_malloc (21);
921	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	923	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922		924
923	/* add entries to the environment:	925	/* add entries to the environment:
924	* @ DISPLAY: in case we started with -display	926	* @ DISPLAY: in case we started with -display
925	* @ WINDOWID: X window id number of the window	927	* @ WINDOWID: X window id number of the window
926	* @ COLORTERM: terminal sub-name and also indicates its color	928	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
929	* @ COLORFGBG: fg;bg color codes	931	* @ COLORFGBG: fg;bg color codes
930	*/	932	*/
931	putenv (env_display);	933	putenv (env_display);
932	putenv (env_windowid);	934	putenv (env_windowid);
933		935
934	if (env_colorfgbg)	936	env_colorfgbg = get_colorfgbg ();
935	putenv (env_colorfgbg);	937	putenv (env_colorfgbg);
936		938
937	#ifdef RXVT_TERMINFO	939	#ifdef RXVT_TERMINFO
938	putenv ("TERMINFO=" RXVT_TERMINFO);	940	putenv ("TERMINFO=" RXVT_TERMINFO);
939	#endif	941	#endif
940		942
…		…
959	unsetenv ("TERMCAP"); /* terminfo should be okay */	961	unsetenv ("TERMCAP"); /* terminfo should be okay */
960	#endif /* HAVE_UNSETENV */	962	#endif /* HAVE_UNSETENV */
961	}	963	}
962		964
963	/----------------------------------------------------------------------/	965	/----------------------------------------------------------------------/
964	/*
965	* This is more or less stolen straight from XFree86 xterm.
966	* This should support all European type languages.
967	*/
968	void	966	void
969	rxvt_term::set_locale (const char *locale)	967	rxvt_term::set_locale (const char *locale)
970	{	968	{
971	set_environ (envv);	969	set_environ (envv);
972		970
973	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
974	free (this->locale);	971	free (this->locale);
975	this->locale = setlocale (LC_CTYPE, locale);	972	this->locale = setlocale (LC_CTYPE, locale);
976		973
977	if (!this->locale)	974	if (!this->locale)
978	{	975	{
…		…
989		986
990		987
991	this->locale = strdup (this->locale);	988	this->locale = strdup (this->locale);
992	SET_LOCALE (this->locale);	989	SET_LOCALE (this->locale);
993	mbstate.reset ();	990	mbstate.reset ();
994	#endif
995		991
996	#if HAVE_NL_LANGINFO	992	#if HAVE_NL_LANGINFO
997	char *codeset = strdup (nl_langinfo (CODESET));	993	char *codeset = nl_langinfo (CODESET);
998	// /^UTF.?8/i	994	// /^UTF.?8/i
999	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')	995	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
1000	&& (codeset[1] == 'T' \|\| codeset[1] == 't')	996	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
1001	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')	997	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
1002	&& (codeset[3] == '8' \|\| codeset[4] == '8');	998	&& (codeset[3] == '8' \|\| codeset[4] == '8');
1003	free (codeset);
1004	#else	999	#else
1005	enc_utf8 = 0;	1000	enc_utf8 = 0;
1006	#endif	1001	#endif
1007	}	1002	}
1008		1003
…		…
1011	{	1006	{
1012	set_environ (envv);	1007	set_environ (envv);
1013		1008
1014	#ifdef USE_XIM	1009	#ifdef USE_XIM
1015	if (!locale)	1010	if (!locale)
1016	rxvt_warn ("setting locale failed, working without locale support.\n");	1011	rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017	else	1012	else
1018	{	1013	{
1019	set_string_property (xa[XA_WM_LOCALE_NAME], locale);	1014	set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020		1015
1021	if (!XSupportsLocale ())	1016	if (!XSupportsLocale ())
1022	{	1017	{
1023	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");	1018	rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024	return;	1019	return;
1025	}	1020	}
1026		1021
1027	im_ev.start (display);	1022	im_ev.start (display);
1028		1023
…		…
1177	/----------------------------------------------------------------------/	1172	/----------------------------------------------------------------------/
1178	/* color aliases, fg/bg bright-bold */	1173	/* color aliases, fg/bg bright-bold */
1179	void	1174	void
1180	rxvt_term::color_aliases (int idx)	1175	rxvt_term::color_aliases (int idx)
1181	{	1176	{
1182	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	1177	if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183	{	1178	{
1184	int i = atoi (rs[Rs_color + idx]);	1179	int i = atoi (rs[Rs_color + idx]);
1185		1180
1186	if (i >= 8 && i <= 15)	1181	if (i >= 8 && i <= 15)
1187	/* bright colors */	1182	/* bright colors */
…		…
1282	}	1277	}
1283		1278
1284	void	1279	void
1285	rxvt_term::set_icon (const char *file)	1280	rxvt_term::set_icon (const char *file)
1286	{	1281	{
1287	#ifdef HAVE_AFTERIMAGE	1282	#ifdef HAVE_PIXBUF
1288	init_asv ();	1283	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1289
1290	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291	if (!im)	1284	if (!pixbuf)
1292	{	1285	{
1293	rxvt_warn ("Loading image icon failed, continuing without.\n");	1286	rxvt_warn ("Loading image icon failed, continuing without.\n");
1294	return;	1287	return;
1295	}	1288	}
1296		1289
1297	int w = im->width;	1290	unsigned int w = gdk_pixbuf_get_width (pixbuf);
1298	int h = im->height;	1291	unsigned int h = gdk_pixbuf_get_height (pixbuf);
1299		1292
1300	if (!IN_RANGE_INC (w, 1, 32767) \|\| !IN_RANGE_INC (h, 1, 32767))	1293	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
1301	{	1294	{
1302	rxvt_warn ("Icon image too big, continuing without.\n");	1295	rxvt_warn ("Icon image too big, continuing without.\n");
1303	destroy_asimage (&im);	1296	g_object_unref (pixbuf);
1304	return;	1297	return;
1305	}	1298	}
1306		1299
1307	ASImage *result = scale_asimage (asv, im,
1308	w, h, ASA_ARGB32,
1309	100, ASIMAGE_QUALITY_DEFAULT);
1310	destroy_asimage (&im);
1311
1312	if (!result)
1313	{
1314	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1315	return;
1316	}
1317
1318	long buffer = (long )malloc ((2 + w * h) * sizeof (long));	1300	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
1319	if (buffer)
1320	{	1301	{
1321	ARGB32 *asbuf = result->alt.argb32;	1302	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1303	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1304	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1305
1322	buffer [0] = w;	1306	buffer [0] = w;
1323	buffer [1] = h;	1307	buffer [1] = h;
1324
1325	for (unsigned int i = 0; i < w * h; ++i)	1308	for (int i = 0; i < h; i++)
1326	buffer [i + 2] = asbuf [i];	1309	{
		1310	for (int j = 0; j < w; j++)
		1311	{
		1312	unsigned char pixel = row + j channels;
		1313	long value;
1327		1314
		1315	if (channels == 4)
		1316	value = pixel[3];
		1317	else
		1318	value = (unsigned char)0x00ff;
		1319
		1320	value = (value << 8) + pixel[0];
		1321	value = (value << 8) + pixel[1];
		1322	value = (value << 8) + pixel[2];
		1323	buffer[(i * w + j) + 2] = value;
		1324	}
		1325
		1326	row += rowstride;
		1327	}
		1328
1328	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,	1329	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329	PropModeReplace, (const unsigned char ) buffer, 2 + w h);	1330	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1330	free (buffer);	1331	free (buffer);
1331	}	1332	}
1332	else	1333	else
1333	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");	1334	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334		1335
1335	destroy_asimage (&result);	1336	g_object_unref (pixbuf);
1336	#endif	1337	#endif
1337	}	1338	}
1338		1339
1339	/----------------------------------------------------------------------/	1340	/----------------------------------------------------------------------/
1340	/* rxvt_Create_Windows () - Open and map the window */	1341	/* Open and map the window */
1341	void	1342	void
1342	rxvt_term::create_windows (int argc, const char const argv)	1343	rxvt_term::create_windows (int argc, const char const argv)
1343	{	1344	{
1344	XClassHint classHint;	1345	XClassHint classHint;
1345	XWMHints wmHint;	1346	XWMHints wmHint;
…		…
1391	}	1392	}
1392	#endif	1393	#endif
1393		1394
1394	window_calc (0, 0);	1395	window_calc (0, 0);
1395		1396
1396	/* sub-window placement & size in rxvt_resize_subwindows () */	1397	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1397	attributes.background_pixel = pix_colors_focused [Color_border];	1398	attributes.background_pixel = pix_colors_focused [Color_border];
1398	attributes.border_pixel = pix_colors_focused [Color_border];	1399	attributes.border_pixel = pix_colors_focused [Color_border];
1399	attributes.colormap = cmap;	1400	attributes.colormap = cmap;
1400		1401
1401	top = XCreateWindow (dpy, parent,	1402	top = XCreateWindow (dpy, parent,
…		…
1404	ext_bwidth,	1405	ext_bwidth,
1405	depth, InputOutput, visual,	1406	depth, InputOutput, visual,
1406	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1407	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1407	&attributes);	1408	&attributes);
1408		1409
1409	this->parent[0] = top;	1410	this->parent = top;
1410
1411	old_width = szHint.width;
1412	old_height = szHint.height;
1413		1411
1414	set_title (rs [Rs_title]);	1412	set_title (rs [Rs_title]);
1415	set_icon_name (rs [Rs_iconName]);	1413	set_icon_name (rs [Rs_iconName]);
1416		1414
1417	classHint.res_name = (char *)rs[Rs_name];	1415	classHint.res_name = (char *)rs[Rs_name];
…		…
1447	#if ENABLE_EWMH	1445	#if ENABLE_EWMH
1448	xa[XA_NET_WM_PING],	1446	xa[XA_NET_WM_PING],
1449	#endif	1447	#endif
1450	};	1448	};
1451		1449
1452	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1450	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1453		1451
1454	#if ENABLE_FRILLS	1452	#if ENABLE_FRILLS
1455	if (rs[Rs_transient_for])	1453	if (rs[Rs_transient_for])
1456	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1454	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1457	#endif	1455	#endif
…		…
1480	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1478	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1481		1479
1482	/* the vt window */	1480	/* the vt window */
1483	vt = XCreateSimpleWindow (dpy, top,	1481	vt = XCreateSimpleWindow (dpy, top,
1484	window_vt_x, window_vt_y,	1482	window_vt_x, window_vt_y,
1485	width, height,	1483	vt_width, vt_height,
1486	0,	1484	0,
1487	pix_colors_focused[Color_fg],	1485	pix_colors_focused[Color_fg],
1488	pix_colors_focused[Color_bg]);	1486	pix_colors_focused[Color_bg]);
1489		1487
1490	attributes.bit_gravity = NorthWestGravity;	1488	attributes.bit_gravity = NorthWestGravity;
…		…
1539	if (pty->pty >= 0)	1537	if (pty->pty >= 0)
1540	{	1538	{
1541	if (getfd_hook)	1539	if (getfd_hook)
1542	pty->pty = (*getfd_hook) (pty->pty);	1540	pty->pty = (*getfd_hook) (pty->pty);
1543		1541
1544	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))	1542	if (pty->pty < 0)
1545	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1543	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1546	}	1544	}
1547	}	1545	}
1548	else	1546	else
1549	#endif	1547	#endif
1550	if (!pty->get ())	1548	if (!pty->get ())
1551	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1549	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1550
		1551	fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552		1552
1553	struct termios tio = def_tio;	1553	struct termios tio = def_tio;
1554		1554
1555	#ifndef NO_BACKSPACE_KEY	1555	#ifndef NO_BACKSPACE_KEY
1556	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1556	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
…		…
1606		1606
1607	_exit (EXIT_FAILURE);	1607	_exit (EXIT_FAILURE);
1608		1608
1609	default:	1609	default:
1610	if (!option (Opt_utmpInhibit))	1610	if (!option (Opt_utmpInhibit))
		1611	{
		1612	#ifdef LOG_ONLY_ON_LOGIN
		1613	bool login_shell = option (Opt_loginShell);
		1614	#else
		1615	bool login_shell = true;
		1616	#endif
1611	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);	1617	pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
		1618	}
1612		1619
1613	pty->close_tty ();	1620	pty->close_tty ();
1614		1621
1615	child_ev.start (cmd_pid);	1622	child_ev.start (cmd_pid);
1616		1623
…		…
1641	#elif defined (SRIOCSREDIR)	1648	#elif defined (SRIOCSREDIR)
1642	int fd;	1649	int fd;
1643		1650
1644	fd = open (CONSOLE, O_WRONLY, 0);	1651	fd = open (CONSOLE, O_WRONLY, 0);
1645	if (fd >= 0)	1652	if (fd >= 0)
1646	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1653	{
		1654	ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1647	close (fd);	1655	close (fd);
		1656	}
1648	#endif /* SRIOCSREDIR */	1657	#endif /* SRIOCSREDIR */
1649	}	1658	}
1650		1659
1651	/* reset signals and spin off the command interpreter */	1660	/* reset signals and spin off the command interpreter */
1652	signal (SIGINT, SIG_DFL);	1661	signal (SIGINT, SIG_DFL);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC vs. Revision 1.326 by root, Sun Jun 3 10:42:34 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC vs.
Revision 1.326 by root, Sun Jun 3 10:42:34 2012 UTC