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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.279 by ayin, Wed Dec 12 09:33:48 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	{
		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
148	#if TRANSPARENT \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
149	rootwin_ev (this, &rxvt_term::rootwin_cb),	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 \|\| ENABLE_PERL	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
…		…
464		482
465	SET_R (this);	483	SET_R (this);
466	set_locale ("");	484	set_locale ("");
467	set_environ (envv); // few things in X do not call setlocale :(	485	set_environ (envv); // few things in X do not call setlocale :(
468		486
469	if (!init_vars ())	487	init_vars ();
470	return false;
471		488
472	init_secondary ();	489	init_secondary ();
473		490
474	const char **cmd_argv = init_resources (argc, argv);	491	const char **cmd_argv = init_resources (argc, argv);
475		492
476	#ifdef KEYSYM_RESOURCE	493	#ifdef KEYSYM_RESOURCE
477	keyboard->register_done ();	494	keyboard->register_done ();
478	#endif	495	#endif
479		496
480	#ifdef HAVE_SCROLLBARS	497	#ifdef HAVE_SCROLLBARS
481	if (OPTION (Opt_scrollBar))	498	if (option (Opt_scrollBar))
482	scrollBar.setIdle (); /* set existence for size calculations */	499	scrollBar.setIdle (); /* set existence for size calculations */
483	#endif	500	#endif
484		501
485	pty = ptytty::create ();	502	pty = ptytty::create ();
486		503
…		…
493	#if 0	510	#if 0
494	XSynchronize (dpy, True);	511	XSynchronize (dpy, True);
495	#endif	512	#endif
496		513
497	#ifdef HAVE_SCROLLBARS	514	#ifdef HAVE_SCROLLBARS
498	if (OPTION (Opt_scrollBar))	515	if (option (Opt_scrollBar))
499	resize_scrollbar (); /* create and map scrollbar */	516	resize_scrollbar (); /* create and map scrollbar */
500	#endif	517	#endif
		518	#ifdef HAVE_BG_PIXMAP
		519	{
		520	bgPixmap.set_target (this);
		521
501	#ifdef TRANSPARENT	522	#ifdef ENABLE_TRANSPARENCY
502	if (OPTION (Opt_transparent))	523	if (option (Opt_transparent))
503	{	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 ();
504	XSelectInput (dpy, display->root, PropertyChangeMask);	536	XSelectInput (dpy, display->root, PropertyChangeMask);
505	check_our_parents ();
506	rootwin_ev.start (display, display->root);	537	rootwin_ev.start (display, display->root);
507	}	538	}
508	#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
509	#if ENABLE_PERL	562	#if ENABLE_PERL
510	rootwin_ev.start (display, display->root);	563	rootwin_ev.start (display, display->root);
511	#endif	564	#endif
512		565
513	set_colorfgbg ();	566	set_colorfgbg ();
…		…
515	init_command (cmd_argv);	568	init_command (cmd_argv);
516		569
517	free (cmd_argv);	570	free (cmd_argv);
518		571
519	if (pty->pty >= 0)	572	if (pty->pty >= 0)
520	pty_ev.start (pty->pty, EVENT_READ);	573	pty_ev.start (pty->pty, ev::READ);
521		574
522	check_ev.start ();	575	prepare_ev.start ();
523		576
524	HOOK_INVOKE ((this, HOOK_START, DT_END));	577	HOOK_INVOKE ((this, HOOK_START, DT_END));
525		578
526	#if ENABLE_XEMBED	579	#if ENABLE_XEMBED
527	if (rs[Rs_embed])	580	if (rs[Rs_embed])
…		…
539	return true;	592	return true;
540	}	593	}
541		594
542	static struct sig_handlers	595	static struct sig_handlers
543	{	596	{
544	sig_watcher sw_term, sw_int;	597	ev::sig sw_term, sw_int;
545		598
546	/*	599	/*
547	* Catch a fatal signal and tidy up before quitting	600	* Catch a fatal signal and tidy up before quitting
548	*/	601	*/
549	void	602	void sig_term (ev::sig &w, int revents);
550	sig_term (sig_watcher &w)	603
		604	sig_handlers ()
551	{	605	{
552	rxvt_emergency_cleanup ();	606	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
553	signal (w.signum, SIG_DFL);
554	kill (getpid (), w.signum);
555	}
556
557	sig_handlers ()
558	: sw_term (this, &sig_handlers::sig_term),
559	sw_int (this, &sig_handlers::sig_term)	607	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
560	{
561	}	608	}
562	} sig_handlers;	609	} sig_handlers;
563		610
		611	void
		612	sig_handlers::sig_term (ev::sig &w, int revents)
		613	{
		614	rxvt_emergency_cleanup ();
		615	w.stop ();
		616	kill (getpid (), w.signum);
		617	}
		618
564	char **rxvt_environ; // startup environment	619	char **rxvt_environ; // startup environment
565		620
566	void	621	void
567	rxvt_init ()	622	rxvt_init ()
568	{	623	{
569	ptytty::init ();	624	ptytty::init ();
		625
		626	if (!ev_default_loop (0))
		627	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
570		628
571	rxvt_environ = environ;	629	rxvt_environ = environ;
572		630
573	signal (SIGHUP, SIG_IGN);	631	signal (SIGHUP, SIG_IGN);
574	signal (SIGPIPE, SIG_IGN);	632	signal (SIGPIPE, SIG_IGN);
575		633
576	sig_handlers.sw_term.start (SIGTERM);	634	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
577	sig_handlers.sw_int.start (SIGINT);	635	sig_handlers.sw_int.start (SIGINT); ev_unref ();
578		636
579	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	637	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
580	/* signal (SIGURG, SIG_DFL); */	638	/* signal (SIGURG, SIG_DFL); */
581		639
582	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	640	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
622	return p;	680	return p;
623	}	681	}
624		682
625	/----------------------------------------------------------------------/	683	/----------------------------------------------------------------------/
626	/*	684	/*
627	* window size/position calculcations for XSizeHint and other storage.	685	* window size/position calculations for XSizeHint and other storage.
628	* if width/height are non-zero then override calculated width/height	686	* if width/height are non-zero then override calculated width/height
629	*/	687	*/
630	void	688	void
631	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	689	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
632	{	690	{
…		…
704	if (scrollBar.state)	762	if (scrollBar.state)
705	{	763	{
706	sb_w = scrollbar_TotalWidth ();	764	sb_w = scrollbar_TotalWidth ();
707	szHint.base_width += sb_w;	765	szHint.base_width += sb_w;
708		766
709	if (!OPTION (Opt_scrollBar_right))	767	if (!option (Opt_scrollBar_right))
710	window_vt_x += sb_w;	768	window_vt_x += sb_w;
711	}	769	}
712		770
713	szHint.width_inc = fwidth;	771	szHint.width_inc = fwidth;
714	szHint.height_inc = fheight;	772	szHint.height_inc = fheight;
…		…
735	{	793	{
736	min_it (height, max_height);	794	min_it (height, max_height);
737	szHint.height = szHint.base_height + height;	795	szHint.height = szHint.base_height + height;
738	}	796	}
739		797
740	if (scrollBar.state && OPTION (Opt_scrollBar_right))	798	if (scrollBar.state && option (Opt_scrollBar_right))
741	window_sb_x = szHint.width - sb_w;	799	window_sb_x = szHint.width - sb_w;
742		800
743	if (recalc_x)	801	if (recalc_x)
744	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	802	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745		803
…		…
768	ws.ws_xpixel = width;	826	ws.ws_xpixel = width;
769	ws.ws_ypixel = height;	827	ws.ws_ypixel = height;
770	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	828	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
771		829
772	#if 0	830	#if 0
773	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	831	// TIOCSWINSZ is supposed to do this automatically and correctly
774	if (cmd_pid) /* force through to the command */	832	if (cmd_pid) /* force through to the command */
775	kill (-cmd_pid, SIGWINCH);	833	kill (-cmd_pid, SIGWINCH);
776	#endif	834	#endif
777	}	835	}
778		836
…		…
807	delete fontset[0];	865	delete fontset[0];
808	fontset[0] = fs;	866	fontset[0] = fs;
809		867
810	prop = (*fs)[1]->properties ();	868	prop = (*fs)[1]->properties ();
811	prop.height += lineSpace;	869	prop.height += lineSpace;
		870
812	fs->set_prop (prop);	871	fs->set_prop (prop, false);
813		872
814	fwidth = prop.width;	873	fwidth = prop.width;
815	fheight = prop.height;	874	fheight = prop.height;
816	fbase = prop.ascent;	875	fbase = prop.ascent;
817		876
…		…
826	{	885	{
827	fontset[style] = fs = new rxvt_fontset (this);	886	fontset[style] = fs = new rxvt_fontset (this);
828	rxvt_fontprop prop2 = prop;	887	rxvt_fontprop prop2 = prop;
829		888
830	if (res)	889	if (res)
831	prop2.weight = prop2.slant = rxvt_fontprop::unset;	890	{
		891	fs->populate (res);
		892	fs->set_prop (prop2, false);
		893	}
832	else	894	else
833	{	895	{
834	res = fontset[0]->fontdesc;	896	fs->populate (fontset[0]->fontdesc);
835		897
836	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	898	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
837	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	899	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		900
		901	fs->set_prop (prop2, true);
838	}	902	}
839		903
840	fs->populate (res);
841	fs->set_prop (prop2);
842	}	904	}
843	#else	905	#else
844	fontset[style] = fontset[0];	906	fontset[style] = fontset[0];
845	#endif	907	#endif
846	}	908	}
…		…
848	if (parent[0])	910	if (parent[0])
849	{	911	{
850	resize_all_windows (0, 0, 0);	912	resize_all_windows (0, 0, 0);
851	scr_remap_chars ();	913	scr_remap_chars ();
852	scr_touch (true);	914	scr_touch (true);
853	}	915	}
854		916
855	return true;	917	return true;
856	}	918	}
857		919
		920	void
858	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	921	rxvt_term::set_string_property (Atom prop, const char *str, int len)
859	{	922	{
860	XChangeProperty (dpy, parent[0],	923	XChangeProperty (dpy, parent[0],
861	prop, XA_STRING, 8, PropModeReplace,	924	prop, XA_STRING, 8, PropModeReplace,
862	(const unsigned char *)str, len >= 0 ? len : strlen (str));	925	(const unsigned char *)str, len >= 0 ? len : strlen (str));
863	}	926	}
864		927
		928	void
865	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	929	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866	{	930	{
867	wchar_t *ws = rxvt_mbstowcs (str, len);	931	wchar_t *ws = rxvt_mbstowcs (str, len);
868	char *s = rxvt_wcstoutf8 (ws);	932	char *s = rxvt_wcstoutf8 (ws);
869		933
870	XChangeProperty (dpy, parent[0],	934	XChangeProperty (dpy, parent[0],
…		…
894	#if ENABLE_EWMH	958	#if ENABLE_EWMH
895	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	959	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
896	#endif	960	#endif
897	}	961	}
898		962
		963	void
		964	rxvt_term::set_window_color (int idx, const char *color)
		965	{
899	#ifdef XTERM_COLOR_CHANGE	966	#ifdef XTERM_COLOR_CHANGE
900	void
901	rxvt_term::set_window_color (int idx, const char *color)
902	{
903	rxvt_color xcol;	967	rxvt_color xcol;
904	int i;	968	int i;
905		969
906	if (color == NULL \|\| *color == '\0')	970	if (color == NULL \|\| *color == '\0')
907	return;	971	return;
908		972
909	color = strdup (color);	973	color = strdup (color);
910	allocated.push_back ((void *)color);	974	allocated.push_back ((void *)color);
…		…
914	if (isdigit (*color))	978	if (isdigit (*color))
915	{	979	{
916	i = atoi (color);	980	i = atoi (color);
917		981
918	if (i >= 8 && i <= 15)	982	if (i >= 8 && i <= 15)
		983	{
919	{ /* bright colors */	984	/* bright colors */
920	i -= 8;
921	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	985	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
922	goto done;	986	goto done;
923	}	987	}
924		988
925	if (i >= 0 && i <= 7)	989	if (i >= 0 && i <= 7)
		990	{
926	{ /* normal colors */	991	/* normal colors */
927	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	992	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
928	goto done;	993	goto done;
929	}	994	}
930	}	995	}
931		996
…		…
936	* so just keep gobbling up the colormap	1001	* so just keep gobbling up the colormap
937	*/	1002	*/
938		1003
939	pix_colors_focused[idx] = xcol;	1004	pix_colors_focused[idx] = xcol;
940		1005
941	/* XSetWindowAttributes attr; */
942	/* Cursor cursor; */
943	done:	1006	done:
944	/TODO: handle Color_BD, scrollbar background, etc. /	1007	/TODO: handle Color_BD, scrollbar background, etc. /
945		1008
946	update_fade_color (idx);	1009	update_fade_color (idx);
947	recolour_cursor ();	1010	recolour_cursor ();
948	scr_recolour ();	1011	scr_recolour ();
		1012	#endif /* XTERM_COLOR_CHANGE */
949	}	1013	}
950
951	#else
952	# define set_window_color (idx,color) ((void)0)
953	#endif /* XTERM_COLOR_CHANGE */
954		1014
955	void	1015	void
956	rxvt_term::recolour_cursor ()	1016	rxvt_term::recolour_cursor ()
957	{	1017	{
958	XColor fg, bg;	1018	XColor fg, bg;
…		…
974	*/	1034	*/
975	void	1035	void
976	rxvt_term::set_colorfgbg ()	1036	rxvt_term::set_colorfgbg ()
977	{	1037	{
978	unsigned int i;	1038	unsigned int i;
979	const char *xpmb = "\0";	1039	const char *xpmb = "";
980	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1040	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981		1041
982	strcpy (fstr, "default");	1042	strcpy (fstr, "default");
983	strcpy (bstr, "default");	1043	strcpy (bstr, "default");
984	for (i = Color_Black; i <= Color_White; i++)	1044	for (i = Color_Black; i <= Color_White; i++)
…		…
990		1050
991	for (i = Color_Black; i <= Color_White; i++)	1051	for (i = Color_Black; i <= Color_White; i++)
992	if (pix_colors[Color_bg] == pix_colors[i])	1052	if (pix_colors[Color_bg] == pix_colors[i])
993	{	1053	{
994	sprintf (bstr, "%d", (i - Color_Black));	1054	sprintf (bstr, "%d", (i - Color_Black));
995	#ifdef XPM_BACKGROUND	1055	#ifdef BG_IMAGE_FROM_FILE
996	xpmb = "default;";	1056	xpmb = "default;";
997	#endif	1057	#endif
998	break;	1058	break;
999	}	1059	}
1000		1060
…		…
1096		1156
1097	XMoveResizeWindow (dpy, vt,	1157	XMoveResizeWindow (dpy, vt,
1098	window_vt_x, window_vt_y,	1158	window_vt_x, window_vt_y,
1099	width, height);	1159	width, height);
1100		1160
		1161	#ifdef HAVE_BG_PIXMAP
		1162	if (bgPixmap.window_size_sensitive ())
		1163	update_background ();
		1164	#endif
		1165
1101	scr_clear ();	1166	scr_clear ();
1102	#ifdef XPM_BACKGROUND
1103	resize_pixmap ();
1104	#endif
1105	}	1167	}
1106		1168
1107	if (fix_screen \|\| old_height == 0)	1169	if (fix_screen \|\| old_height == 0)
1108	scr_reset ();	1170	scr_reset ();
1109		1171
1110	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1172	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1111	//scr_touch (false);	1173	//scr_touch (false);
1112		1174
1113	#ifdef XPM_BACKGROUND	1175	#ifdef HAVE_BG_PIXMAP
1114	if (pixmap)	1176	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1177	// if (bgPixmap.pixmap)
1115	scr_touch (false);	1178	// scr_touch (false);
1116	#endif	1179	#endif
1117		1180
1118	#ifdef USE_XIM	1181	#ifdef USE_XIM
1119	IMSetPosition ();	1182	IMSetPosition ();
1120	#endif	1183	#endif
…		…
1291	if (term->rs[Rs_imLocale])	1354	if (term->rs[Rs_imLocale])
1292	SET_LOCALE (term->locale);	1355	SET_LOCALE (term->locale);
1293	}	1356	}
1294	else	1357	else
1295	str = (void *)text->string.wide_char;	1358	str = (void *)text->string.wide_char;
1296		1359
1297	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1360	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1298	DT_INT, call_data->caret,	1361	DT_INT, call_data->caret,
1299	DT_INT, call_data->chg_first,	1362	DT_INT, call_data->chg_first,
1300	DT_INT, call_data->chg_length,	1363	DT_INT, call_data->chg_length,
1301	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1364	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1620		1683
1621	if (input_style & XIMPreeditPosition)	1684	if (input_style & XIMPreeditPosition)
1622	{	1685	{
1623	im_set_size (preedit_rect);	1686	im_set_size (preedit_rect);
1624	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1687	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625		1688
1626	XSetICValues (Input_Context,	1689	XSetICValues (Input_Context,
1627	XNPreeditAttributes, preedit_attr, NULL);	1690	XNPreeditAttributes, preedit_attr, NULL);
1628	}	1691	}
1629	else	1692	else
1630	{	1693	{
…		…
1647	XFree (status_attr);	1710	XFree (status_attr);
1648	}	1711	}
1649		1712
1650	XFree (preedit_attr);	1713	XFree (preedit_attr);
1651	}	1714	}
1652	#endif /* USE_XIM */	1715	#endif /* USE_XIM */
		1716
		1717	void
		1718	rxvt_term::get_window_origin (int &x, int &y)
		1719	{
		1720	Window cr;
		1721	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1722	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1723	}
		1724
		1725	Pixmap
		1726	rxvt_term::get_pixmap_property (int prop_id)
		1727	{
		1728	if (prop_id > 0 && prop_id < NUM_XA)
		1729	if (xa[prop_id])
		1730	{
		1731	int aformat;
		1732	unsigned long nitems, bytes_after;
		1733	Atom atype;
		1734	unsigned char *prop = NULL;
		1735	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1736	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1737	&nitems, &bytes_after, &prop);
		1738	if (result == Success && prop && atype == XA_PIXMAP)
		1739	{
		1740	return (Pixmap )prop;
		1741	}
		1742	}
		1743	return None;
		1744	}
		1745
		1746	#ifdef HAVE_BG_PIXMAP
		1747	# if TRACE_PIXMAPS
		1748	# undef update_background
		1749	int rxvt_term::trace_update_background (const char *file, int line)
		1750	{
		1751	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1752	update_background ();
		1753	}
		1754	# endif
		1755
		1756	int
		1757	rxvt_term::update_background ()
		1758	{
		1759	bgPixmap.invalidate ();
		1760
		1761	/* no chance of real time refresh if we are blurring! */
		1762	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1763	bgPixmap.render ();
		1764	else
		1765	{
		1766	update_background_ev.stop ();
		1767
		1768	if (!bgPixmap.need_client_side_rendering())
		1769	update_background_ev.start (.05);
		1770	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1771	update_background_ev.start (.20); /* very slow !!! */
		1772	else
		1773	update_background_ev.start (.07);
		1774	}
		1775
		1776	return 0;
		1777	}
		1778
		1779	void
		1780	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1781	{
		1782	bgPixmap.render ();
		1783	}
		1784
		1785	#endif /* HAVE_BG_PIXMAP */
1653		1786
1654	/----------------------- end-of-file (C source) -----------------------/	1787	/----------------------- 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.226 by root, Thu Jul 6 23:48:11 2006 UTC vs. Revision 1.279 by ayin, Wed Dec 12 09:33:48 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.279 by ayin, Wed Dec 12 09:33:48 2007 UTC