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

Diff Legend

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