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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.253 by ayin, Mon Oct 15 07:33:48 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	{
		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::rootwin_cb> (this),
155	#endif	176	#endif
156	#if HAVE_BG_PIXMAP	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157	update_background_ev(this, &rxvt_term::update_background_cb),	178	#ifdef USE_XIM
158	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),
161	#endif
162	#ifdef CURSOR_BLINK
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
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	180	#endif
177	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	183	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	184	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	186	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	194
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
197	termlist.push_back (this);	197	termlist.push_back (this);
198		198
199	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
223	for (int i = RS_styleCount; --i; )	223	for (int i = RS_styleCount; --i; )
224	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
225	delete fontset[i];	225	delete fontset[i];
226	#endif	226	#endif
227	delete fontset[0];	227	delete fontset[0];
		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
228		232
229	if (display)	233	if (display)
230	{	234	{
231	selection_clear ();	235	selection_clear ();
232		236
…		…
272	pix_colors_unfocused [i].free (this);	276	pix_colors_unfocused [i].free (this);
273	#endif	277	#endif
274	}	278	}
275		279
276	clear ();	280	clear ();
277	}
278		281
279	delete [] pix_colors_focused;	282	display->flush (); /* ideally .put should do this */
280	#if OFF_FOCUS_FADING
281	delete [] pix_colors_unfocused;
282	#endif
283
284	displays.put (display);	283	displays.put (display);
		284	}
285		285
286	scr_release ();	286	scr_release ();
287		287
288	/* clear all resources */	288	/* clear all resources */
289	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
…		…
301	delete argv;	301	delete argv;
302		302
303	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
304	delete keyboard;	304	delete keyboard;
305	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
306	}	309	}
307		310
308	// child has exited, usually destroys	311	// child has exited, usually destroys
309	void	312	void
310	rxvt_term::child_cb (child_watcher &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
311	{	314	{
312	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	315	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313		316
314	cmd_pid = 0;	317	cmd_pid = 0;
315		318
…		…
318	}	321	}
319		322
320	void	323	void
321	rxvt_term::destroy ()	324	rxvt_term::destroy ()
322	{	325	{
323	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
324	return;	327	return;
325		328
326	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327		330
328	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
…		…
332	if (display)	335	if (display)
333	{	336	{
334	#if USE_XIM	337	#if USE_XIM
335	im_ev.stop (display);	338	im_ev.stop (display);
336	#endif	339	#endif
337	#if HAVE_SCROLLBARS
338	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
339	#endif
340	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
341	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
342	#endif	343	#endif
343	incr_ev.stop ();	344	incr_ev.stop ();
344	termwin_ev.stop (display);	345	termwin_ev.stop (display);
345	vt_ev.stop (display);	346	vt_ev.stop (display);
346	}	347	}
347		348
348	check_ev.stop ();	349	flush_ev.stop ();
349	pty_ev.stop ();	350	pty_ev.stop ();
350	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
351	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
352	#endif	353	#endif
353	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
361	#endif	362	#endif
362	#ifdef POINTER_BLANK	363	#ifdef POINTER_BLANK
363	pointer_ev.stop ();	364	pointer_ev.stop ();
364	#endif	365	#endif
365		366
366	destroy_ev.start (0);	367	destroy_ev.start ();
367	}	368	}
368		369
369	void	370	void
370	rxvt_term::destroy_cb (time_watcher &w)	371	rxvt_term::destroy_cb (ev::idle &w, int revents)
371	{	372	{
372	make_current ();	373	make_current ();
373		374
374	delete this;	375	delete this;
375	}	376	}
…		…
429	else	430	else
430	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431	mesg, BUFSIZ);	432	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433	}	434	}
434	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435	mesg, BUFSIZ);	436	mesg, BUFSIZ);
436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437	}	438	}
438	#endif	439	#endif
439		440
…		…
463	DisplayString (display));	464	DisplayString (display));
464	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
465	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
466	}	467	}
467		468
468	/----------------------------------------------------------------------/
469	bool
470	rxvt_term::init (int argc, const char const argv, stringvec *envv)
471	{
472	this->envv = envv;
473
474	SET_R (this);
475	set_locale ("");
476	set_environ (envv); // few things in X do not call setlocale :(
477
478	if (!init_vars ())
479	return false;
480
481	init_secondary ();
482
483	const char **cmd_argv = init_resources (argc, argv);
484
485	#ifdef KEYSYM_RESOURCE
486	keyboard->register_done ();
487	#endif
488
489	#ifdef HAVE_SCROLLBARS
490	if (option (Opt_scrollBar))
491	scrollBar.setIdle (); /* set existence for size calculations */
492	#endif
493
494	pty = ptytty::create ();
495
496	create_windows (argc, argv);
497
498	init_xlocale ();
499
500	scr_reset (); // initialize screen
501
502	#if 0
503	XSynchronize (dpy, True);
504	#endif
505
506	#ifdef HAVE_SCROLLBARS
507	if (option (Opt_scrollBar))
508	resize_scrollbar (); /* create and map scrollbar */
509	#endif
510	#ifdef HAVE_BG_PIXMAP
511	{
512	bgPixmap.set_target (this);
513
514	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))
516	{
517	bgPixmap.set_transparent ();
518	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif
522	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);
526
527	bgPixmap.set_root_pixmap ();
528	XSelectInput (dpy, display->root, PropertyChangeMask);
529	rootwin_ev.start (display, display->root);
530	}
531	#endif
532
533	#ifdef BG_IMAGE_FROM_FILE
534	if (rs[Rs_backgroundPixmap] != NULL)
535	{
536	const char *p = rs[Rs_backgroundPixmap];
537
538	if ((p = strchr (p, ';')) != NULL)
539	{
540	p++;
541	bgPixmap.set_geometry (p);
542	}
543	else
544	bgPixmap.set_defaultGeometry ();
545
546	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547	if (!bgPixmap.window_position_sensitive ())
548	update_background ();
549	}
550	#endif
551	}
552	#endif
553
554	#if ENABLE_PERL
555	rootwin_ev.start (display, display->root);
556	#endif
557
558	set_colorfgbg ();
559
560	init_command (cmd_argv);
561
562	free (cmd_argv);
563
564	if (pty->pty >= 0)
565	pty_ev.start (pty->pty, EVENT_READ);
566
567	check_ev.start ();
568
569	HOOK_INVOKE ((this, HOOK_START, DT_END));
570
571	#if ENABLE_XEMBED
572	if (rs[Rs_embed])
573	{
574	long info[2] = { 0, XEMBED_MAPPED };
575
576	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
577	32, PropModeReplace, (unsigned char *)&info, 2);
578	}
579	#endif
580
581	XMapWindow (dpy, vt);
582	XMapWindow (dpy, parent[0]);
583
584	return true;
585	}
586
587	static struct sig_handlers	469	static struct sig_handlers
588	{	470	{
589	sig_watcher sw_term, sw_int;	471	ev::sig sw_term, sw_int;
590		472
591	/*	473	/*
592	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
593	*/	475	*/
594	void	476	void sig_term (ev::sig &w, int revents);
595	sig_term (sig_watcher &w)	477
		478	sig_handlers ()
596	{	479	{
597	rxvt_emergency_cleanup ();	480	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
598	signal (w.signum, SIG_DFL);
599	kill (getpid (), w.signum);
600	}
601
602	sig_handlers ()
603	: sw_term (this, &sig_handlers::sig_term),
604	sw_int (this, &sig_handlers::sig_term)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605	{
606	}	482	}
607	} sig_handlers;	483	} sig_handlers;
608		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
609	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
610		494
611	void	495	void
612	rxvt_init ()	496	rxvt_init ()
613	{	497	{
614	ptytty::init ();	498	ptytty::init ();
		499
		500	if (!ev_default_loop (0))
		501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615		502
616	rxvt_environ = environ;	503	rxvt_environ = environ;
617		504
618	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
619	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
620		507
621	sig_handlers.sw_term.start (SIGTERM);	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622	sig_handlers.sw_int.start (SIGINT);	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
623		510
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
626		513
627	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
628	// TODO: handle this with exceptions and tolerate the memory loss	515	// TODO: handle this with exceptions and tolerate the memory loss
629	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
630		517
631	XrmInitialize ();	518	XrmInitialize ();
632	}
633
634	/* ------------------------------------------------------------------------- *
635	* MEMORY ALLOCATION WRAPPERS *
636	* ------------------------------------------------------------------------- */
637	void *
638	rxvt_malloc (size_t size)
639	{
640	void *p = malloc (size);
641
642	if (!p)
643	rxvt_fatal ("memory allocation failure. aborting.\n");
644
645	return p;
646	}
647
648	void *
649	rxvt_calloc (size_t number, size_t size)
650	{
651	void *p = calloc (number, size);
652
653	if (!p)
654	rxvt_fatal ("memory allocation failure. aborting.\n");
655
656	return p;
657	}
658
659	void *
660	rxvt_realloc (void *ptr, size_t size)
661	{
662	void *p = realloc (ptr, size);
663
664	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");
666
667	return p;
668	}	519	}
669		520
670	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
671	/*	522	/*
672	* window size/position calculations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
…		…
813	ws.ws_xpixel = width;	664	ws.ws_xpixel = width;
814	ws.ws_ypixel = height;	665	ws.ws_ypixel = height;
815	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
816		667
817	#if 0	668	#if 0
818	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	669	// TIOCSWINSZ is supposed to do this automatically and correctly
819	if (cmd_pid) /* force through to the command */	670	if (cmd_pid) /* force through to the command */
820	kill (-cmd_pid, SIGWINCH);	671	kill (-cmd_pid, SIGWINCH);
821	#endif	672	#endif
822	}	673	}
823		674
…		…
897	if (parent[0])	748	if (parent[0])
898	{	749	{
899	resize_all_windows (0, 0, 0);	750	resize_all_windows (0, 0, 0);
900	scr_remap_chars ();	751	scr_remap_chars ();
901	scr_touch (true);	752	scr_touch (true);
902	}	753	}
903		754
904	return true;	755	return true;
905	}	756	}
906		757
907	void	758	void
…		…
950	void	801	void
951	rxvt_term::set_window_color (int idx, const char *color)	802	rxvt_term::set_window_color (int idx, const char *color)
952	{	803	{
953	#ifdef XTERM_COLOR_CHANGE	804	#ifdef XTERM_COLOR_CHANGE
954	rxvt_color xcol;	805	rxvt_color xcol;
955	int i;	806
956
957	if (color == NULL \|\| *color == '\0')	807	if (color == NULL \|\| *color == '\0')
958	return;	808	return;
959		809
960	color = strdup (color);	810	color = strdup (color);
961	allocated.push_back ((void *)color);	811	allocated.push_back ((void *)color);
962	rs[Rs_color + idx] = color;	812	rs[Rs_color + idx] = color;
963		813
964	/* handle color aliases */	814	/* handle color aliases */
965	if (isdigit (*color))	815	if (isdigit (*color))
966	{	816	{
967	i = atoi (color);	817	int i = atoi (color);
968		818
969	if (i >= 8 && i <= 15)	819	if (i >= 8 && i <= 15)
		820	{
970	{ /* bright colors */	821	/* bright colors */
971	i -= 8;
972	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	822	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973	goto done;	823	goto done;
974	}	824	}
975		825
976	if (i >= 0 && i <= 7)	826	if (i >= 0 && i <= 7)
		827	{
977	{ /* normal colors */	828	/* normal colors */
978	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	829	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979	goto done;	830	goto done;
980	}	831	}
981	}	832	}
982		833
…		…
987	* so just keep gobbling up the colormap	838	* so just keep gobbling up the colormap
988	*/	839	*/
989		840
990	pix_colors_focused[idx] = xcol;	841	pix_colors_focused[idx] = xcol;
991		842
992	/* XSetWindowAttributes attr; */
993	/* Cursor cursor; */
994	done:	843	done:
995	/TODO: handle Color_BD, scrollbar background, etc. /	844	/TODO: handle Color_BD, scrollbar background, etc. /
996		845
997	update_fade_color (idx);	846	update_fade_color (idx);
998	recolour_cursor ();	847	recolour_cursor ();
999	scr_recolour ();	848	scr_recolour ();
1000	#endif /* XTERM_COLOR_CHANGE */	849	#endif /* XTERM_COLOR_CHANGE */
1001	}	850	}
1002		851
1003	void	852	void
1004	rxvt_term::recolour_cursor ()	853	rxvt_term::recolour_cursor ()
1005	{	854	{
…		…
1022	*/	871	*/
1023	void	872	void
1024	rxvt_term::set_colorfgbg ()	873	rxvt_term::set_colorfgbg ()
1025	{	874	{
1026	unsigned int i;	875	unsigned int i;
1027	const char *xpmb = "\0";	876	const char *xpmb = "";
1028	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	877	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029		878
1030	strcpy (fstr, "default");	879	strcpy (fstr, "default");
1031	strcpy (bstr, "default");	880	strcpy (bstr, "default");
1032	for (i = Color_Black; i <= Color_White; i++)	881	for (i = Color_Black; i <= Color_White; i++)
…		…
1342	if (term->rs[Rs_imLocale])	1191	if (term->rs[Rs_imLocale])
1343	SET_LOCALE (term->locale);	1192	SET_LOCALE (term->locale);
1344	}	1193	}
1345	else	1194	else
1346	str = (void *)text->string.wide_char;	1195	str = (void *)text->string.wide_char;
1347		1196
1348	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349	DT_INT, call_data->caret,	1198	DT_INT, call_data->caret,
1350	DT_INT, call_data->chg_first,	1199	DT_INT, call_data->chg_first,
1351	DT_INT, call_data->chg_length,	1200	DT_INT, call_data->chg_length,
1352	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,
…		…
1671		1520
1672	if (input_style & XIMPreeditPosition)	1521	if (input_style & XIMPreeditPosition)
1673	{	1522	{
1674	im_set_size (preedit_rect);	1523	im_set_size (preedit_rect);
1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1524	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676		1525
1677	XSetICValues (Input_Context,	1526	XSetICValues (Input_Context,
1678	XNPreeditAttributes, preedit_attr, NULL);	1527	XNPreeditAttributes, preedit_attr, NULL);
1679	}	1528	}
1680	else	1529	else
1681	{	1530	{
…		…
1698	XFree (status_attr);	1547	XFree (status_attr);
1699	}	1548	}
1700		1549
1701	XFree (preedit_attr);	1550	XFree (preedit_attr);
1702	}	1551	}
1703	#endif /* USE_XIM */	1552	#endif /* USE_XIM */
1704		1553
1705	void	1554	void
1706	rxvt_term::get_window_origin (int &x, int &y)	1555	rxvt_term::get_window_origin (int &x, int &y)
1707	{	1556	{
1708	Window cr;	1557	Window cr;
1709	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1711	}	1560	}
1712		1561
1713	Pixmap	1562	Pixmap
1714	rxvt_term::get_pixmap_property (int prop_id)	1563	rxvt_term::get_pixmap_property (int prop_id)
1715	{	1564	{
…		…
1722	unsigned char *prop = NULL;	1571	unsigned char *prop = NULL;
1723	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725	&nitems, &bytes_after, &prop);	1574	&nitems, &bytes_after, &prop);
1726	if (result == Success && prop && atype == XA_PIXMAP)	1575	if (result == Success && prop && atype == XA_PIXMAP)
1727	{
1728	return (Pixmap )prop;	1576	return (Pixmap )prop;
1729	}
1730	}	1577	}
		1578
1731	return None;	1579	return None;
1732	}	1580	}
1733		1581
1734	#ifdef HAVE_BG_PIXMAP	1582	#ifdef HAVE_BG_PIXMAP
1735	int	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
1736	rxvt_term::update_background ()	1594	rxvt_term::update_background ()
1737	{	1595	{
		1596	if (update_background_ev.is_active ())
		1597	return;
		1598
1738	bgPixmap.invalidate ();	1599	bgPixmap.invalidate ();
1739		1600
1740	/* no chance of real time refresh if we are blurring ! */	1601	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1741	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1602
		1603	if (to_wait <= 0.)
1742	bgPixmap.render ();	1604	bgPixmap.render ();
1743	else	1605	else
1744	{	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
1745	update_background_ev.stop ();	1614	update_background_ev.stop ();
1746	if (!bgPixmap.need_client_side_rendering())
1747	update_background_ev.start (NOW + .05);
1748	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749	update_background_ev.start (NOW + .2); /* very slow !!! */
1750	else
1751	update_background_ev.start (NOW + .07);
1752	}
1753	return 0;
1754	}
1755
1756	void
1757	rxvt_term::update_background_cb (time_watcher &w)
1758	{
1759	bgPixmap.render ();	1615	bgPixmap.render ();
		1616	refresh_check ();
1760	}	1617	}
1761		1618
1762	#endif /* HAVE_BG_PIXMAP */	1619	#endif /* HAVE_BG_PIXMAP */
1763		1620
1764	/----------------------- 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.253 by ayin, Mon Oct 15 07:33:48 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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.304 by ayin, Wed Feb 6 12:05:35 2008 UTC