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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC

…		…
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	11	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>	12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	13	* - QNX support
14	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15	*	15	*
16	* This program is free software; you can redistribute it and/or modify	16	* 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	17	* 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	18	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	19	* (at your option) any later version.
…		…
34	#include "../config.h" /* NECESSARY */	34	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	35	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	36	#include "rxvtutil.h"
37	#include "init.h"	37	#include "init.h"
38		38
		39	#include <limits>
		40
39	#include <csignal>	41	#include <csignal>
40		42
41	const char *const def_colorName[] =	43	const char *const def_colorName[] =
42	{	44	{
43	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
44	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
45	/* low-intensity colors */	47	/* low-intensity colors */
46	"Black", /* 0: black (#000000) */	48	"Black", /* 0: black (#000000) */
47	#ifndef NO_BRIGHTCOLOR
48	"Red3", /* 1: red (#CD0000) */	49	"Red3", /* 1: red (#CD0000) */
49	"Green3", /* 2: green (#00CD00) */	50	"Green3", /* 2: green (#00CD00) */
50	"Yellow3", /* 3: yellow (#CDCD00) */	51	"Yellow3", /* 3: yellow (#CDCD00) */
51	"Blue3", /* 4: blue (#0000CD) */	52	"Blue3", /* 4: blue (#0000CD) */
52	"Magenta3", /* 5: magenta (#CD00CD) */	53	"Magenta3", /* 5: magenta (#CD00CD) */
…		…
60	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
61	"Grey30", /* 8: bright black (#4D4D4D) */	62	"Grey30", /* 8: bright black (#4D4D4D) */
62	# else	63	# else
63	"Grey25", /* 8: bright black (#404040) */	64	"Grey25", /* 8: bright black (#404040) */
64	# endif	65	# endif
65	#endif /* NO_BRIGHTCOLOR */
66	"Red", /* 1/9: bright red (#FF0000) */	66	"Red", /* 1/9: bright red (#FF0000) */
67	"Green", /* 2/10: bright green (#00FF00) */	67	"Green", /* 2/10: bright green (#00FF00) */
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"Yellow", /* 3/11: bright yellow (#FFFF00) */
69	"Blue", /* 4/12: bright blue (#0000FF) */	69	"Blue", /* 4/12: bright blue (#0000FF) */
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"Magenta", /* 5/13: bright magenta (#FF00FF) */
…		…
203	#endif	203	#endif
204	#ifdef TRANSPARENT	204	#ifdef TRANSPARENT
205	"_XROOTPMAP_ID",	205	"_XROOTPMAP_ID",
206	"ESETROOT_PMAP_ID",	206	"ESETROOT_PMAP_ID",
207	#endif	207	#endif
208	#ifdef OFFIX_DND
209	"DndProtocol",
210	"DndSelection",
211	#endif
212	#if ENABLE_XEMBED	208	#if ENABLE_XEMBED
213	"_XEMBED",	209	"_XEMBED",
214	"_XEMBED_INFO",	210	"_XEMBED_INFO",
215	#endif	211	#endif
216	};	212	};
…		…
226		222
227	if (pix_colors == NULL)	223	if (pix_colors == NULL)
228	return false;	224	return false;
229		225
230	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	226	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
231	TermWin.pixmap = None;	227	pixmap = None;
232	#endif	228	#endif
233		229
234	MEvent.time = CurrentTime;	230	MEvent.time = CurrentTime;
235	MEvent.button = AnyButton;	231	MEvent.button = AnyButton;
236	options = DEFAULT_OPTIONS;	232	options = DEFAULT_OPTIONS;
237	want_refresh = 1;	233	want_refresh = 1;
238	priv_modes = SavedModes = PrivMode_Default;	234	priv_modes = SavedModes = PrivMode_Default;
239	TermWin.focus = 0;	235	focus = 0;
240	TermWin.ncol = 80;	236	ncol = 80;
241	TermWin.nrow = 24;	237	nrow = 24;
242	TermWin.int_bwidth = INTERNALBORDERWIDTH;	238	int_bwidth = INTERNALBORDERWIDTH;
243	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	239	ext_bwidth = EXTERNALBORDERWIDTH;
244	TermWin.lineSpace = LINESPACE;	240	lineSpace = LINESPACE;
245	TermWin.saveLines = SAVELINES;	241	saveLines = SAVELINES;
246	numpix_colors = TOTAL_COLORS;	242	numpix_colors = TOTAL_COLORS;
247		243
248	refresh_limit = 1;	244	refresh_limit = 1;
249	refresh_type = SLOW_REFRESH;	245	refresh_type = SLOW_REFRESH;
250	prev_nrow = prev_ncol = 0;	246	prev_nrow = prev_ncol = 0;
…		…
255	bgPixmap.x = bgPixmap.y = 50;	251	bgPixmap.x = bgPixmap.y = 50;
256	bgPixmap.pixmap = None;	252	bgPixmap.pixmap = None;
257	#endif	253	#endif
258		254
259	last_bot = last_state = -1;	255	last_bot = last_state = -1;
260
261	#ifdef MENUBAR
262	menu_readonly = 1;
263	# if ! (MENUBAR_MAX > 1)
264	CurrentBar = &BarList;
265	# endif /* (MENUBAR_MAX > 1) */
266	#endif
267		256
268	return true;	257	return true;
269	}	258	}
270		259
271	void	260	void
…		…
339	rs[Rs_name] = rxvt_r_basename (argv[0]);	328	rs[Rs_name] = rxvt_r_basename (argv[0]);
340		329
341	/*	330	/*
342	* Open display, get options/resources and create the window	331	* Open display, get options/resources and create the window
343	*/	332	*/
		333
344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	334	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345	rs[Rs_display_name] = ":0";	335	rs[Rs_display_name] = ":0";
346		336
347	get_options (r_argc, r_argv);	337	get_options (r_argc, r_argv);
348		338
349	if (!(display = displays.get (rs[Rs_display_name])))	339	if (!(display = displays.get (rs[Rs_display_name])))
350	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	340	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351		341
352	extract_resources ();	342	extract_resources ();
		343
353	free (r_argv);	344	free (r_argv);
354		345
355	/*	346	/*
356	* set any defaults not already set	347	* set any defaults not already set
357	*/	348	*/
…		…
369	if (!rs[Rs_iconName])	360	if (!rs[Rs_iconName])
370	rs[Rs_iconName] = rs[Rs_name];	361	rs[Rs_iconName] = rs[Rs_name];
371	}	362	}
372		363
373	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	364	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	365	saveLines = min (i, MAX_SAVELINES);
375		366
376	#if ENABLE_FRILLS	367	#if ENABLE_FRILLS
377	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	368	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	369	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		370
379	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	371	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	372	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		373
381	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	374	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	375	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383	#endif	376	#endif
384		377
385	#ifdef POINTER_BLANK	378	#ifdef POINTER_BLANK
386	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	379	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387	pointerBlankDelay = i;	380	pointerBlankDelay = i;
388	else	381	else
389	pointerBlankDelay = 2;	382	pointerBlankDelay = 2;
390	#endif	383	#endif
391		384
392	/* no point having a scrollbar without having any scrollback! */	385	/* no point having a scrollbar without having any scrollback! */
393	if (!TermWin.saveLines)	386	if (!saveLines)
394	options &= ~Opt_scrollBar;	387	set_option (Opt_scrollBar, 0);
395		388
396	#ifdef PRINTPIPE	389	#ifdef PRINTPIPE
397	if (!rs[Rs_print_pipe])	390	if (!rs[Rs_print_pipe])
398	rs[Rs_print_pipe] = PRINTPIPE;	391	rs[Rs_print_pipe] = PRINTPIPE;
399	#endif	392	#endif
…		…
442	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	435	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443	#endif	436	#endif
444		437
445	#ifdef XTERM_REVERSE_VIDEO	438	#ifdef XTERM_REVERSE_VIDEO
446	/* this is how xterm implements reverseVideo */	439	/* this is how xterm implements reverseVideo */
447	if (options & Opt_reverseVideo)	440	if (OPTION (Opt_reverseVideo))
448	{	441	{
449	if (!rs[Rs_color + Color_fg])	442	if (!rs[Rs_color + Color_fg])
450	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	443	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451	if (!rs[Rs_color + Color_bg])	444	if (!rs[Rs_color + Color_bg])
452	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	445	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
457	if (!rs[Rs_color + i])	450	if (!rs[Rs_color + i])
458	rs[Rs_color + i] = def_colorName[i];	451	rs[Rs_color + i] = def_colorName[i];
459		452
460	#ifndef XTERM_REVERSE_VIDEO	453	#ifndef XTERM_REVERSE_VIDEO
461	/* this is how we implement reverseVideo */	454	/* this is how we implement reverseVideo */
462	if (options & Opt_reverseVideo)	455	if (OPTION (Opt_reverseVideo))
463	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	456	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464	#endif	457	#endif
465		458
466	/* convenient aliases for setting fg/bg to colors */	459	/* convenient aliases for setting fg/bg to colors */
467	color_aliases (Color_fg);	460	color_aliases (Color_fg);
468	color_aliases (Color_bg);	461	color_aliases (Color_bg);
…		…
518	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	511	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
519		512
520	sprintf (env_display, "DISPLAY=%s", val);	513	sprintf (env_display, "DISPLAY=%s", val);
521		514
522	/* avoiding the math library:	515	/* avoiding the math library:
523	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */	516	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)	517	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525	;	518	;
526	MAX_IT (i, 1);	519	max_it (i, 1);
527	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));	520	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
528		521
529	sprintf (env_windowid, "WINDOWID=%u",	522	sprintf (env_windowid, "WINDOWID=%u",
530	(unsigned int)TermWin.parent[0]);	523	(unsigned int)parent[0]);
531		524
532	/* add entries to the environment:	525	/* add entries to the environment:
533	* @ DISPLAY: in case we started with -display	526	* @ DISPLAY: in case we started with -display
534	* @ WINDOWID: X window id number of the window	527	* @ WINDOWID: X window id number of the window
535	* @ COLORTERM: terminal sub-name and also indicates its color	528	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
574	* This should support all European type languages.	567	* This should support all European type languages.
575	*/	568	*/
576	void	569	void
577	rxvt_term::set_locale (const char *locale)	570	rxvt_term::set_locale (const char *locale)
578	{	571	{
		572	set_environ (envv);
		573
579	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	574	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
580	free (this->locale);	575	free (this->locale);
581	this->locale = setlocale (LC_CTYPE, locale);	576	this->locale = setlocale (LC_CTYPE, locale);
582		577
583	if (!this->locale)	578	if (!this->locale)
584	{	579	{
585	if (*locale)	580	if (*locale)
586	{	581	{
587	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	582	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
588	setlocale (LC_CTYPE, "");	583	setlocale (LC_CTYPE, "C");
589	}	584	}
590	else	585	else
591	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	586	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
592		587
593	this->locale = "";	588	this->locale = "C";
594	}	589	}
595		590
596		591
597	this->locale = rxvt_strdup (this->locale);	592	this->locale = rxvt_strdup (this->locale);
598	SET_LOCALE (this->locale);	593	SET_LOCALE (this->locale);
…		…
613	}	608	}
614		609
615	void	610	void
616	rxvt_term::init_xlocale ()	611	rxvt_term::init_xlocale ()
617	{	612	{
		613	set_environ (envv);
		614
618	#ifdef USE_XIM	615	#ifdef USE_XIM
619	if (!locale)	616	if (!locale)
620	rxvt_warn ("setting locale failed, working without locale support.\n");	617	rxvt_warn ("setting locale failed, working without locale support.\n");
621	else	618	else
622	{	619	{
…		…
644	* Initialize the command connection.	641	* Initialize the command connection.
645	* This should be called after the X server connection is established.	642	* This should be called after the X server connection is established.
646	*/	643	*/
647		644
648	#ifdef META8_OPTION	645	#ifdef META8_OPTION
649	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	646	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650	#endif	647	#endif
651		648
652	get_ourmods ();	649	get_ourmods ();
653		650
654	if (!(options & Opt_scrollTtyOutput))	651	if (!OPTION (Opt_scrollTtyOutput))
655	priv_modes \|= PrivMode_TtyOutputInh;	652	priv_modes \|= PrivMode_TtyOutputInh;
656	if (options & Opt_scrollTtyKeypress)	653	if (OPTION (Opt_scrollTtyKeypress))
657	priv_modes \|= PrivMode_Keypress;	654	priv_modes \|= PrivMode_Keypress;
658	if (!(options & Opt_jumpScroll))	655	if (!OPTION (Opt_jumpScroll))
659	priv_modes \|= PrivMode_smoothScroll;	656	priv_modes \|= PrivMode_smoothScroll;
660		657
661	#ifndef NO_BACKSPACE_KEY	658	#ifndef NO_BACKSPACE_KEY
662	if (strcmp (key_backspace, "DEC") == 0)	659	if (strcmp (key_backspace, "DEC") == 0)
663	priv_modes \|= PrivMode_HaveBackSpace;	660	priv_modes \|= PrivMode_HaveBackSpace;
664	#endif	661	#endif
665		662
666	/* add value for scrollBar */	663	/* add value for scrollBar */
667	if (scrollbar_visible ())	664	if (scrollBar.state)
668	{	665	{
669	priv_modes \|= PrivMode_scrollBar;	666	priv_modes \|= PrivMode_scrollBar;
670	SavedModes \|= PrivMode_scrollBar;	667	SavedModes \|= PrivMode_scrollBar;
671	}	668	}
672
673	if (menubar_visible ())
674	{
675	priv_modes \|= PrivMode_menuBar;
676	SavedModes \|= PrivMode_menuBar;
677	}
678
679	#ifdef CURSOR_BLINK
680	if (options & Opt_cursorBlink)
681	(void)gettimeofday (&lastcursorchange, NULL);
682	#endif
683		669
684	run_command (argv);	670	run_command (argv);
685	}	671	}
686		672
687	/----------------------------------------------------------------------/	673	/----------------------------------------------------------------------/
…		…
702	continue;	688	continue;
703		689
704	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	690	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705	{	691	{
706	#ifndef XTERM_REVERSE_VIDEO	692	#ifndef XTERM_REVERSE_VIDEO
707	if (i < 2 && (options & Opt_reverseVideo))	693	if (i < 2 && OPTION (Opt_reverseVideo))
708	rs[Rs_color + i] = def_colorName[!i];	694	rs[Rs_color + i] = def_colorName[!i];
709	else	695	else
710	#endif	696	#endif
711	rs[Rs_color + i] = def_colorName[i];	697	rs[Rs_color + i] = def_colorName[i];
712		698
…		…
754	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	740	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
755	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	741	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
756	}	742	}
757		743
758	/*	744	/*
759	* get scrollBar/menuBar shadow colors	745	* get scrollBar shadow colors
760	*	746	*
761	* The calculations of topShadow/bottomShadow values are adapted	747	* The calculations of topShadow/bottomShadow values are adapted
762	* from the fvwm window manager.	748	* from the fvwm window manager.
763	*/	749	*/
764	#ifdef KEEP_SCROLLCOLOR	750	#ifdef KEEP_SCROLLCOLOR
…		…
809	int i = atoi (rs[Rs_color + idx]);	795	int i = atoi (rs[Rs_color + idx]);
810		796
811	if (i >= 8 && i <= 15)	797	if (i >= 8 && i <= 15)
812	{ /* bright colors */	798	{ /* bright colors */
813	i -= 8;	799	i -= 8;
814	#ifndef NO_BRIGHTCOLOR
815	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	800	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
816	return;	801	return;
817	#endif
818	}	802	}
819		803
820	if (i >= 0 && i <= 7) /* normal colors */	804	if (i >= 0 && i <= 7) /* normal colors */
821	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	805	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
822	}	806	}
…		…
921	#if ENABLE_FRILLS	905	#if ENABLE_FRILLS
922	Atom prop = None;	906	Atom prop = None;
923	MWMHints mwmhints;	907	MWMHints mwmhints;
924	#endif	908	#endif
925	XGCValues gcvalue;	909	XGCValues gcvalue;
926	long vt_emask;
927	XSetWindowAttributes attributes;	910	XSetWindowAttributes attributes;
928	XWindowAttributes gattr;	911	XWindowAttributes gattr;
929	Window top, parent;	912	Window top, parent;
930	dDisp;	913	dDisp;
931		914
…		…
935	#endif	918	#endif
936		919
937	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	920	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	921	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939		922
940	if (options & Opt_transparent)	923	if (OPTION (Opt_transparent))
941	{	924	{
942	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	925	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	926	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944	}	927	}
945		928
		929	/* grab colors before netscape does */
		930	Get_Colours ();
		931
		932	if (!set_fonts ())
		933	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
		934
		935	parent = DefaultRootWindow (disp);
		936
		937	attributes.override_redirect = !!OPTION (Opt_override_redirect);
		938
946	#if ENABLE_FRILLS	939	#if ENABLE_FRILLS
947	if (options & Opt_borderLess)	940	if (OPTION (Opt_borderLess))
948	{	941	{
949	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	942	prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
950		943
951	if (prop == None)	944	if (prop == None)
952	{	945	{
953	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	946	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954	#ifdef PREFER_24BIT
955	attributes.override_redirect = TRUE;	947	attributes.override_redirect = TRUE;
956	#endif
957	mwmhints.flags = 0;	948	mwmhints.flags = 0;
958	}	949	}
959	else	950	else
960	{	951	{
961	mwmhints.flags = MWM_HINTS_DECORATIONS;	952	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
964	}	955	}
965	else	956	else
966	mwmhints.flags = 0;	957	mwmhints.flags = 0;
967	#endif	958	#endif
968		959
969	/* grab colors before netscape does */
970	Get_Colours ();
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 = DefaultRootWindow (disp);
976
977	#if ENABLE_XEMBED	960	#if ENABLE_XEMBED
978	if (rs[Rs_embed])	961	if (rs[Rs_embed])
979	{	962	{
980	XWindowAttributes wattr;	963	XWindowAttributes wattr;
981		964
…		…
984	if (!XGetWindowAttributes (disp, parent, &wattr))	967	if (!XGetWindowAttributes (disp, parent, &wattr))
985	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	968	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986		969
987	window_calc (wattr.width, wattr.height);	970	window_calc (wattr.width, wattr.height);
988	}	971	}
989
990	#endif	972	#endif
		973
991	window_calc (0, 0);	974	window_calc (0, 0);
992		975
993	/* sub-window placement & size in rxvt_resize_subwindows () */	976	/* sub-window placement & size in rxvt_resize_subwindows () */
994	#ifdef PREFER_24BIT
995	attributes.background_pixel = pix_colors_focused[Color_border];	977	attributes.background_pixel = pix_colors_focused[Color_border];
996	attributes.border_pixel = pix_colors_focused[Color_border];	978	attributes.border_pixel = pix_colors_focused[Color_border];
997	attributes.colormap = display->cmap;	979	attributes.colormap = display->cmap;
998	top = XCreateWindow (disp, parent,	980	top = XCreateWindow (disp, parent,
999	szHint.x, szHint.y,	981	szHint.x, szHint.y,
1000	szHint.width, szHint.height,	982	szHint.width, szHint.height,
1001	TermWin.ext_bwidth,	983	ext_bwidth,
1002	display->depth, InputOutput,	984	display->depth, InputOutput,
1003	display->visual,	985	display->visual,
1004	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	986	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1005	#else	987	&attributes);
1006	top = XCreateSimpleWindow (disp, parent,
1007	szHint.x, szHint.y,
1008	szHint.width, szHint.height,
1009	TermWin.ext_bwidth,
1010	pix_colors_focused[Color_border],
1011	pix_colors_focused[Color_border]);
1012	#endif
1013		988
1014	TermWin.parent[0] = top;	989	this->parent[0] = top;
1015		990
1016	old_width = szHint.width;	991	old_width = szHint.width;
1017	old_height = szHint.height;	992	old_height = szHint.height;
1018		993
1019	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	994	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
…		…
1022	classHint.res_name = (char *)rs[Rs_name];	997	classHint.res_name = (char *)rs[Rs_name];
1023	classHint.res_class = (char *)RESCLASS;	998	classHint.res_class = (char *)RESCLASS;
1024		999
1025	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1000	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1026	wmHint.input = True;	1001	wmHint.input = True;
1027	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1002	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028	wmHint.window_group = top;	1003	wmHint.window_group = top;
1029		1004
1030	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	1005	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1031	&szHint, &wmHint, &classHint);	1006	&szHint, &wmHint, &classHint);
1032		1007
…		…
1037	#endif	1012	#endif
1038	};	1013	};
1039		1014
1040	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1015	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041		1016
		1017	#if ENABLE_FRILLS
		1018	if (rs[Rs_transient_for])
		1019	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		1020	#endif
		1021
1042	#if ENABLE_EWMH	1022	#if ENABLE_EWMH
1043	long pid = getpid ();	1023	long pid = getpid ();
1044		1024
1045	XChangeProperty (disp, top,	1025	XChangeProperty (disp, top,
1046	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1026	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
…		…
1066	#endif	1046	#endif
1067		1047
1068	/* vt cursor: Black-on-White is standard, but this is more popular */	1048	/* vt cursor: Black-on-White is standard, but this is more popular */
1069	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1049	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1070		1050
1071	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1051	#ifdef HAVE_SCROLLBARS
1072	/* cursor (menuBar/scrollBar): Black-on-White */	1052	/* cursor scrollBar: Black-on-White */
1073	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1053	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074	#endif	1054	#endif
1075		1055
1076	/* the vt window */	1056	/* the vt window */
1077	TermWin.vt = XCreateSimpleWindow (disp, top,	1057	vt = XCreateSimpleWindow (disp, top,
1078	window_vt_x,	1058	window_vt_x,
1079	window_vt_y,	1059	window_vt_y,
1080	TermWin_TotalWidth (),	1060	width,
1081	TermWin_TotalHeight (),	1061	height,
1082	0,	1062	0,
1083	pix_colors_focused[Color_fg],	1063	pix_colors_focused[Color_fg],
1084	pix_colors_focused[Color_bg]);	1064	pix_colors_focused[Color_bg]);
1085	#ifdef DEBUG_X	1065	#ifdef DEBUG_X
1086	XStoreName (disp, TermWin.vt, "vt window");	1066	XStoreName (disp, vt, "vt window");
1087	#endif	1067	#endif
1088		1068
1089	attributes.bit_gravity = NorthWestGravity;	1069	attributes.bit_gravity = NorthWestGravity;
1090	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1070	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091		1071
1092	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1072	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1093		1073
1094	#ifdef POINTER_BLANK	1074	if (OPTION (Opt_pointerBlank))
1095	if (options & Opt_pointerBlank)
1096	vt_emask \|= PointerMotionMask;	1075	vt_emask \|= PointerMotionMask;
1097	else	1076	else
1098	#endif
1099	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1077	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1100		1078
1101	XSelectInput (disp, TermWin.vt, vt_emask);	1079	vt_select_input ();
		1080
1102	vt_ev.start (display, TermWin.vt);	1081	vt_ev.start (display, vt);
1103
1104	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105	if (menuBar_height ())
1106	{
1107	menuBar.win = XCreateSimpleWindow (disp, top,
1108	window_vt_x, 0,
1109	TermWin_TotalWidth (),
1110	menuBar_TotalHeight (),
1111	0,
1112	pix_colors_focused[Color_fg],
1113	pix_colors_focused[Color_scroll]);
1114
1115	#ifdef DEBUG_X
1116	XStoreName (disp, menuBar.win, "menubar");
1117	#endif
1118
1119	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1120
1121	XDefineCursor (disp, menuBar.win,
1122	XCreateFontCursor (disp, XC_left_ptr));
1123
1124	XSelectInput (disp, menuBar.win,
1125	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1126	menubar_ev.start (display, menuBar.win);
1127	}
1128	#endif
1129		1082
1130	#ifdef XPM_BACKGROUND	1083	#ifdef XPM_BACKGROUND
1131	if (rs[Rs_backgroundPixmap] != NULL	1084	if (rs[Rs_backgroundPixmap] != NULL
1132	&& ! (options & Opt_transparent))	1085	&& ! OPTION (Opt_transparent))
1133	{	1086	{
1134	const char *p = rs[Rs_backgroundPixmap];	1087	const char *p = rs[Rs_backgroundPixmap];
1135		1088
1136	if ((p = strchr (p, ';')) != NULL)	1089	if ((p = strchr (p, ';')) != NULL)
1137	{	1090	{
…		…
1146		1099
1147	/* graphics context for the vt window */	1100	/* graphics context for the vt window */
1148	gcvalue.foreground = pix_colors[Color_fg];	1101	gcvalue.foreground = pix_colors[Color_fg];
1149	gcvalue.background = pix_colors[Color_bg];	1102	gcvalue.background = pix_colors[Color_bg];
1150	gcvalue.graphics_exposures = 1;	1103	gcvalue.graphics_exposures = 1;
1151	TermWin.gc = XCreateGC (disp, TermWin.vt,	1104	gc = XCreateGC (disp, vt,
1152	GCForeground \| GCBackground \| GCGraphicsExposures,	1105	GCForeground \| GCBackground \| GCGraphicsExposures,
1153	&gcvalue);	1106	&gcvalue);
1154		1107
1155	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1108	drawable = new rxvt_drawable (display, vt);
1156		1109
1157	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1110	#ifdef RXVT_SCROLLBAR
1158	gcvalue.foreground = pix_colors[Color_topShadow];	1111	gcvalue.foreground = pix_colors[Color_topShadow];
1159	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1112	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160	gcvalue.foreground = pix_colors[Color_bottomShadow];	1113	gcvalue.foreground = pix_colors[Color_bottomShadow];
1161	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1114	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1115	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1163	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1116	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164	#endif	1117	#endif
1165		1118
1166	#ifdef OFF_FOCUS_FADING	1119	#ifdef OFF_FOCUS_FADING
1167	// initially we are in unfocused state	1120	// initially we are in unfocused state
1168	if (rs[Rs_fade])	1121	if (rs[Rs_fade])
…		…
1193	/*	1146	/*
1194	* standard System V termios interface	1147	* standard System V termios interface
1195	*/	1148	*/
1196	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1149	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197	{	1150	{
1198	/* return error - use system defaults */	1151	// return error - use system defaults,
		1152	// where possible, and zero elsewhere
		1153	memset (tio, 0, sizeof (ttymode_t));
		1154
1199	tio->c_cc[VINTR] = CINTR;	1155	tio->c_cc[VINTR] = CINTR;
1200	tio->c_cc[VQUIT] = CQUIT;	1156	tio->c_cc[VQUIT] = CQUIT;
1201	tio->c_cc[VERASE] = CERASE;	1157	tio->c_cc[VERASE] = CERASE;
		1158	#ifdef VERASE2
		1159	tio->c_cc[VERASE2] = CERASE2;
		1160	#endif
1202	tio->c_cc[VKILL] = CKILL;	1161	tio->c_cc[VKILL] = CKILL;
1203	tio->c_cc[VSTART] = CSTART;	1162	tio->c_cc[VSTART] = CSTART;
1204	tio->c_cc[VSTOP] = CSTOP;	1163	tio->c_cc[VSTOP] = CSTOP;
1205	tio->c_cc[VSUSP] = CSUSP;	1164	tio->c_cc[VSUSP] = CSUSP;
1206	# ifdef VDSUSP	1165	# ifdef VDSUSP
…		…
1399	rxvt_term::run_command (const char const argv)	1358	rxvt_term::run_command (const char const argv)
1400	{	1359	{
1401	#if ENABLE_FRILLS	1360	#if ENABLE_FRILLS
1402	if (rs[Rs_pty_fd])	1361	if (rs[Rs_pty_fd])
1403	{	1362	{
1404	pty.pty = atoi (rs[Rs_pty_fd]);	1363	pty->pty = atoi (rs[Rs_pty_fd]);
1405	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1364
		1365	if (pty->pty >= 0)
		1366	{
		1367	if (getfd_hook)
		1368	pty->pty = (*getfd_hook) (pty->pty);
		1369
		1370	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1371	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1372	}
1406	}	1373	}
1407	else	1374	else
1408	#endif	1375	#endif
1409	if (!pty.get ())	1376	if (!pty->get ())
1410	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1377	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411		1378
1412	pty.set_utf8_mode (enc_utf8);	1379	pty->set_utf8_mode (enc_utf8);
1413		1380
1414	/* set initial window size */	1381	/* set initial window size */
1415	tt_winch ();	1382	tt_winch ();
1416		1383
1417	int er;	1384	int er;
…		…
1430	#if ENABLE_FRILLS	1397	#if ENABLE_FRILLS
1431	if (rs[Rs_pty_fd])	1398	if (rs[Rs_pty_fd])
1432	return;	1399	return;
1433	#endif	1400	#endif
1434		1401
1435	#ifndef __QNX__
1436	/* spin off the command interpreter */	1402	/* spin off the command interpreter */
1437	switch (cmd_pid = fork ())	1403	switch (cmd_pid = fork ())
1438	{	1404	{
1439	case -1:	1405	case -1:
1440	{	1406	{
…		…
1442	rxvt_fatal ("can't fork, aborting.\n");	1408	rxvt_fatal ("can't fork, aborting.\n");
1443	}	1409	}
1444	case 0:	1410	case 0:
1445	init_env ();	1411	init_env ();
1446		1412
1447	if (!pty.make_controlling_tty ())	1413	if (!pty->make_controlling_tty ())
1448	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1414	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1449	else	1415	else
1450	{	1416	{
1451	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1417	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1452	dup2 (pty.tty, STDIN_FILENO);	1418	dup2 (pty->tty, STDIN_FILENO);
1453	dup2 (pty.tty, STDOUT_FILENO);	1419	dup2 (pty->tty, STDOUT_FILENO);
1454	dup2 (pty.tty, STDERR_FILENO);	1420	dup2 (pty->tty, STDERR_FILENO);
1455		1421
1456	// close all our file handles that we do no longer need	1422	// close all our file handles that we do no longer need
1457	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1423	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1458	{	1424	{
1459	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1425	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1460	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1426	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1461	}	1427	}
1462		1428
1463	run_child (argv);	1429	run_child (argv);
1464	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1430	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1465	}	1431	}
1466		1432
1467	_exit (EXIT_FAILURE);	1433	_exit (EXIT_FAILURE);
1468		1434
1469	default:	1435	default:
1470	{
1471	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1472	int fdstdin;
1473
1474	fdstdin = dup (STDIN_FILENO);
1475	dup2 (pty.tty, STDIN_FILENO);
1476	#endif
1477
1478	#ifdef UTMP_SUPPORT	1436	#if UTMP_SUPPORT
1479	privileged_utmp (SAVE);	1437	if (!OPTION (Opt_utmpInhibit))
		1438	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1480	#endif	1439	#endif
1481		1440
1482	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1441	pty->close_tty ();
1483		1442
1484	dup2 (fdstdin, STDIN_FILENO);	1443	child_ev.start (cmd_pid);
1485	close (fdstdin);
1486	#endif
1487	}
1488		1444
1489	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */	1445	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1490	break;	1446	break;
1491	}	1447	}
1492	#else /* __QNX__ uses qnxspawn () */
1493	fchmod (pty.tty, 0622);
1494	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1495	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1496
1497	if (run_child (argv) == -1)
1498	exit (EXIT_FAILURE);
1499	#endif
1500	}	1448	}
1501		1449
1502	/* ------------------------------------------------------------------------- *	1450	/* ------------------------------------------------------------------------- *
1503	* CHILD PROCESS OPERATIONS *	1451	* CHILD PROCESS OPERATIONS *
1504	* ------------------------------------------------------------------------- */	1452	* ------------------------------------------------------------------------- */
…		…
1511	{	1459	{
1512	char *login;	1460	char *login;
1513		1461
1514	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1462	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515		1463
1516	if (options & Opt_console)	1464	if (OPTION (Opt_console))
1517	{ /* be virtual console, fail silently */	1465	{ /* be virtual console, fail silently */
1518	#ifdef TIOCCONS	1466	#ifdef TIOCCONS
1519	unsigned int on = 1;	1467	unsigned int on = 1;
1520		1468
1521	ioctl (STDIN_FILENO, TIOCCONS, &on);	1469	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1548	// unblock signals (signals are blocked by iom.C	1496	// unblock signals (signals are blocked by iom.C
1549	sigset_t ss;	1497	sigset_t ss;
1550	sigemptyset (&ss);	1498	sigemptyset (&ss);
1551	sigprocmask (SIG_SETMASK, &ss, 0);	1499	sigprocmask (SIG_SETMASK, &ss, 0);
1552		1500
1553	#ifndef __QNX__
1554	/* command interpreter path */	1501	/* command interpreter path */
1555	if (argv != NULL)	1502	if (argv != NULL)
1556	{	1503	{
1557	# ifdef DEBUG_CMD	1504	# ifdef DEBUG_CMD
1558	int i;	1505	int i;
…		…
1564	execvp (argv[0], (char const )argv);	1511	execvp (argv[0], (char const )argv);
1565	/* no error message: STDERR is closed! */	1512	/* no error message: STDERR is closed! */
1566	}	1513	}
1567	else	1514	else
1568	{	1515	{
1569	const char argv0, shell;	1516	const char argv0, shell;
1570		1517
1571	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1518	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1572	shell = "/bin/sh";	1519	shell = "/bin/sh";
1573		1520
1574	argv0 = (const char *)rxvt_r_basename (shell);	1521	argv0 = (const char *)rxvt_r_basename (shell);
1575		1522
1576	if (options & Opt_loginShell)	1523	if (OPTION (Opt_loginShell))
1577	{	1524	{
1578	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1525	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1579		1526
1580	login[0] = '-';	1527	login[0] = '-';
1581	strcpy (&login[1], argv0);	1528	strcpy (&login[1], argv0);
1582	argv0 = login;	1529	argv0 = login;
1583	}	1530	}
		1531
1584	execlp (shell, argv0, NULL);	1532	execlp (shell, argv0, NULL);
1585	/* no error message: STDERR is closed! */	1533	/* no error message: STDERR is closed! */
1586	}	1534	}
1587		1535
1588	#else /* __QNX__ uses qnxspawn () */
1589
1590	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1591	char *command = NULL, fullcommand[_MAX_PATH];
1592	char *arg_v, arg_a[2] = { NULL, NULL };
1593
1594	if (argv != NULL)
1595	{
1596	if (access (argv[0], X_OK) == -1)
1597	{
1598	if (strchr (argv[0], '/') == NULL)
1599	{
1600	searchenv (argv[0], "PATH", fullcommand);
1601
1602	if (fullcommand[0] != '\0')
1603	command = fullcommand;
1604	}
1605
1606	if (access (command, X_OK) == -1)
1607	return -1;
1608	}
1609	else
1610	command = argv[0];
1611
1612	arg_v = argv;
1613	}
1614	else
1615	{
1616	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1617	command = "/bin/sh";
1618
1619	arg_a[0] = my_basename (command);
1620
1621	if (options & Opt_loginShell)
1622	{
1623	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1624
1625	login[0] = '-';
1626	strcpy (&login[1], arg_a[0]);
1627	arg_a[0] = login;
1628	}
1629
1630	arg_v = arg_a;
1631	}
1632
1633	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1634	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1635	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1636	command, arg_v, environ, iov_a, 0);
1637	if (login)
1638	free (login);
1639
1640	pty.close_tty ();
1641	return pty.pty;
1642	#endif
1643
1644	return -1;	1536	return -1;
1645	}	1537	}
1646		1538
1647	/----------------------- end-of-file (C source) -----------------------/	1539	/----------------------- 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.121 by root, Wed Nov 30 21:05:39 2005 UTC vs. Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC