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

Diff Legend

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