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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.257 by root, Sun Nov 11 17:10:45 2007 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 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 HAVE_TERMIOS_H
44	# include <termios.h>	43	#include <termios.h>
45	#endif
46		44
47	#ifdef HAVE_XSETLOCALE	45	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	46	# define X_LOCALE
49	# include <X11/Xlocale.h>	47	# include <X11/Xlocale.h>
50	#else	48	#else
…		…
152		150
153	}	151	}
154	#endif	152	#endif
155		153
156	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
157	:	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
158	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
159	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160	#endif	176	#endif
161	#if HAVE_BG_PIXMAP	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162	update_background_ev(this, &rxvt_term::update_background_cb),	178	#ifdef USE_XIM
163	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#ifdef HAVE_SCROLLBARS
165	scrollbar_ev (this, &rxvt_term::x_cb),
166	#endif
167	#ifdef CURSOR_BLINK
168	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169	#endif
170	#ifdef TEXT_BLINK
171	text_blink_ev (this, &rxvt_term::text_blink_cb),
172	#endif
173	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175	#endif
176	#ifdef SELECTION_SCROLLING
177	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178	#endif
179	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181	#endif	180	#endif
182	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
183	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif
185	#ifdef USE_XIM
186	im_ev (this, &rxvt_term::im_cb),
187	#endif	183	#endif
188	#ifndef NO_BELL	184	#ifndef NO_BELL
189	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190	#endif	186	#endif
191	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194	prepare_ev (this, &rxvt_term::prepare_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198	incr_ev (this, &rxvt_term::incr_cb)	194
199	{
200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201		196
202	termlist.push_back (this);	197	termlist.push_back (this);
203		198
204	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
229	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
230	delete fontset[i];	225	delete fontset[i];
231	#endif	226	#endif
232	delete fontset[0];	227	delete fontset[0];
233		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
234	if (display)	233	if (display)
235	{	234	{
236	selection_clear ();	235	selection_clear ();
237		236
238	#ifdef USE_XIM	237	#ifdef USE_XIM
239	im_destroy ();	238	im_destroy ();
240	#endif	239	#endif
241	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
242	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243	if (ShadowGC) XFreeGC (dpy, ShadowGC);
244	#endif
245	#ifdef PLAIN_SCROLLBAR
246	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247	#endif
248	#ifdef NEXT_SCROLLBAR
249	if (blackGC) XFreeGC (dpy, blackGC);
250	if (whiteGC) XFreeGC (dpy, whiteGC);
251	if (grayGC) XFreeGC (dpy, grayGC);
252	if (darkGC) XFreeGC (dpy, darkGC);
253	if (stippleGC) XFreeGC (dpy, stippleGC);
254	if (dimple) XFreePixmap (dpy, dimple);
255	if (upArrow) XFreePixmap (dpy, upArrow);
256	if (downArrow) XFreePixmap (dpy, downArrow);
257	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259	#endif
260	#ifdef RXVT_SCROLLBAR
261	if (topShadowGC) XFreeGC (dpy, topShadowGC);
262	if (botShadowGC) XFreeGC (dpy, botShadowGC);
263	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264	#endif
265	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
266		242
267	delete drawable;	243	delete drawable;
268	// destroy all windows	244	// destroy all windows
269	if (parent[0])	245	if (parent[0])
…		…
277	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
278	#endif	254	#endif
279	}	255	}
280		256
281	clear ();	257	clear ();
282	}
283		258
284	delete [] pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
285	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;
287	#endif
288
289	displays.put (display);	260	displays.put (display);
		261	}
290		262
291	scr_release ();	263	scr_release ();
292		264
293	/* clear all resources */	265	/* clear all resources */
294	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
306	delete argv;	278	delete argv;
307		279
308	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
309	delete keyboard;	281	delete keyboard;
310	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
311	}	286	}
312		287
313	// child has exited, usually destroys	288	// child has exited, usually destroys
314	void	289	void
315	rxvt_term::child_cb (ev::child &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
…		…
323	}	298	}
324		299
325	void	300	void
326	rxvt_term::destroy ()	301	rxvt_term::destroy ()
327	{	302	{
328	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
329	return;	304	return;
330		305
331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332		307
333	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
337	if (display)	312	if (display)
338	{	313	{
339	#if USE_XIM	314	#if USE_XIM
340	im_ev.stop (display);	315	im_ev.stop (display);
341	#endif	316	#endif
342	#if HAVE_SCROLLBARS
343	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
344	#endif
345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
346	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
347	#endif	320	#endif
348	incr_ev.stop ();	321	incr_ev.stop ();
349	termwin_ev.stop (display);	322	termwin_ev.stop (display);
350	vt_ev.stop (display);	323	vt_ev.stop (display);
351	}	324	}
352		325
353	prepare_ev.stop ();	326	flush_ev.stop ();
354	pty_ev.stop ();	327	pty_ev.stop ();
355	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
356	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
357	#endif	330	#endif
358	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
370		343
371	destroy_ev.start ();	344	destroy_ev.start ();
372	}	345	}
373		346
374	void	347	void
375	rxvt_term::destroy_cb (ev::check &w, int revents)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	349	{
377	make_current ();	350	make_current ();
378		351
379	delete this;	352	delete this;
380	}	353	}
…		…
468	DisplayString (display));	441	DisplayString (display));
469	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
470	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
471	}	444	}
472		445
473	/----------------------------------------------------------------------/
474	bool
475	rxvt_term::init (int argc, const char const argv, stringvec *envv)
476	{
477	this->envv = envv;
478
479	SET_R (this);
480	set_locale ("");
481	set_environ (envv); // few things in X do not call setlocale :(
482
483	if (!init_vars ())
484	return false;
485
486	init_secondary ();
487
488	const char **cmd_argv = init_resources (argc, argv);
489
490	#ifdef KEYSYM_RESOURCE
491	keyboard->register_done ();
492	#endif
493
494	#ifdef HAVE_SCROLLBARS
495	if (option (Opt_scrollBar))
496	scrollBar.setIdle (); /* set existence for size calculations */
497	#endif
498
499	pty = ptytty::create ();
500
501	create_windows (argc, argv);
502
503	init_xlocale ();
504
505	scr_reset (); // initialize screen
506
507	#if 0
508	XSynchronize (dpy, True);
509	#endif
510
511	#ifdef HAVE_SCROLLBARS
512	if (option (Opt_scrollBar))
513	resize_scrollbar (); /* create and map scrollbar */
514	#endif
515	#ifdef HAVE_BG_PIXMAP
516	{
517	bgPixmap.set_target (this);
518
519	#ifdef ENABLE_TRANSPARENCY
520	if (option (Opt_transparent))
521	{
522	bgPixmap.set_transparent ();
523	#ifdef HAVE_AFTERIMAGE
524	if (rs [Rs_blurradius])
525	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526	#endif
527	if (ISSET_PIXCOLOR (Color_tint))
528	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529	if (rs [Rs_shade])
530	bgPixmap.set_shade (rs [Rs_shade]);
531
532	bgPixmap.set_root_pixmap ();
533	XSelectInput (dpy, display->root, PropertyChangeMask);
534	rootwin_ev.start (display, display->root);
535	}
536	#endif
537
538	#ifdef BG_IMAGE_FROM_FILE
539	if (rs[Rs_backgroundPixmap] != NULL)
540	{
541	const char *p = rs[Rs_backgroundPixmap];
542
543	if ((p = strchr (p, ';')) != NULL)
544	{
545	p++;
546	bgPixmap.set_geometry (p);
547	}
548	else
549	bgPixmap.set_defaultGeometry ();
550
551	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552	if (!bgPixmap.window_position_sensitive ())
553	update_background ();
554	}
555	#endif
556	}
557	#endif
558
559	#if ENABLE_PERL
560	rootwin_ev.start (display, display->root);
561	#endif
562
563	set_colorfgbg ();
564
565	init_command (cmd_argv);
566
567	free (cmd_argv);
568
569	if (pty->pty >= 0)
570	pty_ev.start (pty->pty, ev::READ);
571
572	prepare_ev.start ();
573
574	HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576	#if ENABLE_XEMBED
577	if (rs[Rs_embed])
578	{
579	long info[2] = { 0, XEMBED_MAPPED };
580
581	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582	32, PropModeReplace, (unsigned char *)&info, 2);
583	}
584	#endif
585
586	XMapWindow (dpy, vt);
587	XMapWindow (dpy, parent[0]);
588
589	return true;
590	}
591
592	static struct sig_handlers	446	static struct sig_handlers
593	{	447	{
594	ev::sig sw_term, sw_int;	448	ev::sig sw_term, sw_int;
595		449
596	/*	450	/*
597	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
598	*/	452	*/
599	void
600	sig_term (ev::sig &w, int revents)	453	void sig_term (ev::sig &w, int revents);
		454
		455	sig_handlers ()
601	{	456	{
602	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603	w.stop ();
604	kill (getpid (), w.signum);
605	}
606
607	sig_handlers ()
608	: sw_term (this, &sig_handlers::sig_term),
609	sw_int (this, &sig_handlers::sig_term)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610	{
611	}	459	}
612	} sig_handlers;	460	} sig_handlers;
613		461
		462	void
		463	sig_handlers::sig_term (ev::sig &w, int revents)
		464	{
		465	rxvt_emergency_cleanup ();
		466	w.stop ();
		467	kill (getpid (), w.signum);
		468	}
		469
614	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
615		471
616	void	472	void
617	rxvt_init ()	473	rxvt_init ()
618	{	474	{
619	ptytty::init ();	475	ptytty::init ();
620		476
621	if (!ev::ev_default_loop (0))	477	if (!ev_default_loop (0))
622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623		479
624	rxvt_environ = environ;	480	rxvt_environ = environ;
625		481
626	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
627	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
628		484
629	sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630	sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
631		487
632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
633	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
634		490
635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636	// TODO: handle this with exceptions and tolerate the memory loss	492	// TODO: handle this with exceptions and tolerate the memory loss
637	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
638		494
639	XrmInitialize ();	495	XrmInitialize ();
640	}
641
642	/* ------------------------------------------------------------------------- *
643	* MEMORY ALLOCATION WRAPPERS *
644	* ------------------------------------------------------------------------- */
645	void *
646	rxvt_malloc (size_t size)
647	{
648	void *p = malloc (size);
649
650	if (!p)
651	rxvt_fatal ("memory allocation failure. aborting.\n");
652
653	return p;
654	}
655
656	void *
657	rxvt_calloc (size_t number, size_t size)
658	{
659	void *p = calloc (number, size);
660
661	if (!p)
662	rxvt_fatal ("memory allocation failure. aborting.\n");
663
664	return p;
665	}
666
667	void *
668	rxvt_realloc (void *ptr, size_t size)
669	{
670	void *p = realloc (ptr, size);
671
672	if (!p)
673	rxvt_fatal ("memory allocation failure. aborting.\n");
674
675	return p;
676	}	496	}
677		497
678	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
679	/*	499	/*
680	* window size/position calculations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
…		…
682	*/	502	*/
683	void	503	void
684	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
685	{	505	{
686	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
687	int x, y, sb_w, flags;	507	int x, y, flags;
688	unsigned int w, h;	508	unsigned int w, h;
689	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
690		510
691	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
692	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
749	max_width = MAX_COLS * fwidth;	569	max_width = MAX_COLS * fwidth;
750	max_height = MAX_ROWS * fheight;	570	max_height = MAX_ROWS * fheight;
751		571
752	szHint.base_width = szHint.base_height = 2 * int_bwidth;	572	szHint.base_width = szHint.base_height = 2 * int_bwidth;
753		573
754	sb_w = 0;
755	window_vt_x = window_vt_y = int_bwidth;	574	window_vt_x = window_vt_y = int_bwidth;
756		575
757	if (scrollBar.state)	576	if (scrollBar.state)
758	{	577	{
759	sb_w = scrollbar_TotalWidth ();	578	int sb_w = scrollBar.total_width ();
760	szHint.base_width += sb_w;	579	szHint.base_width += sb_w;
761		580
762	if (!option (Opt_scrollBar_right))	581	if (!option (Opt_scrollBar_right))
763	window_vt_x += sb_w;	582	window_vt_x += sb_w;
764	}	583	}
…		…
787	else	606	else
788	{	607	{
789	min_it (height, max_height);	608	min_it (height, max_height);
790	szHint.height = szHint.base_height + height;	609	szHint.height = szHint.base_height + height;
791	}	610	}
792
793	if (scrollBar.state && option (Opt_scrollBar_right))
794	window_sb_x = szHint.width - sb_w;
795		611
796	if (recalc_x)	612	if (recalc_x)
797	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	613	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798		614
799	if (recalc_y)	615	if (recalc_y)
…		…
821	ws.ws_xpixel = width;	637	ws.ws_xpixel = width;
822	ws.ws_ypixel = height;	638	ws.ws_ypixel = height;
823	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	639	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
824		640
825	#if 0	641	#if 0
826	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	642	// TIOCSWINSZ is supposed to do this automatically and correctly
827	if (cmd_pid) /* force through to the command */	643	if (cmd_pid) /* force through to the command */
828	kill (-cmd_pid, SIGWINCH);	644	kill (-cmd_pid, SIGWINCH);
829	#endif	645	#endif
830	}	646	}
831		647
…		…
958	void	774	void
959	rxvt_term::set_window_color (int idx, const char *color)	775	rxvt_term::set_window_color (int idx, const char *color)
960	{	776	{
961	#ifdef XTERM_COLOR_CHANGE	777	#ifdef XTERM_COLOR_CHANGE
962	rxvt_color xcol;	778	rxvt_color xcol;
963	int i;
964		779
965	if (color == NULL \|\| *color == '\0')	780	if (color == NULL \|\| *color == '\0')
966	return;	781	return;
967		782
968	color = strdup (color);	783	color = strdup (color);
…		…
970	rs[Rs_color + idx] = color;	785	rs[Rs_color + idx] = color;
971		786
972	/* handle color aliases */	787	/* handle color aliases */
973	if (isdigit (*color))	788	if (isdigit (*color))
974	{	789	{
975	i = atoi (color);	790	int i = atoi (color);
976		791
977	if (i >= 8 && i <= 15)	792	if (i >= 8 && i <= 15)
		793	{
978	{ /* bright colors */	794	/* bright colors */
979	i -= 8;
980	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	795	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
981	goto done;	796	goto done;
982	}	797	}
983		798
984	if (i >= 0 && i <= 7)	799	if (i >= 0 && i <= 7)
		800	{
985	{ /* normal colors */	801	/* normal colors */
986	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	802	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
987	goto done;	803	goto done;
988	}	804	}
989	}	805	}
990		806
…		…
995	* so just keep gobbling up the colormap	811	* so just keep gobbling up the colormap
996	*/	812	*/
997		813
998	pix_colors_focused[idx] = xcol;	814	pix_colors_focused[idx] = xcol;
999		815
1000	/* XSetWindowAttributes attr; */
1001	/* Cursor cursor; */
1002	done:	816	done:
1003	/TODO: handle Color_BD, scrollbar background, etc. /	817	/TODO: handle Color_BD, scrollbar background, etc. /
1004		818
1005	update_fade_color (idx);	819	update_fade_color (idx);
1006	recolour_cursor ();	820	recolour_cursor ();
1007	scr_recolour ();	821	scr_recolour ();
1008	#endif /* XTERM_COLOR_CHANGE */	822	#endif /* XTERM_COLOR_CHANGE */
1009	}	823	}
1010		824
1011	void	825	void
1012	rxvt_term::recolour_cursor ()	826	rxvt_term::recolour_cursor ()
1013	{	827	{
…		…
1030	*/	844	*/
1031	void	845	void
1032	rxvt_term::set_colorfgbg ()	846	rxvt_term::set_colorfgbg ()
1033	{	847	{
1034	unsigned int i;	848	unsigned int i;
1035	const char *xpmb = "\0";	849	const char *xpmb = "";
1036	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	850	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037		851
1038	strcpy (fstr, "default");	852	strcpy (fstr, "default");
1039	strcpy (bstr, "default");	853	strcpy (bstr, "default");
1040	for (i = Color_Black; i <= Color_White; i++)	854	for (i = Color_Black; i <= Color_White; i++)
…		…
1141	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	955	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1142		956
1143	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	957	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1144	{	958	{
1145	if (scrollBar.state)	959	if (scrollBar.state)
1146	{	960	scrollBar.resize ();
1147	XMoveResizeWindow (dpy, scrollBar.win,
1148	window_sb_x, 0,
1149	scrollbar_TotalWidth (), szHint.height);
1150	resize_scrollbar ();
1151	}
1152		961
1153	XMoveResizeWindow (dpy, vt,	962	XMoveResizeWindow (dpy, vt,
1154	window_vt_x, window_vt_y,	963	window_vt_x, window_vt_y,
1155	width, height);	964	width, height);
1156		965
…		…
1706	XFree (status_attr);	1515	XFree (status_attr);
1707	}	1516	}
1708		1517
1709	XFree (preedit_attr);	1518	XFree (preedit_attr);
1710	}	1519	}
1711	#endif /* USE_XIM */	1520	#endif /* USE_XIM */
1712		1521
1713	void	1522	void
1714	rxvt_term::get_window_origin (int &x, int &y)	1523	rxvt_term::get_window_origin (int &x, int &y)
1715	{	1524	{
1716	Window cr;	1525	Window cr;
1717	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1526	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1527	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1719	}	1528	}
1720		1529
1721	Pixmap	1530	Pixmap
1722	rxvt_term::get_pixmap_property (int prop_id)	1531	rxvt_term::get_pixmap_property (int prop_id)
1723	{	1532	{
…		…
1730	unsigned char *prop = NULL;	1539	unsigned char *prop = NULL;
1731	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1540	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1541	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733	&nitems, &bytes_after, &prop);	1542	&nitems, &bytes_after, &prop);
1734	if (result == Success && prop && atype == XA_PIXMAP)	1543	if (result == Success && prop && atype == XA_PIXMAP)
1735	{
1736	return (Pixmap )prop;	1544	return (Pixmap )prop;
1737	}
1738	}	1545	}
		1546
1739	return None;	1547	return None;
1740	}	1548	}
1741		1549
1742	#ifdef HAVE_BG_PIXMAP	1550	#ifdef HAVE_BG_PIXMAP
1743	int	1551	# if TRACE_PIXMAPS
		1552	# undef update_background
		1553	void
		1554	rxvt_term::trace_update_background (const char *file, int line)
		1555	{
		1556	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1557	update_background ();
		1558	}
		1559	# endif
		1560
		1561	void
1744	rxvt_term::update_background ()	1562	rxvt_term::update_background ()
1745	{	1563	{
		1564	if (update_background_ev.is_active ())
		1565	return;
		1566
1746	bgPixmap.invalidate ();	1567	bgPixmap.invalidate ();
1747		1568
1748	/* no chance of real time refresh if we are blurring! */	1569	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1749	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1570
		1571	if (to_wait <= 0.)
1750	bgPixmap.render ();	1572	bgPixmap.render ();
1751	else	1573	else
1752	{
1753	update_background_ev.stop ();
1754
1755	if (!bgPixmap.need_client_side_rendering())
1756	update_background_ev.start (.05);	1574	update_background_ev.start (to_wait);
1757	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1758	update_background_ev.start (.20); /* very slow !!! */
1759	else
1760	update_background_ev.start (.07);
1761	}
1762
1763	return 0;
1764	}	1575	}
1765		1576
1766	void	1577	void
1767	rxvt_term::update_background_cb (ev::timer &w, int revents)	1578	rxvt_term::update_background_cb (ev::timer &w, int revents)
1768	{	1579	{
		1580	make_current ();
		1581
		1582	update_background_ev.stop ();
1769	bgPixmap.render ();	1583	bgPixmap.render ();
		1584	refresh_check ();
1770	}	1585	}
1771		1586
1772	#endif /* HAVE_BG_PIXMAP */	1587	#endif /* HAVE_BG_PIXMAP */
1773		1588
1774	/----------------------- end-of-file (C source) -----------------------/	1589	/----------------------- 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.257 by root, Sun Nov 11 17:10:45 2007 UTC vs. Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.257 by root, Sun Nov 11 17:10:45 2007 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC