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

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.115 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.160 by root, Mon Jan 30 19:46:13 2006 UTC