[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.284 by root, Fri Dec 14 06:29:28 2007 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 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); 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
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	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	196
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		198
197	termlist.push_back (this);	199	termlist.push_back (this);
198		200
199	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
279	delete [] pix_colors_focused;	281	delete [] pix_colors_focused;
280	#if OFF_FOCUS_FADING	282	#if OFF_FOCUS_FADING
281	delete [] pix_colors_unfocused;	283	delete [] pix_colors_unfocused;
282	#endif	284	#endif
283		285
		286	#ifdef HAVE_BG_PIXMAP
		287	bgPixmap.destroy ();
		288	#endif
284	displays.put (display);	289	displays.put (display);
285		290
286	scr_release ();	291	scr_release ();
287		292
288	/* clear all resources */	293	/* clear all resources */
…		…
301	delete argv;	306	delete argv;
302		307
303	#ifdef KEYSYM_RESOURCE	308	#ifdef KEYSYM_RESOURCE
304	delete keyboard;	309	delete keyboard;
305	#endif	310	#endif
		311	#ifndef NO_RESOURCES
		312	XrmDestroyDatabase (option_db);
		313	#endif
306	}	314	}
307		315
308	// child has exited, usually destroys	316	// child has exited, usually destroys
309	void	317	void
310	rxvt_term::child_cb (child_watcher &w, int status)	318	rxvt_term::child_cb (ev::child &w, int status)
311	{	319	{
312	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	320	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313		321
314	cmd_pid = 0;	322	cmd_pid = 0;
315		323
…		…
318	}	326	}
319		327
320	void	328	void
321	rxvt_term::destroy ()	329	rxvt_term::destroy ()
322	{	330	{
323	if (destroy_ev.active)	331	if (destroy_ev.is_active ())
324	return;	332	return;
325		333
326	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	334	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327		335
328	#if ENABLE_OVERLAY	336	#if ENABLE_OVERLAY
…		…
343	incr_ev.stop ();	351	incr_ev.stop ();
344	termwin_ev.stop (display);	352	termwin_ev.stop (display);
345	vt_ev.stop (display);	353	vt_ev.stop (display);
346	}	354	}
347		355
348	check_ev.stop ();	356	flush_ev.stop ();
349	pty_ev.stop ();	357	pty_ev.stop ();
350	#ifdef CURSOR_BLINK	358	#ifdef CURSOR_BLINK
351	cursor_blink_ev.stop ();	359	cursor_blink_ev.stop ();
352	#endif	360	#endif
353	#ifdef TEXT_BLINK	361	#ifdef TEXT_BLINK
…		…
361	#endif	369	#endif
362	#ifdef POINTER_BLANK	370	#ifdef POINTER_BLANK
363	pointer_ev.stop ();	371	pointer_ev.stop ();
364	#endif	372	#endif
365		373
366	destroy_ev.start (0);	374	destroy_ev.start ();
367	}	375	}
368		376
369	void	377	void
370	rxvt_term::destroy_cb (time_watcher &w)	378	rxvt_term::destroy_cb (ev::idle &w, int revents)
371	{	379	{
372	make_current ();	380	make_current ();
373		381
374	delete this;	382	delete this;
375	}	383	}
…		…
429	else	437	else
430	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	438	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431	mesg, BUFSIZ);	439	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433	}	441	}
434	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	442	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435	mesg, BUFSIZ);	443	mesg, BUFSIZ);
436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	444	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437	}	445	}
438	#endif	446	#endif
439		447
…		…
464	rxvt_emergency_cleanup ();	472	rxvt_emergency_cleanup ();
465	_exit (EXIT_FAILURE);	473	_exit (EXIT_FAILURE);
466	}	474	}
467		475
468	/----------------------------------------------------------------------/	476	/----------------------------------------------------------------------/
469	bool	477	void
470	rxvt_term::init (int argc, const char const argv, stringvec *envv)	478	rxvt_term::init (int argc, const char const argv, stringvec *envv)
471	{	479	{
472	this->envv = envv;	480	this->envv = envv;
473		481
474	SET_R (this);	482	SET_R (this);
475	set_locale ("");	483	set_locale ("");
476	set_environ (envv); // few things in X do not call setlocale :(	484	set_environ (envv); // few things in X do not call setlocale :(
477		485
478	if (!init_vars ())	486	init_vars ();
479	return false;
480		487
481	init_secondary ();	488	init_secondary ();
482		489
483	const char **cmd_argv = init_resources (argc, argv);	490	const char **cmd_argv = init_resources (argc, argv);
484		491
…		…
513		520
514	#ifdef ENABLE_TRANSPARENCY	521	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))	522	if (option (Opt_transparent))
516	{	523	{
517	bgPixmap.set_transparent ();	524	bgPixmap.set_transparent ();
518	#ifdef HAVE_AFTERIMAGE	525	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])	526	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	527	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif	528	#endif
522	if (ISSET_PIXCOLOR (Color_tint))	529	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	530	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524	if (rs [Rs_shade])	531	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);	532	bgPixmap.set_shade (rs [Rs_shade]);
526		533
…		…
560	init_command (cmd_argv);	567	init_command (cmd_argv);
561		568
562	free (cmd_argv);	569	free (cmd_argv);
563		570
564	if (pty->pty >= 0)	571	if (pty->pty >= 0)
565	pty_ev.start (pty->pty, EVENT_READ);	572	pty_ev.start (pty->pty, ev::READ);
566
567	check_ev.start ();
568		573
569	HOOK_INVOKE ((this, HOOK_START, DT_END));	574	HOOK_INVOKE ((this, HOOK_START, DT_END));
570		575
571	#if ENABLE_XEMBED	576	#if ENABLE_XEMBED
572	if (rs[Rs_embed])	577	if (rs[Rs_embed])
…		…
578	}	583	}
579	#endif	584	#endif
580		585
581	XMapWindow (dpy, vt);	586	XMapWindow (dpy, vt);
582	XMapWindow (dpy, parent[0]);	587	XMapWindow (dpy, parent[0]);
583
584	return true;
585	}	588	}
586		589
587	static struct sig_handlers	590	static struct sig_handlers
588	{	591	{
589	sig_watcher sw_term, sw_int;	592	ev::sig sw_term, sw_int;
590		593
591	/*	594	/*
592	* Catch a fatal signal and tidy up before quitting	595	* Catch a fatal signal and tidy up before quitting
593	*/	596	*/
594	void	597	void sig_term (ev::sig &w, int revents);
595	sig_term (sig_watcher &w)	598
		599	sig_handlers ()
596	{	600	{
597	rxvt_emergency_cleanup ();	601	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)	602	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605	{
606	}	603	}
607	} sig_handlers;	604	} sig_handlers;
608		605
		606	void
		607	sig_handlers::sig_term (ev::sig &w, int revents)
		608	{
		609	rxvt_emergency_cleanup ();
		610	w.stop ();
		611	kill (getpid (), w.signum);
		612	}
		613
609	char **rxvt_environ; // startup environment	614	char **rxvt_environ; // startup environment
610		615
611	void	616	void
612	rxvt_init ()	617	rxvt_init ()
613	{	618	{
614	ptytty::init ();	619	ptytty::init ();
		620
		621	if (!ev_default_loop (0))
		622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615		623
616	rxvt_environ = environ;	624	rxvt_environ = environ;
617		625
618	signal (SIGHUP, SIG_IGN);	626	signal (SIGHUP, SIG_IGN);
619	signal (SIGPIPE, SIG_IGN);	627	signal (SIGPIPE, SIG_IGN);
620		628
621	sig_handlers.sw_term.start (SIGTERM);	629	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622	sig_handlers.sw_int.start (SIGINT);	630	sig_handlers.sw_int.start (SIGINT); ev_unref ();
623		631
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	633	/* signal (SIGURG, SIG_DFL); */
626		634
627	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
813	ws.ws_xpixel = width;	821	ws.ws_xpixel = width;
814	ws.ws_ypixel = height;	822	ws.ws_ypixel = height;
815	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	823	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
816		824
817	#if 0	825	#if 0
818	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	826	// TIOCSWINSZ is supposed to do this automatically and correctly
819	if (cmd_pid) /* force through to the command */	827	if (cmd_pid) /* force through to the command */
820	kill (-cmd_pid, SIGWINCH);	828	kill (-cmd_pid, SIGWINCH);
821	#endif	829	#endif
822	}	830	}
823		831
…		…
897	if (parent[0])	905	if (parent[0])
898	{	906	{
899	resize_all_windows (0, 0, 0);	907	resize_all_windows (0, 0, 0);
900	scr_remap_chars ();	908	scr_remap_chars ();
901	scr_touch (true);	909	scr_touch (true);
902	}	910	}
903		911
904	return true;	912	return true;
905	}	913	}
906		914
907	void	915	void
…		…
951	rxvt_term::set_window_color (int idx, const char *color)	959	rxvt_term::set_window_color (int idx, const char *color)
952	{	960	{
953	#ifdef XTERM_COLOR_CHANGE	961	#ifdef XTERM_COLOR_CHANGE
954	rxvt_color xcol;	962	rxvt_color xcol;
955	int i;	963	int i;
956		964
957	if (color == NULL \|\| *color == '\0')	965	if (color == NULL \|\| *color == '\0')
958	return;	966	return;
959		967
960	color = strdup (color);	968	color = strdup (color);
961	allocated.push_back ((void *)color);	969	allocated.push_back ((void *)color);
…		…
965	if (isdigit (*color))	973	if (isdigit (*color))
966	{	974	{
967	i = atoi (color);	975	i = atoi (color);
968		976
969	if (i >= 8 && i <= 15)	977	if (i >= 8 && i <= 15)
		978	{
970	{ /* bright colors */	979	/* bright colors */
971	i -= 8;
972	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	980	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973	goto done;	981	goto done;
974	}	982	}
975		983
976	if (i >= 0 && i <= 7)	984	if (i >= 0 && i <= 7)
		985	{
977	{ /* normal colors */	986	/* normal colors */
978	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	987	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979	goto done;	988	goto done;
980	}	989	}
981	}	990	}
982		991
…		…
987	* so just keep gobbling up the colormap	996	* so just keep gobbling up the colormap
988	*/	997	*/
989		998
990	pix_colors_focused[idx] = xcol;	999	pix_colors_focused[idx] = xcol;
991		1000
992	/* XSetWindowAttributes attr; */
993	/* Cursor cursor; */
994	done:	1001	done:
995	/TODO: handle Color_BD, scrollbar background, etc. /	1002	/TODO: handle Color_BD, scrollbar background, etc. /
996		1003
997	update_fade_color (idx);	1004	update_fade_color (idx);
998	recolour_cursor ();	1005	recolour_cursor ();
999	scr_recolour ();	1006	scr_recolour ();
1000	#endif /* XTERM_COLOR_CHANGE */	1007	#endif /* XTERM_COLOR_CHANGE */
1001	}	1008	}
1002		1009
1003	void	1010	void
1004	rxvt_term::recolour_cursor ()	1011	rxvt_term::recolour_cursor ()
1005	{	1012	{
…		…
1022	*/	1029	*/
1023	void	1030	void
1024	rxvt_term::set_colorfgbg ()	1031	rxvt_term::set_colorfgbg ()
1025	{	1032	{
1026	unsigned int i;	1033	unsigned int i;
1027	const char *xpmb = "\0";	1034	const char *xpmb = "";
1028	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1035	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029		1036
1030	strcpy (fstr, "default");	1037	strcpy (fstr, "default");
1031	strcpy (bstr, "default");	1038	strcpy (bstr, "default");
1032	for (i = Color_Black; i <= Color_White; i++)	1039	for (i = Color_Black; i <= Color_White; i++)
…		…
1342	if (term->rs[Rs_imLocale])	1349	if (term->rs[Rs_imLocale])
1343	SET_LOCALE (term->locale);	1350	SET_LOCALE (term->locale);
1344	}	1351	}
1345	else	1352	else
1346	str = (void *)text->string.wide_char;	1353	str = (void *)text->string.wide_char;
1347		1354
1348	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1355	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349	DT_INT, call_data->caret,	1356	DT_INT, call_data->caret,
1350	DT_INT, call_data->chg_first,	1357	DT_INT, call_data->chg_first,
1351	DT_INT, call_data->chg_length,	1358	DT_INT, call_data->chg_length,
1352	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1359	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1671		1678
1672	if (input_style & XIMPreeditPosition)	1679	if (input_style & XIMPreeditPosition)
1673	{	1680	{
1674	im_set_size (preedit_rect);	1681	im_set_size (preedit_rect);
1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1682	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676		1683
1677	XSetICValues (Input_Context,	1684	XSetICValues (Input_Context,
1678	XNPreeditAttributes, preedit_attr, NULL);	1685	XNPreeditAttributes, preedit_attr, NULL);
1679	}	1686	}
1680	else	1687	else
1681	{	1688	{
…		…
1698	XFree (status_attr);	1705	XFree (status_attr);
1699	}	1706	}
1700		1707
1701	XFree (preedit_attr);	1708	XFree (preedit_attr);
1702	}	1709	}
1703	#endif /* USE_XIM */	1710	#endif /* USE_XIM */
1704		1711
1705	void	1712	void
1706	rxvt_term::get_window_origin (int &x, int &y)	1713	rxvt_term::get_window_origin (int &x, int &y)
1707	{	1714	{
1708	Window cr;	1715	Window cr;
…		…
1730	}	1737	}
1731	return None;	1738	return None;
1732	}	1739	}
1733		1740
1734	#ifdef HAVE_BG_PIXMAP	1741	#ifdef HAVE_BG_PIXMAP
		1742	# if TRACE_PIXMAPS
		1743	# undef update_background
		1744	int rxvt_term::trace_update_background (const char *file, int line)
		1745	{
		1746	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1747	update_background ();
		1748	}
		1749	# endif
		1750
1735	int	1751	int
1736	rxvt_term::update_background ()	1752	rxvt_term::update_background ()
1737	{	1753	{
1738	bgPixmap.invalidate ();	1754	bgPixmap.invalidate ();
1739		1755
1740	/* no chance of real time refresh if we are blurring ! */	1756	/* no chance of real time refresh if we are blurring! */
1741	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1757	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742	bgPixmap.render ();	1758	bgPixmap.render ();
1743	else	1759	else
1744	{	1760	{
1745	update_background_ev.stop ();	1761	update_background_ev.stop ();
		1762
1746	if (!bgPixmap.need_client_side_rendering())	1763	if (!bgPixmap.need_client_side_rendering())
1747	update_background_ev.start (NOW + .05);	1764	update_background_ev.start (.05);
1748	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)	1765	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749	update_background_ev.start (NOW + .2); /* very slow !!! */	1766	update_background_ev.start (.20); /* very slow !!! */
1750	else	1767	else
1751	update_background_ev.start (NOW + .07);	1768	update_background_ev.start (.07);
1752	}	1769	}
		1770
1753	return 0;	1771	return 0;
1754	}	1772	}
1755		1773
1756	void	1774	void
1757	rxvt_term::update_background_cb (time_watcher &w)	1775	rxvt_term::update_background_cb (ev::timer &w, int revents)
1758	{	1776	{
		1777	make_current ();
1759	bgPixmap.render ();	1778	bgPixmap.render ();
		1779	refresh_check ();
1760	}	1780	}
1761		1781
1762	#endif /* HAVE_BG_PIXMAP */	1782	#endif /* HAVE_BG_PIXMAP */
1763		1783
1764	/----------------------- end-of-file (C source) -----------------------/	1784	/----------------------- 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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs. Revision 1.284 by root, Fri Dec 14 06:29:28 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.284 by root, Fri Dec 14 06:29:28 2007 UTC