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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.114 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.146 by root, Tue Jan 17 15:17:39 2006 UTC

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.114 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.146 by root, Tue Jan 17 15:17:39 2006 UTC