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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.159 by root, Wed Jan 4 04:42:45 2006 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.
…		…
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),
…		…
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	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
		177	child_ev (this, &rxvt_term::child_cb),
177	check_ev (this, &rxvt_term::check_cb),	178	check_ev (this, &rxvt_term::check_cb),
178	flush_ev (this, &rxvt_term::flush_cb),	179	flush_ev (this, &rxvt_term::flush_cb),
179	destroy_ev (this, &rxvt_term::destroy_cb),	180	destroy_ev (this, &rxvt_term::destroy_cb),
180	pty_ev (this, &rxvt_term::pty_cb),	181	pty_ev (this, &rxvt_term::pty_cb),
181	incr_ev (this, &rxvt_term::incr_cb)	182	incr_ev (this, &rxvt_term::incr_cb)
…		…
184		185
185	termlist.push_back (this);	186	termlist.push_back (this);
186		187
187	#ifdef KEYSYM_RESOURCE	188	#ifdef KEYSYM_RESOURCE
188	keyboard = new keyboard_manager;	189	keyboard = new keyboard_manager;
189
190	if (!keyboard)
191	rxvt_fatal ("out of memory, aborting.\n");
192	#endif	190	#endif
193	}	191	}
194		192
195	// 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.
196	// for use before an emergency exit	194	// for use before an emergency exit
197	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
198	{	196	{
199	if (cmd_pid)	197	if (cmd_pid)
200	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
201		199
202	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
203	privileged_utmp (RESTORE);
204	#endif
205
206	pty.put ();
207	}	201	}
208		202
209	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
210	{	204	{
211	PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213	termlist.erase (find (termlist.begin (), termlist.end(), this));	205	termlist.erase (find (termlist.begin (), termlist.end(), this));
214		206
215	emergency_cleanup ();	207	emergency_cleanup ();
216		208
217	#if ENABLE_STYLES	209	#if ENABLE_STYLES
…		…
227		219
228	selection_clear ();	220	selection_clear ();
229		221
230	#ifdef USE_XIM	222	#ifdef USE_XIM
231	im_destroy ();	223	im_destroy ();
232	#endif
233	#ifdef MENUBAR
234	if (menubarGC) XFreeGC (disp, menubarGC);
235	#endif	224	#endif
236	#ifdef XTERM_SCROLLBAR	225	#ifdef XTERM_SCROLLBAR
237	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238	if (ShadowGC) XFreeGC (disp, ShadowGC);	227	if (ShadowGC) XFreeGC (disp, ShadowGC);
239	#endif	228	#endif
…		…
250	if (upArrow) XFreePixmap (disp, upArrow);	239	if (upArrow) XFreePixmap (disp, upArrow);
251	if (downArrow) XFreePixmap (disp, downArrow);	240	if (downArrow) XFreePixmap (disp, downArrow);
252	if (upArrowHi) XFreePixmap (disp, upArrowHi);	241	if (upArrowHi) XFreePixmap (disp, upArrowHi);
253	if (downArrowHi) XFreePixmap (disp, downArrowHi);	242	if (downArrowHi) XFreePixmap (disp, downArrowHi);
254	#endif	243	#endif
255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	244	#ifdef RXVT_SCROLLBAR
256	if (topShadowGC) XFreeGC (disp, topShadowGC);	245	if (topShadowGC) XFreeGC (disp, topShadowGC);
257	if (botShadowGC) XFreeGC (disp, botShadowGC);	246	if (botShadowGC) XFreeGC (disp, botShadowGC);
258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259	#endif	248	#endif
260	if (gc) XFreeGC (disp, gc);	249	if (gc) XFreeGC (disp, gc);
261		250
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;	251	delete drawable;
268	// destroy all windows	252	// destroy all windows
269	if (parent[0])	253	if (parent[0])
270	XDestroyWindow (disp, parent[0]);	254	XDestroyWindow (disp, parent[0]);
271	}	255	}
272		256
273	// TODO: free pixcolours, colours should become part of rxvt_display	257	// TODO: free pixcolours, colours should become part of rxvt_display
274
275	delete pix_colors_focused;	258	delete pix_colors_focused;
276	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
277	delete pix_colors_unfocused;	260	delete pix_colors_unfocused;
278	#endif	261	#endif
279		262
…		…
301	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
302	delete keyboard;	285	delete keyboard;
303	#endif	286	#endif
304	}	287	}
305		288
		289	// child has exited, usually destroys
306	void	290	void
307	rxvt_term::child_exit ()	291	rxvt_term::child_cb (child_watcher &w, int status)
308	{	292	{
		293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		294
309	cmd_pid = 0;	295	cmd_pid = 0;
310		296
311	if (!OPTION (Opt_hold))	297	if (!OPTION (Opt_hold))
312	destroy ();	298	destroy ();
313	}	299	}
…		…
316	rxvt_term::destroy ()	302	rxvt_term::destroy ()
317	{	303	{
318	if (destroy_ev.active)	304	if (destroy_ev.active)
319	return;	305	return;
320		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		309
321	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
322	scr_overlay_off ();	311	scr_overlay_off ();
323	#endif	312	#endif
324		313
325	if (display)	314	if (display)
…		…
327	#if USE_XIM	316	#if USE_XIM
328	im_ev.stop (display);	317	im_ev.stop (display);
329	#endif	318	#endif
330	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
331	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
332	#endif
333	#if MENUBAR
334	menubar_ev.stop (display);
335	#endif	321	#endif
336	#if TRANSPARENT	322	#if TRANSPARENT
337	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
338	#endif	324	#endif
339	incr_ev.stop ();	325	incr_ev.stop ();
…		…
363	}	349	}
364		350
365	void	351	void
366	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
367	{	353	{
368	SET_R (this);	354	make_current ();
369		355
370	delete this;	356	delete this;
371	}	357	}
372		358
373	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
464	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
465	bool	451	bool
466	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv)
467	{	453	{
468	SET_R (this);	454	SET_R (this);
469
470	set_locale ("");	455	set_locale ("");
		456	set_environ (envv); // few things in X do not call setlocale :(
471		457
472	if (!init_vars ())	458	if (!init_vars ())
473	return false;	459	return false;
474		460
475	init_secondary ();	461	init_secondary ();
…		…
478		464
479	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
480	keyboard->register_done ();	466	keyboard->register_done ();
481	#endif	467	#endif
482		468
483	#if MENUBAR_MAX	469	#if ENABLE_PERL
484	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	}
485	#endif	480	#endif
		481
486	#ifdef HAVE_SCROLLBARS	482	#ifdef HAVE_SCROLLBARS
487	if (OPTION (Opt_scrollBar))	483	if (OPTION (Opt_scrollBar))
488	scrollBar.setIdle (); /* set existence for size calculations */	484	scrollBar.setIdle (); /* set existence for size calculations */
489	#endif	485	#endif
490		486
491	#if ENABLE_PERL	487	pty = rxvt_new_ptytty ();
492	if (rs[Rs_perl_ext] && *rs[Rs_perl_ext])
493	{
494	rxvt_perl.init ();
495	PERL_INVOKE ((this, HOOK_INIT, DT_END));
496	}
497	#endif
498		488
499	create_windows (argc, argv);	489	create_windows (argc, argv);
500		490
501	dDisp;	491	dDisp;
502		492
503	init_xlocale ();	493	init_xlocale ();
504		494
505	scr_reset (); /* initialize screen */	495	scr_reset (); // initialize screen
506		496
507	#if 0	497	#if 0
508	XSynchronize (disp, True);	498	XSynchronize (disp, True);
509	#endif	499	#endif
510		500
511	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
512	if (OPTION (Opt_scrollBar))	502	if (OPTION (Opt_scrollBar))
513	resize_scrollbar (); /* create and map scrollbar */	503	resize_scrollbar (); /* create and map scrollbar */
514	#endif	504	#endif
515	#if (MENUBAR_MAX)
516	if (menubar_visible ())
517	XMapWindow (disp, menuBar.win);
518	#endif
519	#ifdef TRANSPARENT	505	#ifdef TRANSPARENT
520	if (OPTION (Opt_transparent))	506	if (OPTION (Opt_transparent))
521	{	507	{
522	XSelectInput (disp, display->root, PropertyChangeMask);	508	XSelectInput (disp, display->root, PropertyChangeMask);
523	check_our_parents ();	509	check_our_parents ();
524	rootwin_ev.start (display, display->root);	510	rootwin_ev.start (display, display->root);
525	}	511	}
526	#endif	512	#endif
527		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
528	XMapWindow (disp, vt);	527	XMapWindow (disp, vt);
529	XMapWindow (disp, parent[0]);	528	XMapWindow (disp, parent[0]);
530		529
531	set_colorfgbg ();
532
533	init_command (cmd_argv);
534
535	free (cmd_argv);
536
537	pty_ev.start (pty.pty, EVENT_READ);
538
539	check_ev.start ();
540
541	PERL_INVOKE ((this, HOOK_START, DT_END));
542
543	return true;	530	return true;
544	}	531	}
545		532
546	static struct sig_handlers	533	static struct sig_handlers
547	{	534	{
548	sig_watcher sw_chld, sw_term, sw_int;	535	sig_watcher sw_term, sw_int;
549		536
550	void sig_chld (sig_watcher &w)
551	{
552	// we are being called for every SIGCHLD, find the corresponding term
553	int pid;
554
555	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
556	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
557	if (pid == (*t)->cmd_pid)
558	{
559	(*t)->child_exit ();
560	break;
561	}
562	}
563
564	/*	537	/*
565	* Catch a fatal signal and tidy up before quitting	538	* Catch a fatal signal and tidy up before quitting
566	*/	539	*/
567	void	540	void
568	sig_term (sig_watcher &w)	541	sig_term (sig_watcher &w)
…		…
574	signal (w.signum, SIG_DFL);	547	signal (w.signum, SIG_DFL);
575	kill (getpid (), w.signum);	548	kill (getpid (), w.signum);
576	}	549	}
577		550
578	sig_handlers ()	551	sig_handlers ()
579	: sw_chld (this, &sig_handlers::sig_chld),
580	sw_term (this, &sig_handlers::sig_term),	552	: sw_term (this, &sig_handlers::sig_term),
581	sw_int (this, &sig_handlers::sig_term)	553	sw_int (this, &sig_handlers::sig_term)
582	{	554	{
583	}	555	}
584	} sig_handlers;	556	} sig_handlers;
585		557
		558	char **rxvt_environ; // startup environment
		559
586	void	560	void
587	rxvt_init ()	561	rxvt_init ()
588	{	562	{
589	/*	563	uid_t uid = getuid ();
590	* Save and then give up any super-user privileges	564	gid_t gid = getgid ();
591	* If we need privileges in any area then we must specifically request it.	565
592	* We should only need to be root in these cases:	566	// before doing anything else, check for setuid/setgid operation,
593	* 1. write utmp entries on some systems	567	// start the helper process and drop privileges
594	* 2. chown tty on some systems	568	if (uid != geteuid ()
595	*/	569	\|\| gid != getegid ())
596	rxvt_privileges (SAVE);	570	{
597	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;
598		595
599	signal (SIGHUP, SIG_IGN);	596	signal (SIGHUP, SIG_IGN);
600	signal (SIGPIPE, SIG_IGN);	597	signal (SIGPIPE, SIG_IGN);
601		598
602	sig_handlers.sw_chld.start (SIGCHLD);
603	sig_handlers.sw_term.start (SIGTERM);	599	sig_handlers.sw_term.start (SIGTERM);
604	sig_handlers.sw_int.start (SIGINT);	600	sig_handlers.sw_int.start (SIGINT);
605		601
606	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	602	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
607	/* signal (SIGURG, SIG_DFL); */	603	/* signal (SIGURG, SIG_DFL); */
608		604
609	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	605	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610	// TODO: handle this with exceptions and tolerate the memory loss	606	// TODO: handle this with exceptions and tolerate the memory loss
611	XSetIOErrorHandler (rxvt_xioerror_handler);	607	XSetIOErrorHandler (rxvt_xioerror_handler);
		608
		609	XrmInitialize ();
612	}	610	}
613		611
614	/* ------------------------------------------------------------------------- *	612	/* ------------------------------------------------------------------------- *
615	* MEMORY ALLOCATION WRAPPERS *	613	* MEMORY ALLOCATION WRAPPERS *
616	* ------------------------------------------------------------------------- */	614	* ------------------------------------------------------------------------- */
…		…
634	rxvt_fatal ("memory allocation failure. aborting.\n");	632	rxvt_fatal ("memory allocation failure. aborting.\n");
635		633
636	return p;	634	return p;
637	}	635	}
638		636
639	void *	637	void *
640	rxvt_realloc (void *ptr, size_t size)	638	rxvt_realloc (void *ptr, size_t size)
641	{	639	{
642	void *p = realloc (ptr, size);	640	void *p = realloc (ptr, size);
643		641
644	if (!p)	642	if (!p)
645	rxvt_fatal ("memory allocation failure. aborting.\n");	643	rxvt_fatal ("memory allocation failure. aborting.\n");
646		644
647	return p;	645	return p;
648	}	646	}
649
650	/* ------------------------------------------------------------------------- *
651	* PRIVILEGED OPERATIONS *
652	* ------------------------------------------------------------------------- */
653	/* take care of suid/sgid super-user (root) privileges */
654	void
655	rxvt_privileges (rxvt_privaction action)
656	{
657	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
658	static uid_t euid;
659	static gid_t egid;
660	#endif
661
662	#if ! defined(__CYGWIN32__)
663	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
664	/* setreuid () is the poor man's setuid (), seteuid () */
665	# define seteuid(a) setreuid(-1, (a))
666	# define setegid(a) setregid(-1, (a))
667	# define HAVE_SETEUID
668	# endif
669	# ifdef HAVE_SETEUID
670	switch (action)
671	{
672	case IGNORE:
673	/*
674	* change effective uid/gid - not real uid/gid - so we can switch
675	* back to root later, as required
676	*/
677	seteuid (getuid ());
678	setegid (getgid ());
679	break;
680	case SAVE:
681	euid = geteuid ();
682	egid = getegid ();
683	break;
684	case RESTORE:
685	seteuid (euid);
686	setegid (egid);
687	break;
688	}
689	# else
690	switch (action)
691	{
692	case IGNORE:
693	setuid (getuid ());
694	setgid (getgid ());
695	/* FALLTHROUGH */
696	case SAVE:
697	/* FALLTHROUGH */
698	case RESTORE:
699	break;
700	}
701	# endif
702	#endif
703	}
704
705	#ifdef UTMP_SUPPORT
706	void
707	rxvt_term::privileged_utmp (rxvt_privaction action)
708	{
709	if (OPTION (Opt_utmpInhibit)
710	\|\| !pty.name \|\| !*pty.name)
711	return;
712
713	rxvt_privileges (RESTORE);
714
715	if (action == SAVE)
716	makeutent (pty.name, rs[Rs_display_name]);
717	else
718	cleanutent ();
719
720	rxvt_privileges (IGNORE);
721	}
722	#endif
723		647
724	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
725	/*	649	/*
726	* window size/position calculcations for XSizeHint and other storage.	650	* window size/position calculcations for XSizeHint and other storage.
727	* if width/height are non-zero then override calculated width/height	651	* if width/height are non-zero then override calculated width/height
728	*/	652	*/
729	void	653	void
730	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	654	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
731	{	655	{
732	short recalc_x, recalc_y;	656	short recalc_x, recalc_y;
733	int x, y, sb_w, mb_h, flags;	657	int x, y, sb_w, flags;
734	unsigned int w, h;	658	unsigned int w, h;
735	unsigned int max_width, max_height;	659	unsigned int max_width, max_height;
736	dDisp;	660	dDisp;
737		661
738	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",
…		…
799	max_width = MAX_COLS * fwidth;	723	max_width = MAX_COLS * fwidth;
800	max_height = MAX_ROWS * fheight;	724	max_height = MAX_ROWS * fheight;
801		725
802	szHint.base_width = szHint.base_height = 2 * int_bwidth;	726	szHint.base_width = szHint.base_height = 2 * int_bwidth;
803		727
804	sb_w = mb_h = 0;	728	sb_w = 0;
805	window_vt_x = window_vt_y = int_bwidth;	729	window_vt_x = window_vt_y = int_bwidth;
806		730
807	if (scrollbar_visible ())	731	if (scrollBar.state)
808	{	732	{
809	sb_w = scrollbar_TotalWidth ();	733	sb_w = scrollbar_TotalWidth ();
810	szHint.base_width += sb_w;	734	szHint.base_width += sb_w;
811	if (!OPTION (Opt_scrollBar_right))	735	if (!OPTION (Opt_scrollBar_right))
812	window_vt_x += sb_w;	736	window_vt_x += sb_w;
813	}	737	}
814		738
815	if (menubar_visible ())
816	{
817	mb_h = menuBar_TotalHeight ();
818	szHint.base_height += mb_h;
819	window_vt_y += mb_h;
820	}
821
822	szHint.width_inc = fwidth;	739	szHint.width_inc = fwidth;
823	szHint.height_inc = fheight;	740	szHint.height_inc = fheight;
824	szHint.min_width = szHint.base_width + szHint.width_inc;	741	szHint.min_width = szHint.base_width + szHint.width_inc;
825	szHint.min_height = szHint.base_height + szHint.height_inc;	742	szHint.min_height = szHint.base_height + szHint.height_inc;
826		743
…		…
844	{	761	{
845	min_it (height, max_height);	762	min_it (height, max_height);
846	szHint.height = szHint.base_height + height;	763	szHint.height = szHint.base_height + height;
847	}	764	}
848		765
849	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	766	if (scrollBar.state && OPTION (Opt_scrollBar_right))
850	window_sb_x = szHint.width - sb_w;	767	window_sb_x = szHint.width - sb_w;
851		768
852	if (recalc_x)	769	if (recalc_x)
853	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	770	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
854	if (recalc_y)	771	if (recalc_y)
…		…
868	* Called after a window size change.	785	* Called after a window size change.
869	*/	786	*/
870	void	787	void
871	rxvt_term::tt_winch ()	788	rxvt_term::tt_winch ()
872	{	789	{
873	if (pty.pty < 0)	790	if (pty->pty < 0)
874	return;	791	return;
875		792
876	struct winsize ws;	793	struct winsize ws;
877		794
878	ws.ws_col = ncol;	795	ws.ws_col = ncol;
879	ws.ws_row = nrow;	796	ws.ws_row = nrow;
880	ws.ws_xpixel = width;	797	ws.ws_xpixel = width;
881	ws.ws_ypixel = height;	798	ws.ws_ypixel = height;
882	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	799	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
883		800
884	#if 0	801	#if 0
885	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	802	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
886	if (cmd_pid) /* force through to the command */	803	if (cmd_pid) /* force through to the command */
887	kill (-cmd_pid, SIGWINCH);	804	kill (-cmd_pid, SIGWINCH);
…		…
1024	i = atoi (color);	941	i = atoi (color);
1025		942
1026	if (i >= 8 && i <= 15)	943	if (i >= 8 && i <= 15)
1027	{ /* bright colors */	944	{ /* bright colors */
1028	i -= 8;	945	i -= 8;
1029	# ifndef NO_BRIGHTCOLOR
1030	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	946	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1031	SET_PIXCOLOR (idx);	947	SET_PIXCOLOR (idx);
1032	goto done;	948	goto done;
1033	# endif
1034	}	949	}
1035		950
1036	if (i >= 0 && i <= 7)	951	if (i >= 0 && i <= 7)
1037	{ /* normal colors */	952	{ /* normal colors */
1038	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	953	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1211		1126
1212	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1127	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1213		1128
1214	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1129	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1215	{	1130	{
1216	if (scrollbar_visible ())	1131	if (scrollBar.state)
1217	{	1132	{
1218	XMoveResizeWindow (disp, scrollBar.win,	1133	XMoveResizeWindow (disp, scrollBar.win,
1219	window_sb_x, 0,	1134	window_sb_x, 0,
1220	scrollbar_TotalWidth (), szHint.height);	1135	scrollbar_TotalWidth (), szHint.height);
1221	resize_scrollbar ();	1136	resize_scrollbar ();
1222	}	1137	}
1223
1224	if (menubar_visible ())
1225	XMoveResizeWindow (disp, menuBar.win,
1226	window_vt_x, 0,
1227	width, menuBar_TotalHeight ());
1228		1138
1229	XMoveResizeWindow (disp, vt,	1139	XMoveResizeWindow (disp, vt,
1230	window_vt_x, window_vt_y,	1140	window_vt_x, window_vt_y,
1231	width, height);	1141	width, height);
1232		1142
…		…
1416	XRectangle rect, status_rect, needed_rect;	1326	XRectangle rect, status_rect, needed_rect;
1417	unsigned long fg, bg;	1327	unsigned long fg, bg;
1418	const char *p;	1328	const char *p;
1419	char **s;	1329	char **s;
1420	XIMStyles *xim_styles;	1330	XIMStyles *xim_styles;
		1331
		1332	set_environ (envv);
1421		1333
1422	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1334	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423	return false;	1335	return false;
1424		1336
1425	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1337	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1591	int i;	1503	int i;
1592	const char *p;	1504	const char *p;
1593	char **s;	1505	char **s;
1594	char buf[IMBUFSIZ];	1506	char buf[IMBUFSIZ];
1595		1507
1596	SET_R (this);	1508	make_current ();
1597		1509
1598	im_destroy ();	1510	im_destroy ();
1599		1511
1600	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1512	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601	if (Input_Context)	1513	if (Input_Context)
…		…
1678	XFree (preedit_attr);	1590	XFree (preedit_attr);
1679	XFree (status_attr);	1591	XFree (status_attr);
1680	}	1592	}
1681	#endif /* USE_XIM */	1593	#endif /* USE_XIM */
1682		1594
1683	/----------------------------------------------------------------------/
1684	rxvt_t rxvt_current_term;
1685
1686	/----------------------- 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.159 by root, Wed Jan 4 04:42:45 2006 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.159 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC