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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 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
215	privileged_utmp (RESTORE);
216	#endif
217
218	delete pty; pty = 0;	203	delete pty; pty = 0;
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
514	pty = rxvt_new_ptytty ();
515		477
516	create_windows (argc, argv);	478	create_windows (argc, argv);
517		479
518	dDisp;	480	dDisp;
519		481
…		…
536	check_our_parents ();	498	check_our_parents ();
537	rootwin_ev.start (display, display->root);	499	rootwin_ev.start (display, display->root);
538	}	500	}
539	#endif	501	#endif
540		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
541	XMapWindow (disp, vt);	526	XMapWindow (disp, vt);
542	XMapWindow (disp, parent[0]);	527	XMapWindow (disp, parent[0]);
543		528
544	set_colorfgbg ();
545
546	init_command (cmd_argv);
547
548	free (cmd_argv);
549
550	if (pty->pty >= 0)
551	pty_ev.start (pty->pty, EVENT_READ);
552
553	check_ev.start ();
554
555	HOOK_INVOKE ((this, HOOK_START, DT_END));
556
557	return true;	529	return true;
558	}	530	}
559		531
560	static struct sig_handlers	532	static struct sig_handlers
561	{	533	{
562	sig_watcher sw_chld, sw_term, sw_int;	534	sig_watcher sw_term, sw_int;
563		535
564	void sig_chld (sig_watcher &w)
565	{
566	// we are being called for every SIGCHLD, find the corresponding term
567	int pid;
568
569	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571	if (pid == (*t)->cmd_pid)
572	{
573	(*t)->child_exit ();
574	break;
575	}
576	}
577
578	/*	536	/*
579	* Catch a fatal signal and tidy up before quitting	537	* Catch a fatal signal and tidy up before quitting
580	*/	538	*/
581	void	539	void
582	sig_term (sig_watcher &w)	540	sig_term (sig_watcher &w)
583	{	541	{
584	#ifdef DEBUG_CMD
585	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586	#endif
587	rxvt_emergency_cleanup ();	542	rxvt_emergency_cleanup ();
588	signal (w.signum, SIG_DFL);	543	signal (w.signum, SIG_DFL);
589	kill (getpid (), w.signum);	544	kill (getpid (), w.signum);
590	}	545	}
591		546
592	sig_handlers ()	547	sig_handlers ()
593	: sw_chld (this, &sig_handlers::sig_chld),
594	sw_term (this, &sig_handlers::sig_term),	548	: sw_term (this, &sig_handlers::sig_term),
595	sw_int (this, &sig_handlers::sig_term)	549	sw_int (this, &sig_handlers::sig_term)
596	{	550	{
597	}	551	}
598	} sig_handlers;	552	} sig_handlers;
599		553
600	char **rxvt_environ; // startup environment	554	char **rxvt_environ; // startup environment
601		555
602	void	556	void
603	rxvt_init ()	557	rxvt_init ()
604	{	558	{
		559	ptytty::init ();
		560
605	rxvt_environ = environ;	561	rxvt_environ = environ;
606
607	/*
608	* Save and then give up any super-user privileges
609	* If we need privileges in any area then we must specifically request it.
610	* We should only need to be root in these cases:
611	* 1. write utmp entries on some systems
612	* 2. chown tty on some systems
613	*/
614	rxvt_privileges (SAVE);
615	rxvt_privileges (IGNORE);
616		562
617	signal (SIGHUP, SIG_IGN);	563	signal (SIGHUP, SIG_IGN);
618	signal (SIGPIPE, SIG_IGN);	564	signal (SIGPIPE, SIG_IGN);
619		565
620	sig_handlers.sw_chld.start (SIGCHLD);
621	sig_handlers.sw_term.start (SIGTERM);	566	sig_handlers.sw_term.start (SIGTERM);
622	sig_handlers.sw_int.start (SIGINT);	567	sig_handlers.sw_int.start (SIGINT);
623		568
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	569	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	570	/* signal (SIGURG, SIG_DFL); */
…		…
654	rxvt_fatal ("memory allocation failure. aborting.\n");	599	rxvt_fatal ("memory allocation failure. aborting.\n");
655		600
656	return p;	601	return p;
657	}	602	}
658		603
659	void *	604	void *
660	rxvt_realloc (void *ptr, size_t size)	605	rxvt_realloc (void *ptr, size_t size)
661	{	606	{
662	void *p = realloc (ptr, size);	607	void *p = realloc (ptr, size);
663		608
664	if (!p)	609	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");	610	rxvt_fatal ("memory allocation failure. aborting.\n");
666		611
667	return p;	612	return p;
668	}	613	}
669
670	/* ------------------------------------------------------------------------- *
671	* PRIVILEGED OPERATIONS *
672	* ------------------------------------------------------------------------- */
673	/* take care of suid/sgid super-user (root) privileges */
674	void
675	rxvt_privileges (rxvt_privaction action)
676	{
677	#if ! defined(__CYGWIN32__)
678	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679	/* setreuid () is the poor man's setuid (), seteuid () */
680	# define seteuid(a) setreuid(-1, (a))
681	# define setegid(a) setregid(-1, (a))
682	# define HAVE_SETEUID
683	# endif
684	# ifdef HAVE_SETEUID
685	switch (action)
686	{
687	case IGNORE:
688	/*
689	* change effective uid/gid - not real uid/gid - so we can switch
690	* back to root later, as required
691	*/
692	setegid (getgid ());
693	seteuid (getuid ());
694	break;
695	case SAVE:
696	saved_egid = getegid ();
697	saved_euid = geteuid ();
698	break;
699	case RESTORE:
700	setegid (saved_egid);
701	seteuid (saved_euid);
702	break;
703	}
704	# else
705	switch (action)
706	{
707	case IGNORE:
708	setgid (getgid ());
709	setuid (getuid ());
710	/* FALLTHROUGH */
711	case SAVE:
712	/* FALLTHROUGH */
713	case RESTORE:
714	break;
715	}
716	# endif
717	#endif
718	}
719
720	#ifdef UTMP_SUPPORT
721	void
722	rxvt_term::privileged_utmp (rxvt_privaction action)
723	{
724	if (OPTION (Opt_utmpInhibit))
725	return;
726
727	rxvt_privileges (RESTORE);
728
729	if (action == SAVE)
730	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
731	else
732	pty->logout ();
733
734	rxvt_privileges (IGNORE);
735	}
736	#endif
737		614
738	/----------------------------------------------------------------------/	615	/----------------------------------------------------------------------/
739	/*	616	/*
740	* window size/position calculcations for XSizeHint and other storage.	617	* window size/position calculcations for XSizeHint and other storage.
741	* if width/height are non-zero then override calculated width/height	618	* if width/height are non-zero then override calculated width/height
…		…
746	short recalc_x, recalc_y;	623	short recalc_x, recalc_y;
747	int x, y, sb_w, flags;	624	int x, y, sb_w, flags;
748	unsigned int w, h;	625	unsigned int w, h;
749	unsigned int max_width, max_height;	626	unsigned int max_width, max_height;
750	dDisp;	627	dDisp;
751
752	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
753	ncol, nrow, szHint.width, szHint.height));
754		628
755	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	629	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
756	szHint.win_gravity = NorthWestGravity;	630	szHint.win_gravity = NorthWestGravity;
757	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	631	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
758		632
…		…
861	if (recalc_y)	735	if (recalc_y)
862	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	736	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
863		737
864	ncol = width / fwidth;	738	ncol = width / fwidth;
865	nrow = height / fheight;	739	nrow = height / fheight;
866	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
867	ncol, nrow, szHint.width,
868	szHint.height));
869	return;
870	}	740	}
871		741
872	/----------------------------------------------------------------------/	742	/----------------------------------------------------------------------/
873	/*	743	/*
874	* Tell the teletype handler what size the window is.	744	* Tell the teletype handler what size the window is.
…		…
1114	{	984	{
1115	unsigned int i;	985	unsigned int i;
1116	const char *xpmb = "\0";	986	const char *xpmb = "\0";
1117	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	987	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1118		988
1119	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1120	strcpy (fstr, "default");	989	strcpy (fstr, "default");
1121	strcpy (bstr, "default");	990	strcpy (bstr, "default");
1122	for (i = Color_Black; i <= Color_White; i++)	991	for (i = Color_Black; i <= Color_White; i++)
1123	if (pix_colors[Color_fg] == pix_colors[i])	992	if (pix_colors[Color_fg] == pix_colors[i])
1124	{	993	{
…		…
1158	* -------------------------------------------------------------------- */	1027	* -------------------------------------------------------------------- */
1159	void	1028	void
1160	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)
1161	{	1030	{
1162	int fix_screen;	1031	int fix_screen;
1163	int old_width = szHint.width, old_height = szHint.height;	1032	int old_width = szHint.width;
		1033	int old_height = szHint.height;
1164	dDisp;	1034	dDisp;
1165		1035
1166	window_calc (newwidth, newheight);	1036	window_calc (newwidth, newheight);
1167	XSetWMNormalHints (disp, parent[0], &szHint);	1037	XSetWMNormalHints (disp, parent[0], &szHint);
1168		1038
…		…
1190	{	1060	{
1191	x -= x1;	1061	x -= x1;
1192	y -= y1;	1062	y -= y1;
1193	}	1063	}
1194		1064
1195	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1065	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1196	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1066	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1197	dx = old_width - szHint.width;	1067	dx = old_width - szHint.width;
1198	dy = old_height - szHint.height;	1068	dy = old_height - szHint.height;
1199		1069
1200	/* Check position of the center of the window */	1070	/* Check position of the center of the window */
1201	if (x < x1) /* left half */	1071	if (x < x1) /* left half */
1202	dx = 0;	1072	dx = 0;
…		…
1235	resize_pixmap ();	1105	resize_pixmap ();
1236	#endif	1106	#endif
1237	}	1107	}
1238		1108
1239	if (fix_screen \|\| old_height == 0)	1109	if (fix_screen \|\| old_height == 0)
1240	{
1241	int curr_screen = -1;
1242	int old_ncol = prev_ncol;
1243
1244	/* scr_reset only works on the primary screen */
1245	if (old_height) /* this is not the first time through */
1246	{
1247	unsigned int ocol = ncol;
1248	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1249	curr_screen = scr_change_screen (PRIMARY);
1250	ncol = ocol;
1251	}
1252
1253	scr_reset ();	1110	scr_reset ();
1254
1255	if (curr_screen >= 0) /* this is not the first time through */
1256	{
1257	scr_change_screen (curr_screen);
1258	selection_check (old_ncol != ncol ? 4 : 0);
1259	}
1260	}
1261
1262	old_width = szHint.width;
1263	old_height = szHint.height;
1264		1111
1265	#ifdef XPM_BACKGROUND	1112	#ifdef XPM_BACKGROUND
1266	if (pixmap)	1113	if (pixmap)
1267	scr_touch (false);	1114	scr_touch (false);
1268	#endif	1115	#endif
…		…
1371	XPoint nspot;	1218	XPoint nspot;
1372	XVaNestedList preedit_attr;	1219	XVaNestedList preedit_attr;
1373		1220
1374	if (!Input_Context	1221	if (!Input_Context
1375	\|\| !focus	1222	\|\| !focus
1376	\|\| !(input_style & XIMPreeditPosition))	1223	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1377	return;	1224	return;
1378		1225
1379	im_set_position (nspot);	1226	im_set_position (nspot);
1380		1227
1381	if (nspot.x == spot.x && nspot.y == spot.y)	1228	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1400	input_method = 0;	1247	input_method = 0;
1401	}	1248	}
1402		1249
1403	Input_Context = 0;	1250	Input_Context = 0;
1404	}	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
1405		1326
1406	/*	1327	/*
1407	* 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
1408	* open a suitable preedit type	1329	* open a suitable preedit type
1409	*/	1330	*/
…		…
1416	XRectangle rect, status_rect, needed_rect;	1337	XRectangle rect, status_rect, needed_rect;
1417	unsigned long fg, bg;	1338	unsigned long fg, bg;
1418	const char *p;	1339	const char *p;
1419	char **s;	1340	char **s;
1420	XIMStyles *xim_styles;	1341	XIMStyles *xim_styles;
		1342	#ifdef ENABLE_XIM_ONTHESPOT
		1343	XIMCallback xcb[4];
		1344	#endif
1421		1345
1422	set_environ (envv);	1346	set_environ (envv);
1423		1347
1424	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1348	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425	return false;	1349	return false;
1426		1350
1427	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428	input_method = display->get_xim (locale, modifiers);	1351	input_method = display->get_xim (locale, modifiers);
1429	if (input_method == NULL)	1352	if (input_method == NULL)
1430	return false;	1353	return false;
1431		1354
1432	xim = input_method->xim;	1355	xim = input_method->xim;
…		…
1452	s = rxvt_splitcommastring (p);	1375	s = rxvt_splitcommastring (p);
1453		1376
1454	for (i = found = 0; !found && s[i]; i++)	1377	for (i = found = 0; !found && s[i]; i++)
1455	{	1378	{
1456	if (!strcmp (s[i], "OverTheSpot"))	1379	if (!strcmp (s[i], "OverTheSpot"))
1457	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1380	input_style = XIMPreeditPosition \| XIMStatusNothing;
1458	else if (!strcmp (s[i], "OffTheSpot"))	1381	else if (!strcmp (s[i], "OffTheSpot"))
1459	input_style = (XIMPreeditArea \| XIMStatusArea);	1382	input_style = XIMPreeditArea \| XIMStatusArea;
1460	else if (!strcmp (s[i], "Root"))	1383	else if (!strcmp (s[i], "Root"))
1461	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1384	input_style = XIMPreeditNothing \| XIMStatusNothing;
1462	else if (!strcmp (s[i], "None"))	1385	else if (!strcmp (s[i], "None"))
1463	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;
1464		1393
1465	for (j = 0; j < xim_styles->count_styles; j++)	1394	for (j = 0; j < xim_styles->count_styles; j++)
1466	if (input_style == xim_styles->supported_styles[j])	1395	if (input_style == xim_styles->supported_styles[j])
1467	{	1396	{
1468	rxvt_freecommastring (s);	1397	rxvt_freecommastring (s);
…		…
1557	XNBackground, bg,	1486	XNBackground, bg,
1558	XNArea, &status_rect,	1487	XNArea, &status_rect,
1559	XNFontSet, fs,	1488	XNFontSet, fs,
1560	NULL);	1489	NULL);
1561	}	1490	}
		1491	#if ENABLE_XIM_ONTHESPOT
		1492	else if (input_style & XIMPreeditCallbacks)
		1493	{
		1494	im_set_position (spot);
		1495
		1496	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1497	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1498	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1499	# if 0
		1500	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1501	# endif
		1502
		1503	preedit_attr = XVaCreateNestedList (0,
		1504	XNSpotLocation, &spot,
		1505	XNPreeditStartCallback, &xcb[0],
		1506	XNPreeditDoneCallback , &xcb[1],
		1507	XNPreeditDrawCallback , &xcb[2],
		1508	# if 0
		1509	XNPreeditCaretCallback, &xcb[3],
		1510	# endif
		1511	NULL);
		1512	}
		1513	#endif
1562		1514
1563	Input_Context = XCreateIC (xim,	1515	Input_Context = XCreateIC (xim,
1564	XNInputStyle, input_style,	1516	XNInputStyle, input_style,
1565	XNClientWindow, vt,	1517	XNClientWindow, vt,
1566	XNFocusWindow, parent[0],	1518	XNFocusWindow, parent[0],
…		…
1578	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1530	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579	im_destroy ();	1531	im_destroy ();
1580	return false;	1532	return false;
1581	}	1533	}
1582		1534
		1535	#if 0
		1536	// unfortunately, only the focus window is used by XIM, hard to fix
		1537	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1538	vt_select_input ();
		1539	#endif
		1540
1583	if (input_style & XIMPreeditArea)	1541	if (input_style & XIMPreeditArea)
1584	IMSetStatusPosition ();	1542	IMSetStatusPosition ();
1585		1543
1586	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587	return true;	1544	return true;
1588	}	1545	}
1589		1546
1590	void	1547	void
1591	rxvt_term::im_cb ()	1548	rxvt_term::im_cb ()
…		…
1597		1554
1598	make_current ();	1555	make_current ();
1599		1556
1600	im_destroy ();	1557	im_destroy ();
1601		1558
1602	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603	if (Input_Context)	1559	if (Input_Context)
1604	return;	1560	return;
1605		1561
1606	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1562	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1607	if (rs[Rs_imLocale])	1563	if (rs[Rs_imLocale])
…		…
1680	XFree (preedit_attr);	1636	XFree (preedit_attr);
1681	XFree (status_attr);	1637	XFree (status_attr);
1682	}	1638	}
1683	#endif /* USE_XIM */	1639	#endif /* USE_XIM */
1684		1640
1685	/----------------------------------------------------------------------/
1686	rxvt_t rxvt_current_term;
1687
1688	/----------------------- end-of-file (C source) -----------------------/	1641	/----------------------- 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.184 by root, Tue Jan 17 12:22:59 2006 UTC vs. Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC