ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.80 by root, Fri Aug 13 19:31:23 2004 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*--------------------------------*-C-*---------------------------------*
2	* File: main.c	2	* File: main.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	* $Id: main.C,v 1.2 2003/11/24 17:31:27 pcg Exp $
5	*	4	*
6	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
7	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8	* - original version	7	* - original version
9	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
10	* - extensive modifications	9	* - extensive modifications
11	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>	10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
12	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13	* - extensive modifications	12	* - extensive modifications
14	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16	* - extensive modifications	15	* - extensive modifications
		16	* Copyright (c) 2003-2004 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.
…		…
28	* You should have received a copy of the GNU General Public License	28	* You should have received a copy of the GNU General Public License
29	* along with this program; if not, write to the Free Software	29	* along with this program; if not, write to the Free Software
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 "main.intpro" /* PROTOS for internal routines */	35	#include "main.intpro" /* PROTOS for internal routines */
36		36
37	#include <signal.h>	37	#include <signal.h>
38		38
39	#ifdef TTY_GID_SUPPORT	39	#ifdef TTY_GID_SUPPORT
40	# include <grp.h>	40	# include <grp.h>
…		…
42		42
43	#ifdef HAVE_TERMIOS_H	43	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	44	# include <termios.h>
45	#endif	45	#endif
46		46
		47	#include <cstring>
		48
		49	vector<rxvt_term *> rxvt_term::termlist;
		50
		51	static char curlocale[128];
		52
		53	bool
		54	rxvt_set_locale (const char *locale)
		55	{
		56	if (!locale || !STRNCMP (locale, curlocale, 128))
		57	return false;
		58
		59	STRNCPY (curlocale, locale, 128);
		60	setlocale (LC_CTYPE, curlocale);
		61	return true;
		62	}
		63
		64	#if ENABLE_COMBINING
		65	class rxvt_composite_vec rxvt_composite;
		66
		67	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
		68	{
		69	compose_char *cc;
		70
		71	// break compose chains, as stupid readline really likes to duplicate
		72	// composing characters for some reason near the end of a line.
		73	cc = (*this)[c1];
		74	while (cc)
		75	{
		76	if (cc->c2 == c2) return c1;
		77	cc = (*this)[cc->c1];
		78	}
		79
		80	// check to see wether this combination already exists otherwise
		81	for (cc = v.end (); cc-- > v.begin (); )
		82	{
		83	if (cc->c1 == c1 && cc->c2 == c2)
		84	return COMPOSE_LO + (cc - v.begin ());
		85	}
		86
		87	// allocate a new combination
		88	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
		89	{
		90	static int seen;
		91
		92	if (!seen++)
		93	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
		94
		95	return REPLACEMENT_CHAR;
		96	}
		97
		98	v.push_back (compose_char (c1, c2));
		99
		100	return v.size () - 1 + COMPOSE_LO;
		101	}
		102
		103	int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
		104	{
		105	compose_char *cc = (*this)[c];
		106
		107	if (!cc)
		108	{
		109	if (r) *r = c;
		110	return 1;
		111	}
		112
		113	int len = expand (cc->c1, r);
		114
		115	if (r) r += len;
		116
		117	if (cc->c2 != NOCHAR)
		118	{
		119	len++;
		120	if (r) *r++ = cc->c2;
		121	}
		122
		123	return len;
		124
		125	}
		126	#endif
		127
		128	void *
		129	rxvt_term::operator new (size_t s)
		130	{
		131	void *p = malloc (s);
		132
		133	MEMSET (p, 0, s);
		134	return p;
		135	}
		136
		137	void
		138	rxvt_term::operator delete (void *p, size_t s)
		139	{
		140	free (p);
		141	}
		142
		143	rxvt_term::rxvt_term ()
		144	:
		145	#if TRANSPARENT
		146	rootwin_ev (this, &rxvt_term::rootwin_cb),
		147	#endif
		148	#ifdef HAVE_SCROLLBARS
		149	scrollbar_ev (this, &rxvt_term::x_cb),
		150	#endif
		151	#ifdef MENUBAR
		152	menubar_ev (this, &rxvt_term::x_cb),
		153	#endif
		154	#ifdef CURSOR_BLINK
		155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		156	#endif
		157	#ifdef TEXT_BLINK
		158	text_blink_ev (this, &rxvt_term::text_blink_cb),
		159	#endif
		160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		162	#endif
		163	#ifdef SELECTION_SCROLLING
		164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		165	#endif
		166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		168	#endif
		169	#ifdef POINTER_BLANK
		170	pointer_ev (this, &rxvt_term::pointer_cb),
		171	#endif
		172	#ifdef USE_XIM
		173	im_ev (this, &rxvt_term::im_cb),
		174	#endif
		175	termwin_ev (this, &rxvt_term::x_cb),
		176	vt_ev (this, &rxvt_term::x_cb),
		177	check_ev (this, &rxvt_term::check_cb),
		178	flush_ev (this, &rxvt_term::flush_cb),
		179	destroy_ev (this, &rxvt_term::destroy_cb),
		180	pty_ev (this, &rxvt_term::pty_cb),
		181	incr_ev (this, &rxvt_term::incr_cb)
		182	{
		183	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
		184
		185	termlist.push_back (this);
		186	}
		187
		188	rxvt_term::~rxvt_term ()
		189	{
		190	termlist.erase (find (termlist.begin (), termlist.end(), this));
		191
		192	if (cmd_fd >= 0)
		193	close (cmd_fd);
		194
		195	#ifndef NO_SETOWNER_TTYDEV
		196	privileged_ttydev (RESTORE);
		197	#endif
		198	#ifdef UTMP_SUPPORT
		199	privileged_utmp (RESTORE);
		200	#endif
		201
		202	delete TermWin.fontset;
		203
		204	if (display)
		205	{
		206	selection_clear ();
		207
		208	#ifdef USE_XIM
		209	im_destroy ();
		210	#endif
		211	#ifdef MENUBAR
		212	if (menubarGC) XFreeGC (display->display, menubarGC);
		213	#endif
		214	#ifdef XTERM_SCROLLBAR
		215	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
		216	if (ShadowGC) XFreeGC (display->display, ShadowGC);
		217	#endif
		218	#ifdef PLAIN_SCROLLBAR
		219	if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
		220	#endif
		221	#ifdef NEXT_SCROLLBAR
		222	if (blackGC) XFreeGC (display->display, blackGC);
		223	if (whiteGC) XFreeGC (display->display, whiteGC);
		224	if (grayGC) XFreeGC (display->display, grayGC);
		225	if (darkGC) XFreeGC (display->display, darkGC);
		226	if (stippleGC) XFreeGC (display->display, stippleGC);
		227	if (dimple) XFreePixmap (display->display, dimple);
		228	if (upArrow) XFreePixmap (display->display, upArrow);
		229	if (downArrow) XFreePixmap (display->display, downArrow);
		230	if (upArrowHi) XFreePixmap (display->display, upArrowHi);
		231	if (downArrowHi) XFreePixmap (display->display, downArrowHi);
		232	#endif
		233	#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
		234	if (topShadowGC) XFreeGC (display->display, topShadowGC);
		235	if (botShadowGC) XFreeGC (display->display, botShadowGC);
		236	if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
		237	#endif
		238	if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
		239
		240	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
		241	delete menuBar.drawable;
		242	//if (menuBar.win)
		243	// XDestroyWindow (display->display, menuBar.win);
		244	#endif
		245	delete TermWin.drawable;
		246	// destroy all windows
		247	if (TermWin.parent[0])
		248	XDestroyWindow (display->display, TermWin.parent[0]);
		249	}
		250
		251	// TODO: free pixcolours, colours should become part of rxvt_display
		252
		253	delete PixColorsFocused;
		254	#ifdef OFF_FOCUS_FADING
		255	delete PixColorsUnFocused;
		256	#endif
		257
		258	displays.put (display);
		259
		260	scr_release ();
		261
		262	/* clear all resources */
		263	for (int i = 0; i < allocated.size (); i++)
		264	free (allocated[i]);
		265
		266	free (selection.text);
		267	// TODO: manage env vars in child only(!)
		268	free (env_windowid);
		269	free (env_display);
		270	free (env_term);
		271	free (env_colorfgbg);
		272	free (locale);
		273	#if 0
		274	free (codeset);
		275	#endif
		276
		277	delete envv;
		278	delete argv;
		279	}
		280
		281	void
		282	rxvt_term::destroy ()
		283	{
		284	if (destroy_ev.active)
		285	return;
		286
		287	if (display)
		288	{
		289	#if USE_XIM
		290	im_ev.stop (display);
		291	#endif
		292	#if HAVE_SCROLLBARS
		293	scrollbar_ev.stop (display);
		294	#endif
		295	#if MENUBAR
		296	menubar_ev.stop (display);
		297	#endif
		298	#if TRANSPARENT
		299	rootwin_ev.stop (display);
		300	#endif
		301	incr_ev.stop ();
		302	termwin_ev.stop (display);
		303	vt_ev.stop (display);
		304	}
		305
		306	check_ev.stop ();
		307	pty_ev.stop ();
		308	#ifdef CURSOR_BLINK
		309	cursor_blink_ev.stop ();
		310	#endif
		311	#ifdef TEXT_BLINK
		312	text_blink_ev.stop ();
		313	#endif
		314	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		315	cont_scroll_ev.stop ();
		316	#endif
		317	#ifdef SELECTION_SCROLLING
		318	sel_scroll_ev.stop ();
		319	#endif
		320	#ifdef POINTER_BLANK
		321	pointer_ev.stop ();
		322	#endif
		323
		324	destroy_ev.start (0);
		325	}
		326
		327	void
		328	rxvt_term::destroy_cb (time_watcher &w)
		329	{
		330	SET_R (this);
		331
		332	delete this;
		333	}
		334
47	/*----------------------------------------------------------------------*/	335	/*----------------------------------------------------------------------*/
48	/* rxvt_init() */	336	/* rxvt_init () */
49	/* LIBPROTO */	337	bool
50	rxvt_t *
51	rxvt_init(int argc, const char *const *argv)	338	rxvt_term::init (int argc, const char *const *argv)
52	{	339	{
53	const char **cmd_argv;	340	SET_R (this);
54		341
55	SET_R ((rxvt_t *)rxvt_calloc(1, sizeof(rxvt_t)));	342	if (!init_vars ())
		343	return false;
56		344
57	dR;	345	/*
58	if (rxvt_init_vars(aR) < 0) {
59	free(R);
60	return NULL;
61	}
62
63	/*
64	* Save and then give up any super-user privileges	346	* Save and then give up any super-user privileges
65	* If we need privileges in any area then we must specifically request it.	347	* If we need privileges in any area then we must specifically request it.
66	* We should only need to be root in these cases:	348	* We should only need to be root in these cases:
67	* 1. write utmp entries on some systems	349	* 1. write utmp entries on some systems
68	* 2. chown tty on some systems	350	* 2. chown tty on some systems
69	*/	351	*/
70	rxvt_privileges(aR_ SAVE);	352	privileges (SAVE);
71	rxvt_privileges(aR_ IGNORE);	353	privileges (IGNORE);
72		354
73	rxvt_init_secondary(aR);	355	init_secondary ();
74		356
75	cmd_argv = rxvt_init_resources(aR_ argc, argv);	357	const char **cmd_argv = init_resources (argc, argv);
76		358
		359	set_locale ("");
		360
		361	#if MENUBAR_MAX
		362	menubar_read (rs[Rs_menu]);
		363	#endif
		364	#ifdef HAVE_SCROLLBARS
		365	if (Options & Opt_scrollBar)
		366	scrollBar.setIdle (); /* set existence for size calculations */
		367	#endif
		368
		369	create_windows (argc, argv);
		370
		371	init_xlocale ();
		372
		373	scr_reset (); /* initialize screen */
		374
		375	#if 0
		376	XSynchronize (display->display, True);
		377	#endif
		378
		379	#ifdef HAVE_SCROLLBARS
		380	if (Options & Opt_scrollBar)
		381	resize_scrollbar (); /* create and map scrollbar */
		382	#endif
77	#if (MENUBAR_MAX)	383	#if (MENUBAR_MAX)
78	rxvt_menubar_read(aR_ R->h->rs[Rs_menu]);	384	if (menubar_visible ())
		385	XMapWindow (display->display, menuBar.win);
79	#endif	386	#endif
80	#ifdef HAVE_SCROLLBARS	387	#ifdef TRANSPARENT
81	if (R->Options & Opt_scrollBar)	388	if (Options & Opt_transparent)
82	scrollbar_setIdle(); /* set existence for size calculations */	389	{
		390	XSelectInput (display->display, display->root, PropertyChangeMask);
		391	check_our_parents ();
		392	rootwin_ev.start (display, display->root);
		393	}
83	#endif	394	#endif
84		395
85	rxvt_Create_Windows(aR_ argc, argv);	396	XMapWindow (display->display, TermWin.vt);
		397	XMapWindow (display->display, TermWin.parent[0]);
86		398
87	rxvt_init_xlocale(aR);	399	init_command (cmd_argv);
88		400
89	rxvt_scr_reset(aR); /* initialize screen */	401	pty_ev.start (cmd_fd, EVENT_READ);
90	#ifdef RXVT_GRAPHICS
91	rxvt_Gr_reset(aR); /* reset graphics */
92	#endif
93		402
		403	check_ev.start ();
		404
		405	return true;
		406	}
		407
		408	static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
		409
		410	void
		411	rxvt_init_signals ()
		412	{
		413	/* install exit handler for cleanup */
94	#if 0	414	#if 0
95	#ifdef DEBUG_X	415	#ifdef HAVE_ATEXIT
96	XSynchronize(R->Xdisplay, True);	416	atexit (rxvt_clean_exit);
97	XSetErrorHandler((XErrorHandler) abort);
98	#else	417	#else
		418	#endif
		419	#endif
		420
		421	struct sigaction sa;
		422
		423	sigfillset (&sa.sa_mask);
		424	sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
		425	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
		426	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
		427	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
		428	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
		429	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
		430	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
		431
		432	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
		433	/* signal (SIGURG, SIG_DFL); */
		434
		435	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
99	XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);	436	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
100	#endif
101	#endif
102
103	#ifdef HAVE_SCROLLBARS
104	if (R->Options & Opt_scrollBar)
105	rxvt_Resize_scrollBar(aR); /* create and map scrollbar */
106	#endif
107	#if (MENUBAR_MAX)
108	if (menubar_visible(r))
109	XMapWindow(R->Xdisplay, R->menuBar.win);
110	#endif
111	#ifdef TRANSPARENT
112	if (R->Options & Opt_transparent) {
113	XSelectInput(R->Xdisplay, Xroot, PropertyChangeMask);
114	rxvt_check_our_parents(aR);
115	}
116	#endif
117	XMapWindow(R->Xdisplay, R->TermWin.vt);
118	XMapWindow(R->Xdisplay, R->TermWin.parent[0]);
119
120	rxvt_init_env(aR);
121	rxvt_init_command(aR_ cmd_argv);
122
123	return R;
124	}	437	}
125		438
126	/* ------------------------------------------------------------------------- *	439	/* ------------------------------------------------------------------------- *
127	* SIGNAL HANDLING & EXIT HANDLER *	440	* SIGNAL HANDLING & EXIT HANDLER *
128	* ------------------------------------------------------------------------- */	441	* ------------------------------------------------------------------------- */
129	/*	442	/*
130	* Catch a SIGCHLD signal and exit if the direct child has died	443	* Catch a SIGCHLD signal and exit if the direct child has died
131	*/	444	*/
		445
		446	void rxvt_term::child_exited (int pid)
		447	{
		448	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
		449	if (pid == (*t)->cmd_pid)
		450	{
		451	(*t)->destroy ();
		452	break;
		453	}
		454	}
		455
132	/* ARGSUSED */	456	/* ARGSUSED */
133	/* EXTPROTO */	457	/* EXTPROTO */
134	RETSIGTYPE	458	RETSIGTYPE
135	rxvt_Child_signal(int sig __attribute__((unused)))	459	rxvt_Child_signal (int sig __attribute__ ((unused)))
136	{	460	{
137	dR;
138	int pid, save_errno = errno;	461	int pid, save_errno = errno;
139		462
140	do {	463	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
141	errno = 0;	464	rxvt_term::child_exited (pid);
142	} while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR);
143		465
144	if (pid == R->h->cmd_pid)
145	exit(EXIT_SUCCESS);
146
147	errno = save_errno;	466	errno = save_errno;
148	signal(SIGCHLD, rxvt_Child_signal);
149	}	467	}
150		468
151	/*	469	/*
152	* Catch a fatal signal and tidy up before quitting	470	* Catch a fatal signal and tidy up before quitting
153	*/	471	*/
154	/* EXTPROTO */	472	/* EXTPROTO */
155	RETSIGTYPE	473	RETSIGTYPE
156	rxvt_Exit_signal(int sig)	474	rxvt_Exit_signal (int sig)
157	{	475	{
158	signal(sig, SIG_DFL);	476	signal (sig, SIG_DFL);
159	#ifdef DEBUG_CMD	477	#ifdef DEBUG_CMD
160	rxvt_print_error("signal %d", sig);	478	rxvt_warn ("caught signal %d, exiting.\n", sig);
161	#endif	479	#endif
162	rxvt_clean_exit();	480	rxvt_clean_exit ();
163	kill(getpid(), sig);	481	kill (getpid (), sig);
164	}	482	}
165		483
166	/* ARGSUSED */
167	/* INTPROTO */	484	/* INTPROTO */
168	int	485	int
169	rxvt_xerror_handler(const Display *display __attribute__((unused)), const XErrorEvent *event)	486	rxvt_xerror_handler (Display *display, XErrorEvent *event)
170	{	487	{
171	dR;
172
173	if (R->h->allowedxerror == -1) {	488	if (GET_R->allowedxerror == -1)
174	R->h->allowedxerror = event->error_code;	489	GET_R->allowedxerror = event->error_code;
175	return 0; /* ignored anyway */	490	else
176	}	491	{
177	rxvt_print_error("XError: Request: %d . %d, Error: %d",	492	old_xerror_handler (display, event);
178	event->request_code, event->minor_code,	493	GET_R->destroy ();
179	event->error_code);	494	}
180	/* XXX: probably should call rxvt_clean_exit() bypassing X routines */	495
181	exit(EXIT_FAILURE);	496	return 0;
182	/* NOTREACHED */
183	}	497	}
184		498
185	/*----------------------------------------------------------------------*/	499	/*----------------------------------------------------------------------*/
186	/*	500	/*
187	* Exit gracefully, clearing the utmp entry and restoring tty attributes	501	* Exit gracefully, clearing the utmp entry and restoring tty attributes
188	* TODO: if debugging, this should free up any known resources if we can	502	* TODO: if debugging, this should free up any known resources if we can
189	*/	503	*/
190	/* EXTPROTO */	504	/* EXTPROTO */
191	void	505	void
192	rxvt_clean_exit(void)	506	rxvt_clean_exit ()
193	{	507	{
194	dR;	508	// TODO: rxvtd should clean up all ressources
195		509	if (GET_R)
196	#ifdef DEBUG_SCREEN	510	GET_R->destroy ();
197	rxvt_scr_release(aR);
198	#endif
199	#ifndef NO_SETOWNER_TTYDEV
200	rxvt_privileged_ttydev(aR_ RESTORE);
201	#endif
202	#ifdef UTMP_SUPPORT
203	rxvt_privileged_utmp(aR_ RESTORE);
204	#endif
205	#ifdef USE_XIM
206	if (R->h->Input_Context != NULL) {
207	XDestroyIC(R->h->Input_Context);
208	R->h->Input_Context = NULL;
209	}
210	#endif
211	}	511	}
212		512
213	/* ------------------------------------------------------------------------- *	513	/* ------------------------------------------------------------------------- *
214	* MEMORY ALLOCATION WRAPPERS *	514	* MEMORY ALLOCATION WRAPPERS *
215	* ------------------------------------------------------------------------- */	515	* ------------------------------------------------------------------------- */
216	/* EXTPROTO */	516	/* EXTPROTO */
217	void *	517	void *
218	rxvt_malloc(size_t size)	518	rxvt_malloc (size_t size)
219	{	519	{
220	void *p;	520	void *p;
221		521
222	p = malloc(size);	522	p = malloc (size);
223	if (p)	523	if (p)
224	return p;	524	return p;
225		525
226	fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");	526	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
227	rxvt_clean_exit();	527	rxvt_clean_exit ();
228	exit(EXIT_FAILURE);	528	exit (EXIT_FAILURE);
229	/* NOTREACHED */	529	/* NOTREACHED */
230	}	530	}
231		531
232	/* EXTPROTO */	532	/* EXTPROTO */
233	void *	533	void *
234	rxvt_calloc(size_t number, size_t size)	534	rxvt_calloc (size_t number, size_t size)
235	{	535	{
236	void *p;	536	void *p;
237		537
238	p = calloc(number, size);	538	p = calloc (number, size);
239	if (p)	539	if (p)
240	return p;	540	return p;
241		541
242	fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");	542	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
243	rxvt_clean_exit();	543	rxvt_clean_exit ();
244	exit(EXIT_FAILURE);	544	exit (EXIT_FAILURE);
245	/* NOTREACHED */	545	/* NOTREACHED */
246	}	546	}
247		547
248	/* EXTPROTO */	548	/* EXTPROTO */
249	void *	549	void *
250	rxvt_realloc(void *ptr, size_t size)	550	rxvt_realloc (void *ptr, size_t size)
251	{	551	{
252	void *p;	552	void *p;
253		553
254	if (ptr)	554	if (ptr)
255	p = realloc(ptr, size);	555	p = realloc (ptr, size);
256	else	556	else
257	p = malloc(size);	557	p = malloc (size);
258	if (p)	558	if (p)
259	return p;	559	return p;
260		560
261	fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");	561	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
262	rxvt_clean_exit();	562	rxvt_clean_exit ();
263	exit(EXIT_FAILURE);	563	exit (EXIT_FAILURE);
264	/* NOTREACHED */	564	/* NOTREACHED */
265	}	565	}
		566
266	/* ------------------------------------------------------------------------- *	567	/* ------------------------------------------------------------------------- *
267	* PRIVILEGED OPERATIONS *	568	* PRIVILEGED OPERATIONS *
268	* ------------------------------------------------------------------------- */	569	* ------------------------------------------------------------------------- */
269	/* take care of suid/sgid super-user (root) privileges */	570	/* take care of suid/sgid super-user (root) privileges */
270	/* INTPROTO */
271	void	571	void
272	rxvt_privileges(pR_ int mode)	572	rxvt_term::privileges (int mode)
273	{	573	{
274	#if ! defined(__CYGWIN32__)	574	#if ! defined(__CYGWIN32__)
275	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	575	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
276	/* setreuid() is the poor man's setuid(), seteuid() */	576	/* setreuid () is the poor man's setuid (), seteuid () */
277	# define seteuid(a) setreuid(-1, (a))	577	# define seteuid(a) setreuid(-1, (a))
278	# define setegid(a) setregid(-1, (a))	578	# define setegid(a) setregid(-1, (a))
279	# define HAVE_SETEUID	579	# define HAVE_SETEUID
280	# endif	580	# endif
281	# ifdef HAVE_SETEUID	581	# ifdef HAVE_SETEUID
282	switch (mode) {	582	switch (mode)
		583	{
283	case IGNORE:	584	case IGNORE:
284	/*	585	/*
285	* change effective uid/gid - not real uid/gid - so we can switch	586	* change effective uid/gid - not real uid/gid - so we can switch
286	* back to root later, as required	587	* back to root later, as required
287	*/	588	*/
288	seteuid(getuid());	589	seteuid (getuid ());
289	setegid(getgid());	590	setegid (getgid ());
290	break;	591	break;
291	case SAVE:	592	case SAVE:
292	R->h->euid = geteuid();	593	euid = geteuid ();
293	R->h->egid = getegid();	594	egid = getegid ();
294	break;	595	break;
295	case RESTORE:	596	case RESTORE:
296	seteuid(R->h->euid);	597	seteuid (euid);
297	setegid(R->h->egid);	598	setegid (egid);
298	break;	599	break;
299	}	600	}
300	# else	601	# else
301	switch (mode) {	602	switch (mode)
		603	{
302	case IGNORE:	604	case IGNORE:
303	setuid(getuid());	605	setuid (getuid ());
304	setgid(getgid());	606	setgid (getgid ());
305	/* FALLTHROUGH */	607	/* FALLTHROUGH */
306	case SAVE:	608	case SAVE:
307	/* FALLTHROUGH */	609	/* FALLTHROUGH */
308	case RESTORE:	610	case RESTORE:
309	break;	611	break;
310	}	612	}
311	# endif	613	# endif
312	#endif	614	#endif
313	}	615	}
314		616
315	#ifdef UTMP_SUPPORT	617	#ifdef UTMP_SUPPORT
316	/* EXTPROTO */
317	void	618	void
318	rxvt_privileged_utmp(pR_ char action)	619	rxvt_term::privileged_utmp (char action)
319	{	620	{
320	struct rxvt_hidden *h = R->h;
321
322	D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", action, h->next_utmp_action, getpid()));	621	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
323	if (h->next_utmp_action != action	622	action, next_utmp_action, getpid ()));
324	|| (action != SAVE && action != RESTORE)	623	if (next_utmp_action != action || (action != SAVE && action != RESTORE)
325	|| (R->Options & Opt_utmpInhibit)	624	|| (Options & Opt_utmpInhibit)
326	|| h->ttydev == NULL	625	|| ttydev == NULL || *ttydev == '\0')
327	|| *h->ttydev == '\0')	626	return;
328	return;
329		627
330	rxvt_privileges(aR_ RESTORE);	628	privileges (RESTORE);
331	if (action == SAVE) {	629	if (action == SAVE)
		630	{
332	h->next_utmp_action = RESTORE;	631	next_utmp_action = RESTORE;
333	rxvt_makeutent(aR_ h->ttydev, h->rs[Rs_display_name]);	632	makeutent (ttydev, rs[Rs_display_name]);
334	} else { /* action == RESTORE */	633	}
		634	else
		635	{ /* action == RESTORE */
335	h->next_utmp_action = IGNORE;	636	next_utmp_action = IGNORE;
336	rxvt_cleanutent(aR);	637	cleanutent ();
337	}	638	}
338	rxvt_privileges(aR_ IGNORE);	639	privileges (IGNORE);
339	}	640	}
340	#endif	641	#endif
341		642
342	#ifndef NO_SETOWNER_TTYDEV	643	#ifndef NO_SETOWNER_TTYDEV
343	/* EXTPROTO */
344	void	644	void
345	rxvt_privileged_ttydev(pR_ char action)	645	rxvt_term::privileged_ttydev (char action)
346	{	646	{
347	struct rxvt_hidden *h = R->h;	647	D_MAIN ((stderr,
		648	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
		649	action, next_tty_action, getpid ()));
		650	if (next_tty_action != action || (action != SAVE && action != RESTORE)
		651	|| ttydev == NULL || *ttydev == '\0')
		652	return;
348		653
349	D_MAIN((stderr, "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", action, h->next_tty_action, getpid()));
350	if (h->next_tty_action != action
351	|| (action != SAVE && action != RESTORE)
352	|| h->ttydev == NULL
353	|| *h->ttydev == '\0')
354	return;
355
356	rxvt_privileges(aR_ RESTORE);	654	privileges (RESTORE);
357		655
358	if (action == SAVE) {	656	if (action == SAVE)
		657	{
359	h->next_tty_action = RESTORE;	658	next_tty_action = RESTORE;
360	# ifndef RESET_TTY_TO_COMMON_DEFAULTS	659	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
361	/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */	660	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
362	if (lstat(h->ttydev, &h->ttyfd_stat) < 0) /* you lose out */	661	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
363	h->next_tty_action = IGNORE;	662	next_tty_action = IGNORE;
364	else	663	else
365	# endif	664	# endif
366	{	665
		666	{
367	chown(h->ttydev, getuid(), h->ttygid); /* fail silently */	667	chown (ttydev, getuid (), ttygid); /* fail silently */
368	chmod(h->ttydev, h->ttymode);	668	chmod (ttydev, ttymode);
369	# ifdef HAVE_REVOKE	669	# ifdef HAVE_REVOKE
370	revoke(h->ttydev);	670	revoke (ttydev);
371	# endif	671	# endif
372	}	672
373	} else { /* action == RESTORE */	673	}
		674	}
		675	else
		676	{ /* action == RESTORE */
374	h->next_tty_action = IGNORE;	677	next_tty_action = IGNORE;
375	# ifndef RESET_TTY_TO_COMMON_DEFAULTS	678	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
376	chmod(h->ttydev, h->ttyfd_stat.st_mode);	679	chmod (ttydev, ttyfd_stat.st_mode);
377	chown(h->ttydev, h->ttyfd_stat.st_uid, h->ttyfd_stat.st_gid);	680	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
378	# else	681	# else
379	chmod(h->ttydev,	682	chmod (ttydev,
380	(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));	683	(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
381	chown(h->ttydev, 0, 0);	684	chown (ttydev, 0, 0);
382	# endif	685	# endif
383	}
384		686
		687	}
		688
385	rxvt_privileges(aR_ IGNORE);	689	privileges (IGNORE);
386		690
387	# ifndef RESET_TTY_TO_COMMON_DEFAULTS	691	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
388	D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", action == RESTORE ? "Restoring" : (action == SAVE ? "Saving" : "UNKNOWN ERROR for"), h->ttydev, h->ttyfd_stat.st_mode, h->ttyfd_stat.st_uid, h->ttyfd_stat.st_gid));	692	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
		693	action == RESTORE ? "Restoring" : (action ==
		694	SAVE ? "Saving" :
		695	"UNKNOWN ERROR for"), ttydev,
		696	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
		697	ttyfd_stat.st_gid));
389	# endif	698	# endif
390	}	699	}
391	#endif	700	#endif
392		701
393	/*----------------------------------------------------------------------*/	702	/*----------------------------------------------------------------------*/
394	/*	703	/*
395	* window size/position calculcations for XSizeHint and other storage.	704	* window size/position calculcations for XSizeHint and other storage.
396	* if width/height are non-zero then override calculated width/height	705	* if width/height are non-zero then override calculated width/height
397	*/	706	*/
398	/* EXTPROTO */
399	void	707	void
400	rxvt_window_calc(pR_ unsigned int width, unsigned int height)	708	rxvt_term::window_calc (unsigned int width, unsigned int height)
401	{	709	{
402	short recalc_x, recalc_y;	710	short recalc_x, recalc_y;
403	int x, y, sb_w, mb_h, flags;	711	int x, y, sb_w, mb_h, flags;
404	unsigned int w, h;	712	unsigned int w, h;
405	unsigned int max_width, max_height;	713	unsigned int max_width, max_height;
406		714
407	D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, R->szHint.height));	715	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
		716	TermWin.ncol, TermWin.nrow, szHint.width,
		717	szHint.height));
408	R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;	718	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
409	R->szHint.win_gravity = NorthWestGravity;	719	szHint.win_gravity = NorthWestGravity;
410	/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */	720	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
411		721
412	recalc_x = recalc_y = 0;	722	recalc_x = recalc_y = 0;
413	flags = 0;	723	flags = 0;
414	if (!R->h->parsed_geometry) {	724	if (!parsed_geometry)
		725	{
415	R->h->parsed_geometry = 1;	726	parsed_geometry = 1;
416	if (R->h->rs[Rs_geometry])	727	if (rs[Rs_geometry])
417	flags = XParseGeometry(R->h->rs[Rs_geometry], &x, &y, &w, &h);	728	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
418	if (flags & WidthValue) {	729	if (flags & WidthValue)
		730	{
419	R->TermWin.ncol = BOUND_POSITIVE_INT16(w);	731	TermWin.ncol = BOUND_POSITIVE_INT16 (w);
420	R->szHint.flags |= USSize;	732	szHint.flags |= USSize;
421	}	733	}
422	if (flags & HeightValue) {	734	if (flags & HeightValue)
		735	{
423	R->TermWin.nrow = BOUND_POSITIVE_INT16(h);	736	TermWin.nrow = BOUND_POSITIVE_INT16 (h);
424	R->szHint.flags |= USSize;	737	szHint.flags |= USSize;
425	}	738	}
426	if (flags & XValue) {	739	if (flags & XValue)
427	R->szHint.x = x;	740	{
		741	szHint.x = x;
428	R->szHint.flags |= USPosition;	742	szHint.flags |= USPosition;
429	if (flags & XNegative) {	743	if (flags & XNegative)
430	recalc_x = 1;	744	{
		745	recalc_x = 1;
431	R->szHint.win_gravity = NorthEastGravity;	746	szHint.win_gravity = NorthEastGravity;
		747	}
		748	}
		749	if (flags & YValue)
		750	{
		751	szHint.y = y;
		752	szHint.flags |= USPosition;
		753	if (flags & YNegative)
		754	{
		755	recalc_y = 1;
		756	if (szHint.win_gravity == NorthEastGravity)
		757	szHint.win_gravity = SouthEastGravity;
		758	else
		759	szHint.win_gravity = SouthWestGravity;
		760	}
		761	}
432	}	762	}
433	}	763
434	if (flags & YValue) {
435	R->szHint.y = y;
436	R->szHint.flags |= USPosition;
437	if (flags & YNegative) {
438	recalc_y = 1;
439	if (R->szHint.win_gravity == NorthEastGravity)
440	R->szHint.win_gravity = SouthEastGravity;
441	else
442	R->szHint.win_gravity = SouthWestGravity;
443	}
444	}
445	}
446	/* TODO: BOUNDS */	764	/* TODO: BOUNDS */
447	R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth;	765	TermWin.width = TermWin.ncol * TermWin.fwidth;
448	R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight;	766	TermWin.height = TermWin.nrow * TermWin.fheight;
449	max_width = MAX_COLS * R->TermWin.fwidth;	767	max_width = MAX_COLS * TermWin.fwidth;
450	max_height = MAX_ROWS * R->TermWin.fheight;	768	max_height = MAX_ROWS * TermWin.fheight;
451		769
452	R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth;	770	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
453		771
454	sb_w = mb_h = 0;	772	sb_w = mb_h = 0;
455	R->h->window_vt_x = R->h->window_vt_y = 0;	773	window_vt_x = window_vt_y = TermWin.int_bwidth;
		774
456	if (scrollbar_visible(R)) {	775	if (scrollbar_visible ())
		776	{
457	sb_w = scrollbar_TotalWidth();	777	sb_w = scrollbar_TotalWidth ();
458	R->szHint.base_width += sb_w;	778	szHint.base_width += sb_w;
459	if (!(R->Options & Opt_scrollBar_right))	779	if (!(Options & Opt_scrollBar_right))
460	R->h->window_vt_x = sb_w;	780	window_vt_x += sb_w;
461	}	781	}
		782
462	if (menubar_visible(R)) {	783	if (menubar_visible ())
		784	{
463	mb_h = menuBar_TotalHeight();	785	mb_h = menuBar_TotalHeight ();
464	R->szHint.base_height += mb_h;	786	szHint.base_height += mb_h;
465	R->h->window_vt_y = mb_h;	787	window_vt_y += mb_h;
466	}	788	}
		789
467	R->szHint.width_inc = R->TermWin.fwidth;	790	szHint.width_inc = TermWin.fwidth;
468	R->szHint.height_inc = R->TermWin.fheight;	791	szHint.height_inc = TermWin.fheight;
469	R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc;	792	szHint.min_width = szHint.base_width + szHint.width_inc;
470	R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc;	793	szHint.min_height = szHint.base_height + szHint.height_inc;
471		794
472	if (width && width - R->szHint.base_width < max_width) {	795	if (width && width - szHint.base_width < max_width)
		796	{
473	R->szHint.width = width;	797	szHint.width = width;
474	R->TermWin.width = width - R->szHint.base_width;	798	TermWin.width = width - szHint.base_width;
475	} else {	799	}
		800	else
		801	{
476	MIN_IT(R->TermWin.width, max_width);	802	MIN_IT (TermWin.width, max_width);
477	R->szHint.width = R->szHint.base_width + R->TermWin.width;	803	szHint.width = szHint.base_width + TermWin.width;
478	}	804	}
		805
479	if (height && height - R->szHint.base_height < max_height) {	806	if (height && height - szHint.base_height < max_height)
		807	{
480	R->szHint.height = height;	808	szHint.height = height;
481	R->TermWin.height = height - R->szHint.base_height;	809	TermWin.height = height - szHint.base_height;
482	} else {	810	}
		811	else
		812	{
483	MIN_IT(R->TermWin.height, max_height);	813	MIN_IT (TermWin.height, max_height);
484	R->szHint.height = R->szHint.base_height + R->TermWin.height;	814	szHint.height = szHint.base_height + TermWin.height;
485	}	815	}
		816
486	if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right))	817	if (scrollbar_visible () && (Options & Opt_scrollBar_right))
487	R->h->window_sb_x = R->szHint.width - sb_w;	818	window_sb_x = szHint.width - sb_w;
488		819
489	if (recalc_x)	820	if (recalc_x)
490	R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen)	821	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
491	- R->szHint.width - 2 * R->TermWin.ext_bwidth);	822	- szHint.width - 2 * TermWin.ext_bwidth);
492	if (recalc_y)	823	if (recalc_y)
493	R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen)	824	szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
494	- R->szHint.height - 2 * R->TermWin.ext_bwidth);	825	- szHint.height - 2 * TermWin.ext_bwidth);
495		826
496	R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth;	827	TermWin.ncol = TermWin.width / TermWin.fwidth;
497	R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight;	828	TermWin.nrow = TermWin.height / TermWin.fheight;
498	D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, R->szHint.height));	829	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
		830	TermWin.ncol, TermWin.nrow, szHint.width,
		831	szHint.height));
499	return;	832	return;
500	}	833	}
501		834
502	/*----------------------------------------------------------------------*/	835	/*----------------------------------------------------------------------*/
503	/*	836	/*
504	* Tell the teletype handler what size the window is.	837	* Tell the teletype handler what size the window is.
505	* Called after a window size change.	838	* Called after a window size change.
506	*/	839	*/
507	/* EXTPROTO */
508	void	840	void
509	rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid)	841	rxvt_term::tt_winch ()
510	{	842	{
511	struct winsize ws;	843	struct winsize ws;
512		844
513	if (fd < 0)	845	if (cmd_fd < 0)
514	return;	846	return;
		847
515	ws.ws_col = col;	848	ws.ws_col = TermWin.ncol;
516	ws.ws_row = row;	849	ws.ws_row = TermWin.nrow;
517	ws.ws_xpixel = ws.ws_ypixel = 0;	850	ws.ws_xpixel = ws.ws_ypixel = 0;
518	#ifndef DEBUG_SIZE	851	#ifndef DEBUG_SIZE
519	(void)ioctl(fd, TIOCSWINSZ, &ws);	852	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
520	#else	853	#else
521	if (ioctl(fd, TIOCSWINSZ, &ws) < 0) {	854	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
522	D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	855	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
523	}
524	# ifdef SIGWINCH	856	# ifdef SIGWINCH
525	else if (pid) /* force through to the command */	857	else if (cmd_pid) /* force through to the command */
526	kill(pid, SIGWINCH);	858	kill (cmd_pid, SIGWINCH);
527	# endif	859	# endif
528	#endif	860	#endif
529	}	861	}
530		862
531	/*----------------------------------------------------------------------*/	863	/*----------------------------------------------------------------------*/
532	/* rxvt_change_font() - Switch to a new font */	864	/* rxvt_change_font () - Switch to a new font */
533	/*	865	/*
534	* init = 1 - initialize	866	* init = 1 - initialize
535	*	867	*
536	* fontname == FONT_UP - switch to bigger font	868	* fontname == FONT_UP - switch to bigger font
537	* fontname == FONT_DN - switch to smaller font	869	* fontname == FONT_DN - switch to smaller font
538	*/	870	*/
539	/* EXTPROTO */	871	bool
540	void
541	rxvt_change_font(pR_ int init, const char *fontname)	872	rxvt_term::change_font (const char *fontname)
542	{	873	{
543	}	874	if (fontname == FONT_UP)
		875	{
		876	// TODO
		877	}
		878	else if (fontname == FONT_DN)
		879	{
		880	// TODO
		881	}
		882	else
		883	{
		884	rxvt_fontset *fs = new rxvt_fontset (this);
544		885
545	/* INTPROTO */	886	if (fs && fs->populate (fontname ? fontname : "fixed"))
546	void	887	{
		888	delete TermWin.fontset;
		889	TermWin.fontset = fs;
		890	TermWin.fwidth = fs->base_font ()->width;
		891	TermWin.fheight = fs->base_font ()->height;
		892	TermWin.fbase = fs->base_font ()->ascent;
		893
		894	if (TermWin.parent[0])
		895	{
		896	resize_all_windows (0, 0, 0);
		897	scr_remap_chars ();
		898	scr_touch (true);
		899	}
		900
		901	for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
		902	TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
		903
		904	return true;
		905	}
		906	}
		907
		908	return false;
		909	}
		910
		911	bool
547	rxvt_font_up_down(pR_ int n, int direction)	912	rxvt_term::font_up_down (int n, int direction)
548	{	913	{
		914	return false;
549	}	915	}
550		916
551	/*----------------------------------------------------------------------*/	917	/*----------------------------------------------------------------------*/
552	/*----------------------------------------------------------------------*/	918	/*----------------------------------------------------------------------*/
553	/* xterm sequences - title, iconName, color (exptl) */	919	/* xterm sequences - title, iconName, color (exptl) */
554	/* EXTPROTO */
555	void	920	void
556	rxvt_set_title(pR_ const char *str)	921	rxvt_term::set_title (const char *str)
557	{	922	{
558	#ifndef SMART_WINDOW_TITLE	923	#ifdef SMART_WINDOW_TITLE
		924	char *name;
		925
		926	if (!XFetchName (display->display, TermWin.parent[0], &name))
		927	name = NULL;
		928
		929	if (name == NULL || STRCMP (name, str))
		930	#endif
559	XStoreName(R->Xdisplay, R->TermWin.parent[0], str);	931	XStoreName (display->display, TermWin.parent[0], str);
		932
		933	#ifdef SMART_WINDOW_TITLE
		934	if (name)
		935	XFree (name);
		936	#endif
		937	}
		938
		939	void
		940	rxvt_term::set_icon_name (const char *str)
		941	{
		942	#ifdef SMART_WINDOW_TITLE
		943	char *name;
		944
		945	if (!XGetIconName (display->display, TermWin.parent[0], &name))
		946	name = NULL;
		947
		948	if (name == NULL || STRCMP (name, str))
		949	#endif
		950	XSetIconName (display->display, TermWin.parent[0], str);
		951
		952	#ifdef SMART_WINDOW_TITLE
		953	if (name)
		954	XFree (name);
		955	#endif
		956	}
		957
		958	#ifdef XTERM_COLOR_CHANGE
		959	void
		960	rxvt_term::set_window_color (int idx, const char *color)
		961	{
		962	rxvt_color xcol;
		963	int i;
		964
		965	if (color == NULL || *color == '\0')
		966	return;
		967
		968	/* handle color aliases */
		969	if (isdigit (*color))
		970	{
		971	i = atoi (color);
		972	if (i >= 8 && i <= 15)
		973	{ /* bright colors */
		974	i -= 8;
		975	# ifndef NO_BRIGHTCOLOR
		976	PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
		977	SET_PIXCOLOR (idx);
		978	goto Done;
		979	# endif
		980
		981	}
		982	if (i >= 0 && i <= 7)
		983	{ /* normal colors */
		984	PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
		985	SET_PIXCOLOR (idx);
		986	goto Done;
		987	}
		988	}
		989
		990	if (!rXParseAllocColor (& xcol, color))
		991	return;
		992
		993	/* XStoreColor (display->display, display->cmap, XColor*); */
		994
		995	/*
		996	* FIXME: should free colors here, but no idea how to do it so instead,
		997	* so just keep gobbling up the colormap
		998	*/
		999	# if 0
		1000	for (i = Color_Black; i <= Color_White; i++)
		1001	if (PixColors[idx] == PixColors[i])
		1002	break;
		1003	if (i > Color_White)
		1004	{
		1005	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
		1006	XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
		1007	DisplayPlanes (display->display, display->screen));
		1008	}
		1009	# endif
		1010
		1011	PixColorsFocused[idx] = xcol;
		1012	SET_PIXCOLOR (idx);
		1013
		1014	/* XSetWindowAttributes attr; */
		1015	/* Cursor cursor; */
		1016	Done:
		1017	#ifdef OFF_FOCUS_FADING
		1018	PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
		1019	#endif
		1020	if (idx == Color_bg && ! (Options & Opt_transparent))
		1021	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
		1022
		1023	/* handle Color_BD, scrollbar background, etc. */
		1024
		1025	set_colorfgbg ();
		1026	recolour_cursor ();
		1027	scr_touch (true);
		1028	}
		1029
560	#else	1030	#else
561	char *name;
562
563	if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0)
564	name = NULL;
565	if (name == NULL || STRCMP(name, str))
566	XStoreName(R->Xdisplay, R->TermWin.parent[0], str);
567	if (name)
568	XFree(name);
569	#endif
570	}
571
572	/* EXTPROTO */
573	void
574	rxvt_set_iconName(pR_ const char *str)
575	{
576	#ifndef SMART_WINDOW_TITLE
577	XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
578	#else
579	char *name;
580
581	if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name))
582	name = NULL;
583	if (name == NULL || STRCMP(name, str))
584	XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
585	if (name)
586	XFree(name);
587	#endif
588	}
589
590	#ifdef XTERM_COLOR_CHANGE
591	/* EXTPROTO */
592	void
593	rxvt_set_window_color(pR_ int idx, const char *color)
594	{
595	rxvt_color xcol;
596	int i;
597
598	if (color == NULL || *color == '\0')
599	return;
600
601	/* handle color aliases */
602	if (isdigit(*color)) {
603	i = atoi(color);
604	if (i >= 8 && i <= 15) { /* bright colors */
605	i -= 8;
606	# ifndef NO_BRIGHTCOLOR
607	R->PixColors[idx] = R->PixColors[minBrightCOLOR + i];
608	SET_PIXCOLOR(R->h, idx);
609	goto Done;
610	# endif
611	}
612	if (i >= 0 && i <= 7) { /* normal colors */
613	R->PixColors[idx] = R->PixColors[minCOLOR + i];
614	SET_PIXCOLOR(R->h, idx);
615	goto Done;
616	}
617	}
618	if (!rxvt_rXParseAllocColor(aR_ &xcol, color))
619	return;
620	/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */
621
622	/*
623	* FIXME: should free colors here, but no idea how to do it so instead,
624	* so just keep gobbling up the colormap
625	*/
626	# if 0
627	for (i = Color_Black; i <= Color_White; i++)
628	if (R->PixColors[idx] == R->PixColors[i])
629	break;
630	if (i > Color_White) {
631	/* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */
632	XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1,
633	DisplayPlanes(R->Xdisplay, Xscreen));
634	}
635	# endif
636
637	R->PixColors[idx] = xcol;
638	SET_PIXCOLOR(R->h, idx);
639
640	/* XSetWindowAttributes attr; */
641	/* Cursor cursor; */
642	Done:
643	if (idx == Color_bg && !(R->Options & Opt_transparent))
644	XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
645	R->PixColors[Color_bg]);
646
647	/* handle Color_BD, scrollbar background, etc. */
648
649	rxvt_set_colorfgbg(aR);
650	rxvt_recolour_cursor(aR);
651	/* the only reasonable way to enforce a clean update */
652	rxvt_scr_poweron(aR);
653	}
654
655	#else
656	# define rxvt_set_window_color(aR_ idx,color) ((void)0)	1031	# define set_window_color (idx,color) ((void)0)
657	#endif /* XTERM_COLOR_CHANGE */	1032	#endif /* XTERM_COLOR_CHANGE */
658		1033
659	/* EXTPROTO */
660	void	1034	void
661	rxvt_recolour_cursor(pR)	1035	rxvt_term::recolour_cursor ()
662	{	1036	{
663	rxvt_color xcol[2];	1037	XColor xcol[2];
664		1038
665	#if TODO	1039	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
666	xcol[0] = R->PixColors[Color_pointer];	1040	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
667	xcol[1] = R->PixColors[Color_bg];	1041	XQueryColors (display->display, display->cmap, xcol, 2);
668	XQueryColors(R->Xdisplay, XCMAP, xcol, 2);
669	XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1]));	1042	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
670	#endif
671	}	1043	}
672		1044
673	/*----------------------------------------------------------------------*/	1045	/*----------------------------------------------------------------------*/
674	/*	1046	/*
675	* find if fg/bg matches any of the normal (low-intensity) colors	1047	* find if fg/bg matches any of the normal (low-intensity) colors
676	*/	1048	*/
677	/* INTPROTO */
678	void	1049	void
679	rxvt_set_colorfgbg(pR)	1050	rxvt_term::set_colorfgbg ()
680	{	1051	{
681	unsigned int i;	1052	unsigned int i;
682	const char *xpmb = "\0";	1053	const char *xpmb = "\0";
683	char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];	1054	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
684		1055
		1056	env_colorfgbg =
685	R->h->env_colorfgbg = (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);	1057	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
686	STRCPY(fstr, "default");	1058	STRCPY (fstr, "default");
687	STRCPY(bstr, "default");	1059	STRCPY (bstr, "default");
688	for (i = Color_Black; i <= Color_White; i++)	1060	for (i = Color_Black; i <= Color_White; i++)
689	if (R->PixColors[Color_fg] == R->PixColors[i]) {	1061	if (PixColors[Color_fg] == PixColors[i])
		1062	{
690	sprintf(fstr, "%d", (i - Color_Black));	1063	sprintf (fstr, "%d", (i - Color_Black));
691	break;	1064	break;
692	}	1065	}
693	for (i = Color_Black; i <= Color_White; i++)	1066	for (i = Color_Black; i <= Color_White; i++)
694	if (R->PixColors[Color_bg] == R->PixColors[i]) {	1067	if (PixColors[Color_bg] == PixColors[i])
		1068	{
695	sprintf(bstr, "%d", (i - Color_Black));	1069	sprintf (bstr, "%d", (i - Color_Black));
696	#ifdef XPM_BACKGROUND	1070	#ifdef XPM_BACKGROUND
697	xpmb = "default;";	1071	xpmb = "default;";
698	#endif	1072	#endif
699	break;	1073	break;
700	}	1074	}
		1075
701	sprintf(R->h->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1076	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
702	putenv(R->h->env_colorfgbg);
703		1077
704	#ifndef NO_BRIGHTCOLOR	1078	#ifndef NO_BRIGHTCOLOR
705	R->h->colorfgbg = DEFAULT_RSTYLE;	1079	colorfgbg = DEFAULT_RSTYLE;
706	for (i = minCOLOR; i <= maxCOLOR; i++) {	1080	for (i = minCOLOR; i <= maxCOLOR; i++)
		1081	{
707	if (R->PixColors[Color_fg] == R->PixColors[i])	1082	if (PixColors[Color_fg] == PixColors[i])
708	R->h->colorfgbg = SET_FGCOLOR(R->h->colorfgbg, i);	1083	colorfgbg = SET_FGCOLOR (colorfgbg, i);
709	if (R->PixColors[Color_bg] == R->PixColors[i])	1084	if (PixColors[Color_bg] == PixColors[i])
710	R->h->colorfgbg = SET_BGCOLOR(R->h->colorfgbg, i);	1085	colorfgbg = SET_BGCOLOR (colorfgbg, i);
711	}	1086	}
712	#endif	1087	#endif
713	}	1088	}
714		1089
715	/*----------------------------------------------------------------------*/	1090	/*----------------------------------------------------------------------*/
716	/*	1091	/*
717	* Colour determination for low colour displays, routine from	1092	* Colour determination for low colour displays, routine from
718	* Hans de Goede <hans@highrise.nl>	1093	* Hans de Goede <hans@highrise.nl>
719	*/	1094	*/
720		1095
721	/* EXTPROTO */
722	int	1096	int
723	rxvt_rXParseAllocColor(pR_ rxvt_color *screen_in_out, const char *colour)	1097	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
724	{	1098	{
725	screen_in_out->set (aR_ colour);
726
727	if (!screen_in_out->set (aR_ colour))	1099	if (!screen_in_out->set (display, colour))
728	{	1100	{
729	rxvt_print_error("can't allocate colour: %s", colour);	1101	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
730	return false;	1102	return false;
731	}	1103	}
732		1104
733	return true;	1105	return true;
734	}	1106	}
735		1107
736	/* -------------------------------------------------------------------- *	1108	/* -------------------------------------------------------------------- *
737	* - WINDOW RESIZING - *	1109	* - WINDOW RESIZING - *
738	* -------------------------------------------------------------------- */	1110	* -------------------------------------------------------------------- */
739	/* EXTPROTO */
740	void	1111	void
741	rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, int ignoreparent)	1112	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
742	{	1113	{
743	int fix_screen;	1114	int fix_screen;
		1115
744	#ifdef SMART_RESIZE	1116	#ifdef SMART_RESIZE
745	int old_width = R->szHint.width,	1117	int old_width = szHint.width, old_height = szHint.height;
746	old_height = R->szHint.height;
747	#endif	1118	#endif
748		1119
749	rxvt_window_calc(aR_ width, height);	1120	window_calc (width, height);
750	XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint);	1121	XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
		1122
751	if (!ignoreparent) {	1123	if (!ignoreparent)
		1124	{
752	#ifdef SMART_RESIZE	1125	#ifdef SMART_RESIZE
753	/*	1126	/*
754	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>	1127	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
755	* reposition window on resize depending on placement on screen	1128	* reposition window on resize depending on placement on screen
756	*/	1129	*/
757	int x, y, x1, y1;	1130	int x, y, x1, y1;
758	int dx, dy;	1131	int dx, dy;
759	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1132	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
760	Window unused_cr;	1133	Window unused_cr;
761		1134
762	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot,	1135	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
763	0, 0, &x, &y, &unused_cr);	1136	0, 0, &x, &y, &unused_cr);
764	XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1,	1137	XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
765	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1138	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
766	/*	1139	/*
767	* if Xroot isn't the parent window, a WM will probably have offset	1140	* if display->root isn't the parent window, a WM will probably have offset
768	* our position for handles and decorations. Counter it	1141	* our position for handles and decorations. Counter it
769	*/	1142	*/
770	if (x1 != x || y1 != y) {	1143	if (x1 != x || y1 != y)
		1144	{
771	x -= x1;	1145	x -= x1;
772	y -= y1;	1146	y -= y1;
773	}	1147	}
774		1148
775	x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2;	1149	x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
776	y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2;	1150	y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
777	dx = old_width - R->szHint.width;	1151	dx = old_width - szHint.width;
778	dy = old_height - R->szHint.height;	1152	dy = old_height - szHint.height;
779		1153
780	/* Check position of the center of the window */	1154	/* Check position of the center of the window */
781	if (x < x1) /* left half */	1155	if (x < x1) /* left half */
782	dx = 0;	1156	dx = 0;
783	else if (x == x1) /* exact center */	1157	else if (x == x1) /* exact center */
784	dx /= 2;	1158	dx /= 2;
785	if (y < y1) /* top half */	1159	if (y < y1) /* top half */
786	dy = 0;	1160	dy = 0;
787	else if (y == y1) /* exact center */	1161	else if (y == y1) /* exact center */
788	dy /= 2;	1162	dy /= 2;
789		1163
790	XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,	1164	XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
791	R->szHint.width, R->szHint.height);	1165	szHint.width, szHint.height);
792	#else	1166	#else
793	XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,	1167	XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
794	R->szHint.height);
795	#endif	1168	#endif
796	}	1169	}
797		1170
798	fix_screen = (R->TermWin.ncol != R->h->prev_ncol	1171	fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
799	|| R->TermWin.nrow != R->h->prev_nrow);	1172
800	if (fix_screen || width != R->h->old_width || height != R->h->old_height) {	1173	if (fix_screen || width != old_width || height != old_height)
		1174	{
801	if (scrollbar_visible(R)) {	1175	if (scrollbar_visible ())
802	XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->h->window_sb_x,	1176	{
803	0, scrollbar_TotalWidth(), R->szHint.height);	1177	XMoveResizeWindow (display->display, scrollBar.win,
804	rxvt_Resize_scrollBar(aR);	1178	window_sb_x, 0,
805	}	1179	scrollbar_TotalWidth (), szHint.height);
		1180	resize_scrollbar ();
		1181	}
		1182
806	if (menubar_visible(R))	1183	if (menubar_visible ())
807	XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->h->window_vt_x,	1184	XMoveResizeWindow (display->display, menuBar.win,
808	0, TermWin_TotalWidth(), menuBar_TotalHeight());	1185	window_vt_x, 0,
809	XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->h->window_vt_x,	1186	TermWin_TotalWidth (), menuBar_TotalHeight ());
810	R->h->window_vt_y, TermWin_TotalWidth(),	1187
811	TermWin_TotalHeight());	1188	XMoveResizeWindow (display->display, TermWin.vt,
812	#ifdef RXVT_GRAPHICS	1189	window_vt_x, window_vt_y,
813	if (R->h->old_height)	1190	TermWin_TotalWidth (), TermWin_TotalHeight ());
814	rxvt_Gr_Resize(aR_ R->h->old_width - R->szHint.base_width,	1191	scr_clear ();
815	R->h->old_height - R->szHint.base_height);
816	#endif
817	rxvt_scr_clear(aR);
818	#ifdef XPM_BACKGROUND	1192	#ifdef XPM_BACKGROUND
819	rxvt_resize_pixmap(aR);	1193	resize_pixmap ();
820	#endif	1194	#endif
821	}	1195	}
822		1196
823	if (fix_screen || R->h->old_height == 0) {	1197	if (fix_screen || old_height == 0)
824	int curr_screen = -1;	1198	{
825	uint16_t old_ncol = R->h->prev_ncol;	1199	int curr_screen = -1;
		1200	int old_ncol = prev_ncol;
826		1201
827	/* scr_reset only works on the primary screen */	1202	/* scr_reset only works on the primary screen */
828	if (R->h->old_height) /* this is not the first time through */	1203	if (old_height) /* this is not the first time through */
		1204	{
		1205	unsigned int ncol = TermWin.ncol;
		1206	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
829	curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);	1207	curr_screen = scr_change_screen (PRIMARY);
830	rxvt_scr_reset(aR);	1208	TermWin.ncol = ncol;
		1209	}
		1210
		1211	scr_reset ();
		1212
831	if (curr_screen >= 0) { /* this is not the first time through */	1213	if (curr_screen >= 0) /* this is not the first time through */
832	rxvt_scr_change_screen(aR_ curr_screen);	1214	{
		1215	scr_change_screen (curr_screen);
833	rxvt_selection_check(aR_ (old_ncol != R->TermWin.ncol ? 4 : 0));	1216	selection_check (old_ncol != TermWin.ncol ? 4 : 0);
834	}	1217	}
835	}	1218	}
836		1219
837	R->h->old_width = R->szHint.width;	1220	old_width = szHint.width;
838	R->h->old_height = R->szHint.height;	1221	old_height = szHint.height;
839		1222
840	#ifdef USE_XIM	1223	#ifdef USE_XIM
841	rxvt_IMSetStatusPosition(aR);	1224	IMSetStatusPosition ();
842	#endif	1225	#endif
843	}	1226	}
844		1227
845	/*	1228	/*
846	* Set the width/height of the vt window in characters. Units are pixels.	1229	* Set the width/height of the vt window in characters. Units are pixels.
847	* good for toggling 80/132 columns	1230	* good for toggling 80/132 columns
848	*/	1231	*/
849	/* EXTPROTO */
850	void	1232	void
851	rxvt_set_widthheight(pR_ unsigned int width, unsigned int height)	1233	rxvt_term::set_widthheight (unsigned int width, unsigned int height)
852	{	1234	{
853	XWindowAttributes wattr;	1235	XWindowAttributes wattr;
854		1236
855	if (width == 0 || height == 0) {	1237	if (width == 0 || height == 0)
		1238	{
856	XGetWindowAttributes(R->Xdisplay, Xroot, &wattr);	1239	XGetWindowAttributes (display->display, display->root, &wattr);
857	if (width == 0)	1240	if (width == 0)
858	width = wattr.width - R->szHint.base_width;	1241	width = wattr.width - szHint.base_width;
859	if (height == 0)	1242	if (height == 0)
860	height = wattr.height - R->szHint.base_height;	1243	height = wattr.height - szHint.base_height;
861	}	1244	}
		1245
862	if (width != R->TermWin.width || height != R->TermWin.height) {	1246	if (width != TermWin.width || height != TermWin.height)
		1247	{
863	width += R->szHint.base_width;	1248	width += szHint.base_width;
864	height += R->szHint.base_height;	1249	height += szHint.base_height;
865	rxvt_resize_all_windows(aR_ width, height, 0);	1250	resize_all_windows (width, height, 0);
866	}	1251	}
867	}	1252	}
868		1253
869	/* -------------------------------------------------------------------- *	1254	/* -------------------------------------------------------------------- *
870	* - X INPUT METHOD ROUTINES - *	1255	* - X INPUT METHOD ROUTINES - *
871	* -------------------------------------------------------------------- */	1256	* -------------------------------------------------------------------- */
872	#ifdef USE_XIM	1257	#ifdef USE_XIM
873	/* INTPROTO */	1258
874	void	1259	void
875	rxvt_setSize(pR_ XRectangle *size)	1260	rxvt_term::im_set_size (XRectangle *size)
876	{	1261	{
877	size->x = R->TermWin.int_bwidth;	1262	size->x = TermWin.int_bwidth;
878	size->y = R->TermWin.int_bwidth;	1263	size->y = TermWin.int_bwidth;
879	size->width = Width2Pixel(R->TermWin.ncol);	1264	size->width = Width2Pixel (TermWin.ncol);
880	size->height = Height2Pixel(R->TermWin.nrow);	1265	size->height = Height2Pixel (TermWin.nrow);
881	}	1266	}
882		1267
883	/* INTPROTO */
884	void	1268	void
885	rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg)	1269	rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
886	{	1270	{
887	*fg = R->PixColors[Color_fg];	1271	*fg = PixColors[Color_fg];
888	*bg = R->PixColors[Color_bg];	1272	*bg = PixColors[Color_bg];
889	}	1273	}
890		1274
891	/* Checking whether input method is running. */	1275	/* Checking whether input method is running. */
892	/* INTPROTO */
893	Bool	1276	bool
894	rxvt_IMisRunning(pR)	1277	rxvt_term::IMisRunning ()
895	{	1278	{
896	char *p;	1279	char *p;
897	Atom atom;	1280	Atom atom;
898	Window win;	1281	Window win;
899	char server[IMBUFSIZ];	1282	char server[IMBUFSIZ];
900		1283
901	/* get current locale modifier */	1284	/* get current locale modifier */
902	if ((p = XSetLocaleModifiers(NULL)) != NULL) {	1285	if ((p = XSetLocaleModifiers (NULL)) != NULL)
		1286	{
903	STRCPY(server, "@server=");	1287	STRCPY (server, "@server=");
904	STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1288	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
905	if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */	1289	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
906	*p = '\0';	1290	*p = '\0';
907		1291
908	atom = XInternAtom(R->Xdisplay, server, False);	1292	atom = XInternAtom (display->display, server, False);
909	win = XGetSelectionOwner(R->Xdisplay, atom);	1293	win = XGetSelectionOwner (display->display, atom);
910	if (win != None)	1294	if (win != None)
911	return True;	1295	return True;
912	}	1296	}
913	return False;	1297	return False;
914	}	1298	}
915		1299
916	/* EXTPROTO */
917	void	1300	void
918	rxvt_IMSendSpot(pR)	1301	rxvt_term::IMSendSpot ()
919	{	1302	{
920	XPoint spot;	1303	XPoint spot;
921	XVaNestedList preedit_attr;	1304	XVaNestedList preedit_attr;
922		1305
923	if (R->h->Input_Context == NULL	1306	if (Input_Context == NULL
924	|| !R->TermWin.focus	1307	|| !TermWin.focus || ! (input_style & XIMPreeditPosition)
925	|| !(R->h->input_style & XIMPreeditPosition)
926	|| !(R->h->event_type == KeyPress	1308	|| ! (event_type == KeyPress
927	|| R->h->event_type == Expose	1309	|| event_type == Expose
928	|| R->h->event_type == NoExpose	1310	|| event_type == NoExpose
929	|| R->h->event_type == SelectionNotify	1311	|| event_type == SelectionNotify
930	|| R->h->event_type == ButtonRelease	1312	|| event_type == ButtonRelease || event_type == FocusIn)
931	|| R->h->event_type == FocusIn)	1313	|| !IMisRunning ())
932	|| !rxvt_IMisRunning(aR))	1314	return;
933	return;
934		1315
935	rxvt_setPosition(aR_ &spot);	1316	im_set_position (&spot);
936		1317
937	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);	1318	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
938	XSetICValues(R->h->Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1319	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
939	XFree(preedit_attr);	1320	XFree (preedit_attr);
940	}	1321	}
941		1322
942	/* EXTPROTO */
943	void	1323	void
944	rxvt_setTermFontSet(pR_ int idx)	1324	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
		1325	XRectangle * needed_rect)
945	{	1326	{
946	char *string;	1327	int mbh, vtx = 0;
947	long length;
948	int success = 0;
949		1328
950	if (idx < 0 || idx >= MAX_NFONTS)
951	return;
952	}
953
954	/* INTPROTO */
955	void
956	rxvt_setPreeditArea(pR_ XRectangle *preedit_rect, XRectangle *status_rect, XRectangle *needed_rect)
957	{
958	int mbh, vtx = 0;
959
960	if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))	1329	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
961	vtx = scrollbar_TotalWidth();	1330	vtx = scrollbar_TotalWidth ();
		1331
962	mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;	1332	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
963	mbh -= R->TermWin.lineSpace;	1333	mbh -= TermWin.lineSpace;
964		1334
965	preedit_rect->x = needed_rect->width + vtx;	1335	preedit_rect->x = needed_rect->width + vtx;
966	preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;	1336	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
967		1337
968	preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width	1338	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
969	+ vtx;
970	preedit_rect->height = Height2Pixel(1);	1339	preedit_rect->height = Height2Pixel (1);
971		1340
972	status_rect->x = vtx;	1341	status_rect->x = vtx;
973	status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;	1342	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
974		1343
975	status_rect->width = needed_rect->width ? needed_rect->width	1344	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
976	: Width2Pixel(R->TermWin.ncol + 1);
977	status_rect->height = Height2Pixel(1);	1345	status_rect->height = Height2Pixel (1);
978	}	1346	}
979		1347
980	/* ARGSUSED */
981	/* INTPROTO */
982	void	1348	void
983	rxvt_IMDestroyCallback(XIM xim __attribute__((unused)), XPointer client_data __attribute__((unused)), XPointer call_data __attribute__((unused)))	1349	rxvt_term::im_destroy ()
984	{	1350	{
985	dR;	1351	if (Input_Context)
986		1352	{
		1353	XDestroyIC (Input_Context);
987	R->h->Input_Context = NULL;	1354	Input_Context = NULL;
988	/* To avoid Segmentation Fault in C locale: Solaris only? */
989	if (STRCMP(R->h->locale, "C"))
990	XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
991	rxvt_IMInstantiateCallback, NULL);
992	}
993
994	/*
995	* X manual pages and include files don't match on some systems:
996	* some think this is an XIDProc and others an XIMProc so we can't
997	* use the first argument - need to update this to be nice for
998	* both types via some sort of configure detection
999	*/
1000	/* ARGSUSED */
1001	/* EXTPROTO */
1002	void
1003	rxvt_IMInstantiateCallback(Display *unused __attribute__((unused)), XPointer client_data __attribute__((unused)), XPointer call_data __attribute__((unused)))
1004	{
1005	dR;
1006	int i, found, had_im;
1007	const char *p;
1008	char **s;
1009	char buf[IMBUFSIZ];
1010
1011	D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1012	if (R->h->Input_Context)
1013	return;
1014
1015	found = had_im = 0;
1016	p = R->h->rs[Rs_inputMethod];
1017	if (p && *p) {
1018	had_im = 1;
1019	s = rxvt_splitcommastring(p);
1020	for (i = 0; s[i]; i++) {
1021	if (*s[i]) {
1022	STRCPY(buf, "@im=");
1023	STRNCAT(buf, s[i], IMBUFSIZ - 5);
1024	if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1025	&& (rxvt_IM_get_IC(aR) == True)) {
1026	found = 1;
1027	break;
1028	}
1029	}	1355	}
1030	}	1356
1031	for (i = 0; s[i]; i++)	1357	if (input_method)
1032	free(s[i]);
1033	free(s);
1034	}	1358	{
1035	if (found)	1359	display->put_xim (input_method);
1036	return;	1360	input_method = 0;
1037
1038	/* try with XMODIFIERS env. var. */
1039	if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1040	rxvt_IM_get_IC(aR);
1041	return;
1042	}	1361	}
1043
1044	/* try with no modifiers base IF the user didn't specify an IM */
1045	if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1046	&& rxvt_IM_get_IC(aR) == True)
1047	return;
1048	}	1362	}
1049		1363
1050	/*	1364	/*
1051	* Try to open a XIM with the current modifiers, then see if we can	1365	* Try to open a XIM with the current modifiers, then see if we can
1052	* open a suitable preedit type	1366	* open a suitable preedit type
1053	*/	1367	*/
1054	/* INTPROTO */
1055	Bool	1368	bool
1056	rxvt_IM_get_IC(pR)	1369	rxvt_term::IM_get_IC (const char *modifiers)
1057	{	1370	{
1058	int i, j, found;	1371	int i, j, found;
1059	XIM xim;	1372	XIM xim;
1060	XPoint spot;	1373	XPoint spot;
1061	XRectangle rect, status_rect, needed_rect;	1374	XRectangle rect, status_rect, needed_rect;
1062	unsigned long fg, bg;	1375	unsigned long fg, bg;
1063	const char *p;	1376	const char *p;
1064	char **s;	1377	char **s;
1065	XIMStyles *xim_styles;	1378	XIMStyles *xim_styles;
1066	XVaNestedList preedit_attr, status_attr;	1379	XVaNestedList preedit_attr, status_attr;
1067	XIMCallback ximcallback;
1068	struct rxvt_hidden *h = R->h;
1069		1380
		1381	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
		1382	return false;
		1383
1070	D_MAIN((stderr, "rxvt_IM_get_IC()"));	1384	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1071	xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);	1385	input_method = display->get_xim (locale, modifiers);
1072	if (xim == NULL)	1386	if (input_method == NULL)
1073	return False;	1387	return false;
1074		1388
		1389	xim = input_method->xim;
		1390
1075	xim_styles = NULL;	1391	xim_styles = NULL;
1076	if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)	1392	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1077	|| !xim_styles || !xim_styles->count_styles) {	1393	|| !xim_styles || !xim_styles->count_styles)
1078	XCloseIM(xim);
1079	return False;
1080	}	1394	{
		1395	display->put_xim (input_method);
		1396	return false;
		1397	}
1081		1398
1082	p = h->rs[Rs_preeditType] ? h->rs[Rs_preeditType]	1399	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1083	: "OverTheSpot,OffTheSpot,Root";
1084	s = rxvt_splitcommastring(p);	1400	s = rxvt_splitcommastring (p);
1085	for (i = found = 0; !found && s[i]; i++) {	1401	for (i = found = 0; !found && s[i]; i++)
		1402	{
1086	if (!STRCMP(s[i], "OverTheSpot"))	1403	if (!STRCMP (s[i], "OverTheSpot"))
1087	h->input_style = (XIMPreeditPosition | XIMStatusNothing);	1404	input_style = (XIMPreeditPosition | XIMStatusNothing);
1088	else if (!STRCMP(s[i], "OffTheSpot"))	1405	else if (!STRCMP (s[i], "OffTheSpot"))
1089	h->input_style = (XIMPreeditArea | XIMStatusArea);	1406	input_style = (XIMPreeditArea | XIMStatusArea);
1090	else if (!STRCMP(s[i], "Root"))	1407	else if (!STRCMP (s[i], "Root"))
1091	h->input_style = (XIMPreeditNothing | XIMStatusNothing);	1408	input_style = (XIMPreeditNothing | XIMStatusNothing);
1092		1409
1093	for (j = 0; j < xim_styles->count_styles; j++)	1410	for (j = 0; j < xim_styles->count_styles; j++)
1094	if (h->input_style == xim_styles->supported_styles[j]) {	1411	if (input_style == xim_styles->supported_styles[j])
1095	found = 1;	1412	{
1096	break;	1413	found = 1;
		1414	break;
		1415	}
1097	}	1416	}
1098	}	1417
1099	for (i = 0; s[i]; i++)	1418	for (i = 0; s[i]; i++)
1100	free(s[i]);	1419	free (s[i]);
		1420
1101	free(s);	1421	free (s);
1102	XFree(xim_styles);	1422	XFree (xim_styles);
1103		1423
1104	if (!found) {	1424	if (!found)
1105	XCloseIM(xim);
1106	return False;
1107	}	1425	{
		1426	display->put_xim (input_method);
		1427	return false;
		1428	}
1108		1429
1109	ximcallback.callback = rxvt_IMDestroyCallback;
1110
1111	/* XXX: not sure why we need this (as well as IC one below) */
1112	XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1113
1114	preedit_attr = status_attr = NULL;	1430	preedit_attr = status_attr = NULL;
1115		1431
1116	if (h->input_style & XIMPreeditPosition) {	1432	if (input_style & XIMPreeditPosition)
1117	rxvt_setSize(aR_ &rect);	1433	{
1118	rxvt_setPosition(aR_ &spot);	1434	im_set_size (&rect);
1119	rxvt_setColor(aR_ &fg, &bg);	1435	im_set_position (&spot);
		1436	im_set_color (&fg, &bg);
1120		1437
1121	preedit_attr = XVaCreateNestedList(0, XNArea, &rect,	1438	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1122	XNSpotLocation, &spot,	1439	XNSpotLocation, &spot,
1123	XNForeground, fg,	1440	XNForeground, fg, XNBackground, bg,
1124	XNBackground, bg,	1441	//XNFontSet, TermWin.fontset,
1125	//XNFontSet, R->TermWin.fontset,
1126	NULL);
1127	} else if (h->input_style & XIMPreeditArea) {
1128	rxvt_setColor(aR_ &fg, &bg);
1129
1130	/*
1131	* The necessary width of preedit area is unknown
1132	* until create input context.
1133	*/
1134	needed_rect.width = 0;
1135
1136	rxvt_setPreeditArea(aR_ &rect, &status_rect, &needed_rect);
1137
1138	preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1139	XNForeground, fg,
1140	XNBackground, bg,
1141	//XNFontSet, R->TermWin.fontset,
1142	NULL);
1143	status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1144	XNForeground, fg,
1145	XNBackground, bg,
1146	//XNFontSet, R->TermWin.fontset,
1147	NULL);	1442	NULL);
		1443	}
		1444	else if (input_style & XIMPreeditArea)
1148	}	1445	{
		1446	im_set_color (&fg, &bg);
		1447
		1448	/*
		1449	* The necessary width of preedit area is unknown
		1450	* until create input context.
		1451	*/
		1452	needed_rect.width = 0;
		1453
		1454	im_set_preedit_area (&rect, &status_rect, &needed_rect);
		1455
		1456	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
		1457	XNForeground, fg, XNBackground, bg,
		1458	//XNFontSet, TermWin.fontset,
		1459	NULL);
		1460	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
		1461	XNForeground, fg, XNBackground, bg,
		1462	//XNFontSet, TermWin.fontset,
		1463	NULL);
		1464	}
		1465
1149	h->Input_Context = XCreateIC(xim, XNInputStyle, h->input_style,	1466	Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1150	XNClientWindow, R->TermWin.parent[0],	1467	XNClientWindow, TermWin.parent[0],
1151	XNFocusWindow, R->TermWin.parent[0],	1468	XNFocusWindow, TermWin.parent[0],
1152	XNDestroyCallback, &ximcallback,	1469	preedit_attr ? XNPreeditAttributes : NULL,
1153	preedit_attr ? XNPreeditAttributes : NULL,	1470	preedit_attr,
1154	preedit_attr,	1471	status_attr ? XNStatusAttributes : NULL,
1155	status_attr ? XNStatusAttributes : NULL,	1472	status_attr, NULL);
1156	status_attr, NULL);	1473	if (preedit_attr) XFree (preedit_attr);
1157	if (preedit_attr)	1474	if (status_attr) XFree (status_attr);
1158	XFree(preedit_attr);	1475
1159	if (status_attr)
1160	XFree(status_attr);
1161	if (h->Input_Context == NULL) {	1476	if (Input_Context == NULL)
1162	rxvt_print_error("failed to create input context");
1163	XCloseIM(xim);
1164	return False;
1165	}	1477	{
		1478	rxvt_warn ("failed to create input context, continuing without XIM.\n");
		1479	display->put_xim (input_method);
		1480	return false;
		1481	}
		1482
1166	if (h->input_style & XIMPreeditArea)	1483	if (input_style & XIMPreeditArea)
1167	rxvt_IMSetStatusPosition(aR);	1484	IMSetStatusPosition ();
		1485
1168	D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));	1486	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1169	return True;	1487	return true;
1170	}	1488	}
1171		1489
1172	/* EXTPROTO */
1173	void	1490	void
		1491	rxvt_term::im_cb ()
		1492	{
		1493	int i, found, had_im;
		1494	const char *p;
		1495	char **s;
		1496	char buf[IMBUFSIZ];
		1497
		1498	im_destroy ();
		1499
		1500	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
		1501	if (Input_Context)
		1502	return;
		1503
		1504	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
		1505	if (rs[Rs_imLocale])
		1506	SET_LOCALE (rs[Rs_imLocale]);
		1507	#endif
		1508
		1509	p = rs[Rs_inputMethod];
		1510	if (p && *p)
		1511	{
		1512	bool found = false;
		1513
		1514	s = rxvt_splitcommastring (p);
		1515	for (i = 0; s[i]; i++)
		1516	{
		1517	if (*s[i])
		1518	{
		1519	STRCPY (buf, "@im=");
		1520	STRNCAT (buf, s[i], IMBUFSIZ - 5);
		1521	if (IM_get_IC (buf))
		1522	{
		1523	found = true;
		1524	break;
		1525	}
		1526	}
		1527	}
		1528	for (i = 0; s[i]; i++)
		1529	free (s[i]);
		1530	free (s);
		1531
		1532	if (found)
		1533	goto done;
		1534	}
		1535
		1536	/* try with XMODIFIERS env. var. */
		1537	if (IM_get_IC (""))
		1538	goto done;
		1539
		1540	/* try with no modifiers base IF the user didn't specify an IM */
		1541	if (IM_get_IC ("@im=none"))
		1542	goto done;
		1543
		1544	done:
		1545	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
		1546	if (rs[Rs_imLocale])
		1547	SET_LOCALE (locale);
		1548	#endif
		1549	}
		1550
		1551	void
1174	rxvt_IMSetStatusPosition(pR)	1552	rxvt_term::IMSetStatusPosition ()
1175	{	1553	{
1176	XRectangle preedit_rect, status_rect, *needed_rect;	1554	XRectangle preedit_rect, status_rect, *needed_rect;
1177	XVaNestedList preedit_attr, status_attr;	1555	XVaNestedList preedit_attr, status_attr;
1178		1556
1179	if (R->h->Input_Context == NULL	1557	if (Input_Context == NULL
1180	|| !R->TermWin.focus	1558	|| !TermWin.focus || ! (input_style & XIMPreeditArea)
1181	|| !(R->h->input_style & XIMPreeditArea)	1559	|| !IMisRunning ())
1182	|| !rxvt_IMisRunning(aR))	1560	return;
1183	return;
1184		1561
1185	/* Getting the necessary width of preedit area */	1562	/* Getting the necessary width of preedit area */
1186	status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);	1563	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1187	XGetICValues(R->h->Input_Context, XNStatusAttributes, status_attr, NULL);	1564	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1188	XFree(status_attr);	1565	XFree (status_attr);
1189		1566
1190	rxvt_setPreeditArea(aR_ &preedit_rect, &status_rect, needed_rect);	1567	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1191		1568
1192	preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);	1569	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1193	status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);	1570	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1194		1571
1195	XSetICValues(R->h->Input_Context,	1572	XSetICValues (Input_Context,
1196	XNPreeditAttributes, preedit_attr,	1573	XNPreeditAttributes, preedit_attr,
1197	XNStatusAttributes, status_attr, NULL);	1574	XNStatusAttributes, status_attr, NULL);
1198		1575
1199	XFree(preedit_attr);	1576	XFree (preedit_attr);
1200	XFree(status_attr);	1577	XFree (status_attr);
1201	}	1578	}
1202	#endif /* USE_XIM */	1579	#endif /* USE_XIM */
1203		1580
1204	/*----------------------------------------------------------------------*/	1581	/*----------------------------------------------------------------------*/
1205	rxvt_t *rxvt_current_term;	1582	rxvt_t rxvt_current_term;
1206		1583
1207	/*----------------------- end-of-file (C source) -----------------------*/	1584	/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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