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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.283 by root, Fri Dec 14 05:25:25 2007 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
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"
…		…
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 ENABLE_TRANSPARENCY \|\| 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
156	#if ENABLE_TRANSPARENCY
157	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
158	#endif	176	#endif
159	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161	#endif	179	#endif
162	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	182	#endif
177	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	185	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	186	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	188	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	196
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		198
197	termlist.push_back (this);	199	termlist.push_back (this);
198		200
199	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	203	#endif
202	}	204	}
203		205
204	// clean up the most important stuff, do not call x or free mem etc.	206	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	207	// for use before an emergency exit
		208	void
206	void rxvt_term::emergency_cleanup ()	209	rxvt_term::emergency_cleanup ()
207	{	210	{
208	if (cmd_pid)	211	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	212	kill (-cmd_pid, SIGHUP);
210		213
211	pty_ev.stop ();	214	pty_ev.stop ();
…		…
278	delete [] pix_colors_focused;	281	delete [] pix_colors_focused;
279	#if OFF_FOCUS_FADING	282	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;	283	delete [] pix_colors_unfocused;
281	#endif	284	#endif
282		285
		286	#ifdef HAVE_BG_PIXMAP
		287	bgPixmap.destroy ();
		288	#endif
283	displays.put (display);	289	displays.put (display);
284		290
285	scr_release ();	291	scr_release ();
286		292
287	/* clear all resources */	293	/* clear all resources */
…		…
300	delete argv;	306	delete argv;
301		307
302	#ifdef KEYSYM_RESOURCE	308	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	309	delete keyboard;
304	#endif	310	#endif
		311	#ifndef NO_RESOURCES
		312	XrmDestroyDatabase (option_db);
		313	#endif
305	}	314	}
306		315
307	// child has exited, usually destroys	316	// child has exited, usually destroys
308	void	317	void
309	rxvt_term::child_cb (child_watcher &w, int status)	318	rxvt_term::child_cb (ev::child &w, int status)
310	{	319	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	320	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		321
313	cmd_pid = 0;	322	cmd_pid = 0;
314		323
…		…
317	}	326	}
318		327
319	void	328	void
320	rxvt_term::destroy ()	329	rxvt_term::destroy ()
321	{	330	{
322	if (destroy_ev.active)	331	if (destroy_ev.is_active ())
323	return;	332	return;
324		333
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	334	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		335
327	#if ENABLE_OVERLAY	336	#if ENABLE_OVERLAY
…		…
342	incr_ev.stop ();	351	incr_ev.stop ();
343	termwin_ev.stop (display);	352	termwin_ev.stop (display);
344	vt_ev.stop (display);	353	vt_ev.stop (display);
345	}	354	}
346		355
347	check_ev.stop ();	356	flush_ev.stop ();
348	pty_ev.stop ();	357	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	358	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	359	cursor_blink_ev.stop ();
351	#endif	360	#endif
352	#ifdef TEXT_BLINK	361	#ifdef TEXT_BLINK
…		…
360	#endif	369	#endif
361	#ifdef POINTER_BLANK	370	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	371	pointer_ev.stop ();
363	#endif	372	#endif
364		373
365	destroy_ev.start (0);	374	destroy_ev.start ();
366	}	375	}
367		376
368	void	377	void
369	rxvt_term::destroy_cb (time_watcher &w)	378	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	379	{
371	make_current ();	380	make_current ();
372		381
373	delete this;	382	delete this;
374	}	383	}
…		…
428	else	437	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	438	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	439	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	441	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	442	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	443	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	444	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	445	}
437	#endif	446	#endif
438		447
…		…
463	rxvt_emergency_cleanup ();	472	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	473	_exit (EXIT_FAILURE);
465	}	474	}
466		475
467	/----------------------------------------------------------------------/	476	/----------------------------------------------------------------------/
468	bool	477	void
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)	478	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{	479	{
471	this->envv = envv;	480	this->envv = envv;
472		481
473	SET_R (this);	482	SET_R (this);
474	set_locale ("");	483	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(	484	set_environ (envv); // few things in X do not call setlocale :(
476		485
477	if (!init_vars ())	486	init_vars ();
478	return false;
479		487
480	init_secondary ();	488	init_secondary ();
481		489
482	const char **cmd_argv = init_resources (argc, argv);	490	const char **cmd_argv = init_resources (argc, argv);
483		491
…		…
506	if (option (Opt_scrollBar))	514	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */	515	resize_scrollbar (); /* create and map scrollbar */
508	#endif	516	#endif
509	#ifdef HAVE_BG_PIXMAP	517	#ifdef HAVE_BG_PIXMAP
510	{	518	{
511	bool changed = false;
512	bgPixmap.set_target (this);	519	bgPixmap.set_target (this);
513		520
514	#ifdef ENABLE_TRANSPARENCY	521	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))	522	if (option (Opt_transparent))
516	{	523	{
517	bgPixmap.set_transparent ();	524	bgPixmap.set_transparent ();
518	#ifdef HAVE_AFTERIMAGE	525	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])	526	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	527	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif	528	#endif
522	if (ISSET_PIXCOLOR (Color_tint))	529	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	530	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524	if (rs [Rs_shade])	531	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);	532	bgPixmap.set_shade (rs [Rs_shade]);
526	changed = true;
527		533
528	bgPixmap.set_root_pixmap ();	534	bgPixmap.set_root_pixmap ();
529	XSelectInput (dpy, display->root, PropertyChangeMask);	535	XSelectInput (dpy, display->root, PropertyChangeMask);
530	rootwin_ev.start (display, display->root);	536	rootwin_ev.start (display, display->root);
531	}	537	}
532	#endif	538	#endif
533		539
534	#ifdef XPM_BACKGROUND	540	#ifdef BG_IMAGE_FROM_FILE
535	if (rs[Rs_backgroundPixmap] != NULL)	541	if (rs[Rs_backgroundPixmap] != NULL)
536	{	542	{
537	const char *p = rs[Rs_backgroundPixmap];	543	const char *p = rs[Rs_backgroundPixmap];
538		544
539	if ((p = strchr (p, ';')) != NULL)	545	if ((p = strchr (p, ';')) != NULL)
…		…
542	bgPixmap.set_geometry (p);	548	bgPixmap.set_geometry (p);
543	}	549	}
544	else	550	else
545	bgPixmap.set_defaultGeometry ();	551	bgPixmap.set_defaultGeometry ();
546		552
547	changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);	553	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		554	if (!bgPixmap.window_position_sensitive ())
		555	update_background ();
548	}	556	}
549	#endif	557	#endif
550	if (changed)
551	{
552	bgPixmap.render ();
553	scr_touch (true);
554	}
555	}	558	}
556	#endif	559	#endif
557		560
558	#if ENABLE_PERL	561	#if ENABLE_PERL
559	rootwin_ev.start (display, display->root);	562	rootwin_ev.start (display, display->root);
…		…
564	init_command (cmd_argv);	567	init_command (cmd_argv);
565		568
566	free (cmd_argv);	569	free (cmd_argv);
567		570
568	if (pty->pty >= 0)	571	if (pty->pty >= 0)
569	pty_ev.start (pty->pty, EVENT_READ);	572	pty_ev.start (pty->pty, ev::READ);
570
571	check_ev.start ();
572		573
573	HOOK_INVOKE ((this, HOOK_START, DT_END));	574	HOOK_INVOKE ((this, HOOK_START, DT_END));
574		575
575	#if ENABLE_XEMBED	576	#if ENABLE_XEMBED
576	if (rs[Rs_embed])	577	if (rs[Rs_embed])
…		…
582	}	583	}
583	#endif	584	#endif
584		585
585	XMapWindow (dpy, vt);	586	XMapWindow (dpy, vt);
586	XMapWindow (dpy, parent[0]);	587	XMapWindow (dpy, parent[0]);
587
588	return true;
589	}	588	}
590		589
591	static struct sig_handlers	590	static struct sig_handlers
592	{	591	{
593	sig_watcher sw_term, sw_int;	592	ev::sig sw_term, sw_int;
594		593
595	/*	594	/*
596	* Catch a fatal signal and tidy up before quitting	595	* Catch a fatal signal and tidy up before quitting
597	*/	596	*/
598	void	597	void sig_term (ev::sig &w, int revents);
599	sig_term (sig_watcher &w)	598
		599	sig_handlers ()
600	{	600	{
601	rxvt_emergency_cleanup ();	601	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
602	signal (w.signum, SIG_DFL);
603	kill (getpid (), w.signum);
604	}
605
606	sig_handlers ()
607	: sw_term (this, &sig_handlers::sig_term),
608	sw_int (this, &sig_handlers::sig_term)	602	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
609	{
610	}	603	}
611	} sig_handlers;	604	} sig_handlers;
612		605
		606	void
		607	sig_handlers::sig_term (ev::sig &w, int revents)
		608	{
		609	rxvt_emergency_cleanup ();
		610	w.stop ();
		611	kill (getpid (), w.signum);
		612	}
		613
613	char **rxvt_environ; // startup environment	614	char **rxvt_environ; // startup environment
614		615
615	void	616	void
616	rxvt_init ()	617	rxvt_init ()
617	{	618	{
618	ptytty::init ();	619	ptytty::init ();
		620
		621	if (!ev_default_loop (0))
		622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
619		623
620	rxvt_environ = environ;	624	rxvt_environ = environ;
621		625
622	signal (SIGHUP, SIG_IGN);	626	signal (SIGHUP, SIG_IGN);
623	signal (SIGPIPE, SIG_IGN);	627	signal (SIGPIPE, SIG_IGN);
624		628
625	sig_handlers.sw_term.start (SIGTERM);	629	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
626	sig_handlers.sw_int.start (SIGINT);	630	sig_handlers.sw_int.start (SIGINT); ev_unref ();
627		631
628	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
629	/* signal (SIGURG, SIG_DFL); */	633	/* signal (SIGURG, SIG_DFL); */
630		634
631	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
817	ws.ws_xpixel = width;	821	ws.ws_xpixel = width;
818	ws.ws_ypixel = height;	822	ws.ws_ypixel = height;
819	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	823	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
820		824
821	#if 0	825	#if 0
822	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	826	// TIOCSWINSZ is supposed to do this automatically and correctly
823	if (cmd_pid) /* force through to the command */	827	if (cmd_pid) /* force through to the command */
824	kill (-cmd_pid, SIGWINCH);	828	kill (-cmd_pid, SIGWINCH);
825	#endif	829	#endif
826	}	830	}
827		831
…		…
901	if (parent[0])	905	if (parent[0])
902	{	906	{
903	resize_all_windows (0, 0, 0);	907	resize_all_windows (0, 0, 0);
904	scr_remap_chars ();	908	scr_remap_chars ();
905	scr_touch (true);	909	scr_touch (true);
906	}	910	}
907		911
908	return true;	912	return true;
909	}	913	}
910		914
		915	void
911	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	916	rxvt_term::set_string_property (Atom prop, const char *str, int len)
912	{	917	{
913	XChangeProperty (dpy, parent[0],	918	XChangeProperty (dpy, parent[0],
914	prop, XA_STRING, 8, PropModeReplace,	919	prop, XA_STRING, 8, PropModeReplace,
915	(const unsigned char *)str, len >= 0 ? len : strlen (str));	920	(const unsigned char *)str, len >= 0 ? len : strlen (str));
916	}	921	}
917		922
		923	void
918	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	924	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919	{	925	{
920	wchar_t *ws = rxvt_mbstowcs (str, len);	926	wchar_t *ws = rxvt_mbstowcs (str, len);
921	char *s = rxvt_wcstoutf8 (ws);	927	char *s = rxvt_wcstoutf8 (ws);
922		928
923	XChangeProperty (dpy, parent[0],	929	XChangeProperty (dpy, parent[0],
…		…
947	#if ENABLE_EWMH	953	#if ENABLE_EWMH
948	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	954	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949	#endif	955	#endif
950	}	956	}
951		957
		958	void
		959	rxvt_term::set_window_color (int idx, const char *color)
		960	{
952	#ifdef XTERM_COLOR_CHANGE	961	#ifdef XTERM_COLOR_CHANGE
953	void
954	rxvt_term::set_window_color (int idx, const char *color)
955	{
956	rxvt_color xcol;	962	rxvt_color xcol;
957	int i;	963	int i;
958		964
959	if (color == NULL \|\| *color == '\0')	965	if (color == NULL \|\| *color == '\0')
960	return;	966	return;
961		967
962	color = strdup (color);	968	color = strdup (color);
963	allocated.push_back ((void *)color);	969	allocated.push_back ((void *)color);
…		…
967	if (isdigit (*color))	973	if (isdigit (*color))
968	{	974	{
969	i = atoi (color);	975	i = atoi (color);
970		976
971	if (i >= 8 && i <= 15)	977	if (i >= 8 && i <= 15)
		978	{
972	{ /* bright colors */	979	/* bright colors */
973	i -= 8;
974	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	980	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
975	goto done;	981	goto done;
976	}	982	}
977		983
978	if (i >= 0 && i <= 7)	984	if (i >= 0 && i <= 7)
		985	{
979	{ /* normal colors */	986	/* normal colors */
980	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	987	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981	goto done;	988	goto done;
982	}	989	}
983	}	990	}
984		991
…		…
989	* so just keep gobbling up the colormap	996	* so just keep gobbling up the colormap
990	*/	997	*/
991		998
992	pix_colors_focused[idx] = xcol;	999	pix_colors_focused[idx] = xcol;
993		1000
994	/* XSetWindowAttributes attr; */
995	/* Cursor cursor; */
996	done:	1001	done:
997	/TODO: handle Color_BD, scrollbar background, etc. /	1002	/TODO: handle Color_BD, scrollbar background, etc. /
998		1003
999	update_fade_color (idx);	1004	update_fade_color (idx);
1000	recolour_cursor ();	1005	recolour_cursor ();
1001	scr_recolour ();	1006	scr_recolour ();
		1007	#endif /* XTERM_COLOR_CHANGE */
1002	}	1008	}
1003
1004	#else
1005	# define set_window_color (idx,color) ((void)0)
1006	#endif /* XTERM_COLOR_CHANGE */
1007		1009
1008	void	1010	void
1009	rxvt_term::recolour_cursor ()	1011	rxvt_term::recolour_cursor ()
1010	{	1012	{
1011	XColor fg, bg;	1013	XColor fg, bg;
…		…
1027	*/	1029	*/
1028	void	1030	void
1029	rxvt_term::set_colorfgbg ()	1031	rxvt_term::set_colorfgbg ()
1030	{	1032	{
1031	unsigned int i;	1033	unsigned int i;
1032	const char *xpmb = "\0";	1034	const char *xpmb = "";
1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1035	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034		1036
1035	strcpy (fstr, "default");	1037	strcpy (fstr, "default");
1036	strcpy (bstr, "default");	1038	strcpy (bstr, "default");
1037	for (i = Color_Black; i <= Color_White; i++)	1039	for (i = Color_Black; i <= Color_White; i++)
…		…
1043		1045
1044	for (i = Color_Black; i <= Color_White; i++)	1046	for (i = Color_Black; i <= Color_White; i++)
1045	if (pix_colors[Color_bg] == pix_colors[i])	1047	if (pix_colors[Color_bg] == pix_colors[i])
1046	{	1048	{
1047	sprintf (bstr, "%d", (i - Color_Black));	1049	sprintf (bstr, "%d", (i - Color_Black));
1048	#ifdef XPM_BACKGROUND	1050	#ifdef BG_IMAGE_FROM_FILE
1049	xpmb = "default;";	1051	xpmb = "default;";
1050	#endif	1052	#endif
1051	break;	1053	break;
1052	}	1054	}
1053		1055
…		…
1149		1151
1150	XMoveResizeWindow (dpy, vt,	1152	XMoveResizeWindow (dpy, vt,
1151	window_vt_x, window_vt_y,	1153	window_vt_x, window_vt_y,
1152	width, height);	1154	width, height);
1153		1155
1154	#ifdef XPM_BACKGROUND	1156	#ifdef HAVE_BG_PIXMAP
1155	/* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156	if (bgPixmap.window_size_sensitive ())	1157	if (bgPixmap.window_size_sensitive ())
1157	bgPixmap.render ();	1158	update_background ();
1158	#endif	1159	#endif
1159		1160
1160	scr_clear ();	1161	scr_clear ();
1161	}	1162	}
1162		1163
…		…
1348	if (term->rs[Rs_imLocale])	1349	if (term->rs[Rs_imLocale])
1349	SET_LOCALE (term->locale);	1350	SET_LOCALE (term->locale);
1350	}	1351	}
1351	else	1352	else
1352	str = (void *)text->string.wide_char;	1353	str = (void *)text->string.wide_char;
1353		1354
1354	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1355	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355	DT_INT, call_data->caret,	1356	DT_INT, call_data->caret,
1356	DT_INT, call_data->chg_first,	1357	DT_INT, call_data->chg_first,
1357	DT_INT, call_data->chg_length,	1358	DT_INT, call_data->chg_length,
1358	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1359	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1677		1678
1678	if (input_style & XIMPreeditPosition)	1679	if (input_style & XIMPreeditPosition)
1679	{	1680	{
1680	im_set_size (preedit_rect);	1681	im_set_size (preedit_rect);
1681	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1682	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682		1683
1683	XSetICValues (Input_Context,	1684	XSetICValues (Input_Context,
1684	XNPreeditAttributes, preedit_attr, NULL);	1685	XNPreeditAttributes, preedit_attr, NULL);
1685	}	1686	}
1686	else	1687	else
1687	{	1688	{
…		…
1704	XFree (status_attr);	1705	XFree (status_attr);
1705	}	1706	}
1706		1707
1707	XFree (preedit_attr);	1708	XFree (preedit_attr);
1708	}	1709	}
1709	#endif /* USE_XIM */	1710	#endif /* USE_XIM */
		1711
		1712	void
		1713	rxvt_term::get_window_origin (int &x, int &y)
		1714	{
		1715	Window cr;
		1716	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1717	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1718	}
		1719
		1720	Pixmap
		1721	rxvt_term::get_pixmap_property (int prop_id)
		1722	{
		1723	if (prop_id > 0 && prop_id < NUM_XA)
		1724	if (xa[prop_id])
		1725	{
		1726	int aformat;
		1727	unsigned long nitems, bytes_after;
		1728	Atom atype;
		1729	unsigned char *prop = NULL;
		1730	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1731	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1732	&nitems, &bytes_after, &prop);
		1733	if (result == Success && prop && atype == XA_PIXMAP)
		1734	{
		1735	return (Pixmap )prop;
		1736	}
		1737	}
		1738	return None;
		1739	}
		1740
		1741	#ifdef HAVE_BG_PIXMAP
		1742	# if TRACE_PIXMAPS
		1743	# undef update_background
		1744	int rxvt_term::trace_update_background (const char *file, int line)
		1745	{
		1746	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1747	update_background ();
		1748	}
		1749	# endif
		1750
		1751	int
		1752	rxvt_term::update_background ()
		1753	{
		1754	bgPixmap.invalidate ();
		1755
		1756	/* no chance of real time refresh if we are blurring! */
		1757	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1758	bgPixmap.render ();
		1759	else
		1760	{
		1761	update_background_ev.stop ();
		1762
		1763	if (!bgPixmap.need_client_side_rendering())
		1764	update_background_ev.start (.05);
		1765	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1766	update_background_ev.start (.20); /* very slow !!! */
		1767	else
		1768	update_background_ev.start (.07);
		1769	}
		1770
		1771	return 0;
		1772	}
		1773
		1774	void
		1775	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1776	{
		1777	bgPixmap.render ();
		1778	}
		1779
		1780	#endif /* HAVE_BG_PIXMAP */
1710		1781
1711	/----------------------- end-of-file (C source) -----------------------/	1782	/----------------------- 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.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs. Revision 1.283 by root, Fri Dec 14 05:25:25 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.283 by root, Fri Dec 14 05:25:25 2007 UTC