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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.267 by sf-exg, Mon Jun 14 15:47:52 2010 UTC vs.
Revision 1.279 by sf-exg, Sun Aug 29 15:05:08 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;
…		…
790	set_locale ("");	772	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	773	set_environ (envv); // a few things in X do not call setlocale :(
792		774
793	init_vars ();	775	init_vars ();
794		776
795	init_secondary ();
796
797	const char **cmd_argv = init_resources (argc, argv);	777	const char **cmd_argv = init_resources (argc, argv);
798		778
799	#ifdef KEYSYM_RESOURCE	779	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	780	keyboard->register_done ();
801	#endif	781	#endif
…		…
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	int w = im->width;
		1298	int h = im->height;
		1299
		1300	if (!IN_RANGE_INC (w, 1, 32767) \|\| !IN_RANGE_INC (h, 1, 32767))
		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[0], 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
1304	/----------------------------------------------------------------------/	1339	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1340	/* rxvt_Create_Windows () - Open and map the window */
1306	void	1341	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1342	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1343	{
…		…
1388	wmHint.window_group = top;	1423	wmHint.window_group = top;
1389		1424
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1425	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1426	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1427	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1428	/*
1395	* set up icon hint	1429	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1430	* rs [Rs_iconfile] is path to icon
1397	*/	1431	*/
1398		1432
1399	if (rs [Rs_iconfile])	1433	if (rs [Rs_iconfile])
1400	{	1434	{
1401	init_asv ();	1435	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	}	1436	}
1440	# endif
1441	#endif	1437	#endif
1442		1438
1443	#if ENABLE_FRILLS	1439	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1440	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1441	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1522	pix_colors = pix_colors_unfocused;	1518	pix_colors = pix_colors_unfocused;
1523	#endif	1519	#endif
1524		1520
1525	pointer_unblank ();	1521	pointer_unblank ();
1526	scr_recolour ();	1522	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	for (int i = 0; i < NCCS; i++)
1546	tio->c_cc[i] = VDISABLE;
1547
1548	tio->c_cc[VINTR] = CINTR;
1549	tio->c_cc[VQUIT] = CQUIT;
1550	tio->c_cc[VERASE] = CERASE;
1551	#ifdef VERASE2
1552	tio->c_cc[VERASE2] = CERASE2;
1553	#endif
1554	tio->c_cc[VKILL] = CKILL;
1555	tio->c_cc[VSTART] = CSTART;
1556	tio->c_cc[VSTOP] = CSTOP;
1557	tio->c_cc[VSUSP] = CSUSP;
1558	# ifdef VDSUSP
1559	tio->c_cc[VDSUSP] = CDSUSP;
1560	# endif
1561	# ifdef VREPRINT
1562	tio->c_cc[VREPRINT] = CRPRNT;
1563	# endif
1564	# ifdef VDISCRD
1565	tio->c_cc[VDISCRD] = CFLUSH;
1566	# endif
1567	# ifdef VWERSE
1568	tio->c_cc[VWERSE] = CWERASE;
1569	# endif
1570	# ifdef VLNEXT
1571	tio->c_cc[VLNEXT] = CLNEXT;
1572	# endif
1573	}
1574
1575	tio->c_cc[VEOF] = CEOF;
1576	# if VMIN != VEOF
1577	tio->c_cc[VMIN] = 1;
1578	# endif
1579	# if VTIME != VEOL
1580	tio->c_cc[VTIME] = 0;
1581	# endif
1582
1583	if (erase != -1)
1584	tio->c_cc[VERASE] = (char)erase;
1585
1586	/* input modes */
1587	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1588	# ifdef IMAXBEL
1589	\| IMAXBEL
1590	# endif
1591	\| IXON);
1592
1593	/* output modes */
1594	tio->c_oflag = (OPOST \| ONLCR);
1595
1596	/* control modes */
1597	tio->c_cflag = (CS8 \| CREAD);
1598
1599	/* line discipline modes */
1600	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1601	# if defined (ECHOCTL) && defined (ECHOKE)
1602	\| ECHOCTL \| ECHOKE
1603	# endif
1604	\| ECHOE \| ECHOK);
1605
1606	/*
1607	* Debugging
1608	*/
1609	#ifdef DEBUG_TTYMODE
1610	/* c_iflag bits */
1611	fprintf (stderr, "Input flags\n");
1612
1613	/* cpp token stringize doesn't work on all machines <sigh> */
1614	# define FOO(flag,name) \
1615	if ((tio->c_iflag) & flag) \
1616	fprintf (stderr, "%s ", name)
1617
1618	/* c_iflag bits */
1619	FOO (IGNBRK, "IGNBRK");
1620	FOO (BRKINT, "BRKINT");
1621	FOO (IGNPAR, "IGNPAR");
1622	FOO (PARMRK, "PARMRK");
1623	FOO (INPCK, "INPCK");
1624	FOO (ISTRIP, "ISTRIP");
1625	FOO (INLCR, "INLCR");
1626	FOO (IGNCR, "IGNCR");
1627	FOO (ICRNL, "ICRNL");
1628	FOO (IXON, "IXON");
1629	FOO (IXOFF, "IXOFF");
1630	# ifdef IUCLC
1631	FOO (IUCLC, "IUCLC");
1632	# endif
1633	# ifdef IXANY
1634	FOO (IXANY, "IXANY");
1635	# endif
1636	# ifdef IMAXBEL
1637	FOO (IMAXBEL, "IMAXBEL");
1638	# endif
1639
1640	fprintf (stderr, "\n");
1641
1642	# undef FOO
1643	# define FOO(entry, name) \
1644	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1645
1646	FOO (VINTR, "VINTR");
1647	FOO (VQUIT, "VQUIT");
1648	FOO (VERASE, "VERASE");
1649	FOO (VKILL, "VKILL");
1650	FOO (VEOF, "VEOF");
1651	FOO (VEOL, "VEOL");
1652	# ifdef VEOL2
1653	FOO (VEOL2, "VEOL2");
1654	# endif
1655	# ifdef VSWTC
1656	FOO (VSWTC, "VSWTC");
1657	# endif
1658	# ifdef VSWTCH
1659	FOO (VSWTCH, "VSWTCH");
1660	# endif
1661	FOO (VSTART, "VSTART");
1662	FOO (VSTOP, "VSTOP");
1663	FOO (VSUSP, "VSUSP");
1664	# ifdef VDSUSP
1665	FOO (VDSUSP, "VDSUSP");
1666	# endif
1667	# ifdef VREPRINT
1668	FOO (VREPRINT, "VREPRINT");
1669	# endif
1670	# ifdef VDISCRD
1671	FOO (VDISCRD, "VDISCRD");
1672	# endif
1673	# ifdef VWERSE
1674	FOO (VWERSE, "VWERSE");
1675	# endif
1676	# ifdef VLNEXT
1677	FOO (VLNEXT, "VLNEXT");
1678	# endif
1679
1680	fprintf (stderr, "\n");
1681	# undef FOO
1682	#endif /* DEBUG_TTYMODE */
1683	}	1523	}
1684		1524
1685	/----------------------------------------------------------------------/	1525	/----------------------------------------------------------------------/
1686	/*	1526	/*
1687	* Run the command in a subprocess and return a file descriptor for the	1527	* Run the command in a subprocess and return a file descriptor for the
…		…
1708	else	1548	else
1709	#endif	1549	#endif
1710	if (!pty->get ())	1550	if (!pty->get ())
1711	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1551	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1712		1552
1713	int er;	1553	struct termios tio = def_tio;
1714		1554
1715	#ifndef NO_BACKSPACE_KEY	1555	#ifndef NO_BACKSPACE_KEY
1716	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1556	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1717	er = rs[Rs_backspace_key][0];	1557	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1718	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1558	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1719	er = '\177'; /* the initial state anyway */	1559	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1720	else
1721	#endif	1560	#endif
1722	er = -1;
1723		1561
1724	rxvt_get_ttymode (&tio, er);
1725	/* init terminal attributes */	1562	/* init terminal attributes */
1726	cfsetospeed (&tio, BAUDRATE);	1563	cfsetospeed (&tio, BAUDRATE);
1727	cfsetispeed (&tio, BAUDRATE);	1564	cfsetispeed (&tio, BAUDRATE);
1728	tcsetattr (pty->tty, TCSANOW, &tio);	1565	tcsetattr (pty->tty, TCSANOW, &tio);
1729	pty->set_utf8_mode (enc_utf8);	1566	pty->set_utf8_mode (enc_utf8);
…		…
1816	signal (SIGQUIT, SIG_DFL);	1653	signal (SIGQUIT, SIG_DFL);
1817	signal (SIGCHLD, SIG_DFL);	1654	signal (SIGCHLD, SIG_DFL);
1818	signal (SIGHUP, SIG_DFL);	1655	signal (SIGHUP, SIG_DFL);
1819	signal (SIGPIPE, SIG_DFL);	1656	signal (SIGPIPE, SIG_DFL);
1820	/*	1657	/*
1821	* mimick login's behavior by disabling the job control signals	1658	* mimic login's behavior by disabling the job control signals
1822	* a shell that wants them can turn them back on	1659	* a shell that wants them can turn them back on
1823	*/	1660	*/
1824	#ifdef SIGTSTP	1661	#ifdef SIGTSTP
1825	signal (SIGTSTP, SIG_IGN);	1662	signal (SIGTSTP, SIG_IGN);
1826	signal (SIGTTIN, SIG_IGN);	1663	signal (SIGTTIN, SIG_IGN);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.267 by sf-exg, Mon Jun 14 15:47:52 2010 UTC vs. Revision 1.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.267 by sf-exg, Mon Jun 14 15:47:52 2010 UTC vs.
Revision 1.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC