[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.213 by root, Tue Jan 31 19:11:43 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
…		…
233	#endif	216	#endif
234	delete fontset[0];	217	delete fontset[0];
235		218
236	if (display)	219	if (display)
237	{	220	{
238	dDisp;
239
240	selection_clear ();	221	selection_clear ();
241		222
242	#ifdef USE_XIM	223	#ifdef USE_XIM
243	im_destroy ();	224	im_destroy ();
244	#endif	225	#endif
245	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
246	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
247	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (xdisp, ShadowGC);
248	#endif	229	#endif
249	#ifdef PLAIN_SCROLLBAR	230	#ifdef PLAIN_SCROLLBAR
250	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	231	if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
251	#endif	232	#endif
252	#ifdef NEXT_SCROLLBAR	233	#ifdef NEXT_SCROLLBAR
253	if (blackGC) XFreeGC (disp, blackGC);	234	if (blackGC) XFreeGC (xdisp, blackGC);
254	if (whiteGC) XFreeGC (disp, whiteGC);	235	if (whiteGC) XFreeGC (xdisp, whiteGC);
255	if (grayGC) XFreeGC (disp, grayGC);	236	if (grayGC) XFreeGC (xdisp, grayGC);
256	if (darkGC) XFreeGC (disp, darkGC);	237	if (darkGC) XFreeGC (xdisp, darkGC);
257	if (stippleGC) XFreeGC (disp, stippleGC);	238	if (stippleGC) XFreeGC (xdisp, stippleGC);
258	if (dimple) XFreePixmap (disp, dimple);	239	if (dimple) XFreePixmap (xdisp, dimple);
259	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (xdisp, upArrow);
260	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (xdisp, downArrow);
261	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
262	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
263	#endif	244	#endif
264	#ifdef RXVT_SCROLLBAR	245	#ifdef RXVT_SCROLLBAR
265	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (xdisp, topShadowGC);
266	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (xdisp, botShadowGC);
267	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
268	#endif	249	#endif
269	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (xdisp, gc);
270		251
271	delete drawable;	252	delete drawable;
272	// destroy all windows	253	// destroy all windows
273	if (parent[0])	254	if (parent[0])
274	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (xdisp, parent[0]);
		256
		257	clear ();
275	}	258	}
276		259
277	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
278	delete pix_colors_focused;	261	delete pix_colors_focused;
279	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
…		…
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
…		…
382	{	368	{
383	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	369	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384	(*t)->emergency_cleanup ();	370	(*t)->emergency_cleanup ();
385	}	371	}
386		372
387	#if ENABLE_FRILLS	373	#if !ENABLE_MINIMAL
388	static void	374	static void
389	print_x_error (Display dpy, XErrorEvent event)	375	print_x_error (Display dpy, XErrorEvent event)
390	{	376	{
391	char buffer[BUFSIZ];	377	char buffer[BUFSIZ];
392	char mesg[BUFSIZ];	378	char mesg[BUFSIZ];
…		…
440	GET_R->allowedxerror = event->error_code;	426	GET_R->allowedxerror = event->error_code;
441	else	427	else
442	{	428	{
443	// GET_R is most likely not the terminal which caused the error,	429	// GET_R is most likely not the terminal which caused the error,
444	// so just output the error and continue	430	// so just output the error and continue
445	#if ENABLE_FRILLS	431	#if ENABLE_MINIMAL
		432	old_xerror_handler (display, event);
		433	#else
446	print_x_error (display, event);	434	print_x_error (display, event);
447	#else
448	old_xerror_handler (display, event);
449	#endif	435	#endif
450	}	436	}
451		437
452	return 0;	438	return 0;
453	}	439	}
…		…
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;
519
520	init_xlocale ();	480	init_xlocale ();
521		481
522	scr_reset (); // initialize screen	482	scr_reset (); // initialize screen
523		483
524	#if 0	484	#if 0
525	XSynchronize (disp, True);	485	XSynchronize (xdisp, True);
526	#endif	486	#endif
527		487
528	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
529	if (OPTION (Opt_scrollBar))	489	if (OPTION (Opt_scrollBar))
530	resize_scrollbar (); /* create and map scrollbar */	490	resize_scrollbar (); /* create and map scrollbar */
531	#endif	491	#endif
532	#ifdef TRANSPARENT	492	#ifdef TRANSPARENT
533	if (OPTION (Opt_transparent))	493	if (OPTION (Opt_transparent))
534	{	494	{
535	XSelectInput (disp, display->root, PropertyChangeMask);	495	XSelectInput (xdisp, display->root, PropertyChangeMask);
536	check_our_parents ();	496	check_our_parents ();
537	rootwin_ev.start (display, display->root);	497	rootwin_ev.start (display, display->root);
538	}	498	}
539	#endif	499	#endif
540		500
541	XMapWindow (disp, vt);
542	XMapWindow (disp, parent[0]);
543
544	set_colorfgbg ();	501	set_colorfgbg ();
545		502
546	init_command (cmd_argv);	503	init_command (cmd_argv);
547		504
548	free (cmd_argv);	505	free (cmd_argv);
…		…
552		509
553	check_ev.start ();	510	check_ev.start ();
554		511
555	HOOK_INVOKE ((this, HOOK_START, DT_END));	512	HOOK_INVOKE ((this, HOOK_START, DT_END));
556		513
		514	#if ENABLE_XEMBED
		515	if (rs[Rs_embed])
		516	{
		517	long info[2] = { 0, XEMBED_MAPPED };
		518
		519	XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		520	32, PropModeReplace, (unsigned char *)&info, 2);
		521	}
		522	#endif
		523
		524	XMapWindow (xdisp, vt);
		525	XMapWindow (xdisp, parent[0]);
		526
557	return true;	527	return true;
558	}	528	}
559		529
560	static struct sig_handlers	530	static struct sig_handlers
561	{	531	{
562	sig_watcher sw_chld, sw_term, sw_int;	532	sig_watcher sw_term, sw_int;
563		533
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	/*	534	/*
579	* Catch a fatal signal and tidy up before quitting	535	* Catch a fatal signal and tidy up before quitting
580	*/	536	*/
581	void	537	void
582	sig_term (sig_watcher &w)	538	sig_term (sig_watcher &w)
583	{	539	{
584	#ifdef DEBUG_CMD
585	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586	#endif
587	rxvt_emergency_cleanup ();	540	rxvt_emergency_cleanup ();
588	signal (w.signum, SIG_DFL);	541	signal (w.signum, SIG_DFL);
589	kill (getpid (), w.signum);	542	kill (getpid (), w.signum);
590	}	543	}
591		544
592	sig_handlers ()	545	sig_handlers ()
593	: sw_chld (this, &sig_handlers::sig_chld),
594	sw_term (this, &sig_handlers::sig_term),	546	: sw_term (this, &sig_handlers::sig_term),
595	sw_int (this, &sig_handlers::sig_term)	547	sw_int (this, &sig_handlers::sig_term)
596	{	548	{
597	}	549	}
598	} sig_handlers;	550	} sig_handlers;
599		551
600	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
601		553
602	void	554	void
603	rxvt_init ()	555	rxvt_init ()
604	{	556	{
		557	ptytty::init ();
		558
605	rxvt_environ = environ;	559	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		560
617	signal (SIGHUP, SIG_IGN);	561	signal (SIGHUP, SIG_IGN);
618	signal (SIGPIPE, SIG_IGN);	562	signal (SIGPIPE, SIG_IGN);
619		563
620	sig_handlers.sw_chld.start (SIGCHLD);
621	sig_handlers.sw_term.start (SIGTERM);	564	sig_handlers.sw_term.start (SIGTERM);
622	sig_handlers.sw_int.start (SIGINT);	565	sig_handlers.sw_int.start (SIGINT);
623		566
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	567	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	568	/* signal (SIGURG, SIG_DFL); */
…		…
654	rxvt_fatal ("memory allocation failure. aborting.\n");	597	rxvt_fatal ("memory allocation failure. aborting.\n");
655		598
656	return p;	599	return p;
657	}	600	}
658		601
659	void *	602	void *
660	rxvt_realloc (void *ptr, size_t size)	603	rxvt_realloc (void *ptr, size_t size)
661	{	604	{
662	void *p = realloc (ptr, size);	605	void *p = realloc (ptr, size);
663		606
664	if (!p)	607	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");	608	rxvt_fatal ("memory allocation failure. aborting.\n");
666		609
667	return p;	610	return p;
668	}	611	}
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		612
738	/----------------------------------------------------------------------/	613	/----------------------------------------------------------------------/
739	/*	614	/*
740	* window size/position calculcations for XSizeHint and other storage.	615	* window size/position calculcations for XSizeHint and other storage.
741	* if width/height are non-zero then override calculated width/height	616	* if width/height are non-zero then override calculated width/height
…		…
745	{	620	{
746	short recalc_x, recalc_y;	621	short recalc_x, recalc_y;
747	int x, y, sb_w, flags;	622	int x, y, sb_w, flags;
748	unsigned int w, h;	623	unsigned int w, h;
749	unsigned int max_width, max_height;	624	unsigned int max_width, max_height;
750	dDisp;
751
752	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
753	ncol, nrow, szHint.width, szHint.height));
754		625
755	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	626	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
756	szHint.win_gravity = NorthWestGravity;	627	szHint.win_gravity = NorthWestGravity;
757	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	628	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
758		629
…		…
820		691
821	if (scrollBar.state)	692	if (scrollBar.state)
822	{	693	{
823	sb_w = scrollbar_TotalWidth ();	694	sb_w = scrollbar_TotalWidth ();
824	szHint.base_width += sb_w;	695	szHint.base_width += sb_w;
		696
825	if (!OPTION (Opt_scrollBar_right))	697	if (!OPTION (Opt_scrollBar_right))
826	window_vt_x += sb_w;	698	window_vt_x += sb_w;
827	}	699	}
828		700
829	szHint.width_inc = fwidth;	701	szHint.width_inc = fwidth;
…		…
855		727
856	if (scrollBar.state && OPTION (Opt_scrollBar_right))	728	if (scrollBar.state && OPTION (Opt_scrollBar_right))
857	window_sb_x = szHint.width - sb_w;	729	window_sb_x = szHint.width - sb_w;
858		730
859	if (recalc_x)	731	if (recalc_x)
860	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	732	szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
		733
861	if (recalc_y)	734	if (recalc_y)
862	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	735	szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
863		736
864	ncol = width / fwidth;	737	ncol = width / fwidth;
865	nrow = height / fheight;	738	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	}	739	}
871		740
872	/----------------------------------------------------------------------/	741	/----------------------------------------------------------------------/
873	/*	742	/*
874	* Tell the teletype handler what size the window is.	743	* Tell the teletype handler what size the window is.
…		…
974	return true;	843	return true;
975	}	844	}
976		845
977	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	846	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
978	{	847	{
979	XChangeProperty (display->display, parent[0],	848	XChangeProperty (xdisp, parent[0],
980	prop, XA_STRING, 8, PropModeReplace,	849	prop, XA_STRING, 8, PropModeReplace,
981	(const unsigned char *)str, len >= 0 ? len : strlen (str));	850	(const unsigned char *)str, len >= 0 ? len : strlen (str));
982	}	851	}
983		852
984	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	853	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
985	{	854	{
986	wchar_t *ws = rxvt_mbstowcs (str, len);	855	wchar_t *ws = rxvt_mbstowcs (str, len);
987	char *s = rxvt_wcstoutf8 (ws);	856	char *s = rxvt_wcstoutf8 (ws);
988		857
989	XChangeProperty (display->display, parent[0],	858	XChangeProperty (xdisp, parent[0],
990	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	859	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
991	(const unsigned char *)s, strlen (s));	860	(const unsigned char *)s, strlen (s));
992		861
993	free (s);	862	free (s);
994	free (ws);	863	free (ws);
…		…
1019	void	888	void
1020	rxvt_term::set_window_color (int idx, const char *color)	889	rxvt_term::set_window_color (int idx, const char *color)
1021	{	890	{
1022	rxvt_color xcol;	891	rxvt_color xcol;
1023	int i;	892	int i;
1024		893
1025	if (color == NULL \|\| *color == '\0')	894	if (color == NULL \|\| *color == '\0')
1026	return;	895	return;
		896
		897	color = strdup (color);
		898	allocated.push_back ((void *)color);
		899	rs[Rs_color + idx] = color;
1027		900
1028	/* handle color aliases */	901	/* handle color aliases */
1029	if (isdigit (*color))	902	if (isdigit (*color))
1030	{	903	{
1031	i = atoi (color);	904	i = atoi (color);
1032		905
1033	if (i >= 8 && i <= 15)	906	if (i >= 8 && i <= 15)
1034	{ /* bright colors */	907	{ /* bright colors */
1035	i -= 8;	908	i -= 8;
1036	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	909	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1037	SET_PIXCOLOR (idx);
1038	goto done;	910	goto done;
1039	}	911	}
1040		912
1041	if (i >= 0 && i <= 7)	913	if (i >= 0 && i <= 7)
1042	{ /* normal colors */	914	{ /* normal colors */
1043	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	915	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1044	SET_PIXCOLOR (idx);
1045	goto done;	916	goto done;
1046	}	917	}
1047	}	918	}
1048		919
1049	if (!rXParseAllocColor (&xcol, color))	920	set_color (xcol, color);
1050	return;
1051
1052	/* XStoreColor (display->display, display->cmap, XColor); /
1053		921
1054	/*	922	/*
1055	* FIXME: should free colors here, but no idea how to do it so instead,	923	* FIXME: should free colors here, but no idea how to do it so instead,
1056	* so just keep gobbling up the colormap	924	* so just keep gobbling up the colormap
1057	*/	925	*/
1058	# if 0
1059	for (i = Color_Black; i <= Color_White; i++)
1060	if (pix_colors[idx] == pix_colors[i])
1061	break;
1062	if (i > Color_White)
1063	{
1064	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1065	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1066	DisplayPlanes (display->display, display->screen));
1067	}
1068	# endif
1069		926
1070	pix_colors_focused[idx] = xcol;	927	pix_colors_focused[idx] = xcol;
1071	SET_PIXCOLOR (idx);
1072		928
1073	/* XSetWindowAttributes attr; */	929	/* XSetWindowAttributes attr; */
1074	/* Cursor cursor; */	930	/* Cursor cursor; */
1075	done:	931	done:
1076		932
1077	#if OFF_FOCUS_FADING	933	#if OFF_FOCUS_FADING
1078	if (rs[Rs_fade])	934	if (rs[Rs_fade])
1079	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	935	{
		936	rgba c;
		937	pix_colors [Color_fade].get (this, c);
		938	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		939	}
1080	#endif	940	#endif
1081		941
1082	/TODO: handle Color_BD, scrollbar background, etc. /	942	/TODO: handle Color_BD, scrollbar background, etc. /
1083		943
1084	recolour_cursor ();	944	recolour_cursor ();
…		…
1099	: pix_colors_focused[Color_fg];	959	: pix_colors_focused[Color_fg];
1100	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	960	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1101	? pix_colors_focused[Color_pointer_bg]	961	? pix_colors_focused[Color_pointer_bg]
1102	: pix_colors_focused[Color_bg];	962	: pix_colors_focused[Color_bg];
1103		963
1104	XQueryColors (display->display, display->cmap, xcol, 2);	964	XQueryColors (xdisp, cmap, xcol, 2);
1105	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	965	XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1106	}	966	}
1107		967
1108	/----------------------------------------------------------------------/	968	/----------------------------------------------------------------------/
1109	/*	969	/*
1110	* find if fg/bg matches any of the normal (low-intensity) colors	970	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1114	{	974	{
1115	unsigned int i;	975	unsigned int i;
1116	const char *xpmb = "\0";	976	const char *xpmb = "\0";
1117	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	977	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1118		978
1119	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1120	strcpy (fstr, "default");	979	strcpy (fstr, "default");
1121	strcpy (bstr, "default");	980	strcpy (bstr, "default");
1122	for (i = Color_Black; i <= Color_White; i++)	981	for (i = Color_Black; i <= Color_White; i++)
1123	if (pix_colors[Color_fg] == pix_colors[i])	982	if (pix_colors[Color_fg] == pix_colors[i])
1124	{	983	{
…		…
1139	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	998	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1140	}	999	}
1141		1000
1142	/----------------------------------------------------------------------/	1001	/----------------------------------------------------------------------/
1143		1002
1144	int	1003	bool
1145	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1004	rxvt_term::set_color (rxvt_color &color, const char *name)
1146	{	1005	{
1147	if (!screen_in_out->set (display, colour))	1006	if (color.set (this, name))
1148	{
1149	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1150	return false;
1151	}
1152
1153	return true;	1007	return true;
		1008
		1009	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1010	return false;
1154	}	1011	}
1155		1012
1156	/* -------------------------------------------------------------------- *	1013	/* -------------------------------------------------------------------- *
1157	* - WINDOW RESIZING - *	1014	* - WINDOW RESIZING - *
1158	* -------------------------------------------------------------------- */	1015	* -------------------------------------------------------------------- */
1159	void	1016	void
1160	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1017	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1161	{	1018	{
1162	int fix_screen;	1019	int fix_screen;
1163	int old_width = szHint.width, old_height = szHint.height;	1020	int old_width = szHint.width;
1164	dDisp;	1021	int old_height = szHint.height;
1165		1022
1166	window_calc (newwidth, newheight);	1023	window_calc (newwidth, newheight);
1167	XSetWMNormalHints (disp, parent[0], &szHint);	1024	XSetWMNormalHints (xdisp, parent[0], &szHint);
1168		1025
1169	if (!ignoreparent)	1026	if (!ignoreparent)
1170	{	1027	{
1171	#ifdef SMART_RESIZE	1028	#ifdef SMART_RESIZE
1172	/*	1029	/*
…		…
1176	int x, y, x1, y1;	1033	int x, y, x1, y1;
1177	int dx, dy;	1034	int dx, dy;
1178	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1035	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1179	Window unused_cr;	1036	Window unused_cr;
1180		1037
1181	XTranslateCoordinates (disp, parent[0], display->root,	1038	XTranslateCoordinates (xdisp, parent[0], display->root,
1182	0, 0, &x, &y, &unused_cr);	1039	0, 0, &x, &y, &unused_cr);
1183	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1040	XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1184	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1041	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1185	/*	1042	/*
1186	* if display->root isn't the parent window, a WM will probably have offset	1043	* if display->root isn't the parent window, a WM will probably have offset
1187	* our position for handles and decorations. Counter it	1044	* our position for handles and decorations. Counter it
1188	*/	1045	*/
…		…
1190	{	1047	{
1191	x -= x1;	1048	x -= x1;
1192	y -= y1;	1049	y -= y1;
1193	}	1050	}
1194		1051
1195	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1052	x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1196	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1053	y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1197	dx = old_width - szHint.width;	1054	dx = old_width - szHint.width;
1198	dy = old_height - szHint.height;	1055	dy = old_height - szHint.height;
1199		1056
1200	/* Check position of the center of the window */	1057	/* Check position of the center of the window */
1201	if (x < x1) /* left half */	1058	if (x < x1) /* left half */
1202	dx = 0;	1059	dx = 0;
…		…
1205	if (y < y1) /* top half */	1062	if (y < y1) /* top half */
1206	dy = 0;	1063	dy = 0;
1207	else if (y == y1) /* exact center */	1064	else if (y == y1) /* exact center */
1208	dy /= 2;	1065	dy /= 2;
1209		1066
1210	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1067	XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1211	szHint.width, szHint.height);	1068	szHint.width, szHint.height);
1212	#else	1069	#else
1213	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1070	XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1214	#endif	1071	#endif
1215	}	1072	}
1216		1073
1217	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1074	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1218		1075
1219	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1076	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1220	{	1077	{
1221	if (scrollBar.state)	1078	if (scrollBar.state)
1222	{	1079	{
1223	XMoveResizeWindow (disp, scrollBar.win,	1080	XMoveResizeWindow (xdisp, scrollBar.win,
1224	window_sb_x, 0,	1081	window_sb_x, 0,
1225	scrollbar_TotalWidth (), szHint.height);	1082	scrollbar_TotalWidth (), szHint.height);
1226	resize_scrollbar ();	1083	resize_scrollbar ();
1227	}	1084	}
1228		1085
1229	XMoveResizeWindow (disp, vt,	1086	XMoveResizeWindow (xdisp, vt,
1230	window_vt_x, window_vt_y,	1087	window_vt_x, window_vt_y,
1231	width, height);	1088	width, height);
1232		1089
1233	scr_clear ();	1090	scr_clear ();
1234	#ifdef XPM_BACKGROUND	1091	#ifdef XPM_BACKGROUND
1235	resize_pixmap ();	1092	resize_pixmap ();
1236	#endif	1093	#endif
1237	}	1094	}
1238		1095
1239	if (fix_screen \|\| old_height == 0)	1096	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 ();	1097	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		1098
1265	#ifdef XPM_BACKGROUND	1099	#ifdef XPM_BACKGROUND
1266	if (pixmap)	1100	if (pixmap)
1267	scr_touch (false);	1101	scr_touch (false);
1268	#endif	1102	#endif
…		…
1281	{	1115	{
1282	XWindowAttributes wattr;	1116	XWindowAttributes wattr;
1283		1117
1284	if (newwidth == 0 \|\| newheight == 0)	1118	if (newwidth == 0 \|\| newheight == 0)
1285	{	1119	{
1286	XGetWindowAttributes (display->display, display->root, &wattr);	1120	XGetWindowAttributes (xdisp, display->root, &wattr);
1287		1121
1288	if (newwidth == 0)	1122	if (newwidth == 0)
1289	newwidth = wattr.width - szHint.base_width;	1123	newwidth = wattr.width - szHint.base_width;
1290	if (newheight == 0)	1124	if (newheight == 0)
1291	newheight = wattr.height - szHint.base_height;	1125	newheight = wattr.height - szHint.base_height;
…		…
1353	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1187	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1354		1188
1355	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1189	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1356	*p = '\0';	1190	*p = '\0';
1357		1191
1358	atom = XInternAtom (display->display, server, False);	1192	atom = XInternAtom (xdisp, server, False);
1359	win = XGetSelectionOwner (display->display, atom);	1193	win = XGetSelectionOwner (xdisp, atom);
1360		1194
1361	if (win != None)	1195	if (win != None)
1362	return True;	1196	return True;
1363	}	1197	}
1364		1198
…		…
1371	XPoint nspot;	1205	XPoint nspot;
1372	XVaNestedList preedit_attr;	1206	XVaNestedList preedit_attr;
1373		1207
1374	if (!Input_Context	1208	if (!Input_Context
1375	\|\| !focus	1209	\|\| !focus
1376	\|\| !(input_style & XIMPreeditPosition))	1210	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1377	return;	1211	return;
1378		1212
1379	im_set_position (nspot);	1213	im_set_position (nspot);
1380		1214
1381	if (nspot.x == spot.x && nspot.y == spot.y)	1215	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1400	input_method = 0;	1234	input_method = 0;
1401	}	1235	}
1402		1236
1403	Input_Context = 0;	1237	Input_Context = 0;
1404	}	1238	}
		1239
		1240	#ifdef ENABLE_XIM_ONTHESPOT
		1241
		1242	static void
		1243	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1244	{
		1245	((rxvt_term *)client_data)->make_current ();
		1246	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1247	}
		1248
		1249	static void
		1250	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1251	{
		1252	((rxvt_term *)client_data)->make_current ();
		1253	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1254	}
		1255
		1256	static void
		1257	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1258	{
		1259	rxvt_term term = (rxvt_term )client_data;
		1260	XIMText *text = call_data->text;
		1261
		1262	term->make_current ();
		1263
		1264	if (text)
		1265	{
		1266	void *str;
		1267
		1268	if (!text->encoding_is_wchar && text->string.multi_byte)
		1269	{
		1270	// of course, X makes it ugly again
		1271	if (term->rs[Rs_imLocale])
		1272	SET_LOCALE (term->rs[Rs_imLocale]);
		1273
		1274	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1275	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1276
		1277	if (term->rs[Rs_imLocale])
		1278	SET_LOCALE (term->locale);
		1279	}
		1280	else
		1281	str = (void *)text->string.wide_char;
		1282
		1283	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1284	DT_INT, call_data->caret,
		1285	DT_INT, call_data->chg_first,
		1286	DT_INT, call_data->chg_length,
		1287	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1288	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1289	DT_END));
		1290	}
		1291	else
		1292	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1293	DT_INT, call_data->caret,
		1294	DT_INT, call_data->chg_first,
		1295	DT_INT, call_data->chg_length,
		1296	DT_END));
		1297	}
		1298
		1299	#if 0
		1300	static void
		1301	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1302	{
		1303	((rxvt_term *)client_data)->make_current ();
		1304	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1305	DT_INT, call_data->position,
		1306	DT_INT, call_data->direction,
		1307	DT_INT, call_data->style,
		1308	DT_END));
		1309	}
		1310	#endif
		1311
		1312	#endif
1405		1313
1406	/*	1314	/*
1407	* Try to open a XIM with the current modifiers, then see if we can	1315	* Try to open a XIM with the current modifiers, then see if we can
1408	* open a suitable preedit type	1316	* open a suitable preedit type
1409	*/	1317	*/
…		…
1416	XRectangle rect, status_rect, needed_rect;	1324	XRectangle rect, status_rect, needed_rect;
1417	unsigned long fg, bg;	1325	unsigned long fg, bg;
1418	const char *p;	1326	const char *p;
1419	char **s;	1327	char **s;
1420	XIMStyles *xim_styles;	1328	XIMStyles *xim_styles;
		1329	#ifdef ENABLE_XIM_ONTHESPOT
		1330	XIMCallback xcb[4];
		1331	#endif
1421		1332
1422	set_environ (envv);	1333	set_environ (envv);
1423		1334
1424	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1335	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425	return false;	1336	return false;
1426		1337
1427	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428	input_method = display->get_xim (locale, modifiers);	1338	input_method = display->get_xim (locale, modifiers);
1429	if (input_method == NULL)	1339	if (input_method == NULL)
1430	return false;	1340	return false;
1431		1341
1432	xim = input_method->xim;	1342	xim = input_method->xim;
…		…
1452	s = rxvt_splitcommastring (p);	1362	s = rxvt_splitcommastring (p);
1453		1363
1454	for (i = found = 0; !found && s[i]; i++)	1364	for (i = found = 0; !found && s[i]; i++)
1455	{	1365	{
1456	if (!strcmp (s[i], "OverTheSpot"))	1366	if (!strcmp (s[i], "OverTheSpot"))
1457	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1367	input_style = XIMPreeditPosition \| XIMStatusNothing;
1458	else if (!strcmp (s[i], "OffTheSpot"))	1368	else if (!strcmp (s[i], "OffTheSpot"))
1459	input_style = (XIMPreeditArea \| XIMStatusArea);	1369	input_style = XIMPreeditArea \| XIMStatusArea;
1460	else if (!strcmp (s[i], "Root"))	1370	else if (!strcmp (s[i], "Root"))
1461	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1371	input_style = XIMPreeditNothing \| XIMStatusNothing;
1462	else if (!strcmp (s[i], "None"))	1372	else if (!strcmp (s[i], "None"))
1463	input_style = (XIMPreeditNone \| XIMStatusNone);	1373	input_style = XIMPreeditNone \| XIMStatusNone;
		1374	#ifdef ENABLE_XIM_ONTHESPOT
		1375	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1376	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1377	#endif
		1378	else
		1379	input_style = XIMPreeditNothing \| XIMStatusNothing;
1464		1380
1465	for (j = 0; j < xim_styles->count_styles; j++)	1381	for (j = 0; j < xim_styles->count_styles; j++)
1466	if (input_style == xim_styles->supported_styles[j])	1382	if (input_style == xim_styles->supported_styles[j])
1467	{	1383	{
1468	rxvt_freecommastring (s);	1384	rxvt_freecommastring (s);
…		…
1506	"*",	1422	"*",
1507	fheight,	1423	fheight,
1508	fheight + 1, fheight - 1,	1424	fheight + 1, fheight - 1,
1509	fheight - 2, fheight + 2);	1425	fheight - 2, fheight + 2);
1510		1426
1511	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1427	fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1512	&missing_charset_list, &missing_charset_count, &def_string);	1428	&missing_charset_list, &missing_charset_count, &def_string);
1513		1429
1514	if (missing_charset_list)	1430	if (missing_charset_list)
1515	XFreeStringList (missing_charset_list);	1431	XFreeStringList (missing_charset_list);
1516		1432
…		…
1557	XNBackground, bg,	1473	XNBackground, bg,
1558	XNArea, &status_rect,	1474	XNArea, &status_rect,
1559	XNFontSet, fs,	1475	XNFontSet, fs,
1560	NULL);	1476	NULL);
1561	}	1477	}
		1478	#if ENABLE_XIM_ONTHESPOT
		1479	else if (input_style & XIMPreeditCallbacks)
		1480	{
		1481	im_set_position (spot);
		1482
		1483	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1484	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1485	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1486	# if 0
		1487	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1488	# endif
		1489
		1490	preedit_attr = XVaCreateNestedList (0,
		1491	XNSpotLocation, &spot,
		1492	XNPreeditStartCallback, &xcb[0],
		1493	XNPreeditDoneCallback , &xcb[1],
		1494	XNPreeditDrawCallback , &xcb[2],
		1495	# if 0
		1496	XNPreeditCaretCallback, &xcb[3],
		1497	# endif
		1498	NULL);
		1499	}
		1500	#endif
1562		1501
1563	Input_Context = XCreateIC (xim,	1502	Input_Context = XCreateIC (xim,
1564	XNInputStyle, input_style,	1503	XNInputStyle, input_style,
1565	XNClientWindow, vt,	1504	XNClientWindow, vt,
1566	XNFocusWindow, parent[0],	1505	XNFocusWindow, parent[0],
…		…
1569	status_attr ? XNStatusAttributes : NULL,	1508	status_attr ? XNStatusAttributes : NULL,
1570	status_attr, NULL);	1509	status_attr, NULL);
1571		1510
1572	if (preedit_attr) XFree (preedit_attr);	1511	if (preedit_attr) XFree (preedit_attr);
1573	if (status_attr) XFree (status_attr);	1512	if (status_attr) XFree (status_attr);
1574	if (fs) XFreeFontSet (display->display, fs);	1513	if (fs) XFreeFontSet (xdisp, fs);
1575		1514
1576	if (Input_Context == NULL)	1515	if (Input_Context == NULL)
1577	{	1516	{
1578	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1517	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579	im_destroy ();	1518	im_destroy ();
1580	return false;	1519	return false;
1581	}	1520	}
1582		1521
		1522	#if 0
		1523	// unfortunately, only the focus window is used by XIM, hard to fix
		1524	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1525	vt_select_input ();
		1526	#endif
		1527
1583	if (input_style & XIMPreeditArea)	1528	if (input_style & XIMPreeditArea)
1584	IMSetStatusPosition ();	1529	IMSetStatusPosition ();
1585		1530
1586	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587	return true;	1531	return true;
1588	}	1532	}
1589		1533
1590	void	1534	void
1591	rxvt_term::im_cb ()	1535	rxvt_term::im_cb ()
…		…
1597		1541
1598	make_current ();	1542	make_current ();
1599		1543
1600	im_destroy ();	1544	im_destroy ();
1601		1545
1602	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603	if (Input_Context)	1546	if (Input_Context)
1604	return;	1547	return;
1605		1548
1606	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1549	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1607	if (rs[Rs_imLocale])	1550	if (rs[Rs_imLocale])
…		…
1680	XFree (preedit_attr);	1623	XFree (preedit_attr);
1681	XFree (status_attr);	1624	XFree (status_attr);
1682	}	1625	}
1683	#endif /* USE_XIM */	1626	#endif /* USE_XIM */
1684		1627
1685	/----------------------------------------------------------------------/
1686	rxvt_t rxvt_current_term;
1687
1688	/----------------------- end-of-file (C source) -----------------------/	1628	/----------------------- 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.213 by root, Tue Jan 31 19:11:43 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.213 by root, Tue Jan 31 19:11:43 2006 UTC