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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 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
…		…
242		222
243	selection_clear ();	223	selection_clear ();
244		224
245	#ifdef USE_XIM	225	#ifdef USE_XIM
246	im_destroy ();	226	im_destroy ();
247	#endif
248	#ifdef MENUBAR
249	if (menubarGC) XFreeGC (disp, menubarGC);
250	#endif	227	#endif
251	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
252	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
254	#endif	231	#endif
…		…
265	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
266	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
267	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
268	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
269	#endif	246	#endif
270	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
271	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
272	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
273	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274	#endif	251	#endif
275	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
276		253
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;	254	delete drawable;
283	// destroy all windows	255	// destroy all windows
284	if (parent[0])	256	if (parent[0])
285	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
286	}	258	}
…		…
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	setlocale (LC_CTYPE, curlocale); // perl init destroys this info
529	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530	}
531	#endif
532		477
533	create_windows (argc, argv);	478	create_windows (argc, argv);
534		479
535	dDisp;	480	dDisp;
536		481
…		…
544		489
545	#ifdef HAVE_SCROLLBARS	490	#ifdef HAVE_SCROLLBARS
546	if (OPTION (Opt_scrollBar))	491	if (OPTION (Opt_scrollBar))
547	resize_scrollbar (); /* create and map scrollbar */	492	resize_scrollbar (); /* create and map scrollbar */
548	#endif	493	#endif
549	#if (MENUBAR_MAX)
550	if (menubar_visible ())
551	XMapWindow (disp, menuBar.win);
552	#endif
553	#ifdef TRANSPARENT	494	#ifdef TRANSPARENT
554	if (OPTION (Opt_transparent))	495	if (OPTION (Opt_transparent))
555	{	496	{
556	XSelectInput (disp, display->root, PropertyChangeMask);	497	XSelectInput (disp, display->root, PropertyChangeMask);
557	check_our_parents ();	498	check_our_parents ();
558	rootwin_ev.start (display, display->root);	499	rootwin_ev.start (display, display->root);
559	}	500	}
560	#endif	501	#endif
561		502
		503	set_colorfgbg ();
		504
		505	init_command (cmd_argv);
		506
		507	free (cmd_argv);
		508
		509	if (pty->pty >= 0)
		510	pty_ev.start (pty->pty, EVENT_READ);
		511
		512	check_ev.start ();
		513
		514	HOOK_INVOKE ((this, HOOK_START, DT_END));
		515
		516	#if ENABLE_XEMBED
		517	if (rs[Rs_embed])
		518	{
		519	long info[2] = { 0, XEMBED_MAPPED };
		520
		521	XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		522	32, PropModeReplace, (unsigned char *)&info, 2);
		523	}
		524	#endif
		525
562	XMapWindow (disp, vt);	526	XMapWindow (disp, vt);
563	XMapWindow (disp, parent[0]);	527	XMapWindow (disp, parent[0]);
564		528
565	set_colorfgbg ();
566
567	init_command (cmd_argv);
568
569	free (cmd_argv);
570
571	if (pty.pty >= 0)
572	pty_ev.start (pty.pty, EVENT_READ);
573
574	check_ev.start ();
575
576	HOOK_INVOKE ((this, HOOK_START, DT_END));
577
578	return true;	529	return true;
579	}	530	}
580		531
581	static struct sig_handlers	532	static struct sig_handlers
582	{	533	{
583	sig_watcher sw_chld, sw_term, sw_int;	534	sig_watcher sw_term, sw_int;
584		535
585	void sig_chld (sig_watcher &w)
586	{
587	// we are being called for every SIGCHLD, find the corresponding term
588	int pid;
589
590	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
591	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
592	if (pid == (*t)->cmd_pid)
593	{
594	(*t)->child_exit ();
595	break;
596	}
597	}
598
599	/*	536	/*
600	* Catch a fatal signal and tidy up before quitting	537	* Catch a fatal signal and tidy up before quitting
601	*/	538	*/
602	void	539	void
603	sig_term (sig_watcher &w)	540	sig_term (sig_watcher &w)
604	{	541	{
605	#ifdef DEBUG_CMD
606	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
607	#endif
608	rxvt_emergency_cleanup ();	542	rxvt_emergency_cleanup ();
609	signal (w.signum, SIG_DFL);	543	signal (w.signum, SIG_DFL);
610	kill (getpid (), w.signum);	544	kill (getpid (), w.signum);
611	}	545	}
612		546
613	sig_handlers ()	547	sig_handlers ()
614	: sw_chld (this, &sig_handlers::sig_chld),
615	sw_term (this, &sig_handlers::sig_term),	548	: sw_term (this, &sig_handlers::sig_term),
616	sw_int (this, &sig_handlers::sig_term)	549	sw_int (this, &sig_handlers::sig_term)
617	{	550	{
618	}	551	}
619	} sig_handlers;	552	} sig_handlers;
620		553
621	char **rxvt_environ; // startup environment	554	char **rxvt_environ; // startup environment
622		555
623	void	556	void
624	rxvt_init ()	557	rxvt_init ()
625	{	558	{
		559	ptytty::init ();
		560
626	rxvt_environ = environ;	561	rxvt_environ = environ;
627
628	/*
629	* Save and then give up any super-user privileges
630	* If we need privileges in any area then we must specifically request it.
631	* We should only need to be root in these cases:
632	* 1. write utmp entries on some systems
633	* 2. chown tty on some systems
634	*/
635	rxvt_privileges (SAVE);
636	rxvt_privileges (IGNORE);
637		562
638	signal (SIGHUP, SIG_IGN);	563	signal (SIGHUP, SIG_IGN);
639	signal (SIGPIPE, SIG_IGN);	564	signal (SIGPIPE, SIG_IGN);
640		565
641	sig_handlers.sw_chld.start (SIGCHLD);
642	sig_handlers.sw_term.start (SIGTERM);	566	sig_handlers.sw_term.start (SIGTERM);
643	sig_handlers.sw_int.start (SIGINT);	567	sig_handlers.sw_int.start (SIGINT);
644		568
645	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	569	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
646	/* signal (SIGURG, SIG_DFL); */	570	/* signal (SIGURG, SIG_DFL); */
…		…
675	rxvt_fatal ("memory allocation failure. aborting.\n");	599	rxvt_fatal ("memory allocation failure. aborting.\n");
676		600
677	return p;	601	return p;
678	}	602	}
679		603
680	void *	604	void *
681	rxvt_realloc (void *ptr, size_t size)	605	rxvt_realloc (void *ptr, size_t size)
682	{	606	{
683	void *p = realloc (ptr, size);	607	void *p = realloc (ptr, size);
684		608
685	if (!p)	609	if (!p)
686	rxvt_fatal ("memory allocation failure. aborting.\n");	610	rxvt_fatal ("memory allocation failure. aborting.\n");
687		611
688	return p;	612	return p;
689	}	613	}
690
691	/* ------------------------------------------------------------------------- *
692	* PRIVILEGED OPERATIONS *
693	* ------------------------------------------------------------------------- */
694	/* take care of suid/sgid super-user (root) privileges */
695	void
696	rxvt_privileges (rxvt_privaction action)
697	{
698	#if ! defined(__CYGWIN32__)
699	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
700	/* setreuid () is the poor man's setuid (), seteuid () */
701	# define seteuid(a) setreuid(-1, (a))
702	# define setegid(a) setregid(-1, (a))
703	# define HAVE_SETEUID
704	# endif
705	# ifdef HAVE_SETEUID
706	switch (action)
707	{
708	case IGNORE:
709	/*
710	* change effective uid/gid - not real uid/gid - so we can switch
711	* back to root later, as required
712	*/
713	setegid (getgid ());
714	seteuid (getuid ());
715	break;
716	case SAVE:
717	saved_egid = getegid ();
718	saved_euid = geteuid ();
719	break;
720	case RESTORE:
721	setegid (saved_egid);
722	seteuid (saved_euid);
723	break;
724	}
725	# else
726	switch (action)
727	{
728	case IGNORE:
729	setgid (getgid ());
730	setuid (getuid ());
731	/* FALLTHROUGH */
732	case SAVE:
733	/* FALLTHROUGH */
734	case RESTORE:
735	break;
736	}
737	# endif
738	#endif
739	}
740
741	#ifdef UTMP_SUPPORT
742	void
743	rxvt_term::privileged_utmp (rxvt_privaction action)
744	{
745	if (OPTION (Opt_utmpInhibit)
746	\|\| !pty.name \|\| !*pty.name)
747	return;
748
749	rxvt_privileges (RESTORE);
750
751	if (action == SAVE)
752	makeutent (pty.name, rs[Rs_display_name]);
753	else
754	cleanutent ();
755
756	rxvt_privileges (IGNORE);
757	}
758	#endif
759		614
760	/----------------------------------------------------------------------/	615	/----------------------------------------------------------------------/
761	/*	616	/*
762	* window size/position calculcations for XSizeHint and other storage.	617	* window size/position calculcations for XSizeHint and other storage.
763	* if width/height are non-zero then override calculated width/height	618	* if width/height are non-zero then override calculated width/height
764	*/	619	*/
765	void	620	void
766	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	621	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767	{	622	{
768	short recalc_x, recalc_y;	623	short recalc_x, recalc_y;
769	int x, y, sb_w, mb_h, flags;	624	int x, y, sb_w, flags;
770	unsigned int w, h;	625	unsigned int w, h;
771	unsigned int max_width, max_height;	626	unsigned int max_width, max_height;
772	dDisp;	627	dDisp;
773
774	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
775	ncol, nrow, szHint.width, szHint.height));
776		628
777	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	629	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
778	szHint.win_gravity = NorthWestGravity;	630	szHint.win_gravity = NorthWestGravity;
779	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	631	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
780		632
…		…
835	max_width = MAX_COLS * fwidth;	687	max_width = MAX_COLS * fwidth;
836	max_height = MAX_ROWS * fheight;	688	max_height = MAX_ROWS * fheight;
837		689
838	szHint.base_width = szHint.base_height = 2 * int_bwidth;	690	szHint.base_width = szHint.base_height = 2 * int_bwidth;
839		691
840	sb_w = mb_h = 0;	692	sb_w = 0;
841	window_vt_x = window_vt_y = int_bwidth;	693	window_vt_x = window_vt_y = int_bwidth;
842		694
843	if (scrollbar_visible ())	695	if (scrollBar.state)
844	{	696	{
845	sb_w = scrollbar_TotalWidth ();	697	sb_w = scrollbar_TotalWidth ();
846	szHint.base_width += sb_w;	698	szHint.base_width += sb_w;
847	if (!OPTION (Opt_scrollBar_right))	699	if (!OPTION (Opt_scrollBar_right))
848	window_vt_x += sb_w;	700	window_vt_x += sb_w;
849	}	701	}
850		702
851	if (menubar_visible ())
852	{
853	mb_h = menuBar_TotalHeight ();
854	szHint.base_height += mb_h;
855	window_vt_y += mb_h;
856	}
857
858	szHint.width_inc = fwidth;	703	szHint.width_inc = fwidth;
859	szHint.height_inc = fheight;	704	szHint.height_inc = fheight;
860	szHint.min_width = szHint.base_width + szHint.width_inc;	705	szHint.min_width = szHint.base_width + szHint.width_inc;
861	szHint.min_height = szHint.base_height + szHint.height_inc;	706	szHint.min_height = szHint.base_height + szHint.height_inc;
862		707
…		…
880	{	725	{
881	min_it (height, max_height);	726	min_it (height, max_height);
882	szHint.height = szHint.base_height + height;	727	szHint.height = szHint.base_height + height;
883	}	728	}
884		729
885	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	730	if (scrollBar.state && OPTION (Opt_scrollBar_right))
886	window_sb_x = szHint.width - sb_w;	731	window_sb_x = szHint.width - sb_w;
887		732
888	if (recalc_x)	733	if (recalc_x)
889	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	734	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890	if (recalc_y)	735	if (recalc_y)
891	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	736	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
892		737
893	ncol = width / fwidth;	738	ncol = width / fwidth;
894	nrow = height / fheight;	739	nrow = height / fheight;
895	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
896	ncol, nrow, szHint.width,
897	szHint.height));
898	return;
899	}	740	}
900		741
901	/----------------------------------------------------------------------/	742	/----------------------------------------------------------------------/
902	/*	743	/*
903	* Tell the teletype handler what size the window is.	744	* Tell the teletype handler what size the window is.
904	* Called after a window size change.	745	* Called after a window size change.
905	*/	746	*/
906	void	747	void
907	rxvt_term::tt_winch ()	748	rxvt_term::tt_winch ()
908	{	749	{
909	if (pty.pty < 0)	750	if (pty->pty < 0)
910	return;	751	return;
911		752
912	struct winsize ws;	753	struct winsize ws;
913		754
914	ws.ws_col = ncol;	755	ws.ws_col = ncol;
915	ws.ws_row = nrow;	756	ws.ws_row = nrow;
916	ws.ws_xpixel = width;	757	ws.ws_xpixel = width;
917	ws.ws_ypixel = height;	758	ws.ws_ypixel = height;
918	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	759	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919		760
920	#if 0	761	#if 0
921	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	762	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922	if (cmd_pid) /* force through to the command */	763	if (cmd_pid) /* force through to the command */
923	kill (-cmd_pid, SIGWINCH);	764	kill (-cmd_pid, SIGWINCH);
…		…
1143	{	984	{
1144	unsigned int i;	985	unsigned int i;
1145	const char *xpmb = "\0";	986	const char *xpmb = "\0";
1146	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	987	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1147		988
1148	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1149	strcpy (fstr, "default");	989	strcpy (fstr, "default");
1150	strcpy (bstr, "default");	990	strcpy (bstr, "default");
1151	for (i = Color_Black; i <= Color_White; i++)	991	for (i = Color_Black; i <= Color_White; i++)
1152	if (pix_colors[Color_fg] == pix_colors[i])	992	if (pix_colors[Color_fg] == pix_colors[i])
1153	{	993	{
…		…
1187	* -------------------------------------------------------------------- */	1027	* -------------------------------------------------------------------- */
1188	void	1028	void
1189	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)
1190	{	1030	{
1191	int fix_screen;	1031	int fix_screen;
1192	int old_width = szHint.width, old_height = szHint.height;	1032	int old_width = szHint.width;
		1033	int old_height = szHint.height;
1193	dDisp;	1034	dDisp;
1194		1035
1195	window_calc (newwidth, newheight);	1036	window_calc (newwidth, newheight);
1196	XSetWMNormalHints (disp, parent[0], &szHint);	1037	XSetWMNormalHints (disp, parent[0], &szHint);
1197		1038
…		…
1219	{	1060	{
1220	x -= x1;	1061	x -= x1;
1221	y -= y1;	1062	y -= y1;
1222	}	1063	}
1223		1064
1224	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1065	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1225	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1066	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1226	dx = old_width - szHint.width;	1067	dx = old_width - szHint.width;
1227	dy = old_height - szHint.height;	1068	dy = old_height - szHint.height;
1228		1069
1229	/* Check position of the center of the window */	1070	/* Check position of the center of the window */
1230	if (x < x1) /* left half */	1071	if (x < x1) /* left half */
1231	dx = 0;	1072	dx = 0;
…		…
1245		1086
1246	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1087	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1247		1088
1248	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1089	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1249	{	1090	{
1250	if (scrollbar_visible ())	1091	if (scrollBar.state)
1251	{	1092	{
1252	XMoveResizeWindow (disp, scrollBar.win,	1093	XMoveResizeWindow (disp, scrollBar.win,
1253	window_sb_x, 0,	1094	window_sb_x, 0,
1254	scrollbar_TotalWidth (), szHint.height);	1095	scrollbar_TotalWidth (), szHint.height);
1255	resize_scrollbar ();	1096	resize_scrollbar ();
1256	}	1097	}
1257		1098
1258	if (menubar_visible ())
1259	XMoveResizeWindow (disp, menuBar.win,
1260	window_vt_x, 0,
1261	width, menuBar_TotalHeight ());
1262
1263	XMoveResizeWindow (disp, vt,	1099	XMoveResizeWindow (disp, vt,
1264	window_vt_x, window_vt_y,	1100	window_vt_x, window_vt_y,
1265	width, height);	1101	width, height);
1266		1102
1267	scr_clear ();	1103	scr_clear ();
…		…
1269	resize_pixmap ();	1105	resize_pixmap ();
1270	#endif	1106	#endif
1271	}	1107	}
1272		1108
1273	if (fix_screen \|\| old_height == 0)	1109	if (fix_screen \|\| old_height == 0)
1274	{
1275	int curr_screen = -1;
1276	int old_ncol = prev_ncol;
1277
1278	/* scr_reset only works on the primary screen */
1279	if (old_height) /* this is not the first time through */
1280	{
1281	unsigned int ocol = ncol;
1282	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1283	curr_screen = scr_change_screen (PRIMARY);
1284	ncol = ocol;
1285	}
1286
1287	scr_reset ();	1110	scr_reset ();
1288
1289	if (curr_screen >= 0) /* this is not the first time through */
1290	{
1291	scr_change_screen (curr_screen);
1292	selection_check (old_ncol != ncol ? 4 : 0);
1293	}
1294	}
1295
1296	old_width = szHint.width;
1297	old_height = szHint.height;
1298		1111
1299	#ifdef XPM_BACKGROUND	1112	#ifdef XPM_BACKGROUND
1300	if (pixmap)	1113	if (pixmap)
1301	scr_touch (false);	1114	scr_touch (false);
1302	#endif	1115	#endif
…		…
1405	XPoint nspot;	1218	XPoint nspot;
1406	XVaNestedList preedit_attr;	1219	XVaNestedList preedit_attr;
1407		1220
1408	if (!Input_Context	1221	if (!Input_Context
1409	\|\| !focus	1222	\|\| !focus
1410	\|\| !(input_style & XIMPreeditPosition))	1223	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1411	return;	1224	return;
1412		1225
1413	im_set_position (nspot);	1226	im_set_position (nspot);
1414		1227
1415	if (nspot.x == spot.x && nspot.y == spot.y)	1228	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1434	input_method = 0;	1247	input_method = 0;
1435	}	1248	}
1436		1249
1437	Input_Context = 0;	1250	Input_Context = 0;
1438	}	1251	}
		1252
		1253	#ifdef ENABLE_XIM_ONTHESPOT
		1254
		1255	static void
		1256	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1257	{
		1258	((rxvt_term *)client_data)->make_current ();
		1259	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1260	}
		1261
		1262	static void
		1263	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1264	{
		1265	((rxvt_term *)client_data)->make_current ();
		1266	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1267	}
		1268
		1269	static void
		1270	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1271	{
		1272	rxvt_term term = (rxvt_term )client_data;
		1273	XIMText *text = call_data->text;
		1274
		1275	term->make_current ();
		1276
		1277	if (text)
		1278	{
		1279	void *str;
		1280
		1281	if (!text->encoding_is_wchar && text->string.multi_byte)
		1282	{
		1283	// of course, X makes it ugly again
		1284	if (term->rs[Rs_imLocale])
		1285	SET_LOCALE (term->rs[Rs_imLocale]);
		1286
		1287	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1288	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1289
		1290	if (term->rs[Rs_imLocale])
		1291	SET_LOCALE (term->locale);
		1292	}
		1293	else
		1294	str = (void *)text->string.wide_char;
		1295
		1296	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1297	DT_INT, call_data->caret,
		1298	DT_INT, call_data->chg_first,
		1299	DT_INT, call_data->chg_length,
		1300	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1301	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1302	DT_END));
		1303	}
		1304	else
		1305	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1306	DT_INT, call_data->caret,
		1307	DT_INT, call_data->chg_first,
		1308	DT_INT, call_data->chg_length,
		1309	DT_END));
		1310	}
		1311
		1312	#if 0
		1313	static void
		1314	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1315	{
		1316	((rxvt_term *)client_data)->make_current ();
		1317	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1318	DT_INT, call_data->position,
		1319	DT_INT, call_data->direction,
		1320	DT_INT, call_data->style,
		1321	DT_END));
		1322	}
		1323	#endif
		1324
		1325	#endif
1439		1326
1440	/*	1327	/*
1441	* Try to open a XIM with the current modifiers, then see if we can	1328	* Try to open a XIM with the current modifiers, then see if we can
1442	* open a suitable preedit type	1329	* open a suitable preedit type
1443	*/	1330	*/
…		…
1450	XRectangle rect, status_rect, needed_rect;	1337	XRectangle rect, status_rect, needed_rect;
1451	unsigned long fg, bg;	1338	unsigned long fg, bg;
1452	const char *p;	1339	const char *p;
1453	char **s;	1340	char **s;
1454	XIMStyles *xim_styles;	1341	XIMStyles *xim_styles;
		1342	#ifdef ENABLE_XIM_ONTHESPOT
		1343	XIMCallback xcb[4];
		1344	#endif
1455		1345
1456	TEMP_ENV;	1346	set_environ (envv);
1457		1347
1458	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1348	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1459	return false;	1349	return false;
1460		1350
1461	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1462	input_method = display->get_xim (locale, modifiers);	1351	input_method = display->get_xim (locale, modifiers);
1463	if (input_method == NULL)	1352	if (input_method == NULL)
1464	return false;	1353	return false;
1465		1354
1466	xim = input_method->xim;	1355	xim = input_method->xim;
…		…
1486	s = rxvt_splitcommastring (p);	1375	s = rxvt_splitcommastring (p);
1487		1376
1488	for (i = found = 0; !found && s[i]; i++)	1377	for (i = found = 0; !found && s[i]; i++)
1489	{	1378	{
1490	if (!strcmp (s[i], "OverTheSpot"))	1379	if (!strcmp (s[i], "OverTheSpot"))
1491	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1380	input_style = XIMPreeditPosition \| XIMStatusNothing;
1492	else if (!strcmp (s[i], "OffTheSpot"))	1381	else if (!strcmp (s[i], "OffTheSpot"))
1493	input_style = (XIMPreeditArea \| XIMStatusArea);	1382	input_style = XIMPreeditArea \| XIMStatusArea;
1494	else if (!strcmp (s[i], "Root"))	1383	else if (!strcmp (s[i], "Root"))
1495	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1384	input_style = XIMPreeditNothing \| XIMStatusNothing;
1496	else if (!strcmp (s[i], "None"))	1385	else if (!strcmp (s[i], "None"))
1497	input_style = (XIMPreeditNone \| XIMStatusNone);	1386	input_style = XIMPreeditNone \| XIMStatusNone;
		1387	#ifdef ENABLE_XIM_ONTHESPOT
		1388	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1389	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1390	#endif
		1391	else
		1392	input_style = XIMPreeditNothing \| XIMStatusNothing;
1498		1393
1499	for (j = 0; j < xim_styles->count_styles; j++)	1394	for (j = 0; j < xim_styles->count_styles; j++)
1500	if (input_style == xim_styles->supported_styles[j])	1395	if (input_style == xim_styles->supported_styles[j])
1501	{	1396	{
1502	rxvt_freecommastring (s);	1397	rxvt_freecommastring (s);
…		…
1591	XNBackground, bg,	1486	XNBackground, bg,
1592	XNArea, &status_rect,	1487	XNArea, &status_rect,
1593	XNFontSet, fs,	1488	XNFontSet, fs,
1594	NULL);	1489	NULL);
1595	}	1490	}
		1491	#if ENABLE_XIM_ONTHESPOT
		1492	else if (input_style & XIMPreeditCallbacks)
		1493	{
		1494	im_set_position (spot);
		1495
		1496	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1497	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1498	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1499	# if 0
		1500	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1501	# endif
		1502
		1503	preedit_attr = XVaCreateNestedList (0,
		1504	XNSpotLocation, &spot,
		1505	XNPreeditStartCallback, &xcb[0],
		1506	XNPreeditDoneCallback , &xcb[1],
		1507	XNPreeditDrawCallback , &xcb[2],
		1508	# if 0
		1509	XNPreeditCaretCallback, &xcb[3],
		1510	# endif
		1511	NULL);
		1512	}
		1513	#endif
1596		1514
1597	Input_Context = XCreateIC (xim,	1515	Input_Context = XCreateIC (xim,
1598	XNInputStyle, input_style,	1516	XNInputStyle, input_style,
1599	XNClientWindow, vt,	1517	XNClientWindow, vt,
1600	XNFocusWindow, parent[0],	1518	XNFocusWindow, parent[0],
…		…
1612	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1530	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1613	im_destroy ();	1531	im_destroy ();
1614	return false;	1532	return false;
1615	}	1533	}
1616		1534
		1535	#if 0
		1536	// unfortunately, only the focus window is used by XIM, hard to fix
		1537	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1538	vt_select_input ();
		1539	#endif
		1540
1617	if (input_style & XIMPreeditArea)	1541	if (input_style & XIMPreeditArea)
1618	IMSetStatusPosition ();	1542	IMSetStatusPosition ();
1619		1543
1620	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1621	return true;	1544	return true;
1622	}	1545	}
1623		1546
1624	void	1547	void
1625	rxvt_term::im_cb ()	1548	rxvt_term::im_cb ()
…		…
1627	int i;	1550	int i;
1628	const char *p;	1551	const char *p;
1629	char **s;	1552	char **s;
1630	char buf[IMBUFSIZ];	1553	char buf[IMBUFSIZ];
1631		1554
1632	SET_R (this);	1555	make_current ();
1633		1556
1634	im_destroy ();	1557	im_destroy ();
1635		1558
1636	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637	if (Input_Context)	1559	if (Input_Context)
1638	return;	1560	return;
1639		1561
1640	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1562	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1641	if (rs[Rs_imLocale])	1563	if (rs[Rs_imLocale])
…		…
1714	XFree (preedit_attr);	1636	XFree (preedit_attr);
1715	XFree (status_attr);	1637	XFree (status_attr);
1716	}	1638	}
1717	#endif /* USE_XIM */	1639	#endif /* USE_XIM */
1718		1640
1719	/----------------------------------------------------------------------/
1720	rxvt_t rxvt_current_term;
1721
1722	/----------------------- end-of-file (C source) -----------------------/	1641	/----------------------- 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.175 by root, Thu Jan 12 00:35:39 2006 UTC vs. Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC