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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC

…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	# include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	155	{
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
155	#endif
156	#if HAVE_BG_PIXMAP
157	update_background_ev(this, &rxvt_term::update_background_cb),
158	#endif	176	#endif
159	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161	#endif	179	#endif
162	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	182	#endif
177	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	185	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	186	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	188	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	190	prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); flush_ev.set (0., 1. / 60.); // refresh at max. 60 Hz normally
189	check_ev (this, &rxvt_term::check_cb),	192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	196	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194	{	197
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	198	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		199
197	termlist.push_back (this);	200	termlist.push_back (this);
198		201
199	#ifdef KEYSYM_RESOURCE	202	#ifdef KEYSYM_RESOURCE
…		…
279	delete [] pix_colors_focused;	282	delete [] pix_colors_focused;
280	#if OFF_FOCUS_FADING	283	#if OFF_FOCUS_FADING
281	delete [] pix_colors_unfocused;	284	delete [] pix_colors_unfocused;
282	#endif	285	#endif
283		286
		287	#ifdef HAVE_BG_PIXMAP
		288	bgPixmap.destroy ();
		289	#endif
284	displays.put (display);	290	displays.put (display);
285		291
286	scr_release ();	292	scr_release ();
287		293
288	/* clear all resources */	294	/* clear all resources */
…		…
301	delete argv;	307	delete argv;
302		308
303	#ifdef KEYSYM_RESOURCE	309	#ifdef KEYSYM_RESOURCE
304	delete keyboard;	310	delete keyboard;
305	#endif	311	#endif
		312	#ifndef NO_RESOURCES
		313	XrmDestroyDatabase (option_db);
		314	#endif
306	}	315	}
307		316
308	// child has exited, usually destroys	317	// child has exited, usually destroys
309	void	318	void
310	rxvt_term::child_cb (child_watcher &w, int status)	319	rxvt_term::child_cb (ev::child &w, int status)
311	{	320	{
312	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	321	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313		322
314	cmd_pid = 0;	323	cmd_pid = 0;
315		324
…		…
318	}	327	}
319		328
320	void	329	void
321	rxvt_term::destroy ()	330	rxvt_term::destroy ()
322	{	331	{
323	if (destroy_ev.active)	332	if (ev_is_active (&destroy_ev))
324	return;	333	return;
325		334
326	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327		336
328	#if ENABLE_OVERLAY	337	#if ENABLE_OVERLAY
…		…
343	incr_ev.stop ();	352	incr_ev.stop ();
344	termwin_ev.stop (display);	353	termwin_ev.stop (display);
345	vt_ev.stop (display);	354	vt_ev.stop (display);
346	}	355	}
347		356
348	check_ev.stop ();	357	prepare_ev.stop ();
349	pty_ev.stop ();	358	pty_ev.stop ();
350	#ifdef CURSOR_BLINK	359	#ifdef CURSOR_BLINK
351	cursor_blink_ev.stop ();	360	cursor_blink_ev.stop ();
352	#endif	361	#endif
353	#ifdef TEXT_BLINK	362	#ifdef TEXT_BLINK
…		…
361	#endif	370	#endif
362	#ifdef POINTER_BLANK	371	#ifdef POINTER_BLANK
363	pointer_ev.stop ();	372	pointer_ev.stop ();
364	#endif	373	#endif
365		374
366	destroy_ev.start (0);	375	destroy_ev.start ();
367	}	376	}
368		377
369	void	378	void
370	rxvt_term::destroy_cb (time_watcher &w)	379	rxvt_term::destroy_cb (ev::idle &w, int revents)
371	{	380	{
372	make_current ();	381	make_current ();
373		382
374	delete this;	383	delete this;
375	}	384	}
…		…
429	else	438	else
430	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431	mesg, BUFSIZ);	440	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433	}	442	}
434	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435	mesg, BUFSIZ);	444	mesg, BUFSIZ);
436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437	}	446	}
438	#endif	447	#endif
439		448
…		…
513		522
514	#ifdef ENABLE_TRANSPARENCY	523	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))	524	if (option (Opt_transparent))
516	{	525	{
517	bgPixmap.set_transparent ();	526	bgPixmap.set_transparent ();
518	#ifdef HAVE_AFTERIMAGE	527	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])	528	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif	530	#endif
522	if (ISSET_PIXCOLOR (Color_tint))	531	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524	if (rs [Rs_shade])	533	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);	534	bgPixmap.set_shade (rs [Rs_shade]);
526		535
…		…
560	init_command (cmd_argv);	569	init_command (cmd_argv);
561		570
562	free (cmd_argv);	571	free (cmd_argv);
563		572
564	if (pty->pty >= 0)	573	if (pty->pty >= 0)
565	pty_ev.start (pty->pty, EVENT_READ);	574	pty_ev.start (pty->pty, ev::READ);
566		575
567	check_ev.start ();	576	prepare_ev.start ();
568		577
569	HOOK_INVOKE ((this, HOOK_START, DT_END));	578	HOOK_INVOKE ((this, HOOK_START, DT_END));
570		579
571	#if ENABLE_XEMBED	580	#if ENABLE_XEMBED
572	if (rs[Rs_embed])	581	if (rs[Rs_embed])
…		…
584	return true;	593	return true;
585	}	594	}
586		595
587	static struct sig_handlers	596	static struct sig_handlers
588	{	597	{
589	sig_watcher sw_term, sw_int;	598	ev::sig sw_term, sw_int;
590		599
591	/*	600	/*
592	* Catch a fatal signal and tidy up before quitting	601	* Catch a fatal signal and tidy up before quitting
593	*/	602	*/
594	void	603	void sig_term (ev::sig &w, int revents);
595	sig_term (sig_watcher &w)	604
		605	sig_handlers ()
596	{	606	{
597	rxvt_emergency_cleanup ();	607	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
598	signal (w.signum, SIG_DFL);
599	kill (getpid (), w.signum);
600	}
601
602	sig_handlers ()
603	: sw_term (this, &sig_handlers::sig_term),
604	sw_int (this, &sig_handlers::sig_term)	608	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605	{
606	}	609	}
607	} sig_handlers;	610	} sig_handlers;
608		611
		612	void
		613	sig_handlers::sig_term (ev::sig &w, int revents)
		614	{
		615	rxvt_emergency_cleanup ();
		616	w.stop ();
		617	kill (getpid (), w.signum);
		618	}
		619
609	char **rxvt_environ; // startup environment	620	char **rxvt_environ; // startup environment
610		621
611	void	622	void
612	rxvt_init ()	623	rxvt_init ()
613	{	624	{
614	ptytty::init ();	625	ptytty::init ();
		626
		627	if (!ev_default_loop (0))
		628	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615		629
616	rxvt_environ = environ;	630	rxvt_environ = environ;
617		631
618	signal (SIGHUP, SIG_IGN);	632	signal (SIGHUP, SIG_IGN);
619	signal (SIGPIPE, SIG_IGN);	633	signal (SIGPIPE, SIG_IGN);
620		634
621	sig_handlers.sw_term.start (SIGTERM);	635	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622	sig_handlers.sw_int.start (SIGINT);	636	sig_handlers.sw_int.start (SIGINT); ev_unref ();
623		637
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	638	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	639	/* signal (SIGURG, SIG_DFL); */
626		640
627	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
813	ws.ws_xpixel = width;	827	ws.ws_xpixel = width;
814	ws.ws_ypixel = height;	828	ws.ws_ypixel = height;
815	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
816		830
817	#if 0	831	#if 0
818	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	832	// TIOCSWINSZ is supposed to do this automatically and correctly
819	if (cmd_pid) /* force through to the command */	833	if (cmd_pid) /* force through to the command */
820	kill (-cmd_pid, SIGWINCH);	834	kill (-cmd_pid, SIGWINCH);
821	#endif	835	#endif
822	}	836	}
823		837
…		…
897	if (parent[0])	911	if (parent[0])
898	{	912	{
899	resize_all_windows (0, 0, 0);	913	resize_all_windows (0, 0, 0);
900	scr_remap_chars ();	914	scr_remap_chars ();
901	scr_touch (true);	915	scr_touch (true);
902	}	916	}
903		917
904	return true;	918	return true;
905	}	919	}
906		920
907	void	921	void
…		…
951	rxvt_term::set_window_color (int idx, const char *color)	965	rxvt_term::set_window_color (int idx, const char *color)
952	{	966	{
953	#ifdef XTERM_COLOR_CHANGE	967	#ifdef XTERM_COLOR_CHANGE
954	rxvt_color xcol;	968	rxvt_color xcol;
955	int i;	969	int i;
956		970
957	if (color == NULL \|\| *color == '\0')	971	if (color == NULL \|\| *color == '\0')
958	return;	972	return;
959		973
960	color = strdup (color);	974	color = strdup (color);
961	allocated.push_back ((void *)color);	975	allocated.push_back ((void *)color);
…		…
965	if (isdigit (*color))	979	if (isdigit (*color))
966	{	980	{
967	i = atoi (color);	981	i = atoi (color);
968		982
969	if (i >= 8 && i <= 15)	983	if (i >= 8 && i <= 15)
		984	{
970	{ /* bright colors */	985	/* bright colors */
971	i -= 8;
972	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973	goto done;	987	goto done;
974	}	988	}
975		989
976	if (i >= 0 && i <= 7)	990	if (i >= 0 && i <= 7)
		991	{
977	{ /* normal colors */	992	/* normal colors */
978	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	993	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979	goto done;	994	goto done;
980	}	995	}
981	}	996	}
982		997
…		…
987	* so just keep gobbling up the colormap	1002	* so just keep gobbling up the colormap
988	*/	1003	*/
989		1004
990	pix_colors_focused[idx] = xcol;	1005	pix_colors_focused[idx] = xcol;
991		1006
992	/* XSetWindowAttributes attr; */
993	/* Cursor cursor; */
994	done:	1007	done:
995	/TODO: handle Color_BD, scrollbar background, etc. /	1008	/TODO: handle Color_BD, scrollbar background, etc. /
996		1009
997	update_fade_color (idx);	1010	update_fade_color (idx);
998	recolour_cursor ();	1011	recolour_cursor ();
999	scr_recolour ();	1012	scr_recolour ();
1000	#endif /* XTERM_COLOR_CHANGE */	1013	#endif /* XTERM_COLOR_CHANGE */
1001	}	1014	}
1002		1015
1003	void	1016	void
1004	rxvt_term::recolour_cursor ()	1017	rxvt_term::recolour_cursor ()
1005	{	1018	{
…		…
1022	*/	1035	*/
1023	void	1036	void
1024	rxvt_term::set_colorfgbg ()	1037	rxvt_term::set_colorfgbg ()
1025	{	1038	{
1026	unsigned int i;	1039	unsigned int i;
1027	const char *xpmb = "\0";	1040	const char *xpmb = "";
1028	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1041	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029		1042
1030	strcpy (fstr, "default");	1043	strcpy (fstr, "default");
1031	strcpy (bstr, "default");	1044	strcpy (bstr, "default");
1032	for (i = Color_Black; i <= Color_White; i++)	1045	for (i = Color_Black; i <= Color_White; i++)
…		…
1342	if (term->rs[Rs_imLocale])	1355	if (term->rs[Rs_imLocale])
1343	SET_LOCALE (term->locale);	1356	SET_LOCALE (term->locale);
1344	}	1357	}
1345	else	1358	else
1346	str = (void *)text->string.wide_char;	1359	str = (void *)text->string.wide_char;
1347		1360
1348	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1361	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349	DT_INT, call_data->caret,	1362	DT_INT, call_data->caret,
1350	DT_INT, call_data->chg_first,	1363	DT_INT, call_data->chg_first,
1351	DT_INT, call_data->chg_length,	1364	DT_INT, call_data->chg_length,
1352	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1365	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1671		1684
1672	if (input_style & XIMPreeditPosition)	1685	if (input_style & XIMPreeditPosition)
1673	{	1686	{
1674	im_set_size (preedit_rect);	1687	im_set_size (preedit_rect);
1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1688	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676		1689
1677	XSetICValues (Input_Context,	1690	XSetICValues (Input_Context,
1678	XNPreeditAttributes, preedit_attr, NULL);	1691	XNPreeditAttributes, preedit_attr, NULL);
1679	}	1692	}
1680	else	1693	else
1681	{	1694	{
…		…
1698	XFree (status_attr);	1711	XFree (status_attr);
1699	}	1712	}
1700		1713
1701	XFree (preedit_attr);	1714	XFree (preedit_attr);
1702	}	1715	}
1703	#endif /* USE_XIM */	1716	#endif /* USE_XIM */
1704		1717
1705	void	1718	void
1706	rxvt_term::get_window_origin (int &x, int &y)	1719	rxvt_term::get_window_origin (int &x, int &y)
1707	{	1720	{
1708	Window cr;	1721	Window cr;
…		…
1730	}	1743	}
1731	return None;	1744	return None;
1732	}	1745	}
1733		1746
1734	#ifdef HAVE_BG_PIXMAP	1747	#ifdef HAVE_BG_PIXMAP
		1748	# if TRACE_PIXMAPS
		1749	# undef update_background
		1750	int rxvt_term::trace_update_background (const char *file, int line)
		1751	{
		1752	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1753	update_background ();
		1754	}
		1755	# endif
		1756
1735	int	1757	int
1736	rxvt_term::update_background ()	1758	rxvt_term::update_background ()
1737	{	1759	{
1738	bgPixmap.invalidate ();	1760	bgPixmap.invalidate ();
1739		1761
1740	/* no chance of real time refresh if we are blurring ! */	1762	/* no chance of real time refresh if we are blurring! */
1741	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1763	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742	bgPixmap.render ();	1764	bgPixmap.render ();
1743	else	1765	else
1744	{	1766	{
1745	update_background_ev.stop ();	1767	update_background_ev.stop ();
		1768
1746	if (!bgPixmap.need_client_side_rendering())	1769	if (!bgPixmap.need_client_side_rendering())
1747	update_background_ev.start (NOW + .05);	1770	update_background_ev.start (.05);
1748	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)	1771	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749	update_background_ev.start (NOW + .2); /* very slow !!! */	1772	update_background_ev.start (.20); /* very slow !!! */
1750	else	1773	else
1751	update_background_ev.start (NOW + .07);	1774	update_background_ev.start (.07);
1752	}	1775	}
		1776
1753	return 0;	1777	return 0;
1754	}	1778	}
1755		1779
1756	void	1780	void
1757	rxvt_term::update_background_cb (time_watcher &w)	1781	rxvt_term::update_background_cb (ev::timer &w, int revents)
1758	{	1782	{
1759	bgPixmap.render ();	1783	bgPixmap.render ();
1760	}	1784	}
1761		1785
1762	#endif /* HAVE_BG_PIXMAP */	1786	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs. Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC