[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.179 by root, Sat Jan 20 12:29:35 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: init.C	2	* File: init.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
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	"rgb:00/00/00", // 0: black (Black)
47	#ifndef NO_BRIGHTCOLOR	49	"rgb:cd/00/00", // 1: red (Red3)
48	"Red3", /* 1: red (#CD0000) */	50	"rgb:00/cd/00", // 2: green (Green3)
49	"Green3", /* 2: green (#00CD00) */	51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)
50	"Yellow3", /* 3: yellow (#CDCD00) */	52	"rgb:00/00/cd", // 4: blue (Blue3)
51	"Blue3", /* 4: blue (#0000CD) */	53	"rgb:cd/00/cd", // 5: magenta (Magenta3)
52	"Magenta3", /* 5: magenta (#CD00CD) */	54	"rgb:00/cd/cd", // 6: cyan (Cyan3)
53	"Cyan3", /* 6: cyan (#00CDCD) */	55	# ifdef XTERM_COLORS
54	# ifdef XTERM_COLORS	56	"rgb:e5/e5/e5", // 7: white (Grey90)
55	"Grey90", /* 7: white (#E5E5E5) */	57	# else
56	# else	58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57	"AntiqueWhite", /* 7: white (#FAEBD7) */
58	# endif	59	# endif
59	/* high-intensity colors */	60	/* high-intensity colors */
60	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
61	"Grey30", /* 8: bright black (#4D4D4D) */	62	"rgb:4d/4d/4d", // 8: bright black (Grey30)
62	# else	63	# else
63	"Grey25", /* 8: bright black (#404040) */	64	"rgb:40/40/40", // 8: bright black (Grey25)
64	# endif	65	# endif
65	#endif /* NO_BRIGHTCOLOR */	66	"rgb:ff/00/00", // 1/9: bright red (Reed)
66	"Red", /* 1/9: bright red (#FF0000) */	67	"rgb:00/ff/00", // 2/10: bright green (Green)
67	"Green", /* 2/10: bright green (#00FF00) */	68	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	69	"rgb:00/00/ff", // 4/12: bright blue (Blue)
69	"Blue", /* 4/12: bright blue (#0000FF) */	70	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	71	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71	"Cyan", /* 6/14: bright cyan (#00FFFF) */	72	"rgb:ff/ff/ff", // 7/15: bright white (White)
72	"White", /* 7/15: bright white (#FFFFFF) */
73		73
74	// 88 xterm colours	74	// 88 xterm colours
75	"rgb:00/00/00",	75	"rgb:00/00/00",
76	"rgb:00/00/8b",	76	"rgb:00/00/8b",
77	"rgb:00/00/cd",	77	"rgb:00/00/cd",
…		…
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	"rgb:00/00/00",
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
…		…
305	int i, r_argc;	258	int i, r_argc;
306	char *val;	259	char *val;
307	const char cmd_argv, r_argv;	260	const char cmd_argv, r_argv;
308		261
309	/*	262	/*
310	* Look for -exec option. Find => split and make cmd_argv[] of command args	263	* Look for -e option. Find => split and make cmd_argv[] of command args
311	*/	264	*/
312	for (r_argc = 0; r_argc < argc; r_argc++)	265	for (r_argc = 0; r_argc < argc; r_argc++)
313	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	266	if (!strcmp (argv[r_argc], "-e"))
314	break;	267	break;
315		268
316	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
317		270
318	for (i = 0; i < r_argc; i++)	271	for (i = 0; i < r_argc; i++)
…		…
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
		302	// using a local pointer decreases code size a lot
		303	xa = display->xa;
		304
		305	set (display);
360	extract_resources ();	306	extract_resources ();
		307
		308	#if XFT
		309	if (rs[Rs_depth])
		310	select_visual (strtol (rs[Rs_depth], 0, 0));
		311	#endif
		312
361	free (r_argv);	313	free (r_argv);
		314
		315	for (int i = NUM_RESOURCES; i--; )
		316	if (rs [i] == resval_undef)
		317	rs [i] = 0;
		318
		319	#if ENABLE_PERL
		320	if (!rs[Rs_perl_ext_1])
		321	rs[Rs_perl_ext_1] = "default";
		322
		323	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		324	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		325	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		326	{
		327	rxvt_perl.init (this);
		328	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		329	}
		330	#endif
362		331
363	/*	332	/*
364	* set any defaults not already set	333	* set any defaults not already set
365	*/	334	*/
366	if (cmd_argv && cmd_argv[0])	335	if (cmd_argv && cmd_argv[0])
…		…
377	if (!rs[Rs_iconName])	346	if (!rs[Rs_iconName])
378	rs[Rs_iconName] = rs[Rs_name];	347	rs[Rs_iconName] = rs[Rs_name];
379	}	348	}
380		349
381	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	350	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
382	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	351	saveLines = min (i, MAX_SAVELINES);
383		352
384	#if ENABLE_FRILLS	353	#if ENABLE_FRILLS
385	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	354	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
386	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	355	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		356
387	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	357	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
388	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	358	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		359
389	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	360	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
390	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	361	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
391	#endif	362	#endif
392		363
393	#ifdef POINTER_BLANK	364	#ifdef POINTER_BLANK
394	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	365	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
395	pointerBlankDelay = i;	366	pointerBlankDelay = i;
396	else	367	else
397	pointerBlankDelay = 2;	368	pointerBlankDelay = 2;
398	#endif	369	#endif
399		370
400	/* no point having a scrollbar without having any scrollback! */	371	/* no point having a scrollbar without having any scrollback! */
401	if (!TermWin.saveLines)	372	if (!saveLines)
402	options &= ~Opt_scrollBar;	373	set_option (Opt_scrollBar, 0);
403		374
404	#ifdef PRINTPIPE	375	#ifdef PRINTPIPE
405	if (!rs[Rs_print_pipe])	376	if (!rs[Rs_print_pipe])
406	rs[Rs_print_pipe] = PRINTPIPE;	377	rs[Rs_print_pipe] = PRINTPIPE;
407	#endif	378	#endif
…		…
450	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	421	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
451	#endif	422	#endif
452		423
453	#ifdef XTERM_REVERSE_VIDEO	424	#ifdef XTERM_REVERSE_VIDEO
454	/* this is how xterm implements reverseVideo */	425	/* this is how xterm implements reverseVideo */
455	if (options & Opt_reverseVideo)	426	if (OPTION (Opt_reverseVideo))
456	{	427	{
457	if (!rs[Rs_color + Color_fg])	428	if (!rs[Rs_color + Color_fg])
458	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	429	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		430
459	if (!rs[Rs_color + Color_bg])	431	if (!rs[Rs_color + Color_bg])
460	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	432	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
461	}	433	}
462	#endif	434	#endif
463		435
…		…
465	if (!rs[Rs_color + i])	437	if (!rs[Rs_color + i])
466	rs[Rs_color + i] = def_colorName[i];	438	rs[Rs_color + i] = def_colorName[i];
467		439
468	#ifndef XTERM_REVERSE_VIDEO	440	#ifndef XTERM_REVERSE_VIDEO
469	/* this is how we implement reverseVideo */	441	/* this is how we implement reverseVideo */
470	if (options & Opt_reverseVideo)	442	if (OPTION (Opt_reverseVideo))
471	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	443	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
472	#endif	444	#endif
473		445
474	/* convenient aliases for setting fg/bg to colors */	446	/* convenient aliases for setting fg/bg to colors */
475	color_aliases (Color_fg);	447	color_aliases (Color_fg);
476	color_aliases (Color_bg);	448	color_aliases (Color_bg);
…		…
515	val = rxvt_network_display (rs[Rs_display_name]);	487	val = rxvt_network_display (rs[Rs_display_name]);
516	rs[Rs_display_name] = (const char *)val;	488	rs[Rs_display_name] = (const char *)val;
517		489
518	if (val == NULL)	490	if (val == NULL)
519	#endif /* DISPLAY_IS_IP */	491	#endif /* DISPLAY_IS_IP */
520	val = XDisplayString (display->display);	492	val = XDisplayString (dpy);
521		493
522	if (rs[Rs_display_name] == NULL)	494	if (rs[Rs_display_name] == NULL)
523	rs[Rs_display_name] = val; /* use broken `:0' value */	495	rs[Rs_display_name] = val; /* use broken `:0' value */
524		496
525	i = strlen (val);	497	i = strlen (val);
526	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	498	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
527		499
528	sprintf (env_display, "DISPLAY=%s", val);	500	sprintf (env_display, "DISPLAY=%s", val);
529		501
530	/* avoiding the math library:	502	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		503
540	/* add entries to the environment:	504	/* add entries to the environment:
541	* @ DISPLAY: in case we started with -display	505	* @ DISPLAY: in case we started with -display
542	* @ WINDOWID: X window id number of the window	506	* @ WINDOWID: X window id number of the window
543	* @ COLORTERM: terminal sub-name and also indicates its color	507	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
545	* @ TERMINFO: path to terminfo directory	509	* @ TERMINFO: path to terminfo directory
546	* @ COLORFGBG: fg;bg color codes	510	* @ COLORFGBG: fg;bg color codes
547	*/	511	*/
548	putenv (env_display);	512	putenv (env_display);
549	putenv (env_windowid);	513	putenv (env_windowid);
		514
550	if (env_colorfgbg)	515	if (env_colorfgbg)
551	putenv (env_colorfgbg);	516	putenv (env_colorfgbg);
552		517
553	#ifdef RXVT_TERMINFO	518	#ifdef RXVT_TERMINFO
554	putenv ("TERMINFO=" RXVT_TERMINFO);	519	putenv ("TERMINFO=" RXVT_TERMINFO);
555	#endif	520	#endif
556		521
557	if (display->depth <= 2)	522	if (depth <= 2)
558	putenv ("COLORTERM=" COLORTERMENV "-mono");	523	putenv ("COLORTERM=" COLORTERMENV "-mono");
559	else	524	else
560	putenv ("COLORTERM=" COLORTERMENVFULL);	525	putenv ("COLORTERM=" COLORTERMENVFULL);
561		526
562	if (rs[Rs_term_name] != NULL)	527	if (rs[Rs_term_name] != NULL)
…		…
582	* This should support all European type languages.	547	* This should support all European type languages.
583	*/	548	*/
584	void	549	void
585	rxvt_term::set_locale (const char *locale)	550	rxvt_term::set_locale (const char *locale)
586	{	551	{
		552	set_environ (envv);
		553
587	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	554	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
588	free (this->locale);	555	free (this->locale);
589	this->locale = setlocale (LC_CTYPE, locale);	556	this->locale = setlocale (LC_CTYPE, locale);
590		557
591	if (!this->locale)	558	if (!this->locale)
592	{	559	{
593	if (*locale)	560	if (*locale)
594	{	561	{
595	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	562	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
596	setlocale (LC_CTYPE, "");	563	setlocale (LC_CTYPE, "C");
597	}	564	}
598	else	565	else
599	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	566	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
600		567
601	this->locale = "";	568	this->locale = "C";
602	}	569	}
603		570
604		571
605	this->locale = rxvt_strdup (this->locale);	572	this->locale = rxvt_strdup (this->locale);
606	SET_LOCALE (this->locale);	573	SET_LOCALE (this->locale);
…		…
621	}	588	}
622		589
623	void	590	void
624	rxvt_term::init_xlocale ()	591	rxvt_term::init_xlocale ()
625	{	592	{
		593	set_environ (envv);
		594
626	#ifdef USE_XIM	595	#ifdef USE_XIM
627	if (!locale)	596	if (!locale)
628	rxvt_warn ("setting locale failed, working without locale support.\n");	597	rxvt_warn ("setting locale failed, working without locale support.\n");
629	else	598	else
630	{	599	{
…		…
652	* Initialize the command connection.	621	* Initialize the command connection.
653	* This should be called after the X server connection is established.	622	* This should be called after the X server connection is established.
654	*/	623	*/
655		624
656	#ifdef META8_OPTION	625	#ifdef META8_OPTION
657	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	626	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
658	#endif	627	#endif
659		628
660	get_ourmods ();	629	get_ourmods ();
661		630
662	if (!(options & Opt_scrollTtyOutput))	631	if (!OPTION (Opt_scrollTtyOutput))
663	priv_modes \|= PrivMode_TtyOutputInh;	632	priv_modes \|= PrivMode_TtyOutputInh;
664	if (options & Opt_scrollTtyKeypress)	633	if (OPTION (Opt_scrollTtyKeypress))
665	priv_modes \|= PrivMode_Keypress;	634	priv_modes \|= PrivMode_Keypress;
666	if (!(options & Opt_jumpScroll))	635	if (!OPTION (Opt_jumpScroll))
667	priv_modes \|= PrivMode_smoothScroll;	636	priv_modes \|= PrivMode_smoothScroll;
668		637
669	#ifndef NO_BACKSPACE_KEY	638	#ifndef NO_BACKSPACE_KEY
670	if (strcmp (key_backspace, "DEC") == 0)	639	if (strcmp (key_backspace, "DEC") == 0)
671	priv_modes \|= PrivMode_HaveBackSpace;	640	priv_modes \|= PrivMode_HaveBackSpace;
672	#endif	641	#endif
673		642
674	/* add value for scrollBar */	643	/* add value for scrollBar */
675	if (scrollbar_visible ())	644	if (scrollBar.state)
676	{	645	{
677	priv_modes \|= PrivMode_scrollBar;	646	priv_modes \|= PrivMode_scrollBar;
678	SavedModes \|= PrivMode_scrollBar;	647	SavedModes \|= PrivMode_scrollBar;
679	}	648	}
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		649
692	run_command (argv);	650	run_command (argv);
693	}	651	}
694		652
695	/----------------------------------------------------------------------/	653	/----------------------------------------------------------------------/
…		…
700		658
701	#ifdef OFF_FOCUS_FADING	659	#ifdef OFF_FOCUS_FADING
702	pix_colors = pix_colors_focused;	660	pix_colors = pix_colors_focused;
703	#endif	661	#endif
704		662
705	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	663	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
706	{	664	{
		665	const char *name = rs[Rs_color + i];
		666
		667	if (!name)
		668	continue;
		669
707	rxvt_color xcol;	670	rxvt_color xcol;
708		671
709	if (!rs[Rs_color + i])	672	if (!set_color (xcol, name))
710	continue;
711
712	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
713	{	673	{
714	#ifndef XTERM_REVERSE_VIDEO	674	#ifndef XTERM_REVERSE_VIDEO
715	if (i < 2 && (options & Opt_reverseVideo))	675	if (i < 2 && OPTION (Opt_reverseVideo))
716	rs[Rs_color + i] = def_colorName[!i];	676	name = def_colorName [1 - i];
717	else	677	else
718	#endif	678	#endif
719	rs[Rs_color + i] = def_colorName[i];	679	name = def_colorName [i];
720		680
721	if (!rs[Rs_color + i])	681	if (!name)
722	continue;	682	continue;
723		683
724	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	684	if (!set_color (xcol, name))
725	{	685	{
726	switch (i)	686	switch (i)
727	{	687	{
728	case Color_fg:	688	case Color_fg:
729	case Color_bg:	689	case Color_bg:
730	/* fatal: need bg/fg color */
731	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	690	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
732	/* NOTREACHED */	691	name = "";
733	break;	692	break;
734	#ifndef NO_CURSORCOLOR	693	#ifndef NO_CURSORCOLOR
735	case Color_cursor2:	694	case Color_cursor2:
736	xcol = pix_colors[Color_fg];	695	#endif
737	break;
738	#endif /* ! NO_CURSORCOLOR */
739	case Color_pointer_fg:	696	case Color_pointer_fg:
740	xcol = pix_colors[Color_fg];	697	name = rs[Rs_color + Color_fg];
		698	xcol.set (this, name);
741	break;	699	break;
742	default:	700	default:
743	xcol = pix_colors[Color_bg]; /* None */	701	name = rs[Rs_color + Color_bg];
		702	xcol.set (this, name);
744	break;	703	break;
745	}	704	}
746	}	705	}
747	}	706	}
748		707
749	pix_colors[i] = xcol;	708	pix_colors[i] = xcol;
750	#ifdef OFF_FOCUS_FADING	709	rs[Rs_color + i] = name;
751	if (rs[Rs_fade])
752	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
753	#endif
754	SET_PIXCOLOR (i);
755	}
756
757	if (display->depth <= 2)
758	{	710	}
		711
		712	if (depth <= 2)
		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]) alias_color (Color_pointer_fg, 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]) alias_color (Color_pointer_bg, Color_bg);
761	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	716	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, 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
772	if (display->depth <= 2)	726	if (depth <= 2)
		727	{
773	{ /* Monochrome */	728	/* Monochrome */
774	pix_colors[Color_scroll] = pix_colors[Color_fg];	729	alias_color (Color_scroll, Color_fg);
775	pix_colors[Color_topShadow] = pix_colors[Color_bg];	730	alias_color (Color_topShadow, Color_bg);
776	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	731	alias_color (Color_bottomShadow, Color_bg);
777	}	732	}
778	else	733	else
779	{	734	{
780	rxvt_color xcol[2];	735	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
781	/* xcol[0] == white
782	* xcol[1] == top shadow
783	* xcol[2] == bot shadow */
784		736
785	xcol[1] = pix_colors[Color_scroll];	737	rgba cscroll;
786	xcol[0].set (display, 65535, 65535, 65535);	738	pix_colors [Color_scroll].get (cscroll);
787
788	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
789
790	xcol[0].get (display, pr0, pg0, pb0);
791	xcol[1].get (display, pr1, pg1, pb1);
792
793	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
794		739
795	/* topShadowColor */	740	/* topShadowColor */
796	if (!xcol[1].set (display,	741	if (!pix_colors[Color_topShadow].set (this,
797	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	742	rgba (
798	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	743	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
799	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	744	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
800	xcol[1] = pix_colors[Color_White];	745	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
801		746	cscroll.a)
802	pix_colors[Color_topShadow] = xcol[1];	747	))
		748	alias_color (Color_topShadow, Color_White);
803	}	749	}
804	#endif /* KEEP_SCROLLCOLOR */	750	#endif /* KEEP_SCROLLCOLOR */
		751
		752	#ifdef OFF_FOCUS_FADING
		753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		754	update_fade_color (i);
		755	#endif
805	}	756	}
806		757
807	/----------------------------------------------------------------------/	758	/----------------------------------------------------------------------/
808	/* color aliases, fg/bg bright-bold */	759	/* color aliases, fg/bg bright-bold */
809	void	760	void
…		…
814	int i = atoi (rs[Rs_color + idx]);	765	int i = atoi (rs[Rs_color + idx]);
815		766
816	if (i >= 8 && i <= 15)	767	if (i >= 8 && i <= 15)
817	{ /* bright colors */	768	{ /* bright colors */
818	i -= 8;	769	i -= 8;
819	#ifndef NO_BRIGHTCOLOR
820	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	770	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
821	return;	771	return;
822	#endif
823	}	772	}
824		773
825	if (i >= 0 && i <= 7) /* normal colors */	774	if (i >= 0 && i <= 7) /* normal colors */
826	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	775	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
827	}	776	}
…		…
850		799
851	if (rsmod	800	if (rsmod
852	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	801	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853	requestedmeta = rsmod[3] - '0';	802	requestedmeta = rsmod[3] - '0';
854		803
855	map = XGetModifierMapping (display->display);	804	map = XGetModifierMapping (dpy);
856	kc = map->modifiermap;	805	kc = map->modifiermap;
857		806
858	for (i = 1; i < 6; i++)	807	for (i = 1; i < 6; i++)
859	{	808	{
860	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	809	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
862	for (j = map->max_keypermod; j--; k++)	811	for (j = map->max_keypermod; j--; k++)
863	{	812	{
864	if (kc[k] == 0)	813	if (kc[k] == 0)
865	break;	814	break;
866		815
867	switch (XKeycodeToKeysym (display->display, kc[k], 0))	816	switch (XKeycodeToKeysym (dpy, kc[k], 0))
868	{	817	{
869	case XK_Num_Lock:	818	case XK_Num_Lock:
870	ModNumLockMask = modmasks[i - 1];	819	ModNumLockMask = modmasks[i - 1];
871	continue;	820	continue;
872		821
…		…
922	rxvt_term::create_windows (int argc, const char const argv)	871	rxvt_term::create_windows (int argc, const char const argv)
923	{	872	{
924	XClassHint classHint;	873	XClassHint classHint;
925	XWMHints wmHint;	874	XWMHints wmHint;
926	#if ENABLE_FRILLS	875	#if ENABLE_FRILLS
927	Atom prop = None;
928	MWMHints mwmhints;	876	MWMHints mwmhints;
929	#endif	877	#endif
930	XGCValues gcvalue;	878	XGCValues gcvalue;
931	long vt_emask;
932	XSetWindowAttributes attributes;	879	XSetWindowAttributes attributes;
933	XWindowAttributes gattr;
934	Window top;	880	Window top, parent;
935	dDisp;
936		881
937	#ifdef USING_W11LIB	882	dLocal (Display *, dpy);
938	/* enable W11 callbacks */
939	W11AddEventHandler (disp, rxvt_W11_process_x_event);
940	#endif
941		883
942	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	884	/* grab colors before netscape does */
943	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	885	Get_Colours ();
944		886
945	if (options & Opt_transparent)	887	if (!set_fonts ())
946	{	888	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	889
948	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	890	parent = display->root;
949	}	891
		892	attributes.override_redirect = !!OPTION (Opt_override_redirect);
950		893
951	#if ENABLE_FRILLS	894	#if ENABLE_FRILLS
952	if (options & Opt_borderLess)	895	if (OPTION (Opt_borderLess))
953	{	896	{
954	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	897	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
955
956	if (prop == None)
957	{	898	{
958	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	899	/* 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;	900	attributes.override_redirect = true;
961	#endif
962	mwmhints.flags = 0;	901	mwmhints.flags = 0;
963	}	902	}
964	else	903	else
965	{	904	{
966	mwmhints.flags = MWM_HINTS_DECORATIONS;	905	mwmhints.flags = MWM_HINTS_DECORATIONS;
967	mwmhints.decorations = 0;	906	mwmhints.decorations = 0;
968	}	907	}
969	}	908	}
970	else	909	else
971	{
972	mwmhints.flags = 0;	910	mwmhints.flags = 0;
973	}
974	#endif	911	#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		912
982	#if ENABLE_XEMBED	913	#if ENABLE_XEMBED
983	if (rs[Rs_embed])	914	if (rs[Rs_embed])
984	{	915	{
985	XWindowAttributes wattr;	916	XWindowAttributes wattr;
986		917
987	top = strtol (rs[Rs_embed], 0, 0);	918	parent = strtol (rs[Rs_embed], 0, 0);
988		919
989	if (!XGetWindowAttributes (disp, top, &wattr))	920	if (!XGetWindowAttributes (dpy, parent, &wattr))
990	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	921	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991		922
992	window_calc (wattr.width, wattr.height);	923	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	{	924	}
		925	#endif
		926
1012	window_calc (0, 0);	927	window_calc (0, 0);
1013		928
1014	/* sub-window placement & size in rxvt_resize_subwindows () */	929	/* sub-window placement & size in rxvt_resize_subwindows () */
1015	#ifdef PREFER_24BIT
1016	attributes.background_pixel = pix_colors_focused[Color_border];	930	attributes.background_pixel = pix_colors_focused [Color_border];
1017	attributes.border_pixel = pix_colors_focused[Color_border];	931	attributes.border_pixel = pix_colors_focused [Color_border];
1018	attributes.colormap = display->cmap;	932	attributes.colormap = cmap;
1019	top = XCreateWindow (disp, DefaultRootWindow (disp),	933
		934	top = XCreateWindow (dpy, parent,
1020	szHint.x, szHint.y,	935	szHint.x, szHint.y,
1021	szHint.width, szHint.height,	936	szHint.width, szHint.height,
1022	TermWin.ext_bwidth,	937	ext_bwidth,
1023	display->depth, InputOutput,	938	depth, InputOutput, visual,
1024	display->visual,
1025	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	939	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1026	#else	940	&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		941
1036	TermWin.parent[0] = top;	942	this->parent[0] = top;
1037		943
1038	old_width = szHint.width;	944	old_width = szHint.width;
1039	old_height = szHint.height;	945	old_height = szHint.height;
1040		946
1041	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	947	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1042	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	948	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1043		949
1044	classHint.res_name = (char *)rs[Rs_name];	950	classHint.res_name = (char *)rs[Rs_name];
1045	classHint.res_class = (char *)RESCLASS;	951	classHint.res_class = (char *)RESCLASS;
1046		952
1047	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	953	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1048	wmHint.input = True;	954	wmHint.input = True;
1049	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	955	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1050	wmHint.window_group = top;	956	wmHint.window_group = top;
1051		957
1052	XSetWMProperties (disp, top, NULL, NULL,	958	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1053	(char **)argv, argc, &szHint, &wmHint, &classHint);	959	&szHint, &wmHint, &classHint);
1054
1055	/* Enable delete window protocol */
1056	XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
1057		960
1058	#if ENABLE_FRILLS	961	#if ENABLE_FRILLS
		962	if (mwmhints.flags)
		963	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		964	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		965	#endif
		966
		967	Atom protocols[] = {
		968	xa[XA_WM_DELETE_WINDOW],
		969	#if ENABLE_EWMH
		970	xa[XA_NET_WM_PING],
		971	#endif
		972	};
		973
		974	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		975
		976	#if ENABLE_FRILLS
		977	if (rs[Rs_transient_for])
		978	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		979	#endif
		980
		981	#if ENABLE_EWMH
1059	long pid = getpid ();	982	long pid = getpid ();
1060		983
1061	XChangeProperty (disp, top,	984	XChangeProperty (dpy, top,
1062	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	985	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1063	PropModeReplace, (unsigned char *)&pid, 1);	986	PropModeReplace, (unsigned char *)&pid, 1);
1064	#endif
1065		987
		988	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
		989	#endif
		990
1066	XSelectInput (disp, top,	991	XSelectInput (dpy, top,
1067	KeyPressMask	992	KeyPressMask
1068	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	993	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1069	\| KeyReleaseMask	994	\| KeyReleaseMask
1070	#endif	995	#endif
1071	\| FocusChangeMask \| VisibilityChangeMask	996	\| FocusChangeMask \| VisibilityChangeMask
1072	\| ExposureMask \| StructureNotifyMask);	997	\| ExposureMask \| StructureNotifyMask);
1073		998
1074	termwin_ev.start (display, top);	999	termwin_ev.start (display, top);
1075		1000
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 */	1001	/* vt cursor: Black-on-White is standard, but this is more popular */
1083	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1002	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1084		1003
1085	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1004	#ifdef HAVE_SCROLLBARS
1086	/* cursor (menuBar/scrollBar): Black-on-White */	1005	/* cursor scrollBar: Black-on-White */
1087	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1006	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1088	#endif	1007	#endif
1089		1008
1090	/* the vt window */	1009	/* the vt window */
1091	TermWin.vt = XCreateSimpleWindow (disp, top,	1010	vt = XCreateSimpleWindow (dpy, top,
1092	window_vt_x,
1093	window_vt_y,	1011	window_vt_x, window_vt_y,
1094	TermWin_TotalWidth (),	1012	width, height,
1095	TermWin_TotalHeight (),
1096	0,	1013	0,
1097	pix_colors_focused[Color_fg],	1014	pix_colors_focused[Color_fg],
1098	pix_colors_focused[Color_bg]);	1015	pix_colors_focused[Color_bg]);
1099	#ifdef DEBUG_X
1100	XStoreName (disp, TermWin.vt, "vt window");
1101	#endif
1102		1016
1103	attributes.bit_gravity = NorthWestGravity;	1017	attributes.bit_gravity = NorthWestGravity;
1104	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1018	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1105		1019
1106	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1020	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1107		1021
1108	#ifdef POINTER_BLANK	1022	if (OPTION (Opt_pointerBlank))
1109	if (options & Opt_pointerBlank)
1110	vt_emask \|= PointerMotionMask;	1023	vt_emask \|= PointerMotionMask;
1111	else	1024	else
1112	#endif
1113	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1025	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1114		1026
1115	XSelectInput (disp, TermWin.vt, vt_emask);	1027	vt_select_input ();
		1028
1116	vt_ev.start (display, TermWin.vt);	1029	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		1030
1144	#ifdef XPM_BACKGROUND	1031	#ifdef XPM_BACKGROUND
1145	if (rs[Rs_backgroundPixmap] != NULL	1032	if (rs[Rs_backgroundPixmap] != NULL
1146	&& ! (options & Opt_transparent))	1033	&& !OPTION (Opt_transparent))
1147	{	1034	{
1148	const char *p = rs[Rs_backgroundPixmap];	1035	const char *p = rs[Rs_backgroundPixmap];
1149		1036
1150	if ((p = strchr (p, ';')) != NULL)	1037	if ((p = strchr (p, ';')) != NULL)
1151	{	1038	{
…		…
1157	scr_touch (true);	1044	scr_touch (true);
1158	}	1045	}
1159	#endif	1046	#endif
1160		1047
1161	/* graphics context for the vt window */	1048	/* graphics context for the vt window */
1162	gcvalue.foreground = pix_colors[Color_fg];	1049	gcvalue.foreground = pix_colors[Color_fg];
1163	gcvalue.background = pix_colors[Color_bg];	1050	gcvalue.background = pix_colors[Color_bg];
1164	gcvalue.graphics_exposures = 1;	1051	gcvalue.graphics_exposures = 0;
1165	TermWin.gc = XCreateGC (disp, TermWin.vt,	1052
		1053	gc = XCreateGC (dpy, vt,
1166	GCForeground \| GCBackground \| GCGraphicsExposures,	1054	GCForeground \| GCBackground \| GCGraphicsExposures,
1167	&gcvalue);	1055	&gcvalue);
1168		1056
1169	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1057	drawable = new rxvt_drawable (this, vt);
1170		1058
1171	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1059	#ifdef RXVT_SCROLLBAR
1172	gcvalue.foreground = pix_colors[Color_topShadow];	1060	gcvalue.foreground = pix_colors[Color_topShadow];
1173	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1061	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1174	gcvalue.foreground = pix_colors[Color_bottomShadow];	1062	gcvalue.foreground = pix_colors[Color_bottomShadow];
1175	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1063	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1176	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1064	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1177	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1065	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1178	#endif	1066	#endif
1179		1067
1180	#ifdef OFF_FOCUS_FADING	1068	#ifdef OFF_FOCUS_FADING
1181	// initially we are in unfocused state	1069	// initially we are in unfocused state
1182	if (rs[Rs_fade])	1070	if (rs[Rs_fade])
1183	pix_colors = pix_colors_unfocused;	1071	pix_colors = pix_colors_unfocused;
1184	#endif	1072	#endif
1185		1073
1186	pointer_unblank ();	1074	pointer_unblank ();
1187	scr_recolour ();	1075	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	}	1076	}
1194		1077
1195	/* ------------------------------------------------------------------------- *	1078	/* ------------------------------------------------------------------------- *
1196	* GET TTY CURRENT STATE *	1079	* GET TTY CURRENT STATE *
1197	* ------------------------------------------------------------------------- */	1080	* ------------------------------------------------------------------------- */
1198	void	1081	void
1199	rxvt_get_ttymode (ttymode_t *tio, int erase)	1082	rxvt_get_ttymode (ttymode_t *tio, int erase)
1200	{	1083	{
1201	#ifdef HAVE_TERMIOS_H
1202	/*	1084	/*
1203	* standard System V termios interface	1085	* standard System V termios interface
1204	*/	1086	*/
1205	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1087	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1206	{	1088	{
1207	/* return error - use system defaults */	1089	// return error - use system defaults,
		1090	// where possible, and zero elsewhere
		1091	memset (tio, 0, sizeof (ttymode_t));
		1092
1208	tio->c_cc[VINTR] = CINTR;	1093	tio->c_cc[VINTR] = CINTR;
1209	tio->c_cc[VQUIT] = CQUIT;	1094	tio->c_cc[VQUIT] = CQUIT;
1210	tio->c_cc[VERASE] = CERASE;	1095	tio->c_cc[VERASE] = CERASE;
		1096	#ifdef VERASE2
		1097	tio->c_cc[VERASE2] = CERASE2;
		1098	#endif
1211	tio->c_cc[VKILL] = CKILL;	1099	tio->c_cc[VKILL] = CKILL;
1212	tio->c_cc[VSTART] = CSTART;	1100	tio->c_cc[VSTART] = CSTART;
1213	tio->c_cc[VSTOP] = CSTOP;	1101	tio->c_cc[VSTOP] = CSTOP;
1214	tio->c_cc[VSUSP] = CSUSP;	1102	tio->c_cc[VSUSP] = CSUSP;
1215	# ifdef VDSUSP	1103	# ifdef VDSUSP
1216
1217	tio->c_cc[VDSUSP] = CDSUSP;	1104	tio->c_cc[VDSUSP] = CDSUSP;
1218	# endif	1105	# endif
1219	# ifdef VREPRINT	1106	# ifdef VREPRINT
1220
1221	tio->c_cc[VREPRINT] = CRPRNT;	1107	tio->c_cc[VREPRINT] = CRPRNT;
1222	# endif	1108	# endif
1223	# ifdef VDISCRD	1109	# ifdef VDISCRD
1224
1225	tio->c_cc[VDISCRD] = CFLUSH;	1110	tio->c_cc[VDISCRD] = CFLUSH;
1226	# endif	1111	# endif
1227	# ifdef VWERSE	1112	# ifdef VWERSE
1228
1229	tio->c_cc[VWERSE] = CWERASE;	1113	tio->c_cc[VWERSE] = CWERASE;
1230	# endif	1114	# endif
1231	# ifdef VLNEXT	1115	# ifdef VLNEXT
1232
1233	tio->c_cc[VLNEXT] = CLNEXT;	1116	tio->c_cc[VLNEXT] = CLNEXT;
1234	# endif	1117	# endif
1235
1236	}	1118	}
		1119
1237	tio->c_cc[VEOF] = CEOF;	1120	tio->c_cc[VEOF] = CEOF;
1238	tio->c_cc[VEOL] = VDISABLE;	1121	tio->c_cc[VEOL] = VDISABLE;
1239	# ifdef VEOL2	1122	# ifdef VEOL2
1240
1241	tio->c_cc[VEOL2] = VDISABLE;	1123	tio->c_cc[VEOL2] = VDISABLE;
1242	# endif	1124	# endif
1243	# ifdef VSWTC	1125	# ifdef VSWTC
1244
1245	tio->c_cc[VSWTC] = VDISABLE;	1126	tio->c_cc[VSWTC] = VDISABLE;
1246	# endif	1127	# endif
1247	# ifdef VSWTCH	1128	# ifdef VSWTCH
1248
1249	tio->c_cc[VSWTCH] = VDISABLE;	1129	tio->c_cc[VSWTCH] = VDISABLE;
1250	# endif	1130	# endif
1251	# if VMIN != VEOF	1131	# if VMIN != VEOF
1252
1253	tio->c_cc[VMIN] = 1;	1132	tio->c_cc[VMIN] = 1;
1254	# endif	1133	# endif
1255	# if VTIME != VEOL	1134	# if VTIME != VEOL
1256
1257	tio->c_cc[VTIME] = 0;	1135	tio->c_cc[VTIME] = 0;
1258	# endif	1136	# endif
1259		1137
1260	if (erase != -1)	1138	if (erase != -1)
1261	tio->c_cc[VERASE] = (char)erase;	1139	tio->c_cc[VERASE] = (char)erase;
…		…
1277	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1155	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1278	# if defined (ECHOCTL) && defined (ECHOKE)	1156	# if defined (ECHOCTL) && defined (ECHOKE)
1279	\| ECHOCTL \| ECHOKE	1157	\| ECHOCTL \| ECHOKE
1280	# endif	1158	# endif
1281	\| ECHOE \| ECHOK);	1159	\| ECHOE \| ECHOK);
1282	# else /* HAVE_TERMIOS_H */
1283
1284	/*
1285	* sgtty interface
1286	*/
1287
1288	/* get parameters -- gtty */
1289	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290	{
1291	tio->sg.sg_erase = CERASE; /* ^H */
1292	tio->sg.sg_kill = CKILL; /* ^U */
1293	}
1294	if (erase != -1)
1295	tio->sg.sg_erase = (char)erase;
1296
1297	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1298
1299	/* get special characters */
1300	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1301	{
1302	tio->tc.t_intrc = CINTR; /* ^C */
1303	tio->tc.t_quitc = CQUIT; /* ^\ */
1304	tio->tc.t_startc = CSTART; /* ^Q */
1305	tio->tc.t_stopc = CSTOP; /* ^S */
1306	tio->tc.t_eofc = CEOF; /* ^D */
1307	tio->tc.t_brkc = -1;
1308	}
1309	/* get local special chars */
1310	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311	{
1312	tio->lc.t_suspc = CSUSP; /* ^Z */
1313	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1314	tio->lc.t_rprntc = CRPRNT; /* ^R */
1315	tio->lc.t_flushc = CFLUSH; /* ^O */
1316	tio->lc.t_werasc = CWERASE; /* ^W */
1317	tio->lc.t_lnextc = CLNEXT; /* ^V */
1318	}
1319	/* get line discipline */
1320	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321	# ifdef NTTYDISC
1322
1323	tio->line = NTTYDISC;
1324	# endif /* NTTYDISC */
1325
1326	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1327	#endif /* HAVE_TERMIOS_H */
1328		1160
1329	/*	1161	/*
1330	* Debugging	1162	* Debugging
1331	*/	1163	*/
1332	#ifdef DEBUG_TTYMODE	1164	#ifdef DEBUG_TTYMODE
…		…
1350	FOO (IGNCR, "IGNCR");	1182	FOO (IGNCR, "IGNCR");
1351	FOO (ICRNL, "ICRNL");	1183	FOO (ICRNL, "ICRNL");
1352	FOO (IXON, "IXON");	1184	FOO (IXON, "IXON");
1353	FOO (IXOFF, "IXOFF");	1185	FOO (IXOFF, "IXOFF");
1354	# ifdef IUCLC	1186	# ifdef IUCLC
1355
1356	FOO (IUCLC, "IUCLC");	1187	FOO (IUCLC, "IUCLC");
1357	# endif	1188	# endif
1358	# ifdef IXANY	1189	# ifdef IXANY
1359
1360	FOO (IXANY, "IXANY");	1190	FOO (IXANY, "IXANY");
1361	# endif	1191	# endif
1362	# ifdef IMAXBEL	1192	# ifdef IMAXBEL
1363
1364	FOO (IMAXBEL, "IMAXBEL");	1193	FOO (IMAXBEL, "IMAXBEL");
1365	# endif	1194	# endif
1366		1195
1367	fprintf (stderr, "\n");	1196	fprintf (stderr, "\n");
1368		1197
…		…
1375	FOO (VERASE, "VERASE");	1204	FOO (VERASE, "VERASE");
1376	FOO (VKILL, "VKILL");	1205	FOO (VKILL, "VKILL");
1377	FOO (VEOF, "VEOF");	1206	FOO (VEOF, "VEOF");
1378	FOO (VEOL, "VEOL");	1207	FOO (VEOL, "VEOL");
1379	# ifdef VEOL2	1208	# ifdef VEOL2
1380
1381	FOO (VEOL2, "VEOL2");	1209	FOO (VEOL2, "VEOL2");
1382	# endif	1210	# endif
1383	# ifdef VSWTC	1211	# ifdef VSWTC
1384
1385	FOO (VSWTC, "VSWTC");	1212	FOO (VSWTC, "VSWTC");
1386	# endif	1213	# endif
1387	# ifdef VSWTCH	1214	# ifdef VSWTCH
1388
1389	FOO (VSWTCH, "VSWTCH");	1215	FOO (VSWTCH, "VSWTCH");
1390	# endif	1216	# endif
1391
1392	FOO (VSTART, "VSTART");	1217	FOO (VSTART, "VSTART");
1393	FOO (VSTOP, "VSTOP");	1218	FOO (VSTOP, "VSTOP");
1394	FOO (VSUSP, "VSUSP");	1219	FOO (VSUSP, "VSUSP");
1395	# ifdef VDSUSP	1220	# ifdef VDSUSP
1396
1397	FOO (VDSUSP, "VDSUSP");	1221	FOO (VDSUSP, "VDSUSP");
1398	# endif	1222	# endif
1399	# ifdef VREPRINT	1223	# ifdef VREPRINT
1400
1401	FOO (VREPRINT, "VREPRINT");	1224	FOO (VREPRINT, "VREPRINT");
1402	# endif	1225	# endif
1403	# ifdef VDISCRD	1226	# ifdef VDISCRD
1404
1405	FOO (VDISCRD, "VDISCRD");	1227	FOO (VDISCRD, "VDISCRD");
1406	# endif	1228	# endif
1407	# ifdef VWERSE	1229	# ifdef VWERSE
1408
1409	FOO (VWERSE, "VWERSE");	1230	FOO (VWERSE, "VWERSE");
1410	# endif	1231	# endif
1411	# ifdef VLNEXT	1232	# ifdef VLNEXT
1412
1413	FOO (VLNEXT, "VLNEXT");	1233	FOO (VLNEXT, "VLNEXT");
1414	# endif	1234	# endif
1415		1235
1416	fprintf (stderr, "\n");	1236	fprintf (stderr, "\n");
1417	# undef FOO	1237	# undef FOO
…		…
1429	rxvt_term::run_command (const char const argv)	1249	rxvt_term::run_command (const char const argv)
1430	{	1250	{
1431	#if ENABLE_FRILLS	1251	#if ENABLE_FRILLS
1432	if (rs[Rs_pty_fd])	1252	if (rs[Rs_pty_fd])
1433	{	1253	{
1434	pty.pty = atoi (rs[Rs_pty_fd]);	1254	pty->pty = atoi (rs[Rs_pty_fd]);
1435	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1255
		1256	if (pty->pty >= 0)
		1257	{
		1258	if (getfd_hook)
		1259	pty->pty = (*getfd_hook) (pty->pty);
		1260
		1261	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1262	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1263	}
1436	}	1264	}
1437	else	1265	else
1438	#endif	1266	#endif
1439	if (!pty.get ())	1267	if (!pty->get ())
1440	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1268	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1441
1442	pty.set_utf8_mode (enc_utf8);
1443
1444	/* set initial window size */
1445	tt_winch ();
1446		1269
1447	int er;	1270	int er;
1448		1271
1449	#ifndef NO_BACKSPACE_KEY	1272	#ifndef NO_BACKSPACE_KEY
1450	if (key_backspace[0] && !key_backspace[1])	1273	if (key_backspace[0] && !key_backspace[1])
…		…
1454	else	1277	else
1455	#endif	1278	#endif
1456	er = -1;	1279	er = -1;
1457		1280
1458	rxvt_get_ttymode (&tio, er);	1281	rxvt_get_ttymode (&tio, er);
		1282	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
		1283	pty->set_utf8_mode (enc_utf8);
		1284
		1285	/* set initial window size */
		1286	tt_winch ();
1459		1287
1460	#if ENABLE_FRILLS	1288	#if ENABLE_FRILLS
1461	if (rs[Rs_pty_fd])	1289	if (rs[Rs_pty_fd])
1462	return;	1290	return;
1463	#endif	1291	#endif
1464		1292
1465	sw_chld.start (SIGCHLD);
1466
1467	#ifndef __QNX__
1468	/* spin off the command interpreter */	1293	/* spin off the command interpreter */
1469	switch (cmd_pid = fork ())	1294	switch (cmd_pid = fork ())
1470	{	1295	{
1471	case -1:	1296	case -1:
1472	{	1297	{
…		…
1474	rxvt_fatal ("can't fork, aborting.\n");	1299	rxvt_fatal ("can't fork, aborting.\n");
1475	}	1300	}
1476	case 0:	1301	case 0:
1477	init_env ();	1302	init_env ();
1478		1303
1479	if (!pty.make_controlling_tty ())	1304	if (!pty->make_controlling_tty ())
1480	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1305	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1481	else	1306	else
1482	{	1307	{
1483	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1308	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1484	dup2 (pty.tty, STDIN_FILENO);	1309	dup2 (pty->tty, STDIN_FILENO);
1485	dup2 (pty.tty, STDOUT_FILENO);	1310	dup2 (pty->tty, STDOUT_FILENO);
1486	dup2 (pty.tty, STDERR_FILENO);	1311	dup2 (pty->tty, STDERR_FILENO);
1487		1312
1488	// close all our file handles that we do no longer need	1313	// close all our file handles that we do no longer need
1489	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1314	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1490	{	1315	{
1491	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1316	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1492	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1317	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1493	}	1318	}
1494		1319
1495	run_child (argv);	1320	run_child (argv);
1496	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1321	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1497	}	1322	}
1498		1323
1499	_exit (EXIT_FAILURE);	1324	_exit (EXIT_FAILURE);
1500		1325
1501	default:	1326	default:
1502	{	1327	if (!OPTION (Opt_utmpInhibit))
1503	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1328	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1504	int fdstdin;
1505		1329
1506	fdstdin = dup (STDIN_FILENO);	1330	pty->close_tty ();
1507	dup2 (pty.tty, STDIN_FILENO);
1508	#endif
1509		1331
1510	#ifdef UTMP_SUPPORT	1332	child_ev.start (cmd_pid);
1511	privileged_utmp (SAVE);
1512	#endif
1513		1333
1514	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1334	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;	1335	break;
1523	}	1336	}
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	}	1337	}
1533		1338
1534	/* ------------------------------------------------------------------------- *	1339	/* ------------------------------------------------------------------------- *
1535	* CHILD PROCESS OPERATIONS *	1340	* CHILD PROCESS OPERATIONS *
1536	* ------------------------------------------------------------------------- */	1341	* ------------------------------------------------------------------------- */
…		…
1541	int	1346	int
1542	rxvt_term::run_child (const char const argv)	1347	rxvt_term::run_child (const char const argv)
1543	{	1348	{
1544	char *login;	1349	char *login;
1545		1350
1546	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1351	if (OPTION (Opt_console))
1547
1548	if (options & Opt_console)
1549	{ /* be virtual console, fail silently */	1352	{ /* be virtual console, fail silently */
1550	#ifdef TIOCCONS	1353	#ifdef TIOCCONS
1551	unsigned int on = 1;	1354	unsigned int on = 1;
1552		1355
1553	ioctl (STDIN_FILENO, TIOCCONS, &on);	1356	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1580	// unblock signals (signals are blocked by iom.C	1383	// unblock signals (signals are blocked by iom.C
1581	sigset_t ss;	1384	sigset_t ss;
1582	sigemptyset (&ss);	1385	sigemptyset (&ss);
1583	sigprocmask (SIG_SETMASK, &ss, 0);	1386	sigprocmask (SIG_SETMASK, &ss, 0);
1584		1387
1585	#ifndef __QNX__
1586	/* command interpreter path */	1388	/* command interpreter path */
1587	if (argv != NULL)	1389	if (argv != NULL)
1588	{	1390	{
1589	# ifdef DEBUG_CMD	1391	# ifdef DEBUG_CMD
1590	int i;	1392	int i;
…		…
1596	execvp (argv[0], (char const )argv);	1398	execvp (argv[0], (char const )argv);
1597	/* no error message: STDERR is closed! */	1399	/* no error message: STDERR is closed! */
1598	}	1400	}
1599	else	1401	else
1600	{	1402	{
1601	const char argv0, shell;	1403	const char argv0, shell;
1602		1404
1603	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1405	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1604	shell = "/bin/sh";	1406	shell = "/bin/sh";
1605		1407
1606	argv0 = (const char *)rxvt_r_basename (shell);	1408	argv0 = (const char *)rxvt_r_basename (shell);
1607		1409
1608	if (options & Opt_loginShell)	1410	if (OPTION (Opt_loginShell))
1609	{	1411	{
1610	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1412	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1611		1413
1612	login[0] = '-';	1414	login[0] = '-';
1613	strcpy (&login[1], argv0);	1415	strcpy (&login[1], argv0);
1614	argv0 = login;	1416	argv0 = login;
1615	}	1417	}
		1418
1616	execlp (shell, argv0, NULL);	1419	execlp (shell, argv0, NULL);
1617	/* no error message: STDERR is closed! */	1420	/* no error message: STDERR is closed! */
1618	}	1421	}
1619		1422
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;	1423	return -1;
1677	}	1424	}
1678		1425
1679	/----------------------- end-of-file (C source) -----------------------/	1426	/----------------------- 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.179 by root, Sat Jan 20 12:29:35 2007 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.179 by root, Sat Jan 20 12:29:35 2007 UTC