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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.249 by sasha, Wed Sep 12 20:29:24 2007 UTC vs.
Revision 1.276 by root, Tue Dec 11 18:00:07 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);
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
…		…
201	#endif	204	#endif
202	}	205	}
203		206
204	// clean up the most important stuff, do not call x or free mem etc.	207	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	208	// for use before an emergency exit
		209	void
206	void rxvt_term::emergency_cleanup ()	210	rxvt_term::emergency_cleanup ()
207	{	211	{
208	if (cmd_pid)	212	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	213	kill (-cmd_pid, SIGHUP);
210		214
211	pty_ev.stop ();	215	pty_ev.stop ();
…		…
278	delete [] pix_colors_focused;	282	delete [] pix_colors_focused;
279	#if OFF_FOCUS_FADING	283	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;	284	delete [] pix_colors_unfocused;
281	#endif	285	#endif
282		286
		287	#ifdef HAVE_BG_PIXMAP
		288	bgPixmap.destroy ();
		289	#endif
283	displays.put (display);	290	displays.put (display);
284		291
285	scr_release ();	292	scr_release ();
286		293
287	/* clear all resources */	294	/* clear all resources */
…		…
300	delete argv;	307	delete argv;
301		308
302	#ifdef KEYSYM_RESOURCE	309	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	310	delete keyboard;
304	#endif	311	#endif
		312	#ifndef NO_RESOURCES
		313	XrmDestroyDatabase (option_db);
		314	#endif
305	}	315	}
306		316
307	// child has exited, usually destroys	317	// child has exited, usually destroys
308	void	318	void
309	rxvt_term::child_cb (child_watcher &w, int status)	319	rxvt_term::child_cb (ev::child &w, int status)
310	{	320	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	321	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		322
313	cmd_pid = 0;	323	cmd_pid = 0;
314		324
…		…
317	}	327	}
318		328
319	void	329	void
320	rxvt_term::destroy ()	330	rxvt_term::destroy ()
321	{	331	{
322	if (destroy_ev.active)	332	if (ev_is_active (&destroy_ev))
323	return;	333	return;
324		334
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		336
327	#if ENABLE_OVERLAY	337	#if ENABLE_OVERLAY
…		…
342	incr_ev.stop ();	352	incr_ev.stop ();
343	termwin_ev.stop (display);	353	termwin_ev.stop (display);
344	vt_ev.stop (display);	354	vt_ev.stop (display);
345	}	355	}
346		356
347	check_ev.stop ();	357	prepare_ev.stop ();
348	pty_ev.stop ();	358	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	359	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	360	cursor_blink_ev.stop ();
351	#endif	361	#endif
352	#ifdef TEXT_BLINK	362	#ifdef TEXT_BLINK
…		…
360	#endif	370	#endif
361	#ifdef POINTER_BLANK	371	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	372	pointer_ev.stop ();
363	#endif	373	#endif
364		374
365	destroy_ev.start (0);	375	destroy_ev.start ();
366	}	376	}
367		377
368	void	378	void
369	rxvt_term::destroy_cb (time_watcher &w)	379	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	380	{
371	make_current ();	381	make_current ();
372		382
373	delete this;	383	delete this;
374	}	384	}
…		…
428	else	438	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	440	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	442	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	444	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	446	}
437	#endif	447	#endif
438		448
…		…
512		522
513	#ifdef ENABLE_TRANSPARENCY	523	#ifdef ENABLE_TRANSPARENCY
514	if (option (Opt_transparent))	524	if (option (Opt_transparent))
515	{	525	{
516	bgPixmap.set_transparent ();	526	bgPixmap.set_transparent ();
517	#ifdef HAVE_AFTERIMAGE	527	#ifdef HAVE_AFTERIMAGE
518	if (rs [Rs_blurradius])	528	if (rs [Rs_blurradius])
519	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520	#endif	530	#endif
521	if (ISSET_PIXCOLOR (Color_tint))	531	if (ISSET_PIXCOLOR (Color_tint))
522	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523	if (rs [Rs_shade])	533	if (rs [Rs_shade])
524	bgPixmap.set_shade (rs [Rs_shade]);	534	bgPixmap.set_shade (rs [Rs_shade]);
525		535
…		…
527	XSelectInput (dpy, display->root, PropertyChangeMask);	537	XSelectInput (dpy, display->root, PropertyChangeMask);
528	rootwin_ev.start (display, display->root);	538	rootwin_ev.start (display, display->root);
529	}	539	}
530	#endif	540	#endif
531		541
532	#ifdef XPM_BACKGROUND	542	#ifdef BG_IMAGE_FROM_FILE
533	if (rs[Rs_backgroundPixmap] != NULL)	543	if (rs[Rs_backgroundPixmap] != NULL)
534	{	544	{
535	const char *p = rs[Rs_backgroundPixmap];	545	const char *p = rs[Rs_backgroundPixmap];
536		546
537	if ((p = strchr (p, ';')) != NULL)	547	if ((p = strchr (p, ';')) != NULL)
…		…
559	init_command (cmd_argv);	569	init_command (cmd_argv);
560		570
561	free (cmd_argv);	571	free (cmd_argv);
562		572
563	if (pty->pty >= 0)	573	if (pty->pty >= 0)
564	pty_ev.start (pty->pty, EVENT_READ);	574	pty_ev.start (pty->pty, ev::READ);
565		575
566	check_ev.start ();	576	prepare_ev.start ();
567		577
568	HOOK_INVOKE ((this, HOOK_START, DT_END));	578	HOOK_INVOKE ((this, HOOK_START, DT_END));
569		579
570	#if ENABLE_XEMBED	580	#if ENABLE_XEMBED
571	if (rs[Rs_embed])	581	if (rs[Rs_embed])
…		…
583	return true;	593	return true;
584	}	594	}
585		595
586	static struct sig_handlers	596	static struct sig_handlers
587	{	597	{
588	sig_watcher sw_term, sw_int;	598	ev::sig sw_term, sw_int;
589		599
590	/*	600	/*
591	* Catch a fatal signal and tidy up before quitting	601	* Catch a fatal signal and tidy up before quitting
592	*/	602	*/
593	void	603	void sig_term (ev::sig &w, int revents);
594	sig_term (sig_watcher &w)	604
		605	sig_handlers ()
595	{	606	{
596	rxvt_emergency_cleanup ();	607	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597	signal (w.signum, SIG_DFL);
598	kill (getpid (), w.signum);
599	}
600
601	sig_handlers ()
602	: sw_term (this, &sig_handlers::sig_term),
603	sw_int (this, &sig_handlers::sig_term)	608	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604	{
605	}	609	}
606	} sig_handlers;	610	} sig_handlers;
607		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
608	char **rxvt_environ; // startup environment	620	char **rxvt_environ; // startup environment
609		621
610	void	622	void
611	rxvt_init ()	623	rxvt_init ()
612	{	624	{
613	ptytty::init ();	625	ptytty::init ();
		626
		627	if (!ev_default_loop (0))
		628	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
614		629
615	rxvt_environ = environ;	630	rxvt_environ = environ;
616		631
617	signal (SIGHUP, SIG_IGN);	632	signal (SIGHUP, SIG_IGN);
618	signal (SIGPIPE, SIG_IGN);	633	signal (SIGPIPE, SIG_IGN);
619		634
620	sig_handlers.sw_term.start (SIGTERM);	635	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621	sig_handlers.sw_int.start (SIGINT);	636	sig_handlers.sw_int.start (SIGINT); ev_unref ();
622		637
623	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	638	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
624	/* signal (SIGURG, SIG_DFL); */	639	/* signal (SIGURG, SIG_DFL); */
625		640
626	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
812	ws.ws_xpixel = width;	827	ws.ws_xpixel = width;
813	ws.ws_ypixel = height;	828	ws.ws_ypixel = height;
814	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
815		830
816	#if 0	831	#if 0
817	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	832	// TIOCSWINSZ is supposed to do this automatically and correctly
818	if (cmd_pid) /* force through to the command */	833	if (cmd_pid) /* force through to the command */
819	kill (-cmd_pid, SIGWINCH);	834	kill (-cmd_pid, SIGWINCH);
820	#endif	835	#endif
821	}	836	}
822		837
…		…
896	if (parent[0])	911	if (parent[0])
897	{	912	{
898	resize_all_windows (0, 0, 0);	913	resize_all_windows (0, 0, 0);
899	scr_remap_chars ();	914	scr_remap_chars ();
900	scr_touch (true);	915	scr_touch (true);
901	}	916	}
902		917
903	return true;	918	return true;
904	}	919	}
905		920
		921	void
906	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	922	rxvt_term::set_string_property (Atom prop, const char *str, int len)
907	{	923	{
908	XChangeProperty (dpy, parent[0],	924	XChangeProperty (dpy, parent[0],
909	prop, XA_STRING, 8, PropModeReplace,	925	prop, XA_STRING, 8, PropModeReplace,
910	(const unsigned char *)str, len >= 0 ? len : strlen (str));	926	(const unsigned char *)str, len >= 0 ? len : strlen (str));
911	}	927	}
912		928
		929	void
913	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	930	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914	{	931	{
915	wchar_t *ws = rxvt_mbstowcs (str, len);	932	wchar_t *ws = rxvt_mbstowcs (str, len);
916	char *s = rxvt_wcstoutf8 (ws);	933	char *s = rxvt_wcstoutf8 (ws);
917		934
918	XChangeProperty (dpy, parent[0],	935	XChangeProperty (dpy, parent[0],
…		…
942	#if ENABLE_EWMH	959	#if ENABLE_EWMH
943	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	960	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944	#endif	961	#endif
945	}	962	}
946		963
		964	void
		965	rxvt_term::set_window_color (int idx, const char *color)
		966	{
947	#ifdef XTERM_COLOR_CHANGE	967	#ifdef XTERM_COLOR_CHANGE
948	void
949	rxvt_term::set_window_color (int idx, const char *color)
950	{
951	rxvt_color xcol;	968	rxvt_color xcol;
952	int i;	969	int i;
953		970
954	if (color == NULL \|\| *color == '\0')	971	if (color == NULL \|\| *color == '\0')
955	return;	972	return;
956		973
957	color = strdup (color);	974	color = strdup (color);
958	allocated.push_back ((void *)color);	975	allocated.push_back ((void *)color);
…		…
962	if (isdigit (*color))	979	if (isdigit (*color))
963	{	980	{
964	i = atoi (color);	981	i = atoi (color);
965		982
966	if (i >= 8 && i <= 15)	983	if (i >= 8 && i <= 15)
		984	{
967	{ /* bright colors */	985	/* bright colors */
968	i -= 8;
969	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
970	goto done;	987	goto done;
971	}	988	}
972		989
973	if (i >= 0 && i <= 7)	990	if (i >= 0 && i <= 7)
		991	{
974	{ /* normal colors */	992	/* normal colors */
975	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	993	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976	goto done;	994	goto done;
977	}	995	}
978	}	996	}
979		997
…		…
984	* so just keep gobbling up the colormap	1002	* so just keep gobbling up the colormap
985	*/	1003	*/
986		1004
987	pix_colors_focused[idx] = xcol;	1005	pix_colors_focused[idx] = xcol;
988		1006
989	/* XSetWindowAttributes attr; */
990	/* Cursor cursor; */
991	done:	1007	done:
992	/TODO: handle Color_BD, scrollbar background, etc. /	1008	/TODO: handle Color_BD, scrollbar background, etc. /
993		1009
994	update_fade_color (idx);	1010	update_fade_color (idx);
995	recolour_cursor ();	1011	recolour_cursor ();
996	scr_recolour ();	1012	scr_recolour ();
		1013	#endif /* XTERM_COLOR_CHANGE */
997	}	1014	}
998
999	#else
1000	# define set_window_color (idx,color) ((void)0)
1001	#endif /* XTERM_COLOR_CHANGE */
1002		1015
1003	void	1016	void
1004	rxvt_term::recolour_cursor ()	1017	rxvt_term::recolour_cursor ()
1005	{	1018	{
1006	XColor fg, bg;	1019	XColor fg, bg;
…		…
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++)
…		…
1038		1051
1039	for (i = Color_Black; i <= Color_White; i++)	1052	for (i = Color_Black; i <= Color_White; i++)
1040	if (pix_colors[Color_bg] == pix_colors[i])	1053	if (pix_colors[Color_bg] == pix_colors[i])
1041	{	1054	{
1042	sprintf (bstr, "%d", (i - Color_Black));	1055	sprintf (bstr, "%d", (i - Color_Black));
1043	#ifdef XPM_BACKGROUND	1056	#ifdef BG_IMAGE_FROM_FILE
1044	xpmb = "default;";	1057	xpmb = "default;";
1045	#endif	1058	#endif
1046	break;	1059	break;
1047	}	1060	}
1048		1061
…		…
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.249 by sasha, Wed Sep 12 20:29:24 2007 UTC vs. Revision 1.276 by root, Tue Dec 11 18:00:07 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.249 by sasha, Wed Sep 12 20:29:24 2007 UTC vs.
Revision 1.276 by root, Tue Dec 11 18:00:07 2007 UTC