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

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.117 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 2006 UTC