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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.117 by root, Mon Nov 29 01:20:42 2004 UTC

…		…
123	return len;	123	return len;
124		124
125	}	125	}
126	#endif	126	#endif
127		127
128	void *
129	rxvt_term::operator new (size_t s)
130	{
131	void *p = malloc (s);
132
133	memset (p, 0, s);
134	return p;
135	}
136
137	void
138	rxvt_term::operator delete (void *p, size_t s)
139	{
140	free (p);
141	}
142
143	rxvt_term::rxvt_term ()	128	rxvt_term::rxvt_term ()
144	:	129	:
145	#if TRANSPARENT	130	#if TRANSPARENT
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	131	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	132	#endif
…		…
170	pointer_ev (this, &rxvt_term::pointer_cb),	155	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	156	#endif
172	#ifdef USE_XIM	157	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	158	im_ev (this, &rxvt_term::im_cb),
174	#endif	159	#endif
		160	sw_term (this, &rxvt_term::sig_term),
		161	sw_chld (this, &rxvt_term::sig_chld),
175	termwin_ev (this, &rxvt_term::x_cb),	162	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	163	vt_ev (this, &rxvt_term::x_cb),
177	check_ev (this, &rxvt_term::check_cb),	164	check_ev (this, &rxvt_term::check_cb),
178	flush_ev (this, &rxvt_term::flush_cb),	165	flush_ev (this, &rxvt_term::flush_cb),
179	destroy_ev (this, &rxvt_term::destroy_cb),	166	destroy_ev (this, &rxvt_term::destroy_cb),
…		…
196		183
197	#ifdef UTMP_SUPPORT	184	#ifdef UTMP_SUPPORT
198	privileged_utmp (RESTORE);	185	privileged_utmp (RESTORE);
199	#endif	186	#endif
200		187
		188	#if ENABLE_STYLES
		189	for (int i = RS_styleCount; --i; )
		190	if (TermWin.fontset[i] != TermWin.fontset[0])
		191	delete TermWin.fontset[i];
		192	#endif
201	delete TermWin.fontset;	193	delete TermWin.fontset[0];
202		194
203	if (display)	195	if (display)
204	{	196	{
205	selection_clear ();	197	selection_clear ();
206		198
…		…
387	#endif	379	#endif
388		380
389	XMapWindow (display->display, TermWin.vt);	381	XMapWindow (display->display, TermWin.vt);
390	XMapWindow (display->display, TermWin.parent[0]);	382	XMapWindow (display->display, TermWin.parent[0]);
391		383
		384	set_colorfgbg ();
		385
392	init_command (cmd_argv);	386	init_command (cmd_argv);
393		387
394	pty_ev.start (pty.pty, EVENT_READ);	388	pty_ev.start (pty.pty, EVENT_READ);
395		389
396	check_ev.start ();	390	check_ev.start ();
…		…
401	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);	395	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
402		396
403	void	397	void
404	rxvt_init ()	398	rxvt_init ()
405	{	399	{
406	/* install exit handler for cleanup */
407	#if 0
408	#ifdef HAVE_ATEXIT
409	atexit (rxvt_clean_exit);
410	#else
411	#endif
412	#endif
413	/*	400	/*
414	* Save and then give up any super-user privileges	401	* Save and then give up any super-user privileges
415	* If we need privileges in any area then we must specifically request it.	402	* If we need privileges in any area then we must specifically request it.
416	* We should only need to be root in these cases:	403	* We should only need to be root in these cases:
417	* 1. write utmp entries on some systems	404	* 1. write utmp entries on some systems
418	* 2. chown tty on some systems	405	* 2. chown tty on some systems
419	*/	406	*/
420	rxvt_privileges (SAVE);	407	rxvt_privileges (SAVE);
421	rxvt_privileges (IGNORE);	408	rxvt_privileges (IGNORE);
422		409
423	struct sigaction sa;	410	signal (SIGHUP, SIG_IGN);
424		411	signal (SIGPIPE, SIG_IGN);
425	sigfillset (&sa.sa_mask);
426	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;
427	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
428	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
429	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
430	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
431	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
432	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
433		412
434	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	413	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
435	/* signal (SIGURG, SIG_DFL); */	414	/* signal (SIGURG, SIG_DFL); */
436		415
437	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	416	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
		417	// TODO: handle this with exceptions and tolerate the memory loss
438	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);	418	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
439	}	419	}
440		420
441	/* ------------------------------------------------------------------------- *	421	/* ------------------------------------------------------------------------- *
442	* SIGNAL HANDLING & EXIT HANDLER *	422	* SIGNAL HANDLING & EXIT HANDLER *
443	* ------------------------------------------------------------------------- */	423	* ------------------------------------------------------------------------- */
444	/*	424	/*
445	* Catch a SIGCHLD signal and exit if the direct child has died	425	* Catch a SIGCHLD signal and exit if the direct child has died
446	*/	426	*/
447		427
448	void rxvt_term::child_exited (int pid)	428	void
		429	rxvt_term::sig_chld (sig_watcher &w)
449	{	430	{
450	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	431	// we are being called for every SIGCHLD, not just ours
451	if (pid == (*t)->cmd_pid)	432	int pid;
452	{
453	(*t)->destroy ();
454	break;
455	}
456	}
457
458	/* ARGSUSED */
459	/* INTPROTO */
460	RETSIGTYPE
461	rxvt_Child_signal (int sig __attribute__ ((unused)))
462	{
463	int pid, save_errno = errno;
464		433
465	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	434	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
466	rxvt_term::child_exited (pid);	435	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
467		436	if (pid == (*t)->cmd_pid)
468	errno = save_errno;	437	{
469	}	438	(*t)->destroy ();
470		439	break;
471	/*	440	}
472	* Catch a fatal signal and tidy up before quitting
473	*/
474	/* INTPROTO */
475	RETSIGTYPE
476	rxvt_Exit_signal (int sig)
477	{
478	signal (sig, SIG_DFL);
479	#ifdef DEBUG_CMD
480	rxvt_warn ("caught signal %d, exiting.\n", sig);
481	#endif
482	rxvt_clean_exit ();
483	kill (getpid (), sig);
484	}
485
486	/* INTPROTO */
487	int
488	rxvt_xerror_handler (Display display, XErrorEvent event)
489	{
490	if (GET_R->allowedxerror == -1)
491	GET_R->allowedxerror = event->error_code;
492	else
493	{
494	old_xerror_handler (display, event);
495	GET_R->destroy ();
496	}
497
498	return 0;
499	}	441	}
500		442
501	/----------------------------------------------------------------------/	443	/----------------------------------------------------------------------/
502	/*	444	/*
503	* Exit gracefully, clearing the utmp entry and restoring tty attributes	445	* Exit gracefully, clearing the utmp entry and restoring tty attributes
504	* TODO: if debugging, this should free up any known resources if we can	446	* TODO: if debugging, this should free up any known resources if we can
505	*/	447	*/
		448	void
		449	rxvt_destroy_all ()
		450	{
		451	// TODO: rxvtd should clean up all ressources
		452	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		453	(*t)->destroy ();
		454	}
		455
		456	/*
		457	* Catch a fatal signal and tidy up before quitting
		458	*/
		459	void
		460	rxvt_term::sig_term (sig_watcher &w)
		461	{
		462	#ifdef DEBUG_CMD
		463	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		464	#endif
		465	rxvt_destroy_all ();
		466	signal (w.signum, SIG_DFL);
		467	kill (getpid (), w.signum);
		468	}
		469
506	/* INTPROTO */	470	/* INTPROTO */
507	void	471	int
508	rxvt_clean_exit ()	472	rxvt_xerror_handler (Display display, XErrorEvent event)
509	{	473	{
510	// TODO: rxvtd should clean up all ressources	474	if (GET_R->allowedxerror == -1)
511	if (GET_R)	475	GET_R->allowedxerror = event->error_code;
		476	else
		477	{
		478	old_xerror_handler (display, event);
512	GET_R->destroy ();	479	GET_R->destroy ();
		480	}
		481
		482	return 0;
513	}	483	}
514		484
515	/* ------------------------------------------------------------------------- *	485	/* ------------------------------------------------------------------------- *
516	* MEMORY ALLOCATION WRAPPERS *	486	* MEMORY ALLOCATION WRAPPERS *
517	* ------------------------------------------------------------------------- */	487	* ------------------------------------------------------------------------- */
518	/* INTPROTO */	488	void *
519	void *
520	rxvt_malloc (size_t size)	489	rxvt_malloc (size_t size)
521	{	490	{
522	void *p;
523
524	p = malloc (size);	491	void *p = malloc (size);
		492
525	if (p)	493	if (!p)
526	return p;
527
528	rxvt_fatal ("memory allocation failure. aborting.\n");	494	rxvt_fatal ("memory allocation failure. aborting.\n");
529	/* NOTREACHED */	495
		496	return p;
530	}	497	}
531		498
532	/* INTPROTO */	499	/* INTPROTO */
533	void *	500	void *
534	rxvt_calloc (size_t number, size_t size)	501	rxvt_calloc (size_t number, size_t size)
535	{	502	{
536	void *p;
537
538	p = calloc (number, size);	503	void *p = calloc (number, size);
		504
539	if (p)	505	if (!p)
540	return p;
541
542	rxvt_fatal ("memory allocation failure. aborting.\n");	506	rxvt_fatal ("memory allocation failure. aborting.\n");
543	/* NOTREACHED */	507
		508	return p;
544	}	509	}
545		510
546	/* INTPROTO */	511	/* INTPROTO */
547	void *	512	void *
548	rxvt_realloc (void *ptr, size_t size)	513	rxvt_realloc (void *ptr, size_t size)
549	{	514	{
550	void *p;
551
552	if (ptr)
553	p = realloc (ptr, size);	515	void *p = realloc (ptr, size);
554	else
555	p = malloc (size);
556		516
557	if (p)	517	if (!p)
558	return p;
559
560	rxvt_fatal ("memory allocation failure. aborting.\n");	518	rxvt_fatal ("memory allocation failure. aborting.\n");
561	/* NOTREACHED */	519
		520	return p;
562	}	521	}
563		522
564	/* ------------------------------------------------------------------------- *	523	/* ------------------------------------------------------------------------- *
565	* PRIVILEGED OPERATIONS *	524	* PRIVILEGED OPERATIONS *
566	* ------------------------------------------------------------------------- */	525	* ------------------------------------------------------------------------- */
…		…
793	kill (cmd_pid, SIGWINCH);	752	kill (cmd_pid, SIGWINCH);
794	#endif	753	#endif
795	}	754	}
796		755
797	/----------------------------------------------------------------------/	756	/----------------------------------------------------------------------/
798	/* rxvt_change_font () - Switch to a new font */	757	/* set_fonts () - load and set the various fonts
799	/*	758	/*
800	* init = 1 - initialize	759	* init = 1 - initialize
801	*	760	*
802	* fontname == FONT_UP - switch to bigger font	761	* fontname == FONT_UP - switch to bigger font
803	* fontname == FONT_DN - switch to smaller font	762	* fontname == FONT_DN - switch to smaller font
804	*/	763	*/
805	bool	764	bool
806	rxvt_term::change_font (const char *fontname)	765	rxvt_term::set_fonts ()
807	{	766	{
808	if (fontname == FONT_UP)
809	{
810	// TODO
811	}
812	else if (fontname == FONT_DN)
813	{
814	// TODO
815	}
816	else
817	{
818	rxvt_fontset *fs = new rxvt_fontset (this);	767	rxvt_fontset *fs = new rxvt_fontset (this);
		768	rxvt_fontprop prop;
819		769
820	if (fs && fs->populate (fontname ? fontname : "fixed"))	770	if (!fs
		771	\|\| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
		772	\|\| !fs->realize_font (1))
		773	{
		774	delete fs;
		775	return false;
		776	}
		777
		778	#if ENABLE_STYLES
		779	for (int i = RS_styleCount; --i; )
		780	if (TermWin.fontset[i] != TermWin.fontset[0])
		781	delete TermWin.fontset[i];
		782	#endif
		783
		784	delete TermWin.fontset[0];
		785	TermWin.fontset[0] = fs;
		786
		787	prop = (*fs)[1]->properties ();
		788	fs->set_prop (prop);
		789
		790	TermWin.fwidth = prop.width;
		791	TermWin.fheight = prop.height;
		792	TermWin.fweight = prop.weight;
		793	TermWin.fslant = prop.slant;
		794	TermWin.fbase = (*fs)[1]->ascent;
		795
		796	for (int style = 1; style < 4; style++)
		797	{
		798	#if ENABLE_STYLES
		799	const char *res = rs[Rs_font + style];
		800
		801	if (res && !*res)
		802	TermWin.fontset[style] = TermWin.fontset[0];
		803	else
821	{	804	{
822	delete TermWin.fontset;	805	TermWin.fontset[style] = fs = new rxvt_fontset (this);
823	TermWin.fontset = fs;	806	rxvt_fontprop prop2 = prop;
824	TermWin.fwidth = fs->base_font ()->width;
825	TermWin.fheight = fs->base_font ()->height;
826	TermWin.fbase = fs->base_font ()->ascent;
827		807
828	if (TermWin.parent[0])	808	if (res)
		809	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		810	else
829	{	811	{
830	resize_all_windows (0, 0, 0);	812	res = TermWin.fontset[0]->fontdesc;
831	scr_remap_chars ();	813
832	scr_touch (true);	814	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		815	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833	}	816	}
834		817
835	for (unicode_t ch = 0x20; ch <= 0x7f; ch++)	818	fs->populate (res);
836	TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);	819	fs->set_prop (prop2);
837
838	return true;
839	}	820	}
		821	#else
		822	TermWin.fontset[style] = TermWin.fontset[0];
		823	#endif
		824	}
		825
		826	if (TermWin.parent[0])
840	}	827	{
		828	resize_all_windows (0, 0, 0);
		829	scr_remap_chars ();
		830	scr_touch (true);
		831	}
841		832
842	return false;	833	return true;
843	}
844
845	bool
846	rxvt_term::font_up_down (int n, int direction)
847	{
848	return false;
849	}	834	}
850		835
851	/----------------------------------------------------------------------/	836	/----------------------------------------------------------------------/
852	/----------------------------------------------------------------------/	837	/----------------------------------------------------------------------/
853	/* xterm sequences - title, iconName, color (exptl) */	838	/* xterm sequences - title, iconName, color (exptl) */
…		…
947		932
948	/* XSetWindowAttributes attr; */	933	/* XSetWindowAttributes attr; */
949	/* Cursor cursor; */	934	/* Cursor cursor; */
950	Done:	935	Done:
951	#ifdef OFF_FOCUS_FADING	936	#ifdef OFF_FOCUS_FADING
		937	if (rs[Rs_fade])
952	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));	938	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
953	#endif	939	#endif
954	if (idx == Color_bg && ! (options & Opt_transparent))
955	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956		940
957	/* handle Color_BD, scrollbar background, etc. */	941	/TODO: handle Color_BD, scrollbar background, etc. /
958		942
959	set_colorfgbg ();
960	recolour_cursor ();	943	recolour_cursor ();
961	scr_touch (true);	944	scr_recolour ();
962	}	945	}
963		946
964	#else	947	#else
965	# define set_window_color (idx,color) ((void)0)	948	# define set_window_color (idx,color) ((void)0)
966	#endif /* XTERM_COLOR_CHANGE */	949	#endif /* XTERM_COLOR_CHANGE */
…		…
968	void	951	void
969	rxvt_term::recolour_cursor ()	952	rxvt_term::recolour_cursor ()
970	{	953	{
971	XColor xcol[2];	954	XColor xcol[2];
972		955
973	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg];	956	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
974	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg];	957	? pix_colors_focused[Color_pointer_fg]
		958	: pix_colors_focused[Color_fg];
		959	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		960	? pix_colors_focused[Color_pointer_bg]
		961	: pix_colors_focused[Color_bg];
		962
975	XQueryColors (display->display, display->cmap, xcol, 2);	963	XQueryColors (display->display, display->cmap, xcol, 2);
976	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	964	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977	}	965	}
978		966
979	/----------------------------------------------------------------------/	967	/----------------------------------------------------------------------/
…		…
981	* find if fg/bg matches any of the normal (low-intensity) colors	969	* find if fg/bg matches any of the normal (low-intensity) colors
982	*/	970	*/
983	void	971	void
984	rxvt_term::set_colorfgbg ()	972	rxvt_term::set_colorfgbg ()
985	{	973	{
986	unsigned int i;	974	unsigned int i;
987	const char *xpmb = "\0";	975	const char *xpmb = "\0";
988	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	976	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989		977
990	env_colorfgbg =
991	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	978	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992	strcpy (fstr, "default");	979	strcpy (fstr, "default");
993	strcpy (bstr, "default");	980	strcpy (bstr, "default");
994	for (i = Color_Black; i <= Color_White; i++)	981	for (i = Color_Black; i <= Color_White; i++)
995	if (pix_colors[Color_fg] == pix_colors[i])	982	if (pix_colors[Color_fg] == pix_colors[i])
996	{	983	{
997	sprintf (fstr, "%d", (i - Color_Black));	984	sprintf (fstr, "%d", (i - Color_Black));
998	break;	985	break;
999	}	986	}
		987
1000	for (i = Color_Black; i <= Color_White; i++)	988	for (i = Color_Black; i <= Color_White; i++)
1001	if (pix_colors[Color_bg] == pix_colors[i])	989	if (pix_colors[Color_bg] == pix_colors[i])
1002	{	990	{
1003	sprintf (bstr, "%d", (i - Color_Black));	991	sprintf (bstr, "%d", (i - Color_Black));
1004	#ifdef XPM_BACKGROUND	992	#ifdef XPM_BACKGROUND
…		…
1006	#endif	994	#endif
1007	break;	995	break;
1008	}	996	}
1009		997
1010	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	998	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1011
1012	#ifndef NO_BRIGHTCOLOR
1013	colorfgbg = DEFAULT_RSTYLE;
1014	for (i = minCOLOR; i <= maxCOLOR; i++)
1015	{
1016	if (pix_colors[Color_fg] == pix_colors[i])
1017	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1018	if (pix_colors[Color_bg] == pix_colors[i])
1019	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1020	}
1021	#endif
1022	}	999	}
1023		1000
1024	/----------------------------------------------------------------------/	1001	/----------------------------------------------------------------------/
1025	/*	1002	/*
1026	* Colour determination for low colour displays, routine from	1003	* Colour determination for low colour displays, routine from
…		…
1252	}	1229	}
1253		1230
1254	void	1231	void
1255	rxvt_term::IMSendSpot ()	1232	rxvt_term::IMSendSpot ()
1256	{	1233	{
1257	XPoint spot;	1234	XPoint nspot;
1258	XVaNestedList preedit_attr;	1235	XVaNestedList preedit_attr;
1259		1236
1260	if (!Input_Context	1237	if (!Input_Context
1261	\|\| !TermWin.focus	1238	\|\| !TermWin.focus
1262	\|\| !(input_style & XIMPreeditPosition)	1239	\|\| !(input_style & XIMPreeditPosition))
1263	#if 0
1264	\|\| !(event_type == KeyPress
1265	\|\| event_type == Expose
1266	\|\| event_type == NoExpose
1267	\|\| event_type == SelectionNotify
1268	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)
1269	#endif
1270	\|\| !IMisRunning ())
1271	return;	1240	return;
1272		1241
1273	im_set_position (spot);	1242	im_set_position (nspot);
		1243
		1244	if (nspot.x == spot.x && nspot.y == spot.y)
		1245	return;
		1246
		1247	spot = nspot;
1274		1248
1275	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1249	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1250	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277	XFree (preedit_attr);	1251	XFree (preedit_attr);
1278	}	1252	}
1279		1253
1280	void	1254	void
1281	rxvt_term::im_destroy ()	1255	rxvt_term::im_destroy ()
1282	{	1256	{
1283	if (Input_Context)
1284	{
1285	XDestroyIC (Input_Context);
1286	Input_Context = 0;
1287	}
1288
1289	if (input_method)	1257	if (input_method)
1290	{	1258	{
		1259	if (Input_Context && input_method->xim)
		1260	XDestroyIC (Input_Context);
		1261
1291	display->put_xim (input_method);	1262	display->put_xim (input_method);
1292	input_method = 0;	1263	input_method = 0;
1293	}	1264	}
		1265
		1266	Input_Context = 0;
1294	}	1267	}
1295		1268
1296	/*	1269	/*
1297	* Try to open a XIM with the current modifiers, then see if we can	1270	* Try to open a XIM with the current modifiers, then see if we can
1298	* open a suitable preedit type	1271	* open a suitable preedit type
…		…
1316	input_method = display->get_xim (locale, modifiers);	1289	input_method = display->get_xim (locale, modifiers);
1317	if (input_method == NULL)	1290	if (input_method == NULL)
1318	return false;	1291	return false;
1319		1292
1320	xim = input_method->xim;	1293	xim = input_method->xim;
		1294	spot.x = spot.y = -1;
1321		1295
1322	xim_styles = NULL;	1296	xim_styles = NULL;
1323	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1297	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324	\|\| !xim_styles \|\| !xim_styles->count_styles)	1298	\|\| !xim_styles \|\| !xim_styles->count_styles)
1325	{	1299	{
1326	im_destroy ();	1300	im_destroy ();
1327	return false;	1301	return false;
1328	}	1302	}
1329		1303
1330	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1304	const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
		1305
		1306	for (int pi = 0; pi < 2; pi++)
		1307	{
		1308	p = pet[pi];
		1309
		1310	if (!p)
		1311	continue;
		1312
1331	s = rxvt_splitcommastring (p);	1313	s = rxvt_splitcommastring (p);
1332		1314
1333	for (i = found = 0; !found && s[i]; i++)	1315	for (i = found = 0; !found && s[i]; i++)
1334	{	1316	{
1335	if (!strcmp (s[i], "OverTheSpot"))	1317	if (!strcmp (s[i], "OverTheSpot"))
1336	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1318	input_style = (XIMPreeditPosition \| XIMStatusNothing);
1337	else if (!strcmp (s[i], "OffTheSpot"))	1319	else if (!strcmp (s[i], "OffTheSpot"))
1338	input_style = (XIMPreeditArea \| XIMStatusArea);	1320	input_style = (XIMPreeditArea \| XIMStatusArea);
1339	else if (!strcmp (s[i], "Root"))	1321	else if (!strcmp (s[i], "Root"))
1340	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1322	input_style = (XIMPreeditNothing \| XIMStatusNothing);
		1323	else if (!strcmp (s[i], "None"))
		1324	input_style = (XIMPreeditNone \| XIMStatusNone);
1341		1325
1342	for (j = 0; j < xim_styles->count_styles; j++)	1326	for (j = 0; j < xim_styles->count_styles; j++)
1343	if (input_style == xim_styles->supported_styles[j])	1327	if (input_style == xim_styles->supported_styles[j])
1344	{	1328	{
		1329	rxvt_freecommastring (s);
		1330
1345	found = 1;	1331	found = 1;
1346	break;	1332	goto foundpet;
		1333	}
		1334
1347	}	1335	}
1348	}
1349		1336
1350	for (i = 0; s[i]; i++)	1337	rxvt_freecommastring (s);
1351	free (s[i]);	1338	}
1352		1339
1353	free (s);	1340	foundpet:
		1341
1354	XFree (xim_styles);	1342	XFree (xim_styles);
1355		1343
1356	if (!found)	1344	if (!found)
1357	{	1345	{
1358	im_destroy ();	1346	im_destroy ();
…		…
1483	if (p && *p)	1471	if (p && *p)
1484	{	1472	{
1485	bool found = false;	1473	bool found = false;
1486		1474
1487	s = rxvt_splitcommastring (p);	1475	s = rxvt_splitcommastring (p);
		1476
1488	for (i = 0; s[i]; i++)	1477	for (i = 0; s[i]; i++)
1489	{	1478	{
1490	if (*s[i])	1479	if (*s[i])
1491	{	1480	{
1492	strcpy (buf, "@im=");	1481	strcpy (buf, "@im=");
…		…
1496	found = true;	1485	found = true;
1497	break;	1486	break;
1498	}	1487	}
1499	}	1488	}
1500	}	1489	}
1501	for (i = 0; s[i]; i++)	1490
1502	free (s[i]);	1491	rxvt_freecommastring (s);
1503	free (s);
1504		1492
1505	if (found)	1493	if (found)
1506	goto done;	1494	goto done;
1507	}	1495	}
1508		1496

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC vs. Revision 1.117 by root, Mon Nov 29 01:20:42 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.117 by root, Mon Nov 29 01:20:42 2004 UTC