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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.270 by sf-exg, Tue Jun 15 13:34:52 2010 UTC vs.
Revision 1.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC

…		…
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 ();
		639	gdk_pixbuf_xlib_init (dpy, display->screen);
653	#endif	640	#endif
654		641
655	#if ENABLE_PERL	642	#if ENABLE_PERL
656	if (!rs[Rs_perl_ext_1])	643	if (!rs[Rs_perl_ext_1])
657	rs[Rs_perl_ext_1] = "default";	644	rs[Rs_perl_ext_1] = "default";
…		…
790	set_locale ("");	777	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	778	set_environ (envv); // a few things in X do not call setlocale :(
792		779
793	init_vars ();	780	init_vars ();
794		781
795	init_secondary ();
796
797	const char **cmd_argv = init_resources (argc, argv);	782	const char **cmd_argv = init_resources (argc, argv);
798		783
799	#ifdef KEYSYM_RESOURCE	784	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	785	keyboard->register_done ();
801	#endif	786	#endif
…		…
835	#ifdef ENABLE_TRANSPARENCY	820	#ifdef ENABLE_TRANSPARENCY
836	if (option (Opt_transparent))	821	if (option (Opt_transparent))
837	{	822	{
838	bgPixmap.set_transparent ();	823	bgPixmap.set_transparent ();
839		824
840	#ifdef HAVE_AFTERIMAGE
841	if (rs [Rs_blurradius])	825	if (rs [Rs_blurradius])
842	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	826	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843	#endif	827
844	if (ISSET_PIXCOLOR (Color_tint))	828	if (ISSET_PIXCOLOR (Color_tint))
845	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	829	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846		830
847	if (rs [Rs_shade])	831	if (rs [Rs_shade])
848	bgPixmap.set_shade (rs [Rs_shade]);	832	bgPixmap.set_shade (rs [Rs_shade]);
…		…
1299		1283
1300	if (i)	1284	if (i)
1301	ModMetaMask = modmasks[i - 1];	1285	ModMetaMask = modmasks[i - 1];
1302	}	1286	}
1303		1287
		1288	void
		1289	rxvt_term::set_icon (const char *file)
		1290	{
		1291	#ifdef HAVE_AFTERIMAGE
		1292	init_asv ();
		1293
		1294	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1295	if (!im)
		1296	{
		1297	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1298	return;
		1299	}
		1300
		1301	unsigned int w = im->width;
		1302	unsigned int h = im->height;
		1303
		1304	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1305	{
		1306	rxvt_warn ("Icon image too big, continuing without.\n");
		1307	destroy_asimage (&im);
		1308	return;
		1309	}
		1310
		1311	ASImage *result = scale_asimage (asv, im,
		1312	w, h, ASA_ARGB32,
		1313	100, ASIMAGE_QUALITY_DEFAULT);
		1314	destroy_asimage (&im);
		1315
		1316	if (!result)
		1317	{
		1318	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1319	return;
		1320	}
		1321
		1322	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1323	if (buffer)
		1324	{
		1325	ARGB32 *asbuf = result->alt.argb32;
		1326	buffer [0] = w;
		1327	buffer [1] = h;
		1328
		1329	for (unsigned int i = 0; i < w * h; ++i)
		1330	buffer [i + 2] = asbuf [i];
		1331
		1332	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1333	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1334	free (buffer);
		1335	}
		1336	else
		1337	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1338
		1339	destroy_asimage (&result);
		1340	#endif
		1341
		1342	#ifdef HAVE_PIXBUF
		1343	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1344	if (!pixbuf)
		1345	{
		1346	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1347	return;
		1348	}
		1349
		1350	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1351	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1352
		1353	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1354	{
		1355	rxvt_warn ("Icon image too big, continuing without.\n");
		1356	g_object_unref (pixbuf);
		1357	return;
		1358	}
		1359
		1360	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1361	{
		1362	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1363	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1364	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1365
		1366	buffer [0] = w;
		1367	buffer [1] = h;
		1368	for (int i = 0; i < h; i++)
		1369	{
		1370	for (int j = 0; j < w; j++)
		1371	{
		1372	unsigned char pixel = row + j channels;
		1373	long value;
		1374
		1375	if (channels == 4)
		1376	value = pixel[3];
		1377	else
		1378	value = (unsigned char)0x00ff;
		1379
		1380	value = (value << 8) + pixel[0];
		1381	value = (value << 8) + pixel[1];
		1382	value = (value << 8) + pixel[2];
		1383	buffer[(i * w + j) + 2] = value;
		1384	}
		1385
		1386	row += rowstride;
		1387	}
		1388
		1389	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1390	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1391	free (buffer);
		1392	}
		1393	else
		1394	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1395
		1396	g_object_unref (pixbuf);
		1397	#endif
		1398	}
		1399
1304	/----------------------------------------------------------------------/	1400	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1401	/* rxvt_Create_Windows () - Open and map the window */
1306	void	1402	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1403	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1404	{
…		…
1388	wmHint.window_group = top;	1484	wmHint.window_group = top;
1389		1485
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1486	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1487	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1488	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1489	/*
1395	* set up icon hint	1490	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1491	* rs [Rs_iconfile] is path to icon
1397	*/	1492	*/
1398		1493
1399	if (rs [Rs_iconfile])	1494	if (rs [Rs_iconfile])
1400	{	1495	{
1401	init_asv ();	1496	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	}	1497	}
1440	# endif
1441	#endif	1498	#endif
1442		1499
1443	#if ENABLE_FRILLS	1500	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1501	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1502	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1522	pix_colors = pix_colors_unfocused;	1579	pix_colors = pix_colors_unfocused;
1523	#endif	1580	#endif
1524		1581
1525	pointer_unblank ();	1582	pointer_unblank ();
1526	scr_recolour ();	1583	scr_recolour ();
1527	}
1528
1529	/* ------------------------------------------------------------------------- *
1530	* GET TTY CURRENT STATE *
1531	* ------------------------------------------------------------------------- */
1532	void
1533	rxvt_get_ttymode (struct termios *tio)
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	/* input modes */
1585	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1586	# ifdef IMAXBEL
1587	\| IMAXBEL
1588	# endif
1589	\| IXON);
1590
1591	/* output modes */
1592	tio->c_oflag = (OPOST \| ONLCR);
1593
1594	/* control modes */
1595	tio->c_cflag = (CS8 \| CREAD);
1596
1597	/* line discipline modes */
1598	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1599	# if defined (ECHOCTL) && defined (ECHOKE)
1600	\| ECHOCTL \| ECHOKE
1601	# endif
1602	\| ECHOE \| ECHOK);
1603
1604	/*
1605	* Debugging
1606	*/
1607	#ifdef DEBUG_TTYMODE
1608	/* c_iflag bits */
1609	fprintf (stderr, "Input flags\n");
1610
1611	/* cpp token stringize doesn't work on all machines <sigh> */
1612	# define FOO(flag,name) \
1613	if ((tio->c_iflag) & flag) \
1614	fprintf (stderr, "%s ", name)
1615
1616	/* c_iflag bits */
1617	FOO (IGNBRK, "IGNBRK");
1618	FOO (BRKINT, "BRKINT");
1619	FOO (IGNPAR, "IGNPAR");
1620	FOO (PARMRK, "PARMRK");
1621	FOO (INPCK, "INPCK");
1622	FOO (ISTRIP, "ISTRIP");
1623	FOO (INLCR, "INLCR");
1624	FOO (IGNCR, "IGNCR");
1625	FOO (ICRNL, "ICRNL");
1626	FOO (IXON, "IXON");
1627	FOO (IXOFF, "IXOFF");
1628	# ifdef IUCLC
1629	FOO (IUCLC, "IUCLC");
1630	# endif
1631	# ifdef IXANY
1632	FOO (IXANY, "IXANY");
1633	# endif
1634	# ifdef IMAXBEL
1635	FOO (IMAXBEL, "IMAXBEL");
1636	# endif
1637
1638	fprintf (stderr, "\n");
1639
1640	# undef FOO
1641	# define FOO(entry, name) \
1642	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1643
1644	FOO (VINTR, "VINTR");
1645	FOO (VQUIT, "VQUIT");
1646	FOO (VERASE, "VERASE");
1647	FOO (VKILL, "VKILL");
1648	FOO (VEOF, "VEOF");
1649	FOO (VEOL, "VEOL");
1650	# ifdef VEOL2
1651	FOO (VEOL2, "VEOL2");
1652	# endif
1653	# ifdef VSWTC
1654	FOO (VSWTC, "VSWTC");
1655	# endif
1656	# ifdef VSWTCH
1657	FOO (VSWTCH, "VSWTCH");
1658	# endif
1659	FOO (VSTART, "VSTART");
1660	FOO (VSTOP, "VSTOP");
1661	FOO (VSUSP, "VSUSP");
1662	# ifdef VDSUSP
1663	FOO (VDSUSP, "VDSUSP");
1664	# endif
1665	# ifdef VREPRINT
1666	FOO (VREPRINT, "VREPRINT");
1667	# endif
1668	# ifdef VDISCRD
1669	FOO (VDISCRD, "VDISCRD");
1670	# endif
1671	# ifdef VWERSE
1672	FOO (VWERSE, "VWERSE");
1673	# endif
1674	# ifdef VLNEXT
1675	FOO (VLNEXT, "VLNEXT");
1676	# endif
1677
1678	fprintf (stderr, "\n");
1679	# undef FOO
1680	#endif /* DEBUG_TTYMODE */
1681	}	1584	}
1682		1585
1683	/----------------------------------------------------------------------/	1586	/----------------------------------------------------------------------/
1684	/*	1587	/*
1685	* Run the command in a subprocess and return a file descriptor for the	1588	* Run the command in a subprocess and return a file descriptor for the
…		…
1706	else	1609	else
1707	#endif	1610	#endif
1708	if (!pty->get ())	1611	if (!pty->get ())
1709	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1612	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1710		1613
1711	rxvt_get_ttymode (&tio);	1614	struct termios tio = def_tio;
1712		1615
1713	#ifndef NO_BACKSPACE_KEY	1616	#ifndef NO_BACKSPACE_KEY
1714	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1617	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1715	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];	1618	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1716	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1619	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
…		…
1811	signal (SIGQUIT, SIG_DFL);	1714	signal (SIGQUIT, SIG_DFL);
1812	signal (SIGCHLD, SIG_DFL);	1715	signal (SIGCHLD, SIG_DFL);
1813	signal (SIGHUP, SIG_DFL);	1716	signal (SIGHUP, SIG_DFL);
1814	signal (SIGPIPE, SIG_DFL);	1717	signal (SIGPIPE, SIG_DFL);
1815	/*	1718	/*
1816	* mimick login's behavior by disabling the job control signals	1719	* mimic login's behavior by disabling the job control signals
1817	* a shell that wants them can turn them back on	1720	* a shell that wants them can turn them back on
1818	*/	1721	*/
1819	#ifdef SIGTSTP	1722	#ifdef SIGTSTP
1820	signal (SIGTSTP, SIG_IGN);	1723	signal (SIGTSTP, SIG_IGN);
1821	signal (SIGTTIN, SIG_IGN);	1724	signal (SIGTTIN, SIG_IGN);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.270 by sf-exg, Tue Jun 15 13:34:52 2010 UTC vs. Revision 1.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.270 by sf-exg, Tue Jun 15 13:34:52 2010 UTC vs.
Revision 1.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC