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

Diff Legend

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