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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 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	}
93
94	void
95	rxvt_term::make_current () const
96	{
97	SET_R (this);
98	rxvt_set_locale (locale);
99	set_environ (envv);
100	}	80	}
101		81
102	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
103	class rxvt_composite_vec rxvt_composite;	83	class rxvt_composite_vec rxvt_composite;
104		84
…		…
169	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
170	#endif	150	#endif
171	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
172	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
173	#endif	153	#endif
174	#ifdef MENUBAR
175	menubar_ev (this, &rxvt_term::x_cb),
176	#endif
177	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
178	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179	#endif	156	#endif
180	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
181	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
195	#ifdef USE_XIM	172	#ifdef USE_XIM
196	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
197	#endif	174	#endif
198	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
199	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
		177	child_ev (this, &rxvt_term::child_cb),
200	check_ev (this, &rxvt_term::check_cb),	178	check_ev (this, &rxvt_term::check_cb),
201	flush_ev (this, &rxvt_term::flush_cb),	179	flush_ev (this, &rxvt_term::flush_cb),
202	destroy_ev (this, &rxvt_term::destroy_cb),	180	destroy_ev (this, &rxvt_term::destroy_cb),
203	pty_ev (this, &rxvt_term::pty_cb),	181	pty_ev (this, &rxvt_term::pty_cb),
204	incr_ev (this, &rxvt_term::incr_cb)	182	incr_ev (this, &rxvt_term::incr_cb)
…		…
207		185
208	termlist.push_back (this);	186	termlist.push_back (this);
209		187
210	#ifdef KEYSYM_RESOURCE	188	#ifdef KEYSYM_RESOURCE
211	keyboard = new keyboard_manager;	189	keyboard = new keyboard_manager;
212
213	if (!keyboard)
214	rxvt_fatal ("out of memory, aborting.\n");
215	#endif	190	#endif
216	}	191	}
217		192
218	// clean up the most important stuff, do not call x or free mem etc.	193	// clean up the most important stuff, do not call x or free mem etc.
219	// for use before an emergency exit	194	// for use before an emergency exit
220	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
221	{	196	{
222	if (cmd_pid)	197	if (cmd_pid)
223	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
224		199
225	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
226	privileged_utmp (RESTORE);
227	#endif
228
229	pty.put ();
230	}	201	}
231		202
232	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
233	{	204	{
234	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
235
236	termlist.erase (find (termlist.begin (), termlist.end(), this));	205	termlist.erase (find (termlist.begin (), termlist.end(), this));
237		206
238	emergency_cleanup ();	207	emergency_cleanup ();
239		208
240	#if ENABLE_STYLES	209	#if ENABLE_STYLES
…		…
250		219
251	selection_clear ();	220	selection_clear ();
252		221
253	#ifdef USE_XIM	222	#ifdef USE_XIM
254	im_destroy ();	223	im_destroy ();
255	#endif
256	#ifdef MENUBAR
257	if (menubarGC) XFreeGC (disp, menubarGC);
258	#endif	224	#endif
259	#ifdef XTERM_SCROLLBAR	225	#ifdef XTERM_SCROLLBAR
260	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
261	if (ShadowGC) XFreeGC (disp, ShadowGC);	227	if (ShadowGC) XFreeGC (disp, ShadowGC);
262	#endif	228	#endif
…		…
273	if (upArrow) XFreePixmap (disp, upArrow);	239	if (upArrow) XFreePixmap (disp, upArrow);
274	if (downArrow) XFreePixmap (disp, downArrow);	240	if (downArrow) XFreePixmap (disp, downArrow);
275	if (upArrowHi) XFreePixmap (disp, upArrowHi);	241	if (upArrowHi) XFreePixmap (disp, upArrowHi);
276	if (downArrowHi) XFreePixmap (disp, downArrowHi);	242	if (downArrowHi) XFreePixmap (disp, downArrowHi);
277	#endif	243	#endif
278	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	244	#ifdef RXVT_SCROLLBAR
279	if (topShadowGC) XFreeGC (disp, topShadowGC);	245	if (topShadowGC) XFreeGC (disp, topShadowGC);
280	if (botShadowGC) XFreeGC (disp, botShadowGC);	246	if (botShadowGC) XFreeGC (disp, botShadowGC);
281	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
282	#endif	248	#endif
283	if (gc) XFreeGC (disp, gc);	249	if (gc) XFreeGC (disp, gc);
284		250
285	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
286	delete menuBar.drawable;
287	//if (menuBar.win)
288	// XDestroyWindow (disp, menuBar.win);
289	#endif
290	delete drawable;	251	delete drawable;
291	// destroy all windows	252	// destroy all windows
292	if (parent[0])	253	if (parent[0])
293	XDestroyWindow (disp, parent[0]);	254	XDestroyWindow (disp, parent[0]);
294	}	255	}
…		…
323	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
324	delete keyboard;	285	delete keyboard;
325	#endif	286	#endif
326	}	287	}
327		288
		289	// child has exited, usually destroys
328	void	290	void
329	rxvt_term::child_exit ()	291	rxvt_term::child_cb (child_watcher &w, int status)
330	{	292	{
		293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		294
331	cmd_pid = 0;	295	cmd_pid = 0;
332		296
333	if (!OPTION (Opt_hold))	297	if (!OPTION (Opt_hold))
334	destroy ();	298	destroy ();
335	}	299	}
…		…
338	rxvt_term::destroy ()	302	rxvt_term::destroy ()
339	{	303	{
340	if (destroy_ev.active)	304	if (destroy_ev.active)
341	return;	305	return;
342		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		309
343	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
344	scr_overlay_off ();	311	scr_overlay_off ();
345	#endif	312	#endif
346		313
347	if (display)	314	if (display)
…		…
349	#if USE_XIM	316	#if USE_XIM
350	im_ev.stop (display);	317	im_ev.stop (display);
351	#endif	318	#endif
352	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
353	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
354	#endif
355	#if MENUBAR
356	menubar_ev.stop (display);
357	#endif	321	#endif
358	#if TRANSPARENT	322	#if TRANSPARENT
359	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
360	#endif	324	#endif
361	incr_ev.stop ();	325	incr_ev.stop ();
…		…
500		464
501	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
502	keyboard->register_done ();	466	keyboard->register_done ();
503	#endif	467	#endif
504		468
505	#if MENUBAR_MAX	469	#if ENABLE_PERL
506	menubar_read (rs[Rs_menu]);	470	if (!rs[Rs_perl_ext_1])
		471	rs[Rs_perl_ext_1] = "default";
		472
		473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		476	{
		477	rxvt_perl.init (this);
		478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		479	}
507	#endif	480	#endif
		481
508	#ifdef HAVE_SCROLLBARS	482	#ifdef HAVE_SCROLLBARS
509	if (OPTION (Opt_scrollBar))	483	if (OPTION (Opt_scrollBar))
510	scrollBar.setIdle (); /* set existence for size calculations */	484	scrollBar.setIdle (); /* set existence for size calculations */
511	#endif	485	#endif
512		486
513	#if ENABLE_PERL	487	pty = rxvt_new_ptytty ();
514	if (!rs[Rs_perl_ext_1])
515	rs[Rs_perl_ext_1] = "default";
516
517	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
518	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
519	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520	{
521	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
522	// ignore some perl-related arguments if some bozo installed us set[ug]id
523	if (rxvt_tainted ())
524	{
525	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
526	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
527	{
528	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
529	rs[Rs_perl_lib] = 0;
530	rs[Rs_perl_eval] = 0;
531	}
532	}
533	#endif
534	rxvt_perl.init ();
535	setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537	}
538	#endif
539		488
540	create_windows (argc, argv);	489	create_windows (argc, argv);
541		490
542	dDisp;	491	dDisp;
543		492
…		…
551		500
552	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
553	if (OPTION (Opt_scrollBar))	502	if (OPTION (Opt_scrollBar))
554	resize_scrollbar (); /* create and map scrollbar */	503	resize_scrollbar (); /* create and map scrollbar */
555	#endif	504	#endif
556	#if (MENUBAR_MAX)
557	if (menubar_visible ())
558	XMapWindow (disp, menuBar.win);
559	#endif
560	#ifdef TRANSPARENT	505	#ifdef TRANSPARENT
561	if (OPTION (Opt_transparent))	506	if (OPTION (Opt_transparent))
562	{	507	{
563	XSelectInput (disp, display->root, PropertyChangeMask);	508	XSelectInput (disp, display->root, PropertyChangeMask);
564	check_our_parents ();	509	check_our_parents ();
565	rootwin_ev.start (display, display->root);	510	rootwin_ev.start (display, display->root);
566	}	511	}
567	#endif	512	#endif
568		513
		514	set_colorfgbg ();
		515
		516	init_command (cmd_argv);
		517
		518	free (cmd_argv);
		519
		520	if (pty->pty >= 0)
		521	pty_ev.start (pty->pty, EVENT_READ);
		522
		523	check_ev.start ();
		524
		525	HOOK_INVOKE ((this, HOOK_START, DT_END));
		526
569	XMapWindow (disp, vt);	527	XMapWindow (disp, vt);
570	XMapWindow (disp, parent[0]);	528	XMapWindow (disp, parent[0]);
571		529
572	set_colorfgbg ();
573
574	init_command (cmd_argv);
575
576	free (cmd_argv);
577
578	if (pty.pty >= 0)
579	pty_ev.start (pty.pty, EVENT_READ);
580
581	check_ev.start ();
582
583	HOOK_INVOKE ((this, HOOK_START, DT_END));
584
585	return true;	530	return true;
586	}	531	}
587		532
588	static struct sig_handlers	533	static struct sig_handlers
589	{	534	{
590	sig_watcher sw_chld, sw_term, sw_int;	535	sig_watcher sw_term, sw_int;
591		536
592	void sig_chld (sig_watcher &w)
593	{
594	// we are being called for every SIGCHLD, find the corresponding term
595	int pid;
596
597	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
598	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
599	if (pid == (*t)->cmd_pid)
600	{
601	(*t)->child_exit ();
602	break;
603	}
604	}
605
606	/*	537	/*
607	* Catch a fatal signal and tidy up before quitting	538	* Catch a fatal signal and tidy up before quitting
608	*/	539	*/
609	void	540	void
610	sig_term (sig_watcher &w)	541	sig_term (sig_watcher &w)
…		…
616	signal (w.signum, SIG_DFL);	547	signal (w.signum, SIG_DFL);
617	kill (getpid (), w.signum);	548	kill (getpid (), w.signum);
618	}	549	}
619		550
620	sig_handlers ()	551	sig_handlers ()
621	: sw_chld (this, &sig_handlers::sig_chld),
622	sw_term (this, &sig_handlers::sig_term),	552	: sw_term (this, &sig_handlers::sig_term),
623	sw_int (this, &sig_handlers::sig_term)	553	sw_int (this, &sig_handlers::sig_term)
624	{	554	{
625	}	555	}
626	} sig_handlers;	556	} sig_handlers;
627		557
628	char **rxvt_environ; // startup environment	558	char **rxvt_environ; // startup environment
629		559
630	void	560	void
631	rxvt_init ()	561	rxvt_init ()
632	{	562	{
		563	uid_t uid = getuid ();
		564	gid_t gid = getgid ();
		565
		566	// before doing anything else, check for setuid/setgid operation,
		567	// start the helper process and drop privileges
		568	if (uid != geteuid ()
		569	\|\| gid != getegid ())
		570	{
		571	#if PTYTTY_HELPER
		572	rxvt_ptytty_server ();
		573	#else
		574	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		575	#endif
		576
		577	// drop privileges
		578	#if HAVE_SETRESUID
		579	setresgid (gid, gid, gid);
		580	setresuid (uid, uid, uid);
		581	#elif HAVE_SETREUID
		582	setregid (gid, gid);
		583	setreuid (uid, uid);
		584	#elif HAVE_SETUID
		585	setgid (gid);
		586	setuid (uid);
		587	#endif
		588
		589	if (uid != geteuid ()
		590	\|\| gid != getegid ())
		591	rxvt_fatal ("unable to drop privileges, aborting.\n");
		592	}
		593
633	rxvt_environ = environ;	594	rxvt_environ = environ;
634
635	/*
636	* Save and then give up any super-user privileges
637	* If we need privileges in any area then we must specifically request it.
638	* We should only need to be root in these cases:
639	* 1. write utmp entries on some systems
640	* 2. chown tty on some systems
641	*/
642	rxvt_privileges (SAVE);
643	rxvt_privileges (IGNORE);
644		595
645	signal (SIGHUP, SIG_IGN);	596	signal (SIGHUP, SIG_IGN);
646	signal (SIGPIPE, SIG_IGN);	597	signal (SIGPIPE, SIG_IGN);
647		598
648	sig_handlers.sw_chld.start (SIGCHLD);
649	sig_handlers.sw_term.start (SIGTERM);	599	sig_handlers.sw_term.start (SIGTERM);
650	sig_handlers.sw_int.start (SIGINT);	600	sig_handlers.sw_int.start (SIGINT);
651		601
652	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	602	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
653	/* signal (SIGURG, SIG_DFL); */	603	/* signal (SIGURG, SIG_DFL); */
…		…
682	rxvt_fatal ("memory allocation failure. aborting.\n");	632	rxvt_fatal ("memory allocation failure. aborting.\n");
683		633
684	return p;	634	return p;
685	}	635	}
686		636
687	void *	637	void *
688	rxvt_realloc (void *ptr, size_t size)	638	rxvt_realloc (void *ptr, size_t size)
689	{	639	{
690	void *p = realloc (ptr, size);	640	void *p = realloc (ptr, size);
691		641
692	if (!p)	642	if (!p)
693	rxvt_fatal ("memory allocation failure. aborting.\n");	643	rxvt_fatal ("memory allocation failure. aborting.\n");
694		644
695	return p;	645	return p;
696	}	646	}
697
698	/* ------------------------------------------------------------------------- *
699	* PRIVILEGED OPERATIONS *
700	* ------------------------------------------------------------------------- */
701	/* take care of suid/sgid super-user (root) privileges */
702	void
703	rxvt_privileges (rxvt_privaction action)
704	{
705	#if ! defined(__CYGWIN32__)
706	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707	/* setreuid () is the poor man's setuid (), seteuid () */
708	# define seteuid(a) setreuid(-1, (a))
709	# define setegid(a) setregid(-1, (a))
710	# define HAVE_SETEUID
711	# endif
712	# ifdef HAVE_SETEUID
713	switch (action)
714	{
715	case IGNORE:
716	/*
717	* change effective uid/gid - not real uid/gid - so we can switch
718	* back to root later, as required
719	*/
720	setegid (getgid ());
721	seteuid (getuid ());
722	break;
723	case SAVE:
724	saved_egid = getegid ();
725	saved_euid = geteuid ();
726	break;
727	case RESTORE:
728	setegid (saved_egid);
729	seteuid (saved_euid);
730	break;
731	}
732	# else
733	switch (action)
734	{
735	case IGNORE:
736	setgid (getgid ());
737	setuid (getuid ());
738	/* FALLTHROUGH */
739	case SAVE:
740	/* FALLTHROUGH */
741	case RESTORE:
742	break;
743	}
744	# endif
745	#endif
746	}
747
748	#ifdef UTMP_SUPPORT
749	void
750	rxvt_term::privileged_utmp (rxvt_privaction action)
751	{
752	if (OPTION (Opt_utmpInhibit)
753	\|\| !pty.name \|\| !*pty.name)
754	return;
755
756	rxvt_privileges (RESTORE);
757
758	if (action == SAVE)
759	makeutent (pty.name, rs[Rs_display_name]);
760	else
761	cleanutent ();
762
763	rxvt_privileges (IGNORE);
764	}
765	#endif
766		647
767	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
768	/*	649	/*
769	* window size/position calculcations for XSizeHint and other storage.	650	* window size/position calculcations for XSizeHint and other storage.
770	* if width/height are non-zero then override calculated width/height	651	* if width/height are non-zero then override calculated width/height
771	*/	652	*/
772	void	653	void
773	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	654	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
774	{	655	{
775	short recalc_x, recalc_y;	656	short recalc_x, recalc_y;
776	int x, y, sb_w, mb_h, flags;	657	int x, y, sb_w, flags;
777	unsigned int w, h;	658	unsigned int w, h;
778	unsigned int max_width, max_height;	659	unsigned int max_width, max_height;
779	dDisp;	660	dDisp;
780		661
781	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	662	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
842	max_width = MAX_COLS * fwidth;	723	max_width = MAX_COLS * fwidth;
843	max_height = MAX_ROWS * fheight;	724	max_height = MAX_ROWS * fheight;
844		725
845	szHint.base_width = szHint.base_height = 2 * int_bwidth;	726	szHint.base_width = szHint.base_height = 2 * int_bwidth;
846		727
847	sb_w = mb_h = 0;	728	sb_w = 0;
848	window_vt_x = window_vt_y = int_bwidth;	729	window_vt_x = window_vt_y = int_bwidth;
849		730
850	if (scrollbar_visible ())	731	if (scrollBar.state)
851	{	732	{
852	sb_w = scrollbar_TotalWidth ();	733	sb_w = scrollbar_TotalWidth ();
853	szHint.base_width += sb_w;	734	szHint.base_width += sb_w;
854	if (!OPTION (Opt_scrollBar_right))	735	if (!OPTION (Opt_scrollBar_right))
855	window_vt_x += sb_w;	736	window_vt_x += sb_w;
856	}	737	}
857		738
858	if (menubar_visible ())
859	{
860	mb_h = menuBar_TotalHeight ();
861	szHint.base_height += mb_h;
862	window_vt_y += mb_h;
863	}
864
865	szHint.width_inc = fwidth;	739	szHint.width_inc = fwidth;
866	szHint.height_inc = fheight;	740	szHint.height_inc = fheight;
867	szHint.min_width = szHint.base_width + szHint.width_inc;	741	szHint.min_width = szHint.base_width + szHint.width_inc;
868	szHint.min_height = szHint.base_height + szHint.height_inc;	742	szHint.min_height = szHint.base_height + szHint.height_inc;
869		743
…		…
887	{	761	{
888	min_it (height, max_height);	762	min_it (height, max_height);
889	szHint.height = szHint.base_height + height;	763	szHint.height = szHint.base_height + height;
890	}	764	}
891		765
892	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	766	if (scrollBar.state && OPTION (Opt_scrollBar_right))
893	window_sb_x = szHint.width - sb_w;	767	window_sb_x = szHint.width - sb_w;
894		768
895	if (recalc_x)	769	if (recalc_x)
896	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	770	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
897	if (recalc_y)	771	if (recalc_y)
…		…
911	* Called after a window size change.	785	* Called after a window size change.
912	*/	786	*/
913	void	787	void
914	rxvt_term::tt_winch ()	788	rxvt_term::tt_winch ()
915	{	789	{
916	if (pty.pty < 0)	790	if (pty->pty < 0)
917	return;	791	return;
918		792
919	struct winsize ws;	793	struct winsize ws;
920		794
921	ws.ws_col = ncol;	795	ws.ws_col = ncol;
922	ws.ws_row = nrow;	796	ws.ws_row = nrow;
923	ws.ws_xpixel = width;	797	ws.ws_xpixel = width;
924	ws.ws_ypixel = height;	798	ws.ws_ypixel = height;
925	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	799	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
926		800
927	#if 0	801	#if 0
928	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	802	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
929	if (cmd_pid) /* force through to the command */	803	if (cmd_pid) /* force through to the command */
930	kill (-cmd_pid, SIGWINCH);	804	kill (-cmd_pid, SIGWINCH);
…		…
1252		1126
1253	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1127	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1254		1128
1255	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1129	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1256	{	1130	{
1257	if (scrollbar_visible ())	1131	if (scrollBar.state)
1258	{	1132	{
1259	XMoveResizeWindow (disp, scrollBar.win,	1133	XMoveResizeWindow (disp, scrollBar.win,
1260	window_sb_x, 0,	1134	window_sb_x, 0,
1261	scrollbar_TotalWidth (), szHint.height);	1135	scrollbar_TotalWidth (), szHint.height);
1262	resize_scrollbar ();	1136	resize_scrollbar ();
1263	}	1137	}
1264
1265	if (menubar_visible ())
1266	XMoveResizeWindow (disp, menuBar.win,
1267	window_vt_x, 0,
1268	width, menuBar_TotalHeight ());
1269		1138
1270	XMoveResizeWindow (disp, vt,	1139	XMoveResizeWindow (disp, vt,
1271	window_vt_x, window_vt_y,	1140	window_vt_x, window_vt_y,
1272	width, height);	1141	width, height);
1273		1142
…		…
1721	XFree (preedit_attr);	1590	XFree (preedit_attr);
1722	XFree (status_attr);	1591	XFree (status_attr);
1723	}	1592	}
1724	#endif /* USE_XIM */	1593	#endif /* USE_XIM */
1725		1594
1726	/----------------------------------------------------------------------/
1727	rxvt_t rxvt_current_term;
1728
1729	/----------------------- end-of-file (C source) -----------------------/	1595	/----------------------- 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.177 by root, Mon Jan 16 06:37:52 2006 UTC vs. Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC