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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.154 by root, Sat Dec 31 17:16:17 2005 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.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "keyboard.h"
		36	#include "rxvtperl.h"
35		37
36	#include <limits>	38	#include <limits>
37		39
38	#include <csignal>	40	#include <csignal>
39	#include <cstring>	41	#include <cstring>
…		…
44		46
45	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
46	# include <termios.h>	48	# include <termios.h>
47	#endif	49	#endif
48		50
49	#ifdef KEYSYM_RESOURCE
50	# include "keyboard.h"
51	#endif
52
53	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
54		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
55	static char curlocale[128];	56	static char curlocale[128], savelocale[128];
56		57
57	bool	58	bool
58	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
59	{	60	{
60	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
61	return false;	62	return false;
62		63
63	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
64	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
65	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);
66	}	80	}
67		81
68	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
69	class rxvt_composite_vec rxvt_composite;	83	class rxvt_composite_vec rxvt_composite;
70		84
…		…
135	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
136	#endif	150	#endif
137	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
138	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
139	#endif	153	#endif
140	#ifdef MENUBAR
141	menubar_ev (this, &rxvt_term::x_cb),
142	#endif
143	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
144	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145	#endif	156	#endif
146	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
147	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
159	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
160	#endif	171	#endif
161	#ifdef USE_XIM	172	#ifdef USE_XIM
162	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
163	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
164	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
165	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
166	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
167	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
168	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
169	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
170	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
173		188
174	termlist.push_back (this);	189	termlist.push_back (this);
175		190
176	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
177	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
178
179	if (!keyboard)
180	rxvt_fatal ("out of memory, aborting.\n");
181	#endif	193	#endif
182	}	194	}
183		195
184	// 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.
185	// for use before an emergency exit	197	// for use before an emergency exit
186	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
187	{	199	{
188	if (cmd_pid)	200	if (cmd_pid)
189	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
190		202
191	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
192	privileged_utmp (RESTORE);
193	#endif
194
195	pty.put ();
196	}	204	}
197		205
198	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
199	{	207	{
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
…		…
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
		479	pty = ptytty::create ();
		480
478	create_windows (argc, argv);	481	create_windows (argc, argv);
479		482
480	dDisp;	483	dDisp;
481		484
482	init_xlocale ();	485	init_xlocale ();
483		486
484	scr_reset (); /* initialize screen */	487	scr_reset (); // initialize screen
485		488
486	#if 0	489	#if 0
487	XSynchronize (disp, True);	490	XSynchronize (disp, True);
488	#endif	491	#endif
489		492
490	#ifdef HAVE_SCROLLBARS	493	#ifdef HAVE_SCROLLBARS
491	if (OPTION (Opt_scrollBar))	494	if (OPTION (Opt_scrollBar))
492	resize_scrollbar (); /* create and map scrollbar */	495	resize_scrollbar (); /* create and map scrollbar */
493	#endif	496	#endif
494	#if (MENUBAR_MAX)
495	if (menubar_visible ())
496	XMapWindow (disp, menuBar.win);
497	#endif
498	#ifdef TRANSPARENT	497	#ifdef TRANSPARENT
499	if (OPTION (Opt_transparent))	498	if (OPTION (Opt_transparent))
500	{	499	{
501	XSelectInput (disp, display->root, PropertyChangeMask);	500	XSelectInput (disp, display->root, PropertyChangeMask);
502	check_our_parents ();	501	check_our_parents ();
503	rootwin_ev.start (display, display->root);	502	rootwin_ev.start (display, display->root);
504	}	503	}
505	#endif	504	#endif
506		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
507	XMapWindow (disp, vt);	519	XMapWindow (disp, vt);
508	XMapWindow (disp, parent[0]);	520	XMapWindow (disp, parent[0]);
509		521
510	set_colorfgbg ();
511
512	init_command (cmd_argv);
513
514	free (cmd_argv);
515
516	pty_ev.start (pty.pty, EVENT_READ);
517
518	check_ev.start ();
519
520	return true;	522	return true;
521	}	523	}
522		524
523	static struct sig_handlers	525	static struct sig_handlers
524	{	526	{
525	sig_watcher sw_chld, sw_term, sw_int;	527	sig_watcher sw_term, sw_int;
526		528
527	void sig_chld (sig_watcher &w)
528	{
529	// we are being called for every SIGCHLD, find the corresponding term
530	int pid;
531
532	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534	if (pid == (*t)->cmd_pid)
535	{
536	(*t)->child_exit ();
537	break;
538	}
539	}
540
541	/*	529	/*
542	* Catch a fatal signal and tidy up before quitting	530	* Catch a fatal signal and tidy up before quitting
543	*/	531	*/
544	void	532	void
545	sig_term (sig_watcher &w)	533	sig_term (sig_watcher &w)
…		…
551	signal (w.signum, SIG_DFL);	539	signal (w.signum, SIG_DFL);
552	kill (getpid (), w.signum);	540	kill (getpid (), w.signum);
553	}	541	}
554		542
555	sig_handlers ()	543	sig_handlers ()
556	: sw_chld (this, &sig_handlers::sig_chld),
557	sw_term (this, &sig_handlers::sig_term),	544	: sw_term (this, &sig_handlers::sig_term),
558	sw_int (this, &sig_handlers::sig_term)	545	sw_int (this, &sig_handlers::sig_term)
559	{	546	{
560	}	547	}
561	} sig_handlers;	548	} sig_handlers;
562		549
		550	char **rxvt_environ; // startup environment
		551
563	void	552	void
564	rxvt_init ()	553	rxvt_init ()
565	{	554	{
566	/*	555	ptytty::init ();
567	* Save and then give up any super-user privileges	556
568	* If we need privileges in any area then we must specifically request it.	557	rxvt_environ = environ;
569	* We should only need to be root in these cases:
570	* 1. write utmp entries on some systems
571	* 2. chown tty on some systems
572	*/
573	rxvt_privileges (SAVE);
574	rxvt_privileges (IGNORE);
575		558
576	signal (SIGHUP, SIG_IGN);	559	signal (SIGHUP, SIG_IGN);
577	signal (SIGPIPE, SIG_IGN);	560	signal (SIGPIPE, SIG_IGN);
578		561
579	sig_handlers.sw_chld.start (SIGCHLD);
580	sig_handlers.sw_term.start (SIGTERM);	562	sig_handlers.sw_term.start (SIGTERM);
581	sig_handlers.sw_int.start (SIGINT);	563	sig_handlers.sw_int.start (SIGINT);
582		564
583	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	565	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
584	/* signal (SIGURG, SIG_DFL); */	566	/* signal (SIGURG, SIG_DFL); */
585		567
586	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	568	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587	// TODO: handle this with exceptions and tolerate the memory loss	569	// TODO: handle this with exceptions and tolerate the memory loss
588	XSetIOErrorHandler (rxvt_xioerror_handler);	570	XSetIOErrorHandler (rxvt_xioerror_handler);
		571
		572	XrmInitialize ();
589	}	573	}
590		574
591	/* ------------------------------------------------------------------------- *	575	/* ------------------------------------------------------------------------- *
592	* MEMORY ALLOCATION WRAPPERS *	576	* MEMORY ALLOCATION WRAPPERS *
593	* ------------------------------------------------------------------------- */	577	* ------------------------------------------------------------------------- */
…		…
611	rxvt_fatal ("memory allocation failure. aborting.\n");	595	rxvt_fatal ("memory allocation failure. aborting.\n");
612		596
613	return p;	597	return p;
614	}	598	}
615		599
616	void *	600	void *
617	rxvt_realloc (void *ptr, size_t size)	601	rxvt_realloc (void *ptr, size_t size)
618	{	602	{
619	void *p = realloc (ptr, size);	603	void *p = realloc (ptr, size);
620		604
621	if (!p)	605	if (!p)
622	rxvt_fatal ("memory allocation failure. aborting.\n");	606	rxvt_fatal ("memory allocation failure. aborting.\n");
623		607
624	return p;	608	return p;
625	}	609	}
626
627	/* ------------------------------------------------------------------------- *
628	* PRIVILEGED OPERATIONS *
629	* ------------------------------------------------------------------------- */
630	/* take care of suid/sgid super-user (root) privileges */
631	void
632	rxvt_privileges (rxvt_privaction action)
633	{
634	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635	static uid_t euid;
636	static gid_t egid;
637	#endif
638
639	#if ! defined(__CYGWIN32__)
640	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641	/* setreuid () is the poor man's setuid (), seteuid () */
642	# define seteuid(a) setreuid(-1, (a))
643	# define setegid(a) setregid(-1, (a))
644	# define HAVE_SETEUID
645	# endif
646	# ifdef HAVE_SETEUID
647	switch (action)
648	{
649	case IGNORE:
650	/*
651	* change effective uid/gid - not real uid/gid - so we can switch
652	* back to root later, as required
653	*/
654	seteuid (getuid ());
655	setegid (getgid ());
656	break;
657	case SAVE:
658	euid = geteuid ();
659	egid = getegid ();
660	break;
661	case RESTORE:
662	seteuid (euid);
663	setegid (egid);
664	break;
665	}
666	# else
667	switch (action)
668	{
669	case IGNORE:
670	setuid (getuid ());
671	setgid (getgid ());
672	/* FALLTHROUGH */
673	case SAVE:
674	/* FALLTHROUGH */
675	case RESTORE:
676	break;
677	}
678	# endif
679	#endif
680	}
681
682	#ifdef UTMP_SUPPORT
683	void
684	rxvt_term::privileged_utmp (rxvt_privaction action)
685	{
686	if (OPTION (Opt_utmpInhibit)
687	\|\| !pty.name \|\| !*pty.name)
688	return;
689
690	rxvt_privileges (RESTORE);
691
692	if (action == SAVE)
693	makeutent (pty.name, rs[Rs_display_name]);
694	else
695	cleanutent ();
696
697	rxvt_privileges (IGNORE);
698	}
699	#endif
700		610
701	/----------------------------------------------------------------------/	611	/----------------------------------------------------------------------/
702	/*	612	/*
703	* window size/position calculcations for XSizeHint and other storage.	613	* window size/position calculcations for XSizeHint and other storage.
704	* if width/height are non-zero then override calculated width/height	614	* if width/height are non-zero then override calculated width/height
705	*/	615	*/
706	void	616	void
707	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	617	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708	{	618	{
709	short recalc_x, recalc_y;	619	short recalc_x, recalc_y;
710	int x, y, sb_w, mb_h, flags;	620	int x, y, sb_w, flags;
711	unsigned int w, h;	621	unsigned int w, h;
712	unsigned int max_width, max_height;	622	unsigned int max_width, max_height;
713	dDisp;	623	dDisp;
714		624
715	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",
…		…
776	max_width = MAX_COLS * fwidth;	686	max_width = MAX_COLS * fwidth;
777	max_height = MAX_ROWS * fheight;	687	max_height = MAX_ROWS * fheight;
778		688
779	szHint.base_width = szHint.base_height = 2 * int_bwidth;	689	szHint.base_width = szHint.base_height = 2 * int_bwidth;
780		690
781	sb_w = mb_h = 0;	691	sb_w = 0;
782	window_vt_x = window_vt_y = int_bwidth;	692	window_vt_x = window_vt_y = int_bwidth;
783		693
784	if (scrollbar_visible ())	694	if (scrollBar.state)
785	{	695	{
786	sb_w = scrollbar_TotalWidth ();	696	sb_w = scrollbar_TotalWidth ();
787	szHint.base_width += sb_w;	697	szHint.base_width += sb_w;
788	if (!OPTION (Opt_scrollBar_right))	698	if (!OPTION (Opt_scrollBar_right))
789	window_vt_x += sb_w;	699	window_vt_x += sb_w;
790	}	700	}
791		701
792	if (menubar_visible ())
793	{
794	mb_h = menuBar_TotalHeight ();
795	szHint.base_height += mb_h;
796	window_vt_y += mb_h;
797	}
798
799	szHint.width_inc = fwidth;	702	szHint.width_inc = fwidth;
800	szHint.height_inc = fheight;	703	szHint.height_inc = fheight;
801	szHint.min_width = szHint.base_width + szHint.width_inc;	704	szHint.min_width = szHint.base_width + szHint.width_inc;
802	szHint.min_height = szHint.base_height + szHint.height_inc;	705	szHint.min_height = szHint.base_height + szHint.height_inc;
803		706
…		…
821	{	724	{
822	min_it (height, max_height);	725	min_it (height, max_height);
823	szHint.height = szHint.base_height + height;	726	szHint.height = szHint.base_height + height;
824	}	727	}
825		728
826	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	729	if (scrollBar.state && OPTION (Opt_scrollBar_right))
827	window_sb_x = szHint.width - sb_w;	730	window_sb_x = szHint.width - sb_w;
828		731
829	if (recalc_x)	732	if (recalc_x)
830	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	733	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831	if (recalc_y)	734	if (recalc_y)
…		…
845	* Called after a window size change.	748	* Called after a window size change.
846	*/	749	*/
847	void	750	void
848	rxvt_term::tt_winch ()	751	rxvt_term::tt_winch ()
849	{	752	{
850	if (pty.pty < 0)	753	if (pty->pty < 0)
851	return;	754	return;
852		755
853	struct winsize ws;	756	struct winsize ws;
854		757
855	ws.ws_col = ncol;	758	ws.ws_col = ncol;
856	ws.ws_row = nrow;	759	ws.ws_row = nrow;
857	ws.ws_xpixel = width;	760	ws.ws_xpixel = width;
858	ws.ws_ypixel = height;	761	ws.ws_ypixel = height;
859	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	762	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860		763
861	#if 0	764	#if 0
862	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	765	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863	if (cmd_pid) /* force through to the command */	766	if (cmd_pid) /* force through to the command */
864	kill (-cmd_pid, SIGWINCH);	767	kill (-cmd_pid, SIGWINCH);
…		…
900	prop.height += lineSpace;	803	prop.height += lineSpace;
901	fs->set_prop (prop);	804	fs->set_prop (prop);
902		805
903	fwidth = prop.width;	806	fwidth = prop.width;
904	fheight = prop.height;	807	fheight = prop.height;
905	fbase = (*fs)[1]->ascent;	808	fbase = prop.ascent;
906		809
907	for (int style = 1; style < 4; style++)	810	for (int style = 1; style < 4; style++)
908	{	811	{
909	#if ENABLE_STYLES	812	#if ENABLE_STYLES
910	const char *res = rs[Rs_font + style];	813	const char *res = rs[Rs_font + style];
…		…
1001	i = atoi (color);	904	i = atoi (color);
1002		905
1003	if (i >= 8 && i <= 15)	906	if (i >= 8 && i <= 15)
1004	{ /* bright colors */	907	{ /* bright colors */
1005	i -= 8;	908	i -= 8;
1006	# ifndef NO_BRIGHTCOLOR
1007	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	909	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008	SET_PIXCOLOR (idx);	910	SET_PIXCOLOR (idx);
1009	goto done;	911	goto done;
1010	# endif
1011	}	912	}
1012		913
1013	if (i >= 0 && i <= 7)	914	if (i >= 0 && i <= 7)
1014	{ /* normal colors */	915	{ /* normal colors */
1015	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	916	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1130	* -------------------------------------------------------------------- */	1031	* -------------------------------------------------------------------- */
1131	void	1032	void
1132	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)
1133	{	1034	{
1134	int fix_screen;	1035	int fix_screen;
1135	int old_width = szHint.width, old_height = szHint.height;	1036	int old_width = szHint.width;
		1037	int old_height = szHint.height;
1136	dDisp;	1038	dDisp;
1137		1039
1138	window_calc (newwidth, newheight);	1040	window_calc (newwidth, newheight);
1139	XSetWMNormalHints (disp, parent[0], &szHint);	1041	XSetWMNormalHints (disp, parent[0], &szHint);
1140		1042
…		…
1162	{	1064	{
1163	x -= x1;	1065	x -= x1;
1164	y -= y1;	1066	y -= y1;
1165	}	1067	}
1166		1068
1167	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1069	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1168	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1070	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1169	dx = old_width - szHint.width;	1071	dx = old_width - szHint.width;
1170	dy = old_height - szHint.height;	1072	dy = old_height - szHint.height;
1171		1073
1172	/* Check position of the center of the window */	1074	/* Check position of the center of the window */
1173	if (x < x1) /* left half */	1075	if (x < x1) /* left half */
1174	dx = 0;	1076	dx = 0;
…		…
1188		1090
1189	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1091	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1190		1092
1191	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1093	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1192	{	1094	{
1193	if (scrollbar_visible ())	1095	if (scrollBar.state)
1194	{	1096	{
1195	XMoveResizeWindow (disp, scrollBar.win,	1097	XMoveResizeWindow (disp, scrollBar.win,
1196	window_sb_x, 0,	1098	window_sb_x, 0,
1197	scrollbar_TotalWidth (), szHint.height);	1099	scrollbar_TotalWidth (), szHint.height);
1198	resize_scrollbar ();	1100	resize_scrollbar ();
1199	}	1101	}
1200		1102
1201	if (menubar_visible ())
1202	XMoveResizeWindow (disp, menuBar.win,
1203	window_vt_x, 0,
1204	TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206	XMoveResizeWindow (disp, vt,	1103	XMoveResizeWindow (disp, vt,
1207	window_vt_x, window_vt_y,	1104	window_vt_x, window_vt_y,
1208	TermWin_TotalWidth (), TermWin_TotalHeight ());	1105	width, height);
1209		1106
1210	scr_clear ();	1107	scr_clear ();
1211	#ifdef XPM_BACKGROUND	1108	#ifdef XPM_BACKGROUND
1212	resize_pixmap ();	1109	resize_pixmap ();
1213	#endif	1110	#endif
1214	}	1111	}
1215		1112
1216	if (fix_screen \|\| old_height == 0)	1113	if (fix_screen \|\| old_height == 0)
1217	{
1218	int curr_screen = -1;
1219	int old_ncol = prev_ncol;
1220
1221	/* scr_reset only works on the primary screen */
1222	if (old_height) /* this is not the first time through */
1223	{
1224	unsigned int ocol = ncol;
1225	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1226	curr_screen = scr_change_screen (PRIMARY);
1227	ncol = ocol;
1228	}
1229
1230	scr_reset ();	1114	scr_reset ();
1231
1232	if (curr_screen >= 0) /* this is not the first time through */
1233	{
1234	scr_change_screen (curr_screen);
1235	selection_check (old_ncol != ncol ? 4 : 0);
1236	}
1237	}
1238
1239	old_width = szHint.width;
1240	old_height = szHint.height;
1241		1115
1242	#ifdef XPM_BACKGROUND	1116	#ifdef XPM_BACKGROUND
1243	if (pixmap)	1117	if (pixmap)
1244	scr_touch (false);	1118	scr_touch (false);
1245	#endif	1119	#endif
…		…
1393	XRectangle rect, status_rect, needed_rect;	1267	XRectangle rect, status_rect, needed_rect;
1394	unsigned long fg, bg;	1268	unsigned long fg, bg;
1395	const char *p;	1269	const char *p;
1396	char **s;	1270	char **s;
1397	XIMStyles *xim_styles;	1271	XIMStyles *xim_styles;
		1272
		1273	set_environ (envv);
1398		1274
1399	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1275	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400	return false;	1276	return false;
1401		1277
1402	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1278	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1568	int i;	1444	int i;
1569	const char *p;	1445	const char *p;
1570	char **s;	1446	char **s;
1571	char buf[IMBUFSIZ];	1447	char buf[IMBUFSIZ];
1572		1448
1573	SET_R (this);	1449	make_current ();
1574		1450
1575	im_destroy ();	1451	im_destroy ();
1576		1452
1577	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1453	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578	if (Input_Context)	1454	if (Input_Context)
…		…
1655	XFree (preedit_attr);	1531	XFree (preedit_attr);
1656	XFree (status_attr);	1532	XFree (status_attr);
1657	}	1533	}
1658	#endif /* USE_XIM */	1534	#endif /* USE_XIM */
1659		1535
1660	/----------------------------------------------------------------------/
1661	rxvt_t rxvt_current_term;
1662
1663	/----------------------- 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.154 by root, Sat Dec 31 17:16:17 2005 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.154 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.197 by root, Sun Jan 22 20:39:47 2006 UTC