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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC vs.
Revision 1.192 by root, Fri Jan 20 12:16:28 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__)
52	static uid_t saved_euid;
53	static gid_t saved_egid;
54	#endif
55
56	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
57		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
58	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
59		57
60	bool	58	bool
61	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
62	{	60	{
63	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
64	return false;	62	return false;
65		63
66	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
67	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
68	return true;	66	return true;
69	}	67	}
70		68
71	bool	69	void
72	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
73	{	71	{
74	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
75	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
76	}	74	}
77		75
78	void	76	void
79	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
80	{	78	{
81	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
82	}	80	}
83		81
84	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
151	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
152	#endif	150	#endif
153	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
154	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
155	#endif	153	#endif
156	#ifdef MENUBAR
157	menubar_ev (this, &rxvt_term::x_cb),
158	#endif
159	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
161	#endif	156	#endif
162	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
163	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
177	#ifdef USE_XIM	172	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
179	#endif	174	#endif
180	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
181	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
		177	child_ev (this, &rxvt_term::child_cb),
182	check_ev (this, &rxvt_term::check_cb),	178	check_ev (this, &rxvt_term::check_cb),
183	flush_ev (this, &rxvt_term::flush_cb),	179	flush_ev (this, &rxvt_term::flush_cb),
184	destroy_ev (this, &rxvt_term::destroy_cb),	180	destroy_ev (this, &rxvt_term::destroy_cb),
185	pty_ev (this, &rxvt_term::pty_cb),	181	pty_ev (this, &rxvt_term::pty_cb),
186	incr_ev (this, &rxvt_term::incr_cb)	182	incr_ev (this, &rxvt_term::incr_cb)
…		…
189		185
190	termlist.push_back (this);	186	termlist.push_back (this);
191		187
192	#ifdef KEYSYM_RESOURCE	188	#ifdef KEYSYM_RESOURCE
193	keyboard = new keyboard_manager;	189	keyboard = new keyboard_manager;
194
195	if (!keyboard)
196	rxvt_fatal ("out of memory, aborting.\n");
197	#endif	190	#endif
198	}	191	}
199		192
200	// 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.
201	// for use before an emergency exit	194	// for use before an emergency exit
202	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
203	{	196	{
204	if (cmd_pid)	197	if (cmd_pid)
205	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
206		199
207	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
208	privileged_utmp (RESTORE);
209	#endif
210
211	pty.put ();
212	}	201	}
213		202
214	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
215	{	204	{
216	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
217
218	termlist.erase (find (termlist.begin (), termlist.end(), this));	205	termlist.erase (find (termlist.begin (), termlist.end(), this));
219		206
220	emergency_cleanup ();	207	emergency_cleanup ();
221		208
222	#if ENABLE_STYLES	209	#if ENABLE_STYLES
…		…
232		219
233	selection_clear ();	220	selection_clear ();
234		221
235	#ifdef USE_XIM	222	#ifdef USE_XIM
236	im_destroy ();	223	im_destroy ();
237	#endif
238	#ifdef MENUBAR
239	if (menubarGC) XFreeGC (disp, menubarGC);
240	#endif	224	#endif
241	#ifdef XTERM_SCROLLBAR	225	#ifdef XTERM_SCROLLBAR
242	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
243	if (ShadowGC) XFreeGC (disp, ShadowGC);	227	if (ShadowGC) XFreeGC (disp, ShadowGC);
244	#endif	228	#endif
…		…
255	if (upArrow) XFreePixmap (disp, upArrow);	239	if (upArrow) XFreePixmap (disp, upArrow);
256	if (downArrow) XFreePixmap (disp, downArrow);	240	if (downArrow) XFreePixmap (disp, downArrow);
257	if (upArrowHi) XFreePixmap (disp, upArrowHi);	241	if (upArrowHi) XFreePixmap (disp, upArrowHi);
258	if (downArrowHi) XFreePixmap (disp, downArrowHi);	242	if (downArrowHi) XFreePixmap (disp, downArrowHi);
259	#endif	243	#endif
260	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	244	#ifdef RXVT_SCROLLBAR
261	if (topShadowGC) XFreeGC (disp, topShadowGC);	245	if (topShadowGC) XFreeGC (disp, topShadowGC);
262	if (botShadowGC) XFreeGC (disp, botShadowGC);	246	if (botShadowGC) XFreeGC (disp, botShadowGC);
263	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
264	#endif	248	#endif
265	if (gc) XFreeGC (disp, gc);	249	if (gc) XFreeGC (disp, gc);
266		250
267	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
268	delete menuBar.drawable;
269	//if (menuBar.win)
270	// XDestroyWindow (disp, menuBar.win);
271	#endif
272	delete drawable;	251	delete drawable;
273	// destroy all windows	252	// destroy all windows
274	if (parent[0])	253	if (parent[0])
275	XDestroyWindow (disp, parent[0]);	254	XDestroyWindow (disp, parent[0]);
276	}	255	}
277		256
278	// TODO: free pixcolours, colours should become part of rxvt_display	257	// TODO: free pixcolours, colours should become part of rxvt_display
279
280	delete pix_colors_focused;	258	delete pix_colors_focused;
281	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
282	delete pix_colors_unfocused;	260	delete pix_colors_unfocused;
283	#endif
284	#if USE_XGETDEFAULT
285	XrmDestroyDatabase (xrmdatabase);
286	#endif	261	#endif
287		262
288	displays.put (display);	263	displays.put (display);
289		264
290	scr_release ();	265	scr_release ();
…		…
309	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
310	delete keyboard;	285	delete keyboard;
311	#endif	286	#endif
312	}	287	}
313		288
		289	// child has exited, usually destroys
314	void	290	void
315	rxvt_term::child_exit ()	291	rxvt_term::child_cb (child_watcher &w, int status)
316	{	292	{
		293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		294
317	cmd_pid = 0;	295	cmd_pid = 0;
318		296
319	if (!OPTION (Opt_hold))	297	if (!OPTION (Opt_hold))
320	destroy ();	298	destroy ();
321	}	299	}
…		…
324	rxvt_term::destroy ()	302	rxvt_term::destroy ()
325	{	303	{
326	if (destroy_ev.active)	304	if (destroy_ev.active)
327	return;	305	return;
328		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		309
329	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
330	scr_overlay_off ();	311	scr_overlay_off ();
331	#endif	312	#endif
332		313
333	if (display)	314	if (display)
…		…
335	#if USE_XIM	316	#if USE_XIM
336	im_ev.stop (display);	317	im_ev.stop (display);
337	#endif	318	#endif
338	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
339	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
340	#endif
341	#if MENUBAR
342	menubar_ev.stop (display);
343	#endif	321	#endif
344	#if TRANSPARENT	322	#if TRANSPARENT
345	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
346	#endif	324	#endif
347	incr_ev.stop ();	325	incr_ev.stop ();
…		…
371	}	349	}
372		350
373	void	351	void
374	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
375	{	353	{
376	SET_R (this);	354	make_current ();
377		355
378	delete this;	356	delete this;
379	}	357	}
380		358
381	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
472	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
473	bool	451	bool
474	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv)
475	{	453	{
476	SET_R (this);	454	SET_R (this);
477
478	set_locale ("");	455	set_locale ("");
		456	set_environ (envv); // few things in X do not call setlocale :(
479		457
480	if (!init_vars ())	458	if (!init_vars ())
481	return false;	459	return false;
482		460
483	init_secondary ();	461	init_secondary ();
…		…
486		464
487	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
488	keyboard->register_done ();	466	keyboard->register_done ();
489	#endif	467	#endif
490		468
491	#if MENUBAR_MAX
492	menubar_read (rs[Rs_menu]);
493	#endif
494	#ifdef HAVE_SCROLLBARS	469	#ifdef HAVE_SCROLLBARS
495	if (OPTION (Opt_scrollBar))	470	if (OPTION (Opt_scrollBar))
496	scrollBar.setIdle (); /* set existence for size calculations */	471	scrollBar.setIdle (); /* set existence for size calculations */
497	#endif	472	#endif
498		473
499	#if ENABLE_PERL	474	pty = rxvt_new_ptytty ();
500	if (!rs[Rs_perl_ext_1])
501	rs[Rs_perl_ext_1] = "default";
502
503	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506	{
507	bool tainted = false;
508
509	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510	// ignore some perl-related arguments if some bozo installed us set[ug]id
511	if (getuid () != saved_euid \|\| getgid () != saved_egid)
512	{
513	tainted = true;
514
515	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517	{
518	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519	rs[Rs_perl_lib] = 0;
520	rs[Rs_perl_eval] = "our $tainted = 1";
521	}
522	}
523	#endif
524	rxvt_perl.init (tainted);
525	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526	}
527	#endif
528		475
529	create_windows (argc, argv);	476	create_windows (argc, argv);
530		477
531	dDisp;	478	dDisp;
532		479
533	init_xlocale ();	480	init_xlocale ();
534		481
535	scr_reset (); /* initialize screen */	482	scr_reset (); // initialize screen
536		483
537	#if 0	484	#if 0
538	XSynchronize (disp, True);	485	XSynchronize (disp, True);
539	#endif	486	#endif
540		487
541	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
542	if (OPTION (Opt_scrollBar))	489	if (OPTION (Opt_scrollBar))
543	resize_scrollbar (); /* create and map scrollbar */	490	resize_scrollbar (); /* create and map scrollbar */
544	#endif	491	#endif
545	#if (MENUBAR_MAX)
546	if (menubar_visible ())
547	XMapWindow (disp, menuBar.win);
548	#endif
549	#ifdef TRANSPARENT	492	#ifdef TRANSPARENT
550	if (OPTION (Opt_transparent))	493	if (OPTION (Opt_transparent))
551	{	494	{
552	XSelectInput (disp, display->root, PropertyChangeMask);	495	XSelectInput (disp, display->root, PropertyChangeMask);
553	check_our_parents ();	496	check_our_parents ();
554	rootwin_ev.start (display, display->root);	497	rootwin_ev.start (display, display->root);
555	}	498	}
556	#endif	499	#endif
557		500
		501	set_colorfgbg ();
		502
		503	init_command (cmd_argv);
		504
		505	free (cmd_argv);
		506
		507	if (pty->pty >= 0)
		508	pty_ev.start (pty->pty, EVENT_READ);
		509
		510	check_ev.start ();
		511
		512	HOOK_INVOKE ((this, HOOK_START, DT_END));
		513
558	XMapWindow (disp, vt);	514	XMapWindow (disp, vt);
559	XMapWindow (disp, parent[0]);	515	XMapWindow (disp, parent[0]);
560		516
561	set_colorfgbg ();
562
563	init_command (cmd_argv);
564
565	free (cmd_argv);
566
567	if (pty.pty >= 0)
568	pty_ev.start (pty.pty, EVENT_READ);
569
570	check_ev.start ();
571
572	HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574	return true;	517	return true;
575	}	518	}
576		519
577	static struct sig_handlers	520	static struct sig_handlers
578	{	521	{
579	sig_watcher sw_chld, sw_term, sw_int;	522	sig_watcher sw_term, sw_int;
580		523
581	void sig_chld (sig_watcher &w)
582	{
583	// we are being called for every SIGCHLD, find the corresponding term
584	int pid;
585
586	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
587	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
588	if (pid == (*t)->cmd_pid)
589	{
590	(*t)->child_exit ();
591	break;
592	}
593	}
594
595	/*	524	/*
596	* Catch a fatal signal and tidy up before quitting	525	* Catch a fatal signal and tidy up before quitting
597	*/	526	*/
598	void	527	void
599	sig_term (sig_watcher &w)	528	sig_term (sig_watcher &w)
…		…
605	signal (w.signum, SIG_DFL);	534	signal (w.signum, SIG_DFL);
606	kill (getpid (), w.signum);	535	kill (getpid (), w.signum);
607	}	536	}
608		537
609	sig_handlers ()	538	sig_handlers ()
610	: sw_chld (this, &sig_handlers::sig_chld),
611	sw_term (this, &sig_handlers::sig_term),	539	: sw_term (this, &sig_handlers::sig_term),
612	sw_int (this, &sig_handlers::sig_term)	540	sw_int (this, &sig_handlers::sig_term)
613	{	541	{
614	}	542	}
615	} sig_handlers;	543	} sig_handlers;
616		544
		545	char **rxvt_environ; // startup environment
		546
617	void	547	void
618	rxvt_init ()	548	rxvt_init ()
619	{	549	{
620	/*	550	uid_t uid = getuid ();
621	* Save and then give up any super-user privileges	551	gid_t gid = getgid ();
622	* If we need privileges in any area then we must specifically request it.	552
623	* We should only need to be root in these cases:	553	// before doing anything else, check for setuid/setgid operation,
624	* 1. write utmp entries on some systems	554	// start the helper process and drop privileges
625	* 2. chown tty on some systems	555	if (uid != geteuid ()
626	*/	556	\|\| gid != getegid ())
627	rxvt_privileges (SAVE);	557	{
628	rxvt_privileges (IGNORE);	558	#if PTYTTY_HELPER
		559	rxvt_ptytty_server ();
		560	#else
		561	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		562	#endif
		563
		564	// drop privileges
		565	#if HAVE_SETRESUID
		566	setresgid (gid, gid, gid);
		567	setresuid (uid, uid, uid);
		568	#elif HAVE_SETREUID
		569	setregid (gid, gid);
		570	setreuid (uid, uid);
		571	#elif HAVE_SETUID
		572	setgid (gid);
		573	setuid (uid);
		574	#endif
		575
		576	if (uid != geteuid ()
		577	\|\| gid != getegid ())
		578	rxvt_fatal ("unable to drop privileges, aborting.\n");
		579	}
		580
		581	rxvt_environ = environ;
629		582
630	signal (SIGHUP, SIG_IGN);	583	signal (SIGHUP, SIG_IGN);
631	signal (SIGPIPE, SIG_IGN);	584	signal (SIGPIPE, SIG_IGN);
632		585
633	sig_handlers.sw_chld.start (SIGCHLD);
634	sig_handlers.sw_term.start (SIGTERM);	586	sig_handlers.sw_term.start (SIGTERM);
635	sig_handlers.sw_int.start (SIGINT);	587	sig_handlers.sw_int.start (SIGINT);
636		588
637	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	589	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
638	/* signal (SIGURG, SIG_DFL); */	590	/* signal (SIGURG, SIG_DFL); */
639		591
640	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	592	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
641	// TODO: handle this with exceptions and tolerate the memory loss	593	// TODO: handle this with exceptions and tolerate the memory loss
642	XSetIOErrorHandler (rxvt_xioerror_handler);	594	XSetIOErrorHandler (rxvt_xioerror_handler);
643		595
644	#ifdef USE_XGETDEFAULT
645	XrmInitialize ();	596	XrmInitialize ();
646	#endif
647	}	597	}
648		598
649	/* ------------------------------------------------------------------------- *	599	/* ------------------------------------------------------------------------- *
650	* MEMORY ALLOCATION WRAPPERS *	600	* MEMORY ALLOCATION WRAPPERS *
651	* ------------------------------------------------------------------------- */	601	* ------------------------------------------------------------------------- */
…		…
669	rxvt_fatal ("memory allocation failure. aborting.\n");	619	rxvt_fatal ("memory allocation failure. aborting.\n");
670		620
671	return p;	621	return p;
672	}	622	}
673		623
674	void *	624	void *
675	rxvt_realloc (void *ptr, size_t size)	625	rxvt_realloc (void *ptr, size_t size)
676	{	626	{
677	void *p = realloc (ptr, size);	627	void *p = realloc (ptr, size);
678		628
679	if (!p)	629	if (!p)
680	rxvt_fatal ("memory allocation failure. aborting.\n");	630	rxvt_fatal ("memory allocation failure. aborting.\n");
681		631
682	return p;	632	return p;
683	}	633	}
684
685	/* ------------------------------------------------------------------------- *
686	* PRIVILEGED OPERATIONS *
687	* ------------------------------------------------------------------------- */
688	/* take care of suid/sgid super-user (root) privileges */
689	void
690	rxvt_privileges (rxvt_privaction action)
691	{
692	#if ! defined(__CYGWIN32__)
693	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
694	/* setreuid () is the poor man's setuid (), seteuid () */
695	# define seteuid(a) setreuid(-1, (a))
696	# define setegid(a) setregid(-1, (a))
697	# define HAVE_SETEUID
698	# endif
699	# ifdef HAVE_SETEUID
700	switch (action)
701	{
702	case IGNORE:
703	/*
704	* change effective uid/gid - not real uid/gid - so we can switch
705	* back to root later, as required
706	*/
707	seteuid (getuid ());
708	setegid (getgid ());
709	break;
710	case SAVE:
711	saved_euid = geteuid ();
712	saved_egid = getegid ();
713	break;
714	case RESTORE:
715	seteuid (saved_euid);
716	setegid (saved_egid);
717	break;
718	}
719	# else
720	switch (action)
721	{
722	case IGNORE:
723	setuid (getuid ());
724	setgid (getgid ());
725	/* FALLTHROUGH */
726	case SAVE:
727	/* FALLTHROUGH */
728	case RESTORE:
729	break;
730	}
731	# endif
732	#endif
733	}
734
735	#ifdef UTMP_SUPPORT
736	void
737	rxvt_term::privileged_utmp (rxvt_privaction action)
738	{
739	if (OPTION (Opt_utmpInhibit)
740	\|\| !pty.name \|\| !*pty.name)
741	return;
742
743	rxvt_privileges (RESTORE);
744
745	if (action == SAVE)
746	makeutent (pty.name, rs[Rs_display_name]);
747	else
748	cleanutent ();
749
750	rxvt_privileges (IGNORE);
751	}
752	#endif
753		634
754	/----------------------------------------------------------------------/	635	/----------------------------------------------------------------------/
755	/*	636	/*
756	* window size/position calculcations for XSizeHint and other storage.	637	* window size/position calculcations for XSizeHint and other storage.
757	* if width/height are non-zero then override calculated width/height	638	* if width/height are non-zero then override calculated width/height
758	*/	639	*/
759	void	640	void
760	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	641	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
761	{	642	{
762	short recalc_x, recalc_y;	643	short recalc_x, recalc_y;
763	int x, y, sb_w, mb_h, flags;	644	int x, y, sb_w, flags;
764	unsigned int w, h;	645	unsigned int w, h;
765	unsigned int max_width, max_height;	646	unsigned int max_width, max_height;
766	dDisp;	647	dDisp;
767		648
768	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	649	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
829	max_width = MAX_COLS * fwidth;	710	max_width = MAX_COLS * fwidth;
830	max_height = MAX_ROWS * fheight;	711	max_height = MAX_ROWS * fheight;
831		712
832	szHint.base_width = szHint.base_height = 2 * int_bwidth;	713	szHint.base_width = szHint.base_height = 2 * int_bwidth;
833		714
834	sb_w = mb_h = 0;	715	sb_w = 0;
835	window_vt_x = window_vt_y = int_bwidth;	716	window_vt_x = window_vt_y = int_bwidth;
836		717
837	if (scrollbar_visible ())	718	if (scrollBar.state)
838	{	719	{
839	sb_w = scrollbar_TotalWidth ();	720	sb_w = scrollbar_TotalWidth ();
840	szHint.base_width += sb_w;	721	szHint.base_width += sb_w;
841	if (!OPTION (Opt_scrollBar_right))	722	if (!OPTION (Opt_scrollBar_right))
842	window_vt_x += sb_w;	723	window_vt_x += sb_w;
843	}	724	}
844		725
845	if (menubar_visible ())
846	{
847	mb_h = menuBar_TotalHeight ();
848	szHint.base_height += mb_h;
849	window_vt_y += mb_h;
850	}
851
852	szHint.width_inc = fwidth;	726	szHint.width_inc = fwidth;
853	szHint.height_inc = fheight;	727	szHint.height_inc = fheight;
854	szHint.min_width = szHint.base_width + szHint.width_inc;	728	szHint.min_width = szHint.base_width + szHint.width_inc;
855	szHint.min_height = szHint.base_height + szHint.height_inc;	729	szHint.min_height = szHint.base_height + szHint.height_inc;
856		730
…		…
874	{	748	{
875	min_it (height, max_height);	749	min_it (height, max_height);
876	szHint.height = szHint.base_height + height;	750	szHint.height = szHint.base_height + height;
877	}	751	}
878		752
879	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	753	if (scrollBar.state && OPTION (Opt_scrollBar_right))
880	window_sb_x = szHint.width - sb_w;	754	window_sb_x = szHint.width - sb_w;
881		755
882	if (recalc_x)	756	if (recalc_x)
883	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	757	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
884	if (recalc_y)	758	if (recalc_y)
…		…
898	* Called after a window size change.	772	* Called after a window size change.
899	*/	773	*/
900	void	774	void
901	rxvt_term::tt_winch ()	775	rxvt_term::tt_winch ()
902	{	776	{
903	if (pty.pty < 0)	777	if (pty->pty < 0)
904	return;	778	return;
905		779
906	struct winsize ws;	780	struct winsize ws;
907		781
908	ws.ws_col = ncol;	782	ws.ws_col = ncol;
909	ws.ws_row = nrow;	783	ws.ws_row = nrow;
910	ws.ws_xpixel = width;	784	ws.ws_xpixel = width;
911	ws.ws_ypixel = height;	785	ws.ws_ypixel = height;
912	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	786	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
913		787
914	#if 0	788	#if 0
915	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	789	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
916	if (cmd_pid) /* force through to the command */	790	if (cmd_pid) /* force through to the command */
917	kill (-cmd_pid, SIGWINCH);	791	kill (-cmd_pid, SIGWINCH);
…		…
1239		1113
1240	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1114	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1241		1115
1242	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1116	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1243	{	1117	{
1244	if (scrollbar_visible ())	1118	if (scrollBar.state)
1245	{	1119	{
1246	XMoveResizeWindow (disp, scrollBar.win,	1120	XMoveResizeWindow (disp, scrollBar.win,
1247	window_sb_x, 0,	1121	window_sb_x, 0,
1248	scrollbar_TotalWidth (), szHint.height);	1122	scrollbar_TotalWidth (), szHint.height);
1249	resize_scrollbar ();	1123	resize_scrollbar ();
1250	}	1124	}
1251
1252	if (menubar_visible ())
1253	XMoveResizeWindow (disp, menuBar.win,
1254	window_vt_x, 0,
1255	width, menuBar_TotalHeight ());
1256		1125
1257	XMoveResizeWindow (disp, vt,	1126	XMoveResizeWindow (disp, vt,
1258	window_vt_x, window_vt_y,	1127	window_vt_x, window_vt_y,
1259	width, height);	1128	width, height);
1260		1129
…		…
1444	XRectangle rect, status_rect, needed_rect;	1313	XRectangle rect, status_rect, needed_rect;
1445	unsigned long fg, bg;	1314	unsigned long fg, bg;
1446	const char *p;	1315	const char *p;
1447	char **s;	1316	char **s;
1448	XIMStyles *xim_styles;	1317	XIMStyles *xim_styles;
		1318
		1319	set_environ (envv);
1449		1320
1450	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1321	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1451	return false;	1322	return false;
1452		1323
1453	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1324	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1619	int i;	1490	int i;
1620	const char *p;	1491	const char *p;
1621	char **s;	1492	char **s;
1622	char buf[IMBUFSIZ];	1493	char buf[IMBUFSIZ];
1623		1494
1624	SET_R (this);	1495	make_current ();
1625		1496
1626	im_destroy ();	1497	im_destroy ();
1627		1498
1628	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1499	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1629	if (Input_Context)	1500	if (Input_Context)
…		…
1706	XFree (preedit_attr);	1577	XFree (preedit_attr);
1707	XFree (status_attr);	1578	XFree (status_attr);
1708	}	1579	}
1709	#endif /* USE_XIM */	1580	#endif /* USE_XIM */
1710		1581
1711	/----------------------------------------------------------------------/
1712	rxvt_t rxvt_current_term;
1713
1714	/----------------------- end-of-file (C source) -----------------------/	1582	/----------------------- 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.167 by root, Sun Jan 8 08:43:11 2006 UTC vs. Revision 1.192 by root, Fri Jan 20 12:16:28 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC vs.
Revision 1.192 by root, Fri Jan 20 12:16:28 2006 UTC