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

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