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.51 by pcg, Sat Mar 6 00:05:01 2004 UTC vs.
Revision 1.183 by root, Tue Jan 17 10:19:13 2006 UTC

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

Diff Legend

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