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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 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>	15	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	16	* - QNX support
14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	17	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
38		41
39	#include <limits>	42	#include <limits>
40		43
41	#include <csignal>	44	#include <csignal>
42		45
		46	#ifdef DISPLAY_IS_IP
		47	/* On Solaris link with -lsocket and -lnsl */
		48	#include <sys/types.h>
		49	#include <sys/socket.h>
		50
		51	/* these next two are probably only on Sun (not Solaris) */
		52	#ifdef HAVE_SYS_SOCKIO_H
		53	#include <sys/sockio.h>
		54	#endif
		55	#ifdef HAVE_SYS_BYTEORDER_H
		56	#include <sys/byteorder.h>
		57	#endif
		58
		59	#include <netinet/in.h>
		60	#include <arpa/inet.h>
		61	#include <net/if.h>
		62	#include <net/if_arp.h>
		63
		64	static char *
		65	rxvt_network_display (const char *display)
		66	{
		67	char buffer[1024], *rval = NULL;
		68	struct ifconf ifc;
		69	struct ifreq *ifr;
		70	int i, skfd;
		71
		72	if (display[0] != ':' && strncmp (display, "unix:", 5))
		73	return (char ) display; / nothing to do */
		74
		75	ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
		76	ifc.ifc_buf = buffer;
		77
		78	if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
		79	{
		80	perror ("socket");
		81	return NULL;
		82	}
		83
		84	if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
		85	{
		86	perror ("SIOCGIFCONF");
		87	close (skfd);
		88	return NULL;
		89	}
		90
		91	for (i = 0, ifr = ifc.ifc_req;
		92	i < (ifc.ifc_len / sizeof (struct ifreq));
		93	i++, ifr++)
		94	{
		95	struct ifreq ifr2;
		96
		97	strcpy (ifr2.ifr_name, ifr->ifr_name);
		98
		99	if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
		100	{
		101	unsigned long addr;
		102	struct sockaddr_in *p_addr;
		103
		104	p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
		105	addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
		106
		107	/*
		108	* not "0.0.0.0" or "127.0.0.1" - so format the address
		109	*/
		110	if (addr && addr != 0x7F000001)
		111	{
		112	char *colon = strchr (display, ':');
		113
		114	if (colon == NULL)
		115	colon = ":0.0";
		116
		117	rval = rxvt_malloc (strlen (colon) + 16);
		118	sprintf (rval, "%d.%d.%d.%d%s",
		119	(int) ((addr >> 030) & 0xFF),
		120	(int) ((addr >> 020) & 0xFF),
		121	(int) ((addr >> 010) & 0xFF),
		122	(int) (addr & 0xFF), colon);
		123	break;
		124	}
		125	}
		126	}
		127
		128	close (skfd);
		129
		130	return rval;
		131	}
		132	#endif
		133
43	const char *const def_colorName[] =	134	const char *const def_colorName[] =
44	{	135	{
45	COLOR_FOREGROUND,	136	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	137	COLOR_BACKGROUND,
47	/* low-intensity colors */	138	/* low-intensity colors */
48	"rgb:00/00/00", // 0: black (Black)	139	"rgb:00/00/00", // 0: black (Black)
49	"rgb:cd/00/00", // 1: red (Red3)	140	"rgb:cd/00/00", // 1: red (Red3)
50	"rgb:00/cd/00", // 2: green (Green3)	141	"rgb:00/cd/00", // 2: green (Green3)
51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)	142	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"rgb:00/00/cd", // 4: blue (Blue3)	143	"rgb:00/00/cd", // 4: blue (Blue3)
53	"rgb:cd/00/cd", // 5: magenta (Magenta3)	144	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"rgb:00/cd/cd", // 6: cyan (Cyan3)	145	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	146	# ifdef XTERM_COLORS
56	"rgb:e5/e5/e5", // 7: white (Grey90)	147	"rgb:e5/e5/e5", // 7: white (Grey90)
…		…
166	#endif	257	#endif
167	#ifdef KEEP_SCROLLCOLOR	258	#ifdef KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	259	COLOR_SCROLLBAR,
169	COLOR_SCROLLTROUGH,	260	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	261	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	262	#if ENABLE_TRANSPARENCY
172	NULL,	263	NULL,
173	#endif	264	#endif
174	#if OFF_FOCUS_FADING	265	#if OFF_FOCUS_FADING
175	"rgb:00/00/00",	266	"rgb:00/00/00",
176	#endif	267	#endif
…		…
183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	274	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184	#ifdef OFF_FOCUS_FADING	275	#ifdef OFF_FOCUS_FADING
185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	276	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186	#endif	277	#endif
187		278
188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
189	pixmap = None;
190	#endif
191		279
192	MEvent.time = CurrentTime;	280	MEvent.time = CurrentTime;
193	MEvent.button = AnyButton;	281	MEvent.button = AnyButton;
194	options = DEFAULT_OPTIONS;
195	want_refresh = 1;	282	want_refresh = 1;
196	priv_modes = SavedModes = PrivMode_Default;	283	priv_modes = SavedModes = PrivMode_Default;
197	ncol = 80;	284	ncol = 80;
198	nrow = 24;	285	nrow = 24;
199	int_bwidth = INTERNALBORDERWIDTH;	286	int_bwidth = INTERNALBORDERWIDTH;
200	ext_bwidth = EXTERNALBORDERWIDTH;	287	ext_bwidth = EXTERNALBORDERWIDTH;
201	lineSpace = LINESPACE;	288	lineSpace = LINESPACE;
202	saveLines = SAVELINES;	289	saveLines = SAVELINES;
203	numpix_colors = TOTAL_COLORS;	290	numpix_colors = TOTAL_COLORS;
204		291
205	refresh_limit = 1;
206	refresh_type = SLOW_REFRESH;	292	refresh_type = SLOW_REFRESH;
207		293
208	oldcursor.row = oldcursor.col = -1;	294	oldcursor.row = oldcursor.col = -1;
209	#ifdef XPM_BACKGROUND
210	/* bgPixmap.w = bgPixmap.h = 0; */
211	bgPixmap.x = bgPixmap.y = 50;
212	bgPixmap.pixmap = None;
213	#endif
214
215	last_bot = last_state = -1;	295	last_bot = last_state = -1;
		296
		297	set_option (Opt_scrollBar);
		298	set_option (Opt_scrollTtyOutput);
		299	set_option (Opt_jumpScroll);
		300	set_option (Opt_skipScroll);
		301	set_option (Opt_secondaryScreen);
		302	set_option (Opt_secondaryScroll);
		303	set_option (Opt_pastableTabs);
		304	set_option (Opt_intensityStyles);
		305	set_option (Opt_iso14755_52);
216		306
217	return true;	307	return true;
218	}	308	}
219		309
220	void	310	void
…		…
229	if ((i = open ("/dev/null", O_RDONLY)) < 0)	319	if ((i = open ("/dev/null", O_RDONLY)) < 0)
230	{	320	{
231	/* TODO: BOO HISS */	321	/* TODO: BOO HISS */
232	dup2 (STDERR_FILENO, STDIN_FILENO);	322	dup2 (STDERR_FILENO, STDIN_FILENO);
233	}	323	}
234	else if (i > STDIN_FILENO)	324	else if (i != STDIN_FILENO)
235	{	325	{
236	dup2 (i, STDIN_FILENO);	326	dup2 (i, STDIN_FILENO);
237	close (i);	327	close (i);
238	}	328	}
239		329
…		…
254	/----------------------------------------------------------------------/	344	/----------------------------------------------------------------------/
255	const char **	345	const char **
256	rxvt_term::init_resources (int argc, const char const argv)	346	rxvt_term::init_resources (int argc, const char const argv)
257	{	347	{
258	int i, r_argc;	348	int i, r_argc;
259	char *val;
260	const char cmd_argv, r_argv;	349	const char cmd_argv, r_argv;
261		350
262	/*	351	/*
263	* Look for -exec option. Find => split and make cmd_argv[] of command args	352	* Look for -e option. Find => split and make cmd_argv[] of command args
264	*/	353	*/
265	for (r_argc = 0; r_argc < argc; r_argc++)	354	for (r_argc = 0; r_argc < argc; r_argc++)
266	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	355	if (!strcmp (argv[r_argc], "-e"))
267	break;	356	break;
		357
		358	if (r_argc == argc)
		359	cmd_argv = NULL;
		360	else if (!argv[r_argc + 1])
		361	rxvt_fatal ("-e requires an argument\n");
		362	else
		363	{
		364	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
		365
		366	for (i = 0; i < argc - r_argc - 1; i++)
		367	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
		368
		369	cmd_argv[i] = NULL;
		370	}
268		371
269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	372	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
270		373
271	for (i = 0; i < r_argc; i++)	374	for (i = 0; i < r_argc; i++)
272	r_argv[i] = (const char *)argv[i];	375	r_argv[i] = (const char *)argv[i];
273		376
274	r_argv[i] = NULL;	377	r_argv[i] = NULL;
275		378
276	if (r_argc == argc)
277	cmd_argv = NULL;
278	else
279	{
280	cmd_argv = (const char *)rxvt_malloc (sizeof (char ) * (argc - r_argc));
281
282	for (i = 0; i < argc - r_argc - 1; i++)
283	cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285	cmd_argv[i] = NULL;
286	}
287
288	rs[Rs_name] = rxvt_r_basename (argv[0]);	379	rs[Rs_name] = rxvt_basename (argv[0]);
289		380
290	/*	381	/*
291	* Open display, get options/resources and create the window	382	* Open display, get options/resources and create the window
292	*/	383	*/
293		384
…		…
295	rs[Rs_display_name] = ":0";	386	rs[Rs_display_name] = ":0";
296		387
297	get_options (r_argc, r_argv);	388	get_options (r_argc, r_argv);
298		389
299	if (!(display = displays.get (rs[Rs_display_name])))	390	if (!(display = displays.get (rs[Rs_display_name])))
		391	{
		392	free (r_argv);
300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	393	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		394	}
301		395
		396	// using a local pointer decreases code size a lot
302	xa = display->xa;	397	xa = display->xa;
		398
		399	set (display);
		400	extract_resources ();
303		401
304	#if XFT	402	#if XFT
305	if (rs[Rs_depth])	403	if (rs[Rs_depth])
306	set (display, strtol (rs[Rs_depth], 0, 0));	404	select_visual (strtol (rs[Rs_depth], 0, 0));
307	else
308	#endif	405	#endif
309	set (display);
310		406
311	extract_resources ();	407	#ifdef HAVE_AFTERIMAGE
312		408	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		409	#endif
313	free (r_argv);	410	free (r_argv);
		411
		412	for (int i = NUM_RESOURCES; i--; )
		413	if (rs [i] == resval_undef)
		414	rs [i] = 0;
314		415
315	#if ENABLE_PERL	416	#if ENABLE_PERL
316	if (!rs[Rs_perl_ext_1])	417	if (!rs[Rs_perl_ext_1])
317	rs[Rs_perl_ext_1] = "default";	418	rs[Rs_perl_ext_1] = "default";
318		419
…		…
329	* set any defaults not already set	430	* set any defaults not already set
330	*/	431	*/
331	if (cmd_argv && cmd_argv[0])	432	if (cmd_argv && cmd_argv[0])
332	{	433	{
333	if (!rs[Rs_title])	434	if (!rs[Rs_title])
334	rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);	435	rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335	if (!rs[Rs_iconName])	436	if (!rs[Rs_iconName])
336	rs[Rs_iconName] = rs[Rs_title];	437	rs[Rs_iconName] = rs[Rs_title];
337	}	438	}
338	else	439	else
339	{	440	{
…		…
377	rs[Rs_cutchars] = CUTCHARS;	478	rs[Rs_cutchars] = CUTCHARS;
378		479
379	#ifndef NO_BACKSPACE_KEY	480	#ifndef NO_BACKSPACE_KEY
380	if (!rs[Rs_backspace_key])	481	if (!rs[Rs_backspace_key])
381	# ifdef DEFAULT_BACKSPACE	482	# ifdef DEFAULT_BACKSPACE
382	key_backspace = DEFAULT_BACKSPACE;	483	rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383	# else	484	# else
384	key_backspace = "DEC"; /* can toggle between \010 or \177 */	485	rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385	# endif	486	# endif
386	else
387	{
388	val = strdup (rs[Rs_backspace_key]);
389	rxvt_Str_trim (val);
390	rxvt_Str_escaped (val);
391	key_backspace = val;
392	}
393	#endif	487	#endif
394		488
395	#ifndef NO_DELETE_KEY	489	#ifndef NO_DELETE_KEY
396	if (!rs[Rs_delete_key])	490	if (!rs[Rs_delete_key])
397	# ifdef DEFAULT_DELETE	491	# ifdef DEFAULT_DELETE
398	key_delete = DEFAULT_DELETE;	492	rs[Rs_delete_key] = DEFAULT_DELETE;
399	# else	493	# else
400	key_delete = "\033[3~";	494	rs[Rs_delete_key] = "\033[3~";
401	# endif
402	else
403	{
404	val = strdup (rs[Rs_delete_key]);
405	rxvt_Str_trim (val);
406	rxvt_Str_escaped (val);
407	key_delete = val;
408	}
409	#endif	495	# endif
410	if (rs[Rs_answerbackstring])	496	#endif
411	{
412	rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413	rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414	}
415		497
416	#ifdef HAVE_SCROLLBARS	498	#ifdef HAVE_SCROLLBARS
417	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	499	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418	#endif	500	#endif
419		501
420	#ifdef XTERM_REVERSE_VIDEO	502	#ifdef XTERM_REVERSE_VIDEO
421	/* this is how xterm implements reverseVideo */	503	/* this is how xterm implements reverseVideo */
422	if (OPTION (Opt_reverseVideo))	504	if (option (Opt_reverseVideo))
423	{	505	{
424	if (!rs[Rs_color + Color_fg])	506	if (!rs[Rs_color + Color_fg])
425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	507	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		508
426	if (!rs[Rs_color + Color_bg])	509	if (!rs[Rs_color + Color_bg])
427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	510	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428	}	511	}
429	#endif	512	#endif
430		513
…		…
432	if (!rs[Rs_color + i])	515	if (!rs[Rs_color + i])
433	rs[Rs_color + i] = def_colorName[i];	516	rs[Rs_color + i] = def_colorName[i];
434		517
435	#ifndef XTERM_REVERSE_VIDEO	518	#ifndef XTERM_REVERSE_VIDEO
436	/* this is how we implement reverseVideo */	519	/* this is how we implement reverseVideo */
437	if (OPTION (Opt_reverseVideo))	520	if (option (Opt_reverseVideo))
438	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	521	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439	#endif	522	#endif
440		523
441	/* convenient aliases for setting fg/bg to colors */	524	/* convenient aliases for setting fg/bg to colors */
442	color_aliases (Color_fg);	525	color_aliases (Color_fg);
…		…
463	/----------------------------------------------------------------------/	546	/----------------------------------------------------------------------/
464	void	547	void
465	rxvt_term::init_env ()	548	rxvt_term::init_env ()
466	{	549	{
467	int i;	550	int i;
468	unsigned int u;
469	char *val;	551	char *val;
470		552
471	#ifdef DISPLAY_IS_IP	553	#ifdef DISPLAY_IS_IP
472	/* Fixup display_name for export over pty to any interested terminal	554	/* Fixup display_name for export over pty to any interested terminal
473	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number	555	* clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
…		…
482	val = rxvt_network_display (rs[Rs_display_name]);	564	val = rxvt_network_display (rs[Rs_display_name]);
483	rs[Rs_display_name] = (const char *)val;	565	rs[Rs_display_name] = (const char *)val;
484		566
485	if (val == NULL)	567	if (val == NULL)
486	#endif /* DISPLAY_IS_IP */	568	#endif /* DISPLAY_IS_IP */
487	val = XDisplayString (xdisp);	569	val = XDisplayString (dpy);
488		570
489	if (rs[Rs_display_name] == NULL)	571	if (rs[Rs_display_name] == NULL)
490	rs[Rs_display_name] = val; /* use broken `:0' value */	572	rs[Rs_display_name] = val; /* use broken `:0' value */
491		573
492	i = strlen (val);	574	i = strlen (val);
493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	575	env_display = (char *)rxvt_malloc (i + 9);
494		576
495	sprintf (env_display, "DISPLAY=%s", val);	577	sprintf (env_display, "DISPLAY=%s", val);
496		578
497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);	579	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498		580
…		…
519	else	601	else
520	putenv ("COLORTERM=" COLORTERMENVFULL);	602	putenv ("COLORTERM=" COLORTERMENVFULL);
521		603
522	if (rs[Rs_term_name] != NULL)	604	if (rs[Rs_term_name] != NULL)
523	{	605	{
524	env_term = (char )rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) sizeof (char));	606	env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);	607	sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526	putenv (env_term);	608	putenv (env_term);
527	}	609	}
528	else	610	else
529	putenv ("TERM=" TERMENV);	611	putenv ("TERM=" TERMENV);
…		…
616	* Initialize the command connection.	698	* Initialize the command connection.
617	* This should be called after the X server connection is established.	699	* This should be called after the X server connection is established.
618	*/	700	*/
619		701
620	#ifdef META8_OPTION	702	#ifdef META8_OPTION
621	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	703	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622	#endif	704	#endif
623		705
624	get_ourmods ();	706	get_ourmods ();
625		707
626	if (!OPTION (Opt_scrollTtyOutput))	708	if (!option (Opt_scrollTtyOutput))
627	priv_modes \|= PrivMode_TtyOutputInh;	709	priv_modes \|= PrivMode_TtyOutputInh;
628	if (OPTION (Opt_scrollTtyKeypress))	710	if (option (Opt_scrollTtyKeypress))
629	priv_modes \|= PrivMode_Keypress;	711	priv_modes \|= PrivMode_Keypress;
630	if (!OPTION (Opt_jumpScroll))	712	if (!option (Opt_jumpScroll))
631	priv_modes \|= PrivMode_smoothScroll;	713	priv_modes \|= PrivMode_smoothScroll;
632		714
633	#ifndef NO_BACKSPACE_KEY	715	#ifndef NO_BACKSPACE_KEY
634	if (strcmp (key_backspace, "DEC") == 0)	716	if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635	priv_modes \|= PrivMode_HaveBackSpace;	717	priv_modes \|= PrivMode_HaveBackSpace;
636	#endif	718	#endif
637		719
638	/* add value for scrollBar */	720	/* add value for scrollBar */
639	if (scrollBar.state)	721	if (scrollBar.state)
…		…
665	rxvt_color xcol;	747	rxvt_color xcol;
666		748
667	if (!set_color (xcol, name))	749	if (!set_color (xcol, name))
668	{	750	{
669	#ifndef XTERM_REVERSE_VIDEO	751	#ifndef XTERM_REVERSE_VIDEO
670	if (i < 2 && OPTION (Opt_reverseVideo))	752	if (i < 2 && option (Opt_reverseVideo))
671	name = def_colorName [1 - i];	753	name = def_colorName [1 - i];
672	else	754	else
673	#endif	755	#endif
674	name = def_colorName [i];	756	name = def_colorName [i];
675		757
…		…
688	#ifndef NO_CURSORCOLOR	770	#ifndef NO_CURSORCOLOR
689	case Color_cursor2:	771	case Color_cursor2:
690	#endif	772	#endif
691	case Color_pointer_fg:	773	case Color_pointer_fg:
692	name = rs[Rs_color + Color_fg];	774	name = rs[Rs_color + Color_fg];
693	xcol = pix_colors[Color_fg];	775	xcol.set (this, name);
694	break;	776	break;
695	default:	777	default:
696	name = rs[Rs_color + Color_bg];	778	name = rs[Rs_color + Color_bg];
697	xcol = pix_colors[Color_bg];	779	xcol.set (this, name);
698	break;	780	break;
699	}	781	}
700	}	782	}
701	}	783	}
702		784
703	pix_colors[i] = xcol;	785	pix_colors[i] = xcol;
704	rs[Rs_color + i] = name;	786	rs[Rs_color + i] = name;
705	}	787	}
706		788
707	#ifdef OFF_FOCUS_FADING
708	if (rs[Rs_fade])
709	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
710	{
711	rgba c;
712	pix_colors[Color_fade].get (this, c);
713	pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
714	}
715	#endif
716
717	if (depth <= 2)	789	if (depth <= 2)
718	{	790	{
719	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	791	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
720	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	792	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
721	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	793	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
722	}	794	}
723		795
724	/*	796	/*
725	* get scrollBar shadow colors	797	* get scrollBar shadow colors
726	*	798	*
727	* The calculations of topShadow/bottomShadow values are adapted	799	* The calculations of topShadow/bottomShadow values are adapted
728	* from the fvwm window manager.	800	* from the fvwm window manager.
729	*/	801	*/
730	#ifdef KEEP_SCROLLCOLOR	802	#ifdef KEEP_SCROLLCOLOR
731
732	if (depth <= 2)	803	if (depth <= 2)
733	{	804	{
734	/* Monochrome */	805	/* Monochrome */
735	pix_colors[Color_scroll] = pix_colors[Color_fg];	806	alias_color (Color_scroll, Color_fg);
736	pix_colors[Color_topShadow] = pix_colors[Color_bg];	807	alias_color (Color_topShadow, Color_bg);
737	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	808	alias_color (Color_bottomShadow, Color_bg);
738	}	809	}
739	else	810	else
740	{	811	{
741	rxvt_color xcol[2];	812	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
742	/* xcol[0] == white
743	* xcol[1] == top shadow
744	* xcol[2] == bot shadow */
745		813
746	xcol[1] = pix_colors[Color_scroll];
747	xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
748
749	rgba c0, c1;	814	rgba cscroll;
750		815	pix_colors [Color_scroll].get (cscroll);
751	xcol[0].get (this, c0);
752	xcol[1].get (this, c1);
753
754	xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
755		816
756	/* topShadowColor */	817	/* topShadowColor */
757	if (!xcol[1].set (this,	818	if (!pix_colors[Color_topShadow].set (this,
758	rgba (	819	rgba (
759	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),	820	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
760	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),	821	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
761	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),	822	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
762	c1.a) // pa1 vs. pa0: arbitrary	823	cscroll.a)
763	));	824	))
764	xcol[1] = pix_colors[Color_White];	825	alias_color (Color_topShadow, Color_White);
765
766	pix_colors[Color_topShadow] = xcol[1];
767	}	826	}
768	#endif /* KEEP_SCROLLCOLOR */	827	#endif /* KEEP_SCROLLCOLOR */
		828
		829	#ifdef OFF_FOCUS_FADING
		830	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		831	update_fade_color (i);
		832	#endif
769	}	833	}
770		834
771	/----------------------------------------------------------------------/	835	/----------------------------------------------------------------------/
772	/* color aliases, fg/bg bright-bold */	836	/* color aliases, fg/bg bright-bold */
773	void	837	void
…		…
812		876
813	if (rsmod	877	if (rsmod
814	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	878	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
815	requestedmeta = rsmod[3] - '0';	879	requestedmeta = rsmod[3] - '0';
816		880
817	map = XGetModifierMapping (xdisp);	881	map = XGetModifierMapping (dpy);
818	kc = map->modifiermap;	882	kc = map->modifiermap;
819		883
820	for (i = 1; i < 6; i++)	884	for (i = 1; i < 6; i++)
821	{	885	{
822	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	886	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
824	for (j = map->max_keypermod; j--; k++)	888	for (j = map->max_keypermod; j--; k++)
825	{	889	{
826	if (kc[k] == 0)	890	if (kc[k] == 0)
827	break;	891	break;
828		892
829	switch (XKeycodeToKeysym (xdisp, kc[k], 0))	893	switch (XKeycodeToKeysym (dpy, kc[k], 0))
830	{	894	{
831	case XK_Num_Lock:	895	case XK_Num_Lock:
832	ModNumLockMask = modmasks[i - 1];	896	ModNumLockMask = modmasks[i - 1];
833	continue;	897	continue;
834		898
…		…
884	rxvt_term::create_windows (int argc, const char const argv)	948	rxvt_term::create_windows (int argc, const char const argv)
885	{	949	{
886	XClassHint classHint;	950	XClassHint classHint;
887	XWMHints wmHint;	951	XWMHints wmHint;
888	#if ENABLE_FRILLS	952	#if ENABLE_FRILLS
889	MWMHints mwmhints;	953	MWMHints mwmhints = { };
890	#endif	954	#endif
891	XGCValues gcvalue;	955	XGCValues gcvalue;
892	XSetWindowAttributes attributes;	956	XSetWindowAttributes attributes;
893	Window top, parent;	957	Window top, parent;
894		958
895	dLocal (Display *, xdisp);	959	dLocal (Display *, dpy);
896		960
897	/* grab colors before netscape does */	961	/* grab colors before netscape does */
898	Get_Colours ();	962	Get_Colours ();
899		963
900	if (!set_fonts ())	964	if (!set_fonts ())
901	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	965	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
902		966
903	parent = display->root;	967	parent = display->root;
904		968
905	attributes.override_redirect = !!OPTION (Opt_override_redirect);	969	attributes.override_redirect = !!option (Opt_override_redirect);
906		970
907	#if ENABLE_FRILLS	971	#if ENABLE_FRILLS
908	if (OPTION (Opt_borderLess))	972	if (option (Opt_borderLess))
909	{	973	{
910	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)	974	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911	{	975	{
912	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	976	// rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913	attributes.override_redirect = true;	977	attributes.override_redirect = true;
914	mwmhints.flags = 0;
915	}	978	}
916	else	979	else
917	{	980	{
918	mwmhints.flags = MWM_HINTS_DECORATIONS;	981	mwmhints.flags = MWM_HINTS_DECORATIONS;
919	mwmhints.decorations = 0;
920	}	982	}
921	}	983	}
922	else
923	mwmhints.flags = 0;
924	#endif	984	#endif
925		985
926	#if ENABLE_XEMBED	986	#if ENABLE_XEMBED
927	if (rs[Rs_embed])	987	if (rs[Rs_embed])
928	{	988	{
929	XWindowAttributes wattr;	989	XWindowAttributes wattr;
930		990
931	parent = strtol (rs[Rs_embed], 0, 0);	991	parent = strtol (rs[Rs_embed], 0, 0);
932		992
933	if (!XGetWindowAttributes (xdisp, parent, &wattr))	993	if (!XGetWindowAttributes (dpy, parent, &wattr))
934	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	994	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
935		995
936	window_calc (wattr.width, wattr.height);	996	window_calc (wattr.width, wattr.height);
937	}	997	}
938	#endif	998	#endif
…		…
942	/* sub-window placement & size in rxvt_resize_subwindows () */	1002	/* sub-window placement & size in rxvt_resize_subwindows () */
943	attributes.background_pixel = pix_colors_focused [Color_border];	1003	attributes.background_pixel = pix_colors_focused [Color_border];
944	attributes.border_pixel = pix_colors_focused [Color_border];	1004	attributes.border_pixel = pix_colors_focused [Color_border];
945	attributes.colormap = cmap;	1005	attributes.colormap = cmap;
946		1006
947	top = XCreateWindow (xdisp, parent,	1007	top = XCreateWindow (dpy, parent,
948	szHint.x, szHint.y,	1008	szHint.x, szHint.y,
949	szHint.width, szHint.height,	1009	szHint.width, szHint.height,
950	ext_bwidth,	1010	ext_bwidth,
951	depth, InputOutput, visual,	1011	depth, InputOutput, visual,
952	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	1012	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
…		…
963	classHint.res_name = (char *)rs[Rs_name];	1023	classHint.res_name = (char *)rs[Rs_name];
964	classHint.res_class = (char *)RESCLASS;	1024	classHint.res_class = (char *)RESCLASS;
965		1025
966	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1026	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
967	wmHint.input = True;	1027	wmHint.input = True;
968	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	1028	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
969	wmHint.window_group = top;	1029	wmHint.window_group = top;
970		1030
971	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,	1031	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972	&szHint, &wmHint, &classHint);	1032	&szHint, &wmHint, &classHint);
973		1033
974	#if ENABLE_FRILLS	1034	#if ENABLE_FRILLS
975	if (mwmhints.flags)	1035	if (mwmhints.flags)
976	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1036	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
977	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);	1037	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
978	#endif	1038	#endif
979		1039
980	Atom protocols[] = {	1040	Atom protocols[] = {
981	xa[XA_WM_DELETE_WINDOW],	1041	xa[XA_WM_DELETE_WINDOW],
982	#if ENABLE_EWMH	1042	#if ENABLE_EWMH
983	xa[XA_NET_WM_PING],	1043	xa[XA_NET_WM_PING],
984	#endif	1044	#endif
985	};	1045	};
986		1046
987	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1047	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
988		1048
989	#if ENABLE_FRILLS	1049	#if ENABLE_FRILLS
990	if (rs[Rs_transient_for])	1050	if (rs[Rs_transient_for])
991	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	1051	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
992	#endif	1052	#endif
993		1053
994	#if ENABLE_EWMH	1054	#if ENABLE_EWMH
995	long pid = getpid ();	1055	long pid = getpid ();
996		1056
997	XChangeProperty (xdisp, top,	1057	XChangeProperty (dpy, top,
998	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1058	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
999	PropModeReplace, (unsigned char *)&pid, 1);	1059	PropModeReplace, (unsigned char *)&pid, 1);
1000		1060
1001	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1061	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1002	#endif	1062	#endif
1003		1063
1004	XSelectInput (xdisp, top,	1064	XSelectInput (dpy, top,
1005	KeyPressMask	1065	KeyPressMask
1006	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1066	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1007	\| KeyReleaseMask	1067	\| KeyReleaseMask
1008	#endif	1068	#endif
1009	\| FocusChangeMask \| VisibilityChangeMask	1069	\| FocusChangeMask \| VisibilityChangeMask
1010	\| ExposureMask \| StructureNotifyMask);	1070	\| ExposureMask \| StructureNotifyMask);
1011		1071
1012	termwin_ev.start (display, top);	1072	termwin_ev.start (display, top);
1013		1073
1014	/* vt cursor: Black-on-White is standard, but this is more popular */	1074	/* vt cursor: Black-on-White is standard, but this is more popular */
1015	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);	1075	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016		1076
1017	#ifdef HAVE_SCROLLBARS	1077	#ifdef HAVE_SCROLLBARS
1018	/* cursor scrollBar: Black-on-White */	1078	/* cursor scrollBar: Black-on-White */
1019	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);	1079	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1020	#endif	1080	#endif
1021		1081
1022	/* the vt window */	1082	/* the vt window */
1023	vt = XCreateSimpleWindow (xdisp, top,	1083	vt = XCreateSimpleWindow (dpy, top,
1024	window_vt_x, window_vt_y,	1084	window_vt_x, window_vt_y,
1025	width, height,	1085	width, height,
1026	0,	1086	0,
1027	pix_colors_focused[Color_fg],	1087	pix_colors_focused[Color_fg],
1028	pix_colors_focused[Color_bg]);	1088	pix_colors_focused[Color_bg]);
1029		1089
1030	attributes.bit_gravity = NorthWestGravity;	1090	attributes.bit_gravity = NorthWestGravity;
1031	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);	1091	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1032		1092
1033	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1093	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1034		1094
1035	if (OPTION (Opt_pointerBlank))	1095	if (option (Opt_pointerBlank))
1036	vt_emask \|= PointerMotionMask;	1096	vt_emask \|= PointerMotionMask;
1037	else	1097	else
1038	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1098	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1039		1099
1040	vt_select_input ();	1100	vt_select_input ();
1041		1101
1042	vt_ev.start (display, vt);	1102	vt_ev.start (display, vt);
1043		1103
1044	#ifdef XPM_BACKGROUND
1045	if (rs[Rs_backgroundPixmap] != NULL
1046	&& !OPTION (Opt_transparent))
1047	{
1048	const char *p = rs[Rs_backgroundPixmap];
1049
1050	if ((p = strchr (p, ';')) != NULL)
1051	{
1052	p++;
1053	scale_pixmap (p);
1054	}
1055
1056	set_bgPixmap (rs[Rs_backgroundPixmap]);
1057	scr_touch (true);
1058	}
1059	#endif
1060
1061	/* graphics context for the vt window */	1104	/* graphics context for the vt window */
1062	gcvalue.foreground = pix_colors[Color_fg];	1105	gcvalue.foreground = pix_colors[Color_fg];
1063	gcvalue.background = pix_colors[Color_bg];	1106	gcvalue.background = pix_colors[Color_bg];
1064	gcvalue.graphics_exposures = 1;	1107	gcvalue.graphics_exposures = 0;
1065		1108
1066	gc = XCreateGC (xdisp, vt,	1109	gc = XCreateGC (dpy, vt,
1067	GCForeground \| GCBackground \| GCGraphicsExposures,	1110	GCForeground \| GCBackground \| GCGraphicsExposures,
1068	&gcvalue);	1111	&gcvalue);
1069		1112
1070	drawable = new rxvt_drawable (this, vt);	1113	drawable = new rxvt_drawable (this, vt);
1071		1114
1072	#ifdef RXVT_SCROLLBAR	1115	#ifdef RXVT_SCROLLBAR
1073	gcvalue.foreground = pix_colors[Color_topShadow];	1116	gcvalue.foreground = pix_colors[Color_topShadow];
1074	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1117	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075	gcvalue.foreground = pix_colors[Color_bottomShadow];	1118	gcvalue.foreground = pix_colors[Color_bottomShadow];
1076	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1119	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];	1120	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1078	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);	1121	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079	#endif	1122	#endif
1080		1123
1081	#ifdef OFF_FOCUS_FADING	1124	#ifdef OFF_FOCUS_FADING
1082	// initially we are in unfocused state	1125	// initially we are in unfocused state
1083	if (rs[Rs_fade])	1126	if (rs[Rs_fade])
…		…
1092	* GET TTY CURRENT STATE *	1135	* GET TTY CURRENT STATE *
1093	* ------------------------------------------------------------------------- */	1136	* ------------------------------------------------------------------------- */
1094	void	1137	void
1095	rxvt_get_ttymode (ttymode_t *tio, int erase)	1138	rxvt_get_ttymode (ttymode_t *tio, int erase)
1096	{	1139	{
1097	#ifdef HAVE_TERMIOS_H
1098	/*	1140	/*
1099	* standard System V termios interface	1141	* standard System V termios interface
1100	*/	1142	*/
1101	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1143	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1102	{	1144	{
…		…
1169	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1211	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1170	# if defined (ECHOCTL) && defined (ECHOKE)	1212	# if defined (ECHOCTL) && defined (ECHOKE)
1171	\| ECHOCTL \| ECHOKE	1213	\| ECHOCTL \| ECHOKE
1172	# endif	1214	# endif
1173	\| ECHOE \| ECHOK);	1215	\| ECHOE \| ECHOK);
1174	# else /* HAVE_TERMIOS_H */
1175
1176	/*
1177	* sgtty interface
1178	*/
1179
1180	/* get parameters -- gtty */
1181	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1182	{
1183	tio->sg.sg_erase = CERASE; /* ^H */
1184	tio->sg.sg_kill = CKILL; /* ^U */
1185	}
1186
1187	if (erase != -1)
1188	tio->sg.sg_erase = (char)erase;
1189
1190	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1191
1192	/* get special characters */
1193	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1194	{
1195	tio->tc.t_intrc = CINTR; /* ^C */
1196	tio->tc.t_quitc = CQUIT; /* ^\ */
1197	tio->tc.t_startc = CSTART; /* ^Q */
1198	tio->tc.t_stopc = CSTOP; /* ^S */
1199	tio->tc.t_eofc = CEOF; /* ^D */
1200	tio->tc.t_brkc = -1;
1201	}
1202
1203	/* get local special chars */
1204	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1205	{
1206	tio->lc.t_suspc = CSUSP; /* ^Z */
1207	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1208	tio->lc.t_rprntc = CRPRNT; /* ^R */
1209	tio->lc.t_flushc = CFLUSH; /* ^O */
1210	tio->lc.t_werasc = CWERASE; /* ^W */
1211	tio->lc.t_lnextc = CLNEXT; /* ^V */
1212	}
1213	/* get line discipline */
1214	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1215	# ifdef NTTYDISC
1216	tio->line = NTTYDISC;
1217	# endif /* NTTYDISC */
1218
1219	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1220	#endif /* HAVE_TERMIOS_H */
1221		1216
1222	/*	1217	/*
1223	* Debugging	1218	* Debugging
1224	*/	1219	*/
1225	#ifdef DEBUG_TTYMODE	1220	#ifdef DEBUG_TTYMODE
…		…
1326	else	1321	else
1327	#endif	1322	#endif
1328	if (!pty->get ())	1323	if (!pty->get ())
1329	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1324	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1330		1325
		1326	int er;
		1327
		1328	#ifndef NO_BACKSPACE_KEY
		1329	if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
		1330	er = rs[Rs_backspace_key][0];
		1331	else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
		1332	er = '\177'; /* the initial state anyway */
		1333	else
		1334	#endif
		1335	er = -1;
		1336
		1337	rxvt_get_ttymode (&tio, er);
		1338	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1331	pty->set_utf8_mode (enc_utf8);	1339	pty->set_utf8_mode (enc_utf8);
1332		1340
1333	/* set initial window size */	1341	/* set initial window size */
1334	tt_winch ();	1342	tt_winch ();
1335
1336	int er;
1337
1338	#ifndef NO_BACKSPACE_KEY
1339	if (key_backspace[0] && !key_backspace[1])
1340	er = key_backspace[0];
1341	else if (strcmp (key_backspace, "DEC") == 0)
1342	er = '\177'; /* the initial state anyway */
1343	else
1344	#endif
1345	er = -1;
1346
1347	rxvt_get_ttymode (&tio, er);
1348		1343
1349	#if ENABLE_FRILLS	1344	#if ENABLE_FRILLS
1350	if (rs[Rs_pty_fd])	1345	if (rs[Rs_pty_fd])
1351	return;	1346	return;
1352	#endif	1347	#endif
…		…
1383	}	1378	}
1384		1379
1385	_exit (EXIT_FAILURE);	1380	_exit (EXIT_FAILURE);
1386		1381
1387	default:	1382	default:
1388	if (!OPTION (Opt_utmpInhibit))	1383	if (!option (Opt_utmpInhibit))
1389	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1384	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1390		1385
1391	pty->close_tty ();	1386	pty->close_tty ();
1392		1387
1393	child_ev.start (cmd_pid);	1388	child_ev.start (cmd_pid);
1394		1389
…		…
1407	int	1402	int
1408	rxvt_term::run_child (const char const argv)	1403	rxvt_term::run_child (const char const argv)
1409	{	1404	{
1410	char *login;	1405	char *login;
1411		1406
1412	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1413
1414	if (OPTION (Opt_console))	1407	if (option (Opt_console))
1415	{ /* be virtual console, fail silently */	1408	{ /* be virtual console, fail silently */
1416	#ifdef TIOCCONS	1409	#ifdef TIOCCONS
1417	unsigned int on = 1;	1410	unsigned int on = 1;
1418		1411
1419	ioctl (STDIN_FILENO, TIOCCONS, &on);	1412	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1447	sigset_t ss;	1440	sigset_t ss;
1448	sigemptyset (&ss);	1441	sigemptyset (&ss);
1449	sigprocmask (SIG_SETMASK, &ss, 0);	1442	sigprocmask (SIG_SETMASK, &ss, 0);
1450		1443
1451	/* command interpreter path */	1444	/* command interpreter path */
1452	if (argv != NULL)	1445	if (argv)
1453	{	1446	{
1454	# ifdef DEBUG_CMD	1447	# ifdef DEBUG_CMD
1455	int i;	1448	int i;
1456		1449
1457	for (i = 0; argv[i]; i++)	1450	for (i = 0; argv[i]; i++)
…		…
1466	const char argv0, shell;	1459	const char argv0, shell;
1467		1460
1468	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1461	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1469	shell = "/bin/sh";	1462	shell = "/bin/sh";
1470		1463
1471	argv0 = (const char *)rxvt_r_basename (shell);	1464	argv0 = (const char *)rxvt_basename (shell);
1472		1465
1473	if (OPTION (Opt_loginShell))	1466	if (option (Opt_loginShell))
1474	{	1467	{
1475	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1468	login = (char *)rxvt_malloc (strlen (argv0) + 2);
1476		1469
1477	login[0] = '-';	1470	login[0] = '-';
1478	strcpy (&login[1], argv0);	1471	strcpy (&login[1], argv0);
1479	argv0 = login;	1472	argv0 = login;
1480	}	1473	}
1481		1474
1482	execlp (shell, argv0, NULL);	1475	execlp (shell, argv0, (char *)0);
1483	/* no error message: STDERR is closed! */	1476	/* no error message: STDERR is closed! */
1484	}	1477	}
1485		1478
1486	return -1;	1479	return -1;
1487	}	1480	}

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs. Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC