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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.202 by sasha, Tue Aug 7 22:43:33 2007 UTC vs.
Revision 1.251 by ayin, Tue Feb 19 18:15:26 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
217	last_bot = last_state = -1;
218		303
219	set_option (Opt_scrollBar);	304	set_option (Opt_scrollBar);
220	set_option (Opt_scrollTtyOutput);	305	set_option (Opt_scrollTtyOutput);
221	set_option (Opt_jumpScroll);	306	set_option (Opt_jumpScroll);
222	set_option (Opt_skipScroll);	307	set_option (Opt_skipScroll);
223	set_option (Opt_secondaryScreen);	308	set_option (Opt_secondaryScreen);
224	set_option (Opt_secondaryScroll);	309	set_option (Opt_secondaryScroll);
225	set_option (Opt_pastableTabs);	310	set_option (Opt_pastableTabs);
226	set_option (Opt_intensityStyles);	311	set_option (Opt_intensityStyles);
227	set_option (Opt_iso14755_52);	312	set_option (Opt_iso14755_52);
228		313	set_option (Opt_buffered);
229	return true;
230	}	314	}
231		315
232	void	316	static void
233	rxvt_term::init_secondary ()	317	init_secondary ()
234	{	318	{
235	int i;	319	int i;
236		320
237	/*
238	* Close all unused file descriptors
239	* We don't want them, we don't need them.
240	*/
241	if ((i = open ("/dev/null", O_RDONLY)) < 0)	321	if ((i = open ("/dev/null", O_RDONLY)) < 0)
242	{	322	{
243	/* TODO: BOO HISS */
244	dup2 (STDERR_FILENO, STDIN_FILENO);	323	dup2 (STDERR_FILENO, STDIN_FILENO);
245	}	324	}
246	else if (i > STDIN_FILENO)	325	else if (i != STDIN_FILENO)
247	{	326	{
248	dup2 (i, STDIN_FILENO);	327	dup2 (i, STDIN_FILENO);
249	close (i);	328	close (i);
250	}	329	}
251		330
252	dup2 (STDERR_FILENO, STDOUT_FILENO);	331	dup2 (STDERR_FILENO, STDOUT_FILENO);
253
254	#if 0 // schmorp sayz closing filies is murder
255	for (i = STDERR_FILENO + 1; i < num_fds; i++)
256	{
257	#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
258	if (i == 4 \|\| i == 7)
259	continue;
260	#endif
261	close (i);
262	}
263	#endif
264	}	332	}
265		333
266	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
267	const char **	335	const char **
268	rxvt_term::init_resources (int argc, const char const argv)	336	rxvt_term::init_resources (int argc, const char const argv)
269	{	337	{
270	int i, r_argc;	338	int i, r_argc;
271	char *val;
272	const char cmd_argv, r_argv;	339	const char cmd_argv, r_argv;
273		340
274	/*	341	/*
275	* 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
276	*/	343	*/
277	for (r_argc = 0; r_argc < argc; r_argc++)	344	for (r_argc = 0; r_argc < argc; r_argc++)
278	if (!strcmp (argv[r_argc], "-e"))	345	if (!strcmp (argv[r_argc], "-e"))
279	break;	346	break;
280		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
281	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	362	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
282		363
283	for (i = 0; i < r_argc; i++)	364	for (i = 0; i < r_argc; i++)
284	r_argv[i] = (const char *)argv[i];	365	r_argv[i] = (const char *)argv[i];
285		366
286	r_argv[i] = NULL;	367	r_argv[i] = NULL;
287		368
288	if (r_argc == argc)
289	cmd_argv = NULL;
290	else
291	{
292	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
293
294	for (i = 0; i < argc - r_argc - 1; i++)
295	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
296
297	cmd_argv[i] = NULL;
298	}
299
300	rs[Rs_name] = rxvt_r_basename (argv[0]);	369	rs[Rs_name] = rxvt_basename (argv[0]);
301		370
302	/*	371	/*
303	* Open display, get options/resources and create the window	372	* Open display, get options/resources and create the window
304	*/	373	*/
305		374
…		…
307	rs[Rs_display_name] = ":0";	376	rs[Rs_display_name] = ":0";
308		377
309	get_options (r_argc, r_argv);	378	get_options (r_argc, r_argv);
310		379
311	if (!(display = displays.get (rs[Rs_display_name])))	380	if (!(display = displays.get (rs[Rs_display_name])))
		381	{
		382	free (r_argv);
312	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	}
313		385
314	// using a local pointer decreases code size a lot	386	// using a local pointer decreases code size a lot
315	xa = display->xa;	387	xa = display->xa;
316		388
317	set (display);	389	set (display);
…		…
321	if (rs[Rs_depth])	393	if (rs[Rs_depth])
322	select_visual (strtol (rs[Rs_depth], 0, 0));	394	select_visual (strtol (rs[Rs_depth], 0, 0));
323	#endif	395	#endif
324		396
325	#ifdef HAVE_AFTERIMAGE	397	#ifdef HAVE_AFTERIMAGE
		398	set_application_name ((char*)rs[Rs_name]);
		399	set_output_threshold (OUTPUT_LEVEL_WARNING);
326	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);
327	#endif	401	#endif
328	free (r_argv);	402	free (r_argv);
329		403
330	for (int i = NUM_RESOURCES; i--; )	404	for (int i = NUM_RESOURCES; i--; )
…		…
348	* set any defaults not already set	422	* set any defaults not already set
349	*/	423	*/
350	if (cmd_argv && cmd_argv[0])	424	if (cmd_argv && cmd_argv[0])
351	{	425	{
352	if (!rs[Rs_title])	426	if (!rs[Rs_title])
353	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	427	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
354	if (!rs[Rs_iconName])	428	if (!rs[Rs_iconName])
355	rs[Rs_iconName] = rs[Rs_title];	429	rs[Rs_iconName] = rs[Rs_title];
356	}	430	}
357	else	431	else
358	{	432	{
…		…
396	rs[Rs_cutchars] = CUTCHARS;	470	rs[Rs_cutchars] = CUTCHARS;
397		471
398	#ifndef NO_BACKSPACE_KEY	472	#ifndef NO_BACKSPACE_KEY
399	if (!rs[Rs_backspace_key])	473	if (!rs[Rs_backspace_key])
400	# ifdef DEFAULT_BACKSPACE	474	# ifdef DEFAULT_BACKSPACE
401	key_backspace = DEFAULT_BACKSPACE;	475	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402	# else	476	# else
403	key_backspace = "DEC"; /* can toggle between \010 or \177 */	477	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404	# endif	478	# endif
405	else
406	{
407	val = strdup (rs[Rs_backspace_key]);
408	rxvt_Str_trim (val);
409	rxvt_Str_escaped (val);
410	key_backspace = val;
411	}
412	#endif	479	#endif
413		480
414	#ifndef NO_DELETE_KEY	481	#ifndef NO_DELETE_KEY
415	if (!rs[Rs_delete_key])	482	if (!rs[Rs_delete_key])
416	# ifdef DEFAULT_DELETE	483	# ifdef DEFAULT_DELETE
417	key_delete = DEFAULT_DELETE;	484	rs[Rs_delete_key] = DEFAULT_DELETE;
418	# else	485	# else
419	key_delete = "\033[3~";	486	rs[Rs_delete_key] = "\033[3~";
420	# endif
421	else
422	{
423	val = strdup (rs[Rs_delete_key]);
424	rxvt_Str_trim (val);
425	rxvt_Str_escaped (val);
426	key_delete = val;
427	}
428	#endif	487	# endif
429	if (rs[Rs_answerbackstring])
430	{
431	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433	}
434
435	#ifdef HAVE_SCROLLBARS
436	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437	#endif	488	#endif
		489
		490	scrollBar.setup (this);
438		491
439	#ifdef XTERM_REVERSE_VIDEO	492	#ifdef XTERM_REVERSE_VIDEO
440	/* this is how xterm implements reverseVideo */	493	/* this is how xterm implements reverseVideo */
441	if (option (Opt_reverseVideo))	494	if (option (Opt_reverseVideo))
442	{	495	{
…		…
462	color_aliases (Color_fg);	515	color_aliases (Color_fg);
463	color_aliases (Color_bg);	516	color_aliases (Color_bg);
464	#ifndef NO_CURSORCOLOR	517	#ifndef NO_CURSORCOLOR
465	color_aliases (Color_cursor);	518	color_aliases (Color_cursor);
466	color_aliases (Color_cursor2);	519	color_aliases (Color_cursor2);
467	#endif /* NO_CURSORCOLOR */	520	#endif /* NO_CURSORCOLOR */
468	color_aliases (Color_pointer_fg);	521	color_aliases (Color_pointer_fg);
469	color_aliases (Color_pointer_bg);	522	color_aliases (Color_pointer_bg);
470	color_aliases (Color_border);	523	color_aliases (Color_border);
471	#ifndef NO_BOLD_UNDERLINE_REVERSE	524	#ifndef NO_BOLD_UNDERLINE_REVERSE
472	color_aliases (Color_BD);	525	color_aliases (Color_BD);
473	color_aliases (Color_UL);	526	color_aliases (Color_UL);
474	color_aliases (Color_RV);	527	color_aliases (Color_RV);
475	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	528	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
476		529
477	if (!rs[Rs_color + Color_border])	530	if (!rs[Rs_color + Color_border])
478	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	531	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
479		532
480	return cmd_argv;	533	return cmd_argv;
		534	}
		535
		536	/----------------------------------------------------------------------/
		537	void
		538	rxvt_term::init (int argc, const char const argv, stringvec *envv)
		539	{
		540	this->envv = envv;
		541
		542	SET_R (this);
		543	set_locale ("");
		544	set_environ (envv); // few things in X do not call setlocale :(
		545
		546	init_vars ();
		547
		548	init_secondary ();
		549
		550	const char **cmd_argv = init_resources (argc, argv);
		551
		552	#ifdef KEYSYM_RESOURCE
		553	keyboard->register_done ();
		554	#endif
		555
		556	if (option (Opt_scrollBar))
		557	scrollBar.state = STATE_IDLE; /* set existence for size calculations */
		558
		559	pty = ptytty::create ();
		560
		561	create_windows (argc, argv);
		562
		563	init_xlocale ();
		564
		565	scr_reset (); // initialize screen
		566
		567	#if 0
		568	XSynchronize (dpy, True);
		569	#endif
		570
		571	if (option (Opt_scrollBar))
		572	scrollBar.resize (); /* create and map scrollbar */
		573	#ifdef HAVE_BG_PIXMAP
		574	{
		575	bgPixmap.set_target (this);
		576	bgPixmap.invalidate ();
		577
		578	#ifdef ENABLE_TRANSPARENCY
		579	if (option (Opt_transparent))
		580	{
		581	bgPixmap.set_transparent ();
		582
		583	#ifdef HAVE_AFTERIMAGE
		584	if (rs [Rs_blurradius])
		585	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		586	#endif
		587	if (ISSET_PIXCOLOR (Color_tint))
		588	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		589
		590	if (rs [Rs_shade])
		591	bgPixmap.set_shade (rs [Rs_shade]);
		592
		593	bgPixmap.set_root_pixmap ();
		594	XSelectInput (dpy, display->root, PropertyChangeMask);
		595	rootwin_ev.start (display, display->root);
		596	}
		597	#endif
		598
		599	#ifdef BG_IMAGE_FROM_FILE
		600	if (rs[Rs_backgroundPixmap])
		601	{
		602	const char *p = rs[Rs_backgroundPixmap];
		603
		604	if ((p = strchr (p, ';')) != 0)
		605	{
		606	p++;
		607	bgPixmap.set_geometry (p);
		608	}
		609	else
		610	bgPixmap.set_defaultGeometry ();
		611
		612	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		613	if (!bgPixmap.window_position_sensitive ())
		614	update_background ();
		615	}
		616	#endif
		617	}
		618	#endif
		619
		620	#if ENABLE_PERL
		621	rootwin_ev.start (display, display->root);
		622	#endif
		623
		624	set_colorfgbg ();
		625
		626	init_command (cmd_argv);
		627
		628	free (cmd_argv);
		629
		630	if (pty->pty >= 0)
		631	pty_ev.start (pty->pty, ev::READ);
		632
		633	HOOK_INVOKE ((this, HOOK_START, DT_END));
		634
		635	#if ENABLE_XEMBED
		636	if (rs[Rs_embed])
		637	{
		638	long info[2] = { 0, XEMBED_MAPPED };
		639
		640	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		641	32, PropModeReplace, (unsigned char *)&info, 2);
		642	}
		643	#endif
		644
		645	XMapWindow (dpy, vt);
		646	XMapWindow (dpy, parent[0]);
		647
		648	refresh_check ();
481	}	649	}
482		650
483	/----------------------------------------------------------------------/	651	/----------------------------------------------------------------------/
484	void	652	void
485	rxvt_term::init_env ()	653	rxvt_term::init_env ()
486	{	654	{
487	int i;	655	int i;
488	unsigned int u;
489	char *val;	656	char *val;
490		657
491	#ifdef DISPLAY_IS_IP	658	#ifdef DISPLAY_IS_IP
492	/* Fixup display_name for export over pty to any interested terminal	659	/* Fixup display_name for export over pty to any interested terminal
493	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	660	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
501	*/	668	*/
502	val = rxvt_network_display (rs[Rs_display_name]);	669	val = rxvt_network_display (rs[Rs_display_name]);
503	rs[Rs_display_name] = (const char *)val;	670	rs[Rs_display_name] = (const char *)val;
504		671
505	if (val == NULL)	672	if (val == NULL)
506	#endif /* DISPLAY_IS_IP */	673	#endif /* DISPLAY_IS_IP */
507	val = XDisplayString (dpy);	674	val = XDisplayString (dpy);
508		675
509	if (rs[Rs_display_name] == NULL)	676	if (rs[Rs_display_name] == NULL)
510	rs[Rs_display_name] = val; /* use broken `:0' value */	677	rs[Rs_display_name] = val; /* use broken `:0' value */
511		678
512	i = strlen (val);	679	i = strlen (val);
513	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	680	env_display = (char *)rxvt_malloc (i + 9);
514		681
515	sprintf (env_display, "DISPLAY=%s", val);	682	sprintf (env_display, "DISPLAY=%s", val);
516		683
517	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	684	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
518		685
…		…
539	else	706	else
540	putenv ("COLORTERM=" COLORTERMENVFULL);	707	putenv ("COLORTERM=" COLORTERMENVFULL);
541		708
542	if (rs[Rs_term_name] != NULL)	709	if (rs[Rs_term_name] != NULL)
543	{	710	{
544	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	711	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
545	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	712	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
546	putenv (env_term);	713	putenv (env_term);
547	}	714	}
548	else	715	else
549	putenv ("TERM=" TERMENV);	716	putenv ("TERM=" TERMENV);
…		…
551	#ifdef HAVE_UNSETENV	718	#ifdef HAVE_UNSETENV
552	/* avoid passing old settings and confusing term size */	719	/* avoid passing old settings and confusing term size */
553	unsetenv ("LINES");	720	unsetenv ("LINES");
554	unsetenv ("COLUMNS");	721	unsetenv ("COLUMNS");
555	unsetenv ("TERMCAP"); /* terminfo should be okay */	722	unsetenv ("TERMCAP"); /* terminfo should be okay */
556	#endif /* HAVE_UNSETENV */	723	#endif /* HAVE_UNSETENV */
557	}	724	}
558		725
559	/----------------------------------------------------------------------/	726	/----------------------------------------------------------------------/
560	/*	727	/*
561	* This is more or less stolen straight from XFree86 xterm.	728	* This is more or less stolen straight from XFree86 xterm.
…		…
582		749
583	this->locale = "C";	750	this->locale = "C";
584	}	751	}
585		752
586		753
587	this->locale = rxvt_strdup (this->locale);	754	this->locale = strdup (this->locale);
588	SET_LOCALE (this->locale);	755	SET_LOCALE (this->locale);
589	mbstate.reset ();	756	mbstate.reset ();
590	#endif	757	#endif
591		758
592	#if HAVE_NL_LANGINFO	759	#if HAVE_NL_LANGINFO
…		…
649	priv_modes \|= PrivMode_Keypress;	816	priv_modes \|= PrivMode_Keypress;
650	if (!option (Opt_jumpScroll))	817	if (!option (Opt_jumpScroll))
651	priv_modes \|= PrivMode_smoothScroll;	818	priv_modes \|= PrivMode_smoothScroll;
652		819
653	#ifndef NO_BACKSPACE_KEY	820	#ifndef NO_BACKSPACE_KEY
654	if (strcmp (key_backspace, "DEC") == 0)	821	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
655	priv_modes \|= PrivMode_HaveBackSpace;	822	priv_modes \|= PrivMode_HaveBackSpace;
656	#endif	823	#endif
657		824
658	/* add value for scrollBar */	825	/* add value for scrollBar */
659	if (scrollBar.state)	826	if (scrollBar.state)
…		…
665	run_command (argv);	832	run_command (argv);
666	}	833	}
667		834
668	/----------------------------------------------------------------------/	835	/----------------------------------------------------------------------/
669	void	836	void
670	rxvt_term::Get_Colours ()	837	rxvt_term::get_colours ()
671	{	838	{
672	int i;	839	int i;
673		840
674	#ifdef OFF_FOCUS_FADING	841	#ifdef OFF_FOCUS_FADING
675	pix_colors = pix_colors_focused;	842	pix_colors = pix_colors_focused;
676	#endif	843	#endif
677		844
678	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	845	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
679	{	846	{
680	const char *name = rs[Rs_color + i];	847	const char *name = rs[Rs_color + i];
681		848
682	if (!name)	849	if (!name)
…		…
735	* get scrollBar shadow colors	902	* get scrollBar shadow colors
736	*	903	*
737	* The calculations of topShadow/bottomShadow values are adapted	904	* The calculations of topShadow/bottomShadow values are adapted
738	* from the fvwm window manager.	905	* from the fvwm window manager.
739	*/	906	*/
740	#ifdef KEEP_SCROLLCOLOR	907	#ifdef RXVT_SCROLLBAR
741	if (depth <= 2)	908	if (depth <= 2)
742	{	909	{
743	/* Monochrome */	910	/* Monochrome */
744	alias_color (Color_scroll, Color_fg);	911	alias_color (Color_scroll, Color_fg);
745	alias_color (Color_topShadow, Color_bg);	912	alias_color (Color_topShadow, Color_bg);
…		…
760	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),	927	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
761	cscroll.a)	928	cscroll.a)
762	))	929	))
763	alias_color (Color_topShadow, Color_White);	930	alias_color (Color_topShadow, Color_White);
764	}	931	}
765	#endif /* KEEP_SCROLLCOLOR */	932	#endif
766		933
767	#ifdef OFF_FOCUS_FADING	934	#ifdef OFF_FOCUS_FADING
768	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)	935	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
769	update_fade_color (i);	936	update_fade_color (i);
770	#endif	937	#endif
…		…
778	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	945	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
779	{	946	{
780	int i = atoi (rs[Rs_color + idx]);	947	int i = atoi (rs[Rs_color + idx]);
781		948
782	if (i >= 8 && i <= 15)	949	if (i >= 8 && i <= 15)
783	{ /* bright colors */	950	/* bright colors */
784	i -= 8;
785	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	951	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
786	return;	952	else if (i >= 0 && i <= 7)
787	}	953	/* normal colors */
788
789	if (i >= 0 && i <= 7) /* normal colors */
790	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	954	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
791	}	955	}
792	}	956	}
793		957
794	/----------------------------------------------------------------------/	958	/----------------------------------------------------------------------/
…		…
895	Window top, parent;	1059	Window top, parent;
896		1060
897	dLocal (Display *, dpy);	1061	dLocal (Display *, dpy);
898		1062
899	/* grab colors before netscape does */	1063	/* grab colors before netscape does */
900	Get_Colours ();	1064	get_colours ();
901		1065
902	if (!set_fonts ())	1066	if (!set_fonts ())
903	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1067	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
904		1068
905	parent = display->root;	1069	parent = display->root;
…		…
909	#if ENABLE_FRILLS	1073	#if ENABLE_FRILLS
910	if (option (Opt_borderLess))	1074	if (option (Opt_borderLess))
911	{	1075	{
912	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)	1076	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
913	{	1077	{
914	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	1078	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
915	attributes.override_redirect = true;	1079	attributes.override_redirect = true;
916	mwmhints.flags = 0;
917	}	1080	}
918	else	1081	else
919	{	1082	{
920	mwmhints.flags = MWM_HINTS_DECORATIONS;	1083	mwmhints.flags = MWM_HINTS_DECORATIONS;
921	mwmhints.decorations = 0;
922	}	1084	}
923	}	1085	}
924	else
925	mwmhints.flags = 0;
926	#endif	1086	#endif
927		1087
928	#if ENABLE_XEMBED	1088	#if ENABLE_XEMBED
929	if (rs[Rs_embed])	1089	if (rs[Rs_embed])
930	{	1090	{
…		…
1014	termwin_ev.start (display, top);	1174	termwin_ev.start (display, top);
1015		1175
1016	/* vt cursor: Black-on-White is standard, but this is more popular */	1176	/* vt cursor: Black-on-White is standard, but this is more popular */
1017	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);	1177	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1018		1178
1019	#ifdef HAVE_SCROLLBARS
1020	/* cursor scrollBar: Black-on-White */
1021	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1022	#endif
1023
1024	/* the vt window */	1179	/* the vt window */
1025	vt = XCreateSimpleWindow (dpy, top,	1180	vt = XCreateSimpleWindow (dpy, top,
1026	window_vt_x, window_vt_y,	1181	window_vt_x, window_vt_y,
1027	width, height,	1182	width, height,
1028	0,	1183	0,
…		…
1041		1196
1042	vt_select_input ();	1197	vt_select_input ();
1043		1198
1044	vt_ev.start (display, vt);	1199	vt_ev.start (display, vt);
1045		1200
1046	#ifdef XPM_BACKGROUND
1047	if (rs[Rs_backgroundPixmap] != NULL)
1048	{
1049	const char *p = rs[Rs_backgroundPixmap];
1050
1051	if ((p = strchr (p, ';')) != NULL)
1052	{
1053	p++;
1054	bgPixmap.handle_geometry (p);
1055	}
1056	else
1057	bgPixmap.set_defaultGeometry ();
1058
1059	set_bgPixmap (rs[Rs_backgroundPixmap]);
1060	scr_touch (true);
1061	}
1062	#endif
1063
1064	/* graphics context for the vt window */	1201	/* graphics context for the vt window */
1065	gcvalue.foreground = pix_colors[Color_fg];	1202	gcvalue.foreground = pix_colors[Color_fg];
1066	gcvalue.background = pix_colors[Color_bg];	1203	gcvalue.background = pix_colors[Color_bg];
1067	gcvalue.graphics_exposures = 0;	1204	gcvalue.graphics_exposures = 0;
1068		1205
…		…
1070	GCForeground \| GCBackground \| GCGraphicsExposures,	1207	GCForeground \| GCBackground \| GCGraphicsExposures,
1071	&gcvalue);	1208	&gcvalue);
1072		1209
1073	drawable = new rxvt_drawable (this, vt);	1210	drawable = new rxvt_drawable (this, vt);
1074		1211
1075	#ifdef RXVT_SCROLLBAR
1076	gcvalue.foreground = pix_colors[Color_topShadow];
1077	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078	gcvalue.foreground = pix_colors[Color_bottomShadow];
1079	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1080	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1081	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1082	#endif
1083
1084	#ifdef OFF_FOCUS_FADING	1212	#ifdef OFF_FOCUS_FADING
1085	// initially we are in unfocused state	1213	// initially we are in unfocused state
1086	if (rs[Rs_fade])	1214	if (rs[Rs_fade])
1087	pix_colors = pix_colors_unfocused;	1215	pix_colors = pix_colors_unfocused;
1088	#endif	1216	#endif
…		…
1093		1221
1094	/* ------------------------------------------------------------------------- *	1222	/* ------------------------------------------------------------------------- *
1095	* GET TTY CURRENT STATE *	1223	* GET TTY CURRENT STATE *
1096	* ------------------------------------------------------------------------- */	1224	* ------------------------------------------------------------------------- */
1097	void	1225	void
1098	rxvt_get_ttymode (ttymode_t *tio, int erase)	1226	rxvt_get_ttymode (struct termios *tio, int erase)
1099	{	1227	{
1100	/*	1228	/*
1101	* standard System V termios interface	1229	* standard System V termios interface
1102	*/	1230	*/
1103	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1231	if (tcgetattr (STDIN_FILENO, tio) < 0)
1104	{	1232	{
1105	// return error - use system defaults,	1233	// return error - use system defaults,
1106	// where possible, and zero elsewhere	1234	// where possible, and zero elsewhere
1107	memset (tio, 0, sizeof (ttymode_t));	1235	memset (tio, 0, sizeof (struct termios));
1108		1236
1109	tio->c_cc[VINTR] = CINTR;	1237	tio->c_cc[VINTR] = CINTR;
1110	tio->c_cc[VQUIT] = CQUIT;	1238	tio->c_cc[VQUIT] = CQUIT;
1111	tio->c_cc[VERASE] = CERASE;	1239	tio->c_cc[VERASE] = CERASE;
1112	#ifdef VERASE2	1240	#ifdef VERASE2
…		…
1176		1304
1177	/*	1305	/*
1178	* Debugging	1306	* Debugging
1179	*/	1307	*/
1180	#ifdef DEBUG_TTYMODE	1308	#ifdef DEBUG_TTYMODE
1181	#ifdef HAVE_TERMIOS_H
1182	/* c_iflag bits */	1309	/* c_iflag bits */
1183	fprintf (stderr, "Input flags\n");	1310	fprintf (stderr, "Input flags\n");
1184		1311
1185	/* cpp token stringize doesn't work on all machines <sigh> */	1312	/* cpp token stringize doesn't work on all machines <sigh> */
1186	# define FOO(flag,name) \	1313	# define FOO(flag,name) \
…		…
1249	FOO (VLNEXT, "VLNEXT");	1376	FOO (VLNEXT, "VLNEXT");
1250	# endif	1377	# endif
1251		1378
1252	fprintf (stderr, "\n");	1379	fprintf (stderr, "\n");
1253	# undef FOO	1380	# undef FOO
1254	# endif /* HAVE_TERMIOS_H */	1381	#endif /* DEBUG_TTYMODE */
1255	#endif /* DEBUG_TTYMODE */
1256	}	1382	}
1257		1383
1258	/----------------------------------------------------------------------/	1384	/----------------------------------------------------------------------/
1259	/*	1385	/*
1260	* Run the command in a subprocess and return a file descriptor for the	1386	* Run the command in a subprocess and return a file descriptor for the
…		…
1284	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1410	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1285		1411
1286	int er;	1412	int er;
1287		1413
1288	#ifndef NO_BACKSPACE_KEY	1414	#ifndef NO_BACKSPACE_KEY
1289	if (key_backspace[0] && !key_backspace[1])	1415	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1290	er = key_backspace[0];	1416	er = rs[Rs_backspace_key][0];
1291	else if (strcmp (key_backspace, "DEC") == 0)	1417	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1292	er = '\177'; /* the initial state anyway */	1418	er = '\177'; /* the initial state anyway */
1293	else	1419	else
1294	#endif	1420	#endif
1295	er = -1;	1421	er = -1;
1296		1422
1297	rxvt_get_ttymode (&tio, er);	1423	rxvt_get_ttymode (&tio, er);
1298	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */	1424	/* init terminal attributes */
		1425	cfsetospeed (&tio, BAUDRATE);
		1426	cfsetispeed (&tio, BAUDRATE);
		1427	tcsetattr (pty->tty, TCSANOW, &tio);
1299	pty->set_utf8_mode (enc_utf8);	1428	pty->set_utf8_mode (enc_utf8);
1300		1429
1301	/* set initial window size */	1430	/* set initial window size */
1302	tt_winch ();	1431	tt_winch ();
1303		1432
…		…
1363	rxvt_term::run_child (const char const argv)	1492	rxvt_term::run_child (const char const argv)
1364	{	1493	{
1365	char *login;	1494	char *login;
1366		1495
1367	if (option (Opt_console))	1496	if (option (Opt_console))
		1497	{
1368	{ /* be virtual console, fail silently */	1498	/* be virtual console, fail silently */
1369	#ifdef TIOCCONS	1499	#ifdef TIOCCONS
1370	unsigned int on = 1;	1500	unsigned int on = 1;
1371		1501
1372	ioctl (STDIN_FILENO, TIOCCONS, &on);	1502	ioctl (STDIN_FILENO, TIOCCONS, &on);
1373	#elif defined (SRIOCSREDIR)	1503	#elif defined (SRIOCSREDIR)
…		…
1375		1505
1376	fd = open (CONSOLE, O_WRONLY, 0);	1506	fd = open (CONSOLE, O_WRONLY, 0);
1377	if (fd >= 0)	1507	if (fd >= 0)
1378	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1508	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1379	close (fd);	1509	close (fd);
1380	#endif /* SRIOCSREDIR */	1510	#endif /* SRIOCSREDIR */
1381	}	1511	}
1382		1512
1383	/* reset signals and spin off the command interpreter */	1513	/* reset signals and spin off the command interpreter */
1384	signal (SIGINT, SIG_DFL);	1514	signal (SIGINT, SIG_DFL);
1385	signal (SIGQUIT, SIG_DFL);	1515	signal (SIGQUIT, SIG_DFL);
…		…
1392	*/	1522	*/
1393	#ifdef SIGTSTP	1523	#ifdef SIGTSTP
1394	signal (SIGTSTP, SIG_IGN);	1524	signal (SIGTSTP, SIG_IGN);
1395	signal (SIGTTIN, SIG_IGN);	1525	signal (SIGTTIN, SIG_IGN);
1396	signal (SIGTTOU, SIG_IGN);	1526	signal (SIGTTOU, SIG_IGN);
1397	#endif /* SIGTSTP */	1527	#endif /* SIGTSTP */
1398
1399	// unblock signals (signals are blocked by iom.C
1400	sigset_t ss;
1401	sigemptyset (&ss);
1402	sigprocmask (SIG_SETMASK, &ss, 0);
1403		1528
1404	/* command interpreter path */	1529	/* command interpreter path */
1405	if (argv != NULL)	1530	if (argv)
1406	{	1531	{
1407	# ifdef DEBUG_CMD	1532	# ifdef DEBUG_CMD
1408	int i;	1533	int i;
1409		1534
1410	for (i = 0; argv[i]; i++)	1535	for (i = 0; argv[i]; i++)
…		…
1419	const char argv0, shell;	1544	const char argv0, shell;
1420		1545
1421	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1546	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1422	shell = "/bin/sh";	1547	shell = "/bin/sh";
1423		1548
1424	argv0 = (const char *)rxvt_r_basename (shell);	1549	argv0 = (const char *)rxvt_basename (shell);
1425		1550
1426	if (option (Opt_loginShell))	1551	if (option (Opt_loginShell))
1427	{	1552	{
1428	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1553	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1429		1554
1430	login[0] = '-';	1555	login[0] = '-';
1431	strcpy (&login[1], argv0);	1556	strcpy (&login[1], argv0);
1432	argv0 = login;	1557	argv0 = login;
1433	}	1558	}
1434		1559
1435	execlp (shell, argv0, NULL);	1560	execlp (shell, argv0, (char *)0);
1436	/* no error message: STDERR is closed! */	1561	/* no error message: STDERR is closed! */
1437	}	1562	}
1438		1563
1439	return -1;	1564	return -1;
1440	}	1565	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.202 by sasha, Tue Aug 7 22:43:33 2007 UTC vs. Revision 1.251 by ayin, Tue Feb 19 18:15:26 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.202 by sasha, Tue Aug 7 22:43:33 2007 UTC vs.
Revision 1.251 by ayin, Tue Feb 19 18:15:26 2008 UTC