[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.269 by root, Tue Dec 4 14:50:42 2007 UTC

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

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs. Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC