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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.153 by root, Tue Dec 27 12:23:37 2005 UTC vs.
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "keyboard.h"
		36	#include "rxvtperl.h"
35		37
36	#include <limits>	38	#include <limits>
37		39
38	#include <csignal>	40	#include <csignal>
39	#include <cstring>	41	#include <cstring>
…		…
44		46
45	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
46	# include <termios.h>	48	# include <termios.h>
47	#endif	49	#endif
48		50
49	#ifdef KEYSYM_RESOURCE
50	# include "keyboard.h"
51	#endif
52
53	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
54		52
55	static char curlocale[128];	53	static char curlocale[128], savelocale[128];
56		54
57	bool	55	bool
58	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
59	{	57	{
60	if (!locale \|\| !strncmp (locale, curlocale, 128))	58	if (!locale \|\| !strncmp (locale, curlocale, 128))
61	return false;	59	return false;
62		60
63	strncpy (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
64	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
65	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);
66	}	77	}
67		78
68	#if ENABLE_COMBINING	79	#if ENABLE_COMBINING
69	class rxvt_composite_vec rxvt_composite;	80	class rxvt_composite_vec rxvt_composite;
70		81
…		…
134	#if TRANSPARENT	145	#if TRANSPARENT
135	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
136	#endif	147	#endif
137	#ifdef HAVE_SCROLLBARS	148	#ifdef HAVE_SCROLLBARS
138	scrollbar_ev (this, &rxvt_term::x_cb),	149	scrollbar_ev (this, &rxvt_term::x_cb),
139	#endif
140	#ifdef MENUBAR
141	menubar_ev (this, &rxvt_term::x_cb),
142	#endif	150	#endif
143	#ifdef CURSOR_BLINK	151	#ifdef CURSOR_BLINK
144	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	152	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145	#endif	153	#endif
146	#ifdef TEXT_BLINK	154	#ifdef TEXT_BLINK
…		…
186	void rxvt_term::emergency_cleanup ()	194	void rxvt_term::emergency_cleanup ()
187	{	195	{
188	if (cmd_pid)	196	if (cmd_pid)
189	kill (-cmd_pid, SIGHUP);	197	kill (-cmd_pid, SIGHUP);
190		198
191	#ifdef UTMP_SUPPORT	199	delete pty; pty = 0;
192	privileged_utmp (RESTORE);
193	#endif
194
195	pty.put ();
196	}	200	}
197		201
198	rxvt_term::~rxvt_term ()	202	rxvt_term::~rxvt_term ()
199	{	203	{
		204	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		205
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	206	termlist.erase (find (termlist.begin (), termlist.end(), this));
201		207
202	emergency_cleanup ();	208	emergency_cleanup ();
203		209
204	#if ENABLE_STYLES	210	#if ENABLE_STYLES
…		…
214		220
215	selection_clear ();	221	selection_clear ();
216		222
217	#ifdef USE_XIM	223	#ifdef USE_XIM
218	im_destroy ();	224	im_destroy ();
219	#endif
220	#ifdef MENUBAR
221	if (menubarGC) XFreeGC (disp, menubarGC);
222	#endif	225	#endif
223	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
224	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (disp, ShadowGC);
226	#endif	229	#endif
…		…
237	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (disp, upArrow);
238	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (disp, downArrow);
239	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (disp, upArrowHi);
240	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (disp, downArrowHi);
241	#endif	244	#endif
242	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	245	#ifdef RXVT_SCROLLBAR
243	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (disp, topShadowGC);
244	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (disp, botShadowGC);
245	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246	#endif	249	#endif
247	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (disp, gc);
248		251
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;	252	delete drawable;
255	// destroy all windows	253	// destroy all windows
256	if (parent[0])	254	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (disp, parent[0]);
258	}	256	}
259		257
260	// TODO: free pixcolours, colours should become part of rxvt_display	258	// TODO: free pixcolours, colours should become part of rxvt_display
261
262	delete pix_colors_focused;	259	delete pix_colors_focused;
263	#if OFF_FOCUS_FADING	260	#if OFF_FOCUS_FADING
264	delete pix_colors_unfocused;	261	delete pix_colors_unfocused;
265	#endif	262	#endif
266		263
…		…
293	void	290	void
294	rxvt_term::child_exit ()	291	rxvt_term::child_exit ()
295	{	292	{
296	cmd_pid = 0;	293	cmd_pid = 0;
297		294
298	if (!(options & Opt_hold))	295	if (!OPTION (Opt_hold))
299	destroy ();	296	destroy ();
300	}	297	}
301		298
302	void	299	void
303	rxvt_term::destroy ()	300	rxvt_term::destroy ()
…		…
314	#if USE_XIM	311	#if USE_XIM
315	im_ev.stop (display);	312	im_ev.stop (display);
316	#endif	313	#endif
317	#if HAVE_SCROLLBARS	314	#if HAVE_SCROLLBARS
318	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
319	#endif
320	#if MENUBAR
321	menubar_ev.stop (display);
322	#endif	316	#endif
323	#if TRANSPARENT	317	#if TRANSPARENT
324	rootwin_ev.stop (display);	318	rootwin_ev.stop (display);
325	#endif	319	#endif
326	incr_ev.stop ();	320	incr_ev.stop ();
…		…
350	}	344	}
351		345
352	void	346	void
353	rxvt_term::destroy_cb (time_watcher &w)	347	rxvt_term::destroy_cb (time_watcher &w)
354	{	348	{
355	SET_R (this);	349	make_current ();
356		350
357	delete this;	351	delete this;
358	}	352	}
359		353
360	/----------------------------------------------------------------------/	354	/----------------------------------------------------------------------/
…		…
451	/----------------------------------------------------------------------/	445	/----------------------------------------------------------------------/
452	bool	446	bool
453	rxvt_term::init (int argc, const char const argv)	447	rxvt_term::init (int argc, const char const argv)
454	{	448	{
455	SET_R (this);	449	SET_R (this);
456
457	set_locale ("");	450	set_locale ("");
		451	set_environ (envv); // few things in X do not call setlocale :(
458		452
459	if (!init_vars ())	453	if (!init_vars ())
460	return false;	454	return false;
461		455
462	init_secondary ();	456	init_secondary ();
…		…
465		459
466	#ifdef KEYSYM_RESOURCE	460	#ifdef KEYSYM_RESOURCE
467	keyboard->register_done ();	461	keyboard->register_done ();
468	#endif	462	#endif
469		463
470	#if MENUBAR_MAX
471	menubar_read (rs[Rs_menu]);
472	#endif
473	#ifdef HAVE_SCROLLBARS	464	#ifdef HAVE_SCROLLBARS
474	if (options & Opt_scrollBar)	465	if (OPTION (Opt_scrollBar))
475	scrollBar.setIdle (); /* set existence for size calculations */	466	scrollBar.setIdle (); /* set existence for size calculations */
476	#endif	467	#endif
477		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
478	create_windows (argc, argv);	484	create_windows (argc, argv);
479		485
480	dDisp;	486	dDisp;
481		487
482	init_xlocale ();	488	init_xlocale ();
483		489
484	scr_reset (); /* initialize screen */	490	scr_reset (); // initialize screen
485		491
486	#if 0	492	#if 0
487	XSynchronize (disp, True);	493	XSynchronize (disp, True);
488	#endif	494	#endif
489		495
490	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
491	if (options & Opt_scrollBar)	497	if (OPTION (Opt_scrollBar))
492	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
493	#endif	499	#endif
494	#if (MENUBAR_MAX)
495	if (menubar_visible ())
496	XMapWindow (disp, menuBar.win);
497	#endif
498	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
499	if (options & Opt_transparent)	501	if (OPTION (Opt_transparent))
500	{	502	{
501	XSelectInput (disp, display->root, PropertyChangeMask);	503	XSelectInput (disp, display->root, PropertyChangeMask);
502	check_our_parents ();	504	check_our_parents ();
503	rootwin_ev.start (display, display->root);	505	rootwin_ev.start (display, display->root);
504	}	506	}
…		…
511		513
512	init_command (cmd_argv);	514	init_command (cmd_argv);
513		515
514	free (cmd_argv);	516	free (cmd_argv);
515		517
		518	if (pty->pty >= 0)
516	pty_ev.start (pty.pty, EVENT_READ);	519	pty_ev.start (pty->pty, EVENT_READ);
517		520
518	check_ev.start ();	521	check_ev.start ();
		522
		523	HOOK_INVOKE ((this, HOOK_START, DT_END));
519		524
520	return true;	525	return true;
521	}	526	}
522		527
523	static struct sig_handlers	528	static struct sig_handlers
…		…
558	sw_int (this, &sig_handlers::sig_term)	563	sw_int (this, &sig_handlers::sig_term)
559	{	564	{
560	}	565	}
561	} sig_handlers;	566	} sig_handlers;
562		567
		568	char **rxvt_environ; // startup environment
		569
563	void	570	void
564	rxvt_init ()	571	rxvt_init ()
565	{	572	{
566	/*	573	uid_t uid = getuid ();
567	* Save and then give up any super-user privileges	574	gid_t gid = getgid ();
568	* If we need privileges in any area then we must specifically request it.	575
569	* We should only need to be root in these cases:	576	// before doing anything else, check for setuid/setgid operation,
570	* 1. write utmp entries on some systems	577	// start the helper process and drop privileges
571	* 2. chown tty on some systems	578	if (uid != geteuid ()
572	*/	579	\|\| 1 //D
573	rxvt_privileges (SAVE);	580	\|\| gid != getegid ())
574	rxvt_privileges (IGNORE);	581	{
		582	#if PTYTTY_HELPER
		583	rxvt_ptytty_server ();
		584	#else
		585	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		586	#endif
		587
		588	// drop privileges
		589	#if HAVE_SETRESUID
		590	setresgid (gid, gid, gid);
		591	setresuid (uid, uid, uid);
		592	#elif HAVE_SETREUID
		593	setregid (gid, gid);
		594	setreuid (uid, uid);
		595	#elif HAVE_SETUID
		596	setgid (gid);
		597	setuid (uid);
		598	#endif
		599
		600	if (uid != geteuid ()
		601	\|\| gid != getegid ())
		602	rxvt_fatal ("unable to drop privileges, aborting.\n");
		603	}
		604
		605	rxvt_environ = environ;
575		606
576	signal (SIGHUP, SIG_IGN);	607	signal (SIGHUP, SIG_IGN);
577	signal (SIGPIPE, SIG_IGN);	608	signal (SIGPIPE, SIG_IGN);
578		609
579	sig_handlers.sw_chld.start (SIGCHLD);	610	sig_handlers.sw_chld.start (SIGCHLD);
…		…
584	/* signal (SIGURG, SIG_DFL); */	615	/* signal (SIGURG, SIG_DFL); */
585		616
586	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	617	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587	// TODO: handle this with exceptions and tolerate the memory loss	618	// TODO: handle this with exceptions and tolerate the memory loss
588	XSetIOErrorHandler (rxvt_xioerror_handler);	619	XSetIOErrorHandler (rxvt_xioerror_handler);
		620
		621	XrmInitialize ();
589	}	622	}
590		623
591	/* ------------------------------------------------------------------------- *	624	/* ------------------------------------------------------------------------- *
592	* MEMORY ALLOCATION WRAPPERS *	625	* MEMORY ALLOCATION WRAPPERS *
593	* ------------------------------------------------------------------------- */	626	* ------------------------------------------------------------------------- */
…		…
622	rxvt_fatal ("memory allocation failure. aborting.\n");	655	rxvt_fatal ("memory allocation failure. aborting.\n");
623		656
624	return p;	657	return p;
625	}	658	}
626		659
627	/* ------------------------------------------------------------------------- *
628	* PRIVILEGED OPERATIONS *
629	* ------------------------------------------------------------------------- */
630	/* take care of suid/sgid super-user (root) privileges */
631	void
632	rxvt_privileges (rxvt_privaction action)
633	{
634	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635	static uid_t euid;
636	static gid_t egid;
637	#endif
638
639	#if ! defined(__CYGWIN32__)
640	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641	/* setreuid () is the poor man's setuid (), seteuid () */
642	# define seteuid(a) setreuid(-1, (a))
643	# define setegid(a) setregid(-1, (a))
644	# define HAVE_SETEUID
645	# endif
646	# ifdef HAVE_SETEUID
647	switch (action)
648	{
649	case IGNORE:
650	/*
651	* change effective uid/gid - not real uid/gid - so we can switch
652	* back to root later, as required
653	*/
654	seteuid (getuid ());
655	setegid (getgid ());
656	break;
657	case SAVE:
658	euid = geteuid ();
659	egid = getegid ();
660	break;
661	case RESTORE:
662	seteuid (euid);
663	setegid (egid);
664	break;
665	}
666	# else
667	switch (action)
668	{
669	case IGNORE:
670	setuid (getuid ());
671	setgid (getgid ());
672	/* FALLTHROUGH */
673	case SAVE:
674	/* FALLTHROUGH */
675	case RESTORE:
676	break;
677	}
678	# endif
679	#endif
680	}
681
682	#ifdef UTMP_SUPPORT
683	void
684	rxvt_term::privileged_utmp (rxvt_privaction action)
685	{
686	if ((options & Opt_utmpInhibit)
687	\|\| !pty.name \|\| !*pty.name)
688	return;
689
690	rxvt_privileges (RESTORE);
691
692	if (action == SAVE)
693	makeutent (pty.name, rs[Rs_display_name]);
694	else
695	cleanutent ();
696
697	rxvt_privileges (IGNORE);
698	}
699	#endif
700
701	/----------------------------------------------------------------------/	660	/----------------------------------------------------------------------/
702	/*	661	/*
703	* window size/position calculcations for XSizeHint and other storage.	662	* window size/position calculcations for XSizeHint and other storage.
704	* if width/height are non-zero then override calculated width/height	663	* if width/height are non-zero then override calculated width/height
705	*/	664	*/
706	void	665	void
707	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	666	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708	{	667	{
709	short recalc_x, recalc_y;	668	short recalc_x, recalc_y;
710	int x, y, sb_w, mb_h, flags;	669	int x, y, sb_w, flags;
711	unsigned int w, h;	670	unsigned int w, h;
712	unsigned int max_width, max_height;	671	unsigned int max_width, max_height;
713	dDisp;	672	dDisp;
714		673
715	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	674	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
776	max_width = MAX_COLS * fwidth;	735	max_width = MAX_COLS * fwidth;
777	max_height = MAX_ROWS * fheight;	736	max_height = MAX_ROWS * fheight;
778		737
779	szHint.base_width = szHint.base_height = 2 * int_bwidth;	738	szHint.base_width = szHint.base_height = 2 * int_bwidth;
780		739
781	sb_w = mb_h = 0;	740	sb_w = 0;
782	window_vt_x = window_vt_y = int_bwidth;	741	window_vt_x = window_vt_y = int_bwidth;
783		742
784	if (scrollbar_visible ())	743	if (scrollBar.state)
785	{	744	{
786	sb_w = scrollbar_TotalWidth ();	745	sb_w = scrollbar_TotalWidth ();
787	szHint.base_width += sb_w;	746	szHint.base_width += sb_w;
788	if (!(options & Opt_scrollBar_right))	747	if (!OPTION (Opt_scrollBar_right))
789	window_vt_x += sb_w;	748	window_vt_x += sb_w;
790	}
791
792	if (menubar_visible ())
793	{
794	mb_h = menuBar_TotalHeight ();
795	szHint.base_height += mb_h;
796	window_vt_y += mb_h;
797	}	749	}
798		750
799	szHint.width_inc = fwidth;	751	szHint.width_inc = fwidth;
800	szHint.height_inc = fheight;	752	szHint.height_inc = fheight;
801	szHint.min_width = szHint.base_width + szHint.width_inc;	753	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
821	{	773	{
822	min_it (height, max_height);	774	min_it (height, max_height);
823	szHint.height = szHint.base_height + height;	775	szHint.height = szHint.base_height + height;
824	}	776	}
825		777
826	if (scrollbar_visible () && (options & Opt_scrollBar_right))	778	if (scrollBar.state && OPTION (Opt_scrollBar_right))
827	window_sb_x = szHint.width - sb_w;	779	window_sb_x = szHint.width - sb_w;
828		780
829	if (recalc_x)	781	if (recalc_x)
830	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	782	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831	if (recalc_y)	783	if (recalc_y)
…		…
845	* Called after a window size change.	797	* Called after a window size change.
846	*/	798	*/
847	void	799	void
848	rxvt_term::tt_winch ()	800	rxvt_term::tt_winch ()
849	{	801	{
850	if (pty.pty < 0)	802	if (pty->pty < 0)
851	return;	803	return;
852		804
853	struct winsize ws;	805	struct winsize ws;
854		806
855	ws.ws_col = ncol;	807	ws.ws_col = ncol;
856	ws.ws_row = nrow;	808	ws.ws_row = nrow;
857	ws.ws_xpixel = width;	809	ws.ws_xpixel = width;
858	ws.ws_ypixel = height;	810	ws.ws_ypixel = height;
859	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	811	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860		812
861	#if 0	813	#if 0
862	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	814	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863	if (cmd_pid) /* force through to the command */	815	if (cmd_pid) /* force through to the command */
864	kill (-cmd_pid, SIGWINCH);	816	kill (-cmd_pid, SIGWINCH);
…		…
900	prop.height += lineSpace;	852	prop.height += lineSpace;
901	fs->set_prop (prop);	853	fs->set_prop (prop);
902		854
903	fwidth = prop.width;	855	fwidth = prop.width;
904	fheight = prop.height;	856	fheight = prop.height;
905	fbase = (*fs)[1]->ascent;	857	fbase = prop.ascent;
906		858
907	for (int style = 1; style < 4; style++)	859	for (int style = 1; style < 4; style++)
908	{	860	{
909	#if ENABLE_STYLES	861	#if ENABLE_STYLES
910	const char *res = rs[Rs_font + style];	862	const char *res = rs[Rs_font + style];
…		…
1001	i = atoi (color);	953	i = atoi (color);
1002		954
1003	if (i >= 8 && i <= 15)	955	if (i >= 8 && i <= 15)
1004	{ /* bright colors */	956	{ /* bright colors */
1005	i -= 8;	957	i -= 8;
1006	# ifndef NO_BRIGHTCOLOR
1007	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	958	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008	SET_PIXCOLOR (idx);	959	SET_PIXCOLOR (idx);
1009	goto done;	960	goto done;
1010	# endif
1011	}	961	}
1012		962
1013	if (i >= 0 && i <= 7)	963	if (i >= 0 && i <= 7)
1014	{ /* normal colors */	964	{ /* normal colors */
1015	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	965	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1188		1138
1189	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1139	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1190		1140
1191	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1141	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1192	{	1142	{
1193	if (scrollbar_visible ())	1143	if (scrollBar.state)
1194	{	1144	{
1195	XMoveResizeWindow (disp, scrollBar.win,	1145	XMoveResizeWindow (disp, scrollBar.win,
1196	window_sb_x, 0,	1146	window_sb_x, 0,
1197	scrollbar_TotalWidth (), szHint.height);	1147	scrollbar_TotalWidth (), szHint.height);
1198	resize_scrollbar ();	1148	resize_scrollbar ();
1199	}	1149	}
1200		1150
1201	if (menubar_visible ())
1202	XMoveResizeWindow (disp, menuBar.win,
1203	window_vt_x, 0,
1204	TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206	XMoveResizeWindow (disp, vt,	1151	XMoveResizeWindow (disp, vt,
1207	window_vt_x, window_vt_y,	1152	window_vt_x, window_vt_y,
1208	TermWin_TotalWidth (), TermWin_TotalHeight ());	1153	width, height);
1209		1154
1210	scr_clear ();	1155	scr_clear ();
1211	#ifdef XPM_BACKGROUND	1156	#ifdef XPM_BACKGROUND
1212	resize_pixmap ();	1157	resize_pixmap ();
1213	#endif	1158	#endif
…		…
1393	XRectangle rect, status_rect, needed_rect;	1338	XRectangle rect, status_rect, needed_rect;
1394	unsigned long fg, bg;	1339	unsigned long fg, bg;
1395	const char *p;	1340	const char *p;
1396	char **s;	1341	char **s;
1397	XIMStyles *xim_styles;	1342	XIMStyles *xim_styles;
		1343
		1344	set_environ (envv);
1398		1345
1399	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1346	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400	return false;	1347	return false;
1401		1348
1402	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1349	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1568	int i;	1515	int i;
1569	const char *p;	1516	const char *p;
1570	char **s;	1517	char **s;
1571	char buf[IMBUFSIZ];	1518	char buf[IMBUFSIZ];
1572		1519
1573	SET_R (this);	1520	make_current ();
1574		1521
1575	im_destroy ();	1522	im_destroy ();
1576		1523
1577	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1524	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578	if (Input_Context)	1525	if (Input_Context)

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.153 by root, Tue Dec 27 12:23:37 2005 UTC vs. Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.153 by root, Tue Dec 27 12:23:37 2005 UTC vs.
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC