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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.268 by root, Mon Jun 14 15:50:08 2010 UTC vs.
Revision 1.306 by sf-exg, Tue Dec 6 11:39:30 2011 UTC

…		…
10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>	10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>	11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14	* - extensive modifications	14	* - extensive modifications
15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16	*	16	*
17	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
18	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
19	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
20	* (at your option) any later version.	20	* (at your option) any later version.
…		…
55		55
56	#ifdef HAVE_NL_LANGINFO	56	#ifdef HAVE_NL_LANGINFO
57	# include <langinfo.h>	57	# include <langinfo.h>
58	#endif	58	#endif
59		59
		60	#ifdef HAVE_STARTUP_NOTIFICATION
		61	# define SN_API_NOT_YET_FROZEN
		62	# include <libsn/sn-launchee.h>
		63	#endif
		64
60	#ifdef DISPLAY_IS_IP	65	#ifdef DISPLAY_IS_IP
61	/* On Solaris link with -lsocket and -lnsl */	66	/* On Solaris link with -lsocket and -lnsl */
62	#include <sys/types.h>	67	#include <sys/types.h>
63	#include <sys/socket.h>	68	#include <sys/socket.h>
64		69
…		…
143		148
144	return rval;	149	return rval;
145	}	150	}
146	#endif	151	#endif
147		152
148	const char *const def_colorName[] =	153	static const char *const def_colorName[] =
149	{	154	{
150	COLOR_FOREGROUND,	155	COLOR_FOREGROUND,
151	COLOR_BACKGROUND,	156	COLOR_BACKGROUND,
152	/* low-intensity colors */	157	/* low-intensity colors */
153	"rgb:00/00/00", // 0: black (Black)	158	"rgb:00/00/00", // 0: black (Black)
…		…
558	set_option (Opt_iso14755);	563	set_option (Opt_iso14755);
559	set_option (Opt_iso14755_52);	564	set_option (Opt_iso14755_52);
560	set_option (Opt_buffered);	565	set_option (Opt_buffered);
561	}	566	}
562		567
563	static void
564	init_secondary ()
565	{
566	int i;
567
568	if ((i = open ("/dev/null", O_RDONLY)) < 0)
569	{
570	dup2 (STDERR_FILENO, STDIN_FILENO);
571	}
572	else if (i != STDIN_FILENO)
573	{
574	dup2 (i, STDIN_FILENO);
575	close (i);
576	}
577
578	dup2 (STDERR_FILENO, STDOUT_FILENO);
579	}
580
581	/----------------------------------------------------------------------/	568	/----------------------------------------------------------------------/
582	const char **	569	const char **
583	rxvt_term::init_resources (int argc, const char const argv)	570	rxvt_term::init_resources (int argc, const char const argv)
584	{	571	{
585	int i, r_argc;	572	int i, r_argc;
586	const char cmd_argv, r_argv;	573	const char **cmd_argv;
587		574
588	/*	575	/*
589	* Look for -e option. Find => split and make cmd_argv[] of command args	576	* Look for -e option. Find => split and make cmd_argv[] of command args
590	*/	577	*/
591	for (r_argc = 0; r_argc < argc; r_argc++)	578	for (r_argc = 0; r_argc < argc; r_argc++)
…		…
595	if (r_argc == argc)	582	if (r_argc == argc)
596	cmd_argv = NULL;	583	cmd_argv = NULL;
597	else if (!argv[r_argc + 1])	584	else if (!argv[r_argc + 1])
598	rxvt_fatal ("option '-e' requires an argument, aborting.\n");	585	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599	else	586	else
600	{
601	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
602
603	for (i = 0; i < argc - r_argc - 1; i++)
604	cmd_argv[i] = (const char *)argv[i + r_argc + 1];	587	cmd_argv = (const char **)argv + r_argc + 1;
605
606	cmd_argv[i] = NULL;
607	}
608
609	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
610
611	for (i = 0; i < r_argc; i++)
612	r_argv[i] = (const char *)argv[i];
613
614	r_argv[i] = NULL;
615		588
616	rs[Rs_name] = rxvt_basename (argv[0]);	589	rs[Rs_name] = rxvt_basename (argv[0]);
617		590
618	/*	591	/*
619	* Open display, get options/resources and create the window	592	* Open display, get options/resources and create the window
620	*/	593	*/
621		594
622	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	595	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623	rs[Rs_display_name] = ":0";	596	rs[Rs_display_name] = ":0";
624		597
625	get_options (r_argc, r_argv);	598	get_options (r_argc, argv);
626		599
627	if (!(display = displays.get (rs[Rs_display_name])))	600	if (!(display = displays.get (rs[Rs_display_name])))
628	{
629	free (r_argv);
630	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	601	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631	}
632		602
633	// using a local pointer decreases code size a lot	603	// using a local pointer decreases code size a lot
634	xa = display->xa;	604	xa = display->xa;
635		605
636	set (display);	606	set (display);
…		…
639	#if XFT	609	#if XFT
640	if (rs[Rs_depth])	610	if (rs[Rs_depth])
641	select_visual (strtol (rs[Rs_depth], 0, 0));	611	select_visual (strtol (rs[Rs_depth], 0, 0));
642	#endif	612	#endif
643		613
644	free (r_argv);
645
646	for (int i = NUM_RESOURCES; i--; )	614	for (int i = NUM_RESOURCES; i--; )
647	if (rs [i] == resval_undef)	615	if (rs [i] == resval_undef)
648	rs [i] = 0;	616	rs [i] = 0;
649		617
650	#ifdef HAVE_AFTERIMAGE
651	set_application_name ((char *)rs[Rs_name]);
652	set_output_threshold (OUTPUT_LEVEL_WARNING);
653	#endif
654
655	#if ENABLE_PERL	618	#if ENABLE_PERL
656	if (!rs[Rs_perl_ext_1])	619	if (!rs[Rs_perl_ext_1])
657	rs[Rs_perl_ext_1] = "default";	620	rs[Rs_perl_ext_1] = "default";
658		621
659	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	622	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
662	{	625	{
663	rxvt_perl.init (this);	626	rxvt_perl.init (this);
664	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	627	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665	}	628	}
666	#endif	629	#endif
		630
		631	// must be called after initialising the perl interpreter as it
		632	// may invoke the `on_register_command' hook
		633	extract_keysym_resources ();
667		634
668	/*	635	/*
669	* set any defaults not already set	636	* set any defaults not already set
670	*/	637	*/
671	if (cmd_argv && cmd_argv[0])	638	if (cmd_argv && cmd_argv[0])
…		…
780	return cmd_argv;	747	return cmd_argv;
781	}	748	}
782		749
783	/----------------------------------------------------------------------/	750	/----------------------------------------------------------------------/
784	void	751	void
785	rxvt_term::init (int argc, const char const argv, stringvec *envv)	752	rxvt_term::init (int argc, const char const argv)
786	{	753	{
787	this->envv = envv;
788
789	SET_R (this);	754	SET_R (this);
790	set_locale ("");	755	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	756	set_environ (envv); // a few things in X do not call setlocale :(
792		757
793	init_vars ();	758	init_vars ();
794
795	init_secondary ();
796		759
797	const char **cmd_argv = init_resources (argc, argv);	760	const char **cmd_argv = init_resources (argc, argv);
798		761
799	#ifdef KEYSYM_RESOURCE	762	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	763	keyboard->register_done ();
…		…
809	if (chdir (path))	772	if (chdir (path))
810	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");	773	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811	}	774	}
812		775
813	if (option (Opt_scrollBar))	776	if (option (Opt_scrollBar))
814	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	777	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815		778
816	pty = ptytty::create ();	779	pty = ptytty::create ();
		780
		781	#ifdef HAVE_AFTERIMAGE
		782	set_application_name ((char *)rs[Rs_name]);
		783	set_output_threshold (OUTPUT_LEVEL_WARNING);
		784	#endif
		785
		786	// must be called before create_windows, because the latter may call set_icon
		787	#ifdef HAVE_PIXBUF
		788	g_type_init ();
		789	#endif
817		790
818	create_windows (argc, argv);	791	create_windows (argc, argv);
819		792
820	init_xlocale ();	793	init_xlocale ();
821		794
…		…
827		800
828	if (option (Opt_scrollBar))	801	if (option (Opt_scrollBar))
829	scrollBar.resize (); /* create and map scrollbar */	802	scrollBar.resize (); /* create and map scrollbar */
830	#ifdef HAVE_BG_PIXMAP	803	#ifdef HAVE_BG_PIXMAP
831	{	804	{
832	bgPixmap.set_target (this);	805	bg_init ();
833	bgPixmap.invalidate ();
834		806
835	#ifdef ENABLE_TRANSPARENCY	807	#ifdef ENABLE_TRANSPARENCY
836	if (option (Opt_transparent))	808	if (option (Opt_transparent))
837	{	809	{
838	bgPixmap.set_transparent ();	810	bg_set_transparent ();
839		811
840	#ifdef HAVE_AFTERIMAGE
841	if (rs [Rs_blurradius])	812	if (rs [Rs_blurradius])
842	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	813	bg_set_blur (rs [Rs_blurradius]);
843	#endif	814
844	if (ISSET_PIXCOLOR (Color_tint))	815	if (ISSET_PIXCOLOR (Color_tint))
845	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	816	bg_set_tint (pix_colors_focused [Color_tint]);
846		817
847	if (rs [Rs_shade])	818	if (rs [Rs_shade])
848	bgPixmap.set_shade (rs [Rs_shade]);	819	bg_set_shade (rs [Rs_shade]);
849		820
850	bgPixmap.set_root_pixmap ();	821	bg_set_root_pixmap ();
851	XSelectInput (dpy, display->root, PropertyChangeMask);	822	XSelectInput (dpy, display->root, PropertyChangeMask);
852	rootwin_ev.start (display, display->root);	823	rootwin_ev.start (display, display->root);
853	}	824	}
854	#endif	825	#endif
855		826
856	#ifdef BG_IMAGE_FROM_FILE	827	#ifdef BG_IMAGE_FROM_FILE
857	if (rs[Rs_backgroundPixmap])	828	if (rs[Rs_backgroundPixmap])
858	{	829	{
859	const char *p = rs[Rs_backgroundPixmap];
860
861	if ((p = strchr (p, ';')) != 0)
862	{
863	p++;
864	bgPixmap.set_geometry (p);
865	}
866	else
867	bgPixmap.set_defaultGeometry ();
868
869	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))	830	if (bg_set_file (rs[Rs_backgroundPixmap]))
870	if (!bgPixmap.window_position_sensitive ())	831	if (!bg_window_position_sensitive ())
871	update_background ();	832	update_background ();
872	}	833	}
873	#endif	834	#endif
874	}	835	}
875	#endif	836	#endif
…		…
880		841
881	set_colorfgbg ();	842	set_colorfgbg ();
882		843
883	init_command (cmd_argv);	844	init_command (cmd_argv);
884		845
885	free (cmd_argv);
886
887	if (pty->pty >= 0)	846	if (pty->pty >= 0)
888	pty_ev.start (pty->pty, ev::READ);	847	pty_ev.start (pty->pty, ev::READ);
889		848
890	HOOK_INVOKE ((this, HOOK_START, DT_END));	849	HOOK_INVOKE ((this, HOOK_START, DT_END));
891		850
892	#if ENABLE_XEMBED	851	#if ENABLE_XEMBED
893	if (rs[Rs_embed])	852	if (rs[Rs_embed])
894	{	853	{
895	long info[2] = { 0, XEMBED_MAPPED };	854	long info[2] = { 0, XEMBED_MAPPED };
896		855
897	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	856	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898	32, PropModeReplace, (unsigned char *)&info, 2);	857	32, PropModeReplace, (unsigned char *)&info, 2);
899	}	858	}
900	#endif	859	#endif
901		860
		861	#if HAVE_STARTUP_NOTIFICATION
		862	SnDisplay *snDisplay;
		863	SnLauncheeContext *snContext;
		864
		865	snDisplay = sn_display_new (dpy, NULL, NULL);
		866	snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
		867
		868	/* Tell the window manager that this window is part of the startup context */
		869	if (snContext)
		870	sn_launchee_context_setup_window (snContext, parent);
		871	#endif
		872
902	XMapWindow (dpy, vt);	873	XMapWindow (dpy, vt);
903	XMapWindow (dpy, parent[0]);	874	XMapWindow (dpy, parent);
		875
		876	#if HAVE_STARTUP_NOTIFICATION
		877	if (snContext)
		878	{
		879	/* Mark the startup process as complete */
		880	sn_launchee_context_complete (snContext);
		881
		882	sn_launchee_context_unref (snContext);
		883	}
		884
		885	sn_display_unref (snDisplay);
		886	#endif
904		887
905	refresh_check ();	888	refresh_check ();
906	}	889	}
907		890
908	/----------------------------------------------------------------------/	891	/----------------------------------------------------------------------/
909	void	892	void
910	rxvt_term::init_env ()	893	rxvt_term::init_env ()
911	{	894	{
912	int i;
913	char *val;	895	char *val;
914		896
915	#ifdef DISPLAY_IS_IP	897	#ifdef DISPLAY_IS_IP
916	/* Fixup display_name for export over pty to any interested terminal	898	/* Fixup display_name for export over pty to any interested terminal
917	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	899	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
931	val = XDisplayString (dpy);	913	val = XDisplayString (dpy);
932		914
933	if (rs[Rs_display_name] == NULL)	915	if (rs[Rs_display_name] == NULL)
934	rs[Rs_display_name] = val; /* use broken `:0' value */	916	rs[Rs_display_name] = val; /* use broken `:0' value */
935		917
936	i = strlen (val);
937	env_display = (char *)rxvt_malloc (i + 9);	918	env_display = (char *)rxvt_malloc (strlen (val) + 9);
938		919
939	sprintf (env_display, "DISPLAY=%s", val);	920	sprintf (env_display, "DISPLAY=%s", val);
940		921
941	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	922	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942		923
943	/* add entries to the environment:	924	/* add entries to the environment:
944	* @ DISPLAY: in case we started with -display	925	* @ DISPLAY: in case we started with -display
945	* @ WINDOWID: X window id number of the window	926	* @ WINDOWID: X window id number of the window
946	* @ COLORTERM: terminal sub-name and also indicates its color	927	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
1299		1280
1300	if (i)	1281	if (i)
1301	ModMetaMask = modmasks[i - 1];	1282	ModMetaMask = modmasks[i - 1];
1302	}	1283	}
1303		1284
		1285	void
		1286	rxvt_term::set_icon (const char *file)
		1287	{
		1288	#ifdef HAVE_AFTERIMAGE
		1289	init_asv ();
		1290
		1291	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1292	if (!im)
		1293	{
		1294	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1295	return;
		1296	}
		1297
		1298	unsigned int w = im->width;
		1299	unsigned int h = im->height;
		1300
		1301	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1302	{
		1303	rxvt_warn ("Icon image too big, continuing without.\n");
		1304	destroy_asimage (&im);
		1305	return;
		1306	}
		1307
		1308	ASImage *result = scale_asimage (asv, im,
		1309	w, h, ASA_ARGB32,
		1310	100, ASIMAGE_QUALITY_DEFAULT);
		1311	destroy_asimage (&im);
		1312
		1313	if (!result)
		1314	{
		1315	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1316	return;
		1317	}
		1318
		1319	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1320	if (buffer)
		1321	{
		1322	ARGB32 *asbuf = result->alt.argb32;
		1323	buffer [0] = w;
		1324	buffer [1] = h;
		1325
		1326	for (unsigned int i = 0; i < w * h; ++i)
		1327	buffer [i + 2] = asbuf [i];
		1328
		1329	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1330	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1331	free (buffer);
		1332	}
		1333	else
		1334	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1335
		1336	destroy_asimage (&result);
		1337	#endif
		1338
		1339	#ifdef HAVE_PIXBUF
		1340	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1341	if (!pixbuf)
		1342	{
		1343	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1344	return;
		1345	}
		1346
		1347	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1348	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1349
		1350	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1351	{
		1352	rxvt_warn ("Icon image too big, continuing without.\n");
		1353	g_object_unref (pixbuf);
		1354	return;
		1355	}
		1356
		1357	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1358	{
		1359	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1360	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1361	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1362
		1363	buffer [0] = w;
		1364	buffer [1] = h;
		1365	for (int i = 0; i < h; i++)
		1366	{
		1367	for (int j = 0; j < w; j++)
		1368	{
		1369	unsigned char pixel = row + j channels;
		1370	long value;
		1371
		1372	if (channels == 4)
		1373	value = pixel[3];
		1374	else
		1375	value = (unsigned char)0x00ff;
		1376
		1377	value = (value << 8) + pixel[0];
		1378	value = (value << 8) + pixel[1];
		1379	value = (value << 8) + pixel[2];
		1380	buffer[(i * w + j) + 2] = value;
		1381	}
		1382
		1383	row += rowstride;
		1384	}
		1385
		1386	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1387	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1388	free (buffer);
		1389	}
		1390	else
		1391	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1392
		1393	g_object_unref (pixbuf);
		1394	#endif
		1395	}
		1396
1304	/----------------------------------------------------------------------/	1397	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1398	/* Open and map the window */
1306	void	1399	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1400	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1401	{
1309	XClassHint classHint;	1402	XClassHint classHint;
1310	XWMHints wmHint;	1403	XWMHints wmHint;
…		…
1356	}	1449	}
1357	#endif	1450	#endif
1358		1451
1359	window_calc (0, 0);	1452	window_calc (0, 0);
1360		1453
1361	/* sub-window placement & size in rxvt_resize_subwindows () */	1454	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1362	attributes.background_pixel = pix_colors_focused [Color_border];	1455	attributes.background_pixel = pix_colors_focused [Color_border];
1363	attributes.border_pixel = pix_colors_focused [Color_border];	1456	attributes.border_pixel = pix_colors_focused [Color_border];
1364	attributes.colormap = cmap;	1457	attributes.colormap = cmap;
1365		1458
1366	top = XCreateWindow (dpy, parent,	1459	top = XCreateWindow (dpy, parent,
…		…
1369	ext_bwidth,	1462	ext_bwidth,
1370	depth, InputOutput, visual,	1463	depth, InputOutput, visual,
1371	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1464	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1372	&attributes);	1465	&attributes);
1373		1466
1374	this->parent[0] = top;	1467	this->parent = top;
1375		1468
1376	old_width = szHint.width;	1469	old_width = szHint.width;
1377	old_height = szHint.height;	1470	old_height = szHint.height;
1378		1471
1379	set_title (rs [Rs_title]);	1472	set_title (rs [Rs_title]);
…		…
1388	wmHint.window_group = top;	1481	wmHint.window_group = top;
1389		1482
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1483	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1484	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1485	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1486	/*
1395	* set up icon hint	1487	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1488	* rs [Rs_iconfile] is path to icon
1397	*/	1489	*/
1398		1490
1399	if (rs [Rs_iconfile])	1491	if (rs [Rs_iconfile])
1400	{	1492	{
1401	init_asv ();	1493	set_icon (rs [Rs_iconfile]);
1402
1403	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404	if (asv && im)
1405	{
1406	int w = im->width;
1407	int h = im->height;
1408	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
1409	ASImage *result = scale_asimage (asv, im,
1410	w, h, ASA_ARGB32,
1411	100, ASIMAGE_QUALITY_DEFAULT);
1412	destroy_asimage (&im);
1413
1414	if (buffer && result)
1415	{
1416	ARGB32 *asbuf = result->alt.argb32;
1417	buffer [0] = w;
1418	buffer [1] = h;
1419
1420	for (unsigned int i = 0; i < w * h; ++i)
1421	buffer [i + 2] = asbuf [i];
1422
1423	destroy_asimage (&result);
1424	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1426	free (buffer);
1427	}
1428	else
1429	{
1430	if (!buffer)
1431	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433	if (!result)
1434	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435	}
1436	}
1437	else
1438	rxvt_warn ("Loading image icon failed, continuing without.\n");
1439	}	1494	}
1440	# endif
1441	#endif	1495	#endif
1442		1496
1443	#if ENABLE_FRILLS	1497	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1498	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1499	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1451	#if ENABLE_EWMH	1505	#if ENABLE_EWMH
1452	xa[XA_NET_WM_PING],	1506	xa[XA_NET_WM_PING],
1453	#endif	1507	#endif
1454	};	1508	};
1455		1509
1456	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1510	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457		1511
1458	#if ENABLE_FRILLS	1512	#if ENABLE_FRILLS
1459	if (rs[Rs_transient_for])	1513	if (rs[Rs_transient_for])
1460	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1514	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461	#endif	1515	#endif
…		…
1522	pix_colors = pix_colors_unfocused;	1576	pix_colors = pix_colors_unfocused;
1523	#endif	1577	#endif
1524		1578
1525	pointer_unblank ();	1579	pointer_unblank ();
1526	scr_recolour ();	1580	scr_recolour ();
1527	}
1528
1529	/* ------------------------------------------------------------------------- *
1530	* GET TTY CURRENT STATE *
1531	* ------------------------------------------------------------------------- */
1532	void
1533	rxvt_get_ttymode (struct termios *tio, int erase)
1534	{
1535	/*
1536	* standard System V termios interface
1537	*/
1538	// does not work as stdin is not a tty
1539	// if (tcgetattr (STDIN_FILENO, tio) < 0)
1540	if (1)
1541	{
1542	// return error - use system defaults,
1543	// where possible, and zero elsewhere
1544	memset (tio, 0, sizeof (struct termios));
1545	if (VDISABLE)
1546	for (int i = 0; i < NCCS; i++)
1547	tio->c_cc[i] = VDISABLE;
1548
1549	tio->c_cc[VINTR] = CINTR;
1550	tio->c_cc[VQUIT] = CQUIT;
1551	tio->c_cc[VERASE] = CERASE;
1552	#ifdef VERASE2
1553	tio->c_cc[VERASE2] = CERASE2;
1554	#endif
1555	tio->c_cc[VKILL] = CKILL;
1556	tio->c_cc[VSTART] = CSTART;
1557	tio->c_cc[VSTOP] = CSTOP;
1558	tio->c_cc[VSUSP] = CSUSP;
1559	# ifdef VDSUSP
1560	tio->c_cc[VDSUSP] = CDSUSP;
1561	# endif
1562	# ifdef VREPRINT
1563	tio->c_cc[VREPRINT] = CRPRNT;
1564	# endif
1565	# ifdef VDISCRD
1566	tio->c_cc[VDISCRD] = CFLUSH;
1567	# endif
1568	# ifdef VWERSE
1569	tio->c_cc[VWERSE] = CWERASE;
1570	# endif
1571	# ifdef VLNEXT
1572	tio->c_cc[VLNEXT] = CLNEXT;
1573	# endif
1574	}
1575
1576	tio->c_cc[VEOF] = CEOF;
1577	# if VMIN != VEOF
1578	tio->c_cc[VMIN] = 1;
1579	# endif
1580	# if VTIME != VEOL
1581	tio->c_cc[VTIME] = 0;
1582	# endif
1583
1584	if (erase != -1)
1585	tio->c_cc[VERASE] = (char)erase;
1586
1587	/* input modes */
1588	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1589	# ifdef IMAXBEL
1590	\| IMAXBEL
1591	# endif
1592	\| IXON);
1593
1594	/* output modes */
1595	tio->c_oflag = (OPOST \| ONLCR);
1596
1597	/* control modes */
1598	tio->c_cflag = (CS8 \| CREAD);
1599
1600	/* line discipline modes */
1601	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1602	# if defined (ECHOCTL) && defined (ECHOKE)
1603	\| ECHOCTL \| ECHOKE
1604	# endif
1605	\| ECHOE \| ECHOK);
1606
1607	/*
1608	* Debugging
1609	*/
1610	#ifdef DEBUG_TTYMODE
1611	/* c_iflag bits */
1612	fprintf (stderr, "Input flags\n");
1613
1614	/* cpp token stringize doesn't work on all machines <sigh> */
1615	# define FOO(flag,name) \
1616	if ((tio->c_iflag) & flag) \
1617	fprintf (stderr, "%s ", name)
1618
1619	/* c_iflag bits */
1620	FOO (IGNBRK, "IGNBRK");
1621	FOO (BRKINT, "BRKINT");
1622	FOO (IGNPAR, "IGNPAR");
1623	FOO (PARMRK, "PARMRK");
1624	FOO (INPCK, "INPCK");
1625	FOO (ISTRIP, "ISTRIP");
1626	FOO (INLCR, "INLCR");
1627	FOO (IGNCR, "IGNCR");
1628	FOO (ICRNL, "ICRNL");
1629	FOO (IXON, "IXON");
1630	FOO (IXOFF, "IXOFF");
1631	# ifdef IUCLC
1632	FOO (IUCLC, "IUCLC");
1633	# endif
1634	# ifdef IXANY
1635	FOO (IXANY, "IXANY");
1636	# endif
1637	# ifdef IMAXBEL
1638	FOO (IMAXBEL, "IMAXBEL");
1639	# endif
1640
1641	fprintf (stderr, "\n");
1642
1643	# undef FOO
1644	# define FOO(entry, name) \
1645	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1646
1647	FOO (VINTR, "VINTR");
1648	FOO (VQUIT, "VQUIT");
1649	FOO (VERASE, "VERASE");
1650	FOO (VKILL, "VKILL");
1651	FOO (VEOF, "VEOF");
1652	FOO (VEOL, "VEOL");
1653	# ifdef VEOL2
1654	FOO (VEOL2, "VEOL2");
1655	# endif
1656	# ifdef VSWTC
1657	FOO (VSWTC, "VSWTC");
1658	# endif
1659	# ifdef VSWTCH
1660	FOO (VSWTCH, "VSWTCH");
1661	# endif
1662	FOO (VSTART, "VSTART");
1663	FOO (VSTOP, "VSTOP");
1664	FOO (VSUSP, "VSUSP");
1665	# ifdef VDSUSP
1666	FOO (VDSUSP, "VDSUSP");
1667	# endif
1668	# ifdef VREPRINT
1669	FOO (VREPRINT, "VREPRINT");
1670	# endif
1671	# ifdef VDISCRD
1672	FOO (VDISCRD, "VDISCRD");
1673	# endif
1674	# ifdef VWERSE
1675	FOO (VWERSE, "VWERSE");
1676	# endif
1677	# ifdef VLNEXT
1678	FOO (VLNEXT, "VLNEXT");
1679	# endif
1680
1681	fprintf (stderr, "\n");
1682	# undef FOO
1683	#endif /* DEBUG_TTYMODE */
1684	}	1581	}
1685		1582
1686	/----------------------------------------------------------------------/	1583	/----------------------------------------------------------------------/
1687	/*	1584	/*
1688	* Run the command in a subprocess and return a file descriptor for the	1585	* Run the command in a subprocess and return a file descriptor for the
…		…
1709	else	1606	else
1710	#endif	1607	#endif
1711	if (!pty->get ())	1608	if (!pty->get ())
1712	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1609	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1713		1610
1714	int er;	1611	struct termios tio = def_tio;
1715		1612
1716	#ifndef NO_BACKSPACE_KEY	1613	#ifndef NO_BACKSPACE_KEY
1717	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1614	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718	er = rs[Rs_backspace_key][0];	1615	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1719	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1616	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720	er = '\177'; /* the initial state anyway */	1617	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1721	else
1722	#endif	1618	#endif
1723	er = -1;
1724		1619
1725	rxvt_get_ttymode (&tio, er);
1726	/* init terminal attributes */	1620	/* init terminal attributes */
1727	cfsetospeed (&tio, BAUDRATE);	1621	cfsetospeed (&tio, BAUDRATE);
1728	cfsetispeed (&tio, BAUDRATE);	1622	cfsetispeed (&tio, BAUDRATE);
1729	tcsetattr (pty->tty, TCSANOW, &tio);	1623	tcsetattr (pty->tty, TCSANOW, &tio);
1730	pty->set_utf8_mode (enc_utf8);	1624	pty->set_utf8_mode (enc_utf8);
…		…
1817	signal (SIGQUIT, SIG_DFL);	1711	signal (SIGQUIT, SIG_DFL);
1818	signal (SIGCHLD, SIG_DFL);	1712	signal (SIGCHLD, SIG_DFL);
1819	signal (SIGHUP, SIG_DFL);	1713	signal (SIGHUP, SIG_DFL);
1820	signal (SIGPIPE, SIG_DFL);	1714	signal (SIGPIPE, SIG_DFL);
1821	/*	1715	/*
1822	* mimick login's behavior by disabling the job control signals	1716	* mimic login's behavior by disabling the job control signals
1823	* a shell that wants them can turn them back on	1717	* a shell that wants them can turn them back on
1824	*/	1718	*/
1825	#ifdef SIGTSTP	1719	#ifdef SIGTSTP
1826	signal (SIGTSTP, SIG_IGN);	1720	signal (SIGTSTP, SIG_IGN);
1827	signal (SIGTTIN, SIG_IGN);	1721	signal (SIGTTIN, SIG_IGN);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.268 by root, Mon Jun 14 15:50:08 2010 UTC vs. Revision 1.306 by sf-exg, Tue Dec 6 11:39:30 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.268 by root, Mon Jun 14 15:50:08 2010 UTC vs.
Revision 1.306 by sf-exg, Tue Dec 6 11:39:30 2011 UTC