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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.173 by root, Wed Jan 11 19:55:34 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
…		…
161	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
162	#endif	150	#endif
163	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
164	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
165	#endif	153	#endif
166	#ifdef MENUBAR
167	menubar_ev (this, &rxvt_term::x_cb),
168	#endif
169	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
170	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171	#endif	156	#endif
172	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
173	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
185	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
186	#endif	171	#endif
187	#ifdef USE_XIM	172	#ifdef USE_XIM
188	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
189	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
190	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
191	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
192	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
193	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
194	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
195	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
196	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
199		188
200	termlist.push_back (this);	189	termlist.push_back (this);
201		190
202	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
203	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
204
205	if (!keyboard)
206	rxvt_fatal ("out of memory, aborting.\n");
207	#endif	193	#endif
208	}	194	}
209		195
210	// 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.
211	// for use before an emergency exit	197	// for use before an emergency exit
212	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
213	{	199	{
214	if (cmd_pid)	200	if (cmd_pid)
215	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
216		202
217	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
218	privileged_utmp (RESTORE);
219	#endif
220
221	pty.put ();
222	}	204	}
223		205
224	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
225	{	207	{
226	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
229		209
230	emergency_cleanup ();	210	emergency_cleanup ();
231		211
232	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
236	#endif	216	#endif
237	delete fontset[0];	217	delete fontset[0];
238		218
239	if (display)	219	if (display)
240	{	220	{
241	dDisp;
242
243	selection_clear ();	221	selection_clear ();
244		222
245	#ifdef USE_XIM	223	#ifdef USE_XIM
246	im_destroy ();	224	im_destroy ();
247	#endif	225	#endif
248	#ifdef MENUBAR
249	if (menubarGC) XFreeGC (disp, menubarGC);
250	#endif
251	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
252	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
253	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (xdisp, ShadowGC);
254	#endif	229	#endif
255	#ifdef PLAIN_SCROLLBAR	230	#ifdef PLAIN_SCROLLBAR
256	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	231	if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
257	#endif	232	#endif
258	#ifdef NEXT_SCROLLBAR	233	#ifdef NEXT_SCROLLBAR
259	if (blackGC) XFreeGC (disp, blackGC);	234	if (blackGC) XFreeGC (xdisp, blackGC);
260	if (whiteGC) XFreeGC (disp, whiteGC);	235	if (whiteGC) XFreeGC (xdisp, whiteGC);
261	if (grayGC) XFreeGC (disp, grayGC);	236	if (grayGC) XFreeGC (xdisp, grayGC);
262	if (darkGC) XFreeGC (disp, darkGC);	237	if (darkGC) XFreeGC (xdisp, darkGC);
263	if (stippleGC) XFreeGC (disp, stippleGC);	238	if (stippleGC) XFreeGC (xdisp, stippleGC);
264	if (dimple) XFreePixmap (disp, dimple);	239	if (dimple) XFreePixmap (xdisp, dimple);
265	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (xdisp, upArrow);
266	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (xdisp, downArrow);
267	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
268	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
269	#endif	244	#endif
270	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	245	#ifdef RXVT_SCROLLBAR
271	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (xdisp, topShadowGC);
272	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (xdisp, botShadowGC);
273	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
274	#endif	249	#endif
275	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (xdisp, gc);
276		251
277	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278	delete menuBar.drawable;
279	//if (menuBar.win)
280	// XDestroyWindow (disp, menuBar.win);
281	#endif
282	delete drawable;	252	delete drawable;
283	// destroy all windows	253	// destroy all windows
284	if (parent[0])	254	if (parent[0])
285	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (xdisp, parent[0]);
		256
		257	clear ();
286	}	258	}
287		259
288	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
289	delete pix_colors_focused;	261	delete pix_colors_focused;
290	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
…		…
299	for (int i = 0; i < allocated.size (); i++)	271	for (int i = 0; i < allocated.size (); i++)
300	free (allocated [i]);	272	free (allocated [i]);
301		273
302	free (selection.text);	274	free (selection.text);
303	// TODO: manage env vars in child only(!)	275	// TODO: manage env vars in child only(!)
304	free (env_windowid);
305	free (env_display);	276	free (env_display);
306	free (env_term);	277	free (env_term);
307	free (env_colorfgbg);
308	free (locale);	278	free (locale);
309	free (v_buffer);	279	free (v_buffer);
310	free (incr_buf);	280	free (incr_buf);
311		281
312	delete envv;	282	delete envv;
…		…
315	#ifdef KEYSYM_RESOURCE	285	#ifdef KEYSYM_RESOURCE
316	delete keyboard;	286	delete keyboard;
317	#endif	287	#endif
318	}	288	}
319		289
		290	// child has exited, usually destroys
320	void	291	void
321	rxvt_term::child_exit ()	292	rxvt_term::child_cb (child_watcher &w, int status)
322	{	293	{
		294	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		295
323	cmd_pid = 0;	296	cmd_pid = 0;
324		297
325	if (!OPTION (Opt_hold))	298	if (!OPTION (Opt_hold))
326	destroy ();	299	destroy ();
327	}	300	}
…		…
330	rxvt_term::destroy ()	303	rxvt_term::destroy ()
331	{	304	{
332	if (destroy_ev.active)	305	if (destroy_ev.active)
333	return;	306	return;
334		307
		308	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		309
335	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
336	scr_overlay_off ();	311	scr_overlay_off ();
337	#endif	312	#endif
338		313
339	if (display)	314	if (display)
…		…
341	#if USE_XIM	316	#if USE_XIM
342	im_ev.stop (display);	317	im_ev.stop (display);
343	#endif	318	#endif
344	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
345	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
346	#endif
347	#if MENUBAR
348	menubar_ev.stop (display);
349	#endif	321	#endif
350	#if TRANSPARENT	322	#if TRANSPARENT
351	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
352	#endif	324	#endif
353	incr_ev.stop ();	325	incr_ev.stop ();
…		…
377	}	349	}
378		350
379	void	351	void
380	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
381	{	353	{
382	SET_R (this);	354	make_current ();
383		355
384	delete this;	356	delete this;
385	}	357	}
386		358
387	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
475	_exit (EXIT_FAILURE);	447	_exit (EXIT_FAILURE);
476	}	448	}
477		449
478	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
479	bool	451	bool
480	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv, stringvec *envv)
481	{	453	{
		454	this->envv = envv;
		455
482	SET_R (this);	456	SET_R (this);
483	TEMP_ENV; // few things in X do not call setlocale :(
484
485	set_locale ("");	457	set_locale ("");
		458	set_environ (envv); // few things in X do not call setlocale :(
486		459
487	if (!init_vars ())	460	if (!init_vars ())
488	return false;	461	return false;
489		462
490	init_secondary ();	463	init_secondary ();
…		…
493		466
494	#ifdef KEYSYM_RESOURCE	467	#ifdef KEYSYM_RESOURCE
495	keyboard->register_done ();	468	keyboard->register_done ();
496	#endif	469	#endif
497		470
498	#if MENUBAR_MAX
499	menubar_read (rs[Rs_menu]);
500	#endif
501	#ifdef HAVE_SCROLLBARS	471	#ifdef HAVE_SCROLLBARS
502	if (OPTION (Opt_scrollBar))	472	if (OPTION (Opt_scrollBar))
503	scrollBar.setIdle (); /* set existence for size calculations */	473	scrollBar.setIdle (); /* set existence for size calculations */
504	#endif	474	#endif
505		475
506	#if ENABLE_PERL	476	pty = ptytty::create ();
507	if (!rs[Rs_perl_ext_1])
508	rs[Rs_perl_ext_1] = "default";
509
510	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
511	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
512	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
513	{
514	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
515	// ignore some perl-related arguments if some bozo installed us set[ug]id
516	if (rxvt_tainted ())
517	{
518	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
519	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520	{
521	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
522	rs[Rs_perl_lib] = 0;
523	rs[Rs_perl_eval] = 0;
524	}
525	}
526	#endif
527	rxvt_perl.init ();
528	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529	}
530	#endif
531		477
532	create_windows (argc, argv);	478	create_windows (argc, argv);
533		479
534	dDisp;
535
536	init_xlocale ();	480	init_xlocale ();
537		481
538	scr_reset (); // initialize screen	482	scr_reset (); // initialize screen
539		483
540	#if 0	484	#if 0
541	XSynchronize (disp, True);	485	XSynchronize (xdisp, True);
542	#endif	486	#endif
543		487
544	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
545	if (OPTION (Opt_scrollBar))	489	if (OPTION (Opt_scrollBar))
546	resize_scrollbar (); /* create and map scrollbar */	490	resize_scrollbar (); /* create and map scrollbar */
547	#endif	491	#endif
548	#if (MENUBAR_MAX)
549	if (menubar_visible ())
550	XMapWindow (disp, menuBar.win);
551	#endif
552	#ifdef TRANSPARENT	492	#ifdef TRANSPARENT
553	if (OPTION (Opt_transparent))	493	if (OPTION (Opt_transparent))
554	{	494	{
555	XSelectInput (disp, display->root, PropertyChangeMask);	495	XSelectInput (xdisp, display->root, PropertyChangeMask);
556	check_our_parents ();	496	check_our_parents ();
557	rootwin_ev.start (display, display->root);	497	rootwin_ev.start (display, display->root);
558	}	498	}
559	#endif	499	#endif
560		500
561	XMapWindow (disp, vt);
562	XMapWindow (disp, parent[0]);
563
564	set_colorfgbg ();	501	set_colorfgbg ();
565		502
566	init_command (cmd_argv);	503	init_command (cmd_argv);
567		504
568	free (cmd_argv);	505	free (cmd_argv);
569		506
570	if (pty.pty >= 0)	507	if (pty->pty >= 0)
571	pty_ev.start (pty.pty, EVENT_READ);	508	pty_ev.start (pty->pty, EVENT_READ);
572		509
573	check_ev.start ();	510	check_ev.start ();
574		511
575	HOOK_INVOKE ((this, HOOK_START, DT_END));	512	HOOK_INVOKE ((this, HOOK_START, DT_END));
576		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
577	return true;	527	return true;
578	}	528	}
579		529
580	static struct sig_handlers	530	static struct sig_handlers
581	{	531	{
582	sig_watcher sw_chld, sw_term, sw_int;	532	sig_watcher sw_term, sw_int;
583		533
584	void sig_chld (sig_watcher &w)
585	{
586	// we are being called for every SIGCHLD, find the corresponding term
587	int pid;
588
589	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
590	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
591	if (pid == (*t)->cmd_pid)
592	{
593	(*t)->child_exit ();
594	break;
595	}
596	}
597
598	/*	534	/*
599	* Catch a fatal signal and tidy up before quitting	535	* Catch a fatal signal and tidy up before quitting
600	*/	536	*/
601	void	537	void
602	sig_term (sig_watcher &w)	538	sig_term (sig_watcher &w)
603	{	539	{
604	#ifdef DEBUG_CMD
605	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
606	#endif
607	rxvt_emergency_cleanup ();	540	rxvt_emergency_cleanup ();
608	signal (w.signum, SIG_DFL);	541	signal (w.signum, SIG_DFL);
609	kill (getpid (), w.signum);	542	kill (getpid (), w.signum);
610	}	543	}
611		544
612	sig_handlers ()	545	sig_handlers ()
613	: sw_chld (this, &sig_handlers::sig_chld),
614	sw_term (this, &sig_handlers::sig_term),	546	: sw_term (this, &sig_handlers::sig_term),
615	sw_int (this, &sig_handlers::sig_term)	547	sw_int (this, &sig_handlers::sig_term)
616	{	548	{
617	}	549	}
618	} sig_handlers;	550	} sig_handlers;
619		551
		552	char **rxvt_environ; // startup environment
		553
620	void	554	void
621	rxvt_init ()	555	rxvt_init ()
622	{	556	{
623	/*	557	ptytty::init ();
624	* Save and then give up any super-user privileges	558
625	* If we need privileges in any area then we must specifically request it.	559	rxvt_environ = environ;
626	* We should only need to be root in these cases:
627	* 1. write utmp entries on some systems
628	* 2. chown tty on some systems
629	*/
630	rxvt_privileges (SAVE);
631	rxvt_privileges (IGNORE);
632		560
633	signal (SIGHUP, SIG_IGN);	561	signal (SIGHUP, SIG_IGN);
634	signal (SIGPIPE, SIG_IGN);	562	signal (SIGPIPE, SIG_IGN);
635		563
636	sig_handlers.sw_chld.start (SIGCHLD);
637	sig_handlers.sw_term.start (SIGTERM);	564	sig_handlers.sw_term.start (SIGTERM);
638	sig_handlers.sw_int.start (SIGINT);	565	sig_handlers.sw_int.start (SIGINT);
639		566
640	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	567	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
641	/* signal (SIGURG, SIG_DFL); */	568	/* signal (SIGURG, SIG_DFL); */
…		…
670	rxvt_fatal ("memory allocation failure. aborting.\n");	597	rxvt_fatal ("memory allocation failure. aborting.\n");
671		598
672	return p;	599	return p;
673	}	600	}
674		601
675	void *	602	void *
676	rxvt_realloc (void *ptr, size_t size)	603	rxvt_realloc (void *ptr, size_t size)
677	{	604	{
678	void *p = realloc (ptr, size);	605	void *p = realloc (ptr, size);
679		606
680	if (!p)	607	if (!p)
681	rxvt_fatal ("memory allocation failure. aborting.\n");	608	rxvt_fatal ("memory allocation failure. aborting.\n");
682		609
683	return p;	610	return p;
684	}	611	}
685
686	/* ------------------------------------------------------------------------- *
687	* PRIVILEGED OPERATIONS *
688	* ------------------------------------------------------------------------- */
689	/* take care of suid/sgid super-user (root) privileges */
690	void
691	rxvt_privileges (rxvt_privaction action)
692	{
693	#if ! defined(__CYGWIN32__)
694	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
695	/* setreuid () is the poor man's setuid (), seteuid () */
696	# define seteuid(a) setreuid(-1, (a))
697	# define setegid(a) setregid(-1, (a))
698	# define HAVE_SETEUID
699	# endif
700	# ifdef HAVE_SETEUID
701	switch (action)
702	{
703	case IGNORE:
704	/*
705	* change effective uid/gid - not real uid/gid - so we can switch
706	* back to root later, as required
707	*/
708	setegid (getgid ());
709	seteuid (getuid ());
710	break;
711	case SAVE:
712	saved_egid = getegid ();
713	saved_euid = geteuid ();
714	break;
715	case RESTORE:
716	setegid (saved_egid);
717	seteuid (saved_euid);
718	break;
719	}
720	# else
721	switch (action)
722	{
723	case IGNORE:
724	setgid (getgid ());
725	setuid (getuid ());
726	/* FALLTHROUGH */
727	case SAVE:
728	/* FALLTHROUGH */
729	case RESTORE:
730	break;
731	}
732	# endif
733	#endif
734	}
735
736	#ifdef UTMP_SUPPORT
737	void
738	rxvt_term::privileged_utmp (rxvt_privaction action)
739	{
740	if (OPTION (Opt_utmpInhibit)
741	\|\| !pty.name \|\| !*pty.name)
742	return;
743
744	rxvt_privileges (RESTORE);
745
746	if (action == SAVE)
747	makeutent (pty.name, rs[Rs_display_name]);
748	else
749	cleanutent ();
750
751	rxvt_privileges (IGNORE);
752	}
753	#endif
754		612
755	/----------------------------------------------------------------------/	613	/----------------------------------------------------------------------/
756	/*	614	/*
757	* window size/position calculcations for XSizeHint and other storage.	615	* window size/position calculcations for XSizeHint and other storage.
758	* if width/height are non-zero then override calculated width/height	616	* if width/height are non-zero then override calculated width/height
759	*/	617	*/
760	void	618	void
761	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	619	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
762	{	620	{
763	short recalc_x, recalc_y;	621	short recalc_x, recalc_y;
764	int x, y, sb_w, mb_h, flags;	622	int x, y, sb_w, flags;
765	unsigned int w, h;	623	unsigned int w, h;
766	unsigned int max_width, max_height;	624	unsigned int max_width, max_height;
767	dDisp;
768
769	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
770	ncol, nrow, szHint.width, szHint.height));
771		625
772	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	626	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
773	szHint.win_gravity = NorthWestGravity;	627	szHint.win_gravity = NorthWestGravity;
774	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	628	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
775		629
…		…
830	max_width = MAX_COLS * fwidth;	684	max_width = MAX_COLS * fwidth;
831	max_height = MAX_ROWS * fheight;	685	max_height = MAX_ROWS * fheight;
832		686
833	szHint.base_width = szHint.base_height = 2 * int_bwidth;	687	szHint.base_width = szHint.base_height = 2 * int_bwidth;
834		688
835	sb_w = mb_h = 0;	689	sb_w = 0;
836	window_vt_x = window_vt_y = int_bwidth;	690	window_vt_x = window_vt_y = int_bwidth;
837		691
838	if (scrollbar_visible ())	692	if (scrollBar.state)
839	{	693	{
840	sb_w = scrollbar_TotalWidth ();	694	sb_w = scrollbar_TotalWidth ();
841	szHint.base_width += sb_w;	695	szHint.base_width += sb_w;
842	if (!OPTION (Opt_scrollBar_right))	696	if (!OPTION (Opt_scrollBar_right))
843	window_vt_x += sb_w;	697	window_vt_x += sb_w;
844	}	698	}
845		699
846	if (menubar_visible ())
847	{
848	mb_h = menuBar_TotalHeight ();
849	szHint.base_height += mb_h;
850	window_vt_y += mb_h;
851	}
852
853	szHint.width_inc = fwidth;	700	szHint.width_inc = fwidth;
854	szHint.height_inc = fheight;	701	szHint.height_inc = fheight;
855	szHint.min_width = szHint.base_width + szHint.width_inc;	702	szHint.min_width = szHint.base_width + szHint.width_inc;
856	szHint.min_height = szHint.base_height + szHint.height_inc;	703	szHint.min_height = szHint.base_height + szHint.height_inc;
857		704
…		…
875	{	722	{
876	min_it (height, max_height);	723	min_it (height, max_height);
877	szHint.height = szHint.base_height + height;	724	szHint.height = szHint.base_height + height;
878	}	725	}
879		726
880	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	727	if (scrollBar.state && OPTION (Opt_scrollBar_right))
881	window_sb_x = szHint.width - sb_w;	728	window_sb_x = szHint.width - sb_w;
882		729
883	if (recalc_x)	730	if (recalc_x)
884	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	731	szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
		732
885	if (recalc_y)	733	if (recalc_y)
886	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	734	szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
887		735
888	ncol = width / fwidth;	736	ncol = width / fwidth;
889	nrow = height / fheight;	737	nrow = height / fheight;
890	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
891	ncol, nrow, szHint.width,
892	szHint.height));
893	return;
894	}	738	}
895		739
896	/----------------------------------------------------------------------/	740	/----------------------------------------------------------------------/
897	/*	741	/*
898	* Tell the teletype handler what size the window is.	742	* Tell the teletype handler what size the window is.
899	* Called after a window size change.	743	* Called after a window size change.
900	*/	744	*/
901	void	745	void
902	rxvt_term::tt_winch ()	746	rxvt_term::tt_winch ()
903	{	747	{
904	if (pty.pty < 0)	748	if (pty->pty < 0)
905	return;	749	return;
906		750
907	struct winsize ws;	751	struct winsize ws;
908		752
909	ws.ws_col = ncol;	753	ws.ws_col = ncol;
910	ws.ws_row = nrow;	754	ws.ws_row = nrow;
911	ws.ws_xpixel = width;	755	ws.ws_xpixel = width;
912	ws.ws_ypixel = height;	756	ws.ws_ypixel = height;
913	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	757	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
914		758
915	#if 0	759	#if 0
916	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	760	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
917	if (cmd_pid) /* force through to the command */	761	if (cmd_pid) /* force through to the command */
918	kill (-cmd_pid, SIGWINCH);	762	kill (-cmd_pid, SIGWINCH);
…		…
998	return true;	842	return true;
999	}	843	}
1000		844
1001	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)
1002	{	846	{
1003	XChangeProperty (display->display, parent[0],	847	XChangeProperty (xdisp, parent[0],
1004	prop, XA_STRING, 8, PropModeReplace,	848	prop, XA_STRING, 8, PropModeReplace,
1005	(const unsigned char *)str, len >= 0 ? len : strlen (str));	849	(const unsigned char *)str, len >= 0 ? len : strlen (str));
1006	}	850	}
1007		851
1008	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)
1009	{	853	{
1010	wchar_t *ws = rxvt_mbstowcs (str, len);	854	wchar_t *ws = rxvt_mbstowcs (str, len);
1011	char *s = rxvt_wcstoutf8 (ws);	855	char *s = rxvt_wcstoutf8 (ws);
1012		856
1013	XChangeProperty (display->display, parent[0],	857	XChangeProperty (xdisp, parent[0],
1014	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	858	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1015	(const unsigned char *)s, strlen (s));	859	(const unsigned char *)s, strlen (s));
1016		860
1017	free (s);	861	free (s);
1018	free (ws);	862	free (ws);
…		…
1071	}	915	}
1072		916
1073	if (!rXParseAllocColor (&xcol, color))	917	if (!rXParseAllocColor (&xcol, color))
1074	return;	918	return;
1075		919
1076	/* XStoreColor (display->display, display->cmap, XColor); /	920	/* XStoreColor (xdisp, display->cmap, XColor); /
1077		921
1078	/*	922	/*
1079	* 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,
1080	* so just keep gobbling up the colormap	924	* so just keep gobbling up the colormap
1081	*/	925	*/
…		…
1084	if (pix_colors[idx] == pix_colors[i])	928	if (pix_colors[idx] == pix_colors[i])
1085	break;	929	break;
1086	if (i > Color_White)	930	if (i > Color_White)
1087	{	931	{
1088	/* 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]); */
1089	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,	933	XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1090	DisplayPlanes (display->display, display->screen));	934	DisplayPlanes (xdisp, display->screen));
1091	}	935	}
1092	# endif	936	# endif
1093		937
1094	pix_colors_focused[idx] = xcol;	938	pix_colors_focused[idx] = xcol;
1095	SET_PIXCOLOR (idx);	939	SET_PIXCOLOR (idx);
…		…
1098	/* Cursor cursor; */	942	/* Cursor cursor; */
1099	done:	943	done:
1100		944
1101	#if OFF_FOCUS_FADING	945	#if OFF_FOCUS_FADING
1102	if (rs[Rs_fade])	946	if (rs[Rs_fade])
1103	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]);
1104	#endif	948	#endif
1105		949
1106	/TODO: handle Color_BD, scrollbar background, etc. /	950	/TODO: handle Color_BD, scrollbar background, etc. /
1107		951
1108	recolour_cursor ();	952	recolour_cursor ();
…		…
1123	: pix_colors_focused[Color_fg];	967	: pix_colors_focused[Color_fg];
1124	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	968	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1125	? pix_colors_focused[Color_pointer_bg]	969	? pix_colors_focused[Color_pointer_bg]
1126	: pix_colors_focused[Color_bg];	970	: pix_colors_focused[Color_bg];
1127		971
1128	XQueryColors (display->display, display->cmap, xcol, 2);	972	XQueryColors (xdisp, cmap, xcol, 2);
1129	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	973	XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1130	}	974	}
1131		975
1132	/----------------------------------------------------------------------/	976	/----------------------------------------------------------------------/
1133	/*	977	/*
1134	* 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
…		…
1138	{	982	{
1139	unsigned int i;	983	unsigned int i;
1140	const char *xpmb = "\0";	984	const char *xpmb = "\0";
1141	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1142		986
1143	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1144	strcpy (fstr, "default");	987	strcpy (fstr, "default");
1145	strcpy (bstr, "default");	988	strcpy (bstr, "default");
1146	for (i = Color_Black; i <= Color_White; i++)	989	for (i = Color_Black; i <= Color_White; i++)
1147	if (pix_colors[Color_fg] == pix_colors[i])	990	if (pix_colors[Color_fg] == pix_colors[i])
1148	{	991	{
…		…
1166	/----------------------------------------------------------------------/	1009	/----------------------------------------------------------------------/
1167		1010
1168	int	1011	int
1169	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1012	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)
1170	{	1013	{
1171	if (!screen_in_out->set (display, colour))	1014	if (!screen_in_out->set (this, colour))
1172	{	1015	{
1173	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);	1016	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1174	return false;	1017	return false;
1175	}	1018	}
1176		1019
…		…
1182	* -------------------------------------------------------------------- */	1025	* -------------------------------------------------------------------- */
1183	void	1026	void
1184	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)
1185	{	1028	{
1186	int fix_screen;	1029	int fix_screen;
1187	int old_width = szHint.width, old_height = szHint.height;	1030	int old_width = szHint.width;
1188	dDisp;	1031	int old_height = szHint.height;
1189		1032
1190	window_calc (newwidth, newheight);	1033	window_calc (newwidth, newheight);
1191	XSetWMNormalHints (disp, parent[0], &szHint);	1034	XSetWMNormalHints (xdisp, parent[0], &szHint);
1192		1035
1193	if (!ignoreparent)	1036	if (!ignoreparent)
1194	{	1037	{
1195	#ifdef SMART_RESIZE	1038	#ifdef SMART_RESIZE
1196	/*	1039	/*
…		…
1200	int x, y, x1, y1;	1043	int x, y, x1, y1;
1201	int dx, dy;	1044	int dx, dy;
1202	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1045	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1203	Window unused_cr;	1046	Window unused_cr;
1204		1047
1205	XTranslateCoordinates (disp, parent[0], display->root,	1048	XTranslateCoordinates (xdisp, parent[0], display->root,
1206	0, 0, &x, &y, &unused_cr);	1049	0, 0, &x, &y, &unused_cr);
1207	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1050	XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1208	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1051	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1209	/*	1052	/*
1210	* 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
1211	* our position for handles and decorations. Counter it	1054	* our position for handles and decorations. Counter it
1212	*/	1055	*/
…		…
1214	{	1057	{
1215	x -= x1;	1058	x -= x1;
1216	y -= y1;	1059	y -= y1;
1217	}	1060	}
1218		1061
1219	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1062	x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1220	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1063	y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1221	dx = old_width - szHint.width;	1064	dx = old_width - szHint.width;
1222	dy = old_height - szHint.height;	1065	dy = old_height - szHint.height;
1223		1066
1224	/* Check position of the center of the window */	1067	/* Check position of the center of the window */
1225	if (x < x1) /* left half */	1068	if (x < x1) /* left half */
1226	dx = 0;	1069	dx = 0;
…		…
1229	if (y < y1) /* top half */	1072	if (y < y1) /* top half */
1230	dy = 0;	1073	dy = 0;
1231	else if (y == y1) /* exact center */	1074	else if (y == y1) /* exact center */
1232	dy /= 2;	1075	dy /= 2;
1233		1076
1234	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1077	XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1235	szHint.width, szHint.height);	1078	szHint.width, szHint.height);
1236	#else	1079	#else
1237	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1080	XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1238	#endif	1081	#endif
1239	}	1082	}
1240		1083
1241	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1084	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1242		1085
1243	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1086	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1244	{	1087	{
1245	if (scrollbar_visible ())	1088	if (scrollBar.state)
1246	{	1089	{
1247	XMoveResizeWindow (disp, scrollBar.win,	1090	XMoveResizeWindow (xdisp, scrollBar.win,
1248	window_sb_x, 0,	1091	window_sb_x, 0,
1249	scrollbar_TotalWidth (), szHint.height);	1092	scrollbar_TotalWidth (), szHint.height);
1250	resize_scrollbar ();	1093	resize_scrollbar ();
1251	}	1094	}
1252		1095
1253	if (menubar_visible ())
1254	XMoveResizeWindow (disp, menuBar.win,
1255	window_vt_x, 0,
1256	width, menuBar_TotalHeight ());
1257
1258	XMoveResizeWindow (disp, vt,	1096	XMoveResizeWindow (xdisp, vt,
1259	window_vt_x, window_vt_y,	1097	window_vt_x, window_vt_y,
1260	width, height);	1098	width, height);
1261		1099
1262	scr_clear ();	1100	scr_clear ();
1263	#ifdef XPM_BACKGROUND	1101	#ifdef XPM_BACKGROUND
1264	resize_pixmap ();	1102	resize_pixmap ();
1265	#endif	1103	#endif
1266	}	1104	}
1267		1105
1268	if (fix_screen \|\| old_height == 0)	1106	if (fix_screen \|\| old_height == 0)
1269	{
1270	int curr_screen = -1;
1271	int old_ncol = prev_ncol;
1272
1273	/* scr_reset only works on the primary screen */
1274	if (old_height) /* this is not the first time through */
1275	{
1276	unsigned int ocol = ncol;
1277	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1278	curr_screen = scr_change_screen (PRIMARY);
1279	ncol = ocol;
1280	}
1281
1282	scr_reset ();	1107	scr_reset ();
1283
1284	if (curr_screen >= 0) /* this is not the first time through */
1285	{
1286	scr_change_screen (curr_screen);
1287	selection_check (old_ncol != ncol ? 4 : 0);
1288	}
1289	}
1290
1291	old_width = szHint.width;
1292	old_height = szHint.height;
1293		1108
1294	#ifdef XPM_BACKGROUND	1109	#ifdef XPM_BACKGROUND
1295	if (pixmap)	1110	if (pixmap)
1296	scr_touch (false);	1111	scr_touch (false);
1297	#endif	1112	#endif
…		…
1310	{	1125	{
1311	XWindowAttributes wattr;	1126	XWindowAttributes wattr;
1312		1127
1313	if (newwidth == 0 \|\| newheight == 0)	1128	if (newwidth == 0 \|\| newheight == 0)
1314	{	1129	{
1315	XGetWindowAttributes (display->display, display->root, &wattr);	1130	XGetWindowAttributes (xdisp, display->root, &wattr);
1316		1131
1317	if (newwidth == 0)	1132	if (newwidth == 0)
1318	newwidth = wattr.width - szHint.base_width;	1133	newwidth = wattr.width - szHint.base_width;
1319	if (newheight == 0)	1134	if (newheight == 0)
1320	newheight = wattr.height - szHint.base_height;	1135	newheight = wattr.height - szHint.base_height;
…		…
1382	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1197	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1383		1198
1384	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1199	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1385	*p = '\0';	1200	*p = '\0';
1386		1201
1387	atom = XInternAtom (display->display, server, False);	1202	atom = XInternAtom (xdisp, server, False);
1388	win = XGetSelectionOwner (display->display, atom);	1203	win = XGetSelectionOwner (xdisp, atom);
1389		1204
1390	if (win != None)	1205	if (win != None)
1391	return True;	1206	return True;
1392	}	1207	}
1393		1208
…		…
1400	XPoint nspot;	1215	XPoint nspot;
1401	XVaNestedList preedit_attr;	1216	XVaNestedList preedit_attr;
1402		1217
1403	if (!Input_Context	1218	if (!Input_Context
1404	\|\| !focus	1219	\|\| !focus
1405	\|\| !(input_style & XIMPreeditPosition))	1220	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1406	return;	1221	return;
1407		1222
1408	im_set_position (nspot);	1223	im_set_position (nspot);
1409		1224
1410	if (nspot.x == spot.x && nspot.y == spot.y)	1225	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1429	input_method = 0;	1244	input_method = 0;
1430	}	1245	}
1431		1246
1432	Input_Context = 0;	1247	Input_Context = 0;
1433	}	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
1434		1323
1435	/*	1324	/*
1436	* 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
1437	* open a suitable preedit type	1326	* open a suitable preedit type
1438	*/	1327	*/
…		…
1445	XRectangle rect, status_rect, needed_rect;	1334	XRectangle rect, status_rect, needed_rect;
1446	unsigned long fg, bg;	1335	unsigned long fg, bg;
1447	const char *p;	1336	const char *p;
1448	char **s;	1337	char **s;
1449	XIMStyles *xim_styles;	1338	XIMStyles *xim_styles;
		1339	#ifdef ENABLE_XIM_ONTHESPOT
		1340	XIMCallback xcb[4];
		1341	#endif
1450		1342
1451	TEMP_ENV;	1343	set_environ (envv);
1452		1344
1453	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1345	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1454	return false;	1346	return false;
1455		1347
1456	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1457	input_method = display->get_xim (locale, modifiers);	1348	input_method = display->get_xim (locale, modifiers);
1458	if (input_method == NULL)	1349	if (input_method == NULL)
1459	return false;	1350	return false;
1460		1351
1461	xim = input_method->xim;	1352	xim = input_method->xim;
…		…
1481	s = rxvt_splitcommastring (p);	1372	s = rxvt_splitcommastring (p);
1482		1373
1483	for (i = found = 0; !found && s[i]; i++)	1374	for (i = found = 0; !found && s[i]; i++)
1484	{	1375	{
1485	if (!strcmp (s[i], "OverTheSpot"))	1376	if (!strcmp (s[i], "OverTheSpot"))
1486	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1377	input_style = XIMPreeditPosition \| XIMStatusNothing;
1487	else if (!strcmp (s[i], "OffTheSpot"))	1378	else if (!strcmp (s[i], "OffTheSpot"))
1488	input_style = (XIMPreeditArea \| XIMStatusArea);	1379	input_style = XIMPreeditArea \| XIMStatusArea;
1489	else if (!strcmp (s[i], "Root"))	1380	else if (!strcmp (s[i], "Root"))
1490	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1381	input_style = XIMPreeditNothing \| XIMStatusNothing;
1491	else if (!strcmp (s[i], "None"))	1382	else if (!strcmp (s[i], "None"))
1492	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;
1493		1390
1494	for (j = 0; j < xim_styles->count_styles; j++)	1391	for (j = 0; j < xim_styles->count_styles; j++)
1495	if (input_style == xim_styles->supported_styles[j])	1392	if (input_style == xim_styles->supported_styles[j])
1496	{	1393	{
1497	rxvt_freecommastring (s);	1394	rxvt_freecommastring (s);
…		…
1535	"*",	1432	"*",
1536	fheight,	1433	fheight,
1537	fheight + 1, fheight - 1,	1434	fheight + 1, fheight - 1,
1538	fheight - 2, fheight + 2);	1435	fheight - 2, fheight + 2);
1539		1436
1540	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1437	fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1541	&missing_charset_list, &missing_charset_count, &def_string);	1438	&missing_charset_list, &missing_charset_count, &def_string);
1542		1439
1543	if (missing_charset_list)	1440	if (missing_charset_list)
1544	XFreeStringList (missing_charset_list);	1441	XFreeStringList (missing_charset_list);
1545		1442
…		…
1586	XNBackground, bg,	1483	XNBackground, bg,
1587	XNArea, &status_rect,	1484	XNArea, &status_rect,
1588	XNFontSet, fs,	1485	XNFontSet, fs,
1589	NULL);	1486	NULL);
1590	}	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
1591		1511
1592	Input_Context = XCreateIC (xim,	1512	Input_Context = XCreateIC (xim,
1593	XNInputStyle, input_style,	1513	XNInputStyle, input_style,
1594	XNClientWindow, vt,	1514	XNClientWindow, vt,
1595	XNFocusWindow, parent[0],	1515	XNFocusWindow, parent[0],
…		…
1598	status_attr ? XNStatusAttributes : NULL,	1518	status_attr ? XNStatusAttributes : NULL,
1599	status_attr, NULL);	1519	status_attr, NULL);
1600		1520
1601	if (preedit_attr) XFree (preedit_attr);	1521	if (preedit_attr) XFree (preedit_attr);
1602	if (status_attr) XFree (status_attr);	1522	if (status_attr) XFree (status_attr);
1603	if (fs) XFreeFontSet (display->display, fs);	1523	if (fs) XFreeFontSet (xdisp, fs);
1604		1524
1605	if (Input_Context == NULL)	1525	if (Input_Context == NULL)
1606	{	1526	{
1607	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1527	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1608	im_destroy ();	1528	im_destroy ();
1609	return false;	1529	return false;
1610	}	1530	}
1611		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
1612	if (input_style & XIMPreeditArea)	1538	if (input_style & XIMPreeditArea)
1613	IMSetStatusPosition ();	1539	IMSetStatusPosition ();
1614		1540
1615	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1616	return true;	1541	return true;
1617	}	1542	}
1618		1543
1619	void	1544	void
1620	rxvt_term::im_cb ()	1545	rxvt_term::im_cb ()
…		…
1622	int i;	1547	int i;
1623	const char *p;	1548	const char *p;
1624	char **s;	1549	char **s;
1625	char buf[IMBUFSIZ];	1550	char buf[IMBUFSIZ];
1626		1551
1627	SET_R (this);	1552	make_current ();
1628		1553
1629	im_destroy ();	1554	im_destroy ();
1630		1555
1631	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1632	if (Input_Context)	1556	if (Input_Context)
1633	return;	1557	return;
1634		1558
1635	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1559	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1636	if (rs[Rs_imLocale])	1560	if (rs[Rs_imLocale])
…		…
1709	XFree (preedit_attr);	1633	XFree (preedit_attr);
1710	XFree (status_attr);	1634	XFree (status_attr);
1711	}	1635	}
1712	#endif /* USE_XIM */	1636	#endif /* USE_XIM */
1713		1637
1714	/----------------------------------------------------------------------/
1715	rxvt_t rxvt_current_term;
1716
1717	/----------------------- 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.173 by root, Wed Jan 11 19:55:34 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.173 by root, Wed Jan 11 19:55:34 2006 UTC vs.
Revision 1.207 by root, Wed Jan 25 21:09:21 2006 UTC