[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.271 by root, Tue Dec 4 16:33:42 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	43	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	44	# include <termios.h>
		45	#endif
		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
49	#endif	54	#endif
50		55
51	vector<rxvt_term *> rxvt_term::termlist;	56	vector<rxvt_term *> rxvt_term::termlist;
52		57
53	// used to tell global functions which terminal instance is "active"	58	// used to tell global functions which terminal instance is "active"
…		…
88	class rxvt_composite_vec rxvt_composite;	93	class rxvt_composite_vec rxvt_composite;
89		94
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	95	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	96	{
92	compose_char *cc;	97	compose_char *cc;
93		98
94	// break compose chains, as stupid readline really likes to duplicate	99	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	100	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	101	cc = (*this)[c1];
97	while (cc)	102	while (cc)
98	{	103	{
…		…
147		152
148	}	153	}
149	#endif	154	#endif
150		155
151	rxvt_term::rxvt_term ()	156	rxvt_term::rxvt_term ()
152	:	157	{
		158	#if HAVE_BG_PIXMAP
		159	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		160	#endif
		161	#ifdef CURSOR_BLINK
		162	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
		163	#endif
		164	#ifdef TEXT_BLINK
		165	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
		166	#endif
		167	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		168	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		169	#endif
		170	#ifdef SELECTION_SCROLLING
		171	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		172	#endif
		173	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		174	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		175	#endif
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	176	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	177	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	178	#endif
159	#ifdef HAVE_SCROLLBARS	179	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),	180	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161	#endif	181	#endif
162	#ifdef CURSOR_BLINK	182	#ifdef USE_XIM
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	183	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	184	#endif
177	#ifdef POINTER_BLANK	185	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	186	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	187	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	188	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	189	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	190	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	191	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	192	prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	193	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	194	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	195	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	196	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	197	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	198	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194	{	199
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		201
197	termlist.push_back (this);	202	termlist.push_back (this);
198		203
199	#ifdef KEYSYM_RESOURCE	204	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	206	#endif
202	}	207	}
203		208
204	// clean up the most important stuff, do not call x or free mem etc.	209	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	210	// for use before an emergency exit
		211	void
206	void rxvt_term::emergency_cleanup ()	212	rxvt_term::emergency_cleanup ()
207	{	213	{
208	if (cmd_pid)	214	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	215	kill (-cmd_pid, SIGHUP);
210		216
211	pty_ev.stop ();	217	pty_ev.stop ();
…		…
278	delete [] pix_colors_focused;	284	delete [] pix_colors_focused;
279	#if OFF_FOCUS_FADING	285	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;	286	delete [] pix_colors_unfocused;
281	#endif	287	#endif
282		288
		289	#ifdef HAVE_BG_PIXMAP
		290	bgPixmap.destroy ();
		291	#endif
283	displays.put (display);	292	displays.put (display);
284		293
285	scr_release ();	294	scr_release ();
286		295
287	/* clear all resources */	296	/* clear all resources */
…		…
300	delete argv;	309	delete argv;
301		310
302	#ifdef KEYSYM_RESOURCE	311	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	312	delete keyboard;
304	#endif	313	#endif
		314	#ifndef NO_RESOURCES
		315	XrmDestroyDatabase (option_db);
		316	#endif
305	}	317	}
306		318
307	// child has exited, usually destroys	319	// child has exited, usually destroys
308	void	320	void
309	rxvt_term::child_cb (child_watcher &w, int status)	321	rxvt_term::child_cb (ev::child &w, int status)
310	{	322	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	323	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		324
313	cmd_pid = 0;	325	cmd_pid = 0;
314		326
…		…
342	incr_ev.stop ();	354	incr_ev.stop ();
343	termwin_ev.stop (display);	355	termwin_ev.stop (display);
344	vt_ev.stop (display);	356	vt_ev.stop (display);
345	}	357	}
346		358
347	check_ev.stop ();	359	prepare_ev.stop ();
348	pty_ev.stop ();	360	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	361	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	362	cursor_blink_ev.stop ();
351	#endif	363	#endif
352	#ifdef TEXT_BLINK	364	#ifdef TEXT_BLINK
…		…
360	#endif	372	#endif
361	#ifdef POINTER_BLANK	373	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	374	pointer_ev.stop ();
363	#endif	375	#endif
364		376
365	destroy_ev.start (0);	377	destroy_ev.start ();
366	}	378	}
367		379
368	void	380	void
369	rxvt_term::destroy_cb (time_watcher &w)	381	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	382	{
371	make_current ();	383	make_current ();
372		384
373	delete this;	385	delete this;
374	}	386	}
…		…
428	else	440	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	441	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	442	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	443	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	444	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	445	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	446	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	447	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	448	}
437	#endif	449	#endif
438		450
…		…
504		516
505	#ifdef HAVE_SCROLLBARS	517	#ifdef HAVE_SCROLLBARS
506	if (option (Opt_scrollBar))	518	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */	519	resize_scrollbar (); /* create and map scrollbar */
508	#endif	520	#endif
		521	#ifdef HAVE_BG_PIXMAP
		522	{
		523	bgPixmap.set_target (this);
		524
509	#ifdef ENABLE_TRANSPARENCY	525	#ifdef ENABLE_TRANSPARENCY
510	if (option (Opt_transparent))	526	if (option (Opt_transparent))
511	{	527	{
		528	bgPixmap.set_transparent ();
		529	#ifdef HAVE_AFTERIMAGE
		530	if (rs [Rs_blurradius])
		531	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		532	#endif
		533	if (ISSET_PIXCOLOR (Color_tint))
		534	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		535	if (rs [Rs_shade])
		536	bgPixmap.set_shade (rs [Rs_shade]);
		537
		538	bgPixmap.set_root_pixmap ();
512	XSelectInput (dpy, display->root, PropertyChangeMask);	539	XSelectInput (dpy, display->root, PropertyChangeMask);
513	check_our_parents ();
514	rootwin_ev.start (display, display->root);	540	rootwin_ev.start (display, display->root);
515	}	541	}
516	#endif	542	#endif
		543
		544	#ifdef BG_IMAGE_FROM_FILE
		545	if (rs[Rs_backgroundPixmap] != NULL)
		546	{
		547	const char *p = rs[Rs_backgroundPixmap];
		548
		549	if ((p = strchr (p, ';')) != NULL)
		550	{
		551	p++;
		552	bgPixmap.set_geometry (p);
		553	}
		554	else
		555	bgPixmap.set_defaultGeometry ();
		556
		557	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		558	if (!bgPixmap.window_position_sensitive ())
		559	update_background ();
		560	}
		561	#endif
		562	}
		563	#endif
		564
517	#if ENABLE_PERL	565	#if ENABLE_PERL
518	rootwin_ev.start (display, display->root);	566	rootwin_ev.start (display, display->root);
519	#endif	567	#endif
520		568
521	set_colorfgbg ();	569	set_colorfgbg ();
…		…
523	init_command (cmd_argv);	571	init_command (cmd_argv);
524		572
525	free (cmd_argv);	573	free (cmd_argv);
526		574
527	if (pty->pty >= 0)	575	if (pty->pty >= 0)
528	pty_ev.start (pty->pty, EVENT_READ);	576	pty_ev.start (pty->pty, ev::READ);
529		577
530	check_ev.start ();	578	prepare_ev.start ();
531		579
532	HOOK_INVOKE ((this, HOOK_START, DT_END));	580	HOOK_INVOKE ((this, HOOK_START, DT_END));
533		581
534	#if ENABLE_XEMBED	582	#if ENABLE_XEMBED
535	if (rs[Rs_embed])	583	if (rs[Rs_embed])
…		…
547	return true;	595	return true;
548	}	596	}
549		597
550	static struct sig_handlers	598	static struct sig_handlers
551	{	599	{
552	sig_watcher sw_term, sw_int;	600	ev::sig sw_term, sw_int;
553		601
554	/*	602	/*
555	* Catch a fatal signal and tidy up before quitting	603	* Catch a fatal signal and tidy up before quitting
556	*/	604	*/
557	void	605	void sig_term (ev::sig &w, int revents);
558	sig_term (sig_watcher &w)	606
		607	sig_handlers ()
559	{	608	{
560	rxvt_emergency_cleanup ();	609	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)	610	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
568	{
569	}	611	}
570	} sig_handlers;	612	} sig_handlers;
571		613
		614	void
		615	sig_handlers::sig_term (ev::sig &w, int revents)
		616	{
		617	rxvt_emergency_cleanup ();
		618	w.stop ();
		619	kill (getpid (), w.signum);
		620	}
		621
572	char **rxvt_environ; // startup environment	622	char **rxvt_environ; // startup environment
573		623
574	void	624	void
575	rxvt_init ()	625	rxvt_init ()
576	{	626	{
577	ptytty::init ();	627	ptytty::init ();
		628
		629	if (!ev_default_loop (0))
		630	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578		631
579	rxvt_environ = environ;	632	rxvt_environ = environ;
580		633
581	signal (SIGHUP, SIG_IGN);	634	signal (SIGHUP, SIG_IGN);
582	signal (SIGPIPE, SIG_IGN);	635	signal (SIGPIPE, SIG_IGN);
583		636
584	sig_handlers.sw_term.start (SIGTERM);	637	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
585	sig_handlers.sw_int.start (SIGINT);	638	sig_handlers.sw_int.start (SIGINT); ev_unref ();
586		639
587	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	640	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
588	/* signal (SIGURG, SIG_DFL); */	641	/* signal (SIGURG, SIG_DFL); */
589		642
590	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	643	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
860	if (parent[0])	913	if (parent[0])
861	{	914	{
862	resize_all_windows (0, 0, 0);	915	resize_all_windows (0, 0, 0);
863	scr_remap_chars ();	916	scr_remap_chars ();
864	scr_touch (true);	917	scr_touch (true);
865	}	918	}
866		919
867	return true;	920	return true;
868	}	921	}
869		922
		923	void
870	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	924	rxvt_term::set_string_property (Atom prop, const char *str, int len)
871	{	925	{
872	XChangeProperty (dpy, parent[0],	926	XChangeProperty (dpy, parent[0],
873	prop, XA_STRING, 8, PropModeReplace,	927	prop, XA_STRING, 8, PropModeReplace,
874	(const unsigned char *)str, len >= 0 ? len : strlen (str));	928	(const unsigned char *)str, len >= 0 ? len : strlen (str));
875	}	929	}
876		930
		931	void
877	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	932	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
878	{	933	{
879	wchar_t *ws = rxvt_mbstowcs (str, len);	934	wchar_t *ws = rxvt_mbstowcs (str, len);
880	char *s = rxvt_wcstoutf8 (ws);	935	char *s = rxvt_wcstoutf8 (ws);
881		936
882	XChangeProperty (dpy, parent[0],	937	XChangeProperty (dpy, parent[0],
…		…
906	#if ENABLE_EWMH	961	#if ENABLE_EWMH
907	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	962	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
908	#endif	963	#endif
909	}	964	}
910		965
		966	void
		967	rxvt_term::set_window_color (int idx, const char *color)
		968	{
911	#ifdef XTERM_COLOR_CHANGE	969	#ifdef XTERM_COLOR_CHANGE
912	void
913	rxvt_term::set_window_color (int idx, const char *color)
914	{
915	rxvt_color xcol;	970	rxvt_color xcol;
916	int i;	971	int i;
917		972
918	if (color == NULL \|\| *color == '\0')	973	if (color == NULL \|\| *color == '\0')
919	return;	974	return;
920		975
921	color = strdup (color);	976	color = strdup (color);
922	allocated.push_back ((void *)color);	977	allocated.push_back ((void *)color);
…		…
926	if (isdigit (*color))	981	if (isdigit (*color))
927	{	982	{
928	i = atoi (color);	983	i = atoi (color);
929		984
930	if (i >= 8 && i <= 15)	985	if (i >= 8 && i <= 15)
		986	{
931	{ /* bright colors */	987	/* bright colors */
932	i -= 8;
933	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	988	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934	goto done;	989	goto done;
935	}	990	}
936		991
937	if (i >= 0 && i <= 7)	992	if (i >= 0 && i <= 7)
		993	{
938	{ /* normal colors */	994	/* normal colors */
939	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	995	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
940	goto done;	996	goto done;
941	}	997	}
942	}	998	}
943		999
…		…
948	* so just keep gobbling up the colormap	1004	* so just keep gobbling up the colormap
949	*/	1005	*/
950		1006
951	pix_colors_focused[idx] = xcol;	1007	pix_colors_focused[idx] = xcol;
952		1008
953	/* XSetWindowAttributes attr; */
954	/* Cursor cursor; */
955	done:	1009	done:
956	/TODO: handle Color_BD, scrollbar background, etc. /	1010	/TODO: handle Color_BD, scrollbar background, etc. /
957		1011
958	update_fade_color (idx);	1012	update_fade_color (idx);
959	recolour_cursor ();	1013	recolour_cursor ();
960	scr_recolour ();	1014	scr_recolour ();
		1015	#endif /* XTERM_COLOR_CHANGE */
961	}	1016	}
962
963	#else
964	# define set_window_color (idx,color) ((void)0)
965	#endif /* XTERM_COLOR_CHANGE */
966		1017
967	void	1018	void
968	rxvt_term::recolour_cursor ()	1019	rxvt_term::recolour_cursor ()
969	{	1020	{
970	XColor fg, bg;	1021	XColor fg, bg;
…		…
986	*/	1037	*/
987	void	1038	void
988	rxvt_term::set_colorfgbg ()	1039	rxvt_term::set_colorfgbg ()
989	{	1040	{
990	unsigned int i;	1041	unsigned int i;
991	const char *xpmb = "\0";	1042	const char *xpmb = "";
992	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1043	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
993		1044
994	strcpy (fstr, "default");	1045	strcpy (fstr, "default");
995	strcpy (bstr, "default");	1046	strcpy (bstr, "default");
996	for (i = Color_Black; i <= Color_White; i++)	1047	for (i = Color_Black; i <= Color_White; i++)
…		…
1002		1053
1003	for (i = Color_Black; i <= Color_White; i++)	1054	for (i = Color_Black; i <= Color_White; i++)
1004	if (pix_colors[Color_bg] == pix_colors[i])	1055	if (pix_colors[Color_bg] == pix_colors[i])
1005	{	1056	{
1006	sprintf (bstr, "%d", (i - Color_Black));	1057	sprintf (bstr, "%d", (i - Color_Black));
1007	#ifdef XPM_BACKGROUND	1058	#ifdef BG_IMAGE_FROM_FILE
1008	xpmb = "default;";	1059	xpmb = "default;";
1009	#endif	1060	#endif
1010	break;	1061	break;
1011	}	1062	}
1012		1063
…		…
1108		1159
1109	XMoveResizeWindow (dpy, vt,	1160	XMoveResizeWindow (dpy, vt,
1110	window_vt_x, window_vt_y,	1161	window_vt_x, window_vt_y,
1111	width, height);	1162	width, height);
1112		1163
		1164	#ifdef HAVE_BG_PIXMAP
		1165	if (bgPixmap.window_size_sensitive ())
		1166	update_background ();
		1167	#endif
		1168
1113	scr_clear ();	1169	scr_clear ();
1114	#ifdef XPM_BACKGROUND
1115	resize_pixmap ();
1116	#endif
1117	}	1170	}
1118		1171
1119	if (fix_screen \|\| old_height == 0)	1172	if (fix_screen \|\| old_height == 0)
1120	scr_reset ();	1173	scr_reset ();
1121		1174
1122	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1175	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123	//scr_touch (false);	1176	//scr_touch (false);
1124		1177
1125	#ifdef HAVE_BG_PIXMAP	1178	#ifdef HAVE_BG_PIXMAP
		1179	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1126	if (bgPixmap.pixmap)	1180	// if (bgPixmap.pixmap)
1127	scr_touch (false);	1181	// scr_touch (false);
1128	#endif	1182	#endif
1129		1183
1130	#ifdef USE_XIM	1184	#ifdef USE_XIM
1131	IMSetPosition ();	1185	IMSetPosition ();
1132	#endif	1186	#endif
…		…
1303	if (term->rs[Rs_imLocale])	1357	if (term->rs[Rs_imLocale])
1304	SET_LOCALE (term->locale);	1358	SET_LOCALE (term->locale);
1305	}	1359	}
1306	else	1360	else
1307	str = (void *)text->string.wide_char;	1361	str = (void *)text->string.wide_char;
1308		1362
1309	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1363	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310	DT_INT, call_data->caret,	1364	DT_INT, call_data->caret,
1311	DT_INT, call_data->chg_first,	1365	DT_INT, call_data->chg_first,
1312	DT_INT, call_data->chg_length,	1366	DT_INT, call_data->chg_length,
1313	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1367	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1632		1686
1633	if (input_style & XIMPreeditPosition)	1687	if (input_style & XIMPreeditPosition)
1634	{	1688	{
1635	im_set_size (preedit_rect);	1689	im_set_size (preedit_rect);
1636	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1690	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637		1691
1638	XSetICValues (Input_Context,	1692	XSetICValues (Input_Context,
1639	XNPreeditAttributes, preedit_attr, NULL);	1693	XNPreeditAttributes, preedit_attr, NULL);
1640	}	1694	}
1641	else	1695	else
1642	{	1696	{
…		…
1659	XFree (status_attr);	1713	XFree (status_attr);
1660	}	1714	}
1661		1715
1662	XFree (preedit_attr);	1716	XFree (preedit_attr);
1663	}	1717	}
1664	#endif /* USE_XIM */	1718	#endif /* USE_XIM */
		1719
		1720	void
		1721	rxvt_term::get_window_origin (int &x, int &y)
		1722	{
		1723	Window cr;
		1724	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1725	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1726	}
		1727
		1728	Pixmap
		1729	rxvt_term::get_pixmap_property (int prop_id)
		1730	{
		1731	if (prop_id > 0 && prop_id < NUM_XA)
		1732	if (xa[prop_id])
		1733	{
		1734	int aformat;
		1735	unsigned long nitems, bytes_after;
		1736	Atom atype;
		1737	unsigned char *prop = NULL;
		1738	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1739	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1740	&nitems, &bytes_after, &prop);
		1741	if (result == Success && prop && atype == XA_PIXMAP)
		1742	{
		1743	return (Pixmap )prop;
		1744	}
		1745	}
		1746	return None;
		1747	}
		1748
		1749	#ifdef HAVE_BG_PIXMAP
		1750	# if TRACE_PIXMAPS
		1751	# undef update_background
		1752	int rxvt_term::trace_update_background (const char *file, int line)
		1753	{
		1754	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1755	update_background ();
		1756	}
		1757	# endif
		1758
		1759	int
		1760	rxvt_term::update_background ()
		1761	{
		1762	bgPixmap.invalidate ();
		1763
		1764	/* no chance of real time refresh if we are blurring! */
		1765	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1766	bgPixmap.render ();
		1767	else
		1768	{
		1769	update_background_ev.stop ();
		1770
		1771	if (!bgPixmap.need_client_side_rendering())
		1772	update_background_ev.start (.05);
		1773	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1774	update_background_ev.start (.20); /* very slow !!! */
		1775	else
		1776	update_background_ev.start (.07);
		1777	}
		1778
		1779	return 0;
		1780	}
		1781
		1782	void
		1783	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1784	{
		1785	bgPixmap.render ();
		1786	}
		1787
		1788	#endif /* HAVE_BG_PIXMAP */
1665		1789
1666	/----------------------- end-of-file (C source) -----------------------/	1790	/----------------------- 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.271 by root, Tue Dec 4 16:33:42 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.271 by root, Tue Dec 4 16:33:42 2007 UTC