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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.183 by root, Tue Jan 17 10:19:13 2006 UTC vs.
Revision 1.210 by root, Tue Jan 31 16:19:16 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	203	delete pty; pty = 0;
215	privileged_utmp (RESTORE);
216	#endif
217
218	pty.put ();
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		477
514	create_windows (argc, argv);	478	create_windows (argc, argv);
515		479
516	dDisp;
517
518	init_xlocale ();	480	init_xlocale ();
519		481
520	scr_reset (); // initialize screen	482	scr_reset (); // initialize screen
521		483
522	#if 0	484	#if 0
523	XSynchronize (disp, True);	485	XSynchronize (xdisp, True);
524	#endif	486	#endif
525		487
526	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
527	if (OPTION (Opt_scrollBar))	489	if (OPTION (Opt_scrollBar))
528	resize_scrollbar (); /* create and map scrollbar */	490	resize_scrollbar (); /* create and map scrollbar */
529	#endif	491	#endif
530	#ifdef TRANSPARENT	492	#ifdef TRANSPARENT
531	if (OPTION (Opt_transparent))	493	if (OPTION (Opt_transparent))
532	{	494	{
533	XSelectInput (disp, display->root, PropertyChangeMask);	495	XSelectInput (xdisp, display->root, PropertyChangeMask);
534	check_our_parents ();	496	check_our_parents ();
535	rootwin_ev.start (display, display->root);	497	rootwin_ev.start (display, display->root);
536	}	498	}
537	#endif	499	#endif
538		500
539	XMapWindow (disp, vt);
540	XMapWindow (disp, parent[0]);
541
542	set_colorfgbg ();	501	set_colorfgbg ();
543		502
544	init_command (cmd_argv);	503	init_command (cmd_argv);
545		504
546	free (cmd_argv);	505	free (cmd_argv);
547		506
548	if (pty.pty >= 0)	507	if (pty->pty >= 0)
549	pty_ev.start (pty.pty, EVENT_READ);	508	pty_ev.start (pty->pty, EVENT_READ);
550		509
551	check_ev.start ();	510	check_ev.start ();
552		511
553	HOOK_INVOKE ((this, HOOK_START, DT_END));	512	HOOK_INVOKE ((this, HOOK_START, DT_END));
554		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
555	return true;	527	return true;
556	}	528	}
557		529
558	static struct sig_handlers	530	static struct sig_handlers
559	{	531	{
560	sig_watcher sw_chld, sw_term, sw_int;	532	sig_watcher sw_term, sw_int;
561		533
562	void sig_chld (sig_watcher &w)
563	{
564	// we are being called for every SIGCHLD, find the corresponding term
565	int pid;
566
567	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569	if (pid == (*t)->cmd_pid)
570	{
571	(*t)->child_exit ();
572	break;
573	}
574	}
575
576	/*	534	/*
577	* Catch a fatal signal and tidy up before quitting	535	* Catch a fatal signal and tidy up before quitting
578	*/	536	*/
579	void	537	void
580	sig_term (sig_watcher &w)	538	sig_term (sig_watcher &w)
581	{	539	{
582	#ifdef DEBUG_CMD
583	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584	#endif
585	rxvt_emergency_cleanup ();	540	rxvt_emergency_cleanup ();
586	signal (w.signum, SIG_DFL);	541	signal (w.signum, SIG_DFL);
587	kill (getpid (), w.signum);	542	kill (getpid (), w.signum);
588	}	543	}
589		544
590	sig_handlers ()	545	sig_handlers ()
591	: sw_chld (this, &sig_handlers::sig_chld),
592	sw_term (this, &sig_handlers::sig_term),	546	: sw_term (this, &sig_handlers::sig_term),
593	sw_int (this, &sig_handlers::sig_term)	547	sw_int (this, &sig_handlers::sig_term)
594	{	548	{
595	}	549	}
596	} sig_handlers;	550	} sig_handlers;
597		551
598	char **rxvt_environ; // startup environment	552	char **rxvt_environ; // startup environment
599		553
600	void	554	void
601	rxvt_init ()	555	rxvt_init ()
602	{	556	{
		557	ptytty::init ();
		558
603	rxvt_environ = environ;	559	rxvt_environ = environ;
604
605	/*
606	* Save and then give up any super-user privileges
607	* If we need privileges in any area then we must specifically request it.
608	* We should only need to be root in these cases:
609	* 1. write utmp entries on some systems
610	* 2. chown tty on some systems
611	*/
612	rxvt_privileges (SAVE);
613	rxvt_privileges (IGNORE);
614		560
615	signal (SIGHUP, SIG_IGN);	561	signal (SIGHUP, SIG_IGN);
616	signal (SIGPIPE, SIG_IGN);	562	signal (SIGPIPE, SIG_IGN);
617		563
618	sig_handlers.sw_chld.start (SIGCHLD);
619	sig_handlers.sw_term.start (SIGTERM);	564	sig_handlers.sw_term.start (SIGTERM);
620	sig_handlers.sw_int.start (SIGINT);	565	sig_handlers.sw_int.start (SIGINT);
621		566
622	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	567	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
623	/* signal (SIGURG, SIG_DFL); */	568	/* signal (SIGURG, SIG_DFL); */
…		…
652	rxvt_fatal ("memory allocation failure. aborting.\n");	597	rxvt_fatal ("memory allocation failure. aborting.\n");
653		598
654	return p;	599	return p;
655	}	600	}
656		601
657	void *	602	void *
658	rxvt_realloc (void *ptr, size_t size)	603	rxvt_realloc (void *ptr, size_t size)
659	{	604	{
660	void *p = realloc (ptr, size);	605	void *p = realloc (ptr, size);
661		606
662	if (!p)	607	if (!p)
663	rxvt_fatal ("memory allocation failure. aborting.\n");	608	rxvt_fatal ("memory allocation failure. aborting.\n");
664		609
665	return p;	610	return p;
666	}	611	}
667
668	/* ------------------------------------------------------------------------- *
669	* PRIVILEGED OPERATIONS *
670	* ------------------------------------------------------------------------- */
671	/* take care of suid/sgid super-user (root) privileges */
672	void
673	rxvt_privileges (rxvt_privaction action)
674	{
675	#if ! defined(__CYGWIN32__)
676	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677	/* setreuid () is the poor man's setuid (), seteuid () */
678	# define seteuid(a) setreuid(-1, (a))
679	# define setegid(a) setregid(-1, (a))
680	# define HAVE_SETEUID
681	# endif
682	# ifdef HAVE_SETEUID
683	switch (action)
684	{
685	case IGNORE:
686	/*
687	* change effective uid/gid - not real uid/gid - so we can switch
688	* back to root later, as required
689	*/
690	setegid (getgid ());
691	seteuid (getuid ());
692	break;
693	case SAVE:
694	saved_egid = getegid ();
695	saved_euid = geteuid ();
696	break;
697	case RESTORE:
698	setegid (saved_egid);
699	seteuid (saved_euid);
700	break;
701	}
702	# else
703	switch (action)
704	{
705	case IGNORE:
706	setgid (getgid ());
707	setuid (getuid ());
708	/* FALLTHROUGH */
709	case SAVE:
710	/* FALLTHROUGH */
711	case RESTORE:
712	break;
713	}
714	# endif
715	#endif
716	}
717
718	#ifdef UTMP_SUPPORT
719	void
720	rxvt_term::privileged_utmp (rxvt_privaction action)
721	{
722	if (OPTION (Opt_utmpInhibit))
723	return;
724
725	rxvt_privileges (RESTORE);
726
727	if (action == SAVE)
728	pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
729	else
730	pty.logout ();
731
732	rxvt_privileges (IGNORE);
733	}
734	#endif
735		612
736	/----------------------------------------------------------------------/	613	/----------------------------------------------------------------------/
737	/*	614	/*
738	* window size/position calculcations for XSizeHint and other storage.	615	* window size/position calculcations for XSizeHint and other storage.
739	* if width/height are non-zero then override calculated width/height	616	* if width/height are non-zero then override calculated width/height
…		…
743	{	620	{
744	short recalc_x, recalc_y;	621	short recalc_x, recalc_y;
745	int x, y, sb_w, flags;	622	int x, y, sb_w, flags;
746	unsigned int w, h;	623	unsigned int w, h;
747	unsigned int max_width, max_height;	624	unsigned int max_width, max_height;
748	dDisp;
749
750	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
751	ncol, nrow, szHint.width, szHint.height));
752		625
753	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	626	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
754	szHint.win_gravity = NorthWestGravity;	627	szHint.win_gravity = NorthWestGravity;
755	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	628	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
756		629
…		…
853		726
854	if (scrollBar.state && OPTION (Opt_scrollBar_right))	727	if (scrollBar.state && OPTION (Opt_scrollBar_right))
855	window_sb_x = szHint.width - sb_w;	728	window_sb_x = szHint.width - sb_w;
856		729
857	if (recalc_x)	730	if (recalc_x)
858	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	731	szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
		732
859	if (recalc_y)	733	if (recalc_y)
860	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	734	szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
861		735
862	ncol = width / fwidth;	736	ncol = width / fwidth;
863	nrow = height / fheight;	737	nrow = height / fheight;
864	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
865	ncol, nrow, szHint.width,
866	szHint.height));
867	return;
868	}	738	}
869		739
870	/----------------------------------------------------------------------/	740	/----------------------------------------------------------------------/
871	/*	741	/*
872	* Tell the teletype handler what size the window is.	742	* Tell the teletype handler what size the window is.
873	* Called after a window size change.	743	* Called after a window size change.
874	*/	744	*/
875	void	745	void
876	rxvt_term::tt_winch ()	746	rxvt_term::tt_winch ()
877	{	747	{
878	if (pty.pty < 0)	748	if (pty->pty < 0)
879	return;	749	return;
880		750
881	struct winsize ws;	751	struct winsize ws;
882		752
883	ws.ws_col = ncol;	753	ws.ws_col = ncol;
884	ws.ws_row = nrow;	754	ws.ws_row = nrow;
885	ws.ws_xpixel = width;	755	ws.ws_xpixel = width;
886	ws.ws_ypixel = height;	756	ws.ws_ypixel = height;
887	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	757	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
888		758
889	#if 0	759	#if 0
890	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	760	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
891	if (cmd_pid) /* force through to the command */	761	if (cmd_pid) /* force through to the command */
892	kill (-cmd_pid, SIGWINCH);	762	kill (-cmd_pid, SIGWINCH);
…		…
972	return true;	842	return true;
973	}	843	}
974		844
975	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)
976	{	846	{
977	XChangeProperty (display->display, parent[0],	847	XChangeProperty (xdisp, parent[0],
978	prop, XA_STRING, 8, PropModeReplace,	848	prop, XA_STRING, 8, PropModeReplace,
979	(const unsigned char *)str, len >= 0 ? len : strlen (str));	849	(const unsigned char *)str, len >= 0 ? len : strlen (str));
980	}	850	}
981		851
982	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)
983	{	853	{
984	wchar_t *ws = rxvt_mbstowcs (str, len);	854	wchar_t *ws = rxvt_mbstowcs (str, len);
985	char *s = rxvt_wcstoutf8 (ws);	855	char *s = rxvt_wcstoutf8 (ws);
986		856
987	XChangeProperty (display->display, parent[0],	857	XChangeProperty (xdisp, parent[0],
988	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	858	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
989	(const unsigned char *)s, strlen (s));	859	(const unsigned char *)s, strlen (s));
990		860
991	free (s);	861	free (s);
992	free (ws);	862	free (ws);
…		…
1042	SET_PIXCOLOR (idx);	912	SET_PIXCOLOR (idx);
1043	goto done;	913	goto done;
1044	}	914	}
1045	}	915	}
1046		916
1047	if (!rXParseAllocColor (&xcol, color))	917	if (!set_color (xcol, color))
1048	return;	918	return;
1049		919
1050	/* XStoreColor (display->display, display->cmap, XColor); /	920	/* XStoreColor (xdisp, display->cmap, XColor); /
1051		921
1052	/*	922	/*
1053	* 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,
1054	* so just keep gobbling up the colormap	924	* so just keep gobbling up the colormap
1055	*/	925	*/
…		…
1058	if (pix_colors[idx] == pix_colors[i])	928	if (pix_colors[idx] == pix_colors[i])
1059	break;	929	break;
1060	if (i > Color_White)	930	if (i > Color_White)
1061	{	931	{
1062	/* 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]); */
1063	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,	933	XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1064	DisplayPlanes (display->display, display->screen));	934	DisplayPlanes (xdisp, display->screen));
1065	}	935	}
1066	# endif	936	# endif
1067		937
1068	pix_colors_focused[idx] = xcol;	938	pix_colors_focused[idx] = xcol;
1069	SET_PIXCOLOR (idx);	939	SET_PIXCOLOR (idx);
…		…
1072	/* Cursor cursor; */	942	/* Cursor cursor; */
1073	done:	943	done:
1074		944
1075	#if OFF_FOCUS_FADING	945	#if OFF_FOCUS_FADING
1076	if (rs[Rs_fade])	946	if (rs[Rs_fade])
		947	{
		948	rxvt_rgba c;
		949	pix_colors [Color_fade].get (this, c);
1077	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	950	pix_colors_unfocused [idx] = pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), c);
		951	}
1078	#endif	952	#endif
1079		953
1080	/TODO: handle Color_BD, scrollbar background, etc. /	954	/TODO: handle Color_BD, scrollbar background, etc. /
1081		955
1082	recolour_cursor ();	956	recolour_cursor ();
…		…
1097	: pix_colors_focused[Color_fg];	971	: pix_colors_focused[Color_fg];
1098	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	972	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1099	? pix_colors_focused[Color_pointer_bg]	973	? pix_colors_focused[Color_pointer_bg]
1100	: pix_colors_focused[Color_bg];	974	: pix_colors_focused[Color_bg];
1101		975
1102	XQueryColors (display->display, display->cmap, xcol, 2);	976	XQueryColors (xdisp, cmap, xcol, 2);
1103	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	977	XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1104	}	978	}
1105		979
1106	/----------------------------------------------------------------------/	980	/----------------------------------------------------------------------/
1107	/*	981	/*
1108	* find if fg/bg matches any of the normal (low-intensity) colors	982	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1112	{	986	{
1113	unsigned int i;	987	unsigned int i;
1114	const char *xpmb = "\0";	988	const char *xpmb = "\0";
1115	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	989	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1116		990
1117	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1118	strcpy (fstr, "default");	991	strcpy (fstr, "default");
1119	strcpy (bstr, "default");	992	strcpy (bstr, "default");
1120	for (i = Color_Black; i <= Color_White; i++)	993	for (i = Color_Black; i <= Color_White; i++)
1121	if (pix_colors[Color_fg] == pix_colors[i])	994	if (pix_colors[Color_fg] == pix_colors[i])
1122	{	995	{
…		…
1137	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1010	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1138	}	1011	}
1139		1012
1140	/----------------------------------------------------------------------/	1013	/----------------------------------------------------------------------/
1141		1014
1142	int	1015	bool
1143	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1016	rxvt_term::set_color (rxvt_color &color, const char *name)
1144	{	1017	{
1145	if (!screen_in_out->set (display, colour))	1018	if (color.set (this, name))
1146	{
1147	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1148	return false;
1149	}
1150
1151	return true;	1019	return true;
		1020
		1021	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1022	return false;
1152	}	1023	}
1153		1024
1154	/* -------------------------------------------------------------------- *	1025	/* -------------------------------------------------------------------- *
1155	* - WINDOW RESIZING - *	1026	* - WINDOW RESIZING - *
1156	* -------------------------------------------------------------------- */	1027	* -------------------------------------------------------------------- */
1157	void	1028	void
1158	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1029	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1159	{	1030	{
1160	int fix_screen;	1031	int fix_screen;
1161	int old_width = szHint.width, old_height = szHint.height;	1032	int old_width = szHint.width;
1162	dDisp;	1033	int old_height = szHint.height;
1163		1034
1164	window_calc (newwidth, newheight);	1035	window_calc (newwidth, newheight);
1165	XSetWMNormalHints (disp, parent[0], &szHint);	1036	XSetWMNormalHints (xdisp, parent[0], &szHint);
1166		1037
1167	if (!ignoreparent)	1038	if (!ignoreparent)
1168	{	1039	{
1169	#ifdef SMART_RESIZE	1040	#ifdef SMART_RESIZE
1170	/*	1041	/*
…		…
1174	int x, y, x1, y1;	1045	int x, y, x1, y1;
1175	int dx, dy;	1046	int dx, dy;
1176	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1047	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1177	Window unused_cr;	1048	Window unused_cr;
1178		1049
1179	XTranslateCoordinates (disp, parent[0], display->root,	1050	XTranslateCoordinates (xdisp, parent[0], display->root,
1180	0, 0, &x, &y, &unused_cr);	1051	0, 0, &x, &y, &unused_cr);
1181	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1052	XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1182	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1053	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1183	/*	1054	/*
1184	* if display->root isn't the parent window, a WM will probably have offset	1055	* if display->root isn't the parent window, a WM will probably have offset
1185	* our position for handles and decorations. Counter it	1056	* our position for handles and decorations. Counter it
1186	*/	1057	*/
…		…
1188	{	1059	{
1189	x -= x1;	1060	x -= x1;
1190	y -= y1;	1061	y -= y1;
1191	}	1062	}
1192		1063
1193	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1064	x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1194	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1065	y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1195	dx = old_width - szHint.width;	1066	dx = old_width - szHint.width;
1196	dy = old_height - szHint.height;	1067	dy = old_height - szHint.height;
1197		1068
1198	/* Check position of the center of the window */	1069	/* Check position of the center of the window */
1199	if (x < x1) /* left half */	1070	if (x < x1) /* left half */
1200	dx = 0;	1071	dx = 0;
…		…
1203	if (y < y1) /* top half */	1074	if (y < y1) /* top half */
1204	dy = 0;	1075	dy = 0;
1205	else if (y == y1) /* exact center */	1076	else if (y == y1) /* exact center */
1206	dy /= 2;	1077	dy /= 2;
1207		1078
1208	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1079	XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1209	szHint.width, szHint.height);	1080	szHint.width, szHint.height);
1210	#else	1081	#else
1211	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1082	XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1212	#endif	1083	#endif
1213	}	1084	}
1214		1085
1215	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1086	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1216		1087
1217	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1088	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1218	{	1089	{
1219	if (scrollBar.state)	1090	if (scrollBar.state)
1220	{	1091	{
1221	XMoveResizeWindow (disp, scrollBar.win,	1092	XMoveResizeWindow (xdisp, scrollBar.win,
1222	window_sb_x, 0,	1093	window_sb_x, 0,
1223	scrollbar_TotalWidth (), szHint.height);	1094	scrollbar_TotalWidth (), szHint.height);
1224	resize_scrollbar ();	1095	resize_scrollbar ();
1225	}	1096	}
1226		1097
1227	XMoveResizeWindow (disp, vt,	1098	XMoveResizeWindow (xdisp, vt,
1228	window_vt_x, window_vt_y,	1099	window_vt_x, window_vt_y,
1229	width, height);	1100	width, height);
1230		1101
1231	scr_clear ();	1102	scr_clear ();
1232	#ifdef XPM_BACKGROUND	1103	#ifdef XPM_BACKGROUND
1233	resize_pixmap ();	1104	resize_pixmap ();
1234	#endif	1105	#endif
1235	}	1106	}
1236		1107
1237	if (fix_screen \|\| old_height == 0)	1108	if (fix_screen \|\| old_height == 0)
1238	{
1239	int curr_screen = -1;
1240	int old_ncol = prev_ncol;
1241
1242	/* scr_reset only works on the primary screen */
1243	if (old_height) /* this is not the first time through */
1244	{
1245	unsigned int ocol = ncol;
1246	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1247	curr_screen = scr_change_screen (PRIMARY);
1248	ncol = ocol;
1249	}
1250
1251	scr_reset ();	1109	scr_reset ();
1252
1253	if (curr_screen >= 0) /* this is not the first time through */
1254	{
1255	scr_change_screen (curr_screen);
1256	selection_check (old_ncol != ncol ? 4 : 0);
1257	}
1258	}
1259
1260	old_width = szHint.width;
1261	old_height = szHint.height;
1262		1110
1263	#ifdef XPM_BACKGROUND	1111	#ifdef XPM_BACKGROUND
1264	if (pixmap)	1112	if (pixmap)
1265	scr_touch (false);	1113	scr_touch (false);
1266	#endif	1114	#endif
…		…
1279	{	1127	{
1280	XWindowAttributes wattr;	1128	XWindowAttributes wattr;
1281		1129
1282	if (newwidth == 0 \|\| newheight == 0)	1130	if (newwidth == 0 \|\| newheight == 0)
1283	{	1131	{
1284	XGetWindowAttributes (display->display, display->root, &wattr);	1132	XGetWindowAttributes (xdisp, display->root, &wattr);
1285		1133
1286	if (newwidth == 0)	1134	if (newwidth == 0)
1287	newwidth = wattr.width - szHint.base_width;	1135	newwidth = wattr.width - szHint.base_width;
1288	if (newheight == 0)	1136	if (newheight == 0)
1289	newheight = wattr.height - szHint.base_height;	1137	newheight = wattr.height - szHint.base_height;
…		…
1351	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1199	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1352		1200
1353	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1201	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1354	*p = '\0';	1202	*p = '\0';
1355		1203
1356	atom = XInternAtom (display->display, server, False);	1204	atom = XInternAtom (xdisp, server, False);
1357	win = XGetSelectionOwner (display->display, atom);	1205	win = XGetSelectionOwner (xdisp, atom);
1358		1206
1359	if (win != None)	1207	if (win != None)
1360	return True;	1208	return True;
1361	}	1209	}
1362		1210
…		…
1369	XPoint nspot;	1217	XPoint nspot;
1370	XVaNestedList preedit_attr;	1218	XVaNestedList preedit_attr;
1371		1219
1372	if (!Input_Context	1220	if (!Input_Context
1373	\|\| !focus	1221	\|\| !focus
1374	\|\| !(input_style & XIMPreeditPosition))	1222	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1375	return;	1223	return;
1376		1224
1377	im_set_position (nspot);	1225	im_set_position (nspot);
1378		1226
1379	if (nspot.x == spot.x && nspot.y == spot.y)	1227	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1398	input_method = 0;	1246	input_method = 0;
1399	}	1247	}
1400		1248
1401	Input_Context = 0;	1249	Input_Context = 0;
1402	}	1250	}
		1251
		1252	#ifdef ENABLE_XIM_ONTHESPOT
		1253
		1254	static void
		1255	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1256	{
		1257	((rxvt_term *)client_data)->make_current ();
		1258	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1259	}
		1260
		1261	static void
		1262	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1263	{
		1264	((rxvt_term *)client_data)->make_current ();
		1265	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1266	}
		1267
		1268	static void
		1269	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1270	{
		1271	rxvt_term term = (rxvt_term )client_data;
		1272	XIMText *text = call_data->text;
		1273
		1274	term->make_current ();
		1275
		1276	if (text)
		1277	{
		1278	void *str;
		1279
		1280	if (!text->encoding_is_wchar && text->string.multi_byte)
		1281	{
		1282	// of course, X makes it ugly again
		1283	if (term->rs[Rs_imLocale])
		1284	SET_LOCALE (term->rs[Rs_imLocale]);
		1285
		1286	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1287	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1288
		1289	if (term->rs[Rs_imLocale])
		1290	SET_LOCALE (term->locale);
		1291	}
		1292	else
		1293	str = (void *)text->string.wide_char;
		1294
		1295	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1296	DT_INT, call_data->caret,
		1297	DT_INT, call_data->chg_first,
		1298	DT_INT, call_data->chg_length,
		1299	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1300	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1301	DT_END));
		1302	}
		1303	else
		1304	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1305	DT_INT, call_data->caret,
		1306	DT_INT, call_data->chg_first,
		1307	DT_INT, call_data->chg_length,
		1308	DT_END));
		1309	}
		1310
		1311	#if 0
		1312	static void
		1313	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1314	{
		1315	((rxvt_term *)client_data)->make_current ();
		1316	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1317	DT_INT, call_data->position,
		1318	DT_INT, call_data->direction,
		1319	DT_INT, call_data->style,
		1320	DT_END));
		1321	}
		1322	#endif
		1323
		1324	#endif
1403		1325
1404	/*	1326	/*
1405	* Try to open a XIM with the current modifiers, then see if we can	1327	* Try to open a XIM with the current modifiers, then see if we can
1406	* open a suitable preedit type	1328	* open a suitable preedit type
1407	*/	1329	*/
…		…
1414	XRectangle rect, status_rect, needed_rect;	1336	XRectangle rect, status_rect, needed_rect;
1415	unsigned long fg, bg;	1337	unsigned long fg, bg;
1416	const char *p;	1338	const char *p;
1417	char **s;	1339	char **s;
1418	XIMStyles *xim_styles;	1340	XIMStyles *xim_styles;
		1341	#ifdef ENABLE_XIM_ONTHESPOT
		1342	XIMCallback xcb[4];
		1343	#endif
1419		1344
1420	set_environ (envv);	1345	set_environ (envv);
1421		1346
1422	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1347	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423	return false;	1348	return false;
1424		1349
1425	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426	input_method = display->get_xim (locale, modifiers);	1350	input_method = display->get_xim (locale, modifiers);
1427	if (input_method == NULL)	1351	if (input_method == NULL)
1428	return false;	1352	return false;
1429		1353
1430	xim = input_method->xim;	1354	xim = input_method->xim;
…		…
1450	s = rxvt_splitcommastring (p);	1374	s = rxvt_splitcommastring (p);
1451		1375
1452	for (i = found = 0; !found && s[i]; i++)	1376	for (i = found = 0; !found && s[i]; i++)
1453	{	1377	{
1454	if (!strcmp (s[i], "OverTheSpot"))	1378	if (!strcmp (s[i], "OverTheSpot"))
1455	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1379	input_style = XIMPreeditPosition \| XIMStatusNothing;
1456	else if (!strcmp (s[i], "OffTheSpot"))	1380	else if (!strcmp (s[i], "OffTheSpot"))
1457	input_style = (XIMPreeditArea \| XIMStatusArea);	1381	input_style = XIMPreeditArea \| XIMStatusArea;
1458	else if (!strcmp (s[i], "Root"))	1382	else if (!strcmp (s[i], "Root"))
1459	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1383	input_style = XIMPreeditNothing \| XIMStatusNothing;
1460	else if (!strcmp (s[i], "None"))	1384	else if (!strcmp (s[i], "None"))
1461	input_style = (XIMPreeditNone \| XIMStatusNone);	1385	input_style = XIMPreeditNone \| XIMStatusNone;
		1386	#ifdef ENABLE_XIM_ONTHESPOT
		1387	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1388	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1389	#endif
		1390	else
		1391	input_style = XIMPreeditNothing \| XIMStatusNothing;
1462		1392
1463	for (j = 0; j < xim_styles->count_styles; j++)	1393	for (j = 0; j < xim_styles->count_styles; j++)
1464	if (input_style == xim_styles->supported_styles[j])	1394	if (input_style == xim_styles->supported_styles[j])
1465	{	1395	{
1466	rxvt_freecommastring (s);	1396	rxvt_freecommastring (s);
…		…
1504	"*",	1434	"*",
1505	fheight,	1435	fheight,
1506	fheight + 1, fheight - 1,	1436	fheight + 1, fheight - 1,
1507	fheight - 2, fheight + 2);	1437	fheight - 2, fheight + 2);
1508		1438
1509	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1439	fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1510	&missing_charset_list, &missing_charset_count, &def_string);	1440	&missing_charset_list, &missing_charset_count, &def_string);
1511		1441
1512	if (missing_charset_list)	1442	if (missing_charset_list)
1513	XFreeStringList (missing_charset_list);	1443	XFreeStringList (missing_charset_list);
1514		1444
…		…
1555	XNBackground, bg,	1485	XNBackground, bg,
1556	XNArea, &status_rect,	1486	XNArea, &status_rect,
1557	XNFontSet, fs,	1487	XNFontSet, fs,
1558	NULL);	1488	NULL);
1559	}	1489	}
		1490	#if ENABLE_XIM_ONTHESPOT
		1491	else if (input_style & XIMPreeditCallbacks)
		1492	{
		1493	im_set_position (spot);
		1494
		1495	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1496	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1497	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1498	# if 0
		1499	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1500	# endif
		1501
		1502	preedit_attr = XVaCreateNestedList (0,
		1503	XNSpotLocation, &spot,
		1504	XNPreeditStartCallback, &xcb[0],
		1505	XNPreeditDoneCallback , &xcb[1],
		1506	XNPreeditDrawCallback , &xcb[2],
		1507	# if 0
		1508	XNPreeditCaretCallback, &xcb[3],
		1509	# endif
		1510	NULL);
		1511	}
		1512	#endif
1560		1513
1561	Input_Context = XCreateIC (xim,	1514	Input_Context = XCreateIC (xim,
1562	XNInputStyle, input_style,	1515	XNInputStyle, input_style,
1563	XNClientWindow, vt,	1516	XNClientWindow, vt,
1564	XNFocusWindow, parent[0],	1517	XNFocusWindow, parent[0],
…		…
1567	status_attr ? XNStatusAttributes : NULL,	1520	status_attr ? XNStatusAttributes : NULL,
1568	status_attr, NULL);	1521	status_attr, NULL);
1569		1522
1570	if (preedit_attr) XFree (preedit_attr);	1523	if (preedit_attr) XFree (preedit_attr);
1571	if (status_attr) XFree (status_attr);	1524	if (status_attr) XFree (status_attr);
1572	if (fs) XFreeFontSet (display->display, fs);	1525	if (fs) XFreeFontSet (xdisp, fs);
1573		1526
1574	if (Input_Context == NULL)	1527	if (Input_Context == NULL)
1575	{	1528	{
1576	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1529	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1577	im_destroy ();	1530	im_destroy ();
1578	return false;	1531	return false;
1579	}	1532	}
1580		1533
		1534	#if 0
		1535	// unfortunately, only the focus window is used by XIM, hard to fix
		1536	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1537	vt_select_input ();
		1538	#endif
		1539
1581	if (input_style & XIMPreeditArea)	1540	if (input_style & XIMPreeditArea)
1582	IMSetStatusPosition ();	1541	IMSetStatusPosition ();
1583		1542
1584	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1585	return true;	1543	return true;
1586	}	1544	}
1587		1545
1588	void	1546	void
1589	rxvt_term::im_cb ()	1547	rxvt_term::im_cb ()
…		…
1595		1553
1596	make_current ();	1554	make_current ();
1597		1555
1598	im_destroy ();	1556	im_destroy ();
1599		1557
1600	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601	if (Input_Context)	1558	if (Input_Context)
1602	return;	1559	return;
1603		1560
1604	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1561	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1605	if (rs[Rs_imLocale])	1562	if (rs[Rs_imLocale])
…		…
1678	XFree (preedit_attr);	1635	XFree (preedit_attr);
1679	XFree (status_attr);	1636	XFree (status_attr);
1680	}	1637	}
1681	#endif /* USE_XIM */	1638	#endif /* USE_XIM */
1682		1639
1683	/----------------------------------------------------------------------/
1684	rxvt_t rxvt_current_term;
1685
1686	/----------------------- end-of-file (C source) -----------------------/	1640	/----------------------- 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.183 by root, Tue Jan 17 10:19:13 2006 UTC vs. Revision 1.210 by root, Tue Jan 31 16:19:16 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.183 by root, Tue Jan 17 10:19:13 2006 UTC vs.
Revision 1.210 by root, Tue Jan 31 16:19:16 2006 UTC