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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.275 by root, Tue Dec 11 15:42:51 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 TRANSPARENT \|\| 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	check_our_aprents_ev(this, &rxvt_term::check_our_parents_cb),
156	#endif	176	#endif
157	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
158	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
159	#endif	179	#endif
160	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
161	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
162	#endif
163	#ifdef TEXT_BLINK
164	text_blink_ev (this, &rxvt_term::text_blink_cb),
165	#endif
166	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
168	#endif
169	#ifdef SELECTION_SCROLLING
170	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
171	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
174	#endif	182	#endif
175	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
176	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
177	#endif	185	#endif
178	#ifdef USE_XIM
179	im_ev (this, &rxvt_term::im_cb),
180	#endif
181	#ifndef NO_BELL	186	#ifndef NO_BELL
182	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
183	#endif	188	#endif
184	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
185	vt_ev (this, &rxvt_term::x_cb),	190	prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
186	child_ev (this, &rxvt_term::child_cb),	191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); flush_ev.set (0., 1. / 60.); // refresh at max. 60 Hz normally
187	check_ev (this, &rxvt_term::check_cb),	192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
188	flush_ev (this, &rxvt_term::flush_cb),	193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
189	destroy_ev (this, &rxvt_term::destroy_cb),	194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
190	pty_ev (this, &rxvt_term::pty_cb),	195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191	incr_ev (this, &rxvt_term::incr_cb)	196	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	{	197
193	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	198	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
194		199
195	termlist.push_back (this);	200	termlist.push_back (this);
196		201
197	#ifdef KEYSYM_RESOURCE	202	#ifdef KEYSYM_RESOURCE
…		…
199	#endif	204	#endif
200	}	205	}
201		206
202	// 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.
203	// for use before an emergency exit	208	// for use before an emergency exit
		209	void
204	void rxvt_term::emergency_cleanup ()	210	rxvt_term::emergency_cleanup ()
205	{	211	{
206	if (cmd_pid)	212	if (cmd_pid)
207	kill (-cmd_pid, SIGHUP);	213	kill (-cmd_pid, SIGHUP);
208		214
209	pty_ev.stop ();	215	pty_ev.stop ();
…		…
276	delete [] pix_colors_focused;	282	delete [] pix_colors_focused;
277	#if OFF_FOCUS_FADING	283	#if OFF_FOCUS_FADING
278	delete [] pix_colors_unfocused;	284	delete [] pix_colors_unfocused;
279	#endif	285	#endif
280		286
		287	#ifdef HAVE_BG_PIXMAP
		288	bgPixmap.destroy ();
		289	#endif
281	displays.put (display);	290	displays.put (display);
282		291
283	scr_release ();	292	scr_release ();
284		293
285	/* clear all resources */	294	/* clear all resources */
…		…
298	delete argv;	307	delete argv;
299		308
300	#ifdef KEYSYM_RESOURCE	309	#ifdef KEYSYM_RESOURCE
301	delete keyboard;	310	delete keyboard;
302	#endif	311	#endif
		312	#ifndef NO_RESOURCES
		313	XrmDestroyDatabase (option_db);
		314	#endif
303	}	315	}
304		316
305	// child has exited, usually destroys	317	// child has exited, usually destroys
306	void	318	void
307	rxvt_term::child_cb (child_watcher &w, int status)	319	rxvt_term::child_cb (ev::child &w, int status)
308	{	320	{
309	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	321	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
310		322
311	cmd_pid = 0;	323	cmd_pid = 0;
312		324
…		…
315	}	327	}
316		328
317	void	329	void
318	rxvt_term::destroy ()	330	rxvt_term::destroy ()
319	{	331	{
320	if (destroy_ev.active)	332	if (ev_is_active (&destroy_ev))
321	return;	333	return;
322		334
323	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
324		336
325	#if ENABLE_OVERLAY	337	#if ENABLE_OVERLAY
…		…
332	im_ev.stop (display);	344	im_ev.stop (display);
333	#endif	345	#endif
334	#if HAVE_SCROLLBARS	346	#if HAVE_SCROLLBARS
335	scrollbar_ev.stop (display);	347	scrollbar_ev.stop (display);
336	#endif	348	#endif
337	#if TRANSPARENT \|\| ENABLE_PERL	349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
338	rootwin_ev.stop (display);	350	rootwin_ev.stop (display);
339	#endif	351	#endif
340	incr_ev.stop ();	352	incr_ev.stop ();
341	termwin_ev.stop (display);	353	termwin_ev.stop (display);
342	vt_ev.stop (display);	354	vt_ev.stop (display);
343	}	355	}
344		356
345	check_ev.stop ();	357	prepare_ev.stop ();
346	pty_ev.stop ();	358	pty_ev.stop ();
347	#ifdef CURSOR_BLINK	359	#ifdef CURSOR_BLINK
348	cursor_blink_ev.stop ();	360	cursor_blink_ev.stop ();
349	#endif	361	#endif
350	#ifdef TEXT_BLINK	362	#ifdef TEXT_BLINK
…		…
358	#endif	370	#endif
359	#ifdef POINTER_BLANK	371	#ifdef POINTER_BLANK
360	pointer_ev.stop ();	372	pointer_ev.stop ();
361	#endif	373	#endif
362		374
363	destroy_ev.start (0);	375	destroy_ev.start ();
364	}	376	}
365		377
366	void	378	void
367	rxvt_term::destroy_cb (time_watcher &w)	379	rxvt_term::destroy_cb (ev::idle &w, int revents)
368	{	380	{
369	make_current ();	381	make_current ();
370		382
371	delete this;	383	delete this;
372	}	384	}
…		…
426	else	438	else
427	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
428	mesg, BUFSIZ);	440	mesg, BUFSIZ);
429	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
430	}	442	}
431	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
432	mesg, BUFSIZ);	444	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
434	}	446	}
435	#endif	447	#endif
436		448
…		…
502		514
503	#ifdef HAVE_SCROLLBARS	515	#ifdef HAVE_SCROLLBARS
504	if (option (Opt_scrollBar))	516	if (option (Opt_scrollBar))
505	resize_scrollbar (); /* create and map scrollbar */	517	resize_scrollbar (); /* create and map scrollbar */
506	#endif	518	#endif
		519	#ifdef HAVE_BG_PIXMAP
		520	{
		521	bgPixmap.set_target (this);
		522
507	#ifdef TRANSPARENT	523	#ifdef ENABLE_TRANSPARENCY
508	if (option (Opt_transparent))	524	if (option (Opt_transparent))
509	{	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 ();
510	XSelectInput (dpy, display->root, PropertyChangeMask);	537	XSelectInput (dpy, display->root, PropertyChangeMask);
511	check_our_parents ();
512	rootwin_ev.start (display, display->root);	538	rootwin_ev.start (display, display->root);
513	}	539	}
514	#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
515	#if ENABLE_PERL	563	#if ENABLE_PERL
516	rootwin_ev.start (display, display->root);	564	rootwin_ev.start (display, display->root);
517	#endif	565	#endif
518		566
519	set_colorfgbg ();	567	set_colorfgbg ();
…		…
521	init_command (cmd_argv);	569	init_command (cmd_argv);
522		570
523	free (cmd_argv);	571	free (cmd_argv);
524		572
525	if (pty->pty >= 0)	573	if (pty->pty >= 0)
526	pty_ev.start (pty->pty, EVENT_READ);	574	pty_ev.start (pty->pty, ev::READ);
527		575
528	check_ev.start ();	576	prepare_ev.start ();
529		577
530	HOOK_INVOKE ((this, HOOK_START, DT_END));	578	HOOK_INVOKE ((this, HOOK_START, DT_END));
531		579
532	#if ENABLE_XEMBED	580	#if ENABLE_XEMBED
533	if (rs[Rs_embed])	581	if (rs[Rs_embed])
…		…
545	return true;	593	return true;
546	}	594	}
547		595
548	static struct sig_handlers	596	static struct sig_handlers
549	{	597	{
550	sig_watcher sw_term, sw_int;	598	ev::sig sw_term, sw_int;
551		599
552	/*	600	/*
553	* Catch a fatal signal and tidy up before quitting	601	* Catch a fatal signal and tidy up before quitting
554	*/	602	*/
555	void	603	void sig_term (ev::sig &w, int revents);
556	sig_term (sig_watcher &w)	604
		605	sig_handlers ()
557	{	606	{
558	rxvt_emergency_cleanup ();	607	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
559	signal (w.signum, SIG_DFL);
560	kill (getpid (), w.signum);
561	}
562
563	sig_handlers ()
564	: sw_term (this, &sig_handlers::sig_term),
565	sw_int (this, &sig_handlers::sig_term)	608	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
566	{
567	}	609	}
568	} sig_handlers;	610	} sig_handlers;
569		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
570	char **rxvt_environ; // startup environment	620	char **rxvt_environ; // startup environment
571		621
572	void	622	void
573	rxvt_init ()	623	rxvt_init ()
574	{	624	{
575	ptytty::init ();	625	ptytty::init ();
		626
		627	if (!ev_default_loop (0))
		628	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
576		629
577	rxvt_environ = environ;	630	rxvt_environ = environ;
578		631
579	signal (SIGHUP, SIG_IGN);	632	signal (SIGHUP, SIG_IGN);
580	signal (SIGPIPE, SIG_IGN);	633	signal (SIGPIPE, SIG_IGN);
581		634
582	sig_handlers.sw_term.start (SIGTERM);	635	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
583	sig_handlers.sw_int.start (SIGINT);	636	sig_handlers.sw_int.start (SIGINT); ev_unref ();
584		637
585	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	638	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
586	/* signal (SIGURG, SIG_DFL); */	639	/* signal (SIGURG, SIG_DFL); */
587		640
588	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
628	return p;	681	return p;
629	}	682	}
630		683
631	/----------------------------------------------------------------------/	684	/----------------------------------------------------------------------/
632	/*	685	/*
633	* window size/position calculcations for XSizeHint and other storage.	686	* window size/position calculations for XSizeHint and other storage.
634	* if width/height are non-zero then override calculated width/height	687	* if width/height are non-zero then override calculated width/height
635	*/	688	*/
636	void	689	void
637	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	690	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638	{	691	{
…		…
774	ws.ws_xpixel = width;	827	ws.ws_xpixel = width;
775	ws.ws_ypixel = height;	828	ws.ws_ypixel = height;
776	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
777		830
778	#if 0	831	#if 0
779	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	832	// TIOCSWINSZ is supposed to do this automatically and correctly
780	if (cmd_pid) /* force through to the command */	833	if (cmd_pid) /* force through to the command */
781	kill (-cmd_pid, SIGWINCH);	834	kill (-cmd_pid, SIGWINCH);
782	#endif	835	#endif
783	}	836	}
784		837
…		…
858	if (parent[0])	911	if (parent[0])
859	{	912	{
860	resize_all_windows (0, 0, 0);	913	resize_all_windows (0, 0, 0);
861	scr_remap_chars ();	914	scr_remap_chars ();
862	scr_touch (true);	915	scr_touch (true);
863	}	916	}
864		917
865	return true;	918	return true;
866	}	919	}
867		920
		921	void
868	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)
869	{	923	{
870	XChangeProperty (dpy, parent[0],	924	XChangeProperty (dpy, parent[0],
871	prop, XA_STRING, 8, PropModeReplace,	925	prop, XA_STRING, 8, PropModeReplace,
872	(const unsigned char *)str, len >= 0 ? len : strlen (str));	926	(const unsigned char *)str, len >= 0 ? len : strlen (str));
873	}	927	}
874		928
		929	void
875	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)
876	{	931	{
877	wchar_t *ws = rxvt_mbstowcs (str, len);	932	wchar_t *ws = rxvt_mbstowcs (str, len);
878	char *s = rxvt_wcstoutf8 (ws);	933	char *s = rxvt_wcstoutf8 (ws);
879		934
880	XChangeProperty (dpy, parent[0],	935	XChangeProperty (dpy, parent[0],
…		…
904	#if ENABLE_EWMH	959	#if ENABLE_EWMH
905	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	960	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
906	#endif	961	#endif
907	}	962	}
908		963
		964	void
		965	rxvt_term::set_window_color (int idx, const char *color)
		966	{
909	#ifdef XTERM_COLOR_CHANGE	967	#ifdef XTERM_COLOR_CHANGE
910	void
911	rxvt_term::set_window_color (int idx, const char *color)
912	{
913	rxvt_color xcol;	968	rxvt_color xcol;
914	int i;	969	int i;
915		970
916	if (color == NULL \|\| *color == '\0')	971	if (color == NULL \|\| *color == '\0')
917	return;	972	return;
918		973
919	color = strdup (color);	974	color = strdup (color);
920	allocated.push_back ((void *)color);	975	allocated.push_back ((void *)color);
…		…
924	if (isdigit (*color))	979	if (isdigit (*color))
925	{	980	{
926	i = atoi (color);	981	i = atoi (color);
927		982
928	if (i >= 8 && i <= 15)	983	if (i >= 8 && i <= 15)
		984	{
929	{ /* bright colors */	985	/* bright colors */
930	i -= 8;
931	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
932	goto done;	987	goto done;
933	}	988	}
934		989
935	if (i >= 0 && i <= 7)	990	if (i >= 0 && i <= 7)
		991	{
936	{ /* normal colors */	992	/* normal colors */
937	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	993	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938	goto done;	994	goto done;
939	}	995	}
940	}	996	}
941		997
…		…
946	* so just keep gobbling up the colormap	1002	* so just keep gobbling up the colormap
947	*/	1003	*/
948		1004
949	pix_colors_focused[idx] = xcol;	1005	pix_colors_focused[idx] = xcol;
950		1006
951	/* XSetWindowAttributes attr; */
952	/* Cursor cursor; */
953	done:	1007	done:
954	/TODO: handle Color_BD, scrollbar background, etc. /	1008	/TODO: handle Color_BD, scrollbar background, etc. /
955		1009
956	update_fade_color (idx);	1010	update_fade_color (idx);
957	recolour_cursor ();	1011	recolour_cursor ();
958	scr_recolour ();	1012	scr_recolour ();
		1013	#endif /* XTERM_COLOR_CHANGE */
959	}	1014	}
960
961	#else
962	# define set_window_color (idx,color) ((void)0)
963	#endif /* XTERM_COLOR_CHANGE */
964		1015
965	void	1016	void
966	rxvt_term::recolour_cursor ()	1017	rxvt_term::recolour_cursor ()
967	{	1018	{
968	XColor fg, bg;	1019	XColor fg, bg;
…		…
984	*/	1035	*/
985	void	1036	void
986	rxvt_term::set_colorfgbg ()	1037	rxvt_term::set_colorfgbg ()
987	{	1038	{
988	unsigned int i;	1039	unsigned int i;
989	const char *xpmb = "\0";	1040	const char *xpmb = "";
990	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1041	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991		1042
992	strcpy (fstr, "default");	1043	strcpy (fstr, "default");
993	strcpy (bstr, "default");	1044	strcpy (bstr, "default");
994	for (i = Color_Black; i <= Color_White; i++)	1045	for (i = Color_Black; i <= Color_White; i++)
…		…
1000		1051
1001	for (i = Color_Black; i <= Color_White; i++)	1052	for (i = Color_Black; i <= Color_White; i++)
1002	if (pix_colors[Color_bg] == pix_colors[i])	1053	if (pix_colors[Color_bg] == pix_colors[i])
1003	{	1054	{
1004	sprintf (bstr, "%d", (i - Color_Black));	1055	sprintf (bstr, "%d", (i - Color_Black));
1005	#ifdef XPM_BACKGROUND	1056	#ifdef BG_IMAGE_FROM_FILE
1006	xpmb = "default;";	1057	xpmb = "default;";
1007	#endif	1058	#endif
1008	break;	1059	break;
1009	}	1060	}
1010		1061
…		…
1106		1157
1107	XMoveResizeWindow (dpy, vt,	1158	XMoveResizeWindow (dpy, vt,
1108	window_vt_x, window_vt_y,	1159	window_vt_x, window_vt_y,
1109	width, height);	1160	width, height);
1110		1161
		1162	#ifdef HAVE_BG_PIXMAP
		1163	if (bgPixmap.window_size_sensitive ())
		1164	update_background ();
		1165	#endif
		1166
1111	scr_clear ();	1167	scr_clear ();
1112	#ifdef XPM_BACKGROUND
1113	resize_pixmap ();
1114	#endif
1115	}	1168	}
1116		1169
1117	if (fix_screen \|\| old_height == 0)	1170	if (fix_screen \|\| old_height == 0)
1118	scr_reset ();	1171	scr_reset ();
1119		1172
1120	// 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
1121	//scr_touch (false);	1174	//scr_touch (false);
1122		1175
1123	#ifdef XPM_BACKGROUND	1176	#ifdef HAVE_BG_PIXMAP
1124	if (pixmap)	1177	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1178	// if (bgPixmap.pixmap)
1125	scr_touch (false);	1179	// scr_touch (false);
1126	#endif	1180	#endif
1127		1181
1128	#ifdef USE_XIM	1182	#ifdef USE_XIM
1129	IMSetPosition ();	1183	IMSetPosition ();
1130	#endif	1184	#endif
…		…
1301	if (term->rs[Rs_imLocale])	1355	if (term->rs[Rs_imLocale])
1302	SET_LOCALE (term->locale);	1356	SET_LOCALE (term->locale);
1303	}	1357	}
1304	else	1358	else
1305	str = (void *)text->string.wide_char;	1359	str = (void *)text->string.wide_char;
1306		1360
1307	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1361	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1308	DT_INT, call_data->caret,	1362	DT_INT, call_data->caret,
1309	DT_INT, call_data->chg_first,	1363	DT_INT, call_data->chg_first,
1310	DT_INT, call_data->chg_length,	1364	DT_INT, call_data->chg_length,
1311	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,
…		…
1630		1684
1631	if (input_style & XIMPreeditPosition)	1685	if (input_style & XIMPreeditPosition)
1632	{	1686	{
1633	im_set_size (preedit_rect);	1687	im_set_size (preedit_rect);
1634	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1688	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635		1689
1636	XSetICValues (Input_Context,	1690	XSetICValues (Input_Context,
1637	XNPreeditAttributes, preedit_attr, NULL);	1691	XNPreeditAttributes, preedit_attr, NULL);
1638	}	1692	}
1639	else	1693	else
1640	{	1694	{
…		…
1657	XFree (status_attr);	1711	XFree (status_attr);
1658	}	1712	}
1659		1713
1660	XFree (preedit_attr);	1714	XFree (preedit_attr);
1661	}	1715	}
1662	#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 */
1663		1787
1664	/----------------------- 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.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs. Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC