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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.263 by sf-exg, Thu Apr 1 00:12:33 2010 UTC vs.
Revision 1.278 by sf-exg, Sun Aug 29 15:04:40 2010 UTC

…		…
174	"rgb:00/00/ff", // 4/12: bright blue (Blue)	174	"rgb:00/00/ff", // 4/12: bright blue (Blue)
175	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)	175	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)	176	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177	"rgb:ff/ff/ff", // 7/15: bright white (White)	177	"rgb:ff/ff/ff", // 7/15: bright white (White)
178		178
179	#ifndef USE_256_COLORS	179	#if !USE_256_COLORS
180	// 88 xterm colours	180	// 88 xterm colours
181	"rgb:00/00/00",	181	"rgb:00/00/00",
182	"rgb:00/00/8b",	182	"rgb:00/00/8b",
183	"rgb:00/00/cd",	183	"rgb:00/00/cd",
184	"rgb:00/00/ff",	184	"rgb:00/00/ff",
…		…
510	#if ENABLE_FRILLS	510	#if ENABLE_FRILLS
511	NULL, // Color_underline	511	NULL, // Color_underline
512	#endif	512	#endif
513	#ifdef OPTION_HC	513	#ifdef OPTION_HC
514	NULL,	514	NULL,
		515	NULL,
515	#endif	516	#endif
516	COLOR_SCROLLBAR,	517	COLOR_SCROLLBAR,
517	#ifdef RXVT_SCROLLBAR	518	#ifdef RXVT_SCROLLBAR
518	COLOR_SCROLLTROUGH,	519	COLOR_SCROLLTROUGH,
519	#endif	520	#endif
…		…
555	set_option (Opt_pastableTabs);	556	set_option (Opt_pastableTabs);
556	set_option (Opt_intensityStyles);	557	set_option (Opt_intensityStyles);
557	set_option (Opt_iso14755);	558	set_option (Opt_iso14755);
558	set_option (Opt_iso14755_52);	559	set_option (Opt_iso14755_52);
559	set_option (Opt_buffered);	560	set_option (Opt_buffered);
560	}
561
562	static void
563	init_secondary ()
564	{
565	int i;
566
567	if ((i = open ("/dev/null", O_RDONLY)) < 0)
568	{
569	dup2 (STDERR_FILENO, STDIN_FILENO);
570	}
571	else if (i != STDIN_FILENO)
572	{
573	dup2 (i, STDIN_FILENO);
574	close (i);
575	}
576
577	dup2 (STDERR_FILENO, STDOUT_FILENO);
578	}	561	}
579		562
580	/----------------------------------------------------------------------/	563	/----------------------------------------------------------------------/
581	const char **	564	const char **
582	rxvt_term::init_resources (int argc, const char const argv)	565	rxvt_term::init_resources (int argc, const char const argv)
…		…
789	set_locale ("");	772	set_locale ("");
790	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 :(
791		774
792	init_vars ();	775	init_vars ();
793		776
794	init_secondary ();
795
796	const char **cmd_argv = init_resources (argc, argv);	777	const char **cmd_argv = init_resources (argc, argv);
797		778
798	#ifdef KEYSYM_RESOURCE	779	#ifdef KEYSYM_RESOURCE
799	keyboard->register_done ();	780	keyboard->register_done ();
800	#endif	781	#endif
…		…
1298		1279
1299	if (i)	1280	if (i)
1300	ModMetaMask = modmasks[i - 1];	1281	ModMetaMask = modmasks[i - 1];
1301	}	1282	}
1302		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	ASImage *result = scale_asimage (asv, im,
		1301	w, h, ASA_ARGB32,
		1302	100, ASIMAGE_QUALITY_DEFAULT);
		1303	destroy_asimage (&im);
		1304
		1305	if (!result)
		1306	{
		1307	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1308	return;
		1309	}
		1310
		1311	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1312	if (buffer)
		1313	{
		1314	ARGB32 *asbuf = result->alt.argb32;
		1315	buffer [0] = w;
		1316	buffer [1] = h;
		1317
		1318	for (unsigned int i = 0; i < w * h; ++i)
		1319	buffer [i + 2] = asbuf [i];
		1320
		1321	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1322	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1323	free (buffer);
		1324	}
		1325	else
		1326	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1327
		1328	destroy_asimage (&result);
		1329	#endif
		1330	}
		1331
1303	/----------------------------------------------------------------------/	1332	/----------------------------------------------------------------------/
1304	/* rxvt_Create_Windows () - Open and map the window */	1333	/* rxvt_Create_Windows () - Open and map the window */
1305	void	1334	void
1306	rxvt_term::create_windows (int argc, const char const argv)	1335	rxvt_term::create_windows (int argc, const char const argv)
1307	{	1336	{
…		…
1387	wmHint.window_group = top;	1416	wmHint.window_group = top;
1388		1417
1389	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1418	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1390	&szHint, &wmHint, &classHint);	1419	&szHint, &wmHint, &classHint);
1391	#if ENABLE_EWMH	1420	#if ENABLE_EWMH
1392	# ifdef HAVE_AFTERIMAGE
1393	/*	1421	/*
1394	* set up icon hint	1422	* set up icon hint
1395	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1423	* rs [Rs_iconfile] is path to icon
1396	*/	1424	*/
1397		1425
1398	if (rs [Rs_iconfile])	1426	if (rs [Rs_iconfile])
1399	{	1427	{
1400	init_asv ();	1428	set_icon (rs [Rs_iconfile]);
1401
1402	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1403	if (asv && im)
1404	{
1405	int w = im->width;
1406	int h = im->height;
1407	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
1408	ASImage *result = scale_asimage (asv, im,
1409	w, h, ASA_ARGB32,
1410	100, ASIMAGE_QUALITY_DEFAULT);
1411	destroy_asimage (&im);
1412
1413	if (buffer && result)
1414	{
1415	ARGB32 *asbuf = result->alt.argb32;
1416	buffer [0] = w;
1417	buffer [1] = h;
1418
1419	for (unsigned int i = 0; i < w * h; ++i)
1420	buffer [i + 2] = asbuf [i];
1421
1422	destroy_asimage (&result);
1423	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1424	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
1425	free (buffer);
1426	}
1427	else
1428	{
1429	if (!buffer)
1430	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1431
1432	if (!result)
1433	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1434	}
1435	}
1436	else
1437	rxvt_warn ("Loading image icon failed, continuing without.\n");
1438	}	1429	}
1439	# endif
1440	#endif	1430	#endif
1441		1431
1442	#if ENABLE_FRILLS	1432	#if ENABLE_FRILLS
1443	if (mwmhints.flags)	1433	if (mwmhints.flags)
1444	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1434	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1521	pix_colors = pix_colors_unfocused;	1511	pix_colors = pix_colors_unfocused;
1522	#endif	1512	#endif
1523		1513
1524	pointer_unblank ();	1514	pointer_unblank ();
1525	scr_recolour ();	1515	scr_recolour ();
1526	}
1527
1528	/* ------------------------------------------------------------------------- *
1529	* GET TTY CURRENT STATE *
1530	* ------------------------------------------------------------------------- */
1531	void
1532	rxvt_get_ttymode (struct termios *tio, int erase)
1533	{
1534	/*
1535	* standard System V termios interface
1536	*/
1537	if (tcgetattr (STDIN_FILENO, tio) < 0)
1538	{
1539	// return error - use system defaults,
1540	// where possible, and zero elsewhere
1541	memset (tio, 0, sizeof (struct termios));
1542
1543	tio->c_cc[VINTR] = CINTR;
1544	tio->c_cc[VQUIT] = CQUIT;
1545	tio->c_cc[VERASE] = CERASE;
1546	#ifdef VERASE2
1547	tio->c_cc[VERASE2] = CERASE2;
1548	#endif
1549	tio->c_cc[VKILL] = CKILL;
1550	tio->c_cc[VSTART] = CSTART;
1551	tio->c_cc[VSTOP] = CSTOP;
1552	tio->c_cc[VSUSP] = CSUSP;
1553	# ifdef VDSUSP
1554	tio->c_cc[VDSUSP] = CDSUSP;
1555	# endif
1556	# ifdef VREPRINT
1557	tio->c_cc[VREPRINT] = CRPRNT;
1558	# endif
1559	# ifdef VDISCRD
1560	tio->c_cc[VDISCRD] = CFLUSH;
1561	# endif
1562	# ifdef VWERSE
1563	tio->c_cc[VWERSE] = CWERASE;
1564	# endif
1565	# ifdef VLNEXT
1566	tio->c_cc[VLNEXT] = CLNEXT;
1567	# endif
1568	}
1569
1570	tio->c_cc[VEOF] = CEOF;
1571	tio->c_cc[VEOL] = VDISABLE;
1572	# ifdef VEOL2
1573	tio->c_cc[VEOL2] = VDISABLE;
1574	# endif
1575	# ifdef VSWTC
1576	tio->c_cc[VSWTC] = VDISABLE;
1577	# endif
1578	# ifdef VSWTCH
1579	tio->c_cc[VSWTCH] = VDISABLE;
1580	# endif
1581	# if VMIN != VEOF
1582	tio->c_cc[VMIN] = 1;
1583	# endif
1584	# if VTIME != VEOL
1585	tio->c_cc[VTIME] = 0;
1586	# endif
1587
1588	if (erase != -1)
1589	tio->c_cc[VERASE] = (char)erase;
1590
1591	/* input modes */
1592	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1593	# ifdef IMAXBEL
1594	\| IMAXBEL
1595	# endif
1596	\| IXON);
1597
1598	/* output modes */
1599	tio->c_oflag = (OPOST \| ONLCR);
1600
1601	/* control modes */
1602	tio->c_cflag = (CS8 \| CREAD);
1603
1604	/* line discipline modes */
1605	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1606	# if defined (ECHOCTL) && defined (ECHOKE)
1607	\| ECHOCTL \| ECHOKE
1608	# endif
1609	\| ECHOE \| ECHOK);
1610
1611	/*
1612	* Debugging
1613	*/
1614	#ifdef DEBUG_TTYMODE
1615	/* c_iflag bits */
1616	fprintf (stderr, "Input flags\n");
1617
1618	/* cpp token stringize doesn't work on all machines <sigh> */
1619	# define FOO(flag,name) \
1620	if ((tio->c_iflag) & flag) \
1621	fprintf (stderr, "%s ", name)
1622
1623	/* c_iflag bits */
1624	FOO (IGNBRK, "IGNBRK");
1625	FOO (BRKINT, "BRKINT");
1626	FOO (IGNPAR, "IGNPAR");
1627	FOO (PARMRK, "PARMRK");
1628	FOO (INPCK, "INPCK");
1629	FOO (ISTRIP, "ISTRIP");
1630	FOO (INLCR, "INLCR");
1631	FOO (IGNCR, "IGNCR");
1632	FOO (ICRNL, "ICRNL");
1633	FOO (IXON, "IXON");
1634	FOO (IXOFF, "IXOFF");
1635	# ifdef IUCLC
1636	FOO (IUCLC, "IUCLC");
1637	# endif
1638	# ifdef IXANY
1639	FOO (IXANY, "IXANY");
1640	# endif
1641	# ifdef IMAXBEL
1642	FOO (IMAXBEL, "IMAXBEL");
1643	# endif
1644
1645	fprintf (stderr, "\n");
1646
1647	# undef FOO
1648	# define FOO(entry, name) \
1649	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1650
1651	FOO (VINTR, "VINTR");
1652	FOO (VQUIT, "VQUIT");
1653	FOO (VERASE, "VERASE");
1654	FOO (VKILL, "VKILL");
1655	FOO (VEOF, "VEOF");
1656	FOO (VEOL, "VEOL");
1657	# ifdef VEOL2
1658	FOO (VEOL2, "VEOL2");
1659	# endif
1660	# ifdef VSWTC
1661	FOO (VSWTC, "VSWTC");
1662	# endif
1663	# ifdef VSWTCH
1664	FOO (VSWTCH, "VSWTCH");
1665	# endif
1666	FOO (VSTART, "VSTART");
1667	FOO (VSTOP, "VSTOP");
1668	FOO (VSUSP, "VSUSP");
1669	# ifdef VDSUSP
1670	FOO (VDSUSP, "VDSUSP");
1671	# endif
1672	# ifdef VREPRINT
1673	FOO (VREPRINT, "VREPRINT");
1674	# endif
1675	# ifdef VDISCRD
1676	FOO (VDISCRD, "VDISCRD");
1677	# endif
1678	# ifdef VWERSE
1679	FOO (VWERSE, "VWERSE");
1680	# endif
1681	# ifdef VLNEXT
1682	FOO (VLNEXT, "VLNEXT");
1683	# endif
1684
1685	fprintf (stderr, "\n");
1686	# undef FOO
1687	#endif /* DEBUG_TTYMODE */
1688	}	1516	}
1689		1517
1690	/----------------------------------------------------------------------/	1518	/----------------------------------------------------------------------/
1691	/*	1519	/*
1692	* Run the command in a subprocess and return a file descriptor for the	1520	* Run the command in a subprocess and return a file descriptor for the
…		…
1713	else	1541	else
1714	#endif	1542	#endif
1715	if (!pty->get ())	1543	if (!pty->get ())
1716	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1544	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1717		1545
1718	int er;	1546	struct termios tio = def_tio;
1719		1547
1720	#ifndef NO_BACKSPACE_KEY	1548	#ifndef NO_BACKSPACE_KEY
1721	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1549	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1722	er = rs[Rs_backspace_key][0];	1550	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1723	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1551	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1724	er = '\177'; /* the initial state anyway */	1552	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1725	else
1726	#endif	1553	#endif
1727	er = -1;
1728		1554
1729	rxvt_get_ttymode (&tio, er);
1730	/* init terminal attributes */	1555	/* init terminal attributes */
1731	cfsetospeed (&tio, BAUDRATE);	1556	cfsetospeed (&tio, BAUDRATE);
1732	cfsetispeed (&tio, BAUDRATE);	1557	cfsetispeed (&tio, BAUDRATE);
1733	tcsetattr (pty->tty, TCSANOW, &tio);	1558	tcsetattr (pty->tty, TCSANOW, &tio);
1734	pty->set_utf8_mode (enc_utf8);	1559	pty->set_utf8_mode (enc_utf8);
…		…
1821	signal (SIGQUIT, SIG_DFL);	1646	signal (SIGQUIT, SIG_DFL);
1822	signal (SIGCHLD, SIG_DFL);	1647	signal (SIGCHLD, SIG_DFL);
1823	signal (SIGHUP, SIG_DFL);	1648	signal (SIGHUP, SIG_DFL);
1824	signal (SIGPIPE, SIG_DFL);	1649	signal (SIGPIPE, SIG_DFL);
1825	/*	1650	/*
1826	* mimick login's behavior by disabling the job control signals	1651	* mimic login's behavior by disabling the job control signals
1827	* a shell that wants them can turn them back on	1652	* a shell that wants them can turn them back on
1828	*/	1653	*/
1829	#ifdef SIGTSTP	1654	#ifdef SIGTSTP
1830	signal (SIGTSTP, SIG_IGN);	1655	signal (SIGTSTP, SIG_IGN);
1831	signal (SIGTTIN, SIG_IGN);	1656	signal (SIGTTIN, SIG_IGN);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.263 by sf-exg, Thu Apr 1 00:12:33 2010 UTC vs. Revision 1.278 by sf-exg, Sun Aug 29 15:04:40 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.263 by sf-exg, Thu Apr 1 00:12:33 2010 UTC vs.
Revision 1.278 by sf-exg, Sun Aug 29 15:04:40 2010 UTC