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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC vs.
Revision 1.351 by sf-exg, Tue Feb 1 00:41:01 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
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
93	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)
94	{	97	{
95	compose_char *cc;	98	compose_char *cc;
96		99
97	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	102	cc = (*this)[c1];
100	while (cc)	103	while (cc)
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see whether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
111	}
112		113
113	// allocate a new combination	114	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	116	{
116	static int seen;	117	static int seen;
117		118
118	if (!seen++)	119	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		121
121	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
122	}	123	}
123		124
124	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
225	delete fontset[i];	226	delete fontset[i];
226	#endif	227	#endif
227	delete fontset[0];	228	delete fontset[0];
228		229
229	#ifdef HAVE_BG_PIXMAP	230	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	231	bg_destroy ();
231	#endif
232	#ifdef HAVE_AFTERIMAGE
233	if (asv)
234	destroy_asvisual (asv, 0);
235	if (asimman)
236	destroy_image_manager (asimman, 0);
237	#endif	232	#endif
238		233
239	if (display)	234	if (display)
240	{	235	{
241	selection_clear ();	236	selection_clear ();
…		…
358	make_current ();	353	make_current ();
359		354
360	delete this;	355	delete this;
361	}	356	}
362		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
363	/----------------------------------------------------------------------/	370	/----------------------------------------------------------------------/
364	/*	371	/*
365	* Exit gracefully, clearing the utmp entry and restoring tty attributes	372	* Exit gracefully, clearing the utmp entry and restoring tty attributes
366	* 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
367	*/	374	*/
…		…
379	print_x_error (Display dpy, XErrorEvent event)	386	print_x_error (Display dpy, XErrorEvent event)
380	{	387	{
381	char buffer[BUFSIZ];	388	char buffer[BUFSIZ];
382	char mesg[BUFSIZ];	389	char mesg[BUFSIZ];
383	char number[32];	390	char number[32];
384	char *mtype = "XlibMessage";	391	const char mtype[] = "XlibMessage";
385	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	392	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
386	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	393	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387	rxvt_warn ("An X Error occured, trying to continue after report.\n");	394	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
388	rxvt_warn ("%s: %s\n", mesg, buffer);	395	rxvt_warn ("%s: %s\n", mesg, buffer);
389	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	396	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	397	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
391	sprintf(number, "%d", event->request_code);	398	sprintf(number, "%d", event->request_code);
392	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	399	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
393	rxvt_warn ("(which is %s)\n", buffer);	400	rxvt_warn ("(which is %s)\n", buffer);
394	if (event->request_code >= 128) {	401	if (event->request_code >= 128) {
395	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	402	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
396	mesg, BUFSIZ);	403	mesg, BUFSIZ);
397	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	404	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
398	}	405	}
399	if ((event->error_code == BadWindow) \|\|	406	if ((event->error_code == BadWindow) \|\|
400	(event->error_code == BadPixmap) \|\|	407	(event->error_code == BadPixmap) \|\|
401	(event->error_code == BadCursor) \|\|	408	(event->error_code == BadCursor) \|\|
402	(event->error_code == BadFont) \|\|	409	(event->error_code == BadFont) \|\|
403	(event->error_code == BadDrawable) \|\|	410	(event->error_code == BadDrawable) \|\|
404	(event->error_code == BadColor) \|\|	411	(event->error_code == BadColor) \|\|
405	(event->error_code == BadGC) \|\|	412	(event->error_code == BadGC) \|\|
406	(event->error_code == BadIDChoice) \|\|	413	(event->error_code == BadIDChoice) \|\|
407	(event->error_code == BadValue) \|\|	414	(event->error_code == BadValue) \|\|
408	(event->error_code == BadAtom)) {	415	(event->error_code == BadAtom)) {
409	if (event->error_code == BadValue)	416	if (event->error_code == BadValue)
410	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
411	mesg, BUFSIZ);	418	mesg, BUFSIZ);
412	else if (event->error_code == BadAtom)	419	else if (event->error_code == BadAtom)
413	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	420	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
414	mesg, BUFSIZ);	421	mesg, BUFSIZ);
415	else	422	else
416	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	423	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
417	mesg, BUFSIZ);	424	mesg, BUFSIZ);
418	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419	}	426	}
420	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	427	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
421	mesg, BUFSIZ);	428	mesg, BUFSIZ);
422	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	429	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423	}	430	}
424	#endif	431	#endif
425		432
426	int	433	int
…		…
473	rxvt_emergency_cleanup ();	480	rxvt_emergency_cleanup ();
474	w.stop ();	481	w.stop ();
475	kill (getpid (), w.signum);	482	kill (getpid (), w.signum);
476	}	483	}
477		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
478	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
479		553
480	void	554	void
481	rxvt_init ()	555	rxvt_init ()
482	{	556	{
483	ptytty::init ();	557	assert (("fontMask must not overlap other RS masks",
		558	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
484		559
		560	rxvt_get_ttymode (&rxvt_term::def_tio);
		561
		562	// get rid of stdin/stdout as we don't need them, to free resources
		563	dup2 (STDERR_FILENO, STDIN_FILENO);
		564	dup2 (STDERR_FILENO, STDOUT_FILENO);
		565
485	if (!ev_default_loop (0))	566	if (!ev_default_loop ())
486	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	567	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487		568
488	rxvt_environ = environ;	569	rxvt_environ = environ;
489		570
490	signal (SIGHUP, SIG_IGN);	571	signal (SIGHUP, SIG_IGN);
491	signal (SIGPIPE, SIG_IGN);	572	signal (SIGPIPE, SIG_IGN);
492		573
493	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	574	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494	sig_handlers.sw_int.start (SIGINT); ev_unref ();	575	sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
497	/* signal (SIGURG, SIG_DFL); */
498		576
499	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	577	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500	// TODO: handle this with exceptions and tolerate the memory loss	578	// TODO: handle this with exceptions and tolerate the memory loss
501	XSetIOErrorHandler (rxvt_xioerror_handler);	579	XSetIOErrorHandler (rxvt_xioerror_handler);
502		580
…		…
688	#endif	766	#endif
689		767
690	delete fontset[0];	768	delete fontset[0];
691	fontset[0] = fs;	769	fontset[0] = fs;
692		770
693	prop = (*fs)[1]->properties ();	771	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694	prop.height += lineSpace;	772	prop.height += lineSpace;
695	prop.width += letterSpace;	773	prop.width += letterSpace;
696		774
697	fs->set_prop (prop, false);	775	fs->set_prop (prop, false);
698		776
…		…
750	prop, XA_STRING, 8, PropModeReplace,	828	prop, XA_STRING, 8, PropModeReplace,
751	(const unsigned char *)str, len >= 0 ? len : strlen (str));	829	(const unsigned char *)str, len >= 0 ? len : strlen (str));
752	}	830	}
753		831
754	void	832	void
		833	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		834	{
		835	XTextProperty ct;
		836
		837	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		838	{
		839	XSetTextProperty (dpy, parent[0], &ct, prop);
		840	XFree (ct.value);
		841	}
		842	}
		843
		844	void
755	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	845	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756	{	846	{
757	wchar_t *ws = rxvt_mbstowcs (str, len);	847	wchar_t *ws = rxvt_mbstowcs (str, len);
758	char *s = rxvt_wcstoutf8 (ws);	848	char *s = rxvt_wcstoutf8 (ws);
759		849
…		…
769	/----------------------------------------------------------------------/	859	/----------------------------------------------------------------------/
770	/* xterm sequences - title, iconName, color (exptl) */	860	/* xterm sequences - title, iconName, color (exptl) */
771	void	861	void
772	rxvt_term::set_title (const char *str)	862	rxvt_term::set_title (const char *str)
773	{	863	{
774	set_string_property (XA_WM_NAME, str);	864	set_mbstring_property (XA_WM_NAME, str);
775	#if ENABLE_EWMH	865	#if ENABLE_EWMH
776	set_utf8_property (xa[XA_NET_WM_NAME], str);	866	set_utf8_property (xa[XA_NET_WM_NAME], str);
777	#endif	867	#endif
778	}	868	}
779		869
780	void	870	void
781	rxvt_term::set_icon_name (const char *str)	871	rxvt_term::set_icon_name (const char *str)
782	{	872	{
783	set_string_property (XA_WM_ICON_NAME, str);	873	set_mbstring_property (XA_WM_ICON_NAME, str);
784	#if ENABLE_EWMH	874	#if ENABLE_EWMH
785	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	875	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786	#endif	876	#endif
787	}	877	}
788		878
…		…
860	void	950	void
861	rxvt_term::set_colorfgbg ()	951	rxvt_term::set_colorfgbg ()
862	{	952	{
863	unsigned int i;	953	unsigned int i;
864	const char *xpmb = "";	954	const char *xpmb = "";
865	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	955	char fstr[] = "default";
		956	char bstr[] = "default";
866		957
867	strcpy (fstr, "default");
868	strcpy (bstr, "default");
869	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
870	if (pix_colors[Color_fg] == pix_colors[i])	959	if (pix_colors[Color_fg] == pix_colors[i])
871	{	960	{
872	sprintf (fstr, "%d", (i - Color_Black));	961	sprintf (fstr, "%d", i - Color_Black);
873	break;	962	break;
874	}	963	}
875		964
876	for (i = Color_Black; i <= Color_White; i++)	965	for (i = Color_Black; i <= Color_White; i++)
877	if (pix_colors[Color_bg] == pix_colors[i])	966	if (pix_colors[Color_bg] == pix_colors[i])
878	{	967	{
879	sprintf (bstr, "%d", (i - Color_Black));	968	sprintf (bstr, "%d", i - Color_Black);
880	#ifdef BG_IMAGE_FROM_FILE	969	#ifdef BG_IMAGE_FROM_FILE
881	xpmb = "default;";	970	xpmb = "default;";
882	#endif	971	#endif
883	break;	972	break;
884	}	973	}
…		…
987	XMoveResizeWindow (dpy, vt,	1076	XMoveResizeWindow (dpy, vt,
988	window_vt_x, window_vt_y,	1077	window_vt_x, window_vt_y,
989	width, height);	1078	width, height);
990		1079
991	#ifdef HAVE_BG_PIXMAP	1080	#ifdef HAVE_BG_PIXMAP
992	if (bgPixmap.window_size_sensitive ())	1081	if (bg_window_size_sensitive ())
993	update_background ();	1082	update_background ();
994	#endif	1083	#endif
995	}	1084	}
996		1085
997	if (fix_screen \|\| old_height == 0)	1086	if (fix_screen \|\| old_height == 0)
998	scr_reset ();	1087	scr_reset ();
999
1000	#ifdef HAVE_BG_PIXMAP
1001	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002	// if (bgPixmap.pixmap)
1003	// scr_touch (false);
1004	#endif
1005		1088
1006	#ifdef USE_XIM	1089	#ifdef USE_XIM
1007	IMSetPosition ();	1090	IMSetPosition ();
1008	#endif	1091	#endif
1009	}	1092	}
…		…
1092		1175
1093	atom = XInternAtom (dpy, server, False);	1176	atom = XInternAtom (dpy, server, False);
1094	win = XGetSelectionOwner (dpy, atom);	1177	win = XGetSelectionOwner (dpy, atom);
1095		1178
1096	if (win != None)	1179	if (win != None)
1097	return True;	1180	return true;
1098	}	1181	}
1099		1182
1100	return False;	1183	return false;
1101	}	1184	}
1102		1185
1103	void	1186	void
1104	rxvt_term::IMSendSpot ()	1187	rxvt_term::IMSendSpot ()
1105	{	1188	{
…		…
1258	p = pet[pi];	1341	p = pet[pi];
1259		1342
1260	if (!p)	1343	if (!p)
1261	continue;	1344	continue;
1262		1345
1263	s = rxvt_splitcommastring (p);	1346	s = rxvt_strsplit (',', p);
1264		1347
1265	for (i = found = 0; !found && s[i]; i++)	1348	for (i = found = 0; !found && s[i]; i++)
1266	{	1349	{
1267	if (!strcmp (s[i], "OverTheSpot"))	1350	if (!strcmp (s[i], "OverTheSpot"))
1268	input_style = XIMPreeditPosition \| XIMStatusNothing;	1351	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1280	input_style = XIMPreeditNothing \| XIMStatusNothing;	1363	input_style = XIMPreeditNothing \| XIMStatusNothing;
1281		1364
1282	for (j = 0; j < xim_styles->count_styles; j++)	1365	for (j = 0; j < xim_styles->count_styles; j++)
1283	if (input_style == xim_styles->supported_styles[j])	1366	if (input_style == xim_styles->supported_styles[j])
1284	{	1367	{
1285	rxvt_freecommastring (s);	1368	rxvt_free_strsplit (s);
1286		1369
1287	found = 1;	1370	found = 1;
1288	goto foundpet;	1371	goto foundpet;
1289	}	1372	}
1290		1373
1291	}	1374	}
1292		1375
1293	rxvt_freecommastring (s);	1376	rxvt_free_strsplit (s);
1294	}	1377	}
1295		1378
1296	foundpet:	1379	foundpet:
1297		1380
1298	XFree (xim_styles);	1381	XFree (xim_styles);
…		…
1454	p = rs[Rs_inputMethod];	1537	p = rs[Rs_inputMethod];
1455	if (p && *p)	1538	if (p && *p)
1456	{	1539	{
1457	bool found = false;	1540	bool found = false;
1458		1541
1459	s = rxvt_splitcommastring (p);	1542	s = rxvt_strsplit (',', p);
1460		1543
1461	for (i = 0; s[i]; i++)	1544	for (i = 0; s[i]; i++)
1462	{	1545	{
1463	if (*s[i])	1546	if (*s[i])
1464	{	1547	{
…		…
1470	break;	1553	break;
1471	}	1554	}
1472	}	1555	}
1473	}	1556	}
1474		1557
1475	rxvt_freecommastring (s);	1558	rxvt_free_strsplit (s);
1476		1559
1477	if (found)	1560	if (found)
1478	goto done;	1561	goto done;
1479	}	1562	}
1480		1563
…		…
1541	void	1624	void
1542	rxvt_term::get_window_origin (int &x, int &y)	1625	rxvt_term::get_window_origin (int &x, int &y)
1543	{	1626	{
1544	Window cr;	1627	Window cr;
1545	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1628	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547	}	1629	}
1548		1630
1549	Pixmap	1631	Pixmap
1550	rxvt_term::get_pixmap_property (int prop_id)	1632	rxvt_term::get_pixmap_property (Atom property)
1551	{	1633	{
1552	if (prop_id > 0 && prop_id < NUM_XA)	1634	Pixmap pixmap = None;
1553	if (xa[prop_id])	1635
1554	{
1555	int aformat;	1636	int aformat;
1556	unsigned long nitems, bytes_after;	1637	unsigned long nitems, bytes_after;
1557	Atom atype;	1638	Atom atype;
1558	unsigned char *prop = NULL;	1639	unsigned char *prop;
1559	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1640	int result = XGetWindowProperty (dpy, display->root, property,
1560	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1641	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561	&nitems, &bytes_after, &prop);	1642	&nitems, &bytes_after, &prop);
1562	if (result == Success && prop && atype == XA_PIXMAP)	1643	if (result == Success)
		1644	{
		1645	if (atype == XA_PIXMAP)
1563	return (Pixmap )prop;	1646	pixmap = (Pixmap )prop;
		1647	XFree (prop);
1564	}	1648	}
1565		1649
1566	return None;	1650	return pixmap;
1567	}	1651	}
1568		1652
1569	#ifdef HAVE_BG_PIXMAP	1653	#ifdef HAVE_BG_PIXMAP
1570	# if TRACE_PIXMAPS
1571	# undef update_background
1572	void
1573	rxvt_term::trace_update_background (const char *file, int line)
1574	{
1575	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576	update_background ();
1577	}
1578	# endif
1579		1654
1580	void	1655	void
1581	rxvt_term::update_background ()	1656	rxvt_term::update_background ()
1582	{	1657	{
1583	if (update_background_ev.is_active ())	1658	if (update_background_ev.is_active ())
1584	return;	1659	return;
1585		1660
1586	bgPixmap.invalidate ();	1661	bg_invalidate ();
1587		1662
1588	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1663	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1589		1664
1590	if (to_wait <= 0.)	1665	if (to_wait <= 0.)
1591	bgPixmap.render ();	1666	bg_render ();
1592	else	1667	else
1593	update_background_ev.start (to_wait);	1668	update_background_ev.start (to_wait);
1594	}	1669	}
1595		1670
1596	void	1671	void
1597	rxvt_term::update_background_cb (ev::timer &w, int revents)	1672	rxvt_term::update_background_cb (ev::timer &w, int revents)
1598	{	1673	{
1599	make_current ();	1674	make_current ();
1600		1675
1601	update_background_ev.stop ();	1676	update_background_ev.stop ();
1602	bgPixmap.render ();	1677	bg_render ();
1603	refresh_check ();	1678	refresh_check ();
1604	}	1679	}
1605		1680
1606	#endif /* HAVE_BG_PIXMAP */	1681	#endif /* HAVE_BG_PIXMAP */
1607		1682

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC vs. Revision 1.351 by sf-exg, Tue Feb 1 00:41:01 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC vs.
Revision 1.351 by sf-exg, Tue Feb 1 00:41:01 2011 UTC