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.30 by pcg, Thu Feb 12 01:53:25 2004 UTC vs.
Revision 1.213 by root, Tue Jan 31 19:11:43 2006 UTC

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

Diff Legend

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