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

Diff Legend

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