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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.240 by sasha, Fri Aug 10 22:10:36 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 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::x_cb> (this),
155	#endif
156	#if ENABLE_TRANSPARENCY
157	check_our_parents_ev(this, &rxvt_term::check_our_parents_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
…		…
506	if (option (Opt_scrollBar))	515	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */	516	resize_scrollbar (); /* create and map scrollbar */
508	#endif	517	#endif
509	#ifdef HAVE_BG_PIXMAP	518	#ifdef HAVE_BG_PIXMAP
510	{	519	{
511	bool changed = false;
512	bgPixmap.set_target (this);	520	bgPixmap.set_target (this);
513		521
514	#ifdef ENABLE_TRANSPARENCY	522	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))	523	if (option (Opt_transparent))
516	{	524	{
517	bgPixmap.set_transparent ();	525	bgPixmap.set_transparent ();
518	#ifdef HAVE_AFTERIMAGE	526	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])	527	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	528	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif	529	#endif
522	if (ISSET_PIXCOLOR (Color_tint))	530	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	531	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524	if (rs [Rs_shade])	532	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);	533	bgPixmap.set_shade (rs [Rs_shade]);
526	changed = true;
527		534
528	bgPixmap.set_root_pixmap ();	535	bgPixmap.set_root_pixmap ();
529	XSelectInput (dpy, display->root, PropertyChangeMask);	536	XSelectInput (dpy, display->root, PropertyChangeMask);
530	rootwin_ev.start (display, display->root);	537	rootwin_ev.start (display, display->root);
531	}	538	}
532	#endif	539	#endif
533		540
534	#ifdef XPM_BACKGROUND	541	#ifdef BG_IMAGE_FROM_FILE
535	if (rs[Rs_backgroundPixmap] != NULL)	542	if (rs[Rs_backgroundPixmap] != NULL)
536	{	543	{
537	const char *p = rs[Rs_backgroundPixmap];	544	const char *p = rs[Rs_backgroundPixmap];
538		545
539	if ((p = strchr (p, ';')) != NULL)	546	if ((p = strchr (p, ';')) != NULL)
…		…
542	bgPixmap.set_geometry (p);	549	bgPixmap.set_geometry (p);
543	}	550	}
544	else	551	else
545	bgPixmap.set_defaultGeometry ();	552	bgPixmap.set_defaultGeometry ();
546		553
547	changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);	554	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		555	if (!bgPixmap.window_position_sensitive ())
		556	update_background ();
548	}	557	}
549	#endif	558	#endif
550	if (changed)
551	{
552	bgPixmap.render_background ();
553	scr_touch (true);
554	}
555	}	559	}
556	#endif	560	#endif
557		561
558	#if ENABLE_PERL	562	#if ENABLE_PERL
559	rootwin_ev.start (display, display->root);	563	rootwin_ev.start (display, display->root);
…		…
564	init_command (cmd_argv);	568	init_command (cmd_argv);
565		569
566	free (cmd_argv);	570	free (cmd_argv);
567		571
568	if (pty->pty >= 0)	572	if (pty->pty >= 0)
569	pty_ev.start (pty->pty, EVENT_READ);	573	pty_ev.start (pty->pty, ev::READ);
570
571	check_ev.start ();
572		574
573	HOOK_INVOKE ((this, HOOK_START, DT_END));	575	HOOK_INVOKE ((this, HOOK_START, DT_END));
574		576
575	#if ENABLE_XEMBED	577	#if ENABLE_XEMBED
576	if (rs[Rs_embed])	578	if (rs[Rs_embed])
…		…
582	}	584	}
583	#endif	585	#endif
584		586
585	XMapWindow (dpy, vt);	587	XMapWindow (dpy, vt);
586	XMapWindow (dpy, parent[0]);	588	XMapWindow (dpy, parent[0]);
587
588	return true;
589	}	589	}
590		590
591	static struct sig_handlers	591	static struct sig_handlers
592	{	592	{
593	sig_watcher sw_term, sw_int;	593	ev::sig sw_term, sw_int;
594		594
595	/*	595	/*
596	* Catch a fatal signal and tidy up before quitting	596	* Catch a fatal signal and tidy up before quitting
597	*/	597	*/
598	void	598	void sig_term (ev::sig &w, int revents);
599	sig_term (sig_watcher &w)	599
		600	sig_handlers ()
600	{	601	{
601	rxvt_emergency_cleanup ();	602	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
602	signal (w.signum, SIG_DFL);
603	kill (getpid (), w.signum);
604	}
605
606	sig_handlers ()
607	: sw_term (this, &sig_handlers::sig_term),
608	sw_int (this, &sig_handlers::sig_term)	603	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
609	{
610	}	604	}
611	} sig_handlers;	605	} sig_handlers;
612		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
613	char **rxvt_environ; // startup environment	615	char **rxvt_environ; // startup environment
614		616
615	void	617	void
616	rxvt_init ()	618	rxvt_init ()
617	{	619	{
618	ptytty::init ();	620	ptytty::init ();
		621
		622	if (!ev_default_loop (0))
		623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
619		624
620	rxvt_environ = environ;	625	rxvt_environ = environ;
621		626
622	signal (SIGHUP, SIG_IGN);	627	signal (SIGHUP, SIG_IGN);
623	signal (SIGPIPE, SIG_IGN);	628	signal (SIGPIPE, SIG_IGN);
624		629
625	sig_handlers.sw_term.start (SIGTERM);	630	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
626	sig_handlers.sw_int.start (SIGINT);	631	sig_handlers.sw_int.start (SIGINT); ev_unref ();
627		632
628	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
629	/* signal (SIGURG, SIG_DFL); */	634	/* signal (SIGURG, SIG_DFL); */
630		635
631	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
817	ws.ws_xpixel = width;	822	ws.ws_xpixel = width;
818	ws.ws_ypixel = height;	823	ws.ws_ypixel = height;
819	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	824	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
820		825
821	#if 0	826	#if 0
822	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	827	// TIOCSWINSZ is supposed to do this automatically and correctly
823	if (cmd_pid) /* force through to the command */	828	if (cmd_pid) /* force through to the command */
824	kill (-cmd_pid, SIGWINCH);	829	kill (-cmd_pid, SIGWINCH);
825	#endif	830	#endif
826	}	831	}
827		832
…		…
901	if (parent[0])	906	if (parent[0])
902	{	907	{
903	resize_all_windows (0, 0, 0);	908	resize_all_windows (0, 0, 0);
904	scr_remap_chars ();	909	scr_remap_chars ();
905	scr_touch (true);	910	scr_touch (true);
906	}	911	}
907		912
908	return true;	913	return true;
909	}	914	}
910		915
		916	void
911	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	917	rxvt_term::set_string_property (Atom prop, const char *str, int len)
912	{	918	{
913	XChangeProperty (dpy, parent[0],	919	XChangeProperty (dpy, parent[0],
914	prop, XA_STRING, 8, PropModeReplace,	920	prop, XA_STRING, 8, PropModeReplace,
915	(const unsigned char *)str, len >= 0 ? len : strlen (str));	921	(const unsigned char *)str, len >= 0 ? len : strlen (str));
916	}	922	}
917		923
		924	void
918	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	925	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919	{	926	{
920	wchar_t *ws = rxvt_mbstowcs (str, len);	927	wchar_t *ws = rxvt_mbstowcs (str, len);
921	char *s = rxvt_wcstoutf8 (ws);	928	char *s = rxvt_wcstoutf8 (ws);
922		929
923	XChangeProperty (dpy, parent[0],	930	XChangeProperty (dpy, parent[0],
…		…
947	#if ENABLE_EWMH	954	#if ENABLE_EWMH
948	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	955	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949	#endif	956	#endif
950	}	957	}
951		958
		959	void
		960	rxvt_term::set_window_color (int idx, const char *color)
		961	{
952	#ifdef XTERM_COLOR_CHANGE	962	#ifdef XTERM_COLOR_CHANGE
953	void
954	rxvt_term::set_window_color (int idx, const char *color)
955	{
956	rxvt_color xcol;	963	rxvt_color xcol;
957	int i;	964	int i;
958		965
959	if (color == NULL \|\| *color == '\0')	966	if (color == NULL \|\| *color == '\0')
960	return;	967	return;
961		968
962	color = strdup (color);	969	color = strdup (color);
963	allocated.push_back ((void *)color);	970	allocated.push_back ((void *)color);
…		…
967	if (isdigit (*color))	974	if (isdigit (*color))
968	{	975	{
969	i = atoi (color);	976	i = atoi (color);
970		977
971	if (i >= 8 && i <= 15)	978	if (i >= 8 && i <= 15)
		979	{
972	{ /* bright colors */	980	/* bright colors */
973	i -= 8;
974	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	981	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
975	goto done;	982	goto done;
976	}	983	}
977		984
978	if (i >= 0 && i <= 7)	985	if (i >= 0 && i <= 7)
		986	{
979	{ /* normal colors */	987	/* normal colors */
980	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	988	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981	goto done;	989	goto done;
982	}	990	}
983	}	991	}
984		992
…		…
989	* so just keep gobbling up the colormap	997	* so just keep gobbling up the colormap
990	*/	998	*/
991		999
992	pix_colors_focused[idx] = xcol;	1000	pix_colors_focused[idx] = xcol;
993		1001
994	/* XSetWindowAttributes attr; */
995	/* Cursor cursor; */
996	done:	1002	done:
997	/TODO: handle Color_BD, scrollbar background, etc. /	1003	/TODO: handle Color_BD, scrollbar background, etc. /
998		1004
999	update_fade_color (idx);	1005	update_fade_color (idx);
1000	recolour_cursor ();	1006	recolour_cursor ();
1001	scr_recolour ();	1007	scr_recolour ();
		1008	#endif /* XTERM_COLOR_CHANGE */
1002	}	1009	}
1003
1004	#else
1005	# define set_window_color (idx,color) ((void)0)
1006	#endif /* XTERM_COLOR_CHANGE */
1007		1010
1008	void	1011	void
1009	rxvt_term::recolour_cursor ()	1012	rxvt_term::recolour_cursor ()
1010	{	1013	{
1011	XColor fg, bg;	1014	XColor fg, bg;
…		…
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++)
…		…
1043		1046
1044	for (i = Color_Black; i <= Color_White; i++)	1047	for (i = Color_Black; i <= Color_White; i++)
1045	if (pix_colors[Color_bg] == pix_colors[i])	1048	if (pix_colors[Color_bg] == pix_colors[i])
1046	{	1049	{
1047	sprintf (bstr, "%d", (i - Color_Black));	1050	sprintf (bstr, "%d", (i - Color_Black));
1048	#ifdef XPM_BACKGROUND	1051	#ifdef BG_IMAGE_FROM_FILE
1049	xpmb = "default;";	1052	xpmb = "default;";
1050	#endif	1053	#endif
1051	break;	1054	break;
1052	}	1055	}
1053		1056
…		…
1149		1152
1150	XMoveResizeWindow (dpy, vt,	1153	XMoveResizeWindow (dpy, vt,
1151	window_vt_x, window_vt_y,	1154	window_vt_x, window_vt_y,
1152	width, height);	1155	width, height);
1153		1156
		1157	#ifdef HAVE_BG_PIXMAP
		1158	if (bgPixmap.window_size_sensitive ())
		1159	update_background ();
		1160	#endif
		1161
1154	scr_clear ();	1162	scr_clear ();
1155	#ifdef XPM_BACKGROUND
1156	/* TODO: should that really be here ? */
1157	bgPixmap.render_background ();
1158	#endif
1159	}	1163	}
1160		1164
1161	if (fix_screen \|\| old_height == 0)	1165	if (fix_screen \|\| old_height == 0)
1162	scr_reset ();	1166	scr_reset ();
1163		1167
1164	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1168	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165	//scr_touch (false);	1169	//scr_touch (false);
1166		1170
1167	#ifdef HAVE_BG_PIXMAP	1171	#ifdef HAVE_BG_PIXMAP
		1172	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1168	if (bgPixmap.pixmap)	1173	// if (bgPixmap.pixmap)
1169	scr_touch (false);	1174	// scr_touch (false);
1170	#endif	1175	#endif
1171		1176
1172	#ifdef USE_XIM	1177	#ifdef USE_XIM
1173	IMSetPosition ();	1178	IMSetPosition ();
1174	#endif	1179	#endif
…		…
1345	if (term->rs[Rs_imLocale])	1350	if (term->rs[Rs_imLocale])
1346	SET_LOCALE (term->locale);	1351	SET_LOCALE (term->locale);
1347	}	1352	}
1348	else	1353	else
1349	str = (void *)text->string.wide_char;	1354	str = (void *)text->string.wide_char;
1350		1355
1351	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1356	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352	DT_INT, call_data->caret,	1357	DT_INT, call_data->caret,
1353	DT_INT, call_data->chg_first,	1358	DT_INT, call_data->chg_first,
1354	DT_INT, call_data->chg_length,	1359	DT_INT, call_data->chg_length,
1355	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1360	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1674		1679
1675	if (input_style & XIMPreeditPosition)	1680	if (input_style & XIMPreeditPosition)
1676	{	1681	{
1677	im_set_size (preedit_rect);	1682	im_set_size (preedit_rect);
1678	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1683	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679		1684
1680	XSetICValues (Input_Context,	1685	XSetICValues (Input_Context,
1681	XNPreeditAttributes, preedit_attr, NULL);	1686	XNPreeditAttributes, preedit_attr, NULL);
1682	}	1687	}
1683	else	1688	else
1684	{	1689	{
…		…
1701	XFree (status_attr);	1706	XFree (status_attr);
1702	}	1707	}
1703		1708
1704	XFree (preedit_attr);	1709	XFree (preedit_attr);
1705	}	1710	}
1706	#endif /* USE_XIM */	1711	#endif /* USE_XIM */
		1712
		1713	void
		1714	rxvt_term::get_window_origin (int &x, int &y)
		1715	{
		1716	Window cr;
		1717	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1718	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1719	}
		1720
		1721	Pixmap
		1722	rxvt_term::get_pixmap_property (int prop_id)
		1723	{
		1724	if (prop_id > 0 && prop_id < NUM_XA)
		1725	if (xa[prop_id])
		1726	{
		1727	int aformat;
		1728	unsigned long nitems, bytes_after;
		1729	Atom atype;
		1730	unsigned char *prop = NULL;
		1731	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1732	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1733	&nitems, &bytes_after, &prop);
		1734	if (result == Success && prop && atype == XA_PIXMAP)
		1735	{
		1736	return (Pixmap )prop;
		1737	}
		1738	}
		1739	return None;
		1740	}
		1741
		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
		1752	int
		1753	rxvt_term::update_background ()
		1754	{
		1755	bgPixmap.invalidate ();
		1756
		1757	/* no chance of real time refresh if we are blurring! */
		1758	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1759	bgPixmap.render ();
		1760	else
		1761	{
		1762	update_background_ev.stop ();
		1763
		1764	if (!bgPixmap.need_client_side_rendering ())
		1765	update_background_ev.start (.05);
		1766	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1767	update_background_ev.start (.20); /* very slow !!! */
		1768	else
		1769	update_background_ev.start (.07);
		1770	}
		1771
		1772	return 0;
		1773	}
		1774
		1775	void
		1776	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1777	{
		1778	make_current ();
		1779	bgPixmap.render ();
		1780	refresh_check ();
		1781	}
		1782
		1783	#endif /* HAVE_BG_PIXMAP */
1707		1784
1708	/----------------------- 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.240 by sasha, Fri Aug 10 22:10:36 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.240 by sasha, Fri Aug 10 22:10:36 2007 UTC vs.
Revision 1.286 by root, Sun Dec 16 19:44:48 2007 UTC