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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.197 by root, Sun Jan 22 20:39:47 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];	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;
		67	}
		68
		69	void
		70	rxvt_push_locale (const char *locale) NOTHROW
		71	{
		72	strcpy (savelocale, curlocale);
		73	rxvt_set_locale (locale);
		74	}
		75
		76	void
		77	rxvt_pop_locale () NOTHROW
		78	{
		79	rxvt_set_locale (savelocale);
64	}	80	}
65		81
66	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
67	class rxvt_composite_vec rxvt_composite;	83	class rxvt_composite_vec rxvt_composite;
68		84
…		…
133	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
134	#endif	150	#endif
135	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
136	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
137	#endif	153	#endif
138	#ifdef MENUBAR
139	menubar_ev (this, &rxvt_term::x_cb),
140	#endif
141	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
142	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143	#endif	156	#endif
144	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
145	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
157	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
158	#endif	171	#endif
159	#ifdef USE_XIM	172	#ifdef USE_XIM
160	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
161	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
162	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
163	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
164	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
165	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
166	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
167	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
168	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
171		188
172	termlist.push_back (this);	189	termlist.push_back (this);
173		190
174	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
175	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
176
177	if (!keyboard)
178	rxvt_fatal ("out of memory, aborting.\n");
179	#endif	193	#endif
180	}	194	}
181		195
182	// 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.
183	// for use before an emergency exit	197	// for use before an emergency exit
184	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
185	{	199	{
186	if (cmd_pid)	200	if (cmd_pid)
187	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
188		202
189	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
190	privileged_utmp (RESTORE);
191	#endif
192
193	pty.put ();
194	}	204	}
195		205
196	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
197	{	207	{
198	PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
201		209
202	emergency_cleanup ();	210	emergency_cleanup ();
203		211
204	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
214		222
215	selection_clear ();	223	selection_clear ();
216		224
217	#ifdef USE_XIM	225	#ifdef USE_XIM
218	im_destroy ();	226	im_destroy ();
219	#endif
220	#ifdef MENUBAR
221	if (menubarGC) XFreeGC (disp, menubarGC);
222	#endif	227	#endif
223	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
224	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
226	#endif	231	#endif
…		…
237	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
238	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
239	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
240	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
241	#endif	246	#endif
242	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
243	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
244	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
245	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246	#endif	251	#endif
247	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
248		253
249	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250	delete menuBar.drawable;
251	//if (menuBar.win)
252	// XDestroyWindow (disp, menuBar.win);
253	#endif
254	delete drawable;	254	delete drawable;
255	// destroy all windows	255	// destroy all windows
256	if (parent[0])	256	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
258	}	258	}
259		259
260	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
261
262	delete pix_colors_focused;	261	delete pix_colors_focused;
263	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
264	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
265	#endif	264	#endif
266		265
…		…
288	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
289	delete keyboard;	288	delete keyboard;
290	#endif	289	#endif
291	}	290	}
292		291
		292	// child has exited, usually destroys
293	void	293	void
294	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
295	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
296	cmd_pid = 0;	298	cmd_pid = 0;
297		299
298	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
299	destroy ();	301	destroy ();
300	}	302	}
…		…
303	rxvt_term::destroy ()	305	rxvt_term::destroy ()
304	{	306	{
305	if (destroy_ev.active)	307	if (destroy_ev.active)
306	return;	308	return;
307		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		311	return;
		312
308	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
309	scr_overlay_off ();	314	scr_overlay_off ();
310	#endif	315	#endif
311		316
312	if (display)	317	if (display)
…		…
314	#if USE_XIM	319	#if USE_XIM
315	im_ev.stop (display);	320	im_ev.stop (display);
316	#endif	321	#endif
317	#if HAVE_SCROLLBARS	322	#if HAVE_SCROLLBARS
318	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
319	#endif
320	#if MENUBAR
321	menubar_ev.stop (display);
322	#endif	324	#endif
323	#if TRANSPARENT	325	#if TRANSPARENT
324	rootwin_ev.stop (display);	326	rootwin_ev.stop (display);
325	#endif	327	#endif
326	incr_ev.stop ();	328	incr_ev.stop ();
…		…
350	}	352	}
351		353
352	void	354	void
353	rxvt_term::destroy_cb (time_watcher &w)	355	rxvt_term::destroy_cb (time_watcher &w)
354	{	356	{
355	SET_R (this);	357	make_current ();
356		358
357	delete this;	359	delete this;
358	}	360	}
359		361
360	/----------------------------------------------------------------------/	362	/----------------------------------------------------------------------/
…		…
448	_exit (EXIT_FAILURE);	450	_exit (EXIT_FAILURE);
449	}	451	}
450		452
451	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
452	bool	454	bool
453	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv, stringvec *envv)
454	{	456	{
		457	this->envv = envv;
		458
455	SET_R (this);	459	SET_R (this);
456
457	set_locale ("");	460	set_locale ("");
		461	set_environ (envv); // few things in X do not call setlocale :(
458		462
459	if (!init_vars ())	463	if (!init_vars ())
460	return false;	464	return false;
461		465
462	init_secondary ();	466	init_secondary ();
…		…
465		469
466	#ifdef KEYSYM_RESOURCE	470	#ifdef KEYSYM_RESOURCE
467	keyboard->register_done ();	471	keyboard->register_done ();
468	#endif	472	#endif
469		473
470	#if MENUBAR_MAX
471	menubar_read (rs[Rs_menu]);
472	#endif
473	#ifdef HAVE_SCROLLBARS	474	#ifdef HAVE_SCROLLBARS
474	if (OPTION (Opt_scrollBar))	475	if (OPTION (Opt_scrollBar))
475	scrollBar.setIdle (); /* set existence for size calculations */	476	scrollBar.setIdle (); /* set existence for size calculations */
476	#endif	477	#endif
477		478
478	#if ENABLE_PERL	479	pty = ptytty::create ();
479	rxvt_perl.init ();
480	#endif
481
482	PERL_INVOKE ((this, HOOK_INIT, DT_END));
483		480
484	create_windows (argc, argv);	481	create_windows (argc, argv);
485		482
486	dDisp;	483	dDisp;
487		484
488	init_xlocale ();	485	init_xlocale ();
489		486
490	scr_reset (); /* initialize screen */	487	scr_reset (); // initialize screen
491		488
492	#if 0	489	#if 0
493	XSynchronize (disp, True);	490	XSynchronize (disp, True);
494	#endif	491	#endif
495		492
496	#ifdef HAVE_SCROLLBARS	493	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))	494	if (OPTION (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */	495	resize_scrollbar (); /* create and map scrollbar */
499	#endif	496	#endif
500	#if (MENUBAR_MAX)
501	if (menubar_visible ())
502	XMapWindow (disp, menuBar.win);
503	#endif
504	#ifdef TRANSPARENT	497	#ifdef TRANSPARENT
505	if (OPTION (Opt_transparent))	498	if (OPTION (Opt_transparent))
506	{	499	{
507	XSelectInput (disp, display->root, PropertyChangeMask);	500	XSelectInput (disp, display->root, PropertyChangeMask);
508	check_our_parents ();	501	check_our_parents ();
509	rootwin_ev.start (display, display->root);	502	rootwin_ev.start (display, display->root);
510	}	503	}
511	#endif	504	#endif
512		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
513	XMapWindow (disp, vt);	519	XMapWindow (disp, vt);
514	XMapWindow (disp, parent[0]);	520	XMapWindow (disp, parent[0]);
515		521
516	set_colorfgbg ();
517
518	init_command (cmd_argv);
519
520	free (cmd_argv);
521
522	pty_ev.start (pty.pty, EVENT_READ);
523
524	check_ev.start ();
525
526	PERL_INVOKE ((this, HOOK_START, DT_END));
527
528	return true;	522	return true;
529	}	523	}
530		524
531	static struct sig_handlers	525	static struct sig_handlers
532	{	526	{
533	sig_watcher sw_chld, sw_term, sw_int;	527	sig_watcher sw_term, sw_int;
534		528
535	void sig_chld (sig_watcher &w)
536	{
537	// we are being called for every SIGCHLD, find the corresponding term
538	int pid;
539
540	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542	if (pid == (*t)->cmd_pid)
543	{
544	(*t)->child_exit ();
545	break;
546	}
547	}
548
549	/*	529	/*
550	* Catch a fatal signal and tidy up before quitting	530	* Catch a fatal signal and tidy up before quitting
551	*/	531	*/
552	void	532	void
553	sig_term (sig_watcher &w)	533	sig_term (sig_watcher &w)
…		…
559	signal (w.signum, SIG_DFL);	539	signal (w.signum, SIG_DFL);
560	kill (getpid (), w.signum);	540	kill (getpid (), w.signum);
561	}	541	}
562		542
563	sig_handlers ()	543	sig_handlers ()
564	: sw_chld (this, &sig_handlers::sig_chld),
565	sw_term (this, &sig_handlers::sig_term),	544	: sw_term (this, &sig_handlers::sig_term),
566	sw_int (this, &sig_handlers::sig_term)	545	sw_int (this, &sig_handlers::sig_term)
567	{	546	{
568	}	547	}
569	} sig_handlers;	548	} sig_handlers;
570		549
		550	char **rxvt_environ; // startup environment
		551
571	void	552	void
572	rxvt_init ()	553	rxvt_init ()
573	{	554	{
574	/*	555	ptytty::init ();
575	* Save and then give up any super-user privileges	556
576	* If we need privileges in any area then we must specifically request it.	557	rxvt_environ = environ;
577	* We should only need to be root in these cases:
578	* 1. write utmp entries on some systems
579	* 2. chown tty on some systems
580	*/
581	rxvt_privileges (SAVE);
582	rxvt_privileges (IGNORE);
583		558
584	signal (SIGHUP, SIG_IGN);	559	signal (SIGHUP, SIG_IGN);
585	signal (SIGPIPE, SIG_IGN);	560	signal (SIGPIPE, SIG_IGN);
586		561
587	sig_handlers.sw_chld.start (SIGCHLD);
588	sig_handlers.sw_term.start (SIGTERM);	562	sig_handlers.sw_term.start (SIGTERM);
589	sig_handlers.sw_int.start (SIGINT);	563	sig_handlers.sw_int.start (SIGINT);
590		564
591	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	565	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
592	/* signal (SIGURG, SIG_DFL); */	566	/* signal (SIGURG, SIG_DFL); */
593		567
594	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	568	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
595	// TODO: handle this with exceptions and tolerate the memory loss	569	// TODO: handle this with exceptions and tolerate the memory loss
596	XSetIOErrorHandler (rxvt_xioerror_handler);	570	XSetIOErrorHandler (rxvt_xioerror_handler);
		571
		572	XrmInitialize ();
597	}	573	}
598		574
599	/* ------------------------------------------------------------------------- *	575	/* ------------------------------------------------------------------------- *
600	* MEMORY ALLOCATION WRAPPERS *	576	* MEMORY ALLOCATION WRAPPERS *
601	* ------------------------------------------------------------------------- */	577	* ------------------------------------------------------------------------- */
…		…
619	rxvt_fatal ("memory allocation failure. aborting.\n");	595	rxvt_fatal ("memory allocation failure. aborting.\n");
620		596
621	return p;	597	return p;
622	}	598	}
623		599
624	void *	600	void *
625	rxvt_realloc (void *ptr, size_t size)	601	rxvt_realloc (void *ptr, size_t size)
626	{	602	{
627	void *p = realloc (ptr, size);	603	void *p = realloc (ptr, size);
628		604
629	if (!p)	605	if (!p)
630	rxvt_fatal ("memory allocation failure. aborting.\n");	606	rxvt_fatal ("memory allocation failure. aborting.\n");
631		607
632	return p;	608	return p;
633	}	609	}
634
635	/* ------------------------------------------------------------------------- *
636	* PRIVILEGED OPERATIONS *
637	* ------------------------------------------------------------------------- */
638	/* take care of suid/sgid super-user (root) privileges */
639	void
640	rxvt_privileges (rxvt_privaction action)
641	{
642	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
643	static uid_t euid;
644	static gid_t egid;
645	#endif
646
647	#if ! defined(__CYGWIN32__)
648	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
649	/* setreuid () is the poor man's setuid (), seteuid () */
650	# define seteuid(a) setreuid(-1, (a))
651	# define setegid(a) setregid(-1, (a))
652	# define HAVE_SETEUID
653	# endif
654	# ifdef HAVE_SETEUID
655	switch (action)
656	{
657	case IGNORE:
658	/*
659	* change effective uid/gid - not real uid/gid - so we can switch
660	* back to root later, as required
661	*/
662	seteuid (getuid ());
663	setegid (getgid ());
664	break;
665	case SAVE:
666	euid = geteuid ();
667	egid = getegid ();
668	break;
669	case RESTORE:
670	seteuid (euid);
671	setegid (egid);
672	break;
673	}
674	# else
675	switch (action)
676	{
677	case IGNORE:
678	setuid (getuid ());
679	setgid (getgid ());
680	/* FALLTHROUGH */
681	case SAVE:
682	/* FALLTHROUGH */
683	case RESTORE:
684	break;
685	}
686	# endif
687	#endif
688	}
689
690	#ifdef UTMP_SUPPORT
691	void
692	rxvt_term::privileged_utmp (rxvt_privaction action)
693	{
694	if (OPTION (Opt_utmpInhibit)
695	\|\| !pty.name \|\| !*pty.name)
696	return;
697
698	rxvt_privileges (RESTORE);
699
700	if (action == SAVE)
701	makeutent (pty.name, rs[Rs_display_name]);
702	else
703	cleanutent ();
704
705	rxvt_privileges (IGNORE);
706	}
707	#endif
708		610
709	/----------------------------------------------------------------------/	611	/----------------------------------------------------------------------/
710	/*	612	/*
711	* window size/position calculcations for XSizeHint and other storage.	613	* window size/position calculcations for XSizeHint and other storage.
712	* if width/height are non-zero then override calculated width/height	614	* if width/height are non-zero then override calculated width/height
713	*/	615	*/
714	void	616	void
715	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	617	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
716	{	618	{
717	short recalc_x, recalc_y;	619	short recalc_x, recalc_y;
718	int x, y, sb_w, mb_h, flags;	620	int x, y, sb_w, flags;
719	unsigned int w, h;	621	unsigned int w, h;
720	unsigned int max_width, max_height;	622	unsigned int max_width, max_height;
721	dDisp;	623	dDisp;
722		624
723	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	625	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
784	max_width = MAX_COLS * fwidth;	686	max_width = MAX_COLS * fwidth;
785	max_height = MAX_ROWS * fheight;	687	max_height = MAX_ROWS * fheight;
786		688
787	szHint.base_width = szHint.base_height = 2 * int_bwidth;	689	szHint.base_width = szHint.base_height = 2 * int_bwidth;
788		690
789	sb_w = mb_h = 0;	691	sb_w = 0;
790	window_vt_x = window_vt_y = int_bwidth;	692	window_vt_x = window_vt_y = int_bwidth;
791		693
792	if (scrollbar_visible ())	694	if (scrollBar.state)
793	{	695	{
794	sb_w = scrollbar_TotalWidth ();	696	sb_w = scrollbar_TotalWidth ();
795	szHint.base_width += sb_w;	697	szHint.base_width += sb_w;
796	if (!OPTION (Opt_scrollBar_right))	698	if (!OPTION (Opt_scrollBar_right))
797	window_vt_x += sb_w;	699	window_vt_x += sb_w;
798	}	700	}
799		701
800	if (menubar_visible ())
801	{
802	mb_h = menuBar_TotalHeight ();
803	szHint.base_height += mb_h;
804	window_vt_y += mb_h;
805	}
806
807	szHint.width_inc = fwidth;	702	szHint.width_inc = fwidth;
808	szHint.height_inc = fheight;	703	szHint.height_inc = fheight;
809	szHint.min_width = szHint.base_width + szHint.width_inc;	704	szHint.min_width = szHint.base_width + szHint.width_inc;
810	szHint.min_height = szHint.base_height + szHint.height_inc;	705	szHint.min_height = szHint.base_height + szHint.height_inc;
811		706
…		…
829	{	724	{
830	min_it (height, max_height);	725	min_it (height, max_height);
831	szHint.height = szHint.base_height + height;	726	szHint.height = szHint.base_height + height;
832	}	727	}
833		728
834	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	729	if (scrollBar.state && OPTION (Opt_scrollBar_right))
835	window_sb_x = szHint.width - sb_w;	730	window_sb_x = szHint.width - sb_w;
836		731
837	if (recalc_x)	732	if (recalc_x)
838	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	733	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
839	if (recalc_y)	734	if (recalc_y)
…		…
853	* Called after a window size change.	748	* Called after a window size change.
854	*/	749	*/
855	void	750	void
856	rxvt_term::tt_winch ()	751	rxvt_term::tt_winch ()
857	{	752	{
858	if (pty.pty < 0)	753	if (pty->pty < 0)
859	return;	754	return;
860		755
861	struct winsize ws;	756	struct winsize ws;
862		757
863	ws.ws_col = ncol;	758	ws.ws_col = ncol;
864	ws.ws_row = nrow;	759	ws.ws_row = nrow;
865	ws.ws_xpixel = width;	760	ws.ws_xpixel = width;
866	ws.ws_ypixel = height;	761	ws.ws_ypixel = height;
867	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	762	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
868		763
869	#if 0	764	#if 0
870	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	765	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
871	if (cmd_pid) /* force through to the command */	766	if (cmd_pid) /* force through to the command */
872	kill (-cmd_pid, SIGWINCH);	767	kill (-cmd_pid, SIGWINCH);
…		…
908	prop.height += lineSpace;	803	prop.height += lineSpace;
909	fs->set_prop (prop);	804	fs->set_prop (prop);
910		805
911	fwidth = prop.width;	806	fwidth = prop.width;
912	fheight = prop.height;	807	fheight = prop.height;
913	fbase = (*fs)[1]->ascent;	808	fbase = prop.ascent;
914		809
915	for (int style = 1; style < 4; style++)	810	for (int style = 1; style < 4; style++)
916	{	811	{
917	#if ENABLE_STYLES	812	#if ENABLE_STYLES
918	const char *res = rs[Rs_font + style];	813	const char *res = rs[Rs_font + style];
…		…
1009	i = atoi (color);	904	i = atoi (color);
1010		905
1011	if (i >= 8 && i <= 15)	906	if (i >= 8 && i <= 15)
1012	{ /* bright colors */	907	{ /* bright colors */
1013	i -= 8;	908	i -= 8;
1014	# ifndef NO_BRIGHTCOLOR
1015	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	909	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016	SET_PIXCOLOR (idx);	910	SET_PIXCOLOR (idx);
1017	goto done;	911	goto done;
1018	# endif
1019	}	912	}
1020		913
1021	if (i >= 0 && i <= 7)	914	if (i >= 0 && i <= 7)
1022	{ /* normal colors */	915	{ /* normal colors */
1023	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	916	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1138	* -------------------------------------------------------------------- */	1031	* -------------------------------------------------------------------- */
1139	void	1032	void
1140	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1033	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1141	{	1034	{
1142	int fix_screen;	1035	int fix_screen;
1143	int old_width = szHint.width, old_height = szHint.height;	1036	int old_width = szHint.width;
		1037	int old_height = szHint.height;
1144	dDisp;	1038	dDisp;
1145		1039
1146	window_calc (newwidth, newheight);	1040	window_calc (newwidth, newheight);
1147	XSetWMNormalHints (disp, parent[0], &szHint);	1041	XSetWMNormalHints (disp, parent[0], &szHint);
1148		1042
…		…
1170	{	1064	{
1171	x -= x1;	1065	x -= x1;
1172	y -= y1;	1066	y -= y1;
1173	}	1067	}
1174		1068
1175	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1069	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1176	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1070	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1177	dx = old_width - szHint.width;	1071	dx = old_width - szHint.width;
1178	dy = old_height - szHint.height;	1072	dy = old_height - szHint.height;
1179		1073
1180	/* Check position of the center of the window */	1074	/* Check position of the center of the window */
1181	if (x < x1) /* left half */	1075	if (x < x1) /* left half */
1182	dx = 0;	1076	dx = 0;
…		…
1196		1090
1197	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1091	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1198		1092
1199	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1093	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1200	{	1094	{
1201	if (scrollbar_visible ())	1095	if (scrollBar.state)
1202	{	1096	{
1203	XMoveResizeWindow (disp, scrollBar.win,	1097	XMoveResizeWindow (disp, scrollBar.win,
1204	window_sb_x, 0,	1098	window_sb_x, 0,
1205	scrollbar_TotalWidth (), szHint.height);	1099	scrollbar_TotalWidth (), szHint.height);
1206	resize_scrollbar ();	1100	resize_scrollbar ();
1207	}	1101	}
1208		1102
1209	if (menubar_visible ())
1210	XMoveResizeWindow (disp, menuBar.win,
1211	window_vt_x, 0,
1212	TermWin_TotalWidth (), menuBar_TotalHeight ());
1213
1214	XMoveResizeWindow (disp, vt,	1103	XMoveResizeWindow (disp, vt,
1215	window_vt_x, window_vt_y,	1104	window_vt_x, window_vt_y,
1216	TermWin_TotalWidth (), TermWin_TotalHeight ());	1105	width, height);
1217		1106
1218	scr_clear ();	1107	scr_clear ();
1219	#ifdef XPM_BACKGROUND	1108	#ifdef XPM_BACKGROUND
1220	resize_pixmap ();	1109	resize_pixmap ();
1221	#endif	1110	#endif
1222	}	1111	}
1223		1112
1224	if (fix_screen \|\| old_height == 0)	1113	if (fix_screen \|\| old_height == 0)
1225	{
1226	int curr_screen = -1;
1227	int old_ncol = prev_ncol;
1228
1229	/* scr_reset only works on the primary screen */
1230	if (old_height) /* this is not the first time through */
1231	{
1232	unsigned int ocol = ncol;
1233	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1234	curr_screen = scr_change_screen (PRIMARY);
1235	ncol = ocol;
1236	}
1237
1238	scr_reset ();	1114	scr_reset ();
1239
1240	if (curr_screen >= 0) /* this is not the first time through */
1241	{
1242	scr_change_screen (curr_screen);
1243	selection_check (old_ncol != ncol ? 4 : 0);
1244	}
1245	}
1246
1247	old_width = szHint.width;
1248	old_height = szHint.height;
1249		1115
1250	#ifdef XPM_BACKGROUND	1116	#ifdef XPM_BACKGROUND
1251	if (pixmap)	1117	if (pixmap)
1252	scr_touch (false);	1118	scr_touch (false);
1253	#endif	1119	#endif
…		…
1401	XRectangle rect, status_rect, needed_rect;	1267	XRectangle rect, status_rect, needed_rect;
1402	unsigned long fg, bg;	1268	unsigned long fg, bg;
1403	const char *p;	1269	const char *p;
1404	char **s;	1270	char **s;
1405	XIMStyles *xim_styles;	1271	XIMStyles *xim_styles;
		1272
		1273	set_environ (envv);
1406		1274
1407	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1275	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1408	return false;	1276	return false;
1409		1277
1410	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1278	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1576	int i;	1444	int i;
1577	const char *p;	1445	const char *p;
1578	char **s;	1446	char **s;
1579	char buf[IMBUFSIZ];	1447	char buf[IMBUFSIZ];
1580		1448
1581	SET_R (this);	1449	make_current ();
1582		1450
1583	im_destroy ();	1451	im_destroy ();
1584		1452
1585	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1453	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1586	if (Input_Context)	1454	if (Input_Context)
…		…
1663	XFree (preedit_attr);	1531	XFree (preedit_attr);
1664	XFree (status_attr);	1532	XFree (status_attr);
1665	}	1533	}
1666	#endif /* USE_XIM */	1534	#endif /* USE_XIM */
1667		1535
1668	/----------------------------------------------------------------------/
1669	rxvt_t rxvt_current_term;
1670
1671	/----------------------- end-of-file (C source) -----------------------/	1536	/----------------------- 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.155 by root, Mon Jan 2 15:35:43 2006 UTC vs. Revision 1.197 by root, Sun Jan 22 20:39:47 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.197 by root, Sun Jan 22 20:39:47 2006 UTC