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

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