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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.231 by root, Sun Aug 27 10:14:47 2006 UTC vs.
Revision 1.272 by root, Tue Dec 11 03:30:49 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>
		45	#endif
		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
49	#endif	54	#endif
50		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"
…		…
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	{
…		…
147		152
148	}	153	}
149	#endif	154	#endif
150		155
151	rxvt_term::rxvt_term ()	156	rxvt_term::rxvt_term ()
152	:	157	{
		158	#if HAVE_BG_PIXMAP
		159	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		160	#endif
		161	#ifdef CURSOR_BLINK
		162	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
		163	#endif
		164	#ifdef TEXT_BLINK
		165	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
		166	#endif
		167	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		168	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		169	#endif
		170	#ifdef SELECTION_SCROLLING
		171	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		172	#endif
		173	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		174	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		175	#endif
153	#if TRANSPARENT \|\| ENABLE_PERL	176	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	177	rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
155	#endif	178	#endif
156	#ifdef HAVE_SCROLLBARS	179	#ifdef HAVE_SCROLLBARS
157	scrollbar_ev (this, &rxvt_term::x_cb),	180	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
158	#endif	181	#endif
159	#ifdef CURSOR_BLINK	182	#ifdef USE_XIM
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	183	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
161	#endif
162	#ifdef TEXT_BLINK
163	text_blink_ev (this, &rxvt_term::text_blink_cb),
164	#endif
165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
167	#endif
168	#ifdef SELECTION_SCROLLING
169	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
170	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
173	#endif	184	#endif
174	#ifdef POINTER_BLANK	185	#ifdef POINTER_BLANK
175	pointer_ev (this, &rxvt_term::pointer_cb),	186	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176	#endif	187	#endif
177	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),
179	#endif
180	#ifndef NO_BELL	188	#ifndef NO_BELL
181	bell_ev (this, &rxvt_term::bell_cb),	189	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182	#endif	190	#endif
183	termwin_ev (this, &rxvt_term::x_cb),	191	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184	vt_ev (this, &rxvt_term::x_cb),	192	prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
185	child_ev (this, &rxvt_term::child_cb),	193	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
186	check_ev (this, &rxvt_term::check_cb),	194	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
187	flush_ev (this, &rxvt_term::flush_cb),	195	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
188	destroy_ev (this, &rxvt_term::destroy_cb),	196	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
189	pty_ev (this, &rxvt_term::pty_cb),	197	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190	incr_ev (this, &rxvt_term::incr_cb)	198	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191	{	199
192	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193		201
194	termlist.push_back (this);	202	termlist.push_back (this);
195		203
196	#ifdef KEYSYM_RESOURCE	204	#ifdef KEYSYM_RESOURCE
…		…
198	#endif	206	#endif
199	}	207	}
200		208
201	// clean up the most important stuff, do not call x or free mem etc.	209	// clean up the most important stuff, do not call x or free mem etc.
202	// for use before an emergency exit	210	// for use before an emergency exit
		211	void
203	void rxvt_term::emergency_cleanup ()	212	rxvt_term::emergency_cleanup ()
204	{	213	{
205	if (cmd_pid)	214	if (cmd_pid)
206	kill (-cmd_pid, SIGHUP);	215	kill (-cmd_pid, SIGHUP);
207		216
208	pty_ev.stop ();	217	pty_ev.stop ();
…		…
275	delete [] pix_colors_focused;	284	delete [] pix_colors_focused;
276	#if OFF_FOCUS_FADING	285	#if OFF_FOCUS_FADING
277	delete [] pix_colors_unfocused;	286	delete [] pix_colors_unfocused;
278	#endif	287	#endif
279		288
		289	#ifdef HAVE_BG_PIXMAP
		290	bgPixmap.destroy ();
		291	#endif
280	displays.put (display);	292	displays.put (display);
281		293
282	scr_release ();	294	scr_release ();
283		295
284	/* clear all resources */	296	/* clear all resources */
…		…
297	delete argv;	309	delete argv;
298		310
299	#ifdef KEYSYM_RESOURCE	311	#ifdef KEYSYM_RESOURCE
300	delete keyboard;	312	delete keyboard;
301	#endif	313	#endif
		314	#ifndef NO_RESOURCES
		315	XrmDestroyDatabase (option_db);
		316	#endif
302	}	317	}
303		318
304	// child has exited, usually destroys	319	// child has exited, usually destroys
305	void	320	void
306	rxvt_term::child_cb (child_watcher &w, int status)	321	rxvt_term::child_cb (ev::child &w, int status)
307	{	322	{
308	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	323	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309		324
310	cmd_pid = 0;	325	cmd_pid = 0;
311		326
312	if (!OPTION (Opt_hold))	327	if (!option (Opt_hold))
313	destroy ();	328	destroy ();
314	}	329	}
315		330
316	void	331	void
317	rxvt_term::destroy ()	332	rxvt_term::destroy ()
318	{	333	{
319	if (destroy_ev.active)	334	if (ev_is_active (&destroy_ev))
320	return;	335	return;
321		336
322	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	337	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		338
324	#if ENABLE_OVERLAY	339	#if ENABLE_OVERLAY
…		…
331	im_ev.stop (display);	346	im_ev.stop (display);
332	#endif	347	#endif
333	#if HAVE_SCROLLBARS	348	#if HAVE_SCROLLBARS
334	scrollbar_ev.stop (display);	349	scrollbar_ev.stop (display);
335	#endif	350	#endif
336	#if TRANSPARENT \|\| ENABLE_PERL	351	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
337	rootwin_ev.stop (display);	352	rootwin_ev.stop (display);
338	#endif	353	#endif
339	incr_ev.stop ();	354	incr_ev.stop ();
340	termwin_ev.stop (display);	355	termwin_ev.stop (display);
341	vt_ev.stop (display);	356	vt_ev.stop (display);
342	}	357	}
343		358
344	check_ev.stop ();	359	prepare_ev.stop ();
345	pty_ev.stop ();	360	pty_ev.stop ();
346	#ifdef CURSOR_BLINK	361	#ifdef CURSOR_BLINK
347	cursor_blink_ev.stop ();	362	cursor_blink_ev.stop ();
348	#endif	363	#endif
349	#ifdef TEXT_BLINK	364	#ifdef TEXT_BLINK
…		…
357	#endif	372	#endif
358	#ifdef POINTER_BLANK	373	#ifdef POINTER_BLANK
359	pointer_ev.stop ();	374	pointer_ev.stop ();
360	#endif	375	#endif
361		376
362	destroy_ev.start (0);	377	destroy_ev.start ();
363	}	378	}
364		379
365	void	380	void
366	rxvt_term::destroy_cb (time_watcher &w)	381	rxvt_term::destroy_cb (ev::idle &w, int revents)
367	{	382	{
368	make_current ();	383	make_current ();
369		384
370	delete this;	385	delete this;
371	}	386	}
…		…
425	else	440	else
426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	441	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427	mesg, BUFSIZ);	442	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	443	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429	}	444	}
430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	445	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431	mesg, BUFSIZ);	446	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	447	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433	}	448	}
434	#endif	449	#endif
435		450
…		…
481	#ifdef KEYSYM_RESOURCE	496	#ifdef KEYSYM_RESOURCE
482	keyboard->register_done ();	497	keyboard->register_done ();
483	#endif	498	#endif
484		499
485	#ifdef HAVE_SCROLLBARS	500	#ifdef HAVE_SCROLLBARS
486	if (OPTION (Opt_scrollBar))	501	if (option (Opt_scrollBar))
487	scrollBar.setIdle (); /* set existence for size calculations */	502	scrollBar.setIdle (); /* set existence for size calculations */
488	#endif	503	#endif
489		504
490	pty = ptytty::create ();	505	pty = ptytty::create ();
491		506
…		…
498	#if 0	513	#if 0
499	XSynchronize (dpy, True);	514	XSynchronize (dpy, True);
500	#endif	515	#endif
501		516
502	#ifdef HAVE_SCROLLBARS	517	#ifdef HAVE_SCROLLBARS
503	if (OPTION (Opt_scrollBar))	518	if (option (Opt_scrollBar))
504	resize_scrollbar (); /* create and map scrollbar */	519	resize_scrollbar (); /* create and map scrollbar */
505	#endif	520	#endif
		521	#ifdef HAVE_BG_PIXMAP
		522	{
		523	bgPixmap.set_target (this);
		524
506	#ifdef TRANSPARENT	525	#ifdef ENABLE_TRANSPARENCY
507	if (OPTION (Opt_transparent))	526	if (option (Opt_transparent))
508	{	527	{
		528	bgPixmap.set_transparent ();
		529	#ifdef HAVE_AFTERIMAGE
		530	if (rs [Rs_blurradius])
		531	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		532	#endif
		533	if (ISSET_PIXCOLOR (Color_tint))
		534	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		535	if (rs [Rs_shade])
		536	bgPixmap.set_shade (rs [Rs_shade]);
		537
		538	bgPixmap.set_root_pixmap ();
509	XSelectInput (dpy, display->root, PropertyChangeMask);	539	XSelectInput (dpy, display->root, PropertyChangeMask);
510	check_our_parents ();
511	rootwin_ev.start (display, display->root);	540	rootwin_ev.start (display, display->root);
512	}	541	}
513	#endif	542	#endif
		543
		544	#ifdef BG_IMAGE_FROM_FILE
		545	if (rs[Rs_backgroundPixmap] != NULL)
		546	{
		547	const char *p = rs[Rs_backgroundPixmap];
		548
		549	if ((p = strchr (p, ';')) != NULL)
		550	{
		551	p++;
		552	bgPixmap.set_geometry (p);
		553	}
		554	else
		555	bgPixmap.set_defaultGeometry ();
		556
		557	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		558	if (!bgPixmap.window_position_sensitive ())
		559	update_background ();
		560	}
		561	#endif
		562	}
		563	#endif
		564
514	#if ENABLE_PERL	565	#if ENABLE_PERL
515	rootwin_ev.start (display, display->root);	566	rootwin_ev.start (display, display->root);
516	#endif	567	#endif
517		568
518	set_colorfgbg ();	569	set_colorfgbg ();
…		…
520	init_command (cmd_argv);	571	init_command (cmd_argv);
521		572
522	free (cmd_argv);	573	free (cmd_argv);
523		574
524	if (pty->pty >= 0)	575	if (pty->pty >= 0)
525	pty_ev.start (pty->pty, EVENT_READ);	576	pty_ev.start (pty->pty, ev::READ);
526		577
527	check_ev.start ();	578	prepare_ev.start ();
528		579
529	HOOK_INVOKE ((this, HOOK_START, DT_END));	580	HOOK_INVOKE ((this, HOOK_START, DT_END));
530		581
531	#if ENABLE_XEMBED	582	#if ENABLE_XEMBED
532	if (rs[Rs_embed])	583	if (rs[Rs_embed])
…		…
544	return true;	595	return true;
545	}	596	}
546		597
547	static struct sig_handlers	598	static struct sig_handlers
548	{	599	{
549	sig_watcher sw_term, sw_int;	600	ev::sig sw_term, sw_int;
550		601
551	/*	602	/*
552	* Catch a fatal signal and tidy up before quitting	603	* Catch a fatal signal and tidy up before quitting
553	*/	604	*/
554	void	605	void sig_term (ev::sig &w, int revents);
555	sig_term (sig_watcher &w)	606
		607	sig_handlers ()
556	{	608	{
557	rxvt_emergency_cleanup ();	609	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
558	signal (w.signum, SIG_DFL);
559	kill (getpid (), w.signum);
560	}
561
562	sig_handlers ()
563	: sw_term (this, &sig_handlers::sig_term),
564	sw_int (this, &sig_handlers::sig_term)	610	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565	{
566	}	611	}
567	} sig_handlers;	612	} sig_handlers;
568		613
		614	void
		615	sig_handlers::sig_term (ev::sig &w, int revents)
		616	{
		617	rxvt_emergency_cleanup ();
		618	w.stop ();
		619	kill (getpid (), w.signum);
		620	}
		621
569	char **rxvt_environ; // startup environment	622	char **rxvt_environ; // startup environment
570		623
571	void	624	void
572	rxvt_init ()	625	rxvt_init ()
573	{	626	{
574	ptytty::init ();	627	ptytty::init ();
		628
		629	if (!ev_default_loop (0))
		630	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575		631
576	rxvt_environ = environ;	632	rxvt_environ = environ;
577		633
578	signal (SIGHUP, SIG_IGN);	634	signal (SIGHUP, SIG_IGN);
579	signal (SIGPIPE, SIG_IGN);	635	signal (SIGPIPE, SIG_IGN);
580		636
581	sig_handlers.sw_term.start (SIGTERM);	637	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582	sig_handlers.sw_int.start (SIGINT);	638	sig_handlers.sw_int.start (SIGINT); ev_unref ();
583		639
584	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	640	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
585	/* signal (SIGURG, SIG_DFL); */	641	/* signal (SIGURG, SIG_DFL); */
586		642
587	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	643	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
627	return p;	683	return p;
628	}	684	}
629		685
630	/----------------------------------------------------------------------/	686	/----------------------------------------------------------------------/
631	/*	687	/*
632	* window size/position calculcations for XSizeHint and other storage.	688	* window size/position calculations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	689	* if width/height are non-zero then override calculated width/height
634	*/	690	*/
635	void	691	void
636	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	692	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	693	{
…		…
709	if (scrollBar.state)	765	if (scrollBar.state)
710	{	766	{
711	sb_w = scrollbar_TotalWidth ();	767	sb_w = scrollbar_TotalWidth ();
712	szHint.base_width += sb_w;	768	szHint.base_width += sb_w;
713		769
714	if (!OPTION (Opt_scrollBar_right))	770	if (!option (Opt_scrollBar_right))
715	window_vt_x += sb_w;	771	window_vt_x += sb_w;
716	}	772	}
717		773
718	szHint.width_inc = fwidth;	774	szHint.width_inc = fwidth;
719	szHint.height_inc = fheight;	775	szHint.height_inc = fheight;
…		…
740	{	796	{
741	min_it (height, max_height);	797	min_it (height, max_height);
742	szHint.height = szHint.base_height + height;	798	szHint.height = szHint.base_height + height;
743	}	799	}
744		800
745	if (scrollBar.state && OPTION (Opt_scrollBar_right))	801	if (scrollBar.state && option (Opt_scrollBar_right))
746	window_sb_x = szHint.width - sb_w;	802	window_sb_x = szHint.width - sb_w;
747		803
748	if (recalc_x)	804	if (recalc_x)
749	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	805	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750		806
…		…
857	if (parent[0])	913	if (parent[0])
858	{	914	{
859	resize_all_windows (0, 0, 0);	915	resize_all_windows (0, 0, 0);
860	scr_remap_chars ();	916	scr_remap_chars ();
861	scr_touch (true);	917	scr_touch (true);
862	}	918	}
863		919
864	return true;	920	return true;
865	}	921	}
866		922
		923	void
867	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	924	rxvt_term::set_string_property (Atom prop, const char *str, int len)
868	{	925	{
869	XChangeProperty (dpy, parent[0],	926	XChangeProperty (dpy, parent[0],
870	prop, XA_STRING, 8, PropModeReplace,	927	prop, XA_STRING, 8, PropModeReplace,
871	(const unsigned char *)str, len >= 0 ? len : strlen (str));	928	(const unsigned char *)str, len >= 0 ? len : strlen (str));
872	}	929	}
873		930
		931	void
874	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	932	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
875	{	933	{
876	wchar_t *ws = rxvt_mbstowcs (str, len);	934	wchar_t *ws = rxvt_mbstowcs (str, len);
877	char *s = rxvt_wcstoutf8 (ws);	935	char *s = rxvt_wcstoutf8 (ws);
878		936
879	XChangeProperty (dpy, parent[0],	937	XChangeProperty (dpy, parent[0],
…		…
903	#if ENABLE_EWMH	961	#if ENABLE_EWMH
904	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	962	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
905	#endif	963	#endif
906	}	964	}
907		965
		966	void
		967	rxvt_term::set_window_color (int idx, const char *color)
		968	{
908	#ifdef XTERM_COLOR_CHANGE	969	#ifdef XTERM_COLOR_CHANGE
909	void
910	rxvt_term::set_window_color (int idx, const char *color)
911	{
912	rxvt_color xcol;	970	rxvt_color xcol;
913	int i;	971	int i;
914		972
915	if (color == NULL \|\| *color == '\0')	973	if (color == NULL \|\| *color == '\0')
916	return;	974	return;
917		975
918	color = strdup (color);	976	color = strdup (color);
919	allocated.push_back ((void *)color);	977	allocated.push_back ((void *)color);
…		…
923	if (isdigit (*color))	981	if (isdigit (*color))
924	{	982	{
925	i = atoi (color);	983	i = atoi (color);
926		984
927	if (i >= 8 && i <= 15)	985	if (i >= 8 && i <= 15)
		986	{
928	{ /* bright colors */	987	/* bright colors */
929	i -= 8;
930	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	988	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
931	goto done;	989	goto done;
932	}	990	}
933		991
934	if (i >= 0 && i <= 7)	992	if (i >= 0 && i <= 7)
		993	{
935	{ /* normal colors */	994	/* normal colors */
936	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	995	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
937	goto done;	996	goto done;
938	}	997	}
939	}	998	}
940		999
…		…
945	* so just keep gobbling up the colormap	1004	* so just keep gobbling up the colormap
946	*/	1005	*/
947		1006
948	pix_colors_focused[idx] = xcol;	1007	pix_colors_focused[idx] = xcol;
949		1008
950	/* XSetWindowAttributes attr; */
951	/* Cursor cursor; */
952	done:	1009	done:
953	/TODO: handle Color_BD, scrollbar background, etc. /	1010	/TODO: handle Color_BD, scrollbar background, etc. /
954		1011
955	update_fade_color (idx);	1012	update_fade_color (idx);
956	recolour_cursor ();	1013	recolour_cursor ();
957	scr_recolour ();	1014	scr_recolour ();
		1015	#endif /* XTERM_COLOR_CHANGE */
958	}	1016	}
959
960	#else
961	# define set_window_color (idx,color) ((void)0)
962	#endif /* XTERM_COLOR_CHANGE */
963		1017
964	void	1018	void
965	rxvt_term::recolour_cursor ()	1019	rxvt_term::recolour_cursor ()
966	{	1020	{
967	XColor fg, bg;	1021	XColor fg, bg;
…		…
983	*/	1037	*/
984	void	1038	void
985	rxvt_term::set_colorfgbg ()	1039	rxvt_term::set_colorfgbg ()
986	{	1040	{
987	unsigned int i;	1041	unsigned int i;
988	const char *xpmb = "\0";	1042	const char *xpmb = "";
989	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1043	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990		1044
991	strcpy (fstr, "default");	1045	strcpy (fstr, "default");
992	strcpy (bstr, "default");	1046	strcpy (bstr, "default");
993	for (i = Color_Black; i <= Color_White; i++)	1047	for (i = Color_Black; i <= Color_White; i++)
…		…
999		1053
1000	for (i = Color_Black; i <= Color_White; i++)	1054	for (i = Color_Black; i <= Color_White; i++)
1001	if (pix_colors[Color_bg] == pix_colors[i])	1055	if (pix_colors[Color_bg] == pix_colors[i])
1002	{	1056	{
1003	sprintf (bstr, "%d", (i - Color_Black));	1057	sprintf (bstr, "%d", (i - Color_Black));
1004	#ifdef XPM_BACKGROUND	1058	#ifdef BG_IMAGE_FROM_FILE
1005	xpmb = "default;";	1059	xpmb = "default;";
1006	#endif	1060	#endif
1007	break;	1061	break;
1008	}	1062	}
1009		1063
…		…
1105		1159
1106	XMoveResizeWindow (dpy, vt,	1160	XMoveResizeWindow (dpy, vt,
1107	window_vt_x, window_vt_y,	1161	window_vt_x, window_vt_y,
1108	width, height);	1162	width, height);
1109		1163
		1164	#ifdef HAVE_BG_PIXMAP
		1165	if (bgPixmap.window_size_sensitive ())
		1166	update_background ();
		1167	#endif
		1168
1110	scr_clear ();	1169	scr_clear ();
1111	#ifdef XPM_BACKGROUND
1112	resize_pixmap ();
1113	#endif
1114	}	1170	}
1115		1171
1116	if (fix_screen \|\| old_height == 0)	1172	if (fix_screen \|\| old_height == 0)
1117	scr_reset ();	1173	scr_reset ();
1118		1174
1119	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1175	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1120	//scr_touch (false);	1176	//scr_touch (false);
1121		1177
1122	#ifdef XPM_BACKGROUND	1178	#ifdef HAVE_BG_PIXMAP
1123	if (pixmap)	1179	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1180	// if (bgPixmap.pixmap)
1124	scr_touch (false);	1181	// scr_touch (false);
1125	#endif	1182	#endif
1126		1183
1127	#ifdef USE_XIM	1184	#ifdef USE_XIM
1128	IMSetPosition ();	1185	IMSetPosition ();
1129	#endif	1186	#endif
…		…
1300	if (term->rs[Rs_imLocale])	1357	if (term->rs[Rs_imLocale])
1301	SET_LOCALE (term->locale);	1358	SET_LOCALE (term->locale);
1302	}	1359	}
1303	else	1360	else
1304	str = (void *)text->string.wide_char;	1361	str = (void *)text->string.wide_char;
1305		1362
1306	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1363	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307	DT_INT, call_data->caret,	1364	DT_INT, call_data->caret,
1308	DT_INT, call_data->chg_first,	1365	DT_INT, call_data->chg_first,
1309	DT_INT, call_data->chg_length,	1366	DT_INT, call_data->chg_length,
1310	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1367	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1629		1686
1630	if (input_style & XIMPreeditPosition)	1687	if (input_style & XIMPreeditPosition)
1631	{	1688	{
1632	im_set_size (preedit_rect);	1689	im_set_size (preedit_rect);
1633	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1690	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634		1691
1635	XSetICValues (Input_Context,	1692	XSetICValues (Input_Context,
1636	XNPreeditAttributes, preedit_attr, NULL);	1693	XNPreeditAttributes, preedit_attr, NULL);
1637	}	1694	}
1638	else	1695	else
1639	{	1696	{
…		…
1656	XFree (status_attr);	1713	XFree (status_attr);
1657	}	1714	}
1658		1715
1659	XFree (preedit_attr);	1716	XFree (preedit_attr);
1660	}	1717	}
1661	#endif /* USE_XIM */	1718	#endif /* USE_XIM */
		1719
		1720	void
		1721	rxvt_term::get_window_origin (int &x, int &y)
		1722	{
		1723	Window cr;
		1724	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1725	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1726	}
		1727
		1728	Pixmap
		1729	rxvt_term::get_pixmap_property (int prop_id)
		1730	{
		1731	if (prop_id > 0 && prop_id < NUM_XA)
		1732	if (xa[prop_id])
		1733	{
		1734	int aformat;
		1735	unsigned long nitems, bytes_after;
		1736	Atom atype;
		1737	unsigned char *prop = NULL;
		1738	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1739	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1740	&nitems, &bytes_after, &prop);
		1741	if (result == Success && prop && atype == XA_PIXMAP)
		1742	{
		1743	return (Pixmap )prop;
		1744	}
		1745	}
		1746	return None;
		1747	}
		1748
		1749	#ifdef HAVE_BG_PIXMAP
		1750	# if TRACE_PIXMAPS
		1751	# undef update_background
		1752	int rxvt_term::trace_update_background (const char *file, int line)
		1753	{
		1754	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1755	update_background ();
		1756	}
		1757	# endif
		1758
		1759	int
		1760	rxvt_term::update_background ()
		1761	{
		1762	bgPixmap.invalidate ();
		1763
		1764	/* no chance of real time refresh if we are blurring! */
		1765	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1766	bgPixmap.render ();
		1767	else
		1768	{
		1769	update_background_ev.stop ();
		1770
		1771	if (!bgPixmap.need_client_side_rendering())
		1772	update_background_ev.start (.05);
		1773	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1774	update_background_ev.start (.20); /* very slow !!! */
		1775	else
		1776	update_background_ev.start (.07);
		1777	}
		1778
		1779	return 0;
		1780	}
		1781
		1782	void
		1783	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1784	{
		1785	bgPixmap.render ();
		1786	}
		1787
		1788	#endif /* HAVE_BG_PIXMAP */
1662		1789
1663	/----------------------- end-of-file (C source) -----------------------/	1790	/----------------------- 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.231 by root, Sun Aug 27 10:14:47 2006 UTC vs. Revision 1.272 by root, Tue Dec 11 03:30:49 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.231 by root, Sun Aug 27 10:14:47 2006 UTC vs.
Revision 1.272 by root, Tue Dec 11 03:30:49 2007 UTC