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

Diff Legend

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