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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.327 by root, Sun May 23 00:25:48 2010 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 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));
…		…
359	make_current ();	359	make_current ();
360		360
361	delete this;	361	delete this;
362	}	362	}
363		363
		364	void
		365	rxvt_term::set_option (uint8_t opt, bool set)
		366	{
		367	if (!opt)
		368	return;
		369
		370	uint8_t mask = 1 << (opt & 7);
		371	uint8_t &val = options [opt >> 3];
		372
		373	val = val & ~mask \| (set ? mask : 0);
		374	}
		375
364	/----------------------------------------------------------------------/	376	/----------------------------------------------------------------------/
365	/*	377	/*
366	* Exit gracefully, clearing the utmp entry and restoring tty attributes	378	* Exit gracefully, clearing the utmp entry and restoring tty attributes
367	* TODO: if debugging, this should free up any known resources if we can	379	* TODO: if debugging, this should free up any known resources if we can
368	*/	380	*/
…		…
380	print_x_error (Display dpy, XErrorEvent event)	392	print_x_error (Display dpy, XErrorEvent event)
381	{	393	{
382	char buffer[BUFSIZ];	394	char buffer[BUFSIZ];
383	char mesg[BUFSIZ];	395	char mesg[BUFSIZ];
384	char number[32];	396	char number[32];
385	char *mtype = "XlibMessage";	397	const char mtype[] = "XlibMessage";
386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	398	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	399	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388	rxvt_warn ("An X Error occured, trying to continue after report.\n");	400	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389	rxvt_warn ("%s: %s\n", mesg, buffer);	401	rxvt_warn ("%s: %s\n", mesg, buffer);
390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	402	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
392	sprintf(number, "%d", event->request_code);	404	sprintf(number, "%d", event->request_code);
393	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	405	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
…		…
474	rxvt_emergency_cleanup ();	486	rxvt_emergency_cleanup ();
475	w.stop ();	487	w.stop ();
476	kill (getpid (), w.signum);	488	kill (getpid (), w.signum);
477	}	489	}
478		490
		491	static void
		492	rxvt_get_ttymode (struct termios *tio)
		493	{
		494	if (tcgetattr (STDIN_FILENO, tio) < 0)
		495	memset (tio, 0, sizeof (struct termios));
		496
		497	for (int i = 0; i < NCCS; i++)
		498	tio->c_cc[i] = VDISABLE;
		499
		500	tio->c_cc[VINTR] = CINTR;
		501	tio->c_cc[VQUIT] = CQUIT;
		502	tio->c_cc[VERASE] = CERASE;
		503	#ifdef VERASE2
		504	tio->c_cc[VERASE2] = CERASE2;
		505	#endif
		506	tio->c_cc[VKILL] = CKILL;
		507	tio->c_cc[VEOF] = CEOF;
		508	tio->c_cc[VSTART] = CSTART;
		509	tio->c_cc[VSTOP] = CSTOP;
		510	tio->c_cc[VSUSP] = CSUSP;
		511	# ifdef VDSUSP
		512	tio->c_cc[VDSUSP] = CDSUSP;
		513	# endif
		514	# ifdef VREPRINT
		515	tio->c_cc[VREPRINT] = CRPRNT;
		516	# endif
		517	# ifdef VDISCRD
		518	tio->c_cc[VDISCRD] = CFLUSH;
		519	# endif
		520	# ifdef VWERSE
		521	tio->c_cc[VWERSE] = CWERASE;
		522	# endif
		523	# ifdef VLNEXT
		524	tio->c_cc[VLNEXT] = CLNEXT;
		525	# endif
		526	# ifdef VSTATUS
		527	tio->c_cc[VSTATUS] = CSTATUS;
		528	# endif
		529
		530	# if VMIN != VEOF
		531	tio->c_cc[VMIN] = 1;
		532	# endif
		533	# if VTIME != VEOL
		534	tio->c_cc[VTIME] = 0;
		535	# endif
		536
		537	/* input modes */
		538	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		539	# ifdef IMAXBEL
		540	\| IMAXBEL
		541	# endif
		542	\| IXON);
		543
		544	/* output modes */
		545	tio->c_oflag = (OPOST \| ONLCR);
		546
		547	/* control modes */
		548	tio->c_cflag = (CS8 \| CREAD);
		549
		550	/* local modes */
		551	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		552	# if defined (ECHOCTL) && defined (ECHOKE)
		553	\| ECHOCTL \| ECHOKE
		554	# endif
		555	\| ECHOE \| ECHOK);
		556	}
		557
479	char **rxvt_environ; // startup environment	558	char **rxvt_environ; // startup environment
480		559
481	void	560	void
482	rxvt_init ()	561	rxvt_init ()
483	{	562	{
484	assert (("fontMask must not overlap other RS masks",	563	assert (("fontMask must not overlap other RS masks",
485	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));	564	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
486		565
487	ptytty::init ();	566	rxvt_get_ttymode (&rxvt_term::def_tio);
488		567
		568	// get rid of stdin/stdout as we don't need them, to free resources
		569	dup2 (STDERR_FILENO, STDIN_FILENO);
		570	dup2 (STDERR_FILENO, STDOUT_FILENO);
		571
489	if (!ev_default_loop (0))	572	if (!ev_default_loop ())
490	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	573	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491		574
492	rxvt_environ = environ;	575	rxvt_environ = environ;
493		576
494	signal (SIGHUP, SIG_IGN);	577	signal (SIGHUP, SIG_IGN);
495	signal (SIGPIPE, SIG_IGN);	578	signal (SIGPIPE, SIG_IGN);
496		579
497	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	580	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
498	sig_handlers.sw_int.start (SIGINT); ev_unref ();	581	sig_handlers.sw_int.start (SIGINT); ev_unref ();
499
500	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
501	/* signal (SIGURG, SIG_DFL); */
502		582
503	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	583	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
504	// TODO: handle this with exceptions and tolerate the memory loss	584	// TODO: handle this with exceptions and tolerate the memory loss
505	XSetIOErrorHandler (rxvt_xioerror_handler);	585	XSetIOErrorHandler (rxvt_xioerror_handler);
506		586
…		…
754	prop, XA_STRING, 8, PropModeReplace,	834	prop, XA_STRING, 8, PropModeReplace,
755	(const unsigned char *)str, len >= 0 ? len : strlen (str));	835	(const unsigned char *)str, len >= 0 ? len : strlen (str));
756	}	836	}
757		837
758	void	838	void
		839	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		840	{
		841	XTextProperty ct;
		842
		843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		844	{
		845	XSetTextProperty (dpy, parent[0], &ct, prop);
		846	XFree (ct.value);
		847	}
		848	}
		849
		850	void
759	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
760	{	852	{
761	wchar_t *ws = rxvt_mbstowcs (str, len);	853	wchar_t *ws = rxvt_mbstowcs (str, len);
762	char *s = rxvt_wcstoutf8 (ws);	854	char *s = rxvt_wcstoutf8 (ws);
763		855
…		…
773	/----------------------------------------------------------------------/	865	/----------------------------------------------------------------------/
774	/* xterm sequences - title, iconName, color (exptl) */	866	/* xterm sequences - title, iconName, color (exptl) */
775	void	867	void
776	rxvt_term::set_title (const char *str)	868	rxvt_term::set_title (const char *str)
777	{	869	{
778	set_string_property (XA_WM_NAME, str);	870	set_mbstring_property (XA_WM_NAME, str);
779	#if ENABLE_EWMH	871	#if ENABLE_EWMH
780	set_utf8_property (xa[XA_NET_WM_NAME], str);	872	set_utf8_property (xa[XA_NET_WM_NAME], str);
781	#endif	873	#endif
782	}	874	}
783		875
784	void	876	void
785	rxvt_term::set_icon_name (const char *str)	877	rxvt_term::set_icon_name (const char *str)
786	{	878	{
787	set_string_property (XA_WM_ICON_NAME, str);	879	set_mbstring_property (XA_WM_ICON_NAME, str);
788	#if ENABLE_EWMH	880	#if ENABLE_EWMH
789	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	881	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
790	#endif	882	#endif
791	}	883	}
792		884
…		…
864	void	956	void
865	rxvt_term::set_colorfgbg ()	957	rxvt_term::set_colorfgbg ()
866	{	958	{
867	unsigned int i;	959	unsigned int i;
868	const char *xpmb = "";	960	const char *xpmb = "";
869	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	961	char fstr[] = "default";
		962	char bstr[] = "default";
870		963
871	strcpy (fstr, "default");
872	strcpy (bstr, "default");
873	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
874	if (pix_colors[Color_fg] == pix_colors[i])	965	if (pix_colors[Color_fg] == pix_colors[i])
875	{	966	{
876	sprintf (fstr, "%d", (i - Color_Black));	967	sprintf (fstr, "%d", i - Color_Black);
877	break;	968	break;
878	}	969	}
879		970
880	for (i = Color_Black; i <= Color_White; i++)	971	for (i = Color_Black; i <= Color_White; i++)
881	if (pix_colors[Color_bg] == pix_colors[i])	972	if (pix_colors[Color_bg] == pix_colors[i])
882	{	973	{
883	sprintf (bstr, "%d", (i - Color_Black));	974	sprintf (bstr, "%d", i - Color_Black);
884	#ifdef BG_IMAGE_FROM_FILE	975	#ifdef BG_IMAGE_FROM_FILE
885	xpmb = "default;";	976	xpmb = "default;";
886	#endif	977	#endif
887	break;	978	break;
888	}	979	}
…		…
999	}	1090	}
1000		1091
1001	if (fix_screen \|\| old_height == 0)	1092	if (fix_screen \|\| old_height == 0)
1002	scr_reset ();	1093	scr_reset ();
1003		1094
1004	#ifdef HAVE_BG_PIXMAP
1005	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1006	// if (bgPixmap.pixmap)
1007	// scr_touch (false);
1008	#endif
1009
1010	#ifdef USE_XIM	1095	#ifdef USE_XIM
1011	IMSetPosition ();	1096	IMSetPosition ();
1012	#endif	1097	#endif
1013	}	1098	}
1014		1099
…		…
1262	p = pet[pi];	1347	p = pet[pi];
1263		1348
1264	if (!p)	1349	if (!p)
1265	continue;	1350	continue;
1266		1351
1267	s = rxvt_splitcommastring (p);	1352	s = rxvt_strsplit (',', p);
1268		1353
1269	for (i = found = 0; !found && s[i]; i++)	1354	for (i = found = 0; !found && s[i]; i++)
1270	{	1355	{
1271	if (!strcmp (s[i], "OverTheSpot"))	1356	if (!strcmp (s[i], "OverTheSpot"))
1272	input_style = XIMPreeditPosition \| XIMStatusNothing;	1357	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1284	input_style = XIMPreeditNothing \| XIMStatusNothing;	1369	input_style = XIMPreeditNothing \| XIMStatusNothing;
1285		1370
1286	for (j = 0; j < xim_styles->count_styles; j++)	1371	for (j = 0; j < xim_styles->count_styles; j++)
1287	if (input_style == xim_styles->supported_styles[j])	1372	if (input_style == xim_styles->supported_styles[j])
1288	{	1373	{
1289	rxvt_freecommastring (s);	1374	rxvt_free_strsplit (s);
1290		1375
1291	found = 1;	1376	found = 1;
1292	goto foundpet;	1377	goto foundpet;
1293	}	1378	}
1294		1379
1295	}	1380	}
1296		1381
1297	rxvt_freecommastring (s);	1382	rxvt_free_strsplit (s);
1298	}	1383	}
1299		1384
1300	foundpet:	1385	foundpet:
1301		1386
1302	XFree (xim_styles);	1387	XFree (xim_styles);
…		…
1458	p = rs[Rs_inputMethod];	1543	p = rs[Rs_inputMethod];
1459	if (p && *p)	1544	if (p && *p)
1460	{	1545	{
1461	bool found = false;	1546	bool found = false;
1462		1547
1463	s = rxvt_splitcommastring (p);	1548	s = rxvt_strsplit (',', p);
1464		1549
1465	for (i = 0; s[i]; i++)	1550	for (i = 0; s[i]; i++)
1466	{	1551	{
1467	if (*s[i])	1552	if (*s[i])
1468	{	1553	{
…		…
1474	break;	1559	break;
1475	}	1560	}
1476	}	1561	}
1477	}	1562	}
1478		1563
1479	rxvt_freecommastring (s);	1564	rxvt_free_strsplit (s);
1480		1565
1481	if (found)	1566	if (found)
1482	goto done;	1567	goto done;
1483	}	1568	}
1484		1569
…		…
1545	void	1630	void
1546	rxvt_term::get_window_origin (int &x, int &y)	1631	rxvt_term::get_window_origin (int &x, int &y)
1547	{	1632	{
1548	Window cr;	1633	Window cr;
1549	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1634	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1550	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551	}	1635	}
1552		1636
1553	Pixmap	1637	Pixmap
1554	rxvt_term::get_pixmap_property (int prop_id)	1638	rxvt_term::get_pixmap_property (Atom property)
1555	{	1639	{
1556	if (prop_id > 0 && prop_id < NUM_XA)	1640	Pixmap pixmap = None;
1557	if (xa[prop_id])	1641
1558	{
1559	int aformat;	1642	int aformat;
1560	unsigned long nitems, bytes_after;	1643	unsigned long nitems, bytes_after;
1561	Atom atype;	1644	Atom atype;
1562	unsigned char *prop = NULL;	1645	unsigned char *prop;
1563	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1646	int result = XGetWindowProperty (dpy, display->root, property,
1564	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1647	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565	&nitems, &bytes_after, &prop);	1648	&nitems, &bytes_after, &prop);
1566	if (result == Success && prop && atype == XA_PIXMAP)	1649	if (result == Success)
		1650	{
		1651	if (atype == XA_PIXMAP)
1567	return (Pixmap )prop;	1652	pixmap = (Pixmap )prop;
		1653	XFree (prop);
1568	}	1654	}
1569		1655
1570	return None;	1656	return pixmap;
1571	}	1657	}
1572		1658
1573	#ifdef HAVE_BG_PIXMAP	1659	#ifdef HAVE_BG_PIXMAP
1574	# if TRACE_PIXMAPS
1575	# undef update_background
1576	void
1577	rxvt_term::trace_update_background (const char *file, int line)
1578	{
1579	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580	update_background ();
1581	}
1582	# endif
1583		1660
1584	void	1661	void
1585	rxvt_term::update_background ()	1662	rxvt_term::update_background ()
1586	{	1663	{
1587	if (update_background_ev.is_active ())	1664	if (update_background_ev.is_active ())

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.327 by root, Sun May 23 00:25:48 2010 UTC vs. Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.327 by root, Sun May 23 00:25:48 2010 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC