[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.305 by sf-exg, Tue Dec 6 11:29:52 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++)
…		…
604	cmd_argv[i] = (const char *)argv[i + r_argc + 1];	591	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605		592
606	cmd_argv[i] = NULL;	593	cmd_argv[i] = NULL;
607	}	594	}
608		595
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
616	rs[Rs_name] = rxvt_basename (argv[0]);	596	rs[Rs_name] = rxvt_basename (argv[0]);
617		597
618	/*	598	/*
619	* Open display, get options/resources and create the window	599	* Open display, get options/resources and create the window
620	*/	600	*/
621		601
622	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	602	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623	rs[Rs_display_name] = ":0";	603	rs[Rs_display_name] = ":0";
624		604
625	get_options (r_argc, r_argv);	605	get_options (r_argc, argv);
626		606
627	if (!(display = displays.get (rs[Rs_display_name])))	607	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]);	608	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631	}
632		609
633	// using a local pointer decreases code size a lot	610	// using a local pointer decreases code size a lot
634	xa = display->xa;	611	xa = display->xa;
635		612
636	set (display);	613	set (display);
…		…
639	#if XFT	616	#if XFT
640	if (rs[Rs_depth])	617	if (rs[Rs_depth])
641	select_visual (strtol (rs[Rs_depth], 0, 0));	618	select_visual (strtol (rs[Rs_depth], 0, 0));
642	#endif	619	#endif
643		620
644	free (r_argv);
645
646	for (int i = NUM_RESOURCES; i--; )	621	for (int i = NUM_RESOURCES; i--; )
647	if (rs [i] == resval_undef)	622	if (rs [i] == resval_undef)
648	rs [i] = 0;	623	rs [i] = 0;
649		624
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	625	#if ENABLE_PERL
656	if (!rs[Rs_perl_ext_1])	626	if (!rs[Rs_perl_ext_1])
657	rs[Rs_perl_ext_1] = "default";	627	rs[Rs_perl_ext_1] = "default";
658		628
659	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	629	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
662	{	632	{
663	rxvt_perl.init (this);	633	rxvt_perl.init (this);
664	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	634	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665	}	635	}
666	#endif	636	#endif
		637
		638	// must be called after initialising the perl interpreter as it
		639	// may invoke the `on_register_command' hook
		640	extract_keysym_resources ();
667		641
668	/*	642	/*
669	* set any defaults not already set	643	* set any defaults not already set
670	*/	644	*/
671	if (cmd_argv && cmd_argv[0])	645	if (cmd_argv && cmd_argv[0])
…		…
780	return cmd_argv;	754	return cmd_argv;
781	}	755	}
782		756
783	/----------------------------------------------------------------------/	757	/----------------------------------------------------------------------/
784	void	758	void
785	rxvt_term::init (int argc, const char const argv, stringvec *envv)	759	rxvt_term::init (int argc, const char const argv)
786	{	760	{
787	this->envv = envv;
788
789	SET_R (this);	761	SET_R (this);
790	set_locale ("");	762	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	763	set_environ (envv); // a few things in X do not call setlocale :(
792		764
793	init_vars ();	765	init_vars ();
794
795	init_secondary ();
796		766
797	const char **cmd_argv = init_resources (argc, argv);	767	const char **cmd_argv = init_resources (argc, argv);
798		768
799	#ifdef KEYSYM_RESOURCE	769	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	770	keyboard->register_done ();
…		…
809	if (chdir (path))	779	if (chdir (path))
810	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");	780	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811	}	781	}
812		782
813	if (option (Opt_scrollBar))	783	if (option (Opt_scrollBar))
814	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	784	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815		785
816	pty = ptytty::create ();	786	pty = ptytty::create ();
		787
		788	#ifdef HAVE_AFTERIMAGE
		789	set_application_name ((char *)rs[Rs_name]);
		790	set_output_threshold (OUTPUT_LEVEL_WARNING);
		791	#endif
		792
		793	// must be called before create_windows, because the latter may call set_icon
		794	#ifdef HAVE_PIXBUF
		795	g_type_init ();
		796	#endif
817		797
818	create_windows (argc, argv);	798	create_windows (argc, argv);
819		799
820	init_xlocale ();	800	init_xlocale ();
821		801
…		…
827		807
828	if (option (Opt_scrollBar))	808	if (option (Opt_scrollBar))
829	scrollBar.resize (); /* create and map scrollbar */	809	scrollBar.resize (); /* create and map scrollbar */
830	#ifdef HAVE_BG_PIXMAP	810	#ifdef HAVE_BG_PIXMAP
831	{	811	{
832	bgPixmap.set_target (this);	812	bg_init ();
833	bgPixmap.invalidate ();
834		813
835	#ifdef ENABLE_TRANSPARENCY	814	#ifdef ENABLE_TRANSPARENCY
836	if (option (Opt_transparent))	815	if (option (Opt_transparent))
837	{	816	{
838	bgPixmap.set_transparent ();	817	bg_set_transparent ();
839		818
840	#ifdef HAVE_AFTERIMAGE
841	if (rs [Rs_blurradius])	819	if (rs [Rs_blurradius])
842	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	820	bg_set_blur (rs [Rs_blurradius]);
843	#endif	821
844	if (ISSET_PIXCOLOR (Color_tint))	822	if (ISSET_PIXCOLOR (Color_tint))
845	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	823	bg_set_tint (pix_colors_focused [Color_tint]);
846		824
847	if (rs [Rs_shade])	825	if (rs [Rs_shade])
848	bgPixmap.set_shade (rs [Rs_shade]);	826	bg_set_shade (rs [Rs_shade]);
849		827
850	bgPixmap.set_root_pixmap ();	828	bg_set_root_pixmap ();
851	XSelectInput (dpy, display->root, PropertyChangeMask);	829	XSelectInput (dpy, display->root, PropertyChangeMask);
852	rootwin_ev.start (display, display->root);	830	rootwin_ev.start (display, display->root);
853	}	831	}
854	#endif	832	#endif
855		833
856	#ifdef BG_IMAGE_FROM_FILE	834	#ifdef BG_IMAGE_FROM_FILE
857	if (rs[Rs_backgroundPixmap])	835	if (rs[Rs_backgroundPixmap])
858	{	836	{
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]))	837	if (bg_set_file (rs[Rs_backgroundPixmap]))
870	if (!bgPixmap.window_position_sensitive ())	838	if (!bg_window_position_sensitive ())
871	update_background ();	839	update_background ();
872	}	840	}
873	#endif	841	#endif
874	}	842	}
875	#endif	843	#endif
…		…
892	#if ENABLE_XEMBED	860	#if ENABLE_XEMBED
893	if (rs[Rs_embed])	861	if (rs[Rs_embed])
894	{	862	{
895	long info[2] = { 0, XEMBED_MAPPED };	863	long info[2] = { 0, XEMBED_MAPPED };
896		864
897	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	865	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898	32, PropModeReplace, (unsigned char *)&info, 2);	866	32, PropModeReplace, (unsigned char *)&info, 2);
899	}	867	}
900	#endif	868	#endif
901		869
		870	#if HAVE_STARTUP_NOTIFICATION
		871	SnDisplay *snDisplay;
		872	SnLauncheeContext *snContext;
		873
		874	snDisplay = sn_display_new (dpy, NULL, NULL);
		875	snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
		876
		877	/* Tell the window manager that this window is part of the startup context */
		878	if (snContext)
		879	sn_launchee_context_setup_window (snContext, parent);
		880	#endif
		881
902	XMapWindow (dpy, vt);	882	XMapWindow (dpy, vt);
903	XMapWindow (dpy, parent[0]);	883	XMapWindow (dpy, parent);
		884
		885	#if HAVE_STARTUP_NOTIFICATION
		886	if (snContext)
		887	{
		888	/* Mark the startup process as complete */
		889	sn_launchee_context_complete (snContext);
		890
		891	sn_launchee_context_unref (snContext);
		892	}
		893
		894	sn_display_unref (snDisplay);
		895	#endif
904		896
905	refresh_check ();	897	refresh_check ();
906	}	898	}
907		899
908	/----------------------------------------------------------------------/	900	/----------------------------------------------------------------------/
909	void	901	void
910	rxvt_term::init_env ()	902	rxvt_term::init_env ()
911	{	903	{
912	int i;
913	char *val;	904	char *val;
914		905
915	#ifdef DISPLAY_IS_IP	906	#ifdef DISPLAY_IS_IP
916	/* Fixup display_name for export over pty to any interested terminal	907	/* 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	908	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
931	val = XDisplayString (dpy);	922	val = XDisplayString (dpy);
932		923
933	if (rs[Rs_display_name] == NULL)	924	if (rs[Rs_display_name] == NULL)
934	rs[Rs_display_name] = val; /* use broken `:0' value */	925	rs[Rs_display_name] = val; /* use broken `:0' value */
935		926
936	i = strlen (val);
937	env_display = (char *)rxvt_malloc (i + 9);	927	env_display = (char *)rxvt_malloc (strlen (val) + 9);
938		928
939	sprintf (env_display, "DISPLAY=%s", val);	929	sprintf (env_display, "DISPLAY=%s", val);
940		930
941	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	931	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942		932
943	/* add entries to the environment:	933	/* add entries to the environment:
944	* @ DISPLAY: in case we started with -display	934	* @ DISPLAY: in case we started with -display
945	* @ WINDOWID: X window id number of the window	935	* @ WINDOWID: X window id number of the window
946	* @ COLORTERM: terminal sub-name and also indicates its color	936	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
1299		1289
1300	if (i)	1290	if (i)
1301	ModMetaMask = modmasks[i - 1];	1291	ModMetaMask = modmasks[i - 1];
1302	}	1292	}
1303		1293
		1294	void
		1295	rxvt_term::set_icon (const char *file)
		1296	{
		1297	#ifdef HAVE_AFTERIMAGE
		1298	init_asv ();
		1299
		1300	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1301	if (!im)
		1302	{
		1303	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1304	return;
		1305	}
		1306
		1307	unsigned int w = im->width;
		1308	unsigned int h = im->height;
		1309
		1310	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1311	{
		1312	rxvt_warn ("Icon image too big, continuing without.\n");
		1313	destroy_asimage (&im);
		1314	return;
		1315	}
		1316
		1317	ASImage *result = scale_asimage (asv, im,
		1318	w, h, ASA_ARGB32,
		1319	100, ASIMAGE_QUALITY_DEFAULT);
		1320	destroy_asimage (&im);
		1321
		1322	if (!result)
		1323	{
		1324	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1325	return;
		1326	}
		1327
		1328	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1329	if (buffer)
		1330	{
		1331	ARGB32 *asbuf = result->alt.argb32;
		1332	buffer [0] = w;
		1333	buffer [1] = h;
		1334
		1335	for (unsigned int i = 0; i < w * h; ++i)
		1336	buffer [i + 2] = asbuf [i];
		1337
		1338	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1339	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1340	free (buffer);
		1341	}
		1342	else
		1343	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1344
		1345	destroy_asimage (&result);
		1346	#endif
		1347
		1348	#ifdef HAVE_PIXBUF
		1349	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1350	if (!pixbuf)
		1351	{
		1352	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1353	return;
		1354	}
		1355
		1356	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1357	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1358
		1359	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1360	{
		1361	rxvt_warn ("Icon image too big, continuing without.\n");
		1362	g_object_unref (pixbuf);
		1363	return;
		1364	}
		1365
		1366	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1367	{
		1368	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1369	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1370	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1371
		1372	buffer [0] = w;
		1373	buffer [1] = h;
		1374	for (int i = 0; i < h; i++)
		1375	{
		1376	for (int j = 0; j < w; j++)
		1377	{
		1378	unsigned char pixel = row + j channels;
		1379	long value;
		1380
		1381	if (channels == 4)
		1382	value = pixel[3];
		1383	else
		1384	value = (unsigned char)0x00ff;
		1385
		1386	value = (value << 8) + pixel[0];
		1387	value = (value << 8) + pixel[1];
		1388	value = (value << 8) + pixel[2];
		1389	buffer[(i * w + j) + 2] = value;
		1390	}
		1391
		1392	row += rowstride;
		1393	}
		1394
		1395	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1396	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1397	free (buffer);
		1398	}
		1399	else
		1400	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1401
		1402	g_object_unref (pixbuf);
		1403	#endif
		1404	}
		1405
1304	/----------------------------------------------------------------------/	1406	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1407	/* Open and map the window */
1306	void	1408	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1409	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1410	{
1309	XClassHint classHint;	1411	XClassHint classHint;
1310	XWMHints wmHint;	1412	XWMHints wmHint;
…		…
1356	}	1458	}
1357	#endif	1459	#endif
1358		1460
1359	window_calc (0, 0);	1461	window_calc (0, 0);
1360		1462
1361	/* sub-window placement & size in rxvt_resize_subwindows () */	1463	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1362	attributes.background_pixel = pix_colors_focused [Color_border];	1464	attributes.background_pixel = pix_colors_focused [Color_border];
1363	attributes.border_pixel = pix_colors_focused [Color_border];	1465	attributes.border_pixel = pix_colors_focused [Color_border];
1364	attributes.colormap = cmap;	1466	attributes.colormap = cmap;
1365		1467
1366	top = XCreateWindow (dpy, parent,	1468	top = XCreateWindow (dpy, parent,
…		…
1369	ext_bwidth,	1471	ext_bwidth,
1370	depth, InputOutput, visual,	1472	depth, InputOutput, visual,
1371	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1473	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1372	&attributes);	1474	&attributes);
1373		1475
1374	this->parent[0] = top;	1476	this->parent = top;
1375		1477
1376	old_width = szHint.width;	1478	old_width = szHint.width;
1377	old_height = szHint.height;	1479	old_height = szHint.height;
1378		1480
1379	set_title (rs [Rs_title]);	1481	set_title (rs [Rs_title]);
…		…
1388	wmHint.window_group = top;	1490	wmHint.window_group = top;
1389		1491
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1492	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1493	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1494	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1495	/*
1395	* set up icon hint	1496	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1497	* rs [Rs_iconfile] is path to icon
1397	*/	1498	*/
1398		1499
1399	if (rs [Rs_iconfile])	1500	if (rs [Rs_iconfile])
1400	{	1501	{
1401	init_asv ();	1502	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	}	1503	}
1440	# endif
1441	#endif	1504	#endif
1442		1505
1443	#if ENABLE_FRILLS	1506	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1507	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1508	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1451	#if ENABLE_EWMH	1514	#if ENABLE_EWMH
1452	xa[XA_NET_WM_PING],	1515	xa[XA_NET_WM_PING],
1453	#endif	1516	#endif
1454	};	1517	};
1455		1518
1456	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1519	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457		1520
1458	#if ENABLE_FRILLS	1521	#if ENABLE_FRILLS
1459	if (rs[Rs_transient_for])	1522	if (rs[Rs_transient_for])
1460	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1523	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461	#endif	1524	#endif
…		…
1522	pix_colors = pix_colors_unfocused;	1585	pix_colors = pix_colors_unfocused;
1523	#endif	1586	#endif
1524		1587
1525	pointer_unblank ();	1588	pointer_unblank ();
1526	scr_recolour ();	1589	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	}	1590	}
1685		1591
1686	/----------------------------------------------------------------------/	1592	/----------------------------------------------------------------------/
1687	/*	1593	/*
1688	* Run the command in a subprocess and return a file descriptor for the	1594	* Run the command in a subprocess and return a file descriptor for the
…		…
1709	else	1615	else
1710	#endif	1616	#endif
1711	if (!pty->get ())	1617	if (!pty->get ())
1712	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1618	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1713		1619
1714	int er;	1620	struct termios tio = def_tio;
1715		1621
1716	#ifndef NO_BACKSPACE_KEY	1622	#ifndef NO_BACKSPACE_KEY
1717	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1623	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718	er = rs[Rs_backspace_key][0];	1624	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1719	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1625	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720	er = '\177'; /* the initial state anyway */	1626	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1721	else
1722	#endif	1627	#endif
1723	er = -1;
1724		1628
1725	rxvt_get_ttymode (&tio, er);
1726	/* init terminal attributes */	1629	/* init terminal attributes */
1727	cfsetospeed (&tio, BAUDRATE);	1630	cfsetospeed (&tio, BAUDRATE);
1728	cfsetispeed (&tio, BAUDRATE);	1631	cfsetispeed (&tio, BAUDRATE);
1729	tcsetattr (pty->tty, TCSANOW, &tio);	1632	tcsetattr (pty->tty, TCSANOW, &tio);
1730	pty->set_utf8_mode (enc_utf8);	1633	pty->set_utf8_mode (enc_utf8);
…		…
1817	signal (SIGQUIT, SIG_DFL);	1720	signal (SIGQUIT, SIG_DFL);
1818	signal (SIGCHLD, SIG_DFL);	1721	signal (SIGCHLD, SIG_DFL);
1819	signal (SIGHUP, SIG_DFL);	1722	signal (SIGHUP, SIG_DFL);
1820	signal (SIGPIPE, SIG_DFL);	1723	signal (SIGPIPE, SIG_DFL);
1821	/*	1724	/*
1822	* mimick login's behavior by disabling the job control signals	1725	* mimic login's behavior by disabling the job control signals
1823	* a shell that wants them can turn them back on	1726	* a shell that wants them can turn them back on
1824	*/	1727	*/
1825	#ifdef SIGTSTP	1728	#ifdef SIGTSTP
1826	signal (SIGTSTP, SIG_IGN);	1729	signal (SIGTSTP, SIG_IGN);
1827	signal (SIGTTIN, SIG_IGN);	1730	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.305 by sf-exg, Tue Dec 6 11:29:52 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.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC