[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.244 by ayin, Sat Jan 26 14:24:43 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-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	"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);
		313	set_option (Opt_buffered);
218	}	314	}
219		315
220	void	316	static void
221	rxvt_term::init_secondary ()	317	init_secondary ()
222	{	318	{
223	int i;	319	int i;
224		320
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)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
230	{	322	{
231	/* TODO: BOO HISS */
232	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
233	}	324	}
234	else if (i > STDIN_FILENO)	325	else if (i != STDIN_FILENO)
235	{	326	{
236	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
237	close (i);	328	close (i);
238	}	329	}
239		330
240	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	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	}	332	}
253		333
254	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
255	const char **	335	const char **
256	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
257	{	337	{
258	int i, r_argc;	338	int i, r_argc;
259	char *val;
260	const char cmd_argv, r_argv;	339	const char cmd_argv, r_argv;
261		340
262	/*	341	/*
263	* Look for -e option. Find => split and make cmd_argv[] of command args	342	* Look for -e option. Find => split and make cmd_argv[] of command args
264	*/	343	*/
265	for (r_argc = 0; r_argc < argc; r_argc++)	344	for (r_argc = 0; r_argc < argc; r_argc++)
266	if (!strcmp (argv[r_argc], "-e"))	345	if (!strcmp (argv[r_argc], "-e"))
267	break;	346	break;
268		347
		348	if (r_argc == argc)
		349	cmd_argv = NULL;
		350	else if (!argv[r_argc + 1])
		351	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		352	else
		353	{
		354	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		355
		356	for (i = 0; i < argc - r_argc - 1; i++)
		357	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		358
		359	cmd_argv[i] = NULL;
		360	}
		361
269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	362	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
270		363
271	for (i = 0; i < r_argc; i++)	364	for (i = 0; i < r_argc; i++)
272	r_argv[i] = (const char *)argv[i];	365	r_argv[i] = (const char *)argv[i];
273		366
274	r_argv[i] = NULL;	367	r_argv[i] = NULL;
275		368
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]);	369	rs[Rs_name] = rxvt_basename (argv[0]);
289		370
290	/*	371	/*
291	* Open display, get options/resources and create the window	372	* Open display, get options/resources and create the window
292	*/	373	*/
293		374
…		…
295	rs[Rs_display_name] = ":0";	376	rs[Rs_display_name] = ":0";
296		377
297	get_options (r_argc, r_argv);	378	get_options (r_argc, r_argv);
298		379
299	if (!(display = displays.get (rs[Rs_display_name])))	380	if (!(display = displays.get (rs[Rs_display_name])))
		381	{
		382	free (r_argv);
300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	383	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		384	}
301		385
302	// using a local pointer decreases code size a lot	386	// using a local pointer decreases code size a lot
303	xa = display->xa;	387	xa = display->xa;
304		388
305	set (display);	389	set (display);
…		…
308	#if XFT	392	#if XFT
309	if (rs[Rs_depth])	393	if (rs[Rs_depth])
310	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
311	#endif	395	#endif
312		396
		397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
		400	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		401	#endif
313	free (r_argv);	402	free (r_argv);
314		403
315	for (int i = NUM_RESOURCES; i--; )	404	for (int i = NUM_RESOURCES; i--; )
316	if (rs [i] == resval_undef)	405	if (rs [i] == resval_undef)
317	rs [i] = 0;	406	rs [i] = 0;
…		…
333	* set any defaults not already set	422	* set any defaults not already set
334	*/	423	*/
335	if (cmd_argv && cmd_argv[0])	424	if (cmd_argv && cmd_argv[0])
336	{	425	{
337	if (!rs[Rs_title])	426	if (!rs[Rs_title])
338	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339	if (!rs[Rs_iconName])	428	if (!rs[Rs_iconName])
340	rs[Rs_iconName] = rs[Rs_title];	429	rs[Rs_iconName] = rs[Rs_title];
341	}	430	}
342	else	431	else
343	{	432	{
…		…
381	rs[Rs_cutchars] = CUTCHARS;	470	rs[Rs_cutchars] = CUTCHARS;
382		471
383	#ifndef NO_BACKSPACE_KEY	472	#ifndef NO_BACKSPACE_KEY
384	if (!rs[Rs_backspace_key])	473	if (!rs[Rs_backspace_key])
385	# ifdef DEFAULT_BACKSPACE	474	# ifdef DEFAULT_BACKSPACE
386	key_backspace = DEFAULT_BACKSPACE;	475	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387	# else	476	# else
388	key_backspace = "DEC"; /* can toggle between \010 or \177 */	477	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389	# endif	478	# 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	479	#endif
398		480
399	#ifndef NO_DELETE_KEY	481	#ifndef NO_DELETE_KEY
400	if (!rs[Rs_delete_key])	482	if (!rs[Rs_delete_key])
401	# ifdef DEFAULT_DELETE	483	# ifdef DEFAULT_DELETE
402	key_delete = DEFAULT_DELETE;	484	rs[Rs_delete_key] = DEFAULT_DELETE;
403	# else	485	# else
404	key_delete = "\033[3~";	486	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	487	# endif
414	if (rs[Rs_answerbackstring])	488	#endif
415	{
416	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418	}
419		489
420	#ifdef HAVE_SCROLLBARS	490	#ifdef HAVE_SCROLLBARS
421	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	491	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422	#endif	492	#endif
423		493
424	#ifdef XTERM_REVERSE_VIDEO	494	#ifdef XTERM_REVERSE_VIDEO
425	/* this is how xterm implements reverseVideo */	495	/* this is how xterm implements reverseVideo */
426	if (OPTION (Opt_reverseVideo))	496	if (option (Opt_reverseVideo))
427	{	497	{
428	if (!rs[Rs_color + Color_fg])	498	if (!rs[Rs_color + Color_fg])
429	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	499	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430		500
431	if (!rs[Rs_color + Color_bg])	501	if (!rs[Rs_color + Color_bg])
…		…
437	if (!rs[Rs_color + i])	507	if (!rs[Rs_color + i])
438	rs[Rs_color + i] = def_colorName[i];	508	rs[Rs_color + i] = def_colorName[i];
439		509
440	#ifndef XTERM_REVERSE_VIDEO	510	#ifndef XTERM_REVERSE_VIDEO
441	/* this is how we implement reverseVideo */	511	/* this is how we implement reverseVideo */
442	if (OPTION (Opt_reverseVideo))	512	if (option (Opt_reverseVideo))
443	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	513	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444	#endif	514	#endif
445		515
446	/* convenient aliases for setting fg/bg to colors */	516	/* convenient aliases for setting fg/bg to colors */
447	color_aliases (Color_fg);	517	color_aliases (Color_fg);
448	color_aliases (Color_bg);	518	color_aliases (Color_bg);
449	#ifndef NO_CURSORCOLOR	519	#ifndef NO_CURSORCOLOR
450	color_aliases (Color_cursor);	520	color_aliases (Color_cursor);
451	color_aliases (Color_cursor2);	521	color_aliases (Color_cursor2);
452	#endif /* NO_CURSORCOLOR */	522	#endif /* NO_CURSORCOLOR */
453	color_aliases (Color_pointer_fg);	523	color_aliases (Color_pointer_fg);
454	color_aliases (Color_pointer_bg);	524	color_aliases (Color_pointer_bg);
455	color_aliases (Color_border);	525	color_aliases (Color_border);
456	#ifndef NO_BOLD_UNDERLINE_REVERSE	526	#ifndef NO_BOLD_UNDERLINE_REVERSE
457	color_aliases (Color_BD);	527	color_aliases (Color_BD);
458	color_aliases (Color_UL);	528	color_aliases (Color_UL);
459	color_aliases (Color_RV);	529	color_aliases (Color_RV);
460	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	530	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461		531
462	if (!rs[Rs_color + Color_border])	532	if (!rs[Rs_color + Color_border])
463	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	533	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464		534
465	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); // 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	#ifdef HAVE_SCROLLBARS
		559	if (option (Opt_scrollBar))
		560	scrollBar.setIdle (); /* set existence for size calculations */
		561	#endif
		562
		563	pty = ptytty::create ();
		564
		565	create_windows (argc, argv);
		566
		567	init_xlocale ();
		568
		569	scr_reset (); // initialize screen
		570
		571	#if 0
		572	XSynchronize (dpy, True);
		573	#endif
		574
		575	#ifdef HAVE_SCROLLBARS
		576	if (option (Opt_scrollBar))
		577	resize_scrollbar (); /* create and map scrollbar */
		578	#endif
		579	#ifdef HAVE_BG_PIXMAP
		580	{
		581	bgPixmap.set_target (this);
		582	bgPixmap.invalidate ();
		583
		584	#ifdef ENABLE_TRANSPARENCY
		585	if (option (Opt_transparent))
		586	{
		587	bgPixmap.set_transparent ();
		588
		589	#ifdef HAVE_AFTERIMAGE
		590	if (rs [Rs_blurradius])
		591	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		592	#endif
		593	if (ISSET_PIXCOLOR (Color_tint))
		594	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		595
		596	if (rs [Rs_shade])
		597	bgPixmap.set_shade (rs [Rs_shade]);
		598
		599	bgPixmap.set_root_pixmap ();
		600	XSelectInput (dpy, display->root, PropertyChangeMask);
		601	rootwin_ev.start (display, display->root);
		602	}
		603	#endif
		604
		605	#ifdef BG_IMAGE_FROM_FILE
		606	if (rs[Rs_backgroundPixmap])
		607	{
		608	const char *p = rs[Rs_backgroundPixmap];
		609
		610	if ((p = strchr (p, ';')) != 0)
		611	{
		612	p++;
		613	bgPixmap.set_geometry (p);
		614	}
		615	else
		616	bgPixmap.set_defaultGeometry ();
		617
		618	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		619	if (!bgPixmap.window_position_sensitive ())
		620	update_background ();
		621	}
		622	#endif
		623	}
		624	#endif
		625
		626	#if ENABLE_PERL
		627	rootwin_ev.start (display, display->root);
		628	#endif
		629
		630	set_colorfgbg ();
		631
		632	init_command (cmd_argv);
		633
		634	free (cmd_argv);
		635
		636	if (pty->pty >= 0)
		637	pty_ev.start (pty->pty, ev::READ);
		638
		639	HOOK_INVOKE ((this, HOOK_START, DT_END));
		640
		641	#if ENABLE_XEMBED
		642	if (rs[Rs_embed])
		643	{
		644	long info[2] = { 0, XEMBED_MAPPED };
		645
		646	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		647	32, PropModeReplace, (unsigned char *)&info, 2);
		648	}
		649	#endif
		650
		651	XMapWindow (dpy, vt);
		652	XMapWindow (dpy, parent[0]);
		653
		654	refresh_check ();
466	}	655	}
467		656
468	/----------------------------------------------------------------------/	657	/----------------------------------------------------------------------/
469	void	658	void
470	rxvt_term::init_env ()	659	rxvt_term::init_env ()
471	{	660	{
472	int i;	661	int i;
473	unsigned int u;
474	char *val;	662	char *val;
475		663
476	#ifdef DISPLAY_IS_IP	664	#ifdef DISPLAY_IS_IP
477	/* Fixup display_name for export over pty to any interested terminal	665	/* 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	666	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
486	*/	674	*/
487	val = rxvt_network_display (rs[Rs_display_name]);	675	val = rxvt_network_display (rs[Rs_display_name]);
488	rs[Rs_display_name] = (const char *)val;	676	rs[Rs_display_name] = (const char *)val;
489		677
490	if (val == NULL)	678	if (val == NULL)
491	#endif /* DISPLAY_IS_IP */	679	#endif /* DISPLAY_IS_IP */
492	val = XDisplayString (dpy);	680	val = XDisplayString (dpy);
493		681
494	if (rs[Rs_display_name] == NULL)	682	if (rs[Rs_display_name] == NULL)
495	rs[Rs_display_name] = val; /* use broken `:0' value */	683	rs[Rs_display_name] = val; /* use broken `:0' value */
496		684
497	i = strlen (val);	685	i = strlen (val);
498	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	686	env_display = (char *)rxvt_malloc (i + 9);
499		687
500	sprintf (env_display, "DISPLAY=%s", val);	688	sprintf (env_display, "DISPLAY=%s", val);
501		689
502	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	690	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503		691
…		…
524	else	712	else
525	putenv ("COLORTERM=" COLORTERMENVFULL);	713	putenv ("COLORTERM=" COLORTERMENVFULL);
526		714
527	if (rs[Rs_term_name] != NULL)	715	if (rs[Rs_term_name] != NULL)
528	{	716	{
529	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	717	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	718	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531	putenv (env_term);	719	putenv (env_term);
532	}	720	}
533	else	721	else
534	putenv ("TERM=" TERMENV);	722	putenv ("TERM=" TERMENV);
…		…
536	#ifdef HAVE_UNSETENV	724	#ifdef HAVE_UNSETENV
537	/* avoid passing old settings and confusing term size */	725	/* avoid passing old settings and confusing term size */
538	unsetenv ("LINES");	726	unsetenv ("LINES");
539	unsetenv ("COLUMNS");	727	unsetenv ("COLUMNS");
540	unsetenv ("TERMCAP"); /* terminfo should be okay */	728	unsetenv ("TERMCAP"); /* terminfo should be okay */
541	#endif /* HAVE_UNSETENV */	729	#endif /* HAVE_UNSETENV */
542	}	730	}
543		731
544	/----------------------------------------------------------------------/	732	/----------------------------------------------------------------------/
545	/*	733	/*
546	* This is more or less stolen straight from XFree86 xterm.	734	* This is more or less stolen straight from XFree86 xterm.
…		…
567		755
568	this->locale = "C";	756	this->locale = "C";
569	}	757	}
570		758
571		759
572	this->locale = rxvt_strdup (this->locale);	760	this->locale = strdup (this->locale);
573	SET_LOCALE (this->locale);	761	SET_LOCALE (this->locale);
574	mbstate.reset ();	762	mbstate.reset ();
575	#endif	763	#endif
576		764
577	#if HAVE_NL_LANGINFO	765	#if HAVE_NL_LANGINFO
…		…
621	* Initialize the command connection.	809	* Initialize the command connection.
622	* This should be called after the X server connection is established.	810	* This should be called after the X server connection is established.
623	*/	811	*/
624		812
625	#ifdef META8_OPTION	813	#ifdef META8_OPTION
626	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	814	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627	#endif	815	#endif
628		816
629	get_ourmods ();	817	get_ourmods ();
630		818
631	if (!OPTION (Opt_scrollTtyOutput))	819	if (!option (Opt_scrollTtyOutput))
632	priv_modes \|= PrivMode_TtyOutputInh;	820	priv_modes \|= PrivMode_TtyOutputInh;
633	if (OPTION (Opt_scrollTtyKeypress))	821	if (option (Opt_scrollTtyKeypress))
634	priv_modes \|= PrivMode_Keypress;	822	priv_modes \|= PrivMode_Keypress;
635	if (!OPTION (Opt_jumpScroll))	823	if (!option (Opt_jumpScroll))
636	priv_modes \|= PrivMode_smoothScroll;	824	priv_modes \|= PrivMode_smoothScroll;
637		825
638	#ifndef NO_BACKSPACE_KEY	826	#ifndef NO_BACKSPACE_KEY
639	if (strcmp (key_backspace, "DEC") == 0)	827	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640	priv_modes \|= PrivMode_HaveBackSpace;	828	priv_modes \|= PrivMode_HaveBackSpace;
641	#endif	829	#endif
642		830
643	/* add value for scrollBar */	831	/* add value for scrollBar */
644	if (scrollBar.state)	832	if (scrollBar.state)
…		…
657	int i;	845	int i;
658		846
659	#ifdef OFF_FOCUS_FADING	847	#ifdef OFF_FOCUS_FADING
660	pix_colors = pix_colors_focused;	848	pix_colors = pix_colors_focused;
661	#endif	849	#endif
662		850
663	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	851	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664	{	852	{
665	const char *name = rs[Rs_color + i];	853	const char *name = rs[Rs_color + i];
666		854
667	if (!name)	855	if (!name)
…		…
670	rxvt_color xcol;	858	rxvt_color xcol;
671		859
672	if (!set_color (xcol, name))	860	if (!set_color (xcol, name))
673	{	861	{
674	#ifndef XTERM_REVERSE_VIDEO	862	#ifndef XTERM_REVERSE_VIDEO
675	if (i < 2 && OPTION (Opt_reverseVideo))	863	if (i < 2 && option (Opt_reverseVideo))
676	name = def_colorName [1 - i];	864	name = def_colorName [1 - i];
677	else	865	else
678	#endif	866	#endif
679	name = def_colorName [i];	867	name = def_colorName [i];
680		868
…		…
745	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	933	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746	cscroll.a)	934	cscroll.a)
747	))	935	))
748	alias_color (Color_topShadow, Color_White);	936	alias_color (Color_topShadow, Color_White);
749	}	937	}
750	#endif /* KEEP_SCROLLCOLOR */	938	#endif /* KEEP_SCROLLCOLOR */
751		939
752	#ifdef OFF_FOCUS_FADING	940	#ifdef OFF_FOCUS_FADING
753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	941	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754	update_fade_color (i);	942	update_fade_color (i);
755	#endif	943	#endif
…		…
763	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	951	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764	{	952	{
765	int i = atoi (rs[Rs_color + idx]);	953	int i = atoi (rs[Rs_color + idx]);
766		954
767	if (i >= 8 && i <= 15)	955	if (i >= 8 && i <= 15)
768	{ /* bright colors */	956	/* bright colors */
769	i -= 8;
770	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	957	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771	return;	958	else if (i >= 0 && i <= 7)
772	}	959	/* normal colors */
773
774	if (i >= 0 && i <= 7) /* normal colors */
775	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	960	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776	}	961	}
777	}	962	}
778		963
779	/----------------------------------------------------------------------/	964	/----------------------------------------------------------------------/
…		…
871	rxvt_term::create_windows (int argc, const char const argv)	1056	rxvt_term::create_windows (int argc, const char const argv)
872	{	1057	{
873	XClassHint classHint;	1058	XClassHint classHint;
874	XWMHints wmHint;	1059	XWMHints wmHint;
875	#if ENABLE_FRILLS	1060	#if ENABLE_FRILLS
876	MWMHints mwmhints;	1061	MWMHints mwmhints = { };
877	#endif	1062	#endif
878	XGCValues gcvalue;	1063	XGCValues gcvalue;
879	XSetWindowAttributes attributes;	1064	XSetWindowAttributes attributes;
880	Window top, parent;	1065	Window top, parent;
881		1066
…		…
887	if (!set_fonts ())	1072	if (!set_fonts ())
888	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1073	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889		1074
890	parent = display->root;	1075	parent = display->root;
891		1076
892	attributes.override_redirect = !!OPTION (Opt_override_redirect);	1077	attributes.override_redirect = !!option (Opt_override_redirect);
893		1078
894	#if ENABLE_FRILLS	1079	#if ENABLE_FRILLS
895	if (OPTION (Opt_borderLess))	1080	if (option (Opt_borderLess))
896	{	1081	{
897	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1082	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898	{	1083	{
899	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1084	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900	attributes.override_redirect = true;	1085	attributes.override_redirect = true;
901	mwmhints.flags = 0;
902	}	1086	}
903	else	1087	else
904	{	1088	{
905	mwmhints.flags = MWM_HINTS_DECORATIONS;	1089	mwmhints.flags = MWM_HINTS_DECORATIONS;
906	mwmhints.decorations = 0;
907	}	1090	}
908	}	1091	}
909	else
910	mwmhints.flags = 0;
911	#endif	1092	#endif
912		1093
913	#if ENABLE_XEMBED	1094	#if ENABLE_XEMBED
914	if (rs[Rs_embed])	1095	if (rs[Rs_embed])
915	{	1096	{
…		…
950	classHint.res_name = (char *)rs[Rs_name];	1131	classHint.res_name = (char *)rs[Rs_name];
951	classHint.res_class = (char *)RESCLASS;	1132	classHint.res_class = (char *)RESCLASS;
952		1133
953	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1134	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
954	wmHint.input = True;	1135	wmHint.input = True;
955	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1136	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956	wmHint.window_group = top;	1137	wmHint.window_group = top;
957		1138
958	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1139	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959	&szHint, &wmHint, &classHint);	1140	&szHint, &wmHint, &classHint);
960		1141
…		…
998		1179
999	termwin_ev.start (display, top);	1180	termwin_ev.start (display, top);
1000		1181
1001	/* vt cursor: Black-on-White is standard, but this is more popular */	1182	/* vt cursor: Black-on-White is standard, but this is more popular */
1002	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1183	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		1184
1009	/* the vt window */	1185	/* the vt window */
1010	vt = XCreateSimpleWindow (dpy, top,	1186	vt = XCreateSimpleWindow (dpy, top,
1011	window_vt_x, window_vt_y,	1187	window_vt_x, window_vt_y,
1012	width, height,	1188	width, height,
…		…
1017	attributes.bit_gravity = NorthWestGravity;	1193	attributes.bit_gravity = NorthWestGravity;
1018	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);	1194	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019		1195
1020	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1196	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1021		1197
1022	if (OPTION (Opt_pointerBlank))	1198	if (option (Opt_pointerBlank))
1023	vt_emask \|= PointerMotionMask;	1199	vt_emask \|= PointerMotionMask;
1024	else	1200	else
1025	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1201	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1026		1202
1027	vt_select_input ();	1203	vt_select_input ();
1028		1204
1029	vt_ev.start (display, vt);	1205	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		1206
1048	/* graphics context for the vt window */	1207	/* graphics context for the vt window */
1049	gcvalue.foreground = pix_colors[Color_fg];	1208	gcvalue.foreground = pix_colors[Color_fg];
1050	gcvalue.background = pix_colors[Color_bg];	1209	gcvalue.background = pix_colors[Color_bg];
1051	gcvalue.graphics_exposures = 0;	1210	gcvalue.graphics_exposures = 0;
…		…
1054	GCForeground \| GCBackground \| GCGraphicsExposures,	1213	GCForeground \| GCBackground \| GCGraphicsExposures,
1055	&gcvalue);	1214	&gcvalue);
1056		1215
1057	drawable = new rxvt_drawable (this, vt);	1216	drawable = new rxvt_drawable (this, vt);
1058		1217
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	1218	#ifdef OFF_FOCUS_FADING
1069	// initially we are in unfocused state	1219	// initially we are in unfocused state
1070	if (rs[Rs_fade])	1220	if (rs[Rs_fade])
1071	pix_colors = pix_colors_unfocused;	1221	pix_colors = pix_colors_unfocused;
1072	#endif	1222	#endif
…		…
1077		1227
1078	/* ------------------------------------------------------------------------- *	1228	/* ------------------------------------------------------------------------- *
1079	* GET TTY CURRENT STATE *	1229	* GET TTY CURRENT STATE *
1080	* ------------------------------------------------------------------------- */	1230	* ------------------------------------------------------------------------- */
1081	void	1231	void
1082	rxvt_get_ttymode (ttymode_t *tio, int erase)	1232	rxvt_get_ttymode (struct termios *tio, int erase)
1083	{	1233	{
1084	/*	1234	/*
1085	* standard System V termios interface	1235	* standard System V termios interface
1086	*/	1236	*/
1087	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1237	if (tcgetattr (STDIN_FILENO, tio) < 0)
1088	{	1238	{
1089	// return error - use system defaults,	1239	// return error - use system defaults,
1090	// where possible, and zero elsewhere	1240	// where possible, and zero elsewhere
1091	memset (tio, 0, sizeof (ttymode_t));	1241	memset (tio, 0, sizeof (struct termios));
1092		1242
1093	tio->c_cc[VINTR] = CINTR;	1243	tio->c_cc[VINTR] = CINTR;
1094	tio->c_cc[VQUIT] = CQUIT;	1244	tio->c_cc[VQUIT] = CQUIT;
1095	tio->c_cc[VERASE] = CERASE;	1245	tio->c_cc[VERASE] = CERASE;
1096	#ifdef VERASE2	1246	#ifdef VERASE2
…		…
1160		1310
1161	/*	1311	/*
1162	* Debugging	1312	* Debugging
1163	*/	1313	*/
1164	#ifdef DEBUG_TTYMODE	1314	#ifdef DEBUG_TTYMODE
1165	#ifdef HAVE_TERMIOS_H
1166	/* c_iflag bits */	1315	/* c_iflag bits */
1167	fprintf (stderr, "Input flags\n");	1316	fprintf (stderr, "Input flags\n");
1168		1317
1169	/* cpp token stringize doesn't work on all machines <sigh> */	1318	/* cpp token stringize doesn't work on all machines <sigh> */
1170	# define FOO(flag,name) \	1319	# define FOO(flag,name) \
…		…
1233	FOO (VLNEXT, "VLNEXT");	1382	FOO (VLNEXT, "VLNEXT");
1234	# endif	1383	# endif
1235		1384
1236	fprintf (stderr, "\n");	1385	fprintf (stderr, "\n");
1237	# undef FOO	1386	# undef FOO
1238	# endif /* HAVE_TERMIOS_H */	1387	#endif /* DEBUG_TTYMODE */
1239	#endif /* DEBUG_TTYMODE */
1240	}	1388	}
1241		1389
1242	/----------------------------------------------------------------------/	1390	/----------------------------------------------------------------------/
1243	/*	1391	/*
1244	* Run the command in a subprocess and return a file descriptor for the	1392	* Run the command in a subprocess and return a file descriptor for the
…		…
1268	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1416	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269		1417
1270	int er;	1418	int er;
1271		1419
1272	#ifndef NO_BACKSPACE_KEY	1420	#ifndef NO_BACKSPACE_KEY
1273	if (key_backspace[0] && !key_backspace[1])	1421	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274	er = key_backspace[0];	1422	er = rs[Rs_backspace_key][0];
1275	else if (strcmp (key_backspace, "DEC") == 0)	1423	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276	er = '\177'; /* the initial state anyway */	1424	er = '\177'; /* the initial state anyway */
1277	else	1425	else
1278	#endif	1426	#endif
1279	er = -1;	1427	er = -1;
1280		1428
1281	rxvt_get_ttymode (&tio, er);	1429	rxvt_get_ttymode (&tio, er);
1282	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1430	/* init terminal attributes */
		1431	cfsetospeed (&tio, BAUDRATE);
		1432	cfsetispeed (&tio, BAUDRATE);
		1433	tcsetattr (pty->tty, TCSANOW, &tio);
1283	pty->set_utf8_mode (enc_utf8);	1434	pty->set_utf8_mode (enc_utf8);
1284		1435
1285	/* set initial window size */	1436	/* set initial window size */
1286	tt_winch ();	1437	tt_winch ();
1287		1438
…		…
1322	}	1473	}
1323		1474
1324	_exit (EXIT_FAILURE);	1475	_exit (EXIT_FAILURE);
1325		1476
1326	default:	1477	default:
1327	if (!OPTION (Opt_utmpInhibit))	1478	if (!option (Opt_utmpInhibit))
1328	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1479	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329		1480
1330	pty->close_tty ();	1481	pty->close_tty ();
1331		1482
1332	child_ev.start (cmd_pid);	1483	child_ev.start (cmd_pid);
1333		1484
…		…
1346	int	1497	int
1347	rxvt_term::run_child (const char const argv)	1498	rxvt_term::run_child (const char const argv)
1348	{	1499	{
1349	char *login;	1500	char *login;
1350		1501
1351	if (OPTION (Opt_console))	1502	if (option (Opt_console))
		1503	{
1352	{ /* be virtual console, fail silently */	1504	/* be virtual console, fail silently */
1353	#ifdef TIOCCONS	1505	#ifdef TIOCCONS
1354	unsigned int on = 1;	1506	unsigned int on = 1;
1355		1507
1356	ioctl (STDIN_FILENO, TIOCCONS, &on);	1508	ioctl (STDIN_FILENO, TIOCCONS, &on);
1357	#elif defined (SRIOCSREDIR)	1509	#elif defined (SRIOCSREDIR)
…		…
1359		1511
1360	fd = open (CONSOLE, O_WRONLY, 0);	1512	fd = open (CONSOLE, O_WRONLY, 0);
1361	if (fd >= 0)	1513	if (fd >= 0)
1362	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1514	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1363	close (fd);	1515	close (fd);
1364	#endif /* SRIOCSREDIR */	1516	#endif /* SRIOCSREDIR */
1365	}	1517	}
1366		1518
1367	/* reset signals and spin off the command interpreter */	1519	/* reset signals and spin off the command interpreter */
1368	signal (SIGINT, SIG_DFL);	1520	signal (SIGINT, SIG_DFL);
1369	signal (SIGQUIT, SIG_DFL);	1521	signal (SIGQUIT, SIG_DFL);
…		…
1376	*/	1528	*/
1377	#ifdef SIGTSTP	1529	#ifdef SIGTSTP
1378	signal (SIGTSTP, SIG_IGN);	1530	signal (SIGTSTP, SIG_IGN);
1379	signal (SIGTTIN, SIG_IGN);	1531	signal (SIGTTIN, SIG_IGN);
1380	signal (SIGTTOU, SIG_IGN);	1532	signal (SIGTTOU, SIG_IGN);
1381	#endif /* SIGTSTP */	1533	#endif /* SIGTSTP */
1382		1534
1383	// unblock signals (signals are blocked by iom.C	1535	// unblock signals (signals are blocked by iom.C
1384	sigset_t ss;	1536	sigset_t ss;
1385	sigemptyset (&ss);	1537	sigemptyset (&ss);
1386	sigprocmask (SIG_SETMASK, &ss, 0);	1538	sigprocmask (SIG_SETMASK, &ss, 0);
1387		1539
1388	/* command interpreter path */	1540	/* command interpreter path */
1389	if (argv != NULL)	1541	if (argv)
1390	{	1542	{
1391	# ifdef DEBUG_CMD	1543	# ifdef DEBUG_CMD
1392	int i;	1544	int i;
1393		1545
1394	for (i = 0; argv[i]; i++)	1546	for (i = 0; argv[i]; i++)
…		…
1403	const char argv0, shell;	1555	const char argv0, shell;
1404		1556
1405	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1557	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1406	shell = "/bin/sh";	1558	shell = "/bin/sh";
1407		1559
1408	argv0 = (const char *)rxvt_r_basename (shell);	1560	argv0 = (const char *)rxvt_basename (shell);
1409		1561
1410	if (OPTION (Opt_loginShell))	1562	if (option (Opt_loginShell))
1411	{	1563	{
1412	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1564	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413		1565
1414	login[0] = '-';	1566	login[0] = '-';
1415	strcpy (&login[1], argv0);	1567	strcpy (&login[1], argv0);
1416	argv0 = login;	1568	argv0 = login;
1417	}	1569	}
1418		1570
1419	execlp (shell, argv0, NULL);	1571	execlp (shell, argv0, (char *)0);
1420	/* no error message: STDERR is closed! */	1572	/* no error message: STDERR is closed! */
1421	}	1573	}
1422		1574
1423	return -1;	1575	return -1;
1424	}	1576	}

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.244 by ayin, Sat Jan 26 14:24:43 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.244 by ayin, Sat Jan 26 14:24:43 2008 UTC