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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.163 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
53	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
54		57
55	bool	58	bool
56	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
57	{	60	{
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
59	return false;	62	return false;
60		63
61	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
62	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
63	return true;	66	return true;
64	}	67	}
65		68
66	bool	69	void
67	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
68	{	71	{
69	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
71	}	74	}
72		75
73	void	76	void
74	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
75	{	78	{
76	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
77	}	80	}
78		81
79	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	150	#endif
148	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif	153	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif	156	#endif
157	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
170	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	171	#endif
172	#ifdef USE_XIM	172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
174	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
175	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
177	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
178	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
179	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
180	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
181	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
184		188
185	termlist.push_back (this);	189	termlist.push_back (this);
186		190
187	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
188	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
189
190	if (!keyboard)
191	rxvt_fatal ("out of memory, aborting.\n");
192	#endif	193	#endif
193	}	194	}
194		195
195	// 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.
196	// for use before an emergency exit	197	// for use before an emergency exit
197	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
198	{	199	{
199	if (cmd_pid)	200	if (cmd_pid)
200	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
201		202
202	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
203	privileged_utmp (RESTORE);
204	#endif
205
206	pty.put ();
207	}	204	}
208		205
209	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
210	{	207	{
211	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
214		209
215	emergency_cleanup ();	210	emergency_cleanup ();
216		211
217	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
227		222
228	selection_clear ();	223	selection_clear ();
229		224
230	#ifdef USE_XIM	225	#ifdef USE_XIM
231	im_destroy ();	226	im_destroy ();
232	#endif
233	#ifdef MENUBAR
234	if (menubarGC) XFreeGC (disp, menubarGC);
235	#endif	227	#endif
236	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
237	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
239	#endif	231	#endif
…		…
250	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
251	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
252	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
253	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
254	#endif	246	#endif
255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
256	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
257	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259	#endif	251	#endif
260	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
261		253
262	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263	delete menuBar.drawable;
264	//if (menuBar.win)
265	// XDestroyWindow (disp, menuBar.win);
266	#endif
267	delete drawable;	254	delete drawable;
268	// destroy all windows	255	// destroy all windows
269	if (parent[0])	256	if (parent[0])
270	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
271	}	258	}
272		259
273	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
274
275	delete pix_colors_focused;	261	delete pix_colors_focused;
276	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
277	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
278	#endif	264	#endif
279		265
…		…
301	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
302	delete keyboard;	288	delete keyboard;
303	#endif	289	#endif
304	}	290	}
305		291
		292	// child has exited, usually destroys
306	void	293	void
307	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
308	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
309	cmd_pid = 0;	298	cmd_pid = 0;
310		299
311	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
312	destroy ();	301	destroy ();
313	}	302	}
…		…
316	rxvt_term::destroy ()	305	rxvt_term::destroy ()
317	{	306	{
318	if (destroy_ev.active)	307	if (destroy_ev.active)
319	return;	308	return;
320		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		311	return;
		312
321	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
322	scr_overlay_off ();	314	scr_overlay_off ();
323	#endif	315	#endif
324		316
325	if (display)	317	if (display)
…		…
327	#if USE_XIM	319	#if USE_XIM
328	im_ev.stop (display);	320	im_ev.stop (display);
329	#endif	321	#endif
330	#if HAVE_SCROLLBARS	322	#if HAVE_SCROLLBARS
331	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
332	#endif
333	#if MENUBAR
334	menubar_ev.stop (display);
335	#endif	324	#endif
336	#if TRANSPARENT	325	#if TRANSPARENT
337	rootwin_ev.stop (display);	326	rootwin_ev.stop (display);
338	#endif	327	#endif
339	incr_ev.stop ();	328	incr_ev.stop ();
…		…
363	}	352	}
364		353
365	void	354	void
366	rxvt_term::destroy_cb (time_watcher &w)	355	rxvt_term::destroy_cb (time_watcher &w)
367	{	356	{
368	SET_R (this);	357	make_current ();
369		358
370	delete this;	359	delete this;
371	}	360	}
372		361
373	/----------------------------------------------------------------------/	362	/----------------------------------------------------------------------/
…		…
464	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
465	bool	454	bool
466	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv)
467	{	456	{
468	SET_R (this);	457	SET_R (this);
469
470	set_locale ("");	458	set_locale ("");
		459	set_environ (envv); // few things in X do not call setlocale :(
471		460
472	if (!init_vars ())	461	if (!init_vars ())
473	return false;	462	return false;
474		463
475	init_secondary ();	464	init_secondary ();
…		…
478		467
479	#ifdef KEYSYM_RESOURCE	468	#ifdef KEYSYM_RESOURCE
480	keyboard->register_done ();	469	keyboard->register_done ();
481	#endif	470	#endif
482		471
483	#if MENUBAR_MAX
484	menubar_read (rs[Rs_menu]);
485	#endif
486	#ifdef HAVE_SCROLLBARS	472	#ifdef HAVE_SCROLLBARS
487	if (OPTION (Opt_scrollBar))	473	if (OPTION (Opt_scrollBar))
488	scrollBar.setIdle (); /* set existence for size calculations */	474	scrollBar.setIdle (); /* set existence for size calculations */
489	#endif	475	#endif
490		476
491	#if ENABLE_PERL	477	pty = rxvt_new_ptytty ();
492	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495	{
496	rxvt_perl.init ();
497	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498	}
499	#endif
500		478
501	create_windows (argc, argv);	479	create_windows (argc, argv);
502		480
503	dDisp;	481	dDisp;
504		482
505	init_xlocale ();	483	init_xlocale ();
506		484
507	scr_reset (); /* initialize screen */	485	scr_reset (); // initialize screen
508		486
509	#if 0	487	#if 0
510	XSynchronize (disp, True);	488	XSynchronize (disp, True);
511	#endif	489	#endif
512		490
513	#ifdef HAVE_SCROLLBARS	491	#ifdef HAVE_SCROLLBARS
514	if (OPTION (Opt_scrollBar))	492	if (OPTION (Opt_scrollBar))
515	resize_scrollbar (); /* create and map scrollbar */	493	resize_scrollbar (); /* create and map scrollbar */
516	#endif	494	#endif
517	#if (MENUBAR_MAX)
518	if (menubar_visible ())
519	XMapWindow (disp, menuBar.win);
520	#endif
521	#ifdef TRANSPARENT	495	#ifdef TRANSPARENT
522	if (OPTION (Opt_transparent))	496	if (OPTION (Opt_transparent))
523	{	497	{
524	XSelectInput (disp, display->root, PropertyChangeMask);	498	XSelectInput (disp, display->root, PropertyChangeMask);
525	check_our_parents ();	499	check_our_parents ();
526	rootwin_ev.start (display, display->root);	500	rootwin_ev.start (display, display->root);
527	}	501	}
528	#endif	502	#endif
529		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
530	XMapWindow (disp, vt);	517	XMapWindow (disp, vt);
531	XMapWindow (disp, parent[0]);	518	XMapWindow (disp, parent[0]);
532		519
533	set_colorfgbg ();
534
535	init_command (cmd_argv);
536
537	free (cmd_argv);
538
539	if (pty.pty >= 0)
540	pty_ev.start (pty.pty, EVENT_READ);
541
542	check_ev.start ();
543
544	HOOK_INVOKE ((this, HOOK_START, DT_END));
545
546	return true;	520	return true;
547	}	521	}
548		522
549	static struct sig_handlers	523	static struct sig_handlers
550	{	524	{
551	sig_watcher sw_chld, sw_term, sw_int;	525	sig_watcher sw_term, sw_int;
552		526
553	void sig_chld (sig_watcher &w)
554	{
555	// we are being called for every SIGCHLD, find the corresponding term
556	int pid;
557
558	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
559	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
560	if (pid == (*t)->cmd_pid)
561	{
562	(*t)->child_exit ();
563	break;
564	}
565	}
566
567	/*	527	/*
568	* Catch a fatal signal and tidy up before quitting	528	* Catch a fatal signal and tidy up before quitting
569	*/	529	*/
570	void	530	void
571	sig_term (sig_watcher &w)	531	sig_term (sig_watcher &w)
…		…
577	signal (w.signum, SIG_DFL);	537	signal (w.signum, SIG_DFL);
578	kill (getpid (), w.signum);	538	kill (getpid (), w.signum);
579	}	539	}
580		540
581	sig_handlers ()	541	sig_handlers ()
582	: sw_chld (this, &sig_handlers::sig_chld),
583	sw_term (this, &sig_handlers::sig_term),	542	: sw_term (this, &sig_handlers::sig_term),
584	sw_int (this, &sig_handlers::sig_term)	543	sw_int (this, &sig_handlers::sig_term)
585	{	544	{
586	}	545	}
587	} sig_handlers;	546	} sig_handlers;
588		547
		548	char **rxvt_environ; // startup environment
		549
589	void	550	void
590	rxvt_init ()	551	rxvt_init ()
591	{	552	{
592	/*	553	uid_t uid = getuid ();
593	* Save and then give up any super-user privileges	554	gid_t gid = getgid ();
594	* If we need privileges in any area then we must specifically request it.	555
595	* We should only need to be root in these cases:	556	// before doing anything else, check for setuid/setgid operation,
596	* 1. write utmp entries on some systems	557	// start the helper process and drop privileges
597	* 2. chown tty on some systems	558	if (uid != geteuid ()
598	*/	559	\|\| gid != getegid ())
599	rxvt_privileges (SAVE);	560	{
600	rxvt_privileges (IGNORE);	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
		584	rxvt_environ = environ;
601		585
602	signal (SIGHUP, SIG_IGN);	586	signal (SIGHUP, SIG_IGN);
603	signal (SIGPIPE, SIG_IGN);	587	signal (SIGPIPE, SIG_IGN);
604		588
605	sig_handlers.sw_chld.start (SIGCHLD);
606	sig_handlers.sw_term.start (SIGTERM);	589	sig_handlers.sw_term.start (SIGTERM);
607	sig_handlers.sw_int.start (SIGINT);	590	sig_handlers.sw_int.start (SIGINT);
608		591
609	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	592	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
610	/* signal (SIGURG, SIG_DFL); */	593	/* signal (SIGURG, SIG_DFL); */
611		594
612	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	595	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
613	// TODO: handle this with exceptions and tolerate the memory loss	596	// TODO: handle this with exceptions and tolerate the memory loss
614	XSetIOErrorHandler (rxvt_xioerror_handler);	597	XSetIOErrorHandler (rxvt_xioerror_handler);
		598
		599	XrmInitialize ();
615	}	600	}
616		601
617	/* ------------------------------------------------------------------------- *	602	/* ------------------------------------------------------------------------- *
618	* MEMORY ALLOCATION WRAPPERS *	603	* MEMORY ALLOCATION WRAPPERS *
619	* ------------------------------------------------------------------------- */	604	* ------------------------------------------------------------------------- */
…		…
637	rxvt_fatal ("memory allocation failure. aborting.\n");	622	rxvt_fatal ("memory allocation failure. aborting.\n");
638		623
639	return p;	624	return p;
640	}	625	}
641		626
642	void *	627	void *
643	rxvt_realloc (void *ptr, size_t size)	628	rxvt_realloc (void *ptr, size_t size)
644	{	629	{
645	void *p = realloc (ptr, size);	630	void *p = realloc (ptr, size);
646		631
647	if (!p)	632	if (!p)
648	rxvt_fatal ("memory allocation failure. aborting.\n");	633	rxvt_fatal ("memory allocation failure. aborting.\n");
649		634
650	return p;	635	return p;
651	}	636	}
652
653	/* ------------------------------------------------------------------------- *
654	* PRIVILEGED OPERATIONS *
655	* ------------------------------------------------------------------------- */
656	/* take care of suid/sgid super-user (root) privileges */
657	void
658	rxvt_privileges (rxvt_privaction action)
659	{
660	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
661	static uid_t euid;
662	static gid_t egid;
663	#endif
664
665	#if ! defined(__CYGWIN32__)
666	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
667	/* setreuid () is the poor man's setuid (), seteuid () */
668	# define seteuid(a) setreuid(-1, (a))
669	# define setegid(a) setregid(-1, (a))
670	# define HAVE_SETEUID
671	# endif
672	# ifdef HAVE_SETEUID
673	switch (action)
674	{
675	case IGNORE:
676	/*
677	* change effective uid/gid - not real uid/gid - so we can switch
678	* back to root later, as required
679	*/
680	seteuid (getuid ());
681	setegid (getgid ());
682	break;
683	case SAVE:
684	euid = geteuid ();
685	egid = getegid ();
686	break;
687	case RESTORE:
688	seteuid (euid);
689	setegid (egid);
690	break;
691	}
692	# else
693	switch (action)
694	{
695	case IGNORE:
696	setuid (getuid ());
697	setgid (getgid ());
698	/* FALLTHROUGH */
699	case SAVE:
700	/* FALLTHROUGH */
701	case RESTORE:
702	break;
703	}
704	# endif
705	#endif
706	}
707
708	#ifdef UTMP_SUPPORT
709	void
710	rxvt_term::privileged_utmp (rxvt_privaction action)
711	{
712	if (OPTION (Opt_utmpInhibit)
713	\|\| !pty.name \|\| !*pty.name)
714	return;
715
716	rxvt_privileges (RESTORE);
717
718	if (action == SAVE)
719	makeutent (pty.name, rs[Rs_display_name]);
720	else
721	cleanutent ();
722
723	rxvt_privileges (IGNORE);
724	}
725	#endif
726		637
727	/----------------------------------------------------------------------/	638	/----------------------------------------------------------------------/
728	/*	639	/*
729	* window size/position calculcations for XSizeHint and other storage.	640	* window size/position calculcations for XSizeHint and other storage.
730	* if width/height are non-zero then override calculated width/height	641	* if width/height are non-zero then override calculated width/height
731	*/	642	*/
732	void	643	void
733	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	644	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
734	{	645	{
735	short recalc_x, recalc_y;	646	short recalc_x, recalc_y;
736	int x, y, sb_w, mb_h, flags;	647	int x, y, sb_w, flags;
737	unsigned int w, h;	648	unsigned int w, h;
738	unsigned int max_width, max_height;	649	unsigned int max_width, max_height;
739	dDisp;	650	dDisp;
740		651
741	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",
…		…
802	max_width = MAX_COLS * fwidth;	713	max_width = MAX_COLS * fwidth;
803	max_height = MAX_ROWS * fheight;	714	max_height = MAX_ROWS * fheight;
804		715
805	szHint.base_width = szHint.base_height = 2 * int_bwidth;	716	szHint.base_width = szHint.base_height = 2 * int_bwidth;
806		717
807	sb_w = mb_h = 0;	718	sb_w = 0;
808	window_vt_x = window_vt_y = int_bwidth;	719	window_vt_x = window_vt_y = int_bwidth;
809		720
810	if (scrollbar_visible ())	721	if (scrollBar.state)
811	{	722	{
812	sb_w = scrollbar_TotalWidth ();	723	sb_w = scrollbar_TotalWidth ();
813	szHint.base_width += sb_w;	724	szHint.base_width += sb_w;
814	if (!OPTION (Opt_scrollBar_right))	725	if (!OPTION (Opt_scrollBar_right))
815	window_vt_x += sb_w;	726	window_vt_x += sb_w;
816	}	727	}
817		728
818	if (menubar_visible ())
819	{
820	mb_h = menuBar_TotalHeight ();
821	szHint.base_height += mb_h;
822	window_vt_y += mb_h;
823	}
824
825	szHint.width_inc = fwidth;	729	szHint.width_inc = fwidth;
826	szHint.height_inc = fheight;	730	szHint.height_inc = fheight;
827	szHint.min_width = szHint.base_width + szHint.width_inc;	731	szHint.min_width = szHint.base_width + szHint.width_inc;
828	szHint.min_height = szHint.base_height + szHint.height_inc;	732	szHint.min_height = szHint.base_height + szHint.height_inc;
829		733
…		…
847	{	751	{
848	min_it (height, max_height);	752	min_it (height, max_height);
849	szHint.height = szHint.base_height + height;	753	szHint.height = szHint.base_height + height;
850	}	754	}
851		755
852	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	756	if (scrollBar.state && OPTION (Opt_scrollBar_right))
853	window_sb_x = szHint.width - sb_w;	757	window_sb_x = szHint.width - sb_w;
854		758
855	if (recalc_x)	759	if (recalc_x)
856	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	760	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
857	if (recalc_y)	761	if (recalc_y)
…		…
871	* Called after a window size change.	775	* Called after a window size change.
872	*/	776	*/
873	void	777	void
874	rxvt_term::tt_winch ()	778	rxvt_term::tt_winch ()
875	{	779	{
876	if (pty.pty < 0)	780	if (pty->pty < 0)
877	return;	781	return;
878		782
879	struct winsize ws;	783	struct winsize ws;
880		784
881	ws.ws_col = ncol;	785	ws.ws_col = ncol;
882	ws.ws_row = nrow;	786	ws.ws_row = nrow;
883	ws.ws_xpixel = width;	787	ws.ws_xpixel = width;
884	ws.ws_ypixel = height;	788	ws.ws_ypixel = height;
885	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	789	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
886		790
887	#if 0	791	#if 0
888	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	792	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
889	if (cmd_pid) /* force through to the command */	793	if (cmd_pid) /* force through to the command */
890	kill (-cmd_pid, SIGWINCH);	794	kill (-cmd_pid, SIGWINCH);
…		…
1212		1116
1213	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1117	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1214		1118
1215	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1119	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1216	{	1120	{
1217	if (scrollbar_visible ())	1121	if (scrollBar.state)
1218	{	1122	{
1219	XMoveResizeWindow (disp, scrollBar.win,	1123	XMoveResizeWindow (disp, scrollBar.win,
1220	window_sb_x, 0,	1124	window_sb_x, 0,
1221	scrollbar_TotalWidth (), szHint.height);	1125	scrollbar_TotalWidth (), szHint.height);
1222	resize_scrollbar ();	1126	resize_scrollbar ();
1223	}	1127	}
1224
1225	if (menubar_visible ())
1226	XMoveResizeWindow (disp, menuBar.win,
1227	window_vt_x, 0,
1228	width, menuBar_TotalHeight ());
1229		1128
1230	XMoveResizeWindow (disp, vt,	1129	XMoveResizeWindow (disp, vt,
1231	window_vt_x, window_vt_y,	1130	window_vt_x, window_vt_y,
1232	width, height);	1131	width, height);
1233		1132
…		…
1417	XRectangle rect, status_rect, needed_rect;	1316	XRectangle rect, status_rect, needed_rect;
1418	unsigned long fg, bg;	1317	unsigned long fg, bg;
1419	const char *p;	1318	const char *p;
1420	char **s;	1319	char **s;
1421	XIMStyles *xim_styles;	1320	XIMStyles *xim_styles;
		1321
		1322	set_environ (envv);
1422		1323
1423	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1324	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424	return false;	1325	return false;
1425		1326
1426	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1327	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1592	int i;	1493	int i;
1593	const char *p;	1494	const char *p;
1594	char **s;	1495	char **s;
1595	char buf[IMBUFSIZ];	1496	char buf[IMBUFSIZ];
1596		1497
1597	SET_R (this);	1498	make_current ();
1598		1499
1599	im_destroy ();	1500	im_destroy ();
1600		1501
1601	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1502	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602	if (Input_Context)	1503	if (Input_Context)
…		…
1679	XFree (preedit_attr);	1580	XFree (preedit_attr);
1680	XFree (status_attr);	1581	XFree (status_attr);
1681	}	1582	}
1682	#endif /* USE_XIM */	1583	#endif /* USE_XIM */
1683		1584
1684	/----------------------------------------------------------------------/
1685	rxvt_t rxvt_current_term;
1686
1687	/----------------------- 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.163 by root, Fri Jan 6 02:11:15 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.163 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC