[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.282 by sf-exg, Thu Sep 2 15:48:11 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
…		…
1299		1284
1300	if (i)	1285	if (i)
1301	ModMetaMask = modmasks[i - 1];	1286	ModMetaMask = modmasks[i - 1];
1302	}	1287	}
1303		1288
		1289	void
		1290	rxvt_term::set_icon (const char *file)
		1291	{
		1292	#ifdef HAVE_AFTERIMAGE
		1293	init_asv ();
		1294
		1295	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1296	if (!im)
		1297	{
		1298	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1299	return;
		1300	}
		1301
		1302	unsigned int w = im->width;
		1303	unsigned int h = im->height;
		1304
		1305	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1306	{
		1307	rxvt_warn ("Icon image too big, continuing without.\n");
		1308	destroy_asimage (&im);
		1309	return;
		1310	}
		1311
		1312	ASImage *result = scale_asimage (asv, im,
		1313	w, h, ASA_ARGB32,
		1314	100, ASIMAGE_QUALITY_DEFAULT);
		1315	destroy_asimage (&im);
		1316
		1317	if (!result)
		1318	{
		1319	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1320	return;
		1321	}
		1322
		1323	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1324	if (buffer)
		1325	{
		1326	ARGB32 *asbuf = result->alt.argb32;
		1327	buffer [0] = w;
		1328	buffer [1] = h;
		1329
		1330	for (unsigned int i = 0; i < w * h; ++i)
		1331	buffer [i + 2] = asbuf [i];
		1332
		1333	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1334	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1335	free (buffer);
		1336	}
		1337	else
		1338	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1339
		1340	destroy_asimage (&result);
		1341	#endif
		1342
		1343	#ifdef HAVE_PIXBUF
		1344	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1345	if (!pixbuf)
		1346	{
		1347	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1348	return;
		1349	}
		1350
		1351	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1352	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1353
		1354	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1355	{
		1356	rxvt_warn ("Icon image too big, continuing without.\n");
		1357	g_object_unref (pixbuf);
		1358	return;
		1359	}
		1360
		1361	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1362	{
		1363	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1364	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1365	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1366
		1367	buffer [0] = w;
		1368	buffer [1] = h;
		1369	for (int i = 0; i < h; i++)
		1370	{
		1371	for (int j = 0; j < w; j++)
		1372	{
		1373	unsigned char pixel = row + j channels;
		1374	long value;
		1375
		1376	if (channels == 4)
		1377	value = pixel[3];
		1378	else
		1379	value = (unsigned char)0x00ff;
		1380
		1381	value = (value << 8) + pixel[0];
		1382	value = (value << 8) + pixel[1];
		1383	value = (value << 8) + pixel[2];
		1384	buffer[(i * w + j) + 2] = value;
		1385	}
		1386
		1387	row += rowstride;
		1388	}
		1389
		1390	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1391	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1392	free (buffer);
		1393	}
		1394	else
		1395	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1396
		1397	g_object_unref (pixbuf);
		1398	#endif
		1399	}
		1400
1304	/----------------------------------------------------------------------/	1401	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1402	/* rxvt_Create_Windows () - Open and map the window */
1306	void	1403	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1404	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1405	{
…		…
1388	wmHint.window_group = top;	1485	wmHint.window_group = top;
1389		1486
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1487	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1488	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1489	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1490	/*
1395	* set up icon hint	1491	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1492	* rs [Rs_iconfile] is path to icon
1397	*/	1493	*/
1398		1494
1399	if (rs [Rs_iconfile])	1495	if (rs [Rs_iconfile])
1400	{	1496	{
1401	init_asv ();	1497	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	}	1498	}
1440	# endif
1441	#endif	1499	#endif
1442		1500
1443	#if ENABLE_FRILLS	1501	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1502	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1503	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1522	pix_colors = pix_colors_unfocused;	1580	pix_colors = pix_colors_unfocused;
1523	#endif	1581	#endif
1524		1582
1525	pointer_unblank ();	1583	pointer_unblank ();
1526	scr_recolour ();	1584	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	}	1585	}
1685		1586
1686	/----------------------------------------------------------------------/	1587	/----------------------------------------------------------------------/
1687	/*	1588	/*
1688	* Run the command in a subprocess and return a file descriptor for the	1589	* Run the command in a subprocess and return a file descriptor for the
…		…
1709	else	1610	else
1710	#endif	1611	#endif
1711	if (!pty->get ())	1612	if (!pty->get ())
1712	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1613	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1713		1614
1714	int er;	1615	struct termios tio = def_tio;
1715		1616
1716	#ifndef NO_BACKSPACE_KEY	1617	#ifndef NO_BACKSPACE_KEY
1717	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1618	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718	er = rs[Rs_backspace_key][0];	1619	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1719	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1620	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720	er = '\177'; /* the initial state anyway */	1621	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1721	else
1722	#endif	1622	#endif
1723	er = -1;
1724		1623
1725	rxvt_get_ttymode (&tio, er);
1726	/* init terminal attributes */	1624	/* init terminal attributes */
1727	cfsetospeed (&tio, BAUDRATE);	1625	cfsetospeed (&tio, BAUDRATE);
1728	cfsetispeed (&tio, BAUDRATE);	1626	cfsetispeed (&tio, BAUDRATE);
1729	tcsetattr (pty->tty, TCSANOW, &tio);	1627	tcsetattr (pty->tty, TCSANOW, &tio);
1730	pty->set_utf8_mode (enc_utf8);	1628	pty->set_utf8_mode (enc_utf8);
…		…
1817	signal (SIGQUIT, SIG_DFL);	1715	signal (SIGQUIT, SIG_DFL);
1818	signal (SIGCHLD, SIG_DFL);	1716	signal (SIGCHLD, SIG_DFL);
1819	signal (SIGHUP, SIG_DFL);	1717	signal (SIGHUP, SIG_DFL);
1820	signal (SIGPIPE, SIG_DFL);	1718	signal (SIGPIPE, SIG_DFL);
1821	/*	1719	/*
1822	* mimick login's behavior by disabling the job control signals	1720	* mimic login's behavior by disabling the job control signals
1823	* a shell that wants them can turn them back on	1721	* a shell that wants them can turn them back on
1824	*/	1722	*/
1825	#ifdef SIGTSTP	1723	#ifdef SIGTSTP
1826	signal (SIGTSTP, SIG_IGN);	1724	signal (SIGTSTP, SIG_IGN);
1827	signal (SIGTTIN, SIG_IGN);	1725	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.282 by sf-exg, Thu Sep 2 15:48:11 2010 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.282 by sf-exg, Thu Sep 2 15:48:11 2010 UTC