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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.150 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.188 by root, Wed Jan 18 08:33:34 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"
		37
		38	#include <limits>
35		39
36	#include <csignal>	40	#include <csignal>
37	#include <cstring>	41	#include <cstring>
38		42
39	#ifdef TTY_GID_SUPPORT	43	#ifdef TTY_GID_SUPPORT
…		…
42		46
43	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	48	# include <termios.h>
45	#endif	49	#endif
46		50
47	#ifdef KEYSYM_RESOURCE
48	# include "keyboard.h"
49	#endif
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
…		…
132	#if TRANSPARENT	145	#if TRANSPARENT
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
138	#ifdef MENUBAR
139	menubar_ev (this, &rxvt_term::x_cb),
140	#endif	150	#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
…		…
184	void rxvt_term::emergency_cleanup ()	194	void rxvt_term::emergency_cleanup ()
185	{	195	{
186	if (cmd_pid)	196	if (cmd_pid)
187	kill (-cmd_pid, SIGHUP);	197	kill (-cmd_pid, SIGHUP);
188		198
189	#ifdef UTMP_SUPPORT	199	delete pty; pty = 0;
190	privileged_utmp (RESTORE);
191	#endif
192
193	pty.put ();
194	}	200	}
195		201
196	rxvt_term::~rxvt_term ()	202	rxvt_term::~rxvt_term ()
197	{	203	{
		204	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		205
198	termlist.erase (find (termlist.begin (), termlist.end(), this));	206	termlist.erase (find (termlist.begin (), termlist.end(), this));
199		207
200	emergency_cleanup ();	208	emergency_cleanup ();
201		209
202	#if ENABLE_STYLES	210	#if ENABLE_STYLES
…		…
212		220
213	selection_clear ();	221	selection_clear ();
214		222
215	#ifdef USE_XIM	223	#ifdef USE_XIM
216	im_destroy ();	224	im_destroy ();
217	#endif
218	#ifdef MENUBAR
219	if (menubarGC) XFreeGC (disp, menubarGC);
220	#endif	225	#endif
221	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
222	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (disp, ShadowGC);
224	#endif	229	#endif
…		…
235	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (disp, upArrow);
236	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (disp, downArrow);
237	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (disp, upArrowHi);
238	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (disp, downArrowHi);
239	#endif	244	#endif
240	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	245	#ifdef RXVT_SCROLLBAR
241	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (disp, topShadowGC);
242	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (disp, botShadowGC);
243	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244	#endif	249	#endif
245	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (disp, gc);
246		251
247	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248	delete menuBar.drawable;
249	//if (menuBar.win)
250	// XDestroyWindow (disp, menuBar.win);
251	#endif
252	delete drawable;	252	delete drawable;
253	// destroy all windows	253	// destroy all windows
254	if (parent[0])	254	if (parent[0])
255	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (disp, parent[0]);
256	}	256	}
257		257
258	// TODO: free pixcolours, colours should become part of rxvt_display	258	// TODO: free pixcolours, colours should become part of rxvt_display
259
260	delete pix_colors_focused;	259	delete pix_colors_focused;
261	#if OFF_FOCUS_FADING	260	#if OFF_FOCUS_FADING
262	delete pix_colors_unfocused;	261	delete pix_colors_unfocused;
263	#endif	262	#endif
264		263
…		…
287	delete keyboard;	286	delete keyboard;
288	#endif	287	#endif
289	}	288	}
290		289
291	void	290	void
		291	rxvt_term::child_exit ()
		292	{
		293	cmd_pid = 0;
		294
		295	if (!OPTION (Opt_hold))
		296	destroy ();
		297	}
		298
		299	void
292	rxvt_term::destroy ()	300	rxvt_term::destroy ()
293	{	301	{
294	if (destroy_ev.active)	302	if (destroy_ev.active)
295	return;	303	return;
296		304
…		…
303	#if USE_XIM	311	#if USE_XIM
304	im_ev.stop (display);	312	im_ev.stop (display);
305	#endif	313	#endif
306	#if HAVE_SCROLLBARS	314	#if HAVE_SCROLLBARS
307	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
308	#endif
309	#if MENUBAR
310	menubar_ev.stop (display);
311	#endif	316	#endif
312	#if TRANSPARENT	317	#if TRANSPARENT
313	rootwin_ev.stop (display);	318	rootwin_ev.stop (display);
314	#endif	319	#endif
315	incr_ev.stop ();	320	incr_ev.stop ();
…		…
339	}	344	}
340		345
341	void	346	void
342	rxvt_term::destroy_cb (time_watcher &w)	347	rxvt_term::destroy_cb (time_watcher &w)
343	{	348	{
344	SET_R (this);	349	make_current ();
345		350
346	delete this;	351	delete this;
347	}	352	}
348		353
349	/----------------------------------------------------------------------/	354	/----------------------------------------------------------------------/
…		…
440	/----------------------------------------------------------------------/	445	/----------------------------------------------------------------------/
441	bool	446	bool
442	rxvt_term::init (int argc, const char const argv)	447	rxvt_term::init (int argc, const char const argv)
443	{	448	{
444	SET_R (this);	449	SET_R (this);
445
446	set_locale ("");	450	set_locale ("");
		451	set_environ (envv); // few things in X do not call setlocale :(
447		452
448	if (!init_vars ())	453	if (!init_vars ())
449	return false;	454	return false;
450		455
451	init_secondary ();	456	init_secondary ();
…		…
454		459
455	#ifdef KEYSYM_RESOURCE	460	#ifdef KEYSYM_RESOURCE
456	keyboard->register_done ();	461	keyboard->register_done ();
457	#endif	462	#endif
458		463
459	#if MENUBAR_MAX
460	menubar_read (rs[Rs_menu]);
461	#endif
462	#ifdef HAVE_SCROLLBARS	464	#ifdef HAVE_SCROLLBARS
463	if (options & Opt_scrollBar)	465	if (OPTION (Opt_scrollBar))
464	scrollBar.setIdle (); /* set existence for size calculations */	466	scrollBar.setIdle (); /* set existence for size calculations */
465	#endif	467	#endif
466		468
		469	#if ENABLE_PERL
		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	}
		480	#endif
		481
		482	pty = rxvt_new_ptytty ();
		483
467	create_windows (argc, argv);	484	create_windows (argc, argv);
468		485
469	dDisp;	486	dDisp;
470		487
471	init_xlocale ();	488	init_xlocale ();
472		489
473	scr_reset (); /* initialize screen */	490	scr_reset (); // initialize screen
474		491
475	#if 0	492	#if 0
476	XSynchronize (disp, True);	493	XSynchronize (disp, True);
477	#endif	494	#endif
478		495
479	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
480	if (options & Opt_scrollBar)	497	if (OPTION (Opt_scrollBar))
481	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
482	#endif	499	#endif
483	#if (MENUBAR_MAX)
484	if (menubar_visible ())
485	XMapWindow (disp, menuBar.win);
486	#endif
487	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
488	if (options & Opt_transparent)	501	if (OPTION (Opt_transparent))
489	{	502	{
490	XSelectInput (disp, display->root, PropertyChangeMask);	503	XSelectInput (disp, display->root, PropertyChangeMask);
491	check_our_parents ();	504	check_our_parents ();
492	rootwin_ev.start (display, display->root);	505	rootwin_ev.start (display, display->root);
493	}	506	}
…		…
500		513
501	init_command (cmd_argv);	514	init_command (cmd_argv);
502		515
503	free (cmd_argv);	516	free (cmd_argv);
504		517
		518	if (pty->pty >= 0)
505	pty_ev.start (pty.pty, EVENT_READ);	519	pty_ev.start (pty->pty, EVENT_READ);
506		520
507	check_ev.start ();	521	check_ev.start ();
		522
		523	HOOK_INVOKE ((this, HOOK_START, DT_END));
508		524
509	return true;	525	return true;
510	}	526	}
511		527
512	static struct sig_handlers	528	static struct sig_handlers
…		…
520		536
521	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	537	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	538	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523	if (pid == (*t)->cmd_pid)	539	if (pid == (*t)->cmd_pid)
524	{	540	{
525	(*t)->destroy ();	541	(*t)->child_exit ();
526	break;	542	break;
527	}	543	}
528	}	544	}
529		545
530	/*	546	/*
…		…
547	sw_int (this, &sig_handlers::sig_term)	563	sw_int (this, &sig_handlers::sig_term)
548	{	564	{
549	}	565	}
550	} sig_handlers;	566	} sig_handlers;
551		567
		568	char **rxvt_environ; // startup environment
		569
552	void	570	void
553	rxvt_init ()	571	rxvt_init ()
554	{	572	{
555	/*	573	uid_t uid = getuid ();
556	* Save and then give up any super-user privileges	574	gid_t gid = getgid ();
557	* If we need privileges in any area then we must specifically request it.	575
558	* We should only need to be root in these cases:	576	// before doing anything else, check for setuid/setgid operation,
559	* 1. write utmp entries on some systems	577	// start the helper process and drop privileges
560	* 2. chown tty on some systems	578	if (uid != geteuid ()
561	*/	579	\|\| gid != getegid ())
562	rxvt_privileges (SAVE);	580	{
563	rxvt_privileges (IGNORE);	581	#if PTYTTY_HELPER
		582	rxvt_ptytty_server ();
		583	#else
		584	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		585	#endif
		586
		587	// drop privileges
		588	#if HAVE_SETRESUID
		589	setresgid (gid, gid, gid);
		590	setresuid (uid, uid, uid);
		591	#elif HAVE_SETREUID
		592	setregid (gid, gid);
		593	setreuid (uid, uid);
		594	#elif HAVE_SETUID
		595	setgid (gid);
		596	setuid (uid);
		597	#endif
		598
		599	if (uid != geteuid ()
		600	\|\| gid != getegid ())
		601	rxvt_fatal ("unable to drop privileges, aborting.\n");
		602	}
		603
		604	rxvt_environ = environ;
564		605
565	signal (SIGHUP, SIG_IGN);	606	signal (SIGHUP, SIG_IGN);
566	signal (SIGPIPE, SIG_IGN);	607	signal (SIGPIPE, SIG_IGN);
567		608
568	sig_handlers.sw_chld.start (SIGCHLD);	609	sig_handlers.sw_chld.start (SIGCHLD);
…		…
573	/* signal (SIGURG, SIG_DFL); */	614	/* signal (SIGURG, SIG_DFL); */
574		615
575	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	616	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576	// TODO: handle this with exceptions and tolerate the memory loss	617	// TODO: handle this with exceptions and tolerate the memory loss
577	XSetIOErrorHandler (rxvt_xioerror_handler);	618	XSetIOErrorHandler (rxvt_xioerror_handler);
		619
		620	XrmInitialize ();
578	}	621	}
579		622
580	/* ------------------------------------------------------------------------- *	623	/* ------------------------------------------------------------------------- *
581	* MEMORY ALLOCATION WRAPPERS *	624	* MEMORY ALLOCATION WRAPPERS *
582	* ------------------------------------------------------------------------- */	625	* ------------------------------------------------------------------------- */
…		…
611	rxvt_fatal ("memory allocation failure. aborting.\n");	654	rxvt_fatal ("memory allocation failure. aborting.\n");
612		655
613	return p;	656	return p;
614	}	657	}
615		658
616	/* ------------------------------------------------------------------------- *
617	* PRIVILEGED OPERATIONS *
618	* ------------------------------------------------------------------------- */
619	/* take care of suid/sgid super-user (root) privileges */
620	void
621	rxvt_privileges (rxvt_privaction action)
622	{
623	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624	static uid_t euid;
625	static gid_t egid;
626	#endif
627
628	#if ! defined(__CYGWIN32__)
629	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630	/* setreuid () is the poor man's setuid (), seteuid () */
631	# define seteuid(a) setreuid(-1, (a))
632	# define setegid(a) setregid(-1, (a))
633	# define HAVE_SETEUID
634	# endif
635	# ifdef HAVE_SETEUID
636	switch (action)
637	{
638	case IGNORE:
639	/*
640	* change effective uid/gid - not real uid/gid - so we can switch
641	* back to root later, as required
642	*/
643	seteuid (getuid ());
644	setegid (getgid ());
645	break;
646	case SAVE:
647	euid = geteuid ();
648	egid = getegid ();
649	break;
650	case RESTORE:
651	seteuid (euid);
652	setegid (egid);
653	break;
654	}
655	# else
656	switch (action)
657	{
658	case IGNORE:
659	setuid (getuid ());
660	setgid (getgid ());
661	/* FALLTHROUGH */
662	case SAVE:
663	/* FALLTHROUGH */
664	case RESTORE:
665	break;
666	}
667	# endif
668	#endif
669	}
670
671	#ifdef UTMP_SUPPORT
672	void
673	rxvt_term::privileged_utmp (rxvt_privaction action)
674	{
675	if ((options & Opt_utmpInhibit)
676	\|\| !pty.name \|\| !*pty.name)
677	return;
678
679	rxvt_privileges (RESTORE);
680
681	if (action == SAVE)
682	makeutent (pty.name, rs[Rs_display_name]);
683	else
684	cleanutent ();
685
686	rxvt_privileges (IGNORE);
687	}
688	#endif
689
690	/----------------------------------------------------------------------/	659	/----------------------------------------------------------------------/
691	/*	660	/*
692	* window size/position calculcations for XSizeHint and other storage.	661	* window size/position calculcations for XSizeHint and other storage.
693	* if width/height are non-zero then override calculated width/height	662	* if width/height are non-zero then override calculated width/height
694	*/	663	*/
695	void	664	void
696	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	665	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697	{	666	{
698	short recalc_x, recalc_y;	667	short recalc_x, recalc_y;
699	int x, y, sb_w, mb_h, flags;	668	int x, y, sb_w, flags;
700	unsigned int w, h;	669	unsigned int w, h;
701	unsigned int max_width, max_height;	670	unsigned int max_width, max_height;
702	dDisp;	671	dDisp;
703		672
704	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	673	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
718	if (rs[Rs_geometry])	687	if (rs[Rs_geometry])
719	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	688	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720		689
721	if (flags & WidthValue)	690	if (flags & WidthValue)
722	{	691	{
723	ncol = clamp (w, 0, MAX_POSITIVE_INT16);	692	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724	szHint.flags \|= USSize;	693	szHint.flags \|= USSize;
725	}	694	}
726		695
727	if (flags & HeightValue)	696	if (flags & HeightValue)
728	{	697	{
729	nrow = clamp (h, 0, MAX_POSITIVE_INT16);	698	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730	szHint.flags \|= USSize;	699	szHint.flags \|= USSize;
731	}	700	}
732		701
733	if (flags & XValue)	702	if (flags & XValue)
734	{	703	{
…		…
765	max_width = MAX_COLS * fwidth;	734	max_width = MAX_COLS * fwidth;
766	max_height = MAX_ROWS * fheight;	735	max_height = MAX_ROWS * fheight;
767		736
768	szHint.base_width = szHint.base_height = 2 * int_bwidth;	737	szHint.base_width = szHint.base_height = 2 * int_bwidth;
769		738
770	sb_w = mb_h = 0;	739	sb_w = 0;
771	window_vt_x = window_vt_y = int_bwidth;	740	window_vt_x = window_vt_y = int_bwidth;
772		741
773	if (scrollbar_visible ())	742	if (scrollBar.state)
774	{	743	{
775	sb_w = scrollbar_TotalWidth ();	744	sb_w = scrollbar_TotalWidth ();
776	szHint.base_width += sb_w;	745	szHint.base_width += sb_w;
777	if (!(options & Opt_scrollBar_right))	746	if (!OPTION (Opt_scrollBar_right))
778	window_vt_x += sb_w;	747	window_vt_x += sb_w;
779	}
780
781	if (menubar_visible ())
782	{
783	mb_h = menuBar_TotalHeight ();
784	szHint.base_height += mb_h;
785	window_vt_y += mb_h;
786	}	748	}
787		749
788	szHint.width_inc = fwidth;	750	szHint.width_inc = fwidth;
789	szHint.height_inc = fheight;	751	szHint.height_inc = fheight;
790	szHint.min_width = szHint.base_width + szHint.width_inc;	752	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
810	{	772	{
811	min_it (height, max_height);	773	min_it (height, max_height);
812	szHint.height = szHint.base_height + height;	774	szHint.height = szHint.base_height + height;
813	}	775	}
814		776
815	if (scrollbar_visible () && (options & Opt_scrollBar_right))	777	if (scrollBar.state && OPTION (Opt_scrollBar_right))
816	window_sb_x = szHint.width - sb_w;	778	window_sb_x = szHint.width - sb_w;
817		779
818	if (recalc_x)	780	if (recalc_x)
819	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	781	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820	if (recalc_y)	782	if (recalc_y)
…		…
834	* Called after a window size change.	796	* Called after a window size change.
835	*/	797	*/
836	void	798	void
837	rxvt_term::tt_winch ()	799	rxvt_term::tt_winch ()
838	{	800	{
839	if (pty.pty < 0)	801	if (pty->pty < 0)
840	return;	802	return;
841		803
842	struct winsize ws;	804	struct winsize ws;
843		805
844	ws.ws_col = ncol;	806	ws.ws_col = ncol;
845	ws.ws_row = nrow;	807	ws.ws_row = nrow;
846	ws.ws_xpixel = width;	808	ws.ws_xpixel = width;
847	ws.ws_ypixel = height;	809	ws.ws_ypixel = height;
848	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	810	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849		811
850	#if 0	812	#if 0
851	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	813	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852	if (cmd_pid) /* force through to the command */	814	if (cmd_pid) /* force through to the command */
853	kill (-cmd_pid, SIGWINCH);	815	kill (-cmd_pid, SIGWINCH);
…		…
889	prop.height += lineSpace;	851	prop.height += lineSpace;
890	fs->set_prop (prop);	852	fs->set_prop (prop);
891		853
892	fwidth = prop.width;	854	fwidth = prop.width;
893	fheight = prop.height;	855	fheight = prop.height;
894	fweight = prop.weight;	856	fbase = prop.ascent;
895	fslant = prop.slant;
896	fbase = (*fs)[1]->ascent;
897		857
898	for (int style = 1; style < 4; style++)	858	for (int style = 1; style < 4; style++)
899	{	859	{
900	#if ENABLE_STYLES	860	#if ENABLE_STYLES
901	const char *res = rs[Rs_font + style];	861	const char *res = rs[Rs_font + style];
…		…
935	return true;	895	return true;
936	}	896	}
937		897
938	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	898	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939	{	899	{
940	// TODO: SMART_WINDOW_TITLE
941	XChangeProperty (display->display, parent[0],	900	XChangeProperty (display->display, parent[0],
942	prop, XA_STRING, 8, PropModeReplace,	901	prop, XA_STRING, 8, PropModeReplace,
943	(const unsigned char *)str, len >= 0 ? len : strlen (str));	902	(const unsigned char *)str, len >= 0 ? len : strlen (str));
944	}	903	}
945		904
946	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	905	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947	{	906	{
948	// TODO: SMART_WINDOW_TITLE
949	wchar_t *ws = rxvt_mbstowcs (str, len);	907	wchar_t *ws = rxvt_mbstowcs (str, len);
950	char *s = rxvt_wcstoutf8 (ws);	908	char *s = rxvt_wcstoutf8 (ws);
951		909
952	XChangeProperty (display->display, parent[0],	910	XChangeProperty (display->display, parent[0],
953	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	911	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
…		…
994	i = atoi (color);	952	i = atoi (color);
995		953
996	if (i >= 8 && i <= 15)	954	if (i >= 8 && i <= 15)
997	{ /* bright colors */	955	{ /* bright colors */
998	i -= 8;	956	i -= 8;
999	# ifndef NO_BRIGHTCOLOR
1000	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	957	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001	SET_PIXCOLOR (idx);	958	SET_PIXCOLOR (idx);
1002	goto done;	959	goto done;
1003	# endif
1004	}	960	}
1005		961
1006	if (i >= 0 && i <= 7)	962	if (i >= 0 && i <= 7)
1007	{ /* normal colors */	963	{ /* normal colors */
1008	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	964	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1181		1137
1182	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1138	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1183		1139
1184	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1140	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1185	{	1141	{
1186	if (scrollbar_visible ())	1142	if (scrollBar.state)
1187	{	1143	{
1188	XMoveResizeWindow (disp, scrollBar.win,	1144	XMoveResizeWindow (disp, scrollBar.win,
1189	window_sb_x, 0,	1145	window_sb_x, 0,
1190	scrollbar_TotalWidth (), szHint.height);	1146	scrollbar_TotalWidth (), szHint.height);
1191	resize_scrollbar ();	1147	resize_scrollbar ();
1192	}	1148	}
1193		1149
1194	if (menubar_visible ())
1195	XMoveResizeWindow (disp, menuBar.win,
1196	window_vt_x, 0,
1197	TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199	XMoveResizeWindow (disp, vt,	1150	XMoveResizeWindow (disp, vt,
1200	window_vt_x, window_vt_y,	1151	window_vt_x, window_vt_y,
1201	TermWin_TotalWidth (), TermWin_TotalHeight ());	1152	width, height);
1202		1153
1203	scr_clear ();	1154	scr_clear ();
1204	#ifdef XPM_BACKGROUND	1155	#ifdef XPM_BACKGROUND
1205	resize_pixmap ();	1156	resize_pixmap ();
1206	#endif	1157	#endif
…		…
1386	XRectangle rect, status_rect, needed_rect;	1337	XRectangle rect, status_rect, needed_rect;
1387	unsigned long fg, bg;	1338	unsigned long fg, bg;
1388	const char *p;	1339	const char *p;
1389	char **s;	1340	char **s;
1390	XIMStyles *xim_styles;	1341	XIMStyles *xim_styles;
		1342
		1343	set_environ (envv);
1391		1344
1392	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1345	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393	return false;	1346	return false;
1394		1347
1395	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1348	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1561	int i;	1514	int i;
1562	const char *p;	1515	const char *p;
1563	char **s;	1516	char **s;
1564	char buf[IMBUFSIZ];	1517	char buf[IMBUFSIZ];
1565		1518
1566	SET_R (this);	1519	make_current ();
1567		1520
1568	im_destroy ();	1521	im_destroy ();
1569		1522
1570	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1523	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571	if (Input_Context)	1524	if (Input_Context)

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.150 by root, Wed Dec 21 14:19:19 2005 UTC vs. Revision 1.188 by root, Wed Jan 18 08:33:34 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.150 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.188 by root, Wed Jan 18 08:33:34 2006 UTC