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

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