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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.174 by root, Thu Jan 12 00:11:13 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	}	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),
…		…
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
190	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
191	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
		177	child_ev (this, &rxvt_term::child_cb),
192	check_ev (this, &rxvt_term::check_cb),	178	check_ev (this, &rxvt_term::check_cb),
193	flush_ev (this, &rxvt_term::flush_cb),	179	flush_ev (this, &rxvt_term::flush_cb),
194	destroy_ev (this, &rxvt_term::destroy_cb),	180	destroy_ev (this, &rxvt_term::destroy_cb),
195	pty_ev (this, &rxvt_term::pty_cb),	181	pty_ev (this, &rxvt_term::pty_cb),
196	incr_ev (this, &rxvt_term::incr_cb)	182	incr_ev (this, &rxvt_term::incr_cb)
…		…
199		185
200	termlist.push_back (this);	186	termlist.push_back (this);
201		187
202	#ifdef KEYSYM_RESOURCE	188	#ifdef KEYSYM_RESOURCE
203	keyboard = new keyboard_manager;	189	keyboard = new keyboard_manager;
204
205	if (!keyboard)
206	rxvt_fatal ("out of memory, aborting.\n");
207	#endif	190	#endif
208	}	191	}
209		192
210	// 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.
211	// for use before an emergency exit	194	// for use before an emergency exit
212	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
213	{	196	{
214	if (cmd_pid)	197	if (cmd_pid)
215	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
216		199
217	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
218	privileged_utmp (RESTORE);
219	#endif
220
221	pty.put ();
222	}	201	}
223		202
224	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
225	{	204	{
226	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228	termlist.erase (find (termlist.begin (), termlist.end(), this));	205	termlist.erase (find (termlist.begin (), termlist.end(), this));
229		206
230	emergency_cleanup ();	207	emergency_cleanup ();
231		208
232	#if ENABLE_STYLES	209	#if ENABLE_STYLES
…		…
242		219
243	selection_clear ();	220	selection_clear ();
244		221
245	#ifdef USE_XIM	222	#ifdef USE_XIM
246	im_destroy ();	223	im_destroy ();
247	#endif
248	#ifdef MENUBAR
249	if (menubarGC) XFreeGC (disp, menubarGC);
250	#endif	224	#endif
251	#ifdef XTERM_SCROLLBAR	225	#ifdef XTERM_SCROLLBAR
252	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253	if (ShadowGC) XFreeGC (disp, ShadowGC);	227	if (ShadowGC) XFreeGC (disp, ShadowGC);
254	#endif	228	#endif
…		…
265	if (upArrow) XFreePixmap (disp, upArrow);	239	if (upArrow) XFreePixmap (disp, upArrow);
266	if (downArrow) XFreePixmap (disp, downArrow);	240	if (downArrow) XFreePixmap (disp, downArrow);
267	if (upArrowHi) XFreePixmap (disp, upArrowHi);	241	if (upArrowHi) XFreePixmap (disp, upArrowHi);
268	if (downArrowHi) XFreePixmap (disp, downArrowHi);	242	if (downArrowHi) XFreePixmap (disp, downArrowHi);
269	#endif	243	#endif
270	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	244	#ifdef RXVT_SCROLLBAR
271	if (topShadowGC) XFreeGC (disp, topShadowGC);	245	if (topShadowGC) XFreeGC (disp, topShadowGC);
272	if (botShadowGC) XFreeGC (disp, botShadowGC);	246	if (botShadowGC) XFreeGC (disp, botShadowGC);
273	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274	#endif	248	#endif
275	if (gc) XFreeGC (disp, gc);	249	if (gc) XFreeGC (disp, gc);
276		250
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;	251	delete drawable;
283	// destroy all windows	252	// destroy all windows
284	if (parent[0])	253	if (parent[0])
285	XDestroyWindow (disp, parent[0]);	254	XDestroyWindow (disp, parent[0]);
286	}	255	}
…		…
315	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
316	delete keyboard;	285	delete keyboard;
317	#endif	286	#endif
318	}	287	}
319		288
		289	// child has exited, usually destroys
320	void	290	void
321	rxvt_term::child_exit ()	291	rxvt_term::child_cb (child_watcher &w, int status)
322	{	292	{
		293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		294
323	cmd_pid = 0;	295	cmd_pid = 0;
324		296
325	if (!OPTION (Opt_hold))	297	if (!OPTION (Opt_hold))
326	destroy ();	298	destroy ();
327	}	299	}
…		…
330	rxvt_term::destroy ()	302	rxvt_term::destroy ()
331	{	303	{
332	if (destroy_ev.active)	304	if (destroy_ev.active)
333	return;	305	return;
334		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		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	/----------------------------------------------------------------------/
…		…
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)
481	{	453	{
482	SET_R (this);	454	SET_R (this);
483
484	const char **cmd_argv;
485
486	{
487	TEMP_ENV; // few things in X do not call setlocale :(
488
489	set_locale ("");	455	set_locale ("");
		456	set_environ (envv); // few things in X do not call setlocale :(
490		457
491	if (!init_vars ())	458	if (!init_vars ())
492	return false;	459	return false;
493		460
494	init_secondary ();	461	init_secondary ();
495		462
496	cmd_argv = init_resources (argc, argv);	463	const char **cmd_argv = init_resources (argc, argv);
497		464
498	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
499	keyboard->register_done ();	466	keyboard->register_done ();
500	#endif	467	#endif
501
502	#if MENUBAR_MAX
503	menubar_read (rs[Rs_menu]);
504	#endif
505	#ifdef HAVE_SCROLLBARS
506	if (OPTION (Opt_scrollBar))
507	scrollBar.setIdle (); /* set existence for size calculations */
508	#endif
509	}
510		468
511	#if ENABLE_PERL	469	#if ENABLE_PERL
512	if (!rs[Rs_perl_ext_1])	470	if (!rs[Rs_perl_ext_1])
513	rs[Rs_perl_ext_1] = "default";	471	rs[Rs_perl_ext_1] = "default";
514		472
515	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])	473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])	474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))	475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
518	{	476	{
519	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520	// ignore some perl-related arguments if some bozo installed us set[ug]id
521	if (rxvt_tainted ())
522	{
523	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525	{
526	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527	rs[Rs_perl_lib] = 0;
528	rs[Rs_perl_eval] = 0;
529	}
530	}
531	#endif
532	rxvt_perl.init ();	477	rxvt_perl.init (this);
533	setlocale (LC_CTYPE, curlocale); // perl destroys this info
534	HOOK_INVOKE ((this, HOOK_INIT, DT_END));	478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535	}	479	}
536	#endif	480	#endif
537		481
538	{	482	#ifdef HAVE_SCROLLBARS
539	TEMP_ENV;	483	if (OPTION (Opt_scrollBar))
		484	scrollBar.setIdle (); /* set existence for size calculations */
		485	#endif
540		486
		487	pty = rxvt_new_ptytty ();
		488
541	create_windows (argc, argv);	489	create_windows (argc, argv);
542		490
543	dDisp;	491	dDisp;
544		492
545	init_xlocale ();	493	init_xlocale ();
546		494
547	scr_reset (); // initialize screen	495	scr_reset (); // initialize screen
548		496
549	#if 0	497	#if 0
550	XSynchronize (disp, True);	498	XSynchronize (disp, True);
551	#endif	499	#endif
552		500
553	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
554	if (OPTION (Opt_scrollBar))	502	if (OPTION (Opt_scrollBar))
555	resize_scrollbar (); /* create and map scrollbar */	503	resize_scrollbar (); /* create and map scrollbar */
556	#endif
557	#if (MENUBAR_MAX)
558	if (menubar_visible ())
559	XMapWindow (disp, menuBar.win);
560	#endif	504	#endif
561	#ifdef TRANSPARENT	505	#ifdef TRANSPARENT
562	if (OPTION (Opt_transparent))	506	if (OPTION (Opt_transparent))
563	{	507	{
564	XSelectInput (disp, display->root, PropertyChangeMask);	508	XSelectInput (disp, display->root, PropertyChangeMask);
565	check_our_parents ();	509	check_our_parents ();
566	rootwin_ev.start (display, display->root);	510	rootwin_ev.start (display, display->root);
567	}	511	}
568	#endif	512	#endif
569		513
570	XMapWindow (disp, vt);
571	XMapWindow (disp, parent[0]);
572
573	set_colorfgbg ();	514	set_colorfgbg ();
574		515
575	init_command (cmd_argv);	516	init_command (cmd_argv);
576		517
577	free (cmd_argv);	518	free (cmd_argv);
578		519
579	if (pty.pty >= 0)	520	if (pty->pty >= 0)
580	pty_ev.start (pty.pty, EVENT_READ);	521	pty_ev.start (pty->pty, EVENT_READ);
581		522
582	check_ev.start ();	523	check_ev.start ();
583		524
584	HOOK_INVOKE ((this, HOOK_START, DT_END));	525	HOOK_INVOKE ((this, HOOK_START, DT_END));
585	}	526
		527	XMapWindow (disp, vt);
		528	XMapWindow (disp, parent[0]);
586		529
587	return true;	530	return true;
588	}	531	}
589		532
590	static struct sig_handlers	533	static struct sig_handlers
591	{	534	{
592	sig_watcher sw_chld, sw_term, sw_int;	535	sig_watcher sw_term, sw_int;
593		536
594	void sig_chld (sig_watcher &w)
595	{
596	// we are being called for every SIGCHLD, find the corresponding term
597	int pid;
598
599	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
600	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
601	if (pid == (*t)->cmd_pid)
602	{
603	(*t)->child_exit ();
604	break;
605	}
606	}
607
608	/*	537	/*
609	* Catch a fatal signal and tidy up before quitting	538	* Catch a fatal signal and tidy up before quitting
610	*/	539	*/
611	void	540	void
612	sig_term (sig_watcher &w)	541	sig_term (sig_watcher &w)
…		…
618	signal (w.signum, SIG_DFL);	547	signal (w.signum, SIG_DFL);
619	kill (getpid (), w.signum);	548	kill (getpid (), w.signum);
620	}	549	}
621		550
622	sig_handlers ()	551	sig_handlers ()
623	: sw_chld (this, &sig_handlers::sig_chld),
624	sw_term (this, &sig_handlers::sig_term),	552	: sw_term (this, &sig_handlers::sig_term),
625	sw_int (this, &sig_handlers::sig_term)	553	sw_int (this, &sig_handlers::sig_term)
626	{	554	{
627	}	555	}
628	} sig_handlers;	556	} sig_handlers;
629		557
		558	char **rxvt_environ; // startup environment
		559
630	void	560	void
631	rxvt_init ()	561	rxvt_init ()
632	{	562	{
633	/*	563	uid_t uid = getuid ();
634	* Save and then give up any super-user privileges	564	gid_t gid = getgid ();
635	* If we need privileges in any area then we must specifically request it.	565
636	* We should only need to be root in these cases:	566	// before doing anything else, check for setuid/setgid operation,
637	* 1. write utmp entries on some systems	567	// start the helper process and drop privileges
638	* 2. chown tty on some systems	568	if (uid != geteuid ()
639	*/	569	\|\| gid != getegid ())
640	rxvt_privileges (SAVE);	570	{
641	rxvt_privileges (IGNORE);	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
		594	rxvt_environ = environ;
642		595
643	signal (SIGHUP, SIG_IGN);	596	signal (SIGHUP, SIG_IGN);
644	signal (SIGPIPE, SIG_IGN);	597	signal (SIGPIPE, SIG_IGN);
645		598
646	sig_handlers.sw_chld.start (SIGCHLD);
647	sig_handlers.sw_term.start (SIGTERM);	599	sig_handlers.sw_term.start (SIGTERM);
648	sig_handlers.sw_int.start (SIGINT);	600	sig_handlers.sw_int.start (SIGINT);
649		601
650	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	602	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
651	/* signal (SIGURG, SIG_DFL); */	603	/* signal (SIGURG, SIG_DFL); */
…		…
680	rxvt_fatal ("memory allocation failure. aborting.\n");	632	rxvt_fatal ("memory allocation failure. aborting.\n");
681		633
682	return p;	634	return p;
683	}	635	}
684		636
685	void *	637	void *
686	rxvt_realloc (void *ptr, size_t size)	638	rxvt_realloc (void *ptr, size_t size)
687	{	639	{
688	void *p = realloc (ptr, size);	640	void *p = realloc (ptr, size);
689		641
690	if (!p)	642	if (!p)
691	rxvt_fatal ("memory allocation failure. aborting.\n");	643	rxvt_fatal ("memory allocation failure. aborting.\n");
692		644
693	return p;	645	return p;
694	}	646	}
695
696	/* ------------------------------------------------------------------------- *
697	* PRIVILEGED OPERATIONS *
698	* ------------------------------------------------------------------------- */
699	/* take care of suid/sgid super-user (root) privileges */
700	void
701	rxvt_privileges (rxvt_privaction action)
702	{
703	#if ! defined(__CYGWIN32__)
704	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
705	/* setreuid () is the poor man's setuid (), seteuid () */
706	# define seteuid(a) setreuid(-1, (a))
707	# define setegid(a) setregid(-1, (a))
708	# define HAVE_SETEUID
709	# endif
710	# ifdef HAVE_SETEUID
711	switch (action)
712	{
713	case IGNORE:
714	/*
715	* change effective uid/gid - not real uid/gid - so we can switch
716	* back to root later, as required
717	*/
718	setegid (getgid ());
719	seteuid (getuid ());
720	break;
721	case SAVE:
722	saved_egid = getegid ();
723	saved_euid = geteuid ();
724	break;
725	case RESTORE:
726	setegid (saved_egid);
727	seteuid (saved_euid);
728	break;
729	}
730	# else
731	switch (action)
732	{
733	case IGNORE:
734	setgid (getgid ());
735	setuid (getuid ());
736	/* FALLTHROUGH */
737	case SAVE:
738	/* FALLTHROUGH */
739	case RESTORE:
740	break;
741	}
742	# endif
743	#endif
744	}
745
746	#ifdef UTMP_SUPPORT
747	void
748	rxvt_term::privileged_utmp (rxvt_privaction action)
749	{
750	if (OPTION (Opt_utmpInhibit)
751	\|\| !pty.name \|\| !*pty.name)
752	return;
753
754	rxvt_privileges (RESTORE);
755
756	if (action == SAVE)
757	makeutent (pty.name, rs[Rs_display_name]);
758	else
759	cleanutent ();
760
761	rxvt_privileges (IGNORE);
762	}
763	#endif
764		647
765	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
766	/*	649	/*
767	* window size/position calculcations for XSizeHint and other storage.	650	* window size/position calculcations for XSizeHint and other storage.
768	* if width/height are non-zero then override calculated width/height	651	* if width/height are non-zero then override calculated width/height
769	*/	652	*/
770	void	653	void
771	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	654	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
772	{	655	{
773	short recalc_x, recalc_y;	656	short recalc_x, recalc_y;
774	int x, y, sb_w, mb_h, flags;	657	int x, y, sb_w, flags;
775	unsigned int w, h;	658	unsigned int w, h;
776	unsigned int max_width, max_height;	659	unsigned int max_width, max_height;
777	dDisp;	660	dDisp;
778		661
779	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",
…		…
840	max_width = MAX_COLS * fwidth;	723	max_width = MAX_COLS * fwidth;
841	max_height = MAX_ROWS * fheight;	724	max_height = MAX_ROWS * fheight;
842		725
843	szHint.base_width = szHint.base_height = 2 * int_bwidth;	726	szHint.base_width = szHint.base_height = 2 * int_bwidth;
844		727
845	sb_w = mb_h = 0;	728	sb_w = 0;
846	window_vt_x = window_vt_y = int_bwidth;	729	window_vt_x = window_vt_y = int_bwidth;
847		730
848	if (scrollbar_visible ())	731	if (scrollBar.state)
849	{	732	{
850	sb_w = scrollbar_TotalWidth ();	733	sb_w = scrollbar_TotalWidth ();
851	szHint.base_width += sb_w;	734	szHint.base_width += sb_w;
852	if (!OPTION (Opt_scrollBar_right))	735	if (!OPTION (Opt_scrollBar_right))
853	window_vt_x += sb_w;	736	window_vt_x += sb_w;
854	}	737	}
855		738
856	if (menubar_visible ())
857	{
858	mb_h = menuBar_TotalHeight ();
859	szHint.base_height += mb_h;
860	window_vt_y += mb_h;
861	}
862
863	szHint.width_inc = fwidth;	739	szHint.width_inc = fwidth;
864	szHint.height_inc = fheight;	740	szHint.height_inc = fheight;
865	szHint.min_width = szHint.base_width + szHint.width_inc;	741	szHint.min_width = szHint.base_width + szHint.width_inc;
866	szHint.min_height = szHint.base_height + szHint.height_inc;	742	szHint.min_height = szHint.base_height + szHint.height_inc;
867		743
…		…
885	{	761	{
886	min_it (height, max_height);	762	min_it (height, max_height);
887	szHint.height = szHint.base_height + height;	763	szHint.height = szHint.base_height + height;
888	}	764	}
889		765
890	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	766	if (scrollBar.state && OPTION (Opt_scrollBar_right))
891	window_sb_x = szHint.width - sb_w;	767	window_sb_x = szHint.width - sb_w;
892		768
893	if (recalc_x)	769	if (recalc_x)
894	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	770	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
895	if (recalc_y)	771	if (recalc_y)
…		…
909	* Called after a window size change.	785	* Called after a window size change.
910	*/	786	*/
911	void	787	void
912	rxvt_term::tt_winch ()	788	rxvt_term::tt_winch ()
913	{	789	{
914	if (pty.pty < 0)	790	if (pty->pty < 0)
915	return;	791	return;
916		792
917	struct winsize ws;	793	struct winsize ws;
918		794
919	ws.ws_col = ncol;	795	ws.ws_col = ncol;
920	ws.ws_row = nrow;	796	ws.ws_row = nrow;
921	ws.ws_xpixel = width;	797	ws.ws_xpixel = width;
922	ws.ws_ypixel = height;	798	ws.ws_ypixel = height;
923	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	799	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
924		800
925	#if 0	801	#if 0
926	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	802	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
927	if (cmd_pid) /* force through to the command */	803	if (cmd_pid) /* force through to the command */
928	kill (-cmd_pid, SIGWINCH);	804	kill (-cmd_pid, SIGWINCH);
…		…
1250		1126
1251	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1127	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1252		1128
1253	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1129	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1254	{	1130	{
1255	if (scrollbar_visible ())	1131	if (scrollBar.state)
1256	{	1132	{
1257	XMoveResizeWindow (disp, scrollBar.win,	1133	XMoveResizeWindow (disp, scrollBar.win,
1258	window_sb_x, 0,	1134	window_sb_x, 0,
1259	scrollbar_TotalWidth (), szHint.height);	1135	scrollbar_TotalWidth (), szHint.height);
1260	resize_scrollbar ();	1136	resize_scrollbar ();
1261	}	1137	}
1262
1263	if (menubar_visible ())
1264	XMoveResizeWindow (disp, menuBar.win,
1265	window_vt_x, 0,
1266	width, menuBar_TotalHeight ());
1267		1138
1268	XMoveResizeWindow (disp, vt,	1139	XMoveResizeWindow (disp, vt,
1269	window_vt_x, window_vt_y,	1140	window_vt_x, window_vt_y,
1270	width, height);	1141	width, height);
1271		1142
…		…
1456	unsigned long fg, bg;	1327	unsigned long fg, bg;
1457	const char *p;	1328	const char *p;
1458	char **s;	1329	char **s;
1459	XIMStyles *xim_styles;	1330	XIMStyles *xim_styles;
1460		1331
1461	TEMP_ENV;	1332	set_environ (envv);
1462		1333
1463	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1334	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1464	return false;	1335	return false;
1465		1336
1466	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1337	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1632	int i;	1503	int i;
1633	const char *p;	1504	const char *p;
1634	char **s;	1505	char **s;
1635	char buf[IMBUFSIZ];	1506	char buf[IMBUFSIZ];
1636		1507
1637	SET_R (this);	1508	make_current ();
1638		1509
1639	im_destroy ();	1510	im_destroy ();
1640		1511
1641	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1512	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1642	if (Input_Context)	1513	if (Input_Context)
…		…
1719	XFree (preedit_attr);	1590	XFree (preedit_attr);
1720	XFree (status_attr);	1591	XFree (status_attr);
1721	}	1592	}
1722	#endif /* USE_XIM */	1593	#endif /* USE_XIM */
1723		1594
1724	/----------------------------------------------------------------------/
1725	rxvt_t rxvt_current_term;
1726
1727	/----------------------- 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.174 by root, Thu Jan 12 00:11:13 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.174 by root, Thu Jan 12 00:11:13 2006 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC