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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.185 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 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
…		…
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
514	pty = rxvt_new_ptytty ();
515		479
516	create_windows (argc, argv);	480	create_windows (argc, argv);
517		481
518	dDisp;	482	dDisp;
519		483
…		…
536	check_our_parents ();	500	check_our_parents ();
537	rootwin_ev.start (display, display->root);	501	rootwin_ev.start (display, display->root);
538	}	502	}
539	#endif	503	#endif
540		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
541	XMapWindow (disp, vt);	518	XMapWindow (disp, vt);
542	XMapWindow (disp, parent[0]);	519	XMapWindow (disp, parent[0]);
543		520
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;	521	return true;
558	}	522	}
559		523
560	static struct sig_handlers	524	static struct sig_handlers
561	{	525	{
562	sig_watcher sw_chld, sw_term, sw_int;	526	sig_watcher sw_term, sw_int;
563		527
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	/*	528	/*
579	* Catch a fatal signal and tidy up before quitting	529	* Catch a fatal signal and tidy up before quitting
580	*/	530	*/
581	void	531	void
582	sig_term (sig_watcher &w)	532	sig_term (sig_watcher &w)
583	{	533	{
584	#ifdef DEBUG_CMD
585	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586	#endif
587	rxvt_emergency_cleanup ();	534	rxvt_emergency_cleanup ();
588	signal (w.signum, SIG_DFL);	535	signal (w.signum, SIG_DFL);
589	kill (getpid (), w.signum);	536	kill (getpid (), w.signum);
590	}	537	}
591		538
592	sig_handlers ()	539	sig_handlers ()
593	: sw_chld (this, &sig_handlers::sig_chld),
594	sw_term (this, &sig_handlers::sig_term),	540	: sw_term (this, &sig_handlers::sig_term),
595	sw_int (this, &sig_handlers::sig_term)	541	sw_int (this, &sig_handlers::sig_term)
596	{	542	{
597	}	543	}
598	} sig_handlers;	544	} sig_handlers;
599		545
600	char **rxvt_environ; // startup environment	546	char **rxvt_environ; // startup environment
601		547
602	void	548	void
603	rxvt_init ()	549	rxvt_init ()
604	{	550	{
		551	ptytty::init ();
		552
605	rxvt_environ = environ;	553	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		554
617	signal (SIGHUP, SIG_IGN);	555	signal (SIGHUP, SIG_IGN);
618	signal (SIGPIPE, SIG_IGN);	556	signal (SIGPIPE, SIG_IGN);
619		557
620	sig_handlers.sw_chld.start (SIGCHLD);
621	sig_handlers.sw_term.start (SIGTERM);	558	sig_handlers.sw_term.start (SIGTERM);
622	sig_handlers.sw_int.start (SIGINT);	559	sig_handlers.sw_int.start (SIGINT);
623		560
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	561	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	562	/* signal (SIGURG, SIG_DFL); */
…		…
654	rxvt_fatal ("memory allocation failure. aborting.\n");	591	rxvt_fatal ("memory allocation failure. aborting.\n");
655		592
656	return p;	593	return p;
657	}	594	}
658		595
659	void *	596	void *
660	rxvt_realloc (void *ptr, size_t size)	597	rxvt_realloc (void *ptr, size_t size)
661	{	598	{
662	void *p = realloc (ptr, size);	599	void *p = realloc (ptr, size);
663		600
664	if (!p)	601	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");	602	rxvt_fatal ("memory allocation failure. aborting.\n");
666		603
667	return p;	604	return p;
668	}
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	}	605	}
719		606
720	/----------------------------------------------------------------------/	607	/----------------------------------------------------------------------/
721	/*	608	/*
722	* window size/position calculcations for XSizeHint and other storage.	609	* window size/position calculcations for XSizeHint and other storage.
…		…
728	short recalc_x, recalc_y;	615	short recalc_x, recalc_y;
729	int x, y, sb_w, flags;	616	int x, y, sb_w, flags;
730	unsigned int w, h;	617	unsigned int w, h;
731	unsigned int max_width, max_height;	618	unsigned int max_width, max_height;
732	dDisp;	619	dDisp;
733
734	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
735	ncol, nrow, szHint.width, szHint.height));
736		620
737	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	621	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
738	szHint.win_gravity = NorthWestGravity;	622	szHint.win_gravity = NorthWestGravity;
739	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	623	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740		624
…		…
843	if (recalc_y)	727	if (recalc_y)
844	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	728	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
845		729
846	ncol = width / fwidth;	730	ncol = width / fwidth;
847	nrow = height / fheight;	731	nrow = height / fheight;
848	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
849	ncol, nrow, szHint.width,
850	szHint.height));
851	return;
852	}	732	}
853		733
854	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
855	/*	735	/*
856	* Tell the teletype handler what size the window is.	736	* Tell the teletype handler what size the window is.
…		…
1140	* -------------------------------------------------------------------- */	1020	* -------------------------------------------------------------------- */
1141	void	1021	void
1142	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)
1143	{	1023	{
1144	int fix_screen;	1024	int fix_screen;
1145	int old_width = szHint.width, old_height = szHint.height;	1025	int old_width = szHint.width;
		1026	int old_height = szHint.height;
1146	dDisp;	1027	dDisp;
1147		1028
1148	window_calc (newwidth, newheight);	1029	window_calc (newwidth, newheight);
1149	XSetWMNormalHints (disp, parent[0], &szHint);	1030	XSetWMNormalHints (disp, parent[0], &szHint);
1150		1031
…		…
1172	{	1053	{
1173	x -= x1;	1054	x -= x1;
1174	y -= y1;	1055	y -= y1;
1175	}	1056	}
1176		1057
1177	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1058	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1178	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1059	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1179	dx = old_width - szHint.width;	1060	dx = old_width - szHint.width;
1180	dy = old_height - szHint.height;	1061	dy = old_height - szHint.height;
1181		1062
1182	/* Check position of the center of the window */	1063	/* Check position of the center of the window */
1183	if (x < x1) /* left half */	1064	if (x < x1) /* left half */
1184	dx = 0;	1065	dx = 0;
…		…
1217	resize_pixmap ();	1098	resize_pixmap ();
1218	#endif	1099	#endif
1219	}	1100	}
1220		1101
1221	if (fix_screen \|\| old_height == 0)	1102	if (fix_screen \|\| old_height == 0)
1222	{
1223	int curr_screen = -1;
1224	int old_ncol = prev_ncol;
1225
1226	/* scr_reset only works on the primary screen */
1227	if (old_height) /* this is not the first time through */
1228	{
1229	unsigned int ocol = ncol;
1230	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1231	curr_screen = scr_change_screen (PRIMARY);
1232	ncol = ocol;
1233	}
1234
1235	scr_reset ();	1103	scr_reset ();
1236
1237	if (curr_screen >= 0) /* this is not the first time through */
1238	{
1239	scr_change_screen (curr_screen);
1240	selection_check (old_ncol != ncol ? 4 : 0);
1241	}
1242	}
1243
1244	old_width = szHint.width;
1245	old_height = szHint.height;
1246		1104
1247	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1248	if (pixmap)	1106	if (pixmap)
1249	scr_touch (false);	1107	scr_touch (false);
1250	#endif	1108	#endif
…		…
1353	XPoint nspot;	1211	XPoint nspot;
1354	XVaNestedList preedit_attr;	1212	XVaNestedList preedit_attr;
1355		1213
1356	if (!Input_Context	1214	if (!Input_Context
1357	\|\| !focus	1215	\|\| !focus
1358	\|\| !(input_style & XIMPreeditPosition))	1216	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1359	return;	1217	return;
1360		1218
1361	im_set_position (nspot);	1219	im_set_position (nspot);
1362		1220
1363	if (nspot.x == spot.x && nspot.y == spot.y)	1221	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1382	input_method = 0;	1240	input_method = 0;
1383	}	1241	}
1384		1242
1385	Input_Context = 0;	1243	Input_Context = 0;
1386	}	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	#if 0
		1306	static void
		1307	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1308	{
		1309	((rxvt_term *)client_data)->make_current ();
		1310	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1311	DT_INT, call_data->position,
		1312	DT_INT, call_data->direction,
		1313	DT_INT, call_data->style,
		1314	DT_END));
		1315	}
		1316	#endif
		1317
		1318	#endif
1387		1319
1388	/*	1320	/*
1389	* Try to open a XIM with the current modifiers, then see if we can	1321	* Try to open a XIM with the current modifiers, then see if we can
1390	* open a suitable preedit type	1322	* open a suitable preedit type
1391	*/	1323	*/
…		…
1398	XRectangle rect, status_rect, needed_rect;	1330	XRectangle rect, status_rect, needed_rect;
1399	unsigned long fg, bg;	1331	unsigned long fg, bg;
1400	const char *p;	1332	const char *p;
1401	char **s;	1333	char **s;
1402	XIMStyles *xim_styles;	1334	XIMStyles *xim_styles;
		1335	#ifdef ENABLE_XIM_ONTHESPOT
		1336	XIMCallback xcb[4];
		1337	#endif
1403		1338
1404	set_environ (envv);	1339	set_environ (envv);
1405		1340
1406	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1341	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407	return false;	1342	return false;
1408		1343
1409	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410	input_method = display->get_xim (locale, modifiers);	1344	input_method = display->get_xim (locale, modifiers);
1411	if (input_method == NULL)	1345	if (input_method == NULL)
1412	return false;	1346	return false;
1413		1347
1414	xim = input_method->xim;	1348	xim = input_method->xim;
…		…
1434	s = rxvt_splitcommastring (p);	1368	s = rxvt_splitcommastring (p);
1435		1369
1436	for (i = found = 0; !found && s[i]; i++)	1370	for (i = found = 0; !found && s[i]; i++)
1437	{	1371	{
1438	if (!strcmp (s[i], "OverTheSpot"))	1372	if (!strcmp (s[i], "OverTheSpot"))
1439	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1373	input_style = XIMPreeditPosition \| XIMStatusNothing;
1440	else if (!strcmp (s[i], "OffTheSpot"))	1374	else if (!strcmp (s[i], "OffTheSpot"))
1441	input_style = (XIMPreeditArea \| XIMStatusArea);	1375	input_style = XIMPreeditArea \| XIMStatusArea;
1442	else if (!strcmp (s[i], "Root"))	1376	else if (!strcmp (s[i], "Root"))
1443	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1377	input_style = XIMPreeditNothing \| XIMStatusNothing;
1444	else if (!strcmp (s[i], "None"))	1378	else if (!strcmp (s[i], "None"))
1445	input_style = (XIMPreeditNone \| XIMStatusNone);	1379	input_style = XIMPreeditNone \| XIMStatusNone;
		1380	#ifdef ENABLE_XIM_ONTHESPOT
		1381	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1382	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1383	#endif
		1384	else
		1385	input_style = XIMPreeditNothing \| XIMStatusNothing;
1446		1386
1447	for (j = 0; j < xim_styles->count_styles; j++)	1387	for (j = 0; j < xim_styles->count_styles; j++)
1448	if (input_style == xim_styles->supported_styles[j])	1388	if (input_style == xim_styles->supported_styles[j])
1449	{	1389	{
1450	rxvt_freecommastring (s);	1390	rxvt_freecommastring (s);
…		…
1539	XNBackground, bg,	1479	XNBackground, bg,
1540	XNArea, &status_rect,	1480	XNArea, &status_rect,
1541	XNFontSet, fs,	1481	XNFontSet, fs,
1542	NULL);	1482	NULL);
1543	}	1483	}
		1484	else if (input_style & XIMPreeditCallbacks)
		1485	{
		1486	im_set_position (spot);
		1487
		1488	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1489	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1490	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1491	#if 0
		1492	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1493	#endif
		1494
		1495	preedit_attr = XVaCreateNestedList (0,
		1496	XNSpotLocation, &spot,
		1497	XNPreeditStartCallback, &xcb[0],
		1498	XNPreeditDoneCallback , &xcb[1],
		1499	XNPreeditDrawCallback , &xcb[2],
		1500	#if 0
		1501	XNPreeditCaretCallback, &xcb[3],
		1502	#endif
		1503	NULL);
		1504	}
1544		1505
1545	Input_Context = XCreateIC (xim,	1506	Input_Context = XCreateIC (xim,
1546	XNInputStyle, input_style,	1507	XNInputStyle, input_style,
1547	XNClientWindow, vt,	1508	XNClientWindow, vt,
1548	XNFocusWindow, parent[0],	1509	XNFocusWindow, parent[0],
…		…
1560	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1521	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561	im_destroy ();	1522	im_destroy ();
1562	return false;	1523	return false;
1563	}	1524	}
1564		1525
		1526	#if 0
		1527	// unfortunately, only the focus window is used by XIM, hard to fix
		1528	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1529	vt_select_input ();
		1530	#endif
		1531
1565	if (input_style & XIMPreeditArea)	1532	if (input_style & XIMPreeditArea)
1566	IMSetStatusPosition ();	1533	IMSetStatusPosition ();
1567		1534
1568	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569	return true;	1535	return true;
1570	}	1536	}
1571		1537
1572	void	1538	void
1573	rxvt_term::im_cb ()	1539	rxvt_term::im_cb ()
…		…
1579		1545
1580	make_current ();	1546	make_current ();
1581		1547
1582	im_destroy ();	1548	im_destroy ();
1583		1549
1584	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585	if (Input_Context)	1550	if (Input_Context)
1586	return;	1551	return;
1587		1552
1588	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1553	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1589	if (rs[Rs_imLocale])	1554	if (rs[Rs_imLocale])
…		…
1662	XFree (preedit_attr);	1627	XFree (preedit_attr);
1663	XFree (status_attr);	1628	XFree (status_attr);
1664	}	1629	}
1665	#endif /* USE_XIM */	1630	#endif /* USE_XIM */
1666		1631
1667	/----------------------------------------------------------------------/
1668	rxvt_t rxvt_current_term;
1669
1670	/----------------------- end-of-file (C source) -----------------------/	1632	/----------------------- 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.185 by root, Tue Jan 17 15:17:39 2006 UTC vs. Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.185 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC