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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.239 by sasha, Fri Aug 3 22:40:10 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 ENABLE_TRANSPARENCY
157	check_our_parents_ev(this, &rxvt_term::check_our_parents_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
…		…
504		514
505	#ifdef HAVE_SCROLLBARS	515	#ifdef HAVE_SCROLLBARS
506	if (option (Opt_scrollBar))	516	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */	517	resize_scrollbar (); /* create and map scrollbar */
508	#endif	518	#endif
		519	#ifdef HAVE_BG_PIXMAP
		520	{
		521	bgPixmap.set_target (this);
		522
509	#ifdef ENABLE_TRANSPARENCY	523	#ifdef ENABLE_TRANSPARENCY
510	if (option (Opt_transparent))	524	if (option (Opt_transparent))
511	{	525	{
		526	bgPixmap.set_transparent ();
		527	#ifdef HAVE_AFTERIMAGE
		528	if (rs [Rs_blurradius])
		529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		530	#endif
		531	if (ISSET_PIXCOLOR (Color_tint))
		532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		533	if (rs [Rs_shade])
		534	bgPixmap.set_shade (rs [Rs_shade]);
		535
		536	bgPixmap.set_root_pixmap ();
512	XSelectInput (dpy, display->root, PropertyChangeMask);	537	XSelectInput (dpy, display->root, PropertyChangeMask);
513	check_our_parents ();
514	rootwin_ev.start (display, display->root);	538	rootwin_ev.start (display, display->root);
515	}	539	}
516	#endif	540	#endif
		541
		542	#ifdef BG_IMAGE_FROM_FILE
		543	if (rs[Rs_backgroundPixmap] != NULL)
		544	{
		545	const char *p = rs[Rs_backgroundPixmap];
		546
		547	if ((p = strchr (p, ';')) != NULL)
		548	{
		549	p++;
		550	bgPixmap.set_geometry (p);
		551	}
		552	else
		553	bgPixmap.set_defaultGeometry ();
		554
		555	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		556	if (!bgPixmap.window_position_sensitive ())
		557	update_background ();
		558	}
		559	#endif
		560	}
		561	#endif
		562
517	#if ENABLE_PERL	563	#if ENABLE_PERL
518	rootwin_ev.start (display, display->root);	564	rootwin_ev.start (display, display->root);
519	#endif	565	#endif
520		566
521	set_colorfgbg ();	567	set_colorfgbg ();
…		…
523	init_command (cmd_argv);	569	init_command (cmd_argv);
524		570
525	free (cmd_argv);	571	free (cmd_argv);
526		572
527	if (pty->pty >= 0)	573	if (pty->pty >= 0)
528	pty_ev.start (pty->pty, EVENT_READ);	574	pty_ev.start (pty->pty, ev::READ);
529		575
530	check_ev.start ();	576	prepare_ev.start ();
531		577
532	HOOK_INVOKE ((this, HOOK_START, DT_END));	578	HOOK_INVOKE ((this, HOOK_START, DT_END));
533		579
534	#if ENABLE_XEMBED	580	#if ENABLE_XEMBED
535	if (rs[Rs_embed])	581	if (rs[Rs_embed])
…		…
547	return true;	593	return true;
548	}	594	}
549		595
550	static struct sig_handlers	596	static struct sig_handlers
551	{	597	{
552	sig_watcher sw_term, sw_int;	598	ev::sig sw_term, sw_int;
553		599
554	/*	600	/*
555	* Catch a fatal signal and tidy up before quitting	601	* Catch a fatal signal and tidy up before quitting
556	*/	602	*/
557	void	603	void sig_term (ev::sig &w, int revents);
558	sig_term (sig_watcher &w)	604
		605	sig_handlers ()
559	{	606	{
560	rxvt_emergency_cleanup ();	607	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
561	signal (w.signum, SIG_DFL);
562	kill (getpid (), w.signum);
563	}
564
565	sig_handlers ()
566	: sw_term (this, &sig_handlers::sig_term),
567	sw_int (this, &sig_handlers::sig_term)	608	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
568	{
569	}	609	}
570	} sig_handlers;	610	} sig_handlers;
571		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
572	char **rxvt_environ; // startup environment	620	char **rxvt_environ; // startup environment
573		621
574	void	622	void
575	rxvt_init ()	623	rxvt_init ()
576	{	624	{
577	ptytty::init ();	625	ptytty::init ();
		626
		627	if (!ev_default_loop (0))
		628	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578		629
579	rxvt_environ = environ;	630	rxvt_environ = environ;
580		631
581	signal (SIGHUP, SIG_IGN);	632	signal (SIGHUP, SIG_IGN);
582	signal (SIGPIPE, SIG_IGN);	633	signal (SIGPIPE, SIG_IGN);
583		634
584	sig_handlers.sw_term.start (SIGTERM);	635	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
585	sig_handlers.sw_int.start (SIGINT);	636	sig_handlers.sw_int.start (SIGINT); ev_unref ();
586		637
587	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	638	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
588	/* signal (SIGURG, SIG_DFL); */	639	/* signal (SIGURG, SIG_DFL); */
589		640
590	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
776	ws.ws_xpixel = width;	827	ws.ws_xpixel = width;
777	ws.ws_ypixel = height;	828	ws.ws_ypixel = height;
778	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
779		830
780	#if 0	831	#if 0
781	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	832	// TIOCSWINSZ is supposed to do this automatically and correctly
782	if (cmd_pid) /* force through to the command */	833	if (cmd_pid) /* force through to the command */
783	kill (-cmd_pid, SIGWINCH);	834	kill (-cmd_pid, SIGWINCH);
784	#endif	835	#endif
785	}	836	}
786		837
…		…
860	if (parent[0])	911	if (parent[0])
861	{	912	{
862	resize_all_windows (0, 0, 0);	913	resize_all_windows (0, 0, 0);
863	scr_remap_chars ();	914	scr_remap_chars ();
864	scr_touch (true);	915	scr_touch (true);
865	}	916	}
866		917
867	return true;	918	return true;
868	}	919	}
869		920
		921	void
870	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)
871	{	923	{
872	XChangeProperty (dpy, parent[0],	924	XChangeProperty (dpy, parent[0],
873	prop, XA_STRING, 8, PropModeReplace,	925	prop, XA_STRING, 8, PropModeReplace,
874	(const unsigned char *)str, len >= 0 ? len : strlen (str));	926	(const unsigned char *)str, len >= 0 ? len : strlen (str));
875	}	927	}
876		928
		929	void
877	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)
878	{	931	{
879	wchar_t *ws = rxvt_mbstowcs (str, len);	932	wchar_t *ws = rxvt_mbstowcs (str, len);
880	char *s = rxvt_wcstoutf8 (ws);	933	char *s = rxvt_wcstoutf8 (ws);
881		934
882	XChangeProperty (dpy, parent[0],	935	XChangeProperty (dpy, parent[0],
…		…
906	#if ENABLE_EWMH	959	#if ENABLE_EWMH
907	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	960	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
908	#endif	961	#endif
909	}	962	}
910		963
		964	void
		965	rxvt_term::set_window_color (int idx, const char *color)
		966	{
911	#ifdef XTERM_COLOR_CHANGE	967	#ifdef XTERM_COLOR_CHANGE
912	void
913	rxvt_term::set_window_color (int idx, const char *color)
914	{
915	rxvt_color xcol;	968	rxvt_color xcol;
916	int i;	969	int i;
917		970
918	if (color == NULL \|\| *color == '\0')	971	if (color == NULL \|\| *color == '\0')
919	return;	972	return;
920		973
921	color = strdup (color);	974	color = strdup (color);
922	allocated.push_back ((void *)color);	975	allocated.push_back ((void *)color);
…		…
926	if (isdigit (*color))	979	if (isdigit (*color))
927	{	980	{
928	i = atoi (color);	981	i = atoi (color);
929		982
930	if (i >= 8 && i <= 15)	983	if (i >= 8 && i <= 15)
		984	{
931	{ /* bright colors */	985	/* bright colors */
932	i -= 8;
933	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934	goto done;	987	goto done;
935	}	988	}
936		989
937	if (i >= 0 && i <= 7)	990	if (i >= 0 && i <= 7)
		991	{
938	{ /* normal colors */	992	/* normal colors */
939	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	993	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
940	goto done;	994	goto done;
941	}	995	}
942	}	996	}
943		997
…		…
948	* so just keep gobbling up the colormap	1002	* so just keep gobbling up the colormap
949	*/	1003	*/
950		1004
951	pix_colors_focused[idx] = xcol;	1005	pix_colors_focused[idx] = xcol;
952		1006
953	/* XSetWindowAttributes attr; */
954	/* Cursor cursor; */
955	done:	1007	done:
956	/TODO: handle Color_BD, scrollbar background, etc. /	1008	/TODO: handle Color_BD, scrollbar background, etc. /
957		1009
958	update_fade_color (idx);	1010	update_fade_color (idx);
959	recolour_cursor ();	1011	recolour_cursor ();
960	scr_recolour ();	1012	scr_recolour ();
		1013	#endif /* XTERM_COLOR_CHANGE */
961	}	1014	}
962
963	#else
964	# define set_window_color (idx,color) ((void)0)
965	#endif /* XTERM_COLOR_CHANGE */
966		1015
967	void	1016	void
968	rxvt_term::recolour_cursor ()	1017	rxvt_term::recolour_cursor ()
969	{	1018	{
970	XColor fg, bg;	1019	XColor fg, bg;
…		…
986	*/	1035	*/
987	void	1036	void
988	rxvt_term::set_colorfgbg ()	1037	rxvt_term::set_colorfgbg ()
989	{	1038	{
990	unsigned int i;	1039	unsigned int i;
991	const char *xpmb = "\0";	1040	const char *xpmb = "";
992	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1041	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
993		1042
994	strcpy (fstr, "default");	1043	strcpy (fstr, "default");
995	strcpy (bstr, "default");	1044	strcpy (bstr, "default");
996	for (i = Color_Black; i <= Color_White; i++)	1045	for (i = Color_Black; i <= Color_White; i++)
…		…
1002		1051
1003	for (i = Color_Black; i <= Color_White; i++)	1052	for (i = Color_Black; i <= Color_White; i++)
1004	if (pix_colors[Color_bg] == pix_colors[i])	1053	if (pix_colors[Color_bg] == pix_colors[i])
1005	{	1054	{
1006	sprintf (bstr, "%d", (i - Color_Black));	1055	sprintf (bstr, "%d", (i - Color_Black));
1007	#ifdef XPM_BACKGROUND	1056	#ifdef BG_IMAGE_FROM_FILE
1008	xpmb = "default;";	1057	xpmb = "default;";
1009	#endif	1058	#endif
1010	break;	1059	break;
1011	}	1060	}
1012		1061
…		…
1108		1157
1109	XMoveResizeWindow (dpy, vt,	1158	XMoveResizeWindow (dpy, vt,
1110	window_vt_x, window_vt_y,	1159	window_vt_x, window_vt_y,
1111	width, height);	1160	width, height);
1112		1161
		1162	#ifdef HAVE_BG_PIXMAP
		1163	if (bgPixmap.window_size_sensitive ())
		1164	update_background ();
		1165	#endif
		1166
1113	scr_clear ();	1167	scr_clear ();
1114	#ifdef XPM_BACKGROUND
1115	resize_pixmap ();
1116	#endif
1117	}	1168	}
1118		1169
1119	if (fix_screen \|\| old_height == 0)	1170	if (fix_screen \|\| old_height == 0)
1120	scr_reset ();	1171	scr_reset ();
1121		1172
1122	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1173	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123	//scr_touch (false);	1174	//scr_touch (false);
1124		1175
1125	#ifdef HAVE_BG_PIXMAP	1176	#ifdef HAVE_BG_PIXMAP
		1177	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1126	if (bgPixmap.pixmap)	1178	// if (bgPixmap.pixmap)
1127	scr_touch (false);	1179	// scr_touch (false);
1128	#endif	1180	#endif
1129		1181
1130	#ifdef USE_XIM	1182	#ifdef USE_XIM
1131	IMSetPosition ();	1183	IMSetPosition ();
1132	#endif	1184	#endif
…		…
1303	if (term->rs[Rs_imLocale])	1355	if (term->rs[Rs_imLocale])
1304	SET_LOCALE (term->locale);	1356	SET_LOCALE (term->locale);
1305	}	1357	}
1306	else	1358	else
1307	str = (void *)text->string.wide_char;	1359	str = (void *)text->string.wide_char;
1308		1360
1309	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1361	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310	DT_INT, call_data->caret,	1362	DT_INT, call_data->caret,
1311	DT_INT, call_data->chg_first,	1363	DT_INT, call_data->chg_first,
1312	DT_INT, call_data->chg_length,	1364	DT_INT, call_data->chg_length,
1313	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,
…		…
1632		1684
1633	if (input_style & XIMPreeditPosition)	1685	if (input_style & XIMPreeditPosition)
1634	{	1686	{
1635	im_set_size (preedit_rect);	1687	im_set_size (preedit_rect);
1636	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1688	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637		1689
1638	XSetICValues (Input_Context,	1690	XSetICValues (Input_Context,
1639	XNPreeditAttributes, preedit_attr, NULL);	1691	XNPreeditAttributes, preedit_attr, NULL);
1640	}	1692	}
1641	else	1693	else
1642	{	1694	{
…		…
1659	XFree (status_attr);	1711	XFree (status_attr);
1660	}	1712	}
1661		1713
1662	XFree (preedit_attr);	1714	XFree (preedit_attr);
1663	}	1715	}
1664	#endif /* USE_XIM */	1716	#endif /* USE_XIM */
		1717
		1718	void
		1719	rxvt_term::get_window_origin (int &x, int &y)
		1720	{
		1721	Window cr;
		1722	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1723	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1724	}
		1725
		1726	Pixmap
		1727	rxvt_term::get_pixmap_property (int prop_id)
		1728	{
		1729	if (prop_id > 0 && prop_id < NUM_XA)
		1730	if (xa[prop_id])
		1731	{
		1732	int aformat;
		1733	unsigned long nitems, bytes_after;
		1734	Atom atype;
		1735	unsigned char *prop = NULL;
		1736	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1737	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1738	&nitems, &bytes_after, &prop);
		1739	if (result == Success && prop && atype == XA_PIXMAP)
		1740	{
		1741	return (Pixmap )prop;
		1742	}
		1743	}
		1744	return None;
		1745	}
		1746
		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
		1757	int
		1758	rxvt_term::update_background ()
		1759	{
		1760	bgPixmap.invalidate ();
		1761
		1762	/* no chance of real time refresh if we are blurring! */
		1763	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1764	bgPixmap.render ();
		1765	else
		1766	{
		1767	update_background_ev.stop ();
		1768
		1769	if (!bgPixmap.need_client_side_rendering())
		1770	update_background_ev.start (.05);
		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	}
		1779
		1780	void
		1781	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1782	{
		1783	bgPixmap.render ();
		1784	}
		1785
		1786	#endif /* HAVE_BG_PIXMAP */
1665		1787
1666	/----------------------- end-of-file (C source) -----------------------/	1788	/----------------------- 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.239 by sasha, Fri Aug 3 22:40:10 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.239 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.276 by root, Tue Dec 11 18:00:07 2007 UTC