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

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.161 by root, Mon Jan 30 20:12:37 2006 UTC