[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.191 by root, Fri Jan 20 10:27:08 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),
…		…
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
164	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
165	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
		177	child_ev (this, &rxvt_term::child_cb),
166	check_ev (this, &rxvt_term::check_cb),	178	check_ev (this, &rxvt_term::check_cb),
167	flush_ev (this, &rxvt_term::flush_cb),	179	flush_ev (this, &rxvt_term::flush_cb),
168	destroy_ev (this, &rxvt_term::destroy_cb),	180	destroy_ev (this, &rxvt_term::destroy_cb),
169	pty_ev (this, &rxvt_term::pty_cb),	181	pty_ev (this, &rxvt_term::pty_cb),
170	incr_ev (this, &rxvt_term::incr_cb)	182	incr_ev (this, &rxvt_term::incr_cb)
…		…
173		185
174	termlist.push_back (this);	186	termlist.push_back (this);
175		187
176	#ifdef KEYSYM_RESOURCE	188	#ifdef KEYSYM_RESOURCE
177	keyboard = new keyboard_manager;	189	keyboard = new keyboard_manager;
178
179	if (!keyboard)
180	rxvt_fatal ("out of memory, aborting.\n");
181	#endif	190	#endif
182	}	191	}
183		192
184	// 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.
185	// for use before an emergency exit	194	// for use before an emergency exit
186	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
187	{	196	{
188	if (cmd_pid)	197	if (cmd_pid)
189	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
190		199
191	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
192	privileged_utmp (RESTORE);
193	#endif
194
195	pty.put ();
196	}	201	}
197		202
198	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
199	{	204	{
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	205	termlist.erase (find (termlist.begin (), termlist.end(), this));
…		…
214		219
215	selection_clear ();	220	selection_clear ();
216		221
217	#ifdef USE_XIM	222	#ifdef USE_XIM
218	im_destroy ();	223	im_destroy ();
219	#endif
220	#ifdef MENUBAR
221	if (menubarGC) XFreeGC (disp, menubarGC);
222	#endif	224	#endif
223	#ifdef XTERM_SCROLLBAR	225	#ifdef XTERM_SCROLLBAR
224	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225	if (ShadowGC) XFreeGC (disp, ShadowGC);	227	if (ShadowGC) XFreeGC (disp, ShadowGC);
226	#endif	228	#endif
…		…
237	if (upArrow) XFreePixmap (disp, upArrow);	239	if (upArrow) XFreePixmap (disp, upArrow);
238	if (downArrow) XFreePixmap (disp, downArrow);	240	if (downArrow) XFreePixmap (disp, downArrow);
239	if (upArrowHi) XFreePixmap (disp, upArrowHi);	241	if (upArrowHi) XFreePixmap (disp, upArrowHi);
240	if (downArrowHi) XFreePixmap (disp, downArrowHi);	242	if (downArrowHi) XFreePixmap (disp, downArrowHi);
241	#endif	243	#endif
242	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	244	#ifdef RXVT_SCROLLBAR
243	if (topShadowGC) XFreeGC (disp, topShadowGC);	245	if (topShadowGC) XFreeGC (disp, topShadowGC);
244	if (botShadowGC) XFreeGC (disp, botShadowGC);	246	if (botShadowGC) XFreeGC (disp, botShadowGC);
245	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246	#endif	248	#endif
247	if (gc) XFreeGC (disp, gc);	249	if (gc) XFreeGC (disp, gc);
248		250
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;	251	delete drawable;
255	// destroy all windows	252	// destroy all windows
256	if (parent[0])	253	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	254	XDestroyWindow (disp, parent[0]);
258	}	255	}
259		256
260	// TODO: free pixcolours, colours should become part of rxvt_display	257	// TODO: free pixcolours, colours should become part of rxvt_display
261
262	delete pix_colors_focused;	258	delete pix_colors_focused;
263	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
264	delete pix_colors_unfocused;	260	delete pix_colors_unfocused;
265	#endif	261	#endif
266		262
…		…
288	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
289	delete keyboard;	285	delete keyboard;
290	#endif	286	#endif
291	}	287	}
292		288
		289	// child has exited, usually destroys
293	void	290	void
294	rxvt_term::child_exit ()	291	rxvt_term::child_cb (child_watcher &w, int status)
295	{	292	{
		293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		294
296	cmd_pid = 0;	295	cmd_pid = 0;
297		296
298	if (!OPTION (Opt_hold))	297	if (!OPTION (Opt_hold))
299	destroy ();	298	destroy ();
300	}	299	}
…		…
303	rxvt_term::destroy ()	302	rxvt_term::destroy ()
304	{	303	{
305	if (destroy_ev.active)	304	if (destroy_ev.active)
306	return;	305	return;
307		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		309
308	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
309	scr_overlay_off ();	311	scr_overlay_off ();
310	#endif	312	#endif
311		313
312	if (display)	314	if (display)
…		…
314	#if USE_XIM	316	#if USE_XIM
315	im_ev.stop (display);	317	im_ev.stop (display);
316	#endif	318	#endif
317	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
318	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
319	#endif
320	#if MENUBAR
321	menubar_ev.stop (display);
322	#endif	321	#endif
323	#if TRANSPARENT	322	#if TRANSPARENT
324	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
325	#endif	324	#endif
326	incr_ev.stop ();	325	incr_ev.stop ();
…		…
350	}	349	}
351		350
352	void	351	void
353	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
354	{	353	{
355	SET_R (this);	354	make_current ();
356		355
357	delete this;	356	delete this;
358	}	357	}
359		358
360	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
451	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
452	bool	451	bool
453	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv)
454	{	453	{
455	SET_R (this);	454	SET_R (this);
456
457	set_locale ("");	455	set_locale ("");
		456	set_environ (envv); // few things in X do not call setlocale :(
458		457
459	if (!init_vars ())	458	if (!init_vars ())
460	return false;	459	return false;
461		460
462	init_secondary ();	461	init_secondary ();
…		…
465		464
466	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
467	keyboard->register_done ();	466	keyboard->register_done ();
468	#endif	467	#endif
469		468
470	#if MENUBAR_MAX	469	#if ENABLE_PERL
471	menubar_read (rs[Rs_menu]);	470	if (!rs[Rs_perl_ext_1])
		471	rs[Rs_perl_ext_1] = "default";
		472
		473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		476	{
		477	rxvt_perl.init (this);
		478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		479	}
472	#endif	480	#endif
		481
473	#ifdef HAVE_SCROLLBARS	482	#ifdef HAVE_SCROLLBARS
474	if (OPTION (Opt_scrollBar))	483	if (OPTION (Opt_scrollBar))
475	scrollBar.setIdle (); /* set existence for size calculations */	484	scrollBar.setIdle (); /* set existence for size calculations */
476	#endif	485	#endif
477		486
		487	pty = rxvt_new_ptytty ();
		488
478	create_windows (argc, argv);	489	create_windows (argc, argv);
479		490
480	dDisp;	491	dDisp;
481		492
482	init_xlocale ();	493	init_xlocale ();
483		494
484	scr_reset (); /* initialize screen */	495	scr_reset (); // initialize screen
485		496
486	#if 0	497	#if 0
487	XSynchronize (disp, True);	498	XSynchronize (disp, True);
488	#endif	499	#endif
489		500
490	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
491	if (OPTION (Opt_scrollBar))	502	if (OPTION (Opt_scrollBar))
492	resize_scrollbar (); /* create and map scrollbar */	503	resize_scrollbar (); /* create and map scrollbar */
493	#endif	504	#endif
494	#if (MENUBAR_MAX)
495	if (menubar_visible ())
496	XMapWindow (disp, menuBar.win);
497	#endif
498	#ifdef TRANSPARENT	505	#ifdef TRANSPARENT
499	if (OPTION (Opt_transparent))	506	if (OPTION (Opt_transparent))
500	{	507	{
501	XSelectInput (disp, display->root, PropertyChangeMask);	508	XSelectInput (disp, display->root, PropertyChangeMask);
502	check_our_parents ();	509	check_our_parents ();
503	rootwin_ev.start (display, display->root);	510	rootwin_ev.start (display, display->root);
504	}	511	}
505	#endif	512	#endif
506		513
		514	set_colorfgbg ();
		515
		516	init_command (cmd_argv);
		517
		518	free (cmd_argv);
		519
		520	if (pty->pty >= 0)
		521	pty_ev.start (pty->pty, EVENT_READ);
		522
		523	check_ev.start ();
		524
		525	HOOK_INVOKE ((this, HOOK_START, DT_END));
		526
507	XMapWindow (disp, vt);	527	XMapWindow (disp, vt);
508	XMapWindow (disp, parent[0]);	528	XMapWindow (disp, parent[0]);
509		529
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;	530	return true;
521	}	531	}
522		532
523	static struct sig_handlers	533	static struct sig_handlers
524	{	534	{
525	sig_watcher sw_chld, sw_term, sw_int;	535	sig_watcher sw_term, sw_int;
526		536
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	/*	537	/*
542	* Catch a fatal signal and tidy up before quitting	538	* Catch a fatal signal and tidy up before quitting
543	*/	539	*/
544	void	540	void
545	sig_term (sig_watcher &w)	541	sig_term (sig_watcher &w)
…		…
551	signal (w.signum, SIG_DFL);	547	signal (w.signum, SIG_DFL);
552	kill (getpid (), w.signum);	548	kill (getpid (), w.signum);
553	}	549	}
554		550
555	sig_handlers ()	551	sig_handlers ()
556	: sw_chld (this, &sig_handlers::sig_chld),
557	sw_term (this, &sig_handlers::sig_term),	552	: sw_term (this, &sig_handlers::sig_term),
558	sw_int (this, &sig_handlers::sig_term)	553	sw_int (this, &sig_handlers::sig_term)
559	{	554	{
560	}	555	}
561	} sig_handlers;	556	} sig_handlers;
562		557
		558	char **rxvt_environ; // startup environment
		559
563	void	560	void
564	rxvt_init ()	561	rxvt_init ()
565	{	562	{
566	/*	563	uid_t uid = getuid ();
567	* Save and then give up any super-user privileges	564	gid_t gid = getgid ();
568	* If we need privileges in any area then we must specifically request it.	565
569	* We should only need to be root in these cases:	566	// before doing anything else, check for setuid/setgid operation,
570	* 1. write utmp entries on some systems	567	// start the helper process and drop privileges
571	* 2. chown tty on some systems	568	if (uid != geteuid ()
572	*/	569	\|\| gid != getegid ())
573	rxvt_privileges (SAVE);	570	{
574	rxvt_privileges (IGNORE);	571	#if PTYTTY_HELPER
		572	rxvt_ptytty_server ();
		573	#else
		574	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		575	#endif
		576
		577	// drop privileges
		578	#if HAVE_SETRESUID
		579	setresgid (gid, gid, gid);
		580	setresuid (uid, uid, uid);
		581	#elif HAVE_SETREUID
		582	setregid (gid, gid);
		583	setreuid (uid, uid);
		584	#elif HAVE_SETUID
		585	setgid (gid);
		586	setuid (uid);
		587	#endif
		588
		589	if (uid != geteuid ()
		590	\|\| gid != getegid ())
		591	rxvt_fatal ("unable to drop privileges, aborting.\n");
		592	}
		593
		594	rxvt_environ = environ;
575		595
576	signal (SIGHUP, SIG_IGN);	596	signal (SIGHUP, SIG_IGN);
577	signal (SIGPIPE, SIG_IGN);	597	signal (SIGPIPE, SIG_IGN);
578		598
579	sig_handlers.sw_chld.start (SIGCHLD);
580	sig_handlers.sw_term.start (SIGTERM);	599	sig_handlers.sw_term.start (SIGTERM);
581	sig_handlers.sw_int.start (SIGINT);	600	sig_handlers.sw_int.start (SIGINT);
582		601
583	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	602	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
584	/* signal (SIGURG, SIG_DFL); */	603	/* signal (SIGURG, SIG_DFL); */
585		604
586	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	605	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587	// TODO: handle this with exceptions and tolerate the memory loss	606	// TODO: handle this with exceptions and tolerate the memory loss
588	XSetIOErrorHandler (rxvt_xioerror_handler);	607	XSetIOErrorHandler (rxvt_xioerror_handler);
		608
		609	XrmInitialize ();
589	}	610	}
590		611
591	/* ------------------------------------------------------------------------- *	612	/* ------------------------------------------------------------------------- *
592	* MEMORY ALLOCATION WRAPPERS *	613	* MEMORY ALLOCATION WRAPPERS *
593	* ------------------------------------------------------------------------- */	614	* ------------------------------------------------------------------------- */
…		…
611	rxvt_fatal ("memory allocation failure. aborting.\n");	632	rxvt_fatal ("memory allocation failure. aborting.\n");
612		633
613	return p;	634	return p;
614	}	635	}
615		636
616	void *	637	void *
617	rxvt_realloc (void *ptr, size_t size)	638	rxvt_realloc (void *ptr, size_t size)
618	{	639	{
619	void *p = realloc (ptr, size);	640	void *p = realloc (ptr, size);
620		641
621	if (!p)	642	if (!p)
622	rxvt_fatal ("memory allocation failure. aborting.\n");	643	rxvt_fatal ("memory allocation failure. aborting.\n");
623		644
624	return p;	645	return p;
625	}	646	}
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		647
701	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
702	/*	649	/*
703	* window size/position calculcations for XSizeHint and other storage.	650	* window size/position calculcations for XSizeHint and other storage.
704	* if width/height are non-zero then override calculated width/height	651	* if width/height are non-zero then override calculated width/height
705	*/	652	*/
706	void	653	void
707	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	654	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708	{	655	{
709	short recalc_x, recalc_y;	656	short recalc_x, recalc_y;
710	int x, y, sb_w, mb_h, flags;	657	int x, y, sb_w, flags;
711	unsigned int w, h;	658	unsigned int w, h;
712	unsigned int max_width, max_height;	659	unsigned int max_width, max_height;
713	dDisp;	660	dDisp;
714		661
715	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	662	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
776	max_width = MAX_COLS * fwidth;	723	max_width = MAX_COLS * fwidth;
777	max_height = MAX_ROWS * fheight;	724	max_height = MAX_ROWS * fheight;
778		725
779	szHint.base_width = szHint.base_height = 2 * int_bwidth;	726	szHint.base_width = szHint.base_height = 2 * int_bwidth;
780		727
781	sb_w = mb_h = 0;	728	sb_w = 0;
782	window_vt_x = window_vt_y = int_bwidth;	729	window_vt_x = window_vt_y = int_bwidth;
783		730
784	if (scrollbar_visible ())	731	if (scrollBar.state)
785	{	732	{
786	sb_w = scrollbar_TotalWidth ();	733	sb_w = scrollbar_TotalWidth ();
787	szHint.base_width += sb_w;	734	szHint.base_width += sb_w;
788	if (!OPTION (Opt_scrollBar_right))	735	if (!OPTION (Opt_scrollBar_right))
789	window_vt_x += sb_w;	736	window_vt_x += sb_w;
790	}	737	}
791		738
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;	739	szHint.width_inc = fwidth;
800	szHint.height_inc = fheight;	740	szHint.height_inc = fheight;
801	szHint.min_width = szHint.base_width + szHint.width_inc;	741	szHint.min_width = szHint.base_width + szHint.width_inc;
802	szHint.min_height = szHint.base_height + szHint.height_inc;	742	szHint.min_height = szHint.base_height + szHint.height_inc;
803		743
…		…
821	{	761	{
822	min_it (height, max_height);	762	min_it (height, max_height);
823	szHint.height = szHint.base_height + height;	763	szHint.height = szHint.base_height + height;
824	}	764	}
825		765
826	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	766	if (scrollBar.state && OPTION (Opt_scrollBar_right))
827	window_sb_x = szHint.width - sb_w;	767	window_sb_x = szHint.width - sb_w;
828		768
829	if (recalc_x)	769	if (recalc_x)
830	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	770	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831	if (recalc_y)	771	if (recalc_y)
…		…
845	* Called after a window size change.	785	* Called after a window size change.
846	*/	786	*/
847	void	787	void
848	rxvt_term::tt_winch ()	788	rxvt_term::tt_winch ()
849	{	789	{
850	if (pty.pty < 0)	790	if (pty->pty < 0)
851	return;	791	return;
852		792
853	struct winsize ws;	793	struct winsize ws;
854		794
855	ws.ws_col = ncol;	795	ws.ws_col = ncol;
856	ws.ws_row = nrow;	796	ws.ws_row = nrow;
857	ws.ws_xpixel = width;	797	ws.ws_xpixel = width;
858	ws.ws_ypixel = height;	798	ws.ws_ypixel = height;
859	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	799	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860		800
861	#if 0	801	#if 0
862	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	802	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863	if (cmd_pid) /* force through to the command */	803	if (cmd_pid) /* force through to the command */
864	kill (-cmd_pid, SIGWINCH);	804	kill (-cmd_pid, SIGWINCH);
…		…
900	prop.height += lineSpace;	840	prop.height += lineSpace;
901	fs->set_prop (prop);	841	fs->set_prop (prop);
902		842
903	fwidth = prop.width;	843	fwidth = prop.width;
904	fheight = prop.height;	844	fheight = prop.height;
905	fbase = (*fs)[1]->ascent;	845	fbase = prop.ascent;
906		846
907	for (int style = 1; style < 4; style++)	847	for (int style = 1; style < 4; style++)
908	{	848	{
909	#if ENABLE_STYLES	849	#if ENABLE_STYLES
910	const char *res = rs[Rs_font + style];	850	const char *res = rs[Rs_font + style];
…		…
1001	i = atoi (color);	941	i = atoi (color);
1002		942
1003	if (i >= 8 && i <= 15)	943	if (i >= 8 && i <= 15)
1004	{ /* bright colors */	944	{ /* bright colors */
1005	i -= 8;	945	i -= 8;
1006	# ifndef NO_BRIGHTCOLOR
1007	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	946	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008	SET_PIXCOLOR (idx);	947	SET_PIXCOLOR (idx);
1009	goto done;	948	goto done;
1010	# endif
1011	}	949	}
1012		950
1013	if (i >= 0 && i <= 7)	951	if (i >= 0 && i <= 7)
1014	{ /* normal colors */	952	{ /* normal colors */
1015	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	953	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1188		1126
1189	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1127	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1190		1128
1191	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1129	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1192	{	1130	{
1193	if (scrollbar_visible ())	1131	if (scrollBar.state)
1194	{	1132	{
1195	XMoveResizeWindow (disp, scrollBar.win,	1133	XMoveResizeWindow (disp, scrollBar.win,
1196	window_sb_x, 0,	1134	window_sb_x, 0,
1197	scrollbar_TotalWidth (), szHint.height);	1135	scrollbar_TotalWidth (), szHint.height);
1198	resize_scrollbar ();	1136	resize_scrollbar ();
1199	}	1137	}
1200		1138
1201	if (menubar_visible ())
1202	XMoveResizeWindow (disp, menuBar.win,
1203	window_vt_x, 0,
1204	TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206	XMoveResizeWindow (disp, vt,	1139	XMoveResizeWindow (disp, vt,
1207	window_vt_x, window_vt_y,	1140	window_vt_x, window_vt_y,
1208	TermWin_TotalWidth (), TermWin_TotalHeight ());	1141	width, height);
1209		1142
1210	scr_clear ();	1143	scr_clear ();
1211	#ifdef XPM_BACKGROUND	1144	#ifdef XPM_BACKGROUND
1212	resize_pixmap ();	1145	resize_pixmap ();
1213	#endif	1146	#endif
…		…
1393	XRectangle rect, status_rect, needed_rect;	1326	XRectangle rect, status_rect, needed_rect;
1394	unsigned long fg, bg;	1327	unsigned long fg, bg;
1395	const char *p;	1328	const char *p;
1396	char **s;	1329	char **s;
1397	XIMStyles *xim_styles;	1330	XIMStyles *xim_styles;
		1331
		1332	set_environ (envv);
1398		1333
1399	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1334	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400	return false;	1335	return false;
1401		1336
1402	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1337	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1568	int i;	1503	int i;
1569	const char *p;	1504	const char *p;
1570	char **s;	1505	char **s;
1571	char buf[IMBUFSIZ];	1506	char buf[IMBUFSIZ];
1572		1507
1573	SET_R (this);	1508	make_current ();
1574		1509
1575	im_destroy ();	1510	im_destroy ();
1576		1511
1577	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1512	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578	if (Input_Context)	1513	if (Input_Context)
…		…
1655	XFree (preedit_attr);	1590	XFree (preedit_attr);
1656	XFree (status_attr);	1591	XFree (status_attr);
1657	}	1592	}
1658	#endif /* USE_XIM */	1593	#endif /* USE_XIM */
1659		1594
1660	/----------------------------------------------------------------------/
1661	rxvt_t rxvt_current_term;
1662
1663	/----------------------- end-of-file (C source) -----------------------/	1595	/----------------------- 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.191 by root, Fri Jan 20 10:27:08 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.191 by root, Fri Jan 20 10:27:08 2006 UTC