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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.300 by root, Sat Jan 19 00:24:53 2008 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-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2007 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.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	43	#include <termios.h>
45	#endif
46		44
47	#ifdef HAVE_XSETLOCALE	45	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	46	# define X_LOCALE
49	# include <X11/Xlocale.h>	47	# include <X11/Xlocale.h>
50	#else	48	#else
…		…
152		150
153	}	151	}
154	#endif	152	#endif
155		153
156	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
157	:	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); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		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
158	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
159	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160	#endif
161	#if HAVE_BG_PIXMAP
162	update_background_ev(this, &rxvt_term::update_background_cb),
163	#endif	176	#endif
164	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
165	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166	#endif	179	#endif
167	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
168	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
169	#endif
170	#ifdef TEXT_BLINK
171	text_blink_ev (this, &rxvt_term::text_blink_cb),
172	#endif
173	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175	#endif
176	#ifdef SELECTION_SCROLLING
177	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178	#endif
179	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181	#endif	182	#endif
182	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
183	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif
185	#ifdef USE_XIM
186	im_ev (this, &rxvt_term::im_cb),
187	#endif	185	#endif
188	#ifndef NO_BELL	186	#ifndef NO_BELL
189	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190	#endif	188	#endif
191	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194	prepare_ev (this, &rxvt_term::prepare_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198	incr_ev (this, &rxvt_term::incr_cb)	196
199	{
200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201		198
202	termlist.push_back (this);	199	termlist.push_back (this);
203		200
204	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
228	for (int i = RS_styleCount; --i; )	225	for (int i = RS_styleCount; --i; )
229	if (fontset[i] != fontset[0])	226	if (fontset[i] != fontset[0])
230	delete fontset[i];	227	delete fontset[i];
231	#endif	228	#endif
232	delete fontset[0];	229	delete fontset[0];
		230
		231	#ifdef HAVE_BG_PIXMAP
		232	bgPixmap.destroy ();
		233	#endif
233		234
234	if (display)	235	if (display)
235	{	236	{
236	selection_clear ();	237	selection_clear ();
237		238
…		…
277	pix_colors_unfocused [i].free (this);	278	pix_colors_unfocused [i].free (this);
278	#endif	279	#endif
279	}	280	}
280		281
281	clear ();	282	clear ();
282	}
283		283
284	delete [] pix_colors_focused;	284	display->flush (); /* ideally .put should do this */
285	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;
287	#endif
288
289	#ifdef HAVE_BG_PIXMAP
290	bgPixmap.destroy ();
291	#endif
292	displays.put (display);	285	displays.put (display);
		286	}
293		287
294	scr_release ();	288	scr_release ();
295		289
296	/* clear all resources */	290	/* clear all resources */
297	for (int i = 0; i < allocated.size (); i++)	291	for (int i = 0; i < allocated.size (); i++)
…		…
329	}	323	}
330		324
331	void	325	void
332	rxvt_term::destroy ()	326	rxvt_term::destroy ()
333	{	327	{
334	if (destroy_ev.active)	328	if (destroy_ev.is_active ())
335	return;	329	return;
336		330
337	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338		332
339	#if ENABLE_OVERLAY	333	#if ENABLE_OVERLAY
…		…
354	incr_ev.stop ();	348	incr_ev.stop ();
355	termwin_ev.stop (display);	349	termwin_ev.stop (display);
356	vt_ev.stop (display);	350	vt_ev.stop (display);
357	}	351	}
358		352
359	prepare_ev.stop ();	353	flush_ev.stop ();
360	pty_ev.stop ();	354	pty_ev.stop ();
361	#ifdef CURSOR_BLINK	355	#ifdef CURSOR_BLINK
362	cursor_blink_ev.stop ();	356	cursor_blink_ev.stop ();
363	#endif	357	#endif
364	#ifdef TEXT_BLINK	358	#ifdef TEXT_BLINK
…		…
475	rxvt_emergency_cleanup ();	469	rxvt_emergency_cleanup ();
476	_exit (EXIT_FAILURE);	470	_exit (EXIT_FAILURE);
477	}	471	}
478		472
479	/----------------------------------------------------------------------/	473	/----------------------------------------------------------------------/
480	bool	474	void
481	rxvt_term::init (int argc, const char const argv, stringvec *envv)	475	rxvt_term::init (int argc, const char const argv, stringvec *envv)
482	{	476	{
483	this->envv = envv;	477	this->envv = envv;
484		478
485	SET_R (this);	479	SET_R (this);
486	set_locale ("");	480	set_locale ("");
487	set_environ (envv); // few things in X do not call setlocale :(	481	set_environ (envv); // few things in X do not call setlocale :(
488		482
489	if (!init_vars ())	483	init_vars ();
490	return false;
491		484
492	init_secondary ();	485	init_secondary ();
493		486
494	const char **cmd_argv = init_resources (argc, argv);	487	const char **cmd_argv = init_resources (argc, argv);
495		488
…		…
519	resize_scrollbar (); /* create and map scrollbar */	512	resize_scrollbar (); /* create and map scrollbar */
520	#endif	513	#endif
521	#ifdef HAVE_BG_PIXMAP	514	#ifdef HAVE_BG_PIXMAP
522	{	515	{
523	bgPixmap.set_target (this);	516	bgPixmap.set_target (this);
		517	bgPixmap.invalidate ();
524		518
525	#ifdef ENABLE_TRANSPARENCY	519	#ifdef ENABLE_TRANSPARENCY
526	if (option (Opt_transparent))	520	if (option (Opt_transparent))
527	{	521	{
528	bgPixmap.set_transparent ();	522	bgPixmap.set_transparent ();
		523
529	#ifdef HAVE_AFTERIMAGE	524	#ifdef HAVE_AFTERIMAGE
530	if (rs [Rs_blurradius])	525	if (rs [Rs_blurradius])
531	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	526	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532	#endif	527	#endif
533	if (ISSET_PIXCOLOR (Color_tint))	528	if (ISSET_PIXCOLOR (Color_tint))
534	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	529	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		530
535	if (rs [Rs_shade])	531	if (rs [Rs_shade])
536	bgPixmap.set_shade (rs [Rs_shade]);	532	bgPixmap.set_shade (rs [Rs_shade]);
537		533
538	bgPixmap.set_root_pixmap ();	534	bgPixmap.set_root_pixmap ();
539	XSelectInput (dpy, display->root, PropertyChangeMask);	535	XSelectInput (dpy, display->root, PropertyChangeMask);
540	rootwin_ev.start (display, display->root);	536	rootwin_ev.start (display, display->root);
541	}	537	}
542	#endif	538	#endif
543		539
544	#ifdef BG_IMAGE_FROM_FILE	540	#ifdef BG_IMAGE_FROM_FILE
545	if (rs[Rs_backgroundPixmap] != NULL)	541	if (rs[Rs_backgroundPixmap])
546	{	542	{
547	const char *p = rs[Rs_backgroundPixmap];	543	const char *p = rs[Rs_backgroundPixmap];
548		544
549	if ((p = strchr (p, ';')) != NULL)	545	if ((p = strchr (p, ';')) != 0)
550	{	546	{
551	p++;	547	p++;
552	bgPixmap.set_geometry (p);	548	bgPixmap.set_geometry (p);
553	}	549	}
554	else	550	else
…		…
573	free (cmd_argv);	569	free (cmd_argv);
574		570
575	if (pty->pty >= 0)	571	if (pty->pty >= 0)
576	pty_ev.start (pty->pty, ev::READ);	572	pty_ev.start (pty->pty, ev::READ);
577		573
578	prepare_ev.start ();
579
580	HOOK_INVOKE ((this, HOOK_START, DT_END));	574	HOOK_INVOKE ((this, HOOK_START, DT_END));
581		575
582	#if ENABLE_XEMBED	576	#if ENABLE_XEMBED
583	if (rs[Rs_embed])	577	if (rs[Rs_embed])
584	{	578	{
…		…
590	#endif	584	#endif
591		585
592	XMapWindow (dpy, vt);	586	XMapWindow (dpy, vt);
593	XMapWindow (dpy, parent[0]);	587	XMapWindow (dpy, parent[0]);
594		588
595	return true;	589	refresh_check ();
596	}	590	}
597		591
598	static struct sig_handlers	592	static struct sig_handlers
599	{	593	{
600	ev::sig sw_term, sw_int;	594	ev::sig sw_term, sw_int;
601		595
602	/*	596	/*
603	* Catch a fatal signal and tidy up before quitting	597	* Catch a fatal signal and tidy up before quitting
604	*/	598	*/
605	void
606	sig_term (ev::sig &w, int revents)	599	void sig_term (ev::sig &w, int revents);
		600
		601	sig_handlers ()
607	{	602	{
608	rxvt_emergency_cleanup ();	603	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
609	w.stop ();
610	kill (getpid (), w.signum);
611	}
612
613	sig_handlers ()
614	: sw_term (this, &sig_handlers::sig_term),
615	sw_int (this, &sig_handlers::sig_term)	604	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616	{
617	}	605	}
618	} sig_handlers;	606	} sig_handlers;
619		607
		608	void
		609	sig_handlers::sig_term (ev::sig &w, int revents)
		610	{
		611	rxvt_emergency_cleanup ();
		612	w.stop ();
		613	kill (getpid (), w.signum);
		614	}
		615
620	char **rxvt_environ; // startup environment	616	char **rxvt_environ; // startup environment
621		617
622	void	618	void
623	rxvt_init ()	619	rxvt_init ()
624	{	620	{
625	ptytty::init ();	621	ptytty::init ();
626		622
627	if (!ev::ev_default_loop (0))	623	if (!ev_default_loop (0))
628	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	624	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629		625
630	rxvt_environ = environ;	626	rxvt_environ = environ;
631		627
632	signal (SIGHUP, SIG_IGN);	628	signal (SIGHUP, SIG_IGN);
633	signal (SIGPIPE, SIG_IGN);	629	signal (SIGPIPE, SIG_IGN);
634		630
635	sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();	631	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636	sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();	632	sig_handlers.sw_int.start (SIGINT); ev_unref ();
637		633
638	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	634	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
639	/* signal (SIGURG, SIG_DFL); */	635	/* signal (SIGURG, SIG_DFL); */
640		636
641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	637	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642	// TODO: handle this with exceptions and tolerate the memory loss	638	// TODO: handle this with exceptions and tolerate the memory loss
643	XSetIOErrorHandler (rxvt_xioerror_handler);	639	XSetIOErrorHandler (rxvt_xioerror_handler);
644		640
645	XrmInitialize ();	641	XrmInitialize ();
646	}
647
648	/* ------------------------------------------------------------------------- *
649	* MEMORY ALLOCATION WRAPPERS *
650	* ------------------------------------------------------------------------- */
651	void *
652	rxvt_malloc (size_t size)
653	{
654	void *p = malloc (size);
655
656	if (!p)
657	rxvt_fatal ("memory allocation failure. aborting.\n");
658
659	return p;
660	}
661
662	void *
663	rxvt_calloc (size_t number, size_t size)
664	{
665	void *p = calloc (number, size);
666
667	if (!p)
668	rxvt_fatal ("memory allocation failure. aborting.\n");
669
670	return p;
671	}
672
673	void *
674	rxvt_realloc (void *ptr, size_t size)
675	{
676	void *p = realloc (ptr, size);
677
678	if (!p)
679	rxvt_fatal ("memory allocation failure. aborting.\n");
680
681	return p;
682	}	642	}
683		643
684	/----------------------------------------------------------------------/	644	/----------------------------------------------------------------------/
685	/*	645	/*
686	* window size/position calculations for XSizeHint and other storage.	646	* window size/position calculations for XSizeHint and other storage.
…		…
827	ws.ws_xpixel = width;	787	ws.ws_xpixel = width;
828	ws.ws_ypixel = height;	788	ws.ws_ypixel = height;
829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	789	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830		790
831	#if 0	791	#if 0
832	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	792	// TIOCSWINSZ is supposed to do this automatically and correctly
833	if (cmd_pid) /* force through to the command */	793	if (cmd_pid) /* force through to the command */
834	kill (-cmd_pid, SIGWINCH);	794	kill (-cmd_pid, SIGWINCH);
835	#endif	795	#endif
836	}	796	}
837		797
…		…
979	if (isdigit (*color))	939	if (isdigit (*color))
980	{	940	{
981	i = atoi (color);	941	i = atoi (color);
982		942
983	if (i >= 8 && i <= 15)	943	if (i >= 8 && i <= 15)
		944	{
984	{ /* bright colors */	945	/* bright colors */
985	i -= 8;
986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	946	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
987	goto done;	947	goto done;
988	}	948	}
989		949
990	if (i >= 0 && i <= 7)	950	if (i >= 0 && i <= 7)
		951	{
991	{ /* normal colors */	952	/* normal colors */
992	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	953	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
993	goto done;	954	goto done;
994	}	955	}
995	}	956	}
996		957
…		…
1001	* so just keep gobbling up the colormap	962	* so just keep gobbling up the colormap
1002	*/	963	*/
1003		964
1004	pix_colors_focused[idx] = xcol;	965	pix_colors_focused[idx] = xcol;
1005		966
1006	/* XSetWindowAttributes attr; */
1007	/* Cursor cursor; */
1008	done:	967	done:
1009	/TODO: handle Color_BD, scrollbar background, etc. /	968	/TODO: handle Color_BD, scrollbar background, etc. /
1010		969
1011	update_fade_color (idx);	970	update_fade_color (idx);
1012	recolour_cursor ();	971	recolour_cursor ();
…		…
1036	*/	995	*/
1037	void	996	void
1038	rxvt_term::set_colorfgbg ()	997	rxvt_term::set_colorfgbg ()
1039	{	998	{
1040	unsigned int i;	999	unsigned int i;
1041	const char *xpmb = "\0";	1000	const char *xpmb = "";
1042	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1001	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043		1002
1044	strcpy (fstr, "default");	1003	strcpy (fstr, "default");
1045	strcpy (bstr, "default");	1004	strcpy (bstr, "default");
1046	for (i = Color_Black; i <= Color_White; i++)	1005	for (i = Color_Black; i <= Color_White; i++)
…		…
1719	void	1678	void
1720	rxvt_term::get_window_origin (int &x, int &y)	1679	rxvt_term::get_window_origin (int &x, int &y)
1721	{	1680	{
1722	Window cr;	1681	Window cr;
1723	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1682	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1683	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725	}	1684	}
1726		1685
1727	Pixmap	1686	Pixmap
1728	rxvt_term::get_pixmap_property (int prop_id)	1687	rxvt_term::get_pixmap_property (int prop_id)
1729	{	1688	{
…		…
1736	unsigned char *prop = NULL;	1695	unsigned char *prop = NULL;
1737	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1696	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1697	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739	&nitems, &bytes_after, &prop);	1698	&nitems, &bytes_after, &prop);
1740	if (result == Success && prop && atype == XA_PIXMAP)	1699	if (result == Success && prop && atype == XA_PIXMAP)
1741	{
1742	return (Pixmap )prop;	1700	return (Pixmap )prop;
1743	}
1744	}	1701	}
		1702
1745	return None;	1703	return None;
1746	}	1704	}
1747		1705
1748	#ifdef HAVE_BG_PIXMAP	1706	#ifdef HAVE_BG_PIXMAP
1749	# if TRACE_PIXMAPS	1707	# if TRACE_PIXMAPS
1750	# undef update_background	1708	# undef update_background
		1709	void
1751	int rxvt_term::trace_update_background (const char* file, int line)	1710	rxvt_term::trace_update_background (const char *file, int line)
1752	{	1711	{
1753	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1712	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754	update_background ();	1713	update_background ();
1755	}	1714	}
1756	# endif	1715	# endif
1757	int	1716
		1717	void
1758	rxvt_term::update_background ()	1718	rxvt_term::update_background ()
1759	{	1719	{
		1720	if (update_background_ev.is_active ())
		1721	return;
		1722
1760	bgPixmap.invalidate ();	1723	bgPixmap.invalidate ();
1761		1724
1762	/* no chance of real time refresh if we are blurring! */	1725	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1726
		1727	if (to_wait <= 0.)
1764	bgPixmap.render ();	1728	bgPixmap.render ();
1765	else	1729	else
1766	{
1767	update_background_ev.stop ();
1768
1769	if (!bgPixmap.need_client_side_rendering())
1770	update_background_ev.start (.05);	1730	update_background_ev.start (to_wait);
1771	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772	update_background_ev.start (.20); /* very slow !!! */
1773	else
1774	update_background_ev.start (.07);
1775	}
1776
1777	return 0;
1778	}	1731	}
1779		1732
1780	void	1733	void
1781	rxvt_term::update_background_cb (ev::timer &w, int revents)	1734	rxvt_term::update_background_cb (ev::timer &w, int revents)
1782	{	1735	{
		1736	make_current ();
		1737
		1738	update_background_ev.stop ();
1783	bgPixmap.render ();	1739	bgPixmap.render ();
		1740	refresh_check ();
1784	}	1741	}
1785		1742
1786	#endif /* HAVE_BG_PIXMAP */	1743	#endif /* HAVE_BG_PIXMAP */
1787		1744
1788	/----------------------- end-of-file (C source) -----------------------/	1745	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs. Revision 1.300 by root, Sat Jan 19 00:24:53 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.300 by root, Sat Jan 19 00:24:53 2008 UTC