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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.254 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 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-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 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
…		…
93	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
94		92
95	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)
96	{	94	{
97	compose_char *cc;	95	compose_char *cc;
98		96
99	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
100	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
101	cc = (*this)[c1];	99	cc = (*this)[c1];
102	while (cc)	100	while (cc)
103	{	101	{
…		…
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
161	#if HAVE_BG_PIXMAP
162	update_background_ev(this, &rxvt_term::update_background_cb),
163	#endif	176	#endif
164	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
165	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166	#endif	179	#endif
167	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
168	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
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	182	#endif
182	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
183	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif	185	#endif
185	#ifdef USE_XIM
186	im_ev (this, &rxvt_term::im_cb),
187	#endif
188	#ifndef NO_BELL	186	#ifndef NO_BELL
189	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190	#endif	188	#endif
191	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198	incr_ev (this, &rxvt_term::incr_cb)	196
199	{
200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201		198
202	termlist.push_back (this);	199	termlist.push_back (this);
203		200
204	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
279	}	276	}
280		277
281	clear ();	278	clear ();
282	}	279	}
283		280
284	delete [] pix_colors_focused;	281	#ifdef HAVE_BG_PIXMAP
285	#if OFF_FOCUS_FADING	282	bgPixmap.destroy ();
286	delete [] pix_colors_unfocused;
287	#endif	283	#endif
288		284	display->flush (); /* ideally .put should do this */
289	displays.put (display);	285	displays.put (display);
290		286
291	scr_release ();	287	scr_release ();
292		288
293	/* clear all resources */	289	/* clear all resources */
…		…
306	delete argv;	302	delete argv;
307		303
308	#ifdef KEYSYM_RESOURCE	304	#ifdef KEYSYM_RESOURCE
309	delete keyboard;	305	delete keyboard;
310	#endif	306	#endif
		307	#ifndef NO_RESOURCES
		308	XrmDestroyDatabase (option_db);
		309	#endif
311	}	310	}
312		311
313	// child has exited, usually destroys	312	// child has exited, usually destroys
314	void	313	void
315	rxvt_term::child_cb (child_watcher &w, int status)	314	rxvt_term::child_cb (ev::child &w, int status)
316	{	315	{
317	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	316	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318		317
319	cmd_pid = 0;	318	cmd_pid = 0;
320		319
…		…
323	}	322	}
324		323
325	void	324	void
326	rxvt_term::destroy ()	325	rxvt_term::destroy ()
327	{	326	{
328	if (destroy_ev.active)	327	if (destroy_ev.is_active ())
329	return;	328	return;
330		329
331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	330	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332		331
333	#if ENABLE_OVERLAY	332	#if ENABLE_OVERLAY
…		…
348	incr_ev.stop ();	347	incr_ev.stop ();
349	termwin_ev.stop (display);	348	termwin_ev.stop (display);
350	vt_ev.stop (display);	349	vt_ev.stop (display);
351	}	350	}
352		351
353	check_ev.stop ();	352	flush_ev.stop ();
354	pty_ev.stop ();	353	pty_ev.stop ();
355	#ifdef CURSOR_BLINK	354	#ifdef CURSOR_BLINK
356	cursor_blink_ev.stop ();	355	cursor_blink_ev.stop ();
357	#endif	356	#endif
358	#ifdef TEXT_BLINK	357	#ifdef TEXT_BLINK
…		…
366	#endif	365	#endif
367	#ifdef POINTER_BLANK	366	#ifdef POINTER_BLANK
368	pointer_ev.stop ();	367	pointer_ev.stop ();
369	#endif	368	#endif
370		369
371	destroy_ev.start (0);	370	destroy_ev.start ();
372	}	371	}
373		372
374	void	373	void
375	rxvt_term::destroy_cb (time_watcher &w)	374	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	375	{
377	make_current ();	376	make_current ();
378		377
379	delete this;	378	delete this;
380	}	379	}
…		…
434	else	433	else
435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	434	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436	mesg, BUFSIZ);	435	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438	}	437	}
439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	438	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440	mesg, BUFSIZ);	439	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442	}	441	}
443	#endif	442	#endif
444		443
…		…
469	rxvt_emergency_cleanup ();	468	rxvt_emergency_cleanup ();
470	_exit (EXIT_FAILURE);	469	_exit (EXIT_FAILURE);
471	}	470	}
472		471
473	/----------------------------------------------------------------------/	472	/----------------------------------------------------------------------/
474	bool	473	void
475	rxvt_term::init (int argc, const char const argv, stringvec *envv)	474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
476	{	475	{
477	this->envv = envv;	476	this->envv = envv;
478		477
479	SET_R (this);	478	SET_R (this);
480	set_locale ("");	479	set_locale ("");
481	set_environ (envv); // few things in X do not call setlocale :(	480	set_environ (envv); // few things in X do not call setlocale :(
482		481
483	if (!init_vars ())	482	init_vars ();
484	return false;
485		483
486	init_secondary ();	484	init_secondary ();
487		485
488	const char **cmd_argv = init_resources (argc, argv);	486	const char **cmd_argv = init_resources (argc, argv);
489		487
…		…
513	resize_scrollbar (); /* create and map scrollbar */	511	resize_scrollbar (); /* create and map scrollbar */
514	#endif	512	#endif
515	#ifdef HAVE_BG_PIXMAP	513	#ifdef HAVE_BG_PIXMAP
516	{	514	{
517	bgPixmap.set_target (this);	515	bgPixmap.set_target (this);
		516	bgPixmap.invalidate ();
518		517
519	#ifdef ENABLE_TRANSPARENCY	518	#ifdef ENABLE_TRANSPARENCY
520	if (option (Opt_transparent))	519	if (option (Opt_transparent))
521	{	520	{
522	bgPixmap.set_transparent ();	521	bgPixmap.set_transparent ();
		522
523	#ifdef HAVE_AFTERIMAGE	523	#ifdef HAVE_AFTERIMAGE
524	if (rs [Rs_blurradius])	524	if (rs [Rs_blurradius])
525	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	525	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526	#endif	526	#endif
527	if (ISSET_PIXCOLOR (Color_tint))	527	if (ISSET_PIXCOLOR (Color_tint))
528	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	528	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		529
529	if (rs [Rs_shade])	530	if (rs [Rs_shade])
530	bgPixmap.set_shade (rs [Rs_shade]);	531	bgPixmap.set_shade (rs [Rs_shade]);
531		532
532	bgPixmap.set_root_pixmap ();	533	bgPixmap.set_root_pixmap ();
533	XSelectInput (dpy, display->root, PropertyChangeMask);	534	XSelectInput (dpy, display->root, PropertyChangeMask);
534	rootwin_ev.start (display, display->root);	535	rootwin_ev.start (display, display->root);
535	}	536	}
536	#endif	537	#endif
537		538
538	#ifdef BG_IMAGE_FROM_FILE	539	#ifdef BG_IMAGE_FROM_FILE
539	if (rs[Rs_backgroundPixmap] != NULL)	540	if (rs[Rs_backgroundPixmap])
540	{	541	{
541	const char *p = rs[Rs_backgroundPixmap];	542	const char *p = rs[Rs_backgroundPixmap];
542		543
543	if ((p = strchr (p, ';')) != NULL)	544	if ((p = strchr (p, ';')) != 0)
544	{	545	{
545	p++;	546	p++;
546	bgPixmap.set_geometry (p);	547	bgPixmap.set_geometry (p);
547	}	548	}
548	else	549	else
…		…
565	init_command (cmd_argv);	566	init_command (cmd_argv);
566		567
567	free (cmd_argv);	568	free (cmd_argv);
568		569
569	if (pty->pty >= 0)	570	if (pty->pty >= 0)
570	pty_ev.start (pty->pty, EVENT_READ);	571	pty_ev.start (pty->pty, ev::READ);
571
572	check_ev.start ();
573		572
574	HOOK_INVOKE ((this, HOOK_START, DT_END));	573	HOOK_INVOKE ((this, HOOK_START, DT_END));
575		574
576	#if ENABLE_XEMBED	575	#if ENABLE_XEMBED
577	if (rs[Rs_embed])	576	if (rs[Rs_embed])
…		…
584	#endif	583	#endif
585		584
586	XMapWindow (dpy, vt);	585	XMapWindow (dpy, vt);
587	XMapWindow (dpy, parent[0]);	586	XMapWindow (dpy, parent[0]);
588		587
589	return true;	588	refresh_check ();
590	}	589	}
591		590
592	static struct sig_handlers	591	static struct sig_handlers
593	{	592	{
594	sig_watcher sw_term, sw_int;	593	ev::sig sw_term, sw_int;
595		594
596	/*	595	/*
597	* Catch a fatal signal and tidy up before quitting	596	* Catch a fatal signal and tidy up before quitting
598	*/	597	*/
599	void	598	void sig_term (ev::sig &w, int revents);
600	sig_term (sig_watcher &w)	599
		600	sig_handlers ()
601	{	601	{
602	rxvt_emergency_cleanup ();	602	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603	signal (w.signum, SIG_DFL);
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)	603	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610	{
611	}	604	}
612	} sig_handlers;	605	} sig_handlers;
613		606
		607	void
		608	sig_handlers::sig_term (ev::sig &w, int revents)
		609	{
		610	rxvt_emergency_cleanup ();
		611	w.stop ();
		612	kill (getpid (), w.signum);
		613	}
		614
614	char **rxvt_environ; // startup environment	615	char **rxvt_environ; // startup environment
615		616
616	void	617	void
617	rxvt_init ()	618	rxvt_init ()
618	{	619	{
619	ptytty::init ();	620	ptytty::init ();
		621
		622	if (!ev_default_loop (0))
		623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620		624
621	rxvt_environ = environ;	625	rxvt_environ = environ;
622		626
623	signal (SIGHUP, SIG_IGN);	627	signal (SIGHUP, SIG_IGN);
624	signal (SIGPIPE, SIG_IGN);	628	signal (SIGPIPE, SIG_IGN);
625		629
626	sig_handlers.sw_term.start (SIGTERM);	630	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627	sig_handlers.sw_int.start (SIGINT);	631	sig_handlers.sw_int.start (SIGINT); ev_unref ();
628		632
629	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
630	/* signal (SIGURG, SIG_DFL); */	634	/* signal (SIGURG, SIG_DFL); */
631		635
632	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
633	// TODO: handle this with exceptions and tolerate the memory loss	637	// TODO: handle this with exceptions and tolerate the memory loss
634	XSetIOErrorHandler (rxvt_xioerror_handler);	638	XSetIOErrorHandler (rxvt_xioerror_handler);
635		639
636	XrmInitialize ();	640	XrmInitialize ();
637	}
638
639	/* ------------------------------------------------------------------------- *
640	* MEMORY ALLOCATION WRAPPERS *
641	* ------------------------------------------------------------------------- */
642	void *
643	rxvt_malloc (size_t size)
644	{
645	void *p = malloc (size);
646
647	if (!p)
648	rxvt_fatal ("memory allocation failure. aborting.\n");
649
650	return p;
651	}
652
653	void *
654	rxvt_calloc (size_t number, size_t size)
655	{
656	void *p = calloc (number, size);
657
658	if (!p)
659	rxvt_fatal ("memory allocation failure. aborting.\n");
660
661	return p;
662	}
663
664	void *
665	rxvt_realloc (void *ptr, size_t size)
666	{
667	void *p = realloc (ptr, size);
668
669	if (!p)
670	rxvt_fatal ("memory allocation failure. aborting.\n");
671
672	return p;
673	}	641	}
674		642
675	/----------------------------------------------------------------------/	643	/----------------------------------------------------------------------/
676	/*	644	/*
677	* window size/position calculations for XSizeHint and other storage.	645	* window size/position calculations for XSizeHint and other storage.
…		…
818	ws.ws_xpixel = width;	786	ws.ws_xpixel = width;
819	ws.ws_ypixel = height;	787	ws.ws_ypixel = height;
820	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	788	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
821		789
822	#if 0	790	#if 0
823	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	791	// TIOCSWINSZ is supposed to do this automatically and correctly
824	if (cmd_pid) /* force through to the command */	792	if (cmd_pid) /* force through to the command */
825	kill (-cmd_pid, SIGWINCH);	793	kill (-cmd_pid, SIGWINCH);
826	#endif	794	#endif
827	}	795	}
828		796
…		…
902	if (parent[0])	870	if (parent[0])
903	{	871	{
904	resize_all_windows (0, 0, 0);	872	resize_all_windows (0, 0, 0);
905	scr_remap_chars ();	873	scr_remap_chars ();
906	scr_touch (true);	874	scr_touch (true);
907	}	875	}
908		876
909	return true;	877	return true;
910	}	878	}
911		879
912	void	880	void
…		…
956	rxvt_term::set_window_color (int idx, const char *color)	924	rxvt_term::set_window_color (int idx, const char *color)
957	{	925	{
958	#ifdef XTERM_COLOR_CHANGE	926	#ifdef XTERM_COLOR_CHANGE
959	rxvt_color xcol;	927	rxvt_color xcol;
960	int i;	928	int i;
961		929
962	if (color == NULL \|\| *color == '\0')	930	if (color == NULL \|\| *color == '\0')
963	return;	931	return;
964		932
965	color = strdup (color);	933	color = strdup (color);
966	allocated.push_back ((void *)color);	934	allocated.push_back ((void *)color);
…		…
970	if (isdigit (*color))	938	if (isdigit (*color))
971	{	939	{
972	i = atoi (color);	940	i = atoi (color);
973		941
974	if (i >= 8 && i <= 15)	942	if (i >= 8 && i <= 15)
		943	{
975	{ /* bright colors */	944	/* bright colors */
976	i -= 8;
977	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978	goto done;	946	goto done;
979	}	947	}
980		948
981	if (i >= 0 && i <= 7)	949	if (i >= 0 && i <= 7)
		950	{
982	{ /* normal colors */	951	/* normal colors */
983	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	952	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984	goto done;	953	goto done;
985	}	954	}
986	}	955	}
987		956
…		…
992	* so just keep gobbling up the colormap	961	* so just keep gobbling up the colormap
993	*/	962	*/
994		963
995	pix_colors_focused[idx] = xcol;	964	pix_colors_focused[idx] = xcol;
996		965
997	/* XSetWindowAttributes attr; */
998	/* Cursor cursor; */
999	done:	966	done:
1000	/TODO: handle Color_BD, scrollbar background, etc. /	967	/TODO: handle Color_BD, scrollbar background, etc. /
1001		968
1002	update_fade_color (idx);	969	update_fade_color (idx);
1003	recolour_cursor ();	970	recolour_cursor ();
1004	scr_recolour ();	971	scr_recolour ();
1005	#endif /* XTERM_COLOR_CHANGE */	972	#endif /* XTERM_COLOR_CHANGE */
1006	}	973	}
1007		974
1008	void	975	void
1009	rxvt_term::recolour_cursor ()	976	rxvt_term::recolour_cursor ()
1010	{	977	{
…		…
1027	*/	994	*/
1028	void	995	void
1029	rxvt_term::set_colorfgbg ()	996	rxvt_term::set_colorfgbg ()
1030	{	997	{
1031	unsigned int i;	998	unsigned int i;
1032	const char *xpmb = "\0";	999	const char *xpmb = "";
1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1000	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034		1001
1035	strcpy (fstr, "default");	1002	strcpy (fstr, "default");
1036	strcpy (bstr, "default");	1003	strcpy (bstr, "default");
1037	for (i = Color_Black; i <= Color_White; i++)	1004	for (i = Color_Black; i <= Color_White; i++)
…		…
1347	if (term->rs[Rs_imLocale])	1314	if (term->rs[Rs_imLocale])
1348	SET_LOCALE (term->locale);	1315	SET_LOCALE (term->locale);
1349	}	1316	}
1350	else	1317	else
1351	str = (void *)text->string.wide_char;	1318	str = (void *)text->string.wide_char;
1352		1319
1353	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1320	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354	DT_INT, call_data->caret,	1321	DT_INT, call_data->caret,
1355	DT_INT, call_data->chg_first,	1322	DT_INT, call_data->chg_first,
1356	DT_INT, call_data->chg_length,	1323	DT_INT, call_data->chg_length,
1357	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1324	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1676		1643
1677	if (input_style & XIMPreeditPosition)	1644	if (input_style & XIMPreeditPosition)
1678	{	1645	{
1679	im_set_size (preedit_rect);	1646	im_set_size (preedit_rect);
1680	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1647	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681		1648
1682	XSetICValues (Input_Context,	1649	XSetICValues (Input_Context,
1683	XNPreeditAttributes, preedit_attr, NULL);	1650	XNPreeditAttributes, preedit_attr, NULL);
1684	}	1651	}
1685	else	1652	else
1686	{	1653	{
…		…
1703	XFree (status_attr);	1670	XFree (status_attr);
1704	}	1671	}
1705		1672
1706	XFree (preedit_attr);	1673	XFree (preedit_attr);
1707	}	1674	}
1708	#endif /* USE_XIM */	1675	#endif /* USE_XIM */
1709		1676
1710	void	1677	void
1711	rxvt_term::get_window_origin (int &x, int &y)	1678	rxvt_term::get_window_origin (int &x, int &y)
1712	{	1679	{
1713	Window cr;	1680	Window cr;
1714	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1681	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1715	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1682	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1716	}	1683	}
1717		1684
1718	Pixmap	1685	Pixmap
1719	rxvt_term::get_pixmap_property (int prop_id)	1686	rxvt_term::get_pixmap_property (int prop_id)
1720	{	1687	{
…		…
1727	unsigned char *prop = NULL;	1694	unsigned char *prop = NULL;
1728	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1695	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1729	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1696	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730	&nitems, &bytes_after, &prop);	1697	&nitems, &bytes_after, &prop);
1731	if (result == Success && prop && atype == XA_PIXMAP)	1698	if (result == Success && prop && atype == XA_PIXMAP)
1732	{
1733	return (Pixmap )prop;	1699	return (Pixmap )prop;
1734	}
1735	}	1700	}
		1701
1736	return None;	1702	return None;
1737	}	1703	}
1738		1704
1739	#ifdef HAVE_BG_PIXMAP	1705	#ifdef HAVE_BG_PIXMAP
1740	int	1706	# if TRACE_PIXMAPS
		1707	# undef update_background
		1708	void
		1709	rxvt_term::trace_update_background (const char *file, int line)
		1710	{
		1711	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1712	update_background ();
		1713	}
		1714	# endif
		1715
		1716	void
1741	rxvt_term::update_background ()	1717	rxvt_term::update_background ()
1742	{	1718	{
		1719	if (update_background_ev.is_active ())
		1720	return;
		1721
1743	bgPixmap.invalidate ();	1722	bgPixmap.invalidate ();
1744		1723
1745	/* no chance of real time refresh if we are blurring ! */	1724	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1746	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1725
		1726	if (to_wait <= 0.)
1747	bgPixmap.render ();	1727	bgPixmap.render ();
1748	else	1728	else
1749	{	1729	update_background_ev.start (to_wait);
		1730	}
		1731
		1732	void
		1733	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1734	{
		1735	make_current ();
		1736
1750	update_background_ev.stop ();	1737	update_background_ev.stop ();
1751	if (!bgPixmap.need_client_side_rendering())
1752	update_background_ev.start (NOW + .05);
1753	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754	update_background_ev.start (NOW + .2); /* very slow !!! */
1755	else
1756	update_background_ev.start (NOW + .07);
1757	}
1758	return 0;
1759	}
1760
1761	void
1762	rxvt_term::update_background_cb (time_watcher &w)
1763	{
1764	bgPixmap.render ();	1738	bgPixmap.render ();
		1739	refresh_check ();
1765	}	1740	}
1766		1741
1767	#endif /* HAVE_BG_PIXMAP */	1742	#endif /* HAVE_BG_PIXMAP */
1768		1743
1769	/----------------------- end-of-file (C source) -----------------------/	1744	/----------------------- 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.254 by ayin, Thu Oct 18 09:11:42 2007 UTC vs. Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.254 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC