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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.284 by root, Fri Dec 14 06:29:28 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 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	check_our_aprents_ev(this, &rxvt_term::check_our_parents_cb),
156	#endif	176	#endif
157	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
158	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
159	#endif	179	#endif
160	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
161	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
162	#endif
163	#ifdef TEXT_BLINK
164	text_blink_ev (this, &rxvt_term::text_blink_cb),
165	#endif
166	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
168	#endif
169	#ifdef SELECTION_SCROLLING
170	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
171	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
174	#endif	182	#endif
175	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
176	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
177	#endif	185	#endif
178	#ifdef USE_XIM
179	im_ev (this, &rxvt_term::im_cb),
180	#endif
181	#ifndef NO_BELL	186	#ifndef NO_BELL
182	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
183	#endif	188	#endif
184	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
185	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
186	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
187	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
188	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
189	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191	incr_ev (this, &rxvt_term::incr_cb)	196
192	{
193	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
194		198
195	termlist.push_back (this);	199	termlist.push_back (this);
196		200
197	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
199	#endif	203	#endif
200	}	204	}
201		205
202	// 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.
203	// for use before an emergency exit	207	// for use before an emergency exit
		208	void
204	void rxvt_term::emergency_cleanup ()	209	rxvt_term::emergency_cleanup ()
205	{	210	{
206	if (cmd_pid)	211	if (cmd_pid)
207	kill (-cmd_pid, SIGHUP);	212	kill (-cmd_pid, SIGHUP);
208		213
209	pty_ev.stop ();	214	pty_ev.stop ();
…		…
276	delete [] pix_colors_focused;	281	delete [] pix_colors_focused;
277	#if OFF_FOCUS_FADING	282	#if OFF_FOCUS_FADING
278	delete [] pix_colors_unfocused;	283	delete [] pix_colors_unfocused;
279	#endif	284	#endif
280		285
		286	#ifdef HAVE_BG_PIXMAP
		287	bgPixmap.destroy ();
		288	#endif
281	displays.put (display);	289	displays.put (display);
282		290
283	scr_release ();	291	scr_release ();
284		292
285	/* clear all resources */	293	/* clear all resources */
…		…
298	delete argv;	306	delete argv;
299		307
300	#ifdef KEYSYM_RESOURCE	308	#ifdef KEYSYM_RESOURCE
301	delete keyboard;	309	delete keyboard;
302	#endif	310	#endif
		311	#ifndef NO_RESOURCES
		312	XrmDestroyDatabase (option_db);
		313	#endif
303	}	314	}
304		315
305	// child has exited, usually destroys	316	// child has exited, usually destroys
306	void	317	void
307	rxvt_term::child_cb (child_watcher &w, int status)	318	rxvt_term::child_cb (ev::child &w, int status)
308	{	319	{
309	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	320	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
310		321
311	cmd_pid = 0;	322	cmd_pid = 0;
312		323
…		…
315	}	326	}
316		327
317	void	328	void
318	rxvt_term::destroy ()	329	rxvt_term::destroy ()
319	{	330	{
320	if (destroy_ev.active)	331	if (destroy_ev.is_active ())
321	return;	332	return;
322		333
323	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	334	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
324		335
325	#if ENABLE_OVERLAY	336	#if ENABLE_OVERLAY
…		…
332	im_ev.stop (display);	343	im_ev.stop (display);
333	#endif	344	#endif
334	#if HAVE_SCROLLBARS	345	#if HAVE_SCROLLBARS
335	scrollbar_ev.stop (display);	346	scrollbar_ev.stop (display);
336	#endif	347	#endif
337	#if TRANSPARENT \|\| ENABLE_PERL	348	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
338	rootwin_ev.stop (display);	349	rootwin_ev.stop (display);
339	#endif	350	#endif
340	incr_ev.stop ();	351	incr_ev.stop ();
341	termwin_ev.stop (display);	352	termwin_ev.stop (display);
342	vt_ev.stop (display);	353	vt_ev.stop (display);
343	}	354	}
344		355
345	check_ev.stop ();	356	flush_ev.stop ();
346	pty_ev.stop ();	357	pty_ev.stop ();
347	#ifdef CURSOR_BLINK	358	#ifdef CURSOR_BLINK
348	cursor_blink_ev.stop ();	359	cursor_blink_ev.stop ();
349	#endif	360	#endif
350	#ifdef TEXT_BLINK	361	#ifdef TEXT_BLINK
…		…
358	#endif	369	#endif
359	#ifdef POINTER_BLANK	370	#ifdef POINTER_BLANK
360	pointer_ev.stop ();	371	pointer_ev.stop ();
361	#endif	372	#endif
362		373
363	destroy_ev.start (0);	374	destroy_ev.start ();
364	}	375	}
365		376
366	void	377	void
367	rxvt_term::destroy_cb (time_watcher &w)	378	rxvt_term::destroy_cb (ev::idle &w, int revents)
368	{	379	{
369	make_current ();	380	make_current ();
370		381
371	delete this;	382	delete this;
372	}	383	}
…		…
426	else	437	else
427	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	438	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
428	mesg, BUFSIZ);	439	mesg, BUFSIZ);
429	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
430	}	441	}
431	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	442	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
432	mesg, BUFSIZ);	443	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	444	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
434	}	445	}
435	#endif	446	#endif
436		447
…		…
461	rxvt_emergency_cleanup ();	472	rxvt_emergency_cleanup ();
462	_exit (EXIT_FAILURE);	473	_exit (EXIT_FAILURE);
463	}	474	}
464		475
465	/----------------------------------------------------------------------/	476	/----------------------------------------------------------------------/
466	bool	477	void
467	rxvt_term::init (int argc, const char const argv, stringvec *envv)	478	rxvt_term::init (int argc, const char const argv, stringvec *envv)
468	{	479	{
469	this->envv = envv;	480	this->envv = envv;
470		481
471	SET_R (this);	482	SET_R (this);
472	set_locale ("");	483	set_locale ("");
473	set_environ (envv); // few things in X do not call setlocale :(	484	set_environ (envv); // few things in X do not call setlocale :(
474		485
475	if (!init_vars ())	486	init_vars ();
476	return false;
477		487
478	init_secondary ();	488	init_secondary ();
479		489
480	const char **cmd_argv = init_resources (argc, argv);	490	const char **cmd_argv = init_resources (argc, argv);
481		491
…		…
502		512
503	#ifdef HAVE_SCROLLBARS	513	#ifdef HAVE_SCROLLBARS
504	if (option (Opt_scrollBar))	514	if (option (Opt_scrollBar))
505	resize_scrollbar (); /* create and map scrollbar */	515	resize_scrollbar (); /* create and map scrollbar */
506	#endif	516	#endif
		517	#ifdef HAVE_BG_PIXMAP
		518	{
		519	bgPixmap.set_target (this);
		520
507	#ifdef TRANSPARENT	521	#ifdef ENABLE_TRANSPARENCY
508	if (option (Opt_transparent))	522	if (option (Opt_transparent))
509	{	523	{
		524	bgPixmap.set_transparent ();
		525	#ifdef HAVE_AFTERIMAGE
		526	if (rs [Rs_blurradius])
		527	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		528	#endif
		529	if (ISSET_PIXCOLOR (Color_tint))
		530	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		531	if (rs [Rs_shade])
		532	bgPixmap.set_shade (rs [Rs_shade]);
		533
		534	bgPixmap.set_root_pixmap ();
510	XSelectInput (dpy, display->root, PropertyChangeMask);	535	XSelectInput (dpy, display->root, PropertyChangeMask);
511	check_our_parents ();
512	rootwin_ev.start (display, display->root);	536	rootwin_ev.start (display, display->root);
513	}	537	}
514	#endif	538	#endif
		539
		540	#ifdef BG_IMAGE_FROM_FILE
		541	if (rs[Rs_backgroundPixmap] != NULL)
		542	{
		543	const char *p = rs[Rs_backgroundPixmap];
		544
		545	if ((p = strchr (p, ';')) != NULL)
		546	{
		547	p++;
		548	bgPixmap.set_geometry (p);
		549	}
		550	else
		551	bgPixmap.set_defaultGeometry ();
		552
		553	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		554	if (!bgPixmap.window_position_sensitive ())
		555	update_background ();
		556	}
		557	#endif
		558	}
		559	#endif
		560
515	#if ENABLE_PERL	561	#if ENABLE_PERL
516	rootwin_ev.start (display, display->root);	562	rootwin_ev.start (display, display->root);
517	#endif	563	#endif
518		564
519	set_colorfgbg ();	565	set_colorfgbg ();
…		…
521	init_command (cmd_argv);	567	init_command (cmd_argv);
522		568
523	free (cmd_argv);	569	free (cmd_argv);
524		570
525	if (pty->pty >= 0)	571	if (pty->pty >= 0)
526	pty_ev.start (pty->pty, EVENT_READ);	572	pty_ev.start (pty->pty, ev::READ);
527
528	check_ev.start ();
529		573
530	HOOK_INVOKE ((this, HOOK_START, DT_END));	574	HOOK_INVOKE ((this, HOOK_START, DT_END));
531		575
532	#if ENABLE_XEMBED	576	#if ENABLE_XEMBED
533	if (rs[Rs_embed])	577	if (rs[Rs_embed])
…		…
539	}	583	}
540	#endif	584	#endif
541		585
542	XMapWindow (dpy, vt);	586	XMapWindow (dpy, vt);
543	XMapWindow (dpy, parent[0]);	587	XMapWindow (dpy, parent[0]);
544
545	return true;
546	}	588	}
547		589
548	static struct sig_handlers	590	static struct sig_handlers
549	{	591	{
550	sig_watcher sw_term, sw_int;	592	ev::sig sw_term, sw_int;
551		593
552	/*	594	/*
553	* Catch a fatal signal and tidy up before quitting	595	* Catch a fatal signal and tidy up before quitting
554	*/	596	*/
555	void	597	void sig_term (ev::sig &w, int revents);
556	sig_term (sig_watcher &w)	598
		599	sig_handlers ()
557	{	600	{
558	rxvt_emergency_cleanup ();	601	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
559	signal (w.signum, SIG_DFL);
560	kill (getpid (), w.signum);
561	}
562
563	sig_handlers ()
564	: sw_term (this, &sig_handlers::sig_term),
565	sw_int (this, &sig_handlers::sig_term)	602	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
566	{
567	}	603	}
568	} sig_handlers;	604	} sig_handlers;
569		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
570	char **rxvt_environ; // startup environment	614	char **rxvt_environ; // startup environment
571		615
572	void	616	void
573	rxvt_init ()	617	rxvt_init ()
574	{	618	{
575	ptytty::init ();	619	ptytty::init ();
		620
		621	if (!ev_default_loop (0))
		622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
576		623
577	rxvt_environ = environ;	624	rxvt_environ = environ;
578		625
579	signal (SIGHUP, SIG_IGN);	626	signal (SIGHUP, SIG_IGN);
580	signal (SIGPIPE, SIG_IGN);	627	signal (SIGPIPE, SIG_IGN);
581		628
582	sig_handlers.sw_term.start (SIGTERM);	629	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
583	sig_handlers.sw_int.start (SIGINT);	630	sig_handlers.sw_int.start (SIGINT); ev_unref ();
584		631
585	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
586	/* signal (SIGURG, SIG_DFL); */	633	/* signal (SIGURG, SIG_DFL); */
587		634
588	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
628	return p;	675	return p;
629	}	676	}
630		677
631	/----------------------------------------------------------------------/	678	/----------------------------------------------------------------------/
632	/*	679	/*
633	* window size/position calculcations for XSizeHint and other storage.	680	* window size/position calculations for XSizeHint and other storage.
634	* if width/height are non-zero then override calculated width/height	681	* if width/height are non-zero then override calculated width/height
635	*/	682	*/
636	void	683	void
637	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	684	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638	{	685	{
…		…
774	ws.ws_xpixel = width;	821	ws.ws_xpixel = width;
775	ws.ws_ypixel = height;	822	ws.ws_ypixel = height;
776	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	823	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
777		824
778	#if 0	825	#if 0
779	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	826	// TIOCSWINSZ is supposed to do this automatically and correctly
780	if (cmd_pid) /* force through to the command */	827	if (cmd_pid) /* force through to the command */
781	kill (-cmd_pid, SIGWINCH);	828	kill (-cmd_pid, SIGWINCH);
782	#endif	829	#endif
783	}	830	}
784		831
…		…
858	if (parent[0])	905	if (parent[0])
859	{	906	{
860	resize_all_windows (0, 0, 0);	907	resize_all_windows (0, 0, 0);
861	scr_remap_chars ();	908	scr_remap_chars ();
862	scr_touch (true);	909	scr_touch (true);
863	}	910	}
864		911
865	return true;	912	return true;
866	}	913	}
867		914
		915	void
868	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)
869	{	917	{
870	XChangeProperty (dpy, parent[0],	918	XChangeProperty (dpy, parent[0],
871	prop, XA_STRING, 8, PropModeReplace,	919	prop, XA_STRING, 8, PropModeReplace,
872	(const unsigned char *)str, len >= 0 ? len : strlen (str));	920	(const unsigned char *)str, len >= 0 ? len : strlen (str));
873	}	921	}
874		922
		923	void
875	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)
876	{	925	{
877	wchar_t *ws = rxvt_mbstowcs (str, len);	926	wchar_t *ws = rxvt_mbstowcs (str, len);
878	char *s = rxvt_wcstoutf8 (ws);	927	char *s = rxvt_wcstoutf8 (ws);
879		928
880	XChangeProperty (dpy, parent[0],	929	XChangeProperty (dpy, parent[0],
…		…
904	#if ENABLE_EWMH	953	#if ENABLE_EWMH
905	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	954	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
906	#endif	955	#endif
907	}	956	}
908		957
		958	void
		959	rxvt_term::set_window_color (int idx, const char *color)
		960	{
909	#ifdef XTERM_COLOR_CHANGE	961	#ifdef XTERM_COLOR_CHANGE
910	void
911	rxvt_term::set_window_color (int idx, const char *color)
912	{
913	rxvt_color xcol;	962	rxvt_color xcol;
914	int i;	963	int i;
915		964
916	if (color == NULL \|\| *color == '\0')	965	if (color == NULL \|\| *color == '\0')
917	return;	966	return;
918		967
919	color = strdup (color);	968	color = strdup (color);
920	allocated.push_back ((void *)color);	969	allocated.push_back ((void *)color);
…		…
924	if (isdigit (*color))	973	if (isdigit (*color))
925	{	974	{
926	i = atoi (color);	975	i = atoi (color);
927		976
928	if (i >= 8 && i <= 15)	977	if (i >= 8 && i <= 15)
		978	{
929	{ /* bright colors */	979	/* bright colors */
930	i -= 8;
931	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	980	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
932	goto done;	981	goto done;
933	}	982	}
934		983
935	if (i >= 0 && i <= 7)	984	if (i >= 0 && i <= 7)
		985	{
936	{ /* normal colors */	986	/* normal colors */
937	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	987	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938	goto done;	988	goto done;
939	}	989	}
940	}	990	}
941		991
…		…
946	* so just keep gobbling up the colormap	996	* so just keep gobbling up the colormap
947	*/	997	*/
948		998
949	pix_colors_focused[idx] = xcol;	999	pix_colors_focused[idx] = xcol;
950		1000
951	/* XSetWindowAttributes attr; */
952	/* Cursor cursor; */
953	done:	1001	done:
954	/TODO: handle Color_BD, scrollbar background, etc. /	1002	/TODO: handle Color_BD, scrollbar background, etc. /
955		1003
956	update_fade_color (idx);	1004	update_fade_color (idx);
957	recolour_cursor ();	1005	recolour_cursor ();
958	scr_recolour ();	1006	scr_recolour ();
		1007	#endif /* XTERM_COLOR_CHANGE */
959	}	1008	}
960
961	#else
962	# define set_window_color (idx,color) ((void)0)
963	#endif /* XTERM_COLOR_CHANGE */
964		1009
965	void	1010	void
966	rxvt_term::recolour_cursor ()	1011	rxvt_term::recolour_cursor ()
967	{	1012	{
968	XColor fg, bg;	1013	XColor fg, bg;
…		…
984	*/	1029	*/
985	void	1030	void
986	rxvt_term::set_colorfgbg ()	1031	rxvt_term::set_colorfgbg ()
987	{	1032	{
988	unsigned int i;	1033	unsigned int i;
989	const char *xpmb = "\0";	1034	const char *xpmb = "";
990	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1035	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991		1036
992	strcpy (fstr, "default");	1037	strcpy (fstr, "default");
993	strcpy (bstr, "default");	1038	strcpy (bstr, "default");
994	for (i = Color_Black; i <= Color_White; i++)	1039	for (i = Color_Black; i <= Color_White; i++)
…		…
1000		1045
1001	for (i = Color_Black; i <= Color_White; i++)	1046	for (i = Color_Black; i <= Color_White; i++)
1002	if (pix_colors[Color_bg] == pix_colors[i])	1047	if (pix_colors[Color_bg] == pix_colors[i])
1003	{	1048	{
1004	sprintf (bstr, "%d", (i - Color_Black));	1049	sprintf (bstr, "%d", (i - Color_Black));
1005	#ifdef XPM_BACKGROUND	1050	#ifdef BG_IMAGE_FROM_FILE
1006	xpmb = "default;";	1051	xpmb = "default;";
1007	#endif	1052	#endif
1008	break;	1053	break;
1009	}	1054	}
1010		1055
…		…
1106		1151
1107	XMoveResizeWindow (dpy, vt,	1152	XMoveResizeWindow (dpy, vt,
1108	window_vt_x, window_vt_y,	1153	window_vt_x, window_vt_y,
1109	width, height);	1154	width, height);
1110		1155
		1156	#ifdef HAVE_BG_PIXMAP
		1157	if (bgPixmap.window_size_sensitive ())
		1158	update_background ();
		1159	#endif
		1160
1111	scr_clear ();	1161	scr_clear ();
1112	#ifdef XPM_BACKGROUND
1113	resize_pixmap ();
1114	#endif
1115	}	1162	}
1116		1163
1117	if (fix_screen \|\| old_height == 0)	1164	if (fix_screen \|\| old_height == 0)
1118	scr_reset ();	1165	scr_reset ();
1119		1166
1120	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1167	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1121	//scr_touch (false);	1168	//scr_touch (false);
1122		1169
1123	#ifdef XPM_BACKGROUND	1170	#ifdef HAVE_BG_PIXMAP
1124	if (pixmap)	1171	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1172	// if (bgPixmap.pixmap)
1125	scr_touch (false);	1173	// scr_touch (false);
1126	#endif	1174	#endif
1127		1175
1128	#ifdef USE_XIM	1176	#ifdef USE_XIM
1129	IMSetPosition ();	1177	IMSetPosition ();
1130	#endif	1178	#endif
…		…
1301	if (term->rs[Rs_imLocale])	1349	if (term->rs[Rs_imLocale])
1302	SET_LOCALE (term->locale);	1350	SET_LOCALE (term->locale);
1303	}	1351	}
1304	else	1352	else
1305	str = (void *)text->string.wide_char;	1353	str = (void *)text->string.wide_char;
1306		1354
1307	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1355	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1308	DT_INT, call_data->caret,	1356	DT_INT, call_data->caret,
1309	DT_INT, call_data->chg_first,	1357	DT_INT, call_data->chg_first,
1310	DT_INT, call_data->chg_length,	1358	DT_INT, call_data->chg_length,
1311	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,
…		…
1630		1678
1631	if (input_style & XIMPreeditPosition)	1679	if (input_style & XIMPreeditPosition)
1632	{	1680	{
1633	im_set_size (preedit_rect);	1681	im_set_size (preedit_rect);
1634	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1682	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635		1683
1636	XSetICValues (Input_Context,	1684	XSetICValues (Input_Context,
1637	XNPreeditAttributes, preedit_attr, NULL);	1685	XNPreeditAttributes, preedit_attr, NULL);
1638	}	1686	}
1639	else	1687	else
1640	{	1688	{
…		…
1657	XFree (status_attr);	1705	XFree (status_attr);
1658	}	1706	}
1659		1707
1660	XFree (preedit_attr);	1708	XFree (preedit_attr);
1661	}	1709	}
1662	#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	make_current ();
		1778	bgPixmap.render ();
		1779	refresh_check ();
		1780	}
		1781
		1782	#endif /* HAVE_BG_PIXMAP */
1663		1783
1664	/----------------------- end-of-file (C source) -----------------------/	1784	/----------------------- 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.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs. Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC