[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.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.
…		…
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	}	64	}
65		65
66	bool	66	void
67	rxvt_push_locale (const char *locale)	67	rxvt_push_locale (const char *locale)
68	{	68	{
69	strcpy (savelocale, curlocale);	69	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	70	rxvt_set_locale (locale);
71	}	71	}
…		…
145	#if TRANSPARENT	145	#if TRANSPARENT
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	147	#endif
148	#ifdef HAVE_SCROLLBARS	148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),	149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif	150	#endif
154	#ifdef CURSOR_BLINK	151	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	152	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif	153	#endif
157	#ifdef TEXT_BLINK	154	#ifdef TEXT_BLINK
…		…
197	void rxvt_term::emergency_cleanup ()	194	void rxvt_term::emergency_cleanup ()
198	{	195	{
199	if (cmd_pid)	196	if (cmd_pid)
200	kill (-cmd_pid, SIGHUP);	197	kill (-cmd_pid, SIGHUP);
201		198
202	#ifdef UTMP_SUPPORT	199	delete pty; pty = 0;
203	privileged_utmp (RESTORE);
204	#endif
205
206	pty.put ();
207	}	200	}
208		201
209	rxvt_term::~rxvt_term ()	202	rxvt_term::~rxvt_term ()
210	{	203	{
211	PERL_INVOKE ((this, HOOK_DESTROY, DT_END));	204	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212		205
213	termlist.erase (find (termlist.begin (), termlist.end(), this));	206	termlist.erase (find (termlist.begin (), termlist.end(), this));
214		207
215	emergency_cleanup ();	208	emergency_cleanup ();
216		209
…		…
227		220
228	selection_clear ();	221	selection_clear ();
229		222
230	#ifdef USE_XIM	223	#ifdef USE_XIM
231	im_destroy ();	224	im_destroy ();
232	#endif
233	#ifdef MENUBAR
234	if (menubarGC) XFreeGC (disp, menubarGC);
235	#endif	225	#endif
236	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
237	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (disp, ShadowGC);
239	#endif	229	#endif
…		…
250	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (disp, upArrow);
251	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (disp, downArrow);
252	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (disp, upArrowHi);
253	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (disp, downArrowHi);
254	#endif	244	#endif
255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	245	#ifdef RXVT_SCROLLBAR
256	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (disp, topShadowGC);
257	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (disp, botShadowGC);
258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259	#endif	249	#endif
260	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (disp, gc);
261		251
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;	252	delete drawable;
268	// destroy all windows	253	// destroy all windows
269	if (parent[0])	254	if (parent[0])
270	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (disp, parent[0]);
271	}	256	}
272		257
273	// TODO: free pixcolours, colours should become part of rxvt_display	258	// TODO: free pixcolours, colours should become part of rxvt_display
274
275	delete pix_colors_focused;	259	delete pix_colors_focused;
276	#if OFF_FOCUS_FADING	260	#if OFF_FOCUS_FADING
277	delete pix_colors_unfocused;	261	delete pix_colors_unfocused;
278	#endif	262	#endif
279		263
…		…
328	im_ev.stop (display);	312	im_ev.stop (display);
329	#endif	313	#endif
330	#if HAVE_SCROLLBARS	314	#if HAVE_SCROLLBARS
331	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
332	#endif	316	#endif
333	#if MENUBAR
334	menubar_ev.stop (display);
335	#endif
336	#if TRANSPARENT	317	#if TRANSPARENT
337	rootwin_ev.stop (display);	318	rootwin_ev.stop (display);
338	#endif	319	#endif
339	incr_ev.stop ();	320	incr_ev.stop ();
340	termwin_ev.stop (display);	321	termwin_ev.stop (display);
…		…
363	}	344	}
364		345
365	void	346	void
366	rxvt_term::destroy_cb (time_watcher &w)	347	rxvt_term::destroy_cb (time_watcher &w)
367	{	348	{
368	SET_R (this);	349	make_current ();
369		350
370	delete this;	351	delete this;
371	}	352	}
372		353
373	/----------------------------------------------------------------------/	354	/----------------------------------------------------------------------/
…		…
464	/----------------------------------------------------------------------/	445	/----------------------------------------------------------------------/
465	bool	446	bool
466	rxvt_term::init (int argc, const char const argv)	447	rxvt_term::init (int argc, const char const argv)
467	{	448	{
468	SET_R (this);	449	SET_R (this);
469
470	set_locale ("");	450	set_locale ("");
		451	set_environ (envv); // few things in X do not call setlocale :(
471		452
472	if (!init_vars ())	453	if (!init_vars ())
473	return false;	454	return false;
474		455
475	init_secondary ();	456	init_secondary ();
…		…
478		459
479	#ifdef KEYSYM_RESOURCE	460	#ifdef KEYSYM_RESOURCE
480	keyboard->register_done ();	461	keyboard->register_done ();
481	#endif	462	#endif
482		463
483	#if MENUBAR_MAX
484	menubar_read (rs[Rs_menu]);
485	#endif
486	#ifdef HAVE_SCROLLBARS	464	#ifdef HAVE_SCROLLBARS
487	if (OPTION (Opt_scrollBar))	465	if (OPTION (Opt_scrollBar))
488	scrollBar.setIdle (); /* set existence for size calculations */	466	scrollBar.setIdle (); /* set existence for size calculations */
489	#endif	467	#endif
490		468
491	#if ENABLE_PERL	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	{
492	rxvt_perl.init ();	477	rxvt_perl.init (this);
493	#endif
494
495	PERL_INVOKE ((this, HOOK_INIT, DT_END));	478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		479	}
		480	#endif
		481
		482	pty = rxvt_new_ptytty ();
496		483
497	create_windows (argc, argv);	484	create_windows (argc, argv);
498		485
499	dDisp;	486	dDisp;
500		487
501	init_xlocale ();	488	init_xlocale ();
502		489
503	scr_reset (); /* initialize screen */	490	scr_reset (); // initialize screen
504		491
505	#if 0	492	#if 0
506	XSynchronize (disp, True);	493	XSynchronize (disp, True);
507	#endif	494	#endif
508		495
509	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
510	if (OPTION (Opt_scrollBar))	497	if (OPTION (Opt_scrollBar))
511	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
512	#endif	499	#endif
513	#if (MENUBAR_MAX)
514	if (menubar_visible ())
515	XMapWindow (disp, menuBar.win);
516	#endif
517	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
518	if (OPTION (Opt_transparent))	501	if (OPTION (Opt_transparent))
519	{	502	{
520	XSelectInput (disp, display->root, PropertyChangeMask);	503	XSelectInput (disp, display->root, PropertyChangeMask);
521	check_our_parents ();	504	check_our_parents ();
…		…
530		513
531	init_command (cmd_argv);	514	init_command (cmd_argv);
532		515
533	free (cmd_argv);	516	free (cmd_argv);
534		517
		518	if (pty->pty >= 0)
535	pty_ev.start (pty.pty, EVENT_READ);	519	pty_ev.start (pty->pty, EVENT_READ);
536		520
537	check_ev.start ();	521	check_ev.start ();
538		522
539	PERL_INVOKE ((this, HOOK_START, DT_END));	523	HOOK_INVOKE ((this, HOOK_START, DT_END));
540		524
541	return true;	525	return true;
542	}	526	}
543		527
544	static struct sig_handlers	528	static struct sig_handlers
…		…
579	sw_int (this, &sig_handlers::sig_term)	563	sw_int (this, &sig_handlers::sig_term)
580	{	564	{
581	}	565	}
582	} sig_handlers;	566	} sig_handlers;
583		567
		568	char **rxvt_environ; // startup environment
		569
584	void	570	void
585	rxvt_init ()	571	rxvt_init ()
586	{	572	{
587	/*	573	uid_t uid = getuid ();
588	* Save and then give up any super-user privileges	574	gid_t gid = getgid ();
589	* If we need privileges in any area then we must specifically request it.	575
590	* We should only need to be root in these cases:	576	// before doing anything else, check for setuid/setgid operation,
591	* 1. write utmp entries on some systems	577	// start the helper process and drop privileges
592	* 2. chown tty on some systems	578	if (uid != geteuid ()
593	*/	579	\|\| 1 //D
594	rxvt_privileges (SAVE);	580	\|\| gid != getegid ())
595	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;
596		606
597	signal (SIGHUP, SIG_IGN);	607	signal (SIGHUP, SIG_IGN);
598	signal (SIGPIPE, SIG_IGN);	608	signal (SIGPIPE, SIG_IGN);
599		609
600	sig_handlers.sw_chld.start (SIGCHLD);	610	sig_handlers.sw_chld.start (SIGCHLD);
…		…
605	/* signal (SIGURG, SIG_DFL); */	615	/* signal (SIGURG, SIG_DFL); */
606		616
607	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	617	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608	// TODO: handle this with exceptions and tolerate the memory loss	618	// TODO: handle this with exceptions and tolerate the memory loss
609	XSetIOErrorHandler (rxvt_xioerror_handler);	619	XSetIOErrorHandler (rxvt_xioerror_handler);
		620
		621	XrmInitialize ();
610	}	622	}
611		623
612	/* ------------------------------------------------------------------------- *	624	/* ------------------------------------------------------------------------- *
613	* MEMORY ALLOCATION WRAPPERS *	625	* MEMORY ALLOCATION WRAPPERS *
614	* ------------------------------------------------------------------------- */	626	* ------------------------------------------------------------------------- */
…		…
643	rxvt_fatal ("memory allocation failure. aborting.\n");	655	rxvt_fatal ("memory allocation failure. aborting.\n");
644		656
645	return p;	657	return p;
646	}	658	}
647		659
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
722	/----------------------------------------------------------------------/	660	/----------------------------------------------------------------------/
723	/*	661	/*
724	* window size/position calculcations for XSizeHint and other storage.	662	* window size/position calculcations for XSizeHint and other storage.
725	* if width/height are non-zero then override calculated width/height	663	* if width/height are non-zero then override calculated width/height
726	*/	664	*/
727	void	665	void
728	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	666	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
729	{	667	{
730	short recalc_x, recalc_y;	668	short recalc_x, recalc_y;
731	int x, y, sb_w, mb_h, flags;	669	int x, y, sb_w, flags;
732	unsigned int w, h;	670	unsigned int w, h;
733	unsigned int max_width, max_height;	671	unsigned int max_width, max_height;
734	dDisp;	672	dDisp;
735		673
736	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",
…		…
797	max_width = MAX_COLS * fwidth;	735	max_width = MAX_COLS * fwidth;
798	max_height = MAX_ROWS * fheight;	736	max_height = MAX_ROWS * fheight;
799		737
800	szHint.base_width = szHint.base_height = 2 * int_bwidth;	738	szHint.base_width = szHint.base_height = 2 * int_bwidth;
801		739
802	sb_w = mb_h = 0;	740	sb_w = 0;
803	window_vt_x = window_vt_y = int_bwidth;	741	window_vt_x = window_vt_y = int_bwidth;
804		742
805	if (scrollbar_visible ())	743	if (scrollBar.state)
806	{	744	{
807	sb_w = scrollbar_TotalWidth ();	745	sb_w = scrollbar_TotalWidth ();
808	szHint.base_width += sb_w;	746	szHint.base_width += sb_w;
809	if (!OPTION (Opt_scrollBar_right))	747	if (!OPTION (Opt_scrollBar_right))
810	window_vt_x += sb_w;	748	window_vt_x += sb_w;
811	}	749	}
812		750
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;	751	szHint.width_inc = fwidth;
821	szHint.height_inc = fheight;	752	szHint.height_inc = fheight;
822	szHint.min_width = szHint.base_width + szHint.width_inc;	753	szHint.min_width = szHint.base_width + szHint.width_inc;
823	szHint.min_height = szHint.base_height + szHint.height_inc;	754	szHint.min_height = szHint.base_height + szHint.height_inc;
824		755
…		…
842	{	773	{
843	min_it (height, max_height);	774	min_it (height, max_height);
844	szHint.height = szHint.base_height + height;	775	szHint.height = szHint.base_height + height;
845	}	776	}
846		777
847	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	778	if (scrollBar.state && OPTION (Opt_scrollBar_right))
848	window_sb_x = szHint.width - sb_w;	779	window_sb_x = szHint.width - sb_w;
849		780
850	if (recalc_x)	781	if (recalc_x)
851	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	782	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
852	if (recalc_y)	783	if (recalc_y)
…		…
866	* Called after a window size change.	797	* Called after a window size change.
867	*/	798	*/
868	void	799	void
869	rxvt_term::tt_winch ()	800	rxvt_term::tt_winch ()
870	{	801	{
871	if (pty.pty < 0)	802	if (pty->pty < 0)
872	return;	803	return;
873		804
874	struct winsize ws;	805	struct winsize ws;
875		806
876	ws.ws_col = ncol;	807	ws.ws_col = ncol;
877	ws.ws_row = nrow;	808	ws.ws_row = nrow;
878	ws.ws_xpixel = width;	809	ws.ws_xpixel = width;
879	ws.ws_ypixel = height;	810	ws.ws_ypixel = height;
880	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	811	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
881		812
882	#if 0	813	#if 0
883	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	814	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
884	if (cmd_pid) /* force through to the command */	815	if (cmd_pid) /* force through to the command */
885	kill (-cmd_pid, SIGWINCH);	816	kill (-cmd_pid, SIGWINCH);
…		…
921	prop.height += lineSpace;	852	prop.height += lineSpace;
922	fs->set_prop (prop);	853	fs->set_prop (prop);
923		854
924	fwidth = prop.width;	855	fwidth = prop.width;
925	fheight = prop.height;	856	fheight = prop.height;
926	fbase = (*fs)[1]->ascent;	857	fbase = prop.ascent;
927		858
928	for (int style = 1; style < 4; style++)	859	for (int style = 1; style < 4; style++)
929	{	860	{
930	#if ENABLE_STYLES	861	#if ENABLE_STYLES
931	const char *res = rs[Rs_font + style];	862	const char *res = rs[Rs_font + style];
…		…
1022	i = atoi (color);	953	i = atoi (color);
1023		954
1024	if (i >= 8 && i <= 15)	955	if (i >= 8 && i <= 15)
1025	{ /* bright colors */	956	{ /* bright colors */
1026	i -= 8;	957	i -= 8;
1027	# ifndef NO_BRIGHTCOLOR
1028	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	958	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029	SET_PIXCOLOR (idx);	959	SET_PIXCOLOR (idx);
1030	goto done;	960	goto done;
1031	# endif
1032	}	961	}
1033		962
1034	if (i >= 0 && i <= 7)	963	if (i >= 0 && i <= 7)
1035	{ /* normal colors */	964	{ /* normal colors */
1036	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	965	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1209		1138
1210	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1139	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1211		1140
1212	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1141	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1213	{	1142	{
1214	if (scrollbar_visible ())	1143	if (scrollBar.state)
1215	{	1144	{
1216	XMoveResizeWindow (disp, scrollBar.win,	1145	XMoveResizeWindow (disp, scrollBar.win,
1217	window_sb_x, 0,	1146	window_sb_x, 0,
1218	scrollbar_TotalWidth (), szHint.height);	1147	scrollbar_TotalWidth (), szHint.height);
1219	resize_scrollbar ();	1148	resize_scrollbar ();
1220	}	1149	}
1221		1150
1222	if (menubar_visible ())
1223	XMoveResizeWindow (disp, menuBar.win,
1224	window_vt_x, 0,
1225	TermWin_TotalWidth (), menuBar_TotalHeight ());
1226
1227	XMoveResizeWindow (disp, vt,	1151	XMoveResizeWindow (disp, vt,
1228	window_vt_x, window_vt_y,	1152	window_vt_x, window_vt_y,
1229	TermWin_TotalWidth (), TermWin_TotalHeight ());	1153	width, height);
1230		1154
1231	scr_clear ();	1155	scr_clear ();
1232	#ifdef XPM_BACKGROUND	1156	#ifdef XPM_BACKGROUND
1233	resize_pixmap ();	1157	resize_pixmap ();
1234	#endif	1158	#endif
…		…
1414	XRectangle rect, status_rect, needed_rect;	1338	XRectangle rect, status_rect, needed_rect;
1415	unsigned long fg, bg;	1339	unsigned long fg, bg;
1416	const char *p;	1340	const char *p;
1417	char **s;	1341	char **s;
1418	XIMStyles *xim_styles;	1342	XIMStyles *xim_styles;
		1343
		1344	set_environ (envv);
1419		1345
1420	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1346	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1421	return false;	1347	return false;
1422		1348
1423	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1349	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1589	int i;	1515	int i;
1590	const char *p;	1516	const char *p;
1591	char **s;	1517	char **s;
1592	char buf[IMBUFSIZ];	1518	char buf[IMBUFSIZ];
1593		1519
1594	SET_R (this);	1520	make_current ();
1595		1521
1596	im_destroy ();	1522	im_destroy ();
1597		1523
1598	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1524	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1599	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.156 by root, Mon Jan 2 18:20:23 2006 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.156 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC