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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.180 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.239 by ayin, Sat Jan 19 13:00:07 2008 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-2007 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	"rgb:00/00/00", // 0: black (Black)	153	"rgb:00/00/00", // 0: black (Black)
49	"rgb:cd/00/00", // 1: red (Red3)	154	"rgb:cd/00/00", // 1: red (Red3)
50	"rgb:00/cd/00", // 2: green (Green3)	155	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: ywlloe (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	272	#ifdef KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	273	COLOR_SCROLLBAR,
169	COLOR_SCROLLTROUGH,	274	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	275	#endif /* KEEP_SCROLLCOLOR */
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	"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	#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;
202	saveLines = SAVELINES;	298	saveLines = SAVELINES;
203	numpix_colors = TOTAL_COLORS;
204		299
205	refresh_limit = 1;
206	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
207		301
208	oldcursor.row = oldcursor.col = -1;	302	oldcursor.row = oldcursor.col = -1;
209	#ifdef XPM_BACKGROUND
210	/* bgPixmap.w = bgPixmap.h = 0; */
211	bgPixmap.x = bgPixmap.y = 0;
212	bgPixmap.pixmap = None;
213	#endif
214		303
215	last_bot = last_state = -1;	304	set_option (Opt_scrollBar);
216		305	set_option (Opt_scrollTtyOutput);
217	return true;	306	set_option (Opt_jumpScroll);
		307	set_option (Opt_skipScroll);
		308	set_option (Opt_secondaryScreen);
		309	set_option (Opt_secondaryScroll);
		310	set_option (Opt_pastableTabs);
		311	set_option (Opt_intensityStyles);
		312	set_option (Opt_iso14755_52);
218	}	313	}
219		314
220	void	315	void
221	rxvt_term::init_secondary ()	316	rxvt_term::init_secondary ()
222	{	317	{
…		…
229	if ((i = open ("/dev/null", O_RDONLY)) < 0)	324	if ((i = open ("/dev/null", O_RDONLY)) < 0)
230	{	325	{
231	/* TODO: BOO HISS */	326	/* TODO: BOO HISS */
232	dup2 (STDERR_FILENO, STDIN_FILENO);	327	dup2 (STDERR_FILENO, STDIN_FILENO);
233	}	328	}
234	else if (i > STDIN_FILENO)	329	else if (i != STDIN_FILENO)
235	{	330	{
236	dup2 (i, STDIN_FILENO);	331	dup2 (i, STDIN_FILENO);
237	close (i);	332	close (i);
238	}	333	}
239		334
…		…
254	/----------------------------------------------------------------------/	349	/----------------------------------------------------------------------/
255	const char **	350	const char **
256	rxvt_term::init_resources (int argc, const char const argv)	351	rxvt_term::init_resources (int argc, const char const argv)
257	{	352	{
258	int i, r_argc;	353	int i, r_argc;
259	char *val;
260	const char cmd_argv, r_argv;	354	const char cmd_argv, r_argv;
261		355
262	/*	356	/*
263	* Look for -e option. Find => split and make cmd_argv[] of command args	357	* Look for -e option. Find => split and make cmd_argv[] of command args
264	*/	358	*/
265	for (r_argc = 0; r_argc < argc; r_argc++)	359	for (r_argc = 0; r_argc < argc; r_argc++)
266	if (!strcmp (argv[r_argc], "-e"))	360	if (!strcmp (argv[r_argc], "-e"))
267	break;	361	break;
268		362
		363	if (r_argc == argc)
		364	cmd_argv = NULL;
		365	else if (!argv[r_argc + 1])
		366	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		367	else
		368	{
		369	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		370
		371	for (i = 0; i < argc - r_argc - 1; i++)
		372	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		373
		374	cmd_argv[i] = NULL;
		375	}
		376
269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	377	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
270		378
271	for (i = 0; i < r_argc; i++)	379	for (i = 0; i < r_argc; i++)
272	r_argv[i] = (const char *)argv[i];	380	r_argv[i] = (const char *)argv[i];
273		381
274	r_argv[i] = NULL;	382	r_argv[i] = NULL;
275		383
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]);	384	rs[Rs_name] = rxvt_basename (argv[0]);
289		385
290	/*	386	/*
291	* Open display, get options/resources and create the window	387	* Open display, get options/resources and create the window
292	*/	388	*/
293		389
…		…
295	rs[Rs_display_name] = ":0";	391	rs[Rs_display_name] = ":0";
296		392
297	get_options (r_argc, r_argv);	393	get_options (r_argc, r_argv);
298		394
299	if (!(display = displays.get (rs[Rs_display_name])))	395	if (!(display = displays.get (rs[Rs_display_name])))
		396	{
		397	free (r_argv);
300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	398	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		399	}
301		400
302	// using a local pointer decreases code size a lot	401	// using a local pointer decreases code size a lot
303	xa = display->xa;	402	xa = display->xa;
304		403
305	set (display);	404	set (display);
…		…
308	#if XFT	407	#if XFT
309	if (rs[Rs_depth])	408	if (rs[Rs_depth])
310	select_visual (strtol (rs[Rs_depth], 0, 0));	409	select_visual (strtol (rs[Rs_depth], 0, 0));
311	#endif	410	#endif
312		411
		412	#ifdef HAVE_AFTERIMAGE
		413	set_application_name ((char*)rs[Rs_name]);
		414	set_output_threshold (OUTPUT_LEVEL_WARNING);
		415	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		416	#endif
313	free (r_argv);	417	free (r_argv);
314		418
315	for (int i = NUM_RESOURCES; i--; )	419	for (int i = NUM_RESOURCES; i--; )
316	if (rs [i] == resval_undef)	420	if (rs [i] == resval_undef)
317	rs [i] = 0;	421	rs [i] = 0;
…		…
333	* set any defaults not already set	437	* set any defaults not already set
334	*/	438	*/
335	if (cmd_argv && cmd_argv[0])	439	if (cmd_argv && cmd_argv[0])
336	{	440	{
337	if (!rs[Rs_title])	441	if (!rs[Rs_title])
338	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	442	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339	if (!rs[Rs_iconName])	443	if (!rs[Rs_iconName])
340	rs[Rs_iconName] = rs[Rs_title];	444	rs[Rs_iconName] = rs[Rs_title];
341	}	445	}
342	else	446	else
343	{	447	{
…		…
381	rs[Rs_cutchars] = CUTCHARS;	485	rs[Rs_cutchars] = CUTCHARS;
382		486
383	#ifndef NO_BACKSPACE_KEY	487	#ifndef NO_BACKSPACE_KEY
384	if (!rs[Rs_backspace_key])	488	if (!rs[Rs_backspace_key])
385	# ifdef DEFAULT_BACKSPACE	489	# ifdef DEFAULT_BACKSPACE
386	key_backspace = DEFAULT_BACKSPACE;	490	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387	# else	491	# else
388	key_backspace = "DEC"; /* can toggle between \010 or \177 */	492	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389	# endif	493	# endif
390	else
391	{
392	val = strdup (rs[Rs_backspace_key]);
393	rxvt_Str_trim (val);
394	rxvt_Str_escaped (val);
395	key_backspace = val;
396	}
397	#endif	494	#endif
398		495
399	#ifndef NO_DELETE_KEY	496	#ifndef NO_DELETE_KEY
400	if (!rs[Rs_delete_key])	497	if (!rs[Rs_delete_key])
401	# ifdef DEFAULT_DELETE	498	# ifdef DEFAULT_DELETE
402	key_delete = DEFAULT_DELETE;	499	rs[Rs_delete_key] = DEFAULT_DELETE;
403	# else	500	# else
404	key_delete = "\033[3~";	501	rs[Rs_delete_key] = "\033[3~";
405	# endif
406	else
407	{
408	val = strdup (rs[Rs_delete_key]);
409	rxvt_Str_trim (val);
410	rxvt_Str_escaped (val);
411	key_delete = val;
412	}
413	#endif	502	# endif
414	if (rs[Rs_answerbackstring])	503	#endif
415	{
416	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418	}
419		504
420	#ifdef HAVE_SCROLLBARS	505	#ifdef HAVE_SCROLLBARS
421	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	506	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422	#endif	507	#endif
423		508
424	#ifdef XTERM_REVERSE_VIDEO	509	#ifdef XTERM_REVERSE_VIDEO
425	/* this is how xterm implements reverseVideo */	510	/* this is how xterm implements reverseVideo */
426	if (OPTION (Opt_reverseVideo))	511	if (option (Opt_reverseVideo))
427	{	512	{
428	if (!rs[Rs_color + Color_fg])	513	if (!rs[Rs_color + Color_fg])
429	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	514	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430		515
431	if (!rs[Rs_color + Color_bg])	516	if (!rs[Rs_color + Color_bg])
…		…
437	if (!rs[Rs_color + i])	522	if (!rs[Rs_color + i])
438	rs[Rs_color + i] = def_colorName[i];	523	rs[Rs_color + i] = def_colorName[i];
439		524
440	#ifndef XTERM_REVERSE_VIDEO	525	#ifndef XTERM_REVERSE_VIDEO
441	/* this is how we implement reverseVideo */	526	/* this is how we implement reverseVideo */
442	if (OPTION (Opt_reverseVideo))	527	if (option (Opt_reverseVideo))
443	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	528	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444	#endif	529	#endif
445		530
446	/* convenient aliases for setting fg/bg to colors */	531	/* convenient aliases for setting fg/bg to colors */
447	color_aliases (Color_fg);	532	color_aliases (Color_fg);
448	color_aliases (Color_bg);	533	color_aliases (Color_bg);
449	#ifndef NO_CURSORCOLOR	534	#ifndef NO_CURSORCOLOR
450	color_aliases (Color_cursor);	535	color_aliases (Color_cursor);
451	color_aliases (Color_cursor2);	536	color_aliases (Color_cursor2);
452	#endif /* NO_CURSORCOLOR */	537	#endif /* NO_CURSORCOLOR */
453	color_aliases (Color_pointer_fg);	538	color_aliases (Color_pointer_fg);
454	color_aliases (Color_pointer_bg);	539	color_aliases (Color_pointer_bg);
455	color_aliases (Color_border);	540	color_aliases (Color_border);
456	#ifndef NO_BOLD_UNDERLINE_REVERSE	541	#ifndef NO_BOLD_UNDERLINE_REVERSE
457	color_aliases (Color_BD);	542	color_aliases (Color_BD);
458	color_aliases (Color_UL);	543	color_aliases (Color_UL);
459	color_aliases (Color_RV);	544	color_aliases (Color_RV);
460	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	545	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461		546
462	if (!rs[Rs_color + Color_border])	547	if (!rs[Rs_color + Color_border])
463	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	548	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464		549
465	return cmd_argv;	550	return cmd_argv;
		551	}
		552
		553	/----------------------------------------------------------------------/
		554	void
		555	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		556	{
		557	this->envv = envv;
		558
		559	SET_R (this);
		560	set_locale ("");
		561	set_environ (envv); // few things in X do not call setlocale :(
		562
		563	init_vars ();
		564
		565	init_secondary ();
		566
		567	const char **cmd_argv = init_resources (argc, argv);
		568
		569	#ifdef KEYSYM_RESOURCE
		570	keyboard->register_done ();
		571	#endif
		572
		573	#ifdef HAVE_SCROLLBARS
		574	if (option (Opt_scrollBar))
		575	scrollBar.setIdle (); /* set existence for size calculations */
		576	#endif
		577
		578	pty = ptytty::create ();
		579
		580	create_windows (argc, argv);
		581
		582	init_xlocale ();
		583
		584	scr_reset (); // initialize screen
		585
		586	#if 0
		587	XSynchronize (dpy, True);
		588	#endif
		589
		590	#ifdef HAVE_SCROLLBARS
		591	if (option (Opt_scrollBar))
		592	resize_scrollbar (); /* create and map scrollbar */
		593	#endif
		594	#ifdef HAVE_BG_PIXMAP
		595	{
		596	bgPixmap.set_target (this);
		597	bgPixmap.invalidate ();
		598
		599	#ifdef ENABLE_TRANSPARENCY
		600	if (option (Opt_transparent))
		601	{
		602	bgPixmap.set_transparent ();
		603
		604	#ifdef HAVE_AFTERIMAGE
		605	if (rs [Rs_blurradius])
		606	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		607	#endif
		608	if (ISSET_PIXCOLOR (Color_tint))
		609	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		610
		611	if (rs [Rs_shade])
		612	bgPixmap.set_shade (rs [Rs_shade]);
		613
		614	bgPixmap.set_root_pixmap ();
		615	XSelectInput (dpy, display->root, PropertyChangeMask);
		616	rootwin_ev.start (display, display->root);
		617	}
		618	#endif
		619
		620	#ifdef BG_IMAGE_FROM_FILE
		621	if (rs[Rs_backgroundPixmap])
		622	{
		623	const char *p = rs[Rs_backgroundPixmap];
		624
		625	if ((p = strchr (p, ';')) != 0)
		626	{
		627	p++;
		628	bgPixmap.set_geometry (p);
		629	}
		630	else
		631	bgPixmap.set_defaultGeometry ();
		632
		633	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		634	if (!bgPixmap.window_position_sensitive ())
		635	update_background ();
		636	}
		637	#endif
		638	}
		639	#endif
		640
		641	#if ENABLE_PERL
		642	rootwin_ev.start (display, display->root);
		643	#endif
		644
		645	set_colorfgbg ();
		646
		647	init_command (cmd_argv);
		648
		649	free (cmd_argv);
		650
		651	if (pty->pty >= 0)
		652	pty_ev.start (pty->pty, ev::READ);
		653
		654	HOOK_INVOKE ((this, HOOK_START, DT_END));
		655
		656	#if ENABLE_XEMBED
		657	if (rs[Rs_embed])
		658	{
		659	long info[2] = { 0, XEMBED_MAPPED };
		660
		661	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		662	32, PropModeReplace, (unsigned char *)&info, 2);
		663	}
		664	#endif
		665
		666	XMapWindow (dpy, vt);
		667	XMapWindow (dpy, parent[0]);
		668
		669	refresh_check ();
466	}	670	}
467		671
468	/----------------------------------------------------------------------/	672	/----------------------------------------------------------------------/
469	void	673	void
470	rxvt_term::init_env ()	674	rxvt_term::init_env ()
471	{	675	{
472	int i;	676	int i;
473	unsigned int u;
474	char *val;	677	char *val;
475		678
476	#ifdef DISPLAY_IS_IP	679	#ifdef DISPLAY_IS_IP
477	/* Fixup display_name for export over pty to any interested terminal	680	/* Fixup display_name for export over pty to any interested terminal
478	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	681	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
486	*/	689	*/
487	val = rxvt_network_display (rs[Rs_display_name]);	690	val = rxvt_network_display (rs[Rs_display_name]);
488	rs[Rs_display_name] = (const char *)val;	691	rs[Rs_display_name] = (const char *)val;
489		692
490	if (val == NULL)	693	if (val == NULL)
491	#endif /* DISPLAY_IS_IP */	694	#endif /* DISPLAY_IS_IP */
492	val = XDisplayString (dpy);	695	val = XDisplayString (dpy);
493		696
494	if (rs[Rs_display_name] == NULL)	697	if (rs[Rs_display_name] == NULL)
495	rs[Rs_display_name] = val; /* use broken `:0' value */	698	rs[Rs_display_name] = val; /* use broken `:0' value */
496		699
497	i = strlen (val);	700	i = strlen (val);
498	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	701	env_display = (char *)rxvt_malloc (i + 9);
499		702
500	sprintf (env_display, "DISPLAY=%s", val);	703	sprintf (env_display, "DISPLAY=%s", val);
501		704
502	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	705	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503		706
…		…
524	else	727	else
525	putenv ("COLORTERM=" COLORTERMENVFULL);	728	putenv ("COLORTERM=" COLORTERMENVFULL);
526		729
527	if (rs[Rs_term_name] != NULL)	730	if (rs[Rs_term_name] != NULL)
528	{	731	{
529	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	732	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	733	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531	putenv (env_term);	734	putenv (env_term);
532	}	735	}
533	else	736	else
534	putenv ("TERM=" TERMENV);	737	putenv ("TERM=" TERMENV);
…		…
536	#ifdef HAVE_UNSETENV	739	#ifdef HAVE_UNSETENV
537	/* avoid passing old settings and confusing term size */	740	/* avoid passing old settings and confusing term size */
538	unsetenv ("LINES");	741	unsetenv ("LINES");
539	unsetenv ("COLUMNS");	742	unsetenv ("COLUMNS");
540	unsetenv ("TERMCAP"); /* terminfo should be okay */	743	unsetenv ("TERMCAP"); /* terminfo should be okay */
541	#endif /* HAVE_UNSETENV */	744	#endif /* HAVE_UNSETENV */
542	}	745	}
543		746
544	/----------------------------------------------------------------------/	747	/----------------------------------------------------------------------/
545	/*	748	/*
546	* This is more or less stolen straight from XFree86 xterm.	749	* This is more or less stolen straight from XFree86 xterm.
…		…
567		770
568	this->locale = "C";	771	this->locale = "C";
569	}	772	}
570		773
571		774
572	this->locale = rxvt_strdup (this->locale);	775	this->locale = strdup (this->locale);
573	SET_LOCALE (this->locale);	776	SET_LOCALE (this->locale);
574	mbstate.reset ();	777	mbstate.reset ();
575	#endif	778	#endif
576		779
577	#if HAVE_NL_LANGINFO	780	#if HAVE_NL_LANGINFO
…		…
621	* Initialize the command connection.	824	* Initialize the command connection.
622	* This should be called after the X server connection is established.	825	* This should be called after the X server connection is established.
623	*/	826	*/
624		827
625	#ifdef META8_OPTION	828	#ifdef META8_OPTION
626	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	829	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627	#endif	830	#endif
628		831
629	get_ourmods ();	832	get_ourmods ();
630		833
631	if (!OPTION (Opt_scrollTtyOutput))	834	if (!option (Opt_scrollTtyOutput))
632	priv_modes \|= PrivMode_TtyOutputInh;	835	priv_modes \|= PrivMode_TtyOutputInh;
633	if (OPTION (Opt_scrollTtyKeypress))	836	if (option (Opt_scrollTtyKeypress))
634	priv_modes \|= PrivMode_Keypress;	837	priv_modes \|= PrivMode_Keypress;
635	if (!OPTION (Opt_jumpScroll))	838	if (!option (Opt_jumpScroll))
636	priv_modes \|= PrivMode_smoothScroll;	839	priv_modes \|= PrivMode_smoothScroll;
637		840
638	#ifndef NO_BACKSPACE_KEY	841	#ifndef NO_BACKSPACE_KEY
639	if (strcmp (key_backspace, "DEC") == 0)	842	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640	priv_modes \|= PrivMode_HaveBackSpace;	843	priv_modes \|= PrivMode_HaveBackSpace;
641	#endif	844	#endif
642		845
643	/* add value for scrollBar */	846	/* add value for scrollBar */
644	if (scrollBar.state)	847	if (scrollBar.state)
…		…
657	int i;	860	int i;
658		861
659	#ifdef OFF_FOCUS_FADING	862	#ifdef OFF_FOCUS_FADING
660	pix_colors = pix_colors_focused;	863	pix_colors = pix_colors_focused;
661	#endif	864	#endif
662		865
663	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	866	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664	{	867	{
665	const char *name = rs[Rs_color + i];	868	const char *name = rs[Rs_color + i];
666		869
667	if (!name)	870	if (!name)
…		…
670	rxvt_color xcol;	873	rxvt_color xcol;
671		874
672	if (!set_color (xcol, name))	875	if (!set_color (xcol, name))
673	{	876	{
674	#ifndef XTERM_REVERSE_VIDEO	877	#ifndef XTERM_REVERSE_VIDEO
675	if (i < 2 && OPTION (Opt_reverseVideo))	878	if (i < 2 && option (Opt_reverseVideo))
676	name = def_colorName [1 - i];	879	name = def_colorName [1 - i];
677	else	880	else
678	#endif	881	#endif
679	name = def_colorName [i];	882	name = def_colorName [i];
680		883
…		…
745	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	948	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746	cscroll.a)	949	cscroll.a)
747	))	950	))
748	alias_color (Color_topShadow, Color_White);	951	alias_color (Color_topShadow, Color_White);
749	}	952	}
750	#endif /* KEEP_SCROLLCOLOR */	953	#endif /* KEEP_SCROLLCOLOR */
751		954
752	#ifdef OFF_FOCUS_FADING	955	#ifdef OFF_FOCUS_FADING
753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	956	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754	update_fade_color (i);	957	update_fade_color (i);
755	#endif	958	#endif
…		…
763	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	966	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764	{	967	{
765	int i = atoi (rs[Rs_color + idx]);	968	int i = atoi (rs[Rs_color + idx]);
766		969
767	if (i >= 8 && i <= 15)	970	if (i >= 8 && i <= 15)
768	{ /* bright colors */	971	/* bright colors */
769	i -= 8;
770	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	972	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771	return;	973	else if (i >= 0 && i <= 7)
772	}	974	/* normal colors */
773
774	if (i >= 0 && i <= 7) /* normal colors */
775	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	975	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776	}	976	}
777	}	977	}
778		978
779	/----------------------------------------------------------------------/	979	/----------------------------------------------------------------------/
…		…
871	rxvt_term::create_windows (int argc, const char const argv)	1071	rxvt_term::create_windows (int argc, const char const argv)
872	{	1072	{
873	XClassHint classHint;	1073	XClassHint classHint;
874	XWMHints wmHint;	1074	XWMHints wmHint;
875	#if ENABLE_FRILLS	1075	#if ENABLE_FRILLS
876	MWMHints mwmhints;	1076	MWMHints mwmhints = { };
877	#endif	1077	#endif
878	XGCValues gcvalue;	1078	XGCValues gcvalue;
879	XSetWindowAttributes attributes;	1079	XSetWindowAttributes attributes;
880	Window top, parent;	1080	Window top, parent;
881		1081
…		…
887	if (!set_fonts ())	1087	if (!set_fonts ())
888	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1088	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889		1089
890	parent = display->root;	1090	parent = display->root;
891		1091
892	attributes.override_redirect = !!OPTION (Opt_override_redirect);	1092	attributes.override_redirect = !!option (Opt_override_redirect);
893		1093
894	#if ENABLE_FRILLS	1094	#if ENABLE_FRILLS
895	if (OPTION (Opt_borderLess))	1095	if (option (Opt_borderLess))
896	{	1096	{
897	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1097	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898	{	1098	{
899	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1099	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900	attributes.override_redirect = true;	1100	attributes.override_redirect = true;
901	mwmhints.flags = 0;
902	}	1101	}
903	else	1102	else
904	{	1103	{
905	mwmhints.flags = MWM_HINTS_DECORATIONS;	1104	mwmhints.flags = MWM_HINTS_DECORATIONS;
906	mwmhints.decorations = 0;
907	}	1105	}
908	}	1106	}
909	else
910	mwmhints.flags = 0;
911	#endif	1107	#endif
912		1108
913	#if ENABLE_XEMBED	1109	#if ENABLE_XEMBED
914	if (rs[Rs_embed])	1110	if (rs[Rs_embed])
915	{	1111	{
…		…
950	classHint.res_name = (char *)rs[Rs_name];	1146	classHint.res_name = (char *)rs[Rs_name];
951	classHint.res_class = (char *)RESCLASS;	1147	classHint.res_class = (char *)RESCLASS;
952		1148
953	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1149	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
954	wmHint.input = True;	1150	wmHint.input = True;
955	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1151	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956	wmHint.window_group = top;	1152	wmHint.window_group = top;
957		1153
958	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1154	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959	&szHint, &wmHint, &classHint);	1155	&szHint, &wmHint, &classHint);
960		1156
…		…
998		1194
999	termwin_ev.start (display, top);	1195	termwin_ev.start (display, top);
1000		1196
1001	/* vt cursor: Black-on-White is standard, but this is more popular */	1197	/* vt cursor: Black-on-White is standard, but this is more popular */
1002	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1198	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		1199
1009	/* the vt window */	1200	/* the vt window */
1010	vt = XCreateSimpleWindow (dpy, top,	1201	vt = XCreateSimpleWindow (dpy, top,
1011	window_vt_x, window_vt_y,	1202	window_vt_x, window_vt_y,
1012	width, height,	1203	width, height,
…		…
1017	attributes.bit_gravity = NorthWestGravity;	1208	attributes.bit_gravity = NorthWestGravity;
1018	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);	1209	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019		1210
1020	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1211	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1021		1212
1022	if (OPTION (Opt_pointerBlank))	1213	if (option (Opt_pointerBlank))
1023	vt_emask \|= PointerMotionMask;	1214	vt_emask \|= PointerMotionMask;
1024	else	1215	else
1025	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1216	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1026		1217
1027	vt_select_input ();	1218	vt_select_input ();
1028		1219
1029	vt_ev.start (display, vt);	1220	vt_ev.start (display, vt);
1030
1031	#ifdef XPM_BACKGROUND
1032	if (rs[Rs_backgroundPixmap] != NULL
1033	&& !OPTION (Opt_transparent))
1034	{
1035	const char *p = rs[Rs_backgroundPixmap];
1036
1037	if ((p = strchr (p, ';')) != NULL)
1038	{
1039	p++;
1040	scale_pixmap (p);
1041	}
1042
1043	set_bgPixmap (rs[Rs_backgroundPixmap]);
1044	scr_touch (true);
1045	}
1046	#endif
1047		1221
1048	/* graphics context for the vt window */	1222	/* graphics context for the vt window */
1049	gcvalue.foreground = pix_colors[Color_fg];	1223	gcvalue.foreground = pix_colors[Color_fg];
1050	gcvalue.background = pix_colors[Color_bg];	1224	gcvalue.background = pix_colors[Color_bg];
1051	gcvalue.graphics_exposures = 0;	1225	gcvalue.graphics_exposures = 0;
…		…
1054	GCForeground \| GCBackground \| GCGraphicsExposures,	1228	GCForeground \| GCBackground \| GCGraphicsExposures,
1055	&gcvalue);	1229	&gcvalue);
1056		1230
1057	drawable = new rxvt_drawable (this, vt);	1231	drawable = new rxvt_drawable (this, vt);
1058		1232
1059	#ifdef RXVT_SCROLLBAR
1060	gcvalue.foreground = pix_colors[Color_topShadow];
1061	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062	gcvalue.foreground = pix_colors[Color_bottomShadow];
1063	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1065	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1066	#endif
1067
1068	#ifdef OFF_FOCUS_FADING	1233	#ifdef OFF_FOCUS_FADING
1069	// initially we are in unfocused state	1234	// initially we are in unfocused state
1070	if (rs[Rs_fade])	1235	if (rs[Rs_fade])
1071	pix_colors = pix_colors_unfocused;	1236	pix_colors = pix_colors_unfocused;
1072	#endif	1237	#endif
…		…
1077		1242
1078	/* ------------------------------------------------------------------------- *	1243	/* ------------------------------------------------------------------------- *
1079	* GET TTY CURRENT STATE *	1244	* GET TTY CURRENT STATE *
1080	* ------------------------------------------------------------------------- */	1245	* ------------------------------------------------------------------------- */
1081	void	1246	void
1082	rxvt_get_ttymode (ttymode_t *tio, int erase)	1247	rxvt_get_ttymode (struct termios *tio, int erase)
1083	{	1248	{
1084	/*	1249	/*
1085	* standard System V termios interface	1250	* standard System V termios interface
1086	*/	1251	*/
1087	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1252	if (tcgetattr (STDIN_FILENO, tio) < 0)
1088	{	1253	{
1089	// return error - use system defaults,	1254	// return error - use system defaults,
1090	// where possible, and zero elsewhere	1255	// where possible, and zero elsewhere
1091	memset (tio, 0, sizeof (ttymode_t));	1256	memset (tio, 0, sizeof (struct termios));
1092		1257
1093	tio->c_cc[VINTR] = CINTR;	1258	tio->c_cc[VINTR] = CINTR;
1094	tio->c_cc[VQUIT] = CQUIT;	1259	tio->c_cc[VQUIT] = CQUIT;
1095	tio->c_cc[VERASE] = CERASE;	1260	tio->c_cc[VERASE] = CERASE;
1096	#ifdef VERASE2	1261	#ifdef VERASE2
…		…
1160		1325
1161	/*	1326	/*
1162	* Debugging	1327	* Debugging
1163	*/	1328	*/
1164	#ifdef DEBUG_TTYMODE	1329	#ifdef DEBUG_TTYMODE
1165	#ifdef HAVE_TERMIOS_H
1166	/* c_iflag bits */	1330	/* c_iflag bits */
1167	fprintf (stderr, "Input flags\n");	1331	fprintf (stderr, "Input flags\n");
1168		1332
1169	/* cpp token stringize doesn't work on all machines <sigh> */	1333	/* cpp token stringize doesn't work on all machines <sigh> */
1170	# define FOO(flag,name) \	1334	# define FOO(flag,name) \
…		…
1233	FOO (VLNEXT, "VLNEXT");	1397	FOO (VLNEXT, "VLNEXT");
1234	# endif	1398	# endif
1235		1399
1236	fprintf (stderr, "\n");	1400	fprintf (stderr, "\n");
1237	# undef FOO	1401	# undef FOO
1238	# endif /* HAVE_TERMIOS_H */	1402	#endif /* DEBUG_TTYMODE */
1239	#endif /* DEBUG_TTYMODE */
1240	}	1403	}
1241		1404
1242	/----------------------------------------------------------------------/	1405	/----------------------------------------------------------------------/
1243	/*	1406	/*
1244	* Run the command in a subprocess and return a file descriptor for the	1407	* Run the command in a subprocess and return a file descriptor for the
…		…
1268	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1431	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269		1432
1270	int er;	1433	int er;
1271		1434
1272	#ifndef NO_BACKSPACE_KEY	1435	#ifndef NO_BACKSPACE_KEY
1273	if (key_backspace[0] && !key_backspace[1])	1436	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274	er = key_backspace[0];	1437	er = rs[Rs_backspace_key][0];
1275	else if (strcmp (key_backspace, "DEC") == 0)	1438	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276	er = '\177'; /* the initial state anyway */	1439	er = '\177'; /* the initial state anyway */
1277	else	1440	else
1278	#endif	1441	#endif
1279	er = -1;	1442	er = -1;
1280		1443
1281	rxvt_get_ttymode (&tio, er);	1444	rxvt_get_ttymode (&tio, er);
1282	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1445	/* init terminal attributes */
		1446	cfsetospeed (&tio, BAUDRATE);
		1447	cfsetispeed (&tio, BAUDRATE);
		1448	tcsetattr (pty->tty, TCSANOW, &tio);
1283	pty->set_utf8_mode (enc_utf8);	1449	pty->set_utf8_mode (enc_utf8);
1284		1450
1285	/* set initial window size */	1451	/* set initial window size */
1286	tt_winch ();	1452	tt_winch ();
1287		1453
…		…
1322	}	1488	}
1323		1489
1324	_exit (EXIT_FAILURE);	1490	_exit (EXIT_FAILURE);
1325		1491
1326	default:	1492	default:
1327	if (!OPTION (Opt_utmpInhibit))	1493	if (!option (Opt_utmpInhibit))
1328	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1494	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329		1495
1330	pty->close_tty ();	1496	pty->close_tty ();
1331		1497
1332	child_ev.start (cmd_pid);	1498	child_ev.start (cmd_pid);
1333		1499
…		…
1346	int	1512	int
1347	rxvt_term::run_child (const char const argv)	1513	rxvt_term::run_child (const char const argv)
1348	{	1514	{
1349	char *login;	1515	char *login;
1350		1516
1351	if (OPTION (Opt_console))	1517	if (option (Opt_console))
		1518	{
1352	{ /* be virtual console, fail silently */	1519	/* be virtual console, fail silently */
1353	#ifdef TIOCCONS	1520	#ifdef TIOCCONS
1354	unsigned int on = 1;	1521	unsigned int on = 1;
1355		1522
1356	ioctl (STDIN_FILENO, TIOCCONS, &on);	1523	ioctl (STDIN_FILENO, TIOCCONS, &on);
1357	#elif defined (SRIOCSREDIR)	1524	#elif defined (SRIOCSREDIR)
…		…
1359		1526
1360	fd = open (CONSOLE, O_WRONLY, 0);	1527	fd = open (CONSOLE, O_WRONLY, 0);
1361	if (fd >= 0)	1528	if (fd >= 0)
1362	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1529	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1363	close (fd);	1530	close (fd);
1364	#endif /* SRIOCSREDIR */	1531	#endif /* SRIOCSREDIR */
1365	}	1532	}
1366		1533
1367	/* reset signals and spin off the command interpreter */	1534	/* reset signals and spin off the command interpreter */
1368	signal (SIGINT, SIG_DFL);	1535	signal (SIGINT, SIG_DFL);
1369	signal (SIGQUIT, SIG_DFL);	1536	signal (SIGQUIT, SIG_DFL);
…		…
1376	*/	1543	*/
1377	#ifdef SIGTSTP	1544	#ifdef SIGTSTP
1378	signal (SIGTSTP, SIG_IGN);	1545	signal (SIGTSTP, SIG_IGN);
1379	signal (SIGTTIN, SIG_IGN);	1546	signal (SIGTTIN, SIG_IGN);
1380	signal (SIGTTOU, SIG_IGN);	1547	signal (SIGTTOU, SIG_IGN);
1381	#endif /* SIGTSTP */	1548	#endif /* SIGTSTP */
1382		1549
1383	// unblock signals (signals are blocked by iom.C	1550	// unblock signals (signals are blocked by iom.C
1384	sigset_t ss;	1551	sigset_t ss;
1385	sigemptyset (&ss);	1552	sigemptyset (&ss);
1386	sigprocmask (SIG_SETMASK, &ss, 0);	1553	sigprocmask (SIG_SETMASK, &ss, 0);
1387		1554
1388	/* command interpreter path */	1555	/* command interpreter path */
1389	if (argv != NULL)	1556	if (argv)
1390	{	1557	{
1391	# ifdef DEBUG_CMD	1558	# ifdef DEBUG_CMD
1392	int i;	1559	int i;
1393		1560
1394	for (i = 0; argv[i]; i++)	1561	for (i = 0; argv[i]; i++)
…		…
1403	const char argv0, shell;	1570	const char argv0, shell;
1404		1571
1405	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1572	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1406	shell = "/bin/sh";	1573	shell = "/bin/sh";
1407		1574
1408	argv0 = (const char *)rxvt_r_basename (shell);	1575	argv0 = (const char *)rxvt_basename (shell);
1409		1576
1410	if (OPTION (Opt_loginShell))	1577	if (option (Opt_loginShell))
1411	{	1578	{
1412	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1579	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413		1580
1414	login[0] = '-';	1581	login[0] = '-';
1415	strcpy (&login[1], argv0);	1582	strcpy (&login[1], argv0);
1416	argv0 = login;	1583	argv0 = login;
1417	}	1584	}
1418		1585
1419	execlp (shell, argv0, NULL);	1586	execlp (shell, argv0, (char *)0);
1420	/* no error message: STDERR is closed! */	1587	/* no error message: STDERR is closed! */
1421	}	1588	}
1422		1589
1423	return -1;	1590	return -1;
1424	}	1591	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.180 by ayin, Fri Feb 16 21:46:05 2007 UTC vs. Revision 1.239 by ayin, Sat Jan 19 13:00:07 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.180 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.239 by ayin, Sat Jan 19 13:00:07 2008 UTC