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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.182 by root, Tue Jan 17 10:14:26 2006 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC

…		…
46		46
47	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)	51	vector<rxvt_term *> rxvt_term::termlist;
52	static uid_t saved_euid;	52
53	static gid_t saved_egid;	53	// used to tell global functions which terminal instance is "active"
54	#endif	54	rxvt_t rxvt_current_term;
		55
		56	static char curlocale[128], savelocale[128];
55		57
56	bool	58	bool
57	rxvt_tainted ()
58	{
59	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60	return getuid () != saved_euid \|\| getgid () != saved_egid;
61	#else
62	return false;
63	#endif
64	}
65
66	vector<rxvt_term *> rxvt_term::termlist;
67
68	static char curlocale[128], savelocale[128];
69
70	bool
71	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
72	{	60	{
73	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
74	return false;	62	return false;
75		63
76	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
77	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
78	return true;	66	return true;
79	}	67	}
80		68
81	void	69	void
82	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
83	{	71	{
84	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
85	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
86	}	74	}
87		75
88	void	76	void
89	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
90	{	78	{
91	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
92	}	80	}
93		81
94	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
182	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
183	#endif	171	#endif
184	#ifdef USE_XIM	172	#ifdef USE_XIM
185	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
186	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
187	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
188	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
189	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
190	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
191	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
192	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
193	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
196		188
197	termlist.push_back (this);	189	termlist.push_back (this);
198		190
199	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
200	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
201
202	if (!keyboard)
203	rxvt_fatal ("out of memory, aborting.\n");
204	#endif	193	#endif
205	}	194	}
206		195
207	// clean up the most important stuff, do not call x or free mem etc.	196	// clean up the most important stuff, do not call x or free mem etc.
208	// for use before an emergency exit	197	// for use before an emergency exit
209	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
210	{	199	{
211	if (cmd_pid)	200	if (cmd_pid)
212	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
213		202
214	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
215	privileged_utmp (RESTORE);
216	#endif
217
218	pty.put ();
219	}	204	}
220		205
221	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
222	{	207	{
223	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
226		209
227	emergency_cleanup ();	210	emergency_cleanup ();
228		211
229	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
304	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
305	delete keyboard;	288	delete keyboard;
306	#endif	289	#endif
307	}	290	}
308		291
		292	// child has exited, usually destroys
309	void	293	void
310	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
311	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
312	cmd_pid = 0;	298	cmd_pid = 0;
313		299
314	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
315	destroy ();	301	destroy ();
316	}	302	}
317		303
318	void	304	void
319	rxvt_term::destroy ()	305	rxvt_term::destroy ()
320	{	306	{
321	if (destroy_ev.active)	307	if (destroy_ev.active)
		308	return;
		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
322	return;	311	return;
323		312
324	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
325	scr_overlay_off ();	314	scr_overlay_off ();
326	#endif	315	#endif
…		…
461	_exit (EXIT_FAILURE);	450	_exit (EXIT_FAILURE);
462	}	451	}
463		452
464	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
465	bool	454	bool
466	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	456	{
		457	this->envv = envv;
		458
468	SET_R (this);	459	SET_R (this);
469	set_locale ("");	460	set_locale ("");
470	set_environ (envv); // few things in X do not call setlocale :(	461	set_environ (envv); // few things in X do not call setlocale :(
471		462
472	if (!init_vars ())	463	if (!init_vars ())
…		…
483	#ifdef HAVE_SCROLLBARS	474	#ifdef HAVE_SCROLLBARS
484	if (OPTION (Opt_scrollBar))	475	if (OPTION (Opt_scrollBar))
485	scrollBar.setIdle (); /* set existence for size calculations */	476	scrollBar.setIdle (); /* set existence for size calculations */
486	#endif	477	#endif
487		478
488	#if ENABLE_PERL	479	pty = ptytty::create ();
489	if (!rs[Rs_perl_ext_1])
490	rs[Rs_perl_ext_1] = "default";
491
492	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495	{
496	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497	// ignore some perl-related arguments if some bozo installed us set[ug]id
498	if (rxvt_tainted ())
499	{
500	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502	{
503	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504	rs[Rs_perl_lib] = 0;
505	rs[Rs_perl_eval] = 0;
506	}
507	}
508	#endif
509	rxvt_perl.init (this);
510	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511	}
512	#endif
513		480
514	create_windows (argc, argv);	481	create_windows (argc, argv);
515		482
516	dDisp;	483	dDisp;
517		484
…		…
534	check_our_parents ();	501	check_our_parents ();
535	rootwin_ev.start (display, display->root);	502	rootwin_ev.start (display, display->root);
536	}	503	}
537	#endif	504	#endif
538		505
		506	set_colorfgbg ();
		507
		508	init_command (cmd_argv);
		509
		510	free (cmd_argv);
		511
		512	if (pty->pty >= 0)
		513	pty_ev.start (pty->pty, EVENT_READ);
		514
		515	check_ev.start ();
		516
		517	HOOK_INVOKE ((this, HOOK_START, DT_END));
		518
539	XMapWindow (disp, vt);	519	XMapWindow (disp, vt);
540	XMapWindow (disp, parent[0]);	520	XMapWindow (disp, parent[0]);
541		521
542	set_colorfgbg ();
543
544	init_command (cmd_argv);
545
546	free (cmd_argv);
547
548	if (pty.pty >= 0)
549	pty_ev.start (pty.pty, EVENT_READ);
550
551	check_ev.start ();
552
553	HOOK_INVOKE ((this, HOOK_START, DT_END));
554
555	return true;	522	return true;
556	}	523	}
557		524
558	static struct sig_handlers	525	static struct sig_handlers
559	{	526	{
560	sig_watcher sw_chld, sw_term, sw_int;	527	sig_watcher sw_term, sw_int;
561		528
562	void sig_chld (sig_watcher &w)
563	{
564	// we are being called for every SIGCHLD, find the corresponding term
565	int pid;
566
567	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569	if (pid == (*t)->cmd_pid)
570	{
571	(*t)->child_exit ();
572	break;
573	}
574	}
575
576	/*	529	/*
577	* Catch a fatal signal and tidy up before quitting	530	* Catch a fatal signal and tidy up before quitting
578	*/	531	*/
579	void	532	void
580	sig_term (sig_watcher &w)	533	sig_term (sig_watcher &w)
581	{	534	{
582	#ifdef DEBUG_CMD
583	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584	#endif
585	rxvt_emergency_cleanup ();	535	rxvt_emergency_cleanup ();
586	signal (w.signum, SIG_DFL);	536	signal (w.signum, SIG_DFL);
587	kill (getpid (), w.signum);	537	kill (getpid (), w.signum);
588	}	538	}
589		539
590	sig_handlers ()	540	sig_handlers ()
591	: sw_chld (this, &sig_handlers::sig_chld),
592	sw_term (this, &sig_handlers::sig_term),	541	: sw_term (this, &sig_handlers::sig_term),
593	sw_int (this, &sig_handlers::sig_term)	542	sw_int (this, &sig_handlers::sig_term)
594	{	543	{
595	}	544	}
596	} sig_handlers;	545	} sig_handlers;
597		546
598	char **rxvt_environ; // startup environment	547	char **rxvt_environ; // startup environment
599		548
600	void	549	void
601	rxvt_init ()	550	rxvt_init ()
602	{	551	{
		552	ptytty::init ();
		553
603	rxvt_environ = environ;	554	rxvt_environ = environ;
604
605	/*
606	* Save and then give up any super-user privileges
607	* If we need privileges in any area then we must specifically request it.
608	* We should only need to be root in these cases:
609	* 1. write utmp entries on some systems
610	* 2. chown tty on some systems
611	*/
612	rxvt_privileges (SAVE);
613	rxvt_privileges (IGNORE);
614		555
615	signal (SIGHUP, SIG_IGN);	556	signal (SIGHUP, SIG_IGN);
616	signal (SIGPIPE, SIG_IGN);	557	signal (SIGPIPE, SIG_IGN);
617		558
618	sig_handlers.sw_chld.start (SIGCHLD);
619	sig_handlers.sw_term.start (SIGTERM);	559	sig_handlers.sw_term.start (SIGTERM);
620	sig_handlers.sw_int.start (SIGINT);	560	sig_handlers.sw_int.start (SIGINT);
621		561
622	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	562	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
623	/* signal (SIGURG, SIG_DFL); */	563	/* signal (SIGURG, SIG_DFL); */
…		…
652	rxvt_fatal ("memory allocation failure. aborting.\n");	592	rxvt_fatal ("memory allocation failure. aborting.\n");
653		593
654	return p;	594	return p;
655	}	595	}
656		596
657	void *	597	void *
658	rxvt_realloc (void *ptr, size_t size)	598	rxvt_realloc (void *ptr, size_t size)
659	{	599	{
660	void *p = realloc (ptr, size);	600	void *p = realloc (ptr, size);
661		601
662	if (!p)	602	if (!p)
663	rxvt_fatal ("memory allocation failure. aborting.\n");	603	rxvt_fatal ("memory allocation failure. aborting.\n");
664		604
665	return p;	605	return p;
666	}	606	}
667
668	/* ------------------------------------------------------------------------- *
669	* PRIVILEGED OPERATIONS *
670	* ------------------------------------------------------------------------- */
671	/* take care of suid/sgid super-user (root) privileges */
672	void
673	rxvt_privileges (rxvt_privaction action)
674	{
675	#if ! defined(__CYGWIN32__)
676	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677	/* setreuid () is the poor man's setuid (), seteuid () */
678	# define seteuid(a) setreuid(-1, (a))
679	# define setegid(a) setregid(-1, (a))
680	# define HAVE_SETEUID
681	# endif
682	# ifdef HAVE_SETEUID
683	switch (action)
684	{
685	case IGNORE:
686	/*
687	* change effective uid/gid - not real uid/gid - so we can switch
688	* back to root later, as required
689	*/
690	setegid (getgid ());
691	seteuid (getuid ());
692	break;
693	case SAVE:
694	saved_egid = getegid ();
695	saved_euid = geteuid ();
696	break;
697	case RESTORE:
698	setegid (saved_egid);
699	seteuid (saved_euid);
700	break;
701	}
702	# else
703	switch (action)
704	{
705	case IGNORE:
706	setgid (getgid ());
707	setuid (getuid ());
708	/* FALLTHROUGH */
709	case SAVE:
710	/* FALLTHROUGH */
711	case RESTORE:
712	break;
713	}
714	# endif
715	#endif
716	}
717
718	#ifdef UTMP_SUPPORT
719	void
720	rxvt_term::privileged_utmp (rxvt_privaction action)
721	{
722	if (OPTION (Opt_utmpInhibit)
723	\|\| !pty.name \|\| !*pty.name)
724	return;
725
726	rxvt_privileges (RESTORE);
727
728	if (action == SAVE)
729	pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
730	else
731	pty.logout ();
732
733	rxvt_privileges (IGNORE);
734	}
735	#endif
736		607
737	/----------------------------------------------------------------------/	608	/----------------------------------------------------------------------/
738	/*	609	/*
739	* window size/position calculcations for XSizeHint and other storage.	610	* window size/position calculcations for XSizeHint and other storage.
740	* if width/height are non-zero then override calculated width/height	611	* if width/height are non-zero then override calculated width/height
…		…
745	short recalc_x, recalc_y;	616	short recalc_x, recalc_y;
746	int x, y, sb_w, flags;	617	int x, y, sb_w, flags;
747	unsigned int w, h;	618	unsigned int w, h;
748	unsigned int max_width, max_height;	619	unsigned int max_width, max_height;
749	dDisp;	620	dDisp;
750
751	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752	ncol, nrow, szHint.width, szHint.height));
753		621
754	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	622	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
755	szHint.win_gravity = NorthWestGravity;	623	szHint.win_gravity = NorthWestGravity;
756	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	624	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757		625
…		…
860	if (recalc_y)	728	if (recalc_y)
861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	729	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
862		730
863	ncol = width / fwidth;	731	ncol = width / fwidth;
864	nrow = height / fheight;	732	nrow = height / fheight;
865	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866	ncol, nrow, szHint.width,
867	szHint.height));
868	return;
869	}	733	}
870		734
871	/----------------------------------------------------------------------/	735	/----------------------------------------------------------------------/
872	/*	736	/*
873	* Tell the teletype handler what size the window is.	737	* Tell the teletype handler what size the window is.
874	* Called after a window size change.	738	* Called after a window size change.
875	*/	739	*/
876	void	740	void
877	rxvt_term::tt_winch ()	741	rxvt_term::tt_winch ()
878	{	742	{
879	if (pty.pty < 0)	743	if (pty->pty < 0)
880	return;	744	return;
881		745
882	struct winsize ws;	746	struct winsize ws;
883		747
884	ws.ws_col = ncol;	748	ws.ws_col = ncol;
885	ws.ws_row = nrow;	749	ws.ws_row = nrow;
886	ws.ws_xpixel = width;	750	ws.ws_xpixel = width;
887	ws.ws_ypixel = height;	751	ws.ws_ypixel = height;
888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	752	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889		753
890	#if 0	754	#if 0
891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	755	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892	if (cmd_pid) /* force through to the command */	756	if (cmd_pid) /* force through to the command */
893	kill (-cmd_pid, SIGWINCH);	757	kill (-cmd_pid, SIGWINCH);
…		…
1157	* -------------------------------------------------------------------- */	1021	* -------------------------------------------------------------------- */
1158	void	1022	void
1159	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1023	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1160	{	1024	{
1161	int fix_screen;	1025	int fix_screen;
1162	int old_width = szHint.width, old_height = szHint.height;	1026	int old_width = szHint.width;
		1027	int old_height = szHint.height;
1163	dDisp;	1028	dDisp;
1164		1029
1165	window_calc (newwidth, newheight);	1030	window_calc (newwidth, newheight);
1166	XSetWMNormalHints (disp, parent[0], &szHint);	1031	XSetWMNormalHints (disp, parent[0], &szHint);
1167		1032
…		…
1189	{	1054	{
1190	x -= x1;	1055	x -= x1;
1191	y -= y1;	1056	y -= y1;
1192	}	1057	}
1193		1058
1194	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1059	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1195	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1060	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1196	dx = old_width - szHint.width;	1061	dx = old_width - szHint.width;
1197	dy = old_height - szHint.height;	1062	dy = old_height - szHint.height;
1198		1063
1199	/* Check position of the center of the window */	1064	/* Check position of the center of the window */
1200	if (x < x1) /* left half */	1065	if (x < x1) /* left half */
1201	dx = 0;	1066	dx = 0;
…		…
1234	resize_pixmap ();	1099	resize_pixmap ();
1235	#endif	1100	#endif
1236	}	1101	}
1237		1102
1238	if (fix_screen \|\| old_height == 0)	1103	if (fix_screen \|\| old_height == 0)
1239	{
1240	int curr_screen = -1;
1241	int old_ncol = prev_ncol;
1242
1243	/* scr_reset only works on the primary screen */
1244	if (old_height) /* this is not the first time through */
1245	{
1246	unsigned int ocol = ncol;
1247	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1248	curr_screen = scr_change_screen (PRIMARY);
1249	ncol = ocol;
1250	}
1251
1252	scr_reset ();	1104	scr_reset ();
1253
1254	if (curr_screen >= 0) /* this is not the first time through */
1255	{
1256	scr_change_screen (curr_screen);
1257	selection_check (old_ncol != ncol ? 4 : 0);
1258	}
1259	}
1260
1261	old_width = szHint.width;
1262	old_height = szHint.height;
1263		1105
1264	#ifdef XPM_BACKGROUND	1106	#ifdef XPM_BACKGROUND
1265	if (pixmap)	1107	if (pixmap)
1266	scr_touch (false);	1108	scr_touch (false);
1267	#endif	1109	#endif
…		…
1421	set_environ (envv);	1263	set_environ (envv);
1422		1264
1423	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1265	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424	return false;	1266	return false;
1425		1267
1426	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427	input_method = display->get_xim (locale, modifiers);	1268	input_method = display->get_xim (locale, modifiers);
1428	if (input_method == NULL)	1269	if (input_method == NULL)
1429	return false;	1270	return false;
1430		1271
1431	xim = input_method->xim;	1272	xim = input_method->xim;
…		…
1577	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1418	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578	im_destroy ();	1419	im_destroy ();
1579	return false;	1420	return false;
1580	}	1421	}
1581		1422
		1423	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1424	vt_select_input ();
		1425
1582	if (input_style & XIMPreeditArea)	1426	if (input_style & XIMPreeditArea)
1583	IMSetStatusPosition ();	1427	IMSetStatusPosition ();
1584		1428
1585	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586	return true;	1429	return true;
1587	}	1430	}
1588		1431
1589	void	1432	void
1590	rxvt_term::im_cb ()	1433	rxvt_term::im_cb ()
…		…
1596		1439
1597	make_current ();	1440	make_current ();
1598		1441
1599	im_destroy ();	1442	im_destroy ();
1600		1443
1601	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602	if (Input_Context)	1444	if (Input_Context)
1603	return;	1445	return;
1604		1446
1605	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1447	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1606	if (rs[Rs_imLocale])	1448	if (rs[Rs_imLocale])
…		…
1679	XFree (preedit_attr);	1521	XFree (preedit_attr);
1680	XFree (status_attr);	1522	XFree (status_attr);
1681	}	1523	}
1682	#endif /* USE_XIM */	1524	#endif /* USE_XIM */
1683		1525
1684	/----------------------------------------------------------------------/
1685	rxvt_t rxvt_current_term;
1686
1687	/----------------------- end-of-file (C source) -----------------------/	1526	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.182 by root, Tue Jan 17 10:14:26 2006 UTC vs. Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.182 by root, Tue Jan 17 10:14:26 2006 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC