[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.292 by root, Mon Dec 24 10:58:09 2007 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
…		…
284	delete [] pix_colors_focused;	281	delete [] pix_colors_focused;
285	#if OFF_FOCUS_FADING	282	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;	283	delete [] pix_colors_unfocused;
287	#endif	284	#endif
288		285
		286	#ifdef HAVE_BG_PIXMAP
		287	bgPixmap.destroy ();
		288	#endif
		289	display->flush (); /* ideally .put should do this */
289	displays.put (display);	290	displays.put (display);
290		291
291	scr_release ();	292	scr_release ();
292		293
293	/* clear all resources */	294	/* clear all resources */
…		…
306	delete argv;	307	delete argv;
307		308
308	#ifdef KEYSYM_RESOURCE	309	#ifdef KEYSYM_RESOURCE
309	delete keyboard;	310	delete keyboard;
310	#endif	311	#endif
		312	#ifndef NO_RESOURCES
		313	XrmDestroyDatabase (option_db);
		314	#endif
311	}	315	}
312		316
313	// child has exited, usually destroys	317	// child has exited, usually destroys
314	void	318	void
315	rxvt_term::child_cb (child_watcher &w, int status)	319	rxvt_term::child_cb (ev::child &w, int status)
316	{	320	{
317	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	321	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318		322
319	cmd_pid = 0;	323	cmd_pid = 0;
320		324
…		…
323	}	327	}
324		328
325	void	329	void
326	rxvt_term::destroy ()	330	rxvt_term::destroy ()
327	{	331	{
328	if (destroy_ev.active)	332	if (destroy_ev.is_active ())
329	return;	333	return;
330		334
331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332		336
333	#if ENABLE_OVERLAY	337	#if ENABLE_OVERLAY
…		…
348	incr_ev.stop ();	352	incr_ev.stop ();
349	termwin_ev.stop (display);	353	termwin_ev.stop (display);
350	vt_ev.stop (display);	354	vt_ev.stop (display);
351	}	355	}
352		356
353	check_ev.stop ();	357	flush_ev.stop ();
354	pty_ev.stop ();	358	pty_ev.stop ();
355	#ifdef CURSOR_BLINK	359	#ifdef CURSOR_BLINK
356	cursor_blink_ev.stop ();	360	cursor_blink_ev.stop ();
357	#endif	361	#endif
358	#ifdef TEXT_BLINK	362	#ifdef TEXT_BLINK
…		…
366	#endif	370	#endif
367	#ifdef POINTER_BLANK	371	#ifdef POINTER_BLANK
368	pointer_ev.stop ();	372	pointer_ev.stop ();
369	#endif	373	#endif
370		374
371	destroy_ev.start (0);	375	destroy_ev.start ();
372	}	376	}
373		377
374	void	378	void
375	rxvt_term::destroy_cb (time_watcher &w)	379	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	380	{
377	make_current ();	381	make_current ();
378		382
379	delete this;	383	delete this;
380	}	384	}
…		…
434	else	438	else
435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436	mesg, BUFSIZ);	440	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438	}	442	}
439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440	mesg, BUFSIZ);	444	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442	}	446	}
443	#endif	447	#endif
444		448
…		…
469	rxvt_emergency_cleanup ();	473	rxvt_emergency_cleanup ();
470	_exit (EXIT_FAILURE);	474	_exit (EXIT_FAILURE);
471	}	475	}
472		476
473	/----------------------------------------------------------------------/	477	/----------------------------------------------------------------------/
474	bool	478	void
475	rxvt_term::init (int argc, const char const argv, stringvec *envv)	479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
476	{	480	{
477	this->envv = envv;	481	this->envv = envv;
478		482
479	SET_R (this);	483	SET_R (this);
480	set_locale ("");	484	set_locale ("");
481	set_environ (envv); // few things in X do not call setlocale :(	485	set_environ (envv); // few things in X do not call setlocale :(
482		486
483	if (!init_vars ())	487	init_vars ();
484	return false;
485		488
486	init_secondary ();	489	init_secondary ();
487		490
488	const char **cmd_argv = init_resources (argc, argv);	491	const char **cmd_argv = init_resources (argc, argv);
489		492
…		…
518		521
519	#ifdef ENABLE_TRANSPARENCY	522	#ifdef ENABLE_TRANSPARENCY
520	if (option (Opt_transparent))	523	if (option (Opt_transparent))
521	{	524	{
522	bgPixmap.set_transparent ();	525	bgPixmap.set_transparent ();
		526
523	#ifdef HAVE_AFTERIMAGE	527	#ifdef HAVE_AFTERIMAGE
524	if (rs [Rs_blurradius])	528	if (rs [Rs_blurradius])
525	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526	#endif	530	#endif
527	if (ISSET_PIXCOLOR (Color_tint))	531	if (ISSET_PIXCOLOR (Color_tint))
528	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		533
529	if (rs [Rs_shade])	534	if (rs [Rs_shade])
530	bgPixmap.set_shade (rs [Rs_shade]);	535	bgPixmap.set_shade (rs [Rs_shade]);
531		536
532	bgPixmap.set_root_pixmap ();	537	bgPixmap.set_root_pixmap ();
533	XSelectInput (dpy, display->root, PropertyChangeMask);	538	XSelectInput (dpy, display->root, PropertyChangeMask);
534	rootwin_ev.start (display, display->root);	539	rootwin_ev.start (display, display->root);
535	}	540	}
536	#endif	541	#endif
537		542
538	#ifdef BG_IMAGE_FROM_FILE	543	#ifdef BG_IMAGE_FROM_FILE
539	if (rs[Rs_backgroundPixmap] != NULL)	544	if (rs[Rs_backgroundPixmap])
540	{	545	{
541	const char *p = rs[Rs_backgroundPixmap];	546	const char *p = rs[Rs_backgroundPixmap];
542		547
543	if ((p = strchr (p, ';')) != NULL)	548	if ((p = strchr (p, ';')) != 0)
544	{	549	{
545	p++;	550	p++;
546	bgPixmap.set_geometry (p);	551	bgPixmap.set_geometry (p);
547	}	552	}
548	else	553	else
…		…
565	init_command (cmd_argv);	570	init_command (cmd_argv);
566		571
567	free (cmd_argv);	572	free (cmd_argv);
568		573
569	if (pty->pty >= 0)	574	if (pty->pty >= 0)
570	pty_ev.start (pty->pty, EVENT_READ);	575	pty_ev.start (pty->pty, ev::READ);
571
572	check_ev.start ();
573		576
574	HOOK_INVOKE ((this, HOOK_START, DT_END));	577	HOOK_INVOKE ((this, HOOK_START, DT_END));
575		578
576	#if ENABLE_XEMBED	579	#if ENABLE_XEMBED
577	if (rs[Rs_embed])	580	if (rs[Rs_embed])
…		…
583	}	586	}
584	#endif	587	#endif
585		588
586	XMapWindow (dpy, vt);	589	XMapWindow (dpy, vt);
587	XMapWindow (dpy, parent[0]);	590	XMapWindow (dpy, parent[0]);
588
589	return true;
590	}	591	}
591		592
592	static struct sig_handlers	593	static struct sig_handlers
593	{	594	{
594	sig_watcher sw_term, sw_int;	595	ev::sig sw_term, sw_int;
595		596
596	/*	597	/*
597	* Catch a fatal signal and tidy up before quitting	598	* Catch a fatal signal and tidy up before quitting
598	*/	599	*/
599	void	600	void sig_term (ev::sig &w, int revents);
600	sig_term (sig_watcher &w)	601
		602	sig_handlers ()
601	{	603	{
602	rxvt_emergency_cleanup ();	604	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)	605	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610	{
611	}	606	}
612	} sig_handlers;	607	} sig_handlers;
613		608
		609	void
		610	sig_handlers::sig_term (ev::sig &w, int revents)
		611	{
		612	rxvt_emergency_cleanup ();
		613	w.stop ();
		614	kill (getpid (), w.signum);
		615	}
		616
614	char **rxvt_environ; // startup environment	617	char **rxvt_environ; // startup environment
615		618
616	void	619	void
617	rxvt_init ()	620	rxvt_init ()
618	{	621	{
619	ptytty::init ();	622	ptytty::init ();
		623
		624	if (!ev_default_loop (0))
		625	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620		626
621	rxvt_environ = environ;	627	rxvt_environ = environ;
622		628
623	signal (SIGHUP, SIG_IGN);	629	signal (SIGHUP, SIG_IGN);
624	signal (SIGPIPE, SIG_IGN);	630	signal (SIGPIPE, SIG_IGN);
625		631
626	sig_handlers.sw_term.start (SIGTERM);	632	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627	sig_handlers.sw_int.start (SIGINT);	633	sig_handlers.sw_int.start (SIGINT); ev_unref ();
628		634
629	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	635	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
630	/* signal (SIGURG, SIG_DFL); */	636	/* signal (SIGURG, SIG_DFL); */
631		637
632	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	638	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
633	// TODO: handle this with exceptions and tolerate the memory loss	639	// TODO: handle this with exceptions and tolerate the memory loss
634	XSetIOErrorHandler (rxvt_xioerror_handler);	640	XSetIOErrorHandler (rxvt_xioerror_handler);
635		641
636	XrmInitialize ();	642	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	}	643	}
674		644
675	/----------------------------------------------------------------------/	645	/----------------------------------------------------------------------/
676	/*	646	/*
677	* window size/position calculations for XSizeHint and other storage.	647	* window size/position calculations for XSizeHint and other storage.
…		…
818	ws.ws_xpixel = width;	788	ws.ws_xpixel = width;
819	ws.ws_ypixel = height;	789	ws.ws_ypixel = height;
820	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	790	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
821		791
822	#if 0	792	#if 0
823	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	793	// TIOCSWINSZ is supposed to do this automatically and correctly
824	if (cmd_pid) /* force through to the command */	794	if (cmd_pid) /* force through to the command */
825	kill (-cmd_pid, SIGWINCH);	795	kill (-cmd_pid, SIGWINCH);
826	#endif	796	#endif
827	}	797	}
828		798
…		…
902	if (parent[0])	872	if (parent[0])
903	{	873	{
904	resize_all_windows (0, 0, 0);	874	resize_all_windows (0, 0, 0);
905	scr_remap_chars ();	875	scr_remap_chars ();
906	scr_touch (true);	876	scr_touch (true);
907	}	877	}
908		878
909	return true;	879	return true;
910	}	880	}
911		881
912	void	882	void
…		…
956	rxvt_term::set_window_color (int idx, const char *color)	926	rxvt_term::set_window_color (int idx, const char *color)
957	{	927	{
958	#ifdef XTERM_COLOR_CHANGE	928	#ifdef XTERM_COLOR_CHANGE
959	rxvt_color xcol;	929	rxvt_color xcol;
960	int i;	930	int i;
961		931
962	if (color == NULL \|\| *color == '\0')	932	if (color == NULL \|\| *color == '\0')
963	return;	933	return;
964		934
965	color = strdup (color);	935	color = strdup (color);
966	allocated.push_back ((void *)color);	936	allocated.push_back ((void *)color);
…		…
970	if (isdigit (*color))	940	if (isdigit (*color))
971	{	941	{
972	i = atoi (color);	942	i = atoi (color);
973		943
974	if (i >= 8 && i <= 15)	944	if (i >= 8 && i <= 15)
		945	{
975	{ /* bright colors */	946	/* bright colors */
976	i -= 8;
977	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	947	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978	goto done;	948	goto done;
979	}	949	}
980		950
981	if (i >= 0 && i <= 7)	951	if (i >= 0 && i <= 7)
		952	{
982	{ /* normal colors */	953	/* normal colors */
983	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	954	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984	goto done;	955	goto done;
985	}	956	}
986	}	957	}
987		958
…		…
992	* so just keep gobbling up the colormap	963	* so just keep gobbling up the colormap
993	*/	964	*/
994		965
995	pix_colors_focused[idx] = xcol;	966	pix_colors_focused[idx] = xcol;
996		967
997	/* XSetWindowAttributes attr; */
998	/* Cursor cursor; */
999	done:	968	done:
1000	/TODO: handle Color_BD, scrollbar background, etc. /	969	/TODO: handle Color_BD, scrollbar background, etc. /
1001		970
1002	update_fade_color (idx);	971	update_fade_color (idx);
1003	recolour_cursor ();	972	recolour_cursor ();
1004	scr_recolour ();	973	scr_recolour ();
1005	#endif /* XTERM_COLOR_CHANGE */	974	#endif /* XTERM_COLOR_CHANGE */
1006	}	975	}
1007		976
1008	void	977	void
1009	rxvt_term::recolour_cursor ()	978	rxvt_term::recolour_cursor ()
1010	{	979	{
…		…
1027	*/	996	*/
1028	void	997	void
1029	rxvt_term::set_colorfgbg ()	998	rxvt_term::set_colorfgbg ()
1030	{	999	{
1031	unsigned int i;	1000	unsigned int i;
1032	const char *xpmb = "\0";	1001	const char *xpmb = "";
1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1002	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034		1003
1035	strcpy (fstr, "default");	1004	strcpy (fstr, "default");
1036	strcpy (bstr, "default");	1005	strcpy (bstr, "default");
1037	for (i = Color_Black; i <= Color_White; i++)	1006	for (i = Color_Black; i <= Color_White; i++)
…		…
1347	if (term->rs[Rs_imLocale])	1316	if (term->rs[Rs_imLocale])
1348	SET_LOCALE (term->locale);	1317	SET_LOCALE (term->locale);
1349	}	1318	}
1350	else	1319	else
1351	str = (void *)text->string.wide_char;	1320	str = (void *)text->string.wide_char;
1352		1321
1353	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1322	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354	DT_INT, call_data->caret,	1323	DT_INT, call_data->caret,
1355	DT_INT, call_data->chg_first,	1324	DT_INT, call_data->chg_first,
1356	DT_INT, call_data->chg_length,	1325	DT_INT, call_data->chg_length,
1357	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1326	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1676		1645
1677	if (input_style & XIMPreeditPosition)	1646	if (input_style & XIMPreeditPosition)
1678	{	1647	{
1679	im_set_size (preedit_rect);	1648	im_set_size (preedit_rect);
1680	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1649	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681		1650
1682	XSetICValues (Input_Context,	1651	XSetICValues (Input_Context,
1683	XNPreeditAttributes, preedit_attr, NULL);	1652	XNPreeditAttributes, preedit_attr, NULL);
1684	}	1653	}
1685	else	1654	else
1686	{	1655	{
…		…
1703	XFree (status_attr);	1672	XFree (status_attr);
1704	}	1673	}
1705		1674
1706	XFree (preedit_attr);	1675	XFree (preedit_attr);
1707	}	1676	}
1708	#endif /* USE_XIM */	1677	#endif /* USE_XIM */
1709		1678
1710	void	1679	void
1711	rxvt_term::get_window_origin (int &x, int &y)	1680	rxvt_term::get_window_origin (int &x, int &y)
1712	{	1681	{
1713	Window cr;	1682	Window cr;
1714	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1683	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1715	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1684	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1716	}	1685	}
1717		1686
1718	Pixmap	1687	Pixmap
1719	rxvt_term::get_pixmap_property (int prop_id)	1688	rxvt_term::get_pixmap_property (int prop_id)
1720	{	1689	{
…		…
1727	unsigned char *prop = NULL;	1696	unsigned char *prop = NULL;
1728	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1697	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1729	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1698	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730	&nitems, &bytes_after, &prop);	1699	&nitems, &bytes_after, &prop);
1731	if (result == Success && prop && atype == XA_PIXMAP)	1700	if (result == Success && prop && atype == XA_PIXMAP)
1732	{
1733	return (Pixmap )prop;	1701	return (Pixmap )prop;
1734	}
1735	}	1702	}
		1703
1736	return None;	1704	return None;
1737	}	1705	}
1738		1706
1739	#ifdef HAVE_BG_PIXMAP	1707	#ifdef HAVE_BG_PIXMAP
1740	int	1708	# if TRACE_PIXMAPS
		1709	# undef update_background
		1710	void
		1711	rxvt_term::trace_update_background (const char *file, int line)
		1712	{
		1713	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1714	update_background ();
		1715	}
		1716	# endif
		1717
		1718	void
1741	rxvt_term::update_background ()	1719	rxvt_term::update_background ()
1742	{	1720	{
1743	bgPixmap.invalidate ();	1721	bgPixmap.invalidate ();
1744		1722
1745	/* no chance of real time refresh if we are blurring ! */	1723	/* no chance of real time refresh if we are blurring! */
1746	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1724	if (bgPixmap.invalid_since + 0.50 < ev::now ()
		1725	&& !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1726	{
		1727	update_background_ev.stop ();
1747	bgPixmap.render ();	1728	bgPixmap.render ();
		1729	}
1748	else	1730	else
1749	{	1731	{
1750	update_background_ev.stop ();	1732	ev_tstamp refresh;
		1733
1751	if (!bgPixmap.need_client_side_rendering())	1734	if (!bgPixmap.need_client_side_rendering ())
1752	update_background_ev.start (NOW + .05);	1735	refresh = .05;
1753	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)	1736	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754	update_background_ev.start (NOW + .2); /* very slow !!! */	1737	refresh = .20; /* very slow !!! */
1755	else	1738	else
		1739	refresh = .07;
		1740
1756	update_background_ev.start (NOW + .07);	1741	update_background_ev.start (refresh);
1757	}	1742	}
1758	return 0;
1759	}	1743	}
1760		1744
1761	void	1745	void
1762	rxvt_term::update_background_cb (time_watcher &w)	1746	rxvt_term::update_background_cb (ev::timer &w, int revents)
1763	{	1747	{
		1748	make_current ();
1764	bgPixmap.render ();	1749	bgPixmap.render ();
		1750	refresh_check ();
1765	}	1751	}
1766		1752
1767	#endif /* HAVE_BG_PIXMAP */	1753	#endif /* HAVE_BG_PIXMAP */
1768		1754
1769	/----------------------- end-of-file (C source) -----------------------/	1755	/----------------------- 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.292 by root, Mon Dec 24 10:58:09 2007 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.292 by root, Mon Dec 24 10:58:09 2007 UTC