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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.152 by root, Sat Jan 21 22:38:05 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	};
217		213
218	bool	214	bool
219	rxvt_term::init_vars ()	215	rxvt_term::init_vars ()
220	{	216	{
221	sw_term.start (SIGTERM);
222	sw_int.start (SIGINT);
223
224	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	217	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225	#ifdef OFF_FOCUS_FADING	218	#ifdef OFF_FOCUS_FADING
226	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	219	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227	#endif	220	#endif
228	pix_colors = pix_colors_focused;	221	pix_colors = pix_colors_focused;
229		222
230	if (pix_colors == NULL)	223	if (pix_colors == NULL)
231	return false;	224	return false;
232		225
233	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	226	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
234	TermWin.pixmap = None;	227	pixmap = None;
235	#endif	228	#endif
236		229
237	MEvent.time = CurrentTime;	230	MEvent.time = CurrentTime;
238	MEvent.button = AnyButton;	231	MEvent.button = AnyButton;
239	options = DEFAULT_OPTIONS;	232	options = DEFAULT_OPTIONS;
240	want_refresh = 1;	233	want_refresh = 1;
241	priv_modes = SavedModes = PrivMode_Default;	234	priv_modes = SavedModes = PrivMode_Default;
242	TermWin.focus = 0;	235	focus = 0;
243	TermWin.ncol = 80;	236	ncol = 80;
244	TermWin.nrow = 24;	237	nrow = 24;
245	TermWin.int_bwidth = INTERNALBORDERWIDTH;	238	int_bwidth = INTERNALBORDERWIDTH;
246	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	239	ext_bwidth = EXTERNALBORDERWIDTH;
247	TermWin.lineSpace = LINESPACE;	240	lineSpace = LINESPACE;
248	TermWin.saveLines = SAVELINES;	241	saveLines = SAVELINES;
249	numpix_colors = TOTAL_COLORS;	242	numpix_colors = TOTAL_COLORS;
250		243
251	refresh_limit = 1;	244	refresh_limit = 1;
252	refresh_type = SLOW_REFRESH;	245	refresh_type = SLOW_REFRESH;
253	prev_nrow = prev_ncol = 0;	246	prev_nrow = prev_ncol = 0;
…		…
258	bgPixmap.x = bgPixmap.y = 50;	251	bgPixmap.x = bgPixmap.y = 50;
259	bgPixmap.pixmap = None;	252	bgPixmap.pixmap = None;
260	#endif	253	#endif
261		254
262	last_bot = last_state = -1;	255	last_bot = last_state = -1;
263
264	#ifdef MENUBAR
265	menu_readonly = 1;
266	# if ! (MENUBAR_MAX > 1)
267	CurrentBar = &BarList;
268	# endif /* (MENUBAR_MAX > 1) */
269	#endif
270		256
271	return true;	257	return true;
272	}	258	}
273		259
274	void	260	void
…		…
342	rs[Rs_name] = rxvt_r_basename (argv[0]);	328	rs[Rs_name] = rxvt_r_basename (argv[0]);
343		329
344	/*	330	/*
345	* Open display, get options/resources and create the window	331	* Open display, get options/resources and create the window
346	*/	332	*/
		333
347	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	334	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348	rs[Rs_display_name] = ":0";	335	rs[Rs_display_name] = ":0";
349		336
350	get_options (r_argc, r_argv);	337	get_options (r_argc, r_argv);
351		338
352	if (!(display = displays.get (rs[Rs_display_name])))	339	if (!(display = displays.get (rs[Rs_display_name])))
353	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]);
354		341
355	extract_resources ();	342	extract_resources ();
		343
356	free (r_argv);	344	free (r_argv);
		345
		346	#if ENABLE_PERL
		347	if (!rs[Rs_perl_ext_1])
		348	rs[Rs_perl_ext_1] = "default";
		349
		350	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		351	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		352	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		353	{
		354	rxvt_perl.init (this);
		355	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		356	}
		357	#endif
357		358
358	/*	359	/*
359	* set any defaults not already set	360	* set any defaults not already set
360	*/	361	*/
361	if (cmd_argv && cmd_argv[0])	362	if (cmd_argv && cmd_argv[0])
…		…
372	if (!rs[Rs_iconName])	373	if (!rs[Rs_iconName])
373	rs[Rs_iconName] = rs[Rs_name];	374	rs[Rs_iconName] = rs[Rs_name];
374	}	375	}
375		376
376	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	377	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	378	saveLines = min (i, MAX_SAVELINES);
378		379
379	#if ENABLE_FRILLS	380	#if ENABLE_FRILLS
380	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	381	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
381	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	382	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		383
382	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	384	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
383	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	385	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		386
384	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	387	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	388	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
386	#endif	389	#endif
387		390
388	#ifdef POINTER_BLANK	391	#ifdef POINTER_BLANK
389	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	392	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390	pointerBlankDelay = i;	393	pointerBlankDelay = i;
391	else	394	else
392	pointerBlankDelay = 2;	395	pointerBlankDelay = 2;
393	#endif	396	#endif
394		397
395	/* no point having a scrollbar without having any scrollback! */	398	/* no point having a scrollbar without having any scrollback! */
396	if (!TermWin.saveLines)	399	if (!saveLines)
397	options &= ~Opt_scrollBar;	400	set_option (Opt_scrollBar, 0);
398		401
399	#ifdef PRINTPIPE	402	#ifdef PRINTPIPE
400	if (!rs[Rs_print_pipe])	403	if (!rs[Rs_print_pipe])
401	rs[Rs_print_pipe] = PRINTPIPE;	404	rs[Rs_print_pipe] = PRINTPIPE;
402	#endif	405	#endif
…		…
445	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	448	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
446	#endif	449	#endif
447		450
448	#ifdef XTERM_REVERSE_VIDEO	451	#ifdef XTERM_REVERSE_VIDEO
449	/* this is how xterm implements reverseVideo */	452	/* this is how xterm implements reverseVideo */
450	if (options & Opt_reverseVideo)	453	if (OPTION (Opt_reverseVideo))
451	{	454	{
452	if (!rs[Rs_color + Color_fg])	455	if (!rs[Rs_color + Color_fg])
453	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	456	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
454	if (!rs[Rs_color + Color_bg])	457	if (!rs[Rs_color + Color_bg])
455	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	458	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
460	if (!rs[Rs_color + i])	463	if (!rs[Rs_color + i])
461	rs[Rs_color + i] = def_colorName[i];	464	rs[Rs_color + i] = def_colorName[i];
462		465
463	#ifndef XTERM_REVERSE_VIDEO	466	#ifndef XTERM_REVERSE_VIDEO
464	/* this is how we implement reverseVideo */	467	/* this is how we implement reverseVideo */
465	if (options & Opt_reverseVideo)	468	if (OPTION (Opt_reverseVideo))
466	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	469	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
467	#endif	470	#endif
468		471
469	/* convenient aliases for setting fg/bg to colors */	472	/* convenient aliases for setting fg/bg to colors */
470	color_aliases (Color_fg);	473	color_aliases (Color_fg);
471	color_aliases (Color_bg);	474	color_aliases (Color_bg);
…		…
521	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	524	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
522		525
523	sprintf (env_display, "DISPLAY=%s", val);	526	sprintf (env_display, "DISPLAY=%s", val);
524		527
525	/* avoiding the math library:	528	/* avoiding the math library:
526	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */	529	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
527	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)	530	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
528	;	531	;
529	MAX_IT (i, 1);	532	max_it (i, 1);
530	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));	533	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
531		534
532	sprintf (env_windowid, "WINDOWID=%u",	535	sprintf (env_windowid, "WINDOWID=%u",
533	(unsigned int)TermWin.parent[0]);	536	(unsigned int)parent[0]);
534		537
535	/* add entries to the environment:	538	/* add entries to the environment:
536	* @ DISPLAY: in case we started with -display	539	* @ DISPLAY: in case we started with -display
537	* @ WINDOWID: X window id number of the window	540	* @ WINDOWID: X window id number of the window
538	* @ COLORTERM: terminal sub-name and also indicates its color	541	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
577	* This should support all European type languages.	580	* This should support all European type languages.
578	*/	581	*/
579	void	582	void
580	rxvt_term::set_locale (const char *locale)	583	rxvt_term::set_locale (const char *locale)
581	{	584	{
		585	set_environ (envv);
		586
582	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	587	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
583	free (this->locale);	588	free (this->locale);
584	this->locale = setlocale (LC_CTYPE, locale);	589	this->locale = setlocale (LC_CTYPE, locale);
585		590
586	if (!this->locale)	591	if (!this->locale)
587	{	592	{
588	if (*locale)	593	if (*locale)
589	{	594	{
590	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	595	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
591	setlocale (LC_CTYPE, "");	596	setlocale (LC_CTYPE, "C");
592	}	597	}
593	else	598	else
594	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	599	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
595		600
596	this->locale = "";	601	this->locale = "C";
597	}	602	}
598		603
599		604
600	this->locale = rxvt_strdup (this->locale);	605	this->locale = rxvt_strdup (this->locale);
601	SET_LOCALE (this->locale);	606	SET_LOCALE (this->locale);
…		…
616	}	621	}
617		622
618	void	623	void
619	rxvt_term::init_xlocale ()	624	rxvt_term::init_xlocale ()
620	{	625	{
		626	set_environ (envv);
		627
621	#ifdef USE_XIM	628	#ifdef USE_XIM
622	if (!locale)	629	if (!locale)
623	rxvt_warn ("setting locale failed, working without locale support.\n");	630	rxvt_warn ("setting locale failed, working without locale support.\n");
624	else	631	else
625	{	632	{
…		…
647	* Initialize the command connection.	654	* Initialize the command connection.
648	* This should be called after the X server connection is established.	655	* This should be called after the X server connection is established.
649	*/	656	*/
650		657
651	#ifdef META8_OPTION	658	#ifdef META8_OPTION
652	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	659	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653	#endif	660	#endif
654		661
655	get_ourmods ();	662	get_ourmods ();
656		663
657	if (!(options & Opt_scrollTtyOutput))	664	if (!OPTION (Opt_scrollTtyOutput))
658	priv_modes \|= PrivMode_TtyOutputInh;	665	priv_modes \|= PrivMode_TtyOutputInh;
659	if (options & Opt_scrollTtyKeypress)	666	if (OPTION (Opt_scrollTtyKeypress))
660	priv_modes \|= PrivMode_Keypress;	667	priv_modes \|= PrivMode_Keypress;
661	if (!(options & Opt_jumpScroll))	668	if (!OPTION (Opt_jumpScroll))
662	priv_modes \|= PrivMode_smoothScroll;	669	priv_modes \|= PrivMode_smoothScroll;
663		670
664	#ifndef NO_BACKSPACE_KEY	671	#ifndef NO_BACKSPACE_KEY
665	if (strcmp (key_backspace, "DEC") == 0)	672	if (strcmp (key_backspace, "DEC") == 0)
666	priv_modes \|= PrivMode_HaveBackSpace;	673	priv_modes \|= PrivMode_HaveBackSpace;
667	#endif	674	#endif
668		675
669	/* add value for scrollBar */	676	/* add value for scrollBar */
670	if (scrollbar_visible ())	677	if (scrollBar.state)
671	{	678	{
672	priv_modes \|= PrivMode_scrollBar;	679	priv_modes \|= PrivMode_scrollBar;
673	SavedModes \|= PrivMode_scrollBar;	680	SavedModes \|= PrivMode_scrollBar;
674	}	681	}
675
676	if (menubar_visible ())
677	{
678	priv_modes \|= PrivMode_menuBar;
679	SavedModes \|= PrivMode_menuBar;
680	}
681
682	#ifdef CURSOR_BLINK
683	if (options & Opt_cursorBlink)
684	(void)gettimeofday (&lastcursorchange, NULL);
685	#endif
686		682
687	run_command (argv);	683	run_command (argv);
688	}	684	}
689		685
690	/----------------------------------------------------------------------/	686	/----------------------------------------------------------------------/
…		…
705	continue;	701	continue;
706		702
707	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	703	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708	{	704	{
709	#ifndef XTERM_REVERSE_VIDEO	705	#ifndef XTERM_REVERSE_VIDEO
710	if (i < 2 && (options & Opt_reverseVideo))	706	if (i < 2 && OPTION (Opt_reverseVideo))
711	rs[Rs_color + i] = def_colorName[!i];	707	rs[Rs_color + i] = def_colorName[!i];
712	else	708	else
713	#endif	709	#endif
714	rs[Rs_color + i] = def_colorName[i];	710	rs[Rs_color + i] = def_colorName[i];
715		711
…		…
757	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	753	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	754	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759	}	755	}
760		756
761	/*	757	/*
762	* get scrollBar/menuBar shadow colors	758	* get scrollBar shadow colors
763	*	759	*
764	* The calculations of topShadow/bottomShadow values are adapted	760	* The calculations of topShadow/bottomShadow values are adapted
765	* from the fvwm window manager.	761	* from the fvwm window manager.
766	*/	762	*/
767	#ifdef KEEP_SCROLLCOLOR	763	#ifdef KEEP_SCROLLCOLOR
…		…
812	int i = atoi (rs[Rs_color + idx]);	808	int i = atoi (rs[Rs_color + idx]);
813		809
814	if (i >= 8 && i <= 15)	810	if (i >= 8 && i <= 15)
815	{ /* bright colors */	811	{ /* bright colors */
816	i -= 8;	812	i -= 8;
817	#ifndef NO_BRIGHTCOLOR
818	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	813	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
819	return;	814	return;
820	#endif
821	}	815	}
822		816
823	if (i >= 0 && i <= 7) /* normal colors */	817	if (i >= 0 && i <= 7) /* normal colors */
824	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	818	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825	}	819	}
…		…
924	#if ENABLE_FRILLS	918	#if ENABLE_FRILLS
925	Atom prop = None;	919	Atom prop = None;
926	MWMHints mwmhints;	920	MWMHints mwmhints;
927	#endif	921	#endif
928	XGCValues gcvalue;	922	XGCValues gcvalue;
929	long vt_emask;
930	XSetWindowAttributes attributes;	923	XSetWindowAttributes attributes;
931	XWindowAttributes gattr;	924	XWindowAttributes gattr;
932	Window top, parent;	925	Window top, parent;
933	dDisp;	926	dDisp;
934		927
…		…
938	#endif	931	#endif
939		932
940	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	933	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	934	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
942		935
943	if (options & Opt_transparent)	936	if (OPTION (Opt_transparent))
944	{	937	{
945	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	938	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
946	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	939	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
947	}	940	}
948		941
		942	/* grab colors before netscape does */
		943	Get_Colours ();
		944
		945	if (!set_fonts ())
		946	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
		947
		948	parent = DefaultRootWindow (disp);
		949
		950	attributes.override_redirect = !!OPTION (Opt_override_redirect);
		951
949	#if ENABLE_FRILLS	952	#if ENABLE_FRILLS
950	if (options & Opt_borderLess)	953	if (OPTION (Opt_borderLess))
951	{	954	{
952	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	955	prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
953		956
954	if (prop == None)	957	if (prop == None)
955	{	958	{
956	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	959	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
957	#ifdef PREFER_24BIT
958	attributes.override_redirect = TRUE;	960	attributes.override_redirect = TRUE;
959	#endif
960	mwmhints.flags = 0;	961	mwmhints.flags = 0;
961	}	962	}
962	else	963	else
963	{	964	{
964	mwmhints.flags = MWM_HINTS_DECORATIONS;	965	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
967	}	968	}
968	else	969	else
969	mwmhints.flags = 0;	970	mwmhints.flags = 0;
970	#endif	971	#endif
971		972
972	/* grab colors before netscape does */
973	Get_Colours ();
974
975	if (!set_fonts ())
976	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978	parent = DefaultRootWindow (disp);
979
980	#if ENABLE_XEMBED	973	#if ENABLE_XEMBED
981	if (rs[Rs_embed])	974	if (rs[Rs_embed])
982	{	975	{
983	XWindowAttributes wattr;	976	XWindowAttributes wattr;
984		977
…		…
987	if (!XGetWindowAttributes (disp, parent, &wattr))	980	if (!XGetWindowAttributes (disp, parent, &wattr))
988	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	981	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989		982
990	window_calc (wattr.width, wattr.height);	983	window_calc (wattr.width, wattr.height);
991	}	984	}
992
993	#endif	985	#endif
		986
994	window_calc (0, 0);	987	window_calc (0, 0);
995		988
996	/* sub-window placement & size in rxvt_resize_subwindows () */	989	/* sub-window placement & size in rxvt_resize_subwindows () */
997	#ifdef PREFER_24BIT
998	attributes.background_pixel = pix_colors_focused[Color_border];	990	attributes.background_pixel = pix_colors_focused[Color_border];
999	attributes.border_pixel = pix_colors_focused[Color_border];	991	attributes.border_pixel = pix_colors_focused[Color_border];
1000	attributes.colormap = display->cmap;	992	attributes.colormap = display->cmap;
1001	top = XCreateWindow (disp, parent,	993	top = XCreateWindow (disp, parent,
1002	szHint.x, szHint.y,	994	szHint.x, szHint.y,
1003	szHint.width, szHint.height,	995	szHint.width, szHint.height,
1004	TermWin.ext_bwidth,	996	ext_bwidth,
1005	display->depth, InputOutput,	997	display->depth, InputOutput,
1006	display->visual,	998	display->visual,
1007	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	999	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1008	#else	1000	&attributes);
1009	top = XCreateSimpleWindow (disp, parent,
1010	szHint.x, szHint.y,
1011	szHint.width, szHint.height,
1012	TermWin.ext_bwidth,
1013	pix_colors_focused[Color_border],
1014	pix_colors_focused[Color_border]);
1015	#endif
1016		1001
1017	TermWin.parent[0] = top;	1002	this->parent[0] = top;
1018		1003
1019	old_width = szHint.width;	1004	old_width = szHint.width;
1020	old_height = szHint.height;	1005	old_height = szHint.height;
1021		1006
1022	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1007	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
…		…
1025	classHint.res_name = (char *)rs[Rs_name];	1010	classHint.res_name = (char *)rs[Rs_name];
1026	classHint.res_class = (char *)RESCLASS;	1011	classHint.res_class = (char *)RESCLASS;
1027		1012
1028	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1013	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1029	wmHint.input = True;	1014	wmHint.input = True;
1030	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1015	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031	wmHint.window_group = top;	1016	wmHint.window_group = top;
1032		1017
1033	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	1018	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1034	&szHint, &wmHint, &classHint);	1019	&szHint, &wmHint, &classHint);
1035		1020
…		…
1040	#endif	1025	#endif
1041	};	1026	};
1042		1027
1043	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	1028	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044		1029
		1030	#if ENABLE_FRILLS
		1031	if (rs[Rs_transient_for])
		1032	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		1033	#endif
		1034
1045	#if ENABLE_EWMH	1035	#if ENABLE_EWMH
1046	long pid = getpid ();	1036	long pid = getpid ();
1047		1037
1048	XChangeProperty (disp, top,	1038	XChangeProperty (disp, top,
1049	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1039	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
…		…
1069	#endif	1059	#endif
1070		1060
1071	/* vt cursor: Black-on-White is standard, but this is more popular */	1061	/* vt cursor: Black-on-White is standard, but this is more popular */
1072	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1062	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1073		1063
1074	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1064	#ifdef HAVE_SCROLLBARS
1075	/* cursor (menuBar/scrollBar): Black-on-White */	1065	/* cursor scrollBar: Black-on-White */
1076	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1066	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1077	#endif	1067	#endif
1078		1068
1079	/* the vt window */	1069	/* the vt window */
1080	TermWin.vt = XCreateSimpleWindow (disp, top,	1070	vt = XCreateSimpleWindow (disp, top,
1081	window_vt_x,	1071	window_vt_x,
1082	window_vt_y,	1072	window_vt_y,
1083	TermWin_TotalWidth (),	1073	width,
1084	TermWin_TotalHeight (),	1074	height,
1085	0,	1075	0,
1086	pix_colors_focused[Color_fg],	1076	pix_colors_focused[Color_fg],
1087	pix_colors_focused[Color_bg]);	1077	pix_colors_focused[Color_bg]);
1088	#ifdef DEBUG_X	1078	#ifdef DEBUG_X
1089	XStoreName (disp, TermWin.vt, "vt window");	1079	XStoreName (disp, vt, "vt window");
1090	#endif	1080	#endif
1091		1081
1092	attributes.bit_gravity = NorthWestGravity;	1082	attributes.bit_gravity = NorthWestGravity;
1093	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1083	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1094		1084
1095	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1085	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1096		1086
1097	#ifdef POINTER_BLANK	1087	if (OPTION (Opt_pointerBlank))
1098	if (options & Opt_pointerBlank)
1099	vt_emask \|= PointerMotionMask;	1088	vt_emask \|= PointerMotionMask;
1100	else	1089	else
1101	#endif
1102	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1090	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1103		1091
1104	XSelectInput (disp, TermWin.vt, vt_emask);	1092	vt_select_input ();
		1093
1105	vt_ev.start (display, TermWin.vt);	1094	vt_ev.start (display, vt);
1106
1107	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108	if (menuBar_height ())
1109	{
1110	menuBar.win = XCreateSimpleWindow (disp, top,
1111	window_vt_x, 0,
1112	TermWin_TotalWidth (),
1113	menuBar_TotalHeight (),
1114	0,
1115	pix_colors_focused[Color_fg],
1116	pix_colors_focused[Color_scroll]);
1117
1118	#ifdef DEBUG_X
1119	XStoreName (disp, menuBar.win, "menubar");
1120	#endif
1121
1122	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1123
1124	XDefineCursor (disp, menuBar.win,
1125	XCreateFontCursor (disp, XC_left_ptr));
1126
1127	XSelectInput (disp, menuBar.win,
1128	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1129	menubar_ev.start (display, menuBar.win);
1130	}
1131	#endif
1132		1095
1133	#ifdef XPM_BACKGROUND	1096	#ifdef XPM_BACKGROUND
1134	if (rs[Rs_backgroundPixmap] != NULL	1097	if (rs[Rs_backgroundPixmap] != NULL
1135	&& ! (options & Opt_transparent))	1098	&& ! OPTION (Opt_transparent))
1136	{	1099	{
1137	const char *p = rs[Rs_backgroundPixmap];	1100	const char *p = rs[Rs_backgroundPixmap];
1138		1101
1139	if ((p = strchr (p, ';')) != NULL)	1102	if ((p = strchr (p, ';')) != NULL)
1140	{	1103	{
…		…
1149		1112
1150	/* graphics context for the vt window */	1113	/* graphics context for the vt window */
1151	gcvalue.foreground = pix_colors[Color_fg];	1114	gcvalue.foreground = pix_colors[Color_fg];
1152	gcvalue.background = pix_colors[Color_bg];	1115	gcvalue.background = pix_colors[Color_bg];
1153	gcvalue.graphics_exposures = 1;	1116	gcvalue.graphics_exposures = 1;
1154	TermWin.gc = XCreateGC (disp, TermWin.vt,	1117	gc = XCreateGC (disp, vt,
1155	GCForeground \| GCBackground \| GCGraphicsExposures,	1118	GCForeground \| GCBackground \| GCGraphicsExposures,
1156	&gcvalue);	1119	&gcvalue);
1157		1120
1158	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1121	drawable = new rxvt_drawable (display, vt);
1159		1122
1160	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1123	#ifdef RXVT_SCROLLBAR
1161	gcvalue.foreground = pix_colors[Color_topShadow];	1124	gcvalue.foreground = pix_colors[Color_topShadow];
1162	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1125	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1163	gcvalue.foreground = pix_colors[Color_bottomShadow];	1126	gcvalue.foreground = pix_colors[Color_bottomShadow];
1164	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1127	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1165	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1128	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1166	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1129	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167	#endif	1130	#endif
1168		1131
1169	#ifdef OFF_FOCUS_FADING	1132	#ifdef OFF_FOCUS_FADING
1170	// initially we are in unfocused state	1133	// initially we are in unfocused state
1171	if (rs[Rs_fade])	1134	if (rs[Rs_fade])
…		…
1196	/*	1159	/*
1197	* standard System V termios interface	1160	* standard System V termios interface
1198	*/	1161	*/
1199	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1162	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1200	{	1163	{
1201	/* return error - use system defaults */	1164	// return error - use system defaults,
		1165	// where possible, and zero elsewhere
		1166	memset (tio, 0, sizeof (ttymode_t));
		1167
1202	tio->c_cc[VINTR] = CINTR;	1168	tio->c_cc[VINTR] = CINTR;
1203	tio->c_cc[VQUIT] = CQUIT;	1169	tio->c_cc[VQUIT] = CQUIT;
1204	tio->c_cc[VERASE] = CERASE;	1170	tio->c_cc[VERASE] = CERASE;
		1171	#ifdef VERASE2
		1172	tio->c_cc[VERASE2] = CERASE2;
		1173	#endif
1205	tio->c_cc[VKILL] = CKILL;	1174	tio->c_cc[VKILL] = CKILL;
1206	tio->c_cc[VSTART] = CSTART;	1175	tio->c_cc[VSTART] = CSTART;
1207	tio->c_cc[VSTOP] = CSTOP;	1176	tio->c_cc[VSTOP] = CSTOP;
1208	tio->c_cc[VSUSP] = CSUSP;	1177	tio->c_cc[VSUSP] = CSUSP;
1209	# ifdef VDSUSP	1178	# ifdef VDSUSP
1210
1211	tio->c_cc[VDSUSP] = CDSUSP;	1179	tio->c_cc[VDSUSP] = CDSUSP;
1212	# endif	1180	# endif
1213	# ifdef VREPRINT	1181	# ifdef VREPRINT
1214
1215	tio->c_cc[VREPRINT] = CRPRNT;	1182	tio->c_cc[VREPRINT] = CRPRNT;
1216	# endif	1183	# endif
1217	# ifdef VDISCRD	1184	# ifdef VDISCRD
1218
1219	tio->c_cc[VDISCRD] = CFLUSH;	1185	tio->c_cc[VDISCRD] = CFLUSH;
1220	# endif	1186	# endif
1221	# ifdef VWERSE	1187	# ifdef VWERSE
1222
1223	tio->c_cc[VWERSE] = CWERASE;	1188	tio->c_cc[VWERSE] = CWERASE;
1224	# endif	1189	# endif
1225	# ifdef VLNEXT	1190	# ifdef VLNEXT
1226
1227	tio->c_cc[VLNEXT] = CLNEXT;	1191	tio->c_cc[VLNEXT] = CLNEXT;
1228	# endif	1192	# endif
1229
1230	}	1193	}
		1194
1231	tio->c_cc[VEOF] = CEOF;	1195	tio->c_cc[VEOF] = CEOF;
1232	tio->c_cc[VEOL] = VDISABLE;	1196	tio->c_cc[VEOL] = VDISABLE;
1233	# ifdef VEOL2	1197	# ifdef VEOL2
1234
1235	tio->c_cc[VEOL2] = VDISABLE;	1198	tio->c_cc[VEOL2] = VDISABLE;
1236	# endif	1199	# endif
1237	# ifdef VSWTC	1200	# ifdef VSWTC
1238
1239	tio->c_cc[VSWTC] = VDISABLE;	1201	tio->c_cc[VSWTC] = VDISABLE;
1240	# endif	1202	# endif
1241	# ifdef VSWTCH	1203	# ifdef VSWTCH
1242
1243	tio->c_cc[VSWTCH] = VDISABLE;	1204	tio->c_cc[VSWTCH] = VDISABLE;
1244	# endif	1205	# endif
1245	# if VMIN != VEOF	1206	# if VMIN != VEOF
1246
1247	tio->c_cc[VMIN] = 1;	1207	tio->c_cc[VMIN] = 1;
1248	# endif	1208	# endif
1249	# if VTIME != VEOL	1209	# if VTIME != VEOL
1250
1251	tio->c_cc[VTIME] = 0;	1210	tio->c_cc[VTIME] = 0;
1252	# endif	1211	# endif
1253		1212
1254	if (erase != -1)	1213	if (erase != -1)
1255	tio->c_cc[VERASE] = (char)erase;	1214	tio->c_cc[VERASE] = (char)erase;
…		…
1283	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1242	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1284	{	1243	{
1285	tio->sg.sg_erase = CERASE; /* ^H */	1244	tio->sg.sg_erase = CERASE; /* ^H */
1286	tio->sg.sg_kill = CKILL; /* ^U */	1245	tio->sg.sg_kill = CKILL; /* ^U */
1287	}	1246	}
		1247
1288	if (erase != -1)	1248	if (erase != -1)
1289	tio->sg.sg_erase = (char)erase;	1249	tio->sg.sg_erase = (char)erase;
1290		1250
1291	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1251	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1292		1252
…		…
1298	tio->tc.t_startc = CSTART; /* ^Q */	1258	tio->tc.t_startc = CSTART; /* ^Q */
1299	tio->tc.t_stopc = CSTOP; /* ^S */	1259	tio->tc.t_stopc = CSTOP; /* ^S */
1300	tio->tc.t_eofc = CEOF; /* ^D */	1260	tio->tc.t_eofc = CEOF; /* ^D */
1301	tio->tc.t_brkc = -1;	1261	tio->tc.t_brkc = -1;
1302	}	1262	}
		1263
1303	/* get local special chars */	1264	/* get local special chars */
1304	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1265	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1305	{	1266	{
1306	tio->lc.t_suspc = CSUSP; /* ^Z */	1267	tio->lc.t_suspc = CSUSP; /* ^Z */
1307	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1268	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1311	tio->lc.t_lnextc = CLNEXT; /* ^V */	1272	tio->lc.t_lnextc = CLNEXT; /* ^V */
1312	}	1273	}
1313	/* get line discipline */	1274	/* get line discipline */
1314	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1275	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1315	# ifdef NTTYDISC	1276	# ifdef NTTYDISC
1316
1317	tio->line = NTTYDISC;	1277	tio->line = NTTYDISC;
1318	# endif /* NTTYDISC */	1278	# endif /* NTTYDISC */
1319		1279
1320	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1280	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1321	#endif /* HAVE_TERMIOS_H */	1281	#endif /* HAVE_TERMIOS_H */
…		…
1344	FOO (IGNCR, "IGNCR");	1304	FOO (IGNCR, "IGNCR");
1345	FOO (ICRNL, "ICRNL");	1305	FOO (ICRNL, "ICRNL");
1346	FOO (IXON, "IXON");	1306	FOO (IXON, "IXON");
1347	FOO (IXOFF, "IXOFF");	1307	FOO (IXOFF, "IXOFF");
1348	# ifdef IUCLC	1308	# ifdef IUCLC
1349
1350	FOO (IUCLC, "IUCLC");	1309	FOO (IUCLC, "IUCLC");
1351	# endif	1310	# endif
1352	# ifdef IXANY	1311	# ifdef IXANY
1353
1354	FOO (IXANY, "IXANY");	1312	FOO (IXANY, "IXANY");
1355	# endif	1313	# endif
1356	# ifdef IMAXBEL	1314	# ifdef IMAXBEL
1357
1358	FOO (IMAXBEL, "IMAXBEL");	1315	FOO (IMAXBEL, "IMAXBEL");
1359	# endif	1316	# endif
1360		1317
1361	fprintf (stderr, "\n");	1318	fprintf (stderr, "\n");
1362		1319
…		…
1369	FOO (VERASE, "VERASE");	1326	FOO (VERASE, "VERASE");
1370	FOO (VKILL, "VKILL");	1327	FOO (VKILL, "VKILL");
1371	FOO (VEOF, "VEOF");	1328	FOO (VEOF, "VEOF");
1372	FOO (VEOL, "VEOL");	1329	FOO (VEOL, "VEOL");
1373	# ifdef VEOL2	1330	# ifdef VEOL2
1374
1375	FOO (VEOL2, "VEOL2");	1331	FOO (VEOL2, "VEOL2");
1376	# endif	1332	# endif
1377	# ifdef VSWTC	1333	# ifdef VSWTC
1378
1379	FOO (VSWTC, "VSWTC");	1334	FOO (VSWTC, "VSWTC");
1380	# endif	1335	# endif
1381	# ifdef VSWTCH	1336	# ifdef VSWTCH
1382
1383	FOO (VSWTCH, "VSWTCH");	1337	FOO (VSWTCH, "VSWTCH");
1384	# endif	1338	# endif
1385
1386	FOO (VSTART, "VSTART");	1339	FOO (VSTART, "VSTART");
1387	FOO (VSTOP, "VSTOP");	1340	FOO (VSTOP, "VSTOP");
1388	FOO (VSUSP, "VSUSP");	1341	FOO (VSUSP, "VSUSP");
1389	# ifdef VDSUSP	1342	# ifdef VDSUSP
1390
1391	FOO (VDSUSP, "VDSUSP");	1343	FOO (VDSUSP, "VDSUSP");
1392	# endif	1344	# endif
1393	# ifdef VREPRINT	1345	# ifdef VREPRINT
1394
1395	FOO (VREPRINT, "VREPRINT");	1346	FOO (VREPRINT, "VREPRINT");
1396	# endif	1347	# endif
1397	# ifdef VDISCRD	1348	# ifdef VDISCRD
1398
1399	FOO (VDISCRD, "VDISCRD");	1349	FOO (VDISCRD, "VDISCRD");
1400	# endif	1350	# endif
1401	# ifdef VWERSE	1351	# ifdef VWERSE
1402
1403	FOO (VWERSE, "VWERSE");	1352	FOO (VWERSE, "VWERSE");
1404	# endif	1353	# endif
1405	# ifdef VLNEXT	1354	# ifdef VLNEXT
1406
1407	FOO (VLNEXT, "VLNEXT");	1355	FOO (VLNEXT, "VLNEXT");
1408	# endif	1356	# endif
1409		1357
1410	fprintf (stderr, "\n");	1358	fprintf (stderr, "\n");
1411	# undef FOO	1359	# undef FOO
…		…
1423	rxvt_term::run_command (const char const argv)	1371	rxvt_term::run_command (const char const argv)
1424	{	1372	{
1425	#if ENABLE_FRILLS	1373	#if ENABLE_FRILLS
1426	if (rs[Rs_pty_fd])	1374	if (rs[Rs_pty_fd])
1427	{	1375	{
1428	pty.pty = atoi (rs[Rs_pty_fd]);	1376	pty->pty = atoi (rs[Rs_pty_fd]);
1429	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1377
		1378	if (pty->pty >= 0)
		1379	{
		1380	if (getfd_hook)
		1381	pty->pty = (*getfd_hook) (pty->pty);
		1382
		1383	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1384	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1385	}
1430	}	1386	}
1431	else	1387	else
1432	#endif	1388	#endif
1433	if (!pty.get ())	1389	if (!pty->get ())
1434	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1390	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1435		1391
1436	pty.set_utf8_mode (enc_utf8);	1392	pty->set_utf8_mode (enc_utf8);
1437		1393
1438	/* set initial window size */	1394	/* set initial window size */
1439	tt_winch ();	1395	tt_winch ();
1440		1396
1441	int er;	1397	int er;
…		…
1454	#if ENABLE_FRILLS	1410	#if ENABLE_FRILLS
1455	if (rs[Rs_pty_fd])	1411	if (rs[Rs_pty_fd])
1456	return;	1412	return;
1457	#endif	1413	#endif
1458		1414
1459	sw_chld.start (SIGCHLD);
1460
1461	#ifndef __QNX__
1462	/* spin off the command interpreter */	1415	/* spin off the command interpreter */
1463	switch (cmd_pid = fork ())	1416	switch (cmd_pid = fork ())
1464	{	1417	{
1465	case -1:	1418	case -1:
1466	{	1419	{
…		…
1468	rxvt_fatal ("can't fork, aborting.\n");	1421	rxvt_fatal ("can't fork, aborting.\n");
1469	}	1422	}
1470	case 0:	1423	case 0:
1471	init_env ();	1424	init_env ();
1472		1425
1473	if (!pty.make_controlling_tty ())	1426	if (!pty->make_controlling_tty ())
1474	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1427	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1475	else	1428	else
1476	{	1429	{
1477	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1430	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1478	dup2 (pty.tty, STDIN_FILENO);	1431	dup2 (pty->tty, STDIN_FILENO);
1479	dup2 (pty.tty, STDOUT_FILENO);	1432	dup2 (pty->tty, STDOUT_FILENO);
1480	dup2 (pty.tty, STDERR_FILENO);	1433	dup2 (pty->tty, STDERR_FILENO);
1481		1434
1482	// close all our file handles that we do no longer need	1435	// close all our file handles that we do no longer need
1483	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1436	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1484	{	1437	{
1485	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1438	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1486	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1439	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1487	}	1440	}
1488		1441
1489	run_child (argv);	1442	run_child (argv);
1490	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1443	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1491	}	1444	}
1492		1445
1493	_exit (EXIT_FAILURE);	1446	_exit (EXIT_FAILURE);
1494		1447
1495	default:	1448	default:
1496	{	1449	if (!OPTION (Opt_utmpInhibit))
1497	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1450	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1498	int fdstdin;
1499		1451
1500	fdstdin = dup (STDIN_FILENO);	1452	pty->close_tty ();
1501	dup2 (pty.tty, STDIN_FILENO);
1502	#endif
1503		1453
1504	#ifdef UTMP_SUPPORT	1454	child_ev.start (cmd_pid);
1505	privileged_utmp (SAVE);
1506	#endif
1507		1455
1508	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1456	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1509
1510	dup2 (fdstdin, STDIN_FILENO);
1511	close (fdstdin);
1512	#endif
1513	}
1514
1515	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1516	break;	1457	break;
1517	}	1458	}
1518	#else /* __QNX__ uses qnxspawn () */
1519	fchmod (pty.tty, 0622);
1520	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1521	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1522
1523	if (run_child (argv) == -1)
1524	exit (EXIT_FAILURE);
1525	#endif
1526	}	1459	}
1527		1460
1528	/* ------------------------------------------------------------------------- *	1461	/* ------------------------------------------------------------------------- *
1529	* CHILD PROCESS OPERATIONS *	1462	* CHILD PROCESS OPERATIONS *
1530	* ------------------------------------------------------------------------- */	1463	* ------------------------------------------------------------------------- */
…		…
1537	{	1470	{
1538	char *login;	1471	char *login;
1539		1472
1540	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1473	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541		1474
1542	if (options & Opt_console)	1475	if (OPTION (Opt_console))
1543	{ /* be virtual console, fail silently */	1476	{ /* be virtual console, fail silently */
1544	#ifdef TIOCCONS	1477	#ifdef TIOCCONS
1545	unsigned int on = 1;	1478	unsigned int on = 1;
1546		1479
1547	ioctl (STDIN_FILENO, TIOCCONS, &on);	1480	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1574	// unblock signals (signals are blocked by iom.C	1507	// unblock signals (signals are blocked by iom.C
1575	sigset_t ss;	1508	sigset_t ss;
1576	sigemptyset (&ss);	1509	sigemptyset (&ss);
1577	sigprocmask (SIG_SETMASK, &ss, 0);	1510	sigprocmask (SIG_SETMASK, &ss, 0);
1578		1511
1579	#ifndef __QNX__
1580	/* command interpreter path */	1512	/* command interpreter path */
1581	if (argv != NULL)	1513	if (argv != NULL)
1582	{	1514	{
1583	# ifdef DEBUG_CMD	1515	# ifdef DEBUG_CMD
1584	int i;	1516	int i;
…		…
1590	execvp (argv[0], (char const )argv);	1522	execvp (argv[0], (char const )argv);
1591	/* no error message: STDERR is closed! */	1523	/* no error message: STDERR is closed! */
1592	}	1524	}
1593	else	1525	else
1594	{	1526	{
1595	const char argv0, shell;	1527	const char argv0, shell;
1596		1528
1597	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1529	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1598	shell = "/bin/sh";	1530	shell = "/bin/sh";
1599		1531
1600	argv0 = (const char *)rxvt_r_basename (shell);	1532	argv0 = (const char *)rxvt_r_basename (shell);
1601		1533
1602	if (options & Opt_loginShell)	1534	if (OPTION (Opt_loginShell))
1603	{	1535	{
1604	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1536	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1605		1537
1606	login[0] = '-';	1538	login[0] = '-';
1607	strcpy (&login[1], argv0);	1539	strcpy (&login[1], argv0);
1608	argv0 = login;	1540	argv0 = login;
1609	}	1541	}
		1542
1610	execlp (shell, argv0, NULL);	1543	execlp (shell, argv0, NULL);
1611	/* no error message: STDERR is closed! */	1544	/* no error message: STDERR is closed! */
1612	}	1545	}
1613		1546
1614	#else /* __QNX__ uses qnxspawn () */
1615
1616	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1617	char *command = NULL, fullcommand[_MAX_PATH];
1618	char *arg_v, arg_a[2] = { NULL, NULL };
1619
1620	if (argv != NULL)
1621	{
1622	if (access (argv[0], X_OK) == -1)
1623	{
1624	if (strchr (argv[0], '/') == NULL)
1625	{
1626	searchenv (argv[0], "PATH", fullcommand);
1627
1628	if (fullcommand[0] != '\0')
1629	command = fullcommand;
1630	}
1631
1632	if (access (command, X_OK) == -1)
1633	return -1;
1634	}
1635	else
1636	command = argv[0];
1637
1638	arg_v = argv;
1639	}
1640	else
1641	{
1642	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1643	command = "/bin/sh";
1644
1645	arg_a[0] = my_basename (command);
1646
1647	if (options & Opt_loginShell)
1648	{
1649	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1650
1651	login[0] = '-';
1652	strcpy (&login[1], arg_a[0]);
1653	arg_a[0] = login;
1654	}
1655
1656	arg_v = arg_a;
1657	}
1658
1659	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1660	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1661	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1662	command, arg_v, environ, iov_a, 0);
1663	if (login)
1664	free (login);
1665
1666	pty.close_tty ();
1667	return pty.pty;
1668	#endif
1669
1670	return -1;	1547	return -1;
1671	}	1548	}
1672		1549
1673	/----------------------- end-of-file (C source) -----------------------/	1550	/----------------------- 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.119 by root, Thu Aug 11 02:05:07 2005 UTC vs. Revision 1.152 by root, Sat Jan 21 22:38:05 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.152 by root, Sat Jan 21 22:38:05 2006 UTC