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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.227 by root, Fri Jul 28 17:16:42 2006 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC

…		…
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	43	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	44	# include <termios.h>
49	#endif	45	#endif
50		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
		54	#endif
		55
51	vector<rxvt_term *> rxvt_term::termlist;	56	vector<rxvt_term *> rxvt_term::termlist;
52		57
53	// used to tell global functions which terminal instance is "active"	58	// used to tell global functions which terminal instance is "active"
54	rxvt_t rxvt_current_term;	59	rxvt_t rxvt_current_term;
55		60
56	static char curlocale[128], savelocale[128];	61	static char curlocale[128], savelocale[128];
57		62
58	bool	63	bool
59	rxvt_set_locale (const char *locale) NOTHROW	64	rxvt_set_locale (const char *locale) NOTHROW
60	{	65	{
61	int len = strlen (locale) + 1;	66	int size = strlen (locale) + 1;
62		67
63	if (len > sizeof (curlocale))	68	if (size > sizeof (curlocale))
64	rxvt_fatal ("locale string too long, aborting.\n");	69	rxvt_fatal ("locale string too long, aborting.\n");
65		70
66	if (!locale \|\| !memcmp (locale, curlocale, len))	71	if (!locale \|\| !memcmp (locale, curlocale, size))
67	return false;	72	return false;
68		73
69	memcpy (curlocale, locale, len);	74	memcpy (curlocale, locale, size);
70	setlocale (LC_CTYPE, curlocale);	75	setlocale (LC_CTYPE, curlocale);
71	return true;	76	return true;
72	}	77	}
73		78
74	void	79	void
…		…
88	class rxvt_composite_vec rxvt_composite;	93	class rxvt_composite_vec rxvt_composite;
89		94
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	95	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	96	{
92	compose_char *cc;	97	compose_char *cc;
93		98
94	// break compose chains, as stupid readline really likes to duplicate	99	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	100	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	101	cc = (*this)[c1];
97	while (cc)	102	while (cc)
98	{	103	{
…		…
148	}	153	}
149	#endif	154	#endif
150		155
151	rxvt_term::rxvt_term ()	156	rxvt_term::rxvt_term ()
152	:	157	:
153	#if TRANSPARENT \|\| ENABLE_PERL	158	#if HAVE_BG_PIXMAP
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	159	update_background_ev(this, &rxvt_term::update_background_cb),
155	#endif
156	#ifdef HAVE_SCROLLBARS
157	scrollbar_ev (this, &rxvt_term::x_cb),
158	#endif	160	#endif
159	#ifdef CURSOR_BLINK	161	#ifdef CURSOR_BLINK
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	162	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
161	#endif	163	#endif
162	#ifdef TEXT_BLINK	164	#ifdef TEXT_BLINK
…		…
172	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	174	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
173	#endif	175	#endif
174	#ifdef POINTER_BLANK	176	#ifdef POINTER_BLANK
175	pointer_ev (this, &rxvt_term::pointer_cb),	177	pointer_ev (this, &rxvt_term::pointer_cb),
176	#endif	178	#endif
		179	#ifndef NO_BELL
		180	bell_ev (this, &rxvt_term::bell_cb),
		181	#endif
		182	child_ev (this, &rxvt_term::child_cb),
		183	prepare_ev (this, &rxvt_term::prepare_cb),
		184	flush_ev (this, &rxvt_term::flush_cb),
		185	destroy_ev (this, &rxvt_term::destroy_cb),
		186	pty_ev (this, &rxvt_term::pty_cb),
		187	incr_ev (this, &rxvt_term::incr_cb)
		188	{
		189	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		190	callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
		191	#endif
		192	#ifdef HAVE_SCROLLBARS
		193	callback_set (scrollbar_ev, this, rxvt_term, x_cb);
		194	#endif
177	#ifdef USE_XIM	195	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),	196	callback_set (im_ev , this, rxvt_term, im_cb);
179	#endif	197	#endif
180	#ifndef NO_BELL	198	callback_set (termwin_ev , this, rxvt_term, x_cb);
181	bell_ev (this, &rxvt_term::bell_cb),	199	callback_set (vt_ev , this, rxvt_term, x_cb);
182	#endif	200
183	termwin_ev (this, &rxvt_term::x_cb),
184	vt_ev (this, &rxvt_term::x_cb),
185	child_ev (this, &rxvt_term::child_cb),
186	check_ev (this, &rxvt_term::check_cb),
187	flush_ev (this, &rxvt_term::flush_cb),
188	destroy_ev (this, &rxvt_term::destroy_cb),
189	pty_ev (this, &rxvt_term::pty_cb),
190	incr_ev (this, &rxvt_term::incr_cb)
191	{
192	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	201	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193		202
194	termlist.push_back (this);	203	termlist.push_back (this);
195		204
196	#ifdef KEYSYM_RESOURCE	205	#ifdef KEYSYM_RESOURCE
…		…
198	#endif	207	#endif
199	}	208	}
200		209
201	// clean up the most important stuff, do not call x or free mem etc.	210	// clean up the most important stuff, do not call x or free mem etc.
202	// for use before an emergency exit	211	// for use before an emergency exit
		212	void
203	void rxvt_term::emergency_cleanup ()	213	rxvt_term::emergency_cleanup ()
204	{	214	{
205	if (cmd_pid)	215	if (cmd_pid)
206	kill (-cmd_pid, SIGHUP);	216	kill (-cmd_pid, SIGHUP);
207		217
208	pty_ev.stop ();	218	pty_ev.stop ();
…		…
270	}	280	}
271		281
272	clear ();	282	clear ();
273	}	283	}
274		284
275	delete pix_colors_focused;	285	delete [] pix_colors_focused;
276	#if OFF_FOCUS_FADING	286	#if OFF_FOCUS_FADING
277	delete pix_colors_unfocused;	287	delete [] pix_colors_unfocused;
278	#endif	288	#endif
279		289
		290	#ifdef HAVE_BG_PIXMAP
		291	bgPixmap.destroy ();
		292	#endif
280	displays.put (display);	293	displays.put (display);
281		294
282	scr_release ();	295	scr_release ();
283		296
284	/* clear all resources */	297	/* clear all resources */
…		…
297	delete argv;	310	delete argv;
298		311
299	#ifdef KEYSYM_RESOURCE	312	#ifdef KEYSYM_RESOURCE
300	delete keyboard;	313	delete keyboard;
301	#endif	314	#endif
		315	#ifndef NO_RESOURCES
		316	XrmDestroyDatabase (option_db);
		317	#endif
302	}	318	}
303		319
304	// child has exited, usually destroys	320	// child has exited, usually destroys
305	void	321	void
306	rxvt_term::child_cb (child_watcher &w, int status)	322	rxvt_term::child_cb (ev::child &w, int status)
307	{	323	{
308	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	324	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309		325
310	cmd_pid = 0;	326	cmd_pid = 0;
311		327
312	if (!OPTION (Opt_hold))	328	if (!option (Opt_hold))
313	destroy ();	329	destroy ();
314	}	330	}
315		331
316	void	332	void
317	rxvt_term::destroy ()	333	rxvt_term::destroy ()
…		…
331	im_ev.stop (display);	347	im_ev.stop (display);
332	#endif	348	#endif
333	#if HAVE_SCROLLBARS	349	#if HAVE_SCROLLBARS
334	scrollbar_ev.stop (display);	350	scrollbar_ev.stop (display);
335	#endif	351	#endif
336	#if TRANSPARENT \|\| ENABLE_PERL	352	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
337	rootwin_ev.stop (display);	353	rootwin_ev.stop (display);
338	#endif	354	#endif
339	incr_ev.stop ();	355	incr_ev.stop ();
340	termwin_ev.stop (display);	356	termwin_ev.stop (display);
341	vt_ev.stop (display);	357	vt_ev.stop (display);
342	}	358	}
343		359
344	check_ev.stop ();	360	prepare_ev.stop ();
345	pty_ev.stop ();	361	pty_ev.stop ();
346	#ifdef CURSOR_BLINK	362	#ifdef CURSOR_BLINK
347	cursor_blink_ev.stop ();	363	cursor_blink_ev.stop ();
348	#endif	364	#endif
349	#ifdef TEXT_BLINK	365	#ifdef TEXT_BLINK
…		…
357	#endif	373	#endif
358	#ifdef POINTER_BLANK	374	#ifdef POINTER_BLANK
359	pointer_ev.stop ();	375	pointer_ev.stop ();
360	#endif	376	#endif
361		377
362	destroy_ev.start (0);	378	destroy_ev.start ();
363	}	379	}
364		380
365	void	381	void
366	rxvt_term::destroy_cb (time_watcher &w)	382	rxvt_term::destroy_cb (ev::idle &w, int revents)
367	{	383	{
368	make_current ();	384	make_current ();
369		385
370	delete this;	386	delete this;
371	}	387	}
…		…
425	else	441	else
426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	442	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427	mesg, BUFSIZ);	443	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	444	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429	}	445	}
430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	446	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431	mesg, BUFSIZ);	447	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	448	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433	}	449	}
434	#endif	450	#endif
435		451
…		…
481	#ifdef KEYSYM_RESOURCE	497	#ifdef KEYSYM_RESOURCE
482	keyboard->register_done ();	498	keyboard->register_done ();
483	#endif	499	#endif
484		500
485	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
486	if (OPTION (Opt_scrollBar))	502	if (option (Opt_scrollBar))
487	scrollBar.setIdle (); /* set existence for size calculations */	503	scrollBar.setIdle (); /* set existence for size calculations */
488	#endif	504	#endif
489		505
490	pty = ptytty::create ();	506	pty = ptytty::create ();
491		507
…		…
498	#if 0	514	#if 0
499	XSynchronize (dpy, True);	515	XSynchronize (dpy, True);
500	#endif	516	#endif
501		517
502	#ifdef HAVE_SCROLLBARS	518	#ifdef HAVE_SCROLLBARS
503	if (OPTION (Opt_scrollBar))	519	if (option (Opt_scrollBar))
504	resize_scrollbar (); /* create and map scrollbar */	520	resize_scrollbar (); /* create and map scrollbar */
505	#endif	521	#endif
		522	#ifdef HAVE_BG_PIXMAP
		523	{
		524	bgPixmap.set_target (this);
		525
506	#ifdef TRANSPARENT	526	#ifdef ENABLE_TRANSPARENCY
507	if (OPTION (Opt_transparent))	527	if (option (Opt_transparent))
508	{	528	{
		529	bgPixmap.set_transparent ();
		530	#ifdef HAVE_AFTERIMAGE
		531	if (rs [Rs_blurradius])
		532	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		533	#endif
		534	if (ISSET_PIXCOLOR (Color_tint))
		535	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		536	if (rs [Rs_shade])
		537	bgPixmap.set_shade (rs [Rs_shade]);
		538
		539	bgPixmap.set_root_pixmap ();
509	XSelectInput (dpy, display->root, PropertyChangeMask);	540	XSelectInput (dpy, display->root, PropertyChangeMask);
510	check_our_parents ();
511	rootwin_ev.start (display, display->root);	541	rootwin_ev.start (display, display->root);
512	}	542	}
513	#endif	543	#endif
		544
		545	#ifdef BG_IMAGE_FROM_FILE
		546	if (rs[Rs_backgroundPixmap] != NULL)
		547	{
		548	const char *p = rs[Rs_backgroundPixmap];
		549
		550	if ((p = strchr (p, ';')) != NULL)
		551	{
		552	p++;
		553	bgPixmap.set_geometry (p);
		554	}
		555	else
		556	bgPixmap.set_defaultGeometry ();
		557
		558	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		559	if (!bgPixmap.window_position_sensitive ())
		560	update_background ();
		561	}
		562	#endif
		563	}
		564	#endif
		565
514	#if ENABLE_PERL	566	#if ENABLE_PERL
515	rootwin_ev.start (display, display->root);	567	rootwin_ev.start (display, display->root);
516	#endif	568	#endif
517		569
518	set_colorfgbg ();	570	set_colorfgbg ();
…		…
520	init_command (cmd_argv);	572	init_command (cmd_argv);
521		573
522	free (cmd_argv);	574	free (cmd_argv);
523		575
524	if (pty->pty >= 0)	576	if (pty->pty >= 0)
525	pty_ev.start (pty->pty, EVENT_READ);	577	pty_ev.start (pty->pty, ev::READ);
526		578
527	check_ev.start ();	579	prepare_ev.start ();
528		580
529	HOOK_INVOKE ((this, HOOK_START, DT_END));	581	HOOK_INVOKE ((this, HOOK_START, DT_END));
530		582
531	#if ENABLE_XEMBED	583	#if ENABLE_XEMBED
532	if (rs[Rs_embed])	584	if (rs[Rs_embed])
…		…
544	return true;	596	return true;
545	}	597	}
546		598
547	static struct sig_handlers	599	static struct sig_handlers
548	{	600	{
549	sig_watcher sw_term, sw_int;	601	ev::sig sw_term, sw_int;
550		602
551	/*	603	/*
552	* Catch a fatal signal and tidy up before quitting	604	* Catch a fatal signal and tidy up before quitting
553	*/	605	*/
554	void	606	void
555	sig_term (sig_watcher &w)	607	sig_term (ev::sig &w, int revents)
556	{	608	{
557	rxvt_emergency_cleanup ();	609	rxvt_emergency_cleanup ();
558	signal (w.signum, SIG_DFL);	610	w.stop ();
559	kill (getpid (), w.signum);	611	kill (getpid (), w.signum);
560	}	612	}
561		613
562	sig_handlers ()	614	sig_handlers ()
563	: sw_term (this, &sig_handlers::sig_term),	615	: sw_term (this, &sig_handlers::sig_term),
…		…
571	void	623	void
572	rxvt_init ()	624	rxvt_init ()
573	{	625	{
574	ptytty::init ();	626	ptytty::init ();
575		627
		628	if (!ev_default_loop (0))
		629	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
		630
576	rxvt_environ = environ;	631	rxvt_environ = environ;
577		632
578	signal (SIGHUP, SIG_IGN);	633	signal (SIGHUP, SIG_IGN);
579	signal (SIGPIPE, SIG_IGN);	634	signal (SIGPIPE, SIG_IGN);
580		635
581	sig_handlers.sw_term.start (SIGTERM);	636	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582	sig_handlers.sw_int.start (SIGINT);	637	sig_handlers.sw_int.start (SIGINT); ev_unref ();
583		638
584	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	639	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
585	/* signal (SIGURG, SIG_DFL); */	640	/* signal (SIGURG, SIG_DFL); */
586		641
587	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	642	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
627	return p;	682	return p;
628	}	683	}
629		684
630	/----------------------------------------------------------------------/	685	/----------------------------------------------------------------------/
631	/*	686	/*
632	* window size/position calculcations for XSizeHint and other storage.	687	* window size/position calculations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	688	* if width/height are non-zero then override calculated width/height
634	*/	689	*/
635	void	690	void
636	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	691	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	692	{
…		…
709	if (scrollBar.state)	764	if (scrollBar.state)
710	{	765	{
711	sb_w = scrollbar_TotalWidth ();	766	sb_w = scrollbar_TotalWidth ();
712	szHint.base_width += sb_w;	767	szHint.base_width += sb_w;
713		768
714	if (!OPTION (Opt_scrollBar_right))	769	if (!option (Opt_scrollBar_right))
715	window_vt_x += sb_w;	770	window_vt_x += sb_w;
716	}	771	}
717		772
718	szHint.width_inc = fwidth;	773	szHint.width_inc = fwidth;
719	szHint.height_inc = fheight;	774	szHint.height_inc = fheight;
…		…
740	{	795	{
741	min_it (height, max_height);	796	min_it (height, max_height);
742	szHint.height = szHint.base_height + height;	797	szHint.height = szHint.base_height + height;
743	}	798	}
744		799
745	if (scrollBar.state && OPTION (Opt_scrollBar_right))	800	if (scrollBar.state && option (Opt_scrollBar_right))
746	window_sb_x = szHint.width - sb_w;	801	window_sb_x = szHint.width - sb_w;
747		802
748	if (recalc_x)	803	if (recalc_x)
749	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	804	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750		805
…		…
812	delete fontset[0];	867	delete fontset[0];
813	fontset[0] = fs;	868	fontset[0] = fs;
814		869
815	prop = (*fs)[1]->properties ();	870	prop = (*fs)[1]->properties ();
816	prop.height += lineSpace;	871	prop.height += lineSpace;
		872
817	fs->set_prop (prop);	873	fs->set_prop (prop, false);
818		874
819	fwidth = prop.width;	875	fwidth = prop.width;
820	fheight = prop.height;	876	fheight = prop.height;
821	fbase = prop.ascent;	877	fbase = prop.ascent;
822		878
…		…
831	{	887	{
832	fontset[style] = fs = new rxvt_fontset (this);	888	fontset[style] = fs = new rxvt_fontset (this);
833	rxvt_fontprop prop2 = prop;	889	rxvt_fontprop prop2 = prop;
834		890
835	if (res)	891	if (res)
836	prop2.weight = prop2.slant = rxvt_fontprop::unset;	892	{
		893	fs->populate (res);
		894	fs->set_prop (prop2, false);
		895	}
837	else	896	else
838	{	897	{
839	res = fontset[0]->fontdesc;	898	fs->populate (fontset[0]->fontdesc);
840		899
841	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	900	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
842	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	901	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		902
		903	fs->set_prop (prop2, true);
843	}	904	}
844		905
845	fs->populate (res);
846	fs->set_prop (prop2);
847	}	906	}
848	#else	907	#else
849	fontset[style] = fontset[0];	908	fontset[style] = fontset[0];
850	#endif	909	#endif
851	}	910	}
…		…
853	if (parent[0])	912	if (parent[0])
854	{	913	{
855	resize_all_windows (0, 0, 0);	914	resize_all_windows (0, 0, 0);
856	scr_remap_chars ();	915	scr_remap_chars ();
857	scr_touch (true);	916	scr_touch (true);
858	}	917	}
859		918
860	return true;	919	return true;
861	}	920	}
862		921
		922	void
863	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	923	rxvt_term::set_string_property (Atom prop, const char *str, int len)
864	{	924	{
865	XChangeProperty (dpy, parent[0],	925	XChangeProperty (dpy, parent[0],
866	prop, XA_STRING, 8, PropModeReplace,	926	prop, XA_STRING, 8, PropModeReplace,
867	(const unsigned char *)str, len >= 0 ? len : strlen (str));	927	(const unsigned char *)str, len >= 0 ? len : strlen (str));
868	}	928	}
869		929
		930	void
870	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	931	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871	{	932	{
872	wchar_t *ws = rxvt_mbstowcs (str, len);	933	wchar_t *ws = rxvt_mbstowcs (str, len);
873	char *s = rxvt_wcstoutf8 (ws);	934	char *s = rxvt_wcstoutf8 (ws);
874		935
875	XChangeProperty (dpy, parent[0],	936	XChangeProperty (dpy, parent[0],
…		…
899	#if ENABLE_EWMH	960	#if ENABLE_EWMH
900	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	961	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901	#endif	962	#endif
902	}	963	}
903		964
		965	void
		966	rxvt_term::set_window_color (int idx, const char *color)
		967	{
904	#ifdef XTERM_COLOR_CHANGE	968	#ifdef XTERM_COLOR_CHANGE
905	void
906	rxvt_term::set_window_color (int idx, const char *color)
907	{
908	rxvt_color xcol;	969	rxvt_color xcol;
909	int i;	970	int i;
910		971
911	if (color == NULL \|\| *color == '\0')	972	if (color == NULL \|\| *color == '\0')
912	return;	973	return;
913		974
914	color = strdup (color);	975	color = strdup (color);
915	allocated.push_back ((void *)color);	976	allocated.push_back ((void *)color);
…		…
919	if (isdigit (*color))	980	if (isdigit (*color))
920	{	981	{
921	i = atoi (color);	982	i = atoi (color);
922		983
923	if (i >= 8 && i <= 15)	984	if (i >= 8 && i <= 15)
		985	{
924	{ /* bright colors */	986	/* bright colors */
925	i -= 8;
926	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	987	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
927	goto done;	988	goto done;
928	}	989	}
929		990
930	if (i >= 0 && i <= 7)	991	if (i >= 0 && i <= 7)
		992	{
931	{ /* normal colors */	993	/* normal colors */
932	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	994	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
933	goto done;	995	goto done;
934	}	996	}
935	}	997	}
936		998
…		…
941	* so just keep gobbling up the colormap	1003	* so just keep gobbling up the colormap
942	*/	1004	*/
943		1005
944	pix_colors_focused[idx] = xcol;	1006	pix_colors_focused[idx] = xcol;
945		1007
946	/* XSetWindowAttributes attr; */
947	/* Cursor cursor; */
948	done:	1008	done:
949	/TODO: handle Color_BD, scrollbar background, etc. /	1009	/TODO: handle Color_BD, scrollbar background, etc. /
950		1010
951	update_fade_color (idx);	1011	update_fade_color (idx);
952	recolour_cursor ();	1012	recolour_cursor ();
953	scr_recolour ();	1013	scr_recolour ();
		1014	#endif /* XTERM_COLOR_CHANGE */
954	}	1015	}
955
956	#else
957	# define set_window_color (idx,color) ((void)0)
958	#endif /* XTERM_COLOR_CHANGE */
959		1016
960	void	1017	void
961	rxvt_term::recolour_cursor ()	1018	rxvt_term::recolour_cursor ()
962	{	1019	{
963	XColor fg, bg;	1020	XColor fg, bg;
…		…
979	*/	1036	*/
980	void	1037	void
981	rxvt_term::set_colorfgbg ()	1038	rxvt_term::set_colorfgbg ()
982	{	1039	{
983	unsigned int i;	1040	unsigned int i;
984	const char *xpmb = "\0";	1041	const char *xpmb = "";
985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1042	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986		1043
987	strcpy (fstr, "default");	1044	strcpy (fstr, "default");
988	strcpy (bstr, "default");	1045	strcpy (bstr, "default");
989	for (i = Color_Black; i <= Color_White; i++)	1046	for (i = Color_Black; i <= Color_White; i++)
…		…
995		1052
996	for (i = Color_Black; i <= Color_White; i++)	1053	for (i = Color_Black; i <= Color_White; i++)
997	if (pix_colors[Color_bg] == pix_colors[i])	1054	if (pix_colors[Color_bg] == pix_colors[i])
998	{	1055	{
999	sprintf (bstr, "%d", (i - Color_Black));	1056	sprintf (bstr, "%d", (i - Color_Black));
1000	#ifdef XPM_BACKGROUND	1057	#ifdef BG_IMAGE_FROM_FILE
1001	xpmb = "default;";	1058	xpmb = "default;";
1002	#endif	1059	#endif
1003	break;	1060	break;
1004	}	1061	}
1005		1062
…		…
1101		1158
1102	XMoveResizeWindow (dpy, vt,	1159	XMoveResizeWindow (dpy, vt,
1103	window_vt_x, window_vt_y,	1160	window_vt_x, window_vt_y,
1104	width, height);	1161	width, height);
1105		1162
		1163	#ifdef HAVE_BG_PIXMAP
		1164	if (bgPixmap.window_size_sensitive ())
		1165	update_background ();
		1166	#endif
		1167
1106	scr_clear ();	1168	scr_clear ();
1107	#ifdef XPM_BACKGROUND
1108	resize_pixmap ();
1109	#endif
1110	}	1169	}
1111		1170
1112	if (fix_screen \|\| old_height == 0)	1171	if (fix_screen \|\| old_height == 0)
1113	scr_reset ();	1172	scr_reset ();
1114		1173
1115	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1174	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116	//scr_touch (false);	1175	//scr_touch (false);
1117		1176
1118	#ifdef XPM_BACKGROUND	1177	#ifdef HAVE_BG_PIXMAP
1119	if (pixmap)	1178	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1179	// if (bgPixmap.pixmap)
1120	scr_touch (false);	1180	// scr_touch (false);
1121	#endif	1181	#endif
1122		1182
1123	#ifdef USE_XIM	1183	#ifdef USE_XIM
1124	IMSetPosition ();	1184	IMSetPosition ();
1125	#endif	1185	#endif
…		…
1296	if (term->rs[Rs_imLocale])	1356	if (term->rs[Rs_imLocale])
1297	SET_LOCALE (term->locale);	1357	SET_LOCALE (term->locale);
1298	}	1358	}
1299	else	1359	else
1300	str = (void *)text->string.wide_char;	1360	str = (void *)text->string.wide_char;
1301		1361
1302	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1362	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303	DT_INT, call_data->caret,	1363	DT_INT, call_data->caret,
1304	DT_INT, call_data->chg_first,	1364	DT_INT, call_data->chg_first,
1305	DT_INT, call_data->chg_length,	1365	DT_INT, call_data->chg_length,
1306	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1366	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1625		1685
1626	if (input_style & XIMPreeditPosition)	1686	if (input_style & XIMPreeditPosition)
1627	{	1687	{
1628	im_set_size (preedit_rect);	1688	im_set_size (preedit_rect);
1629	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1689	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630		1690
1631	XSetICValues (Input_Context,	1691	XSetICValues (Input_Context,
1632	XNPreeditAttributes, preedit_attr, NULL);	1692	XNPreeditAttributes, preedit_attr, NULL);
1633	}	1693	}
1634	else	1694	else
1635	{	1695	{
…		…
1652	XFree (status_attr);	1712	XFree (status_attr);
1653	}	1713	}
1654		1714
1655	XFree (preedit_attr);	1715	XFree (preedit_attr);
1656	}	1716	}
1657	#endif /* USE_XIM */	1717	#endif /* USE_XIM */
		1718
		1719	void
		1720	rxvt_term::get_window_origin (int &x, int &y)
		1721	{
		1722	Window cr;
		1723	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1724	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1725	}
		1726
		1727	Pixmap
		1728	rxvt_term::get_pixmap_property (int prop_id)
		1729	{
		1730	if (prop_id > 0 && prop_id < NUM_XA)
		1731	if (xa[prop_id])
		1732	{
		1733	int aformat;
		1734	unsigned long nitems, bytes_after;
		1735	Atom atype;
		1736	unsigned char *prop = NULL;
		1737	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1738	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1739	&nitems, &bytes_after, &prop);
		1740	if (result == Success && prop && atype == XA_PIXMAP)
		1741	{
		1742	return (Pixmap )prop;
		1743	}
		1744	}
		1745	return None;
		1746	}
		1747
		1748	#ifdef HAVE_BG_PIXMAP
		1749	# if TRACE_PIXMAPS
		1750	# undef update_background
		1751	int rxvt_term::trace_update_background (const char *file, int line)
		1752	{
		1753	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1754	update_background ();
		1755	}
		1756	# endif
		1757
		1758	int
		1759	rxvt_term::update_background ()
		1760	{
		1761	bgPixmap.invalidate ();
		1762
		1763	/* no chance of real time refresh if we are blurring! */
		1764	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1765	bgPixmap.render ();
		1766	else
		1767	{
		1768	update_background_ev.stop ();
		1769
		1770	if (!bgPixmap.need_client_side_rendering())
		1771	update_background_ev.start (.05);
		1772	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1773	update_background_ev.start (.20); /* very slow !!! */
		1774	else
		1775	update_background_ev.start (.07);
		1776	}
		1777
		1778	return 0;
		1779	}
		1780
		1781	void
		1782	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1783	{
		1784	bgPixmap.render ();
		1785	}
		1786
		1787	#endif /* HAVE_BG_PIXMAP */
1658		1788
1659	/----------------------- end-of-file (C source) -----------------------/	1789	/----------------------- 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.227 by root, Fri Jul 28 17:16:42 2006 UTC vs. Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.227 by root, Fri Jul 28 17:16:42 2006 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC