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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.170 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.194 by root, Sun Jan 22 00:36:59 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	}
287		259
288	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
289
290	delete pix_colors_focused;	261	delete pix_colors_focused;
291	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
292	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
293	#endif	264	#endif
294		265
…		…
316	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
317	delete keyboard;	288	delete keyboard;
318	#endif	289	#endif
319	}	290	}
320		291
		292	// child has exited, usually destroys
321	void	293	void
322	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
323	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
324	cmd_pid = 0;	298	cmd_pid = 0;
325		299
326	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
327	destroy ();	301	destroy ();
328	}	302	}
…		…
331	rxvt_term::destroy ()	305	rxvt_term::destroy ()
332	{	306	{
333	if (destroy_ev.active)	307	if (destroy_ev.active)
334	return;	308	return;
335		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		311	return;
		312
336	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
337	scr_overlay_off ();	314	scr_overlay_off ();
338	#endif	315	#endif
339		316
340	if (display)	317	if (display)
…		…
342	#if USE_XIM	319	#if USE_XIM
343	im_ev.stop (display);	320	im_ev.stop (display);
344	#endif	321	#endif
345	#if HAVE_SCROLLBARS	322	#if HAVE_SCROLLBARS
346	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
347	#endif
348	#if MENUBAR
349	menubar_ev.stop (display);
350	#endif	324	#endif
351	#if TRANSPARENT	325	#if TRANSPARENT
352	rootwin_ev.stop (display);	326	rootwin_ev.stop (display);
353	#endif	327	#endif
354	incr_ev.stop ();	328	incr_ev.stop ();
…		…
378	}	352	}
379		353
380	void	354	void
381	rxvt_term::destroy_cb (time_watcher &w)	355	rxvt_term::destroy_cb (time_watcher &w)
382	{	356	{
383	SET_R (this);	357	make_current ();
384		358
385	delete this;	359	delete this;
386	}	360	}
387		361
388	/----------------------------------------------------------------------/	362	/----------------------------------------------------------------------/
…		…
476	_exit (EXIT_FAILURE);	450	_exit (EXIT_FAILURE);
477	}	451	}
478		452
479	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
480	bool	454	bool
481	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv, stringvec *envv)
482	{	456	{
		457	this->envv = envv;
		458
483	SET_R (this);	459	SET_R (this);
484
485	set_locale ("");	460	set_locale ("");
		461	set_environ (envv); // few things in X do not call setlocale :(
486		462
487	if (!init_vars ())	463	if (!init_vars ())
488	return false;	464	return false;
489		465
490	init_secondary ();	466	init_secondary ();
…		…
493		469
494	#ifdef KEYSYM_RESOURCE	470	#ifdef KEYSYM_RESOURCE
495	keyboard->register_done ();	471	keyboard->register_done ();
496	#endif	472	#endif
497		473
498	#if MENUBAR_MAX
499	menubar_read (rs[Rs_menu]);
500	#endif
501	#ifdef HAVE_SCROLLBARS	474	#ifdef HAVE_SCROLLBARS
502	if (OPTION (Opt_scrollBar))	475	if (OPTION (Opt_scrollBar))
503	scrollBar.setIdle (); /* set existence for size calculations */	476	scrollBar.setIdle (); /* set existence for size calculations */
504	#endif	477	#endif
505		478
506	#if ENABLE_PERL	479	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	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
536	init_xlocale ();	485	init_xlocale ();
537		486
538	scr_reset (); /* initialize screen */	487	scr_reset (); // initialize screen
539		488
540	#if 0	489	#if 0
541	XSynchronize (disp, True);	490	XSynchronize (disp, True);
542	#endif	491	#endif
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
		550	char **rxvt_environ; // startup environment
		551
620	void	552	void
621	rxvt_init ()	553	rxvt_init ()
622	{	554	{
623	/*	555	uid_t uid = getuid ();
624	* Save and then give up any super-user privileges	556	gid_t gid = getgid ();
625	* If we need privileges in any area then we must specifically request it.	557
626	* We should only need to be root in these cases:	558	// before doing anything else, check for setuid/setgid operation,
627	* 1. write utmp entries on some systems	559	// start the helper process and drop privileges
628	* 2. chown tty on some systems	560	if (uid != geteuid ()
629	*/	561	\|\| gid != getegid ())
630	rxvt_privileges (SAVE);	562	{
631	rxvt_privileges (IGNORE);	563	#if PTYTTY_HELPER
		564	rxvt_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
		586	rxvt_environ = environ;
632		587
633	signal (SIGHUP, SIG_IGN);	588	signal (SIGHUP, SIG_IGN);
634	signal (SIGPIPE, SIG_IGN);	589	signal (SIGPIPE, SIG_IGN);
635		590
636	sig_handlers.sw_chld.start (SIGCHLD);
637	sig_handlers.sw_term.start (SIGTERM);	591	sig_handlers.sw_term.start (SIGTERM);
638	sig_handlers.sw_int.start (SIGINT);	592	sig_handlers.sw_int.start (SIGINT);
639		593
640	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	594	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
641	/* signal (SIGURG, SIG_DFL); */	595	/* signal (SIGURG, SIG_DFL); */
…		…
670	rxvt_fatal ("memory allocation failure. aborting.\n");	624	rxvt_fatal ("memory allocation failure. aborting.\n");
671		625
672	return p;	626	return p;
673	}	627	}
674		628
675	void *	629	void *
676	rxvt_realloc (void *ptr, size_t size)	630	rxvt_realloc (void *ptr, size_t size)
677	{	631	{
678	void *p = realloc (ptr, size);	632	void *p = realloc (ptr, size);
679		633
680	if (!p)	634	if (!p)
681	rxvt_fatal ("memory allocation failure. aborting.\n");	635	rxvt_fatal ("memory allocation failure. aborting.\n");
682		636
683	return p;	637	return p;
684	}	638	}
685
686	/* ------------------------------------------------------------------------- *
687	* PRIVILEGED OPERATIONS *
688	* ------------------------------------------------------------------------- */
689	/* take care of suid/sgid super-user (root) privileges */
690	void
691	rxvt_privileges (rxvt_privaction action)
692	{
693	#if ! defined(__CYGWIN32__)
694	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
695	/* setreuid () is the poor man's setuid (), seteuid () */
696	# define seteuid(a) setreuid(-1, (a))
697	# define setegid(a) setregid(-1, (a))
698	# define HAVE_SETEUID
699	# endif
700	# ifdef HAVE_SETEUID
701	switch (action)
702	{
703	case IGNORE:
704	/*
705	* change effective uid/gid - not real uid/gid - so we can switch
706	* back to root later, as required
707	*/
708	seteuid (getuid ());
709	setegid (getgid ());
710	break;
711	case SAVE:
712	saved_euid = geteuid ();
713	saved_egid = getegid ();
714	break;
715	case RESTORE:
716	seteuid (saved_euid);
717	setegid (saved_egid);
718	break;
719	}
720	# else
721	switch (action)
722	{
723	case IGNORE:
724	setuid (getuid ());
725	setgid (getgid ());
726	/* FALLTHROUGH */
727	case SAVE:
728	/* FALLTHROUGH */
729	case RESTORE:
730	break;
731	}
732	# endif
733	#endif
734	}
735
736	#ifdef UTMP_SUPPORT
737	void
738	rxvt_term::privileged_utmp (rxvt_privaction action)
739	{
740	if (OPTION (Opt_utmpInhibit)
741	\|\| !pty.name \|\| !*pty.name)
742	return;
743
744	rxvt_privileges (RESTORE);
745
746	if (action == SAVE)
747	makeutent (pty.name, rs[Rs_display_name]);
748	else
749	cleanutent ();
750
751	rxvt_privileges (IGNORE);
752	}
753	#endif
754		639
755	/----------------------------------------------------------------------/	640	/----------------------------------------------------------------------/
756	/*	641	/*
757	* window size/position calculcations for XSizeHint and other storage.	642	* window size/position calculcations for XSizeHint and other storage.
758	* if width/height are non-zero then override calculated width/height	643	* if width/height are non-zero then override calculated width/height
759	*/	644	*/
760	void	645	void
761	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	646	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
762	{	647	{
763	short recalc_x, recalc_y;	648	short recalc_x, recalc_y;
764	int x, y, sb_w, mb_h, flags;	649	int x, y, sb_w, flags;
765	unsigned int w, h;	650	unsigned int w, h;
766	unsigned int max_width, max_height;	651	unsigned int max_width, max_height;
767	dDisp;	652	dDisp;
768		653
769	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",
…		…
830	max_width = MAX_COLS * fwidth;	715	max_width = MAX_COLS * fwidth;
831	max_height = MAX_ROWS * fheight;	716	max_height = MAX_ROWS * fheight;
832		717
833	szHint.base_width = szHint.base_height = 2 * int_bwidth;	718	szHint.base_width = szHint.base_height = 2 * int_bwidth;
834		719
835	sb_w = mb_h = 0;	720	sb_w = 0;
836	window_vt_x = window_vt_y = int_bwidth;	721	window_vt_x = window_vt_y = int_bwidth;
837		722
838	if (scrollbar_visible ())	723	if (scrollBar.state)
839	{	724	{
840	sb_w = scrollbar_TotalWidth ();	725	sb_w = scrollbar_TotalWidth ();
841	szHint.base_width += sb_w;	726	szHint.base_width += sb_w;
842	if (!OPTION (Opt_scrollBar_right))	727	if (!OPTION (Opt_scrollBar_right))
843	window_vt_x += sb_w;	728	window_vt_x += sb_w;
844	}	729	}
845		730
846	if (menubar_visible ())
847	{
848	mb_h = menuBar_TotalHeight ();
849	szHint.base_height += mb_h;
850	window_vt_y += mb_h;
851	}
852
853	szHint.width_inc = fwidth;	731	szHint.width_inc = fwidth;
854	szHint.height_inc = fheight;	732	szHint.height_inc = fheight;
855	szHint.min_width = szHint.base_width + szHint.width_inc;	733	szHint.min_width = szHint.base_width + szHint.width_inc;
856	szHint.min_height = szHint.base_height + szHint.height_inc;	734	szHint.min_height = szHint.base_height + szHint.height_inc;
857		735
…		…
875	{	753	{
876	min_it (height, max_height);	754	min_it (height, max_height);
877	szHint.height = szHint.base_height + height;	755	szHint.height = szHint.base_height + height;
878	}	756	}
879		757
880	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	758	if (scrollBar.state && OPTION (Opt_scrollBar_right))
881	window_sb_x = szHint.width - sb_w;	759	window_sb_x = szHint.width - sb_w;
882		760
883	if (recalc_x)	761	if (recalc_x)
884	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	762	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
885	if (recalc_y)	763	if (recalc_y)
…		…
899	* Called after a window size change.	777	* Called after a window size change.
900	*/	778	*/
901	void	779	void
902	rxvt_term::tt_winch ()	780	rxvt_term::tt_winch ()
903	{	781	{
904	if (pty.pty < 0)	782	if (pty->pty < 0)
905	return;	783	return;
906		784
907	struct winsize ws;	785	struct winsize ws;
908		786
909	ws.ws_col = ncol;	787	ws.ws_col = ncol;
910	ws.ws_row = nrow;	788	ws.ws_row = nrow;
911	ws.ws_xpixel = width;	789	ws.ws_xpixel = width;
912	ws.ws_ypixel = height;	790	ws.ws_ypixel = height;
913	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	791	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
914		792
915	#if 0	793	#if 0
916	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	794	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
917	if (cmd_pid) /* force through to the command */	795	if (cmd_pid) /* force through to the command */
918	kill (-cmd_pid, SIGWINCH);	796	kill (-cmd_pid, SIGWINCH);
…		…
1240		1118
1241	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1119	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1242		1120
1243	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1121	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1244	{	1122	{
1245	if (scrollbar_visible ())	1123	if (scrollBar.state)
1246	{	1124	{
1247	XMoveResizeWindow (disp, scrollBar.win,	1125	XMoveResizeWindow (disp, scrollBar.win,
1248	window_sb_x, 0,	1126	window_sb_x, 0,
1249	scrollbar_TotalWidth (), szHint.height);	1127	scrollbar_TotalWidth (), szHint.height);
1250	resize_scrollbar ();	1128	resize_scrollbar ();
1251	}	1129	}
1252
1253	if (menubar_visible ())
1254	XMoveResizeWindow (disp, menuBar.win,
1255	window_vt_x, 0,
1256	width, menuBar_TotalHeight ());
1257		1130
1258	XMoveResizeWindow (disp, vt,	1131	XMoveResizeWindow (disp, vt,
1259	window_vt_x, window_vt_y,	1132	window_vt_x, window_vt_y,
1260	width, height);	1133	width, height);
1261		1134
…		…
1445	XRectangle rect, status_rect, needed_rect;	1318	XRectangle rect, status_rect, needed_rect;
1446	unsigned long fg, bg;	1319	unsigned long fg, bg;
1447	const char *p;	1320	const char *p;
1448	char **s;	1321	char **s;
1449	XIMStyles *xim_styles;	1322	XIMStyles *xim_styles;
		1323
		1324	set_environ (envv);
1450		1325
1451	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1326	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1452	return false;	1327	return false;
1453		1328
1454	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1329	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1620	int i;	1495	int i;
1621	const char *p;	1496	const char *p;
1622	char **s;	1497	char **s;
1623	char buf[IMBUFSIZ];	1498	char buf[IMBUFSIZ];
1624		1499
1625	SET_R (this);	1500	make_current ();
1626		1501
1627	im_destroy ();	1502	im_destroy ();
1628		1503
1629	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1504	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1630	if (Input_Context)	1505	if (Input_Context)
…		…
1707	XFree (preedit_attr);	1582	XFree (preedit_attr);
1708	XFree (status_attr);	1583	XFree (status_attr);
1709	}	1584	}
1710	#endif /* USE_XIM */	1585	#endif /* USE_XIM */
1711		1586
1712	/----------------------------------------------------------------------/
1713	rxvt_t rxvt_current_term;
1714
1715	/----------------------- 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.170 by root, Wed Jan 11 00:59:58 2006 UTC vs. Revision 1.194 by root, Sun Jan 22 00:36:59 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.170 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.194 by root, Sun Jan 22 00:36:59 2006 UTC