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

Diff Legend

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