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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.116 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.149 by root, Thu Jan 19 09:47:15 2006 UTC

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.116 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.149 by root, Thu Jan 19 09:47:15 2006 UTC