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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48:33 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-2008 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	176	#endif
161	#if HAVE_BG_PIXMAP	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162	update_background_ev(this, &rxvt_term::update_background_cb),	178	#ifdef USE_XIM
163	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#ifdef HAVE_SCROLLBARS
165	scrollbar_ev (this, &rxvt_term::x_cb),
166	#endif
167	#ifdef CURSOR_BLINK
168	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
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	180	#endif
182	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
183	pointer_ev (this, &rxvt_term::pointer_cb),	182	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	183	#endif
188	#ifndef NO_BELL	184	#ifndef NO_BELL
189	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190	#endif	186	#endif
191	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194	prepare_ev (this, &rxvt_term::prepare_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198	incr_ev (this, &rxvt_term::incr_cb)	194
199	{
200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201		196
202	termlist.push_back (this);	197	termlist.push_back (this);
203		198
204	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
228	for (int i = RS_styleCount; --i; )	223	for (int i = RS_styleCount; --i; )
229	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
230	delete fontset[i];	225	delete fontset[i];
231	#endif	226	#endif
232	delete fontset[0];	227	delete fontset[0];
		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
233		232
234	if (display)	233	if (display)
235	{	234	{
236	selection_clear ();	235	selection_clear ();
237		236
…		…
277	pix_colors_unfocused [i].free (this);	276	pix_colors_unfocused [i].free (this);
278	#endif	277	#endif
279	}	278	}
280		279
281	clear ();	280	clear ();
282	}
283		281
284	delete [] pix_colors_focused;	282	display->flush (); /* ideally .put should do this */
285	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;
287	#endif
288
289	bgPixmap.destroy ();
290	displays.put (display);	283	displays.put (display);
		284	}
291		285
292	scr_release ();	286	scr_release ();
293		287
294	/* clear all resources */	288	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
…		…
307	delete argv;	301	delete argv;
308		302
309	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
310	delete keyboard;	304	delete keyboard;
311	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
312	}	309	}
313		310
314	// child has exited, usually destroys	311	// child has exited, usually destroys
315	void	312	void
316	rxvt_term::child_cb (ev::child &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
…		…
324	}	321	}
325		322
326	void	323	void
327	rxvt_term::destroy ()	324	rxvt_term::destroy ()
328	{	325	{
329	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
330	return;	327	return;
331		328
332	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
333		330
334	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
…		…
338	if (display)	335	if (display)
339	{	336	{
340	#if USE_XIM	337	#if USE_XIM
341	im_ev.stop (display);	338	im_ev.stop (display);
342	#endif	339	#endif
343	#if HAVE_SCROLLBARS
344	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
345	#endif
346	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
347	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
348	#endif	343	#endif
349	incr_ev.stop ();	344	incr_ev.stop ();
350	termwin_ev.stop (display);	345	termwin_ev.stop (display);
351	vt_ev.stop (display);	346	vt_ev.stop (display);
352	}	347	}
353		348
354	prepare_ev.stop ();	349	flush_ev.stop ();
355	pty_ev.stop ();	350	pty_ev.stop ();
356	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
357	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
358	#endif	353	#endif
359	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
469	DisplayString (display));	464	DisplayString (display));
470	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
471	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
472	}	467	}
473		468
474	/----------------------------------------------------------------------/
475	bool
476	rxvt_term::init (int argc, const char const argv, stringvec *envv)
477	{
478	this->envv = envv;
479
480	SET_R (this);
481	set_locale ("");
482	set_environ (envv); // few things in X do not call setlocale :(
483
484	if (!init_vars ())
485	return false;
486
487	init_secondary ();
488
489	const char **cmd_argv = init_resources (argc, argv);
490
491	#ifdef KEYSYM_RESOURCE
492	keyboard->register_done ();
493	#endif
494
495	#ifdef HAVE_SCROLLBARS
496	if (option (Opt_scrollBar))
497	scrollBar.setIdle (); /* set existence for size calculations */
498	#endif
499
500	pty = ptytty::create ();
501
502	create_windows (argc, argv);
503
504	init_xlocale ();
505
506	scr_reset (); // initialize screen
507
508	#if 0
509	XSynchronize (dpy, True);
510	#endif
511
512	#ifdef HAVE_SCROLLBARS
513	if (option (Opt_scrollBar))
514	resize_scrollbar (); /* create and map scrollbar */
515	#endif
516	#ifdef HAVE_BG_PIXMAP
517	{
518	bgPixmap.set_target (this);
519
520	#ifdef ENABLE_TRANSPARENCY
521	if (option (Opt_transparent))
522	{
523	bgPixmap.set_transparent ();
524	#ifdef HAVE_AFTERIMAGE
525	if (rs [Rs_blurradius])
526	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527	#endif
528	if (ISSET_PIXCOLOR (Color_tint))
529	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530	if (rs [Rs_shade])
531	bgPixmap.set_shade (rs [Rs_shade]);
532
533	bgPixmap.set_root_pixmap ();
534	XSelectInput (dpy, display->root, PropertyChangeMask);
535	rootwin_ev.start (display, display->root);
536	}
537	#endif
538
539	#ifdef BG_IMAGE_FROM_FILE
540	if (rs[Rs_backgroundPixmap] != NULL)
541	{
542	const char *p = rs[Rs_backgroundPixmap];
543
544	if ((p = strchr (p, ';')) != NULL)
545	{
546	p++;
547	bgPixmap.set_geometry (p);
548	}
549	else
550	bgPixmap.set_defaultGeometry ();
551
552	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553	if (!bgPixmap.window_position_sensitive ())
554	update_background ();
555	}
556	#endif
557	}
558	#endif
559
560	#if ENABLE_PERL
561	rootwin_ev.start (display, display->root);
562	#endif
563
564	set_colorfgbg ();
565
566	init_command (cmd_argv);
567
568	free (cmd_argv);
569
570	if (pty->pty >= 0)
571	pty_ev.start (pty->pty, ev::READ);
572
573	prepare_ev.start ();
574
575	HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577	#if ENABLE_XEMBED
578	if (rs[Rs_embed])
579	{
580	long info[2] = { 0, XEMBED_MAPPED };
581
582	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583	32, PropModeReplace, (unsigned char *)&info, 2);
584	}
585	#endif
586
587	XMapWindow (dpy, vt);
588	XMapWindow (dpy, parent[0]);
589
590	return true;
591	}
592
593	static struct sig_handlers	469	static struct sig_handlers
594	{	470	{
595	ev::sig sw_term, sw_int;	471	ev::sig sw_term, sw_int;
596		472
597	/*	473	/*
598	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
599	*/	475	*/
600	void
601	sig_term (ev::sig &w, int revents)	476	void sig_term (ev::sig &w, int revents);
		477
		478	sig_handlers ()
602	{	479	{
603	rxvt_emergency_cleanup ();	480	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
604	w.stop ();
605	kill (getpid (), w.signum);
606	}
607
608	sig_handlers ()
609	: sw_term (this, &sig_handlers::sig_term),
610	sw_int (this, &sig_handlers::sig_term)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
611	{
612	}	482	}
613	} sig_handlers;	483	} sig_handlers;
614		484
		485	void
		486	sig_handlers::sig_term (ev::sig &w, int revents)
		487	{
		488	rxvt_emergency_cleanup ();
		489	w.stop ();
		490	kill (getpid (), w.signum);
		491	}
		492
615	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
616		494
617	void	495	void
618	rxvt_init ()	496	rxvt_init ()
619	{	497	{
620	ptytty::init ();	498	ptytty::init ();
621		499
622	if (!ev::ev_default_loop (0))	500	if (!ev_default_loop (0))
623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624		502
625	rxvt_environ = environ;	503	rxvt_environ = environ;
626		504
627	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
628	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
629		507
630	sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631	sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
632		510
633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
634	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
635		513
636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637	// TODO: handle this with exceptions and tolerate the memory loss	515	// TODO: handle this with exceptions and tolerate the memory loss
638	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
639		517
640	XrmInitialize ();	518	XrmInitialize ();
641	}
642
643	/* ------------------------------------------------------------------------- *
644	* MEMORY ALLOCATION WRAPPERS *
645	* ------------------------------------------------------------------------- */
646	void *
647	rxvt_malloc (size_t size)
648	{
649	void *p = malloc (size);
650
651	if (!p)
652	rxvt_fatal ("memory allocation failure. aborting.\n");
653
654	return p;
655	}
656
657	void *
658	rxvt_calloc (size_t number, size_t size)
659	{
660	void *p = calloc (number, size);
661
662	if (!p)
663	rxvt_fatal ("memory allocation failure. aborting.\n");
664
665	return p;
666	}
667
668	void *
669	rxvt_realloc (void *ptr, size_t size)
670	{
671	void *p = realloc (ptr, size);
672
673	if (!p)
674	rxvt_fatal ("memory allocation failure. aborting.\n");
675
676	return p;
677	}	519	}
678		520
679	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
680	/*	522	/*
681	* window size/position calculations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
…		…
822	ws.ws_xpixel = width;	664	ws.ws_xpixel = width;
823	ws.ws_ypixel = height;	665	ws.ws_ypixel = height;
824	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
825		667
826	#if 0	668	#if 0
827	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	669	// TIOCSWINSZ is supposed to do this automatically and correctly
828	if (cmd_pid) /* force through to the command */	670	if (cmd_pid) /* force through to the command */
829	kill (-cmd_pid, SIGWINCH);	671	kill (-cmd_pid, SIGWINCH);
830	#endif	672	#endif
831	}	673	}
832		674
…		…
974	if (isdigit (*color))	816	if (isdigit (*color))
975	{	817	{
976	i = atoi (color);	818	i = atoi (color);
977		819
978	if (i >= 8 && i <= 15)	820	if (i >= 8 && i <= 15)
		821	{
979	{ /* bright colors */	822	/* bright colors */
980	i -= 8;
981	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	823	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
982	goto done;	824	goto done;
983	}	825	}
984		826
985	if (i >= 0 && i <= 7)	827	if (i >= 0 && i <= 7)
		828	{
986	{ /* normal colors */	829	/* normal colors */
987	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	830	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
988	goto done;	831	goto done;
989	}	832	}
990	}	833	}
991		834
…		…
996	* so just keep gobbling up the colormap	839	* so just keep gobbling up the colormap
997	*/	840	*/
998		841
999	pix_colors_focused[idx] = xcol;	842	pix_colors_focused[idx] = xcol;
1000		843
1001	/* XSetWindowAttributes attr; */
1002	/* Cursor cursor; */
1003	done:	844	done:
1004	/TODO: handle Color_BD, scrollbar background, etc. /	845	/TODO: handle Color_BD, scrollbar background, etc. /
1005		846
1006	update_fade_color (idx);	847	update_fade_color (idx);
1007	recolour_cursor ();	848	recolour_cursor ();
…		…
1031	*/	872	*/
1032	void	873	void
1033	rxvt_term::set_colorfgbg ()	874	rxvt_term::set_colorfgbg ()
1034	{	875	{
1035	unsigned int i;	876	unsigned int i;
1036	const char *xpmb = "\0";	877	const char *xpmb = "";
1037	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	878	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1038		879
1039	strcpy (fstr, "default");	880	strcpy (fstr, "default");
1040	strcpy (bstr, "default");	881	strcpy (bstr, "default");
1041	for (i = Color_Black; i <= Color_White; i++)	882	for (i = Color_Black; i <= Color_White; i++)
…		…
1714	void	1555	void
1715	rxvt_term::get_window_origin (int &x, int &y)	1556	rxvt_term::get_window_origin (int &x, int &y)
1716	{	1557	{
1717	Window cr;	1558	Window cr;
1718	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1559	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1560	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1720	}	1561	}
1721		1562
1722	Pixmap	1563	Pixmap
1723	rxvt_term::get_pixmap_property (int prop_id)	1564	rxvt_term::get_pixmap_property (int prop_id)
1724	{	1565	{
…		…
1731	unsigned char *prop = NULL;	1572	unsigned char *prop = NULL;
1732	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1573	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1733	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1574	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734	&nitems, &bytes_after, &prop);	1575	&nitems, &bytes_after, &prop);
1735	if (result == Success && prop && atype == XA_PIXMAP)	1576	if (result == Success && prop && atype == XA_PIXMAP)
1736	{
1737	return (Pixmap )prop;	1577	return (Pixmap )prop;
1738	}
1739	}	1578	}
		1579
1740	return None;	1580	return None;
1741	}	1581	}
1742		1582
1743	#ifdef HAVE_BG_PIXMAP	1583	#ifdef HAVE_BG_PIXMAP
1744	# if TRACE_PIXMAPS	1584	# if TRACE_PIXMAPS
1745	# undef update_background	1585	# undef update_background
		1586	void
1746	int rxvt_term::trace_update_background (const char* file, int line)	1587	rxvt_term::trace_update_background (const char *file, int line)
1747	{	1588	{
1748	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1589	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749	update_background ();	1590	update_background ();
1750	}	1591	}
1751	# endif	1592	# endif
1752	int	1593
		1594	void
1753	rxvt_term::update_background ()	1595	rxvt_term::update_background ()
1754	{	1596	{
		1597	if (update_background_ev.is_active ())
		1598	return;
		1599
1755	bgPixmap.invalidate ();	1600	bgPixmap.invalidate ();
1756		1601
1757	/* no chance of real time refresh if we are blurring! */	1602	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1758	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1603
		1604	if (to_wait <= 0.)
1759	bgPixmap.render ();	1605	bgPixmap.render ();
1760	else	1606	else
1761	{
1762	update_background_ev.stop ();
1763
1764	if (!bgPixmap.need_client_side_rendering())
1765	update_background_ev.start (.05);	1607	update_background_ev.start (to_wait);
1766	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767	update_background_ev.start (.20); /* very slow !!! */
1768	else
1769	update_background_ev.start (.07);
1770	}
1771
1772	return 0;
1773	}	1608	}
1774		1609
1775	void	1610	void
1776	rxvt_term::update_background_cb (ev::timer &w, int revents)	1611	rxvt_term::update_background_cb (ev::timer &w, int revents)
1777	{	1612	{
		1613	make_current ();
		1614
		1615	update_background_ev.stop ();
1778	bgPixmap.render ();	1616	bgPixmap.render ();
		1617	refresh_check ();
1779	}	1618	}
1780		1619
1781	#endif /* HAVE_BG_PIXMAP */	1620	#endif /* HAVE_BG_PIXMAP */
1782		1621
1783	/----------------------- end-of-file (C source) -----------------------/	1622	/----------------------- 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.261 by root, Mon Nov 19 15:33:34 2007 UTC vs. Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC