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.80 by root, Fri Aug 13 19:31:23 2004 UTC vs.
Revision 1.219 by root, Sat Feb 11 02:28:19 2006 UTC

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

Diff Legend

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