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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.264 by sf-exg, Sun Apr 4 18:59:19 2010 UTC vs.
Revision 1.286 by sf-exg, Tue Dec 14 08:01:51 2010 UTC

…		…
143		143
144	return rval;	144	return rval;
145	}	145	}
146	#endif	146	#endif
147		147
148	const char *const def_colorName[] =	148	static const char *const def_colorName[] =
149	{	149	{
150	COLOR_FOREGROUND,	150	COLOR_FOREGROUND,
151	COLOR_BACKGROUND,	151	COLOR_BACKGROUND,
152	/* low-intensity colors */	152	/* low-intensity colors */
153	"rgb:00/00/00", // 0: black (Black)	153	"rgb:00/00/00", // 0: black (Black)
…		…
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",
…		…
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 ();
653	#endif	639	#endif
654		640
655	#if ENABLE_PERL	641	#if ENABLE_PERL
656	if (!rs[Rs_perl_ext_1])	642	if (!rs[Rs_perl_ext_1])
657	rs[Rs_perl_ext_1] = "default";	643	rs[Rs_perl_ext_1] = "default";
…		…
790	set_locale ("");	776	set_locale ("");
791	set_environ (envv); // a few things in X do not call setlocale :(	777	set_environ (envv); // a few things in X do not call setlocale :(
792		778
793	init_vars ();	779	init_vars ();
794		780
795	init_secondary ();
796
797	const char **cmd_argv = init_resources (argc, argv);	781	const char **cmd_argv = init_resources (argc, argv);
798		782
799	#ifdef KEYSYM_RESOURCE	783	#ifdef KEYSYM_RESOURCE
800	keyboard->register_done ();	784	keyboard->register_done ();
801	#endif	785	#endif
…		…
835	#ifdef ENABLE_TRANSPARENCY	819	#ifdef ENABLE_TRANSPARENCY
836	if (option (Opt_transparent))	820	if (option (Opt_transparent))
837	{	821	{
838	bgPixmap.set_transparent ();	822	bgPixmap.set_transparent ();
839		823
840	#ifdef HAVE_AFTERIMAGE
841	if (rs [Rs_blurradius])	824	if (rs [Rs_blurradius])
842	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	825	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843	#endif	826
844	if (ISSET_PIXCOLOR (Color_tint))	827	if (ISSET_PIXCOLOR (Color_tint))
845	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	828	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846		829
847	if (rs [Rs_shade])	830	if (rs [Rs_shade])
848	bgPixmap.set_shade (rs [Rs_shade]);	831	bgPixmap.set_shade (rs [Rs_shade]);
…		…
1299		1282
1300	if (i)	1283	if (i)
1301	ModMetaMask = modmasks[i - 1];	1284	ModMetaMask = modmasks[i - 1];
1302	}	1285	}
1303		1286
		1287	void
		1288	rxvt_term::set_icon (const char *file)
		1289	{
		1290	#ifdef HAVE_AFTERIMAGE
		1291	init_asv ();
		1292
		1293	ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1294	if (!im)
		1295	{
		1296	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1297	return;
		1298	}
		1299
		1300	unsigned int w = im->width;
		1301	unsigned int h = im->height;
		1302
		1303	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1304	{
		1305	rxvt_warn ("Icon image too big, continuing without.\n");
		1306	destroy_asimage (&im);
		1307	return;
		1308	}
		1309
		1310	ASImage *result = scale_asimage (asv, im,
		1311	w, h, ASA_ARGB32,
		1312	100, ASIMAGE_QUALITY_DEFAULT);
		1313	destroy_asimage (&im);
		1314
		1315	if (!result)
		1316	{
		1317	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1318	return;
		1319	}
		1320
		1321	long buffer = (long )malloc ((2 + w * h) * sizeof (long));
		1322	if (buffer)
		1323	{
		1324	ARGB32 *asbuf = result->alt.argb32;
		1325	buffer [0] = w;
		1326	buffer [1] = h;
		1327
		1328	for (unsigned int i = 0; i < w * h; ++i)
		1329	buffer [i + 2] = asbuf [i];
		1330
		1331	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1332	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1333	free (buffer);
		1334	}
		1335	else
		1336	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1337
		1338	destroy_asimage (&result);
		1339	#endif
		1340
		1341	#ifdef HAVE_PIXBUF
		1342	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		1343	if (!pixbuf)
		1344	{
		1345	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1346	return;
		1347	}
		1348
		1349	unsigned int w = gdk_pixbuf_get_width (pixbuf);
		1350	unsigned int h = gdk_pixbuf_get_height (pixbuf);
		1351
		1352	if (!IN_RANGE_INC (w, 1, 16383) \|\| !IN_RANGE_INC (h, 1, 16383))
		1353	{
		1354	rxvt_warn ("Icon image too big, continuing without.\n");
		1355	g_object_unref (pixbuf);
		1356	return;
		1357	}
		1358
		1359	if (long buffer = (long )malloc ((2 + w * h) * sizeof (long)))
		1360	{
		1361	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		1362	unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
		1363	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		1364
		1365	buffer [0] = w;
		1366	buffer [1] = h;
		1367	for (int i = 0; i < h; i++)
		1368	{
		1369	for (int j = 0; j < w; j++)
		1370	{
		1371	unsigned char pixel = row + j channels;
		1372	long value;
		1373
		1374	if (channels == 4)
		1375	value = pixel[3];
		1376	else
		1377	value = (unsigned char)0x00ff;
		1378
		1379	value = (value << 8) + pixel[0];
		1380	value = (value << 8) + pixel[1];
		1381	value = (value << 8) + pixel[2];
		1382	buffer[(i * w + j) + 2] = value;
		1383	}
		1384
		1385	row += rowstride;
		1386	}
		1387
		1388	XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1389	PropModeReplace, (const unsigned char ) buffer, 2 + w h);
		1390	free (buffer);
		1391	}
		1392	else
		1393	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1394
		1395	g_object_unref (pixbuf);
		1396	#endif
		1397	}
		1398
1304	/----------------------------------------------------------------------/	1399	/----------------------------------------------------------------------/
1305	/* rxvt_Create_Windows () - Open and map the window */	1400	/* rxvt_Create_Windows () - Open and map the window */
1306	void	1401	void
1307	rxvt_term::create_windows (int argc, const char const argv)	1402	rxvt_term::create_windows (int argc, const char const argv)
1308	{	1403	{
…		…
1388	wmHint.window_group = top;	1483	wmHint.window_group = top;
1389		1484
1390	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1485	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391	&szHint, &wmHint, &classHint);	1486	&szHint, &wmHint, &classHint);
1392	#if ENABLE_EWMH	1487	#if ENABLE_EWMH
1393	# ifdef HAVE_AFTERIMAGE
1394	/*	1488	/*
1395	* set up icon hint	1489	* set up icon hint
1396	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources	1490	* rs [Rs_iconfile] is path to icon
1397	*/	1491	*/
1398		1492
1399	if (rs [Rs_iconfile])	1493	if (rs [Rs_iconfile])
1400	{	1494	{
1401	init_asv ();	1495	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	}	1496	}
1440	# endif
1441	#endif	1497	#endif
1442		1498
1443	#if ENABLE_FRILLS	1499	#if ENABLE_FRILLS
1444	if (mwmhints.flags)	1500	if (mwmhints.flags)
1445	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1501	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1522	pix_colors = pix_colors_unfocused;	1578	pix_colors = pix_colors_unfocused;
1523	#endif	1579	#endif
1524		1580
1525	pointer_unblank ();	1581	pointer_unblank ();
1526	scr_recolour ();	1582	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	if (tcgetattr (STDIN_FILENO, tio) < 0)
1539	{
1540	// return error - use system defaults,
1541	// where possible, and zero elsewhere
1542	memset (tio, 0, sizeof (struct termios));
1543
1544	tio->c_cc[VINTR] = CINTR;
1545	tio->c_cc[VQUIT] = CQUIT;
1546	tio->c_cc[VERASE] = CERASE;
1547	#ifdef VERASE2
1548	tio->c_cc[VERASE2] = CERASE2;
1549	#endif
1550	tio->c_cc[VKILL] = CKILL;
1551	tio->c_cc[VSTART] = CSTART;
1552	tio->c_cc[VSTOP] = CSTOP;
1553	tio->c_cc[VSUSP] = CSUSP;
1554	# ifdef VDSUSP
1555	tio->c_cc[VDSUSP] = CDSUSP;
1556	# endif
1557	# ifdef VREPRINT
1558	tio->c_cc[VREPRINT] = CRPRNT;
1559	# endif
1560	# ifdef VDISCRD
1561	tio->c_cc[VDISCRD] = CFLUSH;
1562	# endif
1563	# ifdef VWERSE
1564	tio->c_cc[VWERSE] = CWERASE;
1565	# endif
1566	# ifdef VLNEXT
1567	tio->c_cc[VLNEXT] = CLNEXT;
1568	# endif
1569	}
1570
1571	tio->c_cc[VEOF] = CEOF;
1572	tio->c_cc[VEOL] = VDISABLE;
1573	# ifdef VEOL2
1574	tio->c_cc[VEOL2] = VDISABLE;
1575	# endif
1576	# ifdef VSWTC
1577	tio->c_cc[VSWTC] = VDISABLE;
1578	# endif
1579	# ifdef VSWTCH
1580	tio->c_cc[VSWTCH] = VDISABLE;
1581	# endif
1582	# if VMIN != VEOF
1583	tio->c_cc[VMIN] = 1;
1584	# endif
1585	# if VTIME != VEOL
1586	tio->c_cc[VTIME] = 0;
1587	# endif
1588
1589	if (erase != -1)
1590	tio->c_cc[VERASE] = (char)erase;
1591
1592	/* input modes */
1593	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
1594	# ifdef IMAXBEL
1595	\| IMAXBEL
1596	# endif
1597	\| IXON);
1598
1599	/* output modes */
1600	tio->c_oflag = (OPOST \| ONLCR);
1601
1602	/* control modes */
1603	tio->c_cflag = (CS8 \| CREAD);
1604
1605	/* line discipline modes */
1606	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1607	# if defined (ECHOCTL) && defined (ECHOKE)
1608	\| ECHOCTL \| ECHOKE
1609	# endif
1610	\| ECHOE \| ECHOK);
1611
1612	/*
1613	* Debugging
1614	*/
1615	#ifdef DEBUG_TTYMODE
1616	/* c_iflag bits */
1617	fprintf (stderr, "Input flags\n");
1618
1619	/* cpp token stringize doesn't work on all machines <sigh> */
1620	# define FOO(flag,name) \
1621	if ((tio->c_iflag) & flag) \
1622	fprintf (stderr, "%s ", name)
1623
1624	/* c_iflag bits */
1625	FOO (IGNBRK, "IGNBRK");
1626	FOO (BRKINT, "BRKINT");
1627	FOO (IGNPAR, "IGNPAR");
1628	FOO (PARMRK, "PARMRK");
1629	FOO (INPCK, "INPCK");
1630	FOO (ISTRIP, "ISTRIP");
1631	FOO (INLCR, "INLCR");
1632	FOO (IGNCR, "IGNCR");
1633	FOO (ICRNL, "ICRNL");
1634	FOO (IXON, "IXON");
1635	FOO (IXOFF, "IXOFF");
1636	# ifdef IUCLC
1637	FOO (IUCLC, "IUCLC");
1638	# endif
1639	# ifdef IXANY
1640	FOO (IXANY, "IXANY");
1641	# endif
1642	# ifdef IMAXBEL
1643	FOO (IMAXBEL, "IMAXBEL");
1644	# endif
1645
1646	fprintf (stderr, "\n");
1647
1648	# undef FOO
1649	# define FOO(entry, name) \
1650	fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1651
1652	FOO (VINTR, "VINTR");
1653	FOO (VQUIT, "VQUIT");
1654	FOO (VERASE, "VERASE");
1655	FOO (VKILL, "VKILL");
1656	FOO (VEOF, "VEOF");
1657	FOO (VEOL, "VEOL");
1658	# ifdef VEOL2
1659	FOO (VEOL2, "VEOL2");
1660	# endif
1661	# ifdef VSWTC
1662	FOO (VSWTC, "VSWTC");
1663	# endif
1664	# ifdef VSWTCH
1665	FOO (VSWTCH, "VSWTCH");
1666	# endif
1667	FOO (VSTART, "VSTART");
1668	FOO (VSTOP, "VSTOP");
1669	FOO (VSUSP, "VSUSP");
1670	# ifdef VDSUSP
1671	FOO (VDSUSP, "VDSUSP");
1672	# endif
1673	# ifdef VREPRINT
1674	FOO (VREPRINT, "VREPRINT");
1675	# endif
1676	# ifdef VDISCRD
1677	FOO (VDISCRD, "VDISCRD");
1678	# endif
1679	# ifdef VWERSE
1680	FOO (VWERSE, "VWERSE");
1681	# endif
1682	# ifdef VLNEXT
1683	FOO (VLNEXT, "VLNEXT");
1684	# endif
1685
1686	fprintf (stderr, "\n");
1687	# undef FOO
1688	#endif /* DEBUG_TTYMODE */
1689	}	1583	}
1690		1584
1691	/----------------------------------------------------------------------/	1585	/----------------------------------------------------------------------/
1692	/*	1586	/*
1693	* Run the command in a subprocess and return a file descriptor for the	1587	* Run the command in a subprocess and return a file descriptor for the
…		…
1714	else	1608	else
1715	#endif	1609	#endif
1716	if (!pty->get ())	1610	if (!pty->get ())
1717	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1611	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1718		1612
1719	int er;	1613	struct termios tio = def_tio;
1720		1614
1721	#ifndef NO_BACKSPACE_KEY	1615	#ifndef NO_BACKSPACE_KEY
1722	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])	1616	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1723	er = rs[Rs_backspace_key][0];	1617	tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1724	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)	1618	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1725	er = '\177'; /* the initial state anyway */	1619	tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1726	else
1727	#endif	1620	#endif
1728	er = -1;
1729		1621
1730	rxvt_get_ttymode (&tio, er);
1731	/* init terminal attributes */	1622	/* init terminal attributes */
1732	cfsetospeed (&tio, BAUDRATE);	1623	cfsetospeed (&tio, BAUDRATE);
1733	cfsetispeed (&tio, BAUDRATE);	1624	cfsetispeed (&tio, BAUDRATE);
1734	tcsetattr (pty->tty, TCSANOW, &tio);	1625	tcsetattr (pty->tty, TCSANOW, &tio);
1735	pty->set_utf8_mode (enc_utf8);	1626	pty->set_utf8_mode (enc_utf8);
…		…
1822	signal (SIGQUIT, SIG_DFL);	1713	signal (SIGQUIT, SIG_DFL);
1823	signal (SIGCHLD, SIG_DFL);	1714	signal (SIGCHLD, SIG_DFL);
1824	signal (SIGHUP, SIG_DFL);	1715	signal (SIGHUP, SIG_DFL);
1825	signal (SIGPIPE, SIG_DFL);	1716	signal (SIGPIPE, SIG_DFL);
1826	/*	1717	/*
1827	* mimick login's behavior by disabling the job control signals	1718	* mimic login's behavior by disabling the job control signals
1828	* a shell that wants them can turn them back on	1719	* a shell that wants them can turn them back on
1829	*/	1720	*/
1830	#ifdef SIGTSTP	1721	#ifdef SIGTSTP
1831	signal (SIGTSTP, SIG_IGN);	1722	signal (SIGTSTP, SIG_IGN);
1832	signal (SIGTTIN, SIG_IGN);	1723	signal (SIGTTIN, SIG_IGN);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.264 by sf-exg, Sun Apr 4 18:59:19 2010 UTC vs. Revision 1.286 by sf-exg, Tue Dec 14 08:01:51 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.264 by sf-exg, Sun Apr 4 18:59:19 2010 UTC vs.
Revision 1.286 by sf-exg, Tue Dec 14 08:01:51 2010 UTC