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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.113 by root, Sat Feb 19 04:16:49 2005 UTC vs.
Revision 1.156 by root, Wed Jan 25 21:03:04 2006 UTC

…		…
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	11	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>	12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	13	* - QNX support
14	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15	*	15	*
16	* This program is free software; you can redistribute it and/or modify	16	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	17	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	18	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	19	* (at your option) any later version.
…		…
34	#include "../config.h" /* NECESSARY */	34	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	35	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	36	#include "rxvtutil.h"
37	#include "init.h"	37	#include "init.h"
38		38
		39	#include <limits>
		40
39	#include <csignal>	41	#include <csignal>
40		42
41	const char *const def_colorName[] =	43	const char *const def_colorName[] =
42	{	44	{
43	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
44	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
45	/* low-intensity colors */	47	/* low-intensity colors */
46	"Black", /* 0: black (#000000) */	48	"Black", /* 0: black (#000000) */
47	#ifndef NO_BRIGHTCOLOR
48	"Red3", /* 1: red (#CD0000) */	49	"Red3", /* 1: red (#CD0000) */
49	"Green3", /* 2: green (#00CD00) */	50	"Green3", /* 2: green (#00CD00) */
50	"Yellow3", /* 3: yellow (#CDCD00) */	51	"Yellow3", /* 3: yellow (#CDCD00) */
51	"Blue3", /* 4: blue (#0000CD) */	52	"Blue3", /* 4: blue (#0000CD) */
52	"Magenta3", /* 5: magenta (#CD00CD) */	53	"Magenta3", /* 5: magenta (#CD00CD) */
…		…
60	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
61	"Grey30", /* 8: bright black (#4D4D4D) */	62	"Grey30", /* 8: bright black (#4D4D4D) */
62	# else	63	# else
63	"Grey25", /* 8: bright black (#404040) */	64	"Grey25", /* 8: bright black (#404040) */
64	# endif	65	# endif
65	#endif /* NO_BRIGHTCOLOR */
66	"Red", /* 1/9: bright red (#FF0000) */	66	"Red", /* 1/9: bright red (#FF0000) */
67	"Green", /* 2/10: bright green (#00FF00) */	67	"Green", /* 2/10: bright green (#00FF00) */
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"Yellow", /* 3/11: bright yellow (#FFFF00) */
69	"Blue", /* 4/12: bright blue (#0000FF) */	69	"Blue", /* 4/12: bright blue (#0000FF) */
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"Magenta", /* 5/13: bright magenta (#FF00FF) */
…		…
169	COLOR_SCROLLTROUGH,	169	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	170	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	171	#if TINTING
172	NULL,	172	NULL,
173	#endif	173	#endif
174	};	174	#if OFF_FOCUS_FADING
175		175	"black",
176	const char *const xa_names[] =
177	{
178	"TEXT",
179	"COMPOUND_TEXT",
180	"UTF8_STRING",
181	"MULTIPLE",
182	"TARGETS",
183	"TIMESTAMP",
184	"VT_SELECTION",
185	"INCR",
186	"WM_PROTOCOLS",
187	"WM_DELETE_WINDOW",
188	"CLIPBOARD",
189	#if ENABLE_FRILLS
190	"_NET_WM_PID",
191	"_MOTIF_WM_HINTS",
192	"_NET_WM_NAME",
193	"_NET_WM_ICON_NAME",
194	#endif
195	#if USE_XIM
196	"WM_LOCALE_NAME",
197	#endif
198	#ifdef TRANSPARENT
199	"_XROOTPMAP_ID",
200	"ESETROOT_PMAP_ID",
201	#endif
202	#ifdef OFFIX_DND
203	"DndProtocol",
204	"DndSelection",
205	#endif
206	#if ENABLE_XEMBED
207	"_XEMBED",
208	#endif	176	#endif
209	};	177	};
210		178
211	bool	179	bool
212	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
213	{	181	{
214	sw_term.start (SIGTERM);	182	pix_colors = //
215	sw_int.start (SIGINT);
216
217	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
219	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220	#endif	186	#endif
221	pix_colors = pix_colors_focused;
222
223	if (pix_colors == NULL)
224	return false;
225		187
226	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
227	TermWin.pixmap = None;	189	pixmap = None;
228	#endif	190	#endif
229		191
230	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
231	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
232	options = DEFAULT_OPTIONS;	194	options = DEFAULT_OPTIONS;
233	want_refresh = 1;	195	want_refresh = 1;
234	priv_modes = SavedModes = PrivMode_Default;	196	priv_modes = SavedModes = PrivMode_Default;
235	TermWin.focus = 0;
236	TermWin.ncol = 80;	197	ncol = 80;
237	TermWin.nrow = 24;	198	nrow = 24;
238	TermWin.int_bwidth = INTERNALBORDERWIDTH;	199	int_bwidth = INTERNALBORDERWIDTH;
239	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	200	ext_bwidth = EXTERNALBORDERWIDTH;
240	TermWin.lineSpace = LINESPACE;	201	lineSpace = LINESPACE;
241	TermWin.saveLines = SAVELINES;	202	saveLines = SAVELINES;
242	numpix_colors = TOTAL_COLORS;	203	numpix_colors = TOTAL_COLORS;
243		204
244	refresh_limit = 1;	205	refresh_limit = 1;
245	refresh_type = SLOW_REFRESH;	206	refresh_type = SLOW_REFRESH;
246	prev_nrow = prev_ncol = 0;
247		207
248	oldcursor.row = oldcursor.col = -1;	208	oldcursor.row = oldcursor.col = -1;
249	#ifdef XPM_BACKGROUND	209	#ifdef XPM_BACKGROUND
250	/* bgPixmap.w = bgPixmap.h = 0; */	210	/* bgPixmap.w = bgPixmap.h = 0; */
251	bgPixmap.x = bgPixmap.y = 50;	211	bgPixmap.x = bgPixmap.y = 50;
252	bgPixmap.pixmap = None;	212	bgPixmap.pixmap = None;
253	#endif	213	#endif
254		214
255	last_bot = last_state = -1;	215	last_bot = last_state = -1;
256
257	#ifdef MENUBAR
258	menu_readonly = 1;
259	# if ! (MENUBAR_MAX > 1)
260	CurrentBar = &BarList;
261	# endif /* (MENUBAR_MAX > 1) */
262	#endif
263		216
264	return true;	217	return true;
265	}	218	}
266		219
267	void	220	void
…		…
335	rs[Rs_name] = rxvt_r_basename (argv[0]);	288	rs[Rs_name] = rxvt_r_basename (argv[0]);
336		289
337	/*	290	/*
338	* Open display, get options/resources and create the window	291	* Open display, get options/resources and create the window
339	*/	292	*/
		293
340	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	294	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
341	rs[Rs_display_name] = ":0";	295	rs[Rs_display_name] = ":0";
342		296
343	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
344		298
345	#ifdef LOCAL_X_IS_UNIX
346	if (rs[Rs_display_name][0] == ':')
347	{
348	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
349	strcpy (val, "unix");
350	strcat (val, rs[Rs_display_name]);
351	display = displays.get (val);
352	free (val);
353	}
354	#endif
355
356	if (!display
357	&& ! (display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
358	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
359		301
360	extract_resources ();	302	extract_resources ();
		303
361	free (r_argv);	304	free (r_argv);
		305
		306	#if ENABLE_PERL
		307	if (!rs[Rs_perl_ext_1])
		308	rs[Rs_perl_ext_1] = "default";
		309
		310	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		311	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		312	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		313	{
		314	rxvt_perl.init (this);
		315	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		316	}
		317	#endif
		318
		319	xa = display->xa;
		320
		321	#if ENABLE_FRILLS
		322	if (rs[Rs_depth])
		323	set (display, strtol (rs[Rs_depth], 0, 0));
		324	else
		325	#endif
		326	set (display);
362		327
363	/*	328	/*
364	* set any defaults not already set	329	* set any defaults not already set
365	*/	330	*/
366	if (cmd_argv && cmd_argv[0])	331	if (cmd_argv && cmd_argv[0])
…		…
377	if (!rs[Rs_iconName])	342	if (!rs[Rs_iconName])
378	rs[Rs_iconName] = rs[Rs_name];	343	rs[Rs_iconName] = rs[Rs_name];
379	}	344	}
380		345
381	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	346	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
382	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	347	saveLines = min (i, MAX_SAVELINES);
383		348
384	#if ENABLE_FRILLS	349	#if ENABLE_FRILLS
385	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	350	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
386	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	351	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		352
387	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	353	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
388	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	354	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		355
389	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	356	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
390	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	357	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
391	#endif	358	#endif
392		359
393	#ifdef POINTER_BLANK	360	#ifdef POINTER_BLANK
394	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	361	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
395	pointerBlankDelay = i;	362	pointerBlankDelay = i;
396	else	363	else
397	pointerBlankDelay = 2;	364	pointerBlankDelay = 2;
398	#endif	365	#endif
399		366
400	/* no point having a scrollbar without having any scrollback! */	367	/* no point having a scrollbar without having any scrollback! */
401	if (!TermWin.saveLines)	368	if (!saveLines)
402	options &= ~Opt_scrollBar;	369	set_option (Opt_scrollBar, 0);
403		370
404	#ifdef PRINTPIPE	371	#ifdef PRINTPIPE
405	if (!rs[Rs_print_pipe])	372	if (!rs[Rs_print_pipe])
406	rs[Rs_print_pipe] = PRINTPIPE;	373	rs[Rs_print_pipe] = PRINTPIPE;
407	#endif	374	#endif
…		…
450	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	417	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
451	#endif	418	#endif
452		419
453	#ifdef XTERM_REVERSE_VIDEO	420	#ifdef XTERM_REVERSE_VIDEO
454	/* this is how xterm implements reverseVideo */	421	/* this is how xterm implements reverseVideo */
455	if (options & Opt_reverseVideo)	422	if (OPTION (Opt_reverseVideo))
456	{	423	{
457	if (!rs[Rs_color + Color_fg])	424	if (!rs[Rs_color + Color_fg])
458	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	425	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
459	if (!rs[Rs_color + Color_bg])	426	if (!rs[Rs_color + Color_bg])
460	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	427	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
465	if (!rs[Rs_color + i])	432	if (!rs[Rs_color + i])
466	rs[Rs_color + i] = def_colorName[i];	433	rs[Rs_color + i] = def_colorName[i];
467		434
468	#ifndef XTERM_REVERSE_VIDEO	435	#ifndef XTERM_REVERSE_VIDEO
469	/* this is how we implement reverseVideo */	436	/* this is how we implement reverseVideo */
470	if (options & Opt_reverseVideo)	437	if (OPTION (Opt_reverseVideo))
471	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	438	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
472	#endif	439	#endif
473		440
474	/* convenient aliases for setting fg/bg to colors */	441	/* convenient aliases for setting fg/bg to colors */
475	color_aliases (Color_fg);	442	color_aliases (Color_fg);
476	color_aliases (Color_bg);	443	color_aliases (Color_bg);
…		…
525	i = strlen (val);	492	i = strlen (val);
526	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
527		494
528	sprintf (env_display, "DISPLAY=%s", val);	495	sprintf (env_display, "DISPLAY=%s", val);
529		496
530	/* avoiding the math library:	497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
531	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
532	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
533	;
534	MAX_IT (i, 1);
535	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
536
537	sprintf (env_windowid, "WINDOWID=%u",
538	(unsigned int)TermWin.parent[0]);
539		498
540	/* add entries to the environment:	499	/* add entries to the environment:
541	* @ DISPLAY: in case we started with -display	500	* @ DISPLAY: in case we started with -display
542	* @ WINDOWID: X window id number of the window	501	* @ WINDOWID: X window id number of the window
543	* @ COLORTERM: terminal sub-name and also indicates its color	502	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
545	* @ TERMINFO: path to terminfo directory	504	* @ TERMINFO: path to terminfo directory
546	* @ COLORFGBG: fg;bg color codes	505	* @ COLORFGBG: fg;bg color codes
547	*/	506	*/
548	putenv (env_display);	507	putenv (env_display);
549	putenv (env_windowid);	508	putenv (env_windowid);
		509
550	if (env_colorfgbg)	510	if (env_colorfgbg)
551	putenv (env_colorfgbg);	511	putenv (env_colorfgbg);
552		512
553	#ifdef RXVT_TERMINFO	513	#ifdef RXVT_TERMINFO
554	putenv ("TERMINFO=" RXVT_TERMINFO);	514	putenv ("TERMINFO=" RXVT_TERMINFO);
555	#endif	515	#endif
556		516
557	if (display->depth <= 2)	517	if (depth <= 2)
558	putenv ("COLORTERM=" COLORTERMENV "-mono");	518	putenv ("COLORTERM=" COLORTERMENV "-mono");
559	else	519	else
560	putenv ("COLORTERM=" COLORTERMENVFULL);	520	putenv ("COLORTERM=" COLORTERMENVFULL);
561		521
562	if (rs[Rs_term_name] != NULL)	522	if (rs[Rs_term_name] != NULL)
…		…
582	* This should support all European type languages.	542	* This should support all European type languages.
583	*/	543	*/
584	void	544	void
585	rxvt_term::set_locale (const char *locale)	545	rxvt_term::set_locale (const char *locale)
586	{	546	{
		547	set_environ (envv);
		548
587	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	549	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
588	free (this->locale);	550	free (this->locale);
589	this->locale = setlocale (LC_CTYPE, locale);	551	this->locale = setlocale (LC_CTYPE, locale);
590		552
591	if (!this->locale)	553	if (!this->locale)
592	{	554	{
593	if (*locale)	555	if (*locale)
594	{	556	{
595	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	557	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
596	setlocale (LC_CTYPE, "");	558	setlocale (LC_CTYPE, "C");
597	}	559	}
598	else	560	else
599	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	561	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
600		562
601	this->locale = "";	563	this->locale = "C";
602	}	564	}
603		565
604		566
605	this->locale = rxvt_strdup (this->locale);	567	this->locale = rxvt_strdup (this->locale);
606	SET_LOCALE (this->locale);	568	SET_LOCALE (this->locale);
…		…
621	}	583	}
622		584
623	void	585	void
624	rxvt_term::init_xlocale ()	586	rxvt_term::init_xlocale ()
625	{	587	{
		588	set_environ (envv);
		589
626	#ifdef USE_XIM	590	#ifdef USE_XIM
627	if (!locale)	591	if (!locale)
628	rxvt_warn ("setting locale failed, working without locale support.\n");	592	rxvt_warn ("setting locale failed, working without locale support.\n");
629	else	593	else
630	{	594	{
…		…
652	* Initialize the command connection.	616	* Initialize the command connection.
653	* This should be called after the X server connection is established.	617	* This should be called after the X server connection is established.
654	*/	618	*/
655		619
656	#ifdef META8_OPTION	620	#ifdef META8_OPTION
657	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	621	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
658	#endif	622	#endif
659		623
660	get_ourmods ();	624	get_ourmods ();
661		625
662	if (!(options & Opt_scrollTtyOutput))	626	if (!OPTION (Opt_scrollTtyOutput))
663	priv_modes \|= PrivMode_TtyOutputInh;	627	priv_modes \|= PrivMode_TtyOutputInh;
664	if (options & Opt_scrollTtyKeypress)	628	if (OPTION (Opt_scrollTtyKeypress))
665	priv_modes \|= PrivMode_Keypress;	629	priv_modes \|= PrivMode_Keypress;
666	if (!(options & Opt_jumpScroll))	630	if (!OPTION (Opt_jumpScroll))
667	priv_modes \|= PrivMode_smoothScroll;	631	priv_modes \|= PrivMode_smoothScroll;
668		632
669	#ifndef NO_BACKSPACE_KEY	633	#ifndef NO_BACKSPACE_KEY
670	if (strcmp (key_backspace, "DEC") == 0)	634	if (strcmp (key_backspace, "DEC") == 0)
671	priv_modes \|= PrivMode_HaveBackSpace;	635	priv_modes \|= PrivMode_HaveBackSpace;
672	#endif	636	#endif
673		637
674	/* add value for scrollBar */	638	/* add value for scrollBar */
675	if (scrollbar_visible ())	639	if (scrollBar.state)
676	{	640	{
677	priv_modes \|= PrivMode_scrollBar;	641	priv_modes \|= PrivMode_scrollBar;
678	SavedModes \|= PrivMode_scrollBar;	642	SavedModes \|= PrivMode_scrollBar;
679	}	643	}
680
681	if (menubar_visible ())
682	{
683	priv_modes \|= PrivMode_menuBar;
684	SavedModes \|= PrivMode_menuBar;
685	}
686
687	#ifdef CURSOR_BLINK
688	if (options & Opt_cursorBlink)
689	(void)gettimeofday (&lastcursorchange, NULL);
690	#endif
691		644
692	run_command (argv);	645	run_command (argv);
693	}	646	}
694		647
695	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
…		…
700		653
701	#ifdef OFF_FOCUS_FADING	654	#ifdef OFF_FOCUS_FADING
702	pix_colors = pix_colors_focused;	655	pix_colors = pix_colors_focused;
703	#endif	656	#endif
704		657
705	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
706	{	659	{
707	rxvt_color xcol;	660	rxvt_color xcol;
708		661
709	if (!rs[Rs_color + i])	662	if (!rs[Rs_color + i])
710	continue;	663	continue;
711		664
712	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	665	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
713	{	666	{
714	#ifndef XTERM_REVERSE_VIDEO	667	#ifndef XTERM_REVERSE_VIDEO
715	if (i < 2 && (options & Opt_reverseVideo))	668	if (i < 2 && OPTION (Opt_reverseVideo))
716	rs[Rs_color + i] = def_colorName[!i];	669	rs[Rs_color + i] = def_colorName[!i];
717	else	670	else
718	#endif	671	#endif
719	rs[Rs_color + i] = def_colorName[i];	672	rs[Rs_color + i] = def_colorName[i];
720		673
…		…
745	}	698	}
746	}	699	}
747	}	700	}
748		701
749	pix_colors[i] = xcol;	702	pix_colors[i] = xcol;
		703	SET_PIXCOLOR (i);
		704	}
		705
750	#ifdef OFF_FOCUS_FADING	706	#ifdef OFF_FOCUS_FADING
751	if (rs[Rs_fade])	707	if (rs[Rs_fade])
752	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));	708	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		709	pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
753	#endif	710	#endif
754	SET_PIXCOLOR (i);
755	}
756		711
757	if (display->depth <= 2)	712	if (depth <= 2)
758	{	713	{
759	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	714	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
760	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	715	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
761	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	716	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
762	}	717	}
763		718
764	/*	719	/*
765	* get scrollBar/menuBar shadow colors	720	* get scrollBar shadow colors
766	*	721	*
767	* The calculations of topShadow/bottomShadow values are adapted	722	* The calculations of topShadow/bottomShadow values are adapted
768	* from the fvwm window manager.	723	* from the fvwm window manager.
769	*/	724	*/
770	#ifdef KEEP_SCROLLCOLOR	725	#ifdef KEEP_SCROLLCOLOR
771		726
772	if (display->depth <= 2)	727	if (depth <= 2)
		728	{
773	{ /* Monochrome */	729	/* Monochrome */
774	pix_colors[Color_scroll] = pix_colors[Color_fg];	730	pix_colors[Color_scroll] = pix_colors[Color_fg];
775	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	pix_colors[Color_topShadow] = pix_colors[Color_bg];
776	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
777	}	733	}
778	else	734	else
…		…
781	/* xcol[0] == white	737	/* xcol[0] == white
782	* xcol[1] == top shadow	738	* xcol[1] == top shadow
783	* xcol[2] == bot shadow */	739	* xcol[2] == bot shadow */
784		740
785	xcol[1] = pix_colors[Color_scroll];	741	xcol[1] = pix_colors[Color_scroll];
786	xcol[0].set (display, 65535, 65535, 65535);	742	xcol[0].set (this, 65535, 65535, 65535);
787		743
788	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;	744	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
789		745
790	xcol[0].get (display, pr0, pg0, pb0);	746	xcol[0].get (this, pr0, pg0, pb0);
791	xcol[1].get (display, pr1, pg1, pb1);	747	xcol[1].get (this, pr1, pg1, pb1);
792		748
793	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);	749	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
794		750
795	/* topShadowColor */	751	/* topShadowColor */
796	if (!xcol[1].set (display,	752	if (!xcol[1].set (this,
797	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	753	min (pr0, max (pr0 / 5, pr1) * 7 / 5),
798	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	754	min (pg0, max (pg0 / 5, pg1) * 7 / 5),
799	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	755	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
800	xcol[1] = pix_colors[Color_White];	756	xcol[1] = pix_colors[Color_White];
801		757
…		…
814	int i = atoi (rs[Rs_color + idx]);	770	int i = atoi (rs[Rs_color + idx]);
815		771
816	if (i >= 8 && i <= 15)	772	if (i >= 8 && i <= 15)
817	{ /* bright colors */	773	{ /* bright colors */
818	i -= 8;	774	i -= 8;
819	#ifndef NO_BRIGHTCOLOR
820	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	775	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
821	return;	776	return;
822	#endif
823	}	777	}
824		778
825	if (i >= 0 && i <= 7) /* normal colors */	779	if (i >= 0 && i <= 7) /* normal colors */
826	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	780	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
827	}	781	}
…		…
922	rxvt_term::create_windows (int argc, const char const argv)	876	rxvt_term::create_windows (int argc, const char const argv)
923	{	877	{
924	XClassHint classHint;	878	XClassHint classHint;
925	XWMHints wmHint;	879	XWMHints wmHint;
926	#if ENABLE_FRILLS	880	#if ENABLE_FRILLS
927	Atom prop = None;
928	MWMHints mwmhints;	881	MWMHints mwmhints;
929	#endif	882	#endif
930	XGCValues gcvalue;	883	XGCValues gcvalue;
931	long vt_emask;
932	XSetWindowAttributes attributes;	884	XSetWindowAttributes attributes;
933	XWindowAttributes gattr;
934	Window top;	885	Window top, parent;
935	dDisp;
936		886
937	#ifdef USING_W11LIB	887	dLocal (Display *, xdisp);
938	/* enable W11 callbacks */
939	W11AddEventHandler (disp, rxvt_W11_process_x_event);
940	#endif
941		888
942	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	889	/* grab colors before netscape does */
943	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	890	Get_Colours ();
944		891
945	if (options & Opt_transparent)	892	if (!set_fonts ())
946	{	893	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	894
948	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	895	parent = display->root;
949	}	896
		897	attributes.override_redirect = !!OPTION (Opt_override_redirect);
950		898
951	#if ENABLE_FRILLS	899	#if ENABLE_FRILLS
952	if (options & Opt_borderLess)	900	if (OPTION (Opt_borderLess))
953	{	901	{
954	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	902	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
955
956	if (prop == None)
957	{	903	{
958	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	904	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
959	#ifdef PREFER_24BIT
960	attributes.override_redirect = TRUE;	905	attributes.override_redirect = TRUE;
961	#endif
962	mwmhints.flags = 0;	906	mwmhints.flags = 0;
963	}	907	}
964	else	908	else
965	{	909	{
966	mwmhints.flags = MWM_HINTS_DECORATIONS;	910	mwmhints.flags = MWM_HINTS_DECORATIONS;
967	mwmhints.decorations = 0;	911	mwmhints.decorations = 0;
968	}	912	}
969	}	913	}
970	else	914	else
971	{
972	mwmhints.flags = 0;	915	mwmhints.flags = 0;
973	}
974	#endif	916	#endif
975
976	/* grab colors before netscape does */
977	Get_Colours ();
978
979	if (!set_fonts ())
980	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
981		917
982	#if ENABLE_XEMBED	918	#if ENABLE_XEMBED
983	if (rs[Rs_embed])	919	if (rs[Rs_embed])
984	{	920	{
985	XWindowAttributes wattr;	921	XWindowAttributes wattr;
986		922
987	top = strtol (rs[Rs_embed], 0, 0);	923	parent = strtol (rs[Rs_embed], 0, 0);
988		924
989	if (!XGetWindowAttributes (disp, top, &wattr))	925	if (!XGetWindowAttributes (xdisp, parent, &wattr))
990	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	926	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991		927
992	window_calc (wattr.width, wattr.height);	928	window_calc (wattr.width, wattr.height);
993
994	#if 0
995	if (wattr.map_state == IsViewable)
996	{
997	TermWin.mapped = 1;
998	refresh_type = FAST_REFRESH;
999	XClearWindow (disp, top);
1000	// TODO: make XMapNotify-event-code a function and call it
1001	// TODO: how can I detect visibility without unmap/map?
1002	// TODO: focusin etc.
1003	}
1004	#else
1005	// it's easiest just to unmap/map to get all state correctly set-up
1006	XUnmapWindow (disp, top);
1007	#endif
1008	}
1009	else
1010	#endif
1011	{	929	}
		930	#endif
		931
1012	window_calc (0, 0);	932	window_calc (0, 0);
1013		933
1014	/* sub-window placement & size in rxvt_resize_subwindows () */	934	/* sub-window placement & size in rxvt_resize_subwindows () */
1015	#ifdef PREFER_24BIT
1016	attributes.background_pixel = pix_colors_focused[Color_border];	935	attributes.background_pixel = pix_colors_focused [Color_border];
1017	attributes.border_pixel = pix_colors_focused[Color_border];	936	attributes.border_pixel = pix_colors_focused [Color_border];
1018	attributes.colormap = display->cmap;	937	attributes.colormap = cmap;
1019	top = XCreateWindow (disp, DefaultRootWindow (disp),	938
		939	top = XCreateWindow (xdisp, parent,
1020	szHint.x, szHint.y,	940	szHint.x, szHint.y,
1021	szHint.width, szHint.height,	941	szHint.width, szHint.height,
1022	TermWin.ext_bwidth,	942	ext_bwidth,
1023	display->depth, InputOutput,	943	depth, InputOutput, visual,
1024	display->visual,
1025	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	944	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1026	#else	945	&attributes);
1027	top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028	szHint.x, szHint.y,
1029	szHint.width, szHint.height,
1030	TermWin.ext_bwidth,
1031	pix_colors_focused[Color_border],
1032	pix_colors_focused[Color_border]);
1033	#endif
1034	}
1035		946
1036	TermWin.parent[0] = top;	947	this->parent[0] = top;
1037		948
1038	old_width = szHint.width;	949	old_width = szHint.width;
1039	old_height = szHint.height;	950	old_height = szHint.height;
1040		951
1041	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	952	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1042	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	953	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1043		954
1044	classHint.res_name = (char *)rs[Rs_name];	955	classHint.res_name = (char *)rs[Rs_name];
1045	classHint.res_class = (char *)RESCLASS;	956	classHint.res_class = (char *)RESCLASS;
1046		957
1047	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	958	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1048	wmHint.input = True;	959	wmHint.input = True;
1049	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	960	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1050	wmHint.window_group = top;	961	wmHint.window_group = top;
1051		962
1052	XSetWMProperties (disp, top, NULL, NULL,	963	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1053	(char **)argv, argc, &szHint, &wmHint, &classHint);	964	&szHint, &wmHint, &classHint);
1054
1055	/* Enable delete window protocol */
1056	XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
1057		965
1058	#if ENABLE_FRILLS	966	#if ENABLE_FRILLS
		967	if (mwmhints.flags)
		968	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		969	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		970	#endif
		971
		972	Atom protocols[] = {
		973	xa[XA_WM_DELETE_WINDOW],
		974	#if ENABLE_EWMH
		975	xa[XA_NET_WM_PING],
		976	#endif
		977	};
		978
		979	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		980
		981	#if ENABLE_FRILLS
		982	if (rs[Rs_transient_for])
		983	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		984	#endif
		985
		986	#if ENABLE_EWMH
1059	long pid = getpid ();	987	long pid = getpid ();
1060		988
1061	XChangeProperty (disp, top,	989	XChangeProperty (xdisp, top,
1062	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	990	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1063	PropModeReplace, (unsigned char *)&pid, 1);	991	PropModeReplace, (unsigned char *)&pid, 1);
1064	#endif
1065		992
		993	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
		994	#endif
		995
1066	XSelectInput (disp, top,	996	XSelectInput (xdisp, top,
1067	KeyPressMask	997	KeyPressMask
1068	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	998	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1069	\| KeyReleaseMask	999	\| KeyReleaseMask
1070	#endif	1000	#endif
1071	\| FocusChangeMask \| VisibilityChangeMask	1001	\| FocusChangeMask \| VisibilityChangeMask
1072	\| ExposureMask \| StructureNotifyMask);	1002	\| ExposureMask \| StructureNotifyMask);
1073		1003
1074	termwin_ev.start (display, top);	1004	termwin_ev.start (display, top);
1075		1005
1076	#if ENABLE_FRILLS
1077	if (mwmhints.flags)
1078	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1079	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1080	#endif
1081
1082	/* vt cursor: Black-on-White is standard, but this is more popular */	1006	/* vt cursor: Black-on-White is standard, but this is more popular */
1083	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1007	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1084		1008
1085	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1009	#ifdef HAVE_SCROLLBARS
1086	/* cursor (menuBar/scrollBar): Black-on-White */	1010	/* cursor scrollBar: Black-on-White */
1087	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1011	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1088	#endif	1012	#endif
1089		1013
1090	/* the vt window */	1014	/* the vt window */
1091	TermWin.vt = XCreateSimpleWindow (disp, top,	1015	vt = XCreateSimpleWindow (xdisp, top,
1092	window_vt_x,
1093	window_vt_y,	1016	window_vt_x, window_vt_y,
1094	TermWin_TotalWidth (),	1017	width, height,
1095	TermWin_TotalHeight (),
1096	0,	1018	0,
1097	pix_colors_focused[Color_fg],	1019	pix_colors_focused[Color_fg],
1098	pix_colors_focused[Color_bg]);	1020	pix_colors_focused[Color_bg]);
1099	#ifdef DEBUG_X
1100	XStoreName (disp, TermWin.vt, "vt window");
1101	#endif
1102		1021
1103	attributes.bit_gravity = NorthWestGravity;	1022	attributes.bit_gravity = NorthWestGravity;
1104	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1023	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1105		1024
1106	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1025	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1107		1026
1108	#ifdef POINTER_BLANK	1027	if (OPTION (Opt_pointerBlank))
1109	if (options & Opt_pointerBlank)
1110	vt_emask \|= PointerMotionMask;	1028	vt_emask \|= PointerMotionMask;
1111	else	1029	else
1112	#endif
1113	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1030	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1114		1031
1115	XSelectInput (disp, TermWin.vt, vt_emask);	1032	vt_select_input ();
		1033
1116	vt_ev.start (display, TermWin.vt);	1034	vt_ev.start (display, vt);
1117
1118	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1119	if (menuBar_height ())
1120	{
1121	menuBar.win = XCreateSimpleWindow (disp, top,
1122	window_vt_x, 0,
1123	TermWin_TotalWidth (),
1124	menuBar_TotalHeight (),
1125	0,
1126	pix_colors_focused[Color_fg],
1127	pix_colors_focused[Color_scroll]);
1128
1129	#ifdef DEBUG_X
1130	XStoreName (disp, menuBar.win, "menubar");
1131	#endif
1132
1133	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1134
1135	XDefineCursor (disp, menuBar.win,
1136	XCreateFontCursor (disp, XC_left_ptr));
1137
1138	XSelectInput (disp, menuBar.win,
1139	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1140	menubar_ev.start (display, menuBar.win);
1141	}
1142	#endif
1143		1035
1144	#ifdef XPM_BACKGROUND	1036	#ifdef XPM_BACKGROUND
1145	if (rs[Rs_backgroundPixmap] != NULL	1037	if (rs[Rs_backgroundPixmap] != NULL
1146	&& ! (options & Opt_transparent))	1038	&& !OPTION (Opt_transparent))
1147	{	1039	{
1148	const char *p = rs[Rs_backgroundPixmap];	1040	const char *p = rs[Rs_backgroundPixmap];
1149		1041
1150	if ((p = strchr (p, ';')) != NULL)	1042	if ((p = strchr (p, ';')) != NULL)
1151	{	1043	{
…		…
1157	scr_touch (true);	1049	scr_touch (true);
1158	}	1050	}
1159	#endif	1051	#endif
1160		1052
1161	/* graphics context for the vt window */	1053	/* graphics context for the vt window */
1162	gcvalue.foreground = pix_colors[Color_fg];	1054	gcvalue.foreground = pix_colors[Color_fg];
1163	gcvalue.background = pix_colors[Color_bg];	1055	gcvalue.background = pix_colors[Color_bg];
1164	gcvalue.graphics_exposures = 1;	1056	gcvalue.graphics_exposures = 1;
		1057
1165	TermWin.gc = XCreateGC (disp, TermWin.vt,	1058	gc = XCreateGC (xdisp, vt,
1166	GCForeground \| GCBackground \| GCGraphicsExposures,	1059	GCForeground \| GCBackground \| GCGraphicsExposures,
1167	&gcvalue);	1060	&gcvalue);
1168		1061
1169	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1062	drawable = new rxvt_drawable (this, vt);
1170		1063
1171	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1064	#ifdef RXVT_SCROLLBAR
1172	gcvalue.foreground = pix_colors[Color_topShadow];	1065	gcvalue.foreground = pix_colors[Color_topShadow];
1173	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1066	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1174	gcvalue.foreground = pix_colors[Color_bottomShadow];	1067	gcvalue.foreground = pix_colors[Color_bottomShadow];
1175	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1068	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1176	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1069	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1177	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1070	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1178	#endif	1071	#endif
1179		1072
1180	#ifdef OFF_FOCUS_FADING	1073	#ifdef OFF_FOCUS_FADING
1181	// initially we are in unfocused state	1074	// initially we are in unfocused state
1182	if (rs[Rs_fade])	1075	if (rs[Rs_fade])
1183	pix_colors = pix_colors_unfocused;	1076	pix_colors = pix_colors_unfocused;
1184	#endif	1077	#endif
1185		1078
1186	pointer_unblank ();	1079	pointer_unblank ();
1187	scr_recolour ();	1080	scr_recolour ();
1188
1189	#if ENABLE_XEMBED
1190	// why this is necessary, I don't know, race condition??
1191	XMoveWindow (disp, TermWin.vt, window_vt_x, window_vt_y);
1192	#endif
1193	}	1081	}
1194		1082
1195	/* ------------------------------------------------------------------------- *	1083	/* ------------------------------------------------------------------------- *
1196	* GET TTY CURRENT STATE *	1084	* GET TTY CURRENT STATE *
1197	* ------------------------------------------------------------------------- */	1085	* ------------------------------------------------------------------------- */
…		…
1202	/*	1090	/*
1203	* standard System V termios interface	1091	* standard System V termios interface
1204	*/	1092	*/
1205	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1093	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1206	{	1094	{
1207	/* return error - use system defaults */	1095	// return error - use system defaults,
		1096	// where possible, and zero elsewhere
		1097	memset (tio, 0, sizeof (ttymode_t));
		1098
1208	tio->c_cc[VINTR] = CINTR;	1099	tio->c_cc[VINTR] = CINTR;
1209	tio->c_cc[VQUIT] = CQUIT;	1100	tio->c_cc[VQUIT] = CQUIT;
1210	tio->c_cc[VERASE] = CERASE;	1101	tio->c_cc[VERASE] = CERASE;
		1102	#ifdef VERASE2
		1103	tio->c_cc[VERASE2] = CERASE2;
		1104	#endif
1211	tio->c_cc[VKILL] = CKILL;	1105	tio->c_cc[VKILL] = CKILL;
1212	tio->c_cc[VSTART] = CSTART;	1106	tio->c_cc[VSTART] = CSTART;
1213	tio->c_cc[VSTOP] = CSTOP;	1107	tio->c_cc[VSTOP] = CSTOP;
1214	tio->c_cc[VSUSP] = CSUSP;	1108	tio->c_cc[VSUSP] = CSUSP;
1215	# ifdef VDSUSP	1109	# ifdef VDSUSP
1216
1217	tio->c_cc[VDSUSP] = CDSUSP;	1110	tio->c_cc[VDSUSP] = CDSUSP;
1218	# endif	1111	# endif
1219	# ifdef VREPRINT	1112	# ifdef VREPRINT
1220
1221	tio->c_cc[VREPRINT] = CRPRNT;	1113	tio->c_cc[VREPRINT] = CRPRNT;
1222	# endif	1114	# endif
1223	# ifdef VDISCRD	1115	# ifdef VDISCRD
1224
1225	tio->c_cc[VDISCRD] = CFLUSH;	1116	tio->c_cc[VDISCRD] = CFLUSH;
1226	# endif	1117	# endif
1227	# ifdef VWERSE	1118	# ifdef VWERSE
1228
1229	tio->c_cc[VWERSE] = CWERASE;	1119	tio->c_cc[VWERSE] = CWERASE;
1230	# endif	1120	# endif
1231	# ifdef VLNEXT	1121	# ifdef VLNEXT
1232
1233	tio->c_cc[VLNEXT] = CLNEXT;	1122	tio->c_cc[VLNEXT] = CLNEXT;
1234	# endif	1123	# endif
1235
1236	}	1124	}
		1125
1237	tio->c_cc[VEOF] = CEOF;	1126	tio->c_cc[VEOF] = CEOF;
1238	tio->c_cc[VEOL] = VDISABLE;	1127	tio->c_cc[VEOL] = VDISABLE;
1239	# ifdef VEOL2	1128	# ifdef VEOL2
1240
1241	tio->c_cc[VEOL2] = VDISABLE;	1129	tio->c_cc[VEOL2] = VDISABLE;
1242	# endif	1130	# endif
1243	# ifdef VSWTC	1131	# ifdef VSWTC
1244
1245	tio->c_cc[VSWTC] = VDISABLE;	1132	tio->c_cc[VSWTC] = VDISABLE;
1246	# endif	1133	# endif
1247	# ifdef VSWTCH	1134	# ifdef VSWTCH
1248
1249	tio->c_cc[VSWTCH] = VDISABLE;	1135	tio->c_cc[VSWTCH] = VDISABLE;
1250	# endif	1136	# endif
1251	# if VMIN != VEOF	1137	# if VMIN != VEOF
1252
1253	tio->c_cc[VMIN] = 1;	1138	tio->c_cc[VMIN] = 1;
1254	# endif	1139	# endif
1255	# if VTIME != VEOL	1140	# if VTIME != VEOL
1256
1257	tio->c_cc[VTIME] = 0;	1141	tio->c_cc[VTIME] = 0;
1258	# endif	1142	# endif
1259		1143
1260	if (erase != -1)	1144	if (erase != -1)
1261	tio->c_cc[VERASE] = (char)erase;	1145	tio->c_cc[VERASE] = (char)erase;
…		…
1289	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1173	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290	{	1174	{
1291	tio->sg.sg_erase = CERASE; /* ^H */	1175	tio->sg.sg_erase = CERASE; /* ^H */
1292	tio->sg.sg_kill = CKILL; /* ^U */	1176	tio->sg.sg_kill = CKILL; /* ^U */
1293	}	1177	}
		1178
1294	if (erase != -1)	1179	if (erase != -1)
1295	tio->sg.sg_erase = (char)erase;	1180	tio->sg.sg_erase = (char)erase;
1296		1181
1297	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1182	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1298		1183
…		…
1304	tio->tc.t_startc = CSTART; /* ^Q */	1189	tio->tc.t_startc = CSTART; /* ^Q */
1305	tio->tc.t_stopc = CSTOP; /* ^S */	1190	tio->tc.t_stopc = CSTOP; /* ^S */
1306	tio->tc.t_eofc = CEOF; /* ^D */	1191	tio->tc.t_eofc = CEOF; /* ^D */
1307	tio->tc.t_brkc = -1;	1192	tio->tc.t_brkc = -1;
1308	}	1193	}
		1194
1309	/* get local special chars */	1195	/* get local special chars */
1310	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1196	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311	{	1197	{
1312	tio->lc.t_suspc = CSUSP; /* ^Z */	1198	tio->lc.t_suspc = CSUSP; /* ^Z */
1313	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1199	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1317	tio->lc.t_lnextc = CLNEXT; /* ^V */	1203	tio->lc.t_lnextc = CLNEXT; /* ^V */
1318	}	1204	}
1319	/* get line discipline */	1205	/* get line discipline */
1320	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1206	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321	# ifdef NTTYDISC	1207	# ifdef NTTYDISC
1322
1323	tio->line = NTTYDISC;	1208	tio->line = NTTYDISC;
1324	# endif /* NTTYDISC */	1209	# endif /* NTTYDISC */
1325		1210
1326	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1211	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1327	#endif /* HAVE_TERMIOS_H */	1212	#endif /* HAVE_TERMIOS_H */
…		…
1350	FOO (IGNCR, "IGNCR");	1235	FOO (IGNCR, "IGNCR");
1351	FOO (ICRNL, "ICRNL");	1236	FOO (ICRNL, "ICRNL");
1352	FOO (IXON, "IXON");	1237	FOO (IXON, "IXON");
1353	FOO (IXOFF, "IXOFF");	1238	FOO (IXOFF, "IXOFF");
1354	# ifdef IUCLC	1239	# ifdef IUCLC
1355
1356	FOO (IUCLC, "IUCLC");	1240	FOO (IUCLC, "IUCLC");
1357	# endif	1241	# endif
1358	# ifdef IXANY	1242	# ifdef IXANY
1359
1360	FOO (IXANY, "IXANY");	1243	FOO (IXANY, "IXANY");
1361	# endif	1244	# endif
1362	# ifdef IMAXBEL	1245	# ifdef IMAXBEL
1363
1364	FOO (IMAXBEL, "IMAXBEL");	1246	FOO (IMAXBEL, "IMAXBEL");
1365	# endif	1247	# endif
1366		1248
1367	fprintf (stderr, "\n");	1249	fprintf (stderr, "\n");
1368		1250
…		…
1375	FOO (VERASE, "VERASE");	1257	FOO (VERASE, "VERASE");
1376	FOO (VKILL, "VKILL");	1258	FOO (VKILL, "VKILL");
1377	FOO (VEOF, "VEOF");	1259	FOO (VEOF, "VEOF");
1378	FOO (VEOL, "VEOL");	1260	FOO (VEOL, "VEOL");
1379	# ifdef VEOL2	1261	# ifdef VEOL2
1380
1381	FOO (VEOL2, "VEOL2");	1262	FOO (VEOL2, "VEOL2");
1382	# endif	1263	# endif
1383	# ifdef VSWTC	1264	# ifdef VSWTC
1384
1385	FOO (VSWTC, "VSWTC");	1265	FOO (VSWTC, "VSWTC");
1386	# endif	1266	# endif
1387	# ifdef VSWTCH	1267	# ifdef VSWTCH
1388
1389	FOO (VSWTCH, "VSWTCH");	1268	FOO (VSWTCH, "VSWTCH");
1390	# endif	1269	# endif
1391
1392	FOO (VSTART, "VSTART");	1270	FOO (VSTART, "VSTART");
1393	FOO (VSTOP, "VSTOP");	1271	FOO (VSTOP, "VSTOP");
1394	FOO (VSUSP, "VSUSP");	1272	FOO (VSUSP, "VSUSP");
1395	# ifdef VDSUSP	1273	# ifdef VDSUSP
1396
1397	FOO (VDSUSP, "VDSUSP");	1274	FOO (VDSUSP, "VDSUSP");
1398	# endif	1275	# endif
1399	# ifdef VREPRINT	1276	# ifdef VREPRINT
1400
1401	FOO (VREPRINT, "VREPRINT");	1277	FOO (VREPRINT, "VREPRINT");
1402	# endif	1278	# endif
1403	# ifdef VDISCRD	1279	# ifdef VDISCRD
1404
1405	FOO (VDISCRD, "VDISCRD");	1280	FOO (VDISCRD, "VDISCRD");
1406	# endif	1281	# endif
1407	# ifdef VWERSE	1282	# ifdef VWERSE
1408
1409	FOO (VWERSE, "VWERSE");	1283	FOO (VWERSE, "VWERSE");
1410	# endif	1284	# endif
1411	# ifdef VLNEXT	1285	# ifdef VLNEXT
1412
1413	FOO (VLNEXT, "VLNEXT");	1286	FOO (VLNEXT, "VLNEXT");
1414	# endif	1287	# endif
1415		1288
1416	fprintf (stderr, "\n");	1289	fprintf (stderr, "\n");
1417	# undef FOO	1290	# undef FOO
…		…
1429	rxvt_term::run_command (const char const argv)	1302	rxvt_term::run_command (const char const argv)
1430	{	1303	{
1431	#if ENABLE_FRILLS	1304	#if ENABLE_FRILLS
1432	if (rs[Rs_pty_fd])	1305	if (rs[Rs_pty_fd])
1433	{	1306	{
1434	pty.pty = atoi (rs[Rs_pty_fd]);	1307	pty->pty = atoi (rs[Rs_pty_fd]);
1435	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1308
		1309	if (pty->pty >= 0)
		1310	{
		1311	if (getfd_hook)
		1312	pty->pty = (*getfd_hook) (pty->pty);
		1313
		1314	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1315	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1316	}
1436	}	1317	}
1437	else	1318	else
1438	#endif	1319	#endif
1439	if (!pty.get ())	1320	if (!pty->get ())
1440	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1321	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1441		1322
1442	pty.set_utf8_mode (enc_utf8);	1323	pty->set_utf8_mode (enc_utf8);
1443		1324
1444	/* set initial window size */	1325	/* set initial window size */
1445	tt_winch ();	1326	tt_winch ();
1446		1327
1447	int er;	1328	int er;
…		…
1460	#if ENABLE_FRILLS	1341	#if ENABLE_FRILLS
1461	if (rs[Rs_pty_fd])	1342	if (rs[Rs_pty_fd])
1462	return;	1343	return;
1463	#endif	1344	#endif
1464		1345
1465	sw_chld.start (SIGCHLD);
1466
1467	#ifndef __QNX__
1468	/* spin off the command interpreter */	1346	/* spin off the command interpreter */
1469	switch (cmd_pid = fork ())	1347	switch (cmd_pid = fork ())
1470	{	1348	{
1471	case -1:	1349	case -1:
1472	{	1350	{
…		…
1474	rxvt_fatal ("can't fork, aborting.\n");	1352	rxvt_fatal ("can't fork, aborting.\n");
1475	}	1353	}
1476	case 0:	1354	case 0:
1477	init_env ();	1355	init_env ();
1478		1356
1479	if (!pty.make_controlling_tty ())	1357	if (!pty->make_controlling_tty ())
1480	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1358	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1481	else	1359	else
1482	{	1360	{
1483	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1361	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1484	dup2 (pty.tty, STDIN_FILENO);	1362	dup2 (pty->tty, STDIN_FILENO);
1485	dup2 (pty.tty, STDOUT_FILENO);	1363	dup2 (pty->tty, STDOUT_FILENO);
1486	dup2 (pty.tty, STDERR_FILENO);	1364	dup2 (pty->tty, STDERR_FILENO);
1487		1365
1488	// close all our file handles that we do no longer need	1366	// close all our file handles that we do no longer need
1489	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1367	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1490	{	1368	{
1491	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1369	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1492	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1370	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1493	}	1371	}
1494		1372
1495	run_child (argv);	1373	run_child (argv);
1496	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1374	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1497	}	1375	}
1498		1376
1499	_exit (EXIT_FAILURE);	1377	_exit (EXIT_FAILURE);
1500		1378
1501	default:	1379	default:
1502	{	1380	if (!OPTION (Opt_utmpInhibit))
1503	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1381	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1504	int fdstdin;
1505		1382
1506	fdstdin = dup (STDIN_FILENO);	1383	pty->close_tty ();
1507	dup2 (pty.tty, STDIN_FILENO);
1508	#endif
1509		1384
1510	#ifdef UTMP_SUPPORT	1385	child_ev.start (cmd_pid);
1511	privileged_utmp (SAVE);
1512	#endif
1513		1386
1514	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1387	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1515
1516	dup2 (fdstdin, STDIN_FILENO);
1517	close (fdstdin);
1518	#endif
1519	}
1520
1521	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1522	break;	1388	break;
1523	}	1389	}
1524	#else /* __QNX__ uses qnxspawn () */
1525	fchmod (pty.tty, 0622);
1526	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1527	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1528
1529	if (run_child (argv) == -1)
1530	exit (EXIT_FAILURE);
1531	#endif
1532	}	1390	}
1533		1391
1534	/* ------------------------------------------------------------------------- *	1392	/* ------------------------------------------------------------------------- *
1535	* CHILD PROCESS OPERATIONS *	1393	* CHILD PROCESS OPERATIONS *
1536	* ------------------------------------------------------------------------- */	1394	* ------------------------------------------------------------------------- */
…		…
1543	{	1401	{
1544	char *login;	1402	char *login;
1545		1403
1546	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1404	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1547		1405
1548	if (options & Opt_console)	1406	if (OPTION (Opt_console))
1549	{ /* be virtual console, fail silently */	1407	{ /* be virtual console, fail silently */
1550	#ifdef TIOCCONS	1408	#ifdef TIOCCONS
1551	unsigned int on = 1;	1409	unsigned int on = 1;
1552		1410
1553	ioctl (STDIN_FILENO, TIOCCONS, &on);	1411	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1580	// unblock signals (signals are blocked by iom.C	1438	// unblock signals (signals are blocked by iom.C
1581	sigset_t ss;	1439	sigset_t ss;
1582	sigemptyset (&ss);	1440	sigemptyset (&ss);
1583	sigprocmask (SIG_SETMASK, &ss, 0);	1441	sigprocmask (SIG_SETMASK, &ss, 0);
1584		1442
1585	#ifndef __QNX__
1586	/* command interpreter path */	1443	/* command interpreter path */
1587	if (argv != NULL)	1444	if (argv != NULL)
1588	{	1445	{
1589	# ifdef DEBUG_CMD	1446	# ifdef DEBUG_CMD
1590	int i;	1447	int i;
…		…
1596	execvp (argv[0], (char const )argv);	1453	execvp (argv[0], (char const )argv);
1597	/* no error message: STDERR is closed! */	1454	/* no error message: STDERR is closed! */
1598	}	1455	}
1599	else	1456	else
1600	{	1457	{
1601	const char argv0, shell;	1458	const char argv0, shell;
1602		1459
1603	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1460	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1604	shell = "/bin/sh";	1461	shell = "/bin/sh";
1605		1462
1606	argv0 = (const char *)rxvt_r_basename (shell);	1463	argv0 = (const char *)rxvt_r_basename (shell);
1607		1464
1608	if (options & Opt_loginShell)	1465	if (OPTION (Opt_loginShell))
1609	{	1466	{
1610	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1467	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1611		1468
1612	login[0] = '-';	1469	login[0] = '-';
1613	strcpy (&login[1], argv0);	1470	strcpy (&login[1], argv0);
1614	argv0 = login;	1471	argv0 = login;
1615	}	1472	}
		1473
1616	execlp (shell, argv0, NULL);	1474	execlp (shell, argv0, NULL);
1617	/* no error message: STDERR is closed! */	1475	/* no error message: STDERR is closed! */
1618	}	1476	}
1619		1477
1620	#else /* __QNX__ uses qnxspawn () */
1621
1622	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1623	char *command = NULL, fullcommand[_MAX_PATH];
1624	char *arg_v, arg_a[2] = { NULL, NULL };
1625
1626	if (argv != NULL)
1627	{
1628	if (access (argv[0], X_OK) == -1)
1629	{
1630	if (strchr (argv[0], '/') == NULL)
1631	{
1632	searchenv (argv[0], "PATH", fullcommand);
1633
1634	if (fullcommand[0] != '\0')
1635	command = fullcommand;
1636	}
1637
1638	if (access (command, X_OK) == -1)
1639	return -1;
1640	}
1641	else
1642	command = argv[0];
1643
1644	arg_v = argv;
1645	}
1646	else
1647	{
1648	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1649	command = "/bin/sh";
1650
1651	arg_a[0] = my_basename (command);
1652
1653	if (options & Opt_loginShell)
1654	{
1655	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1656
1657	login[0] = '-';
1658	strcpy (&login[1], arg_a[0]);
1659	arg_a[0] = login;
1660	}
1661
1662	arg_v = arg_a;
1663	}
1664
1665	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1666	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1667	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1668	command, arg_v, environ, iov_a, 0);
1669	if (login)
1670	free (login);
1671
1672	pty.close_tty ();
1673	return pty.pty;
1674	#endif
1675
1676	return -1;	1478	return -1;
1677	}	1479	}
1678		1480
1679	/----------------------- end-of-file (C source) -----------------------/	1481	/----------------------- 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.113 by root, Sat Feb 19 04:16:49 2005 UTC vs. Revision 1.156 by root, Wed Jan 25 21:03:04 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.113 by root, Sat Feb 19 04:16:49 2005 UTC vs.
Revision 1.156 by root, Wed Jan 25 21:03:04 2006 UTC