ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.116 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.252 by root, Sun Jun 15 13:54:15 2008 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*----------------------------------------------------------------------*
2	* File: init.C	2	* File: init.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
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
		10	* Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
		11	* Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
		12	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	13	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	14	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support
14	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
15	*	16	*
16	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	20	* (at your option) any later version.
…		…
33		34
34	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	37	#include "rxvtutil.h"
37	#include "init.h"	38	#include "init.h"
		39	#include "keyboard.h"
		40
		41	#include <limits>
38		42
39	#include <csignal>	43	#include <csignal>
		44
		45	#include <fcntl.h>
		46
		47	#ifdef HAVE_XSETLOCALE
		48	# define X_LOCALE
		49	# include <X11/Xlocale.h>
		50	#else
		51	# ifdef HAVE_SETLOCALE
		52	# include <clocale>
		53	# endif
		54	#endif
		55
		56	#ifdef HAVE_NL_LANGINFO
		57	# include <langinfo.h>
		58	#endif
		59
		60	#ifdef DISPLAY_IS_IP
		61	/* On Solaris link with -lsocket and -lnsl */
		62	#include <sys/types.h>
		63	#include <sys/socket.h>
		64
		65	/* these next two are probably only on Sun (not Solaris) */
		66	#ifdef HAVE_SYS_SOCKIO_H
		67	#include <sys/sockio.h>
		68	#endif
		69	#ifdef HAVE_SYS_BYTEORDER_H
		70	#include <sys/byteorder.h>
		71	#endif
		72
		73	#include <netinet/in.h>
		74	#include <arpa/inet.h>
		75	#include <net/if.h>
		76	#include <net/if_arp.h>
		77
		78	static char *
		79	rxvt_network_display (const char *display)
		80	{
		81	char buffer[1024], *rval = NULL;
		82	struct ifconf ifc;
		83	struct ifreq *ifr;
		84	int i, skfd;
		85
		86	if (display[0] != ':' && strncmp (display, "unix:", 5))
		87	return (char *) display; /* nothing to do */
		88
		89	ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
		90	ifc.ifc_buf = buffer;
		91
		92	if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
		93	{
		94	perror ("socket");
		95	return NULL;
		96	}
		97
		98	if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
		99	{
		100	perror ("SIOCGIFCONF");
		101	close (skfd);
		102	return NULL;
		103	}
		104
		105	for (i = 0, ifr = ifc.ifc_req;
		106	i < (ifc.ifc_len / sizeof (struct ifreq));
		107	i++, ifr++)
		108	{
		109	struct ifreq ifr2;
		110
		111	strcpy (ifr2.ifr_name, ifr->ifr_name);
		112
		113	if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
		114	{
		115	unsigned long addr;
		116	struct sockaddr_in *p_addr;
		117
		118	p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
		119	addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
		120
		121	/*
		122	* not "0.0.0.0" or "127.0.0.1" - so format the address
		123	*/
		124	if (addr && addr != 0x7F000001)
		125	{
		126	char *colon = strchr (display, ':');
		127
		128	if (colon == NULL)
		129	colon = ":0.0";
		130
		131	rval = rxvt_malloc (strlen (colon) + 16);
		132	sprintf (rval, "%d.%d.%d.%d%s",
		133	(int) ((addr >> 030) & 0xFF),
		134	(int) ((addr >> 020) & 0xFF),
		135	(int) ((addr >> 010) & 0xFF),
		136	(int) (addr & 0xFF), colon);
		137	break;
		138	}
		139	}
		140	}
		141
		142	close (skfd);
		143
		144	return rval;
		145	}
		146	#endif
40		147
41	const char *const def_colorName[] =	148	const char *const def_colorName[] =
42	{	149	{
43	COLOR_FOREGROUND,	150	COLOR_FOREGROUND,
44	COLOR_BACKGROUND,	151	COLOR_BACKGROUND,
45	/* low-intensity colors */	152	/* low-intensity colors */
46	"Black", /* 0: black (#000000) */	153	"rgb:00/00/00", // 0: black (Black)
47	#ifndef NO_BRIGHTCOLOR	154	"rgb:cd/00/00", // 1: red (Red3)
48	"Red3", /* 1: red (#CD0000) */	155	"rgb:00/cd/00", // 2: green (Green3)
49	"Green3", /* 2: green (#00CD00) */	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
50	"Yellow3", /* 3: yellow (#CDCD00) */	157	"rgb:00/00/cd", // 4: blue (Blue3)
51	"Blue3", /* 4: blue (#0000CD) */	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
52	"Magenta3", /* 5: magenta (#CD00CD) */	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
53	"Cyan3", /* 6: cyan (#00CDCD) */
54	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
55	"Grey90", /* 7: white (#E5E5E5) */	161	"rgb:e5/e5/e5", // 7: white (Grey90)
56	# else	162	# else
57	"AntiqueWhite", /* 7: white (#FAEBD7) */	163	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
58	# endif	164	# endif
59	/* high-intensity colors */	165	/* high-intensity colors */
60	# ifdef XTERM_COLORS	166	# ifdef XTERM_COLORS
61	"Grey30", /* 8: bright black (#4D4D4D) */	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
62	# else	168	# else
63	"Grey25", /* 8: bright black (#404040) */	169	"rgb:40/40/40", // 8: bright black (Grey25)
64	# endif	170	# endif
65	#endif /* NO_BRIGHTCOLOR */	171	"rgb:ff/00/00", // 1/9: bright red (Reed)
66	"Red", /* 1/9: bright red (#FF0000) */	172	"rgb:00/ff/00", // 2/10: bright green (Green)
67	"Green", /* 2/10: bright green (#00FF00) */	173	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	174	"rgb:00/00/ff", // 4/12: bright blue (Blue)
69	"Blue", /* 4/12: bright blue (#0000FF) */	175	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	176	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71	"Cyan", /* 6/14: bright cyan (#00FFFF) */	177	"rgb:ff/ff/ff", // 7/15: bright white (White)
72	"White", /* 7/15: bright white (#FFFFFF) */
73		178
74	// 88 xterm colours	179	// 88 xterm colours
75	"rgb:00/00/00",	180	"rgb:00/00/00",
76	"rgb:00/00/8b",	181	"rgb:00/00/8b",
77	"rgb:00/00/cd",	182	"rgb:00/00/cd",
…		…
146	"rgb:e7/e7/e7",	251	"rgb:e7/e7/e7",
147		252
148	#ifndef NO_CURSORCOLOR	253	#ifndef NO_CURSORCOLOR
149	COLOR_CURSOR_BACKGROUND,	254	COLOR_CURSOR_BACKGROUND,
150	COLOR_CURSOR_FOREGROUND,	255	COLOR_CURSOR_FOREGROUND,
151	#endif /* ! NO_CURSORCOLOR */	256	#endif /* ! NO_CURSORCOLOR */
152	NULL, /* Color_pointer_fg */	257	NULL, /* Color_pointer_fg */
153	NULL, /* Color_pointer_bg */	258	NULL, /* Color_pointer_bg */
154	NULL, /* Color_border */	259	NULL, /* Color_border */
155	#ifndef NO_BOLD_UNDERLINE_REVERSE	260	#ifndef NO_BOLD_UNDERLINE_REVERSE
156	NULL, /* Color_BD */	261	NULL, /* Color_BD */
157	NULL, /* Color_IT */	262	NULL, /* Color_IT */
158	NULL, /* Color_UL */	263	NULL, /* Color_UL */
159	NULL, /* Color_RV */	264	NULL, /* Color_RV */
160	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	265	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161	#if ENABLE_FRILLS	266	#if ENABLE_FRILLS
162	NULL, // Color_underline	267	NULL, // Color_underline
163	#endif	268	#endif
164	#ifdef OPTION_HC	269	#ifdef OPTION_HC
165	NULL,	270	NULL,
166	#endif	271	#endif
167	#ifdef KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
		273	#ifdef RXVT_SCROLLBAR
169	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	275	#endif
171	#if TINTING	276	#if ENABLE_TRANSPARENCY
172	NULL,	277	NULL,
173	#endif	278	#endif
		279	#if OFF_FOCUS_FADING
		280	"rgb:00/00/00",
		281	#endif
174	};	282	};
175		283
176	const char *const xa_names[] =	284	void
177	{
178	"TEXT",
179	"COMPOUND_TEXT",
180	"UTF8_STRING",
181	"MULTIPLE",
182	"TARGETS",
183	"TIMESTAMP",
184	"VT_SELECTION",
185	"INCR",
186	"WM_PROTOCOLS",
187	"WM_DELETE_WINDOW",
188	"CLIPBOARD",
189	#if ENABLE_FRILLS
190	"_MOTIF_WM_HINTS",
191	#endif
192	#if ENABLE_EWMH
193	"_NET_WM_PID",
194	"_NET_WM_NAME",
195	"_NET_WM_ICON_NAME",
196	"_NET_WM_PING",
197	#endif
198	#if USE_XIM
199	"WM_LOCALE_NAME",
200	#endif
201	#ifdef TRANSPARENT
202	"_XROOTPMAP_ID",
203	"ESETROOT_PMAP_ID",
204	#endif
205	#ifdef OFFIX_DND
206	"DndProtocol",
207	"DndSelection",
208	#endif
209	#if ENABLE_XEMBED
210	"_XEMBED",
211	"_XEMBED_INFO",
212	#endif
213	};
214
215	bool
216	rxvt_term::init_vars ()	285	rxvt_term::init_vars ()
217	{	286	{
218	sw_term.start (SIGTERM);
219	sw_int.start (SIGINT);
220
221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222	#ifdef OFF_FOCUS_FADING
223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224	#endif
225	pix_colors = pix_colors_focused;	287	pix_colors = pix_colors_focused;
226
227	if (pix_colors == NULL)
228	return false;
229
230	#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231	TermWin.pixmap = None;
232	#endif
233		288
234	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
235	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
236	options = DEFAULT_OPTIONS;
237	want_refresh = 1;	291	want_refresh = 1;
238	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
239	TermWin.focus = 0;
240	TermWin.ncol = 80;	293	ncol = 80;
241	TermWin.nrow = 24;	294	nrow = 24;
242	TermWin.int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
243	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
244	TermWin.lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
245	TermWin.saveLines = SAVELINES;	298	saveLines = SAVELINES;
246	numpix_colors = TOTAL_COLORS;
247		299
248	refresh_limit = 1;
249	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
250	prev_nrow = prev_ncol = 0;
251		301
252	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
253	#ifdef XPM_BACKGROUND
254	/* bgPixmap.w = bgPixmap.h = 0; */
255	bgPixmap.x = bgPixmap.y = 50;
256	bgPixmap.pixmap = None;
257	#endif
258		303
259	last_bot = last_state = -1;	304	set_option (Opt_scrollBar);
260		305	set_option (Opt_scrollTtyOutput);
261	#ifdef MENUBAR	306	set_option (Opt_jumpScroll);
262	menu_readonly = 1;	307	set_option (Opt_skipScroll);
263	# if ! (MENUBAR_MAX > 1)	308	set_option (Opt_secondaryScreen);
264	CurrentBar = &BarList;	309	set_option (Opt_secondaryScroll);
265	# endif /* (MENUBAR_MAX > 1) */	310	set_option (Opt_pastableTabs);
266	#endif	311	set_option (Opt_intensityStyles);
267		312	set_option (Opt_iso14755_52);
268	return true;	313	set_option (Opt_buffered);
269	}	314	}
270		315
271	void	316	static void
272	rxvt_term::init_secondary ()	317	init_secondary ()
273	{	318	{
274	int i;	319	int i;
275		320
276	/*
277	* Close all unused file descriptors
278	* We don't want them, we don't need them.
279	*/
280	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
281	{	322	{
282	/* TODO: BOO HISS */
283	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
284	}	324	}
285	else if (i > STDIN_FILENO)	325	else if (i != STDIN_FILENO)
286	{	326	{
287	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
288	close (i);	328	close (i);
289	}	329	}
290		330
291	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
292
293	#if 0 // schmorp sayz closing filies is murder
294	for (i = STDERR_FILENO + 1; i < num_fds; i++)
295	{
296	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
297	if (i == 4 || i == 7)
298	continue;
299	#endif
300	close (i);
301	}
302	#endif
303	}	332	}
304		333
305	/*----------------------------------------------------------------------*/	334	/*----------------------------------------------------------------------*/
306	const char **	335	const char **
307	rxvt_term::init_resources (int argc, const char *const *argv)	336	rxvt_term::init_resources (int argc, const char *const *argv)
308	{	337	{
309	int i, r_argc;	338	int i, r_argc;
310	char *val;
311	const char **cmd_argv, **r_argv;	339	const char **cmd_argv, **r_argv;
312		340
313	/*	341	/*
314	* Look for -exec option. Find => split and make cmd_argv[] of command args	342	* Look for -e option. Find => split and make cmd_argv[] of command args
315	*/	343	*/
316	for (r_argc = 0; r_argc < argc; r_argc++)	344	for (r_argc = 0; r_argc < argc; r_argc++)
317	if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))	345	if (!strcmp (argv[r_argc], "-e"))
318	break;	346	break;
		347
		348	if (r_argc == argc)
		349	cmd_argv = NULL;
		350	else if (!argv[r_argc + 1])
		351	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		352	else
		353	{
		354	cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
		355
		356	for (i = 0; i < argc - r_argc - 1; i++)
		357	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		358
		359	cmd_argv[i] = NULL;
		360	}
319		361
320	r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));	362	r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321		363
322	for (i = 0; i < r_argc; i++)	364	for (i = 0; i < r_argc; i++)
323	r_argv[i] = (const char *)argv[i];	365	r_argv[i] = (const char *)argv[i];
324		366
325	r_argv[i] = NULL;	367	r_argv[i] = NULL;
326		368
327	if (r_argc == argc)
328	cmd_argv = NULL;
329	else
330	{
331	cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
332
333	for (i = 0; i < argc - r_argc - 1; i++)
334	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
335
336	cmd_argv[i] = NULL;
337	}
338
339	rs[Rs_name] = rxvt_r_basename (argv[0]);	369	rs[Rs_name] = rxvt_basename (argv[0]);
340		370
341	/*	371	/*
342	* Open display, get options/resources and create the window	372	* Open display, get options/resources and create the window
343	*/	373	*/
		374
344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	375	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345	rs[Rs_display_name] = ":0";	376	rs[Rs_display_name] = ":0";
346		377
347	get_options (r_argc, r_argv);	378	get_options (r_argc, r_argv);
348		379
349	#ifdef LOCAL_X_IS_UNIX
350	if (rs[Rs_display_name][0] == ':')
351	{
352	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
353	strcpy (val, "unix");
354	strcat (val, rs[Rs_display_name]);
355	display = displays.get (val);
356	free (val);
357	}
358	#endif
359
360	if (!display
361	&& ! (display = displays.get (rs[Rs_display_name])))	380	if (!(display = displays.get (rs[Rs_display_name])))
		381	{
		382	free (r_argv);
362	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	383	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		384	}
363		385
		386	// using a local pointer decreases code size a lot
		387	xa = display->xa;
		388
		389	set (display);
364	extract_resources ();	390	extract_resources ();
		391
		392	#if XFT
		393	if (rs[Rs_depth])
		394	select_visual (strtol (rs[Rs_depth], 0, 0));
		395	#endif
		396
		397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
		400	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		401	#endif
365	free (r_argv);	402	free (r_argv);
		403
		404	for (int i = NUM_RESOURCES; i--; )
		405	if (rs [i] == resval_undef)
		406	rs [i] = 0;
		407
		408	#if ENABLE_PERL
		409	if (!rs[Rs_perl_ext_1])
		410	rs[Rs_perl_ext_1] = "default";
		411
		412	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		413	|| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		414	|| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		415	{
		416	rxvt_perl.init (this);
		417	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		418	}
		419	#endif
366		420
367	/*	421	/*
368	* set any defaults not already set	422	* set any defaults not already set
369	*/	423	*/
370	if (cmd_argv && cmd_argv[0])	424	if (cmd_argv && cmd_argv[0])
371	{	425	{
372	if (!rs[Rs_title])	426	if (!rs[Rs_title])
373	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
374	if (!rs[Rs_iconName])	428	if (!rs[Rs_iconName])
375	rs[Rs_iconName] = rs[Rs_title];	429	rs[Rs_iconName] = rs[Rs_title];
376	}	430	}
377	else	431	else
378	{	432	{
…		…
381	if (!rs[Rs_iconName])	435	if (!rs[Rs_iconName])
382	rs[Rs_iconName] = rs[Rs_name];	436	rs[Rs_iconName] = rs[Rs_name];
383	}	437	}
384		438
385	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	439	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
386	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	440	saveLines = min (i, MAX_SAVELINES);
387		441
388	#if ENABLE_FRILLS	442	#if ENABLE_FRILLS
389	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	443	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
390	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	444	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		445
391	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	446	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
392	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	447	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		448
393	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	449	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
394	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	450	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
395	#endif	451	#endif
396		452
397	#ifdef POINTER_BLANK	453	#ifdef POINTER_BLANK
398	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	454	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
399	pointerBlankDelay = i;	455	pointerBlankDelay = i;
400	else	456	else
401	pointerBlankDelay = 2;	457	pointerBlankDelay = 2;
402	#endif	458	#endif
403		459
404	/* no point having a scrollbar without having any scrollback! */	460	/* no point having a scrollbar without having any scrollback! */
405	if (!TermWin.saveLines)	461	if (!saveLines)
406	options &= ~Opt_scrollBar;	462	set_option (Opt_scrollBar, 0);
407		463
408	#ifdef PRINTPIPE	464	#ifdef PRINTPIPE
409	if (!rs[Rs_print_pipe])	465	if (!rs[Rs_print_pipe])
410	rs[Rs_print_pipe] = PRINTPIPE;	466	rs[Rs_print_pipe] = PRINTPIPE;
411	#endif	467	#endif
…		…
414	rs[Rs_cutchars] = CUTCHARS;	470	rs[Rs_cutchars] = CUTCHARS;
415		471
416	#ifndef NO_BACKSPACE_KEY	472	#ifndef NO_BACKSPACE_KEY
417	if (!rs[Rs_backspace_key])	473	if (!rs[Rs_backspace_key])
418	# ifdef DEFAULT_BACKSPACE	474	# ifdef DEFAULT_BACKSPACE
419	key_backspace = DEFAULT_BACKSPACE;	475	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
420	# else	476	# else
421	key_backspace = "DEC"; /* can toggle between \010 or \177 */	477	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
422	# endif	478	# endif
423	else
424	{
425	val = strdup (rs[Rs_backspace_key]);
426	rxvt_Str_trim (val);
427	rxvt_Str_escaped (val);
428	key_backspace = val;
429	}
430	#endif	479	#endif
431		480
432	#ifndef NO_DELETE_KEY	481	#ifndef NO_DELETE_KEY
433	if (!rs[Rs_delete_key])	482	if (!rs[Rs_delete_key])
434	# ifdef DEFAULT_DELETE	483	# ifdef DEFAULT_DELETE
435	key_delete = DEFAULT_DELETE;	484	rs[Rs_delete_key] = DEFAULT_DELETE;
436	# else	485	# else
437	key_delete = "\033[3~";	486	rs[Rs_delete_key] = "\033[3~";
438	# endif
439	else
440	{
441	val = strdup (rs[Rs_delete_key]);
442	rxvt_Str_trim (val);
443	rxvt_Str_escaped (val);
444	key_delete = val;
445	}
446	#endif	487	# endif
447	if (rs[Rs_answerbackstring])
448	{
449	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
450	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
451	}
452
453	#ifdef HAVE_SCROLLBARS
454	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
455	#endif	488	#endif
		489
		490	scrollBar.setup (this);
456		491
457	#ifdef XTERM_REVERSE_VIDEO	492	#ifdef XTERM_REVERSE_VIDEO
458	/* this is how xterm implements reverseVideo */	493	/* this is how xterm implements reverseVideo */
459	if (options & Opt_reverseVideo)	494	if (option (Opt_reverseVideo))
460	{	495	{
461	if (!rs[Rs_color + Color_fg])	496	if (!rs[Rs_color + Color_fg])
462	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	497	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		498
463	if (!rs[Rs_color + Color_bg])	499	if (!rs[Rs_color + Color_bg])
464	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	500	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
465	}	501	}
466	#endif	502	#endif
467		503
…		…
469	if (!rs[Rs_color + i])	505	if (!rs[Rs_color + i])
470	rs[Rs_color + i] = def_colorName[i];	506	rs[Rs_color + i] = def_colorName[i];
471		507
472	#ifndef XTERM_REVERSE_VIDEO	508	#ifndef XTERM_REVERSE_VIDEO
473	/* this is how we implement reverseVideo */	509	/* this is how we implement reverseVideo */
474	if (options & Opt_reverseVideo)	510	if (option (Opt_reverseVideo))
475	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	511	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
476	#endif	512	#endif
477		513
478	/* convenient aliases for setting fg/bg to colors */	514	/* convenient aliases for setting fg/bg to colors */
479	color_aliases (Color_fg);	515	color_aliases (Color_fg);
480	color_aliases (Color_bg);	516	color_aliases (Color_bg);
481	#ifndef NO_CURSORCOLOR	517	#ifndef NO_CURSORCOLOR
482	color_aliases (Color_cursor);	518	color_aliases (Color_cursor);
483	color_aliases (Color_cursor2);	519	color_aliases (Color_cursor2);
484	#endif /* NO_CURSORCOLOR */	520	#endif /* NO_CURSORCOLOR */
485	color_aliases (Color_pointer_fg);	521	color_aliases (Color_pointer_fg);
486	color_aliases (Color_pointer_bg);	522	color_aliases (Color_pointer_bg);
487	color_aliases (Color_border);	523	color_aliases (Color_border);
488	#ifndef NO_BOLD_UNDERLINE_REVERSE	524	#ifndef NO_BOLD_UNDERLINE_REVERSE
489	color_aliases (Color_BD);	525	color_aliases (Color_BD);
490	color_aliases (Color_UL);	526	color_aliases (Color_UL);
491	color_aliases (Color_RV);	527	color_aliases (Color_RV);
492	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	528	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
493		529
494	if (!rs[Rs_color + Color_border])	530	if (!rs[Rs_color + Color_border])
495	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	531	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
496		532
497	return cmd_argv;	533	return cmd_argv;
		534	}
		535
		536	/*----------------------------------------------------------------------*/
		537	void
		538	rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
		539	{
		540	this->envv = envv;
		541
		542	SET_R (this);
		543	set_locale ("");
		544	set_environ (envv); // a few things in X do not call setlocale :(
		545
		546	init_vars ();
		547
		548	init_secondary ();
		549
		550	const char **cmd_argv = init_resources (argc, argv);
		551
		552	#ifdef KEYSYM_RESOURCE
		553	keyboard->register_done ();
		554	#endif
		555
		556	if (const char *path = rs[Rs_chdir])
		557	if (*path) // ignored if empty
		558	{
		559	if (*path != '/')
		560	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		561
		562	if (chdir (path))
		563	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		564	}
		565
		566	if (option (Opt_scrollBar))
		567	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		568
		569	pty = ptytty::create ();
		570
		571	create_windows (argc, argv);
		572
		573	init_xlocale ();
		574
		575	scr_reset (); // initialize screen
		576
		577	#if 0
		578	XSynchronize (dpy, True);
		579	#endif
		580
		581	if (option (Opt_scrollBar))
		582	scrollBar.resize (); /* create and map scrollbar */
		583	#ifdef HAVE_BG_PIXMAP
		584	{
		585	bgPixmap.set_target (this);
		586	bgPixmap.invalidate ();
		587
		588	#ifdef ENABLE_TRANSPARENCY
		589	if (option (Opt_transparent))
		590	{
		591	bgPixmap.set_transparent ();
		592
		593	#ifdef HAVE_AFTERIMAGE
		594	if (rs [Rs_blurradius])
		595	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		596	#endif
		597	if (ISSET_PIXCOLOR (Color_tint))
		598	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		599
		600	if (rs [Rs_shade])
		601	bgPixmap.set_shade (rs [Rs_shade]);
		602
		603	bgPixmap.set_root_pixmap ();
		604	XSelectInput (dpy, display->root, PropertyChangeMask);
		605	rootwin_ev.start (display, display->root);
		606	}
		607	#endif
		608
		609	#ifdef BG_IMAGE_FROM_FILE
		610	if (rs[Rs_backgroundPixmap])
		611	{
		612	const char *p = rs[Rs_backgroundPixmap];
		613
		614	if ((p = strchr (p, ';')) != 0)
		615	{
		616	p++;
		617	bgPixmap.set_geometry (p);
		618	}
		619	else
		620	bgPixmap.set_defaultGeometry ();
		621
		622	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		623	if (!bgPixmap.window_position_sensitive ())
		624	update_background ();
		625	}
		626	#endif
		627	}
		628	#endif
		629
		630	#if ENABLE_PERL
		631	rootwin_ev.start (display, display->root);
		632	#endif
		633
		634	set_colorfgbg ();
		635
		636	init_command (cmd_argv);
		637
		638	free (cmd_argv);
		639
		640	if (pty->pty >= 0)
		641	pty_ev.start (pty->pty, ev::READ);
		642
		643	HOOK_INVOKE ((this, HOOK_START, DT_END));
		644
		645	#if ENABLE_XEMBED
		646	if (rs[Rs_embed])
		647	{
		648	long info[2] = { 0, XEMBED_MAPPED };
		649
		650	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		651	32, PropModeReplace, (unsigned char *)&info, 2);
		652	}
		653	#endif
		654
		655	XMapWindow (dpy, vt);
		656	XMapWindow (dpy, parent[0]);
		657
		658	refresh_check ();
498	}	659	}
499		660
500	/*----------------------------------------------------------------------*/	661	/*----------------------------------------------------------------------*/
501	void	662	void
502	rxvt_term::init_env ()	663	rxvt_term::init_env ()
503	{	664	{
504	int i;	665	int i;
505	unsigned int u;
506	char *val;	666	char *val;
507		667
508	#ifdef DISPLAY_IS_IP	668	#ifdef DISPLAY_IS_IP
509	/* Fixup display_name for export over pty to any interested terminal	669	/* Fixup display_name for export over pty to any interested terminal
510	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	670	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
518	*/	678	*/
519	val = rxvt_network_display (rs[Rs_display_name]);	679	val = rxvt_network_display (rs[Rs_display_name]);
520	rs[Rs_display_name] = (const char *)val;	680	rs[Rs_display_name] = (const char *)val;
521		681
522	if (val == NULL)	682	if (val == NULL)
523	#endif /* DISPLAY_IS_IP */	683	#endif /* DISPLAY_IS_IP */
524	val = XDisplayString (display->display);	684	val = XDisplayString (dpy);
525		685
526	if (rs[Rs_display_name] == NULL)	686	if (rs[Rs_display_name] == NULL)
527	rs[Rs_display_name] = val; /* use broken `:0' value */	687	rs[Rs_display_name] = val; /* use broken `:0' value */
528		688
529	i = strlen (val);	689	i = strlen (val);
530	env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));	690	env_display = (char *)rxvt_malloc (i + 9);
531		691
532	sprintf (env_display, "DISPLAY=%s", val);	692	sprintf (env_display, "DISPLAY=%s", val);
533		693
534	/* avoiding the math library:	694	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
535	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
536	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
537	;
538	MAX_IT (i, 1);
539	env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
540
541	sprintf (env_windowid, "WINDOWID=%u",
542	(unsigned int)TermWin.parent[0]);
543		695
544	/* add entries to the environment:	696	/* add entries to the environment:
545	* @ DISPLAY: in case we started with -display	697	* @ DISPLAY: in case we started with -display
546	* @ WINDOWID: X window id number of the window	698	* @ WINDOWID: X window id number of the window
547	* @ COLORTERM: terminal sub-name and also indicates its color	699	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
549	* @ TERMINFO: path to terminfo directory	701	* @ TERMINFO: path to terminfo directory
550	* @ COLORFGBG: fg;bg color codes	702	* @ COLORFGBG: fg;bg color codes
551	*/	703	*/
552	putenv (env_display);	704	putenv (env_display);
553	putenv (env_windowid);	705	putenv (env_windowid);
		706
554	if (env_colorfgbg)	707	if (env_colorfgbg)
555	putenv (env_colorfgbg);	708	putenv (env_colorfgbg);
556		709
557	#ifdef RXVT_TERMINFO	710	#ifdef RXVT_TERMINFO
558	putenv ("TERMINFO=" RXVT_TERMINFO);	711	putenv ("TERMINFO=" RXVT_TERMINFO);
559	#endif	712	#endif
560		713
561	if (display->depth <= 2)	714	if (depth <= 2)
562	putenv ("COLORTERM=" COLORTERMENV "-mono");	715	putenv ("COLORTERM=" COLORTERMENV "-mono");
563	else	716	else
564	putenv ("COLORTERM=" COLORTERMENVFULL);	717	putenv ("COLORTERM=" COLORTERMENVFULL);
565		718
566	if (rs[Rs_term_name] != NULL)	719	if (rs[Rs_term_name] != NULL)
567	{	720	{
568	env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));	721	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
569	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	722	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
570	putenv (env_term);	723	putenv (env_term);
571	}	724	}
572	else	725	else
573	putenv ("TERM=" TERMENV);	726	putenv ("TERM=" TERMENV);
…		…
575	#ifdef HAVE_UNSETENV	728	#ifdef HAVE_UNSETENV
576	/* avoid passing old settings and confusing term size */	729	/* avoid passing old settings and confusing term size */
577	unsetenv ("LINES");	730	unsetenv ("LINES");
578	unsetenv ("COLUMNS");	731	unsetenv ("COLUMNS");
579	unsetenv ("TERMCAP"); /* terminfo should be okay */	732	unsetenv ("TERMCAP"); /* terminfo should be okay */
580	#endif /* HAVE_UNSETENV */	733	#endif /* HAVE_UNSETENV */
581	}	734	}
582		735
583	/*----------------------------------------------------------------------*/	736	/*----------------------------------------------------------------------*/
584	/*	737	/*
585	* This is more or less stolen straight from XFree86 xterm.	738	* This is more or less stolen straight from XFree86 xterm.
586	* This should support all European type languages.	739	* This should support all European type languages.
587	*/	740	*/
588	void	741	void
589	rxvt_term::set_locale (const char *locale)	742	rxvt_term::set_locale (const char *locale)
590	{	743	{
		744	set_environ (envv);
		745
591	#if HAVE_XSETLOCALE || HAVE_SETLOCALE	746	#if HAVE_XSETLOCALE || HAVE_SETLOCALE
592	free (this->locale);	747	free (this->locale);
593	this->locale = setlocale (LC_CTYPE, locale);	748	this->locale = setlocale (LC_CTYPE, locale);
594		749
595	if (!this->locale)	750	if (!this->locale)
596	{	751	{
597	if (*locale)	752	if (*locale)
598	{	753	{
599	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	754	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
600	setlocale (LC_CTYPE, "");	755	setlocale (LC_CTYPE, "C");
601	}	756	}
602	else	757	else
603	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	758	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
604		759
605	this->locale = "";	760	this->locale = "C";
606	}	761	}
607		762
608		763
609	this->locale = rxvt_strdup (this->locale);	764	this->locale = strdup (this->locale);
610	SET_LOCALE (this->locale);	765	SET_LOCALE (this->locale);
611	mbstate.reset ();	766	mbstate.reset ();
612	#endif	767	#endif
613		768
614	#if HAVE_NL_LANGINFO	769	#if HAVE_NL_LANGINFO
…		…
625	}	780	}
626		781
627	void	782	void
628	rxvt_term::init_xlocale ()	783	rxvt_term::init_xlocale ()
629	{	784	{
		785	set_environ (envv);
		786
630	#ifdef USE_XIM	787	#ifdef USE_XIM
631	if (!locale)	788	if (!locale)
632	rxvt_warn ("setting locale failed, working without locale support.\n");	789	rxvt_warn ("setting locale failed, working without locale support.\n");
633	else	790	else
634	{	791	{
…		…
656	* Initialize the command connection.	813	* Initialize the command connection.
657	* This should be called after the X server connection is established.	814	* This should be called after the X server connection is established.
658	*/	815	*/
659		816
660	#ifdef META8_OPTION	817	#ifdef META8_OPTION
661	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	818	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
662	#endif	819	#endif
663		820
664	get_ourmods ();	821	get_ourmods ();
665		822
666	if (!(options & Opt_scrollTtyOutput))	823	if (!option (Opt_scrollTtyOutput))
667	priv_modes |= PrivMode_TtyOutputInh;	824	priv_modes |= PrivMode_TtyOutputInh;
668	if (options & Opt_scrollTtyKeypress)	825	if (option (Opt_scrollTtyKeypress))
669	priv_modes |= PrivMode_Keypress;	826	priv_modes |= PrivMode_Keypress;
670	if (!(options & Opt_jumpScroll))	827	if (!option (Opt_jumpScroll))
671	priv_modes |= PrivMode_smoothScroll;	828	priv_modes |= PrivMode_smoothScroll;
672		829
673	#ifndef NO_BACKSPACE_KEY	830	#ifndef NO_BACKSPACE_KEY
674	if (strcmp (key_backspace, "DEC") == 0)	831	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
675	priv_modes |= PrivMode_HaveBackSpace;	832	priv_modes |= PrivMode_HaveBackSpace;
676	#endif	833	#endif
677		834
678	/* add value for scrollBar */	835	/* add value for scrollBar */
679	if (scrollbar_visible ())	836	if (scrollBar.state)
680	{	837	{
681	priv_modes |= PrivMode_scrollBar;	838	priv_modes |= PrivMode_scrollBar;
682	SavedModes |= PrivMode_scrollBar;	839	SavedModes |= PrivMode_scrollBar;
683	}	840	}
684		841
685	if (menubar_visible ())
686	{
687	priv_modes |= PrivMode_menuBar;
688	SavedModes |= PrivMode_menuBar;
689	}
690
691	#ifdef CURSOR_BLINK
692	if (options & Opt_cursorBlink)
693	(void)gettimeofday (&lastcursorchange, NULL);
694	#endif
695
696	run_command (argv);	842	run_command (argv);
697	}	843	}
698		844
699	/*----------------------------------------------------------------------*/	845	/*----------------------------------------------------------------------*/
700	void	846	void
701	rxvt_term::Get_Colours ()	847	rxvt_term::get_colours ()
702	{	848	{
703	int i;	849	int i;
704		850
705	#ifdef OFF_FOCUS_FADING	851	#ifdef OFF_FOCUS_FADING
706	pix_colors = pix_colors_focused;	852	pix_colors = pix_colors_focused;
707	#endif	853	#endif
708		854
709	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	855	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
710	{	856	{
		857	const char *name = rs[Rs_color + i];
		858
		859	if (!name)
		860	continue;
		861
711	rxvt_color xcol;	862	rxvt_color xcol;
712		863
713	if (!rs[Rs_color + i])	864	if (!set_color (xcol, name))
714	continue;
715
716	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
717	{	865	{
718	#ifndef XTERM_REVERSE_VIDEO	866	#ifndef XTERM_REVERSE_VIDEO
719	if (i < 2 && (options & Opt_reverseVideo))	867	if (i < 2 && option (Opt_reverseVideo))
720	rs[Rs_color + i] = def_colorName[!i];	868	name = def_colorName [1 - i];
721	else	869	else
722	#endif	870	#endif
723	rs[Rs_color + i] = def_colorName[i];	871	name = def_colorName [i];
724		872
725	if (!rs[Rs_color + i])	873	if (!name)
726	continue;	874	continue;
727		875
728	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	876	if (!set_color (xcol, name))
729	{	877	{
730	switch (i)	878	switch (i)
731	{	879	{
732	case Color_fg:	880	case Color_fg:
733	case Color_bg:	881	case Color_bg:
734	/* fatal: need bg/fg color */
735	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	882	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
736	/* NOTREACHED */	883	name = "";
737	break;	884	break;
738	#ifndef NO_CURSORCOLOR	885	#ifndef NO_CURSORCOLOR
739	case Color_cursor2:	886	case Color_cursor2:
740	xcol = pix_colors[Color_fg];	887	#endif
741	break;
742	#endif /* ! NO_CURSORCOLOR */
743	case Color_pointer_fg:	888	case Color_pointer_fg:
744	xcol = pix_colors[Color_fg];	889	name = rs[Rs_color + Color_fg];
		890	xcol.set (this, name);
745	break;	891	break;
746	default:	892	default:
747	xcol = pix_colors[Color_bg]; /* None */	893	name = rs[Rs_color + Color_bg];
		894	xcol.set (this, name);
748	break;	895	break;
749	}	896	}
750	}	897	}
751	}	898	}
752		899
753	pix_colors[i] = xcol;	900	pix_colors[i] = xcol;
754	#ifdef OFF_FOCUS_FADING	901	rs[Rs_color + i] = name;
755	if (rs[Rs_fade])
756	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
757	#endif
758	SET_PIXCOLOR (i);
759	}
760
761	if (display->depth <= 2)
762	{	902	}
		903
		904	if (depth <= 2)
		905	{
763	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	906	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
764	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	907	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
765	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	908	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
766	}	909	}
767		910
768	/*	911	/*
769	* get scrollBar/menuBar shadow colors	912	* get scrollBar shadow colors
770	*	913	*
771	* The calculations of topShadow/bottomShadow values are adapted	914	* The calculations of topShadow/bottomShadow values are adapted
772	* from the fvwm window manager.	915	* from the fvwm window manager.
773	*/	916	*/
774	#ifdef KEEP_SCROLLCOLOR	917	#ifdef RXVT_SCROLLBAR
775
776	if (display->depth <= 2)	918	if (depth <= 2)
		919	{
777	{ /* Monochrome */	920	/* Monochrome */
778	pix_colors[Color_scroll] = pix_colors[Color_fg];	921	alias_color (Color_scroll, Color_fg);
779	pix_colors[Color_topShadow] = pix_colors[Color_bg];	922	alias_color (Color_topShadow, Color_bg);
780	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	923	alias_color (Color_bottomShadow, Color_bg);
781	}	924	}
782	else	925	else
783	{	926	{
784	rxvt_color xcol[2];	927	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
785	/* xcol[0] == white
786	* xcol[1] == top shadow
787	* xcol[2] == bot shadow */
788		928
789	xcol[1] = pix_colors[Color_scroll];	929	rgba cscroll;
790	xcol[0].set (display, 65535, 65535, 65535);	930	pix_colors [Color_scroll].get (cscroll);
791
792	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
793
794	xcol[0].get (display, pr0, pg0, pb0);
795	xcol[1].get (display, pr1, pg1, pb1);
796
797	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
798		931
799	/* topShadowColor */	932	/* topShadowColor */
800	if (!xcol[1].set (display,	933	if (!pix_colors[Color_topShadow].set (this,
801	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	934	rgba (
802	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	935	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
803	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	936	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
804	xcol[1] = pix_colors[Color_White];	937	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
805		938	cscroll.a)
806	pix_colors[Color_topShadow] = xcol[1];	939	))
		940	alias_color (Color_topShadow, Color_White);
807	}	941	}
808	#endif /* KEEP_SCROLLCOLOR */	942	#endif
		943
		944	#ifdef OFF_FOCUS_FADING
		945	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		946	update_fade_color (i);
		947	#endif
809	}	948	}
810		949
811	/*----------------------------------------------------------------------*/	950	/*----------------------------------------------------------------------*/
812	/* color aliases, fg/bg bright-bold */	951	/* color aliases, fg/bg bright-bold */
813	void	952	void
…		…
816	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	955	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
817	{	956	{
818	int i = atoi (rs[Rs_color + idx]);	957	int i = atoi (rs[Rs_color + idx]);
819		958
820	if (i >= 8 && i <= 15)	959	if (i >= 8 && i <= 15)
821	{ /* bright colors */	960	/* bright colors */
822	i -= 8;
823	#ifndef NO_BRIGHTCOLOR
824	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	961	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
825	return;	962	else if (i >= 0 && i <= 7)
826	#endif	963	/* normal colors */
827	}
828
829	if (i >= 0 && i <= 7) /* normal colors */
830	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	964	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
831	}	965	}
832	}	966	}
833		967
834	/*----------------------------------------------------------------------*/	968	/*----------------------------------------------------------------------*/
…		…
854		988
855	if (rsmod	989	if (rsmod
856	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	990	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
857	requestedmeta = rsmod[3] - '0';	991	requestedmeta = rsmod[3] - '0';
858		992
859	map = XGetModifierMapping (display->display);	993	map = XGetModifierMapping (dpy);
860	kc = map->modifiermap;	994	kc = map->modifiermap;
861		995
862	for (i = 1; i < 6; i++)	996	for (i = 1; i < 6; i++)
863	{	997	{
864	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	998	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
866	for (j = map->max_keypermod; j--; k++)	1000	for (j = map->max_keypermod; j--; k++)
867	{	1001	{
868	if (kc[k] == 0)	1002	if (kc[k] == 0)
869	break;	1003	break;
870		1004
871	switch (XKeycodeToKeysym (display->display, kc[k], 0))	1005	switch (XKeycodeToKeysym (dpy, kc[k], 0))
872	{	1006	{
873	case XK_Num_Lock:	1007	case XK_Num_Lock:
874	ModNumLockMask = modmasks[i - 1];	1008	ModNumLockMask = modmasks[i - 1];
875	continue;	1009	continue;
876		1010
…		…
926	rxvt_term::create_windows (int argc, const char *const *argv)	1060	rxvt_term::create_windows (int argc, const char *const *argv)
927	{	1061	{
928	XClassHint classHint;	1062	XClassHint classHint;
929	XWMHints wmHint;	1063	XWMHints wmHint;
930	#if ENABLE_FRILLS	1064	#if ENABLE_FRILLS
931	Atom prop = None;
932	MWMHints mwmhints;	1065	MWMHints mwmhints = { };
933	#endif	1066	#endif
934	XGCValues gcvalue;	1067	XGCValues gcvalue;
935	long vt_emask;
936	XSetWindowAttributes attributes;	1068	XSetWindowAttributes attributes;
937	XWindowAttributes gattr;
938	Window top, parent;	1069	Window top, parent;
939	dDisp;
940		1070
941	#ifdef USING_W11LIB	1071	dLocal (Display *, dpy);
942	/* enable W11 callbacks */
943	W11AddEventHandler (disp, rxvt_W11_process_x_event);
944	#endif
945		1072
946	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	1073	/* grab colors before netscape does */
947	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	1074	get_colours ();
948		1075
949	if (options & Opt_transparent)	1076	if (!set_fonts ())
950	{	1077	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
951	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	1078
952	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	1079	parent = display->root;
953	}	1080
		1081	attributes.override_redirect = !!option (Opt_override_redirect);
954		1082
955	#if ENABLE_FRILLS	1083	#if ENABLE_FRILLS
956	if (options & Opt_borderLess)	1084	if (option (Opt_borderLess))
957	{	1085	{
958	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	1086	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
959
960	if (prop == None)
961	{	1087	{
962	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1088	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
963	#ifdef PREFER_24BIT
964	attributes.override_redirect = TRUE;	1089	attributes.override_redirect = true;
965	#endif
966	mwmhints.flags = 0;
967	}	1090	}
968	else	1091	else
969	{	1092	{
970	mwmhints.flags = MWM_HINTS_DECORATIONS;	1093	mwmhints.flags = MWM_HINTS_DECORATIONS;
971	mwmhints.decorations = 0;
972	}	1094	}
973	}	1095	}
974	else
975	mwmhints.flags = 0;
976	#endif	1096	#endif
977
978	/* grab colors before netscape does */
979	Get_Colours ();
980
981	if (!set_fonts ())
982	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
983
984	parent = DefaultRootWindow (disp);
985		1097
986	#if ENABLE_XEMBED	1098	#if ENABLE_XEMBED
987	if (rs[Rs_embed])	1099	if (rs[Rs_embed])
988	{	1100	{
989	XWindowAttributes wattr;	1101	XWindowAttributes wattr;
990		1102
991	parent = strtol (rs[Rs_embed], 0, 0);	1103	parent = strtol (rs[Rs_embed], 0, 0);
992		1104
993	if (!XGetWindowAttributes (disp, parent, &wattr))	1105	if (!XGetWindowAttributes (dpy, parent, &wattr))
994	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	1106	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
995		1107
996	window_calc (wattr.width, wattr.height);	1108	window_calc (wattr.width, wattr.height);
997	}	1109	}
998
999	#endif	1110	#endif
		1111
1000	window_calc (0, 0);	1112	window_calc (0, 0);
1001		1113
1002	/* sub-window placement & size in rxvt_resize_subwindows () */	1114	/* sub-window placement & size in rxvt_resize_subwindows () */
1003	#ifdef PREFER_24BIT
1004	attributes.background_pixel = pix_colors_focused[Color_border];	1115	attributes.background_pixel = pix_colors_focused [Color_border];
1005	attributes.border_pixel = pix_colors_focused[Color_border];	1116	attributes.border_pixel = pix_colors_focused [Color_border];
1006	attributes.colormap = display->cmap;	1117	attributes.colormap = cmap;
		1118
1007	top = XCreateWindow (disp, parent,	1119	top = XCreateWindow (dpy, parent,
1008	szHint.x, szHint.y,	1120	szHint.x, szHint.y,
1009	szHint.width, szHint.height,	1121	szHint.width, szHint.height,
1010	TermWin.ext_bwidth,	1122	ext_bwidth,
1011	display->depth, InputOutput,	1123	depth, InputOutput, visual,
1012	display->visual,
1013	CWColormap | CWBackPixel | CWBorderPixel, &attributes);	1124	CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1014	#else	1125	&attributes);
1015	top = XCreateSimpleWindow (disp, parent,
1016	szHint.x, szHint.y,
1017	szHint.width, szHint.height,
1018	TermWin.ext_bwidth,
1019	pix_colors_focused[Color_border],
1020	pix_colors_focused[Color_border]);
1021	#endif
1022		1126
1023	TermWin.parent[0] = top;	1127	this->parent[0] = top;
1024		1128
1025	old_width = szHint.width;	1129	old_width = szHint.width;
1026	old_height = szHint.height;	1130	old_height = szHint.height;
1027		1131
1028	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1132	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1029	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1133	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1030		1134
1031	classHint.res_name = (char *)rs[Rs_name];	1135	classHint.res_name = (char *)rs[Rs_name];
1032	classHint.res_class = (char *)RESCLASS;	1136	classHint.res_class = (char *)RESCLASS;
1033		1137
1034	wmHint.flags = InputHint | StateHint | WindowGroupHint;	1138	wmHint.flags = InputHint | StateHint | WindowGroupHint;
1035	wmHint.input = True;	1139	wmHint.input = True;
1036	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1140	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1037	wmHint.window_group = top;	1141	wmHint.window_group = top;
1038		1142
1039	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	1143	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1040	&szHint, &wmHint, &classHint);	1144	&szHint, &wmHint, &classHint);
		1145
		1146	#if ENABLE_FRILLS
		1147	if (mwmhints.flags)
		1148	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		1149	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		1150	#endif
1041		1151
1042	Atom protocols[] = {	1152	Atom protocols[] = {
1043	xa[XA_WM_DELETE_WINDOW],	1153	xa[XA_WM_DELETE_WINDOW],
1044	#if ENABLE_EWMH	1154	#if ENABLE_EWMH
1045	xa[XA_NET_WM_PING],	1155	xa[XA_NET_WM_PING],
1046	#endif	1156	#endif
1047	};	1157	};
1048		1158
1049	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1159	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1160
		1161	#if ENABLE_FRILLS
		1162	if (rs[Rs_transient_for])
		1163	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		1164	#endif
1050		1165
1051	#if ENABLE_EWMH	1166	#if ENABLE_EWMH
1052	long pid = getpid ();	1167	long pid = getpid ();
1053		1168
1054	XChangeProperty (disp, top,	1169	XChangeProperty (dpy, top,
1055	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1170	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1056	PropModeReplace, (unsigned char *)&pid, 1);	1171	PropModeReplace, (unsigned char *)&pid, 1);
1057		1172
1058	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1173	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059	#endif	1174	#endif
1060		1175
1061	XSelectInput (disp, top,	1176	XSelectInput (dpy, top,
1062	KeyPressMask	1177	KeyPressMask
1063	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755	1178	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064	| KeyReleaseMask	1179	| KeyReleaseMask
1065	#endif	1180	#endif
1066	| FocusChangeMask | VisibilityChangeMask	1181	| FocusChangeMask | VisibilityChangeMask
1067	| ExposureMask | StructureNotifyMask);	1182	| ExposureMask | StructureNotifyMask);
1068		1183
1069	termwin_ev.start (display, top);	1184	termwin_ev.start (display, top);
1070		1185
1071	#if ENABLE_FRILLS
1072	if (mwmhints.flags)
1073	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1074	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1075	#endif
1076
1077	/* vt cursor: Black-on-White is standard, but this is more popular */	1186	/* vt cursor: Black-on-White is standard, but this is more popular */
1078	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1187	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079
1080	#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1081	/* cursor (menuBar/scrollBar): Black-on-White */
1082	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1083	#endif
1084		1188
1085	/* the vt window */	1189	/* the vt window */
1086	TermWin.vt = XCreateSimpleWindow (disp, top,	1190	vt = XCreateSimpleWindow (dpy, top,
1087	window_vt_x,
1088	window_vt_y,	1191	window_vt_x, window_vt_y,
1089	TermWin_TotalWidth (),	1192	width, height,
1090	TermWin_TotalHeight (),
1091	0,	1193	0,
1092	pix_colors_focused[Color_fg],	1194	pix_colors_focused[Color_fg],
1093	pix_colors_focused[Color_bg]);	1195	pix_colors_focused[Color_bg]);
1094	#ifdef DEBUG_X
1095	XStoreName (disp, TermWin.vt, "vt window");
1096	#endif
1097		1196
1098	attributes.bit_gravity = NorthWestGravity;	1197	attributes.bit_gravity = NorthWestGravity;
1099	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1198	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1100		1199
1101	vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;	1200	vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102		1201
1103	#ifdef POINTER_BLANK
1104	if (options & Opt_pointerBlank)	1202	if (option (Opt_pointerBlank))
1105	vt_emask |= PointerMotionMask;	1203	vt_emask |= PointerMotionMask;
1106	else	1204	else
1107	#endif
1108	vt_emask |= Button1MotionMask | Button3MotionMask;	1205	vt_emask |= Button1MotionMask | Button3MotionMask;
1109		1206
1110	XSelectInput (disp, TermWin.vt, vt_emask);	1207	vt_select_input ();
		1208
1111	vt_ev.start (display, TermWin.vt);	1209	vt_ev.start (display, vt);
1112
1113	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1114	if (menuBar_height ())
1115	{
1116	menuBar.win = XCreateSimpleWindow (disp, top,
1117	window_vt_x, 0,
1118	TermWin_TotalWidth (),
1119	menuBar_TotalHeight (),
1120	0,
1121	pix_colors_focused[Color_fg],
1122	pix_colors_focused[Color_scroll]);
1123
1124	#ifdef DEBUG_X
1125	XStoreName (disp, menuBar.win, "menubar");
1126	#endif
1127
1128	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1129
1130	XDefineCursor (disp, menuBar.win,
1131	XCreateFontCursor (disp, XC_left_ptr));
1132
1133	XSelectInput (disp, menuBar.win,
1134	(ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1135	menubar_ev.start (display, menuBar.win);
1136	}
1137	#endif
1138
1139	#ifdef XPM_BACKGROUND
1140	if (rs[Rs_backgroundPixmap] != NULL
1141	&& ! (options & Opt_transparent))
1142	{
1143	const char *p = rs[Rs_backgroundPixmap];
1144
1145	if ((p = strchr (p, ';')) != NULL)
1146	{
1147	p++;
1148	scale_pixmap (p);
1149	}
1150
1151	set_bgPixmap (rs[Rs_backgroundPixmap]);
1152	scr_touch (true);
1153	}
1154	#endif
1155		1210
1156	/* graphics context for the vt window */	1211	/* graphics context for the vt window */
1157	gcvalue.foreground = pix_colors[Color_fg];	1212	gcvalue.foreground = pix_colors[Color_fg];
1158	gcvalue.background = pix_colors[Color_bg];	1213	gcvalue.background = pix_colors[Color_bg];
1159	gcvalue.graphics_exposures = 1;	1214	gcvalue.graphics_exposures = 0;
1160	TermWin.gc = XCreateGC (disp, TermWin.vt,	1215
		1216	gc = XCreateGC (dpy, vt,
1161	GCForeground | GCBackground | GCGraphicsExposures,	1217	GCForeground | GCBackground | GCGraphicsExposures,
1162	&gcvalue);	1218	&gcvalue);
1163		1219
1164	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1220	drawable = new rxvt_drawable (this, vt);
1165
1166	#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1167	gcvalue.foreground = pix_colors[Color_topShadow];
1168	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1169	gcvalue.foreground = pix_colors[Color_bottomShadow];
1170	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1171	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1172	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1173	#endif
1174		1221
1175	#ifdef OFF_FOCUS_FADING	1222	#ifdef OFF_FOCUS_FADING
1176	// initially we are in unfocused state	1223	// initially we are in unfocused state
1177	if (rs[Rs_fade])	1224	if (rs[Rs_fade])
1178	pix_colors = pix_colors_unfocused;	1225	pix_colors = pix_colors_unfocused;
1179	#endif	1226	#endif
1180		1227
1181	pointer_unblank ();	1228	pointer_unblank ();
1182	scr_recolour ();	1229	scr_recolour ();
1183
1184	#if ENABLE_XEMBED
1185	if (rs[Rs_embed])
1186	{
1187	long info[2] = { 0, XEMBED_MAPPED };
1188
1189	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1190	32, PropModeReplace, (unsigned char *)&info, 2);
1191	}
1192	#endif
1193	}	1230	}
1194		1231
1195	/* ------------------------------------------------------------------------- *	1232	/* ------------------------------------------------------------------------- *
1196	* GET TTY CURRENT STATE *	1233	* GET TTY CURRENT STATE *
1197	* ------------------------------------------------------------------------- */	1234	* ------------------------------------------------------------------------- */
1198	void	1235	void
1199	rxvt_get_ttymode (ttymode_t *tio, int erase)	1236	rxvt_get_ttymode (struct termios *tio, int erase)
1200	{	1237	{
1201	#ifdef HAVE_TERMIOS_H
1202	/*	1238	/*
1203	* standard System V termios interface	1239	* standard System V termios interface
1204	*/	1240	*/
1205	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1241	if (tcgetattr (STDIN_FILENO, tio) < 0)
1206	{	1242	{
1207	/* return error - use system defaults */	1243	// return error - use system defaults,
		1244	// where possible, and zero elsewhere
		1245	memset (tio, 0, sizeof (struct termios));
		1246
1208	tio->c_cc[VINTR] = CINTR;	1247	tio->c_cc[VINTR] = CINTR;
1209	tio->c_cc[VQUIT] = CQUIT;	1248	tio->c_cc[VQUIT] = CQUIT;
1210	tio->c_cc[VERASE] = CERASE;	1249	tio->c_cc[VERASE] = CERASE;
		1250	#ifdef VERASE2
		1251	tio->c_cc[VERASE2] = CERASE2;
		1252	#endif
1211	tio->c_cc[VKILL] = CKILL;	1253	tio->c_cc[VKILL] = CKILL;
1212	tio->c_cc[VSTART] = CSTART;	1254	tio->c_cc[VSTART] = CSTART;
1213	tio->c_cc[VSTOP] = CSTOP;	1255	tio->c_cc[VSTOP] = CSTOP;
1214	tio->c_cc[VSUSP] = CSUSP;	1256	tio->c_cc[VSUSP] = CSUSP;
1215	# ifdef VDSUSP	1257	# ifdef VDSUSP
1216
1217	tio->c_cc[VDSUSP] = CDSUSP;	1258	tio->c_cc[VDSUSP] = CDSUSP;
1218	# endif	1259	# endif
1219	# ifdef VREPRINT	1260	# ifdef VREPRINT
1220
1221	tio->c_cc[VREPRINT] = CRPRNT;	1261	tio->c_cc[VREPRINT] = CRPRNT;
1222	# endif	1262	# endif
1223	# ifdef VDISCRD	1263	# ifdef VDISCRD
1224
1225	tio->c_cc[VDISCRD] = CFLUSH;	1264	tio->c_cc[VDISCRD] = CFLUSH;
1226	# endif	1265	# endif
1227	# ifdef VWERSE	1266	# ifdef VWERSE
1228
1229	tio->c_cc[VWERSE] = CWERASE;	1267	tio->c_cc[VWERSE] = CWERASE;
1230	# endif	1268	# endif
1231	# ifdef VLNEXT	1269	# ifdef VLNEXT
1232
1233	tio->c_cc[VLNEXT] = CLNEXT;	1270	tio->c_cc[VLNEXT] = CLNEXT;
1234	# endif	1271	# endif
1235
1236	}	1272	}
		1273
1237	tio->c_cc[VEOF] = CEOF;	1274	tio->c_cc[VEOF] = CEOF;
1238	tio->c_cc[VEOL] = VDISABLE;	1275	tio->c_cc[VEOL] = VDISABLE;
1239	# ifdef VEOL2	1276	# ifdef VEOL2
1240
1241	tio->c_cc[VEOL2] = VDISABLE;	1277	tio->c_cc[VEOL2] = VDISABLE;
1242	# endif	1278	# endif
1243	# ifdef VSWTC	1279	# ifdef VSWTC
1244
1245	tio->c_cc[VSWTC] = VDISABLE;	1280	tio->c_cc[VSWTC] = VDISABLE;
1246	# endif	1281	# endif
1247	# ifdef VSWTCH	1282	# ifdef VSWTCH
1248
1249	tio->c_cc[VSWTCH] = VDISABLE;	1283	tio->c_cc[VSWTCH] = VDISABLE;
1250	# endif	1284	# endif
1251	# if VMIN != VEOF	1285	# if VMIN != VEOF
1252
1253	tio->c_cc[VMIN] = 1;	1286	tio->c_cc[VMIN] = 1;
1254	# endif	1287	# endif
1255	# if VTIME != VEOL	1288	# if VTIME != VEOL
1256
1257	tio->c_cc[VTIME] = 0;	1289	tio->c_cc[VTIME] = 0;
1258	# endif	1290	# endif
1259		1291
1260	if (erase != -1)	1292	if (erase != -1)
1261	tio->c_cc[VERASE] = (char)erase;	1293	tio->c_cc[VERASE] = (char)erase;
…		…
1277	tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO	1309	tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1278	# if defined (ECHOCTL) && defined (ECHOKE)	1310	# if defined (ECHOCTL) && defined (ECHOKE)
1279	| ECHOCTL | ECHOKE	1311	| ECHOCTL | ECHOKE
1280	# endif	1312	# endif
1281	| ECHOE | ECHOK);	1313	| ECHOE | ECHOK);
1282	# else /* HAVE_TERMIOS_H */
1283
1284	/*
1285	* sgtty interface
1286	*/
1287
1288	/* get parameters -- gtty */
1289	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290	{
1291	tio->sg.sg_erase = CERASE; /* ^H */
1292	tio->sg.sg_kill = CKILL; /* ^U */
1293	}
1294	if (erase != -1)
1295	tio->sg.sg_erase = (char)erase;
1296
1297	tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298
1299	/* get special characters */
1300	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1301	{
1302	tio->tc.t_intrc = CINTR; /* ^C */
1303	tio->tc.t_quitc = CQUIT; /* ^\ */
1304	tio->tc.t_startc = CSTART; /* ^Q */
1305	tio->tc.t_stopc = CSTOP; /* ^S */
1306	tio->tc.t_eofc = CEOF; /* ^D */
1307	tio->tc.t_brkc = -1;
1308	}
1309	/* get local special chars */
1310	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311	{
1312	tio->lc.t_suspc = CSUSP; /* ^Z */
1313	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1314	tio->lc.t_rprntc = CRPRNT; /* ^R */
1315	tio->lc.t_flushc = CFLUSH; /* ^O */
1316	tio->lc.t_werasc = CWERASE; /* ^W */
1317	tio->lc.t_lnextc = CLNEXT; /* ^V */
1318	}
1319	/* get line discipline */
1320	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321	# ifdef NTTYDISC
1322
1323	tio->line = NTTYDISC;
1324	# endif /* NTTYDISC */
1325
1326	tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327	#endif /* HAVE_TERMIOS_H */
1328		1314
1329	/*	1315	/*
1330	* Debugging	1316	* Debugging
1331	*/	1317	*/
1332	#ifdef DEBUG_TTYMODE	1318	#ifdef DEBUG_TTYMODE
1333	#ifdef HAVE_TERMIOS_H
1334	/* c_iflag bits */	1319	/* c_iflag bits */
1335	fprintf (stderr, "Input flags\n");	1320	fprintf (stderr, "Input flags\n");
1336		1321
1337	/* cpp token stringize doesn't work on all machines <sigh> */	1322	/* cpp token stringize doesn't work on all machines <sigh> */
1338	# define FOO(flag,name) \	1323	# define FOO(flag,name) \
…		…
1350	FOO (IGNCR, "IGNCR");	1335	FOO (IGNCR, "IGNCR");
1351	FOO (ICRNL, "ICRNL");	1336	FOO (ICRNL, "ICRNL");
1352	FOO (IXON, "IXON");	1337	FOO (IXON, "IXON");
1353	FOO (IXOFF, "IXOFF");	1338	FOO (IXOFF, "IXOFF");
1354	# ifdef IUCLC	1339	# ifdef IUCLC
1355
1356	FOO (IUCLC, "IUCLC");	1340	FOO (IUCLC, "IUCLC");
1357	# endif	1341	# endif
1358	# ifdef IXANY	1342	# ifdef IXANY
1359
1360	FOO (IXANY, "IXANY");	1343	FOO (IXANY, "IXANY");
1361	# endif	1344	# endif
1362	# ifdef IMAXBEL	1345	# ifdef IMAXBEL
1363
1364	FOO (IMAXBEL, "IMAXBEL");	1346	FOO (IMAXBEL, "IMAXBEL");
1365	# endif	1347	# endif
1366		1348
1367	fprintf (stderr, "\n");	1349	fprintf (stderr, "\n");
1368		1350
…		…
1375	FOO (VERASE, "VERASE");	1357	FOO (VERASE, "VERASE");
1376	FOO (VKILL, "VKILL");	1358	FOO (VKILL, "VKILL");
1377	FOO (VEOF, "VEOF");	1359	FOO (VEOF, "VEOF");
1378	FOO (VEOL, "VEOL");	1360	FOO (VEOL, "VEOL");
1379	# ifdef VEOL2	1361	# ifdef VEOL2
1380
1381	FOO (VEOL2, "VEOL2");	1362	FOO (VEOL2, "VEOL2");
1382	# endif	1363	# endif
1383	# ifdef VSWTC	1364	# ifdef VSWTC
1384
1385	FOO (VSWTC, "VSWTC");	1365	FOO (VSWTC, "VSWTC");
1386	# endif	1366	# endif
1387	# ifdef VSWTCH	1367	# ifdef VSWTCH
1388
1389	FOO (VSWTCH, "VSWTCH");	1368	FOO (VSWTCH, "VSWTCH");
1390	# endif	1369	# endif
1391
1392	FOO (VSTART, "VSTART");	1370	FOO (VSTART, "VSTART");
1393	FOO (VSTOP, "VSTOP");	1371	FOO (VSTOP, "VSTOP");
1394	FOO (VSUSP, "VSUSP");	1372	FOO (VSUSP, "VSUSP");
1395	# ifdef VDSUSP	1373	# ifdef VDSUSP
1396
1397	FOO (VDSUSP, "VDSUSP");	1374	FOO (VDSUSP, "VDSUSP");
1398	# endif	1375	# endif
1399	# ifdef VREPRINT	1376	# ifdef VREPRINT
1400
1401	FOO (VREPRINT, "VREPRINT");	1377	FOO (VREPRINT, "VREPRINT");
1402	# endif	1378	# endif
1403	# ifdef VDISCRD	1379	# ifdef VDISCRD
1404
1405	FOO (VDISCRD, "VDISCRD");	1380	FOO (VDISCRD, "VDISCRD");
1406	# endif	1381	# endif
1407	# ifdef VWERSE	1382	# ifdef VWERSE
1408
1409	FOO (VWERSE, "VWERSE");	1383	FOO (VWERSE, "VWERSE");
1410	# endif	1384	# endif
1411	# ifdef VLNEXT	1385	# ifdef VLNEXT
1412
1413	FOO (VLNEXT, "VLNEXT");	1386	FOO (VLNEXT, "VLNEXT");
1414	# endif	1387	# endif
1415		1388
1416	fprintf (stderr, "\n");	1389	fprintf (stderr, "\n");
1417	# undef FOO	1390	# undef FOO
1418	# endif /* HAVE_TERMIOS_H */	1391	#endif /* DEBUG_TTYMODE */
1419	#endif /* DEBUG_TTYMODE */
1420	}	1392	}
1421		1393
1422	/*----------------------------------------------------------------------*/	1394	/*----------------------------------------------------------------------*/
1423	/*	1395	/*
1424	* Run the command in a subprocess and return a file descriptor for the	1396	* Run the command in a subprocess and return a file descriptor for the
…		…
1429	rxvt_term::run_command (const char *const *argv)	1401	rxvt_term::run_command (const char *const *argv)
1430	{	1402	{
1431	#if ENABLE_FRILLS	1403	#if ENABLE_FRILLS
1432	if (rs[Rs_pty_fd])	1404	if (rs[Rs_pty_fd])
1433	{	1405	{
1434	pty.pty = atoi (rs[Rs_pty_fd]);	1406	pty->pty = atoi (rs[Rs_pty_fd]);
1435	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1407
		1408	if (pty->pty >= 0)
		1409	{
		1410	if (getfd_hook)
		1411	pty->pty = (*getfd_hook) (pty->pty);
		1412
		1413	if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1414	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1415	}
1436	}	1416	}
1437	else	1417	else
1438	#endif	1418	#endif
1439	if (!pty.get ())	1419	if (!pty->get ())
1440	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1420	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1441		1421
		1422	int er;
		1423
		1424	#ifndef NO_BACKSPACE_KEY
		1425	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
		1426	er = rs[Rs_backspace_key][0];
		1427	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
		1428	er = '\177'; /* the initial state anyway */
		1429	else
		1430	#endif
		1431	er = -1;
		1432
		1433	rxvt_get_ttymode (&tio, er);
		1434	/* init terminal attributes */
		1435	cfsetospeed (&tio, BAUDRATE);
		1436	cfsetispeed (&tio, BAUDRATE);
		1437	tcsetattr (pty->tty, TCSANOW, &tio);
1442	pty.set_utf8_mode (enc_utf8);	1438	pty->set_utf8_mode (enc_utf8);
1443		1439
1444	/* set initial window size */	1440	/* set initial window size */
1445	tt_winch ();	1441	tt_winch ();
1446
1447	int er;
1448
1449	#ifndef NO_BACKSPACE_KEY
1450	if (key_backspace[0] && !key_backspace[1])
1451	er = key_backspace[0];
1452	else if (strcmp (key_backspace, "DEC") == 0)
1453	er = '\177'; /* the initial state anyway */
1454	else
1455	#endif
1456	er = -1;
1457
1458	rxvt_get_ttymode (&tio, er);
1459		1442
1460	#if ENABLE_FRILLS	1443	#if ENABLE_FRILLS
1461	if (rs[Rs_pty_fd])	1444	if (rs[Rs_pty_fd])
1462	return;	1445	return;
1463	#endif	1446	#endif
1464		1447
1465	sw_chld.start (SIGCHLD);
1466
1467	#ifndef __QNX__
1468	/* spin off the command interpreter */	1448	/* spin off the command interpreter */
1469	switch (cmd_pid = fork ())	1449	switch (cmd_pid = fork ())
1470	{	1450	{
1471	case -1:	1451	case -1:
1472	{	1452	{
…		…
1474	rxvt_fatal ("can't fork, aborting.\n");	1454	rxvt_fatal ("can't fork, aborting.\n");
1475	}	1455	}
1476	case 0:	1456	case 0:
1477	init_env ();	1457	init_env ();
1478		1458
1479	if (!pty.make_controlling_tty ())	1459	if (!pty->make_controlling_tty ())
1480	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1460	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1481	else	1461	else
1482	{	1462	{
1483	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1463	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1484	dup2 (pty.tty, STDIN_FILENO);	1464	dup2 (pty->tty, STDIN_FILENO);
1485	dup2 (pty.tty, STDOUT_FILENO);	1465	dup2 (pty->tty, STDOUT_FILENO);
1486	dup2 (pty.tty, STDERR_FILENO);	1466	dup2 (pty->tty, STDERR_FILENO);
1487		1467
1488	// close all our file handles that we do no longer need	1468	// close all our file handles that we do no longer need
1489	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1469	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1490	{	1470	{
1491	if ((*t)->pty.pty > 2) close ((*t)->pty.pty);	1471	if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1492	if ((*t)->pty.tty > 2) close ((*t)->pty.tty);	1472	if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1493	}	1473	}
1494		1474
1495	run_child (argv);	1475	run_child (argv);
1496	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1476	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1497	}	1477	}
1498		1478
1499	_exit (EXIT_FAILURE);	1479	_exit (EXIT_FAILURE);
1500		1480
1501	default:	1481	default:
1502	{	1482	if (!option (Opt_utmpInhibit))
1503	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1483	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1504	int fdstdin;
1505		1484
1506	fdstdin = dup (STDIN_FILENO);	1485	pty->close_tty ();
1507	dup2 (pty.tty, STDIN_FILENO);
1508	#endif
1509		1486
1510	#ifdef UTMP_SUPPORT	1487	child_ev.start (cmd_pid);
1511	privileged_utmp (SAVE);
1512	#endif
1513		1488
1514	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1489	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1515
1516	dup2 (fdstdin, STDIN_FILENO);
1517	close (fdstdin);
1518	#endif
1519	}
1520
1521	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1522	break;	1490	break;
1523	}	1491	}
1524	#else /* __QNX__ uses qnxspawn () */
1525	fchmod (pty.tty, 0622);
1526	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1527	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1528
1529	if (run_child (argv) == -1)
1530	exit (EXIT_FAILURE);
1531	#endif
1532	}	1492	}
1533		1493
1534	/* ------------------------------------------------------------------------- *	1494	/* ------------------------------------------------------------------------- *
1535	* CHILD PROCESS OPERATIONS *	1495	* CHILD PROCESS OPERATIONS *
1536	* ------------------------------------------------------------------------- */	1496	* ------------------------------------------------------------------------- */
…		…
1541	int	1501	int
1542	rxvt_term::run_child (const char *const *argv)	1502	rxvt_term::run_child (const char *const *argv)
1543	{	1503	{
1544	char *login;	1504	char *login;
1545		1505
1546	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1547
1548	if (options & Opt_console)	1506	if (option (Opt_console))
		1507	{
1549	{ /* be virtual console, fail silently */	1508	/* be virtual console, fail silently */
1550	#ifdef TIOCCONS	1509	#ifdef TIOCCONS
1551	unsigned int on = 1;	1510	unsigned int on = 1;
1552		1511
1553	ioctl (STDIN_FILENO, TIOCCONS, &on);	1512	ioctl (STDIN_FILENO, TIOCCONS, &on);
1554	#elif defined (SRIOCSREDIR)	1513	#elif defined (SRIOCSREDIR)
…		…
1556		1515
1557	fd = open (CONSOLE, O_WRONLY, 0);	1516	fd = open (CONSOLE, O_WRONLY, 0);
1558	if (fd >= 0)	1517	if (fd >= 0)
1559	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1518	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1560	close (fd);	1519	close (fd);
1561	#endif /* SRIOCSREDIR */	1520	#endif /* SRIOCSREDIR */
1562	}	1521	}
1563		1522
1564	/* reset signals and spin off the command interpreter */	1523	/* reset signals and spin off the command interpreter */
1565	signal (SIGINT, SIG_DFL);	1524	signal (SIGINT, SIG_DFL);
1566	signal (SIGQUIT, SIG_DFL);	1525	signal (SIGQUIT, SIG_DFL);
…		…
1573	*/	1532	*/
1574	#ifdef SIGTSTP	1533	#ifdef SIGTSTP
1575	signal (SIGTSTP, SIG_IGN);	1534	signal (SIGTSTP, SIG_IGN);
1576	signal (SIGTTIN, SIG_IGN);	1535	signal (SIGTTIN, SIG_IGN);
1577	signal (SIGTTOU, SIG_IGN);	1536	signal (SIGTTOU, SIG_IGN);
1578	#endif /* SIGTSTP */	1537	#endif /* SIGTSTP */
1579		1538
1580	// unblock signals (signals are blocked by iom.C
1581	sigset_t ss;
1582	sigemptyset (&ss);
1583	sigprocmask (SIG_SETMASK, &ss, 0);
1584
1585	#ifndef __QNX__
1586	/* command interpreter path */	1539	/* command interpreter path */
1587	if (argv != NULL)	1540	if (argv)
1588	{	1541	{
1589	# ifdef DEBUG_CMD	1542	# ifdef DEBUG_CMD
1590	int i;	1543	int i;
1591		1544
1592	for (i = 0; argv[i]; i++)	1545	for (i = 0; argv[i]; i++)
…		…
1596	execvp (argv[0], (char *const *)argv);	1549	execvp (argv[0], (char *const *)argv);
1597	/* no error message: STDERR is closed! */	1550	/* no error message: STDERR is closed! */
1598	}	1551	}
1599	else	1552	else
1600	{	1553	{
1601	const char *argv0, *shell;	1554	const char *argv0, *shell;
1602		1555
1603	if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')	1556	if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604	shell = "/bin/sh";	1557	shell = "/bin/sh";
1605		1558
1606	argv0 = (const char *)rxvt_r_basename (shell);	1559	argv0 = (const char *)rxvt_basename (shell);
1607		1560
1608	if (options & Opt_loginShell)	1561	if (option (Opt_loginShell))
1609	{	1562	{
1610	login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));	1563	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1611		1564
1612	login[0] = '-';	1565	login[0] = '-';
1613	strcpy (&login[1], argv0);	1566	strcpy (&login[1], argv0);
1614	argv0 = login;	1567	argv0 = login;
1615	}	1568	}
		1569
1616	execlp (shell, argv0, NULL);	1570	execlp (shell, argv0, (char *)0);
1617	/* no error message: STDERR is closed! */	1571	/* no error message: STDERR is closed! */
1618	}	1572	}
1619
1620	#else /* __QNX__ uses qnxspawn () */
1621
1622	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1623	char *command = NULL, fullcommand[_MAX_PATH];
1624	char **arg_v, *arg_a[2] = { NULL, NULL };
1625
1626	if (argv != NULL)
1627	{
1628	if (access (argv[0], X_OK) == -1)
1629	{
1630	if (strchr (argv[0], '/') == NULL)
1631	{
1632	searchenv (argv[0], "PATH", fullcommand);
1633
1634	if (fullcommand[0] != '\0')
1635	command = fullcommand;
1636	}
1637
1638	if (access (command, X_OK) == -1)
1639	return -1;
1640	}
1641	else
1642	command = argv[0];
1643
1644	arg_v = argv;
1645	}
1646	else
1647	{
1648	if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1649	command = "/bin/sh";
1650
1651	arg_a[0] = my_basename (command);
1652
1653	if (options & Opt_loginShell)
1654	{
1655	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1656
1657	login[0] = '-';
1658	strcpy (&login[1], arg_a[0]);
1659	arg_a[0] = login;
1660	}
1661
1662	arg_v = arg_a;
1663	}
1664
1665	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1666	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1667	_SPAWN_SETSID | _SPAWN_TCSETPGRP,
1668	command, arg_v, environ, iov_a, 0);
1669	if (login)
1670	free (login);
1671
1672	pty.close_tty ();
1673	return pty.pty;
1674	#endif
1675		1573
1676	return -1;	1574	return -1;
1677	}	1575	}
1678		1576
1679	/*----------------------- end-of-file (C source) -----------------------*/	1577	/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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