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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC vs.
Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
…		…
50	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
51	# include <clocale>	52	# include <clocale>
52	# endif	53	# endif
53	#endif	54	#endif
54		55
		56	struct termios rxvt_term::def_tio;
55	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
56		58
57	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
58	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
59		61
…		…
94	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
95	{	97	{
96	compose_char *cc;	98	compose_char *cc;
97		99
98	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
99	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
100	cc = (*this)[c1];	102	cc = (*this)[c1];
101	while (cc)	103	while (cc)
102	{	104	{
103	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
104	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
105	}	107	}
106		108
107	// check to see whether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
108	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
109	{
110	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
111	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
112	}
113		113
114	// allocate a new combination	114	// allocate a new combination
115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
116	{	116	{
117	static int seen;	117	static int seen;
118		118
119	if (!seen++)	119	if (!seen++)
120	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121		121
122	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
123	}	123	}
124		124
125	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
226	delete fontset[i];	226	delete fontset[i];
227	#endif	227	#endif
228	delete fontset[0];	228	delete fontset[0];
229		229
230	#ifdef HAVE_BG_PIXMAP	230	#ifdef HAVE_BG_PIXMAP
231	bgPixmap.destroy ();	231	bg_destroy ();
232	#endif
233	#ifdef HAVE_AFTERIMAGE
234	if (asv)
235	destroy_asvisual (asv, 0);
236	if (asimman)
237	destroy_image_manager (asimman, 0);
238	#endif	232	#endif
239		233
240	if (display)	234	if (display)
241	{	235	{
242	selection_clear ();	236	selection_clear ();
…		…
359	make_current ();	353	make_current ();
360		354
361	delete this;	355	delete this;
362	}	356	}
363		357
		358	void
		359	rxvt_term::set_option (uint8_t opt, bool set)
		360	{
		361	if (!opt)
		362	return;
		363
		364	uint8_t mask = 1 << (opt & 7);
		365	uint8_t &val = options [opt >> 3];
		366
		367	val = val & ~mask \| (set ? mask : 0);
		368	}
		369
364	/----------------------------------------------------------------------/	370	/----------------------------------------------------------------------/
365	/*	371	/*
366	* Exit gracefully, clearing the utmp entry and restoring tty attributes	372	* Exit gracefully, clearing the utmp entry and restoring tty attributes
367	* TODO: if debugging, this should free up any known resources if we can	373	* TODO: if debugging, this should free up any known resources if we can
368	*/	374	*/
…		…
380	print_x_error (Display dpy, XErrorEvent event)	386	print_x_error (Display dpy, XErrorEvent event)
381	{	387	{
382	char buffer[BUFSIZ];	388	char buffer[BUFSIZ];
383	char mesg[BUFSIZ];	389	char mesg[BUFSIZ];
384	char number[32];	390	char number[32];
385	char *mtype = "XlibMessage";	391	const char mtype[] = "XlibMessage";
386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	392	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	393	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	394	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389	rxvt_warn ("%s: %s\n", mesg, buffer);	395	rxvt_warn ("%s: %s\n", mesg, buffer);
390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	396	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
…		…
474	rxvt_emergency_cleanup ();	480	rxvt_emergency_cleanup ();
475	w.stop ();	481	w.stop ();
476	kill (getpid (), w.signum);	482	kill (getpid (), w.signum);
477	}	483	}
478		484
		485	static void
		486	rxvt_get_ttymode (struct termios *tio)
		487	{
		488	if (tcgetattr (STDIN_FILENO, tio) < 0)
		489	memset (tio, 0, sizeof (struct termios));
		490
		491	for (int i = 0; i < NCCS; i++)
		492	tio->c_cc[i] = VDISABLE;
		493
		494	tio->c_cc[VINTR] = CINTR;
		495	tio->c_cc[VQUIT] = CQUIT;
		496	tio->c_cc[VERASE] = CERASE;
		497	#ifdef VERASE2
		498	tio->c_cc[VERASE2] = CERASE2;
		499	#endif
		500	tio->c_cc[VKILL] = CKILL;
		501	tio->c_cc[VEOF] = CEOF;
		502	tio->c_cc[VSTART] = CSTART;
		503	tio->c_cc[VSTOP] = CSTOP;
		504	tio->c_cc[VSUSP] = CSUSP;
		505	# ifdef VDSUSP
		506	tio->c_cc[VDSUSP] = CDSUSP;
		507	# endif
		508	# ifdef VREPRINT
		509	tio->c_cc[VREPRINT] = CRPRNT;
		510	# endif
		511	# ifdef VDISCRD
		512	tio->c_cc[VDISCRD] = CFLUSH;
		513	# endif
		514	# ifdef VWERSE
		515	tio->c_cc[VWERSE] = CWERASE;
		516	# endif
		517	# ifdef VLNEXT
		518	tio->c_cc[VLNEXT] = CLNEXT;
		519	# endif
		520	# ifdef VSTATUS
		521	tio->c_cc[VSTATUS] = CSTATUS;
		522	# endif
		523
		524	# if VMIN != VEOF
		525	tio->c_cc[VMIN] = 1;
		526	# endif
		527	# if VTIME != VEOL
		528	tio->c_cc[VTIME] = 0;
		529	# endif
		530
		531	/* input modes */
		532	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		533	# ifdef IMAXBEL
		534	\| IMAXBEL
		535	# endif
		536	\| IXON);
		537
		538	/* output modes */
		539	tio->c_oflag = (OPOST \| ONLCR);
		540
		541	/* control modes */
		542	tio->c_cflag = (CS8 \| CREAD);
		543
		544	/* local modes */
		545	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		546	# if defined (ECHOCTL) && defined (ECHOKE)
		547	\| ECHOCTL \| ECHOKE
		548	# endif
		549	\| ECHOE \| ECHOK);
		550	}
		551
479	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
480		553
481	void	554	void
482	rxvt_init ()	555	rxvt_init ()
483	{	556	{
484	assert (("fontMask must not overlap other RS masks",	557	assert (("fontMask must not overlap other RS masks",
485	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));	558	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
		559
		560	rxvt_get_ttymode (&rxvt_term::def_tio);
486		561
487	// get rid of stdin/stdout as we don't need them, to free resources	562	// get rid of stdin/stdout as we don't need them, to free resources
488	dup2 (STDERR_FILENO, STDIN_FILENO);	563	dup2 (STDERR_FILENO, STDIN_FILENO);
489	dup2 (STDERR_FILENO, STDOUT_FILENO);	564	dup2 (STDERR_FILENO, STDOUT_FILENO);
490		565
491	ptytty::init ();
492
493	if (!ev_default_loop (0))	566	if (!ev_default_loop ())
494	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	567	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
495		568
496	rxvt_environ = environ;	569	rxvt_environ = environ;
497		570
498	signal (SIGHUP, SIG_IGN);	571	signal (SIGHUP, SIG_IGN);
…		…
877	void	950	void
878	rxvt_term::set_colorfgbg ()	951	rxvt_term::set_colorfgbg ()
879	{	952	{
880	unsigned int i;	953	unsigned int i;
881	const char *xpmb = "";	954	const char *xpmb = "";
882	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	955	char fstr[] = "default";
		956	char bstr[] = "default";
883		957
884	strcpy (fstr, "default");
885	strcpy (bstr, "default");
886	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
887	if (pix_colors[Color_fg] == pix_colors[i])	959	if (pix_colors[Color_fg] == pix_colors[i])
888	{	960	{
889	sprintf (fstr, "%d", (i - Color_Black));	961	sprintf (fstr, "%d", i - Color_Black);
890	break;	962	break;
891	}	963	}
892		964
893	for (i = Color_Black; i <= Color_White; i++)	965	for (i = Color_Black; i <= Color_White; i++)
894	if (pix_colors[Color_bg] == pix_colors[i])	966	if (pix_colors[Color_bg] == pix_colors[i])
895	{	967	{
896	sprintf (bstr, "%d", (i - Color_Black));	968	sprintf (bstr, "%d", i - Color_Black);
897	#ifdef BG_IMAGE_FROM_FILE	969	#ifdef BG_IMAGE_FROM_FILE
898	xpmb = "default;";	970	xpmb = "default;";
899	#endif	971	#endif
900	break;	972	break;
901	}	973	}
…		…
1004	XMoveResizeWindow (dpy, vt,	1076	XMoveResizeWindow (dpy, vt,
1005	window_vt_x, window_vt_y,	1077	window_vt_x, window_vt_y,
1006	width, height);	1078	width, height);
1007		1079
1008	#ifdef HAVE_BG_PIXMAP	1080	#ifdef HAVE_BG_PIXMAP
1009	if (bgPixmap.window_size_sensitive ())	1081	if (bg_window_size_sensitive ())
1010	update_background ();	1082	update_background ();
1011	#endif	1083	#endif
1012	}	1084	}
1013		1085
1014	if (fix_screen \|\| old_height == 0)	1086	if (fix_screen \|\| old_height == 0)
1015	scr_reset ();	1087	scr_reset ();
1016
1017	#ifdef HAVE_BG_PIXMAP
1018	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019	// if (bgPixmap.pixmap)
1020	// scr_touch (false);
1021	#endif
1022		1088
1023	#ifdef USE_XIM	1089	#ifdef USE_XIM
1024	IMSetPosition ();	1090	IMSetPosition ();
1025	#endif	1091	#endif
1026	}	1092	}
…		…
1275	p = pet[pi];	1341	p = pet[pi];
1276		1342
1277	if (!p)	1343	if (!p)
1278	continue;	1344	continue;
1279		1345
1280	s = rxvt_splitcommastring (p);	1346	s = rxvt_strsplit (',', p);
1281		1347
1282	for (i = found = 0; !found && s[i]; i++)	1348	for (i = found = 0; !found && s[i]; i++)
1283	{	1349	{
1284	if (!strcmp (s[i], "OverTheSpot"))	1350	if (!strcmp (s[i], "OverTheSpot"))
1285	input_style = XIMPreeditPosition \| XIMStatusNothing;	1351	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1297	input_style = XIMPreeditNothing \| XIMStatusNothing;	1363	input_style = XIMPreeditNothing \| XIMStatusNothing;
1298		1364
1299	for (j = 0; j < xim_styles->count_styles; j++)	1365	for (j = 0; j < xim_styles->count_styles; j++)
1300	if (input_style == xim_styles->supported_styles[j])	1366	if (input_style == xim_styles->supported_styles[j])
1301	{	1367	{
1302	rxvt_freecommastring (s);	1368	rxvt_free_strsplit (s);
1303		1369
1304	found = 1;	1370	found = 1;
1305	goto foundpet;	1371	goto foundpet;
1306	}	1372	}
1307		1373
1308	}	1374	}
1309		1375
1310	rxvt_freecommastring (s);	1376	rxvt_free_strsplit (s);
1311	}	1377	}
1312		1378
1313	foundpet:	1379	foundpet:
1314		1380
1315	XFree (xim_styles);	1381	XFree (xim_styles);
…		…
1471	p = rs[Rs_inputMethod];	1537	p = rs[Rs_inputMethod];
1472	if (p && *p)	1538	if (p && *p)
1473	{	1539	{
1474	bool found = false;	1540	bool found = false;
1475		1541
1476	s = rxvt_splitcommastring (p);	1542	s = rxvt_strsplit (',', p);
1477		1543
1478	for (i = 0; s[i]; i++)	1544	for (i = 0; s[i]; i++)
1479	{	1545	{
1480	if (*s[i])	1546	if (*s[i])
1481	{	1547	{
…		…
1487	break;	1553	break;
1488	}	1554	}
1489	}	1555	}
1490	}	1556	}
1491		1557
1492	rxvt_freecommastring (s);	1558	rxvt_free_strsplit (s);
1493		1559
1494	if (found)	1560	if (found)
1495	goto done;	1561	goto done;
1496	}	1562	}
1497		1563
…		…
1558	void	1624	void
1559	rxvt_term::get_window_origin (int &x, int &y)	1625	rxvt_term::get_window_origin (int &x, int &y)
1560	{	1626	{
1561	Window cr;	1627	Window cr;
1562	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1628	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1563	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1564	}	1629	}
1565		1630
1566	Pixmap	1631	Pixmap
1567	rxvt_term::get_pixmap_property (int prop_id)	1632	rxvt_term::get_pixmap_property (Atom property)
1568	{	1633	{
1569	if (prop_id > 0 && prop_id < NUM_XA)	1634	Pixmap pixmap = None;
1570	if (xa[prop_id])	1635
1571	{
1572	int aformat;	1636	int aformat;
1573	unsigned long nitems, bytes_after;	1637	unsigned long nitems, bytes_after;
1574	Atom atype;	1638	Atom atype;
1575	unsigned char *prop = NULL;	1639	unsigned char *prop;
1576	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1640	int result = XGetWindowProperty (dpy, display->root, property,
1577	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1641	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1578	&nitems, &bytes_after, &prop);	1642	&nitems, &bytes_after, &prop);
1579	if (result == Success && prop && atype == XA_PIXMAP)	1643	if (result == Success)
		1644	{
		1645	if (atype == XA_PIXMAP)
1580	return (Pixmap )prop;	1646	pixmap = (Pixmap )prop;
		1647	XFree (prop);
1581	}	1648	}
1582		1649
1583	return None;	1650	return pixmap;
1584	}	1651	}
1585		1652
1586	#ifdef HAVE_BG_PIXMAP	1653	#ifdef HAVE_BG_PIXMAP
1587	# if TRACE_PIXMAPS
1588	# undef update_background
1589	void
1590	rxvt_term::trace_update_background (const char *file, int line)
1591	{
1592	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1593	update_background ();
1594	}
1595	# endif
1596		1654
1597	void	1655	void
1598	rxvt_term::update_background ()	1656	rxvt_term::update_background ()
1599	{	1657	{
1600	if (update_background_ev.is_active ())	1658	if (update_background_ev.is_active ())
1601	return;	1659	return;
1602		1660
1603	bgPixmap.invalidate ();	1661	bg_invalidate ();
1604		1662
1605	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1663	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1606		1664
1607	if (to_wait <= 0.)	1665	if (to_wait <= 0.)
1608	bgPixmap.render ();	1666	bg_render ();
1609	else	1667	else
1610	update_background_ev.start (to_wait);	1668	update_background_ev.start (to_wait);
1611	}	1669	}
1612		1670
1613	void	1671	void
1614	rxvt_term::update_background_cb (ev::timer &w, int revents)	1672	rxvt_term::update_background_cb (ev::timer &w, int revents)
1615	{	1673	{
1616	make_current ();	1674	make_current ();
1617		1675
1618	update_background_ev.stop ();	1676	update_background_ev.stop ();
1619	bgPixmap.render ();	1677	bg_render ();
1620	refresh_check ();	1678	refresh_check ();
1621	}	1679	}
1622		1680
1623	#endif /* HAVE_BG_PIXMAP */	1681	#endif /* HAVE_BG_PIXMAP */
1624		1682

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC vs. Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC vs.
Revision 1.350 by sf-exg, Fri Jan 28 00:21:10 2011 UTC