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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.140 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.174 by root, Wed Jul 5 22:46:14 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: init.C	2	* File: init.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
43	const char *const def_colorName[] =	43	const char *const def_colorName[] =
44	{	44	{
45	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
47	/* low-intensity colors */	47	/* low-intensity colors */
48	"Black", /* 0: black (#000000) */	48	"rgb:00/00/00", // 0: black (Black)
49	"Red3", /* 1: red (#CD0000) */	49	"rgb:cd/00/00", // 1: red (Red3)
50	"Green3", /* 2: green (#00CD00) */	50	"rgb:00/cd/00", // 2: green (Green3)
51	"Yellow3", /* 3: yellow (#CDCD00) */	51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)
52	"Blue3", /* 4: blue (#0000CD) */	52	"rgb:00/00/cd", // 4: blue (Blue3)
53	"Magenta3", /* 5: magenta (#CD00CD) */	53	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"Cyan3", /* 6: cyan (#00CDCD) */	54	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	55	# ifdef XTERM_COLORS
56	"Grey90", /* 7: white (#E5E5E5) */	56	"rgb:e5/e5/e5", // 7: white (Grey90)
57	# else	57	# else
58	"AntiqueWhite", /* 7: white (#FAEBD7) */	58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59	# endif	59	# endif
60	/* high-intensity colors */	60	/* high-intensity colors */
61	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
62	"Grey30", /* 8: bright black (#4D4D4D) */	62	"rgb:4d/4d/4d", // 8: bright black (Grey30)
63	# else	63	# else
64	"Grey25", /* 8: bright black (#404040) */	64	"rgb:40/40/40", // 8: bright black (Grey25)
65	# endif	65	# endif
66	"Red", /* 1/9: bright red (#FF0000) */	66	"rgb:ff/00/00", // 1/9: bright red (Reed)
67	"Green", /* 2/10: bright green (#00FF00) */	67	"rgb:00/ff/00", // 2/10: bright green (Green)
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69	"Blue", /* 4/12: bright blue (#0000FF) */	69	"rgb:00/00/ff", // 4/12: bright blue (Blue)
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71	"Cyan", /* 6/14: bright cyan (#00FFFF) */	71	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72	"White", /* 7/15: bright white (#FFFFFF) */	72	"rgb:ff/ff/ff", // 7/15: bright white (White)
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	{
		182	pix_colors = //
221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224	#endif	186	#endif
225	pix_colors = pix_colors_focused;
226
227	if (pix_colors == NULL)
228	return false;
229		187
230	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
231	pixmap = None;	189	pixmap = None;
232	#endif	190	#endif
233		191
234	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
235	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
236	options = DEFAULT_OPTIONS;	194	options = DEFAULT_OPTIONS;
237	want_refresh = 1;	195	want_refresh = 1;
238	priv_modes = SavedModes = PrivMode_Default;	196	priv_modes = SavedModes = PrivMode_Default;
239	focus = 0;
240	ncol = 80;	197	ncol = 80;
241	nrow = 24;	198	nrow = 24;
242	int_bwidth = INTERNALBORDERWIDTH;	199	int_bwidth = INTERNALBORDERWIDTH;
243	ext_bwidth = EXTERNALBORDERWIDTH;	200	ext_bwidth = EXTERNALBORDERWIDTH;
244	lineSpace = LINESPACE;	201	lineSpace = LINESPACE;
245	saveLines = SAVELINES;	202	saveLines = SAVELINES;
246	numpix_colors = TOTAL_COLORS;	203	numpix_colors = TOTAL_COLORS;
247		204
248	refresh_limit = 1;	205	refresh_limit = 1;
249	refresh_type = SLOW_REFRESH;	206	refresh_type = SLOW_REFRESH;
250	prev_nrow = prev_ncol = 0;
251		207
252	oldcursor.row = oldcursor.col = -1;	208	oldcursor.row = oldcursor.col = -1;
253	#ifdef XPM_BACKGROUND	209	#ifdef XPM_BACKGROUND
254	/* bgPixmap.w = bgPixmap.h = 0; */	210	/* bgPixmap.w = bgPixmap.h = 0; */
255	bgPixmap.x = bgPixmap.y = 50;	211	bgPixmap.x = bgPixmap.y = 50;
256	bgPixmap.pixmap = None;	212	bgPixmap.pixmap = None;
257	#endif	213	#endif
258		214
259	last_bot = last_state = -1;	215	last_bot = last_state = -1;
260
261	#ifdef MENUBAR
262	menu_readonly = 1;
263	# if ! (MENUBAR_MAX > 1)
264	CurrentBar = &BarList;
265	# endif /* (MENUBAR_MAX > 1) */
266	#endif
267		216
268	return true;	217	return true;
269	}	218	}
270		219
271	void	220	void
…		…
309	int i, r_argc;	258	int i, r_argc;
310	char *val;	259	char *val;
311	const char cmd_argv, r_argv;	260	const char cmd_argv, r_argv;
312		261
313	/*	262	/*
314	* Look for -exec option. Find => split and make cmd_argv[] of command args	263	* Look for -e option. Find => split and make cmd_argv[] of command args
315	*/	264	*/
316	for (r_argc = 0; r_argc < argc; r_argc++)	265	for (r_argc = 0; r_argc < argc; r_argc++)
317	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	266	if (!strcmp (argv[r_argc], "-e"))
318	break;	267	break;
319		268
320	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
321		270
322	for (i = 0; i < r_argc; i++)	271	for (i = 0; i < r_argc; i++)
…		…
348	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
349		298
350	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
351	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]);
352		301
		302	// using a local pointer decreases code size a lot
		303	xa = display->xa;
		304
		305	set (display);
353	extract_resources ();	306	extract_resources ();
354		307
		308	#if XFT
		309	if (rs[Rs_depth])
		310	select_visual (strtol (rs[Rs_depth], 0, 0));
		311	#endif
		312
355	free (r_argv);	313	free (r_argv);
		314
		315	for (int i = NUM_RESOURCES; i--; )
		316	if (rs [i] == resval_undef)
		317	rs [i] = 0;
		318
		319	#if ENABLE_PERL
		320	if (!rs[Rs_perl_ext_1])
		321	rs[Rs_perl_ext_1] = "default";
		322
		323	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		324	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		325	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		326	{
		327	rxvt_perl.init (this);
		328	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		329	}
		330	#endif
356		331
357	/*	332	/*
358	* set any defaults not already set	333	* set any defaults not already set
359	*/	334	*/
360	if (cmd_argv && cmd_argv[0])	335	if (cmd_argv && cmd_argv[0])
…		…
450	/* this is how xterm implements reverseVideo */	425	/* this is how xterm implements reverseVideo */
451	if (OPTION (Opt_reverseVideo))	426	if (OPTION (Opt_reverseVideo))
452	{	427	{
453	if (!rs[Rs_color + Color_fg])	428	if (!rs[Rs_color + Color_fg])
454	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	429	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		430
455	if (!rs[Rs_color + Color_bg])	431	if (!rs[Rs_color + Color_bg])
456	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	432	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457	}	433	}
458	#endif	434	#endif
459		435
…		…
511	val = rxvt_network_display (rs[Rs_display_name]);	487	val = rxvt_network_display (rs[Rs_display_name]);
512	rs[Rs_display_name] = (const char *)val;	488	rs[Rs_display_name] = (const char *)val;
513		489
514	if (val == NULL)	490	if (val == NULL)
515	#endif /* DISPLAY_IS_IP */	491	#endif /* DISPLAY_IS_IP */
516	val = XDisplayString (display->display);	492	val = XDisplayString (dpy);
517		493
518	if (rs[Rs_display_name] == NULL)	494	if (rs[Rs_display_name] == NULL)
519	rs[Rs_display_name] = val; /* use broken `:0' value */	495	rs[Rs_display_name] = val; /* use broken `:0' value */
520		496
521	i = strlen (val);	497	i = strlen (val);
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	498	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		499
524	sprintf (env_display, "DISPLAY=%s", val);	500	sprintf (env_display, "DISPLAY=%s", val);
525		501
526	/* avoiding the math library:	502	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
527	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529	;
530	max_it (i, 1);
531	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
532
533	sprintf (env_windowid, "WINDOWID=%u",
534	(unsigned int)parent[0]);
535		503
536	/* add entries to the environment:	504	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	505	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	506	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	507	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
541	* @ TERMINFO: path to terminfo directory	509	* @ TERMINFO: path to terminfo directory
542	* @ COLORFGBG: fg;bg color codes	510	* @ COLORFGBG: fg;bg color codes
543	*/	511	*/
544	putenv (env_display);	512	putenv (env_display);
545	putenv (env_windowid);	513	putenv (env_windowid);
		514
546	if (env_colorfgbg)	515	if (env_colorfgbg)
547	putenv (env_colorfgbg);	516	putenv (env_colorfgbg);
548		517
549	#ifdef RXVT_TERMINFO	518	#ifdef RXVT_TERMINFO
550	putenv ("TERMINFO=" RXVT_TERMINFO);	519	putenv ("TERMINFO=" RXVT_TERMINFO);
551	#endif	520	#endif
552		521
553	if (display->depth <= 2)	522	if (depth <= 2)
554	putenv ("COLORTERM=" COLORTERMENV "-mono");	523	putenv ("COLORTERM=" COLORTERMENV "-mono");
555	else	524	else
556	putenv ("COLORTERM=" COLORTERMENVFULL);	525	putenv ("COLORTERM=" COLORTERMENVFULL);
557		526
558	if (rs[Rs_term_name] != NULL)	527	if (rs[Rs_term_name] != NULL)
…		…
670	if (strcmp (key_backspace, "DEC") == 0)	639	if (strcmp (key_backspace, "DEC") == 0)
671	priv_modes \|= PrivMode_HaveBackSpace;	640	priv_modes \|= PrivMode_HaveBackSpace;
672	#endif	641	#endif
673		642
674	/* add value for scrollBar */	643	/* add value for scrollBar */
675	if (scrollbar_visible ())	644	if (scrollBar.state)
676	{	645	{
677	priv_modes \|= PrivMode_scrollBar;	646	priv_modes \|= PrivMode_scrollBar;
678	SavedModes \|= PrivMode_scrollBar;	647	SavedModes \|= PrivMode_scrollBar;
679	}
680
681	if (menubar_visible ())
682	{
683	priv_modes \|= PrivMode_menuBar;
684	SavedModes \|= PrivMode_menuBar;
685	}	648	}
686		649
687	run_command (argv);	650	run_command (argv);
688	}	651	}
689		652
…		…
695		658
696	#ifdef OFF_FOCUS_FADING	659	#ifdef OFF_FOCUS_FADING
697	pix_colors = pix_colors_focused;	660	pix_colors = pix_colors_focused;
698	#endif	661	#endif
699		662
700	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	663	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
701	{	664	{
		665	const char *name = rs[Rs_color + i];
		666
		667	if (!name)
		668	continue;
		669
702	rxvt_color xcol;	670	rxvt_color xcol;
703		671
704	if (!rs[Rs_color + i])	672	if (!set_color (xcol, name))
705	continue;
706
707	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708	{	673	{
709	#ifndef XTERM_REVERSE_VIDEO	674	#ifndef XTERM_REVERSE_VIDEO
710	if (i < 2 && OPTION (Opt_reverseVideo))	675	if (i < 2 && OPTION (Opt_reverseVideo))
711	rs[Rs_color + i] = def_colorName[!i];	676	name = def_colorName [1 - i];
712	else	677	else
713	#endif	678	#endif
714	rs[Rs_color + i] = def_colorName[i];	679	name = def_colorName [i];
715		680
716	if (!rs[Rs_color + i])	681	if (!name)
717	continue;	682	continue;
718		683
719	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	684	if (!set_color (xcol, name))
720	{	685	{
721	switch (i)	686	switch (i)
722	{	687	{
723	case Color_fg:	688	case Color_fg:
724	case Color_bg:	689	case Color_bg:
725	/* fatal: need bg/fg color */
726	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	690	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
727	/* NOTREACHED */	691	name = "";
728	break;	692	break;
729	#ifndef NO_CURSORCOLOR	693	#ifndef NO_CURSORCOLOR
730	case Color_cursor2:	694	case Color_cursor2:
731	xcol = pix_colors[Color_fg];	695	#endif
732	break;
733	#endif /* ! NO_CURSORCOLOR */
734	case Color_pointer_fg:	696	case Color_pointer_fg:
735	xcol = pix_colors[Color_fg];	697	name = rs[Rs_color + Color_fg];
		698	xcol.set (this, name);
736	break;	699	break;
737	default:	700	default:
738	xcol = pix_colors[Color_bg]; /* None */	701	name = rs[Rs_color + Color_bg];
		702	xcol.set (this, name);
739	break;	703	break;
740	}	704	}
741	}	705	}
742	}	706	}
743		707
744	pix_colors[i] = xcol;	708	pix_colors[i] = xcol;
745	SET_PIXCOLOR (i);	709	rs[Rs_color + i] = name;
746	}
747
748	#ifdef OFF_FOCUS_FADING
749	if (rs[Rs_fade])
750	for (i = 0; i < (display->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]);
752	#endif
753
754	if (display->depth <= 2)
755	{	710	}
		711
		712	if (depth <= 2)
		713	{
756	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	714	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
757	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	715	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
758	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	716	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
759	}	717	}
760		718
761	/*	719	/*
762	* get scrollBar/menuBar shadow colors	720	* get scrollBar shadow colors
763	*	721	*
764	* The calculations of topShadow/bottomShadow values are adapted	722	* The calculations of topShadow/bottomShadow values are adapted
765	* from the fvwm window manager.	723	* from the fvwm window manager.
766	*/	724	*/
767	#ifdef KEEP_SCROLLCOLOR	725	#ifdef KEEP_SCROLLCOLOR
768
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	alias_color (Color_scroll, Color_fg);
773	pix_colors[Color_topShadow] = pix_colors[Color_bg];	730	alias_color (Color_topShadow, Color_bg);
774	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	731	alias_color (Color_bottomShadow, Color_bg);
775	}	732	}
776	else	733	else
777	{	734	{
778	rxvt_color xcol[2];	735	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
779	/* xcol[0] == white
780	* xcol[1] == top shadow
781	* xcol[2] == bot shadow */
782		736
783	xcol[1] = pix_colors[Color_scroll];	737	rgba cscroll;
784	xcol[0].set (display, 65535, 65535, 65535);	738	pix_colors [Color_scroll].get (cscroll);
785
786	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
787
788	xcol[0].get (display, pr0, pg0, pb0);
789	xcol[1].get (display, pr1, pg1, pb1);
790
791	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
792		739
793	/* topShadowColor */	740	/* topShadowColor */
794	if (!xcol[1].set (display,	741	if (!pix_colors[Color_topShadow].set (this,
795	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	742	rgba (
796	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	743	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
797	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	744	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
798	xcol[1] = pix_colors[Color_White];	745	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
799		746	cscroll.a)
800	pix_colors[Color_topShadow] = xcol[1];	747	))
		748	alias_color (Color_topShadow, Color_White);
801	}	749	}
802	#endif /* KEEP_SCROLLCOLOR */	750	#endif /* KEEP_SCROLLCOLOR */
		751
		752	#ifdef OFF_FOCUS_FADING
		753	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		754	update_fade_color (i);
		755	#endif
803	}	756	}
804		757
805	/----------------------------------------------------------------------/	758	/----------------------------------------------------------------------/
806	/* color aliases, fg/bg bright-bold */	759	/* color aliases, fg/bg bright-bold */
807	void	760	void
…		…
846		799
847	if (rsmod	800	if (rsmod
848	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	801	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849	requestedmeta = rsmod[3] - '0';	802	requestedmeta = rsmod[3] - '0';
850		803
851	map = XGetModifierMapping (display->display);	804	map = XGetModifierMapping (dpy);
852	kc = map->modifiermap;	805	kc = map->modifiermap;
853		806
854	for (i = 1; i < 6; i++)	807	for (i = 1; i < 6; i++)
855	{	808	{
856	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	809	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
858	for (j = map->max_keypermod; j--; k++)	811	for (j = map->max_keypermod; j--; k++)
859	{	812	{
860	if (kc[k] == 0)	813	if (kc[k] == 0)
861	break;	814	break;
862		815
863	switch (XKeycodeToKeysym (display->display, kc[k], 0))	816	switch (XKeycodeToKeysym (dpy, kc[k], 0))
864	{	817	{
865	case XK_Num_Lock:	818	case XK_Num_Lock:
866	ModNumLockMask = modmasks[i - 1];	819	ModNumLockMask = modmasks[i - 1];
867	continue;	820	continue;
868		821
…		…
918	rxvt_term::create_windows (int argc, const char const argv)	871	rxvt_term::create_windows (int argc, const char const argv)
919	{	872	{
920	XClassHint classHint;	873	XClassHint classHint;
921	XWMHints wmHint;	874	XWMHints wmHint;
922	#if ENABLE_FRILLS	875	#if ENABLE_FRILLS
923	Atom prop = None;
924	MWMHints mwmhints;	876	MWMHints mwmhints;
925	#endif	877	#endif
926	XGCValues gcvalue;	878	XGCValues gcvalue;
927	long vt_emask;
928	XSetWindowAttributes attributes;	879	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;
930	Window top, parent;	880	Window top, parent;
931	dDisp;
932		881
933	#ifdef USING_W11LIB	882	dLocal (Display *, dpy);
934	/* enable W11 callbacks */
935	W11AddEventHandler (disp, rxvt_W11_process_x_event);
936	#endif
937		883
938	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	884	/* grab colors before netscape does */
939	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	885	Get_Colours ();
940		886
941	if (OPTION (Opt_transparent))	887	if (!set_fonts ())
942	{	888	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
943	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	889
944	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	890	parent = display->root;
945	}	891
		892	attributes.override_redirect = !!OPTION (Opt_override_redirect);
946		893
947	#if ENABLE_FRILLS	894	#if ENABLE_FRILLS
948	if (OPTION (Opt_borderLess))	895	if (OPTION (Opt_borderLess))
949	{	896	{
950	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	897	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
951
952	if (prop == None)
953	{	898	{
954	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	899	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
955	#ifdef PREFER_24BIT
956	attributes.override_redirect = TRUE;	900	attributes.override_redirect = true;
957	#endif
958	mwmhints.flags = 0;	901	mwmhints.flags = 0;
959	}	902	}
960	else	903	else
961	{	904	{
962	mwmhints.flags = MWM_HINTS_DECORATIONS;	905	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
965	}	908	}
966	else	909	else
967	mwmhints.flags = 0;	910	mwmhints.flags = 0;
968	#endif	911	#endif
969		912
970	/* grab colors before netscape does */
971	Get_Colours ();
972
973	if (!set_fonts ())
974	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
975
976	parent = DefaultRootWindow (disp);
977
978	#if ENABLE_XEMBED	913	#if ENABLE_XEMBED
979	if (rs[Rs_embed])	914	if (rs[Rs_embed])
980	{	915	{
981	XWindowAttributes wattr;	916	XWindowAttributes wattr;
982		917
983	parent = strtol (rs[Rs_embed], 0, 0);	918	parent = strtol (rs[Rs_embed], 0, 0);
984		919
985	if (!XGetWindowAttributes (disp, parent, &wattr))	920	if (!XGetWindowAttributes (dpy, parent, &wattr))
986	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	921	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987		922
988	window_calc (wattr.width, wattr.height);	923	window_calc (wattr.width, wattr.height);
989	}	924	}
990	#endif	925	#endif
991		926
992	window_calc (0, 0);	927	window_calc (0, 0);
993		928
994	/* sub-window placement & size in rxvt_resize_subwindows () */	929	/* sub-window placement & size in rxvt_resize_subwindows () */
995	#ifdef PREFER_24BIT
996	attributes.background_pixel = pix_colors_focused[Color_border];	930	attributes.background_pixel = pix_colors_focused [Color_border];
997	attributes.border_pixel = pix_colors_focused[Color_border];	931	attributes.border_pixel = pix_colors_focused [Color_border];
998	attributes.colormap = display->cmap;	932	attributes.colormap = cmap;
		933
999	top = XCreateWindow (disp, parent,	934	top = XCreateWindow (dpy, parent,
1000	szHint.x, szHint.y,	935	szHint.x, szHint.y,
1001	szHint.width, szHint.height,	936	szHint.width, szHint.height,
1002	ext_bwidth,	937	ext_bwidth,
1003	display->depth, InputOutput,	938	depth, InputOutput, visual,
1004	display->visual,
1005	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	939	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1006	#else	940	&attributes);
1007	top = XCreateSimpleWindow (disp, parent,
1008	szHint.x, szHint.y,
1009	szHint.width, szHint.height,
1010	ext_bwidth,
1011	pix_colors_focused[Color_border],
1012	pix_colors_focused[Color_border]);
1013	#endif
1014		941
1015	this->parent[0] = top;	942	this->parent[0] = top;
1016		943
1017	old_width = szHint.width;	944	old_width = szHint.width;
1018	old_height = szHint.height;	945	old_height = szHint.height;
1019		946
1020	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	947	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1021	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	948	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1022		949
1023	classHint.res_name = (char *)rs[Rs_name];	950	classHint.res_name = (char *)rs[Rs_name];
1024	classHint.res_class = (char *)RESCLASS;	951	classHint.res_class = (char *)RESCLASS;
1025		952
1026	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	953	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1027	wmHint.input = True;	954	wmHint.input = True;
1028	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	955	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1029	wmHint.window_group = top;	956	wmHint.window_group = top;
1030		957
1031	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	958	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1032	&szHint, &wmHint, &classHint);	959	&szHint, &wmHint, &classHint);
		960
		961	#if ENABLE_FRILLS
		962	if (mwmhints.flags)
		963	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		964	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		965	#endif
1033		966
1034	Atom protocols[] = {	967	Atom protocols[] = {
1035	xa[XA_WM_DELETE_WINDOW],	968	xa[XA_WM_DELETE_WINDOW],
1036	#if ENABLE_EWMH	969	#if ENABLE_EWMH
1037	xa[XA_NET_WM_PING],	970	xa[XA_NET_WM_PING],
1038	#endif	971	#endif
1039	};	972	};
1040		973
1041	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	974	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1042		975
1043	#if ENABLE_FRILLS	976	#if ENABLE_FRILLS
1044	if (rs[Rs_transient_for])	977	if (rs[Rs_transient_for])
1045	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	978	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1046	#endif	979	#endif
1047		980
1048	#if ENABLE_EWMH	981	#if ENABLE_EWMH
1049	long pid = getpid ();	982	long pid = getpid ();
1050		983
1051	XChangeProperty (disp, top,	984	XChangeProperty (dpy, top,
1052	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	985	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1053	PropModeReplace, (unsigned char *)&pid, 1);	986	PropModeReplace, (unsigned char *)&pid, 1);
1054		987
1055	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	988	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1056	#endif	989	#endif
1057		990
1058	XSelectInput (disp, top,	991	XSelectInput (dpy, top,
1059	KeyPressMask	992	KeyPressMask
1060	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	993	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1061	\| KeyReleaseMask	994	\| KeyReleaseMask
1062	#endif	995	#endif
1063	\| FocusChangeMask \| VisibilityChangeMask	996	\| FocusChangeMask \| VisibilityChangeMask
1064	\| ExposureMask \| StructureNotifyMask);	997	\| ExposureMask \| StructureNotifyMask);
1065		998
1066	termwin_ev.start (display, top);	999	termwin_ev.start (display, top);
1067		1000
1068	#if ENABLE_FRILLS
1069	if (mwmhints.flags)
1070	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1071	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1072	#endif
1073
1074	/* vt cursor: Black-on-White is standard, but this is more popular */	1001	/* vt cursor: Black-on-White is standard, but this is more popular */
1075	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1002	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1076		1003
1077	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1004	#ifdef HAVE_SCROLLBARS
1078	/* cursor (menuBar/scrollBar): Black-on-White */	1005	/* cursor scrollBar: Black-on-White */
1079	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1006	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1080	#endif	1007	#endif
1081		1008
1082	/* the vt window */	1009	/* the vt window */
1083	vt = XCreateSimpleWindow (disp, top,	1010	vt = XCreateSimpleWindow (dpy, top,
1084	window_vt_x,
1085	window_vt_y,	1011	window_vt_x, window_vt_y,
1086	width,
1087	height,	1012	width, height,
1088	0,	1013	0,
1089	pix_colors_focused[Color_fg],	1014	pix_colors_focused[Color_fg],
1090	pix_colors_focused[Color_bg]);	1015	pix_colors_focused[Color_bg]);
1091	#ifdef DEBUG_X
1092	XStoreName (disp, vt, "vt window");
1093	#endif
1094		1016
1095	attributes.bit_gravity = NorthWestGravity;	1017	attributes.bit_gravity = NorthWestGravity;
1096	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1018	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1097		1019
1098	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1020	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1099		1021
1100	if (OPTION (Opt_pointerBlank)	1022	if (OPTION (Opt_pointerBlank))
1101	#ifdef ENABLE_PERL
1102	\|\| perl.self
1103	#endif
1104	)
1105	vt_emask \|= PointerMotionMask;	1023	vt_emask \|= PointerMotionMask;
1106	else	1024	else
1107	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1025	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1108		1026
1109	XSelectInput (disp, vt, vt_emask);	1027	vt_select_input ();
		1028
1110	vt_ev.start (display, vt);	1029	vt_ev.start (display, vt);
1111
1112	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1113	if (menuBar_height ())
1114	{
1115	menuBar.win = XCreateSimpleWindow (disp, top,
1116	window_vt_x, 0,
1117	width,
1118	menuBar_TotalHeight (),
1119	0,
1120	pix_colors_focused[Color_fg],
1121	pix_colors_focused[Color_scroll]);
1122
1123	#ifdef DEBUG_X
1124	XStoreName (disp, menuBar.win, "menubar");
1125	#endif
1126
1127	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1128
1129	XDefineCursor (disp, menuBar.win,
1130	XCreateFontCursor (disp, XC_left_ptr));
1131
1132	XSelectInput (disp, menuBar.win,
1133	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1134	menubar_ev.start (display, menuBar.win);
1135	}
1136	#endif
1137		1030
1138	#ifdef XPM_BACKGROUND	1031	#ifdef XPM_BACKGROUND
1139	if (rs[Rs_backgroundPixmap] != NULL	1032	if (rs[Rs_backgroundPixmap] != NULL
1140	&& ! OPTION (Opt_transparent))	1033	&& !OPTION (Opt_transparent))
1141	{	1034	{
1142	const char *p = rs[Rs_backgroundPixmap];	1035	const char *p = rs[Rs_backgroundPixmap];
1143		1036
1144	if ((p = strchr (p, ';')) != NULL)	1037	if ((p = strchr (p, ';')) != NULL)
1145	{	1038	{
…		…
1151	scr_touch (true);	1044	scr_touch (true);
1152	}	1045	}
1153	#endif	1046	#endif
1154		1047
1155	/* graphics context for the vt window */	1048	/* graphics context for the vt window */
1156	gcvalue.foreground = pix_colors[Color_fg];	1049	gcvalue.foreground = pix_colors[Color_fg];
1157	gcvalue.background = pix_colors[Color_bg];	1050	gcvalue.background = pix_colors[Color_bg];
1158	gcvalue.graphics_exposures = 1;	1051	gcvalue.graphics_exposures = 0;
		1052
1159	gc = XCreateGC (disp, vt,	1053	gc = XCreateGC (dpy, vt,
1160	GCForeground \| GCBackground \| GCGraphicsExposures,	1054	GCForeground \| GCBackground \| GCGraphicsExposures,
1161	&gcvalue);	1055	&gcvalue);
1162		1056
1163	drawable = new rxvt_drawable (display, vt);	1057	drawable = new rxvt_drawable (this, vt);
1164		1058
1165	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1059	#ifdef RXVT_SCROLLBAR
1166	gcvalue.foreground = pix_colors[Color_topShadow];	1060	gcvalue.foreground = pix_colors[Color_topShadow];
1167	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1061	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1168	gcvalue.foreground = pix_colors[Color_bottomShadow];	1062	gcvalue.foreground = pix_colors[Color_bottomShadow];
1169	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1063	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1170	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1064	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1171	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1065	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1172	#endif	1066	#endif
1173		1067
1174	#ifdef OFF_FOCUS_FADING	1068	#ifdef OFF_FOCUS_FADING
1175	// initially we are in unfocused state	1069	// initially we are in unfocused state
1176	if (rs[Rs_fade])	1070	if (rs[Rs_fade])
1177	pix_colors = pix_colors_unfocused;	1071	pix_colors = pix_colors_unfocused;
1178	#endif	1072	#endif
1179		1073
1180	pointer_unblank ();	1074	pointer_unblank ();
1181	scr_recolour ();	1075	scr_recolour ();
1182
1183	#if ENABLE_XEMBED
1184	if (rs[Rs_embed])
1185	{
1186	long info[2] = { 0, XEMBED_MAPPED };
1187
1188	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1189	32, PropModeReplace, (unsigned char *)&info, 2);
1190	}
1191	#endif
1192	}	1076	}
1193		1077
1194	/* ------------------------------------------------------------------------- *	1078	/* ------------------------------------------------------------------------- *
1195	* GET TTY CURRENT STATE *	1079	* GET TTY CURRENT STATE *
1196	* ------------------------------------------------------------------------- */	1080	* ------------------------------------------------------------------------- */
…		…
1413	rxvt_term::run_command (const char const argv)	1297	rxvt_term::run_command (const char const argv)
1414	{	1298	{
1415	#if ENABLE_FRILLS	1299	#if ENABLE_FRILLS
1416	if (rs[Rs_pty_fd])	1300	if (rs[Rs_pty_fd])
1417	{	1301	{
1418	pty.pty = atoi (rs[Rs_pty_fd]);	1302	pty->pty = atoi (rs[Rs_pty_fd]);
1419		1303
1420	if (pty.pty >= 0)	1304	if (pty->pty >= 0)
1421	{	1305	{
1422	if (getfd_hook)	1306	if (getfd_hook)
1423	pty.pty = (*getfd_hook) (pty.pty);	1307	pty->pty = (*getfd_hook) (pty->pty);
1424		1308
1425	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1309	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1426	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1310	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1427	}	1311	}
1428	}	1312	}
1429	else	1313	else
1430	#endif	1314	#endif
1431	if (!pty.get ())	1315	if (!pty->get ())
1432	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1316	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1433		1317
1434	pty.set_utf8_mode (enc_utf8);	1318	pty->set_utf8_mode (enc_utf8);
1435		1319
1436	/* set initial window size */	1320	/* set initial window size */
1437	tt_winch ();	1321	tt_winch ();
1438		1322
1439	int er;	1323	int er;
…		…
1452	#if ENABLE_FRILLS	1336	#if ENABLE_FRILLS
1453	if (rs[Rs_pty_fd])	1337	if (rs[Rs_pty_fd])
1454	return;	1338	return;
1455	#endif	1339	#endif
1456		1340
1457	#ifndef __QNX__
1458	/* spin off the command interpreter */	1341	/* spin off the command interpreter */
1459	switch (cmd_pid = fork ())	1342	switch (cmd_pid = fork ())
1460	{	1343	{
1461	case -1:	1344	case -1:
1462	{	1345	{
…		…
1464	rxvt_fatal ("can't fork, aborting.\n");	1347	rxvt_fatal ("can't fork, aborting.\n");
1465	}	1348	}
1466	case 0:	1349	case 0:
1467	init_env ();	1350	init_env ();
1468		1351
1469	if (!pty.make_controlling_tty ())	1352	if (!pty->make_controlling_tty ())
1470	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1353	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1471	else	1354	else
1472	{	1355	{
1473	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1356	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1474	dup2 (pty.tty, STDIN_FILENO);	1357	dup2 (pty->tty, STDIN_FILENO);
1475	dup2 (pty.tty, STDOUT_FILENO);	1358	dup2 (pty->tty, STDOUT_FILENO);
1476	dup2 (pty.tty, STDERR_FILENO);	1359	dup2 (pty->tty, STDERR_FILENO);
1477		1360
1478	// close all our file handles that we do no longer need	1361	// close all our file handles that we do no longer need
1479	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1362	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1480	{	1363	{
1481	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1364	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1482	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1365	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1483	}	1366	}
1484		1367
1485	run_child (argv);	1368	run_child (argv);
1486	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1369	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1487	}	1370	}
1488		1371
1489	_exit (EXIT_FAILURE);	1372	_exit (EXIT_FAILURE);
1490		1373
1491	default:	1374	default:
1492	{	1375	if (!OPTION (Opt_utmpInhibit))
1493	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1376	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1494	int fdstdin;
1495		1377
1496	fdstdin = dup (STDIN_FILENO);	1378	pty->close_tty ();
1497	dup2 (pty.tty, STDIN_FILENO);
1498	#endif
1499		1379
1500	#ifdef UTMP_SUPPORT	1380	child_ev.start (cmd_pid);
1501	privileged_utmp (SAVE);
1502	#endif
1503		1381
1504	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1382	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1505
1506	dup2 (fdstdin, STDIN_FILENO);
1507	close (fdstdin);
1508	#endif
1509	}
1510
1511	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1512	break;	1383	break;
1513	}	1384	}
1514	#else /* __QNX__ uses qnxspawn () */
1515	fchmod (pty.tty, 0622);
1516	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1517	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1518
1519	if (run_child (argv) == -1)
1520	exit (EXIT_FAILURE);
1521	#endif
1522	}	1385	}
1523		1386
1524	/* ------------------------------------------------------------------------- *	1387	/* ------------------------------------------------------------------------- *
1525	* CHILD PROCESS OPERATIONS *	1388	* CHILD PROCESS OPERATIONS *
1526	* ------------------------------------------------------------------------- */	1389	* ------------------------------------------------------------------------- */
…		…
1570	// unblock signals (signals are blocked by iom.C	1433	// unblock signals (signals are blocked by iom.C
1571	sigset_t ss;	1434	sigset_t ss;
1572	sigemptyset (&ss);	1435	sigemptyset (&ss);
1573	sigprocmask (SIG_SETMASK, &ss, 0);	1436	sigprocmask (SIG_SETMASK, &ss, 0);
1574		1437
1575	#ifndef __QNX__
1576	/* command interpreter path */	1438	/* command interpreter path */
1577	if (argv != NULL)	1439	if (argv != NULL)
1578	{	1440	{
1579	# ifdef DEBUG_CMD	1441	# ifdef DEBUG_CMD
1580	int i;	1442	int i;
…		…
1606		1468
1607	execlp (shell, argv0, NULL);	1469	execlp (shell, argv0, NULL);
1608	/* no error message: STDERR is closed! */	1470	/* no error message: STDERR is closed! */
1609	}	1471	}
1610		1472
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 (OPTION (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;	1473	return -1;
1668	}	1474	}
1669		1475
1670	/----------------------- end-of-file (C source) -----------------------/	1476	/----------------------- 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.140 by root, Thu Jan 12 01:30:53 2006 UTC vs. Revision 1.174 by root, Wed Jul 5 22:46:14 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.140 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.174 by root, Wed Jul 5 22:46:14 2006 UTC