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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.189 by root, Thu Jan 19 09:47:15 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	static char curlocale[128];	53	static char curlocale[128], savelocale[128];
54		54
55	bool	55	bool
56	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
57	{	57	{
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	58	if (!locale \|\| !strncmp (locale, curlocale, 128))
59	return false;	59	return false;
60		60
61	strncpy (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
62	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
63	return true;	63	return true;
		64	}
		65
		66	void
		67	rxvt_push_locale (const char *locale)
		68	{
		69	strcpy (savelocale, curlocale);
		70	rxvt_set_locale (locale);
		71	}
		72
		73	void
		74	rxvt_pop_locale ()
		75	{
		76	rxvt_set_locale (savelocale);
64	}	77	}
65		78
66	#if ENABLE_COMBINING	79	#if ENABLE_COMBINING
67	class rxvt_composite_vec rxvt_composite;	80	class rxvt_composite_vec rxvt_composite;
68		81
…		…
133	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
134	#endif	147	#endif
135	#ifdef HAVE_SCROLLBARS	148	#ifdef HAVE_SCROLLBARS
136	scrollbar_ev (this, &rxvt_term::x_cb),	149	scrollbar_ev (this, &rxvt_term::x_cb),
137	#endif	150	#endif
138	#ifdef MENUBAR
139	menubar_ev (this, &rxvt_term::x_cb),
140	#endif
141	#ifdef CURSOR_BLINK	151	#ifdef CURSOR_BLINK
142	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	152	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143	#endif	153	#endif
144	#ifdef TEXT_BLINK	154	#ifdef TEXT_BLINK
145	text_blink_ev (this, &rxvt_term::text_blink_cb),	155	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
159	#ifdef USE_XIM	169	#ifdef USE_XIM
160	im_ev (this, &rxvt_term::im_cb),	170	im_ev (this, &rxvt_term::im_cb),
161	#endif	171	#endif
162	termwin_ev (this, &rxvt_term::x_cb),	172	termwin_ev (this, &rxvt_term::x_cb),
163	vt_ev (this, &rxvt_term::x_cb),	173	vt_ev (this, &rxvt_term::x_cb),
		174	child_ev (this, &rxvt_term::child_cb),
164	check_ev (this, &rxvt_term::check_cb),	175	check_ev (this, &rxvt_term::check_cb),
165	flush_ev (this, &rxvt_term::flush_cb),	176	flush_ev (this, &rxvt_term::flush_cb),
166	destroy_ev (this, &rxvt_term::destroy_cb),	177	destroy_ev (this, &rxvt_term::destroy_cb),
167	pty_ev (this, &rxvt_term::pty_cb),	178	pty_ev (this, &rxvt_term::pty_cb),
168	incr_ev (this, &rxvt_term::incr_cb)	179	incr_ev (this, &rxvt_term::incr_cb)
…		…
184	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
185	{	196	{
186	if (cmd_pid)	197	if (cmd_pid)
187	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
188		199
189	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
190	privileged_utmp (RESTORE);
191	#endif
192
193	pty.put ();
194	}	201	}
195		202
196	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
197	{	204	{
198	PERL_INVOKE ((this, HOOK_DESTROY, DT_END));	205	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
199		206
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	207	termlist.erase (find (termlist.begin (), termlist.end(), this));
201		208
202	emergency_cleanup ();	209	emergency_cleanup ();
203		210
…		…
214		221
215	selection_clear ();	222	selection_clear ();
216		223
217	#ifdef USE_XIM	224	#ifdef USE_XIM
218	im_destroy ();	225	im_destroy ();
219	#endif
220	#ifdef MENUBAR
221	if (menubarGC) XFreeGC (disp, menubarGC);
222	#endif	226	#endif
223	#ifdef XTERM_SCROLLBAR	227	#ifdef XTERM_SCROLLBAR
224	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	228	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225	if (ShadowGC) XFreeGC (disp, ShadowGC);	229	if (ShadowGC) XFreeGC (disp, ShadowGC);
226	#endif	230	#endif
…		…
237	if (upArrow) XFreePixmap (disp, upArrow);	241	if (upArrow) XFreePixmap (disp, upArrow);
238	if (downArrow) XFreePixmap (disp, downArrow);	242	if (downArrow) XFreePixmap (disp, downArrow);
239	if (upArrowHi) XFreePixmap (disp, upArrowHi);	243	if (upArrowHi) XFreePixmap (disp, upArrowHi);
240	if (downArrowHi) XFreePixmap (disp, downArrowHi);	244	if (downArrowHi) XFreePixmap (disp, downArrowHi);
241	#endif	245	#endif
242	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	246	#ifdef RXVT_SCROLLBAR
243	if (topShadowGC) XFreeGC (disp, topShadowGC);	247	if (topShadowGC) XFreeGC (disp, topShadowGC);
244	if (botShadowGC) XFreeGC (disp, botShadowGC);	248	if (botShadowGC) XFreeGC (disp, botShadowGC);
245	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	249	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246	#endif	250	#endif
247	if (gc) XFreeGC (disp, gc);	251	if (gc) XFreeGC (disp, gc);
248		252
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;	253	delete drawable;
255	// destroy all windows	254	// destroy all windows
256	if (parent[0])	255	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	256	XDestroyWindow (disp, parent[0]);
258	}	257	}
259		258
260	// TODO: free pixcolours, colours should become part of rxvt_display	259	// TODO: free pixcolours, colours should become part of rxvt_display
261
262	delete pix_colors_focused;	260	delete pix_colors_focused;
263	#if OFF_FOCUS_FADING	261	#if OFF_FOCUS_FADING
264	delete pix_colors_unfocused;	262	delete pix_colors_unfocused;
265	#endif	263	#endif
266		264
…		…
288	#ifdef KEYSYM_RESOURCE	286	#ifdef KEYSYM_RESOURCE
289	delete keyboard;	287	delete keyboard;
290	#endif	288	#endif
291	}	289	}
292		290
		291	// child has exited, usually destroys
293	void	292	void
294	rxvt_term::child_exit ()	293	rxvt_term::child_cb (child_watcher &w, int status)
295	{	294	{
		295	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		296
296	cmd_pid = 0;	297	cmd_pid = 0;
297		298
298	if (!OPTION (Opt_hold))	299	if (!OPTION (Opt_hold))
299	destroy ();	300	destroy ();
300	}	301	}
…		…
314	#if USE_XIM	315	#if USE_XIM
315	im_ev.stop (display);	316	im_ev.stop (display);
316	#endif	317	#endif
317	#if HAVE_SCROLLBARS	318	#if HAVE_SCROLLBARS
318	scrollbar_ev.stop (display);	319	scrollbar_ev.stop (display);
319	#endif
320	#if MENUBAR
321	menubar_ev.stop (display);
322	#endif	320	#endif
323	#if TRANSPARENT	321	#if TRANSPARENT
324	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
325	#endif	323	#endif
326	incr_ev.stop ();	324	incr_ev.stop ();
…		…
350	}	348	}
351		349
352	void	350	void
353	rxvt_term::destroy_cb (time_watcher &w)	351	rxvt_term::destroy_cb (time_watcher &w)
354	{	352	{
355	SET_R (this);	353	make_current ();
356		354
357	delete this;	355	delete this;
358	}	356	}
359		357
360	/----------------------------------------------------------------------/	358	/----------------------------------------------------------------------/
…		…
451	/----------------------------------------------------------------------/	449	/----------------------------------------------------------------------/
452	bool	450	bool
453	rxvt_term::init (int argc, const char const argv)	451	rxvt_term::init (int argc, const char const argv)
454	{	452	{
455	SET_R (this);	453	SET_R (this);
456
457	set_locale ("");	454	set_locale ("");
		455	set_environ (envv); // few things in X do not call setlocale :(
458		456
459	if (!init_vars ())	457	if (!init_vars ())
460	return false;	458	return false;
461		459
462	init_secondary ();	460	init_secondary ();
…		…
465		463
466	#ifdef KEYSYM_RESOURCE	464	#ifdef KEYSYM_RESOURCE
467	keyboard->register_done ();	465	keyboard->register_done ();
468	#endif	466	#endif
469		467
470	#if MENUBAR_MAX
471	menubar_read (rs[Rs_menu]);
472	#endif
473	#ifdef HAVE_SCROLLBARS	468	#ifdef HAVE_SCROLLBARS
474	if (OPTION (Opt_scrollBar))	469	if (OPTION (Opt_scrollBar))
475	scrollBar.setIdle (); /* set existence for size calculations */	470	scrollBar.setIdle (); /* set existence for size calculations */
476	#endif	471	#endif
477		472
478	#if ENABLE_PERL	473	#if ENABLE_PERL
		474	if (!rs[Rs_perl_ext_1])
		475	rs[Rs_perl_ext_1] = "default";
		476
		477	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		478	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		479	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		480	{
479	rxvt_perl.init ();	481	rxvt_perl.init (this);
480	#endif
481
482	PERL_INVOKE ((this, HOOK_INIT, DT_END));	482	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		483	}
		484	#endif
		485
		486	pty = rxvt_new_ptytty ();
483		487
484	create_windows (argc, argv);	488	create_windows (argc, argv);
485		489
486	dDisp;	490	dDisp;
487		491
488	init_xlocale ();	492	init_xlocale ();
489		493
490	scr_reset (); /* initialize screen */	494	scr_reset (); // initialize screen
491		495
492	#if 0	496	#if 0
493	XSynchronize (disp, True);	497	XSynchronize (disp, True);
494	#endif	498	#endif
495		499
496	#ifdef HAVE_SCROLLBARS	500	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))	501	if (OPTION (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */	502	resize_scrollbar (); /* create and map scrollbar */
499	#endif	503	#endif
500	#if (MENUBAR_MAX)
501	if (menubar_visible ())
502	XMapWindow (disp, menuBar.win);
503	#endif
504	#ifdef TRANSPARENT	504	#ifdef TRANSPARENT
505	if (OPTION (Opt_transparent))	505	if (OPTION (Opt_transparent))
506	{	506	{
507	XSelectInput (disp, display->root, PropertyChangeMask);	507	XSelectInput (disp, display->root, PropertyChangeMask);
508	check_our_parents ();	508	check_our_parents ();
…		…
517		517
518	init_command (cmd_argv);	518	init_command (cmd_argv);
519		519
520	free (cmd_argv);	520	free (cmd_argv);
521		521
		522	if (pty->pty >= 0)
522	pty_ev.start (pty.pty, EVENT_READ);	523	pty_ev.start (pty->pty, EVENT_READ);
523		524
524	check_ev.start ();	525	check_ev.start ();
525		526
526	PERL_INVOKE ((this, HOOK_START, DT_END));	527	HOOK_INVOKE ((this, HOOK_START, DT_END));
527		528
528	return true;	529	return true;
529	}	530	}
530		531
531	static struct sig_handlers	532	static struct sig_handlers
532	{	533	{
533	sig_watcher sw_chld, sw_term, sw_int;	534	sig_watcher sw_term, sw_int;
534		535
535	void sig_chld (sig_watcher &w)
536	{
537	// we are being called for every SIGCHLD, find the corresponding term
538	int pid;
539
540	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542	if (pid == (*t)->cmd_pid)
543	{
544	(*t)->child_exit ();
545	break;
546	}
547	}
548
549	/*	536	/*
550	* Catch a fatal signal and tidy up before quitting	537	* Catch a fatal signal and tidy up before quitting
551	*/	538	*/
552	void	539	void
553	sig_term (sig_watcher &w)	540	sig_term (sig_watcher &w)
…		…
559	signal (w.signum, SIG_DFL);	546	signal (w.signum, SIG_DFL);
560	kill (getpid (), w.signum);	547	kill (getpid (), w.signum);
561	}	548	}
562		549
563	sig_handlers ()	550	sig_handlers ()
564	: sw_chld (this, &sig_handlers::sig_chld),
565	sw_term (this, &sig_handlers::sig_term),	551	: sw_term (this, &sig_handlers::sig_term),
566	sw_int (this, &sig_handlers::sig_term)	552	sw_int (this, &sig_handlers::sig_term)
567	{	553	{
568	}	554	}
569	} sig_handlers;	555	} sig_handlers;
570		556
		557	char **rxvt_environ; // startup environment
		558
571	void	559	void
572	rxvt_init ()	560	rxvt_init ()
573	{	561	{
574	/*	562	uid_t uid = getuid ();
575	* Save and then give up any super-user privileges	563	gid_t gid = getgid ();
576	* If we need privileges in any area then we must specifically request it.	564
577	* We should only need to be root in these cases:	565	// before doing anything else, check for setuid/setgid operation,
578	* 1. write utmp entries on some systems	566	// start the helper process and drop privileges
579	* 2. chown tty on some systems	567	if (uid != geteuid ()
580	*/	568	\|\| gid != getegid ())
581	rxvt_privileges (SAVE);	569	{
582	rxvt_privileges (IGNORE);	570	#if PTYTTY_HELPER
		571	rxvt_ptytty_server ();
		572	#else
		573	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		574	#endif
		575
		576	// drop privileges
		577	#if HAVE_SETRESUID
		578	setresgid (gid, gid, gid);
		579	setresuid (uid, uid, uid);
		580	#elif HAVE_SETREUID
		581	setregid (gid, gid);
		582	setreuid (uid, uid);
		583	#elif HAVE_SETUID
		584	setgid (gid);
		585	setuid (uid);
		586	#endif
		587
		588	if (uid != geteuid ()
		589	\|\| gid != getegid ())
		590	rxvt_fatal ("unable to drop privileges, aborting.\n");
		591	}
		592
		593	rxvt_environ = environ;
583		594
584	signal (SIGHUP, SIG_IGN);	595	signal (SIGHUP, SIG_IGN);
585	signal (SIGPIPE, SIG_IGN);	596	signal (SIGPIPE, SIG_IGN);
586		597
587	sig_handlers.sw_chld.start (SIGCHLD);
588	sig_handlers.sw_term.start (SIGTERM);	598	sig_handlers.sw_term.start (SIGTERM);
589	sig_handlers.sw_int.start (SIGINT);	599	sig_handlers.sw_int.start (SIGINT);
590		600
591	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	601	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
592	/* signal (SIGURG, SIG_DFL); */	602	/* signal (SIGURG, SIG_DFL); */
593		603
594	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	604	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
595	// TODO: handle this with exceptions and tolerate the memory loss	605	// TODO: handle this with exceptions and tolerate the memory loss
596	XSetIOErrorHandler (rxvt_xioerror_handler);	606	XSetIOErrorHandler (rxvt_xioerror_handler);
		607
		608	XrmInitialize ();
597	}	609	}
598		610
599	/* ------------------------------------------------------------------------- *	611	/* ------------------------------------------------------------------------- *
600	* MEMORY ALLOCATION WRAPPERS *	612	* MEMORY ALLOCATION WRAPPERS *
601	* ------------------------------------------------------------------------- */	613	* ------------------------------------------------------------------------- */
…		…
630	rxvt_fatal ("memory allocation failure. aborting.\n");	642	rxvt_fatal ("memory allocation failure. aborting.\n");
631		643
632	return p;	644	return p;
633	}	645	}
634		646
635	/* ------------------------------------------------------------------------- *
636	* PRIVILEGED OPERATIONS *
637	* ------------------------------------------------------------------------- */
638	/* take care of suid/sgid super-user (root) privileges */
639	void
640	rxvt_privileges (rxvt_privaction action)
641	{
642	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
643	static uid_t euid;
644	static gid_t egid;
645	#endif
646
647	#if ! defined(__CYGWIN32__)
648	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
649	/* setreuid () is the poor man's setuid (), seteuid () */
650	# define seteuid(a) setreuid(-1, (a))
651	# define setegid(a) setregid(-1, (a))
652	# define HAVE_SETEUID
653	# endif
654	# ifdef HAVE_SETEUID
655	switch (action)
656	{
657	case IGNORE:
658	/*
659	* change effective uid/gid - not real uid/gid - so we can switch
660	* back to root later, as required
661	*/
662	seteuid (getuid ());
663	setegid (getgid ());
664	break;
665	case SAVE:
666	euid = geteuid ();
667	egid = getegid ();
668	break;
669	case RESTORE:
670	seteuid (euid);
671	setegid (egid);
672	break;
673	}
674	# else
675	switch (action)
676	{
677	case IGNORE:
678	setuid (getuid ());
679	setgid (getgid ());
680	/* FALLTHROUGH */
681	case SAVE:
682	/* FALLTHROUGH */
683	case RESTORE:
684	break;
685	}
686	# endif
687	#endif
688	}
689
690	#ifdef UTMP_SUPPORT
691	void
692	rxvt_term::privileged_utmp (rxvt_privaction action)
693	{
694	if (OPTION (Opt_utmpInhibit)
695	\|\| !pty.name \|\| !*pty.name)
696	return;
697
698	rxvt_privileges (RESTORE);
699
700	if (action == SAVE)
701	makeutent (pty.name, rs[Rs_display_name]);
702	else
703	cleanutent ();
704
705	rxvt_privileges (IGNORE);
706	}
707	#endif
708
709	/----------------------------------------------------------------------/	647	/----------------------------------------------------------------------/
710	/*	648	/*
711	* window size/position calculcations for XSizeHint and other storage.	649	* window size/position calculcations for XSizeHint and other storage.
712	* if width/height are non-zero then override calculated width/height	650	* if width/height are non-zero then override calculated width/height
713	*/	651	*/
714	void	652	void
715	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	653	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
716	{	654	{
717	short recalc_x, recalc_y;	655	short recalc_x, recalc_y;
718	int x, y, sb_w, mb_h, flags;	656	int x, y, sb_w, flags;
719	unsigned int w, h;	657	unsigned int w, h;
720	unsigned int max_width, max_height;	658	unsigned int max_width, max_height;
721	dDisp;	659	dDisp;
722		660
723	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	661	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
784	max_width = MAX_COLS * fwidth;	722	max_width = MAX_COLS * fwidth;
785	max_height = MAX_ROWS * fheight;	723	max_height = MAX_ROWS * fheight;
786		724
787	szHint.base_width = szHint.base_height = 2 * int_bwidth;	725	szHint.base_width = szHint.base_height = 2 * int_bwidth;
788		726
789	sb_w = mb_h = 0;	727	sb_w = 0;
790	window_vt_x = window_vt_y = int_bwidth;	728	window_vt_x = window_vt_y = int_bwidth;
791		729
792	if (scrollbar_visible ())	730	if (scrollBar.state)
793	{	731	{
794	sb_w = scrollbar_TotalWidth ();	732	sb_w = scrollbar_TotalWidth ();
795	szHint.base_width += sb_w;	733	szHint.base_width += sb_w;
796	if (!OPTION (Opt_scrollBar_right))	734	if (!OPTION (Opt_scrollBar_right))
797	window_vt_x += sb_w;	735	window_vt_x += sb_w;
798	}	736	}
799		737
800	if (menubar_visible ())
801	{
802	mb_h = menuBar_TotalHeight ();
803	szHint.base_height += mb_h;
804	window_vt_y += mb_h;
805	}
806
807	szHint.width_inc = fwidth;	738	szHint.width_inc = fwidth;
808	szHint.height_inc = fheight;	739	szHint.height_inc = fheight;
809	szHint.min_width = szHint.base_width + szHint.width_inc;	740	szHint.min_width = szHint.base_width + szHint.width_inc;
810	szHint.min_height = szHint.base_height + szHint.height_inc;	741	szHint.min_height = szHint.base_height + szHint.height_inc;
811		742
…		…
829	{	760	{
830	min_it (height, max_height);	761	min_it (height, max_height);
831	szHint.height = szHint.base_height + height;	762	szHint.height = szHint.base_height + height;
832	}	763	}
833		764
834	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	765	if (scrollBar.state && OPTION (Opt_scrollBar_right))
835	window_sb_x = szHint.width - sb_w;	766	window_sb_x = szHint.width - sb_w;
836		767
837	if (recalc_x)	768	if (recalc_x)
838	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	769	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
839	if (recalc_y)	770	if (recalc_y)
…		…
853	* Called after a window size change.	784	* Called after a window size change.
854	*/	785	*/
855	void	786	void
856	rxvt_term::tt_winch ()	787	rxvt_term::tt_winch ()
857	{	788	{
858	if (pty.pty < 0)	789	if (pty->pty < 0)
859	return;	790	return;
860		791
861	struct winsize ws;	792	struct winsize ws;
862		793
863	ws.ws_col = ncol;	794	ws.ws_col = ncol;
864	ws.ws_row = nrow;	795	ws.ws_row = nrow;
865	ws.ws_xpixel = width;	796	ws.ws_xpixel = width;
866	ws.ws_ypixel = height;	797	ws.ws_ypixel = height;
867	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	798	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
868		799
869	#if 0	800	#if 0
870	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	801	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
871	if (cmd_pid) /* force through to the command */	802	if (cmd_pid) /* force through to the command */
872	kill (-cmd_pid, SIGWINCH);	803	kill (-cmd_pid, SIGWINCH);
…		…
908	prop.height += lineSpace;	839	prop.height += lineSpace;
909	fs->set_prop (prop);	840	fs->set_prop (prop);
910		841
911	fwidth = prop.width;	842	fwidth = prop.width;
912	fheight = prop.height;	843	fheight = prop.height;
913	fbase = (*fs)[1]->ascent;	844	fbase = prop.ascent;
914		845
915	for (int style = 1; style < 4; style++)	846	for (int style = 1; style < 4; style++)
916	{	847	{
917	#if ENABLE_STYLES	848	#if ENABLE_STYLES
918	const char *res = rs[Rs_font + style];	849	const char *res = rs[Rs_font + style];
…		…
1009	i = atoi (color);	940	i = atoi (color);
1010		941
1011	if (i >= 8 && i <= 15)	942	if (i >= 8 && i <= 15)
1012	{ /* bright colors */	943	{ /* bright colors */
1013	i -= 8;	944	i -= 8;
1014	# ifndef NO_BRIGHTCOLOR
1015	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016	SET_PIXCOLOR (idx);	946	SET_PIXCOLOR (idx);
1017	goto done;	947	goto done;
1018	# endif
1019	}	948	}
1020		949
1021	if (i >= 0 && i <= 7)	950	if (i >= 0 && i <= 7)
1022	{ /* normal colors */	951	{ /* normal colors */
1023	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	952	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1196		1125
1197	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1126	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1198		1127
1199	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1128	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1200	{	1129	{
1201	if (scrollbar_visible ())	1130	if (scrollBar.state)
1202	{	1131	{
1203	XMoveResizeWindow (disp, scrollBar.win,	1132	XMoveResizeWindow (disp, scrollBar.win,
1204	window_sb_x, 0,	1133	window_sb_x, 0,
1205	scrollbar_TotalWidth (), szHint.height);	1134	scrollbar_TotalWidth (), szHint.height);
1206	resize_scrollbar ();	1135	resize_scrollbar ();
1207	}	1136	}
1208		1137
1209	if (menubar_visible ())
1210	XMoveResizeWindow (disp, menuBar.win,
1211	window_vt_x, 0,
1212	TermWin_TotalWidth (), menuBar_TotalHeight ());
1213
1214	XMoveResizeWindow (disp, vt,	1138	XMoveResizeWindow (disp, vt,
1215	window_vt_x, window_vt_y,	1139	window_vt_x, window_vt_y,
1216	TermWin_TotalWidth (), TermWin_TotalHeight ());	1140	width, height);
1217		1141
1218	scr_clear ();	1142	scr_clear ();
1219	#ifdef XPM_BACKGROUND	1143	#ifdef XPM_BACKGROUND
1220	resize_pixmap ();	1144	resize_pixmap ();
1221	#endif	1145	#endif
…		…
1401	XRectangle rect, status_rect, needed_rect;	1325	XRectangle rect, status_rect, needed_rect;
1402	unsigned long fg, bg;	1326	unsigned long fg, bg;
1403	const char *p;	1327	const char *p;
1404	char **s;	1328	char **s;
1405	XIMStyles *xim_styles;	1329	XIMStyles *xim_styles;
		1330
		1331	set_environ (envv);
1406		1332
1407	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1333	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1408	return false;	1334	return false;
1409		1335
1410	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1336	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1576	int i;	1502	int i;
1577	const char *p;	1503	const char *p;
1578	char **s;	1504	char **s;
1579	char buf[IMBUFSIZ];	1505	char buf[IMBUFSIZ];
1580		1506
1581	SET_R (this);	1507	make_current ();
1582		1508
1583	im_destroy ();	1509	im_destroy ();
1584		1510
1585	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1511	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1586	if (Input_Context)	1512	if (Input_Context)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.155 by root, Mon Jan 2 15:35:43 2006 UTC vs. Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC