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

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