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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.180 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.200 by root, Wed Jan 25 00:42:20 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
…		…
304	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
305	delete keyboard;	288	delete keyboard;
306	#endif	289	#endif
307	}	290	}
308		291
		292	// child has exited, usually destroys
309	void	293	void
310	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
311	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
312	cmd_pid = 0;	298	cmd_pid = 0;
313		299
314	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
315	destroy ();	301	destroy ();
316	}	302	}
…		…
318	void	304	void
319	rxvt_term::destroy ()	305	rxvt_term::destroy ()
320	{	306	{
321	if (destroy_ev.active)	307	if (destroy_ev.active)
322	return;	308	return;
		309
		310	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		311
324	#if ENABLE_OVERLAY	312	#if ENABLE_OVERLAY
325	scr_overlay_off ();	313	scr_overlay_off ();
326	#endif	314	#endif
327		315
…		…
461	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
462	}	450	}
463		451
464	/----------------------------------------------------------------------/	452	/----------------------------------------------------------------------/
465	bool	453	bool
466	rxvt_term::init (int argc, const char const argv)	454	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	455	{
		456	this->envv = envv;
		457
468	SET_R (this);	458	SET_R (this);
469	set_locale ("");	459	set_locale ("");
470	set_environ (envv); // few things in X do not call setlocale :(	460	set_environ (envv); // few things in X do not call setlocale :(
471		461
472	if (!init_vars ())	462	if (!init_vars ())
…		…
483	#ifdef HAVE_SCROLLBARS	473	#ifdef HAVE_SCROLLBARS
484	if (OPTION (Opt_scrollBar))	474	if (OPTION (Opt_scrollBar))
485	scrollBar.setIdle (); /* set existence for size calculations */	475	scrollBar.setIdle (); /* set existence for size calculations */
486	#endif	476	#endif
487		477
488	#if ENABLE_PERL	478	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		479
514	create_windows (argc, argv);	480	create_windows (argc, argv);
515		481
516	dDisp;	482	dDisp;
517		483
…		…
534	check_our_parents ();	500	check_our_parents ();
535	rootwin_ev.start (display, display->root);	501	rootwin_ev.start (display, display->root);
536	}	502	}
537	#endif	503	#endif
538		504
		505	set_colorfgbg ();
		506
		507	init_command (cmd_argv);
		508
		509	free (cmd_argv);
		510
		511	if (pty->pty >= 0)
		512	pty_ev.start (pty->pty, EVENT_READ);
		513
		514	check_ev.start ();
		515
		516	HOOK_INVOKE ((this, HOOK_START, DT_END));
		517
539	XMapWindow (disp, vt);	518	XMapWindow (disp, vt);
540	XMapWindow (disp, parent[0]);	519	XMapWindow (disp, parent[0]);
541		520
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;	521	return true;
556	}	522	}
557		523
558	static struct sig_handlers	524	static struct sig_handlers
559	{	525	{
560	sig_watcher sw_chld, sw_term, sw_int;	526	sig_watcher sw_term, sw_int;
561		527
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	/*	528	/*
577	* Catch a fatal signal and tidy up before quitting	529	* Catch a fatal signal and tidy up before quitting
578	*/	530	*/
579	void	531	void
580	sig_term (sig_watcher &w)	532	sig_term (sig_watcher &w)
581	{	533	{
582	#ifdef DEBUG_CMD
583	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584	#endif
585	rxvt_emergency_cleanup ();	534	rxvt_emergency_cleanup ();
586	signal (w.signum, SIG_DFL);	535	signal (w.signum, SIG_DFL);
587	kill (getpid (), w.signum);	536	kill (getpid (), w.signum);
588	}	537	}
589		538
590	sig_handlers ()	539	sig_handlers ()
591	: sw_chld (this, &sig_handlers::sig_chld),
592	sw_term (this, &sig_handlers::sig_term),	540	: sw_term (this, &sig_handlers::sig_term),
593	sw_int (this, &sig_handlers::sig_term)	541	sw_int (this, &sig_handlers::sig_term)
594	{	542	{
595	}	543	}
596	} sig_handlers;	544	} sig_handlers;
597		545
598	char **rxvt_environ; // startup environment	546	char **rxvt_environ; // startup environment
599		547
600	void	548	void
601	rxvt_init ()	549	rxvt_init ()
602	{	550	{
		551	ptytty::init ();
		552
603	rxvt_environ = environ;	553	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		554
615	signal (SIGHUP, SIG_IGN);	555	signal (SIGHUP, SIG_IGN);
616	signal (SIGPIPE, SIG_IGN);	556	signal (SIGPIPE, SIG_IGN);
617		557
618	sig_handlers.sw_chld.start (SIGCHLD);
619	sig_handlers.sw_term.start (SIGTERM);	558	sig_handlers.sw_term.start (SIGTERM);
620	sig_handlers.sw_int.start (SIGINT);	559	sig_handlers.sw_int.start (SIGINT);
621		560
622	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	561	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
623	/* signal (SIGURG, SIG_DFL); */	562	/* signal (SIGURG, SIG_DFL); */
…		…
652	rxvt_fatal ("memory allocation failure. aborting.\n");	591	rxvt_fatal ("memory allocation failure. aborting.\n");
653		592
654	return p;	593	return p;
655	}	594	}
656		595
657	void *	596	void *
658	rxvt_realloc (void *ptr, size_t size)	597	rxvt_realloc (void *ptr, size_t size)
659	{	598	{
660	void *p = realloc (ptr, size);	599	void *p = realloc (ptr, size);
661		600
662	if (!p)	601	if (!p)
663	rxvt_fatal ("memory allocation failure. aborting.\n");	602	rxvt_fatal ("memory allocation failure. aborting.\n");
664		603
665	return p;	604	return p;
666	}	605	}
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	makeutent (pty.name, rs[Rs_display_name]);
730	else
731	cleanutent ();
732
733	rxvt_privileges (IGNORE);
734	}
735	#endif
736		606
737	/----------------------------------------------------------------------/	607	/----------------------------------------------------------------------/
738	/*	608	/*
739	* window size/position calculcations for XSizeHint and other storage.	609	* window size/position calculcations for XSizeHint and other storage.
740	* if width/height are non-zero then override calculated width/height	610	* if width/height are non-zero then override calculated width/height
…		…
745	short recalc_x, recalc_y;	615	short recalc_x, recalc_y;
746	int x, y, sb_w, flags;	616	int x, y, sb_w, flags;
747	unsigned int w, h;	617	unsigned int w, h;
748	unsigned int max_width, max_height;	618	unsigned int max_width, max_height;
749	dDisp;	619	dDisp;
750
751	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752	ncol, nrow, szHint.width, szHint.height));
753		620
754	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	621	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
755	szHint.win_gravity = NorthWestGravity;	622	szHint.win_gravity = NorthWestGravity;
756	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	623	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757		624
…		…
860	if (recalc_y)	727	if (recalc_y)
861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	728	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
862		729
863	ncol = width / fwidth;	730	ncol = width / fwidth;
864	nrow = height / fheight;	731	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	}	732	}
870		733
871	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
872	/*	735	/*
873	* Tell the teletype handler what size the window is.	736	* Tell the teletype handler what size the window is.
874	* Called after a window size change.	737	* Called after a window size change.
875	*/	738	*/
876	void	739	void
877	rxvt_term::tt_winch ()	740	rxvt_term::tt_winch ()
878	{	741	{
879	if (pty.pty < 0)	742	if (pty->pty < 0)
880	return;	743	return;
881		744
882	struct winsize ws;	745	struct winsize ws;
883		746
884	ws.ws_col = ncol;	747	ws.ws_col = ncol;
885	ws.ws_row = nrow;	748	ws.ws_row = nrow;
886	ws.ws_xpixel = width;	749	ws.ws_xpixel = width;
887	ws.ws_ypixel = height;	750	ws.ws_ypixel = height;
888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	751	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889		752
890	#if 0	753	#if 0
891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	754	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892	if (cmd_pid) /* force through to the command */	755	if (cmd_pid) /* force through to the command */
893	kill (-cmd_pid, SIGWINCH);	756	kill (-cmd_pid, SIGWINCH);
…		…
1157	* -------------------------------------------------------------------- */	1020	* -------------------------------------------------------------------- */
1158	void	1021	void
1159	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1022	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1160	{	1023	{
1161	int fix_screen;	1024	int fix_screen;
1162	int old_width = szHint.width, old_height = szHint.height;	1025	int old_width = szHint.width;
		1026	int old_height = szHint.height;
1163	dDisp;	1027	dDisp;
1164		1028
1165	window_calc (newwidth, newheight);	1029	window_calc (newwidth, newheight);
1166	XSetWMNormalHints (disp, parent[0], &szHint);	1030	XSetWMNormalHints (disp, parent[0], &szHint);
1167		1031
…		…
1189	{	1053	{
1190	x -= x1;	1054	x -= x1;
1191	y -= y1;	1055	y -= y1;
1192	}	1056	}
1193		1057
1194	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1058	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1195	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1059	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1196	dx = old_width - szHint.width;	1060	dx = old_width - szHint.width;
1197	dy = old_height - szHint.height;	1061	dy = old_height - szHint.height;
1198		1062
1199	/* Check position of the center of the window */	1063	/* Check position of the center of the window */
1200	if (x < x1) /* left half */	1064	if (x < x1) /* left half */
1201	dx = 0;	1065	dx = 0;
…		…
1234	resize_pixmap ();	1098	resize_pixmap ();
1235	#endif	1099	#endif
1236	}	1100	}
1237		1101
1238	if (fix_screen \|\| old_height == 0)	1102	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 ();	1103	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		1104
1264	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1265	if (pixmap)	1106	if (pixmap)
1266	scr_touch (false);	1107	scr_touch (false);
1267	#endif	1108	#endif
…		…
1399	input_method = 0;	1240	input_method = 0;
1400	}	1241	}
1401		1242
1402	Input_Context = 0;	1243	Input_Context = 0;
1403	}	1244	}
		1245
		1246	#ifdef ENABLE_XIM_ONTHESPOT
		1247
		1248	static void
		1249	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1250	{
		1251	((rxvt_term *)client_data)->make_current ();
		1252	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1253	}
		1254
		1255	static void
		1256	xim_preedit_done (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_DONE, DT_END));
		1260	}
		1261
		1262	static void
		1263	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1264	{
		1265	rxvt_term term = (rxvt_term )client_data;
		1266	XIMText *text = call_data->text;
		1267
		1268	term->make_current ();
		1269
		1270	if (text)
		1271	{
		1272	void *str;
		1273
		1274	if (!text->encoding_is_wchar && text->string.multi_byte)
		1275	{
		1276	// of course, X makes it ugly again
		1277	if (term->rs[Rs_imLocale])
		1278	SET_LOCALE (term->rs[Rs_imLocale]);
		1279
		1280	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1281	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1282
		1283	if (term->rs[Rs_imLocale])
		1284	SET_LOCALE (term->locale);
		1285	}
		1286	else
		1287	str = (void *)text->string.wide_char;
		1288
		1289	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1290	DT_INT, call_data->caret,
		1291	DT_INT, call_data->chg_first,
		1292	DT_INT, call_data->chg_length,
		1293	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1294	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1295	DT_END));
		1296	}
		1297	else
		1298	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1299	DT_INT, call_data->caret,
		1300	DT_INT, call_data->chg_first,
		1301	DT_INT, call_data->chg_length,
		1302	DT_END));
		1303	}
		1304
		1305	static void
		1306	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1307	{
		1308	((rxvt_term *)client_data)->make_current ();
		1309	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1310	DT_INT, call_data->position,
		1311	DT_INT, call_data->direction,
		1312	DT_INT, call_data->style,
		1313	DT_END));
		1314	}
		1315
		1316	#endif
1404		1317
1405	/*	1318	/*
1406	* Try to open a XIM with the current modifiers, then see if we can	1319	* Try to open a XIM with the current modifiers, then see if we can
1407	* open a suitable preedit type	1320	* open a suitable preedit type
1408	*/	1321	*/
…		…
1415	XRectangle rect, status_rect, needed_rect;	1328	XRectangle rect, status_rect, needed_rect;
1416	unsigned long fg, bg;	1329	unsigned long fg, bg;
1417	const char *p;	1330	const char *p;
1418	char **s;	1331	char **s;
1419	XIMStyles *xim_styles;	1332	XIMStyles *xim_styles;
		1333	#ifdef ENABLE_XIM_ONTHESPOT
		1334	XIMCallback xcb[4];
		1335	#endif
1420		1336
1421	set_environ (envv);	1337	set_environ (envv);
1422		1338
1423	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1339	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424	return false;	1340	return false;
1425		1341
1426	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427	input_method = display->get_xim (locale, modifiers);	1342	input_method = display->get_xim (locale, modifiers);
1428	if (input_method == NULL)	1343	if (input_method == NULL)
1429	return false;	1344	return false;
1430		1345
1431	xim = input_method->xim;	1346	xim = input_method->xim;
…		…
1451	s = rxvt_splitcommastring (p);	1366	s = rxvt_splitcommastring (p);
1452		1367
1453	for (i = found = 0; !found && s[i]; i++)	1368	for (i = found = 0; !found && s[i]; i++)
1454	{	1369	{
1455	if (!strcmp (s[i], "OverTheSpot"))	1370	if (!strcmp (s[i], "OverTheSpot"))
1456	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1371	input_style = XIMPreeditPosition \| XIMStatusNothing;
1457	else if (!strcmp (s[i], "OffTheSpot"))	1372	else if (!strcmp (s[i], "OffTheSpot"))
1458	input_style = (XIMPreeditArea \| XIMStatusArea);	1373	input_style = XIMPreeditArea \| XIMStatusArea;
1459	else if (!strcmp (s[i], "Root"))	1374	else if (!strcmp (s[i], "Root"))
1460	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1375	input_style = XIMPreeditNothing \| XIMStatusNothing;
1461	else if (!strcmp (s[i], "None"))	1376	else if (!strcmp (s[i], "None"))
1462	input_style = (XIMPreeditNone \| XIMStatusNone);	1377	input_style = XIMPreeditNone \| XIMStatusNone;
		1378	#ifdef ENABLE_XIM_ONTHESPOT
		1379	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1380	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1381	#endif
		1382	else
		1383	input_style = XIMPreeditNothing \| XIMStatusNothing;
1463		1384
1464	for (j = 0; j < xim_styles->count_styles; j++)	1385	for (j = 0; j < xim_styles->count_styles; j++)
1465	if (input_style == xim_styles->supported_styles[j])	1386	if (input_style == xim_styles->supported_styles[j])
1466	{	1387	{
1467	rxvt_freecommastring (s);	1388	rxvt_freecommastring (s);
…		…
1556	XNBackground, bg,	1477	XNBackground, bg,
1557	XNArea, &status_rect,	1478	XNArea, &status_rect,
1558	XNFontSet, fs,	1479	XNFontSet, fs,
1559	NULL);	1480	NULL);
1560	}	1481	}
		1482	else if (input_style & XIMPreeditCallbacks)
		1483	{
		1484	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1485	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1486	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1487	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1488
		1489	preedit_attr = XVaCreateNestedList (0,
		1490	XNPreeditStartCallback, &xcb[0],
		1491	XNPreeditDoneCallback , &xcb[1],
		1492	XNPreeditDrawCallback , &xcb[2],
		1493	XNPreeditCaretCallback, &xcb[3],
		1494	NULL);
		1495	}
1561		1496
1562	Input_Context = XCreateIC (xim,	1497	Input_Context = XCreateIC (xim,
1563	XNInputStyle, input_style,	1498	XNInputStyle, input_style,
1564	XNClientWindow, vt,	1499	XNClientWindow, vt,
1565	XNFocusWindow, parent[0],	1500	XNFocusWindow, parent[0],
…		…
1577	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1512	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578	im_destroy ();	1513	im_destroy ();
1579	return false;	1514	return false;
1580	}	1515	}
1581		1516
		1517	#if 0
		1518	// unfortunately, only the focus window is used by XIM, hard to fix
		1519	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1520	vt_select_input ();
		1521	#endif
		1522
1582	if (input_style & XIMPreeditArea)	1523	if (input_style & XIMPreeditArea)
1583	IMSetStatusPosition ();	1524	IMSetStatusPosition ();
1584		1525
1585	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586	return true;	1526	return true;
1587	}	1527	}
1588		1528
1589	void	1529	void
1590	rxvt_term::im_cb ()	1530	rxvt_term::im_cb ()
…		…
1596		1536
1597	make_current ();	1537	make_current ();
1598		1538
1599	im_destroy ();	1539	im_destroy ();
1600		1540
1601	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602	if (Input_Context)	1541	if (Input_Context)
1603	return;	1542	return;
1604		1543
1605	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1544	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1606	if (rs[Rs_imLocale])	1545	if (rs[Rs_imLocale])
…		…
1679	XFree (preedit_attr);	1618	XFree (preedit_attr);
1680	XFree (status_attr);	1619	XFree (status_attr);
1681	}	1620	}
1682	#endif /* USE_XIM */	1621	#endif /* USE_XIM */
1683		1622
1684	/----------------------------------------------------------------------/
1685	rxvt_t rxvt_current_term;
1686
1687	/----------------------- end-of-file (C source) -----------------------/	1623	/----------------------- 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.180 by root, Mon Jan 16 15:00:20 2006 UTC vs. Revision 1.200 by root, Wed Jan 25 00:42:20 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.180 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.200 by root, Wed Jan 25 00:42:20 2006 UTC