[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.219 by root, Sat Feb 11 02:28:19 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 (dpy, xscrollbarGC);
247	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (dpy, ShadowGC);
248	#endif	229	#endif
249	#ifdef PLAIN_SCROLLBAR	230	#ifdef PLAIN_SCROLLBAR
250	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	231	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251	#endif	232	#endif
252	#ifdef NEXT_SCROLLBAR	233	#ifdef NEXT_SCROLLBAR
253	if (blackGC) XFreeGC (disp, blackGC);	234	if (blackGC) XFreeGC (dpy, blackGC);
254	if (whiteGC) XFreeGC (disp, whiteGC);	235	if (whiteGC) XFreeGC (dpy, whiteGC);
255	if (grayGC) XFreeGC (disp, grayGC);	236	if (grayGC) XFreeGC (dpy, grayGC);
256	if (darkGC) XFreeGC (disp, darkGC);	237	if (darkGC) XFreeGC (dpy, darkGC);
257	if (stippleGC) XFreeGC (disp, stippleGC);	238	if (stippleGC) XFreeGC (dpy, stippleGC);
258	if (dimple) XFreePixmap (disp, dimple);	239	if (dimple) XFreePixmap (dpy, dimple);
259	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (dpy, upArrow);
260	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (dpy, downArrow);
261	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263	#endif	244	#endif
264	#ifdef RXVT_SCROLLBAR	245	#ifdef RXVT_SCROLLBAR
265	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (dpy, topShadowGC);
266	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (dpy, botShadowGC);
267	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268	#endif	249	#endif
269	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (dpy, 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 (dpy, parent[0]);
275	}
276		256
277	// TODO: free pixcolours, colours should become part of rxvt_display	257	for (int i = 0; i < TOTAL_COLORS; i++)
		258	if (ISSET_PIXCOLOR (i))
		259	{
		260	pix_colors_focused [i].free (this);
		261	#if OFF_FOCUS_FADING
		262	pix_colors_unfocused [i].free (this);
		263	#endif
		264	}
		265
		266	clear ();
		267	}
		268
278	delete pix_colors_focused;	269	delete pix_colors_focused;
279	#if OFF_FOCUS_FADING	270	#if OFF_FOCUS_FADING
280	delete pix_colors_unfocused;	271	delete pix_colors_unfocused;
281	#endif	272	#endif
282		273
…		…
288	for (int i = 0; i < allocated.size (); i++)	279	for (int i = 0; i < allocated.size (); i++)
289	free (allocated [i]);	280	free (allocated [i]);
290		281
291	free (selection.text);	282	free (selection.text);
292	// TODO: manage env vars in child only(!)	283	// TODO: manage env vars in child only(!)
293	free (env_windowid);
294	free (env_display);	284	free (env_display);
295	free (env_term);	285	free (env_term);
296	free (env_colorfgbg);
297	free (locale);	286	free (locale);
298	free (v_buffer);	287	free (v_buffer);
299	free (incr_buf);	288	free (incr_buf);
300		289
301	delete envv;	290	delete envv;
…		…
304	#ifdef KEYSYM_RESOURCE	293	#ifdef KEYSYM_RESOURCE
305	delete keyboard;	294	delete keyboard;
306	#endif	295	#endif
307	}	296	}
308		297
		298	// child has exited, usually destroys
309	void	299	void
310	rxvt_term::child_exit ()	300	rxvt_term::child_cb (child_watcher &w, int status)
311	{	301	{
		302	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		303
312	cmd_pid = 0;	304	cmd_pid = 0;
313		305
314	if (!OPTION (Opt_hold))	306	if (!OPTION (Opt_hold))
315	destroy ();	307	destroy ();
316	}	308	}
…		…
318	void	310	void
319	rxvt_term::destroy ()	311	rxvt_term::destroy ()
320	{	312	{
321	if (destroy_ev.active)	313	if (destroy_ev.active)
322	return;	314	return;
		315
		316	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		317
324	#if ENABLE_OVERLAY	318	#if ENABLE_OVERLAY
325	scr_overlay_off ();	319	scr_overlay_off ();
326	#endif	320	#endif
327		321
…		…
382	{	376	{
383	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	377	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384	(*t)->emergency_cleanup ();	378	(*t)->emergency_cleanup ();
385	}	379	}
386		380
387	#if ENABLE_FRILLS	381	#if !ENABLE_MINIMAL
388	static void	382	static void
389	print_x_error (Display dpy, XErrorEvent event)	383	print_x_error (Display dpy, XErrorEvent event)
390	{	384	{
391	char buffer[BUFSIZ];	385	char buffer[BUFSIZ];
392	char mesg[BUFSIZ];	386	char mesg[BUFSIZ];
…		…
440	GET_R->allowedxerror = event->error_code;	434	GET_R->allowedxerror = event->error_code;
441	else	435	else
442	{	436	{
443	// GET_R is most likely not the terminal which caused the error,	437	// GET_R is most likely not the terminal which caused the error,
444	// so just output the error and continue	438	// so just output the error and continue
445	#if ENABLE_FRILLS	439	#if ENABLE_MINIMAL
		440	old_xerror_handler (display, event);
		441	#else
446	print_x_error (display, event);	442	print_x_error (display, event);
447	#else
448	old_xerror_handler (display, event);
449	#endif	443	#endif
450	}	444	}
451		445
452	return 0;	446	return 0;
453	}	447	}
…		…
461	_exit (EXIT_FAILURE);	455	_exit (EXIT_FAILURE);
462	}	456	}
463		457
464	/----------------------------------------------------------------------/	458	/----------------------------------------------------------------------/
465	bool	459	bool
466	rxvt_term::init (int argc, const char const argv)	460	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	461	{
		462	this->envv = envv;
		463
468	SET_R (this);	464	SET_R (this);
469	set_locale ("");	465	set_locale ("");
470	set_environ (envv); // few things in X do not call setlocale :(	466	set_environ (envv); // few things in X do not call setlocale :(
471		467
472	if (!init_vars ())	468	if (!init_vars ())
…		…
483	#ifdef HAVE_SCROLLBARS	479	#ifdef HAVE_SCROLLBARS
484	if (OPTION (Opt_scrollBar))	480	if (OPTION (Opt_scrollBar))
485	scrollBar.setIdle (); /* set existence for size calculations */	481	scrollBar.setIdle (); /* set existence for size calculations */
486	#endif	482	#endif
487		483
488	#if ENABLE_PERL	484	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		485
514	create_windows (argc, argv);	486	create_windows (argc, argv);
515		487
516	dDisp;
517
518	init_xlocale ();	488	init_xlocale ();
519		489
520	scr_reset (); // initialize screen	490	scr_reset (); // initialize screen
521		491
522	#if 0	492	#if 0
523	XSynchronize (disp, True);	493	XSynchronize (dpy, True);
524	#endif	494	#endif
525		495
526	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
527	if (OPTION (Opt_scrollBar))	497	if (OPTION (Opt_scrollBar))
528	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
529	#endif	499	#endif
530	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
531	if (OPTION (Opt_transparent))	501	if (OPTION (Opt_transparent))
532	{	502	{
533	XSelectInput (disp, display->root, PropertyChangeMask);	503	XSelectInput (dpy, display->root, PropertyChangeMask);
534	check_our_parents ();	504	check_our_parents ();
535	rootwin_ev.start (display, display->root);	505	rootwin_ev.start (display, display->root);
536	}	506	}
537	#endif	507	#endif
538		508
539	XMapWindow (disp, vt);
540	XMapWindow (disp, parent[0]);
541
542	set_colorfgbg ();	509	set_colorfgbg ();
543		510
544	init_command (cmd_argv);	511	init_command (cmd_argv);
545		512
546	free (cmd_argv);	513	free (cmd_argv);
547		514
548	if (pty.pty >= 0)	515	if (pty->pty >= 0)
549	pty_ev.start (pty.pty, EVENT_READ);	516	pty_ev.start (pty->pty, EVENT_READ);
550		517
551	check_ev.start ();	518	check_ev.start ();
552		519
553	HOOK_INVOKE ((this, HOOK_START, DT_END));	520	HOOK_INVOKE ((this, HOOK_START, DT_END));
554		521
		522	#if ENABLE_XEMBED
		523	if (rs[Rs_embed])
		524	{
		525	long info[2] = { 0, XEMBED_MAPPED };
		526
		527	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		528	32, PropModeReplace, (unsigned char *)&info, 2);
		529	}
		530	#endif
		531
		532	XMapWindow (dpy, vt);
		533	XMapWindow (dpy, parent[0]);
		534
555	return true;	535	return true;
556	}	536	}
557		537
558	static struct sig_handlers	538	static struct sig_handlers
559	{	539	{
560	sig_watcher sw_chld, sw_term, sw_int;	540	sig_watcher sw_term, sw_int;
561		541
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	/*	542	/*
577	* Catch a fatal signal and tidy up before quitting	543	* Catch a fatal signal and tidy up before quitting
578	*/	544	*/
579	void	545	void
580	sig_term (sig_watcher &w)	546	sig_term (sig_watcher &w)
581	{	547	{
582	#ifdef DEBUG_CMD
583	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584	#endif
585	rxvt_emergency_cleanup ();	548	rxvt_emergency_cleanup ();
586	signal (w.signum, SIG_DFL);	549	signal (w.signum, SIG_DFL);
587	kill (getpid (), w.signum);	550	kill (getpid (), w.signum);
588	}	551	}
589		552
590	sig_handlers ()	553	sig_handlers ()
591	: sw_chld (this, &sig_handlers::sig_chld),
592	sw_term (this, &sig_handlers::sig_term),	554	: sw_term (this, &sig_handlers::sig_term),
593	sw_int (this, &sig_handlers::sig_term)	555	sw_int (this, &sig_handlers::sig_term)
594	{	556	{
595	}	557	}
596	} sig_handlers;	558	} sig_handlers;
597		559
598	char **rxvt_environ; // startup environment	560	char **rxvt_environ; // startup environment
599		561
600	void	562	void
601	rxvt_init ()	563	rxvt_init ()
602	{	564	{
		565	ptytty::init ();
		566
603	rxvt_environ = environ;	567	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		568
615	signal (SIGHUP, SIG_IGN);	569	signal (SIGHUP, SIG_IGN);
616	signal (SIGPIPE, SIG_IGN);	570	signal (SIGPIPE, SIG_IGN);
617		571
618	sig_handlers.sw_chld.start (SIGCHLD);
619	sig_handlers.sw_term.start (SIGTERM);	572	sig_handlers.sw_term.start (SIGTERM);
620	sig_handlers.sw_int.start (SIGINT);	573	sig_handlers.sw_int.start (SIGINT);
621		574
622	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	575	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
623	/* signal (SIGURG, SIG_DFL); */	576	/* signal (SIGURG, SIG_DFL); */
…		…
652	rxvt_fatal ("memory allocation failure. aborting.\n");	605	rxvt_fatal ("memory allocation failure. aborting.\n");
653		606
654	return p;	607	return p;
655	}	608	}
656		609
657	void *	610	void *
658	rxvt_realloc (void *ptr, size_t size)	611	rxvt_realloc (void *ptr, size_t size)
659	{	612	{
660	void *p = realloc (ptr, size);	613	void *p = realloc (ptr, size);
661		614
662	if (!p)	615	if (!p)
663	rxvt_fatal ("memory allocation failure. aborting.\n");	616	rxvt_fatal ("memory allocation failure. aborting.\n");
664		617
665	return p;	618	return p;
666	}	619	}
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		620
736	/----------------------------------------------------------------------/	621	/----------------------------------------------------------------------/
737	/*	622	/*
738	* window size/position calculcations for XSizeHint and other storage.	623	* window size/position calculcations for XSizeHint and other storage.
739	* if width/height are non-zero then override calculated width/height	624	* if width/height are non-zero then override calculated width/height
…		…
743	{	628	{
744	short recalc_x, recalc_y;	629	short recalc_x, recalc_y;
745	int x, y, sb_w, flags;	630	int x, y, sb_w, flags;
746	unsigned int w, h;	631	unsigned int w, h;
747	unsigned int max_width, max_height;	632	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		633
753	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	634	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
754	szHint.win_gravity = NorthWestGravity;	635	szHint.win_gravity = NorthWestGravity;
755	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	636	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
756		637
…		…
818		699
819	if (scrollBar.state)	700	if (scrollBar.state)
820	{	701	{
821	sb_w = scrollbar_TotalWidth ();	702	sb_w = scrollbar_TotalWidth ();
822	szHint.base_width += sb_w;	703	szHint.base_width += sb_w;
		704
823	if (!OPTION (Opt_scrollBar_right))	705	if (!OPTION (Opt_scrollBar_right))
824	window_vt_x += sb_w;	706	window_vt_x += sb_w;
825	}	707	}
826		708
827	szHint.width_inc = fwidth;	709	szHint.width_inc = fwidth;
828	szHint.height_inc = fheight;	710	szHint.height_inc = fheight;
829	szHint.min_width = szHint.base_width + szHint.width_inc;	711	szHint.min_width = szHint.base_width + szHint.width_inc;
830	szHint.min_height = szHint.base_height + szHint.height_inc;	712	szHint.min_height = szHint.base_height + szHint.height_inc;
831		713
832	if (newwidth && newwidth - szHint.base_width < max_width)	714	if (newwidth && newwidth - szHint.base_width < max_width)
833	{	715	{
834	szHint.width = newwidth;	716	szHint.width = newwidth;
…		…
853		735
854	if (scrollBar.state && OPTION (Opt_scrollBar_right))	736	if (scrollBar.state && OPTION (Opt_scrollBar_right))
855	window_sb_x = szHint.width - sb_w;	737	window_sb_x = szHint.width - sb_w;
856		738
857	if (recalc_x)	739	if (recalc_x)
858	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	740	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
		741
859	if (recalc_y)	742	if (recalc_y)
860	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	743	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
861		744
862	ncol = width / fwidth;	745	ncol = width / fwidth;
863	nrow = height / fheight;	746	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	}	747	}
869		748
870	/----------------------------------------------------------------------/	749	/----------------------------------------------------------------------/
871	/*	750	/*
872	* Tell the teletype handler what size the window is.	751	* Tell the teletype handler what size the window is.
873	* Called after a window size change.	752	* Called after a window size change.
874	*/	753	*/
875	void	754	void
876	rxvt_term::tt_winch ()	755	rxvt_term::tt_winch ()
877	{	756	{
878	if (pty.pty < 0)	757	if (pty->pty < 0)
879	return;	758	return;
880		759
881	struct winsize ws;	760	struct winsize ws;
882		761
883	ws.ws_col = ncol;	762	ws.ws_col = ncol;
884	ws.ws_row = nrow;	763	ws.ws_row = nrow;
885	ws.ws_xpixel = width;	764	ws.ws_xpixel = width;
886	ws.ws_ypixel = height;	765	ws.ws_ypixel = height;
887	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	766	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
888		767
889	#if 0	768	#if 0
890	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	769	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
891	if (cmd_pid) /* force through to the command */	770	if (cmd_pid) /* force through to the command */
892	kill (-cmd_pid, SIGWINCH);	771	kill (-cmd_pid, SIGWINCH);
…		…
972	return true;	851	return true;
973	}	852	}
974		853
975	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	854	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
976	{	855	{
977	XChangeProperty (display->display, parent[0],	856	XChangeProperty (dpy, parent[0],
978	prop, XA_STRING, 8, PropModeReplace,	857	prop, XA_STRING, 8, PropModeReplace,
979	(const unsigned char *)str, len >= 0 ? len : strlen (str));	858	(const unsigned char *)str, len >= 0 ? len : strlen (str));
980	}	859	}
981		860
982	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	861	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
983	{	862	{
984	wchar_t *ws = rxvt_mbstowcs (str, len);	863	wchar_t *ws = rxvt_mbstowcs (str, len);
985	char *s = rxvt_wcstoutf8 (ws);	864	char *s = rxvt_wcstoutf8 (ws);
986		865
987	XChangeProperty (display->display, parent[0],	866	XChangeProperty (dpy, parent[0],
988	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	867	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
989	(const unsigned char *)s, strlen (s));	868	(const unsigned char *)s, strlen (s));
990		869
991	free (s);	870	free (s);
992	free (ws);	871	free (ws);
…		…
1017	void	896	void
1018	rxvt_term::set_window_color (int idx, const char *color)	897	rxvt_term::set_window_color (int idx, const char *color)
1019	{	898	{
1020	rxvt_color xcol;	899	rxvt_color xcol;
1021	int i;	900	int i;
1022		901
1023	if (color == NULL \|\| *color == '\0')	902	if (color == NULL \|\| *color == '\0')
1024	return;	903	return;
		904
		905	color = strdup (color);
		906	allocated.push_back ((void *)color);
		907	rs[Rs_color + idx] = color;
1025		908
1026	/* handle color aliases */	909	/* handle color aliases */
1027	if (isdigit (*color))	910	if (isdigit (*color))
1028	{	911	{
1029	i = atoi (color);	912	i = atoi (color);
1030		913
1031	if (i >= 8 && i <= 15)	914	if (i >= 8 && i <= 15)
1032	{ /* bright colors */	915	{ /* bright colors */
1033	i -= 8;	916	i -= 8;
1034	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	917	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1035	SET_PIXCOLOR (idx);
1036	goto done;	918	goto done;
1037	}	919	}
1038		920
1039	if (i >= 0 && i <= 7)	921	if (i >= 0 && i <= 7)
1040	{ /* normal colors */	922	{ /* normal colors */
1041	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	923	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1042	SET_PIXCOLOR (idx);
1043	goto done;	924	goto done;
1044	}	925	}
1045	}	926	}
1046		927
1047	if (!rXParseAllocColor (&xcol, color))	928	set_color (xcol, color);
1048	return;
1049
1050	/* XStoreColor (display->display, display->cmap, XColor); /
1051		929
1052	/*	930	/*
1053	* FIXME: should free colors here, but no idea how to do it so instead,	931	* FIXME: should free colors here, but no idea how to do it so instead,
1054	* so just keep gobbling up the colormap	932	* so just keep gobbling up the colormap
1055	*/	933	*/
1056	# if 0
1057	for (i = Color_Black; i <= Color_White; i++)
1058	if (pix_colors[idx] == pix_colors[i])
1059	break;
1060	if (i > Color_White)
1061	{
1062	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1063	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1064	DisplayPlanes (display->display, display->screen));
1065	}
1066	# endif
1067		934
1068	pix_colors_focused[idx] = xcol;	935	pix_colors_focused[idx] = xcol;
1069	SET_PIXCOLOR (idx);
1070		936
1071	/* XSetWindowAttributes attr; */	937	/* XSetWindowAttributes attr; */
1072	/* Cursor cursor; */	938	/* Cursor cursor; */
1073	done:	939	done:
1074		940
1075	#if OFF_FOCUS_FADING	941	#if OFF_FOCUS_FADING
1076	if (rs[Rs_fade])	942	if (rs[Rs_fade])
1077	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	943	{
		944	rgba c;
		945	pix_colors [Color_fade].get (c);
		946	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		947	}
1078	#endif	948	#endif
1079		949
1080	/TODO: handle Color_BD, scrollbar background, etc. /	950	/TODO: handle Color_BD, scrollbar background, etc. /
1081		951
1082	recolour_cursor ();	952	recolour_cursor ();
…		…
1088	#endif /* XTERM_COLOR_CHANGE */	958	#endif /* XTERM_COLOR_CHANGE */
1089		959
1090	void	960	void
1091	rxvt_term::recolour_cursor ()	961	rxvt_term::recolour_cursor ()
1092	{	962	{
1093	XColor xcol[2];	963	XColor fg, bg;
1094		964
1095	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	965	(ISSET_PIXCOLOR (Color_pointer_fg)
1096	? pix_colors_focused[Color_pointer_fg]	966	? pix_colors_focused[Color_pointer_fg]
1097	: pix_colors_focused[Color_fg];	967	: pix_colors_focused[Color_fg]).get (fg);
		968
1098	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	969	(ISSET_PIXCOLOR (Color_pointer_bg)
1099	? pix_colors_focused[Color_pointer_bg]	970	? pix_colors_focused[Color_pointer_bg]
1100	: pix_colors_focused[Color_bg];	971	: pix_colors_focused[Color_bg]).get (bg);
1101		972
1102	XQueryColors (display->display, display->cmap, xcol, 2);	973	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1103	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1104	}	974	}
1105		975
1106	/----------------------------------------------------------------------/	976	/----------------------------------------------------------------------/
1107	/*	977	/*
1108	* 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
…		…
1112	{	982	{
1113	unsigned int i;	983	unsigned int i;
1114	const char *xpmb = "\0";	984	const char *xpmb = "\0";
1115	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1116		986
1117	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1118	strcpy (fstr, "default");	987	strcpy (fstr, "default");
1119	strcpy (bstr, "default");	988	strcpy (bstr, "default");
1120	for (i = Color_Black; i <= Color_White; i++)	989	for (i = Color_Black; i <= Color_White; i++)
1121	if (pix_colors[Color_fg] == pix_colors[i])	990	if (pix_colors[Color_fg] == pix_colors[i])
1122	{	991	{
…		…
1137	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1006	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1138	}	1007	}
1139		1008
1140	/----------------------------------------------------------------------/	1009	/----------------------------------------------------------------------/
1141		1010
1142	int	1011	bool
1143	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1012	rxvt_term::set_color (rxvt_color &color, const char *name)
1144	{	1013	{
1145	if (!screen_in_out->set (display, colour))	1014	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;	1015	return true;
		1016
		1017	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1018	return false;
		1019	}
		1020
		1021	void
		1022	rxvt_term::alias_color (int dst, int src)
		1023	{
		1024	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1152	}	1025	}
1153		1026
1154	/* -------------------------------------------------------------------- *	1027	/* -------------------------------------------------------------------- *
1155	* - WINDOW RESIZING - *	1028	* - WINDOW RESIZING - *
1156	* -------------------------------------------------------------------- */	1029	* -------------------------------------------------------------------- */
1157	void	1030	void
1158	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1031	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1159	{	1032	{
1160	int fix_screen;	1033	int fix_screen;
1161	int old_width = szHint.width, old_height = szHint.height;	1034	int old_width = szHint.width;
1162	dDisp;	1035	int old_height = szHint.height;
1163		1036
1164	window_calc (newwidth, newheight);	1037	window_calc (newwidth, newheight);
		1038
		1039	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1165	XSetWMNormalHints (disp, parent[0], &szHint);	1040	XSetWMNormalHints (dpy, parent[0], &szHint);
1166		1041
1167	if (!ignoreparent)	1042	if (!ignoreparent)
1168	{	1043	{
1169	#ifdef SMART_RESIZE	1044	#ifdef SMART_RESIZE
1170	/*	1045	/*
…		…
1174	int x, y, x1, y1;	1049	int x, y, x1, y1;
1175	int dx, dy;	1050	int dx, dy;
1176	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1051	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1177	Window unused_cr;	1052	Window unused_cr;
1178		1053
1179	XTranslateCoordinates (disp, parent[0], display->root,	1054	XTranslateCoordinates (dpy, parent[0], display->root,
1180	0, 0, &x, &y, &unused_cr);	1055	0, 0, &x, &y, &unused_cr);
1181	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1056	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1182	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1057	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1183	/*	1058	/*
1184	* if display->root isn't the parent window, a WM will probably have offset	1059	* if display->root isn't the parent window, a WM will probably have offset
1185	* our position for handles and decorations. Counter it	1060	* our position for handles and decorations. Counter it
1186	*/	1061	*/
…		…
1188	{	1063	{
1189	x -= x1;	1064	x -= x1;
1190	y -= y1;	1065	y -= y1;
1191	}	1066	}
1192		1067
1193	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1068	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1194	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1069	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1195	dx = old_width - szHint.width;	1070	dx = old_width - szHint.width;
1196	dy = old_height - szHint.height;	1071	dy = old_height - szHint.height;
1197		1072
1198	/* Check position of the center of the window */	1073	/* Check position of the center of the window */
1199	if (x < x1) /* left half */	1074	if (x < x1) /* left half */
1200	dx = 0;	1075	dx = 0;
…		…
1203	if (y < y1) /* top half */	1078	if (y < y1) /* top half */
1204	dy = 0;	1079	dy = 0;
1205	else if (y == y1) /* exact center */	1080	else if (y == y1) /* exact center */
1206	dy /= 2;	1081	dy /= 2;
1207		1082
1208	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1083	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1209	szHint.width, szHint.height);	1084	szHint.width, szHint.height);
1210	#else	1085	#else
1211	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1086	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1212	#endif	1087	#endif
1213	}	1088	}
1214		1089
1215	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1090	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1216		1091
1217	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1092	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1218	{	1093	{
1219	if (scrollBar.state)	1094	if (scrollBar.state)
1220	{	1095	{
1221	XMoveResizeWindow (disp, scrollBar.win,	1096	XMoveResizeWindow (dpy, scrollBar.win,
1222	window_sb_x, 0,	1097	window_sb_x, 0,
1223	scrollbar_TotalWidth (), szHint.height);	1098	scrollbar_TotalWidth (), szHint.height);
1224	resize_scrollbar ();	1099	resize_scrollbar ();
1225	}	1100	}
1226		1101
1227	XMoveResizeWindow (disp, vt,	1102	XMoveResizeWindow (dpy, vt,
1228	window_vt_x, window_vt_y,	1103	window_vt_x, window_vt_y,
1229	width, height);	1104	width, height);
1230		1105
1231	scr_clear ();	1106	scr_clear ();
1232	#ifdef XPM_BACKGROUND	1107	#ifdef XPM_BACKGROUND
1233	resize_pixmap ();	1108	resize_pixmap ();
1234	#endif	1109	#endif
1235	}	1110	}
1236		1111
1237	if (fix_screen \|\| old_height == 0)	1112	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 ();	1113	scr_reset ();
1252		1114
1253	if (curr_screen >= 0) /* this is not the first time through */	1115	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1254	{	1116	//scr_touch (false);
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		1117
1263	#ifdef XPM_BACKGROUND	1118	#ifdef XPM_BACKGROUND
1264	if (pixmap)	1119	if (pixmap)
1265	scr_touch (false);	1120	scr_touch (false);
1266	#endif	1121	#endif
…		…
1279	{	1134	{
1280	XWindowAttributes wattr;	1135	XWindowAttributes wattr;
1281		1136
1282	if (newwidth == 0 \|\| newheight == 0)	1137	if (newwidth == 0 \|\| newheight == 0)
1283	{	1138	{
1284	XGetWindowAttributes (display->display, display->root, &wattr);	1139	XGetWindowAttributes (dpy, display->root, &wattr);
1285		1140
1286	if (newwidth == 0)	1141	if (newwidth == 0)
1287	newwidth = wattr.width - szHint.base_width;	1142	newwidth = wattr.width - szHint.base_width;
1288	if (newheight == 0)	1143	if (newheight == 0)
1289	newheight = wattr.height - szHint.base_height;	1144	newheight = wattr.height - szHint.base_height;
…		…
1303	#ifdef USE_XIM	1158	#ifdef USE_XIM
1304		1159
1305	void	1160	void
1306	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1161	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1307	{	1162	{
1308	fg = pix_colors[Color_fg];	1163	fg = pix_colors [Color_fg];
1309	bg = pix_colors[Color_bg];	1164	bg = pix_colors [Color_bg];
1310	}	1165	}
1311		1166
1312	void	1167	void
1313	rxvt_term::im_set_size (XRectangle &size)	1168	rxvt_term::im_set_size (XRectangle &size)
1314	{	1169	{
…		…
1351	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1206	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1352		1207
1353	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1208	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1354	*p = '\0';	1209	*p = '\0';
1355		1210
1356	atom = XInternAtom (display->display, server, False);	1211	atom = XInternAtom (dpy, server, False);
1357	win = XGetSelectionOwner (display->display, atom);	1212	win = XGetSelectionOwner (dpy, atom);
1358		1213
1359	if (win != None)	1214	if (win != None)
1360	return True;	1215	return True;
1361	}	1216	}
1362		1217
…		…
1369	XPoint nspot;	1224	XPoint nspot;
1370	XVaNestedList preedit_attr;	1225	XVaNestedList preedit_attr;
1371		1226
1372	if (!Input_Context	1227	if (!Input_Context
1373	\|\| !focus	1228	\|\| !focus
1374	\|\| !(input_style & XIMPreeditPosition))	1229	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1375	return;	1230	return;
1376		1231
1377	im_set_position (nspot);	1232	im_set_position (nspot);
1378		1233
1379	if (nspot.x == spot.x && nspot.y == spot.y)	1234	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1398	input_method = 0;	1253	input_method = 0;
1399	}	1254	}
1400		1255
1401	Input_Context = 0;	1256	Input_Context = 0;
1402	}	1257	}
		1258
		1259	#ifdef ENABLE_XIM_ONTHESPOT
		1260
		1261	static void
		1262	xim_preedit_start (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_START, DT_END));
		1266	}
		1267
		1268	static void
		1269	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1270	{
		1271	((rxvt_term *)client_data)->make_current ();
		1272	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1273	}
		1274
		1275	static void
		1276	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1277	{
		1278	rxvt_term term = (rxvt_term )client_data;
		1279	XIMText *text = call_data->text;
		1280
		1281	term->make_current ();
		1282
		1283	if (text)
		1284	{
		1285	void *str;
		1286
		1287	if (!text->encoding_is_wchar && text->string.multi_byte)
		1288	{
		1289	// of course, X makes it ugly again
		1290	if (term->rs[Rs_imLocale])
		1291	SET_LOCALE (term->rs[Rs_imLocale]);
		1292
		1293	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1294	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1295
		1296	if (term->rs[Rs_imLocale])
		1297	SET_LOCALE (term->locale);
		1298	}
		1299	else
		1300	str = (void *)text->string.wide_char;
		1301
		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_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1307	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1308	DT_END));
		1309	}
		1310	else
		1311	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1312	DT_INT, call_data->caret,
		1313	DT_INT, call_data->chg_first,
		1314	DT_INT, call_data->chg_length,
		1315	DT_END));
		1316	}
		1317
		1318	#if 0
		1319	static void
		1320	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1321	{
		1322	((rxvt_term *)client_data)->make_current ();
		1323	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1324	DT_INT, call_data->position,
		1325	DT_INT, call_data->direction,
		1326	DT_INT, call_data->style,
		1327	DT_END));
		1328	}
		1329	#endif
		1330
		1331	#endif
1403		1332
1404	/*	1333	/*
1405	* Try to open a XIM with the current modifiers, then see if we can	1334	* Try to open a XIM with the current modifiers, then see if we can
1406	* open a suitable preedit type	1335	* open a suitable preedit type
1407	*/	1336	*/
…		…
1414	XRectangle rect, status_rect, needed_rect;	1343	XRectangle rect, status_rect, needed_rect;
1415	unsigned long fg, bg;	1344	unsigned long fg, bg;
1416	const char *p;	1345	const char *p;
1417	char **s;	1346	char **s;
1418	XIMStyles *xim_styles;	1347	XIMStyles *xim_styles;
		1348	#ifdef ENABLE_XIM_ONTHESPOT
		1349	XIMCallback xcb[4];
		1350	#endif
1419		1351
1420	set_environ (envv);	1352	set_environ (envv);
1421		1353
1422	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1354	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423	return false;	1355	return false;
1424		1356
1425	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426	input_method = display->get_xim (locale, modifiers);	1357	input_method = display->get_xim (locale, modifiers);
1427	if (input_method == NULL)	1358	if (input_method == NULL)
1428	return false;	1359	return false;
1429		1360
1430	xim = input_method->xim;	1361	xim = input_method->xim;
…		…
1450	s = rxvt_splitcommastring (p);	1381	s = rxvt_splitcommastring (p);
1451		1382
1452	for (i = found = 0; !found && s[i]; i++)	1383	for (i = found = 0; !found && s[i]; i++)
1453	{	1384	{
1454	if (!strcmp (s[i], "OverTheSpot"))	1385	if (!strcmp (s[i], "OverTheSpot"))
1455	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1386	input_style = XIMPreeditPosition \| XIMStatusNothing;
1456	else if (!strcmp (s[i], "OffTheSpot"))	1387	else if (!strcmp (s[i], "OffTheSpot"))
1457	input_style = (XIMPreeditArea \| XIMStatusArea);	1388	input_style = XIMPreeditArea \| XIMStatusArea;
1458	else if (!strcmp (s[i], "Root"))	1389	else if (!strcmp (s[i], "Root"))
1459	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1390	input_style = XIMPreeditNothing \| XIMStatusNothing;
1460	else if (!strcmp (s[i], "None"))	1391	else if (!strcmp (s[i], "None"))
1461	input_style = (XIMPreeditNone \| XIMStatusNone);	1392	input_style = XIMPreeditNone \| XIMStatusNone;
		1393	#ifdef ENABLE_XIM_ONTHESPOT
		1394	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1395	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1396	#endif
		1397	else
		1398	input_style = XIMPreeditNothing \| XIMStatusNothing;
1462		1399
1463	for (j = 0; j < xim_styles->count_styles; j++)	1400	for (j = 0; j < xim_styles->count_styles; j++)
1464	if (input_style == xim_styles->supported_styles[j])	1401	if (input_style == xim_styles->supported_styles[j])
1465	{	1402	{
1466	rxvt_freecommastring (s);	1403	rxvt_freecommastring (s);
…		…
1504	"*",	1441	"*",
1505	fheight,	1442	fheight,
1506	fheight + 1, fheight - 1,	1443	fheight + 1, fheight - 1,
1507	fheight - 2, fheight + 2);	1444	fheight - 2, fheight + 2);
1508		1445
1509	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1446	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1510	&missing_charset_list, &missing_charset_count, &def_string);	1447	&missing_charset_list, &missing_charset_count, &def_string);
1511		1448
1512	if (missing_charset_list)	1449	if (missing_charset_list)
1513	XFreeStringList (missing_charset_list);	1450	XFreeStringList (missing_charset_list);
1514		1451
…		…
1555	XNBackground, bg,	1492	XNBackground, bg,
1556	XNArea, &status_rect,	1493	XNArea, &status_rect,
1557	XNFontSet, fs,	1494	XNFontSet, fs,
1558	NULL);	1495	NULL);
1559	}	1496	}
		1497	#if ENABLE_XIM_ONTHESPOT
		1498	else if (input_style & XIMPreeditCallbacks)
		1499	{
		1500	im_set_position (spot);
		1501
		1502	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1503	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1504	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1505	# if 0
		1506	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1507	# endif
		1508
		1509	preedit_attr = XVaCreateNestedList (0,
		1510	XNSpotLocation, &spot,
		1511	XNPreeditStartCallback, &xcb[0],
		1512	XNPreeditDoneCallback , &xcb[1],
		1513	XNPreeditDrawCallback , &xcb[2],
		1514	# if 0
		1515	XNPreeditCaretCallback, &xcb[3],
		1516	# endif
		1517	NULL);
		1518	}
		1519	#endif
1560		1520
1561	Input_Context = XCreateIC (xim,	1521	Input_Context = XCreateIC (xim,
1562	XNInputStyle, input_style,	1522	XNInputStyle, input_style,
1563	XNClientWindow, vt,	1523	XNClientWindow, vt,
1564	XNFocusWindow, parent[0],	1524	XNFocusWindow, parent[0],
…		…
1567	status_attr ? XNStatusAttributes : NULL,	1527	status_attr ? XNStatusAttributes : NULL,
1568	status_attr, NULL);	1528	status_attr, NULL);
1569		1529
1570	if (preedit_attr) XFree (preedit_attr);	1530	if (preedit_attr) XFree (preedit_attr);
1571	if (status_attr) XFree (status_attr);	1531	if (status_attr) XFree (status_attr);
1572	if (fs) XFreeFontSet (display->display, fs);	1532	if (fs) XFreeFontSet (dpy, fs);
1573		1533
1574	if (Input_Context == NULL)	1534	if (Input_Context == NULL)
1575	{	1535	{
1576	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1536	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1577	im_destroy ();	1537	im_destroy ();
1578	return false;	1538	return false;
1579	}	1539	}
1580		1540
		1541	#if 0
		1542	// unfortunately, only the focus window is used by XIM, hard to fix
		1543	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1544	vt_select_input ();
		1545	#endif
		1546
1581	if (input_style & XIMPreeditArea)	1547	if (input_style & XIMPreeditArea)
1582	IMSetStatusPosition ();	1548	IMSetStatusPosition ();
1583		1549
1584	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1585	return true;	1550	return true;
1586	}	1551	}
1587		1552
1588	void	1553	void
1589	rxvt_term::im_cb ()	1554	rxvt_term::im_cb ()
…		…
1595		1560
1596	make_current ();	1561	make_current ();
1597		1562
1598	im_destroy ();	1563	im_destroy ();
1599		1564
1600	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601	if (Input_Context)	1565	if (Input_Context)
1602	return;	1566	return;
1603		1567
1604	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1568	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1605	if (rs[Rs_imLocale])	1569	if (rs[Rs_imLocale])
…		…
1678	XFree (preedit_attr);	1642	XFree (preedit_attr);
1679	XFree (status_attr);	1643	XFree (status_attr);
1680	}	1644	}
1681	#endif /* USE_XIM */	1645	#endif /* USE_XIM */
1682		1646
1683	/----------------------------------------------------------------------/
1684	rxvt_t rxvt_current_term;
1685
1686	/----------------------- end-of-file (C source) -----------------------/	1647	/----------------------- 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.219 by root, Sat Feb 11 02:28:19 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.219 by root, Sat Feb 11 02:28:19 2006 UTC