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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC vs.
Revision 1.304 by ayin, Wed Feb 6 12:05:35 2008 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-2008 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	{
153	#if TRANSPARENT \|\| ENABLE_PERL	156	#if HAVE_BG_PIXMAP
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
155	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
156	#endif
157	#ifdef HAVE_SCROLLBARS
158	scrollbar_ev (this, &rxvt_term::x_cb),
159	#endif	158	#endif
160	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
161	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162	#endif	161	#endif
163	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
164	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165	#endif	164	#endif
166	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168	#endif	167	#endif
169	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
170	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171	#endif	170	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
174	#endif	180	#endif
175	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
176	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
177	#endif	183	#endif
178	#ifdef USE_XIM
179	im_ev (this, &rxvt_term::im_cb),
180	#endif
181	#ifndef NO_BELL	184	#ifndef NO_BELL
182	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
183	#endif	186	#endif
184	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
185	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
186	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
187	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
188	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
189	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191	incr_ev (this, &rxvt_term::incr_cb)	194
192	{
193	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
194		196
195	termlist.push_back (this);	197	termlist.push_back (this);
196		198
197	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
199	#endif	201	#endif
200	}	202	}
201		203
202	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
203	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
204	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
205	{	208	{
206	if (cmd_pid)	209	if (cmd_pid)
207	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
208		211
209	pty_ev.stop ();	212	pty_ev.stop ();
…		…
220	for (int i = RS_styleCount; --i; )	223	for (int i = RS_styleCount; --i; )
221	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
222	delete fontset[i];	225	delete fontset[i];
223	#endif	226	#endif
224	delete fontset[0];	227	delete fontset[0];
		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
225		232
226	if (display)	233	if (display)
227	{	234	{
228	selection_clear ();	235	selection_clear ();
229		236
…		…
269	pix_colors_unfocused [i].free (this);	276	pix_colors_unfocused [i].free (this);
270	#endif	277	#endif
271	}	278	}
272		279
273	clear ();	280	clear ();
274	}
275		281
276	delete [] pix_colors_focused;	282	display->flush (); /* ideally .put should do this */
277	#if OFF_FOCUS_FADING
278	delete [] pix_colors_unfocused;
279	#endif
280
281	displays.put (display);	283	displays.put (display);
		284	}
282		285
283	scr_release ();	286	scr_release ();
284		287
285	/* clear all resources */	288	/* clear all resources */
286	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
…		…
298	delete argv;	301	delete argv;
299		302
300	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
301	delete keyboard;	304	delete keyboard;
302	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
303	}	309	}
304		310
305	// child has exited, usually destroys	311	// child has exited, usually destroys
306	void	312	void
307	rxvt_term::child_cb (child_watcher &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
308	{	314	{
309	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	315	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
310		316
311	cmd_pid = 0;	317	cmd_pid = 0;
312		318
…		…
315	}	321	}
316		322
317	void	323	void
318	rxvt_term::destroy ()	324	rxvt_term::destroy ()
319	{	325	{
320	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
321	return;	327	return;
322		328
323	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
324		330
325	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
…		…
329	if (display)	335	if (display)
330	{	336	{
331	#if USE_XIM	337	#if USE_XIM
332	im_ev.stop (display);	338	im_ev.stop (display);
333	#endif	339	#endif
334	#if HAVE_SCROLLBARS
335	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
336	#endif
337	#if TRANSPARENT \|\| ENABLE_PERL	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
338	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
339	#endif	343	#endif
340	incr_ev.stop ();	344	incr_ev.stop ();
341	termwin_ev.stop (display);	345	termwin_ev.stop (display);
342	vt_ev.stop (display);	346	vt_ev.stop (display);
343	}	347	}
344		348
345	check_ev.stop ();	349	flush_ev.stop ();
346	pty_ev.stop ();	350	pty_ev.stop ();
347	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
348	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
349	#endif	353	#endif
350	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
358	#endif	362	#endif
359	#ifdef POINTER_BLANK	363	#ifdef POINTER_BLANK
360	pointer_ev.stop ();	364	pointer_ev.stop ();
361	#endif	365	#endif
362		366
363	destroy_ev.start (0);	367	destroy_ev.start ();
364	}	368	}
365		369
366	void	370	void
367	rxvt_term::destroy_cb (time_watcher &w)	371	rxvt_term::destroy_cb (ev::idle &w, int revents)
368	{	372	{
369	make_current ();	373	make_current ();
370		374
371	delete this;	375	delete this;
372	}	376	}
…		…
426	else	430	else
427	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
428	mesg, BUFSIZ);	432	mesg, BUFSIZ);
429	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
430	}	434	}
431	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
432	mesg, BUFSIZ);	436	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
434	}	438	}
435	#endif	439	#endif
436		440
…		…
460	DisplayString (display));	464	DisplayString (display));
461	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
462	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
463	}	467	}
464		468
465	/----------------------------------------------------------------------/
466	bool
467	rxvt_term::init (int argc, const char const argv, stringvec *envv)
468	{
469	this->envv = envv;
470
471	SET_R (this);
472	set_locale ("");
473	set_environ (envv); // few things in X do not call setlocale :(
474
475	if (!init_vars ())
476	return false;
477
478	init_secondary ();
479
480	const char **cmd_argv = init_resources (argc, argv);
481
482	#ifdef KEYSYM_RESOURCE
483	keyboard->register_done ();
484	#endif
485
486	#ifdef HAVE_SCROLLBARS
487	if (option (Opt_scrollBar))
488	scrollBar.setIdle (); /* set existence for size calculations */
489	#endif
490
491	pty = ptytty::create ();
492
493	create_windows (argc, argv);
494
495	init_xlocale ();
496
497	scr_reset (); // initialize screen
498
499	#if 0
500	XSynchronize (dpy, True);
501	#endif
502
503	#ifdef HAVE_SCROLLBARS
504	if (option (Opt_scrollBar))
505	resize_scrollbar (); /* create and map scrollbar */
506	#endif
507	#ifdef TRANSPARENT
508	if (option (Opt_transparent))
509	{
510	XSelectInput (dpy, display->root, PropertyChangeMask);
511	check_our_parents ();
512	rootwin_ev.start (display, display->root);
513	}
514	#endif
515	#if ENABLE_PERL
516	rootwin_ev.start (display, display->root);
517	#endif
518
519	set_colorfgbg ();
520
521	init_command (cmd_argv);
522
523	free (cmd_argv);
524
525	if (pty->pty >= 0)
526	pty_ev.start (pty->pty, EVENT_READ);
527
528	check_ev.start ();
529
530	HOOK_INVOKE ((this, HOOK_START, DT_END));
531
532	#if ENABLE_XEMBED
533	if (rs[Rs_embed])
534	{
535	long info[2] = { 0, XEMBED_MAPPED };
536
537	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
538	32, PropModeReplace, (unsigned char *)&info, 2);
539	}
540	#endif
541
542	XMapWindow (dpy, vt);
543	XMapWindow (dpy, parent[0]);
544
545	return true;
546	}
547
548	static struct sig_handlers	469	static struct sig_handlers
549	{	470	{
550	sig_watcher sw_term, sw_int;	471	ev::sig sw_term, sw_int;
551		472
552	/*	473	/*
553	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
554	*/	475	*/
555	void	476	void sig_term (ev::sig &w, int revents);
556	sig_term (sig_watcher &w)	477
		478	sig_handlers ()
557	{	479	{
558	rxvt_emergency_cleanup ();	480	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)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
566	{
567	}	482	}
568	} sig_handlers;	483	} sig_handlers;
569		484
		485	void
		486	sig_handlers::sig_term (ev::sig &w, int revents)
		487	{
		488	rxvt_emergency_cleanup ();
		489	w.stop ();
		490	kill (getpid (), w.signum);
		491	}
		492
570	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
571		494
572	void	495	void
573	rxvt_init ()	496	rxvt_init ()
574	{	497	{
575	ptytty::init ();	498	ptytty::init ();
		499
		500	if (!ev_default_loop (0))
		501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
576		502
577	rxvt_environ = environ;	503	rxvt_environ = environ;
578		504
579	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
580	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
581		507
582	sig_handlers.sw_term.start (SIGTERM);	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
583	sig_handlers.sw_int.start (SIGINT);	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
584		510
585	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
586	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
587		513
588	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
590	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
591		517
592	XrmInitialize ();	518	XrmInitialize ();
593	}	519	}
594		520
595	/* ------------------------------------------------------------------------- *
596	* MEMORY ALLOCATION WRAPPERS *
597	* ------------------------------------------------------------------------- */
598	void *
599	rxvt_malloc (size_t size)
600	{
601	void *p = malloc (size);
602
603	if (!p)
604	rxvt_fatal ("memory allocation failure. aborting.\n");
605
606	return p;
607	}
608
609	void *
610	rxvt_calloc (size_t number, size_t size)
611	{
612	void *p = calloc (number, size);
613
614	if (!p)
615	rxvt_fatal ("memory allocation failure. aborting.\n");
616
617	return p;
618	}
619
620	void *
621	rxvt_realloc (void *ptr, size_t size)
622	{
623	void *p = realloc (ptr, size);
624
625	if (!p)
626	rxvt_fatal ("memory allocation failure. aborting.\n");
627
628	return p;
629	}
630
631	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
632	/*	522	/*
633	* window size/position calculcations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
634	* if width/height are non-zero then override calculated width/height	524	* if width/height are non-zero then override calculated width/height
635	*/	525	*/
636	void	526	void
637	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638	{	528	{
…		…
774	ws.ws_xpixel = width;	664	ws.ws_xpixel = width;
775	ws.ws_ypixel = height;	665	ws.ws_ypixel = height;
776	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
777		667
778	#if 0	668	#if 0
779	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	669	// TIOCSWINSZ is supposed to do this automatically and correctly
780	if (cmd_pid) /* force through to the command */	670	if (cmd_pid) /* force through to the command */
781	kill (-cmd_pid, SIGWINCH);	671	kill (-cmd_pid, SIGWINCH);
782	#endif	672	#endif
783	}	673	}
784		674
…		…
858	if (parent[0])	748	if (parent[0])
859	{	749	{
860	resize_all_windows (0, 0, 0);	750	resize_all_windows (0, 0, 0);
861	scr_remap_chars ();	751	scr_remap_chars ();
862	scr_touch (true);	752	scr_touch (true);
863	}	753	}
864		754
865	return true;	755	return true;
866	}	756	}
867		757
		758	void
868	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	759	rxvt_term::set_string_property (Atom prop, const char *str, int len)
869	{	760	{
870	XChangeProperty (dpy, parent[0],	761	XChangeProperty (dpy, parent[0],
871	prop, XA_STRING, 8, PropModeReplace,	762	prop, XA_STRING, 8, PropModeReplace,
872	(const unsigned char *)str, len >= 0 ? len : strlen (str));	763	(const unsigned char *)str, len >= 0 ? len : strlen (str));
873	}	764	}
874		765
		766	void
875	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	767	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
876	{	768	{
877	wchar_t *ws = rxvt_mbstowcs (str, len);	769	wchar_t *ws = rxvt_mbstowcs (str, len);
878	char *s = rxvt_wcstoutf8 (ws);	770	char *s = rxvt_wcstoutf8 (ws);
879		771
880	XChangeProperty (dpy, parent[0],	772	XChangeProperty (dpy, parent[0],
…		…
904	#if ENABLE_EWMH	796	#if ENABLE_EWMH
905	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
906	#endif	798	#endif
907	}	799	}
908		800
		801	void
		802	rxvt_term::set_window_color (int idx, const char *color)
		803	{
909	#ifdef XTERM_COLOR_CHANGE	804	#ifdef XTERM_COLOR_CHANGE
910	void
911	rxvt_term::set_window_color (int idx, const char *color)
912	{
913	rxvt_color xcol;	805	rxvt_color xcol;
914	int i;	806
915
916	if (color == NULL \|\| *color == '\0')	807	if (color == NULL \|\| *color == '\0')
917	return;	808	return;
918		809
919	color = strdup (color);	810	color = strdup (color);
920	allocated.push_back ((void *)color);	811	allocated.push_back ((void *)color);
921	rs[Rs_color + idx] = color;	812	rs[Rs_color + idx] = color;
922		813
923	/* handle color aliases */	814	/* handle color aliases */
924	if (isdigit (*color))	815	if (isdigit (*color))
925	{	816	{
926	i = atoi (color);	817	int i = atoi (color);
927		818
928	if (i >= 8 && i <= 15)	819	if (i >= 8 && i <= 15)
		820	{
929	{ /* bright colors */	821	/* bright colors */
930	i -= 8;
931	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	822	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
932	goto done;	823	goto done;
933	}	824	}
934		825
935	if (i >= 0 && i <= 7)	826	if (i >= 0 && i <= 7)
		827	{
936	{ /* normal colors */	828	/* normal colors */
937	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	829	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938	goto done;	830	goto done;
939	}	831	}
940	}	832	}
941		833
…		…
946	* so just keep gobbling up the colormap	838	* so just keep gobbling up the colormap
947	*/	839	*/
948		840
949	pix_colors_focused[idx] = xcol;	841	pix_colors_focused[idx] = xcol;
950		842
951	/* XSetWindowAttributes attr; */
952	/* Cursor cursor; */
953	done:	843	done:
954	/TODO: handle Color_BD, scrollbar background, etc. /	844	/TODO: handle Color_BD, scrollbar background, etc. /
955		845
956	update_fade_color (idx);	846	update_fade_color (idx);
957	recolour_cursor ();	847	recolour_cursor ();
958	scr_recolour ();	848	scr_recolour ();
		849	#endif /* XTERM_COLOR_CHANGE */
959	}	850	}
960
961	#else
962	# define set_window_color (idx,color) ((void)0)
963	#endif /* XTERM_COLOR_CHANGE */
964		851
965	void	852	void
966	rxvt_term::recolour_cursor ()	853	rxvt_term::recolour_cursor ()
967	{	854	{
968	XColor fg, bg;	855	XColor fg, bg;
…		…
984	*/	871	*/
985	void	872	void
986	rxvt_term::set_colorfgbg ()	873	rxvt_term::set_colorfgbg ()
987	{	874	{
988	unsigned int i;	875	unsigned int i;
989	const char *xpmb = "\0";	876	const char *xpmb = "";
990	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	877	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991		878
992	strcpy (fstr, "default");	879	strcpy (fstr, "default");
993	strcpy (bstr, "default");	880	strcpy (bstr, "default");
994	for (i = Color_Black; i <= Color_White; i++)	881	for (i = Color_Black; i <= Color_White; i++)
…		…
1000		887
1001	for (i = Color_Black; i <= Color_White; i++)	888	for (i = Color_Black; i <= Color_White; i++)
1002	if (pix_colors[Color_bg] == pix_colors[i])	889	if (pix_colors[Color_bg] == pix_colors[i])
1003	{	890	{
1004	sprintf (bstr, "%d", (i - Color_Black));	891	sprintf (bstr, "%d", (i - Color_Black));
1005	#ifdef XPM_BACKGROUND	892	#ifdef BG_IMAGE_FROM_FILE
1006	xpmb = "default;";	893	xpmb = "default;";
1007	#endif	894	#endif
1008	break;	895	break;
1009	}	896	}
1010		897
…		…
1106		993
1107	XMoveResizeWindow (dpy, vt,	994	XMoveResizeWindow (dpy, vt,
1108	window_vt_x, window_vt_y,	995	window_vt_x, window_vt_y,
1109	width, height);	996	width, height);
1110		997
		998	#ifdef HAVE_BG_PIXMAP
		999	if (bgPixmap.window_size_sensitive ())
		1000	update_background ();
		1001	#endif
		1002
1111	scr_clear ();	1003	scr_clear ();
1112	#ifdef XPM_BACKGROUND
1113	resize_pixmap ();
1114	#endif
1115	}	1004	}
1116		1005
1117	if (fix_screen \|\| old_height == 0)	1006	if (fix_screen \|\| old_height == 0)
1118	scr_reset ();	1007	scr_reset ();
1119		1008
1120	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1009	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1121	//scr_touch (false);	1010	//scr_touch (false);
1122		1011
1123	#ifdef XPM_BACKGROUND	1012	#ifdef HAVE_BG_PIXMAP
1124	if (pixmap)	1013	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1014	// if (bgPixmap.pixmap)
1125	scr_touch (false);	1015	// scr_touch (false);
1126	#endif	1016	#endif
1127		1017
1128	#ifdef USE_XIM	1018	#ifdef USE_XIM
1129	IMSetPosition ();	1019	IMSetPosition ();
1130	#endif	1020	#endif
…		…
1301	if (term->rs[Rs_imLocale])	1191	if (term->rs[Rs_imLocale])
1302	SET_LOCALE (term->locale);	1192	SET_LOCALE (term->locale);
1303	}	1193	}
1304	else	1194	else
1305	str = (void *)text->string.wide_char;	1195	str = (void *)text->string.wide_char;
1306		1196
1307	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1308	DT_INT, call_data->caret,	1198	DT_INT, call_data->caret,
1309	DT_INT, call_data->chg_first,	1199	DT_INT, call_data->chg_first,
1310	DT_INT, call_data->chg_length,	1200	DT_INT, call_data->chg_length,
1311	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1201	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1630		1520
1631	if (input_style & XIMPreeditPosition)	1521	if (input_style & XIMPreeditPosition)
1632	{	1522	{
1633	im_set_size (preedit_rect);	1523	im_set_size (preedit_rect);
1634	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1524	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635		1525
1636	XSetICValues (Input_Context,	1526	XSetICValues (Input_Context,
1637	XNPreeditAttributes, preedit_attr, NULL);	1527	XNPreeditAttributes, preedit_attr, NULL);
1638	}	1528	}
1639	else	1529	else
1640	{	1530	{
…		…
1657	XFree (status_attr);	1547	XFree (status_attr);
1658	}	1548	}
1659		1549
1660	XFree (preedit_attr);	1550	XFree (preedit_attr);
1661	}	1551	}
1662	#endif /* USE_XIM */	1552	#endif /* USE_XIM */
		1553
		1554	void
		1555	rxvt_term::get_window_origin (int &x, int &y)
		1556	{
		1557	Window cr;
		1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1560	}
		1561
		1562	Pixmap
		1563	rxvt_term::get_pixmap_property (int prop_id)
		1564	{
		1565	if (prop_id > 0 && prop_id < NUM_XA)
		1566	if (xa[prop_id])
		1567	{
		1568	int aformat;
		1569	unsigned long nitems, bytes_after;
		1570	Atom atype;
		1571	unsigned char *prop = NULL;
		1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1574	&nitems, &bytes_after, &prop);
		1575	if (result == Success && prop && atype == XA_PIXMAP)
		1576	return (Pixmap )prop;
		1577	}
		1578
		1579	return None;
		1580	}
		1581
		1582	#ifdef HAVE_BG_PIXMAP
		1583	# if TRACE_PIXMAPS
		1584	# undef update_background
		1585	void
		1586	rxvt_term::trace_update_background (const char *file, int line)
		1587	{
		1588	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1589	update_background ();
		1590	}
		1591	# endif
		1592
		1593	void
		1594	rxvt_term::update_background ()
		1595	{
		1596	if (update_background_ev.is_active ())
		1597	return;
		1598
		1599	bgPixmap.invalidate ();
		1600
		1601	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1602
		1603	if (to_wait <= 0.)
		1604	bgPixmap.render ();
		1605	else
		1606	update_background_ev.start (to_wait);
		1607	}
		1608
		1609	void
		1610	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1611	{
		1612	make_current ();
		1613
		1614	update_background_ev.stop ();
		1615	bgPixmap.render ();
		1616	refresh_check ();
		1617	}
		1618
		1619	#endif /* HAVE_BG_PIXMAP */
1663		1620
1664	/----------------------- end-of-file (C source) -----------------------/	1621	/----------------------- 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.234 by root, Sat Jun 9 13:04:27 2007 UTC vs. Revision 1.304 by ayin, Wed Feb 6 12:05:35 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC vs.
Revision 1.304 by ayin, Wed Feb 6 12:05:35 2008 UTC