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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.169 by root, Tue Jan 10 18:09:22 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__)	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	}
287		256
288	// TODO: free pixcolours, colours should become part of rxvt_display	257	// TODO: free pixcolours, colours should become part of rxvt_display
289
290	delete pix_colors_focused;	258	delete pix_colors_focused;
291	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
292	delete pix_colors_unfocused;	260	delete pix_colors_unfocused;
293	#endif
294	#if USE_XGETDEFAULT
295	XrmDestroyDatabase (xrmdatabase);
296	#endif	261	#endif
297		262
298	displays.put (display);	263	displays.put (display);
299		264
300	scr_release ();	265	scr_release ();
…		…
319	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
320	delete keyboard;	285	delete keyboard;
321	#endif	286	#endif
322	}	287	}
323		288
		289	// child has exited, usually destroys
324	void	290	void
325	rxvt_term::child_exit ()	291	rxvt_term::child_cb (child_watcher &w, int status)
326	{	292	{
		293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		294
327	cmd_pid = 0;	295	cmd_pid = 0;
328		296
329	if (!OPTION (Opt_hold))	297	if (!OPTION (Opt_hold))
330	destroy ();	298	destroy ();
331	}	299	}
…		…
334	rxvt_term::destroy ()	302	rxvt_term::destroy ()
335	{	303	{
336	if (destroy_ev.active)	304	if (destroy_ev.active)
337	return;	305	return;
338		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		309
339	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
340	scr_overlay_off ();	311	scr_overlay_off ();
341	#endif	312	#endif
342		313
343	if (display)	314	if (display)
…		…
345	#if USE_XIM	316	#if USE_XIM
346	im_ev.stop (display);	317	im_ev.stop (display);
347	#endif	318	#endif
348	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
349	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
350	#endif
351	#if MENUBAR
352	menubar_ev.stop (display);
353	#endif	321	#endif
354	#if TRANSPARENT	322	#if TRANSPARENT
355	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
356	#endif	324	#endif
357	incr_ev.stop ();	325	incr_ev.stop ();
…		…
381	}	349	}
382		350
383	void	351	void
384	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
385	{	353	{
386	SET_R (this);	354	make_current ();
387		355
388	delete this;	356	delete this;
389	}	357	}
390		358
391	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
482	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
483	bool	451	bool
484	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv)
485	{	453	{
486	SET_R (this);	454	SET_R (this);
487
488	set_locale ("");	455	set_locale ("");
		456	set_environ (envv); // few things in X do not call setlocale :(
489		457
490	if (!init_vars ())	458	if (!init_vars ())
491	return false;	459	return false;
492		460
493	init_secondary ();	461	init_secondary ();
…		…
496		464
497	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
498	keyboard->register_done ();	466	keyboard->register_done ();
499	#endif	467	#endif
500		468
501	#if MENUBAR_MAX
502	menubar_read (rs[Rs_menu]);
503	#endif
504	#ifdef HAVE_SCROLLBARS	469	#ifdef HAVE_SCROLLBARS
505	if (OPTION (Opt_scrollBar))	470	if (OPTION (Opt_scrollBar))
506	scrollBar.setIdle (); /* set existence for size calculations */	471	scrollBar.setIdle (); /* set existence for size calculations */
507	#endif	472	#endif
508		473
509	#if ENABLE_PERL	474	pty = rxvt_new_ptytty ();
510	if (!rs[Rs_perl_ext_1])
511	rs[Rs_perl_ext_1] = "default";
512
513	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
514	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
515	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
516	{
517	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
518	// ignore some perl-related arguments if some bozo installed us set[ug]id
519	if (rxvt_tainted ())
520	{
521	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
522	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
523	{
524	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
525	rs[Rs_perl_lib] = 0;
526	rs[Rs_perl_eval] = 0;
527	}
528	}
529	#endif
530	rxvt_perl.init ();
531	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532	}
533	#endif
534		475
535	create_windows (argc, argv);	476	create_windows (argc, argv);
536		477
537	dDisp;	478	dDisp;
538		479
539	init_xlocale ();	480	init_xlocale ();
540		481
541	scr_reset (); /* initialize screen */	482	scr_reset (); // initialize screen
542		483
543	#if 0	484	#if 0
544	XSynchronize (disp, True);	485	XSynchronize (disp, True);
545	#endif	486	#endif
546		487
547	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
548	if (OPTION (Opt_scrollBar))	489	if (OPTION (Opt_scrollBar))
549	resize_scrollbar (); /* create and map scrollbar */	490	resize_scrollbar (); /* create and map scrollbar */
550	#endif	491	#endif
551	#if (MENUBAR_MAX)
552	if (menubar_visible ())
553	XMapWindow (disp, menuBar.win);
554	#endif
555	#ifdef TRANSPARENT	492	#ifdef TRANSPARENT
556	if (OPTION (Opt_transparent))	493	if (OPTION (Opt_transparent))
557	{	494	{
558	XSelectInput (disp, display->root, PropertyChangeMask);	495	XSelectInput (disp, display->root, PropertyChangeMask);
559	check_our_parents ();	496	check_our_parents ();
560	rootwin_ev.start (display, display->root);	497	rootwin_ev.start (display, display->root);
561	}	498	}
562	#endif	499	#endif
563		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
564	XMapWindow (disp, vt);	514	XMapWindow (disp, vt);
565	XMapWindow (disp, parent[0]);	515	XMapWindow (disp, parent[0]);
566		516
567	set_colorfgbg ();
568
569	init_command (cmd_argv);
570
571	free (cmd_argv);
572
573	if (pty.pty >= 0)
574	pty_ev.start (pty.pty, EVENT_READ);
575
576	check_ev.start ();
577
578	HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580	return true;	517	return true;
581	}	518	}
582		519
583	static struct sig_handlers	520	static struct sig_handlers
584	{	521	{
585	sig_watcher sw_chld, sw_term, sw_int;	522	sig_watcher sw_term, sw_int;
586		523
587	void sig_chld (sig_watcher &w)
588	{
589	// we are being called for every SIGCHLD, find the corresponding term
590	int pid;
591
592	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
593	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
594	if (pid == (*t)->cmd_pid)
595	{
596	(*t)->child_exit ();
597	break;
598	}
599	}
600
601	/*	524	/*
602	* Catch a fatal signal and tidy up before quitting	525	* Catch a fatal signal and tidy up before quitting
603	*/	526	*/
604	void	527	void
605	sig_term (sig_watcher &w)	528	sig_term (sig_watcher &w)
…		…
611	signal (w.signum, SIG_DFL);	534	signal (w.signum, SIG_DFL);
612	kill (getpid (), w.signum);	535	kill (getpid (), w.signum);
613	}	536	}
614		537
615	sig_handlers ()	538	sig_handlers ()
616	: sw_chld (this, &sig_handlers::sig_chld),
617	sw_term (this, &sig_handlers::sig_term),	539	: sw_term (this, &sig_handlers::sig_term),
618	sw_int (this, &sig_handlers::sig_term)	540	sw_int (this, &sig_handlers::sig_term)
619	{	541	{
620	}	542	}
621	} sig_handlers;	543	} sig_handlers;
622		544
		545	char **rxvt_environ; // startup environment
		546
623	void	547	void
624	rxvt_init ()	548	rxvt_init ()
625	{	549	{
626	/*	550	uid_t uid = getuid ();
627	* Save and then give up any super-user privileges	551	gid_t gid = getgid ();
628	* If we need privileges in any area then we must specifically request it.	552
629	* We should only need to be root in these cases:	553	// before doing anything else, check for setuid/setgid operation,
630	* 1. write utmp entries on some systems	554	// start the helper process and drop privileges
631	* 2. chown tty on some systems	555	if (uid != geteuid ()
632	*/	556	\|\| gid != getegid ())
633	rxvt_privileges (SAVE);	557	{
634	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;
635		582
636	signal (SIGHUP, SIG_IGN);	583	signal (SIGHUP, SIG_IGN);
637	signal (SIGPIPE, SIG_IGN);	584	signal (SIGPIPE, SIG_IGN);
638		585
639	sig_handlers.sw_chld.start (SIGCHLD);
640	sig_handlers.sw_term.start (SIGTERM);	586	sig_handlers.sw_term.start (SIGTERM);
641	sig_handlers.sw_int.start (SIGINT);	587	sig_handlers.sw_int.start (SIGINT);
642		588
643	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	589	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
644	/* signal (SIGURG, SIG_DFL); */	590	/* signal (SIGURG, SIG_DFL); */
645		591
646	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	592	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
647	// TODO: handle this with exceptions and tolerate the memory loss	593	// TODO: handle this with exceptions and tolerate the memory loss
648	XSetIOErrorHandler (rxvt_xioerror_handler);	594	XSetIOErrorHandler (rxvt_xioerror_handler);
649		595
650	#ifdef USE_XGETDEFAULT
651	XrmInitialize ();	596	XrmInitialize ();
652	#endif
653	}	597	}
654		598
655	/* ------------------------------------------------------------------------- *	599	/* ------------------------------------------------------------------------- *
656	* MEMORY ALLOCATION WRAPPERS *	600	* MEMORY ALLOCATION WRAPPERS *
657	* ------------------------------------------------------------------------- */	601	* ------------------------------------------------------------------------- */
…		…
675	rxvt_fatal ("memory allocation failure. aborting.\n");	619	rxvt_fatal ("memory allocation failure. aborting.\n");
676		620
677	return p;	621	return p;
678	}	622	}
679		623
680	void *	624	void *
681	rxvt_realloc (void *ptr, size_t size)	625	rxvt_realloc (void *ptr, size_t size)
682	{	626	{
683	void *p = realloc (ptr, size);	627	void *p = realloc (ptr, size);
684		628
685	if (!p)	629	if (!p)
686	rxvt_fatal ("memory allocation failure. aborting.\n");	630	rxvt_fatal ("memory allocation failure. aborting.\n");
687		631
688	return p;	632	return p;
689	}	633	}
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	seteuid (getuid ());
714	setegid (getgid ());
715	break;
716	case SAVE:
717	saved_euid = geteuid ();
718	saved_egid = getegid ();
719	break;
720	case RESTORE:
721	seteuid (saved_euid);
722	setegid (saved_egid);
723	break;
724	}
725	# else
726	switch (action)
727	{
728	case IGNORE:
729	setuid (getuid ());
730	setgid (getgid ());
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		634
760	/----------------------------------------------------------------------/	635	/----------------------------------------------------------------------/
761	/*	636	/*
762	* window size/position calculcations for XSizeHint and other storage.	637	* window size/position calculcations for XSizeHint and other storage.
763	* if width/height are non-zero then override calculated width/height	638	* if width/height are non-zero then override calculated width/height
764	*/	639	*/
765	void	640	void
766	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	641	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767	{	642	{
768	short recalc_x, recalc_y;	643	short recalc_x, recalc_y;
769	int x, y, sb_w, mb_h, flags;	644	int x, y, sb_w, flags;
770	unsigned int w, h;	645	unsigned int w, h;
771	unsigned int max_width, max_height;	646	unsigned int max_width, max_height;
772	dDisp;	647	dDisp;
773		648
774	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",
…		…
835	max_width = MAX_COLS * fwidth;	710	max_width = MAX_COLS * fwidth;
836	max_height = MAX_ROWS * fheight;	711	max_height = MAX_ROWS * fheight;
837		712
838	szHint.base_width = szHint.base_height = 2 * int_bwidth;	713	szHint.base_width = szHint.base_height = 2 * int_bwidth;
839		714
840	sb_w = mb_h = 0;	715	sb_w = 0;
841	window_vt_x = window_vt_y = int_bwidth;	716	window_vt_x = window_vt_y = int_bwidth;
842		717
843	if (scrollbar_visible ())	718	if (scrollBar.state)
844	{	719	{
845	sb_w = scrollbar_TotalWidth ();	720	sb_w = scrollbar_TotalWidth ();
846	szHint.base_width += sb_w;	721	szHint.base_width += sb_w;
847	if (!OPTION (Opt_scrollBar_right))	722	if (!OPTION (Opt_scrollBar_right))
848	window_vt_x += sb_w;	723	window_vt_x += sb_w;
849	}	724	}
850		725
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;	726	szHint.width_inc = fwidth;
859	szHint.height_inc = fheight;	727	szHint.height_inc = fheight;
860	szHint.min_width = szHint.base_width + szHint.width_inc;	728	szHint.min_width = szHint.base_width + szHint.width_inc;
861	szHint.min_height = szHint.base_height + szHint.height_inc;	729	szHint.min_height = szHint.base_height + szHint.height_inc;
862		730
…		…
880	{	748	{
881	min_it (height, max_height);	749	min_it (height, max_height);
882	szHint.height = szHint.base_height + height;	750	szHint.height = szHint.base_height + height;
883	}	751	}
884		752
885	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	753	if (scrollBar.state && OPTION (Opt_scrollBar_right))
886	window_sb_x = szHint.width - sb_w;	754	window_sb_x = szHint.width - sb_w;
887		755
888	if (recalc_x)	756	if (recalc_x)
889	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	757	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890	if (recalc_y)	758	if (recalc_y)
…		…
904	* Called after a window size change.	772	* Called after a window size change.
905	*/	773	*/
906	void	774	void
907	rxvt_term::tt_winch ()	775	rxvt_term::tt_winch ()
908	{	776	{
909	if (pty.pty < 0)	777	if (pty->pty < 0)
910	return;	778	return;
911		779
912	struct winsize ws;	780	struct winsize ws;
913		781
914	ws.ws_col = ncol;	782	ws.ws_col = ncol;
915	ws.ws_row = nrow;	783	ws.ws_row = nrow;
916	ws.ws_xpixel = width;	784	ws.ws_xpixel = width;
917	ws.ws_ypixel = height;	785	ws.ws_ypixel = height;
918	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	786	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919		787
920	#if 0	788	#if 0
921	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	789	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922	if (cmd_pid) /* force through to the command */	790	if (cmd_pid) /* force through to the command */
923	kill (-cmd_pid, SIGWINCH);	791	kill (-cmd_pid, SIGWINCH);
…		…
1245		1113
1246	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1114	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1247		1115
1248	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1116	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1249	{	1117	{
1250	if (scrollbar_visible ())	1118	if (scrollBar.state)
1251	{	1119	{
1252	XMoveResizeWindow (disp, scrollBar.win,	1120	XMoveResizeWindow (disp, scrollBar.win,
1253	window_sb_x, 0,	1121	window_sb_x, 0,
1254	scrollbar_TotalWidth (), szHint.height);	1122	scrollbar_TotalWidth (), szHint.height);
1255	resize_scrollbar ();	1123	resize_scrollbar ();
1256	}	1124	}
1257
1258	if (menubar_visible ())
1259	XMoveResizeWindow (disp, menuBar.win,
1260	window_vt_x, 0,
1261	width, menuBar_TotalHeight ());
1262		1125
1263	XMoveResizeWindow (disp, vt,	1126	XMoveResizeWindow (disp, vt,
1264	window_vt_x, window_vt_y,	1127	window_vt_x, window_vt_y,
1265	width, height);	1128	width, height);
1266		1129
…		…
1450	XRectangle rect, status_rect, needed_rect;	1313	XRectangle rect, status_rect, needed_rect;
1451	unsigned long fg, bg;	1314	unsigned long fg, bg;
1452	const char *p;	1315	const char *p;
1453	char **s;	1316	char **s;
1454	XIMStyles *xim_styles;	1317	XIMStyles *xim_styles;
		1318
		1319	set_environ (envv);
1455		1320
1456	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1321	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1457	return false;	1322	return false;
1458		1323
1459	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1324	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1625	int i;	1490	int i;
1626	const char *p;	1491	const char *p;
1627	char **s;	1492	char **s;
1628	char buf[IMBUFSIZ];	1493	char buf[IMBUFSIZ];
1629		1494
1630	SET_R (this);	1495	make_current ();
1631		1496
1632	im_destroy ();	1497	im_destroy ();
1633		1498
1634	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1499	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1635	if (Input_Context)	1500	if (Input_Context)
…		…
1712	XFree (preedit_attr);	1577	XFree (preedit_attr);
1713	XFree (status_attr);	1578	XFree (status_attr);
1714	}	1579	}
1715	#endif /* USE_XIM */	1580	#endif /* USE_XIM */
1716		1581
1717	/----------------------------------------------------------------------/
1718	rxvt_t rxvt_current_term;
1719
1720	/----------------------- 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.169 by root, Tue Jan 10 18:09:22 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.169 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.192 by root, Fri Jan 20 12:16:28 2006 UTC