[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.289 by root, Mon Jan 3 03:05:47 2011 UTC

…		…
60	#ifdef DISPLAY_IS_IP	60	#ifdef DISPLAY_IS_IP
61	/* On Solaris link with -lsocket and -lnsl */	61	/* On Solaris link with -lsocket and -lnsl */
62	#include <sys/types.h>	62	#include <sys/types.h>
63	#include <sys/socket.h>	63	#include <sys/socket.h>
64		64
65	/* these next two are probably only on Sun (not Solaris) */	65	/* these next is probably only on Sun (not Solaris) */
66	#ifdef HAVE_SYS_SOCKIO_H	66	#ifdef HAVE_SYS_SOCKIO_H
67	#include <sys/sockio.h>	67	#include <sys/sockio.h>
68	#endif
69	#ifdef HAVE_SYS_BYTEORDER_H
70	#include <sys/byteorder.h>
71	#endif	68	#endif
72		69
73	#include <netinet/in.h>	70	#include <netinet/in.h>
74	#include <arpa/inet.h>	71	#include <arpa/inet.h>
75	#include <net/if.h>	72	#include <net/if.h>
…		…
143		140
144	return rval;	141	return rval;
145	}	142	}
146	#endif	143	#endif
147		144
148	const char *const def_colorName[] =	145	static const char *const def_colorName[] =
149	{	146	{
150	COLOR_FOREGROUND,	147	COLOR_FOREGROUND,
151	COLOR_BACKGROUND,	148	COLOR_BACKGROUND,
152	/* low-intensity colors */	149	/* low-intensity colors */
153	"rgb:00/00/00", // 0: black (Black)	150	"rgb:00/00/00", // 0: black (Black)
…		…
632	#ifdef HAVE_AFTERIMAGE	629	#ifdef HAVE_AFTERIMAGE
633	set_application_name ((char *)rs[Rs_name]);	630	set_application_name ((char *)rs[Rs_name]);
634	set_output_threshold (OUTPUT_LEVEL_WARNING);	631	set_output_threshold (OUTPUT_LEVEL_WARNING);
635	#endif	632	#endif
636		633
		634	#ifdef HAVE_PIXBUF
		635	g_type_init ();
		636	#endif
		637
637	#if ENABLE_PERL	638	#if ENABLE_PERL
638	if (!rs[Rs_perl_ext_1])	639	if (!rs[Rs_perl_ext_1])
639	rs[Rs_perl_ext_1] = "default";	640	rs[Rs_perl_ext_1] = "default";
640		641
641	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	642	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
…		…
815	#ifdef ENABLE_TRANSPARENCY	816	#ifdef ENABLE_TRANSPARENCY
816	if (option (Opt_transparent))	817	if (option (Opt_transparent))
817	{	818	{
818	bgPixmap.set_transparent ();	819	bgPixmap.set_transparent ();
819		820
820	#ifdef HAVE_AFTERIMAGE
821	if (rs [Rs_blurradius])	821	if (rs [Rs_blurradius])
822	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	822	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823	#endif	823
824	if (ISSET_PIXCOLOR (Color_tint))	824	if (ISSET_PIXCOLOR (Color_tint))
825	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	825	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826		826
827	if (rs [Rs_shade])	827	if (rs [Rs_shade])
828	bgPixmap.set_shade (rs [Rs_shade]);	828	bgPixmap.set_shade (rs [Rs_shade]);
…		…
887		887
888	/----------------------------------------------------------------------/	888	/----------------------------------------------------------------------/
889	void	889	void
890	rxvt_term::init_env ()	890	rxvt_term::init_env ()
891	{	891	{
892	int i;
893	char *val;	892	char *val;
894		893
895	#ifdef DISPLAY_IS_IP	894	#ifdef DISPLAY_IS_IP
896	/* Fixup display_name for export over pty to any interested terminal	895	/* 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	896	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
911	val = XDisplayString (dpy);	910	val = XDisplayString (dpy);
912		911
913	if (rs[Rs_display_name] == NULL)	912	if (rs[Rs_display_name] == NULL)
914	rs[Rs_display_name] = val; /* use broken `:0' value */	913	rs[Rs_display_name] = val; /* use broken `:0' value */
915		914
916	i = strlen (val);
917	env_display = (char *)rxvt_malloc (i + 9);	915	env_display = (char *)rxvt_malloc (strlen (val) + 9);
918		916
919	sprintf (env_display, "DISPLAY=%s", val);	917	sprintf (env_display, "DISPLAY=%s", val);
920		918
921	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	919	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
922		920
…		…
1279		1277
1280	if (i)	1278	if (i)
1281	ModMetaMask = modmasks[i - 1];	1279	ModMetaMask = modmasks[i - 1];
1282	}	1280	}
1283		1281
		1282	void
		1283	rxvt_term::set_icon (const char *file)
		1284	{
		1285	#ifdef HAVE_AFTERIMAGE
		1286	init_asv ();
		1287
		1288	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1289	if (!im)
		1290	{
		1291	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1292	return;
		1293	}
		1294
		1295	unsigned int w = im->width;
		1296	unsigned int h = im->height;
		1297
		1298	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1299	{
		1300	rxvt_warn ("Icon image too big, continuing without.\n");
		1301	destroy_asimage (&im);
		1302	return;
		1303	}
		1304
		1305	ASImage *result = scale_asimage (asv, im,
		1306	w, h, ASA_ARGB32,
		1307	100, ASIMAGE_QUALITY_DEFAULT);
		1308	destroy_asimage (&im);
		1309
		1310	if (!result)
		1311	{
		1312	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1313	return;
		1314	}
		1315
		1316	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1317	if (buffer)
		1318	{
		1319	ARGB32 *asbuf = result->alt.argb32;
		1320	buffer [0] = w;
		1321	buffer [1] = h;
		1322
		1323	for (unsigned int i = 0; i < w * h; ++i)
		1324	buffer [i + 2] = asbuf [i];
		1325
		1326	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1327	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1328	free (buffer);
		1329	}
		1330	else
		1331	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1332
		1333	destroy_asimage (&result);
		1334	#endif
		1335
		1336	#ifdef HAVE_PIXBUF
		1337	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1338	if (!pixbuf)
		1339	{
		1340	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1341	return;
		1342	}
		1343
		1344	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1345	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1346
		1347	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1348	{
		1349	rxvt_warn ("Icon image too big, continuing without.\n");
		1350	g_object_unref (pixbuf);
		1351	return;
		1352	}
		1353
		1354	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1355	{
		1356	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1357	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1358	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1359
		1360	buffer [0] = w;
		1361	buffer [1] = h;
		1362	for (int i = 0; i < h; i++)
		1363	{
		1364	for (int j = 0; j < w; j++)
		1365	{
		1366	unsigned char pixel = row + j channels;
		1367	long value;
		1368
		1369	if (channels == 4)
		1370	value = pixel[3];
		1371	else
		1372	value = (unsigned char)0x00ff;
		1373
		1374	value = (value << 8) + pixel[0];
		1375	value = (value << 8) + pixel[1];
		1376	value = (value << 8) + pixel[2];
		1377	buffer[(i * w + j) + 2] = value;
		1378	}
		1379
		1380	row += rowstride;
		1381	}
		1382
		1383	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1384	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1385	free (buffer);
		1386	}
		1387	else
		1388	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1389
		1390	g_object_unref (pixbuf);
		1391	#endif
		1392	}
		1393
1284	/----------------------------------------------------------------------/	1394	/----------------------------------------------------------------------/
1285	/* rxvt_Create_Windows () - Open and map the window */	1395	/* rxvt_Create_Windows () - Open and map the window */
1286	void	1396	void
1287	rxvt_term::create_windows (int argc, const char const argv)	1397	rxvt_term::create_windows (int argc, const char const argv)
1288	{	1398	{
…		…
1368	wmHint.window_group = top;	1478	wmHint.window_group = top;
1369		1479
1370	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1480	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1371	&szHint, &wmHint, &classHint);	1481	&szHint, &wmHint, &classHint);
1372	#if ENABLE_EWMH	1482	#if ENABLE_EWMH
1373	# ifdef HAVE_AFTERIMAGE
1374	/*	1483	/*
1375	* set up icon hint	1484	* set up icon hint
1376	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1485	* rs [Rs_iconfile] is path to icon
1377	*/	1486	*/
1378		1487
1379	if (rs [Rs_iconfile])	1488	if (rs [Rs_iconfile])
1380	{	1489	{
1381	init_asv ();	1490	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	}	1491	}
1420	# endif
1421	#endif	1492	#endif
1422		1493
1423	#if ENABLE_FRILLS	1494	#if ENABLE_FRILLS
1424	if (mwmhints.flags)	1495	if (mwmhints.flags)
1425	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1496	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1431	#if ENABLE_EWMH	1502	#if ENABLE_EWMH
1432	xa[XA_NET_WM_PING],	1503	xa[XA_NET_WM_PING],
1433	#endif	1504	#endif
1434	};	1505	};
1435		1506
1436	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1507	XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1437		1508
1438	#if ENABLE_FRILLS	1509	#if ENABLE_FRILLS
1439	if (rs[Rs_transient_for])	1510	if (rs[Rs_transient_for])
1440	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1511	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1441	#endif	1512	#endif
…		…
1502	pix_colors = pix_colors_unfocused;	1573	pix_colors = pix_colors_unfocused;
1503	#endif	1574	#endif
1504		1575
1505	pointer_unblank ();	1576	pointer_unblank ();
1506	scr_recolour ();	1577	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	}	1578	}
1662		1579
1663	/----------------------------------------------------------------------/	1580	/----------------------------------------------------------------------/
1664	/*	1581	/*
1665	* Run the command in a subprocess and return a file descriptor for the	1582	* Run the command in a subprocess and return a file descriptor for the
…		…
1686	else	1603	else
1687	#endif	1604	#endif
1688	if (!pty->get ())	1605	if (!pty->get ())
1689	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1606	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1690		1607
1691	rxvt_get_ttymode (&tio);	1608	struct termios tio = def_tio;
1692		1609
1693	#ifndef NO_BACKSPACE_KEY	1610	#ifndef NO_BACKSPACE_KEY
1694	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1611	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1695	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];	1612	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1696	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1613	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.289 by root, Mon Jan 3 03:05:47 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.289 by root, Mon Jan 3 03:05:47 2011 UTC