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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.118 by root, Wed Aug 10 15:10:06 2005 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 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	};	174	#if OFF_FOCUS_FADING
175		175	"black",
176	const char *const xa_names[] =
177	{
178	"TEXT",
179	"COMPOUND_TEXT",
180	"UTF8_STRING",
181	"MULTIPLE",
182	"TARGETS",
183	"TIMESTAMP",
184	"VT_SELECTION",
185	"INCR",
186	"WM_PROTOCOLS",
187	"WM_DELETE_WINDOW",
188	"CLIPBOARD",
189	#if ENABLE_FRILLS
190	"_MOTIF_WM_HINTS",
191	#endif
192	#if ENABLE_EWMH
193	"_NET_WM_PID",
194	"_NET_WM_NAME",
195	"_NET_WM_ICON_NAME",
196	"_NET_WM_PING",
197	#endif
198	#if USE_XIM
199	"WM_LOCALE_NAME",
200	#endif
201	#ifdef TRANSPARENT
202	"_XROOTPMAP_ID",
203	"ESETROOT_PMAP_ID",
204	#endif
205	#ifdef OFFIX_DND
206	"DndProtocol",
207	"DndSelection",
208	#endif
209	#if ENABLE_XEMBED
210	"_XEMBED",
211	"_XEMBED_INFO",
212	#endif	176	#endif
213	};	177	};
214		178
215	bool	179	bool
216	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
217	{	181	{
218	sw_term.start (SIGTERM);	182	pix_colors = //
219	sw_int.start (SIGINT);
220
221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224	#endif	186	#endif
225	pix_colors = pix_colors_focused;
226
227	if (pix_colors == NULL)
228	return false;
229		187
230	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
231	TermWin.pixmap = None;	189	pixmap = None;
232	#endif	190	#endif
233		191
234	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
235	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
236	options = DEFAULT_OPTIONS;	194	options = DEFAULT_OPTIONS;
237	want_refresh = 1;	195	want_refresh = 1;
238	priv_modes = SavedModes = PrivMode_Default;	196	priv_modes = SavedModes = PrivMode_Default;
239	TermWin.focus = 0;
240	TermWin.ncol = 80;	197	ncol = 80;
241	TermWin.nrow = 24;	198	nrow = 24;
242	TermWin.int_bwidth = INTERNALBORDERWIDTH;	199	int_bwidth = INTERNALBORDERWIDTH;
243	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	200	ext_bwidth = EXTERNALBORDERWIDTH;
244	TermWin.lineSpace = LINESPACE;	201	lineSpace = LINESPACE;
245	TermWin.saveLines = SAVELINES;	202	saveLines = SAVELINES;
246	numpix_colors = TOTAL_COLORS;	203	numpix_colors = TOTAL_COLORS;
247		204
248	refresh_limit = 1;	205	refresh_limit = 1;
249	refresh_type = SLOW_REFRESH;	206	refresh_type = SLOW_REFRESH;
250	prev_nrow = prev_ncol = 0;
251		207
252	oldcursor.row = oldcursor.col = -1;	208	oldcursor.row = oldcursor.col = -1;
253	#ifdef XPM_BACKGROUND	209	#ifdef XPM_BACKGROUND
254	/* bgPixmap.w = bgPixmap.h = 0; */	210	/* bgPixmap.w = bgPixmap.h = 0; */
255	bgPixmap.x = bgPixmap.y = 50;	211	bgPixmap.x = bgPixmap.y = 50;
256	bgPixmap.pixmap = None;	212	bgPixmap.pixmap = None;
257	#endif	213	#endif
258		214
259	last_bot = last_state = -1;	215	last_bot = last_state = -1;
260
261	#ifdef MENUBAR
262	menu_readonly = 1;
263	# if ! (MENUBAR_MAX > 1)
264	CurrentBar = &BarList;
265	# endif /* (MENUBAR_MAX > 1) */
266	#endif
267		216
268	return true;	217	return true;
269	}	218	}
270		219
271	void	220	void
…		…
339	rs[Rs_name] = rxvt_r_basename (argv[0]);	288	rs[Rs_name] = rxvt_r_basename (argv[0]);
340		289
341	/*	290	/*
342	* Open display, get options/resources and create the window	291	* Open display, get options/resources and create the window
343	*/	292	*/
		293
344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	294	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345	rs[Rs_display_name] = ":0";	295	rs[Rs_display_name] = ":0";
346		296
347	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
348		298
349	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
350	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351		301
352	extract_resources ();	302	extract_resources ();
		303
353	free (r_argv);	304	free (r_argv);
		305
		306	#if ENABLE_PERL
		307	if (!rs[Rs_perl_ext_1])
		308	rs[Rs_perl_ext_1] = "default";
		309
		310	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		311	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		312	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		313	{
		314	rxvt_perl.init (this);
		315	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		316	}
		317	#endif
354		318
355	/*	319	/*
356	* set any defaults not already set	320	* set any defaults not already set
357	*/	321	*/
358	if (cmd_argv && cmd_argv[0])	322	if (cmd_argv && cmd_argv[0])
…		…
369	if (!rs[Rs_iconName])	333	if (!rs[Rs_iconName])
370	rs[Rs_iconName] = rs[Rs_name];	334	rs[Rs_iconName] = rs[Rs_name];
371	}	335	}
372		336
373	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	337	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	338	saveLines = min (i, MAX_SAVELINES);
375		339
376	#if ENABLE_FRILLS	340	#if ENABLE_FRILLS
377	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	341	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	342	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		343
379	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	344	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	345	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		346
381	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	347	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	348	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383	#endif	349	#endif
384		350
385	#ifdef POINTER_BLANK	351	#ifdef POINTER_BLANK
386	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	352	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387	pointerBlankDelay = i;	353	pointerBlankDelay = i;
388	else	354	else
389	pointerBlankDelay = 2;	355	pointerBlankDelay = 2;
390	#endif	356	#endif
391		357
392	/* no point having a scrollbar without having any scrollback! */	358	/* no point having a scrollbar without having any scrollback! */
393	if (!TermWin.saveLines)	359	if (!saveLines)
394	options &= ~Opt_scrollBar;	360	set_option (Opt_scrollBar, 0);
395		361
396	#ifdef PRINTPIPE	362	#ifdef PRINTPIPE
397	if (!rs[Rs_print_pipe])	363	if (!rs[Rs_print_pipe])
398	rs[Rs_print_pipe] = PRINTPIPE;	364	rs[Rs_print_pipe] = PRINTPIPE;
399	#endif	365	#endif
…		…
442	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	408	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443	#endif	409	#endif
444		410
445	#ifdef XTERM_REVERSE_VIDEO	411	#ifdef XTERM_REVERSE_VIDEO
446	/* this is how xterm implements reverseVideo */	412	/* this is how xterm implements reverseVideo */
447	if (options & Opt_reverseVideo)	413	if (OPTION (Opt_reverseVideo))
448	{	414	{
449	if (!rs[Rs_color + Color_fg])	415	if (!rs[Rs_color + Color_fg])
450	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	416	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451	if (!rs[Rs_color + Color_bg])	417	if (!rs[Rs_color + Color_bg])
452	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	418	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
457	if (!rs[Rs_color + i])	423	if (!rs[Rs_color + i])
458	rs[Rs_color + i] = def_colorName[i];	424	rs[Rs_color + i] = def_colorName[i];
459		425
460	#ifndef XTERM_REVERSE_VIDEO	426	#ifndef XTERM_REVERSE_VIDEO
461	/* this is how we implement reverseVideo */	427	/* this is how we implement reverseVideo */
462	if (options & Opt_reverseVideo)	428	if (OPTION (Opt_reverseVideo))
463	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	429	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464	#endif	430	#endif
465		431
466	/* convenient aliases for setting fg/bg to colors */	432	/* convenient aliases for setting fg/bg to colors */
467	color_aliases (Color_fg);	433	color_aliases (Color_fg);
468	color_aliases (Color_bg);	434	color_aliases (Color_bg);
…		…
517	i = strlen (val);	483	i = strlen (val);
518	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	484	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
519		485
520	sprintf (env_display, "DISPLAY=%s", val);	486	sprintf (env_display, "DISPLAY=%s", val);
521		487
522	/* avoiding the math library:	488	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
523	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
524	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
525	;
526	MAX_IT (i, 1);
527	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
528
529	sprintf (env_windowid, "WINDOWID=%u",
530	(unsigned int)TermWin.parent[0]);
531		489
532	/* add entries to the environment:	490	/* add entries to the environment:
533	* @ DISPLAY: in case we started with -display	491	* @ DISPLAY: in case we started with -display
534	* @ WINDOWID: X window id number of the window	492	* @ WINDOWID: X window id number of the window
535	* @ COLORTERM: terminal sub-name and also indicates its color	493	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
537	* @ TERMINFO: path to terminfo directory	495	* @ TERMINFO: path to terminfo directory
538	* @ COLORFGBG: fg;bg color codes	496	* @ COLORFGBG: fg;bg color codes
539	*/	497	*/
540	putenv (env_display);	498	putenv (env_display);
541	putenv (env_windowid);	499	putenv (env_windowid);
		500
542	if (env_colorfgbg)	501	if (env_colorfgbg)
543	putenv (env_colorfgbg);	502	putenv (env_colorfgbg);
544		503
545	#ifdef RXVT_TERMINFO	504	#ifdef RXVT_TERMINFO
546	putenv ("TERMINFO=" RXVT_TERMINFO);	505	putenv ("TERMINFO=" RXVT_TERMINFO);
…		…
574	* This should support all European type languages.	533	* This should support all European type languages.
575	*/	534	*/
576	void	535	void
577	rxvt_term::set_locale (const char *locale)	536	rxvt_term::set_locale (const char *locale)
578	{	537	{
		538	set_environ (envv);
		539
579	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	540	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
580	free (this->locale);	541	free (this->locale);
581	this->locale = setlocale (LC_CTYPE, locale);	542	this->locale = setlocale (LC_CTYPE, locale);
582		543
583	if (!this->locale)	544	if (!this->locale)
584	{	545	{
585	if (*locale)	546	if (*locale)
586	{	547	{
587	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	548	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
588	setlocale (LC_CTYPE, "");	549	setlocale (LC_CTYPE, "C");
589	}	550	}
590	else	551	else
591	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	552	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
592		553
593	this->locale = "";	554	this->locale = "C";
594	}	555	}
595		556
596		557
597	this->locale = rxvt_strdup (this->locale);	558	this->locale = rxvt_strdup (this->locale);
598	SET_LOCALE (this->locale);	559	SET_LOCALE (this->locale);
…		…
613	}	574	}
614		575
615	void	576	void
616	rxvt_term::init_xlocale ()	577	rxvt_term::init_xlocale ()
617	{	578	{
		579	set_environ (envv);
		580
618	#ifdef USE_XIM	581	#ifdef USE_XIM
619	if (!locale)	582	if (!locale)
620	rxvt_warn ("setting locale failed, working without locale support.\n");	583	rxvt_warn ("setting locale failed, working without locale support.\n");
621	else	584	else
622	{	585	{
…		…
644	* Initialize the command connection.	607	* Initialize the command connection.
645	* This should be called after the X server connection is established.	608	* This should be called after the X server connection is established.
646	*/	609	*/
647		610
648	#ifdef META8_OPTION	611	#ifdef META8_OPTION
649	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	612	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650	#endif	613	#endif
651		614
652	get_ourmods ();	615	get_ourmods ();
653		616
654	if (!(options & Opt_scrollTtyOutput))	617	if (!OPTION (Opt_scrollTtyOutput))
655	priv_modes \|= PrivMode_TtyOutputInh;	618	priv_modes \|= PrivMode_TtyOutputInh;
656	if (options & Opt_scrollTtyKeypress)	619	if (OPTION (Opt_scrollTtyKeypress))
657	priv_modes \|= PrivMode_Keypress;	620	priv_modes \|= PrivMode_Keypress;
658	if (!(options & Opt_jumpScroll))	621	if (!OPTION (Opt_jumpScroll))
659	priv_modes \|= PrivMode_smoothScroll;	622	priv_modes \|= PrivMode_smoothScroll;
660		623
661	#ifndef NO_BACKSPACE_KEY	624	#ifndef NO_BACKSPACE_KEY
662	if (strcmp (key_backspace, "DEC") == 0)	625	if (strcmp (key_backspace, "DEC") == 0)
663	priv_modes \|= PrivMode_HaveBackSpace;	626	priv_modes \|= PrivMode_HaveBackSpace;
664	#endif	627	#endif
665		628
666	/* add value for scrollBar */	629	/* add value for scrollBar */
667	if (scrollbar_visible ())	630	if (scrollBar.state)
668	{	631	{
669	priv_modes \|= PrivMode_scrollBar;	632	priv_modes \|= PrivMode_scrollBar;
670	SavedModes \|= PrivMode_scrollBar;	633	SavedModes \|= PrivMode_scrollBar;
671	}	634	}
672
673	if (menubar_visible ())
674	{
675	priv_modes \|= PrivMode_menuBar;
676	SavedModes \|= PrivMode_menuBar;
677	}
678
679	#ifdef CURSOR_BLINK
680	if (options & Opt_cursorBlink)
681	(void)gettimeofday (&lastcursorchange, NULL);
682	#endif
683		635
684	run_command (argv);	636	run_command (argv);
685	}	637	}
686		638
687	/----------------------------------------------------------------------/	639	/----------------------------------------------------------------------/
…		…
702	continue;	654	continue;
703		655
704	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	656	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705	{	657	{
706	#ifndef XTERM_REVERSE_VIDEO	658	#ifndef XTERM_REVERSE_VIDEO
707	if (i < 2 && (options & Opt_reverseVideo))	659	if (i < 2 && OPTION (Opt_reverseVideo))
708	rs[Rs_color + i] = def_colorName[!i];	660	rs[Rs_color + i] = def_colorName[!i];
709	else	661	else
710	#endif	662	#endif
711	rs[Rs_color + i] = def_colorName[i];	663	rs[Rs_color + i] = def_colorName[i];
712		664
…		…
737	}	689	}
738	}	690	}
739	}	691	}
740		692
741	pix_colors[i] = xcol;	693	pix_colors[i] = xcol;
		694	SET_PIXCOLOR (i);
		695	}
		696
742	#ifdef OFF_FOCUS_FADING	697	#ifdef OFF_FOCUS_FADING
743	if (rs[Rs_fade])	698	if (rs[Rs_fade])
		699	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));	700	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745	#endif	701	#endif
746	SET_PIXCOLOR (i);
747	}
748		702
749	if (display->depth <= 2)	703	if (display->depth <= 2)
750	{	704	{
751	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	705	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
752	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	706	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
753	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	707	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
754	}	708	}
755		709
756	/*	710	/*
757	* get scrollBar/menuBar shadow colors	711	* get scrollBar shadow colors
758	*	712	*
759	* The calculations of topShadow/bottomShadow values are adapted	713	* The calculations of topShadow/bottomShadow values are adapted
760	* from the fvwm window manager.	714	* from the fvwm window manager.
761	*/	715	*/
762	#ifdef KEEP_SCROLLCOLOR	716	#ifdef KEEP_SCROLLCOLOR
…		…
807	int i = atoi (rs[Rs_color + idx]);	761	int i = atoi (rs[Rs_color + idx]);
808		762
809	if (i >= 8 && i <= 15)	763	if (i >= 8 && i <= 15)
810	{ /* bright colors */	764	{ /* bright colors */
811	i -= 8;	765	i -= 8;
812	#ifndef NO_BRIGHTCOLOR
813	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	766	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
814	return;	767	return;
815	#endif
816	}	768	}
817		769
818	if (i >= 0 && i <= 7) /* normal colors */	770	if (i >= 0 && i <= 7) /* normal colors */
819	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	771	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
820	}	772	}
…		…
915	rxvt_term::create_windows (int argc, const char const argv)	867	rxvt_term::create_windows (int argc, const char const argv)
916	{	868	{
917	XClassHint classHint;	869	XClassHint classHint;
918	XWMHints wmHint;	870	XWMHints wmHint;
919	#if ENABLE_FRILLS	871	#if ENABLE_FRILLS
920	Atom prop = None;
921	MWMHints mwmhints;	872	MWMHints mwmhints;
922	#endif	873	#endif
923	XGCValues gcvalue;	874	XGCValues gcvalue;
924	long vt_emask;
925	XSetWindowAttributes attributes;	875	XSetWindowAttributes attributes;
926	XWindowAttributes gattr;
927	Window top, parent;	876	Window top, parent;
928	dDisp;	877	dDisp;
929		878
930	#ifdef USING_W11LIB	879	xa = display->xa;
931	/* enable W11 callbacks */
932	W11AddEventHandler (disp, rxvt_W11_process_x_event);
933	#endif
934		880
935	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	881	/* grab colors before netscape does */
936	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	882	Get_Colours ();
937		883
938	if (options & Opt_transparent)	884	if (!set_fonts ())
939	{	885	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
940	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	886
941	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	887	parent = display->root;
942	}	888
		889	attributes.override_redirect = !!OPTION (Opt_override_redirect);
943		890
944	#if ENABLE_FRILLS	891	#if ENABLE_FRILLS
945	if (options & Opt_borderLess)	892	if (OPTION (Opt_borderLess))
946	{	893	{
947	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	894	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
948
949	if (prop == None)
950	{	895	{
951	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	896	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
952	#ifdef PREFER_24BIT
953	attributes.override_redirect = TRUE;	897	attributes.override_redirect = TRUE;
954	#endif
955	mwmhints.flags = 0;	898	mwmhints.flags = 0;
956	}	899	}
957	else	900	else
958	{	901	{
959	mwmhints.flags = MWM_HINTS_DECORATIONS;	902	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
962	}	905	}
963	else	906	else
964	mwmhints.flags = 0;	907	mwmhints.flags = 0;
965	#endif	908	#endif
966		909
967	/* grab colors before netscape does */
968	Get_Colours ();
969
970	if (!set_fonts ())
971	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
972
973	parent = DefaultRootWindow (disp);
974
975	#if ENABLE_XEMBED	910	#if ENABLE_XEMBED
976	if (rs[Rs_embed])	911	if (rs[Rs_embed])
977	{	912	{
978	XWindowAttributes wattr;	913	XWindowAttributes wattr;
979		914
…		…
982	if (!XGetWindowAttributes (disp, parent, &wattr))	917	if (!XGetWindowAttributes (disp, parent, &wattr))
983	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	918	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
984		919
985	window_calc (wattr.width, wattr.height);	920	window_calc (wattr.width, wattr.height);
986	}	921	}
987
988	#endif	922	#endif
		923
989	window_calc (0, 0);	924	window_calc (0, 0);
990		925
991	/* sub-window placement & size in rxvt_resize_subwindows () */	926	/* sub-window placement & size in rxvt_resize_subwindows () */
992	#ifdef PREFER_24BIT
993	attributes.background_pixel = pix_colors_focused[Color_border];	927	attributes.background_pixel = pix_colors_focused[Color_border];
994	attributes.border_pixel = pix_colors_focused[Color_border];	928	attributes.border_pixel = pix_colors_focused[Color_border];
995	attributes.colormap = display->cmap;	929	attributes.colormap = display->cmap;
		930
996	top = XCreateWindow (disp, parent,	931	top = XCreateWindow (disp, parent,
997	szHint.x, szHint.y,	932	szHint.x, szHint.y,
998	szHint.width, szHint.height,	933	szHint.width, szHint.height,
999	TermWin.ext_bwidth,	934	ext_bwidth,
1000	display->depth, InputOutput,	935	display->depth, InputOutput,
1001	display->visual,	936	display->visual,
1002	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	937	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1003	#else	938	&attributes);
1004	top = XCreateSimpleWindow (disp, parent,
1005	szHint.x, szHint.y,
1006	szHint.width, szHint.height,
1007	TermWin.ext_bwidth,
1008	pix_colors_focused[Color_border],
1009	pix_colors_focused[Color_border]);
1010	#endif
1011		939
1012	TermWin.parent[0] = top;	940	this->parent[0] = top;
1013		941
1014	old_width = szHint.width;	942	old_width = szHint.width;
1015	old_height = szHint.height;	943	old_height = szHint.height;
1016		944
1017	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	945	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1018	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	946	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1019		947
1020	classHint.res_name = (char *)rs[Rs_name];	948	classHint.res_name = (char *)rs[Rs_name];
1021	classHint.res_class = (char *)RESCLASS;	949	classHint.res_class = (char *)RESCLASS;
1022		950
1023	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	951	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1024	wmHint.input = True;	952	wmHint.input = True;
1025	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	953	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1026	wmHint.window_group = top;	954	wmHint.window_group = top;
1027		955
1028	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	956	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1029	&szHint, &wmHint, &classHint);	957	&szHint, &wmHint, &classHint);
		958
		959	#if ENABLE_FRILLS
		960	if (mwmhints.flags)
		961	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		962	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		963	#endif
1030		964
1031	Atom protocols[] = {	965	Atom protocols[] = {
1032	xa[XA_WM_DELETE_WINDOW],	966	xa[XA_WM_DELETE_WINDOW],
1033	#if ENABLE_EWMH	967	#if ENABLE_EWMH
1034	xa[XA_NET_WM_PING],	968	xa[XA_NET_WM_PING],
1035	#endif	969	#endif
1036	};	970	};
1037		971
1038	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	972	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1039		973
		974	#if ENABLE_FRILLS
		975	if (rs[Rs_transient_for])
		976	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		977	#endif
		978
1040	#if ENABLE_EWMH	979	#if ENABLE_EWMH
1041	long pid = getpid ();	980	long pid = getpid ();
1042		981
1043	XChangeProperty (disp, top,	982	XChangeProperty (disp, top,
1044	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	983	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
…		…
1055	\| FocusChangeMask \| VisibilityChangeMask	994	\| FocusChangeMask \| VisibilityChangeMask
1056	\| ExposureMask \| StructureNotifyMask);	995	\| ExposureMask \| StructureNotifyMask);
1057		996
1058	termwin_ev.start (display, top);	997	termwin_ev.start (display, top);
1059		998
1060	#if ENABLE_FRILLS
1061	if (mwmhints.flags)
1062	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1063	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1064	#endif
1065
1066	/* vt cursor: Black-on-White is standard, but this is more popular */	999	/* vt cursor: Black-on-White is standard, but this is more popular */
1067	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1000	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1068		1001
1069	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1002	#ifdef HAVE_SCROLLBARS
1070	/* cursor (menuBar/scrollBar): Black-on-White */	1003	/* cursor scrollBar: Black-on-White */
1071	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1004	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1072	#endif	1005	#endif
1073		1006
1074	/* the vt window */	1007	/* the vt window */
1075	TermWin.vt = XCreateSimpleWindow (disp, top,	1008	vt = XCreateSimpleWindow (disp, top,
1076	window_vt_x,
1077	window_vt_y,	1009	window_vt_x, window_vt_y,
1078	TermWin_TotalWidth (),	1010	width, height,
1079	TermWin_TotalHeight (),
1080	0,	1011	0,
1081	pix_colors_focused[Color_fg],	1012	pix_colors_focused[Color_fg],
1082	pix_colors_focused[Color_bg]);	1013	pix_colors_focused[Color_bg]);
1083	#ifdef DEBUG_X
1084	XStoreName (disp, TermWin.vt, "vt window");
1085	#endif
1086		1014
1087	attributes.bit_gravity = NorthWestGravity;	1015	attributes.bit_gravity = NorthWestGravity;
1088	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1016	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1089		1017
1090	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1018	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1091		1019
1092	#ifdef POINTER_BLANK	1020	if (OPTION (Opt_pointerBlank))
1093	if (options & Opt_pointerBlank)
1094	vt_emask \|= PointerMotionMask;	1021	vt_emask \|= PointerMotionMask;
1095	else	1022	else
1096	#endif
1097	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1023	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1098		1024
1099	XSelectInput (disp, TermWin.vt, vt_emask);	1025	vt_select_input ();
		1026
1100	vt_ev.start (display, TermWin.vt);	1027	vt_ev.start (display, vt);
1101
1102	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1103	if (menuBar_height ())
1104	{
1105	menuBar.win = XCreateSimpleWindow (disp, top,
1106	window_vt_x, 0,
1107	TermWin_TotalWidth (),
1108	menuBar_TotalHeight (),
1109	0,
1110	pix_colors_focused[Color_fg],
1111	pix_colors_focused[Color_scroll]);
1112
1113	#ifdef DEBUG_X
1114	XStoreName (disp, menuBar.win, "menubar");
1115	#endif
1116
1117	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1118
1119	XDefineCursor (disp, menuBar.win,
1120	XCreateFontCursor (disp, XC_left_ptr));
1121
1122	XSelectInput (disp, menuBar.win,
1123	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1124	menubar_ev.start (display, menuBar.win);
1125	}
1126	#endif
1127		1028
1128	#ifdef XPM_BACKGROUND	1029	#ifdef XPM_BACKGROUND
1129	if (rs[Rs_backgroundPixmap] != NULL	1030	if (rs[Rs_backgroundPixmap] != NULL
1130	&& ! (options & Opt_transparent))	1031	&& !OPTION (Opt_transparent))
1131	{	1032	{
1132	const char *p = rs[Rs_backgroundPixmap];	1033	const char *p = rs[Rs_backgroundPixmap];
1133		1034
1134	if ((p = strchr (p, ';')) != NULL)	1035	if ((p = strchr (p, ';')) != NULL)
1135	{	1036	{
…		…
1141	scr_touch (true);	1042	scr_touch (true);
1142	}	1043	}
1143	#endif	1044	#endif
1144		1045
1145	/* graphics context for the vt window */	1046	/* graphics context for the vt window */
1146	gcvalue.foreground = pix_colors[Color_fg];	1047	gcvalue.foreground = pix_colors[Color_fg];
1147	gcvalue.background = pix_colors[Color_bg];	1048	gcvalue.background = pix_colors[Color_bg];
1148	gcvalue.graphics_exposures = 1;	1049	gcvalue.graphics_exposures = 1;
		1050
1149	TermWin.gc = XCreateGC (disp, TermWin.vt,	1051	gc = XCreateGC (disp, vt,
1150	GCForeground \| GCBackground \| GCGraphicsExposures,	1052	GCForeground \| GCBackground \| GCGraphicsExposures,
1151	&gcvalue);	1053	&gcvalue);
1152		1054
1153	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1055	drawable = new rxvt_drawable (display, vt);
1154		1056
1155	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1057	#ifdef RXVT_SCROLLBAR
1156	gcvalue.foreground = pix_colors[Color_topShadow];	1058	gcvalue.foreground = pix_colors[Color_topShadow];
1157	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1059	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1158	gcvalue.foreground = pix_colors[Color_bottomShadow];	1060	gcvalue.foreground = pix_colors[Color_bottomShadow];
1159	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1061	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1062	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1161	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1063	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162	#endif	1064	#endif
1163		1065
1164	#ifdef OFF_FOCUS_FADING	1066	#ifdef OFF_FOCUS_FADING
1165	// initially we are in unfocused state	1067	// initially we are in unfocused state
1166	if (rs[Rs_fade])	1068	if (rs[Rs_fade])
1167	pix_colors = pix_colors_unfocused;	1069	pix_colors = pix_colors_unfocused;
1168	#endif	1070	#endif
1169		1071
1170	pointer_unblank ();	1072	pointer_unblank ();
1171	scr_recolour ();	1073	scr_recolour ();
1172
1173	#if ENABLE_XEMBED
1174	if (rs[Rs_embed])
1175	{
1176	long info[2] = { 0, XEMBED_MAPPED };
1177
1178	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1179	32, PropModeReplace, (unsigned char *)&info, 2);
1180	}
1181	#endif
1182	}	1074	}
1183		1075
1184	/* ------------------------------------------------------------------------- *	1076	/* ------------------------------------------------------------------------- *
1185	* GET TTY CURRENT STATE *	1077	* GET TTY CURRENT STATE *
1186	* ------------------------------------------------------------------------- */	1078	* ------------------------------------------------------------------------- */
…		…
1191	/*	1083	/*
1192	* standard System V termios interface	1084	* standard System V termios interface
1193	*/	1085	*/
1194	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1086	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1195	{	1087	{
1196	/* return error - use system defaults */	1088	// return error - use system defaults,
		1089	// where possible, and zero elsewhere
		1090	memset (tio, 0, sizeof (ttymode_t));
		1091
1197	tio->c_cc[VINTR] = CINTR;	1092	tio->c_cc[VINTR] = CINTR;
1198	tio->c_cc[VQUIT] = CQUIT;	1093	tio->c_cc[VQUIT] = CQUIT;
1199	tio->c_cc[VERASE] = CERASE;	1094	tio->c_cc[VERASE] = CERASE;
		1095	#ifdef VERASE2
		1096	tio->c_cc[VERASE2] = CERASE2;
		1097	#endif
1200	tio->c_cc[VKILL] = CKILL;	1098	tio->c_cc[VKILL] = CKILL;
1201	tio->c_cc[VSTART] = CSTART;	1099	tio->c_cc[VSTART] = CSTART;
1202	tio->c_cc[VSTOP] = CSTOP;	1100	tio->c_cc[VSTOP] = CSTOP;
1203	tio->c_cc[VSUSP] = CSUSP;	1101	tio->c_cc[VSUSP] = CSUSP;
1204	# ifdef VDSUSP	1102	# ifdef VDSUSP
1205
1206	tio->c_cc[VDSUSP] = CDSUSP;	1103	tio->c_cc[VDSUSP] = CDSUSP;
1207	# endif	1104	# endif
1208	# ifdef VREPRINT	1105	# ifdef VREPRINT
1209
1210	tio->c_cc[VREPRINT] = CRPRNT;	1106	tio->c_cc[VREPRINT] = CRPRNT;
1211	# endif	1107	# endif
1212	# ifdef VDISCRD	1108	# ifdef VDISCRD
1213
1214	tio->c_cc[VDISCRD] = CFLUSH;	1109	tio->c_cc[VDISCRD] = CFLUSH;
1215	# endif	1110	# endif
1216	# ifdef VWERSE	1111	# ifdef VWERSE
1217
1218	tio->c_cc[VWERSE] = CWERASE;	1112	tio->c_cc[VWERSE] = CWERASE;
1219	# endif	1113	# endif
1220	# ifdef VLNEXT	1114	# ifdef VLNEXT
1221
1222	tio->c_cc[VLNEXT] = CLNEXT;	1115	tio->c_cc[VLNEXT] = CLNEXT;
1223	# endif	1116	# endif
1224
1225	}	1117	}
		1118
1226	tio->c_cc[VEOF] = CEOF;	1119	tio->c_cc[VEOF] = CEOF;
1227	tio->c_cc[VEOL] = VDISABLE;	1120	tio->c_cc[VEOL] = VDISABLE;
1228	# ifdef VEOL2	1121	# ifdef VEOL2
1229
1230	tio->c_cc[VEOL2] = VDISABLE;	1122	tio->c_cc[VEOL2] = VDISABLE;
1231	# endif	1123	# endif
1232	# ifdef VSWTC	1124	# ifdef VSWTC
1233
1234	tio->c_cc[VSWTC] = VDISABLE;	1125	tio->c_cc[VSWTC] = VDISABLE;
1235	# endif	1126	# endif
1236	# ifdef VSWTCH	1127	# ifdef VSWTCH
1237
1238	tio->c_cc[VSWTCH] = VDISABLE;	1128	tio->c_cc[VSWTCH] = VDISABLE;
1239	# endif	1129	# endif
1240	# if VMIN != VEOF	1130	# if VMIN != VEOF
1241
1242	tio->c_cc[VMIN] = 1;	1131	tio->c_cc[VMIN] = 1;
1243	# endif	1132	# endif
1244	# if VTIME != VEOL	1133	# if VTIME != VEOL
1245
1246	tio->c_cc[VTIME] = 0;	1134	tio->c_cc[VTIME] = 0;
1247	# endif	1135	# endif
1248		1136
1249	if (erase != -1)	1137	if (erase != -1)
1250	tio->c_cc[VERASE] = (char)erase;	1138	tio->c_cc[VERASE] = (char)erase;
…		…
1278	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1166	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1279	{	1167	{
1280	tio->sg.sg_erase = CERASE; /* ^H */	1168	tio->sg.sg_erase = CERASE; /* ^H */
1281	tio->sg.sg_kill = CKILL; /* ^U */	1169	tio->sg.sg_kill = CKILL; /* ^U */
1282	}	1170	}
		1171
1283	if (erase != -1)	1172	if (erase != -1)
1284	tio->sg.sg_erase = (char)erase;	1173	tio->sg.sg_erase = (char)erase;
1285		1174
1286	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1175	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1287		1176
…		…
1293	tio->tc.t_startc = CSTART; /* ^Q */	1182	tio->tc.t_startc = CSTART; /* ^Q */
1294	tio->tc.t_stopc = CSTOP; /* ^S */	1183	tio->tc.t_stopc = CSTOP; /* ^S */
1295	tio->tc.t_eofc = CEOF; /* ^D */	1184	tio->tc.t_eofc = CEOF; /* ^D */
1296	tio->tc.t_brkc = -1;	1185	tio->tc.t_brkc = -1;
1297	}	1186	}
		1187
1298	/* get local special chars */	1188	/* get local special chars */
1299	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1189	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1300	{	1190	{
1301	tio->lc.t_suspc = CSUSP; /* ^Z */	1191	tio->lc.t_suspc = CSUSP; /* ^Z */
1302	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1192	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1306	tio->lc.t_lnextc = CLNEXT; /* ^V */	1196	tio->lc.t_lnextc = CLNEXT; /* ^V */
1307	}	1197	}
1308	/* get line discipline */	1198	/* get line discipline */
1309	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1199	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1310	# ifdef NTTYDISC	1200	# ifdef NTTYDISC
1311
1312	tio->line = NTTYDISC;	1201	tio->line = NTTYDISC;
1313	# endif /* NTTYDISC */	1202	# endif /* NTTYDISC */
1314		1203
1315	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1204	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1316	#endif /* HAVE_TERMIOS_H */	1205	#endif /* HAVE_TERMIOS_H */
…		…
1339	FOO (IGNCR, "IGNCR");	1228	FOO (IGNCR, "IGNCR");
1340	FOO (ICRNL, "ICRNL");	1229	FOO (ICRNL, "ICRNL");
1341	FOO (IXON, "IXON");	1230	FOO (IXON, "IXON");
1342	FOO (IXOFF, "IXOFF");	1231	FOO (IXOFF, "IXOFF");
1343	# ifdef IUCLC	1232	# ifdef IUCLC
1344
1345	FOO (IUCLC, "IUCLC");	1233	FOO (IUCLC, "IUCLC");
1346	# endif	1234	# endif
1347	# ifdef IXANY	1235	# ifdef IXANY
1348
1349	FOO (IXANY, "IXANY");	1236	FOO (IXANY, "IXANY");
1350	# endif	1237	# endif
1351	# ifdef IMAXBEL	1238	# ifdef IMAXBEL
1352
1353	FOO (IMAXBEL, "IMAXBEL");	1239	FOO (IMAXBEL, "IMAXBEL");
1354	# endif	1240	# endif
1355		1241
1356	fprintf (stderr, "\n");	1242	fprintf (stderr, "\n");
1357		1243
…		…
1364	FOO (VERASE, "VERASE");	1250	FOO (VERASE, "VERASE");
1365	FOO (VKILL, "VKILL");	1251	FOO (VKILL, "VKILL");
1366	FOO (VEOF, "VEOF");	1252	FOO (VEOF, "VEOF");
1367	FOO (VEOL, "VEOL");	1253	FOO (VEOL, "VEOL");
1368	# ifdef VEOL2	1254	# ifdef VEOL2
1369
1370	FOO (VEOL2, "VEOL2");	1255	FOO (VEOL2, "VEOL2");
1371	# endif	1256	# endif
1372	# ifdef VSWTC	1257	# ifdef VSWTC
1373
1374	FOO (VSWTC, "VSWTC");	1258	FOO (VSWTC, "VSWTC");
1375	# endif	1259	# endif
1376	# ifdef VSWTCH	1260	# ifdef VSWTCH
1377
1378	FOO (VSWTCH, "VSWTCH");	1261	FOO (VSWTCH, "VSWTCH");
1379	# endif	1262	# endif
1380
1381	FOO (VSTART, "VSTART");	1263	FOO (VSTART, "VSTART");
1382	FOO (VSTOP, "VSTOP");	1264	FOO (VSTOP, "VSTOP");
1383	FOO (VSUSP, "VSUSP");	1265	FOO (VSUSP, "VSUSP");
1384	# ifdef VDSUSP	1266	# ifdef VDSUSP
1385
1386	FOO (VDSUSP, "VDSUSP");	1267	FOO (VDSUSP, "VDSUSP");
1387	# endif	1268	# endif
1388	# ifdef VREPRINT	1269	# ifdef VREPRINT
1389
1390	FOO (VREPRINT, "VREPRINT");	1270	FOO (VREPRINT, "VREPRINT");
1391	# endif	1271	# endif
1392	# ifdef VDISCRD	1272	# ifdef VDISCRD
1393
1394	FOO (VDISCRD, "VDISCRD");	1273	FOO (VDISCRD, "VDISCRD");
1395	# endif	1274	# endif
1396	# ifdef VWERSE	1275	# ifdef VWERSE
1397
1398	FOO (VWERSE, "VWERSE");	1276	FOO (VWERSE, "VWERSE");
1399	# endif	1277	# endif
1400	# ifdef VLNEXT	1278	# ifdef VLNEXT
1401
1402	FOO (VLNEXT, "VLNEXT");	1279	FOO (VLNEXT, "VLNEXT");
1403	# endif	1280	# endif
1404		1281
1405	fprintf (stderr, "\n");	1282	fprintf (stderr, "\n");
1406	# undef FOO	1283	# undef FOO
…		…
1418	rxvt_term::run_command (const char const argv)	1295	rxvt_term::run_command (const char const argv)
1419	{	1296	{
1420	#if ENABLE_FRILLS	1297	#if ENABLE_FRILLS
1421	if (rs[Rs_pty_fd])	1298	if (rs[Rs_pty_fd])
1422	{	1299	{
1423	pty.pty = atoi (rs[Rs_pty_fd]);	1300	pty->pty = atoi (rs[Rs_pty_fd]);
1424	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1301
		1302	if (pty->pty >= 0)
		1303	{
		1304	if (getfd_hook)
		1305	pty->pty = (*getfd_hook) (pty->pty);
		1306
		1307	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1308	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1309	}
1425	}	1310	}
1426	else	1311	else
1427	#endif	1312	#endif
1428	if (!pty.get ())	1313	if (!pty->get ())
1429	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1314	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1430		1315
1431	pty.set_utf8_mode (enc_utf8);	1316	pty->set_utf8_mode (enc_utf8);
1432		1317
1433	/* set initial window size */	1318	/* set initial window size */
1434	tt_winch ();	1319	tt_winch ();
1435		1320
1436	int er;	1321	int er;
…		…
1449	#if ENABLE_FRILLS	1334	#if ENABLE_FRILLS
1450	if (rs[Rs_pty_fd])	1335	if (rs[Rs_pty_fd])
1451	return;	1336	return;
1452	#endif	1337	#endif
1453		1338
1454	sw_chld.start (SIGCHLD);
1455
1456	#ifndef __QNX__
1457	/* spin off the command interpreter */	1339	/* spin off the command interpreter */
1458	switch (cmd_pid = fork ())	1340	switch (cmd_pid = fork ())
1459	{	1341	{
1460	case -1:	1342	case -1:
1461	{	1343	{
…		…
1463	rxvt_fatal ("can't fork, aborting.\n");	1345	rxvt_fatal ("can't fork, aborting.\n");
1464	}	1346	}
1465	case 0:	1347	case 0:
1466	init_env ();	1348	init_env ();
1467		1349
1468	if (!pty.make_controlling_tty ())	1350	if (!pty->make_controlling_tty ())
1469	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1351	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1470	else	1352	else
1471	{	1353	{
1472	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1354	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1473	dup2 (pty.tty, STDIN_FILENO);	1355	dup2 (pty->tty, STDIN_FILENO);
1474	dup2 (pty.tty, STDOUT_FILENO);	1356	dup2 (pty->tty, STDOUT_FILENO);
1475	dup2 (pty.tty, STDERR_FILENO);	1357	dup2 (pty->tty, STDERR_FILENO);
1476		1358
1477	// close all our file handles that we do no longer need	1359	// close all our file handles that we do no longer need
1478	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1360	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1479	{	1361	{
1480	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1362	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1481	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1363	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1482	}	1364	}
1483		1365
1484	run_child (argv);	1366	run_child (argv);
1485	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1367	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1486	}	1368	}
1487		1369
1488	_exit (EXIT_FAILURE);	1370	_exit (EXIT_FAILURE);
1489		1371
1490	default:	1372	default:
1491	{	1373	if (!OPTION (Opt_utmpInhibit))
1492	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1374	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1493	int fdstdin;
1494		1375
1495	fdstdin = dup (STDIN_FILENO);	1376	pty->close_tty ();
1496	dup2 (pty.tty, STDIN_FILENO);
1497	#endif
1498		1377
1499	#ifdef UTMP_SUPPORT	1378	child_ev.start (cmd_pid);
1500	privileged_utmp (SAVE);
1501	#endif
1502		1379
1503	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1380	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1504
1505	dup2 (fdstdin, STDIN_FILENO);
1506	close (fdstdin);
1507	#endif
1508	}
1509
1510	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1511	break;	1381	break;
1512	}	1382	}
1513	#else /* __QNX__ uses qnxspawn () */
1514	fchmod (pty.tty, 0622);
1515	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1516	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1517
1518	if (run_child (argv) == -1)
1519	exit (EXIT_FAILURE);
1520	#endif
1521	}	1383	}
1522		1384
1523	/* ------------------------------------------------------------------------- *	1385	/* ------------------------------------------------------------------------- *
1524	* CHILD PROCESS OPERATIONS *	1386	* CHILD PROCESS OPERATIONS *
1525	* ------------------------------------------------------------------------- */	1387	* ------------------------------------------------------------------------- */
…		…
1532	{	1394	{
1533	char *login;	1395	char *login;
1534		1396
1535	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1397	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1536		1398
1537	if (options & Opt_console)	1399	if (OPTION (Opt_console))
1538	{ /* be virtual console, fail silently */	1400	{ /* be virtual console, fail silently */
1539	#ifdef TIOCCONS	1401	#ifdef TIOCCONS
1540	unsigned int on = 1;	1402	unsigned int on = 1;
1541		1403
1542	ioctl (STDIN_FILENO, TIOCCONS, &on);	1404	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1569	// unblock signals (signals are blocked by iom.C	1431	// unblock signals (signals are blocked by iom.C
1570	sigset_t ss;	1432	sigset_t ss;
1571	sigemptyset (&ss);	1433	sigemptyset (&ss);
1572	sigprocmask (SIG_SETMASK, &ss, 0);	1434	sigprocmask (SIG_SETMASK, &ss, 0);
1573		1435
1574	#ifndef __QNX__
1575	/* command interpreter path */	1436	/* command interpreter path */
1576	if (argv != NULL)	1437	if (argv != NULL)
1577	{	1438	{
1578	# ifdef DEBUG_CMD	1439	# ifdef DEBUG_CMD
1579	int i;	1440	int i;
…		…
1585	execvp (argv[0], (char const )argv);	1446	execvp (argv[0], (char const )argv);
1586	/* no error message: STDERR is closed! */	1447	/* no error message: STDERR is closed! */
1587	}	1448	}
1588	else	1449	else
1589	{	1450	{
1590	const char argv0, shell;	1451	const char argv0, shell;
1591		1452
1592	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1453	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1593	shell = "/bin/sh";	1454	shell = "/bin/sh";
1594		1455
1595	argv0 = (const char *)rxvt_r_basename (shell);	1456	argv0 = (const char *)rxvt_r_basename (shell);
1596		1457
1597	if (options & Opt_loginShell)	1458	if (OPTION (Opt_loginShell))
1598	{	1459	{
1599	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1460	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1600		1461
1601	login[0] = '-';	1462	login[0] = '-';
1602	strcpy (&login[1], argv0);	1463	strcpy (&login[1], argv0);
1603	argv0 = login;	1464	argv0 = login;
1604	}	1465	}
		1466
1605	execlp (shell, argv0, NULL);	1467	execlp (shell, argv0, NULL);
1606	/* no error message: STDERR is closed! */	1468	/* no error message: STDERR is closed! */
1607	}	1469	}
1608		1470
1609	#else /* __QNX__ uses qnxspawn () */
1610
1611	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1612	char *command = NULL, fullcommand[_MAX_PATH];
1613	char *arg_v, arg_a[2] = { NULL, NULL };
1614
1615	if (argv != NULL)
1616	{
1617	if (access (argv[0], X_OK) == -1)
1618	{
1619	if (strchr (argv[0], '/') == NULL)
1620	{
1621	searchenv (argv[0], "PATH", fullcommand);
1622
1623	if (fullcommand[0] != '\0')
1624	command = fullcommand;
1625	}
1626
1627	if (access (command, X_OK) == -1)
1628	return -1;
1629	}
1630	else
1631	command = argv[0];
1632
1633	arg_v = argv;
1634	}
1635	else
1636	{
1637	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1638	command = "/bin/sh";
1639
1640	arg_a[0] = my_basename (command);
1641
1642	if (options & Opt_loginShell)
1643	{
1644	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1645
1646	login[0] = '-';
1647	strcpy (&login[1], arg_a[0]);
1648	arg_a[0] = login;
1649	}
1650
1651	arg_v = arg_a;
1652	}
1653
1654	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1655	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1656	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1657	command, arg_v, environ, iov_a, 0);
1658	if (login)
1659	free (login);
1660
1661	pty.close_tty ();
1662	return pty.pty;
1663	#endif
1664
1665	return -1;	1471	return -1;
1666	}	1472	}
1667		1473
1668	/----------------------- end-of-file (C source) -----------------------/	1474	/----------------------- 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.118 by root, Wed Aug 10 15:10:06 2005 UTC vs. Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.118 by root, Wed Aug 10 15:10:06 2005 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC