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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.286 by root, Sun Dec 16 19:44:48 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	check_ev (this, &rxvt_term::check_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
…		…
284	delete [] pix_colors_focused;	281	delete [] pix_colors_focused;
285	#if OFF_FOCUS_FADING	282	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;	283	delete [] pix_colors_unfocused;
287	#endif	284	#endif
288		285
		286	#ifdef HAVE_BG_PIXMAP
		287	bgPixmap.destroy ();
		288	#endif
		289	display->flush (); /* ideally .put should do this */
289	displays.put (display);	290	displays.put (display);
290		291
291	scr_release ();	292	scr_release ();
292		293
293	/* clear all resources */	294	/* clear all resources */
…		…
306	delete argv;	307	delete argv;
307		308
308	#ifdef KEYSYM_RESOURCE	309	#ifdef KEYSYM_RESOURCE
309	delete keyboard;	310	delete keyboard;
310	#endif	311	#endif
		312	#ifndef NO_RESOURCES
		313	XrmDestroyDatabase (option_db);
		314	#endif
311	}	315	}
312		316
313	// child has exited, usually destroys	317	// child has exited, usually destroys
314	void	318	void
315	rxvt_term::child_cb (child_watcher &w, int status)	319	rxvt_term::child_cb (ev::child &w, int status)
316	{	320	{
317	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	321	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318		322
319	cmd_pid = 0;	323	cmd_pid = 0;
320		324
…		…
323	}	327	}
324		328
325	void	329	void
326	rxvt_term::destroy ()	330	rxvt_term::destroy ()
327	{	331	{
328	if (destroy_ev.active)	332	if (destroy_ev.is_active ())
329	return;	333	return;
330		334
331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332		336
333	#if ENABLE_OVERLAY	337	#if ENABLE_OVERLAY
…		…
348	incr_ev.stop ();	352	incr_ev.stop ();
349	termwin_ev.stop (display);	353	termwin_ev.stop (display);
350	vt_ev.stop (display);	354	vt_ev.stop (display);
351	}	355	}
352		356
353	check_ev.stop ();	357	flush_ev.stop ();
354	pty_ev.stop ();	358	pty_ev.stop ();
355	#ifdef CURSOR_BLINK	359	#ifdef CURSOR_BLINK
356	cursor_blink_ev.stop ();	360	cursor_blink_ev.stop ();
357	#endif	361	#endif
358	#ifdef TEXT_BLINK	362	#ifdef TEXT_BLINK
…		…
366	#endif	370	#endif
367	#ifdef POINTER_BLANK	371	#ifdef POINTER_BLANK
368	pointer_ev.stop ();	372	pointer_ev.stop ();
369	#endif	373	#endif
370		374
371	destroy_ev.start (0);	375	destroy_ev.start ();
372	}	376	}
373		377
374	void	378	void
375	rxvt_term::destroy_cb (time_watcher &w)	379	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	380	{
377	make_current ();	381	make_current ();
378		382
379	delete this;	383	delete this;
380	}	384	}
…		…
469	rxvt_emergency_cleanup ();	473	rxvt_emergency_cleanup ();
470	_exit (EXIT_FAILURE);	474	_exit (EXIT_FAILURE);
471	}	475	}
472		476
473	/----------------------------------------------------------------------/	477	/----------------------------------------------------------------------/
474	bool	478	void
475	rxvt_term::init (int argc, const char const argv, stringvec *envv)	479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
476	{	480	{
477	this->envv = envv;	481	this->envv = envv;
478		482
479	SET_R (this);	483	SET_R (this);
480	set_locale ("");	484	set_locale ("");
481	set_environ (envv); // few things in X do not call setlocale :(	485	set_environ (envv); // few things in X do not call setlocale :(
482		486
483	if (!init_vars ())	487	init_vars ();
484	return false;
485		488
486	init_secondary ();	489	init_secondary ();
487		490
488	const char **cmd_argv = init_resources (argc, argv);	491	const char **cmd_argv = init_resources (argc, argv);
489		492
…		…
565	init_command (cmd_argv);	568	init_command (cmd_argv);
566		569
567	free (cmd_argv);	570	free (cmd_argv);
568		571
569	if (pty->pty >= 0)	572	if (pty->pty >= 0)
570	pty_ev.start (pty->pty, EVENT_READ);	573	pty_ev.start (pty->pty, ev::READ);
571
572	check_ev.start ();
573		574
574	HOOK_INVOKE ((this, HOOK_START, DT_END));	575	HOOK_INVOKE ((this, HOOK_START, DT_END));
575		576
576	#if ENABLE_XEMBED	577	#if ENABLE_XEMBED
577	if (rs[Rs_embed])	578	if (rs[Rs_embed])
…		…
583	}	584	}
584	#endif	585	#endif
585		586
586	XMapWindow (dpy, vt);	587	XMapWindow (dpy, vt);
587	XMapWindow (dpy, parent[0]);	588	XMapWindow (dpy, parent[0]);
588
589	return true;
590	}	589	}
591		590
592	static struct sig_handlers	591	static struct sig_handlers
593	{	592	{
594	sig_watcher sw_term, sw_int;	593	ev::sig sw_term, sw_int;
595		594
596	/*	595	/*
597	* Catch a fatal signal and tidy up before quitting	596	* Catch a fatal signal and tidy up before quitting
598	*/	597	*/
599	void	598	void sig_term (ev::sig &w, int revents);
600	sig_term (sig_watcher &w)	599
		600	sig_handlers ()
601	{	601	{
602	rxvt_emergency_cleanup ();	602	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603	signal (w.signum, SIG_DFL);
604	kill (getpid (), w.signum);
605	}
606
607	sig_handlers ()
608	: sw_term (this, &sig_handlers::sig_term),
609	sw_int (this, &sig_handlers::sig_term)	603	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610	{
611	}	604	}
612	} sig_handlers;	605	} sig_handlers;
613		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
614	char **rxvt_environ; // startup environment	615	char **rxvt_environ; // startup environment
615		616
616	void	617	void
617	rxvt_init ()	618	rxvt_init ()
618	{	619	{
619	ptytty::init ();	620	ptytty::init ();
		621
		622	if (!ev_default_loop (0))
		623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620		624
621	rxvt_environ = environ;	625	rxvt_environ = environ;
622		626
623	signal (SIGHUP, SIG_IGN);	627	signal (SIGHUP, SIG_IGN);
624	signal (SIGPIPE, SIG_IGN);	628	signal (SIGPIPE, SIG_IGN);
625		629
626	sig_handlers.sw_term.start (SIGTERM);	630	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627	sig_handlers.sw_int.start (SIGINT);	631	sig_handlers.sw_int.start (SIGINT); ev_unref ();
628		632
629	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
630	/* signal (SIGURG, SIG_DFL); */	634	/* signal (SIGURG, SIG_DFL); */
631		635
632	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
818	ws.ws_xpixel = width;	822	ws.ws_xpixel = width;
819	ws.ws_ypixel = height;	823	ws.ws_ypixel = height;
820	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	824	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
821		825
822	#if 0	826	#if 0
823	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	827	// TIOCSWINSZ is supposed to do this automatically and correctly
824	if (cmd_pid) /* force through to the command */	828	if (cmd_pid) /* force through to the command */
825	kill (-cmd_pid, SIGWINCH);	829	kill (-cmd_pid, SIGWINCH);
826	#endif	830	#endif
827	}	831	}
828		832
…		…
970	if (isdigit (*color))	974	if (isdigit (*color))
971	{	975	{
972	i = atoi (color);	976	i = atoi (color);
973		977
974	if (i >= 8 && i <= 15)	978	if (i >= 8 && i <= 15)
		979	{
975	{ /* bright colors */	980	/* bright colors */
976	i -= 8;
977	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	981	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978	goto done;	982	goto done;
979	}	983	}
980		984
981	if (i >= 0 && i <= 7)	985	if (i >= 0 && i <= 7)
		986	{
982	{ /* normal colors */	987	/* normal colors */
983	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	988	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984	goto done;	989	goto done;
985	}	990	}
986	}	991	}
987		992
…		…
992	* so just keep gobbling up the colormap	997	* so just keep gobbling up the colormap
993	*/	998	*/
994		999
995	pix_colors_focused[idx] = xcol;	1000	pix_colors_focused[idx] = xcol;
996		1001
997	/* XSetWindowAttributes attr; */
998	/* Cursor cursor; */
999	done:	1002	done:
1000	/TODO: handle Color_BD, scrollbar background, etc. /	1003	/TODO: handle Color_BD, scrollbar background, etc. /
1001		1004
1002	update_fade_color (idx);	1005	update_fade_color (idx);
1003	recolour_cursor ();	1006	recolour_cursor ();
1004	scr_recolour ();	1007	scr_recolour ();
1005	#endif /* XTERM_COLOR_CHANGE */	1008	#endif /* XTERM_COLOR_CHANGE */
1006	}	1009	}
1007		1010
1008	void	1011	void
1009	rxvt_term::recolour_cursor ()	1012	rxvt_term::recolour_cursor ()
1010	{	1013	{
…		…
1027	*/	1030	*/
1028	void	1031	void
1029	rxvt_term::set_colorfgbg ()	1032	rxvt_term::set_colorfgbg ()
1030	{	1033	{
1031	unsigned int i;	1034	unsigned int i;
1032	const char *xpmb = "\0";	1035	const char *xpmb = "";
1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1036	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034		1037
1035	strcpy (fstr, "default");	1038	strcpy (fstr, "default");
1036	strcpy (bstr, "default");	1039	strcpy (bstr, "default");
1037	for (i = Color_Black; i <= Color_White; i++)	1040	for (i = Color_Black; i <= Color_White; i++)
…		…
1703	XFree (status_attr);	1706	XFree (status_attr);
1704	}	1707	}
1705		1708
1706	XFree (preedit_attr);	1709	XFree (preedit_attr);
1707	}	1710	}
1708	#endif /* USE_XIM */	1711	#endif /* USE_XIM */
1709		1712
1710	void	1713	void
1711	rxvt_term::get_window_origin (int &x, int &y)	1714	rxvt_term::get_window_origin (int &x, int &y)
1712	{	1715	{
1713	Window cr;	1716	Window cr;
…		…
1735	}	1738	}
1736	return None;	1739	return None;
1737	}	1740	}
1738		1741
1739	#ifdef HAVE_BG_PIXMAP	1742	#ifdef HAVE_BG_PIXMAP
		1743	# if TRACE_PIXMAPS
		1744	# undef update_background
		1745	int rxvt_term::trace_update_background (const char *file, int line)
		1746	{
		1747	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1748	update_background ();
		1749	}
		1750	# endif
		1751
1740	int	1752	int
1741	rxvt_term::update_background ()	1753	rxvt_term::update_background ()
1742	{	1754	{
1743	bgPixmap.invalidate ();	1755	bgPixmap.invalidate ();
1744		1756
1745	/* no chance of real time refresh if we are blurring ! */	1757	/* no chance of real time refresh if we are blurring! */
1746	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1758	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1747	bgPixmap.render ();	1759	bgPixmap.render ();
1748	else	1760	else
1749	{	1761	{
1750	update_background_ev.stop ();	1762	update_background_ev.stop ();
		1763
1751	if (!bgPixmap.need_client_side_rendering())	1764	if (!bgPixmap.need_client_side_rendering ())
1752	update_background_ev.start (NOW + .05);	1765	update_background_ev.start (.05);
1753	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)	1766	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754	update_background_ev.start (NOW + .2); /* very slow !!! */	1767	update_background_ev.start (.20); /* very slow !!! */
1755	else	1768	else
1756	update_background_ev.start (NOW + .07);	1769	update_background_ev.start (.07);
1757	}	1770	}
		1771
1758	return 0;	1772	return 0;
1759	}	1773	}
1760		1774
1761	void	1775	void
1762	rxvt_term::update_background_cb (time_watcher &w)	1776	rxvt_term::update_background_cb (ev::timer &w, int revents)
1763	{	1777	{
		1778	make_current ();
1764	bgPixmap.render ();	1779	bgPixmap.render ();
		1780	refresh_check ();
1765	}	1781	}
1766		1782
1767	#endif /* HAVE_BG_PIXMAP */	1783	#endif /* HAVE_BG_PIXMAP */
1768		1784
1769	/----------------------- end-of-file (C source) -----------------------/	1785	/----------------------- 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.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs. Revision 1.286 by root, Sun Dec 16 19:44:48 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.286 by root, Sun Dec 16 19:44:48 2007 UTC