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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.181 by root, Tue Jan 17 06:06:42 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

…		…
46		46
47	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)	51	vector<rxvt_term *> rxvt_term::termlist;
52	static uid_t saved_euid;	52
53	static gid_t saved_egid;	53	// used to tell global functions which terminal instance is "active"
54	#endif	54	rxvt_t rxvt_current_term;
		55
		56	static char curlocale[128], savelocale[128];
55		57
56	bool	58	bool
57	rxvt_tainted ()
58	{
59	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60	return getuid () != saved_euid \|\| getgid () != saved_egid;
61	#else
62	return false;
63	#endif
64	}
65
66	vector<rxvt_term *> rxvt_term::termlist;
67
68	static char curlocale[128], savelocale[128];
69
70	bool
71	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
72	{	60	{
73	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
74	return false;	62	return false;
75		63
76	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
77	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
78	return true;	66	return true;
79	}	67	}
80		68
81	void	69	void
82	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
83	{	71	{
84	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
85	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
86	}	74	}
87		75
88	void	76	void
89	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
90	{	78	{
91	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
92	}	80	}
93		81
94	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
182	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
183	#endif	171	#endif
184	#ifdef USE_XIM	172	#ifdef USE_XIM
185	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
186	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
187	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
188	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
189	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
190	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
191	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
192	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
193	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
196		188
197	termlist.push_back (this);	189	termlist.push_back (this);
198		190
199	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
200	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
201
202	if (!keyboard)
203	rxvt_fatal ("out of memory, aborting.\n");
204	#endif	193	#endif
205	}	194	}
206		195
207	// clean up the most important stuff, do not call x or free mem etc.	196	// clean up the most important stuff, do not call x or free mem etc.
208	// for use before an emergency exit	197	// for use before an emergency exit
209	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
210	{	199	{
211	if (cmd_pid)	200	if (cmd_pid)
212	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
213		202
214	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
215	privileged_utmp (RESTORE);
216	#endif
217
218	pty.put ();
219	}	204	}
220		205
221	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
222	{	207	{
223	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
226		209
227	emergency_cleanup ();	210	emergency_cleanup ();
228		211
229	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
288	for (int i = 0; i < allocated.size (); i++)	271	for (int i = 0; i < allocated.size (); i++)
289	free (allocated [i]);	272	free (allocated [i]);
290		273
291	free (selection.text);	274	free (selection.text);
292	// TODO: manage env vars in child only(!)	275	// TODO: manage env vars in child only(!)
293	free (env_windowid);
294	free (env_display);	276	free (env_display);
295	free (env_term);	277	free (env_term);
296	free (env_colorfgbg);
297	free (locale);	278	free (locale);
298	free (v_buffer);	279	free (v_buffer);
299	free (incr_buf);	280	free (incr_buf);
300		281
301	delete envv;	282	delete envv;
…		…
304	#ifdef KEYSYM_RESOURCE	285	#ifdef KEYSYM_RESOURCE
305	delete keyboard;	286	delete keyboard;
306	#endif	287	#endif
307	}	288	}
308		289
		290	// child has exited, usually destroys
309	void	291	void
310	rxvt_term::child_exit ()	292	rxvt_term::child_cb (child_watcher &w, int status)
311	{	293	{
		294	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		295
312	cmd_pid = 0;	296	cmd_pid = 0;
313		297
314	if (!OPTION (Opt_hold))	298	if (!OPTION (Opt_hold))
315	destroy ();	299	destroy ();
316	}	300	}
…		…
318	void	302	void
319	rxvt_term::destroy ()	303	rxvt_term::destroy ()
320	{	304	{
321	if (destroy_ev.active)	305	if (destroy_ev.active)
322	return;	306	return;
		307
		308	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		309
324	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
325	scr_overlay_off ();	311	scr_overlay_off ();
326	#endif	312	#endif
327		313
…		…
461	_exit (EXIT_FAILURE);	447	_exit (EXIT_FAILURE);
462	}	448	}
463		449
464	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
465	bool	451	bool
466	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	453	{
		454	this->envv = envv;
		455
468	SET_R (this);	456	SET_R (this);
469	set_locale ("");	457	set_locale ("");
470	set_environ (envv); // few things in X do not call setlocale :(	458	set_environ (envv); // few things in X do not call setlocale :(
471		459
472	if (!init_vars ())	460	if (!init_vars ())
…		…
483	#ifdef HAVE_SCROLLBARS	471	#ifdef HAVE_SCROLLBARS
484	if (OPTION (Opt_scrollBar))	472	if (OPTION (Opt_scrollBar))
485	scrollBar.setIdle (); /* set existence for size calculations */	473	scrollBar.setIdle (); /* set existence for size calculations */
486	#endif	474	#endif
487		475
488	#if ENABLE_PERL	476	pty = ptytty::create ();
489	if (!rs[Rs_perl_ext_1])
490	rs[Rs_perl_ext_1] = "default";
491
492	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495	{
496	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497	// ignore some perl-related arguments if some bozo installed us set[ug]id
498	if (rxvt_tainted ())
499	{
500	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502	{
503	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504	rs[Rs_perl_lib] = 0;
505	rs[Rs_perl_eval] = 0;
506	}
507	}
508	#endif
509	rxvt_perl.init (this);
510	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511	}
512	#endif
513		477
514	create_windows (argc, argv);	478	create_windows (argc, argv);
515		479
516	dDisp;	480	dDisp;
517		481
…		…
534	check_our_parents ();	498	check_our_parents ();
535	rootwin_ev.start (display, display->root);	499	rootwin_ev.start (display, display->root);
536	}	500	}
537	#endif	501	#endif
538		502
		503	set_colorfgbg ();
		504
		505	init_command (cmd_argv);
		506
		507	free (cmd_argv);
		508
		509	if (pty->pty >= 0)
		510	pty_ev.start (pty->pty, EVENT_READ);
		511
		512	check_ev.start ();
		513
		514	HOOK_INVOKE ((this, HOOK_START, DT_END));
		515
		516	#if ENABLE_XEMBED
		517	if (rs[Rs_embed])
		518	{
		519	long info[2] = { 0, XEMBED_MAPPED };
		520
		521	XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		522	32, PropModeReplace, (unsigned char *)&info, 2);
		523	}
		524	#endif
		525
539	XMapWindow (disp, vt);	526	XMapWindow (disp, vt);
540	XMapWindow (disp, parent[0]);	527	XMapWindow (disp, parent[0]);
541		528
542	set_colorfgbg ();
543
544	init_command (cmd_argv);
545
546	free (cmd_argv);
547
548	if (pty.pty >= 0)
549	pty_ev.start (pty.pty, EVENT_READ);
550
551	check_ev.start ();
552
553	HOOK_INVOKE ((this, HOOK_START, DT_END));
554
555	return true;	529	return true;
556	}	530	}
557		531
558	static struct sig_handlers	532	static struct sig_handlers
559	{	533	{
560	sig_watcher sw_chld, sw_term, sw_int;	534	sig_watcher sw_term, sw_int;
561		535
562	void sig_chld (sig_watcher &w)
563	{
564	// we are being called for every SIGCHLD, find the corresponding term
565	int pid;
566
567	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569	if (pid == (*t)->cmd_pid)
570	{
571	(*t)->child_exit ();
572	break;
573	}
574	}
575
576	/*	536	/*
577	* Catch a fatal signal and tidy up before quitting	537	* Catch a fatal signal and tidy up before quitting
578	*/	538	*/
579	void	539	void
580	sig_term (sig_watcher &w)	540	sig_term (sig_watcher &w)
581	{	541	{
582	#ifdef DEBUG_CMD
583	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584	#endif
585	rxvt_emergency_cleanup ();	542	rxvt_emergency_cleanup ();
586	signal (w.signum, SIG_DFL);	543	signal (w.signum, SIG_DFL);
587	kill (getpid (), w.signum);	544	kill (getpid (), w.signum);
588	}	545	}
589		546
590	sig_handlers ()	547	sig_handlers ()
591	: sw_chld (this, &sig_handlers::sig_chld),
592	sw_term (this, &sig_handlers::sig_term),	548	: sw_term (this, &sig_handlers::sig_term),
593	sw_int (this, &sig_handlers::sig_term)	549	sw_int (this, &sig_handlers::sig_term)
594	{	550	{
595	}	551	}
596	} sig_handlers;	552	} sig_handlers;
597		553
598	char **rxvt_environ; // startup environment	554	char **rxvt_environ; // startup environment
599		555
600	void	556	void
601	rxvt_init ()	557	rxvt_init ()
602	{	558	{
		559	ptytty::init ();
		560
603	rxvt_environ = environ;	561	rxvt_environ = environ;
604
605	/*
606	* Save and then give up any super-user privileges
607	* If we need privileges in any area then we must specifically request it.
608	* We should only need to be root in these cases:
609	* 1. write utmp entries on some systems
610	* 2. chown tty on some systems
611	*/
612	rxvt_privileges (SAVE);
613	rxvt_privileges (IGNORE);
614		562
615	signal (SIGHUP, SIG_IGN);	563	signal (SIGHUP, SIG_IGN);
616	signal (SIGPIPE, SIG_IGN);	564	signal (SIGPIPE, SIG_IGN);
617		565
618	sig_handlers.sw_chld.start (SIGCHLD);
619	sig_handlers.sw_term.start (SIGTERM);	566	sig_handlers.sw_term.start (SIGTERM);
620	sig_handlers.sw_int.start (SIGINT);	567	sig_handlers.sw_int.start (SIGINT);
621		568
622	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	569	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
623	/* signal (SIGURG, SIG_DFL); */	570	/* signal (SIGURG, SIG_DFL); */
…		…
652	rxvt_fatal ("memory allocation failure. aborting.\n");	599	rxvt_fatal ("memory allocation failure. aborting.\n");
653		600
654	return p;	601	return p;
655	}	602	}
656		603
657	void *	604	void *
658	rxvt_realloc (void *ptr, size_t size)	605	rxvt_realloc (void *ptr, size_t size)
659	{	606	{
660	void *p = realloc (ptr, size);	607	void *p = realloc (ptr, size);
661		608
662	if (!p)	609	if (!p)
663	rxvt_fatal ("memory allocation failure. aborting.\n");	610	rxvt_fatal ("memory allocation failure. aborting.\n");
664		611
665	return p;	612	return p;
666	}	613	}
667
668	/* ------------------------------------------------------------------------- *
669	* PRIVILEGED OPERATIONS *
670	* ------------------------------------------------------------------------- */
671	/* take care of suid/sgid super-user (root) privileges */
672	void
673	rxvt_privileges (rxvt_privaction action)
674	{
675	#if ! defined(__CYGWIN32__)
676	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677	/* setreuid () is the poor man's setuid (), seteuid () */
678	# define seteuid(a) setreuid(-1, (a))
679	# define setegid(a) setregid(-1, (a))
680	# define HAVE_SETEUID
681	# endif
682	# ifdef HAVE_SETEUID
683	switch (action)
684	{
685	case IGNORE:
686	/*
687	* change effective uid/gid - not real uid/gid - so we can switch
688	* back to root later, as required
689	*/
690	setegid (getgid ());
691	seteuid (getuid ());
692	break;
693	case SAVE:
694	saved_egid = getegid ();
695	saved_euid = geteuid ();
696	break;
697	case RESTORE:
698	setegid (saved_egid);
699	seteuid (saved_euid);
700	break;
701	}
702	# else
703	switch (action)
704	{
705	case IGNORE:
706	setgid (getgid ());
707	setuid (getuid ());
708	/* FALLTHROUGH */
709	case SAVE:
710	/* FALLTHROUGH */
711	case RESTORE:
712	break;
713	}
714	# endif
715	#endif
716	}
717
718	#ifdef UTMP_SUPPORT
719	void
720	rxvt_term::privileged_utmp (rxvt_privaction action)
721	{
722	if (OPTION (Opt_utmpInhibit)
723	\|\| !pty.name \|\| !*pty.name)
724	return;
725
726	rxvt_privileges (RESTORE);
727
728	if (action == SAVE)
729	session.login (pty.name, cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
730	else
731	session.logout ();
732
733	rxvt_privileges (IGNORE);
734	}
735	#endif
736		614
737	/----------------------------------------------------------------------/	615	/----------------------------------------------------------------------/
738	/*	616	/*
739	* window size/position calculcations for XSizeHint and other storage.	617	* window size/position calculcations for XSizeHint and other storage.
740	* if width/height are non-zero then override calculated width/height	618	* if width/height are non-zero then override calculated width/height
…		…
745	short recalc_x, recalc_y;	623	short recalc_x, recalc_y;
746	int x, y, sb_w, flags;	624	int x, y, sb_w, flags;
747	unsigned int w, h;	625	unsigned int w, h;
748	unsigned int max_width, max_height;	626	unsigned int max_width, max_height;
749	dDisp;	627	dDisp;
750
751	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752	ncol, nrow, szHint.width, szHint.height));
753		628
754	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	629	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
755	szHint.win_gravity = NorthWestGravity;	630	szHint.win_gravity = NorthWestGravity;
756	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	631	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757		632
…		…
860	if (recalc_y)	735	if (recalc_y)
861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	736	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
862		737
863	ncol = width / fwidth;	738	ncol = width / fwidth;
864	nrow = height / fheight;	739	nrow = height / fheight;
865	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866	ncol, nrow, szHint.width,
867	szHint.height));
868	return;
869	}	740	}
870		741
871	/----------------------------------------------------------------------/	742	/----------------------------------------------------------------------/
872	/*	743	/*
873	* Tell the teletype handler what size the window is.	744	* Tell the teletype handler what size the window is.
874	* Called after a window size change.	745	* Called after a window size change.
875	*/	746	*/
876	void	747	void
877	rxvt_term::tt_winch ()	748	rxvt_term::tt_winch ()
878	{	749	{
879	if (pty.pty < 0)	750	if (pty->pty < 0)
880	return;	751	return;
881		752
882	struct winsize ws;	753	struct winsize ws;
883		754
884	ws.ws_col = ncol;	755	ws.ws_col = ncol;
885	ws.ws_row = nrow;	756	ws.ws_row = nrow;
886	ws.ws_xpixel = width;	757	ws.ws_xpixel = width;
887	ws.ws_ypixel = height;	758	ws.ws_ypixel = height;
888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	759	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889		760
890	#if 0	761	#if 0
891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	762	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892	if (cmd_pid) /* force through to the command */	763	if (cmd_pid) /* force through to the command */
893	kill (-cmd_pid, SIGWINCH);	764	kill (-cmd_pid, SIGWINCH);
…		…
1113	{	984	{
1114	unsigned int i;	985	unsigned int i;
1115	const char *xpmb = "\0";	986	const char *xpmb = "\0";
1116	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	987	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1117		988
1118	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1119	strcpy (fstr, "default");	989	strcpy (fstr, "default");
1120	strcpy (bstr, "default");	990	strcpy (bstr, "default");
1121	for (i = Color_Black; i <= Color_White; i++)	991	for (i = Color_Black; i <= Color_White; i++)
1122	if (pix_colors[Color_fg] == pix_colors[i])	992	if (pix_colors[Color_fg] == pix_colors[i])
1123	{	993	{
…		…
1157	* -------------------------------------------------------------------- */	1027	* -------------------------------------------------------------------- */
1158	void	1028	void
1159	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1029	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1160	{	1030	{
1161	int fix_screen;	1031	int fix_screen;
1162	int old_width = szHint.width, old_height = szHint.height;	1032	int old_width = szHint.width;
		1033	int old_height = szHint.height;
1163	dDisp;	1034	dDisp;
1164		1035
1165	window_calc (newwidth, newheight);	1036	window_calc (newwidth, newheight);
1166	XSetWMNormalHints (disp, parent[0], &szHint);	1037	XSetWMNormalHints (disp, parent[0], &szHint);
1167		1038
…		…
1189	{	1060	{
1190	x -= x1;	1061	x -= x1;
1191	y -= y1;	1062	y -= y1;
1192	}	1063	}
1193		1064
1194	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1065	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1195	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1066	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1196	dx = old_width - szHint.width;	1067	dx = old_width - szHint.width;
1197	dy = old_height - szHint.height;	1068	dy = old_height - szHint.height;
1198		1069
1199	/* Check position of the center of the window */	1070	/* Check position of the center of the window */
1200	if (x < x1) /* left half */	1071	if (x < x1) /* left half */
1201	dx = 0;	1072	dx = 0;
…		…
1234	resize_pixmap ();	1105	resize_pixmap ();
1235	#endif	1106	#endif
1236	}	1107	}
1237		1108
1238	if (fix_screen \|\| old_height == 0)	1109	if (fix_screen \|\| old_height == 0)
1239	{
1240	int curr_screen = -1;
1241	int old_ncol = prev_ncol;
1242
1243	/* scr_reset only works on the primary screen */
1244	if (old_height) /* this is not the first time through */
1245	{
1246	unsigned int ocol = ncol;
1247	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1248	curr_screen = scr_change_screen (PRIMARY);
1249	ncol = ocol;
1250	}
1251
1252	scr_reset ();	1110	scr_reset ();
1253
1254	if (curr_screen >= 0) /* this is not the first time through */
1255	{
1256	scr_change_screen (curr_screen);
1257	selection_check (old_ncol != ncol ? 4 : 0);
1258	}
1259	}
1260
1261	old_width = szHint.width;
1262	old_height = szHint.height;
1263		1111
1264	#ifdef XPM_BACKGROUND	1112	#ifdef XPM_BACKGROUND
1265	if (pixmap)	1113	if (pixmap)
1266	scr_touch (false);	1114	scr_touch (false);
1267	#endif	1115	#endif
…		…
1370	XPoint nspot;	1218	XPoint nspot;
1371	XVaNestedList preedit_attr;	1219	XVaNestedList preedit_attr;
1372		1220
1373	if (!Input_Context	1221	if (!Input_Context
1374	\|\| !focus	1222	\|\| !focus
1375	\|\| !(input_style & XIMPreeditPosition))	1223	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1376	return;	1224	return;
1377		1225
1378	im_set_position (nspot);	1226	im_set_position (nspot);
1379		1227
1380	if (nspot.x == spot.x && nspot.y == spot.y)	1228	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1399	input_method = 0;	1247	input_method = 0;
1400	}	1248	}
1401		1249
1402	Input_Context = 0;	1250	Input_Context = 0;
1403	}	1251	}
		1252
		1253	#ifdef ENABLE_XIM_ONTHESPOT
		1254
		1255	static void
		1256	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1257	{
		1258	((rxvt_term *)client_data)->make_current ();
		1259	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1260	}
		1261
		1262	static void
		1263	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1264	{
		1265	((rxvt_term *)client_data)->make_current ();
		1266	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1267	}
		1268
		1269	static void
		1270	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1271	{
		1272	rxvt_term term = (rxvt_term )client_data;
		1273	XIMText *text = call_data->text;
		1274
		1275	term->make_current ();
		1276
		1277	if (text)
		1278	{
		1279	void *str;
		1280
		1281	if (!text->encoding_is_wchar && text->string.multi_byte)
		1282	{
		1283	// of course, X makes it ugly again
		1284	if (term->rs[Rs_imLocale])
		1285	SET_LOCALE (term->rs[Rs_imLocale]);
		1286
		1287	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1288	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1289
		1290	if (term->rs[Rs_imLocale])
		1291	SET_LOCALE (term->locale);
		1292	}
		1293	else
		1294	str = (void *)text->string.wide_char;
		1295
		1296	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1297	DT_INT, call_data->caret,
		1298	DT_INT, call_data->chg_first,
		1299	DT_INT, call_data->chg_length,
		1300	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1301	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1302	DT_END));
		1303	}
		1304	else
		1305	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1306	DT_INT, call_data->caret,
		1307	DT_INT, call_data->chg_first,
		1308	DT_INT, call_data->chg_length,
		1309	DT_END));
		1310	}
		1311
		1312	#if 0
		1313	static void
		1314	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1315	{
		1316	((rxvt_term *)client_data)->make_current ();
		1317	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1318	DT_INT, call_data->position,
		1319	DT_INT, call_data->direction,
		1320	DT_INT, call_data->style,
		1321	DT_END));
		1322	}
		1323	#endif
		1324
		1325	#endif
1404		1326
1405	/*	1327	/*
1406	* Try to open a XIM with the current modifiers, then see if we can	1328	* Try to open a XIM with the current modifiers, then see if we can
1407	* open a suitable preedit type	1329	* open a suitable preedit type
1408	*/	1330	*/
…		…
1415	XRectangle rect, status_rect, needed_rect;	1337	XRectangle rect, status_rect, needed_rect;
1416	unsigned long fg, bg;	1338	unsigned long fg, bg;
1417	const char *p;	1339	const char *p;
1418	char **s;	1340	char **s;
1419	XIMStyles *xim_styles;	1341	XIMStyles *xim_styles;
		1342	#ifdef ENABLE_XIM_ONTHESPOT
		1343	XIMCallback xcb[4];
		1344	#endif
1420		1345
1421	set_environ (envv);	1346	set_environ (envv);
1422		1347
1423	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1348	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424	return false;	1349	return false;
1425		1350
1426	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427	input_method = display->get_xim (locale, modifiers);	1351	input_method = display->get_xim (locale, modifiers);
1428	if (input_method == NULL)	1352	if (input_method == NULL)
1429	return false;	1353	return false;
1430		1354
1431	xim = input_method->xim;	1355	xim = input_method->xim;
…		…
1451	s = rxvt_splitcommastring (p);	1375	s = rxvt_splitcommastring (p);
1452		1376
1453	for (i = found = 0; !found && s[i]; i++)	1377	for (i = found = 0; !found && s[i]; i++)
1454	{	1378	{
1455	if (!strcmp (s[i], "OverTheSpot"))	1379	if (!strcmp (s[i], "OverTheSpot"))
1456	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1380	input_style = XIMPreeditPosition \| XIMStatusNothing;
1457	else if (!strcmp (s[i], "OffTheSpot"))	1381	else if (!strcmp (s[i], "OffTheSpot"))
1458	input_style = (XIMPreeditArea \| XIMStatusArea);	1382	input_style = XIMPreeditArea \| XIMStatusArea;
1459	else if (!strcmp (s[i], "Root"))	1383	else if (!strcmp (s[i], "Root"))
1460	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1384	input_style = XIMPreeditNothing \| XIMStatusNothing;
1461	else if (!strcmp (s[i], "None"))	1385	else if (!strcmp (s[i], "None"))
1462	input_style = (XIMPreeditNone \| XIMStatusNone);	1386	input_style = XIMPreeditNone \| XIMStatusNone;
		1387	#ifdef ENABLE_XIM_ONTHESPOT
		1388	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1389	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1390	#endif
		1391	else
		1392	input_style = XIMPreeditNothing \| XIMStatusNothing;
1463		1393
1464	for (j = 0; j < xim_styles->count_styles; j++)	1394	for (j = 0; j < xim_styles->count_styles; j++)
1465	if (input_style == xim_styles->supported_styles[j])	1395	if (input_style == xim_styles->supported_styles[j])
1466	{	1396	{
1467	rxvt_freecommastring (s);	1397	rxvt_freecommastring (s);
…		…
1556	XNBackground, bg,	1486	XNBackground, bg,
1557	XNArea, &status_rect,	1487	XNArea, &status_rect,
1558	XNFontSet, fs,	1488	XNFontSet, fs,
1559	NULL);	1489	NULL);
1560	}	1490	}
		1491	else if (input_style & XIMPreeditCallbacks)
		1492	{
		1493	im_set_position (spot);
		1494
		1495	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1496	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1497	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1498	#if 0
		1499	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1500	#endif
		1501
		1502	preedit_attr = XVaCreateNestedList (0,
		1503	XNSpotLocation, &spot,
		1504	XNPreeditStartCallback, &xcb[0],
		1505	XNPreeditDoneCallback , &xcb[1],
		1506	XNPreeditDrawCallback , &xcb[2],
		1507	#if 0
		1508	XNPreeditCaretCallback, &xcb[3],
		1509	#endif
		1510	NULL);
		1511	}
1561		1512
1562	Input_Context = XCreateIC (xim,	1513	Input_Context = XCreateIC (xim,
1563	XNInputStyle, input_style,	1514	XNInputStyle, input_style,
1564	XNClientWindow, vt,	1515	XNClientWindow, vt,
1565	XNFocusWindow, parent[0],	1516	XNFocusWindow, parent[0],
…		…
1577	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1528	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578	im_destroy ();	1529	im_destroy ();
1579	return false;	1530	return false;
1580	}	1531	}
1581		1532
		1533	#if 0
		1534	// unfortunately, only the focus window is used by XIM, hard to fix
		1535	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1536	vt_select_input ();
		1537	#endif
		1538
1582	if (input_style & XIMPreeditArea)	1539	if (input_style & XIMPreeditArea)
1583	IMSetStatusPosition ();	1540	IMSetStatusPosition ();
1584		1541
1585	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586	return true;	1542	return true;
1587	}	1543	}
1588		1544
1589	void	1545	void
1590	rxvt_term::im_cb ()	1546	rxvt_term::im_cb ()
…		…
1596		1552
1597	make_current ();	1553	make_current ();
1598		1554
1599	im_destroy ();	1555	im_destroy ();
1600		1556
1601	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602	if (Input_Context)	1557	if (Input_Context)
1603	return;	1558	return;
1604		1559
1605	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1560	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1606	if (rs[Rs_imLocale])	1561	if (rs[Rs_imLocale])
…		…
1679	XFree (preedit_attr);	1634	XFree (preedit_attr);
1680	XFree (status_attr);	1635	XFree (status_attr);
1681	}	1636	}
1682	#endif /* USE_XIM */	1637	#endif /* USE_XIM */
1683		1638
1684	/----------------------------------------------------------------------/
1685	rxvt_t rxvt_current_term;
1686
1687	/----------------------- end-of-file (C source) -----------------------/	1639	/----------------------- 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.181 by root, Tue Jan 17 06:06:42 2006 UTC vs. Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.181 by root, Tue Jan 17 06:06:42 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC