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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.195 by root, Sun Jan 22 00:48:13 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	}
…		…
315	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
316	delete keyboard;	288	delete keyboard;
317	#endif	289	#endif
318	}	290	}
319		291
		292	// child has exited, usually destroys
320	void	293	void
321	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
322	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
323	cmd_pid = 0;	298	cmd_pid = 0;
324		299
325	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
326	destroy ();	301	destroy ();
327	}	302	}
…		…
330	rxvt_term::destroy ()	305	rxvt_term::destroy ()
331	{	306	{
332	if (destroy_ev.active)	307	if (destroy_ev.active)
333	return;	308	return;
334		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		311	return;
		312
335	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
336	scr_overlay_off ();	314	scr_overlay_off ();
337	#endif	315	#endif
338		316
339	if (display)	317	if (display)
…		…
341	#if USE_XIM	319	#if USE_XIM
342	im_ev.stop (display);	320	im_ev.stop (display);
343	#endif	321	#endif
344	#if HAVE_SCROLLBARS	322	#if HAVE_SCROLLBARS
345	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
346	#endif
347	#if MENUBAR
348	menubar_ev.stop (display);
349	#endif	324	#endif
350	#if TRANSPARENT	325	#if TRANSPARENT
351	rootwin_ev.stop (display);	326	rootwin_ev.stop (display);
352	#endif	327	#endif
353	incr_ev.stop ();	328	incr_ev.stop ();
…		…
475	_exit (EXIT_FAILURE);	450	_exit (EXIT_FAILURE);
476	}	451	}
477		452
478	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
479	bool	454	bool
480	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv, stringvec *envv)
481	{	456	{
		457	this->envv = envv;
		458
482	SET_R (this);	459	SET_R (this);
483	set_locale ("");	460	set_locale ("");
484	set_environ (envv); // few things in X do not call setlocale :(	461	set_environ (envv); // few things in X do not call setlocale :(
485		462
486	if (!init_vars ())	463	if (!init_vars ())
…		…
492		469
493	#ifdef KEYSYM_RESOURCE	470	#ifdef KEYSYM_RESOURCE
494	keyboard->register_done ();	471	keyboard->register_done ();
495	#endif	472	#endif
496		473
497	#if MENUBAR_MAX
498	menubar_read (rs[Rs_menu]);
499	#endif
500	#ifdef HAVE_SCROLLBARS	474	#ifdef HAVE_SCROLLBARS
501	if (OPTION (Opt_scrollBar))	475	if (OPTION (Opt_scrollBar))
502	scrollBar.setIdle (); /* set existence for size calculations */	476	scrollBar.setIdle (); /* set existence for size calculations */
503	#endif	477	#endif
504		478
505	#if ENABLE_PERL	479	pty = ptytty_new ();
506	if (!rs[Rs_perl_ext_1])
507	rs[Rs_perl_ext_1] = "default";
508
509	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512	{
513	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514	// ignore some perl-related arguments if some bozo installed us set[ug]id
515	if (rxvt_tainted ())
516	{
517	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519	{
520	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521	rs[Rs_perl_lib] = 0;
522	rs[Rs_perl_eval] = 0;
523	}
524	}
525	#endif
526	rxvt_perl.init ();
527	setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529	}
530	#endif
531		480
532	create_windows (argc, argv);	481	create_windows (argc, argv);
533		482
534	dDisp;	483	dDisp;
535		484
…		…
543		492
544	#ifdef HAVE_SCROLLBARS	493	#ifdef HAVE_SCROLLBARS
545	if (OPTION (Opt_scrollBar))	494	if (OPTION (Opt_scrollBar))
546	resize_scrollbar (); /* create and map scrollbar */	495	resize_scrollbar (); /* create and map scrollbar */
547	#endif	496	#endif
548	#if (MENUBAR_MAX)
549	if (menubar_visible ())
550	XMapWindow (disp, menuBar.win);
551	#endif
552	#ifdef TRANSPARENT	497	#ifdef TRANSPARENT
553	if (OPTION (Opt_transparent))	498	if (OPTION (Opt_transparent))
554	{	499	{
555	XSelectInput (disp, display->root, PropertyChangeMask);	500	XSelectInput (disp, display->root, PropertyChangeMask);
556	check_our_parents ();	501	check_our_parents ();
557	rootwin_ev.start (display, display->root);	502	rootwin_ev.start (display, display->root);
558	}	503	}
559	#endif	504	#endif
560		505
		506	set_colorfgbg ();
		507
		508	init_command (cmd_argv);
		509
		510	free (cmd_argv);
		511
		512	if (pty->pty >= 0)
		513	pty_ev.start (pty->pty, EVENT_READ);
		514
		515	check_ev.start ();
		516
		517	HOOK_INVOKE ((this, HOOK_START, DT_END));
		518
561	XMapWindow (disp, vt);	519	XMapWindow (disp, vt);
562	XMapWindow (disp, parent[0]);	520	XMapWindow (disp, parent[0]);
563		521
564	set_colorfgbg ();
565
566	init_command (cmd_argv);
567
568	free (cmd_argv);
569
570	if (pty.pty >= 0)
571	pty_ev.start (pty.pty, EVENT_READ);
572
573	check_ev.start ();
574
575	HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577	return true;	522	return true;
578	}	523	}
579		524
580	static struct sig_handlers	525	static struct sig_handlers
581	{	526	{
582	sig_watcher sw_chld, sw_term, sw_int;	527	sig_watcher sw_term, sw_int;
583		528
584	void sig_chld (sig_watcher &w)
585	{
586	// we are being called for every SIGCHLD, find the corresponding term
587	int pid;
588
589	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
590	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
591	if (pid == (*t)->cmd_pid)
592	{
593	(*t)->child_exit ();
594	break;
595	}
596	}
597
598	/*	529	/*
599	* Catch a fatal signal and tidy up before quitting	530	* Catch a fatal signal and tidy up before quitting
600	*/	531	*/
601	void	532	void
602	sig_term (sig_watcher &w)	533	sig_term (sig_watcher &w)
…		…
608	signal (w.signum, SIG_DFL);	539	signal (w.signum, SIG_DFL);
609	kill (getpid (), w.signum);	540	kill (getpid (), w.signum);
610	}	541	}
611		542
612	sig_handlers ()	543	sig_handlers ()
613	: sw_chld (this, &sig_handlers::sig_chld),
614	sw_term (this, &sig_handlers::sig_term),	544	: sw_term (this, &sig_handlers::sig_term),
615	sw_int (this, &sig_handlers::sig_term)	545	sw_int (this, &sig_handlers::sig_term)
616	{	546	{
617	}	547	}
618	} sig_handlers;	548	} sig_handlers;
619		549
620	char **rxvt_environ; // startup environment	550	char **rxvt_environ; // startup environment
621		551
622	void	552	void
623	rxvt_init ()	553	rxvt_init ()
624	{	554	{
		555	uid_t uid = getuid ();
		556	gid_t gid = getgid ();
		557
		558	// before doing anything else, check for setuid/setgid operation,
		559	// start the helper process and drop privileges
		560	if (uid != geteuid ()
		561	\|\| gid != getegid ())
		562	{
		563	#if PTYTTY_HELPER
		564	ptytty_server ();
		565	#else
		566	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		567	#endif
		568
		569	// drop privileges
		570	#if HAVE_SETRESUID
		571	setresgid (gid, gid, gid);
		572	setresuid (uid, uid, uid);
		573	#elif HAVE_SETREUID
		574	setregid (gid, gid);
		575	setreuid (uid, uid);
		576	#elif HAVE_SETUID
		577	setgid (gid);
		578	setuid (uid);
		579	#endif
		580
		581	if (uid != geteuid ()
		582	\|\| gid != getegid ())
		583	rxvt_fatal ("unable to drop privileges, aborting.\n");
		584	}
		585
625	rxvt_environ = environ;	586	rxvt_environ = environ;
626
627	/*
628	* Save and then give up any super-user privileges
629	* If we need privileges in any area then we must specifically request it.
630	* We should only need to be root in these cases:
631	* 1. write utmp entries on some systems
632	* 2. chown tty on some systems
633	*/
634	rxvt_privileges (SAVE);
635	rxvt_privileges (IGNORE);
636		587
637	signal (SIGHUP, SIG_IGN);	588	signal (SIGHUP, SIG_IGN);
638	signal (SIGPIPE, SIG_IGN);	589	signal (SIGPIPE, SIG_IGN);
639		590
640	sig_handlers.sw_chld.start (SIGCHLD);
641	sig_handlers.sw_term.start (SIGTERM);	591	sig_handlers.sw_term.start (SIGTERM);
642	sig_handlers.sw_int.start (SIGINT);	592	sig_handlers.sw_int.start (SIGINT);
643		593
644	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	594	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
645	/* signal (SIGURG, SIG_DFL); */	595	/* signal (SIGURG, SIG_DFL); */
…		…
674	rxvt_fatal ("memory allocation failure. aborting.\n");	624	rxvt_fatal ("memory allocation failure. aborting.\n");
675		625
676	return p;	626	return p;
677	}	627	}
678		628
679	void *	629	void *
680	rxvt_realloc (void *ptr, size_t size)	630	rxvt_realloc (void *ptr, size_t size)
681	{	631	{
682	void *p = realloc (ptr, size);	632	void *p = realloc (ptr, size);
683		633
684	if (!p)	634	if (!p)
685	rxvt_fatal ("memory allocation failure. aborting.\n");	635	rxvt_fatal ("memory allocation failure. aborting.\n");
686		636
687	return p;	637	return p;
688	}	638	}
689
690	/* ------------------------------------------------------------------------- *
691	* PRIVILEGED OPERATIONS *
692	* ------------------------------------------------------------------------- */
693	/* take care of suid/sgid super-user (root) privileges */
694	void
695	rxvt_privileges (rxvt_privaction action)
696	{
697	#if ! defined(__CYGWIN32__)
698	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
699	/* setreuid () is the poor man's setuid (), seteuid () */
700	# define seteuid(a) setreuid(-1, (a))
701	# define setegid(a) setregid(-1, (a))
702	# define HAVE_SETEUID
703	# endif
704	# ifdef HAVE_SETEUID
705	switch (action)
706	{
707	case IGNORE:
708	/*
709	* change effective uid/gid - not real uid/gid - so we can switch
710	* back to root later, as required
711	*/
712	setegid (getgid ());
713	seteuid (getuid ());
714	break;
715	case SAVE:
716	saved_egid = getegid ();
717	saved_euid = geteuid ();
718	break;
719	case RESTORE:
720	setegid (saved_egid);
721	seteuid (saved_euid);
722	break;
723	}
724	# else
725	switch (action)
726	{
727	case IGNORE:
728	setgid (getgid ());
729	setuid (getuid ());
730	/* FALLTHROUGH */
731	case SAVE:
732	/* FALLTHROUGH */
733	case RESTORE:
734	break;
735	}
736	# endif
737	#endif
738	}
739
740	#ifdef UTMP_SUPPORT
741	void
742	rxvt_term::privileged_utmp (rxvt_privaction action)
743	{
744	if (OPTION (Opt_utmpInhibit)
745	\|\| !pty.name \|\| !*pty.name)
746	return;
747
748	rxvt_privileges (RESTORE);
749
750	if (action == SAVE)
751	makeutent (pty.name, rs[Rs_display_name]);
752	else
753	cleanutent ();
754
755	rxvt_privileges (IGNORE);
756	}
757	#endif
758		639
759	/----------------------------------------------------------------------/	640	/----------------------------------------------------------------------/
760	/*	641	/*
761	* window size/position calculcations for XSizeHint and other storage.	642	* window size/position calculcations for XSizeHint and other storage.
762	* if width/height are non-zero then override calculated width/height	643	* if width/height are non-zero then override calculated width/height
763	*/	644	*/
764	void	645	void
765	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	646	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
766	{	647	{
767	short recalc_x, recalc_y;	648	short recalc_x, recalc_y;
768	int x, y, sb_w, mb_h, flags;	649	int x, y, sb_w, flags;
769	unsigned int w, h;	650	unsigned int w, h;
770	unsigned int max_width, max_height;	651	unsigned int max_width, max_height;
771	dDisp;	652	dDisp;
772		653
773	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	654	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
834	max_width = MAX_COLS * fwidth;	715	max_width = MAX_COLS * fwidth;
835	max_height = MAX_ROWS * fheight;	716	max_height = MAX_ROWS * fheight;
836		717
837	szHint.base_width = szHint.base_height = 2 * int_bwidth;	718	szHint.base_width = szHint.base_height = 2 * int_bwidth;
838		719
839	sb_w = mb_h = 0;	720	sb_w = 0;
840	window_vt_x = window_vt_y = int_bwidth;	721	window_vt_x = window_vt_y = int_bwidth;
841		722
842	if (scrollbar_visible ())	723	if (scrollBar.state)
843	{	724	{
844	sb_w = scrollbar_TotalWidth ();	725	sb_w = scrollbar_TotalWidth ();
845	szHint.base_width += sb_w;	726	szHint.base_width += sb_w;
846	if (!OPTION (Opt_scrollBar_right))	727	if (!OPTION (Opt_scrollBar_right))
847	window_vt_x += sb_w;	728	window_vt_x += sb_w;
848	}	729	}
849		730
850	if (menubar_visible ())
851	{
852	mb_h = menuBar_TotalHeight ();
853	szHint.base_height += mb_h;
854	window_vt_y += mb_h;
855	}
856
857	szHint.width_inc = fwidth;	731	szHint.width_inc = fwidth;
858	szHint.height_inc = fheight;	732	szHint.height_inc = fheight;
859	szHint.min_width = szHint.base_width + szHint.width_inc;	733	szHint.min_width = szHint.base_width + szHint.width_inc;
860	szHint.min_height = szHint.base_height + szHint.height_inc;	734	szHint.min_height = szHint.base_height + szHint.height_inc;
861		735
…		…
879	{	753	{
880	min_it (height, max_height);	754	min_it (height, max_height);
881	szHint.height = szHint.base_height + height;	755	szHint.height = szHint.base_height + height;
882	}	756	}
883		757
884	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	758	if (scrollBar.state && OPTION (Opt_scrollBar_right))
885	window_sb_x = szHint.width - sb_w;	759	window_sb_x = szHint.width - sb_w;
886		760
887	if (recalc_x)	761	if (recalc_x)
888	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	762	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
889	if (recalc_y)	763	if (recalc_y)
…		…
903	* Called after a window size change.	777	* Called after a window size change.
904	*/	778	*/
905	void	779	void
906	rxvt_term::tt_winch ()	780	rxvt_term::tt_winch ()
907	{	781	{
908	if (pty.pty < 0)	782	if (pty->pty < 0)
909	return;	783	return;
910		784
911	struct winsize ws;	785	struct winsize ws;
912		786
913	ws.ws_col = ncol;	787	ws.ws_col = ncol;
914	ws.ws_row = nrow;	788	ws.ws_row = nrow;
915	ws.ws_xpixel = width;	789	ws.ws_xpixel = width;
916	ws.ws_ypixel = height;	790	ws.ws_ypixel = height;
917	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	791	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
918		792
919	#if 0	793	#if 0
920	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	794	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
921	if (cmd_pid) /* force through to the command */	795	if (cmd_pid) /* force through to the command */
922	kill (-cmd_pid, SIGWINCH);	796	kill (-cmd_pid, SIGWINCH);
…		…
1244		1118
1245	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1119	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1246		1120
1247	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1121	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1248	{	1122	{
1249	if (scrollbar_visible ())	1123	if (scrollBar.state)
1250	{	1124	{
1251	XMoveResizeWindow (disp, scrollBar.win,	1125	XMoveResizeWindow (disp, scrollBar.win,
1252	window_sb_x, 0,	1126	window_sb_x, 0,
1253	scrollbar_TotalWidth (), szHint.height);	1127	scrollbar_TotalWidth (), szHint.height);
1254	resize_scrollbar ();	1128	resize_scrollbar ();
1255	}	1129	}
1256
1257	if (menubar_visible ())
1258	XMoveResizeWindow (disp, menuBar.win,
1259	window_vt_x, 0,
1260	width, menuBar_TotalHeight ());
1261		1130
1262	XMoveResizeWindow (disp, vt,	1131	XMoveResizeWindow (disp, vt,
1263	window_vt_x, window_vt_y,	1132	window_vt_x, window_vt_y,
1264	width, height);	1133	width, height);
1265		1134
…		…
1713	XFree (preedit_attr);	1582	XFree (preedit_attr);
1714	XFree (status_attr);	1583	XFree (status_attr);
1715	}	1584	}
1716	#endif /* USE_XIM */	1585	#endif /* USE_XIM */
1717		1586
1718	/----------------------------------------------------------------------/
1719	rxvt_t rxvt_current_term;
1720
1721	/----------------------- end-of-file (C source) -----------------------/	1587	/----------------------- 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.178 by root, Mon Jan 16 08:29:57 2006 UTC vs. Revision 1.195 by root, Sun Jan 22 00:48:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.195 by root, Sun Jan 22 00:48:13 2006 UTC