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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.156 by root, Mon Jan 2 18:20:23 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	rxvt_perl.init ();
493	#endif
494
495	PERL_INVOKE ((this, HOOK_INIT, DT_END));
496		488
497	create_windows (argc, argv);	489	create_windows (argc, argv);
498		490
499	dDisp;	491	dDisp;
500		492
501	init_xlocale ();	493	init_xlocale ();
502		494
503	scr_reset (); /* initialize screen */	495	scr_reset (); // initialize screen
504		496
505	#if 0	497	#if 0
506	XSynchronize (disp, True);	498	XSynchronize (disp, True);
507	#endif	499	#endif
508		500
509	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
510	if (OPTION (Opt_scrollBar))	502	if (OPTION (Opt_scrollBar))
511	resize_scrollbar (); /* create and map scrollbar */	503	resize_scrollbar (); /* create and map scrollbar */
512	#endif	504	#endif
513	#if (MENUBAR_MAX)
514	if (menubar_visible ())
515	XMapWindow (disp, menuBar.win);
516	#endif
517	#ifdef TRANSPARENT	505	#ifdef TRANSPARENT
518	if (OPTION (Opt_transparent))	506	if (OPTION (Opt_transparent))
519	{	507	{
520	XSelectInput (disp, display->root, PropertyChangeMask);	508	XSelectInput (disp, display->root, PropertyChangeMask);
521	check_our_parents ();	509	check_our_parents ();
522	rootwin_ev.start (display, display->root);	510	rootwin_ev.start (display, display->root);
523	}	511	}
524	#endif	512	#endif
525		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
526	XMapWindow (disp, vt);	527	XMapWindow (disp, vt);
527	XMapWindow (disp, parent[0]);	528	XMapWindow (disp, parent[0]);
528		529
529	set_colorfgbg ();
530
531	init_command (cmd_argv);
532
533	free (cmd_argv);
534
535	pty_ev.start (pty.pty, EVENT_READ);
536
537	check_ev.start ();
538
539	PERL_INVOKE ((this, HOOK_START, DT_END));
540
541	return true;	530	return true;
542	}	531	}
543		532
544	static struct sig_handlers	533	static struct sig_handlers
545	{	534	{
546	sig_watcher sw_chld, sw_term, sw_int;	535	sig_watcher sw_term, sw_int;
547		536
548	void sig_chld (sig_watcher &w)
549	{
550	// we are being called for every SIGCHLD, find the corresponding term
551	int pid;
552
553	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
554	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
555	if (pid == (*t)->cmd_pid)
556	{
557	(*t)->child_exit ();
558	break;
559	}
560	}
561
562	/*	537	/*
563	* Catch a fatal signal and tidy up before quitting	538	* Catch a fatal signal and tidy up before quitting
564	*/	539	*/
565	void	540	void
566	sig_term (sig_watcher &w)	541	sig_term (sig_watcher &w)
…		…
572	signal (w.signum, SIG_DFL);	547	signal (w.signum, SIG_DFL);
573	kill (getpid (), w.signum);	548	kill (getpid (), w.signum);
574	}	549	}
575		550
576	sig_handlers ()	551	sig_handlers ()
577	: sw_chld (this, &sig_handlers::sig_chld),
578	sw_term (this, &sig_handlers::sig_term),	552	: sw_term (this, &sig_handlers::sig_term),
579	sw_int (this, &sig_handlers::sig_term)	553	sw_int (this, &sig_handlers::sig_term)
580	{	554	{
581	}	555	}
582	} sig_handlers;	556	} sig_handlers;
583		557
		558	char **rxvt_environ; // startup environment
		559
584	void	560	void
585	rxvt_init ()	561	rxvt_init ()
586	{	562	{
587	/*	563	uid_t uid = getuid ();
588	* Save and then give up any super-user privileges	564	gid_t gid = getgid ();
589	* If we need privileges in any area then we must specifically request it.	565
590	* We should only need to be root in these cases:	566	// before doing anything else, check for setuid/setgid operation,
591	* 1. write utmp entries on some systems	567	// start the helper process and drop privileges
592	* 2. chown tty on some systems	568	if (uid != geteuid ()
593	*/	569	\|\| gid != getegid ())
594	rxvt_privileges (SAVE);	570	{
595	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;
596		595
597	signal (SIGHUP, SIG_IGN);	596	signal (SIGHUP, SIG_IGN);
598	signal (SIGPIPE, SIG_IGN);	597	signal (SIGPIPE, SIG_IGN);
599		598
600	sig_handlers.sw_chld.start (SIGCHLD);
601	sig_handlers.sw_term.start (SIGTERM);	599	sig_handlers.sw_term.start (SIGTERM);
602	sig_handlers.sw_int.start (SIGINT);	600	sig_handlers.sw_int.start (SIGINT);
603		601
604	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	602	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
605	/* signal (SIGURG, SIG_DFL); */	603	/* signal (SIGURG, SIG_DFL); */
606		604
607	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	605	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608	// TODO: handle this with exceptions and tolerate the memory loss	606	// TODO: handle this with exceptions and tolerate the memory loss
609	XSetIOErrorHandler (rxvt_xioerror_handler);	607	XSetIOErrorHandler (rxvt_xioerror_handler);
		608
		609	XrmInitialize ();
610	}	610	}
611		611
612	/* ------------------------------------------------------------------------- *	612	/* ------------------------------------------------------------------------- *
613	* MEMORY ALLOCATION WRAPPERS *	613	* MEMORY ALLOCATION WRAPPERS *
614	* ------------------------------------------------------------------------- */	614	* ------------------------------------------------------------------------- */
…		…
632	rxvt_fatal ("memory allocation failure. aborting.\n");	632	rxvt_fatal ("memory allocation failure. aborting.\n");
633		633
634	return p;	634	return p;
635	}	635	}
636		636
637	void *	637	void *
638	rxvt_realloc (void *ptr, size_t size)	638	rxvt_realloc (void *ptr, size_t size)
639	{	639	{
640	void *p = realloc (ptr, size);	640	void *p = realloc (ptr, size);
641		641
642	if (!p)	642	if (!p)
643	rxvt_fatal ("memory allocation failure. aborting.\n");	643	rxvt_fatal ("memory allocation failure. aborting.\n");
644		644
645	return p;	645	return p;
646	}	646	}
647
648	/* ------------------------------------------------------------------------- *
649	* PRIVILEGED OPERATIONS *
650	* ------------------------------------------------------------------------- */
651	/* take care of suid/sgid super-user (root) privileges */
652	void
653	rxvt_privileges (rxvt_privaction action)
654	{
655	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
656	static uid_t euid;
657	static gid_t egid;
658	#endif
659
660	#if ! defined(__CYGWIN32__)
661	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
662	/* setreuid () is the poor man's setuid (), seteuid () */
663	# define seteuid(a) setreuid(-1, (a))
664	# define setegid(a) setregid(-1, (a))
665	# define HAVE_SETEUID
666	# endif
667	# ifdef HAVE_SETEUID
668	switch (action)
669	{
670	case IGNORE:
671	/*
672	* change effective uid/gid - not real uid/gid - so we can switch
673	* back to root later, as required
674	*/
675	seteuid (getuid ());
676	setegid (getgid ());
677	break;
678	case SAVE:
679	euid = geteuid ();
680	egid = getegid ();
681	break;
682	case RESTORE:
683	seteuid (euid);
684	setegid (egid);
685	break;
686	}
687	# else
688	switch (action)
689	{
690	case IGNORE:
691	setuid (getuid ());
692	setgid (getgid ());
693	/* FALLTHROUGH */
694	case SAVE:
695	/* FALLTHROUGH */
696	case RESTORE:
697	break;
698	}
699	# endif
700	#endif
701	}
702
703	#ifdef UTMP_SUPPORT
704	void
705	rxvt_term::privileged_utmp (rxvt_privaction action)
706	{
707	if (OPTION (Opt_utmpInhibit)
708	\|\| !pty.name \|\| !*pty.name)
709	return;
710
711	rxvt_privileges (RESTORE);
712
713	if (action == SAVE)
714	makeutent (pty.name, rs[Rs_display_name]);
715	else
716	cleanutent ();
717
718	rxvt_privileges (IGNORE);
719	}
720	#endif
721		647
722	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
723	/*	649	/*
724	* window size/position calculcations for XSizeHint and other storage.	650	* window size/position calculcations for XSizeHint and other storage.
725	* if width/height are non-zero then override calculated width/height	651	* if width/height are non-zero then override calculated width/height
726	*/	652	*/
727	void	653	void
728	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	654	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
729	{	655	{
730	short recalc_x, recalc_y;	656	short recalc_x, recalc_y;
731	int x, y, sb_w, mb_h, flags;	657	int x, y, sb_w, flags;
732	unsigned int w, h;	658	unsigned int w, h;
733	unsigned int max_width, max_height;	659	unsigned int max_width, max_height;
734	dDisp;	660	dDisp;
735		661
736	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",
…		…
797	max_width = MAX_COLS * fwidth;	723	max_width = MAX_COLS * fwidth;
798	max_height = MAX_ROWS * fheight;	724	max_height = MAX_ROWS * fheight;
799		725
800	szHint.base_width = szHint.base_height = 2 * int_bwidth;	726	szHint.base_width = szHint.base_height = 2 * int_bwidth;
801		727
802	sb_w = mb_h = 0;	728	sb_w = 0;
803	window_vt_x = window_vt_y = int_bwidth;	729	window_vt_x = window_vt_y = int_bwidth;
804		730
805	if (scrollbar_visible ())	731	if (scrollBar.state)
806	{	732	{
807	sb_w = scrollbar_TotalWidth ();	733	sb_w = scrollbar_TotalWidth ();
808	szHint.base_width += sb_w;	734	szHint.base_width += sb_w;
809	if (!OPTION (Opt_scrollBar_right))	735	if (!OPTION (Opt_scrollBar_right))
810	window_vt_x += sb_w;	736	window_vt_x += sb_w;
811	}	737	}
812		738
813	if (menubar_visible ())
814	{
815	mb_h = menuBar_TotalHeight ();
816	szHint.base_height += mb_h;
817	window_vt_y += mb_h;
818	}
819
820	szHint.width_inc = fwidth;	739	szHint.width_inc = fwidth;
821	szHint.height_inc = fheight;	740	szHint.height_inc = fheight;
822	szHint.min_width = szHint.base_width + szHint.width_inc;	741	szHint.min_width = szHint.base_width + szHint.width_inc;
823	szHint.min_height = szHint.base_height + szHint.height_inc;	742	szHint.min_height = szHint.base_height + szHint.height_inc;
824		743
…		…
842	{	761	{
843	min_it (height, max_height);	762	min_it (height, max_height);
844	szHint.height = szHint.base_height + height;	763	szHint.height = szHint.base_height + height;
845	}	764	}
846		765
847	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	766	if (scrollBar.state && OPTION (Opt_scrollBar_right))
848	window_sb_x = szHint.width - sb_w;	767	window_sb_x = szHint.width - sb_w;
849		768
850	if (recalc_x)	769	if (recalc_x)
851	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	770	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
852	if (recalc_y)	771	if (recalc_y)
…		…
866	* Called after a window size change.	785	* Called after a window size change.
867	*/	786	*/
868	void	787	void
869	rxvt_term::tt_winch ()	788	rxvt_term::tt_winch ()
870	{	789	{
871	if (pty.pty < 0)	790	if (pty->pty < 0)
872	return;	791	return;
873		792
874	struct winsize ws;	793	struct winsize ws;
875		794
876	ws.ws_col = ncol;	795	ws.ws_col = ncol;
877	ws.ws_row = nrow;	796	ws.ws_row = nrow;
878	ws.ws_xpixel = width;	797	ws.ws_xpixel = width;
879	ws.ws_ypixel = height;	798	ws.ws_ypixel = height;
880	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	799	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
881		800
882	#if 0	801	#if 0
883	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	802	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
884	if (cmd_pid) /* force through to the command */	803	if (cmd_pid) /* force through to the command */
885	kill (-cmd_pid, SIGWINCH);	804	kill (-cmd_pid, SIGWINCH);
…		…
921	prop.height += lineSpace;	840	prop.height += lineSpace;
922	fs->set_prop (prop);	841	fs->set_prop (prop);
923		842
924	fwidth = prop.width;	843	fwidth = prop.width;
925	fheight = prop.height;	844	fheight = prop.height;
926	fbase = (*fs)[1]->ascent;	845	fbase = prop.ascent;
927		846
928	for (int style = 1; style < 4; style++)	847	for (int style = 1; style < 4; style++)
929	{	848	{
930	#if ENABLE_STYLES	849	#if ENABLE_STYLES
931	const char *res = rs[Rs_font + style];	850	const char *res = rs[Rs_font + style];
…		…
1022	i = atoi (color);	941	i = atoi (color);
1023		942
1024	if (i >= 8 && i <= 15)	943	if (i >= 8 && i <= 15)
1025	{ /* bright colors */	944	{ /* bright colors */
1026	i -= 8;	945	i -= 8;
1027	# ifndef NO_BRIGHTCOLOR
1028	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	946	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029	SET_PIXCOLOR (idx);	947	SET_PIXCOLOR (idx);
1030	goto done;	948	goto done;
1031	# endif
1032	}	949	}
1033		950
1034	if (i >= 0 && i <= 7)	951	if (i >= 0 && i <= 7)
1035	{ /* normal colors */	952	{ /* normal colors */
1036	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	953	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1209		1126
1210	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1127	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1211		1128
1212	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1129	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1213	{	1130	{
1214	if (scrollbar_visible ())	1131	if (scrollBar.state)
1215	{	1132	{
1216	XMoveResizeWindow (disp, scrollBar.win,	1133	XMoveResizeWindow (disp, scrollBar.win,
1217	window_sb_x, 0,	1134	window_sb_x, 0,
1218	scrollbar_TotalWidth (), szHint.height);	1135	scrollbar_TotalWidth (), szHint.height);
1219	resize_scrollbar ();	1136	resize_scrollbar ();
1220	}	1137	}
1221		1138
1222	if (menubar_visible ())
1223	XMoveResizeWindow (disp, menuBar.win,
1224	window_vt_x, 0,
1225	TermWin_TotalWidth (), menuBar_TotalHeight ());
1226
1227	XMoveResizeWindow (disp, vt,	1139	XMoveResizeWindow (disp, vt,
1228	window_vt_x, window_vt_y,	1140	window_vt_x, window_vt_y,
1229	TermWin_TotalWidth (), TermWin_TotalHeight ());	1141	width, height);
1230		1142
1231	scr_clear ();	1143	scr_clear ();
1232	#ifdef XPM_BACKGROUND	1144	#ifdef XPM_BACKGROUND
1233	resize_pixmap ();	1145	resize_pixmap ();
1234	#endif	1146	#endif
…		…
1414	XRectangle rect, status_rect, needed_rect;	1326	XRectangle rect, status_rect, needed_rect;
1415	unsigned long fg, bg;	1327	unsigned long fg, bg;
1416	const char *p;	1328	const char *p;
1417	char **s;	1329	char **s;
1418	XIMStyles *xim_styles;	1330	XIMStyles *xim_styles;
		1331
		1332	set_environ (envv);
1419		1333
1420	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1334	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1421	return false;	1335	return false;
1422		1336
1423	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1337	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1589	int i;	1503	int i;
1590	const char *p;	1504	const char *p;
1591	char **s;	1505	char **s;
1592	char buf[IMBUFSIZ];	1506	char buf[IMBUFSIZ];
1593		1507
1594	SET_R (this);	1508	make_current ();
1595		1509
1596	im_destroy ();	1510	im_destroy ();
1597		1511
1598	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1512	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1599	if (Input_Context)	1513	if (Input_Context)
…		…
1676	XFree (preedit_attr);	1590	XFree (preedit_attr);
1677	XFree (status_attr);	1591	XFree (status_attr);
1678	}	1592	}
1679	#endif /* USE_XIM */	1593	#endif /* USE_XIM */
1680		1594
1681	/----------------------------------------------------------------------/
1682	rxvt_t rxvt_current_term;
1683
1684	/----------------------- 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.156 by root, Mon Jan 2 18:20:23 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.156 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC