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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.94 by root, Mon Nov 29 13:37:20 2004 UTC vs.
Revision 1.232 by sasha, Tue Dec 18 15:44:55 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: init.C	2	* File: init.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
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-2004 Marc Lehmann <pcg@goof.com>	15	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15	*	16	*
16	* This program is free software; you can redistribute it and/or modify	17	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	20	* (at your option) any later version.
31	* Initialisation routines.	32	* Initialisation routines.
32	*/	33	*/
33		34
34	#include "../config.h" /* NECESSARY */	35	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	36	#include "rxvt.h" /* NECESSARY */
		37	#include "rxvtutil.h"
36	#include "init.h"	38	#include "init.h"
37		39
		40	#include <limits>
		41
38	#include <signal.h>	42	#include <csignal>
		43
		44	#include <fcntl.h>
		45
		46	#ifdef HAVE_XSETLOCALE
		47	# define X_LOCALE
		48	# include <X11/Xlocale.h>
		49	#else
		50	# ifdef HAVE_SETLOCALE
		51	# include <clocale>
		52	# endif
		53	#endif
		54
		55	#ifdef HAVE_NL_LANGINFO
		56	# include <langinfo.h>
		57	#endif
		58
		59	#ifdef DISPLAY_IS_IP
		60	/* On Solaris link with -lsocket and -lnsl */
		61	#include <sys/types.h>
		62	#include <sys/socket.h>
		63
		64	/* these next two are probably only on Sun (not Solaris) */
		65	#ifdef HAVE_SYS_SOCKIO_H
		66	#include <sys/sockio.h>
		67	#endif
		68	#ifdef HAVE_SYS_BYTEORDER_H
		69	#include <sys/byteorder.h>
		70	#endif
		71
		72	#include <netinet/in.h>
		73	#include <arpa/inet.h>
		74	#include <net/if.h>
		75	#include <net/if_arp.h>
		76
		77	static char *
		78	rxvt_network_display (const char *display)
		79	{
		80	char buffer[1024], *rval = NULL;
		81	struct ifconf ifc;
		82	struct ifreq *ifr;
		83	int i, skfd;
		84
		85	if (display[0] != ':' && strncmp (display, "unix:", 5))
		86	return (char ) display; / nothing to do */
		87
		88	ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
		89	ifc.ifc_buf = buffer;
		90
		91	if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
		92	{
		93	perror ("socket");
		94	return NULL;
		95	}
		96
		97	if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
		98	{
		99	perror ("SIOCGIFCONF");
		100	close (skfd);
		101	return NULL;
		102	}
		103
		104	for (i = 0, ifr = ifc.ifc_req;
		105	i < (ifc.ifc_len / sizeof (struct ifreq));
		106	i++, ifr++)
		107	{
		108	struct ifreq ifr2;
		109
		110	strcpy (ifr2.ifr_name, ifr->ifr_name);
		111
		112	if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
		113	{
		114	unsigned long addr;
		115	struct sockaddr_in *p_addr;
		116
		117	p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
		118	addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
		119
		120	/*
		121	* not "0.0.0.0" or "127.0.0.1" - so format the address
		122	*/
		123	if (addr && addr != 0x7F000001)
		124	{
		125	char *colon = strchr (display, ':');
		126
		127	if (colon == NULL)
		128	colon = ":0.0";
		129
		130	rval = rxvt_malloc (strlen (colon) + 16);
		131	sprintf (rval, "%d.%d.%d.%d%s",
		132	(int) ((addr >> 030) & 0xFF),
		133	(int) ((addr >> 020) & 0xFF),
		134	(int) ((addr >> 010) & 0xFF),
		135	(int) (addr & 0xFF), colon);
		136	break;
		137	}
		138	}
		139	}
		140
		141	close (skfd);
		142
		143	return rval;
		144	}
		145	#endif
39		146
40	const char *const def_colorName[] =	147	const char *const def_colorName[] =
41	{	148	{
42	COLOR_FOREGROUND,	149	COLOR_FOREGROUND,
43	COLOR_BACKGROUND,	150	COLOR_BACKGROUND,
44	/* low-intensity colors */	151	/* low-intensity colors */
45	"Black", /* 0: black (#000000) */	152	"rgb:00/00/00", // 0: black (Black)
46	#ifndef NO_BRIGHTCOLOR	153	"rgb:cd/00/00", // 1: red (Red3)
47	"Red3", /* 1: red (#CD0000) */	154	"rgb:00/cd/00", // 2: green (Green3)
48	"Green3", /* 2: green (#00CD00) */	155	"rgb:cd/cd/00", // 3: yellow (Yellow3)
49	"Yellow3", /* 3: yellow (#CDCD00) */	156	"rgb:00/00/cd", // 4: blue (Blue3)
50	"Blue3", /* 4: blue (#0000CD) */	157	"rgb:cd/00/cd", // 5: magenta (Magenta3)
51	"Magenta3", /* 5: magenta (#CD00CD) */	158	"rgb:00/cd/cd", // 6: cyan (Cyan3)
52	"Cyan3", /* 6: cyan (#00CDCD) */
53	# ifdef XTERM_COLORS	159	# ifdef XTERM_COLORS
54	"Grey90", /* 7: white (#E5E5E5) */	160	"rgb:e5/e5/e5", // 7: white (Grey90)
55	# else	161	# else
56	"AntiqueWhite", /* 7: white (#FAEBD7) */	162	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57	# endif	163	# endif
58	/* high-intensity colors */	164	/* high-intensity colors */
59	# ifdef XTERM_COLORS	165	# ifdef XTERM_COLORS
60	"Grey30", /* 8: bright black (#4D4D4D) */	166	"rgb:4d/4d/4d", // 8: bright black (Grey30)
61	# else	167	# else
62	"Grey25", /* 8: bright black (#404040) */	168	"rgb:40/40/40", // 8: bright black (Grey25)
63	# endif	169	# endif
64	#endif /* NO_BRIGHTCOLOR */	170	"rgb:ff/00/00", // 1/9: bright red (Reed)
65	"Red", /* 1/9: bright red (#FF0000) */	171	"rgb:00/ff/00", // 2/10: bright green (Green)
66	"Green", /* 2/10: bright green (#00FF00) */	172	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
67	"Yellow", /* 3/11: bright yellow (#FFFF00) */	173	"rgb:00/00/ff", // 4/12: bright blue (Blue)
68	"Blue", /* 4/12: bright blue (#0000FF) */	174	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
69	"Magenta", /* 5/13: bright magenta (#FF00FF) */	175	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
70	"Cyan", /* 6/14: bright cyan (#00FFFF) */	176	"rgb:ff/ff/ff", // 7/15: bright white (White)
71	"White", /* 7/15: bright white (#FFFFFF) */
72		177
73	// 88 xterm colours	178	// 88 xterm colours
74	"rgb:00/00/00",	179	"rgb:00/00/00",
75	"rgb:00/00/8b",	180	"rgb:00/00/8b",
76	"rgb:00/00/cd",	181	"rgb:00/00/cd",
…		…
145	"rgb:e7/e7/e7",	250	"rgb:e7/e7/e7",
146		251
147	#ifndef NO_CURSORCOLOR	252	#ifndef NO_CURSORCOLOR
148	COLOR_CURSOR_BACKGROUND,	253	COLOR_CURSOR_BACKGROUND,
149	COLOR_CURSOR_FOREGROUND,	254	COLOR_CURSOR_FOREGROUND,
150	#endif /* ! NO_CURSORCOLOR */	255	#endif /* ! NO_CURSORCOLOR */
151	NULL, /* Color_pointer_fg */	256	NULL, /* Color_pointer_fg */
152	NULL, /* Color_pointer_bg */	257	NULL, /* Color_pointer_bg */
153	NULL, /* Color_border */	258	NULL, /* Color_border */
154	#ifndef NO_BOLD_UNDERLINE_REVERSE	259	#ifndef NO_BOLD_UNDERLINE_REVERSE
155	NULL, /* Color_BD */	260	NULL, /* Color_BD */
156	NULL, /* Color_IT */	261	NULL, /* Color_IT */
157	NULL, /* Color_UL */	262	NULL, /* Color_UL */
158	NULL, /* Color_RV */	263	NULL, /* Color_RV */
159	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	264	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
		265	#if ENABLE_FRILLS
		266	NULL, // Color_underline
		267	#endif
160	#ifdef OPTION_HC	268	#ifdef OPTION_HC
161	NULL,	269	NULL,
162	#endif	270	#endif
163	#ifdef KEEP_SCROLLCOLOR	271	#ifdef KEEP_SCROLLCOLOR
164	COLOR_SCROLLBAR,	272	COLOR_SCROLLBAR,
165	COLOR_SCROLLTROUGH,	273	COLOR_SCROLLTROUGH,
166	#endif /* KEEP_SCROLLCOLOR */	274	#endif /* KEEP_SCROLLCOLOR */
167	#if TINTING	275	#if ENABLE_TRANSPARENCY
168	NULL,	276	NULL,
169	#endif	277	#endif
		278	#if OFF_FOCUS_FADING
		279	"rgb:00/00/00",
		280	#endif
170	};	281	};
171		282
172	const char *const xa_names[NUM_XA] =	283	void
173	{
174	"TEXT",
175	"COMPOUND_TEXT",
176	"UTF8_STRING",
177	"MULTIPLE",
178	"TARGETS",
179	"TIMESTAMP",
180	"VT_SELECTION",
181	"INCR",
182	"WM_DELETE_WINDOW",
183	#ifdef TRANSPARENT
184	"_XROOTPMAP_ID",
185	#endif
186	#ifdef OFFIX_DND
187	"DndProtocol",
188	"DndSelection",
189	#endif
190	"CLIPBOARD"
191	};
192
193	bool
194	rxvt_term::init_vars ()	284	rxvt_term::init_vars ()
195	{	285	{
196	sw_term.start (SIGTERM);	286	pix_colors = //
197
198	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	287	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199	#ifdef OFF_FOCUS_FADING	288	#ifdef OFF_FOCUS_FADING
200	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	289	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201	#endif	290	#endif
202	pix_colors = pix_colors_focused;
203
204	if (pix_colors == NULL)
205	return false;
206
207	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
208	TermWin.pixmap = None;
209	#endif
210		291
211	MEvent.time = CurrentTime;	292	MEvent.time = CurrentTime;
212	MEvent.button = AnyButton;	293	MEvent.button = AnyButton;
213	options = DEFAULT_OPTIONS;
214	want_refresh = 1;	294	want_refresh = 1;
215	cmd_pid = -1;
216	pty.pty = pty.tty = -1;
217	priv_modes = SavedModes = PrivMode_Default;	295	priv_modes = SavedModes = PrivMode_Default;
218	TermWin.focus = 0;
219	TermWin.ncol = 80;	296	ncol = 80;
220	TermWin.nrow = 24;	297	nrow = 24;
221	TermWin.int_bwidth = INTERNALBORDERWIDTH;	298	int_bwidth = INTERNALBORDERWIDTH;
222	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	299	ext_bwidth = EXTERNALBORDERWIDTH;
223	TermWin.lineSpace = LINESPACE;	300	lineSpace = LINESPACE;
224	TermWin.saveLines = SAVELINES;	301	saveLines = SAVELINES;
225	numpix_colors = TOTAL_COLORS;
226		302
227	refresh_limit = 1;
228	refresh_type = SLOW_REFRESH;	303	refresh_type = SLOW_REFRESH;
229	prev_nrow = prev_ncol = 0;
230		304
231	oldcursor.row = oldcursor.col = -1;	305	oldcursor.row = oldcursor.col = -1;
232	#ifdef XPM_BACKGROUND
233	/* bgPixmap.w = bgPixmap.h = 0; */
234	bgPixmap.x = bgPixmap.y = 50;
235	bgPixmap.pixmap = None;
236	#endif
237
238	last_bot = last_state = -1;	306	last_bot = last_state = -1;
239		307
240	#ifdef MENUBAR	308	set_option (Opt_scrollBar);
241	menu_readonly = 1;	309	set_option (Opt_scrollTtyOutput);
242	# if ! (MENUBAR_MAX > 1)	310	set_option (Opt_jumpScroll);
243	CurrentBar = & (BarList);	311	set_option (Opt_skipScroll);
244	# endif /* (MENUBAR_MAX > 1) */	312	set_option (Opt_secondaryScreen);
245	#endif	313	set_option (Opt_secondaryScroll);
246		314	set_option (Opt_pastableTabs);
247	return true;	315	set_option (Opt_intensityStyles);
		316	set_option (Opt_iso14755_52);
248	}	317	}
249		318
250	void	319	void
251	rxvt_term::init_secondary ()	320	rxvt_term::init_secondary ()
252	{	321	{
…		…
259	if ((i = open ("/dev/null", O_RDONLY)) < 0)	328	if ((i = open ("/dev/null", O_RDONLY)) < 0)
260	{	329	{
261	/* TODO: BOO HISS */	330	/* TODO: BOO HISS */
262	dup2 (STDERR_FILENO, STDIN_FILENO);	331	dup2 (STDERR_FILENO, STDIN_FILENO);
263	}	332	}
264	else if (i > STDIN_FILENO)	333	else if (i != STDIN_FILENO)
265	{	334	{
266	dup2 (i, STDIN_FILENO);	335	dup2 (i, STDIN_FILENO);
267	close (i);	336	close (i);
268	}	337	}
269		338
…		…
284	/----------------------------------------------------------------------/	353	/----------------------------------------------------------------------/
285	const char **	354	const char **
286	rxvt_term::init_resources (int argc, const char const argv)	355	rxvt_term::init_resources (int argc, const char const argv)
287	{	356	{
288	int i, r_argc;	357	int i, r_argc;
289	char *val;
290	const char cmd_argv, r_argv;	358	const char cmd_argv, r_argv;
291		359
292	/*	360	/*
293	* Look for -exec option. Find => split and make cmd_argv[] of command args	361	* Look for -e option. Find => split and make cmd_argv[] of command args
294	*/	362	*/
295	for (r_argc = 0; r_argc < argc; r_argc++)	363	for (r_argc = 0; r_argc < argc; r_argc++)
296	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	364	if (!strcmp (argv[r_argc], "-e"))
297	break;	365	break;
		366
		367	if (r_argc == argc)
		368	cmd_argv = NULL;
		369	else if (!argv[r_argc + 1])
		370	rxvt_fatal ("option '-e' requires an argument, aborting.\n");
		371	else
		372	{
		373	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		374
		375	for (i = 0; i < argc - r_argc - 1; i++)
		376	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		377
		378	cmd_argv[i] = NULL;
		379	}
298		380
299	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	381	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
300		382
301	for (i = 0; i < r_argc; i++)	383	for (i = 0; i < r_argc; i++)
302	r_argv[i] = (const char *)argv[i];	384	r_argv[i] = (const char *)argv[i];
303		385
304	r_argv[i] = NULL;	386	r_argv[i] = NULL;
305		387
306	if (r_argc == argc)
307	cmd_argv = NULL;
308	else
309	{
310	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
311
312	for (i = 0; i < argc - r_argc - 1; i++)
313	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
314
315	cmd_argv[i] = NULL;
316	}
317
318	rs[Rs_name] = rxvt_r_basename (argv[0]);	388	rs[Rs_name] = rxvt_basename (argv[0]);
319		389
320	/*	390	/*
321	* Open display, get options/resources and create the window	391	* Open display, get options/resources and create the window
322	*/	392	*/
		393
323	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	394	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324	rs[Rs_display_name] = ":0";	395	rs[Rs_display_name] = ":0";
325		396
326	get_options (r_argc, r_argv);	397	get_options (r_argc, r_argv);
		398
		399	if (!(display = displays.get (rs[Rs_display_name])))
		400	{
		401	free (r_argv);
		402	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		403	}
		404
		405	// using a local pointer decreases code size a lot
		406	xa = display->xa;
		407
		408	set (display);
		409	extract_resources ();
		410
		411	#if XFT
		412	if (rs[Rs_depth])
		413	select_visual (strtol (rs[Rs_depth], 0, 0));
		414	#endif
		415
		416	#ifdef HAVE_AFTERIMAGE
		417	set_application_name ((char*)rs[Rs_name]);
		418	set_output_threshold (OUTPUT_LEVEL_WARNING);
		419	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		420	#endif
327	free (r_argv);	421	free (r_argv);
328		422
329	#ifdef LOCAL_X_IS_UNIX	423	for (int i = NUM_RESOURCES; i--; )
330	if (rs[Rs_display_name][0] == ':')	424	if (rs [i] == resval_undef)
331	{	425	rs [i] = 0;
332	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));	426
333	strcpy (val, "unix");	427	#if ENABLE_PERL
334	strcat (val, rs[Rs_display_name]);	428	if (!rs[Rs_perl_ext_1])
335	display = displays.get (val);	429	rs[Rs_perl_ext_1] = "default";
336	free (val);	430
		431	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		432	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		433	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
337	}	434	{
		435	rxvt_perl.init (this);
		436	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		437	}
338	#endif	438	#endif
339
340	if (!display
341	&& ! (display = displays.get (rs[Rs_display_name])))
342	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
343
344	extract_resources (display->display, rs[Rs_name]);
345		439
346	/*	440	/*
347	* set any defaults not already set	441	* set any defaults not already set
348	*/	442	*/
349	if (cmd_argv && cmd_argv[0])	443	if (cmd_argv && cmd_argv[0])
350	{	444	{
351	if (!rs[Rs_title])	445	if (!rs[Rs_title])
352	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	446	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
353	if (!rs[Rs_iconName])	447	if (!rs[Rs_iconName])
354	rs[Rs_iconName] = rs[Rs_title];	448	rs[Rs_iconName] = rs[Rs_title];
355	}	449	}
356	else	450	else
357	{	451	{
…		…
360	if (!rs[Rs_iconName])	454	if (!rs[Rs_iconName])
361	rs[Rs_iconName] = rs[Rs_name];	455	rs[Rs_iconName] = rs[Rs_name];
362	}	456	}
363		457
364	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	458	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
365	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	459	saveLines = min (i, MAX_SAVELINES);
366		460
367	#if ENABLE_FRILLS	461	#if ENABLE_FRILLS
368	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	462	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
369	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	463	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		464
370	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	465	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	466	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372	#endif
373		467
374	#ifndef NO_LINESPACE
375	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	468	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	469	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
377	#endif	470	#endif
378		471
379	#ifdef POINTER_BLANK	472	#ifdef POINTER_BLANK
380	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	473	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
381	pointerBlankDelay = i;	474	pointerBlankDelay = i;
382	else	475	else
383	pointerBlankDelay = 2;	476	pointerBlankDelay = 2;
384	#endif	477	#endif
385		478
386	/* no point having a scrollbar without having any scrollback! */	479	/* no point having a scrollbar without having any scrollback! */
387	if (!TermWin.saveLines)	480	if (!saveLines)
388	options &= ~Opt_scrollBar;	481	set_option (Opt_scrollBar, 0);
389		482
390	#ifdef PRINTPIPE	483	#ifdef PRINTPIPE
391	if (!rs[Rs_print_pipe])	484	if (!rs[Rs_print_pipe])
392	rs[Rs_print_pipe] = PRINTPIPE;	485	rs[Rs_print_pipe] = PRINTPIPE;
393	#endif	486	#endif
…		…
396	rs[Rs_cutchars] = CUTCHARS;	489	rs[Rs_cutchars] = CUTCHARS;
397		490
398	#ifndef NO_BACKSPACE_KEY	491	#ifndef NO_BACKSPACE_KEY
399	if (!rs[Rs_backspace_key])	492	if (!rs[Rs_backspace_key])
400	# ifdef DEFAULT_BACKSPACE	493	# ifdef DEFAULT_BACKSPACE
401	key_backspace = DEFAULT_BACKSPACE;	494	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402	# else	495	# else
403	key_backspace = "DEC"; /* can toggle between \010 or \177 */	496	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404	# endif	497	# 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	498	#endif
413		499
414	#ifndef NO_DELETE_KEY	500	#ifndef NO_DELETE_KEY
415	if (!rs[Rs_delete_key])	501	if (!rs[Rs_delete_key])
416	# ifdef DEFAULT_DELETE	502	# ifdef DEFAULT_DELETE
417	key_delete = DEFAULT_DELETE;	503	rs[Rs_delete_key] = DEFAULT_DELETE;
418	# else	504	# else
419	key_delete = "\033[3~";	505	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	506	# endif
429	if (rs[Rs_answerbackstring])	507	#endif
430	{
431	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433	}
434		508
435	#ifdef HAVE_SCROLLBARS	509	#ifdef HAVE_SCROLLBARS
436	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	510	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437	#endif	511	#endif
438		512
439	#ifdef XTERM_REVERSE_VIDEO	513	#ifdef XTERM_REVERSE_VIDEO
440	/* this is how xterm implements reverseVideo */	514	/* this is how xterm implements reverseVideo */
441	if (options & Opt_reverseVideo)	515	if (option (Opt_reverseVideo))
442	{	516	{
443	if (!rs[Rs_color + Color_fg])	517	if (!rs[Rs_color + Color_fg])
444	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	518	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		519
445	if (!rs[Rs_color + Color_bg])	520	if (!rs[Rs_color + Color_bg])
446	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	521	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
447	}	522	}
448	#endif	523	#endif
449		524
…		…
451	if (!rs[Rs_color + i])	526	if (!rs[Rs_color + i])
452	rs[Rs_color + i] = def_colorName[i];	527	rs[Rs_color + i] = def_colorName[i];
453		528
454	#ifndef XTERM_REVERSE_VIDEO	529	#ifndef XTERM_REVERSE_VIDEO
455	/* this is how we implement reverseVideo */	530	/* this is how we implement reverseVideo */
456	if (options & Opt_reverseVideo)	531	if (option (Opt_reverseVideo))
457	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	532	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
458	#endif	533	#endif
459		534
460	/* convenient aliases for setting fg/bg to colors */	535	/* convenient aliases for setting fg/bg to colors */
461	color_aliases (Color_fg);	536	color_aliases (Color_fg);
462	color_aliases (Color_bg);	537	color_aliases (Color_bg);
463	#ifndef NO_CURSORCOLOR	538	#ifndef NO_CURSORCOLOR
464	color_aliases (Color_cursor);	539	color_aliases (Color_cursor);
465	color_aliases (Color_cursor2);	540	color_aliases (Color_cursor2);
466	#endif /* NO_CURSORCOLOR */	541	#endif /* NO_CURSORCOLOR */
467	color_aliases (Color_pointer_fg);	542	color_aliases (Color_pointer_fg);
468	color_aliases (Color_pointer_bg);	543	color_aliases (Color_pointer_bg);
469	color_aliases (Color_border);	544	color_aliases (Color_border);
470	#ifndef NO_BOLD_UNDERLINE_REVERSE	545	#ifndef NO_BOLD_UNDERLINE_REVERSE
471	color_aliases (Color_BD);	546	color_aliases (Color_BD);
472	color_aliases (Color_UL);	547	color_aliases (Color_UL);
473	color_aliases (Color_RV);	548	color_aliases (Color_RV);
474	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	549	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
475		550
476	if (!rs[Rs_color + Color_border])	551	if (!rs[Rs_color + Color_border])
477	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];	552	rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
478		553
479	return cmd_argv;	554	return cmd_argv;
…		…
482	/----------------------------------------------------------------------/	557	/----------------------------------------------------------------------/
483	void	558	void
484	rxvt_term::init_env ()	559	rxvt_term::init_env ()
485	{	560	{
486	int i;	561	int i;
487	unsigned int u;
488	char *val;	562	char *val;
489		563
490	#ifdef DISPLAY_IS_IP	564	#ifdef DISPLAY_IS_IP
491	/* Fixup display_name for export over pty to any interested terminal	565	/* Fixup display_name for export over pty to any interested terminal
492	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	566	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
500	*/	574	*/
501	val = rxvt_network_display (rs[Rs_display_name]);	575	val = rxvt_network_display (rs[Rs_display_name]);
502	rs[Rs_display_name] = (const char *)val;	576	rs[Rs_display_name] = (const char *)val;
503		577
504	if (val == NULL)	578	if (val == NULL)
505	#endif /* DISPLAY_IS_IP */	579	#endif /* DISPLAY_IS_IP */
506	val = XDisplayString (display->display);	580	val = XDisplayString (dpy);
507		581
508	if (rs[Rs_display_name] == NULL)	582	if (rs[Rs_display_name] == NULL)
509	rs[Rs_display_name] = val; /* use broken `:0' value */	583	rs[Rs_display_name] = val; /* use broken `:0' value */
510		584
511	i = strlen (val);	585	i = strlen (val);
512	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	586	env_display = (char *)rxvt_malloc (i + 9);
513		587
514	sprintf (env_display, "DISPLAY=%s", val);	588	sprintf (env_display, "DISPLAY=%s", val);
515		589
516	/* avoiding the math library:	590	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
517	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
518	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
519	;
520	MAX_IT (i, 1);
521	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
522
523	sprintf (env_windowid, "WINDOWID=%u",
524	(unsigned int)TermWin.parent[0]);
525		591
526	/* add entries to the environment:	592	/* add entries to the environment:
527	* @ DISPLAY: in case we started with -display	593	* @ DISPLAY: in case we started with -display
528	* @ WINDOWID: X window id number of the window	594	* @ WINDOWID: X window id number of the window
529	* @ COLORTERM: terminal sub-name and also indicates its color	595	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
531	* @ TERMINFO: path to terminfo directory	597	* @ TERMINFO: path to terminfo directory
532	* @ COLORFGBG: fg;bg color codes	598	* @ COLORFGBG: fg;bg color codes
533	*/	599	*/
534	putenv (env_display);	600	putenv (env_display);
535	putenv (env_windowid);	601	putenv (env_windowid);
		602
536	if (env_colorfgbg)	603	if (env_colorfgbg)
537	putenv (env_colorfgbg);	604	putenv (env_colorfgbg);
538		605
539	#ifdef RXVT_TERMINFO	606	#ifdef RXVT_TERMINFO
540	putenv ("TERMINFO=" RXVT_TERMINFO);	607	putenv ("TERMINFO=" RXVT_TERMINFO);
541	#endif	608	#endif
542		609
543	if (display->depth <= 2)	610	if (depth <= 2)
544	putenv ("COLORTERM=" COLORTERMENV "-mono");	611	putenv ("COLORTERM=" COLORTERMENV "-mono");
545	else	612	else
546	putenv ("COLORTERM=" COLORTERMENVFULL);	613	putenv ("COLORTERM=" COLORTERMENVFULL);
547		614
548	if (rs[Rs_term_name] != NULL)	615	if (rs[Rs_term_name] != NULL)
549	{	616	{
550	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	617	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
551	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	618	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
552	putenv (env_term);	619	putenv (env_term);
553	}	620	}
554	else	621	else
555	putenv ("TERM=" TERMENV);	622	putenv ("TERM=" TERMENV);
…		…
557	#ifdef HAVE_UNSETENV	624	#ifdef HAVE_UNSETENV
558	/* avoid passing old settings and confusing term size */	625	/* avoid passing old settings and confusing term size */
559	unsetenv ("LINES");	626	unsetenv ("LINES");
560	unsetenv ("COLUMNS");	627	unsetenv ("COLUMNS");
561	unsetenv ("TERMCAP"); /* terminfo should be okay */	628	unsetenv ("TERMCAP"); /* terminfo should be okay */
562	#endif /* HAVE_UNSETENV */	629	#endif /* HAVE_UNSETENV */
563	}	630	}
564		631
565	/----------------------------------------------------------------------/	632	/----------------------------------------------------------------------/
566	/*	633	/*
567	* This is more or less stolen straight from XFree86 xterm.	634	* This is more or less stolen straight from XFree86 xterm.
568	* This should support all European type languages.	635	* This should support all European type languages.
569	*/	636	*/
570	void	637	void
571	rxvt_term::set_locale (const char *locale)	638	rxvt_term::set_locale (const char *locale)
572	{	639	{
		640	set_environ (envv);
		641
573	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	642	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
574	free (this->locale);	643	free (this->locale);
575	this->locale = setlocale (LC_CTYPE, locale);	644	this->locale = setlocale (LC_CTYPE, locale);
576		645
577	if (!this->locale)	646	if (!this->locale)
578	{	647	{
579	if (*locale)	648	if (*locale)
580	{	649	{
581	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	650	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
582	setlocale (LC_CTYPE, "");	651	setlocale (LC_CTYPE, "C");
583	}	652	}
584	else	653	else
585	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	654	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
586		655
587	this->locale = "";	656	this->locale = "C";
588	}	657	}
589		658
590		659
591	this->locale = rxvt_strdup (this->locale);	660	this->locale = strdup (this->locale);
592	SET_LOCALE (this->locale);	661	SET_LOCALE (this->locale);
593	mbstate.reset ();	662	mbstate.reset ();
594	#endif	663	#endif
595	#if 0	664
596	#if HAVE_NL_LANGINFO	665	#if HAVE_NL_LANGINFO
		666	char *codeset = strdup (nl_langinfo (CODESET));
		667	// /^UTF.?8/i
		668	enc_utf8 = (codeset[0] == 'U' \|\| codeset[0] == 'u')
		669	&& (codeset[1] == 'T' \|\| codeset[1] == 't')
		670	&& (codeset[2] == 'F' \|\| codeset[2] == 'f')
		671	&& (codeset[3] == '8' \|\| codeset[4] == '8');
597	free (codeset);	672	free (codeset);
598	codeset = strdup (nl_langinfo (CODESET));
599	enc_utf8 = !strcasecmp (codeset, "UTF-8")
600	\|\| !strcasecmp (codeset, "UTF8");
601	#else	673	#else
602	enc_utf8 = 1;	674	enc_utf8 = 0;
603	#endif
604	#endif	675	#endif
605	}	676	}
606		677
607	void	678	void
608	rxvt_term::init_xlocale ()	679	rxvt_term::init_xlocale ()
609	{	680	{
		681	set_environ (envv);
		682
610	#ifdef USE_XIM	683	#ifdef USE_XIM
611	if (!locale)	684	if (!locale)
612	rxvt_warn ("setting locale failed, working without locale support.\n");	685	rxvt_warn ("setting locale failed, working without locale support.\n");
613	else	686	else
614	{	687	{
615	Atom wmlocale;	688	set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617	wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618	XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619	XA_STRING, 8, PropModeReplace,
620	(unsigned char *)locale, strlen (locale));
621		689
622	if (!XSupportsLocale ())	690	if (!XSupportsLocale ())
623	{	691	{
624	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");	692	rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
625	return;	693	return;
…		…
639	{	707	{
640	/*	708	/*
641	* Initialize the command connection.	709	* Initialize the command connection.
642	* This should be called after the X server connection is established.	710	* This should be called after the X server connection is established.
643	*/	711	*/
644	int i;
645
646	for (i = 0; i < NUM_XA; i++)
647	xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649	/* Enable delete window protocol */
650	XSetWMProtocols (display->display, TermWin.parent[0],
651	& (xa[XA_WMDELETEWINDOW]), 1);
652
653	#ifdef USING_W11LIB
654	/* enable W11 callbacks */
655	W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656	#endif
657		712
658	#ifdef META8_OPTION	713	#ifdef META8_OPTION
659	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	714	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660	#endif	715	#endif
661		716
662	get_ourmods ();	717	get_ourmods ();
663		718
664	if (!(options & Opt_scrollTtyOutput))	719	if (!option (Opt_scrollTtyOutput))
665	priv_modes \|= PrivMode_TtyOutputInh;	720	priv_modes \|= PrivMode_TtyOutputInh;
666	if (options & Opt_scrollTtyKeypress)	721	if (option (Opt_scrollTtyKeypress))
667	priv_modes \|= PrivMode_Keypress;	722	priv_modes \|= PrivMode_Keypress;
668	if (!(options & Opt_jumpScroll))	723	if (!option (Opt_jumpScroll))
669	priv_modes \|= PrivMode_smoothScroll;	724	priv_modes \|= PrivMode_smoothScroll;
670		725
671	#ifndef NO_BACKSPACE_KEY	726	#ifndef NO_BACKSPACE_KEY
672	if (strcmp (key_backspace, "DEC") == 0)	727	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673	priv_modes \|= PrivMode_HaveBackSpace;	728	priv_modes \|= PrivMode_HaveBackSpace;
674	#endif	729	#endif
675		730
676	/* add value for scrollBar */	731	/* add value for scrollBar */
677	if (scrollbar_visible ())	732	if (scrollBar.state)
678	{	733	{
679	priv_modes \|= PrivMode_scrollBar;	734	priv_modes \|= PrivMode_scrollBar;
680	SavedModes \|= PrivMode_scrollBar;	735	SavedModes \|= PrivMode_scrollBar;
681	}	736	}
682	if (menubar_visible ())
683	{
684	priv_modes \|= PrivMode_menuBar;
685	SavedModes \|= PrivMode_menuBar;
686	}
687
688	#ifdef CURSOR_BLINK
689	if (options & Opt_cursorBlink)
690	(void)gettimeofday (&lastcursorchange, NULL);
691	#endif
692		737
693	run_command (argv);	738	run_command (argv);
694	}	739	}
695		740
696	/----------------------------------------------------------------------/	741	/----------------------------------------------------------------------/
…		…
700	int i;	745	int i;
701		746
702	#ifdef OFF_FOCUS_FADING	747	#ifdef OFF_FOCUS_FADING
703	pix_colors = pix_colors_focused;	748	pix_colors = pix_colors_focused;
704	#endif	749	#endif
705		750
706	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	751	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
707	{	752	{
		753	const char *name = rs[Rs_color + i];
		754
		755	if (!name)
		756	continue;
		757
708	rxvt_color xcol;	758	rxvt_color xcol;
709		759
710	if (!rs[Rs_color + i])	760	if (!set_color (xcol, name))
711	continue;
712
713	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
714	{	761	{
715	#ifndef XTERM_REVERSE_VIDEO	762	#ifndef XTERM_REVERSE_VIDEO
716	if (i < 2 && (options & Opt_reverseVideo))	763	if (i < 2 && option (Opt_reverseVideo))
717	rs[Rs_color + i] = def_colorName[!i];	764	name = def_colorName [1 - i];
718	else	765	else
719	#endif	766	#endif
720	rs[Rs_color + i] = def_colorName[i];	767	name = def_colorName [i];
721		768
722	if (!rs[Rs_color + i])	769	if (!name)
723	continue;	770	continue;
724		771
725	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	772	if (!set_color (xcol, name))
726	{	773	{
727	switch (i)	774	switch (i)
728	{	775	{
729	case Color_fg:	776	case Color_fg:
730	case Color_bg:	777	case Color_bg:
731	/* fatal: need bg/fg color */
732	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	778	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
733	/* NOTREACHED */	779	name = "";
734	break;	780	break;
735	#ifndef NO_CURSORCOLOR	781	#ifndef NO_CURSORCOLOR
736	case Color_cursor2:	782	case Color_cursor2:
737	xcol = pix_colors[Color_fg];	783	#endif
738	break;
739	#endif /* ! NO_CURSORCOLOR */
740	case Color_pointer_fg:	784	case Color_pointer_fg:
741	xcol = pix_colors[Color_fg];	785	name = rs[Rs_color + Color_fg];
		786	xcol.set (this, name);
742	break;	787	break;
743	default:	788	default:
744	xcol = pix_colors[Color_bg]; /* None */	789	name = rs[Rs_color + Color_bg];
		790	xcol.set (this, name);
745	break;	791	break;
746	}	792	}
747	}	793	}
748	}	794	}
749		795
750	pix_colors[i] = xcol;	796	pix_colors[i] = xcol;
751	#ifdef OFF_FOCUS_FADING	797	rs[Rs_color + i] = name;
752	if (rs[Rs_fade])
753	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
754	#endif
755	SET_PIXCOLOR (i);
756	}
757
758	if (display->depth <= 2)
759	{	798	}
		799
		800	if (depth <= 2)
		801	{
760	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	802	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
761	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	803	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
762	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	804	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
763	}	805	}
764		806
765	/*	807	/*
766	* get scrollBar/menuBar shadow colors	808	* get scrollBar shadow colors
767	*	809	*
768	* The calculations of topShadow/bottomShadow values are adapted	810	* The calculations of topShadow/bottomShadow values are adapted
769	* from the fvwm window manager.	811	* from the fvwm window manager.
770	*/	812	*/
771	#ifdef KEEP_SCROLLCOLOR	813	#ifdef KEEP_SCROLLCOLOR
772
773	if (display->depth <= 2)	814	if (depth <= 2)
		815	{
774	{ /* Monochrome */	816	/* Monochrome */
775	pix_colors[Color_scroll] = pix_colors[Color_fg];	817	alias_color (Color_scroll, Color_fg);
776	pix_colors[Color_topShadow] = pix_colors[Color_bg];	818	alias_color (Color_topShadow, Color_bg);
777	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	819	alias_color (Color_bottomShadow, Color_bg);
778	}	820	}
779	else	821	else
780	{	822	{
781	rxvt_color xcol[2];	823	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
782	/* xcol[0] == white
783	* xcol[1] == top shadow
784	* xcol[2] == bot shadow */
785		824
786	xcol[1] = pix_colors[Color_scroll];	825	rgba cscroll;
787	xcol[0].set (display, 65535, 65535, 65535);	826	pix_colors [Color_scroll].get (cscroll);
788
789	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
790
791	xcol[0].get (display, pr0, pg0, pb0);
792	xcol[1].get (display, pr1, pg1, pb1);
793
794	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
795		827
796	/* topShadowColor */	828	/* topShadowColor */
797	if (!xcol[1].set (display,	829	if (!pix_colors[Color_topShadow].set (this,
798	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	830	rgba (
799	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	831	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
800	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	832	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
801	xcol[1] = pix_colors[Color_White];	833	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
802		834	cscroll.a)
803	pix_colors[Color_topShadow] = xcol[1];	835	))
		836	alias_color (Color_topShadow, Color_White);
804	}	837	}
805	#endif /* KEEP_SCROLLCOLOR */	838	#endif /* KEEP_SCROLLCOLOR */
		839
		840	#ifdef OFF_FOCUS_FADING
		841	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		842	update_fade_color (i);
		843	#endif
806	}	844	}
807		845
808	/----------------------------------------------------------------------/	846	/----------------------------------------------------------------------/
809	/* color aliases, fg/bg bright-bold */	847	/* color aliases, fg/bg bright-bold */
810	void	848	void
…		…
813	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))	851	if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
814	{	852	{
815	int i = atoi (rs[Rs_color + idx]);	853	int i = atoi (rs[Rs_color + idx]);
816		854
817	if (i >= 8 && i <= 15)	855	if (i >= 8 && i <= 15)
818	{ /* bright colors */	856	/* bright colors */
819	i -= 8;
820	#ifndef NO_BRIGHTCOLOR
821	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	857	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
822	return;	858	else if (i >= 0 && i <= 7)
823	#endif	859	/* normal colors */
824	}
825
826	if (i >= 0 && i <= 7) /* normal colors */
827	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	860	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
828	}	861	}
829	}	862	}
830		863
831	/----------------------------------------------------------------------/	864	/----------------------------------------------------------------------/
…		…
834	* Use resource ``modifier'' to override the Meta modifier	867	* Use resource ``modifier'' to override the Meta modifier
835	*/	868	*/
836	void	869	void
837	rxvt_term::get_ourmods ()	870	rxvt_term::get_ourmods ()
838	{	871	{
839	int i, j, k;	872	int i, j, k;
840	int requestedmeta, realmeta, realalt;	873	int requestedmeta, realmeta, realalt;
841	const char cm, rsmod;	874	const char cm, rsmod;
842	XModifierKeymap *map;	875	XModifierKeymap *map;
843	KeyCode *kc;	876	KeyCode *kc;
844	const unsigned int modmasks[] =	877	const unsigned int modmasks[] =
845	{	878	{
846	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask	879	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847	};	880	};
848		881
849	requestedmeta = realmeta = realalt = 0;	882	requestedmeta = realmeta = realalt = 0;
850	rsmod = rs[Rs_modifier];	883	rsmod = rs[Rs_modifier];
		884
851	if (rsmod	885	if (rsmod
852	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	886	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853	requestedmeta = rsmod[3] - '0';	887	requestedmeta = rsmod[3] - '0';
854		888
855	map = XGetModifierMapping (display->display);	889	map = XGetModifierMapping (dpy);
856	kc = map->modifiermap;	890	kc = map->modifiermap;
		891
857	for (i = 1; i < 6; i++)	892	for (i = 1; i < 6; i++)
858	{	893	{
859	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	894	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
		895
860	for (j = map->max_keypermod; j--; k++)	896	for (j = map->max_keypermod; j--; k++)
861	{	897	{
862	if (kc[k] == 0)	898	if (kc[k] == 0)
863	break;	899	break;
		900
864	switch (XKeycodeToKeysym (display->display, kc[k], 0))	901	switch (XKeycodeToKeysym (dpy, kc[k], 0))
865	{	902	{
866	case XK_Num_Lock:	903	case XK_Num_Lock:
867	ModNumLockMask = modmasks[i - 1];	904	ModNumLockMask = modmasks[i - 1];
868	/* FALLTHROUGH */	905	continue;
869	default:	906
870	continue; /* for (;;) */	907	case XK_ISO_Level3_Shift:
		908	ModLevel3Mask = modmasks[i - 1];
		909	continue;
		910
871	case XK_Meta_L:	911	case XK_Meta_L:
872	case XK_Meta_R:	912	case XK_Meta_R:
873	cm = "meta";	913	cm = "meta";
874	realmeta = i;	914	realmeta = i;
875	break;	915	break;
		916
876	case XK_Alt_L:	917	case XK_Alt_L:
877	case XK_Alt_R:	918	case XK_Alt_R:
878	cm = "alt";	919	cm = "alt";
879	realalt = i;	920	realalt = i;
880	break;	921	break;
		922
881	case XK_Super_L:	923	case XK_Super_L:
882	case XK_Super_R:	924	case XK_Super_R:
883	cm = "super";	925	cm = "super";
884	break;	926	break;
		927
885	case XK_Hyper_L:	928	case XK_Hyper_L:
886	case XK_Hyper_R:	929	case XK_Hyper_R:
887	cm = "hyper";	930	cm = "hyper";
888	break;	931	break;
		932
		933	default:
		934	continue;
889	}	935	}
		936
890	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)	937	if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891	requestedmeta = i;	938	requestedmeta = i;
892	}	939	}
893	}	940	}
		941
894	XFreeModifiermap (map);	942	XFreeModifiermap (map);
		943
895	i = (requestedmeta ? requestedmeta	944	i = requestedmeta ? requestedmeta
896	: (realmeta ? realmeta	945	: realmeta ? realmeta
897	: (realalt ? realalt : 0)));	946	: realalt ? realalt
		947	: 0;
		948
898	if (i)	949	if (i)
899	ModMetaMask = modmasks[i - 1];	950	ModMetaMask = modmasks[i - 1];
900	}	951	}
901		952
902	/----------------------------------------------------------------------/	953	/----------------------------------------------------------------------/
…		…
905	rxvt_term::create_windows (int argc, const char const argv)	956	rxvt_term::create_windows (int argc, const char const argv)
906	{	957	{
907	XClassHint classHint;	958	XClassHint classHint;
908	XWMHints wmHint;	959	XWMHints wmHint;
909	#if ENABLE_FRILLS	960	#if ENABLE_FRILLS
910	Atom prop = None;
911	MWMHints mwmhints;	961	MWMHints mwmhints = { };
912	#endif	962	#endif
913	XGCValues gcvalue;	963	XGCValues gcvalue;
914	long vt_emask;
915	XSetWindowAttributes attributes;	964	XSetWindowAttributes attributes;
916	XWindowAttributes gattr;	965	Window top, parent;
917		966
918	if (options & Opt_transparent)	967	dLocal (Display *, dpy);
919	{	968
920	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);	969	/* grab colors before netscape does */
921	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	970	Get_Colours ();
922	}	971
		972	if (!set_fonts ())
		973	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
		974
		975	parent = display->root;
		976
		977	attributes.override_redirect = !!option (Opt_override_redirect);
923		978
924	#if ENABLE_FRILLS	979	#if ENABLE_FRILLS
925	if (options & Opt_borderLess)	980	if (option (Opt_borderLess))
926	{	981	{
927	prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);	982	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
928
929	if (prop == None)
930	{	983	{
931	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	984	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
932	#ifdef PREFER_24BIT
933	attributes.override_redirect = TRUE;	985	attributes.override_redirect = true;
934	#endif
935	mwmhints.flags = 0;
936	}	986	}
937	else	987	else
938	{	988	{
939	mwmhints.flags = MWM_HINTS_DECORATIONS;	989	mwmhints.flags = MWM_HINTS_DECORATIONS;
940	mwmhints.decorations = 0;
941	}	990	}
942	}	991	}
943	else	992	#endif
944	{	993
945	mwmhints.flags = 0;	994	#if ENABLE_XEMBED
		995	if (rs[Rs_embed])
946	}	996	{
947	#endif	997	XWindowAttributes wattr;
948		998
949	/* grab colors before netscape does */	999	parent = strtol (rs[Rs_embed], 0, 0);
950	Get_Colours ();
951		1000
952	if (!set_fonts ())	1001	if (!XGetWindowAttributes (dpy, parent, &wattr))
953	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	1002	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
		1003
		1004	window_calc (wattr.width, wattr.height);
		1005	}
		1006	#endif
954		1007
955	window_calc (0, 0);	1008	window_calc (0, 0);
		1009
		1010	/* sub-window placement & size in rxvt_resize_subwindows () */
		1011	attributes.background_pixel = pix_colors_focused [Color_border];
		1012	attributes.border_pixel = pix_colors_focused [Color_border];
		1013	attributes.colormap = cmap;
		1014
		1015	top = XCreateWindow (dpy, parent,
		1016	szHint.x, szHint.y,
		1017	szHint.width, szHint.height,
		1018	ext_bwidth,
		1019	depth, InputOutput, visual,
		1020	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
		1021	&attributes);
		1022
		1023	this->parent[0] = top;
		1024
956	old_width = szHint.width;	1025	old_width = szHint.width;
957	old_height = szHint.height;	1026	old_height = szHint.height;
958		1027
959	/* sub-window placement & size in rxvt_resize_subwindows () */
960
961	#ifdef PREFER_24BIT
962	attributes.background_pixel = pix_colors_focused[Color_border];
963	attributes.border_pixel = pix_colors_focused[Color_border];
964	attributes.colormap = display->cmap;
965	TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
966	szHint.x, szHint.y,
967	szHint.width, szHint.height,
968	TermWin.ext_bwidth,
969	display->depth, InputOutput,
970	display->visual,
971	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
972	#else
973	TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
974	szHint.x, szHint.y,
975	szHint.width, szHint.height,
976	TermWin.ext_bwidth,
977	pix_colors_focused[Color_border],
978	pix_colors_focused[Color_border]);
979	#endif
980
981	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1028	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
982	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	1029	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
983		1030
984	classHint.res_name = (char *)rs[Rs_name];	1031	classHint.res_name = (char *)rs[Rs_name];
985	classHint.res_class = (char *)RESCLASS;	1032	classHint.res_class = (char *)RESCLASS;
986		1033
987	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1034	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
988	wmHint.input = True;	1035	wmHint.input = True;
989	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1036	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
990	wmHint.window_group = TermWin.parent[0];	1037	wmHint.window_group = top;
991		1038
992	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,	1039	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
993	(char **)argv, argc, &szHint, &wmHint, &classHint);	1040	&szHint, &wmHint, &classHint);
994		1041
995	#if ENABLE_FRILLS	1042	#if ENABLE_FRILLS
		1043	if (mwmhints.flags)
		1044	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		1045	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		1046	#endif
		1047
		1048	Atom protocols[] = {
		1049	xa[XA_WM_DELETE_WINDOW],
		1050	#if ENABLE_EWMH
		1051	xa[XA_NET_WM_PING],
		1052	#endif
		1053	};
		1054
		1055	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1056
		1057	#if ENABLE_FRILLS
		1058	if (rs[Rs_transient_for])
		1059	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		1060	#endif
		1061
		1062	#if ENABLE_EWMH
996	long pid = getpid ();	1063	long pid = getpid ();
997		1064
998	XChangeProperty (display->display, TermWin.parent[0],	1065	XChangeProperty (dpy, top,
999	display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,	1066	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000	PropModeReplace, (unsigned char *)&pid, 1);	1067	PropModeReplace, (unsigned char *)&pid, 1);
1001	#endif
1002		1068
1003	XSelectInput (display->display, TermWin.parent[0],	1069	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
		1070	#endif
		1071
		1072	XSelectInput (dpy, top,
1004	KeyPressMask	1073	KeyPressMask
1005	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1074	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1006	\| KeyReleaseMask	1075	\| KeyReleaseMask
1007	#endif	1076	#endif
1008	\| FocusChangeMask \| VisibilityChangeMask	1077	\| FocusChangeMask \| VisibilityChangeMask
1009	\| ExposureMask
1010	\| StructureNotifyMask);	1078	\| ExposureMask \| StructureNotifyMask);
		1079
1011	termwin_ev.start (display, TermWin.parent[0]);	1080	termwin_ev.start (display, top);
1012
1013	#if ENABLE_FRILLS
1014	if (mwmhints.flags)
1015	{
1016	prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1017	XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1018	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1019	}
1020	#endif
1021		1081
1022	/* vt cursor: Black-on-White is standard, but this is more popular */	1082	/* vt cursor: Black-on-White is standard, but this is more popular */
1023	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);	1083	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1024		1084
1025	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1085	#ifdef HAVE_SCROLLBARS
1026	/* cursor (menuBar/scrollBar): Black-on-White */	1086	/* cursor scrollBar: Black-on-White */
1027	leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);	1087	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1028	#endif
1029
1030	#ifdef POINTER_BLANK
1031	{
1032	XColor blackcolour;
1033	blackcolour.red = 0;
1034	blackcolour.green = 0;
1035	blackcolour.blue = 0;
1036	Font f = XLoadFont (display->display, "fixed");
1037	blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1038	&blackcolour, &blackcolour);
1039	XUnloadFont (display->display, f);
1040	}
1041	#endif	1088	#endif
1042		1089
1043	/* the vt window */	1090	/* the vt window */
1044	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],	1091	vt = XCreateSimpleWindow (dpy, top,
1045	window_vt_x,
1046	window_vt_y,	1092	window_vt_x, window_vt_y,
1047	TermWin_TotalWidth (),	1093	width, height,
1048	TermWin_TotalHeight (),
1049	0,	1094	0,
1050	pix_colors_focused[Color_fg],	1095	pix_colors_focused[Color_fg],
1051	pix_colors_focused[Color_bg]);	1096	pix_colors_focused[Color_bg]);
1052	#ifdef DEBUG_X
1053	XStoreName (display->display, TermWin.vt, "vt window");
1054	#endif
1055		1097
1056	attributes.bit_gravity = NorthWestGravity;	1098	attributes.bit_gravity = NorthWestGravity;
1057	XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);	1099	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1058		1100
1059	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1101	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1060		1102
1061	pointer_unblank ();
1062
1063	#ifdef POINTER_BLANK
1064	if (options & Opt_pointerBlank)	1103	if (option (Opt_pointerBlank))
1065	vt_emask \|= PointerMotionMask;	1104	vt_emask \|= PointerMotionMask;
1066	else	1105	else
1067	#endif
1068	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1106	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1069		1107
1070	XSelectInput (display->display, TermWin.vt, vt_emask);	1108	vt_select_input ();
		1109
1071	vt_ev.start (display, TermWin.vt);	1110	vt_ev.start (display, vt);
1072
1073	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1074	if (menuBar_height ())
1075	{
1076	menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1077	window_vt_x, 0,
1078	TermWin_TotalWidth (),
1079	menuBar_TotalHeight (),
1080	0,
1081	pix_colors_focused[Color_fg],
1082	pix_colors_focused[Color_scroll]);
1083
1084	#ifdef DEBUG_X
1085	XStoreName (display->display, menuBar.win, "menubar");
1086	#endif
1087
1088	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1089
1090	XDefineCursor (display->display, menuBar.win,
1091	XCreateFontCursor (display->display, XC_left_ptr));
1092
1093	XSelectInput (display->display, menuBar.win,
1094	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask
1095	\| Button1MotionMask));
1096	menubar_ev.start (display, menuBar.win);
1097	}
1098	#endif
1099
1100	#ifdef XPM_BACKGROUND
1101	if (rs[Rs_backgroundPixmap] != NULL
1102	&& ! (options & Opt_transparent))
1103	{
1104	const char *p = rs[Rs_backgroundPixmap];
1105
1106	if ((p = strchr (p, ';')) != NULL)
1107	{
1108	p++;
1109	scale_pixmap (p);
1110	}
1111
1112	set_bgPixmap (rs[Rs_backgroundPixmap]);
1113	scr_touch (true);
1114	}
1115	#endif
1116		1111
1117	/* graphics context for the vt window */	1112	/* graphics context for the vt window */
1118	gcvalue.foreground = pix_colors[Color_fg];	1113	gcvalue.foreground = pix_colors[Color_fg];
1119	gcvalue.background = pix_colors[Color_bg];	1114	gcvalue.background = pix_colors[Color_bg];
1120	gcvalue.graphics_exposures = 1;	1115	gcvalue.graphics_exposures = 0;
1121	TermWin.gc = XCreateGC (display->display, TermWin.vt,	1116
		1117	gc = XCreateGC (dpy, vt,
1122	GCForeground \| GCBackground \| GCGraphicsExposures,	1118	GCForeground \| GCBackground \| GCGraphicsExposures,
1123	&gcvalue);	1119	&gcvalue);
1124		1120
1125	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1121	drawable = new rxvt_drawable (this, vt);
1126		1122
1127	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1123	#ifdef RXVT_SCROLLBAR
1128	gcvalue.foreground = pix_colors[Color_topShadow];	1124	gcvalue.foreground = pix_colors[Color_topShadow];
1129	topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1125	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130	gcvalue.foreground = pix_colors[Color_bottomShadow];	1126	gcvalue.foreground = pix_colors[Color_bottomShadow];
1131	botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1127	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1132	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1128	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1133	scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1129	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1134	#endif	1130	#endif
1135		1131
1136	#ifdef OFF_FOCUS_FADING	1132	#ifdef OFF_FOCUS_FADING
1137	// initially we are in unfocused state	1133	// initially we are in unfocused state
1138	if (rs[Rs_fade])	1134	if (rs[Rs_fade])
1139	pix_colors = pix_colors_unfocused;	1135	pix_colors = pix_colors_unfocused;
1140	#endif	1136	#endif
1141		1137
		1138	pointer_unblank ();
1142	scr_recolour ();	1139	scr_recolour ();
1143	}	1140	}
1144		1141
1145	/* ------------------------------------------------------------------------- *	1142	/* ------------------------------------------------------------------------- *
1146	* GET TTY CURRENT STATE *	1143	* GET TTY CURRENT STATE *
1147	* ------------------------------------------------------------------------- */	1144	* ------------------------------------------------------------------------- */
1148	void	1145	void
1149	rxvt_get_ttymode (ttymode_t *tio, int erase)	1146	rxvt_get_ttymode (ttymode_t *tio, int erase)
1150	{	1147	{
1151	#ifdef HAVE_TERMIOS_H
1152	/*	1148	/*
1153	* standard System V termios interface	1149	* standard System V termios interface
1154	*/	1150	*/
1155	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1151	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1156	{	1152	{
1157	/* return error - use system defaults */	1153	// return error - use system defaults,
		1154	// where possible, and zero elsewhere
		1155	memset (tio, 0, sizeof (ttymode_t));
		1156
1158	tio->c_cc[VINTR] = CINTR;	1157	tio->c_cc[VINTR] = CINTR;
1159	tio->c_cc[VQUIT] = CQUIT;	1158	tio->c_cc[VQUIT] = CQUIT;
1160	tio->c_cc[VERASE] = CERASE;	1159	tio->c_cc[VERASE] = CERASE;
		1160	#ifdef VERASE2
		1161	tio->c_cc[VERASE2] = CERASE2;
		1162	#endif
1161	tio->c_cc[VKILL] = CKILL;	1163	tio->c_cc[VKILL] = CKILL;
1162	tio->c_cc[VSTART] = CSTART;	1164	tio->c_cc[VSTART] = CSTART;
1163	tio->c_cc[VSTOP] = CSTOP;	1165	tio->c_cc[VSTOP] = CSTOP;
1164	tio->c_cc[VSUSP] = CSUSP;	1166	tio->c_cc[VSUSP] = CSUSP;
1165	# ifdef VDSUSP	1167	# ifdef VDSUSP
1166
1167	tio->c_cc[VDSUSP] = CDSUSP;	1168	tio->c_cc[VDSUSP] = CDSUSP;
1168	# endif	1169	# endif
1169	# ifdef VREPRINT	1170	# ifdef VREPRINT
1170
1171	tio->c_cc[VREPRINT] = CRPRNT;	1171	tio->c_cc[VREPRINT] = CRPRNT;
1172	# endif	1172	# endif
1173	# ifdef VDISCRD	1173	# ifdef VDISCRD
1174
1175	tio->c_cc[VDISCRD] = CFLUSH;	1174	tio->c_cc[VDISCRD] = CFLUSH;
1176	# endif	1175	# endif
1177	# ifdef VWERSE	1176	# ifdef VWERSE
1178
1179	tio->c_cc[VWERSE] = CWERASE;	1177	tio->c_cc[VWERSE] = CWERASE;
1180	# endif	1178	# endif
1181	# ifdef VLNEXT	1179	# ifdef VLNEXT
1182
1183	tio->c_cc[VLNEXT] = CLNEXT;	1180	tio->c_cc[VLNEXT] = CLNEXT;
1184	# endif	1181	# endif
1185
1186	}	1182	}
		1183
1187	tio->c_cc[VEOF] = CEOF;	1184	tio->c_cc[VEOF] = CEOF;
1188	tio->c_cc[VEOL] = VDISABLE;	1185	tio->c_cc[VEOL] = VDISABLE;
1189	# ifdef VEOL2	1186	# ifdef VEOL2
1190
1191	tio->c_cc[VEOL2] = VDISABLE;	1187	tio->c_cc[VEOL2] = VDISABLE;
1192	# endif	1188	# endif
1193	# ifdef VSWTC	1189	# ifdef VSWTC
1194
1195	tio->c_cc[VSWTC] = VDISABLE;	1190	tio->c_cc[VSWTC] = VDISABLE;
1196	# endif	1191	# endif
1197	# ifdef VSWTCH	1192	# ifdef VSWTCH
1198
1199	tio->c_cc[VSWTCH] = VDISABLE;	1193	tio->c_cc[VSWTCH] = VDISABLE;
1200	# endif	1194	# endif
1201	# if VMIN != VEOF	1195	# if VMIN != VEOF
1202
1203	tio->c_cc[VMIN] = 1;	1196	tio->c_cc[VMIN] = 1;
1204	# endif	1197	# endif
1205	# if VTIME != VEOL	1198	# if VTIME != VEOL
1206
1207	tio->c_cc[VTIME] = 0;	1199	tio->c_cc[VTIME] = 0;
1208	# endif	1200	# endif
1209		1201
1210	if (erase != -1)	1202	if (erase != -1)
1211	tio->c_cc[VERASE] = (char)erase;	1203	tio->c_cc[VERASE] = (char)erase;
…		…
1227	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1219	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1228	# if defined (ECHOCTL) && defined (ECHOKE)	1220	# if defined (ECHOCTL) && defined (ECHOKE)
1229	\| ECHOCTL \| ECHOKE	1221	\| ECHOCTL \| ECHOKE
1230	# endif	1222	# endif
1231	\| ECHOE \| ECHOK);	1223	\| ECHOE \| ECHOK);
1232	# else /* HAVE_TERMIOS_H */
1233
1234	/*
1235	* sgtty interface
1236	*/
1237
1238	/* get parameters -- gtty */
1239	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1240	{
1241	tio->sg.sg_erase = CERASE; /* ^H */
1242	tio->sg.sg_kill = CKILL; /* ^U */
1243	}
1244	if (erase != -1)
1245	tio->sg.sg_erase = (char)erase;
1246
1247	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1248
1249	/* get special characters */
1250	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1251	{
1252	tio->tc.t_intrc = CINTR; /* ^C */
1253	tio->tc.t_quitc = CQUIT; /* ^\ */
1254	tio->tc.t_startc = CSTART; /* ^Q */
1255	tio->tc.t_stopc = CSTOP; /* ^S */
1256	tio->tc.t_eofc = CEOF; /* ^D */
1257	tio->tc.t_brkc = -1;
1258	}
1259	/* get local special chars */
1260	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1261	{
1262	tio->lc.t_suspc = CSUSP; /* ^Z */
1263	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1264	tio->lc.t_rprntc = CRPRNT; /* ^R */
1265	tio->lc.t_flushc = CFLUSH; /* ^O */
1266	tio->lc.t_werasc = CWERASE; /* ^W */
1267	tio->lc.t_lnextc = CLNEXT; /* ^V */
1268	}
1269	/* get line discipline */
1270	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1271	# ifdef NTTYDISC
1272
1273	tio->line = NTTYDISC;
1274	# endif /* NTTYDISC */
1275
1276	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1277	#endif /* HAVE_TERMIOS_H */
1278		1224
1279	/*	1225	/*
1280	* Debugging	1226	* Debugging
1281	*/	1227	*/
1282	#ifdef DEBUG_TTYMODE	1228	#ifdef DEBUG_TTYMODE
1283	#ifdef HAVE_TERMIOS_H
1284	/* c_iflag bits */	1229	/* c_iflag bits */
1285	fprintf (stderr, "Input flags\n");	1230	fprintf (stderr, "Input flags\n");
1286		1231
1287	/* cpp token stringize doesn't work on all machines <sigh> */	1232	/* cpp token stringize doesn't work on all machines <sigh> */
1288	# define FOO(flag,name) \	1233	# define FOO(flag,name) \
…		…
1300	FOO (IGNCR, "IGNCR");	1245	FOO (IGNCR, "IGNCR");
1301	FOO (ICRNL, "ICRNL");	1246	FOO (ICRNL, "ICRNL");
1302	FOO (IXON, "IXON");	1247	FOO (IXON, "IXON");
1303	FOO (IXOFF, "IXOFF");	1248	FOO (IXOFF, "IXOFF");
1304	# ifdef IUCLC	1249	# ifdef IUCLC
1305
1306	FOO (IUCLC, "IUCLC");	1250	FOO (IUCLC, "IUCLC");
1307	# endif	1251	# endif
1308	# ifdef IXANY	1252	# ifdef IXANY
1309
1310	FOO (IXANY, "IXANY");	1253	FOO (IXANY, "IXANY");
1311	# endif	1254	# endif
1312	# ifdef IMAXBEL	1255	# ifdef IMAXBEL
1313
1314	FOO (IMAXBEL, "IMAXBEL");	1256	FOO (IMAXBEL, "IMAXBEL");
1315	# endif	1257	# endif
1316		1258
1317	fprintf (stderr, "\n");	1259	fprintf (stderr, "\n");
1318		1260
…		…
1325	FOO (VERASE, "VERASE");	1267	FOO (VERASE, "VERASE");
1326	FOO (VKILL, "VKILL");	1268	FOO (VKILL, "VKILL");
1327	FOO (VEOF, "VEOF");	1269	FOO (VEOF, "VEOF");
1328	FOO (VEOL, "VEOL");	1270	FOO (VEOL, "VEOL");
1329	# ifdef VEOL2	1271	# ifdef VEOL2
1330
1331	FOO (VEOL2, "VEOL2");	1272	FOO (VEOL2, "VEOL2");
1332	# endif	1273	# endif
1333	# ifdef VSWTC	1274	# ifdef VSWTC
1334
1335	FOO (VSWTC, "VSWTC");	1275	FOO (VSWTC, "VSWTC");
1336	# endif	1276	# endif
1337	# ifdef VSWTCH	1277	# ifdef VSWTCH
1338
1339	FOO (VSWTCH, "VSWTCH");	1278	FOO (VSWTCH, "VSWTCH");
1340	# endif	1279	# endif
1341
1342	FOO (VSTART, "VSTART");	1280	FOO (VSTART, "VSTART");
1343	FOO (VSTOP, "VSTOP");	1281	FOO (VSTOP, "VSTOP");
1344	FOO (VSUSP, "VSUSP");	1282	FOO (VSUSP, "VSUSP");
1345	# ifdef VDSUSP	1283	# ifdef VDSUSP
1346
1347	FOO (VDSUSP, "VDSUSP");	1284	FOO (VDSUSP, "VDSUSP");
1348	# endif	1285	# endif
1349	# ifdef VREPRINT	1286	# ifdef VREPRINT
1350
1351	FOO (VREPRINT, "VREPRINT");	1287	FOO (VREPRINT, "VREPRINT");
1352	# endif	1288	# endif
1353	# ifdef VDISCRD	1289	# ifdef VDISCRD
1354
1355	FOO (VDISCRD, "VDISCRD");	1290	FOO (VDISCRD, "VDISCRD");
1356	# endif	1291	# endif
1357	# ifdef VWERSE	1292	# ifdef VWERSE
1358
1359	FOO (VWERSE, "VWERSE");	1293	FOO (VWERSE, "VWERSE");
1360	# endif	1294	# endif
1361	# ifdef VLNEXT	1295	# ifdef VLNEXT
1362
1363	FOO (VLNEXT, "VLNEXT");	1296	FOO (VLNEXT, "VLNEXT");
1364	# endif	1297	# endif
1365		1298
1366	fprintf (stderr, "\n");	1299	fprintf (stderr, "\n");
1367	# undef FOO	1300	# undef FOO
1368	# endif /* HAVE_TERMIOS_H */	1301	#endif /* DEBUG_TTYMODE */
1369	#endif /* DEBUG_TTYMODE */
1370	}	1302	}
1371		1303
1372	/----------------------------------------------------------------------/	1304	/----------------------------------------------------------------------/
1373	/*	1305	/*
1374	* Run the command in a subprocess and return a file descriptor for the	1306	* Run the command in a subprocess and return a file descriptor for the
…		…
1376	* the slave.	1308	* the slave.
1377	*/	1309	*/
1378	void	1310	void
1379	rxvt_term::run_command (const char const argv)	1311	rxvt_term::run_command (const char const argv)
1380	{	1312	{
		1313	#if ENABLE_FRILLS
		1314	if (rs[Rs_pty_fd])
		1315	{
		1316	pty->pty = atoi (rs[Rs_pty_fd]);
		1317
		1318	if (pty->pty >= 0)
		1319	{
		1320	if (getfd_hook)
		1321	pty->pty = (*getfd_hook) (pty->pty);
		1322
		1323	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1324	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1325	}
		1326	}
		1327	else
		1328	#endif
		1329	if (!pty->get ())
		1330	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
		1331
1381	int er;	1332	int er;
1382		1333
1383	if (!pty.get ())
1384	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1385
1386	#ifndef NO_BACKSPACE_KEY	1334	#ifndef NO_BACKSPACE_KEY
1387	if (key_backspace[0] && !key_backspace[1])	1335	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1388	er = key_backspace[0];	1336	er = rs[Rs_backspace_key][0];
1389	else if (strcmp (key_backspace, "DEC") == 0)	1337	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1390	er = '\177'; /* the initial state anyway */	1338	er = '\177'; /* the initial state anyway */
1391	else	1339	else
1392	#endif	1340	#endif
1393	er = -1;	1341	er = -1;
1394		1342
1395	rxvt_get_ttymode (&tio, er);	1343	rxvt_get_ttymode (&tio, er);
		1344	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
		1345	pty->set_utf8_mode (enc_utf8);
1396		1346
1397	/* set initial window size */	1347	/* set initial window size */
1398	tt_winch ();	1348	tt_winch ();
1399		1349
1400	sw_chld.start (SIGCHLD);	1350	#if ENABLE_FRILLS
		1351	if (rs[Rs_pty_fd])
		1352	return;
		1353	#endif
1401		1354
1402	#ifndef __QNX__
1403	/* spin off the command interpreter */	1355	/* spin off the command interpreter */
1404	switch (cmd_pid = fork ())	1356	switch (cmd_pid = fork ())
1405	{	1357	{
1406	case -1:	1358	case -1:
		1359	{
		1360	cmd_pid = 0;
1407	rxvt_fatal ("can't fork, aborting.\n");	1361	rxvt_fatal ("can't fork, aborting.\n");
		1362	}
1408	case 0:	1363	case 0:
1409	init_env ();	1364	init_env ();
1410		1365
1411	if (!pty.make_controlling_tty ())	1366	if (!pty->make_controlling_tty ())
1412	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1367	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1413	else	1368	else
1414	{	1369	{
1415	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1370	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1416	dup2 (pty.tty, STDIN_FILENO);	1371	dup2 (pty->tty, STDIN_FILENO);
1417	dup2 (pty.tty, STDOUT_FILENO);	1372	dup2 (pty->tty, STDOUT_FILENO);
1418	dup2 (pty.tty, STDERR_FILENO);	1373	dup2 (pty->tty, STDERR_FILENO);
1419		1374
1420	// close all our file handles that we do no longer need	1375	// close all our file handles that we do no longer need
1421	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1376	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1422	{	1377	{
1423	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1378	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1424	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1379	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1425	}	1380	}
1426		1381
1427	run_child (argv);	1382	run_child (argv);
1428	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1383	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1429	}	1384	}
1430		1385
1431	_exit (EXIT_FAILURE);	1386	_exit (EXIT_FAILURE);
1432		1387
1433	default:	1388	default:
1434	{	1389	if (!option (Opt_utmpInhibit))
1435	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1390	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1436	int fdstdin;
1437		1391
1438	fdstdin = dup (STDIN_FILENO);	1392	pty->close_tty ();
1439	dup2 (pty.tty, STDIN_FILENO);
1440	#endif
1441		1393
1442	#ifdef UTMP_SUPPORT	1394	child_ev.start (cmd_pid);
1443	privileged_utmp (SAVE);
1444	#endif
1445		1395
1446	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1396	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1447
1448	dup2 (fdstdin, STDIN_FILENO);
1449	close (fdstdin);
1450	#endif
1451	}
1452
1453	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1454	break;	1397	break;
1455	}	1398	}
1456	#else /* __QNX__ uses qnxspawn () */
1457	fchmod (pty.tty, 0622);
1458	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1459	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1460
1461	if (run_child (argv) == -1)
1462	exit (EXIT_FAILURE);
1463	#endif
1464	}	1399	}
1465		1400
1466	/* ------------------------------------------------------------------------- *	1401	/* ------------------------------------------------------------------------- *
1467	* CHILD PROCESS OPERATIONS *	1402	* CHILD PROCESS OPERATIONS *
1468	* ------------------------------------------------------------------------- */	1403	* ------------------------------------------------------------------------- */
…		…
1473	int	1408	int
1474	rxvt_term::run_child (const char const argv)	1409	rxvt_term::run_child (const char const argv)
1475	{	1410	{
1476	char *login;	1411	char *login;
1477		1412
1478	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1479
1480	if (options & Opt_console)	1413	if (option (Opt_console))
		1414	{
1481	{ /* be virtual console, fail silently */	1415	/* be virtual console, fail silently */
1482	#ifdef TIOCCONS	1416	#ifdef TIOCCONS
1483	unsigned int on = 1;	1417	unsigned int on = 1;
1484		1418
1485	ioctl (STDIN_FILENO, TIOCCONS, &on);	1419	ioctl (STDIN_FILENO, TIOCCONS, &on);
1486	#elif defined (SRIOCSREDIR)	1420	#elif defined (SRIOCSREDIR)
…		…
1488		1422
1489	fd = open (CONSOLE, O_WRONLY, 0);	1423	fd = open (CONSOLE, O_WRONLY, 0);
1490	if (fd >= 0)	1424	if (fd >= 0)
1491	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)	1425	if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1492	close (fd);	1426	close (fd);
1493	#endif /* SRIOCSREDIR */	1427	#endif /* SRIOCSREDIR */
1494	}	1428	}
1495		1429
1496	/* reset signals and spin off the command interpreter */	1430	/* reset signals and spin off the command interpreter */
1497	signal (SIGINT, SIG_DFL);	1431	signal (SIGINT, SIG_DFL);
1498	signal (SIGQUIT, SIG_DFL);	1432	signal (SIGQUIT, SIG_DFL);
…		…
1505	*/	1439	*/
1506	#ifdef SIGTSTP	1440	#ifdef SIGTSTP
1507	signal (SIGTSTP, SIG_IGN);	1441	signal (SIGTSTP, SIG_IGN);
1508	signal (SIGTTIN, SIG_IGN);	1442	signal (SIGTTIN, SIG_IGN);
1509	signal (SIGTTOU, SIG_IGN);	1443	signal (SIGTTOU, SIG_IGN);
1510	#endif /* SIGTSTP */	1444	#endif /* SIGTSTP */
1511		1445
1512	// unblock signals (signals are blocked by iom.C	1446	// unblock signals (signals are blocked by iom.C
1513	sigset_t ss;	1447	sigset_t ss;
1514	sigemptyset (&ss);	1448	sigemptyset (&ss);
1515	sigprocmask (SIG_SETMASK, &ss, 0);	1449	sigprocmask (SIG_SETMASK, &ss, 0);
1516		1450
1517	#ifndef __QNX__
1518	/* command interpreter path */	1451	/* command interpreter path */
1519	if (argv != NULL)	1452	if (argv)
1520	{	1453	{
1521	# ifdef DEBUG_CMD	1454	# ifdef DEBUG_CMD
1522	int i;	1455	int i;
1523		1456
1524	for (i = 0; argv[i]; i++)	1457	for (i = 0; argv[i]; i++)
…		…
1528	execvp (argv[0], (char const )argv);	1461	execvp (argv[0], (char const )argv);
1529	/* no error message: STDERR is closed! */	1462	/* no error message: STDERR is closed! */
1530	}	1463	}
1531	else	1464	else
1532	{	1465	{
1533	const char argv0, shell;	1466	const char argv0, shell;
1534		1467
1535	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1468	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1536	shell = "/bin/sh";	1469	shell = "/bin/sh";
1537		1470
1538	argv0 = (const char *)rxvt_r_basename (shell);	1471	argv0 = (const char *)rxvt_basename (shell);
1539		1472
1540	if (options & Opt_loginShell)	1473	if (option (Opt_loginShell))
1541	{	1474	{
1542	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1475	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1543		1476
1544	login[0] = '-';	1477	login[0] = '-';
1545	strcpy (&login[1], argv0);	1478	strcpy (&login[1], argv0);
1546	argv0 = login;	1479	argv0 = login;
1547	}	1480	}
		1481
1548	execlp (shell, argv0, NULL);	1482	execlp (shell, argv0, (char *)0);
1549	/* no error message: STDERR is closed! */	1483	/* no error message: STDERR is closed! */
1550	}	1484	}
1551
1552	#else /* __QNX__ uses qnxspawn () */
1553
1554	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1555	char *command = NULL, fullcommand[_MAX_PATH];
1556	char *arg_v, arg_a[2] = { NULL, NULL };
1557
1558	if (argv != NULL)
1559	{
1560	if (access (argv[0], X_OK) == -1)
1561	{
1562	if (strchr (argv[0], '/') == NULL)
1563	{
1564	searchenv (argv[0], "PATH", fullcommand);
1565
1566	if (fullcommand[0] != '\0')
1567	command = fullcommand;
1568	}
1569
1570	if (access (command, X_OK) == -1)
1571	return -1;
1572	}
1573	else
1574	command = argv[0];
1575
1576	arg_v = argv;
1577	}
1578	else
1579	{
1580	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1581	command = "/bin/sh";
1582
1583	arg_a[0] = my_basename (command);
1584
1585	if (options & Opt_loginShell)
1586	{
1587	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1588
1589	login[0] = '-';
1590	strcpy (&login[1], arg_a[0]);
1591	arg_a[0] = login;
1592	}
1593
1594	arg_v = arg_a;
1595	}
1596
1597	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1598	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1599	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1600	command, arg_v, environ, iov_a, 0);
1601	if (login)
1602	free (login);
1603
1604	pty.close_tty ();
1605	return pty.pty;
1606	#endif
1607		1485
1608	return -1;	1486	return -1;
1609	}	1487	}
1610		1488
1611	/----------------------- end-of-file (C source) -----------------------/	1489	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.94 by root, Mon Nov 29 13:37:20 2004 UTC vs. Revision 1.232 by sasha, Tue Dec 18 15:44:55 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.94 by root, Mon Nov 29 13:37:20 2004 UTC vs.
Revision 1.232 by sasha, Tue Dec 18 15:44:55 2007 UTC