[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.294 by sf-exg, Thu Apr 7 12:19:40 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.
…		…
143		143
144	return rval;	144	return rval;
145	}	145	}
146	#endif	146	#endif
147		147
148	const char *const def_colorName[] =	148	static const char *const def_colorName[] =
149	{	149	{
150	COLOR_FOREGROUND,	150	COLOR_FOREGROUND,
151	COLOR_BACKGROUND,	151	COLOR_BACKGROUND,
152	/* low-intensity colors */	152	/* low-intensity colors */
153	"rgb:00/00/00", // 0: black (Black)	153	"rgb:00/00/00", // 0: black (Black)
…		…
558	set_option (Opt_iso14755);	558	set_option (Opt_iso14755);
559	set_option (Opt_iso14755_52);	559	set_option (Opt_iso14755_52);
560	set_option (Opt_buffered);	560	set_option (Opt_buffered);
561	}	561	}
562		562
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	/----------------------------------------------------------------------/	563	/----------------------------------------------------------------------/
582	const char **	564	const char **
583	rxvt_term::init_resources (int argc, const char const argv)	565	rxvt_term::init_resources (int argc, const char const argv)
584	{	566	{
585	int i, r_argc;	567	int i, r_argc;
…		…
648	rs [i] = 0;	630	rs [i] = 0;
649		631
650	#ifdef HAVE_AFTERIMAGE	632	#ifdef HAVE_AFTERIMAGE
651	set_application_name ((char *)rs[Rs_name]);	633	set_application_name ((char *)rs[Rs_name]);
652	set_output_threshold (OUTPUT_LEVEL_WARNING);	634	set_output_threshold (OUTPUT_LEVEL_WARNING);
		635	#endif
		636
		637	#ifdef HAVE_PIXBUF
		638	g_type_init ();
653	#endif	639	#endif
654		640
655	#if ENABLE_PERL	641	#if ENABLE_PERL
656	if (!rs[Rs_perl_ext_1])	642	if (!rs[Rs_perl_ext_1])
657	rs[Rs_perl_ext_1] = "default";	643	rs[Rs_perl_ext_1] = "default";
…		…
790	set_locale ("");	776	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	777	set_environ (envv); // a few things in X do not call setlocale :(
792		778
793	init_vars ();	779	init_vars ();
794		780
795	init_secondary ();
796
797	const char **cmd_argv = init_resources (argc, argv);	781	const char **cmd_argv = init_resources (argc, argv);
798		782
799	#ifdef KEYSYM_RESOURCE	783	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	784	keyboard->register_done ();
801	#endif	785	#endif
…		…
827		811
828	if (option (Opt_scrollBar))	812	if (option (Opt_scrollBar))
829	scrollBar.resize (); /* create and map scrollbar */	813	scrollBar.resize (); /* create and map scrollbar */
830	#ifdef HAVE_BG_PIXMAP	814	#ifdef HAVE_BG_PIXMAP
831	{	815	{
832	bgPixmap.set_target (this);	816	bg_init ();
833	bgPixmap.invalidate ();
834		817
835	#ifdef ENABLE_TRANSPARENCY	818	#ifdef ENABLE_TRANSPARENCY
836	if (option (Opt_transparent))	819	if (option (Opt_transparent))
837	{	820	{
838	bgPixmap.set_transparent ();	821	bg_set_transparent ();
839		822
840	#ifdef HAVE_AFTERIMAGE
841	if (rs [Rs_blurradius])	823	if (rs [Rs_blurradius])
842	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	824	bg_set_blur (rs [Rs_blurradius]);
843	#endif	825
844	if (ISSET_PIXCOLOR (Color_tint))	826	if (ISSET_PIXCOLOR (Color_tint))
845	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	827	bg_set_tint (pix_colors_focused [Color_tint]);
846		828
847	if (rs [Rs_shade])	829	if (rs [Rs_shade])
848	bgPixmap.set_shade (rs [Rs_shade]);	830	bg_set_shade (rs [Rs_shade]);
849		831
850	bgPixmap.set_root_pixmap ();	832	bg_set_root_pixmap ();
851	XSelectInput (dpy, display->root, PropertyChangeMask);	833	XSelectInput (dpy, display->root, PropertyChangeMask);
852	rootwin_ev.start (display, display->root);	834	rootwin_ev.start (display, display->root);
853	}	835	}
854	#endif	836	#endif
855		837
…		…
859	const char *p = rs[Rs_backgroundPixmap];	841	const char *p = rs[Rs_backgroundPixmap];
860		842
861	if ((p = strchr (p, ';')) != 0)	843	if ((p = strchr (p, ';')) != 0)
862	{	844	{
863	p++;	845	p++;
864	bgPixmap.set_geometry (p);	846	bg_set_geometry (p);
865	}	847	}
866	else	848	else
867	bgPixmap.set_defaultGeometry ();	849	bg_set_default_geometry ();
868		850
869	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))	851	if (bg_set_file (rs[Rs_backgroundPixmap]))
870	if (!bgPixmap.window_position_sensitive ())	852	if (!bg_window_position_sensitive ())
871	update_background ();	853	update_background ();
872	}	854	}
873	#endif	855	#endif
874	}	856	}
875	#endif	857	#endif
…		…
892	#if ENABLE_XEMBED	874	#if ENABLE_XEMBED
893	if (rs[Rs_embed])	875	if (rs[Rs_embed])
894	{	876	{
895	long info[2] = { 0, XEMBED_MAPPED };	877	long info[2] = { 0, XEMBED_MAPPED };
896		878
897	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	879	XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898	32, PropModeReplace, (unsigned char *)&info, 2);	880	32, PropModeReplace, (unsigned char *)&info, 2);
899	}	881	}
900	#endif	882	#endif
901		883
902	XMapWindow (dpy, vt);	884	XMapWindow (dpy, vt);
903	XMapWindow (dpy, parent[0]);	885	XMapWindow (dpy, parent);
904		886
905	refresh_check ();	887	refresh_check ();
906	}	888	}
907		889
908	/----------------------------------------------------------------------/	890	/----------------------------------------------------------------------/
909	void	891	void
910	rxvt_term::init_env ()	892	rxvt_term::init_env ()
911	{	893	{
912	int i;
913	char *val;	894	char *val;
914		895
915	#ifdef DISPLAY_IS_IP	896	#ifdef DISPLAY_IS_IP
916	/* Fixup display_name for export over pty to any interested terminal	897	/* 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	898	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
931	val = XDisplayString (dpy);	912	val = XDisplayString (dpy);
932		913
933	if (rs[Rs_display_name] == NULL)	914	if (rs[Rs_display_name] == NULL)
934	rs[Rs_display_name] = val; /* use broken `:0' value */	915	rs[Rs_display_name] = val; /* use broken `:0' value */
935		916
936	i = strlen (val);
937	env_display = (char *)rxvt_malloc (i + 9);	917	env_display = (char *)rxvt_malloc (strlen (val) + 9);
938		918
939	sprintf (env_display, "DISPLAY=%s", val);	919	sprintf (env_display, "DISPLAY=%s", val);
940		920
941	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	921	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942		922
943	/* add entries to the environment:	923	/* add entries to the environment:
944	* @ DISPLAY: in case we started with -display	924	* @ DISPLAY: in case we started with -display
945	* @ WINDOWID: X window id number of the window	925	* @ WINDOWID: X window id number of the window
946	* @ COLORTERM: terminal sub-name and also indicates its color	926	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
1299		1279
1300	if (i)	1280	if (i)
1301	ModMetaMask = modmasks[i - 1];	1281	ModMetaMask = modmasks[i - 1];
1302	}	1282	}
1303		1283
		1284	void
		1285	rxvt_term::set_icon (const char *file)
		1286	{
		1287	#ifdef HAVE_AFTERIMAGE
		1288	init_asv ();
		1289
		1290	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1291	if (!im)
		1292	{
		1293	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1294	return;
		1295	}
		1296
		1297	unsigned int w = im->width;
		1298	unsigned int h = im->height;
		1299
		1300	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1301	{
		1302	rxvt_warn ("Icon image too big, continuing without.\n");
		1303	destroy_asimage (&im);
		1304	return;
		1305	}
		1306
		1307	ASImage *result = scale_asimage (asv, im,
		1308	w, h, ASA_ARGB32,
		1309	100, ASIMAGE_QUALITY_DEFAULT);
		1310	destroy_asimage (&im);
		1311
		1312	if (!result)
		1313	{
		1314	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1315	return;
		1316	}
		1317
		1318	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1319	if (buffer)
		1320	{
		1321	ARGB32 *asbuf = result->alt.argb32;
		1322	buffer [0] = w;
		1323	buffer [1] = h;
		1324
		1325	for (unsigned int i = 0; i < w * h; ++i)
		1326	buffer [i + 2] = asbuf [i];
		1327
		1328	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1329	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1330	free (buffer);
		1331	}
		1332	else
		1333	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1334
		1335	destroy_asimage (&result);
		1336	#endif
		1337
		1338	#ifdef HAVE_PIXBUF
		1339	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1340	if (!pixbuf)
		1341	{
		1342	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1343	return;
		1344	}
		1345
		1346	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1347	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1348
		1349	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1350	{
		1351	rxvt_warn ("Icon image too big, continuing without.\n");
		1352	g_object_unref (pixbuf);
		1353	return;
		1354	}
		1355
		1356	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1357	{
		1358	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1359	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1360	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1361
		1362	buffer [0] = w;
		1363	buffer [1] = h;
		1364	for (int i = 0; i < h; i++)
		1365	{
		1366	for (int j = 0; j < w; j++)
		1367	{
		1368	unsigned char pixel = row + j channels;
		1369	long value;
		1370
		1371	if (channels == 4)
		1372	value = pixel[3];
		1373	else
		1374	value = (unsigned char)0x00ff;
		1375
		1376	value = (value << 8) + pixel[0];
		1377	value = (value << 8) + pixel[1];
		1378	value = (value << 8) + pixel[2];
		1379	buffer[(i * w + j) + 2] = value;
		1380	}
		1381
		1382	row += rowstride;
		1383	}
		1384
		1385	XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1386	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1387	free (buffer);
		1388	}
		1389	else
		1390	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1391
		1392	g_object_unref (pixbuf);
		1393	#endif
		1394	}
		1395
1304	/----------------------------------------------------------------------/	1396	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1397	/* rxvt_Create_Windows () - Open and map the window */
1306	void	1398	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1399	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1400	{
…		…
1369	ext_bwidth,	1461	ext_bwidth,
1370	depth, InputOutput, visual,	1462	depth, InputOutput, visual,
1371	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1463	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1372	&attributes);	1464	&attributes);
1373		1465
1374	this->parent[0] = top;	1466	this->parent = top;
1375		1467
1376	old_width = szHint.width;	1468	old_width = szHint.width;
1377	old_height = szHint.height;	1469	old_height = szHint.height;
1378		1470
1379	set_title (rs [Rs_title]);	1471	set_title (rs [Rs_title]);
…		…
1388	wmHint.window_group = top;	1480	wmHint.window_group = top;
1389		1481
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1482	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1483	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1484	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1485	/*
1395	* set up icon hint	1486	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1487	* rs [Rs_iconfile] is path to icon
1397	*/	1488	*/
1398		1489
1399	if (rs [Rs_iconfile])	1490	if (rs [Rs_iconfile])
1400	{	1491	{
1401	init_asv ();	1492	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	}	1493	}
1440	# endif
1441	#endif	1494	#endif
1442		1495
1443	#if ENABLE_FRILLS	1496	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1497	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1498	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1451	#if ENABLE_EWMH	1504	#if ENABLE_EWMH
1452	xa[XA_NET_WM_PING],	1505	xa[XA_NET_WM_PING],
1453	#endif	1506	#endif
1454	};	1507	};
1455		1508
1456	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1509	XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1457		1510
1458	#if ENABLE_FRILLS	1511	#if ENABLE_FRILLS
1459	if (rs[Rs_transient_for])	1512	if (rs[Rs_transient_for])
1460	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1513	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461	#endif	1514	#endif
…		…
1522	pix_colors = pix_colors_unfocused;	1575	pix_colors = pix_colors_unfocused;
1523	#endif	1576	#endif
1524		1577
1525	pointer_unblank ();	1578	pointer_unblank ();
1526	scr_recolour ();	1579	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	}	1580	}
1685		1581
1686	/----------------------------------------------------------------------/	1582	/----------------------------------------------------------------------/
1687	/*	1583	/*
1688	* Run the command in a subprocess and return a file descriptor for the	1584	* Run the command in a subprocess and return a file descriptor for the
…		…
1709	else	1605	else
1710	#endif	1606	#endif
1711	if (!pty->get ())	1607	if (!pty->get ())
1712	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1608	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1713		1609
1714	int er;	1610	struct termios tio = def_tio;
1715		1611
1716	#ifndef NO_BACKSPACE_KEY	1612	#ifndef NO_BACKSPACE_KEY
1717	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1613	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718	er = rs[Rs_backspace_key][0];	1614	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1719	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1615	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720	er = '\177'; /* the initial state anyway */	1616	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1721	else
1722	#endif	1617	#endif
1723	er = -1;
1724		1618
1725	rxvt_get_ttymode (&tio, er);
1726	/* init terminal attributes */	1619	/* init terminal attributes */
1727	cfsetospeed (&tio, BAUDRATE);	1620	cfsetospeed (&tio, BAUDRATE);
1728	cfsetispeed (&tio, BAUDRATE);	1621	cfsetispeed (&tio, BAUDRATE);
1729	tcsetattr (pty->tty, TCSANOW, &tio);	1622	tcsetattr (pty->tty, TCSANOW, &tio);
1730	pty->set_utf8_mode (enc_utf8);	1623	pty->set_utf8_mode (enc_utf8);
…		…
1817	signal (SIGQUIT, SIG_DFL);	1710	signal (SIGQUIT, SIG_DFL);
1818	signal (SIGCHLD, SIG_DFL);	1711	signal (SIGCHLD, SIG_DFL);
1819	signal (SIGHUP, SIG_DFL);	1712	signal (SIGHUP, SIG_DFL);
1820	signal (SIGPIPE, SIG_DFL);	1713	signal (SIGPIPE, SIG_DFL);
1821	/*	1714	/*
1822	* mimick login's behavior by disabling the job control signals	1715	* mimic login's behavior by disabling the job control signals
1823	* a shell that wants them can turn them back on	1716	* a shell that wants them can turn them back on
1824	*/	1717	*/
1825	#ifdef SIGTSTP	1718	#ifdef SIGTSTP
1826	signal (SIGTSTP, SIG_IGN);	1719	signal (SIGTSTP, SIG_IGN);
1827	signal (SIGTTIN, SIG_IGN);	1720	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.294 by sf-exg, Thu Apr 7 12:19:40 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.294 by sf-exg, Thu Apr 7 12:19:40 2011 UTC