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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.250 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.292 by root, Mon Dec 24 10:58:09 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 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); 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
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif
156	#if HAVE_BG_PIXMAP
157	update_background_ev(this, &rxvt_term::update_background_cb),
158	#endif	176	#endif
159	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161	#endif	179	#endif
162	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	182	#endif
177	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	185	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	186	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	188	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	196
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		198
197	termlist.push_back (this);	199	termlist.push_back (this);
198		200
199	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	203	#endif
202	}	204	}
203		205
204	// clean up the most important stuff, do not call x or free mem etc.	206	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	207	// for use before an emergency exit
		208	void
206	void rxvt_term::emergency_cleanup ()	209	rxvt_term::emergency_cleanup ()
207	{	210	{
208	if (cmd_pid)	211	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	212	kill (-cmd_pid, SIGHUP);
210		213
211	pty_ev.stop ();	214	pty_ev.stop ();
…		…
278	delete [] pix_colors_focused;	281	delete [] pix_colors_focused;
279	#if OFF_FOCUS_FADING	282	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;	283	delete [] pix_colors_unfocused;
281	#endif	284	#endif
282		285
		286	#ifdef HAVE_BG_PIXMAP
		287	bgPixmap.destroy ();
		288	#endif
		289	display->flush (); /* ideally .put should do this */
283	displays.put (display);	290	displays.put (display);
284		291
285	scr_release ();	292	scr_release ();
286		293
287	/* clear all resources */	294	/* clear all resources */
…		…
300	delete argv;	307	delete argv;
301		308
302	#ifdef KEYSYM_RESOURCE	309	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	310	delete keyboard;
304	#endif	311	#endif
		312	#ifndef NO_RESOURCES
		313	XrmDestroyDatabase (option_db);
		314	#endif
305	}	315	}
306		316
307	// child has exited, usually destroys	317	// child has exited, usually destroys
308	void	318	void
309	rxvt_term::child_cb (child_watcher &w, int status)	319	rxvt_term::child_cb (ev::child &w, int status)
310	{	320	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	321	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		322
313	cmd_pid = 0;	323	cmd_pid = 0;
314		324
…		…
317	}	327	}
318		328
319	void	329	void
320	rxvt_term::destroy ()	330	rxvt_term::destroy ()
321	{	331	{
322	if (destroy_ev.active)	332	if (destroy_ev.is_active ())
323	return;	333	return;
324		334
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		336
327	#if ENABLE_OVERLAY	337	#if ENABLE_OVERLAY
…		…
342	incr_ev.stop ();	352	incr_ev.stop ();
343	termwin_ev.stop (display);	353	termwin_ev.stop (display);
344	vt_ev.stop (display);	354	vt_ev.stop (display);
345	}	355	}
346		356
347	check_ev.stop ();	357	flush_ev.stop ();
348	pty_ev.stop ();	358	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	359	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	360	cursor_blink_ev.stop ();
351	#endif	361	#endif
352	#ifdef TEXT_BLINK	362	#ifdef TEXT_BLINK
…		…
360	#endif	370	#endif
361	#ifdef POINTER_BLANK	371	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	372	pointer_ev.stop ();
363	#endif	373	#endif
364		374
365	destroy_ev.start (0);	375	destroy_ev.start ();
366	}	376	}
367		377
368	void	378	void
369	rxvt_term::destroy_cb (time_watcher &w)	379	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	380	{
371	make_current ();	381	make_current ();
372		382
373	delete this;	383	delete this;
374	}	384	}
…		…
428	else	438	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	440	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	442	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	444	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	446	}
437	#endif	447	#endif
438		448
…		…
463	rxvt_emergency_cleanup ();	473	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	474	_exit (EXIT_FAILURE);
465	}	475	}
466		476
467	/----------------------------------------------------------------------/	477	/----------------------------------------------------------------------/
468	bool	478	void
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)	479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{	480	{
471	this->envv = envv;	481	this->envv = envv;
472		482
473	SET_R (this);	483	SET_R (this);
474	set_locale ("");	484	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(	485	set_environ (envv); // few things in X do not call setlocale :(
476		486
477	if (!init_vars ())	487	init_vars ();
478	return false;
479		488
480	init_secondary ();	489	init_secondary ();
481		490
482	const char **cmd_argv = init_resources (argc, argv);	491	const char **cmd_argv = init_resources (argc, argv);
483		492
…		…
512		521
513	#ifdef ENABLE_TRANSPARENCY	522	#ifdef ENABLE_TRANSPARENCY
514	if (option (Opt_transparent))	523	if (option (Opt_transparent))
515	{	524	{
516	bgPixmap.set_transparent ();	525	bgPixmap.set_transparent ();
		526
517	#ifdef HAVE_AFTERIMAGE	527	#ifdef HAVE_AFTERIMAGE
518	if (rs [Rs_blurradius])	528	if (rs [Rs_blurradius])
519	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520	#endif	530	#endif
521	if (ISSET_PIXCOLOR (Color_tint))	531	if (ISSET_PIXCOLOR (Color_tint))
522	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		533
523	if (rs [Rs_shade])	534	if (rs [Rs_shade])
524	bgPixmap.set_shade (rs [Rs_shade]);	535	bgPixmap.set_shade (rs [Rs_shade]);
525		536
526	bgPixmap.set_root_pixmap ();	537	bgPixmap.set_root_pixmap ();
527	XSelectInput (dpy, display->root, PropertyChangeMask);	538	XSelectInput (dpy, display->root, PropertyChangeMask);
528	rootwin_ev.start (display, display->root);	539	rootwin_ev.start (display, display->root);
529	}	540	}
530	#endif	541	#endif
531		542
532	#ifdef BG_IMAGE_FROM_FILE	543	#ifdef BG_IMAGE_FROM_FILE
533	if (rs[Rs_backgroundPixmap] != NULL)	544	if (rs[Rs_backgroundPixmap])
534	{	545	{
535	const char *p = rs[Rs_backgroundPixmap];	546	const char *p = rs[Rs_backgroundPixmap];
536		547
537	if ((p = strchr (p, ';')) != NULL)	548	if ((p = strchr (p, ';')) != 0)
538	{	549	{
539	p++;	550	p++;
540	bgPixmap.set_geometry (p);	551	bgPixmap.set_geometry (p);
541	}	552	}
542	else	553	else
…		…
559	init_command (cmd_argv);	570	init_command (cmd_argv);
560		571
561	free (cmd_argv);	572	free (cmd_argv);
562		573
563	if (pty->pty >= 0)	574	if (pty->pty >= 0)
564	pty_ev.start (pty->pty, EVENT_READ);	575	pty_ev.start (pty->pty, ev::READ);
565
566	check_ev.start ();
567		576
568	HOOK_INVOKE ((this, HOOK_START, DT_END));	577	HOOK_INVOKE ((this, HOOK_START, DT_END));
569		578
570	#if ENABLE_XEMBED	579	#if ENABLE_XEMBED
571	if (rs[Rs_embed])	580	if (rs[Rs_embed])
…		…
577	}	586	}
578	#endif	587	#endif
579		588
580	XMapWindow (dpy, vt);	589	XMapWindow (dpy, vt);
581	XMapWindow (dpy, parent[0]);	590	XMapWindow (dpy, parent[0]);
582
583	return true;
584	}	591	}
585		592
586	static struct sig_handlers	593	static struct sig_handlers
587	{	594	{
588	sig_watcher sw_term, sw_int;	595	ev::sig sw_term, sw_int;
589		596
590	/*	597	/*
591	* Catch a fatal signal and tidy up before quitting	598	* Catch a fatal signal and tidy up before quitting
592	*/	599	*/
593	void	600	void sig_term (ev::sig &w, int revents);
594	sig_term (sig_watcher &w)	601
		602	sig_handlers ()
595	{	603	{
596	rxvt_emergency_cleanup ();	604	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597	signal (w.signum, SIG_DFL);
598	kill (getpid (), w.signum);
599	}
600
601	sig_handlers ()
602	: sw_term (this, &sig_handlers::sig_term),
603	sw_int (this, &sig_handlers::sig_term)	605	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604	{
605	}	606	}
606	} sig_handlers;	607	} sig_handlers;
607		608
		609	void
		610	sig_handlers::sig_term (ev::sig &w, int revents)
		611	{
		612	rxvt_emergency_cleanup ();
		613	w.stop ();
		614	kill (getpid (), w.signum);
		615	}
		616
608	char **rxvt_environ; // startup environment	617	char **rxvt_environ; // startup environment
609		618
610	void	619	void
611	rxvt_init ()	620	rxvt_init ()
612	{	621	{
613	ptytty::init ();	622	ptytty::init ();
		623
		624	if (!ev_default_loop (0))
		625	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
614		626
615	rxvt_environ = environ;	627	rxvt_environ = environ;
616		628
617	signal (SIGHUP, SIG_IGN);	629	signal (SIGHUP, SIG_IGN);
618	signal (SIGPIPE, SIG_IGN);	630	signal (SIGPIPE, SIG_IGN);
619		631
620	sig_handlers.sw_term.start (SIGTERM);	632	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621	sig_handlers.sw_int.start (SIGINT);	633	sig_handlers.sw_int.start (SIGINT); ev_unref ();
622		634
623	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	635	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
624	/* signal (SIGURG, SIG_DFL); */	636	/* signal (SIGURG, SIG_DFL); */
625		637
626	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	638	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627	// TODO: handle this with exceptions and tolerate the memory loss	639	// TODO: handle this with exceptions and tolerate the memory loss
628	XSetIOErrorHandler (rxvt_xioerror_handler);	640	XSetIOErrorHandler (rxvt_xioerror_handler);
629		641
630	XrmInitialize ();	642	XrmInitialize ();
631	}
632
633	/* ------------------------------------------------------------------------- *
634	* MEMORY ALLOCATION WRAPPERS *
635	* ------------------------------------------------------------------------- */
636	void *
637	rxvt_malloc (size_t size)
638	{
639	void *p = malloc (size);
640
641	if (!p)
642	rxvt_fatal ("memory allocation failure. aborting.\n");
643
644	return p;
645	}
646
647	void *
648	rxvt_calloc (size_t number, size_t size)
649	{
650	void *p = calloc (number, size);
651
652	if (!p)
653	rxvt_fatal ("memory allocation failure. aborting.\n");
654
655	return p;
656	}
657
658	void *
659	rxvt_realloc (void *ptr, size_t size)
660	{
661	void *p = realloc (ptr, size);
662
663	if (!p)
664	rxvt_fatal ("memory allocation failure. aborting.\n");
665
666	return p;
667	}	643	}
668		644
669	/----------------------------------------------------------------------/	645	/----------------------------------------------------------------------/
670	/*	646	/*
671	* window size/position calculations for XSizeHint and other storage.	647	* window size/position calculations for XSizeHint and other storage.
…		…
812	ws.ws_xpixel = width;	788	ws.ws_xpixel = width;
813	ws.ws_ypixel = height;	789	ws.ws_ypixel = height;
814	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	790	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
815		791
816	#if 0	792	#if 0
817	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	793	// TIOCSWINSZ is supposed to do this automatically and correctly
818	if (cmd_pid) /* force through to the command */	794	if (cmd_pid) /* force through to the command */
819	kill (-cmd_pid, SIGWINCH);	795	kill (-cmd_pid, SIGWINCH);
820	#endif	796	#endif
821	}	797	}
822		798
…		…
896	if (parent[0])	872	if (parent[0])
897	{	873	{
898	resize_all_windows (0, 0, 0);	874	resize_all_windows (0, 0, 0);
899	scr_remap_chars ();	875	scr_remap_chars ();
900	scr_touch (true);	876	scr_touch (true);
901	}	877	}
902		878
903	return true;	879	return true;
904	}	880	}
905		881
		882	void
906	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	883	rxvt_term::set_string_property (Atom prop, const char *str, int len)
907	{	884	{
908	XChangeProperty (dpy, parent[0],	885	XChangeProperty (dpy, parent[0],
909	prop, XA_STRING, 8, PropModeReplace,	886	prop, XA_STRING, 8, PropModeReplace,
910	(const unsigned char *)str, len >= 0 ? len : strlen (str));	887	(const unsigned char *)str, len >= 0 ? len : strlen (str));
911	}	888	}
912		889
		890	void
913	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	891	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914	{	892	{
915	wchar_t *ws = rxvt_mbstowcs (str, len);	893	wchar_t *ws = rxvt_mbstowcs (str, len);
916	char *s = rxvt_wcstoutf8 (ws);	894	char *s = rxvt_wcstoutf8 (ws);
917		895
918	XChangeProperty (dpy, parent[0],	896	XChangeProperty (dpy, parent[0],
…		…
942	#if ENABLE_EWMH	920	#if ENABLE_EWMH
943	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	921	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944	#endif	922	#endif
945	}	923	}
946		924
		925	void
		926	rxvt_term::set_window_color (int idx, const char *color)
		927	{
947	#ifdef XTERM_COLOR_CHANGE	928	#ifdef XTERM_COLOR_CHANGE
948	void
949	rxvt_term::set_window_color (int idx, const char *color)
950	{
951	rxvt_color xcol;	929	rxvt_color xcol;
952	int i;	930	int i;
953		931
954	if (color == NULL \|\| *color == '\0')	932	if (color == NULL \|\| *color == '\0')
955	return;	933	return;
956		934
957	color = strdup (color);	935	color = strdup (color);
958	allocated.push_back ((void *)color);	936	allocated.push_back ((void *)color);
…		…
962	if (isdigit (*color))	940	if (isdigit (*color))
963	{	941	{
964	i = atoi (color);	942	i = atoi (color);
965		943
966	if (i >= 8 && i <= 15)	944	if (i >= 8 && i <= 15)
		945	{
967	{ /* bright colors */	946	/* bright colors */
968	i -= 8;
969	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	947	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
970	goto done;	948	goto done;
971	}	949	}
972		950
973	if (i >= 0 && i <= 7)	951	if (i >= 0 && i <= 7)
		952	{
974	{ /* normal colors */	953	/* normal colors */
975	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	954	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976	goto done;	955	goto done;
977	}	956	}
978	}	957	}
979		958
…		…
984	* so just keep gobbling up the colormap	963	* so just keep gobbling up the colormap
985	*/	964	*/
986		965
987	pix_colors_focused[idx] = xcol;	966	pix_colors_focused[idx] = xcol;
988		967
989	/* XSetWindowAttributes attr; */
990	/* Cursor cursor; */
991	done:	968	done:
992	/TODO: handle Color_BD, scrollbar background, etc. /	969	/TODO: handle Color_BD, scrollbar background, etc. /
993		970
994	update_fade_color (idx);	971	update_fade_color (idx);
995	recolour_cursor ();	972	recolour_cursor ();
996	scr_recolour ();	973	scr_recolour ();
		974	#endif /* XTERM_COLOR_CHANGE */
997	}	975	}
998
999	#else
1000	# define set_window_color (idx,color) ((void)0)
1001	#endif /* XTERM_COLOR_CHANGE */
1002		976
1003	void	977	void
1004	rxvt_term::recolour_cursor ()	978	rxvt_term::recolour_cursor ()
1005	{	979	{
1006	XColor fg, bg;	980	XColor fg, bg;
…		…
1022	*/	996	*/
1023	void	997	void
1024	rxvt_term::set_colorfgbg ()	998	rxvt_term::set_colorfgbg ()
1025	{	999	{
1026	unsigned int i;	1000	unsigned int i;
1027	const char *xpmb = "\0";	1001	const char *xpmb = "";
1028	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1002	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029		1003
1030	strcpy (fstr, "default");	1004	strcpy (fstr, "default");
1031	strcpy (bstr, "default");	1005	strcpy (bstr, "default");
1032	for (i = Color_Black; i <= Color_White; i++)	1006	for (i = Color_Black; i <= Color_White; i++)
…		…
1342	if (term->rs[Rs_imLocale])	1316	if (term->rs[Rs_imLocale])
1343	SET_LOCALE (term->locale);	1317	SET_LOCALE (term->locale);
1344	}	1318	}
1345	else	1319	else
1346	str = (void *)text->string.wide_char;	1320	str = (void *)text->string.wide_char;
1347		1321
1348	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1322	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349	DT_INT, call_data->caret,	1323	DT_INT, call_data->caret,
1350	DT_INT, call_data->chg_first,	1324	DT_INT, call_data->chg_first,
1351	DT_INT, call_data->chg_length,	1325	DT_INT, call_data->chg_length,
1352	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1326	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1671		1645
1672	if (input_style & XIMPreeditPosition)	1646	if (input_style & XIMPreeditPosition)
1673	{	1647	{
1674	im_set_size (preedit_rect);	1648	im_set_size (preedit_rect);
1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1649	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676		1650
1677	XSetICValues (Input_Context,	1651	XSetICValues (Input_Context,
1678	XNPreeditAttributes, preedit_attr, NULL);	1652	XNPreeditAttributes, preedit_attr, NULL);
1679	}	1653	}
1680	else	1654	else
1681	{	1655	{
…		…
1698	XFree (status_attr);	1672	XFree (status_attr);
1699	}	1673	}
1700		1674
1701	XFree (preedit_attr);	1675	XFree (preedit_attr);
1702	}	1676	}
1703	#endif /* USE_XIM */	1677	#endif /* USE_XIM */
1704		1678
1705	void	1679	void
1706	rxvt_term::get_window_origin (int &x, int &y)	1680	rxvt_term::get_window_origin (int &x, int &y)
1707	{	1681	{
1708	Window cr;	1682	Window cr;
1709	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1683	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1684	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1711	}	1685	}
1712		1686
1713	Pixmap	1687	Pixmap
1714	rxvt_term::get_pixmap_property (int prop_id)	1688	rxvt_term::get_pixmap_property (int prop_id)
1715	{	1689	{
…		…
1722	unsigned char *prop = NULL;	1696	unsigned char *prop = NULL;
1723	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1697	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1698	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725	&nitems, &bytes_after, &prop);	1699	&nitems, &bytes_after, &prop);
1726	if (result == Success && prop && atype == XA_PIXMAP)	1700	if (result == Success && prop && atype == XA_PIXMAP)
1727	{
1728	return (Pixmap )prop;	1701	return (Pixmap )prop;
1729	}
1730	}	1702	}
		1703
1731	return None;	1704	return None;
1732	}	1705	}
1733		1706
1734	#ifdef HAVE_BG_PIXMAP	1707	#ifdef HAVE_BG_PIXMAP
1735	int	1708	# if TRACE_PIXMAPS
		1709	# undef update_background
		1710	void
		1711	rxvt_term::trace_update_background (const char *file, int line)
		1712	{
		1713	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1714	update_background ();
		1715	}
		1716	# endif
		1717
		1718	void
1736	rxvt_term::update_background ()	1719	rxvt_term::update_background ()
1737	{	1720	{
1738	bgPixmap.invalidate();	1721	bgPixmap.invalidate ();
1739		1722
1740	/* no chance of real time refresh if we are blurring ! */	1723	/* no chance of real time refresh if we are blurring! */
1741	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1724	if (bgPixmap.invalid_since + 0.50 < ev::now ()
		1725	&& !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1726	{
		1727	update_background_ev.stop ();
1742	bgPixmap.render();	1728	bgPixmap.render ();
		1729	}
1743	else	1730	else
1744	{	1731	{
1745	update_background_ev.stop ();	1732	ev_tstamp refresh;
		1733
1746	if (!bgPixmap.need_client_side_rendering())	1734	if (!bgPixmap.need_client_side_rendering ())
1747	update_background_ev.start (NOW + .05);	1735	refresh = .05;
1748	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)	1736	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749	update_background_ev.start (NOW + .2); /* very slow !!! */	1737	refresh = .20; /* very slow !!! */
1750	else	1738	else
		1739	refresh = .07;
		1740
1751	update_background_ev.start (NOW + .07);	1741	update_background_ev.start (refresh);
1752	}	1742	}
1753	return 0;
1754	}	1743	}
1755		1744
1756	void	1745	void
1757	rxvt_term::update_background_cb (time_watcher &w)	1746	rxvt_term::update_background_cb (ev::timer &w, int revents)
1758	{	1747	{
		1748	make_current ();
1759	bgPixmap.render ();	1749	bgPixmap.render ();
		1750	refresh_check ();
1760	}	1751	}
1761		1752
1762	#endif /* HAVE_BG_PIXMAP */	1753	#endif /* HAVE_BG_PIXMAP */
1763		1754
1764	/----------------------- end-of-file (C source) -----------------------/	1755	/----------------------- 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.250 by sasha, Wed Sep 12 21:06:08 2007 UTC vs. Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.250 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC