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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.115 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC

…		…
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	11	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>	12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	13	* - QNX support
14	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15	*	15	*
16	* This program is free software; you can redistribute it and/or modify	16	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	17	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	18	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	19	* (at your option) any later version.
…		…
34	#include "../config.h" /* NECESSARY */	34	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	35	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	36	#include "rxvtutil.h"
37	#include "init.h"	37	#include "init.h"
38		38
		39	#include <limits>
		40
39	#include <csignal>	41	#include <csignal>
40		42
41	const char *const def_colorName[] =	43	const char *const def_colorName[] =
42	{	44	{
43	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
44	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
45	/* low-intensity colors */	47	/* low-intensity colors */
46	"Black", /* 0: black (#000000) */	48	"Black", /* 0: black (#000000) */
47	#ifndef NO_BRIGHTCOLOR
48	"Red3", /* 1: red (#CD0000) */	49	"Red3", /* 1: red (#CD0000) */
49	"Green3", /* 2: green (#00CD00) */	50	"Green3", /* 2: green (#00CD00) */
50	"Yellow3", /* 3: yellow (#CDCD00) */	51	"Yellow3", /* 3: yellow (#CDCD00) */
51	"Blue3", /* 4: blue (#0000CD) */	52	"Blue3", /* 4: blue (#0000CD) */
52	"Magenta3", /* 5: magenta (#CD00CD) */	53	"Magenta3", /* 5: magenta (#CD00CD) */
…		…
60	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
61	"Grey30", /* 8: bright black (#4D4D4D) */	62	"Grey30", /* 8: bright black (#4D4D4D) */
62	# else	63	# else
63	"Grey25", /* 8: bright black (#404040) */	64	"Grey25", /* 8: bright black (#404040) */
64	# endif	65	# endif
65	#endif /* NO_BRIGHTCOLOR */
66	"Red", /* 1/9: bright red (#FF0000) */	66	"Red", /* 1/9: bright red (#FF0000) */
67	"Green", /* 2/10: bright green (#00FF00) */	67	"Green", /* 2/10: bright green (#00FF00) */
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"Yellow", /* 3/11: bright yellow (#FFFF00) */
69	"Blue", /* 4/12: bright blue (#0000FF) */	69	"Blue", /* 4/12: bright blue (#0000FF) */
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"Magenta", /* 5/13: bright magenta (#FF00FF) */
…		…
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);
363		345
364	/*	346	/*
365	* set any defaults not already set	347	* set any defaults not already set
366	*/	348	*/
…		…
378	if (!rs[Rs_iconName])	360	if (!rs[Rs_iconName])
379	rs[Rs_iconName] = rs[Rs_name];	361	rs[Rs_iconName] = rs[Rs_name];
380	}	362	}
381		363
382	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	364	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
383	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	365	saveLines = min (i, MAX_SAVELINES);
384		366
385	#if ENABLE_FRILLS	367	#if ENABLE_FRILLS
386	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	368	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
387	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	369	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		370
388	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	371	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
389	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	372	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		373
390	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	374	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
391	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	375	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
392	#endif	376	#endif
393		377
394	#ifdef POINTER_BLANK	378	#ifdef POINTER_BLANK
395	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	379	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
396	pointerBlankDelay = i;	380	pointerBlankDelay = i;
397	else	381	else
398	pointerBlankDelay = 2;	382	pointerBlankDelay = 2;
399	#endif	383	#endif
400		384
401	/* no point having a scrollbar without having any scrollback! */	385	/* no point having a scrollbar without having any scrollback! */
402	if (!TermWin.saveLines)	386	if (!saveLines)
403	options &= ~Opt_scrollBar;	387	set_option (Opt_scrollBar, 0);
404		388
405	#ifdef PRINTPIPE	389	#ifdef PRINTPIPE
406	if (!rs[Rs_print_pipe])	390	if (!rs[Rs_print_pipe])
407	rs[Rs_print_pipe] = PRINTPIPE;	391	rs[Rs_print_pipe] = PRINTPIPE;
408	#endif	392	#endif
…		…
451	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	435	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
452	#endif	436	#endif
453		437
454	#ifdef XTERM_REVERSE_VIDEO	438	#ifdef XTERM_REVERSE_VIDEO
455	/* this is how xterm implements reverseVideo */	439	/* this is how xterm implements reverseVideo */
456	if (options & Opt_reverseVideo)	440	if (OPTION (Opt_reverseVideo))
457	{	441	{
458	if (!rs[Rs_color + Color_fg])	442	if (!rs[Rs_color + Color_fg])
459	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	443	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
460	if (!rs[Rs_color + Color_bg])	444	if (!rs[Rs_color + Color_bg])
461	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	445	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
466	if (!rs[Rs_color + i])	450	if (!rs[Rs_color + i])
467	rs[Rs_color + i] = def_colorName[i];	451	rs[Rs_color + i] = def_colorName[i];
468		452
469	#ifndef XTERM_REVERSE_VIDEO	453	#ifndef XTERM_REVERSE_VIDEO
470	/* this is how we implement reverseVideo */	454	/* this is how we implement reverseVideo */
471	if (options & Opt_reverseVideo)	455	if (OPTION (Opt_reverseVideo))
472	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	456	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
473	#endif	457	#endif
474		458
475	/* convenient aliases for setting fg/bg to colors */	459	/* convenient aliases for setting fg/bg to colors */
476	color_aliases (Color_fg);	460	color_aliases (Color_fg);
477	color_aliases (Color_bg);	461	color_aliases (Color_bg);
…		…
527	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	511	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
528		512
529	sprintf (env_display, "DISPLAY=%s", val);	513	sprintf (env_display, "DISPLAY=%s", val);
530		514
531	/* avoiding the math library:	515	/* avoiding the math library:
532	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */	516	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
533	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)	517	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
534	;	518	;
535	MAX_IT (i, 1);	519	max_it (i, 1);
536	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));	520	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
537		521
538	sprintf (env_windowid, "WINDOWID=%u",	522	sprintf (env_windowid, "WINDOWID=%u",
539	(unsigned int)TermWin.parent[0]);	523	(unsigned int)parent[0]);
540		524
541	/* add entries to the environment:	525	/* add entries to the environment:
542	* @ DISPLAY: in case we started with -display	526	* @ DISPLAY: in case we started with -display
543	* @ WINDOWID: X window id number of the window	527	* @ WINDOWID: X window id number of the window
544	* @ COLORTERM: terminal sub-name and also indicates its color	528	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
583	* This should support all European type languages.	567	* This should support all European type languages.
584	*/	568	*/
585	void	569	void
586	rxvt_term::set_locale (const char *locale)	570	rxvt_term::set_locale (const char *locale)
587	{	571	{
		572	set_environ (envv);
		573
588	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	574	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
589	free (this->locale);	575	free (this->locale);
590	this->locale = setlocale (LC_CTYPE, locale);	576	this->locale = setlocale (LC_CTYPE, locale);
591		577
592	if (!this->locale)	578	if (!this->locale)
593	{	579	{
594	if (*locale)	580	if (*locale)
595	{	581	{
596	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	582	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
597	setlocale (LC_CTYPE, "");	583	setlocale (LC_CTYPE, "C");
598	}	584	}
599	else	585	else
600	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	586	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
601		587
602	this->locale = "";	588	this->locale = "C";
603	}	589	}
604		590
605		591
606	this->locale = rxvt_strdup (this->locale);	592	this->locale = rxvt_strdup (this->locale);
607	SET_LOCALE (this->locale);	593	SET_LOCALE (this->locale);
…		…
622	}	608	}
623		609
624	void	610	void
625	rxvt_term::init_xlocale ()	611	rxvt_term::init_xlocale ()
626	{	612	{
		613	set_environ (envv);
		614
627	#ifdef USE_XIM	615	#ifdef USE_XIM
628	if (!locale)	616	if (!locale)
629	rxvt_warn ("setting locale failed, working without locale support.\n");	617	rxvt_warn ("setting locale failed, working without locale support.\n");
630	else	618	else
631	{	619	{
…		…
653	* Initialize the command connection.	641	* Initialize the command connection.
654	* This should be called after the X server connection is established.	642	* This should be called after the X server connection is established.
655	*/	643	*/
656		644
657	#ifdef META8_OPTION	645	#ifdef META8_OPTION
658	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	646	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
659	#endif	647	#endif
660		648
661	get_ourmods ();	649	get_ourmods ();
662		650
663	if (!(options & Opt_scrollTtyOutput))	651	if (!OPTION (Opt_scrollTtyOutput))
664	priv_modes \|= PrivMode_TtyOutputInh;	652	priv_modes \|= PrivMode_TtyOutputInh;
665	if (options & Opt_scrollTtyKeypress)	653	if (OPTION (Opt_scrollTtyKeypress))
666	priv_modes \|= PrivMode_Keypress;	654	priv_modes \|= PrivMode_Keypress;
667	if (!(options & Opt_jumpScroll))	655	if (!OPTION (Opt_jumpScroll))
668	priv_modes \|= PrivMode_smoothScroll;	656	priv_modes \|= PrivMode_smoothScroll;
669		657
670	#ifndef NO_BACKSPACE_KEY	658	#ifndef NO_BACKSPACE_KEY
671	if (strcmp (key_backspace, "DEC") == 0)	659	if (strcmp (key_backspace, "DEC") == 0)
672	priv_modes \|= PrivMode_HaveBackSpace;	660	priv_modes \|= PrivMode_HaveBackSpace;
673	#endif	661	#endif
674		662
675	/* add value for scrollBar */	663	/* add value for scrollBar */
676	if (scrollbar_visible ())	664	if (scrollBar.state)
677	{	665	{
678	priv_modes \|= PrivMode_scrollBar;	666	priv_modes \|= PrivMode_scrollBar;
679	SavedModes \|= PrivMode_scrollBar;	667	SavedModes \|= PrivMode_scrollBar;
680	}	668	}
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		669
693	run_command (argv);	670	run_command (argv);
694	}	671	}
695		672
696	/----------------------------------------------------------------------/	673	/----------------------------------------------------------------------/
…		…
711	continue;	688	continue;
712		689
713	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	690	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
714	{	691	{
715	#ifndef XTERM_REVERSE_VIDEO	692	#ifndef XTERM_REVERSE_VIDEO
716	if (i < 2 && (options & Opt_reverseVideo))	693	if (i < 2 && OPTION (Opt_reverseVideo))
717	rs[Rs_color + i] = def_colorName[!i];	694	rs[Rs_color + i] = def_colorName[!i];
718	else	695	else
719	#endif	696	#endif
720	rs[Rs_color + i] = def_colorName[i];	697	rs[Rs_color + i] = def_colorName[i];
721		698
…		…
746	}	723	}
747	}	724	}
748	}	725	}
749		726
750	pix_colors[i] = xcol;	727	pix_colors[i] = xcol;
		728	SET_PIXCOLOR (i);
		729	}
		730
751	#ifdef OFF_FOCUS_FADING	731	#ifdef OFF_FOCUS_FADING
752	if (rs[Rs_fade])	732	if (rs[Rs_fade])
		733	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));	734	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
754	#endif	735	#endif
755	SET_PIXCOLOR (i);
756	}
757		736
758	if (display->depth <= 2)	737	if (display->depth <= 2)
759	{	738	{
760	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	739	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];	740	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];	741	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
763	}	742	}
764		743
765	/*	744	/*
766	* get scrollBar/menuBar shadow colors	745	* get scrollBar shadow colors
767	*	746	*
768	* The calculations of topShadow/bottomShadow values are adapted	747	* The calculations of topShadow/bottomShadow values are adapted
769	* from the fvwm window manager.	748	* from the fvwm window manager.
770	*/	749	*/
771	#ifdef KEEP_SCROLLCOLOR	750	#ifdef KEEP_SCROLLCOLOR
772		751
773	if (display->depth <= 2)	752	if (display->depth <= 2)
		753	{
774	{ /* Monochrome */	754	/* Monochrome */
775	pix_colors[Color_scroll] = pix_colors[Color_fg];	755	pix_colors[Color_scroll] = pix_colors[Color_fg];
776	pix_colors[Color_topShadow] = pix_colors[Color_bg];	756	pix_colors[Color_topShadow] = pix_colors[Color_bg];
777	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	757	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
778	}	758	}
779	else	759	else
…		…
815	int i = atoi (rs[Rs_color + idx]);	795	int i = atoi (rs[Rs_color + idx]);
816		796
817	if (i >= 8 && i <= 15)	797	if (i >= 8 && i <= 15)
818	{ /* bright colors */	798	{ /* bright colors */
819	i -= 8;	799	i -= 8;
820	#ifndef NO_BRIGHTCOLOR
821	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	800	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
822	return;	801	return;
823	#endif
824	}	802	}
825		803
826	if (i >= 0 && i <= 7) /* normal colors */	804	if (i >= 0 && i <= 7) /* normal colors */
827	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	805	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
828	}	806	}
…		…
927	#if ENABLE_FRILLS	905	#if ENABLE_FRILLS
928	Atom prop = None;	906	Atom prop = None;
929	MWMHints mwmhints;	907	MWMHints mwmhints;
930	#endif	908	#endif
931	XGCValues gcvalue;	909	XGCValues gcvalue;
932	long vt_emask;
933	XSetWindowAttributes attributes;	910	XSetWindowAttributes attributes;
934	XWindowAttributes gattr;	911	XWindowAttributes gattr;
935	Window top, parent;	912	Window top, parent;
936	dDisp;	913	dDisp;
937		914
…		…
941	#endif	918	#endif
942		919
943	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	920	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
944	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	921	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
945		922
946	if (options & Opt_transparent)	923	if (OPTION (Opt_transparent))
947	{	924	{
948	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	925	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
949	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	926	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
950	}	927	}
951		928
		929	/* grab colors before netscape does */
		930	Get_Colours ();
		931
		932	if (!set_fonts ())
		933	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
		934
		935	parent = DefaultRootWindow (disp);
		936
		937	attributes.override_redirect = !!OPTION (Opt_override_redirect);
		938
952	#if ENABLE_FRILLS	939	#if ENABLE_FRILLS
953	if (options & Opt_borderLess)	940	if (OPTION (Opt_borderLess))
954	{	941	{
955	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	942	prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
956		943
957	if (prop == None)	944	if (prop == None)
958	{	945	{
959	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	946	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
960	#ifdef PREFER_24BIT
961	attributes.override_redirect = TRUE;	947	attributes.override_redirect = TRUE;
962	#endif
963	mwmhints.flags = 0;	948	mwmhints.flags = 0;
964	}	949	}
965	else	950	else
966	{	951	{
967	mwmhints.flags = MWM_HINTS_DECORATIONS;	952	mwmhints.flags = MWM_HINTS_DECORATIONS;
968	mwmhints.decorations = 0;	953	mwmhints.decorations = 0;
969	}	954	}
970	}	955	}
971	else	956	else
972	{
973	mwmhints.flags = 0;	957	mwmhints.flags = 0;
974	}
975	#endif	958	#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		959
985	#if ENABLE_XEMBED	960	#if ENABLE_XEMBED
986	if (rs[Rs_embed])	961	if (rs[Rs_embed])
987	{	962	{
988	XWindowAttributes wattr;	963	XWindowAttributes wattr;
…		…
992	if (!XGetWindowAttributes (disp, parent, &wattr))	967	if (!XGetWindowAttributes (disp, parent, &wattr))
993	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	968	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
994		969
995	window_calc (wattr.width, wattr.height);	970	window_calc (wattr.width, wattr.height);
996	}	971	}
997
998	#endif	972	#endif
		973
999	window_calc (0, 0);	974	window_calc (0, 0);
1000		975
1001	/* sub-window placement & size in rxvt_resize_subwindows () */	976	/* sub-window placement & size in rxvt_resize_subwindows () */
1002	#ifdef PREFER_24BIT
1003	attributes.background_pixel = pix_colors_focused[Color_border];	977	attributes.background_pixel = pix_colors_focused[Color_border];
1004	attributes.border_pixel = pix_colors_focused[Color_border];	978	attributes.border_pixel = pix_colors_focused[Color_border];
1005	attributes.colormap = display->cmap;	979	attributes.colormap = display->cmap;
1006	top = XCreateWindow (disp, parent,	980	top = XCreateWindow (disp, parent,
1007	szHint.x, szHint.y,	981	szHint.x, szHint.y,
1008	szHint.width, szHint.height,	982	szHint.width, szHint.height,
1009	TermWin.ext_bwidth,	983	ext_bwidth,
1010	display->depth, InputOutput,	984	display->depth, InputOutput,
1011	display->visual,	985	display->visual,
1012	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	986	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1013	#else	987	&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		988
1022	TermWin.parent[0] = top;	989	this->parent[0] = top;
1023		990
1024	old_width = szHint.width;	991	old_width = szHint.width;
1025	old_height = szHint.height;	992	old_height = szHint.height;
1026		993
1027	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	994	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
…		…
1030	classHint.res_name = (char *)rs[Rs_name];	997	classHint.res_name = (char *)rs[Rs_name];
1031	classHint.res_class = (char *)RESCLASS;	998	classHint.res_class = (char *)RESCLASS;
1032		999
1033	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1000	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1034	wmHint.input = True;	1001	wmHint.input = True;
1035	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1002	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1036	wmHint.window_group = top;	1003	wmHint.window_group = top;
1037		1004
1038	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	1005	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1039	&szHint, &wmHint, &classHint);	1006	&szHint, &wmHint, &classHint);
1040		1007
1041	/* Enable delete window protocol */	1008	Atom protocols[] = {
1042	XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);	1009	xa[XA_WM_DELETE_WINDOW],
		1010	#if ENABLE_EWMH
		1011	xa[XA_NET_WM_PING],
		1012	#endif
		1013	};
		1014
		1015	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043		1016
1044	#if ENABLE_FRILLS	1017	#if ENABLE_FRILLS
		1018	if (rs[Rs_transient_for])
		1019	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		1020	#endif
		1021
		1022	#if ENABLE_EWMH
1045	long pid = getpid ();	1023	long pid = getpid ();
1046		1024
1047	XChangeProperty (disp, top,	1025	XChangeProperty (disp, top,
1048	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1026	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1049	PropModeReplace, (unsigned char *)&pid, 1);	1027	PropModeReplace, (unsigned char *)&pid, 1);
		1028
		1029	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050	#endif	1030	#endif
1051		1031
1052	XSelectInput (disp, top,	1032	XSelectInput (disp, top,
1053	KeyPressMask	1033	KeyPressMask
1054	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1034	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
…		…
1066	#endif	1046	#endif
1067		1047
1068	/* vt cursor: Black-on-White is standard, but this is more popular */	1048	/* vt cursor: Black-on-White is standard, but this is more popular */
1069	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1049	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1070		1050
1071	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1051	#ifdef HAVE_SCROLLBARS
1072	/* cursor (menuBar/scrollBar): Black-on-White */	1052	/* cursor scrollBar: Black-on-White */
1073	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1053	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074	#endif	1054	#endif
1075		1055
1076	/* the vt window */	1056	/* the vt window */
1077	TermWin.vt = XCreateSimpleWindow (disp, top,	1057	vt = XCreateSimpleWindow (disp, top,
1078	window_vt_x,	1058	window_vt_x,
1079	window_vt_y,	1059	window_vt_y,
1080	TermWin_TotalWidth (),	1060	width,
1081	TermWin_TotalHeight (),	1061	height,
1082	0,	1062	0,
1083	pix_colors_focused[Color_fg],	1063	pix_colors_focused[Color_fg],
1084	pix_colors_focused[Color_bg]);	1064	pix_colors_focused[Color_bg]);
1085	#ifdef DEBUG_X	1065	#ifdef DEBUG_X
1086	XStoreName (disp, TermWin.vt, "vt window");	1066	XStoreName (disp, vt, "vt window");
1087	#endif	1067	#endif
1088		1068
1089	attributes.bit_gravity = NorthWestGravity;	1069	attributes.bit_gravity = NorthWestGravity;
1090	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1070	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091		1071
1092	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1072	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1093		1073
1094	#ifdef POINTER_BLANK	1074	if (OPTION (Opt_pointerBlank))
1095	if (options & Opt_pointerBlank)
1096	vt_emask \|= PointerMotionMask;	1075	vt_emask \|= PointerMotionMask;
1097	else	1076	else
1098	#endif
1099	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1077	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1100		1078
1101	XSelectInput (disp, TermWin.vt, vt_emask);	1079	vt_select_input ();
		1080
1102	vt_ev.start (display, TermWin.vt);	1081	vt_ev.start (display, vt);
1103
1104	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105	if (menuBar_height ())
1106	{
1107	menuBar.win = XCreateSimpleWindow (disp, top,
1108	window_vt_x, 0,
1109	TermWin_TotalWidth (),
1110	menuBar_TotalHeight (),
1111	0,
1112	pix_colors_focused[Color_fg],
1113	pix_colors_focused[Color_scroll]);
1114
1115	#ifdef DEBUG_X
1116	XStoreName (disp, menuBar.win, "menubar");
1117	#endif
1118
1119	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1120
1121	XDefineCursor (disp, menuBar.win,
1122	XCreateFontCursor (disp, XC_left_ptr));
1123
1124	XSelectInput (disp, menuBar.win,
1125	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1126	menubar_ev.start (display, menuBar.win);
1127	}
1128	#endif
1129		1082
1130	#ifdef XPM_BACKGROUND	1083	#ifdef XPM_BACKGROUND
1131	if (rs[Rs_backgroundPixmap] != NULL	1084	if (rs[Rs_backgroundPixmap] != NULL
1132	&& ! (options & Opt_transparent))	1085	&& ! OPTION (Opt_transparent))
1133	{	1086	{
1134	const char *p = rs[Rs_backgroundPixmap];	1087	const char *p = rs[Rs_backgroundPixmap];
1135		1088
1136	if ((p = strchr (p, ';')) != NULL)	1089	if ((p = strchr (p, ';')) != NULL)
1137	{	1090	{
…		…
1146		1099
1147	/* graphics context for the vt window */	1100	/* graphics context for the vt window */
1148	gcvalue.foreground = pix_colors[Color_fg];	1101	gcvalue.foreground = pix_colors[Color_fg];
1149	gcvalue.background = pix_colors[Color_bg];	1102	gcvalue.background = pix_colors[Color_bg];
1150	gcvalue.graphics_exposures = 1;	1103	gcvalue.graphics_exposures = 1;
1151	TermWin.gc = XCreateGC (disp, TermWin.vt,	1104	gc = XCreateGC (disp, vt,
1152	GCForeground \| GCBackground \| GCGraphicsExposures,	1105	GCForeground \| GCBackground \| GCGraphicsExposures,
1153	&gcvalue);	1106	&gcvalue);
1154		1107
1155	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1108	drawable = new rxvt_drawable (display, vt);
1156		1109
1157	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1110	#ifdef RXVT_SCROLLBAR
1158	gcvalue.foreground = pix_colors[Color_topShadow];	1111	gcvalue.foreground = pix_colors[Color_topShadow];
1159	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1112	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160	gcvalue.foreground = pix_colors[Color_bottomShadow];	1113	gcvalue.foreground = pix_colors[Color_bottomShadow];
1161	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1114	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1115	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1163	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1116	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164	#endif	1117	#endif
1165		1118
1166	#ifdef OFF_FOCUS_FADING	1119	#ifdef OFF_FOCUS_FADING
1167	// initially we are in unfocused state	1120	// initially we are in unfocused state
1168	if (rs[Rs_fade])	1121	if (rs[Rs_fade])
…		…
1193	/*	1146	/*
1194	* standard System V termios interface	1147	* standard System V termios interface
1195	*/	1148	*/
1196	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1149	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197	{	1150	{
1198	/* return error - use system defaults */	1151	// return error - use system defaults,
		1152	// where possible, and zero elsewhere
		1153	memset (tio, 0, sizeof (ttymode_t));
		1154
1199	tio->c_cc[VINTR] = CINTR;	1155	tio->c_cc[VINTR] = CINTR;
1200	tio->c_cc[VQUIT] = CQUIT;	1156	tio->c_cc[VQUIT] = CQUIT;
1201	tio->c_cc[VERASE] = CERASE;	1157	tio->c_cc[VERASE] = CERASE;
		1158	#ifdef VERASE2
		1159	tio->c_cc[VERASE2] = CERASE2;
		1160	#endif
1202	tio->c_cc[VKILL] = CKILL;	1161	tio->c_cc[VKILL] = CKILL;
1203	tio->c_cc[VSTART] = CSTART;	1162	tio->c_cc[VSTART] = CSTART;
1204	tio->c_cc[VSTOP] = CSTOP;	1163	tio->c_cc[VSTOP] = CSTOP;
1205	tio->c_cc[VSUSP] = CSUSP;	1164	tio->c_cc[VSUSP] = CSUSP;
1206	# ifdef VDSUSP	1165	# ifdef VDSUSP
1207
1208	tio->c_cc[VDSUSP] = CDSUSP;	1166	tio->c_cc[VDSUSP] = CDSUSP;
1209	# endif	1167	# endif
1210	# ifdef VREPRINT	1168	# ifdef VREPRINT
1211
1212	tio->c_cc[VREPRINT] = CRPRNT;	1169	tio->c_cc[VREPRINT] = CRPRNT;
1213	# endif	1170	# endif
1214	# ifdef VDISCRD	1171	# ifdef VDISCRD
1215
1216	tio->c_cc[VDISCRD] = CFLUSH;	1172	tio->c_cc[VDISCRD] = CFLUSH;
1217	# endif	1173	# endif
1218	# ifdef VWERSE	1174	# ifdef VWERSE
1219
1220	tio->c_cc[VWERSE] = CWERASE;	1175	tio->c_cc[VWERSE] = CWERASE;
1221	# endif	1176	# endif
1222	# ifdef VLNEXT	1177	# ifdef VLNEXT
1223
1224	tio->c_cc[VLNEXT] = CLNEXT;	1178	tio->c_cc[VLNEXT] = CLNEXT;
1225	# endif	1179	# endif
1226
1227	}	1180	}
		1181
1228	tio->c_cc[VEOF] = CEOF;	1182	tio->c_cc[VEOF] = CEOF;
1229	tio->c_cc[VEOL] = VDISABLE;	1183	tio->c_cc[VEOL] = VDISABLE;
1230	# ifdef VEOL2	1184	# ifdef VEOL2
1231
1232	tio->c_cc[VEOL2] = VDISABLE;	1185	tio->c_cc[VEOL2] = VDISABLE;
1233	# endif	1186	# endif
1234	# ifdef VSWTC	1187	# ifdef VSWTC
1235
1236	tio->c_cc[VSWTC] = VDISABLE;	1188	tio->c_cc[VSWTC] = VDISABLE;
1237	# endif	1189	# endif
1238	# ifdef VSWTCH	1190	# ifdef VSWTCH
1239
1240	tio->c_cc[VSWTCH] = VDISABLE;	1191	tio->c_cc[VSWTCH] = VDISABLE;
1241	# endif	1192	# endif
1242	# if VMIN != VEOF	1193	# if VMIN != VEOF
1243
1244	tio->c_cc[VMIN] = 1;	1194	tio->c_cc[VMIN] = 1;
1245	# endif	1195	# endif
1246	# if VTIME != VEOL	1196	# if VTIME != VEOL
1247
1248	tio->c_cc[VTIME] = 0;	1197	tio->c_cc[VTIME] = 0;
1249	# endif	1198	# endif
1250		1199
1251	if (erase != -1)	1200	if (erase != -1)
1252	tio->c_cc[VERASE] = (char)erase;	1201	tio->c_cc[VERASE] = (char)erase;
…		…
1280	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1229	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281	{	1230	{
1282	tio->sg.sg_erase = CERASE; /* ^H */	1231	tio->sg.sg_erase = CERASE; /* ^H */
1283	tio->sg.sg_kill = CKILL; /* ^U */	1232	tio->sg.sg_kill = CKILL; /* ^U */
1284	}	1233	}
		1234
1285	if (erase != -1)	1235	if (erase != -1)
1286	tio->sg.sg_erase = (char)erase;	1236	tio->sg.sg_erase = (char)erase;
1287		1237
1288	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1238	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1289		1239
…		…
1295	tio->tc.t_startc = CSTART; /* ^Q */	1245	tio->tc.t_startc = CSTART; /* ^Q */
1296	tio->tc.t_stopc = CSTOP; /* ^S */	1246	tio->tc.t_stopc = CSTOP; /* ^S */
1297	tio->tc.t_eofc = CEOF; /* ^D */	1247	tio->tc.t_eofc = CEOF; /* ^D */
1298	tio->tc.t_brkc = -1;	1248	tio->tc.t_brkc = -1;
1299	}	1249	}
		1250
1300	/* get local special chars */	1251	/* get local special chars */
1301	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1252	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1302	{	1253	{
1303	tio->lc.t_suspc = CSUSP; /* ^Z */	1254	tio->lc.t_suspc = CSUSP; /* ^Z */
1304	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1255	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1308	tio->lc.t_lnextc = CLNEXT; /* ^V */	1259	tio->lc.t_lnextc = CLNEXT; /* ^V */
1309	}	1260	}
1310	/* get line discipline */	1261	/* get line discipline */
1311	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1262	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1312	# ifdef NTTYDISC	1263	# ifdef NTTYDISC
1313
1314	tio->line = NTTYDISC;	1264	tio->line = NTTYDISC;
1315	# endif /* NTTYDISC */	1265	# endif /* NTTYDISC */
1316		1266
1317	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1267	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1318	#endif /* HAVE_TERMIOS_H */	1268	#endif /* HAVE_TERMIOS_H */
…		…
1341	FOO (IGNCR, "IGNCR");	1291	FOO (IGNCR, "IGNCR");
1342	FOO (ICRNL, "ICRNL");	1292	FOO (ICRNL, "ICRNL");
1343	FOO (IXON, "IXON");	1293	FOO (IXON, "IXON");
1344	FOO (IXOFF, "IXOFF");	1294	FOO (IXOFF, "IXOFF");
1345	# ifdef IUCLC	1295	# ifdef IUCLC
1346
1347	FOO (IUCLC, "IUCLC");	1296	FOO (IUCLC, "IUCLC");
1348	# endif	1297	# endif
1349	# ifdef IXANY	1298	# ifdef IXANY
1350
1351	FOO (IXANY, "IXANY");	1299	FOO (IXANY, "IXANY");
1352	# endif	1300	# endif
1353	# ifdef IMAXBEL	1301	# ifdef IMAXBEL
1354
1355	FOO (IMAXBEL, "IMAXBEL");	1302	FOO (IMAXBEL, "IMAXBEL");
1356	# endif	1303	# endif
1357		1304
1358	fprintf (stderr, "\n");	1305	fprintf (stderr, "\n");
1359		1306
…		…
1366	FOO (VERASE, "VERASE");	1313	FOO (VERASE, "VERASE");
1367	FOO (VKILL, "VKILL");	1314	FOO (VKILL, "VKILL");
1368	FOO (VEOF, "VEOF");	1315	FOO (VEOF, "VEOF");
1369	FOO (VEOL, "VEOL");	1316	FOO (VEOL, "VEOL");
1370	# ifdef VEOL2	1317	# ifdef VEOL2
1371
1372	FOO (VEOL2, "VEOL2");	1318	FOO (VEOL2, "VEOL2");
1373	# endif	1319	# endif
1374	# ifdef VSWTC	1320	# ifdef VSWTC
1375
1376	FOO (VSWTC, "VSWTC");	1321	FOO (VSWTC, "VSWTC");
1377	# endif	1322	# endif
1378	# ifdef VSWTCH	1323	# ifdef VSWTCH
1379
1380	FOO (VSWTCH, "VSWTCH");	1324	FOO (VSWTCH, "VSWTCH");
1381	# endif	1325	# endif
1382
1383	FOO (VSTART, "VSTART");	1326	FOO (VSTART, "VSTART");
1384	FOO (VSTOP, "VSTOP");	1327	FOO (VSTOP, "VSTOP");
1385	FOO (VSUSP, "VSUSP");	1328	FOO (VSUSP, "VSUSP");
1386	# ifdef VDSUSP	1329	# ifdef VDSUSP
1387
1388	FOO (VDSUSP, "VDSUSP");	1330	FOO (VDSUSP, "VDSUSP");
1389	# endif	1331	# endif
1390	# ifdef VREPRINT	1332	# ifdef VREPRINT
1391
1392	FOO (VREPRINT, "VREPRINT");	1333	FOO (VREPRINT, "VREPRINT");
1393	# endif	1334	# endif
1394	# ifdef VDISCRD	1335	# ifdef VDISCRD
1395
1396	FOO (VDISCRD, "VDISCRD");	1336	FOO (VDISCRD, "VDISCRD");
1397	# endif	1337	# endif
1398	# ifdef VWERSE	1338	# ifdef VWERSE
1399
1400	FOO (VWERSE, "VWERSE");	1339	FOO (VWERSE, "VWERSE");
1401	# endif	1340	# endif
1402	# ifdef VLNEXT	1341	# ifdef VLNEXT
1403
1404	FOO (VLNEXT, "VLNEXT");	1342	FOO (VLNEXT, "VLNEXT");
1405	# endif	1343	# endif
1406		1344
1407	fprintf (stderr, "\n");	1345	fprintf (stderr, "\n");
1408	# undef FOO	1346	# undef FOO
…		…
1420	rxvt_term::run_command (const char const argv)	1358	rxvt_term::run_command (const char const argv)
1421	{	1359	{
1422	#if ENABLE_FRILLS	1360	#if ENABLE_FRILLS
1423	if (rs[Rs_pty_fd])	1361	if (rs[Rs_pty_fd])
1424	{	1362	{
1425	pty.pty = atoi (rs[Rs_pty_fd]);	1363	pty->pty = atoi (rs[Rs_pty_fd]);
1426	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1364
		1365	if (pty->pty >= 0)
		1366	{
		1367	if (getfd_hook)
		1368	pty->pty = (*getfd_hook) (pty->pty);
		1369
		1370	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1371	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1372	}
1427	}	1373	}
1428	else	1374	else
1429	#endif	1375	#endif
1430	if (!pty.get ())	1376	if (!pty->get ())
1431	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1377	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1432		1378
1433	pty.set_utf8_mode (enc_utf8);	1379	pty->set_utf8_mode (enc_utf8);
1434		1380
1435	/* set initial window size */	1381	/* set initial window size */
1436	tt_winch ();	1382	tt_winch ();
1437		1383
1438	int er;	1384	int er;
…		…
1451	#if ENABLE_FRILLS	1397	#if ENABLE_FRILLS
1452	if (rs[Rs_pty_fd])	1398	if (rs[Rs_pty_fd])
1453	return;	1399	return;
1454	#endif	1400	#endif
1455		1401
1456	sw_chld.start (SIGCHLD);
1457
1458	#ifndef __QNX__
1459	/* spin off the command interpreter */	1402	/* spin off the command interpreter */
1460	switch (cmd_pid = fork ())	1403	switch (cmd_pid = fork ())
1461	{	1404	{
1462	case -1:	1405	case -1:
1463	{	1406	{
…		…
1465	rxvt_fatal ("can't fork, aborting.\n");	1408	rxvt_fatal ("can't fork, aborting.\n");
1466	}	1409	}
1467	case 0:	1410	case 0:
1468	init_env ();	1411	init_env ();
1469		1412
1470	if (!pty.make_controlling_tty ())	1413	if (!pty->make_controlling_tty ())
1471	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1414	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1472	else	1415	else
1473	{	1416	{
1474	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1417	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1475	dup2 (pty.tty, STDIN_FILENO);	1418	dup2 (pty->tty, STDIN_FILENO);
1476	dup2 (pty.tty, STDOUT_FILENO);	1419	dup2 (pty->tty, STDOUT_FILENO);
1477	dup2 (pty.tty, STDERR_FILENO);	1420	dup2 (pty->tty, STDERR_FILENO);
1478		1421
1479	// close all our file handles that we do no longer need	1422	// close all our file handles that we do no longer need
1480	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1423	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1481	{	1424	{
1482	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1425	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1483	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1426	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1484	}	1427	}
1485		1428
1486	run_child (argv);	1429	run_child (argv);
1487	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1430	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1488	}	1431	}
1489		1432
1490	_exit (EXIT_FAILURE);	1433	_exit (EXIT_FAILURE);
1491		1434
1492	default:	1435	default:
1493	{
1494	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1495	int fdstdin;
1496
1497	fdstdin = dup (STDIN_FILENO);
1498	dup2 (pty.tty, STDIN_FILENO);
1499	#endif
1500
1501	#ifdef UTMP_SUPPORT	1436	#if UTMP_SUPPORT
1502	privileged_utmp (SAVE);	1437	if (!OPTION (Opt_utmpInhibit))
		1438	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1503	#endif	1439	#endif
1504		1440
1505	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1441	pty->close_tty ();
1506		1442
1507	dup2 (fdstdin, STDIN_FILENO);	1443	child_ev.start (cmd_pid);
1508	close (fdstdin);
1509	#endif
1510	}
1511		1444
1512	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */	1445	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1513	break;	1446	break;
1514	}	1447	}
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	}	1448	}
1524		1449
1525	/* ------------------------------------------------------------------------- *	1450	/* ------------------------------------------------------------------------- *
1526	* CHILD PROCESS OPERATIONS *	1451	* CHILD PROCESS OPERATIONS *
1527	* ------------------------------------------------------------------------- */	1452	* ------------------------------------------------------------------------- */
…		…
1534	{	1459	{
1535	char *login;	1460	char *login;
1536		1461
1537	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1462	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1538		1463
1539	if (options & Opt_console)	1464	if (OPTION (Opt_console))
1540	{ /* be virtual console, fail silently */	1465	{ /* be virtual console, fail silently */
1541	#ifdef TIOCCONS	1466	#ifdef TIOCCONS
1542	unsigned int on = 1;	1467	unsigned int on = 1;
1543		1468
1544	ioctl (STDIN_FILENO, TIOCCONS, &on);	1469	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1571	// unblock signals (signals are blocked by iom.C	1496	// unblock signals (signals are blocked by iom.C
1572	sigset_t ss;	1497	sigset_t ss;
1573	sigemptyset (&ss);	1498	sigemptyset (&ss);
1574	sigprocmask (SIG_SETMASK, &ss, 0);	1499	sigprocmask (SIG_SETMASK, &ss, 0);
1575		1500
1576	#ifndef __QNX__
1577	/* command interpreter path */	1501	/* command interpreter path */
1578	if (argv != NULL)	1502	if (argv != NULL)
1579	{	1503	{
1580	# ifdef DEBUG_CMD	1504	# ifdef DEBUG_CMD
1581	int i;	1505	int i;
…		…
1587	execvp (argv[0], (char const )argv);	1511	execvp (argv[0], (char const )argv);
1588	/* no error message: STDERR is closed! */	1512	/* no error message: STDERR is closed! */
1589	}	1513	}
1590	else	1514	else
1591	{	1515	{
1592	const char argv0, shell;	1516	const char argv0, shell;
1593		1517
1594	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1518	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1595	shell = "/bin/sh";	1519	shell = "/bin/sh";
1596		1520
1597	argv0 = (const char *)rxvt_r_basename (shell);	1521	argv0 = (const char *)rxvt_r_basename (shell);
1598		1522
1599	if (options & Opt_loginShell)	1523	if (OPTION (Opt_loginShell))
1600	{	1524	{
1601	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1525	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1602		1526
1603	login[0] = '-';	1527	login[0] = '-';
1604	strcpy (&login[1], argv0);	1528	strcpy (&login[1], argv0);
1605	argv0 = login;	1529	argv0 = login;
1606	}	1530	}
		1531
1607	execlp (shell, argv0, NULL);	1532	execlp (shell, argv0, NULL);
1608	/* no error message: STDERR is closed! */	1533	/* no error message: STDERR is closed! */
1609	}	1534	}
1610		1535
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;	1536	return -1;
1668	}	1537	}
1669		1538
1670	/----------------------- end-of-file (C source) -----------------------/	1539	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.115 by root, Sun Feb 20 02:00:43 2005 UTC vs. Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.115 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC