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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs.
Revision 1.289 by ayin, Tue Dec 18 11:15:24 2007 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	43	#include <termios.h>
45	#endif
46		44
47	#ifdef HAVE_XSETLOCALE	45	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	46	# define X_LOCALE
49	# include <X11/Xlocale.h>	47	# include <X11/Xlocale.h>
50	#else	48	#else
…		…
152		150
153	}	151	}
154	#endif	152	#endif
155		153
156	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
157	:	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); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		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
158	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
159	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
160	#endif
161	#if HAVE_BG_PIXMAP
162	update_background_ev(this, &rxvt_term::update_background_cb),
163	#endif	176	#endif
164	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
165	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166	#endif	179	#endif
167	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
168	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
169	#endif
170	#ifdef TEXT_BLINK
171	text_blink_ev (this, &rxvt_term::text_blink_cb),
172	#endif
173	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175	#endif
176	#ifdef SELECTION_SCROLLING
177	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178	#endif
179	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181	#endif	182	#endif
182	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
183	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif
185	#ifdef USE_XIM
186	im_ev (this, &rxvt_term::im_cb),
187	#endif	185	#endif
188	#ifndef NO_BELL	186	#ifndef NO_BELL
189	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190	#endif	188	#endif
191	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194	prepare_ev (this, &rxvt_term::prepare_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198	incr_ev (this, &rxvt_term::incr_cb)	196
199	{
200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201		198
202	termlist.push_back (this);	199	termlist.push_back (this);
203		200
204	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
287	#endif	284	#endif
288		285
289	#ifdef HAVE_BG_PIXMAP	286	#ifdef HAVE_BG_PIXMAP
290	bgPixmap.destroy ();	287	bgPixmap.destroy ();
291	#endif	288	#endif
		289	display->flush (); /* ideally .put should do this */
292	displays.put (display);	290	displays.put (display);
293		291
294	scr_release ();	292	scr_release ();
295		293
296	/* clear all resources */	294	/* clear all resources */
…		…
309	delete argv;	307	delete argv;
310		308
311	#ifdef KEYSYM_RESOURCE	309	#ifdef KEYSYM_RESOURCE
312	delete keyboard;	310	delete keyboard;
313	#endif	311	#endif
		312	#ifndef NO_RESOURCES
		313	XrmDestroyDatabase (option_db);
		314	#endif
314	}	315	}
315		316
316	// child has exited, usually destroys	317	// child has exited, usually destroys
317	void	318	void
318	rxvt_term::child_cb (ev::child &w, int status)	319	rxvt_term::child_cb (ev::child &w, int status)
…		…
326	}	327	}
327		328
328	void	329	void
329	rxvt_term::destroy ()	330	rxvt_term::destroy ()
330	{	331	{
331	if (destroy_ev.active)	332	if (destroy_ev.is_active ())
332	return;	333	return;
333		334
334	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
335		336
336	#if ENABLE_OVERLAY	337	#if ENABLE_OVERLAY
…		…
351	incr_ev.stop ();	352	incr_ev.stop ();
352	termwin_ev.stop (display);	353	termwin_ev.stop (display);
353	vt_ev.stop (display);	354	vt_ev.stop (display);
354	}	355	}
355		356
356	prepare_ev.stop ();	357	flush_ev.stop ();
357	pty_ev.stop ();	358	pty_ev.stop ();
358	#ifdef CURSOR_BLINK	359	#ifdef CURSOR_BLINK
359	cursor_blink_ev.stop ();	360	cursor_blink_ev.stop ();
360	#endif	361	#endif
361	#ifdef TEXT_BLINK	362	#ifdef TEXT_BLINK
…		…
472	rxvt_emergency_cleanup ();	473	rxvt_emergency_cleanup ();
473	_exit (EXIT_FAILURE);	474	_exit (EXIT_FAILURE);
474	}	475	}
475		476
476	/----------------------------------------------------------------------/	477	/----------------------------------------------------------------------/
477	bool	478	void
478	rxvt_term::init (int argc, const char const argv, stringvec *envv)	479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
479	{	480	{
480	this->envv = envv;	481	this->envv = envv;
481		482
482	SET_R (this);	483	SET_R (this);
483	set_locale ("");	484	set_locale ("");
484	set_environ (envv); // few things in X do not call setlocale :(	485	set_environ (envv); // few things in X do not call setlocale :(
485		486
486	if (!init_vars ())	487	init_vars ();
487	return false;
488		488
489	init_secondary ();	489	init_secondary ();
490		490
491	const char **cmd_argv = init_resources (argc, argv);	491	const char **cmd_argv = init_resources (argc, argv);
492		492
…		…
570	free (cmd_argv);	570	free (cmd_argv);
571		571
572	if (pty->pty >= 0)	572	if (pty->pty >= 0)
573	pty_ev.start (pty->pty, ev::READ);	573	pty_ev.start (pty->pty, ev::READ);
574		574
575	prepare_ev.start ();
576
577	HOOK_INVOKE ((this, HOOK_START, DT_END));	575	HOOK_INVOKE ((this, HOOK_START, DT_END));
578		576
579	#if ENABLE_XEMBED	577	#if ENABLE_XEMBED
580	if (rs[Rs_embed])	578	if (rs[Rs_embed])
581	{	579	{
…		…
586	}	584	}
587	#endif	585	#endif
588		586
589	XMapWindow (dpy, vt);	587	XMapWindow (dpy, vt);
590	XMapWindow (dpy, parent[0]);	588	XMapWindow (dpy, parent[0]);
591
592	return true;
593	}	589	}
594		590
595	static struct sig_handlers	591	static struct sig_handlers
596	{	592	{
597	ev::sig sw_term, sw_int;	593	ev::sig sw_term, sw_int;
598		594
599	/*	595	/*
600	* Catch a fatal signal and tidy up before quitting	596	* Catch a fatal signal and tidy up before quitting
601	*/	597	*/
602	void
603	sig_term (ev::sig &w, int revents)	598	void sig_term (ev::sig &w, int revents);
		599
		600	sig_handlers ()
604	{	601	{
605	rxvt_emergency_cleanup ();	602	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
606	w.stop ();
607	kill (getpid (), w.signum);
608	}
609
610	sig_handlers ()
611	: sw_term (this, &sig_handlers::sig_term),
612	sw_int (this, &sig_handlers::sig_term)	603	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
613	{
614	}	604	}
615	} sig_handlers;	605	} sig_handlers;
616		606
		607	void
		608	sig_handlers::sig_term (ev::sig &w, int revents)
		609	{
		610	rxvt_emergency_cleanup ();
		611	w.stop ();
		612	kill (getpid (), w.signum);
		613	}
		614
617	char **rxvt_environ; // startup environment	615	char **rxvt_environ; // startup environment
618		616
619	void	617	void
620	rxvt_init ()	618	rxvt_init ()
621	{	619	{
622	ptytty::init ();	620	ptytty::init ();
623		621
624	if (!ev::ev_default_loop (0))	622	if (!ev_default_loop (0))
625	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626		624
627	rxvt_environ = environ;	625	rxvt_environ = environ;
628		626
629	signal (SIGHUP, SIG_IGN);	627	signal (SIGHUP, SIG_IGN);
630	signal (SIGPIPE, SIG_IGN);	628	signal (SIGPIPE, SIG_IGN);
631		629
632	sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();	630	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633	sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();	631	sig_handlers.sw_int.start (SIGINT); ev_unref ();
634		632
635	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
636	/* signal (SIGURG, SIG_DFL); */	634	/* signal (SIGURG, SIG_DFL); */
637		635
638	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639	// TODO: handle this with exceptions and tolerate the memory loss	637	// TODO: handle this with exceptions and tolerate the memory loss
640	XSetIOErrorHandler (rxvt_xioerror_handler);	638	XSetIOErrorHandler (rxvt_xioerror_handler);
641		639
642	XrmInitialize ();	640	XrmInitialize ();
643	}
644
645	/* ------------------------------------------------------------------------- *
646	* MEMORY ALLOCATION WRAPPERS *
647	* ------------------------------------------------------------------------- */
648	void *
649	rxvt_malloc (size_t size)
650	{
651	void *p = malloc (size);
652
653	if (!p)
654	rxvt_fatal ("memory allocation failure. aborting.\n");
655
656	return p;
657	}
658
659	void *
660	rxvt_calloc (size_t number, size_t size)
661	{
662	void *p = calloc (number, size);
663
664	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");
666
667	return p;
668	}
669
670	void *
671	rxvt_realloc (void *ptr, size_t size)
672	{
673	void *p = realloc (ptr, size);
674
675	if (!p)
676	rxvt_fatal ("memory allocation failure. aborting.\n");
677
678	return p;
679	}	641	}
680		642
681	/----------------------------------------------------------------------/	643	/----------------------------------------------------------------------/
682	/*	644	/*
683	* window size/position calculations for XSizeHint and other storage.	645	* window size/position calculations for XSizeHint and other storage.
…		…
824	ws.ws_xpixel = width;	786	ws.ws_xpixel = width;
825	ws.ws_ypixel = height;	787	ws.ws_ypixel = height;
826	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	788	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
827		789
828	#if 0	790	#if 0
829	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	791	// TIOCSWINSZ is supposed to do this automatically and correctly
830	if (cmd_pid) /* force through to the command */	792	if (cmd_pid) /* force through to the command */
831	kill (-cmd_pid, SIGWINCH);	793	kill (-cmd_pid, SIGWINCH);
832	#endif	794	#endif
833	}	795	}
834		796
…		…
976	if (isdigit (*color))	938	if (isdigit (*color))
977	{	939	{
978	i = atoi (color);	940	i = atoi (color);
979		941
980	if (i >= 8 && i <= 15)	942	if (i >= 8 && i <= 15)
		943	{
981	{ /* bright colors */	944	/* bright colors */
982	i -= 8;
983	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
984	goto done;	946	goto done;
985	}	947	}
986		948
987	if (i >= 0 && i <= 7)	949	if (i >= 0 && i <= 7)
		950	{
988	{ /* normal colors */	951	/* normal colors */
989	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	952	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
990	goto done;	953	goto done;
991	}	954	}
992	}	955	}
993		956
…		…
998	* so just keep gobbling up the colormap	961	* so just keep gobbling up the colormap
999	*/	962	*/
1000		963
1001	pix_colors_focused[idx] = xcol;	964	pix_colors_focused[idx] = xcol;
1002		965
1003	/* XSetWindowAttributes attr; */
1004	/* Cursor cursor; */
1005	done:	966	done:
1006	/TODO: handle Color_BD, scrollbar background, etc. /	967	/TODO: handle Color_BD, scrollbar background, etc. /
1007		968
1008	update_fade_color (idx);	969	update_fade_color (idx);
1009	recolour_cursor ();	970	recolour_cursor ();
…		…
1033	*/	994	*/
1034	void	995	void
1035	rxvt_term::set_colorfgbg ()	996	rxvt_term::set_colorfgbg ()
1036	{	997	{
1037	unsigned int i;	998	unsigned int i;
1038	const char *xpmb = "\0";	999	const char *xpmb = "";
1039	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1000	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040		1001
1041	strcpy (fstr, "default");	1002	strcpy (fstr, "default");
1042	strcpy (bstr, "default");	1003	strcpy (bstr, "default");
1043	for (i = Color_Black; i <= Color_White; i++)	1004	for (i = Color_Black; i <= Color_White; i++)
…		…
1716	void	1677	void
1717	rxvt_term::get_window_origin (int &x, int &y)	1678	rxvt_term::get_window_origin (int &x, int &y)
1718	{	1679	{
1719	Window cr;	1680	Window cr;
1720	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1681	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1721	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1682	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1722	}	1683	}
1723		1684
1724	Pixmap	1685	Pixmap
1725	rxvt_term::get_pixmap_property (int prop_id)	1686	rxvt_term::get_pixmap_property (int prop_id)
1726	{	1687	{
…		…
1743	}	1704	}
1744		1705
1745	#ifdef HAVE_BG_PIXMAP	1706	#ifdef HAVE_BG_PIXMAP
1746	# if TRACE_PIXMAPS	1707	# if TRACE_PIXMAPS
1747	# undef update_background	1708	# undef update_background
1748	int rxvt_term::trace_update_background (const char* file, int line)	1709	int rxvt_term::trace_update_background (const char *file, int line)
1749	{	1710	{
1750	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1711	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751	update_background ();	1712	update_background ();
1752	}	1713	}
1753	# endif	1714	# endif
		1715
1754	int	1716	int
1755	rxvt_term::update_background ()	1717	rxvt_term::update_background ()
1756	{	1718	{
1757	bgPixmap.invalidate ();	1719	bgPixmap.invalidate ();
1758		1720
1759	/* no chance of real time refresh if we are blurring! */	1721	/* no chance of real time refresh if we are blurring! */
1760	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1722	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1761	bgPixmap.render ();	1723	bgPixmap.render ();
1762	else	1724	else
1763	{	1725	{
		1726	ev_tstamp refresh;
1764	update_background_ev.stop ();	1727	update_background_ev.stop ();
1765		1728
1766	if (!bgPixmap.need_client_side_rendering())	1729	if (!bgPixmap.need_client_side_rendering ())
1767	update_background_ev.start (.05);	1730	refresh = .05;
1768	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)	1731	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769	update_background_ev.start (.20); /* very slow !!! */	1732	refresh = .20; /* very slow !!! */
1770	else	1733	else
		1734	refresh = .07;
1771	update_background_ev.start (.07);	1735	update_background_ev.start (refresh);
1772	}	1736	}
1773		1737
1774	return 0;	1738	return 0;
1775	}	1739	}
1776		1740
1777	void	1741	void
1778	rxvt_term::update_background_cb (ev::timer &w, int revents)	1742	rxvt_term::update_background_cb (ev::timer &w, int revents)
1779	{	1743	{
		1744	make_current ();
1780	bgPixmap.render ();	1745	bgPixmap.render ();
		1746	refresh_check ();
1781	}	1747	}
1782		1748
1783	#endif /* HAVE_BG_PIXMAP */	1749	#endif /* HAVE_BG_PIXMAP */
1784		1750
1785	/----------------------- end-of-file (C source) -----------------------/	1751	/----------------------- 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.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs. Revision 1.289 by ayin, Tue Dec 18 11:15:24 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs.
Revision 1.289 by ayin, Tue Dec 18 11:15:24 2007 UTC