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