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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.203 by sasha, Wed Aug 8 22:39:49 2007 UTC vs.
Revision 1.254 by root, Tue Nov 4 11:03:29 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,
…		…
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;
…		…
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;
198	saveLines = SAVELINES;	298	saveLines = SAVELINES;
199	numpix_colors = TOTAL_COLORS;
200		299
201	refresh_type = SLOW_REFRESH;	300	refresh_type = SLOW_REFRESH;
202		301
203	oldcursor.row = oldcursor.col = -1;	302	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	bgPixmap.set_target (this);
217
218	last_bot = last_state = -1;
219		303
220	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
221	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
222	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
223	set_option (Opt_skipScroll);	307	set_option (Opt_skipScroll);
224	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
225	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
226	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
227	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
228	set_option (Opt_iso14755_52);	312	set_option (Opt_iso14755_52);
229		313	set_option (Opt_buffered);
230	return true;
231	}	314	}
232		315
233	void	316	static void
234	rxvt_term::init_secondary ()	317	init_secondary ()
235	{	318	{
236	int i;	319	int i;
237		320
238	/*
239	* Close all unused file descriptors
240	* We don't want them, we don't need them.
241	*/
242	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
243	{	322	{
244	/* TODO: BOO HISS */
245	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
246	}	324	}
247	else if (i > STDIN_FILENO)	325	else if (i != STDIN_FILENO)
248	{	326	{
249	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
250	close (i);	328	close (i);
251	}	329	}
252		330
253	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
254
255	#if 0 // schmorp sayz closing filies is murder
256	for (i = STDERR_FILENO + 1; i < num_fds; i++)
257	{
258	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
259	if (i == 4 \|\| i == 7)
260	continue;
261	#endif
262	close (i);
263	}
264	#endif
265	}	332	}
266		333
267	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
268	const char **	335	const char **
269	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
270	{	337	{
271	int i, r_argc;	338	int i, r_argc;
272	char *val;
273	const char cmd_argv, r_argv;	339	const char cmd_argv, r_argv;
274		340
275	/*	341	/*
276	* 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
277	*/	343	*/
278	for (r_argc = 0; r_argc < argc; r_argc++)	344	for (r_argc = 0; r_argc < argc; r_argc++)
279	if (!strcmp (argv[r_argc], "-e"))	345	if (!strcmp (argv[r_argc], "-e"))
280	break;	346	break;
281		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
282	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	362	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
283		363
284	for (i = 0; i < r_argc; i++)	364	for (i = 0; i < r_argc; i++)
285	r_argv[i] = (const char *)argv[i];	365	r_argv[i] = (const char *)argv[i];
286		366
287	r_argv[i] = NULL;	367	r_argv[i] = NULL;
288		368
289	if (r_argc == argc)
290	cmd_argv = NULL;
291	else
292	{
293	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
294
295	for (i = 0; i < argc - r_argc - 1; i++)
296	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
297
298	cmd_argv[i] = NULL;
299	}
300
301	rs[Rs_name] = rxvt_r_basename (argv[0]);	369	rs[Rs_name] = rxvt_basename (argv[0]);
302		370
303	/*	371	/*
304	* Open display, get options/resources and create the window	372	* Open display, get options/resources and create the window
305	*/	373	*/
306		374
…		…
308	rs[Rs_display_name] = ":0";	376	rs[Rs_display_name] = ":0";
309		377
310	get_options (r_argc, r_argv);	378	get_options (r_argc, r_argv);
311		379
312	if (!(display = displays.get (rs[Rs_display_name])))	380	if (!(display = displays.get (rs[Rs_display_name])))
		381	{
		382	free (r_argv);
313	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	}
314		385
315	// using a local pointer decreases code size a lot	386	// using a local pointer decreases code size a lot
316	xa = display->xa;	387	xa = display->xa;
317		388
318	set (display);	389	set (display);
…		…
322	if (rs[Rs_depth])	393	if (rs[Rs_depth])
323	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
324	#endif	395	#endif
325		396
326	#ifdef HAVE_AFTERIMAGE	397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
327	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);	400	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
328	#endif	401	#endif
329	free (r_argv);	402	free (r_argv);
330		403
331	for (int i = NUM_RESOURCES; i--; )	404	for (int i = NUM_RESOURCES; i--; )
…		…
349	* set any defaults not already set	422	* set any defaults not already set
350	*/	423	*/
351	if (cmd_argv && cmd_argv[0])	424	if (cmd_argv && cmd_argv[0])
352	{	425	{
353	if (!rs[Rs_title])	426	if (!rs[Rs_title])
354	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
355	if (!rs[Rs_iconName])	428	if (!rs[Rs_iconName])
356	rs[Rs_iconName] = rs[Rs_title];	429	rs[Rs_iconName] = rs[Rs_title];
357	}	430	}
358	else	431	else
359	{	432	{
…		…
386		459
387	/* no point having a scrollbar without having any scrollback! */	460	/* no point having a scrollbar without having any scrollback! */
388	if (!saveLines)	461	if (!saveLines)
389	set_option (Opt_scrollBar, 0);	462	set_option (Opt_scrollBar, 0);
390		463
391	#ifdef PRINTPIPE
392	if (!rs[Rs_print_pipe])
393	rs[Rs_print_pipe] = PRINTPIPE;
394	#endif
395
396	if (!rs[Rs_cutchars])	464	if (!rs[Rs_cutchars])
397	rs[Rs_cutchars] = CUTCHARS;	465	rs[Rs_cutchars] = CUTCHARS;
398		466
399	#ifndef NO_BACKSPACE_KEY	467	#ifndef NO_BACKSPACE_KEY
400	if (!rs[Rs_backspace_key])	468	if (!rs[Rs_backspace_key])
401	# ifdef DEFAULT_BACKSPACE	469	# ifdef DEFAULT_BACKSPACE
402	key_backspace = DEFAULT_BACKSPACE;	470	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
403	# else	471	# else
404	key_backspace = "DEC"; /* can toggle between \010 or \177 */	472	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
405	# endif	473	# endif
406	else
407	{
408	val = strdup (rs[Rs_backspace_key]);
409	rxvt_Str_trim (val);
410	rxvt_Str_escaped (val);
411	key_backspace = val;
412	}
413	#endif	474	#endif
414		475
415	#ifndef NO_DELETE_KEY	476	#ifndef NO_DELETE_KEY
416	if (!rs[Rs_delete_key])	477	if (!rs[Rs_delete_key])
417	# ifdef DEFAULT_DELETE	478	# ifdef DEFAULT_DELETE
418	key_delete = DEFAULT_DELETE;	479	rs[Rs_delete_key] = DEFAULT_DELETE;
419	# else	480	# else
420	key_delete = "\033[3~";	481	rs[Rs_delete_key] = "\033[3~";
421	# endif
422	else
423	{
424	val = strdup (rs[Rs_delete_key]);
425	rxvt_Str_trim (val);
426	rxvt_Str_escaped (val);
427	key_delete = val;
428	}
429	#endif	482	# endif
430	if (rs[Rs_answerbackstring])
431	{
432	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
433	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
434	}
435
436	#ifdef HAVE_SCROLLBARS
437	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
438	#endif	483	#endif
		484
		485	scrollBar.setup (this);
439		486
440	#ifdef XTERM_REVERSE_VIDEO	487	#ifdef XTERM_REVERSE_VIDEO
441	/* this is how xterm implements reverseVideo */	488	/* this is how xterm implements reverseVideo */
442	if (option (Opt_reverseVideo))	489	if (option (Opt_reverseVideo))
443	{	490	{
…		…
463	color_aliases (Color_fg);	510	color_aliases (Color_fg);
464	color_aliases (Color_bg);	511	color_aliases (Color_bg);
465	#ifndef NO_CURSORCOLOR	512	#ifndef NO_CURSORCOLOR
466	color_aliases (Color_cursor);	513	color_aliases (Color_cursor);
467	color_aliases (Color_cursor2);	514	color_aliases (Color_cursor2);
468	#endif /* NO_CURSORCOLOR */	515	#endif /* NO_CURSORCOLOR */
469	color_aliases (Color_pointer_fg);	516	color_aliases (Color_pointer_fg);
470	color_aliases (Color_pointer_bg);	517	color_aliases (Color_pointer_bg);
471	color_aliases (Color_border);	518	color_aliases (Color_border);
472	#ifndef NO_BOLD_UNDERLINE_REVERSE	519	#ifndef NO_BOLD_UNDERLINE_REVERSE
473	color_aliases (Color_BD);	520	color_aliases (Color_BD);
474	color_aliases (Color_UL);	521	color_aliases (Color_UL);
475	color_aliases (Color_RV);	522	color_aliases (Color_RV);
476	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	523	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
477		524
478	if (!rs[Rs_color + Color_border])	525	if (!rs[Rs_color + Color_border])
479	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	526	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
480		527
481	return cmd_argv;	528	return cmd_argv;
		529	}
		530
		531	/----------------------------------------------------------------------/
		532	void
		533	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		534	{
		535	this->envv = envv;
		536
		537	SET_R (this);
		538	set_locale ("");
		539	set_environ (envv); // a few things in X do not call setlocale :(
		540
		541	init_vars ();
		542
		543	init_secondary ();
		544
		545	const char **cmd_argv = init_resources (argc, argv);
		546
		547	#ifdef KEYSYM_RESOURCE
		548	keyboard->register_done ();
		549	#endif
		550
		551	if (const char *path = rs[Rs_chdir])
		552	if (*path) // ignored if empty
		553	{
		554	if (*path != '/')
		555	rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
		556
		557	if (chdir (path))
		558	rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
		559	}
		560
		561	if (option (Opt_scrollBar))
		562	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		563
		564	pty = ptytty::create ();
		565
		566	create_windows (argc, argv);
		567
		568	init_xlocale ();
		569
		570	scr_reset (); // initialize screen
		571
		572	#if 0
		573	XSynchronize (dpy, True);
		574	#endif
		575
		576	if (option (Opt_scrollBar))
		577	scrollBar.resize (); /* create and map scrollbar */
		578	#ifdef HAVE_BG_PIXMAP
		579	{
		580	bgPixmap.set_target (this);
		581	bgPixmap.invalidate ();
		582
		583	#ifdef ENABLE_TRANSPARENCY
		584	if (option (Opt_transparent))
		585	{
		586	bgPixmap.set_transparent ();
		587
		588	#ifdef HAVE_AFTERIMAGE
		589	if (rs [Rs_blurradius])
		590	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		591	#endif
		592	if (ISSET_PIXCOLOR (Color_tint))
		593	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		594
		595	if (rs [Rs_shade])
		596	bgPixmap.set_shade (rs [Rs_shade]);
		597
		598	bgPixmap.set_root_pixmap ();
		599	XSelectInput (dpy, display->root, PropertyChangeMask);
		600	rootwin_ev.start (display, display->root);
		601	}
		602	#endif
		603
		604	#ifdef BG_IMAGE_FROM_FILE
		605	if (rs[Rs_backgroundPixmap])
		606	{
		607	const char *p = rs[Rs_backgroundPixmap];
		608
		609	if ((p = strchr (p, ';')) != 0)
		610	{
		611	p++;
		612	bgPixmap.set_geometry (p);
		613	}
		614	else
		615	bgPixmap.set_defaultGeometry ();
		616
		617	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		618	if (!bgPixmap.window_position_sensitive ())
		619	update_background ();
		620	}
		621	#endif
		622	}
		623	#endif
		624
		625	#if ENABLE_PERL
		626	rootwin_ev.start (display, display->root);
		627	#endif
		628
		629	set_colorfgbg ();
		630
		631	init_command (cmd_argv);
		632
		633	free (cmd_argv);
		634
		635	if (pty->pty >= 0)
		636	pty_ev.start (pty->pty, ev::READ);
		637
		638	HOOK_INVOKE ((this, HOOK_START, DT_END));
		639
		640	#if ENABLE_XEMBED
		641	if (rs[Rs_embed])
		642	{
		643	long info[2] = { 0, XEMBED_MAPPED };
		644
		645	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		646	32, PropModeReplace, (unsigned char *)&info, 2);
		647	}
		648	#endif
		649
		650	XMapWindow (dpy, vt);
		651	XMapWindow (dpy, parent[0]);
		652
		653	refresh_check ();
482	}	654	}
483		655
484	/----------------------------------------------------------------------/	656	/----------------------------------------------------------------------/
485	void	657	void
486	rxvt_term::init_env ()	658	rxvt_term::init_env ()
487	{	659	{
488	int i;	660	int i;
489	unsigned int u;
490	char *val;	661	char *val;
491		662
492	#ifdef DISPLAY_IS_IP	663	#ifdef DISPLAY_IS_IP
493	/* Fixup display_name for export over pty to any interested terminal	664	/* Fixup display_name for export over pty to any interested terminal
494	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	665	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
502	*/	673	*/
503	val = rxvt_network_display (rs[Rs_display_name]);	674	val = rxvt_network_display (rs[Rs_display_name]);
504	rs[Rs_display_name] = (const char *)val;	675	rs[Rs_display_name] = (const char *)val;
505		676
506	if (val == NULL)	677	if (val == NULL)
507	#endif /* DISPLAY_IS_IP */	678	#endif /* DISPLAY_IS_IP */
508	val = XDisplayString (dpy);	679	val = XDisplayString (dpy);
509		680
510	if (rs[Rs_display_name] == NULL)	681	if (rs[Rs_display_name] == NULL)
511	rs[Rs_display_name] = val; /* use broken `:0' value */	682	rs[Rs_display_name] = val; /* use broken `:0' value */
512		683
513	i = strlen (val);	684	i = strlen (val);
514	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	685	env_display = (char *)rxvt_malloc (i + 9);
515		686
516	sprintf (env_display, "DISPLAY=%s", val);	687	sprintf (env_display, "DISPLAY=%s", val);
517		688
518	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	689	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
519		690
…		…
540	else	711	else
541	putenv ("COLORTERM=" COLORTERMENVFULL);	712	putenv ("COLORTERM=" COLORTERMENVFULL);
542		713
543	if (rs[Rs_term_name] != NULL)	714	if (rs[Rs_term_name] != NULL)
544	{	715	{
545	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	716	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
546	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	717	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
547	putenv (env_term);	718	putenv (env_term);
548	}	719	}
549	else	720	else
550	putenv ("TERM=" TERMENV);	721	putenv ("TERM=" TERMENV);
…		…
552	#ifdef HAVE_UNSETENV	723	#ifdef HAVE_UNSETENV
553	/* avoid passing old settings and confusing term size */	724	/* avoid passing old settings and confusing term size */
554	unsetenv ("LINES");	725	unsetenv ("LINES");
555	unsetenv ("COLUMNS");	726	unsetenv ("COLUMNS");
556	unsetenv ("TERMCAP"); /* terminfo should be okay */	727	unsetenv ("TERMCAP"); /* terminfo should be okay */
557	#endif /* HAVE_UNSETENV */	728	#endif /* HAVE_UNSETENV */
558	}	729	}
559		730
560	/----------------------------------------------------------------------/	731	/----------------------------------------------------------------------/
561	/*	732	/*
562	* This is more or less stolen straight from XFree86 xterm.	733	* This is more or less stolen straight from XFree86 xterm.
…		…
583		754
584	this->locale = "C";	755	this->locale = "C";
585	}	756	}
586		757
587		758
588	this->locale = rxvt_strdup (this->locale);	759	this->locale = strdup (this->locale);
589	SET_LOCALE (this->locale);	760	SET_LOCALE (this->locale);
590	mbstate.reset ();	761	mbstate.reset ();
591	#endif	762	#endif
592		763
593	#if HAVE_NL_LANGINFO	764	#if HAVE_NL_LANGINFO
…		…
650	priv_modes \|= PrivMode_Keypress;	821	priv_modes \|= PrivMode_Keypress;
651	if (!option (Opt_jumpScroll))	822	if (!option (Opt_jumpScroll))
652	priv_modes \|= PrivMode_smoothScroll;	823	priv_modes \|= PrivMode_smoothScroll;
653		824
654	#ifndef NO_BACKSPACE_KEY	825	#ifndef NO_BACKSPACE_KEY
655	if (strcmp (key_backspace, "DEC") == 0)	826	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
656	priv_modes \|= PrivMode_HaveBackSpace;	827	priv_modes \|= PrivMode_HaveBackSpace;
657	#endif	828	#endif
658		829
659	/* add value for scrollBar */	830	/* add value for scrollBar */
660	if (scrollBar.state)	831	if (scrollBar.state)
…		…
666	run_command (argv);	837	run_command (argv);
667	}	838	}
668		839
669	/----------------------------------------------------------------------/	840	/----------------------------------------------------------------------/
670	void	841	void
671	rxvt_term::Get_Colours ()	842	rxvt_term::get_colours ()
672	{	843	{
673	int i;	844	int i;
674		845
675	#ifdef OFF_FOCUS_FADING	846	#ifdef OFF_FOCUS_FADING
676	pix_colors = pix_colors_focused;	847	pix_colors = pix_colors_focused;
677	#endif	848	#endif
678		849
679	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	850	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
680	{	851	{
681	const char *name = rs[Rs_color + i];	852	const char *name = rs[Rs_color + i];
682		853
683	if (!name)	854	if (!name)
…		…
736	* get scrollBar shadow colors	907	* get scrollBar shadow colors
737	*	908	*
738	* The calculations of topShadow/bottomShadow values are adapted	909	* The calculations of topShadow/bottomShadow values are adapted
739	* from the fvwm window manager.	910	* from the fvwm window manager.
740	*/	911	*/
741	#ifdef KEEP_SCROLLCOLOR	912	#ifdef RXVT_SCROLLBAR
742	if (depth <= 2)	913	if (depth <= 2)
743	{	914	{
744	/* Monochrome */	915	/* Monochrome */
745	alias_color (Color_scroll, Color_fg);	916	alias_color (Color_scroll, Color_fg);
746	alias_color (Color_topShadow, Color_bg);	917	alias_color (Color_topShadow, Color_bg);
…		…
761	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	932	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
762	cscroll.a)	933	cscroll.a)
763	))	934	))
764	alias_color (Color_topShadow, Color_White);	935	alias_color (Color_topShadow, Color_White);
765	}	936	}
766	#endif /* KEEP_SCROLLCOLOR */	937	#endif
767		938
768	#ifdef OFF_FOCUS_FADING	939	#ifdef OFF_FOCUS_FADING
769	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	940	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
770	update_fade_color (i);	941	update_fade_color (i);
771	#endif	942	#endif
…		…
779	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	950	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
780	{	951	{
781	int i = atoi (rs[Rs_color + idx]);	952	int i = atoi (rs[Rs_color + idx]);
782		953
783	if (i >= 8 && i <= 15)	954	if (i >= 8 && i <= 15)
784	{ /* bright colors */	955	/* bright colors */
785	i -= 8;
786	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	956	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
787	return;	957	else if (i >= 0 && i <= 7)
788	}	958	/* normal colors */
789
790	if (i >= 0 && i <= 7) /* normal colors */
791	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	959	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
792	}	960	}
793	}	961	}
794		962
795	/----------------------------------------------------------------------/	963	/----------------------------------------------------------------------/
…		…
896	Window top, parent;	1064	Window top, parent;
897		1065
898	dLocal (Display *, dpy);	1066	dLocal (Display *, dpy);
899		1067
900	/* grab colors before netscape does */	1068	/* grab colors before netscape does */
901	Get_Colours ();	1069	get_colours ();
902		1070
903	if (!set_fonts ())	1071	if (!set_fonts ())
904	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1072	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
905		1073
906	parent = display->root;	1074	parent = display->root;
…		…
910	#if ENABLE_FRILLS	1078	#if ENABLE_FRILLS
911	if (option (Opt_borderLess))	1079	if (option (Opt_borderLess))
912	{	1080	{
913	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1081	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
914	{	1082	{
915	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1083	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
916	attributes.override_redirect = true;	1084	attributes.override_redirect = true;
917	mwmhints.flags = 0;
918	}	1085	}
919	else	1086	else
920	{	1087	{
921	mwmhints.flags = MWM_HINTS_DECORATIONS;	1088	mwmhints.flags = MWM_HINTS_DECORATIONS;
922	mwmhints.decorations = 0;
923	}	1089	}
924	}	1090	}
925	else
926	mwmhints.flags = 0;
927	#endif	1091	#endif
928		1092
929	#if ENABLE_XEMBED	1093	#if ENABLE_XEMBED
930	if (rs[Rs_embed])	1094	if (rs[Rs_embed])
931	{	1095	{
…		…
971	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;	1135	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
972	wmHint.window_group = top;	1136	wmHint.window_group = top;
973		1137
974	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,	1138	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
975	&szHint, &wmHint, &classHint);	1139	&szHint, &wmHint, &classHint);
		1140	#if ENABLE_EWMH
		1141	# ifdef HAVE_AFTERIMAGE
		1142	/*
		1143	* set up icon hint
		1144	* rs [Rs_iconfile] is path to icon, asv has been created in init_resources
		1145	*/
		1146	if (rs [Rs_iconfile] && asv)
		1147	{
		1148	ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
		1149	if (im)
		1150	{
		1151	int w = im->width;
		1152	int h = im->height;
		1153	long* buffer = (long )malloc ((2 + w h) * sizeof (long));
		1154	ASImage *result = scale_asimage (asv, im,
		1155	w, h, ASA_ARGB32,
		1156	100, ASIMAGE_QUALITY_DEFAULT);
		1157	destroy_asimage (&im);
		1158
		1159	if (buffer && result)
		1160	{
		1161	ARGB32 *asbuf = result->alt.argb32;
		1162	buffer [0] = w;
		1163	buffer [1] = h;
		1164
		1165	for (unsigned int i = 0; i < w * h; ++i)
		1166	buffer [i + 2] = asbuf [i];
		1167
		1168	destroy_asimage (&result);
		1169	XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
		1170	PropModeReplace, (const unsigned char) buffer, 2 + w h);
		1171	free (buffer);
		1172	}
		1173	else
		1174	{
		1175	if (!buffer)
		1176	rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
		1177
		1178	if (!result)
		1179	rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
		1180	}
		1181	}
		1182	else
		1183	rxvt_warn ("Loading image icon failed, continuing without.\n");
		1184	}
		1185	# endif
		1186	#endif
976		1187
977	#if ENABLE_FRILLS	1188	#if ENABLE_FRILLS
978	if (mwmhints.flags)	1189	if (mwmhints.flags)
979	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1190	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
980	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1191	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
…		…
1014		1225
1015	termwin_ev.start (display, top);	1226	termwin_ev.start (display, top);
1016		1227
1017	/* vt cursor: Black-on-White is standard, but this is more popular */	1228	/* vt cursor: Black-on-White is standard, but this is more popular */
1018	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1229	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1019
1020	#ifdef HAVE_SCROLLBARS
1021	/* cursor scrollBar: Black-on-White */
1022	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1023	#endif
1024		1230
1025	/* the vt window */	1231	/* the vt window */
1026	vt = XCreateSimpleWindow (dpy, top,	1232	vt = XCreateSimpleWindow (dpy, top,
1027	window_vt_x, window_vt_y,	1233	window_vt_x, window_vt_y,
1028	width, height,	1234	width, height,
…		…
1042		1248
1043	vt_select_input ();	1249	vt_select_input ();
1044		1250
1045	vt_ev.start (display, vt);	1251	vt_ev.start (display, vt);
1046		1252
1047	#ifdef XPM_BACKGROUND
1048	if (rs[Rs_backgroundPixmap] != NULL)
1049	{
1050	const char *p = rs[Rs_backgroundPixmap];
1051
1052	if ((p = strchr (p, ';')) != NULL)
1053	{
1054	p++;
1055	bgPixmap.handle_geometry (p);
1056	}
1057	else
1058	bgPixmap.set_defaultGeometry ();
1059
1060	set_bgPixmap (rs[Rs_backgroundPixmap]);
1061	scr_touch (true);
1062	}
1063	#endif
1064
1065	/* graphics context for the vt window */	1253	/* graphics context for the vt window */
1066	gcvalue.foreground = pix_colors[Color_fg];	1254	gcvalue.foreground = pix_colors[Color_fg];
1067	gcvalue.background = pix_colors[Color_bg];	1255	gcvalue.background = pix_colors[Color_bg];
1068	gcvalue.graphics_exposures = 0;	1256	gcvalue.graphics_exposures = 0;
1069		1257
…		…
1071	GCForeground \| GCBackground \| GCGraphicsExposures,	1259	GCForeground \| GCBackground \| GCGraphicsExposures,
1072	&gcvalue);	1260	&gcvalue);
1073		1261
1074	drawable = new rxvt_drawable (this, vt);	1262	drawable = new rxvt_drawable (this, vt);
1075		1263
1076	#ifdef RXVT_SCROLLBAR
1077	gcvalue.foreground = pix_colors[Color_topShadow];
1078	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079	gcvalue.foreground = pix_colors[Color_bottomShadow];
1080	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1082	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083	#endif
1084
1085	#ifdef OFF_FOCUS_FADING	1264	#ifdef OFF_FOCUS_FADING
1086	// initially we are in unfocused state	1265	// initially we are in unfocused state
1087	if (rs[Rs_fade])	1266	if (rs[Rs_fade])
1088	pix_colors = pix_colors_unfocused;	1267	pix_colors = pix_colors_unfocused;
1089	#endif	1268	#endif
…		…
1094		1273
1095	/* ------------------------------------------------------------------------- *	1274	/* ------------------------------------------------------------------------- *
1096	* GET TTY CURRENT STATE *	1275	* GET TTY CURRENT STATE *
1097	* ------------------------------------------------------------------------- */	1276	* ------------------------------------------------------------------------- */
1098	void	1277	void
1099	rxvt_get_ttymode (ttymode_t *tio, int erase)	1278	rxvt_get_ttymode (struct termios *tio, int erase)
1100	{	1279	{
1101	/*	1280	/*
1102	* standard System V termios interface	1281	* standard System V termios interface
1103	*/	1282	*/
1104	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1283	if (tcgetattr (STDIN_FILENO, tio) < 0)
1105	{	1284	{
1106	// return error - use system defaults,	1285	// return error - use system defaults,
1107	// where possible, and zero elsewhere	1286	// where possible, and zero elsewhere
1108	memset (tio, 0, sizeof (ttymode_t));	1287	memset (tio, 0, sizeof (struct termios));
1109		1288
1110	tio->c_cc[VINTR] = CINTR;	1289	tio->c_cc[VINTR] = CINTR;
1111	tio->c_cc[VQUIT] = CQUIT;	1290	tio->c_cc[VQUIT] = CQUIT;
1112	tio->c_cc[VERASE] = CERASE;	1291	tio->c_cc[VERASE] = CERASE;
1113	#ifdef VERASE2	1292	#ifdef VERASE2
…		…
1177		1356
1178	/*	1357	/*
1179	* Debugging	1358	* Debugging
1180	*/	1359	*/
1181	#ifdef DEBUG_TTYMODE	1360	#ifdef DEBUG_TTYMODE
1182	#ifdef HAVE_TERMIOS_H
1183	/* c_iflag bits */	1361	/* c_iflag bits */
1184	fprintf (stderr, "Input flags\n");	1362	fprintf (stderr, "Input flags\n");
1185		1363
1186	/* cpp token stringize doesn't work on all machines <sigh> */	1364	/* cpp token stringize doesn't work on all machines <sigh> */
1187	# define FOO(flag,name) \	1365	# define FOO(flag,name) \
…		…
1250	FOO (VLNEXT, "VLNEXT");	1428	FOO (VLNEXT, "VLNEXT");
1251	# endif	1429	# endif
1252		1430
1253	fprintf (stderr, "\n");	1431	fprintf (stderr, "\n");
1254	# undef FOO	1432	# undef FOO
1255	# endif /* HAVE_TERMIOS_H */	1433	#endif /* DEBUG_TTYMODE */
1256	#endif /* DEBUG_TTYMODE */
1257	}	1434	}
1258		1435
1259	/----------------------------------------------------------------------/	1436	/----------------------------------------------------------------------/
1260	/*	1437	/*
1261	* Run the command in a subprocess and return a file descriptor for the	1438	* Run the command in a subprocess and return a file descriptor for the
…		…
1285	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1462	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1286		1463
1287	int er;	1464	int er;
1288		1465
1289	#ifndef NO_BACKSPACE_KEY	1466	#ifndef NO_BACKSPACE_KEY
1290	if (key_backspace[0] && !key_backspace[1])	1467	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1291	er = key_backspace[0];	1468	er = rs[Rs_backspace_key][0];
1292	else if (strcmp (key_backspace, "DEC") == 0)	1469	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1293	er = '\177'; /* the initial state anyway */	1470	er = '\177'; /* the initial state anyway */
1294	else	1471	else
1295	#endif	1472	#endif
1296	er = -1;	1473	er = -1;
1297		1474
1298	rxvt_get_ttymode (&tio, er);	1475	rxvt_get_ttymode (&tio, er);
1299	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1476	/* init terminal attributes */
		1477	cfsetospeed (&tio, BAUDRATE);
		1478	cfsetispeed (&tio, BAUDRATE);
		1479	tcsetattr (pty->tty, TCSANOW, &tio);
1300	pty->set_utf8_mode (enc_utf8);	1480	pty->set_utf8_mode (enc_utf8);
1301		1481
1302	/* set initial window size */	1482	/* set initial window size */
1303	tt_winch ();	1483	tt_winch ();
1304		1484
…		…
1364	rxvt_term::run_child (const char const argv)	1544	rxvt_term::run_child (const char const argv)
1365	{	1545	{
1366	char *login;	1546	char *login;
1367		1547
1368	if (option (Opt_console))	1548	if (option (Opt_console))
		1549	{
1369	{ /* be virtual console, fail silently */	1550	/* be virtual console, fail silently */
1370	#ifdef TIOCCONS	1551	#ifdef TIOCCONS
1371	unsigned int on = 1;	1552	unsigned int on = 1;
1372		1553
1373	ioctl (STDIN_FILENO, TIOCCONS, &on);	1554	ioctl (STDIN_FILENO, TIOCCONS, &on);
1374	#elif defined (SRIOCSREDIR)	1555	#elif defined (SRIOCSREDIR)
…		…
1376		1557
1377	fd = open (CONSOLE, O_WRONLY, 0);	1558	fd = open (CONSOLE, O_WRONLY, 0);
1378	if (fd >= 0)	1559	if (fd >= 0)
1379	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1560	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1380	close (fd);	1561	close (fd);
1381	#endif /* SRIOCSREDIR */	1562	#endif /* SRIOCSREDIR */
1382	}	1563	}
1383		1564
1384	/* reset signals and spin off the command interpreter */	1565	/* reset signals and spin off the command interpreter */
1385	signal (SIGINT, SIG_DFL);	1566	signal (SIGINT, SIG_DFL);
1386	signal (SIGQUIT, SIG_DFL);	1567	signal (SIGQUIT, SIG_DFL);
…		…
1393	*/	1574	*/
1394	#ifdef SIGTSTP	1575	#ifdef SIGTSTP
1395	signal (SIGTSTP, SIG_IGN);	1576	signal (SIGTSTP, SIG_IGN);
1396	signal (SIGTTIN, SIG_IGN);	1577	signal (SIGTTIN, SIG_IGN);
1397	signal (SIGTTOU, SIG_IGN);	1578	signal (SIGTTOU, SIG_IGN);
1398	#endif /* SIGTSTP */	1579	#endif /* SIGTSTP */
1399
1400	// unblock signals (signals are blocked by iom.C
1401	sigset_t ss;
1402	sigemptyset (&ss);
1403	sigprocmask (SIG_SETMASK, &ss, 0);
1404		1580
1405	/* command interpreter path */	1581	/* command interpreter path */
1406	if (argv != NULL)	1582	if (argv)
1407	{	1583	{
1408	# ifdef DEBUG_CMD	1584	# ifdef DEBUG_CMD
1409	int i;	1585	int i;
1410		1586
1411	for (i = 0; argv[i]; i++)	1587	for (i = 0; argv[i]; i++)
…		…
1420	const char argv0, shell;	1596	const char argv0, shell;
1421		1597
1422	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1598	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1423	shell = "/bin/sh";	1599	shell = "/bin/sh";
1424		1600
1425	argv0 = (const char *)rxvt_r_basename (shell);	1601	argv0 = (const char *)rxvt_basename (shell);
1426		1602
1427	if (option (Opt_loginShell))	1603	if (option (Opt_loginShell))
1428	{	1604	{
1429	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1605	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1430		1606
1431	login[0] = '-';	1607	login[0] = '-';
1432	strcpy (&login[1], argv0);	1608	strcpy (&login[1], argv0);
1433	argv0 = login;	1609	argv0 = login;
1434	}	1610	}
1435		1611
1436	execlp (shell, argv0, NULL);	1612	execlp (shell, argv0, (char *)0);
1437	/* no error message: STDERR is closed! */	1613	/* no error message: STDERR is closed! */
1438	}	1614	}
1439		1615
1440	return -1;	1616	return -1;
1441	}	1617	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.203 by sasha, Wed Aug 8 22:39:49 2007 UTC vs. Revision 1.254 by root, Tue Nov 4 11:03:29 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.203 by sasha, Wed Aug 8 22:39:49 2007 UTC vs.
Revision 1.254 by root, Tue Nov 4 11:03:29 2008 UTC