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

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