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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.225 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.273 by ayin, Tue Dec 11 11:39:06 2007 UTC