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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.273 by sf-exg, Mon Jul 26 22:07:38 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)
…		…
605	rs[Rs_display_name] = ":0";	610	rs[Rs_display_name] = ":0";
606		611
607	get_options (r_argc, r_argv);	612	get_options (r_argc, r_argv);
608		613
609	if (!(display = displays.get (rs[Rs_display_name])))	614	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]);	615	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613	}
614		616
615	// using a local pointer decreases code size a lot	617	// using a local pointer decreases code size a lot
616	xa = display->xa;	618	xa = display->xa;
617		619
618	set (display);	620	set (display);
…		…
627		629
628	for (int i = NUM_RESOURCES; i--; )	630	for (int i = NUM_RESOURCES; i--; )
629	if (rs [i] == resval_undef)	631	if (rs [i] == resval_undef)
630	rs [i] = 0;	632	rs [i] = 0;
631		633
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	634	#if ENABLE_PERL
638	if (!rs[Rs_perl_ext_1])	635	if (!rs[Rs_perl_ext_1])
639	rs[Rs_perl_ext_1] = "default";	636	rs[Rs_perl_ext_1] = "default";
640		637
641	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	638	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
644	{	641	{
645	rxvt_perl.init (this);	642	rxvt_perl.init (this);
646	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	643	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647	}	644	}
648	#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 ();
649		650
650	/*	651	/*
651	* set any defaults not already set	652	* set any defaults not already set
652	*/	653	*/
653	if (cmd_argv && cmd_argv[0])	654	if (cmd_argv && cmd_argv[0])
…		…
789	if (chdir (path))	790	if (chdir (path))
790	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");
791	}	792	}
792		793
793	if (option (Opt_scrollBar))	794	if (option (Opt_scrollBar))
794	scrollBar.state = STATE_IDLE; /* set existence for size calculations */	795	scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795		796
796	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
797		808
798	create_windows (argc, argv);	809	create_windows (argc, argv);
799		810
800	init_xlocale ();	811	init_xlocale ();
801		812
…		…
807		818
808	if (option (Opt_scrollBar))	819	if (option (Opt_scrollBar))
809	scrollBar.resize (); /* create and map scrollbar */	820	scrollBar.resize (); /* create and map scrollbar */
810	#ifdef HAVE_BG_PIXMAP	821	#ifdef HAVE_BG_PIXMAP
811	{	822	{
812	bgPixmap.set_target (this);	823	bg_init ();
813	bgPixmap.invalidate ();
814		824
815	#ifdef ENABLE_TRANSPARENCY	825	#ifdef ENABLE_TRANSPARENCY
816	if (option (Opt_transparent))	826	if (option (Opt_transparent))
817	{	827	{
818	bgPixmap.set_transparent ();	828	bg_set_transparent ();
819		829
820	#ifdef HAVE_AFTERIMAGE
821	if (rs [Rs_blurradius])	830	if (rs [Rs_blurradius])
822	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	831	bg_set_blur (rs [Rs_blurradius]);
823	#endif	832
824	if (ISSET_PIXCOLOR (Color_tint))	833	if (ISSET_PIXCOLOR (Color_tint))
825	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	834	bg_set_tint (pix_colors_focused [Color_tint]);
826		835
827	if (rs [Rs_shade])	836	if (rs [Rs_shade])
828	bgPixmap.set_shade (rs [Rs_shade]);	837	bg_set_shade (rs [Rs_shade]);
829		838
830	bgPixmap.set_root_pixmap ();	839	bg_set_root_pixmap ();
831	XSelectInput (dpy, display->root, PropertyChangeMask);	840	XSelectInput (dpy, display->root, PropertyChangeMask);
832	rootwin_ev.start (display, display->root);	841	rootwin_ev.start (display, display->root);
833	}	842	}
834	#endif	843	#endif
835		844
836	#ifdef BG_IMAGE_FROM_FILE	845	#ifdef BG_IMAGE_FROM_FILE
837	if (rs[Rs_backgroundPixmap])	846	if (rs[Rs_backgroundPixmap])
838	{	847	{
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]))	848	if (bg_set_file (rs[Rs_backgroundPixmap]))
850	if (!bgPixmap.window_position_sensitive ())	849	if (!bg_window_position_sensitive ())
851	update_background ();	850	update_background ();
852	}	851	}
853	#endif	852	#endif
854	}	853	}
855	#endif	854	#endif
…		…
872	#if ENABLE_XEMBED	871	#if ENABLE_XEMBED
873	if (rs[Rs_embed])	872	if (rs[Rs_embed])
874	{	873	{
875	long info[2] = { 0, XEMBED_MAPPED };	874	long info[2] = { 0, XEMBED_MAPPED };
876		875
877	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	876	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878	32, PropModeReplace, (unsigned char *)&info, 2);	877	32, PropModeReplace, (unsigned char *)&info, 2);
879	}	878	}
880	#endif	879	#endif
881		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
882	XMapWindow (dpy, vt);	893	XMapWindow (dpy, vt);
883	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
884		907
885	refresh_check ();	908	refresh_check ();
886	}	909	}
887		910
888	/----------------------------------------------------------------------/	911	/----------------------------------------------------------------------/
889	void	912	void
890	rxvt_term::init_env ()	913	rxvt_term::init_env ()
891	{	914	{
892	int i;
893	char *val;	915	char *val;
894		916
895	#ifdef DISPLAY_IS_IP	917	#ifdef DISPLAY_IS_IP
896	/* Fixup display_name for export over pty to any interested terminal	918	/* 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	919	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
911	val = XDisplayString (dpy);	933	val = XDisplayString (dpy);
912		934
913	if (rs[Rs_display_name] == NULL)	935	if (rs[Rs_display_name] == NULL)
914	rs[Rs_display_name] = val; /* use broken `:0' value */	936	rs[Rs_display_name] = val; /* use broken `:0' value */
915		937
916	i = strlen (val);
917	env_display = (char *)rxvt_malloc (i + 9);	938	env_display = (char *)rxvt_malloc (strlen (val) + 9);
918		939
919	sprintf (env_display, "DISPLAY=%s", val);	940	sprintf (env_display, "DISPLAY=%s", val);
920		941
921	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	942	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922		943
923	/* add entries to the environment:	944	/* add entries to the environment:
924	* @ DISPLAY: in case we started with -display	945	* @ DISPLAY: in case we started with -display
925	* @ WINDOWID: X window id number of the window	946	* @ WINDOWID: X window id number of the window
926	* @ COLORTERM: terminal sub-name and also indicates its color	947	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
1279		1300
1280	if (i)	1301	if (i)
1281	ModMetaMask = modmasks[i - 1];	1302	ModMetaMask = modmasks[i - 1];
1282	}	1303	}
1283		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
1284	/----------------------------------------------------------------------/	1417	/----------------------------------------------------------------------/
1285	/* rxvt_Create_Windows () - Open and map the window */	1418	/* Open and map the window */
1286	void	1419	void
1287	rxvt_term::create_windows (int argc, const char const argv)	1420	rxvt_term::create_windows (int argc, const char const argv)
1288	{	1421	{
1289	XClassHint classHint;	1422	XClassHint classHint;
1290	XWMHints wmHint;	1423	XWMHints wmHint;
…		…
1336	}	1469	}
1337	#endif	1470	#endif
1338		1471
1339	window_calc (0, 0);	1472	window_calc (0, 0);
1340		1473
1341	/* sub-window placement & size in rxvt_resize_subwindows () */	1474	/* sub-window placement & size in rxvt_term::resize_all_windows () */
1342	attributes.background_pixel = pix_colors_focused [Color_border];	1475	attributes.background_pixel = pix_colors_focused [Color_border];
1343	attributes.border_pixel = pix_colors_focused [Color_border];	1476	attributes.border_pixel = pix_colors_focused [Color_border];
1344	attributes.colormap = cmap;	1477	attributes.colormap = cmap;
1345		1478
1346	top = XCreateWindow (dpy, parent,	1479	top = XCreateWindow (dpy, parent,
…		…
1349	ext_bwidth,	1482	ext_bwidth,
1350	depth, InputOutput, visual,	1483	depth, InputOutput, visual,
1351	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1484	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1352	&attributes);	1485	&attributes);
1353		1486
1354	this->parent[0] = top;	1487	this->parent = top;
1355		1488
1356	old_width = szHint.width;	1489	old_width = szHint.width;
1357	old_height = szHint.height;	1490	old_height = szHint.height;
1358		1491
1359	set_title (rs [Rs_title]);	1492	set_title (rs [Rs_title]);
…		…
1368	wmHint.window_group = top;	1501	wmHint.window_group = top;
1369		1502
1370	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1503	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1371	&szHint, &wmHint, &classHint);	1504	&szHint, &wmHint, &classHint);
1372	#if ENABLE_EWMH	1505	#if ENABLE_EWMH
1373	# ifdef HAVE_AFTERIMAGE
1374	/*	1506	/*
1375	* set up icon hint	1507	* set up icon hint
1376	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1508	* rs [Rs_iconfile] is path to icon
1377	*/	1509	*/
1378		1510
1379	if (rs [Rs_iconfile])	1511	if (rs [Rs_iconfile])
1380	{	1512	{
1381	init_asv ();	1513	set_icon (rs [Rs_iconfile]);
1382
1383	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1384	if (asv && im)
1385	{
1386	int w = im->width;
1387	int h = im->height;
1388	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
1389	ASImage *result = scale_asimage (asv, im,
1390	w, h, ASA_ARGB32,
1391	100, ASIMAGE_QUALITY_DEFAULT);
1392	destroy_asimage (&im);
1393
1394	if (buffer && result)
1395	{
1396	ARGB32 *asbuf = result->alt.argb32;
1397	buffer [0] = w;
1398	buffer [1] = h;
1399
1400	for (unsigned int i = 0; i < w * h; ++i)
1401	buffer [i + 2] = asbuf [i];
1402
1403	destroy_asimage (&result);
1404	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1405	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1406	free (buffer);
1407	}
1408	else
1409	{
1410	if (!buffer)
1411	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1412
1413	if (!result)
1414	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1415	}
1416	}
1417	else
1418	rxvt_warn ("Loading image icon failed, continuing without.\n");
1419	}	1514	}
1420	# endif
1421	#endif	1515	#endif
1422		1516
1423	#if ENABLE_FRILLS	1517	#if ENABLE_FRILLS
1424	if (mwmhints.flags)	1518	if (mwmhints.flags)
1425	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,
…		…
1431	#if ENABLE_EWMH	1525	#if ENABLE_EWMH
1432	xa[XA_NET_WM_PING],	1526	xa[XA_NET_WM_PING],
1433	#endif	1527	#endif
1434	};	1528	};
1435		1529
1436	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1530	XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1437		1531
1438	#if ENABLE_FRILLS	1532	#if ENABLE_FRILLS
1439	if (rs[Rs_transient_for])	1533	if (rs[Rs_transient_for])
1440	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1534	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1441	#endif	1535	#endif
…		…
1502	pix_colors = pix_colors_unfocused;	1596	pix_colors = pix_colors_unfocused;
1503	#endif	1597	#endif
1504		1598
1505	pointer_unblank ();	1599	pointer_unblank ();
1506	scr_recolour ();	1600	scr_recolour ();
1507	}
1508
1509	/* ------------------------------------------------------------------------- *
1510	* GET TTY CURRENT STATE *
1511	* ------------------------------------------------------------------------- */
1512	static void
1513	rxvt_get_ttymode (struct termios *tio)
1514	{
1515	/*
1516	* standard System V termios interface
1517	*/
1518	// does not work as stdin is not a tty
1519	// if (tcgetattr (STDIN_FILENO, tio) < 0)
1520	if (1)
1521	{
1522	// return error - use system defaults,
1523	// where possible, and zero elsewhere
1524	memset (tio, 0, sizeof (struct termios));
1525	if (VDISABLE)
1526	for (int i = 0; i < NCCS; i++)
1527	tio->c_cc[i] = VDISABLE;
1528
1529	tio->c_cc[VINTR] = CINTR;
1530	tio->c_cc[VQUIT] = CQUIT;
1531	tio->c_cc[VERASE] = CERASE;
1532	#ifdef VERASE2
1533	tio->c_cc[VERASE2] = CERASE2;
1534	#endif
1535	tio->c_cc[VKILL] = CKILL;
1536	tio->c_cc[VSTART] = CSTART;
1537	tio->c_cc[VSTOP] = CSTOP;
1538	tio->c_cc[VSUSP] = CSUSP;
1539	# ifdef VDSUSP
1540	tio->c_cc[VDSUSP] = CDSUSP;
1541	# endif
1542	# ifdef VREPRINT
1543	tio->c_cc[VREPRINT] = CRPRNT;
1544	# endif
1545	# ifdef VDISCRD
1546	tio->c_cc[VDISCRD] = CFLUSH;
1547	# endif
1548	# ifdef VWERSE
1549	tio->c_cc[VWERSE] = CWERASE;
1550	# endif
1551	# ifdef VLNEXT
1552	tio->c_cc[VLNEXT] = CLNEXT;
1553	# endif
1554	}
1555
1556	tio->c_cc[VEOF] = CEOF;
1557	# if VMIN != VEOF
1558	tio->c_cc[VMIN] = 1;
1559	# endif
1560	# if VTIME != VEOL
1561	tio->c_cc[VTIME] = 0;
1562	# endif
1563
1564	/* input modes */
1565	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1566	# ifdef IMAXBEL
1567	\| IMAXBEL
1568	# endif
1569	\| IXON);
1570
1571	/* output modes */
1572	tio->c_oflag = (OPOST \| ONLCR);
1573
1574	/* control modes */
1575	tio->c_cflag = (CS8 \| CREAD);
1576
1577	/* line discipline modes */
1578	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1579	# if defined (ECHOCTL) && defined (ECHOKE)
1580	\| ECHOCTL \| ECHOKE
1581	# endif
1582	\| ECHOE \| ECHOK);
1583
1584	/*
1585	* Debugging
1586	*/
1587	#ifdef DEBUG_TTYMODE
1588	/* c_iflag bits */
1589	fprintf (stderr, "Input flags\n");
1590
1591	/* cpp token stringize doesn't work on all machines <sigh> */
1592	# define FOO(flag,name) \
1593	if ((tio->c_iflag) & flag) \
1594	fprintf (stderr, "%s ", name)
1595
1596	/* c_iflag bits */
1597	FOO (IGNBRK, "IGNBRK");
1598	FOO (BRKINT, "BRKINT");
1599	FOO (IGNPAR, "IGNPAR");
1600	FOO (PARMRK, "PARMRK");
1601	FOO (INPCK, "INPCK");
1602	FOO (ISTRIP, "ISTRIP");
1603	FOO (INLCR, "INLCR");
1604	FOO (IGNCR, "IGNCR");
1605	FOO (ICRNL, "ICRNL");
1606	FOO (IXON, "IXON");
1607	FOO (IXOFF, "IXOFF");
1608	# ifdef IUCLC
1609	FOO (IUCLC, "IUCLC");
1610	# endif
1611	# ifdef IXANY
1612	FOO (IXANY, "IXANY");
1613	# endif
1614	# ifdef IMAXBEL
1615	FOO (IMAXBEL, "IMAXBEL");
1616	# endif
1617
1618	fprintf (stderr, "\n");
1619
1620	# undef FOO
1621	# define FOO(entry, name) \
1622	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1623
1624	FOO (VINTR, "VINTR");
1625	FOO (VQUIT, "VQUIT");
1626	FOO (VERASE, "VERASE");
1627	FOO (VKILL, "VKILL");
1628	FOO (VEOF, "VEOF");
1629	FOO (VEOL, "VEOL");
1630	# ifdef VEOL2
1631	FOO (VEOL2, "VEOL2");
1632	# endif
1633	# ifdef VSWTC
1634	FOO (VSWTC, "VSWTC");
1635	# endif
1636	# ifdef VSWTCH
1637	FOO (VSWTCH, "VSWTCH");
1638	# endif
1639	FOO (VSTART, "VSTART");
1640	FOO (VSTOP, "VSTOP");
1641	FOO (VSUSP, "VSUSP");
1642	# ifdef VDSUSP
1643	FOO (VDSUSP, "VDSUSP");
1644	# endif
1645	# ifdef VREPRINT
1646	FOO (VREPRINT, "VREPRINT");
1647	# endif
1648	# ifdef VDISCRD
1649	FOO (VDISCRD, "VDISCRD");
1650	# endif
1651	# ifdef VWERSE
1652	FOO (VWERSE, "VWERSE");
1653	# endif
1654	# ifdef VLNEXT
1655	FOO (VLNEXT, "VLNEXT");
1656	# endif
1657
1658	fprintf (stderr, "\n");
1659	# undef FOO
1660	#endif /* DEBUG_TTYMODE */
1661	}	1601	}
1662		1602
1663	/----------------------------------------------------------------------/	1603	/----------------------------------------------------------------------/
1664	/*	1604	/*
1665	* 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
…		…
1686	else	1626	else
1687	#endif	1627	#endif
1688	if (!pty->get ())	1628	if (!pty->get ())
1689	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1629	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1690		1630
1691	rxvt_get_ttymode (&tio);	1631	struct termios tio = def_tio;
1692		1632
1693	#ifndef NO_BACKSPACE_KEY	1633	#ifndef NO_BACKSPACE_KEY
1694	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1634	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1695	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];	1635	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1696	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1636	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.273 by sf-exg, Mon Jul 26 22:07:38 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.273 by sf-exg, Mon Jul 26 22:07:38 2010 UTC vs.
Revision 1.303 by sf-exg, Sat Dec 3 11:47:31 2011 UTC