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.54 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC

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

Diff Legend

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