[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs.
Revision 1.262 by sf-exg, Sun Jan 31 09:02:48 2010 UTC

…		…
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,
…		…
50	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: yellow (Yellow3)	156	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"rgb:00/00/cd", // 4: blue (Blue3)	157	"rgb:00/00/cd", // 4: blue (Blue3)
53	"rgb:cd/00/cd", // 5: magenta (Magenta3)	158	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"rgb:00/cd/cd", // 6: cyan (Cyan3)	159	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	160	# ifdef XTERM_COLORS
56	"rgb:e5/e5/e5", // 7: white (Grey90)	161	"rgb:e5/e5/e5", // 7: white (Grey90)
57	# else	162	# else
58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)	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	"rgb:4d/4d/4d", // 8: bright black (Grey30)	167	"rgb:4d/4d/4d", // 8: bright black (Grey30)
…		…
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 ENABLE_TRANSPARENCY	276	#if ENABLE_TRANSPARENCY
172	NULL,	277	NULL,
173	#endif	278	#endif
174	#if OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
175	"rgb:00/00/00",	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		288
189	MEvent.time = CurrentTime;	289	MEvent.time = CurrentTime;
190	MEvent.button = AnyButton;	290	MEvent.button = AnyButton;
191	want_refresh = 1;	291	want_refresh = 1;
192	priv_modes = SavedModes = PrivMode_Default;	292	priv_modes = SavedModes = PrivMode_Default;
193	ncol = 80;	293	ncol = 80;
194	nrow = 24;	294	nrow = 24;
195	int_bwidth = INTERNALBORDERWIDTH;	295	int_bwidth = INTERNALBORDERWIDTH;
196	ext_bwidth = EXTERNALBORDERWIDTH;	296	ext_bwidth = EXTERNALBORDERWIDTH;
197	lineSpace = LINESPACE;	297	lineSpace = LINESPACE;
		298	letterSpace = LETTERSPACE;
198	saveLines = SAVELINES;	299	saveLines = SAVELINES;
199	numpix_colors = TOTAL_COLORS;
200		300
201	refresh_type = SLOW_REFRESH;	301	refresh_type = SLOW_REFRESH;
202		302
203	oldcursor.row = oldcursor.col = -1;	303	oldcursor.row = oldcursor.col = -1;
204	#ifdef HAVE_BG_PIXMAP
205	#ifdef HAVE_AFTERIMAGE
206	bgPixmap.original_asim = NULL;
207	#endif
208	/* bgPixmap.w = bgPixmap.h = 0; */
209	#ifdef XPM_BACKGROUND
210	bgPixmap.h_scale = bgPixmap.v_scale = 0;
211	bgPixmap.h_align = bgPixmap.v_align = 0;
212	#endif
213	bgPixmap.flags = 0;
214	bgPixmap.pixmap = None;
215	#endif
216	last_bot = last_state = -1;
217		304
218	set_option (Opt_scrollBar);	305	set_option (Opt_scrollBar);
219	set_option (Opt_scrollTtyOutput);	306	set_option (Opt_scrollTtyOutput);
220	set_option (Opt_jumpScroll);	307	set_option (Opt_jumpScroll);
221	set_option (Opt_skipScroll);	308	set_option (Opt_skipScroll);
222	set_option (Opt_secondaryScreen);	309	set_option (Opt_secondaryScreen);
223	set_option (Opt_secondaryScroll);	310	set_option (Opt_secondaryScroll);
224	set_option (Opt_pastableTabs);	311	set_option (Opt_pastableTabs);
225	set_option (Opt_intensityStyles);	312	set_option (Opt_intensityStyles);
		313	set_option (Opt_iso14755);
226	set_option (Opt_iso14755_52);	314	set_option (Opt_iso14755_52);
227		315	set_option (Opt_buffered);
228	return true;
229	}	316	}
230		317
231	void	318	static void
232	rxvt_term::init_secondary ()	319	init_secondary ()
233	{	320	{
234	int i;	321	int i;
235		322
236	/*
237	* Close all unused file descriptors
238	* We don't want them, we don't need them.
239	*/
240	if ((i = open ("/dev/null", O_RDONLY)) < 0)	323	if ((i = open ("/dev/null", O_RDONLY)) < 0)
241	{	324	{
242	/* TODO: BOO HISS */
243	dup2 (STDERR_FILENO, STDIN_FILENO);	325	dup2 (STDERR_FILENO, STDIN_FILENO);
244	}	326	}
245	else if (i > STDIN_FILENO)	327	else if (i != STDIN_FILENO)
246	{	328	{
247	dup2 (i, STDIN_FILENO);	329	dup2 (i, STDIN_FILENO);
248	close (i);	330	close (i);
249	}	331	}
250		332
251	dup2 (STDERR_FILENO, STDOUT_FILENO);	333	dup2 (STDERR_FILENO, STDOUT_FILENO);
252
253	#if 0 // schmorp sayz closing filies is murder
254	for (i = STDERR_FILENO + 1; i < num_fds; i++)
255	{
256	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
257	if (i == 4 \|\| i == 7)
258	continue;
259	#endif
260	close (i);
261	}
262	#endif
263	}	334	}
264		335
265	/----------------------------------------------------------------------/	336	/----------------------------------------------------------------------/
266	const char **	337	const char **
267	rxvt_term::init_resources (int argc, const char const argv)	338	rxvt_term::init_resources (int argc, const char const argv)
268	{	339	{
269	int i, r_argc;	340	int i, r_argc;
270	char *val;
271	const char cmd_argv, r_argv;	341	const char cmd_argv, r_argv;
272		342
273	/*	343	/*
274	* Look for -e option. Find => split and make cmd_argv[] of command args	344	* Look for -e option. Find => split and make cmd_argv[] of command args
275	*/	345	*/
276	for (r_argc = 0; r_argc < argc; r_argc++)	346	for (r_argc = 0; r_argc < argc; r_argc++)
277	if (!strcmp (argv[r_argc], "-e"))	347	if (!strcmp (argv[r_argc], "-e"))
278	break;	348	break;
279		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	}
		363
280	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	364	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
281		365
282	for (i = 0; i < r_argc; i++)	366	for (i = 0; i < r_argc; i++)
283	r_argv[i] = (const char *)argv[i];	367	r_argv[i] = (const char *)argv[i];
284		368
285	r_argv[i] = NULL;	369	r_argv[i] = NULL;
286		370
287	if (r_argc == argc)
288	cmd_argv = NULL;
289	else
290	{
291	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
292
293	for (i = 0; i < argc - r_argc - 1; i++)
294	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296	cmd_argv[i] = NULL;
297	}
298
299	rs[Rs_name] = rxvt_r_basename (argv[0]);	371	rs[Rs_name] = rxvt_basename (argv[0]);
300		372
301	/*	373	/*
302	* Open display, get options/resources and create the window	374	* Open display, get options/resources and create the window
303	*/	375	*/
304		376
…		…
306	rs[Rs_display_name] = ":0";	378	rs[Rs_display_name] = ":0";
307		379
308	get_options (r_argc, r_argv);	380	get_options (r_argc, r_argv);
309		381
310	if (!(display = displays.get (rs[Rs_display_name])))	382	if (!(display = displays.get (rs[Rs_display_name])))
		383	{
		384	free (r_argv);
311	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	}
312		387
313	// using a local pointer decreases code size a lot	388	// using a local pointer decreases code size a lot
314	xa = display->xa;	389	xa = display->xa;
315		390
316	set (display);	391	set (display);
…		…
319	#if XFT	394	#if XFT
320	if (rs[Rs_depth])	395	if (rs[Rs_depth])
321	select_visual (strtol (rs[Rs_depth], 0, 0));	396	select_visual (strtol (rs[Rs_depth], 0, 0));
322	#endif	397	#endif
323		398
324	#ifdef HAVE_AFTERIMAGE
325	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326	#endif
327	free (r_argv);	399	free (r_argv);
328		400
329	for (int i = NUM_RESOURCES; i--; )	401	for (int i = NUM_RESOURCES; i--; )
330	if (rs [i] == resval_undef)	402	if (rs [i] == resval_undef)
331	rs [i] = 0;	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
332		409
333	#if ENABLE_PERL	410	#if ENABLE_PERL
334	if (!rs[Rs_perl_ext_1])	411	if (!rs[Rs_perl_ext_1])
335	rs[Rs_perl_ext_1] = "default";	412	rs[Rs_perl_ext_1] = "default";
336		413
…		…
347	* set any defaults not already set	424	* set any defaults not already set
348	*/	425	*/
349	if (cmd_argv && cmd_argv[0])	426	if (cmd_argv && cmd_argv[0])
350	{	427	{
351	if (!rs[Rs_title])	428	if (!rs[Rs_title])
352	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	429	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
		430
353	if (!rs[Rs_iconName])	431	if (!rs[Rs_iconName])
354	rs[Rs_iconName] = rs[Rs_title];	432	rs[Rs_iconName] = rs[Rs_title];
355	}	433	}
356	else	434	else
357	{	435	{
358	if (!rs[Rs_title])	436	if (!rs[Rs_title])
359	rs[Rs_title] = rs[Rs_name];	437	rs[Rs_title] = rs[Rs_name];
		438
360	if (!rs[Rs_iconName])	439	if (!rs[Rs_iconName])
361	rs[Rs_iconName] = rs[Rs_name];	440	rs[Rs_iconName] = rs[Rs_name];
362	}	441	}
363		442
364	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	443	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
…		…
371	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)
372	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());	451	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
373		452
374	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	453	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
375	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]);
376	#endif	458	#endif
377		459
378	#ifdef POINTER_BLANK	460	#ifdef POINTER_BLANK
379	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	461	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
380	pointerBlankDelay = i;	462	pointerBlankDelay = i;
…		…
384		466
385	/* no point having a scrollbar without having any scrollback! */	467	/* no point having a scrollbar without having any scrollback! */
386	if (!saveLines)	468	if (!saveLines)
387	set_option (Opt_scrollBar, 0);	469	set_option (Opt_scrollBar, 0);
388		470
389	#ifdef PRINTPIPE
390	if (!rs[Rs_print_pipe])
391	rs[Rs_print_pipe] = PRINTPIPE;
392	#endif
393
394	if (!rs[Rs_cutchars])	471	if (!rs[Rs_cutchars])
395	rs[Rs_cutchars] = CUTCHARS;	472	rs[Rs_cutchars] = CUTCHARS;
396		473
397	#ifndef NO_BACKSPACE_KEY	474	#ifndef NO_BACKSPACE_KEY
398	if (!rs[Rs_backspace_key])	475	if (!rs[Rs_backspace_key])
399	# ifdef DEFAULT_BACKSPACE	476	# ifdef DEFAULT_BACKSPACE
400	key_backspace = DEFAULT_BACKSPACE;	477	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401	# else	478	# else
402	key_backspace = "DEC"; /* can toggle between \010 or \177 */	479	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403	# endif	480	# endif
404	else
405	{
406	val = strdup (rs[Rs_backspace_key]);
407	key_backspace = val;
408	}
409	#endif	481	#endif
410		482
411	#ifndef NO_DELETE_KEY	483	#ifndef NO_DELETE_KEY
412	if (!rs[Rs_delete_key])	484	if (!rs[Rs_delete_key])
413	# ifdef DEFAULT_DELETE	485	# ifdef DEFAULT_DELETE
414	key_delete = DEFAULT_DELETE;	486	rs[Rs_delete_key] = DEFAULT_DELETE;
415	# else	487	# else
416	key_delete = "\033[3~";	488	rs[Rs_delete_key] = "\033[3~";
417	# endif
418	else
419	{
420	val = strdup (rs[Rs_delete_key]);
421	key_delete = val;
422	}
423	#endif	489	# endif
424
425	#ifdef HAVE_SCROLLBARS
426	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
427	#endif	490	#endif
		491
		492	scrollBar.setup (this);
428		493
429	#ifdef XTERM_REVERSE_VIDEO	494	#ifdef XTERM_REVERSE_VIDEO
430	/* this is how xterm implements reverseVideo */	495	/* this is how xterm implements reverseVideo */
431	if (option (Opt_reverseVideo))	496	if (option (Opt_reverseVideo))
432	{	497	{
…		…
452	color_aliases (Color_fg);	517	color_aliases (Color_fg);
453	color_aliases (Color_bg);	518	color_aliases (Color_bg);
454	#ifndef NO_CURSORCOLOR	519	#ifndef NO_CURSORCOLOR
455	color_aliases (Color_cursor);	520	color_aliases (Color_cursor);
456	color_aliases (Color_cursor2);	521	color_aliases (Color_cursor2);
457	#endif /* NO_CURSORCOLOR */	522	#endif /* NO_CURSORCOLOR */
458	color_aliases (Color_pointer_fg);	523	color_aliases (Color_pointer_fg);
459	color_aliases (Color_pointer_bg);	524	color_aliases (Color_pointer_bg);
460	color_aliases (Color_border);	525	color_aliases (Color_border);
461	#ifndef NO_BOLD_UNDERLINE_REVERSE	526	#ifndef NO_BOLD_UNDERLINE_REVERSE
462	color_aliases (Color_BD);	527	color_aliases (Color_BD);
463	color_aliases (Color_UL);	528	color_aliases (Color_UL);
464	color_aliases (Color_RV);	529	color_aliases (Color_RV);
465	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	530	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
466		531
467	if (!rs[Rs_color + Color_border])	532	if (!rs[Rs_color + Color_border])
468	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	533	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
469		534
470	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 ();
471	}	661	}
472		662
473	/----------------------------------------------------------------------/	663	/----------------------------------------------------------------------/
474	void	664	void
475	rxvt_term::init_env ()	665	rxvt_term::init_env ()
…		…
490	*/	680	*/
491	val = rxvt_network_display (rs[Rs_display_name]);	681	val = rxvt_network_display (rs[Rs_display_name]);
492	rs[Rs_display_name] = (const char *)val;	682	rs[Rs_display_name] = (const char *)val;
493		683
494	if (val == NULL)	684	if (val == NULL)
495	#endif /* DISPLAY_IS_IP */	685	#endif /* DISPLAY_IS_IP */
496	val = XDisplayString (dpy);	686	val = XDisplayString (dpy);
497		687
498	if (rs[Rs_display_name] == NULL)	688	if (rs[Rs_display_name] == NULL)
499	rs[Rs_display_name] = val; /* use broken `:0' value */	689	rs[Rs_display_name] = val; /* use broken `:0' value */
500		690
…		…
540	#ifdef HAVE_UNSETENV	730	#ifdef HAVE_UNSETENV
541	/* avoid passing old settings and confusing term size */	731	/* avoid passing old settings and confusing term size */
542	unsetenv ("LINES");	732	unsetenv ("LINES");
543	unsetenv ("COLUMNS");	733	unsetenv ("COLUMNS");
544	unsetenv ("TERMCAP"); /* terminfo should be okay */	734	unsetenv ("TERMCAP"); /* terminfo should be okay */
545	#endif /* HAVE_UNSETENV */	735	#endif /* HAVE_UNSETENV */
546	}	736	}
547		737
548	/----------------------------------------------------------------------/	738	/----------------------------------------------------------------------/
549	/*	739	/*
550	* This is more or less stolen straight from XFree86 xterm.	740	* This is more or less stolen straight from XFree86 xterm.
…		…
571		761
572	this->locale = "C";	762	this->locale = "C";
573	}	763	}
574		764
575		765
576	this->locale = rxvt_strdup (this->locale);	766	this->locale = strdup (this->locale);
577	SET_LOCALE (this->locale);	767	SET_LOCALE (this->locale);
578	mbstate.reset ();	768	mbstate.reset ();
579	#endif	769	#endif
580		770
581	#if HAVE_NL_LANGINFO	771	#if HAVE_NL_LANGINFO
…		…
638	priv_modes \|= PrivMode_Keypress;	828	priv_modes \|= PrivMode_Keypress;
639	if (!option (Opt_jumpScroll))	829	if (!option (Opt_jumpScroll))
640	priv_modes \|= PrivMode_smoothScroll;	830	priv_modes \|= PrivMode_smoothScroll;
641		831
642	#ifndef NO_BACKSPACE_KEY	832	#ifndef NO_BACKSPACE_KEY
643	if (strcmp (key_backspace, "DEC") == 0)	833	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
644	priv_modes \|= PrivMode_HaveBackSpace;	834	priv_modes \|= PrivMode_HaveBackSpace;
645	#endif	835	#endif
646		836
647	/* add value for scrollBar */	837	/* add value for scrollBar */
648	if (scrollBar.state)	838	if (scrollBar.state)
…		…
654	run_command (argv);	844	run_command (argv);
655	}	845	}
656		846
657	/----------------------------------------------------------------------/	847	/----------------------------------------------------------------------/
658	void	848	void
659	rxvt_term::Get_Colours ()	849	rxvt_term::get_colours ()
660	{	850	{
661	int i;	851	int i;
662		852
663	#ifdef OFF_FOCUS_FADING	853	#ifdef OFF_FOCUS_FADING
664	pix_colors = pix_colors_focused;	854	pix_colors = pix_colors_focused;
665	#endif	855	#endif
666		856
667	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	857	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
668	{	858	{
669	const char *name = rs[Rs_color + i];	859	const char *name = rs[Rs_color + i];
670		860
671	if (!name)	861	if (!name)
…		…
724	* get scrollBar shadow colors	914	* get scrollBar shadow colors
725	*	915	*
726	* The calculations of topShadow/bottomShadow values are adapted	916	* The calculations of topShadow/bottomShadow values are adapted
727	* from the fvwm window manager.	917	* from the fvwm window manager.
728	*/	918	*/
729	#ifdef KEEP_SCROLLCOLOR	919	#ifdef RXVT_SCROLLBAR
730	if (depth <= 2)	920	if (depth <= 2)
731	{	921	{
732	/* Monochrome */	922	/* Monochrome */
733	alias_color (Color_scroll, Color_fg);	923	alias_color (Color_scroll, Color_fg);
734	alias_color (Color_topShadow, Color_bg);	924	alias_color (Color_topShadow, Color_bg);
…		…
749	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	939	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
750	cscroll.a)	940	cscroll.a)
751	))	941	))
752	alias_color (Color_topShadow, Color_White);	942	alias_color (Color_topShadow, Color_White);
753	}	943	}
754	#endif /* KEEP_SCROLLCOLOR */	944	#endif
755		945
756	#ifdef OFF_FOCUS_FADING	946	#ifdef OFF_FOCUS_FADING
757	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	947	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
758	update_fade_color (i);	948	update_fade_color (i);
759	#endif	949	#endif
…		…
767	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	957	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
768	{	958	{
769	int i = atoi (rs[Rs_color + idx]);	959	int i = atoi (rs[Rs_color + idx]);
770		960
771	if (i >= 8 && i <= 15)	961	if (i >= 8 && i <= 15)
772	{ /* bright colors */	962	/* bright colors */
773	i -= 8;
774	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	963	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
775	return;	964	else if (i >= 0 && i <= 7)
776	}	965	/* normal colors */
777
778	if (i >= 0 && i <= 7) /* normal colors */
779	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	966	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
780	}	967	}
781	}	968	}
782		969
783	/----------------------------------------------------------------------/	970	/----------------------------------------------------------------------/
…		…
884	Window top, parent;	1071	Window top, parent;
885		1072
886	dLocal (Display *, dpy);	1073	dLocal (Display *, dpy);
887		1074
888	/* grab colors before netscape does */	1075	/* grab colors before netscape does */
889	Get_Colours ();	1076	get_colours ();
890		1077
891	if (!set_fonts ())	1078	if (!set_fonts ())
892	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");
893		1080
894	parent = display->root;	1081	parent = display->root;
…		…
942	this->parent[0] = top;	1129	this->parent[0] = top;
943		1130
944	old_width = szHint.width;	1131	old_width = szHint.width;
945	old_height = szHint.height;	1132	old_height = szHint.height;
946		1133
947	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1134	set_title (rs [Rs_title]);
948	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1135	set_icon_name (rs [Rs_iconName]);
949		1136
950	classHint.res_name = (char *)rs[Rs_name];	1137	classHint.res_name = (char *)rs[Rs_name];
951	classHint.res_class = (char *)RESCLASS;	1138	classHint.res_class = (char *)RESCLASS;
952		1139
953	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1140	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
…		…
955	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;	1142	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956	wmHint.window_group = top;	1143	wmHint.window_group = top;
957		1144
958	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1145	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959	&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
960		1197
961	#if ENABLE_FRILLS	1198	#if ENABLE_FRILLS
962	if (mwmhints.flags)	1199	if (mwmhints.flags)
963	XChangeProperty (dpy, 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,
964	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1201	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
…		…
998		1235
999	termwin_ev.start (display, top);	1236	termwin_ev.start (display, top);
1000		1237
1001	/* 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 */
1002	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1239	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1003
1004	#ifdef HAVE_SCROLLBARS
1005	/* cursor scrollBar: Black-on-White */
1006	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1007	#endif
1008		1240
1009	/* the vt window */	1241	/* the vt window */
1010	vt = XCreateSimpleWindow (dpy, top,	1242	vt = XCreateSimpleWindow (dpy, top,
1011	window_vt_x, window_vt_y,	1243	window_vt_x, window_vt_y,
1012	width, height,	1244	width, height,
…		…
1037	GCForeground \| GCBackground \| GCGraphicsExposures,	1269	GCForeground \| GCBackground \| GCGraphicsExposures,
1038	&gcvalue);	1270	&gcvalue);
1039		1271
1040	drawable = new rxvt_drawable (this, vt);	1272	drawable = new rxvt_drawable (this, vt);
1041		1273
1042	#ifdef RXVT_SCROLLBAR
1043	gcvalue.foreground = pix_colors[Color_topShadow];
1044	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1045	gcvalue.foreground = pix_colors[Color_bottomShadow];
1046	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1047	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1048	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1049	#endif
1050
1051	#ifdef OFF_FOCUS_FADING	1274	#ifdef OFF_FOCUS_FADING
1052	// initially we are in unfocused state	1275	// initially we are in unfocused state
1053	if (rs[Rs_fade])	1276	if (rs[Rs_fade])
1054	pix_colors = pix_colors_unfocused;	1277	pix_colors = pix_colors_unfocused;
1055	#endif	1278	#endif
…		…
1060		1283
1061	/* ------------------------------------------------------------------------- *	1284	/* ------------------------------------------------------------------------- *
1062	* GET TTY CURRENT STATE *	1285	* GET TTY CURRENT STATE *
1063	* ------------------------------------------------------------------------- */	1286	* ------------------------------------------------------------------------- */
1064	void	1287	void
1065	rxvt_get_ttymode (ttymode_t *tio, int erase)	1288	rxvt_get_ttymode (struct termios *tio, int erase)
1066	{	1289	{
1067	/*	1290	/*
1068	* standard System V termios interface	1291	* standard System V termios interface
1069	*/	1292	*/
1070	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1293	if (tcgetattr (STDIN_FILENO, tio) < 0)
1071	{	1294	{
1072	// return error - use system defaults,	1295	// return error - use system defaults,
1073	// where possible, and zero elsewhere	1296	// where possible, and zero elsewhere
1074	memset (tio, 0, sizeof (ttymode_t));	1297	memset (tio, 0, sizeof (struct termios));
1075		1298
1076	tio->c_cc[VINTR] = CINTR;	1299	tio->c_cc[VINTR] = CINTR;
1077	tio->c_cc[VQUIT] = CQUIT;	1300	tio->c_cc[VQUIT] = CQUIT;
1078	tio->c_cc[VERASE] = CERASE;	1301	tio->c_cc[VERASE] = CERASE;
1079	#ifdef VERASE2	1302	#ifdef VERASE2
…		…
1143		1366
1144	/*	1367	/*
1145	* Debugging	1368	* Debugging
1146	*/	1369	*/
1147	#ifdef DEBUG_TTYMODE	1370	#ifdef DEBUG_TTYMODE
1148	#ifdef HAVE_TERMIOS_H
1149	/* c_iflag bits */	1371	/* c_iflag bits */
1150	fprintf (stderr, "Input flags\n");	1372	fprintf (stderr, "Input flags\n");
1151		1373
1152	/* cpp token stringize doesn't work on all machines <sigh> */	1374	/* cpp token stringize doesn't work on all machines <sigh> */
1153	# define FOO(flag,name) \	1375	# define FOO(flag,name) \
…		…
1216	FOO (VLNEXT, "VLNEXT");	1438	FOO (VLNEXT, "VLNEXT");
1217	# endif	1439	# endif
1218		1440
1219	fprintf (stderr, "\n");	1441	fprintf (stderr, "\n");
1220	# undef FOO	1442	# undef FOO
1221	# endif /* HAVE_TERMIOS_H */	1443	#endif /* DEBUG_TTYMODE */
1222	#endif /* DEBUG_TTYMODE */
1223	}	1444	}
1224		1445
1225	/----------------------------------------------------------------------/	1446	/----------------------------------------------------------------------/
1226	/*	1447	/*
1227	* 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
…		…
1251	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1472	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1252		1473
1253	int er;	1474	int er;
1254		1475
1255	#ifndef NO_BACKSPACE_KEY	1476	#ifndef NO_BACKSPACE_KEY
1256	if (key_backspace[0] && !key_backspace[1])	1477	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1257	er = key_backspace[0];	1478	er = rs[Rs_backspace_key][0];
1258	else if (strcmp (key_backspace, "DEC") == 0)	1479	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1259	er = '\177'; /* the initial state anyway */	1480	er = '\177'; /* the initial state anyway */
1260	else	1481	else
1261	#endif	1482	#endif
1262	er = -1;	1483	er = -1;
1263		1484
1264	rxvt_get_ttymode (&tio, er);	1485	rxvt_get_ttymode (&tio, er);
1265	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1486	/* init terminal attributes */
		1487	cfsetospeed (&tio, BAUDRATE);
		1488	cfsetispeed (&tio, BAUDRATE);
		1489	tcsetattr (pty->tty, TCSANOW, &tio);
1266	pty->set_utf8_mode (enc_utf8);	1490	pty->set_utf8_mode (enc_utf8);
1267		1491
1268	/* set initial window size */	1492	/* set initial window size */
1269	tt_winch ();	1493	tt_winch ();
1270		1494
…		…
1330	rxvt_term::run_child (const char const argv)	1554	rxvt_term::run_child (const char const argv)
1331	{	1555	{
1332	char *login;	1556	char *login;
1333		1557
1334	if (option (Opt_console))	1558	if (option (Opt_console))
		1559	{
1335	{ /* be virtual console, fail silently */	1560	/* be virtual console, fail silently */
1336	#ifdef TIOCCONS	1561	#ifdef TIOCCONS
1337	unsigned int on = 1;	1562	unsigned int on = 1;
1338		1563
1339	ioctl (STDIN_FILENO, TIOCCONS, &on);	1564	ioctl (STDIN_FILENO, TIOCCONS, &on);
1340	#elif defined (SRIOCSREDIR)	1565	#elif defined (SRIOCSREDIR)
…		…
1342		1567
1343	fd = open (CONSOLE, O_WRONLY, 0);	1568	fd = open (CONSOLE, O_WRONLY, 0);
1344	if (fd >= 0)	1569	if (fd >= 0)
1345	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1570	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1346	close (fd);	1571	close (fd);
1347	#endif /* SRIOCSREDIR */	1572	#endif /* SRIOCSREDIR */
1348	}	1573	}
1349		1574
1350	/* reset signals and spin off the command interpreter */	1575	/* reset signals and spin off the command interpreter */
1351	signal (SIGINT, SIG_DFL);	1576	signal (SIGINT, SIG_DFL);
1352	signal (SIGQUIT, SIG_DFL);	1577	signal (SIGQUIT, SIG_DFL);
…		…
1359	*/	1584	*/
1360	#ifdef SIGTSTP	1585	#ifdef SIGTSTP
1361	signal (SIGTSTP, SIG_IGN);	1586	signal (SIGTSTP, SIG_IGN);
1362	signal (SIGTTIN, SIG_IGN);	1587	signal (SIGTTIN, SIG_IGN);
1363	signal (SIGTTOU, SIG_IGN);	1588	signal (SIGTTOU, SIG_IGN);
1364	#endif /* SIGTSTP */	1589	#endif /* SIGTSTP */
1365
1366	// unblock signals (signals are blocked by iom.C
1367	sigset_t ss;
1368	sigemptyset (&ss);
1369	sigprocmask (SIG_SETMASK, &ss, 0);
1370		1590
1371	/* command interpreter path */	1591	/* command interpreter path */
1372	if (argv != NULL)	1592	if (argv)
1373	{	1593	{
1374	# ifdef DEBUG_CMD	1594	# ifdef DEBUG_CMD
1375	int i;	1595	int i;
1376		1596
1377	for (i = 0; argv[i]; i++)	1597	for (i = 0; argv[i]; i++)
…		…
1386	const char argv0, shell;	1606	const char argv0, shell;
1387		1607
1388	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1608	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1389	shell = "/bin/sh";	1609	shell = "/bin/sh";
1390		1610
1391	argv0 = (const char *)rxvt_r_basename (shell);	1611	argv0 = rxvt_basename (shell);
1392		1612
1393	if (option (Opt_loginShell))	1613	if (option (Opt_loginShell))
1394	{	1614	{
1395	login = (char *)rxvt_malloc (strlen (argv0) + 2);	1615	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1396		1616
1397	login[0] = '-';	1617	login[0] = '-';
1398	strcpy (&login[1], argv0);	1618	strcpy (&login[1], argv0);
1399	argv0 = login;	1619	argv0 = login;
1400	}	1620	}
1401		1621
1402	execlp (shell, argv0, NULL);	1622	execlp (shell, argv0, (char *)0);
1403	/* no error message: STDERR is closed! */	1623	/* no error message: STDERR is closed! */
1404	}	1624	}
1405		1625
1406	return -1;	1626	return -1;
1407	}	1627	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs. Revision 1.262 by sf-exg, Sun Jan 31 09:02:48 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs.
Revision 1.262 by sf-exg, Sun Jan 31 09:02:48 2010 UTC