[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.193 by root, Sat Jan 21 14:25:05 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 ();
…		…
377	}	352	}
378		353
379	void	354	void
380	rxvt_term::destroy_cb (time_watcher &w)	355	rxvt_term::destroy_cb (time_watcher &w)
381	{	356	{
382	SET_R (this);	357	make_current ();
383		358
384	delete this;	359	delete this;
385	}	360	}
386		361
387	/----------------------------------------------------------------------/	362	/----------------------------------------------------------------------/
…		…
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)
481	{	456	{
482	SET_R (this);	457	SET_R (this);
483	TEMP_ENV; // few things in X do not call setlocale :(
484
485	set_locale ("");	458	set_locale ("");
		459	set_environ (envv); // few things in X do not call setlocale :(
486		460
487	if (!init_vars ())	461	if (!init_vars ())
488	return false;	462	return false;
489		463
490	init_secondary ();	464	init_secondary ();
…		…
493		467
494	#ifdef KEYSYM_RESOURCE	468	#ifdef KEYSYM_RESOURCE
495	keyboard->register_done ();	469	keyboard->register_done ();
496	#endif	470	#endif
497		471
498	#if MENUBAR_MAX
499	menubar_read (rs[Rs_menu]);
500	#endif
501	#ifdef HAVE_SCROLLBARS	472	#ifdef HAVE_SCROLLBARS
502	if (OPTION (Opt_scrollBar))	473	if (OPTION (Opt_scrollBar))
503	scrollBar.setIdle (); /* set existence for size calculations */	474	scrollBar.setIdle (); /* set existence for size calculations */
504	#endif	475	#endif
505		476
506	#if ENABLE_PERL	477	pty = rxvt_new_ptytty ();
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		478
533	create_windows (argc, argv);	479	create_windows (argc, argv);
534		480
535	dDisp;	481	dDisp;
536		482
…		…
544		490
545	#ifdef HAVE_SCROLLBARS	491	#ifdef HAVE_SCROLLBARS
546	if (OPTION (Opt_scrollBar))	492	if (OPTION (Opt_scrollBar))
547	resize_scrollbar (); /* create and map scrollbar */	493	resize_scrollbar (); /* create and map scrollbar */
548	#endif	494	#endif
549	#if (MENUBAR_MAX)
550	if (menubar_visible ())
551	XMapWindow (disp, menuBar.win);
552	#endif
553	#ifdef TRANSPARENT	495	#ifdef TRANSPARENT
554	if (OPTION (Opt_transparent))	496	if (OPTION (Opt_transparent))
555	{	497	{
556	XSelectInput (disp, display->root, PropertyChangeMask);	498	XSelectInput (disp, display->root, PropertyChangeMask);
557	check_our_parents ();	499	check_our_parents ();
558	rootwin_ev.start (display, display->root);	500	rootwin_ev.start (display, display->root);
559	}	501	}
560	#endif	502	#endif
561		503
		504	set_colorfgbg ();
		505
		506	init_command (cmd_argv);
		507
		508	free (cmd_argv);
		509
		510	if (pty->pty >= 0)
		511	pty_ev.start (pty->pty, EVENT_READ);
		512
		513	check_ev.start ();
		514
		515	HOOK_INVOKE ((this, HOOK_START, DT_END));
		516
562	XMapWindow (disp, vt);	517	XMapWindow (disp, vt);
563	XMapWindow (disp, parent[0]);	518	XMapWindow (disp, parent[0]);
564		519
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;	520	return true;
579	}	521	}
580		522
581	static struct sig_handlers	523	static struct sig_handlers
582	{	524	{
583	sig_watcher sw_chld, sw_term, sw_int;	525	sig_watcher sw_term, sw_int;
584		526
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	/*	527	/*
600	* Catch a fatal signal and tidy up before quitting	528	* Catch a fatal signal and tidy up before quitting
601	*/	529	*/
602	void	530	void
603	sig_term (sig_watcher &w)	531	sig_term (sig_watcher &w)
…		…
609	signal (w.signum, SIG_DFL);	537	signal (w.signum, SIG_DFL);
610	kill (getpid (), w.signum);	538	kill (getpid (), w.signum);
611	}	539	}
612		540
613	sig_handlers ()	541	sig_handlers ()
614	: sw_chld (this, &sig_handlers::sig_chld),
615	sw_term (this, &sig_handlers::sig_term),	542	: sw_term (this, &sig_handlers::sig_term),
616	sw_int (this, &sig_handlers::sig_term)	543	sw_int (this, &sig_handlers::sig_term)
617	{	544	{
618	}	545	}
619	} sig_handlers;	546	} sig_handlers;
620		547
621	char **rxvt_environ; // startup environment	548	char **rxvt_environ; // startup environment
622		549
623	void	550	void
624	rxvt_init ()	551	rxvt_init ()
625	{	552	{
		553	uid_t uid = getuid ();
		554	gid_t gid = getgid ();
		555
		556	// before doing anything else, check for setuid/setgid operation,
		557	// start the helper process and drop privileges
		558	if (uid != geteuid ()
		559	\|\| gid != getegid ())
		560	{
		561	#if PTYTTY_HELPER
		562	rxvt_ptytty_server ();
		563	#else
		564	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		565	#endif
		566
		567	// drop privileges
		568	#if HAVE_SETRESUID
		569	setresgid (gid, gid, gid);
		570	setresuid (uid, uid, uid);
		571	#elif HAVE_SETREUID
		572	setregid (gid, gid);
		573	setreuid (uid, uid);
		574	#elif HAVE_SETUID
		575	setgid (gid);
		576	setuid (uid);
		577	#endif
		578
		579	if (uid != geteuid ()
		580	\|\| gid != getegid ())
		581	rxvt_fatal ("unable to drop privileges, aborting.\n");
		582	}
		583
626	rxvt_environ = environ;	584	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		585
638	signal (SIGHUP, SIG_IGN);	586	signal (SIGHUP, SIG_IGN);
639	signal (SIGPIPE, SIG_IGN);	587	signal (SIGPIPE, SIG_IGN);
640		588
641	sig_handlers.sw_chld.start (SIGCHLD);
642	sig_handlers.sw_term.start (SIGTERM);	589	sig_handlers.sw_term.start (SIGTERM);
643	sig_handlers.sw_int.start (SIGINT);	590	sig_handlers.sw_int.start (SIGINT);
644		591
645	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	592	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
646	/* signal (SIGURG, SIG_DFL); */	593	/* signal (SIGURG, SIG_DFL); */
…		…
675	rxvt_fatal ("memory allocation failure. aborting.\n");	622	rxvt_fatal ("memory allocation failure. aborting.\n");
676		623
677	return p;	624	return p;
678	}	625	}
679		626
680	void *	627	void *
681	rxvt_realloc (void *ptr, size_t size)	628	rxvt_realloc (void *ptr, size_t size)
682	{	629	{
683	void *p = realloc (ptr, size);	630	void *p = realloc (ptr, size);
684		631
685	if (!p)	632	if (!p)
686	rxvt_fatal ("memory allocation failure. aborting.\n");	633	rxvt_fatal ("memory allocation failure. aborting.\n");
687		634
688	return p;	635	return p;
689	}	636	}
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		637
760	/----------------------------------------------------------------------/	638	/----------------------------------------------------------------------/
761	/*	639	/*
762	* window size/position calculcations for XSizeHint and other storage.	640	* window size/position calculcations for XSizeHint and other storage.
763	* if width/height are non-zero then override calculated width/height	641	* if width/height are non-zero then override calculated width/height
764	*/	642	*/
765	void	643	void
766	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	644	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767	{	645	{
768	short recalc_x, recalc_y;	646	short recalc_x, recalc_y;
769	int x, y, sb_w, mb_h, flags;	647	int x, y, sb_w, flags;
770	unsigned int w, h;	648	unsigned int w, h;
771	unsigned int max_width, max_height;	649	unsigned int max_width, max_height;
772	dDisp;	650	dDisp;
773		651
774	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	652	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
835	max_width = MAX_COLS * fwidth;	713	max_width = MAX_COLS * fwidth;
836	max_height = MAX_ROWS * fheight;	714	max_height = MAX_ROWS * fheight;
837		715
838	szHint.base_width = szHint.base_height = 2 * int_bwidth;	716	szHint.base_width = szHint.base_height = 2 * int_bwidth;
839		717
840	sb_w = mb_h = 0;	718	sb_w = 0;
841	window_vt_x = window_vt_y = int_bwidth;	719	window_vt_x = window_vt_y = int_bwidth;
842		720
843	if (scrollbar_visible ())	721	if (scrollBar.state)
844	{	722	{
845	sb_w = scrollbar_TotalWidth ();	723	sb_w = scrollbar_TotalWidth ();
846	szHint.base_width += sb_w;	724	szHint.base_width += sb_w;
847	if (!OPTION (Opt_scrollBar_right))	725	if (!OPTION (Opt_scrollBar_right))
848	window_vt_x += sb_w;	726	window_vt_x += sb_w;
849	}	727	}
850		728
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;	729	szHint.width_inc = fwidth;
859	szHint.height_inc = fheight;	730	szHint.height_inc = fheight;
860	szHint.min_width = szHint.base_width + szHint.width_inc;	731	szHint.min_width = szHint.base_width + szHint.width_inc;
861	szHint.min_height = szHint.base_height + szHint.height_inc;	732	szHint.min_height = szHint.base_height + szHint.height_inc;
862		733
…		…
880	{	751	{
881	min_it (height, max_height);	752	min_it (height, max_height);
882	szHint.height = szHint.base_height + height;	753	szHint.height = szHint.base_height + height;
883	}	754	}
884		755
885	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	756	if (scrollBar.state && OPTION (Opt_scrollBar_right))
886	window_sb_x = szHint.width - sb_w;	757	window_sb_x = szHint.width - sb_w;
887		758
888	if (recalc_x)	759	if (recalc_x)
889	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	760	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890	if (recalc_y)	761	if (recalc_y)
…		…
904	* Called after a window size change.	775	* Called after a window size change.
905	*/	776	*/
906	void	777	void
907	rxvt_term::tt_winch ()	778	rxvt_term::tt_winch ()
908	{	779	{
909	if (pty.pty < 0)	780	if (pty->pty < 0)
910	return;	781	return;
911		782
912	struct winsize ws;	783	struct winsize ws;
913		784
914	ws.ws_col = ncol;	785	ws.ws_col = ncol;
915	ws.ws_row = nrow;	786	ws.ws_row = nrow;
916	ws.ws_xpixel = width;	787	ws.ws_xpixel = width;
917	ws.ws_ypixel = height;	788	ws.ws_ypixel = height;
918	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	789	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919		790
920	#if 0	791	#if 0
921	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	792	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922	if (cmd_pid) /* force through to the command */	793	if (cmd_pid) /* force through to the command */
923	kill (-cmd_pid, SIGWINCH);	794	kill (-cmd_pid, SIGWINCH);
…		…
1245		1116
1246	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1117	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1247		1118
1248	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1119	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1249	{	1120	{
1250	if (scrollbar_visible ())	1121	if (scrollBar.state)
1251	{	1122	{
1252	XMoveResizeWindow (disp, scrollBar.win,	1123	XMoveResizeWindow (disp, scrollBar.win,
1253	window_sb_x, 0,	1124	window_sb_x, 0,
1254	scrollbar_TotalWidth (), szHint.height);	1125	scrollbar_TotalWidth (), szHint.height);
1255	resize_scrollbar ();	1126	resize_scrollbar ();
1256	}	1127	}
1257
1258	if (menubar_visible ())
1259	XMoveResizeWindow (disp, menuBar.win,
1260	window_vt_x, 0,
1261	width, menuBar_TotalHeight ());
1262		1128
1263	XMoveResizeWindow (disp, vt,	1129	XMoveResizeWindow (disp, vt,
1264	window_vt_x, window_vt_y,	1130	window_vt_x, window_vt_y,
1265	width, height);	1131	width, height);
1266		1132
…		…
1451	unsigned long fg, bg;	1317	unsigned long fg, bg;
1452	const char *p;	1318	const char *p;
1453	char **s;	1319	char **s;
1454	XIMStyles *xim_styles;	1320	XIMStyles *xim_styles;
1455		1321
1456	TEMP_ENV;	1322	set_environ (envv);
1457		1323
1458	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1324	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1459	return false;	1325	return false;
1460		1326
1461	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1327	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1627	int i;	1493	int i;
1628	const char *p;	1494	const char *p;
1629	char **s;	1495	char **s;
1630	char buf[IMBUFSIZ];	1496	char buf[IMBUFSIZ];
1631		1497
1632	SET_R (this);	1498	make_current ();
1633		1499
1634	im_destroy ();	1500	im_destroy ();
1635		1501
1636	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1502	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637	if (Input_Context)	1503	if (Input_Context)
…		…
1714	XFree (preedit_attr);	1580	XFree (preedit_attr);
1715	XFree (status_attr);	1581	XFree (status_attr);
1716	}	1582	}
1717	#endif /* USE_XIM */	1583	#endif /* USE_XIM */
1718		1584
1719	/----------------------------------------------------------------------/
1720	rxvt_t rxvt_current_term;
1721
1722	/----------------------- end-of-file (C source) -----------------------/	1585	/----------------------- 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.193 by root, Sat Jan 21 14:25:05 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.193 by root, Sat Jan 21 14:25:05 2006 UTC