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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.264 by root, Sat Nov 24 11:06:13 2007 UTC vs.
Revision 1.296 by sasha, Fri Jan 4 21:25:57 2008 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::rootwin_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
…		…
279	}	276	}
280		277
281	clear ();	278	clear ();
282	}	279	}
283		280
284	delete [] pix_colors_focused;
285	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;
287	#endif
288
289	#ifdef HAVE_BG_PIXMAP	281	#ifdef HAVE_BG_PIXMAP
290	bgPixmap.destroy ();	282	bgPixmap.destroy ();
291	#endif	283	#endif
		284	display->flush (); /* ideally .put should do this */
292	displays.put (display);	285	displays.put (display);
293		286
294	scr_release ();	287	scr_release ();
295		288
296	/* clear all resources */	289	/* clear all resources */
…		…
329	}	322	}
330		323
331	void	324	void
332	rxvt_term::destroy ()	325	rxvt_term::destroy ()
333	{	326	{
334	if (destroy_ev.active)	327	if (destroy_ev.is_active ())
335	return;	328	return;
336		329
337	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	330	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338		331
339	#if ENABLE_OVERLAY	332	#if ENABLE_OVERLAY
…		…
354	incr_ev.stop ();	347	incr_ev.stop ();
355	termwin_ev.stop (display);	348	termwin_ev.stop (display);
356	vt_ev.stop (display);	349	vt_ev.stop (display);
357	}	350	}
358		351
359	prepare_ev.stop ();	352	flush_ev.stop ();
360	pty_ev.stop ();	353	pty_ev.stop ();
361	#ifdef CURSOR_BLINK	354	#ifdef CURSOR_BLINK
362	cursor_blink_ev.stop ();	355	cursor_blink_ev.stop ();
363	#endif	356	#endif
364	#ifdef TEXT_BLINK	357	#ifdef TEXT_BLINK
…		…
475	rxvt_emergency_cleanup ();	468	rxvt_emergency_cleanup ();
476	_exit (EXIT_FAILURE);	469	_exit (EXIT_FAILURE);
477	}	470	}
478		471
479	/----------------------------------------------------------------------/	472	/----------------------------------------------------------------------/
480	bool	473	void
481	rxvt_term::init (int argc, const char const argv, stringvec *envv)	474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
482	{	475	{
483	this->envv = envv;	476	this->envv = envv;
484		477
485	SET_R (this);	478	SET_R (this);
486	set_locale ("");	479	set_locale ("");
487	set_environ (envv); // few things in X do not call setlocale :(	480	set_environ (envv); // few things in X do not call setlocale :(
488		481
489	if (!init_vars ())	482	init_vars ();
490	return false;
491		483
492	init_secondary ();	484	init_secondary ();
493		485
494	const char **cmd_argv = init_resources (argc, argv);	486	const char **cmd_argv = init_resources (argc, argv);
495		487
…		…
524		516
525	#ifdef ENABLE_TRANSPARENCY	517	#ifdef ENABLE_TRANSPARENCY
526	if (option (Opt_transparent))	518	if (option (Opt_transparent))
527	{	519	{
528	bgPixmap.set_transparent ();	520	bgPixmap.set_transparent ();
		521
529	#ifdef HAVE_AFTERIMAGE	522	#ifdef HAVE_AFTERIMAGE
530	if (rs [Rs_blurradius])	523	if (rs [Rs_blurradius])
531	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	524	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532	#endif	525	#endif
533	if (ISSET_PIXCOLOR (Color_tint))	526	if (ISSET_PIXCOLOR (Color_tint))
534	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	527	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		528
535	if (rs [Rs_shade])	529	if (rs [Rs_shade])
536	bgPixmap.set_shade (rs [Rs_shade]);	530	bgPixmap.set_shade (rs [Rs_shade]);
537		531
538	bgPixmap.set_root_pixmap ();	532	bgPixmap.set_root_pixmap ();
539	XSelectInput (dpy, display->root, PropertyChangeMask);	533	XSelectInput (dpy, display->root, PropertyChangeMask);
540	rootwin_ev.start (display, display->root);	534	rootwin_ev.start (display, display->root);
541	}	535	}
542	#endif	536	#endif
543		537
544	#ifdef BG_IMAGE_FROM_FILE	538	#ifdef BG_IMAGE_FROM_FILE
545	if (rs[Rs_backgroundPixmap] != NULL)	539	if (rs[Rs_backgroundPixmap])
546	{	540	{
547	const char *p = rs[Rs_backgroundPixmap];	541	const char *p = rs[Rs_backgroundPixmap];
548		542
549	if ((p = strchr (p, ';')) != NULL)	543	if ((p = strchr (p, ';')) != 0)
550	{	544	{
551	p++;	545	p++;
552	bgPixmap.set_geometry (p);	546	bgPixmap.set_geometry (p);
553	}	547	}
554	else	548	else
…		…
573	free (cmd_argv);	567	free (cmd_argv);
574		568
575	if (pty->pty >= 0)	569	if (pty->pty >= 0)
576	pty_ev.start (pty->pty, ev::READ);	570	pty_ev.start (pty->pty, ev::READ);
577		571
578	prepare_ev.start ();
579
580	HOOK_INVOKE ((this, HOOK_START, DT_END));	572	HOOK_INVOKE ((this, HOOK_START, DT_END));
581		573
582	#if ENABLE_XEMBED	574	#if ENABLE_XEMBED
583	if (rs[Rs_embed])	575	if (rs[Rs_embed])
584	{	576	{
…		…
589	}	581	}
590	#endif	582	#endif
591		583
592	XMapWindow (dpy, vt);	584	XMapWindow (dpy, vt);
593	XMapWindow (dpy, parent[0]);	585	XMapWindow (dpy, parent[0]);
594
595	return true;
596	}	586	}
597		587
598	static struct sig_handlers	588	static struct sig_handlers
599	{	589	{
600	ev::sig sw_term, sw_int;	590	ev::sig sw_term, sw_int;
601		591
602	/*	592	/*
603	* Catch a fatal signal and tidy up before quitting	593	* Catch a fatal signal and tidy up before quitting
604	*/	594	*/
605	void
606	sig_term (ev::sig &w, int revents)	595	void sig_term (ev::sig &w, int revents);
		596
		597	sig_handlers ()
607	{	598	{
608	rxvt_emergency_cleanup ();	599	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
609	w.stop ();
610	kill (getpid (), w.signum);
611	}
612
613	sig_handlers ()
614	: sw_term (this, &sig_handlers::sig_term),
615	sw_int (this, &sig_handlers::sig_term)	600	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616	{
617	}	601	}
618	} sig_handlers;	602	} sig_handlers;
		603
		604	void
		605	sig_handlers::sig_term (ev::sig &w, int revents)
		606	{
		607	rxvt_emergency_cleanup ();
		608	w.stop ();
		609	kill (getpid (), w.signum);
		610	}
619		611
620	char **rxvt_environ; // startup environment	612	char **rxvt_environ; // startup environment
621		613
622	void	614	void
623	rxvt_init ()	615	rxvt_init ()
…		…
641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	633	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642	// TODO: handle this with exceptions and tolerate the memory loss	634	// TODO: handle this with exceptions and tolerate the memory loss
643	XSetIOErrorHandler (rxvt_xioerror_handler);	635	XSetIOErrorHandler (rxvt_xioerror_handler);
644		636
645	XrmInitialize ();	637	XrmInitialize ();
646	}
647
648	/* ------------------------------------------------------------------------- *
649	* MEMORY ALLOCATION WRAPPERS *
650	* ------------------------------------------------------------------------- */
651	void *
652	rxvt_malloc (size_t size)
653	{
654	void *p = malloc (size);
655
656	if (!p)
657	rxvt_fatal ("memory allocation failure. aborting.\n");
658
659	return p;
660	}
661
662	void *
663	rxvt_calloc (size_t number, size_t size)
664	{
665	void *p = calloc (number, size);
666
667	if (!p)
668	rxvt_fatal ("memory allocation failure. aborting.\n");
669
670	return p;
671	}
672
673	void *
674	rxvt_realloc (void *ptr, size_t size)
675	{
676	void *p = realloc (ptr, size);
677
678	if (!p)
679	rxvt_fatal ("memory allocation failure. aborting.\n");
680
681	return p;
682	}	638	}
683		639
684	/----------------------------------------------------------------------/	640	/----------------------------------------------------------------------/
685	/*	641	/*
686	* window size/position calculations for XSizeHint and other storage.	642	* window size/position calculations for XSizeHint and other storage.
…		…
827	ws.ws_xpixel = width;	783	ws.ws_xpixel = width;
828	ws.ws_ypixel = height;	784	ws.ws_ypixel = height;
829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	785	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830		786
831	#if 0	787	#if 0
832	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	788	// TIOCSWINSZ is supposed to do this automatically and correctly
833	if (cmd_pid) /* force through to the command */	789	if (cmd_pid) /* force through to the command */
834	kill (-cmd_pid, SIGWINCH);	790	kill (-cmd_pid, SIGWINCH);
835	#endif	791	#endif
836	}	792	}
837		793
…		…
979	if (isdigit (*color))	935	if (isdigit (*color))
980	{	936	{
981	i = atoi (color);	937	i = atoi (color);
982		938
983	if (i >= 8 && i <= 15)	939	if (i >= 8 && i <= 15)
		940	{
984	{ /* bright colors */	941	/* bright colors */
985	i -= 8;
986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	942	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
987	goto done;	943	goto done;
988	}	944	}
989		945
990	if (i >= 0 && i <= 7)	946	if (i >= 0 && i <= 7)
		947	{
991	{ /* normal colors */	948	/* normal colors */
992	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	949	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
993	goto done;	950	goto done;
994	}	951	}
995	}	952	}
996		953
…		…
1001	* so just keep gobbling up the colormap	958	* so just keep gobbling up the colormap
1002	*/	959	*/
1003		960
1004	pix_colors_focused[idx] = xcol;	961	pix_colors_focused[idx] = xcol;
1005		962
1006	/* XSetWindowAttributes attr; */
1007	/* Cursor cursor; */
1008	done:	963	done:
1009	/TODO: handle Color_BD, scrollbar background, etc. /	964	/TODO: handle Color_BD, scrollbar background, etc. /
1010		965
1011	update_fade_color (idx);	966	update_fade_color (idx);
1012	recolour_cursor ();	967	recolour_cursor ();
…		…
1036	*/	991	*/
1037	void	992	void
1038	rxvt_term::set_colorfgbg ()	993	rxvt_term::set_colorfgbg ()
1039	{	994	{
1040	unsigned int i;	995	unsigned int i;
1041	const char *xpmb = "\0";	996	const char *xpmb = "";
1042	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	997	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043		998
1044	strcpy (fstr, "default");	999	strcpy (fstr, "default");
1045	strcpy (bstr, "default");	1000	strcpy (bstr, "default");
1046	for (i = Color_Black; i <= Color_White; i++)	1001	for (i = Color_Black; i <= Color_White; i++)
…		…
1719	void	1674	void
1720	rxvt_term::get_window_origin (int &x, int &y)	1675	rxvt_term::get_window_origin (int &x, int &y)
1721	{	1676	{
1722	Window cr;	1677	Window cr;
1723	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1678	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1679	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725	}	1680	}
1726		1681
1727	Pixmap	1682	Pixmap
1728	rxvt_term::get_pixmap_property (int prop_id)	1683	rxvt_term::get_pixmap_property (int prop_id)
1729	{	1684	{
…		…
1736	unsigned char *prop = NULL;	1691	unsigned char *prop = NULL;
1737	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1692	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1693	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739	&nitems, &bytes_after, &prop);	1694	&nitems, &bytes_after, &prop);
1740	if (result == Success && prop && atype == XA_PIXMAP)	1695	if (result == Success && prop && atype == XA_PIXMAP)
1741	{
1742	return (Pixmap )prop;	1696	return (Pixmap )prop;
1743	}
1744	}	1697	}
		1698
1745	return None;	1699	return None;
1746	}	1700	}
1747		1701
1748	#ifdef HAVE_BG_PIXMAP	1702	#ifdef HAVE_BG_PIXMAP
1749	# if TRACE_PIXMAPS	1703	# if TRACE_PIXMAPS
1750	# undef update_background	1704	# undef update_background
		1705	void
1751	int rxvt_term::trace_update_background (const char* file, int line)	1706	rxvt_term::trace_update_background (const char *file, int line)
1752	{	1707	{
1753	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1708	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754	update_background ();	1709	update_background ();
1755	}	1710	}
1756	# endif	1711	# endif
1757	int	1712
		1713	void
1758	rxvt_term::update_background ()	1714	rxvt_term::update_background ()
1759	{	1715	{
		1716	if (update_background_ev.is_active ())
		1717	return;
		1718
1760	bgPixmap.invalidate ();	1719	bgPixmap.invalidate ();
1761		1720
1762	/* no chance of real time refresh if we are blurring! */	1721	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1722
		1723	if ( to_wait <= 0. )
1764	bgPixmap.render ();	1724	bgPixmap.render ();
1765	else	1725	else
1766	{
1767	update_background_ev.stop ();
1768
1769	if (!bgPixmap.need_client_side_rendering())
1770	update_background_ev.start (.05);	1726	update_background_ev.start (to_wait);
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	}	1727	}
1779		1728
1780	void	1729	void
1781	rxvt_term::update_background_cb (ev::timer &w, int revents)	1730	rxvt_term::update_background_cb (ev::timer &w, int revents)
1782	{	1731	{
		1732	make_current ();
		1733
		1734	update_background_ev.stop ();
1783	bgPixmap.render ();	1735	bgPixmap.render ();
		1736	refresh_check ();
1784	}	1737	}
1785		1738
1786	#endif /* HAVE_BG_PIXMAP */	1739	#endif /* HAVE_BG_PIXMAP */
1787		1740
1788	/----------------------- end-of-file (C source) -----------------------/	1741	/----------------------- 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.264 by root, Sat Nov 24 11:06:13 2007 UTC vs. Revision 1.296 by sasha, Fri Jan 4 21:25:57 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.264 by root, Sat Nov 24 11:06:13 2007 UTC vs.
Revision 1.296 by sasha, Fri Jan 4 21:25:57 2008 UTC