[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.296 by sasha, Fri Jan 4 21:25:57 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 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
156	#if HAVE_BG_PIXMAP
157	update_background_ev(this, &rxvt_term::update_background_cb),
158	#endif	176	#endif
159	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161	#endif	179	#endif
162	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
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	182	#endif
177	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	185	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	186	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	188	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	196
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		198
197	termlist.push_back (this);	199	termlist.push_back (this);
198		200
199	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
274	}	276	}
275		277
276	clear ();	278	clear ();
277	}	279	}
278		280
279	delete [] pix_colors_focused;	281	#ifdef HAVE_BG_PIXMAP
280	#if OFF_FOCUS_FADING	282	bgPixmap.destroy ();
281	delete [] pix_colors_unfocused;
282	#endif	283	#endif
283		284	display->flush (); /* ideally .put should do this */
284	displays.put (display);	285	displays.put (display);
285		286
286	scr_release ();	287	scr_release ();
287		288
288	/* clear all resources */	289	/* clear all resources */
…		…
301	delete argv;	302	delete argv;
302		303
303	#ifdef KEYSYM_RESOURCE	304	#ifdef KEYSYM_RESOURCE
304	delete keyboard;	305	delete keyboard;
305	#endif	306	#endif
		307	#ifndef NO_RESOURCES
		308	XrmDestroyDatabase (option_db);
		309	#endif
306	}	310	}
307		311
308	// child has exited, usually destroys	312	// child has exited, usually destroys
309	void	313	void
310	rxvt_term::child_cb (child_watcher &w, int status)	314	rxvt_term::child_cb (ev::child &w, int status)
311	{	315	{
312	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	316	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313		317
314	cmd_pid = 0;	318	cmd_pid = 0;
315		319
…		…
318	}	322	}
319		323
320	void	324	void
321	rxvt_term::destroy ()	325	rxvt_term::destroy ()
322	{	326	{
323	if (destroy_ev.active)	327	if (destroy_ev.is_active ())
324	return;	328	return;
325		329
326	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	330	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327		331
328	#if ENABLE_OVERLAY	332	#if ENABLE_OVERLAY
…		…
343	incr_ev.stop ();	347	incr_ev.stop ();
344	termwin_ev.stop (display);	348	termwin_ev.stop (display);
345	vt_ev.stop (display);	349	vt_ev.stop (display);
346	}	350	}
347		351
348	check_ev.stop ();	352	flush_ev.stop ();
349	pty_ev.stop ();	353	pty_ev.stop ();
350	#ifdef CURSOR_BLINK	354	#ifdef CURSOR_BLINK
351	cursor_blink_ev.stop ();	355	cursor_blink_ev.stop ();
352	#endif	356	#endif
353	#ifdef TEXT_BLINK	357	#ifdef TEXT_BLINK
…		…
361	#endif	365	#endif
362	#ifdef POINTER_BLANK	366	#ifdef POINTER_BLANK
363	pointer_ev.stop ();	367	pointer_ev.stop ();
364	#endif	368	#endif
365		369
366	destroy_ev.start (0);	370	destroy_ev.start ();
367	}	371	}
368		372
369	void	373	void
370	rxvt_term::destroy_cb (time_watcher &w)	374	rxvt_term::destroy_cb (ev::idle &w, int revents)
371	{	375	{
372	make_current ();	376	make_current ();
373		377
374	delete this;	378	delete this;
375	}	379	}
…		…
429	else	433	else
430	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	434	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431	mesg, BUFSIZ);	435	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433	}	437	}
434	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	438	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435	mesg, BUFSIZ);	439	mesg, BUFSIZ);
436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437	}	441	}
438	#endif	442	#endif
439		443
…		…
464	rxvt_emergency_cleanup ();	468	rxvt_emergency_cleanup ();
465	_exit (EXIT_FAILURE);	469	_exit (EXIT_FAILURE);
466	}	470	}
467		471
468	/----------------------------------------------------------------------/	472	/----------------------------------------------------------------------/
469	bool	473	void
470	rxvt_term::init (int argc, const char const argv, stringvec *envv)	474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
471	{	475	{
472	this->envv = envv;	476	this->envv = envv;
473		477
474	SET_R (this);	478	SET_R (this);
475	set_locale ("");	479	set_locale ("");
476	set_environ (envv); // few things in X do not call setlocale :(	480	set_environ (envv); // few things in X do not call setlocale :(
477		481
478	if (!init_vars ())	482	init_vars ();
479	return false;
480		483
481	init_secondary ();	484	init_secondary ();
482		485
483	const char **cmd_argv = init_resources (argc, argv);	486	const char **cmd_argv = init_resources (argc, argv);
484		487
…		…
513		516
514	#ifdef ENABLE_TRANSPARENCY	517	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))	518	if (option (Opt_transparent))
516	{	519	{
517	bgPixmap.set_transparent ();	520	bgPixmap.set_transparent ();
		521
518	#ifdef HAVE_AFTERIMAGE	522	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])	523	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	524	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif	525	#endif
522	if (ISSET_PIXCOLOR (Color_tint))	526	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	527	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		528
524	if (rs [Rs_shade])	529	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);	530	bgPixmap.set_shade (rs [Rs_shade]);
526		531
527	bgPixmap.set_root_pixmap ();	532	bgPixmap.set_root_pixmap ();
528	XSelectInput (dpy, display->root, PropertyChangeMask);	533	XSelectInput (dpy, display->root, PropertyChangeMask);
529	rootwin_ev.start (display, display->root);	534	rootwin_ev.start (display, display->root);
530	}	535	}
531	#endif	536	#endif
532		537
533	#ifdef BG_IMAGE_FROM_FILE	538	#ifdef BG_IMAGE_FROM_FILE
534	if (rs[Rs_backgroundPixmap] != NULL)	539	if (rs[Rs_backgroundPixmap])
535	{	540	{
536	const char *p = rs[Rs_backgroundPixmap];	541	const char *p = rs[Rs_backgroundPixmap];
537		542
538	if ((p = strchr (p, ';')) != NULL)	543	if ((p = strchr (p, ';')) != 0)
539	{	544	{
540	p++;	545	p++;
541	bgPixmap.set_geometry (p);	546	bgPixmap.set_geometry (p);
542	}	547	}
543	else	548	else
…		…
560	init_command (cmd_argv);	565	init_command (cmd_argv);
561		566
562	free (cmd_argv);	567	free (cmd_argv);
563		568
564	if (pty->pty >= 0)	569	if (pty->pty >= 0)
565	pty_ev.start (pty->pty, EVENT_READ);	570	pty_ev.start (pty->pty, ev::READ);
566
567	check_ev.start ();
568		571
569	HOOK_INVOKE ((this, HOOK_START, DT_END));	572	HOOK_INVOKE ((this, HOOK_START, DT_END));
570		573
571	#if ENABLE_XEMBED	574	#if ENABLE_XEMBED
572	if (rs[Rs_embed])	575	if (rs[Rs_embed])
…		…
578	}	581	}
579	#endif	582	#endif
580		583
581	XMapWindow (dpy, vt);	584	XMapWindow (dpy, vt);
582	XMapWindow (dpy, parent[0]);	585	XMapWindow (dpy, parent[0]);
583
584	return true;
585	}	586	}
586		587
587	static struct sig_handlers	588	static struct sig_handlers
588	{	589	{
589	sig_watcher sw_term, sw_int;	590	ev::sig sw_term, sw_int;
590		591
591	/*	592	/*
592	* Catch a fatal signal and tidy up before quitting	593	* Catch a fatal signal and tidy up before quitting
593	*/	594	*/
594	void	595	void sig_term (ev::sig &w, int revents);
595	sig_term (sig_watcher &w)	596
		597	sig_handlers ()
596	{	598	{
597	rxvt_emergency_cleanup ();	599	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)	600	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605	{
606	}	601	}
607	} sig_handlers;	602	} sig_handlers;
608		603
		604	void
		605	sig_handlers::sig_term (ev::sig &w, int revents)
		606	{
		607	rxvt_emergency_cleanup ();
		608	w.stop ();
		609	kill (getpid (), w.signum);
		610	}
		611
609	char **rxvt_environ; // startup environment	612	char **rxvt_environ; // startup environment
610		613
611	void	614	void
612	rxvt_init ()	615	rxvt_init ()
613	{	616	{
614	ptytty::init ();	617	ptytty::init ();
		618
		619	if (!ev_default_loop (0))
		620	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615		621
616	rxvt_environ = environ;	622	rxvt_environ = environ;
617		623
618	signal (SIGHUP, SIG_IGN);	624	signal (SIGHUP, SIG_IGN);
619	signal (SIGPIPE, SIG_IGN);	625	signal (SIGPIPE, SIG_IGN);
620		626
621	sig_handlers.sw_term.start (SIGTERM);	627	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622	sig_handlers.sw_int.start (SIGINT);	628	sig_handlers.sw_int.start (SIGINT); ev_unref ();
623		629
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	630	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	631	/* signal (SIGURG, SIG_DFL); */
626		632
627	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	633	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
628	// TODO: handle this with exceptions and tolerate the memory loss	634	// TODO: handle this with exceptions and tolerate the memory loss
629	XSetIOErrorHandler (rxvt_xioerror_handler);	635	XSetIOErrorHandler (rxvt_xioerror_handler);
630		636
631	XrmInitialize ();	637	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	}	638	}
669		639
670	/----------------------------------------------------------------------/	640	/----------------------------------------------------------------------/
671	/*	641	/*
672	* window size/position calculations for XSizeHint and other storage.	642	* window size/position calculations for XSizeHint and other storage.
…		…
813	ws.ws_xpixel = width;	783	ws.ws_xpixel = width;
814	ws.ws_ypixel = height;	784	ws.ws_ypixel = height;
815	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	785	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
816		786
817	#if 0	787	#if 0
818	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	788	// TIOCSWINSZ is supposed to do this automatically and correctly
819	if (cmd_pid) /* force through to the command */	789	if (cmd_pid) /* force through to the command */
820	kill (-cmd_pid, SIGWINCH);	790	kill (-cmd_pid, SIGWINCH);
821	#endif	791	#endif
822	}	792	}
823		793
…		…
897	if (parent[0])	867	if (parent[0])
898	{	868	{
899	resize_all_windows (0, 0, 0);	869	resize_all_windows (0, 0, 0);
900	scr_remap_chars ();	870	scr_remap_chars ();
901	scr_touch (true);	871	scr_touch (true);
902	}	872	}
903		873
904	return true;	874	return true;
905	}	875	}
906		876
907	void	877	void
…		…
951	rxvt_term::set_window_color (int idx, const char *color)	921	rxvt_term::set_window_color (int idx, const char *color)
952	{	922	{
953	#ifdef XTERM_COLOR_CHANGE	923	#ifdef XTERM_COLOR_CHANGE
954	rxvt_color xcol;	924	rxvt_color xcol;
955	int i;	925	int i;
956		926
957	if (color == NULL \|\| *color == '\0')	927	if (color == NULL \|\| *color == '\0')
958	return;	928	return;
959		929
960	color = strdup (color);	930	color = strdup (color);
961	allocated.push_back ((void *)color);	931	allocated.push_back ((void *)color);
…		…
965	if (isdigit (*color))	935	if (isdigit (*color))
966	{	936	{
967	i = atoi (color);	937	i = atoi (color);
968		938
969	if (i >= 8 && i <= 15)	939	if (i >= 8 && i <= 15)
		940	{
970	{ /* bright colors */	941	/* bright colors */
971	i -= 8;
972	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	942	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973	goto done;	943	goto done;
974	}	944	}
975		945
976	if (i >= 0 && i <= 7)	946	if (i >= 0 && i <= 7)
		947	{
977	{ /* normal colors */	948	/* normal colors */
978	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	949	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979	goto done;	950	goto done;
980	}	951	}
981	}	952	}
982		953
…		…
987	* so just keep gobbling up the colormap	958	* so just keep gobbling up the colormap
988	*/	959	*/
989		960
990	pix_colors_focused[idx] = xcol;	961	pix_colors_focused[idx] = xcol;
991		962
992	/* XSetWindowAttributes attr; */
993	/* Cursor cursor; */
994	done:	963	done:
995	/TODO: handle Color_BD, scrollbar background, etc. /	964	/TODO: handle Color_BD, scrollbar background, etc. /
996		965
997	update_fade_color (idx);	966	update_fade_color (idx);
998	recolour_cursor ();	967	recolour_cursor ();
999	scr_recolour ();	968	scr_recolour ();
1000	#endif /* XTERM_COLOR_CHANGE */	969	#endif /* XTERM_COLOR_CHANGE */
1001	}	970	}
1002		971
1003	void	972	void
1004	rxvt_term::recolour_cursor ()	973	rxvt_term::recolour_cursor ()
1005	{	974	{
…		…
1022	*/	991	*/
1023	void	992	void
1024	rxvt_term::set_colorfgbg ()	993	rxvt_term::set_colorfgbg ()
1025	{	994	{
1026	unsigned int i;	995	unsigned int i;
1027	const char *xpmb = "\0";	996	const char *xpmb = "";
1028	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	997	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029		998
1030	strcpy (fstr, "default");	999	strcpy (fstr, "default");
1031	strcpy (bstr, "default");	1000	strcpy (bstr, "default");
1032	for (i = Color_Black; i <= Color_White; i++)	1001	for (i = Color_Black; i <= Color_White; i++)
…		…
1342	if (term->rs[Rs_imLocale])	1311	if (term->rs[Rs_imLocale])
1343	SET_LOCALE (term->locale);	1312	SET_LOCALE (term->locale);
1344	}	1313	}
1345	else	1314	else
1346	str = (void *)text->string.wide_char;	1315	str = (void *)text->string.wide_char;
1347		1316
1348	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1317	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349	DT_INT, call_data->caret,	1318	DT_INT, call_data->caret,
1350	DT_INT, call_data->chg_first,	1319	DT_INT, call_data->chg_first,
1351	DT_INT, call_data->chg_length,	1320	DT_INT, call_data->chg_length,
1352	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1321	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1671		1640
1672	if (input_style & XIMPreeditPosition)	1641	if (input_style & XIMPreeditPosition)
1673	{	1642	{
1674	im_set_size (preedit_rect);	1643	im_set_size (preedit_rect);
1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1644	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676		1645
1677	XSetICValues (Input_Context,	1646	XSetICValues (Input_Context,
1678	XNPreeditAttributes, preedit_attr, NULL);	1647	XNPreeditAttributes, preedit_attr, NULL);
1679	}	1648	}
1680	else	1649	else
1681	{	1650	{
…		…
1698	XFree (status_attr);	1667	XFree (status_attr);
1699	}	1668	}
1700		1669
1701	XFree (preedit_attr);	1670	XFree (preedit_attr);
1702	}	1671	}
1703	#endif /* USE_XIM */	1672	#endif /* USE_XIM */
1704		1673
1705	void	1674	void
1706	rxvt_term::get_window_origin (int &x, int &y)	1675	rxvt_term::get_window_origin (int &x, int &y)
1707	{	1676	{
1708	Window cr;	1677	Window cr;
1709	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1678	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1679	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1711	}	1680	}
1712		1681
1713	Pixmap	1682	Pixmap
1714	rxvt_term::get_pixmap_property (int prop_id)	1683	rxvt_term::get_pixmap_property (int prop_id)
1715	{	1684	{
…		…
1722	unsigned char *prop = NULL;	1691	unsigned char *prop = NULL;
1723	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1692	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1693	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725	&nitems, &bytes_after, &prop);	1694	&nitems, &bytes_after, &prop);
1726	if (result == Success && prop && atype == XA_PIXMAP)	1695	if (result == Success && prop && atype == XA_PIXMAP)
1727	{
1728	return (Pixmap )prop;	1696	return (Pixmap )prop;
1729	}
1730	}	1697	}
		1698
1731	return None;	1699	return None;
1732	}	1700	}
1733		1701
1734	#ifdef HAVE_BG_PIXMAP	1702	#ifdef HAVE_BG_PIXMAP
1735	int	1703	# if TRACE_PIXMAPS
		1704	# undef update_background
		1705	void
		1706	rxvt_term::trace_update_background (const char *file, int line)
		1707	{
		1708	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1709	update_background ();
		1710	}
		1711	# endif
		1712
		1713	void
1736	rxvt_term::update_background ()	1714	rxvt_term::update_background ()
1737	{	1715	{
		1716	if (update_background_ev.is_active ())
		1717	return;
		1718
1738	bgPixmap.invalidate ();	1719	bgPixmap.invalidate ();
1739		1720
1740	/* no chance of real time refresh if we are blurring ! */	1721	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1741	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1722
		1723	if ( to_wait <= 0. )
1742	bgPixmap.render ();	1724	bgPixmap.render ();
1743	else	1725	else
1744	{	1726	update_background_ev.start (to_wait);
		1727	}
		1728
		1729	void
		1730	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1731	{
		1732	make_current ();
		1733
1745	update_background_ev.stop ();	1734	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 ();	1735	bgPixmap.render ();
		1736	refresh_check ();
1760	}	1737	}
1761		1738
1762	#endif /* HAVE_BG_PIXMAP */	1739	#endif /* HAVE_BG_PIXMAP */
1763		1740
1764	/----------------------- end-of-file (C source) -----------------------/	1741	/----------------------- 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.296 by sasha, Fri Jan 4 21:25:57 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.296 by sasha, Fri Jan 4 21:25:57 2008 UTC