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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.269 by root, Tue Jun 15 10:33:47 2010 UTC vs.
Revision 1.303 by sf-exg, Sat Dec 3 11:47:31 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;
…		…
623	rs[Rs_display_name] = ":0";	610	rs[Rs_display_name] = ":0";
624		611
625	get_options (r_argc, r_argv);	612	get_options (r_argc, r_argv);
626		613
627	if (!(display = displays.get (rs[Rs_display_name])))	614	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]);	615	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631	}
632		616
633	// using a local pointer decreases code size a lot	617	// using a local pointer decreases code size a lot
634	xa = display->xa;	618	xa = display->xa;
635		619
636	set (display);	620	set (display);
…		…
645		629
646	for (int i = NUM_RESOURCES; i--; )	630	for (int i = NUM_RESOURCES; i--; )
647	if (rs [i] == resval_undef)	631	if (rs [i] == resval_undef)
648	rs [i] = 0;	632	rs [i] = 0;
649		633
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	634	#if ENABLE_PERL
656	if (!rs[Rs_perl_ext_1])	635	if (!rs[Rs_perl_ext_1])
657	rs[Rs_perl_ext_1] = "default";	636	rs[Rs_perl_ext_1] = "default";
658		637
659	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	638	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
662	{	641	{
663	rxvt_perl.init (this);	642	rxvt_perl.init (this);
664	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	643	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665	}	644	}
666	#endif	645	#endif
		646
		647	// must be called after initialising the perl interpreter as it
		648	// may invoke the `on_register_command' hook
		649	extract_keysym_resources ();
667		650
668	/*	651	/*
669	* set any defaults not already set	652	* set any defaults not already set
670	*/	653	*/
671	if (cmd_argv && cmd_argv[0])	654	if (cmd_argv && cmd_argv[0])
…		…
790	set_locale ("");	773	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	774	set_environ (envv); // a few things in X do not call setlocale :(
792		775
793	init_vars ();	776	init_vars ();
794		777
795	init_secondary ();
796
797	const char **cmd_argv = init_resources (argc, argv);	778	const char **cmd_argv = init_resources (argc, argv);
798		779
799	#ifdef KEYSYM_RESOURCE	780	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	781	keyboard->register_done ();
801	#endif	782	#endif
…		…
809	if (chdir (path))	790	if (chdir (path))
810	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");	791	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811	}	792	}
812		793
813	if (option (Opt_scrollBar))	794	if (option (Opt_scrollBar))
814	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	795	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815		796
816	pty = ptytty::create ();	797	pty = ptytty::create ();
		798
		799	#ifdef HAVE_AFTERIMAGE
		800	set_application_name ((char *)rs[Rs_name]);
		801	set_output_threshold (OUTPUT_LEVEL_WARNING);
		802	#endif
		803
		804	// must be called before create_windows, because the latter may call set_icon
		805	#ifdef HAVE_PIXBUF
		806	g_type_init ();
		807	#endif
817		808
818	create_windows (argc, argv);	809	create_windows (argc, argv);
819		810
820	init_xlocale ();	811	init_xlocale ();
821		812
…		…
827		818
828	if (option (Opt_scrollBar))	819	if (option (Opt_scrollBar))
829	scrollBar.resize (); /* create and map scrollbar */	820	scrollBar.resize (); /* create and map scrollbar */
830	#ifdef HAVE_BG_PIXMAP	821	#ifdef HAVE_BG_PIXMAP
831	{	822	{
832	bgPixmap.set_target (this);	823	bg_init ();
833	bgPixmap.invalidate ();
834		824
835	#ifdef ENABLE_TRANSPARENCY	825	#ifdef ENABLE_TRANSPARENCY
836	if (option (Opt_transparent))	826	if (option (Opt_transparent))
837	{	827	{
838	bgPixmap.set_transparent ();	828	bg_set_transparent ();
839		829
840	#ifdef HAVE_AFTERIMAGE
841	if (rs [Rs_blurradius])	830	if (rs [Rs_blurradius])
842	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	831	bg_set_blur (rs [Rs_blurradius]);
843	#endif	832
844	if (ISSET_PIXCOLOR (Color_tint))	833	if (ISSET_PIXCOLOR (Color_tint))
845	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	834	bg_set_tint (pix_colors_focused [Color_tint]);
846		835
847	if (rs [Rs_shade])	836	if (rs [Rs_shade])
848	bgPixmap.set_shade (rs [Rs_shade]);	837	bg_set_shade (rs [Rs_shade]);
849		838
850	bgPixmap.set_root_pixmap ();	839	bg_set_root_pixmap ();
851	XSelectInput (dpy, display->root, PropertyChangeMask);	840	XSelectInput (dpy, display->root, PropertyChangeMask);
852	rootwin_ev.start (display, display->root);	841	rootwin_ev.start (display, display->root);
853	}	842	}
854	#endif	843	#endif
855		844
856	#ifdef BG_IMAGE_FROM_FILE	845	#ifdef BG_IMAGE_FROM_FILE
857	if (rs[Rs_backgroundPixmap])	846	if (rs[Rs_backgroundPixmap])
858	{	847	{
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]))	848	if (bg_set_file (rs[Rs_backgroundPixmap]))
870	if (!bgPixmap.window_position_sensitive ())	849	if (!bg_window_position_sensitive ())
871	update_background ();	850	update_background ();
872	}	851	}
873	#endif	852	#endif
874	}	853	}
875	#endif	854	#endif
…		…
892	#if ENABLE_XEMBED	871	#if ENABLE_XEMBED
893	if (rs[Rs_embed])	872	if (rs[Rs_embed])
894	{	873	{
895	long info[2] = { 0, XEMBED_MAPPED };	874	long info[2] = { 0, XEMBED_MAPPED };
896		875
897	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	876	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898	32, PropModeReplace, (unsigned char *)&info, 2);	877	32, PropModeReplace, (unsigned char *)&info, 2);
899	}	878	}
900	#endif	879	#endif
901		880
		881	#if HAVE_STARTUP_NOTIFICATION
		882	SnDisplay *snDisplay;
		883	SnLauncheeContext *snContext;
		884
		885	snDisplay = sn_display_new (dpy, NULL, NULL);
		886	snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
		887
		888	/* Tell the window manager that this window is part of the startup context */
		889	if (snContext)
		890	sn_launchee_context_setup_window (snContext, parent);
		891	#endif
		892
902	XMapWindow (dpy, vt);	893	XMapWindow (dpy, vt);
903	XMapWindow (dpy, parent[0]);	894	XMapWindow (dpy, parent);
		895
		896	#if HAVE_STARTUP_NOTIFICATION
		897	if (snContext)
		898	{
		899	/* Mark the startup process as complete */
		900	sn_launchee_context_complete (snContext);
		901
		902	sn_launchee_context_unref (snContext);
		903	}
		904
		905	sn_display_unref (snDisplay);
		906	#endif
904		907
905	refresh_check ();	908	refresh_check ();
906	}	909	}
907		910
908	/----------------------------------------------------------------------/	911	/----------------------------------------------------------------------/
909	void	912	void
910	rxvt_term::init_env ()	913	rxvt_term::init_env ()
911	{	914	{
912	int i;
913	char *val;	915	char *val;
914		916
915	#ifdef DISPLAY_IS_IP	917	#ifdef DISPLAY_IS_IP
916	/* Fixup display_name for export over pty to any interested terminal	918	/* 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	919	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
931	val = XDisplayString (dpy);	933	val = XDisplayString (dpy);
932		934
933	if (rs[Rs_display_name] == NULL)	935	if (rs[Rs_display_name] == NULL)
934	rs[Rs_display_name] = val; /* use broken `:0' value */	936	rs[Rs_display_name] = val; /* use broken `:0' value */
935		937
936	i = strlen (val);
937	env_display = (char *)rxvt_malloc (i + 9);	938	env_display = (char *)rxvt_malloc (strlen (val) + 9);
938		939
939	sprintf (env_display, "DISPLAY=%s", val);	940	sprintf (env_display, "DISPLAY=%s", val);
940		941
941	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	942	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942		943
943	/* add entries to the environment:	944	/* add entries to the environment:
944	* @ DISPLAY: in case we started with -display	945	* @ DISPLAY: in case we started with -display
945	* @ WINDOWID: X window id number of the window	946	* @ WINDOWID: X window id number of the window
946	* @ COLORTERM: terminal sub-name and also indicates its color	947	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
1299		1300
1300	if (i)	1301	if (i)
1301	ModMetaMask = modmasks[i - 1];	1302	ModMetaMask = modmasks[i - 1];
1302	}	1303	}
1303		1304
		1305	void
		1306	rxvt_term::set_icon (const char *file)
		1307	{
		1308	#ifdef HAVE_AFTERIMAGE
		1309	init_asv ();
		1310
		1311	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1312	if (!im)
		1313	{
		1314	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1315	return;
		1316	}
		1317
		1318	unsigned int w = im->width;
		1319	unsigned int h = im->height;
		1320
		1321	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1322	{
		1323	rxvt_warn ("Icon image too big, continuing without.\n");
		1324	destroy_asimage (&im);
		1325	return;
		1326	}
		1327
		1328	ASImage *result = scale_asimage (asv, im,
		1329	w, h, ASA_ARGB32,
		1330	100, ASIMAGE_QUALITY_DEFAULT);
		1331	destroy_asimage (&im);
		1332
		1333	if (!result)
		1334	{
		1335	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1336	return;
		1337	}
		1338
		1339	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1340	if (buffer)
		1341	{
		1342	ARGB32 *asbuf = result->alt.argb32;
		1343	buffer [0] = w;
		1344	buffer [1] = h;
		1345
		1346	for (unsigned int i = 0; i < w * h; ++i)
		1347	buffer [i + 2] = asbuf [i];
		1348
		1349	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1350	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1351	free (buffer);
		1352	}
		1353	else
		1354	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1355
		1356	destroy_asimage (&result);
		1357	#endif
		1358
		1359	#ifdef HAVE_PIXBUF
		1360	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1361	if (!pixbuf)
		1362	{
		1363	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1364	return;
		1365	}
		1366
		1367	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1368	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1369
		1370	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1371	{
		1372	rxvt_warn ("Icon image too big, continuing without.\n");
		1373	g_object_unref (pixbuf);
		1374	return;
		1375	}
		1376
		1377	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1378	{
		1379	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1380	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1381	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1382
		1383	buffer [0] = w;
		1384	buffer [1] = h;
		1385	for (int i = 0; i < h; i++)
		1386	{
		1387	for (int j = 0; j < w; j++)
		1388	{
		1389	unsigned char pixel = row + j channels;
		1390	long value;
		1391
		1392	if (channels == 4)
		1393	value = pixel[3];
		1394	else
		1395	value = (unsigned char)0x00ff;
		1396
		1397	value = (value << 8) + pixel[0];
		1398	value = (value << 8) + pixel[1];
		1399	value = (value << 8) + pixel[2];
		1400	buffer[(i * w + j) + 2] = value;
		1401	}
		1402
		1403	row += rowstride;
		1404	}
		1405
		1406	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1407	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1408	free (buffer);
		1409	}
		1410	else
		1411	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1412
		1413	g_object_unref (pixbuf);
		1414	#endif
		1415	}
		1416
1304	/----------------------------------------------------------------------/	1417	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1418	/* Open and map the window */
1306	void	1419	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1420	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1421	{
1309	XClassHint classHint;	1422	XClassHint classHint;
1310	XWMHints wmHint;	1423	XWMHints wmHint;
…		…
1356	}	1469	}
1357	#endif	1470	#endif
1358		1471
1359	window_calc (0, 0);	1472	window_calc (0, 0);
1360		1473
1361	/* sub-window placement & size in rxvt_resize_subwindows () */	1474	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1362	attributes.background_pixel = pix_colors_focused [Color_border];	1475	attributes.background_pixel = pix_colors_focused [Color_border];
1363	attributes.border_pixel = pix_colors_focused [Color_border];	1476	attributes.border_pixel = pix_colors_focused [Color_border];
1364	attributes.colormap = cmap;	1477	attributes.colormap = cmap;
1365		1478
1366	top = XCreateWindow (dpy, parent,	1479	top = XCreateWindow (dpy, parent,
…		…
1369	ext_bwidth,	1482	ext_bwidth,
1370	depth, InputOutput, visual,	1483	depth, InputOutput, visual,
1371	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1484	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1372	&attributes);	1485	&attributes);
1373		1486
1374	this->parent[0] = top;	1487	this->parent = top;
1375		1488
1376	old_width = szHint.width;	1489	old_width = szHint.width;
1377	old_height = szHint.height;	1490	old_height = szHint.height;
1378		1491
1379	set_title (rs [Rs_title]);	1492	set_title (rs [Rs_title]);
…		…
1388	wmHint.window_group = top;	1501	wmHint.window_group = top;
1389		1502
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1503	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1504	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1505	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1506	/*
1395	* set up icon hint	1507	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1508	* rs [Rs_iconfile] is path to icon
1397	*/	1509	*/
1398		1510
1399	if (rs [Rs_iconfile])	1511	if (rs [Rs_iconfile])
1400	{	1512	{
1401	init_asv ();	1513	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	}	1514	}
1440	# endif
1441	#endif	1515	#endif
1442		1516
1443	#if ENABLE_FRILLS	1517	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1518	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1519	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1451	#if ENABLE_EWMH	1525	#if ENABLE_EWMH
1452	xa[XA_NET_WM_PING],	1526	xa[XA_NET_WM_PING],
1453	#endif	1527	#endif
1454	};	1528	};
1455		1529
1456	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1530	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457		1531
1458	#if ENABLE_FRILLS	1532	#if ENABLE_FRILLS
1459	if (rs[Rs_transient_for])	1533	if (rs[Rs_transient_for])
1460	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1534	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461	#endif	1535	#endif
…		…
1522	pix_colors = pix_colors_unfocused;	1596	pix_colors = pix_colors_unfocused;
1523	#endif	1597	#endif
1524		1598
1525	pointer_unblank ();	1599	pointer_unblank ();
1526	scr_recolour ();	1600	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] = 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	}	1601	}
1685		1602
1686	/----------------------------------------------------------------------/	1603	/----------------------------------------------------------------------/
1687	/*	1604	/*
1688	* Run the command in a subprocess and return a file descriptor for the	1605	* Run the command in a subprocess and return a file descriptor for the
…		…
1709	else	1626	else
1710	#endif	1627	#endif
1711	if (!pty->get ())	1628	if (!pty->get ())
1712	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1629	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1713		1630
1714	int er;	1631	struct termios tio = def_tio;
1715		1632
1716	#ifndef NO_BACKSPACE_KEY	1633	#ifndef NO_BACKSPACE_KEY
1717	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1634	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718	er = rs[Rs_backspace_key][0];	1635	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1719	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1636	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720	er = '\177'; /* the initial state anyway */	1637	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1721	else
1722	#endif	1638	#endif
1723	er = -1;
1724		1639
1725	rxvt_get_ttymode (&tio, er);
1726	/* init terminal attributes */	1640	/* init terminal attributes */
1727	cfsetospeed (&tio, BAUDRATE);	1641	cfsetospeed (&tio, BAUDRATE);
1728	cfsetispeed (&tio, BAUDRATE);	1642	cfsetispeed (&tio, BAUDRATE);
1729	tcsetattr (pty->tty, TCSANOW, &tio);	1643	tcsetattr (pty->tty, TCSANOW, &tio);
1730	pty->set_utf8_mode (enc_utf8);	1644	pty->set_utf8_mode (enc_utf8);
…		…
1817	signal (SIGQUIT, SIG_DFL);	1731	signal (SIGQUIT, SIG_DFL);
1818	signal (SIGCHLD, SIG_DFL);	1732	signal (SIGCHLD, SIG_DFL);
1819	signal (SIGHUP, SIG_DFL);	1733	signal (SIGHUP, SIG_DFL);
1820	signal (SIGPIPE, SIG_DFL);	1734	signal (SIGPIPE, SIG_DFL);
1821	/*	1735	/*
1822	* mimick login's behavior by disabling the job control signals	1736	* mimic login's behavior by disabling the job control signals
1823	* a shell that wants them can turn them back on	1737	* a shell that wants them can turn them back on
1824	*/	1738	*/
1825	#ifdef SIGTSTP	1739	#ifdef SIGTSTP
1826	signal (SIGTSTP, SIG_IGN);	1740	signal (SIGTSTP, SIG_IGN);
1827	signal (SIGTTIN, SIG_IGN);	1741	signal (SIGTTIN, SIG_IGN);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.269 by root, Tue Jun 15 10:33:47 2010 UTC vs. Revision 1.303 by sf-exg, Sat Dec 3 11:47:31 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.269 by root, Tue Jun 15 10:33:47 2010 UTC vs.
Revision 1.303 by sf-exg, Sat Dec 3 11:47:31 2011 UTC