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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.186 by root, Tue Jan 17 15:41:33 2006 UTC vs.
Revision 1.207 by root, Wed Jan 25 21:09:21 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
…		…
214	delete pty; pty = 0;	203	delete pty; pty = 0;
215	}	204	}
216		205
217	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
218	{	207	{
219	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
221	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
222		209
223	emergency_cleanup ();	210	emergency_cleanup ();
224		211
225	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
229	#endif	216	#endif
230	delete fontset[0];	217	delete fontset[0];
231		218
232	if (display)	219	if (display)
233	{	220	{
234	dDisp;
235
236	selection_clear ();	221	selection_clear ();
237		222
238	#ifdef USE_XIM	223	#ifdef USE_XIM
239	im_destroy ();	224	im_destroy ();
240	#endif	225	#endif
241	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
242	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
243	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (xdisp, ShadowGC);
244	#endif	229	#endif
245	#ifdef PLAIN_SCROLLBAR	230	#ifdef PLAIN_SCROLLBAR
246	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	231	if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
247	#endif	232	#endif
248	#ifdef NEXT_SCROLLBAR	233	#ifdef NEXT_SCROLLBAR
249	if (blackGC) XFreeGC (disp, blackGC);	234	if (blackGC) XFreeGC (xdisp, blackGC);
250	if (whiteGC) XFreeGC (disp, whiteGC);	235	if (whiteGC) XFreeGC (xdisp, whiteGC);
251	if (grayGC) XFreeGC (disp, grayGC);	236	if (grayGC) XFreeGC (xdisp, grayGC);
252	if (darkGC) XFreeGC (disp, darkGC);	237	if (darkGC) XFreeGC (xdisp, darkGC);
253	if (stippleGC) XFreeGC (disp, stippleGC);	238	if (stippleGC) XFreeGC (xdisp, stippleGC);
254	if (dimple) XFreePixmap (disp, dimple);	239	if (dimple) XFreePixmap (xdisp, dimple);
255	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (xdisp, upArrow);
256	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (xdisp, downArrow);
257	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
258	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
259	#endif	244	#endif
260	#ifdef RXVT_SCROLLBAR	245	#ifdef RXVT_SCROLLBAR
261	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (xdisp, topShadowGC);
262	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (xdisp, botShadowGC);
263	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
264	#endif	249	#endif
265	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (xdisp, gc);
266		251
267	delete drawable;	252	delete drawable;
268	// destroy all windows	253	// destroy all windows
269	if (parent[0])	254	if (parent[0])
270	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (xdisp, parent[0]);
		256
		257	clear ();
271	}	258	}
272		259
273	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
274	delete pix_colors_focused;	261	delete pix_colors_focused;
275	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
…		…
284	for (int i = 0; i < allocated.size (); i++)	271	for (int i = 0; i < allocated.size (); i++)
285	free (allocated [i]);	272	free (allocated [i]);
286		273
287	free (selection.text);	274	free (selection.text);
288	// TODO: manage env vars in child only(!)	275	// TODO: manage env vars in child only(!)
289	free (env_windowid);
290	free (env_display);	276	free (env_display);
291	free (env_term);	277	free (env_term);
292	free (env_colorfgbg);
293	free (locale);	278	free (locale);
294	free (v_buffer);	279	free (v_buffer);
295	free (incr_buf);	280	free (incr_buf);
296		281
297	delete envv;	282	delete envv;
…		…
300	#ifdef KEYSYM_RESOURCE	285	#ifdef KEYSYM_RESOURCE
301	delete keyboard;	286	delete keyboard;
302	#endif	287	#endif
303	}	288	}
304		289
		290	// child has exited, usually destroys
305	void	291	void
306	rxvt_term::child_exit ()	292	rxvt_term::child_cb (child_watcher &w, int status)
307	{	293	{
		294	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		295
308	cmd_pid = 0;	296	cmd_pid = 0;
309		297
310	if (!OPTION (Opt_hold))	298	if (!OPTION (Opt_hold))
311	destroy ();	299	destroy ();
312	}	300	}
…		…
314	void	302	void
315	rxvt_term::destroy ()	303	rxvt_term::destroy ()
316	{	304	{
317	if (destroy_ev.active)	305	if (destroy_ev.active)
318	return;	306	return;
		307
		308	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
319		309
320	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
321	scr_overlay_off ();	311	scr_overlay_off ();
322	#endif	312	#endif
323		313
…		…
457	_exit (EXIT_FAILURE);	447	_exit (EXIT_FAILURE);
458	}	448	}
459		449
460	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
461	bool	451	bool
462	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv, stringvec *envv)
463	{	453	{
		454	this->envv = envv;
		455
464	SET_R (this);	456	SET_R (this);
465	set_locale ("");	457	set_locale ("");
466	set_environ (envv); // few things in X do not call setlocale :(	458	set_environ (envv); // few things in X do not call setlocale :(
467		459
468	if (!init_vars ())	460	if (!init_vars ())
…		…
479	#ifdef HAVE_SCROLLBARS	471	#ifdef HAVE_SCROLLBARS
480	if (OPTION (Opt_scrollBar))	472	if (OPTION (Opt_scrollBar))
481	scrollBar.setIdle (); /* set existence for size calculations */	473	scrollBar.setIdle (); /* set existence for size calculations */
482	#endif	474	#endif
483		475
484	#if ENABLE_PERL	476	pty = ptytty::create ();
485	if (!rs[Rs_perl_ext_1])
486	rs[Rs_perl_ext_1] = "default";
487
488	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491	{
492	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493	// ignore some perl-related arguments if some bozo installed us set[ug]id
494	if (rxvt_tainted ())
495	{
496	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498	{
499	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500	rs[Rs_perl_lib] = 0;
501	rs[Rs_perl_eval] = 0;
502	}
503	}
504	#endif
505	rxvt_perl.init (this);
506	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507	}
508	#endif
509
510	pty = rxvt_new_ptytty ();
511		477
512	create_windows (argc, argv);	478	create_windows (argc, argv);
513		479
514	dDisp;
515
516	init_xlocale ();	480	init_xlocale ();
517		481
518	scr_reset (); // initialize screen	482	scr_reset (); // initialize screen
519		483
520	#if 0	484	#if 0
521	XSynchronize (disp, True);	485	XSynchronize (xdisp, True);
522	#endif	486	#endif
523		487
524	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
525	if (OPTION (Opt_scrollBar))	489	if (OPTION (Opt_scrollBar))
526	resize_scrollbar (); /* create and map scrollbar */	490	resize_scrollbar (); /* create and map scrollbar */
527	#endif	491	#endif
528	#ifdef TRANSPARENT	492	#ifdef TRANSPARENT
529	if (OPTION (Opt_transparent))	493	if (OPTION (Opt_transparent))
530	{	494	{
531	XSelectInput (disp, display->root, PropertyChangeMask);	495	XSelectInput (xdisp, display->root, PropertyChangeMask);
532	check_our_parents ();	496	check_our_parents ();
533	rootwin_ev.start (display, display->root);	497	rootwin_ev.start (display, display->root);
534	}	498	}
535	#endif	499	#endif
536		500
537	XMapWindow (disp, vt);
538	XMapWindow (disp, parent[0]);
539
540	set_colorfgbg ();	501	set_colorfgbg ();
541		502
542	init_command (cmd_argv);	503	init_command (cmd_argv);
543		504
544	free (cmd_argv);	505	free (cmd_argv);
…		…
548		509
549	check_ev.start ();	510	check_ev.start ();
550		511
551	HOOK_INVOKE ((this, HOOK_START, DT_END));	512	HOOK_INVOKE ((this, HOOK_START, DT_END));
552		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
553	return true;	527	return true;
554	}	528	}
555		529
556	static struct sig_handlers	530	static struct sig_handlers
557	{	531	{
558	sig_watcher sw_chld, sw_term, sw_int;	532	sig_watcher sw_term, sw_int;
559		533
560	void sig_chld (sig_watcher &w)
561	{
562	// we are being called for every SIGCHLD, find the corresponding term
563	int pid;
564
565	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
566	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
567	if (pid == (*t)->cmd_pid)
568	{
569	(*t)->child_exit ();
570	break;
571	}
572	}
573
574	/*	534	/*
575	* Catch a fatal signal and tidy up before quitting	535	* Catch a fatal signal and tidy up before quitting
576	*/	536	*/
577	void	537	void
578	sig_term (sig_watcher &w)	538	sig_term (sig_watcher &w)
579	{	539	{
580	#ifdef DEBUG_CMD
581	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582	#endif
583	rxvt_emergency_cleanup ();	540	rxvt_emergency_cleanup ();
584	signal (w.signum, SIG_DFL);	541	signal (w.signum, SIG_DFL);
585	kill (getpid (), w.signum);	542	kill (getpid (), w.signum);
586	}	543	}
587		544
588	sig_handlers ()	545	sig_handlers ()
589	: sw_chld (this, &sig_handlers::sig_chld),
590	sw_term (this, &sig_handlers::sig_term),	546	: sw_term (this, &sig_handlers::sig_term),
591	sw_int (this, &sig_handlers::sig_term)	547	sw_int (this, &sig_handlers::sig_term)
592	{	548	{
593	}	549	}
594	} sig_handlers;	550	} sig_handlers;
595		551
596	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
597		553
598	void	554	void
599	rxvt_init ()	555	rxvt_init ()
600	{	556	{
601	uid_t uid = getuid ();	557	ptytty::init ();
602	gid_t gid = getgid ();
603
604	// before doing anything else, check for setuid/setgid operation,
605	// start the helper process and drop privileges
606	if (uid != geteuid ()
607	\|\| 1 //D
608	\|\| gid != getegid ())
609	{
610	#if PTYTTY_HELPER
611	rxvt_ptytty_server ();
612	#else
613	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614	#endif
615
616	// drop privileges
617	#if HAVE_SETRESUID
618	setresgid (gid, gid, gid);
619	setresuid (uid, uid, uid);
620	#elif HAVE_SETREUID
621	setregid (gid, gid);
622	setreuid (uid, uid);
623	#elif HAVE_SETUID
624	setgid (gid);
625	setuid (uid);
626	#endif
627
628	if (uid != geteuid ()
629	\|\| gid != getegid ())
630	rxvt_fatal ("unable to drop privileges, aborting.\n");
631	}
632		558
633	rxvt_environ = environ;	559	rxvt_environ = environ;
634
635	/*
636	* Save and then give up any super-user privileges
637	* If we need privileges in any area then we must specifically request it.
638	* We should only need to be root in these cases:
639	* 1. write utmp entries on some systems
640	* 2. chown tty on some systems
641	*/
642	rxvt_privileges (SAVE);
643	rxvt_privileges (IGNORE);
644		560
645	signal (SIGHUP, SIG_IGN);	561	signal (SIGHUP, SIG_IGN);
646	signal (SIGPIPE, SIG_IGN);	562	signal (SIGPIPE, SIG_IGN);
647		563
648	sig_handlers.sw_chld.start (SIGCHLD);
649	sig_handlers.sw_term.start (SIGTERM);	564	sig_handlers.sw_term.start (SIGTERM);
650	sig_handlers.sw_int.start (SIGINT);	565	sig_handlers.sw_int.start (SIGINT);
651		566
652	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	567	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
653	/* signal (SIGURG, SIG_DFL); */	568	/* signal (SIGURG, SIG_DFL); */
…		…
682	rxvt_fatal ("memory allocation failure. aborting.\n");	597	rxvt_fatal ("memory allocation failure. aborting.\n");
683		598
684	return p;	599	return p;
685	}	600	}
686		601
687	void *	602	void *
688	rxvt_realloc (void *ptr, size_t size)	603	rxvt_realloc (void *ptr, size_t size)
689	{	604	{
690	void *p = realloc (ptr, size);	605	void *p = realloc (ptr, size);
691		606
692	if (!p)	607	if (!p)
693	rxvt_fatal ("memory allocation failure. aborting.\n");	608	rxvt_fatal ("memory allocation failure. aborting.\n");
694		609
695	return p;	610	return p;
696	}
697
698	/* ------------------------------------------------------------------------- *
699	* PRIVILEGED OPERATIONS *
700	* ------------------------------------------------------------------------- */
701	/* take care of suid/sgid super-user (root) privileges */
702	void
703	rxvt_privileges (rxvt_privaction action)
704	{
705	#if ! defined(__CYGWIN32__)
706	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707	/* setreuid () is the poor man's setuid (), seteuid () */
708	# define seteuid(a) setreuid(-1, (a))
709	# define setegid(a) setregid(-1, (a))
710	# define HAVE_SETEUID
711	# endif
712	# ifdef HAVE_SETEUID
713	switch (action)
714	{
715	case IGNORE:
716	/*
717	* change effective uid/gid - not real uid/gid - so we can switch
718	* back to root later, as required
719	*/
720	setegid (getgid ());
721	seteuid (getuid ());
722	break;
723	case SAVE:
724	saved_egid = getegid ();
725	saved_euid = geteuid ();
726	break;
727	case RESTORE:
728	setegid (saved_egid);
729	seteuid (saved_euid);
730	break;
731	}
732	# else
733	switch (action)
734	{
735	case IGNORE:
736	setgid (getgid ());
737	setuid (getuid ());
738	/* FALLTHROUGH */
739	case SAVE:
740	/* FALLTHROUGH */
741	case RESTORE:
742	break;
743	}
744	# endif
745	#endif
746	}	611	}
747		612
748	/----------------------------------------------------------------------/	613	/----------------------------------------------------------------------/
749	/*	614	/*
750	* window size/position calculcations for XSizeHint and other storage.	615	* window size/position calculcations for XSizeHint and other storage.
…		…
755	{	620	{
756	short recalc_x, recalc_y;	621	short recalc_x, recalc_y;
757	int x, y, sb_w, flags;	622	int x, y, sb_w, flags;
758	unsigned int w, h;	623	unsigned int w, h;
759	unsigned int max_width, max_height;	624	unsigned int max_width, max_height;
760	dDisp;
761
762	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
763	ncol, nrow, szHint.width, szHint.height));
764		625
765	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	626	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
766	szHint.win_gravity = NorthWestGravity;	627	szHint.win_gravity = NorthWestGravity;
767	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	628	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768		629
…		…
865		726
866	if (scrollBar.state && OPTION (Opt_scrollBar_right))	727	if (scrollBar.state && OPTION (Opt_scrollBar_right))
867	window_sb_x = szHint.width - sb_w;	728	window_sb_x = szHint.width - sb_w;
868		729
869	if (recalc_x)	730	if (recalc_x)
870	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	731	szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
		732
871	if (recalc_y)	733	if (recalc_y)
872	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	734	szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
873		735
874	ncol = width / fwidth;	736	ncol = width / fwidth;
875	nrow = height / fheight;	737	nrow = height / fheight;
876	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
877	ncol, nrow, szHint.width,
878	szHint.height));
879	return;
880	}	738	}
881		739
882	/----------------------------------------------------------------------/	740	/----------------------------------------------------------------------/
883	/*	741	/*
884	* Tell the teletype handler what size the window is.	742	* Tell the teletype handler what size the window is.
…		…
984	return true;	842	return true;
985	}	843	}
986		844
987	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	845	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
988	{	846	{
989	XChangeProperty (display->display, parent[0],	847	XChangeProperty (xdisp, parent[0],
990	prop, XA_STRING, 8, PropModeReplace,	848	prop, XA_STRING, 8, PropModeReplace,
991	(const unsigned char *)str, len >= 0 ? len : strlen (str));	849	(const unsigned char *)str, len >= 0 ? len : strlen (str));
992	}	850	}
993		851
994	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	852	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
995	{	853	{
996	wchar_t *ws = rxvt_mbstowcs (str, len);	854	wchar_t *ws = rxvt_mbstowcs (str, len);
997	char *s = rxvt_wcstoutf8 (ws);	855	char *s = rxvt_wcstoutf8 (ws);
998		856
999	XChangeProperty (display->display, parent[0],	857	XChangeProperty (xdisp, parent[0],
1000	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	858	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1001	(const unsigned char *)s, strlen (s));	859	(const unsigned char *)s, strlen (s));
1002		860
1003	free (s);	861	free (s);
1004	free (ws);	862	free (ws);
…		…
1057	}	915	}
1058		916
1059	if (!rXParseAllocColor (&xcol, color))	917	if (!rXParseAllocColor (&xcol, color))
1060	return;	918	return;
1061		919
1062	/* XStoreColor (display->display, display->cmap, XColor); /	920	/* XStoreColor (xdisp, display->cmap, XColor); /
1063		921
1064	/*	922	/*
1065	* 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,
1066	* so just keep gobbling up the colormap	924	* so just keep gobbling up the colormap
1067	*/	925	*/
…		…
1070	if (pix_colors[idx] == pix_colors[i])	928	if (pix_colors[idx] == pix_colors[i])
1071	break;	929	break;
1072	if (i > Color_White)	930	if (i > Color_White)
1073	{	931	{
1074	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */	932	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1075	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,	933	XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1076	DisplayPlanes (display->display, display->screen));	934	DisplayPlanes (xdisp, display->screen));
1077	}	935	}
1078	# endif	936	# endif
1079		937
1080	pix_colors_focused[idx] = xcol;	938	pix_colors_focused[idx] = xcol;
1081	SET_PIXCOLOR (idx);	939	SET_PIXCOLOR (idx);
…		…
1084	/* Cursor cursor; */	942	/* Cursor cursor; */
1085	done:	943	done:
1086		944
1087	#if OFF_FOCUS_FADING	945	#if OFF_FOCUS_FADING
1088	if (rs[Rs_fade])	946	if (rs[Rs_fade])
1089	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	947	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1090	#endif	948	#endif
1091		949
1092	/TODO: handle Color_BD, scrollbar background, etc. /	950	/TODO: handle Color_BD, scrollbar background, etc. /
1093		951
1094	recolour_cursor ();	952	recolour_cursor ();
…		…
1109	: pix_colors_focused[Color_fg];	967	: pix_colors_focused[Color_fg];
1110	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	968	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1111	? pix_colors_focused[Color_pointer_bg]	969	? pix_colors_focused[Color_pointer_bg]
1112	: pix_colors_focused[Color_bg];	970	: pix_colors_focused[Color_bg];
1113		971
1114	XQueryColors (display->display, display->cmap, xcol, 2);	972	XQueryColors (xdisp, cmap, xcol, 2);
1115	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	973	XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1116	}	974	}
1117		975
1118	/----------------------------------------------------------------------/	976	/----------------------------------------------------------------------/
1119	/*	977	/*
1120	* find if fg/bg matches any of the normal (low-intensity) colors	978	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1124	{	982	{
1125	unsigned int i;	983	unsigned int i;
1126	const char *xpmb = "\0";	984	const char *xpmb = "\0";
1127	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1128		986
1129	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1130	strcpy (fstr, "default");	987	strcpy (fstr, "default");
1131	strcpy (bstr, "default");	988	strcpy (bstr, "default");
1132	for (i = Color_Black; i <= Color_White; i++)	989	for (i = Color_Black; i <= Color_White; i++)
1133	if (pix_colors[Color_fg] == pix_colors[i])	990	if (pix_colors[Color_fg] == pix_colors[i])
1134	{	991	{
…		…
1152	/----------------------------------------------------------------------/	1009	/----------------------------------------------------------------------/
1153		1010
1154	int	1011	int
1155	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1012	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)
1156	{	1013	{
1157	if (!screen_in_out->set (display, colour))	1014	if (!screen_in_out->set (this, colour))
1158	{	1015	{
1159	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);	1016	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1160	return false;	1017	return false;
1161	}	1018	}
1162		1019
…		…
1168	* -------------------------------------------------------------------- */	1025	* -------------------------------------------------------------------- */
1169	void	1026	void
1170	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1027	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1171	{	1028	{
1172	int fix_screen;	1029	int fix_screen;
1173	int old_width = szHint.width, old_height = szHint.height;	1030	int old_width = szHint.width;
1174	dDisp;	1031	int old_height = szHint.height;
1175		1032
1176	window_calc (newwidth, newheight);	1033	window_calc (newwidth, newheight);
1177	XSetWMNormalHints (disp, parent[0], &szHint);	1034	XSetWMNormalHints (xdisp, parent[0], &szHint);
1178		1035
1179	if (!ignoreparent)	1036	if (!ignoreparent)
1180	{	1037	{
1181	#ifdef SMART_RESIZE	1038	#ifdef SMART_RESIZE
1182	/*	1039	/*
…		…
1186	int x, y, x1, y1;	1043	int x, y, x1, y1;
1187	int dx, dy;	1044	int dx, dy;
1188	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1045	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1189	Window unused_cr;	1046	Window unused_cr;
1190		1047
1191	XTranslateCoordinates (disp, parent[0], display->root,	1048	XTranslateCoordinates (xdisp, parent[0], display->root,
1192	0, 0, &x, &y, &unused_cr);	1049	0, 0, &x, &y, &unused_cr);
1193	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1050	XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1194	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1051	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1195	/*	1052	/*
1196	* if display->root isn't the parent window, a WM will probably have offset	1053	* if display->root isn't the parent window, a WM will probably have offset
1197	* our position for handles and decorations. Counter it	1054	* our position for handles and decorations. Counter it
1198	*/	1055	*/
…		…
1200	{	1057	{
1201	x -= x1;	1058	x -= x1;
1202	y -= y1;	1059	y -= y1;
1203	}	1060	}
1204		1061
1205	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1062	x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1206	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1063	y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1207	dx = old_width - szHint.width;	1064	dx = old_width - szHint.width;
1208	dy = old_height - szHint.height;	1065	dy = old_height - szHint.height;
1209		1066
1210	/* Check position of the center of the window */	1067	/* Check position of the center of the window */
1211	if (x < x1) /* left half */	1068	if (x < x1) /* left half */
1212	dx = 0;	1069	dx = 0;
…		…
1215	if (y < y1) /* top half */	1072	if (y < y1) /* top half */
1216	dy = 0;	1073	dy = 0;
1217	else if (y == y1) /* exact center */	1074	else if (y == y1) /* exact center */
1218	dy /= 2;	1075	dy /= 2;
1219		1076
1220	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1077	XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1221	szHint.width, szHint.height);	1078	szHint.width, szHint.height);
1222	#else	1079	#else
1223	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1080	XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1224	#endif	1081	#endif
1225	}	1082	}
1226		1083
1227	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1084	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1228		1085
1229	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1086	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1230	{	1087	{
1231	if (scrollBar.state)	1088	if (scrollBar.state)
1232	{	1089	{
1233	XMoveResizeWindow (disp, scrollBar.win,	1090	XMoveResizeWindow (xdisp, scrollBar.win,
1234	window_sb_x, 0,	1091	window_sb_x, 0,
1235	scrollbar_TotalWidth (), szHint.height);	1092	scrollbar_TotalWidth (), szHint.height);
1236	resize_scrollbar ();	1093	resize_scrollbar ();
1237	}	1094	}
1238		1095
1239	XMoveResizeWindow (disp, vt,	1096	XMoveResizeWindow (xdisp, vt,
1240	window_vt_x, window_vt_y,	1097	window_vt_x, window_vt_y,
1241	width, height);	1098	width, height);
1242		1099
1243	scr_clear ();	1100	scr_clear ();
1244	#ifdef XPM_BACKGROUND	1101	#ifdef XPM_BACKGROUND
1245	resize_pixmap ();	1102	resize_pixmap ();
1246	#endif	1103	#endif
1247	}	1104	}
1248		1105
1249	if (fix_screen \|\| old_height == 0)	1106	if (fix_screen \|\| old_height == 0)
1250	{
1251	int curr_screen = -1;
1252	int old_ncol = prev_ncol;
1253
1254	/* scr_reset only works on the primary screen */
1255	if (old_height) /* this is not the first time through */
1256	{
1257	unsigned int ocol = ncol;
1258	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1259	curr_screen = scr_change_screen (PRIMARY);
1260	ncol = ocol;
1261	}
1262
1263	scr_reset ();	1107	scr_reset ();
1264
1265	if (curr_screen >= 0) /* this is not the first time through */
1266	{
1267	scr_change_screen (curr_screen);
1268	selection_check (old_ncol != ncol ? 4 : 0);
1269	}
1270	}
1271
1272	old_width = szHint.width;
1273	old_height = szHint.height;
1274		1108
1275	#ifdef XPM_BACKGROUND	1109	#ifdef XPM_BACKGROUND
1276	if (pixmap)	1110	if (pixmap)
1277	scr_touch (false);	1111	scr_touch (false);
1278	#endif	1112	#endif
…		…
1291	{	1125	{
1292	XWindowAttributes wattr;	1126	XWindowAttributes wattr;
1293		1127
1294	if (newwidth == 0 \|\| newheight == 0)	1128	if (newwidth == 0 \|\| newheight == 0)
1295	{	1129	{
1296	XGetWindowAttributes (display->display, display->root, &wattr);	1130	XGetWindowAttributes (xdisp, display->root, &wattr);
1297		1131
1298	if (newwidth == 0)	1132	if (newwidth == 0)
1299	newwidth = wattr.width - szHint.base_width;	1133	newwidth = wattr.width - szHint.base_width;
1300	if (newheight == 0)	1134	if (newheight == 0)
1301	newheight = wattr.height - szHint.base_height;	1135	newheight = wattr.height - szHint.base_height;
…		…
1363	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1197	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1364		1198
1365	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1199	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1366	*p = '\0';	1200	*p = '\0';
1367		1201
1368	atom = XInternAtom (display->display, server, False);	1202	atom = XInternAtom (xdisp, server, False);
1369	win = XGetSelectionOwner (display->display, atom);	1203	win = XGetSelectionOwner (xdisp, atom);
1370		1204
1371	if (win != None)	1205	if (win != None)
1372	return True;	1206	return True;
1373	}	1207	}
1374		1208
…		…
1381	XPoint nspot;	1215	XPoint nspot;
1382	XVaNestedList preedit_attr;	1216	XVaNestedList preedit_attr;
1383		1217
1384	if (!Input_Context	1218	if (!Input_Context
1385	\|\| !focus	1219	\|\| !focus
1386	\|\| !(input_style & XIMPreeditPosition))	1220	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1387	return;	1221	return;
1388		1222
1389	im_set_position (nspot);	1223	im_set_position (nspot);
1390		1224
1391	if (nspot.x == spot.x && nspot.y == spot.y)	1225	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1410	input_method = 0;	1244	input_method = 0;
1411	}	1245	}
1412		1246
1413	Input_Context = 0;	1247	Input_Context = 0;
1414	}	1248	}
		1249
		1250	#ifdef ENABLE_XIM_ONTHESPOT
		1251
		1252	static void
		1253	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1254	{
		1255	((rxvt_term *)client_data)->make_current ();
		1256	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1257	}
		1258
		1259	static void
		1260	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1261	{
		1262	((rxvt_term *)client_data)->make_current ();
		1263	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1264	}
		1265
		1266	static void
		1267	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1268	{
		1269	rxvt_term term = (rxvt_term )client_data;
		1270	XIMText *text = call_data->text;
		1271
		1272	term->make_current ();
		1273
		1274	if (text)
		1275	{
		1276	void *str;
		1277
		1278	if (!text->encoding_is_wchar && text->string.multi_byte)
		1279	{
		1280	// of course, X makes it ugly again
		1281	if (term->rs[Rs_imLocale])
		1282	SET_LOCALE (term->rs[Rs_imLocale]);
		1283
		1284	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1285	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1286
		1287	if (term->rs[Rs_imLocale])
		1288	SET_LOCALE (term->locale);
		1289	}
		1290	else
		1291	str = (void *)text->string.wide_char;
		1292
		1293	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1294	DT_INT, call_data->caret,
		1295	DT_INT, call_data->chg_first,
		1296	DT_INT, call_data->chg_length,
		1297	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1298	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1299	DT_END));
		1300	}
		1301	else
		1302	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1303	DT_INT, call_data->caret,
		1304	DT_INT, call_data->chg_first,
		1305	DT_INT, call_data->chg_length,
		1306	DT_END));
		1307	}
		1308
		1309	#if 0
		1310	static void
		1311	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1312	{
		1313	((rxvt_term *)client_data)->make_current ();
		1314	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1315	DT_INT, call_data->position,
		1316	DT_INT, call_data->direction,
		1317	DT_INT, call_data->style,
		1318	DT_END));
		1319	}
		1320	#endif
		1321
		1322	#endif
1415		1323
1416	/*	1324	/*
1417	* Try to open a XIM with the current modifiers, then see if we can	1325	* Try to open a XIM with the current modifiers, then see if we can
1418	* open a suitable preedit type	1326	* open a suitable preedit type
1419	*/	1327	*/
…		…
1426	XRectangle rect, status_rect, needed_rect;	1334	XRectangle rect, status_rect, needed_rect;
1427	unsigned long fg, bg;	1335	unsigned long fg, bg;
1428	const char *p;	1336	const char *p;
1429	char **s;	1337	char **s;
1430	XIMStyles *xim_styles;	1338	XIMStyles *xim_styles;
		1339	#ifdef ENABLE_XIM_ONTHESPOT
		1340	XIMCallback xcb[4];
		1341	#endif
1431		1342
1432	set_environ (envv);	1343	set_environ (envv);
1433		1344
1434	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1345	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435	return false;	1346	return false;
1436		1347
1437	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438	input_method = display->get_xim (locale, modifiers);	1348	input_method = display->get_xim (locale, modifiers);
1439	if (input_method == NULL)	1349	if (input_method == NULL)
1440	return false;	1350	return false;
1441		1351
1442	xim = input_method->xim;	1352	xim = input_method->xim;
…		…
1462	s = rxvt_splitcommastring (p);	1372	s = rxvt_splitcommastring (p);
1463		1373
1464	for (i = found = 0; !found && s[i]; i++)	1374	for (i = found = 0; !found && s[i]; i++)
1465	{	1375	{
1466	if (!strcmp (s[i], "OverTheSpot"))	1376	if (!strcmp (s[i], "OverTheSpot"))
1467	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1377	input_style = XIMPreeditPosition \| XIMStatusNothing;
1468	else if (!strcmp (s[i], "OffTheSpot"))	1378	else if (!strcmp (s[i], "OffTheSpot"))
1469	input_style = (XIMPreeditArea \| XIMStatusArea);	1379	input_style = XIMPreeditArea \| XIMStatusArea;
1470	else if (!strcmp (s[i], "Root"))	1380	else if (!strcmp (s[i], "Root"))
1471	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1381	input_style = XIMPreeditNothing \| XIMStatusNothing;
1472	else if (!strcmp (s[i], "None"))	1382	else if (!strcmp (s[i], "None"))
1473	input_style = (XIMPreeditNone \| XIMStatusNone);	1383	input_style = XIMPreeditNone \| XIMStatusNone;
		1384	#ifdef ENABLE_XIM_ONTHESPOT
		1385	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1386	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1387	#endif
		1388	else
		1389	input_style = XIMPreeditNothing \| XIMStatusNothing;
1474		1390
1475	for (j = 0; j < xim_styles->count_styles; j++)	1391	for (j = 0; j < xim_styles->count_styles; j++)
1476	if (input_style == xim_styles->supported_styles[j])	1392	if (input_style == xim_styles->supported_styles[j])
1477	{	1393	{
1478	rxvt_freecommastring (s);	1394	rxvt_freecommastring (s);
…		…
1516	"*",	1432	"*",
1517	fheight,	1433	fheight,
1518	fheight + 1, fheight - 1,	1434	fheight + 1, fheight - 1,
1519	fheight - 2, fheight + 2);	1435	fheight - 2, fheight + 2);
1520		1436
1521	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1437	fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1522	&missing_charset_list, &missing_charset_count, &def_string);	1438	&missing_charset_list, &missing_charset_count, &def_string);
1523		1439
1524	if (missing_charset_list)	1440	if (missing_charset_list)
1525	XFreeStringList (missing_charset_list);	1441	XFreeStringList (missing_charset_list);
1526		1442
…		…
1567	XNBackground, bg,	1483	XNBackground, bg,
1568	XNArea, &status_rect,	1484	XNArea, &status_rect,
1569	XNFontSet, fs,	1485	XNFontSet, fs,
1570	NULL);	1486	NULL);
1571	}	1487	}
		1488	#if ENABLE_XIM_ONTHESPOT
		1489	else if (input_style & XIMPreeditCallbacks)
		1490	{
		1491	im_set_position (spot);
		1492
		1493	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1494	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1495	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1496	# if 0
		1497	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1498	# endif
		1499
		1500	preedit_attr = XVaCreateNestedList (0,
		1501	XNSpotLocation, &spot,
		1502	XNPreeditStartCallback, &xcb[0],
		1503	XNPreeditDoneCallback , &xcb[1],
		1504	XNPreeditDrawCallback , &xcb[2],
		1505	# if 0
		1506	XNPreeditCaretCallback, &xcb[3],
		1507	# endif
		1508	NULL);
		1509	}
		1510	#endif
1572		1511
1573	Input_Context = XCreateIC (xim,	1512	Input_Context = XCreateIC (xim,
1574	XNInputStyle, input_style,	1513	XNInputStyle, input_style,
1575	XNClientWindow, vt,	1514	XNClientWindow, vt,
1576	XNFocusWindow, parent[0],	1515	XNFocusWindow, parent[0],
…		…
1579	status_attr ? XNStatusAttributes : NULL,	1518	status_attr ? XNStatusAttributes : NULL,
1580	status_attr, NULL);	1519	status_attr, NULL);
1581		1520
1582	if (preedit_attr) XFree (preedit_attr);	1521	if (preedit_attr) XFree (preedit_attr);
1583	if (status_attr) XFree (status_attr);	1522	if (status_attr) XFree (status_attr);
1584	if (fs) XFreeFontSet (display->display, fs);	1523	if (fs) XFreeFontSet (xdisp, fs);
1585		1524
1586	if (Input_Context == NULL)	1525	if (Input_Context == NULL)
1587	{	1526	{
1588	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1527	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589	im_destroy ();	1528	im_destroy ();
1590	return false;	1529	return false;
1591	}	1530	}
1592		1531
		1532	#if 0
		1533	// unfortunately, only the focus window is used by XIM, hard to fix
		1534	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1535	vt_select_input ();
		1536	#endif
		1537
1593	if (input_style & XIMPreeditArea)	1538	if (input_style & XIMPreeditArea)
1594	IMSetStatusPosition ();	1539	IMSetStatusPosition ();
1595		1540
1596	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597	return true;	1541	return true;
1598	}	1542	}
1599		1543
1600	void	1544	void
1601	rxvt_term::im_cb ()	1545	rxvt_term::im_cb ()
…		…
1607		1551
1608	make_current ();	1552	make_current ();
1609		1553
1610	im_destroy ();	1554	im_destroy ();
1611		1555
1612	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613	if (Input_Context)	1556	if (Input_Context)
1614	return;	1557	return;
1615		1558
1616	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1559	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1617	if (rs[Rs_imLocale])	1560	if (rs[Rs_imLocale])
…		…
1690	XFree (preedit_attr);	1633	XFree (preedit_attr);
1691	XFree (status_attr);	1634	XFree (status_attr);
1692	}	1635	}
1693	#endif /* USE_XIM */	1636	#endif /* USE_XIM */
1694		1637
1695	/----------------------------------------------------------------------/
1696	rxvt_t rxvt_current_term;
1697
1698	/----------------------- end-of-file (C source) -----------------------/	1638	/----------------------- 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.186 by root, Tue Jan 17 15:41:33 2006 UTC vs. Revision 1.207 by root, Wed Jan 25 21:09:21 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.186 by root, Tue Jan 17 15:41:33 2006 UTC vs.
Revision 1.207 by root, Wed Jan 25 21:09:21 2006 UTC