[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.171 by root, Mon Feb 20 20:44:22 2006 UTC

…		…
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	#if XFT
		306	if (rs[Rs_depth])
		307	set (display, strtol (rs[Rs_depth], 0, 0));
		308	else
		309	#endif
		310	set (display);
		311
353	extract_resources ();	312	extract_resources ();
354		313
355	free (r_argv);	314	free (r_argv);
		315
		316	for (int i = NUM_RESOURCES; i--; )
		317	if (rs [i] == resval_undef)
		318	rs [i] = 0;
		319
		320	#if ENABLE_PERL
		321	if (!rs[Rs_perl_ext_1])
		322	rs[Rs_perl_ext_1] = "default";
		323
		324	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		325	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		326	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		327	{
		328	rxvt_perl.init (this);
		329	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		330	}
		331	#endif
356		332
357	/*	333	/*
358	* set any defaults not already set	334	* set any defaults not already set
359	*/	335	*/
360	if (cmd_argv && cmd_argv[0])	336	if (cmd_argv && cmd_argv[0])
…		…
450	/* this is how xterm implements reverseVideo */	426	/* this is how xterm implements reverseVideo */
451	if (OPTION (Opt_reverseVideo))	427	if (OPTION (Opt_reverseVideo))
452	{	428	{
453	if (!rs[Rs_color + Color_fg])	429	if (!rs[Rs_color + Color_fg])
454	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	430	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		431
455	if (!rs[Rs_color + Color_bg])	432	if (!rs[Rs_color + Color_bg])
456	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	433	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457	}	434	}
458	#endif	435	#endif
459		436
…		…
511	val = rxvt_network_display (rs[Rs_display_name]);	488	val = rxvt_network_display (rs[Rs_display_name]);
512	rs[Rs_display_name] = (const char *)val;	489	rs[Rs_display_name] = (const char *)val;
513		490
514	if (val == NULL)	491	if (val == NULL)
515	#endif /* DISPLAY_IS_IP */	492	#endif /* DISPLAY_IS_IP */
516	val = XDisplayString (display->display);	493	val = XDisplayString (dpy);
517		494
518	if (rs[Rs_display_name] == NULL)	495	if (rs[Rs_display_name] == NULL)
519	rs[Rs_display_name] = val; /* use broken `:0' value */	496	rs[Rs_display_name] = val; /* use broken `:0' value */
520		497
521	i = strlen (val);	498	i = strlen (val);
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	499	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		500
524	sprintf (env_display, "DISPLAY=%s", val);	501	sprintf (env_display, "DISPLAY=%s", val);
525		502
526	/* avoiding the math library:	503	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		504
536	/* add entries to the environment:	505	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	506	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	507	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	508	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
541	* @ TERMINFO: path to terminfo directory	510	* @ TERMINFO: path to terminfo directory
542	* @ COLORFGBG: fg;bg color codes	511	* @ COLORFGBG: fg;bg color codes
543	*/	512	*/
544	putenv (env_display);	513	putenv (env_display);
545	putenv (env_windowid);	514	putenv (env_windowid);
		515
546	if (env_colorfgbg)	516	if (env_colorfgbg)
547	putenv (env_colorfgbg);	517	putenv (env_colorfgbg);
548		518
549	#ifdef RXVT_TERMINFO	519	#ifdef RXVT_TERMINFO
550	putenv ("TERMINFO=" RXVT_TERMINFO);	520	putenv ("TERMINFO=" RXVT_TERMINFO);
551	#endif	521	#endif
552		522
553	if (display->depth <= 2)	523	if (depth <= 2)
554	putenv ("COLORTERM=" COLORTERMENV "-mono");	524	putenv ("COLORTERM=" COLORTERMENV "-mono");
555	else	525	else
556	putenv ("COLORTERM=" COLORTERMENVFULL);	526	putenv ("COLORTERM=" COLORTERMENVFULL);
557		527
558	if (rs[Rs_term_name] != NULL)	528	if (rs[Rs_term_name] != NULL)
…		…
670	if (strcmp (key_backspace, "DEC") == 0)	640	if (strcmp (key_backspace, "DEC") == 0)
671	priv_modes \|= PrivMode_HaveBackSpace;	641	priv_modes \|= PrivMode_HaveBackSpace;
672	#endif	642	#endif
673		643
674	/* add value for scrollBar */	644	/* add value for scrollBar */
675	if (scrollbar_visible ())	645	if (scrollBar.state)
676	{	646	{
677	priv_modes \|= PrivMode_scrollBar;	647	priv_modes \|= PrivMode_scrollBar;
678	SavedModes \|= PrivMode_scrollBar;	648	SavedModes \|= PrivMode_scrollBar;
679	}
680
681	if (menubar_visible ())
682	{
683	priv_modes \|= PrivMode_menuBar;
684	SavedModes \|= PrivMode_menuBar;
685	}	649	}
686		650
687	run_command (argv);	651	run_command (argv);
688	}	652	}
689		653
…		…
695		659
696	#ifdef OFF_FOCUS_FADING	660	#ifdef OFF_FOCUS_FADING
697	pix_colors = pix_colors_focused;	661	pix_colors = pix_colors_focused;
698	#endif	662	#endif
699		663
700	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	664	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
701	{	665	{
		666	const char *name = rs[Rs_color + i];
		667
		668	if (!name)
		669	continue;
		670
702	rxvt_color xcol;	671	rxvt_color xcol;
703		672
704	if (!rs[Rs_color + i])	673	if (!set_color (xcol, name))
705	continue;
706
707	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708	{	674	{
709	#ifndef XTERM_REVERSE_VIDEO	675	#ifndef XTERM_REVERSE_VIDEO
710	if (i < 2 && OPTION (Opt_reverseVideo))	676	if (i < 2 && OPTION (Opt_reverseVideo))
711	rs[Rs_color + i] = def_colorName[!i];	677	name = def_colorName [1 - i];
712	else	678	else
713	#endif	679	#endif
714	rs[Rs_color + i] = def_colorName[i];	680	name = def_colorName [i];
715		681
716	if (!rs[Rs_color + i])	682	if (!name)
717	continue;	683	continue;
718		684
719	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	685	if (!set_color (xcol, name))
720	{	686	{
721	switch (i)	687	switch (i)
722	{	688	{
723	case Color_fg:	689	case Color_fg:
724	case Color_bg:	690	case Color_bg:
725	/* fatal: need bg/fg color */
726	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	691	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
727	/* NOTREACHED */	692	name = "";
728	break;	693	break;
729	#ifndef NO_CURSORCOLOR	694	#ifndef NO_CURSORCOLOR
730	case Color_cursor2:	695	case Color_cursor2:
731	xcol = pix_colors[Color_fg];	696	#endif
732	break;
733	#endif /* ! NO_CURSORCOLOR */
734	case Color_pointer_fg:	697	case Color_pointer_fg:
735	xcol = pix_colors[Color_fg];	698	name = rs[Rs_color + Color_fg];
		699	xcol.set (this, name);
736	break;	700	break;
737	default:	701	default:
738	xcol = pix_colors[Color_bg]; /* None */	702	name = rs[Rs_color + Color_bg];
		703	xcol.set (this, name);
739	break;	704	break;
740	}	705	}
741	}	706	}
742	}	707	}
743		708
744	pix_colors[i] = xcol;	709	pix_colors[i] = xcol;
745	SET_PIXCOLOR (i);	710	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	{	711	}
		712
		713	if (depth <= 2)
		714	{
756	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	715	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];	716	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];	717	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
759	}	718	}
760		719
761	/*	720	/*
762	* get scrollBar/menuBar shadow colors	721	* get scrollBar shadow colors
763	*	722	*
764	* The calculations of topShadow/bottomShadow values are adapted	723	* The calculations of topShadow/bottomShadow values are adapted
765	* from the fvwm window manager.	724	* from the fvwm window manager.
766	*/	725	*/
767	#ifdef KEEP_SCROLLCOLOR	726	#ifdef KEEP_SCROLLCOLOR
768
769	if (display->depth <= 2)	727	if (depth <= 2)
770	{	728	{
771	/* Monochrome */	729	/* Monochrome */
772	pix_colors[Color_scroll] = pix_colors[Color_fg];	730	alias_color (Color_scroll, Color_fg);
773	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	alias_color (Color_topShadow, Color_bg);
774	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	alias_color (Color_bottomShadow, Color_bg);
775	}	733	}
776	else	734	else
777	{	735	{
778	rxvt_color xcol[2];	736	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		737
783	xcol[1] = pix_colors[Color_scroll];	738	rgba cscroll;
784	xcol[0].set (display, 65535, 65535, 65535);	739	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		740
793	/* topShadowColor */	741	/* topShadowColor */
794	if (!xcol[1].set (display,	742	if (!pix_colors[Color_topShadow].set (this,
795	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	743	rgba (
796	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	744	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
797	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	745	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
798	xcol[1] = pix_colors[Color_White];	746	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
799		747	cscroll.a)
800	pix_colors[Color_topShadow] = xcol[1];	748	))
		749	alias_color (Color_topShadow, Color_White);
801	}	750	}
802	#endif /* KEEP_SCROLLCOLOR */	751	#endif /* KEEP_SCROLLCOLOR */
		752
		753	#ifdef OFF_FOCUS_FADING
		754	if (rs[Rs_fade])
		755	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		756	{
		757	rgba c;
		758	pix_colors [Color_fade].get (c);
		759	pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
		760	}
		761	#endif
803	}	762	}
804		763
805	/----------------------------------------------------------------------/	764	/----------------------------------------------------------------------/
806	/* color aliases, fg/bg bright-bold */	765	/* color aliases, fg/bg bright-bold */
807	void	766	void
…		…
846		805
847	if (rsmod	806	if (rsmod
848	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	807	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849	requestedmeta = rsmod[3] - '0';	808	requestedmeta = rsmod[3] - '0';
850		809
851	map = XGetModifierMapping (display->display);	810	map = XGetModifierMapping (dpy);
852	kc = map->modifiermap;	811	kc = map->modifiermap;
853		812
854	for (i = 1; i < 6; i++)	813	for (i = 1; i < 6; i++)
855	{	814	{
856	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	815	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
858	for (j = map->max_keypermod; j--; k++)	817	for (j = map->max_keypermod; j--; k++)
859	{	818	{
860	if (kc[k] == 0)	819	if (kc[k] == 0)
861	break;	820	break;
862		821
863	switch (XKeycodeToKeysym (display->display, kc[k], 0))	822	switch (XKeycodeToKeysym (dpy, kc[k], 0))
864	{	823	{
865	case XK_Num_Lock:	824	case XK_Num_Lock:
866	ModNumLockMask = modmasks[i - 1];	825	ModNumLockMask = modmasks[i - 1];
867	continue;	826	continue;
868		827
…		…
918	rxvt_term::create_windows (int argc, const char const argv)	877	rxvt_term::create_windows (int argc, const char const argv)
919	{	878	{
920	XClassHint classHint;	879	XClassHint classHint;
921	XWMHints wmHint;	880	XWMHints wmHint;
922	#if ENABLE_FRILLS	881	#if ENABLE_FRILLS
923	Atom prop = None;
924	MWMHints mwmhints;	882	MWMHints mwmhints;
925	#endif	883	#endif
926	XGCValues gcvalue;	884	XGCValues gcvalue;
927	long vt_emask;
928	XSetWindowAttributes attributes;	885	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;
930	Window top, parent;	886	Window top, parent;
931	dDisp;
932		887
933	#ifdef USING_W11LIB	888	dLocal (Display *, dpy);
934	/* enable W11 callbacks */
935	W11AddEventHandler (disp, rxvt_W11_process_x_event);
936	#endif
937		889
938	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	890	/* grab colors before netscape does */
939	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	891	Get_Colours ();
940		892
941	if (OPTION (Opt_transparent))	893	if (!set_fonts ())
942	{	894	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
943	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	895
944	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	896	parent = display->root;
945	}	897
		898	attributes.override_redirect = !!OPTION (Opt_override_redirect);
946		899
947	#if ENABLE_FRILLS	900	#if ENABLE_FRILLS
948	if (OPTION (Opt_borderLess))	901	if (OPTION (Opt_borderLess))
949	{	902	{
950	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	903	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
951
952	if (prop == None)
953	{	904	{
954	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	905	/* 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;	906	attributes.override_redirect = true;
957	#endif
958	mwmhints.flags = 0;	907	mwmhints.flags = 0;
959	}	908	}
960	else	909	else
961	{	910	{
962	mwmhints.flags = MWM_HINTS_DECORATIONS;	911	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
965	}	914	}
966	else	915	else
967	mwmhints.flags = 0;	916	mwmhints.flags = 0;
968	#endif	917	#endif
969		918
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	919	#if ENABLE_XEMBED
979	if (rs[Rs_embed])	920	if (rs[Rs_embed])
980	{	921	{
981	XWindowAttributes wattr;	922	XWindowAttributes wattr;
982		923
983	parent = strtol (rs[Rs_embed], 0, 0);	924	parent = strtol (rs[Rs_embed], 0, 0);
984		925
985	if (!XGetWindowAttributes (disp, parent, &wattr))	926	if (!XGetWindowAttributes (dpy, parent, &wattr))
986	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	927	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987		928
988	window_calc (wattr.width, wattr.height);	929	window_calc (wattr.width, wattr.height);
989	}	930	}
990	#endif	931	#endif
991		932
992	window_calc (0, 0);	933	window_calc (0, 0);
993		934
994	/* sub-window placement & size in rxvt_resize_subwindows () */	935	/* sub-window placement & size in rxvt_resize_subwindows () */
995	#ifdef PREFER_24BIT
996	attributes.background_pixel = pix_colors_focused[Color_border];	936	attributes.background_pixel = pix_colors_focused [Color_border];
997	attributes.border_pixel = pix_colors_focused[Color_border];	937	attributes.border_pixel = pix_colors_focused [Color_border];
998	attributes.colormap = display->cmap;	938	attributes.colormap = cmap;
		939
999	top = XCreateWindow (disp, parent,	940	top = XCreateWindow (dpy, parent,
1000	szHint.x, szHint.y,	941	szHint.x, szHint.y,
1001	szHint.width, szHint.height,	942	szHint.width, szHint.height,
1002	ext_bwidth,	943	ext_bwidth,
1003	display->depth, InputOutput,	944	depth, InputOutput, visual,
1004	display->visual,
1005	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	945	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1006	#else	946	&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		947
1015	this->parent[0] = top;	948	this->parent[0] = top;
1016		949
1017	old_width = szHint.width;	950	old_width = szHint.width;
1018	old_height = szHint.height;	951	old_height = szHint.height;
1019		952
1020	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	953	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1021	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	954	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1022		955
1023	classHint.res_name = (char *)rs[Rs_name];	956	classHint.res_name = (char *)rs[Rs_name];
1024	classHint.res_class = (char *)RESCLASS;	957	classHint.res_class = (char *)RESCLASS;
1025		958
1026	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	959	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1027	wmHint.input = True;	960	wmHint.input = True;
1028	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	961	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1029	wmHint.window_group = top;	962	wmHint.window_group = top;
1030		963
1031	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	964	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1032	&szHint, &wmHint, &classHint);	965	&szHint, &wmHint, &classHint);
		966
		967	#if ENABLE_FRILLS
		968	if (mwmhints.flags)
		969	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		970	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		971	#endif
1033		972
1034	Atom protocols[] = {	973	Atom protocols[] = {
1035	xa[XA_WM_DELETE_WINDOW],	974	xa[XA_WM_DELETE_WINDOW],
1036	#if ENABLE_EWMH	975	#if ENABLE_EWMH
1037	xa[XA_NET_WM_PING],	976	xa[XA_NET_WM_PING],
1038	#endif	977	#endif
1039	};	978	};
1040		979
1041	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	980	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1042		981
1043	#if ENABLE_FRILLS	982	#if ENABLE_FRILLS
1044	if (rs[Rs_transient_for])	983	if (rs[Rs_transient_for])
1045	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	984	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1046	#endif	985	#endif
1047		986
1048	#if ENABLE_EWMH	987	#if ENABLE_EWMH
1049	long pid = getpid ();	988	long pid = getpid ();
1050		989
1051	XChangeProperty (disp, top,	990	XChangeProperty (dpy, top,
1052	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	991	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1053	PropModeReplace, (unsigned char *)&pid, 1);	992	PropModeReplace, (unsigned char *)&pid, 1);
1054		993
1055	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	994	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1056	#endif	995	#endif
1057		996
1058	XSelectInput (disp, top,	997	XSelectInput (dpy, top,
1059	KeyPressMask	998	KeyPressMask
1060	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	999	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1061	\| KeyReleaseMask	1000	\| KeyReleaseMask
1062	#endif	1001	#endif
1063	\| FocusChangeMask \| VisibilityChangeMask	1002	\| FocusChangeMask \| VisibilityChangeMask
1064	\| ExposureMask \| StructureNotifyMask);	1003	\| ExposureMask \| StructureNotifyMask);
1065		1004
1066	termwin_ev.start (display, top);	1005	termwin_ev.start (display, top);
1067		1006
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 */	1007	/* vt cursor: Black-on-White is standard, but this is more popular */
1075	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1008	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1076		1009
1077	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1010	#ifdef HAVE_SCROLLBARS
1078	/* cursor (menuBar/scrollBar): Black-on-White */	1011	/* cursor scrollBar: Black-on-White */
1079	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1012	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1080	#endif	1013	#endif
1081		1014
1082	/* the vt window */	1015	/* the vt window */
1083	vt = XCreateSimpleWindow (disp, top,	1016	vt = XCreateSimpleWindow (dpy, top,
1084	window_vt_x,
1085	window_vt_y,	1017	window_vt_x, window_vt_y,
1086	width,
1087	height,	1018	width, height,
1088	0,	1019	0,
1089	pix_colors_focused[Color_fg],	1020	pix_colors_focused[Color_fg],
1090	pix_colors_focused[Color_bg]);	1021	pix_colors_focused[Color_bg]);
1091	#ifdef DEBUG_X
1092	XStoreName (disp, vt, "vt window");
1093	#endif
1094		1022
1095	attributes.bit_gravity = NorthWestGravity;	1023	attributes.bit_gravity = NorthWestGravity;
1096	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1024	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1097		1025
1098	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1026	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1099		1027
1100	if (OPTION (Opt_pointerBlank)	1028	if (OPTION (Opt_pointerBlank))
1101	#ifdef ENABLE_PERL
1102	\|\| perl.self
1103	#endif
1104	)
1105	vt_emask \|= PointerMotionMask;	1029	vt_emask \|= PointerMotionMask;
1106	else	1030	else
1107	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1031	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1108		1032
1109	XSelectInput (disp, vt, vt_emask);	1033	vt_select_input ();
		1034
1110	vt_ev.start (display, vt);	1035	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		1036
1138	#ifdef XPM_BACKGROUND	1037	#ifdef XPM_BACKGROUND
1139	if (rs[Rs_backgroundPixmap] != NULL	1038	if (rs[Rs_backgroundPixmap] != NULL
1140	&& ! OPTION (Opt_transparent))	1039	&& !OPTION (Opt_transparent))
1141	{	1040	{
1142	const char *p = rs[Rs_backgroundPixmap];	1041	const char *p = rs[Rs_backgroundPixmap];
1143		1042
1144	if ((p = strchr (p, ';')) != NULL)	1043	if ((p = strchr (p, ';')) != NULL)
1145	{	1044	{
…		…
1151	scr_touch (true);	1050	scr_touch (true);
1152	}	1051	}
1153	#endif	1052	#endif
1154		1053
1155	/* graphics context for the vt window */	1054	/* graphics context for the vt window */
1156	gcvalue.foreground = pix_colors[Color_fg];	1055	gcvalue.foreground = pix_colors[Color_fg];
1157	gcvalue.background = pix_colors[Color_bg];	1056	gcvalue.background = pix_colors[Color_bg];
1158	gcvalue.graphics_exposures = 1;	1057	gcvalue.graphics_exposures = 0;
		1058
1159	gc = XCreateGC (disp, vt,	1059	gc = XCreateGC (dpy, vt,
1160	GCForeground \| GCBackground \| GCGraphicsExposures,	1060	GCForeground \| GCBackground \| GCGraphicsExposures,
1161	&gcvalue);	1061	&gcvalue);
1162		1062
1163	drawable = new rxvt_drawable (display, vt);	1063	drawable = new rxvt_drawable (this, vt);
1164		1064
1165	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1065	#ifdef RXVT_SCROLLBAR
1166	gcvalue.foreground = pix_colors[Color_topShadow];	1066	gcvalue.foreground = pix_colors[Color_topShadow];
1167	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1067	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1168	gcvalue.foreground = pix_colors[Color_bottomShadow];	1068	gcvalue.foreground = pix_colors[Color_bottomShadow];
1169	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1069	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1170	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1070	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1171	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1071	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1172	#endif	1072	#endif
1173		1073
1174	#ifdef OFF_FOCUS_FADING	1074	#ifdef OFF_FOCUS_FADING
1175	// initially we are in unfocused state	1075	// initially we are in unfocused state
1176	if (rs[Rs_fade])	1076	if (rs[Rs_fade])
1177	pix_colors = pix_colors_unfocused;	1077	pix_colors = pix_colors_unfocused;
1178	#endif	1078	#endif
1179		1079
1180	pointer_unblank ();	1080	pointer_unblank ();
1181	scr_recolour ();	1081	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	}	1082	}
1193		1083
1194	/* ------------------------------------------------------------------------- *	1084	/* ------------------------------------------------------------------------- *
1195	* GET TTY CURRENT STATE *	1085	* GET TTY CURRENT STATE *
1196	* ------------------------------------------------------------------------- */	1086	* ------------------------------------------------------------------------- */
…		…
1413	rxvt_term::run_command (const char const argv)	1303	rxvt_term::run_command (const char const argv)
1414	{	1304	{
1415	#if ENABLE_FRILLS	1305	#if ENABLE_FRILLS
1416	if (rs[Rs_pty_fd])	1306	if (rs[Rs_pty_fd])
1417	{	1307	{
1418	pty.pty = atoi (rs[Rs_pty_fd]);	1308	pty->pty = atoi (rs[Rs_pty_fd]);
1419		1309
1420	if (pty.pty >= 0)	1310	if (pty->pty >= 0)
1421	{	1311	{
1422	if (getfd_hook)	1312	if (getfd_hook)
1423	pty.pty = (*getfd_hook) (pty.pty);	1313	pty->pty = (*getfd_hook) (pty->pty);
1424		1314
1425	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1315	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1426	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1316	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1427	}	1317	}
1428	}	1318	}
1429	else	1319	else
1430	#endif	1320	#endif
1431	if (!pty.get ())	1321	if (!pty->get ())
1432	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1322	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1433		1323
1434	pty.set_utf8_mode (enc_utf8);	1324	pty->set_utf8_mode (enc_utf8);
1435		1325
1436	/* set initial window size */	1326	/* set initial window size */
1437	tt_winch ();	1327	tt_winch ();
1438		1328
1439	int er;	1329	int er;
…		…
1452	#if ENABLE_FRILLS	1342	#if ENABLE_FRILLS
1453	if (rs[Rs_pty_fd])	1343	if (rs[Rs_pty_fd])
1454	return;	1344	return;
1455	#endif	1345	#endif
1456		1346
1457	#ifndef __QNX__
1458	/* spin off the command interpreter */	1347	/* spin off the command interpreter */
1459	switch (cmd_pid = fork ())	1348	switch (cmd_pid = fork ())
1460	{	1349	{
1461	case -1:	1350	case -1:
1462	{	1351	{
…		…
1464	rxvt_fatal ("can't fork, aborting.\n");	1353	rxvt_fatal ("can't fork, aborting.\n");
1465	}	1354	}
1466	case 0:	1355	case 0:
1467	init_env ();	1356	init_env ();
1468		1357
1469	if (!pty.make_controlling_tty ())	1358	if (!pty->make_controlling_tty ())
1470	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1359	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1471	else	1360	else
1472	{	1361	{
1473	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1362	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1474	dup2 (pty.tty, STDIN_FILENO);	1363	dup2 (pty->tty, STDIN_FILENO);
1475	dup2 (pty.tty, STDOUT_FILENO);	1364	dup2 (pty->tty, STDOUT_FILENO);
1476	dup2 (pty.tty, STDERR_FILENO);	1365	dup2 (pty->tty, STDERR_FILENO);
1477		1366
1478	// close all our file handles that we do no longer need	1367	// close all our file handles that we do no longer need
1479	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1368	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1480	{	1369	{
1481	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1370	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1482	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1371	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1483	}	1372	}
1484		1373
1485	run_child (argv);	1374	run_child (argv);
1486	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1375	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1487	}	1376	}
1488		1377
1489	_exit (EXIT_FAILURE);	1378	_exit (EXIT_FAILURE);
1490		1379
1491	default:	1380	default:
1492	{	1381	if (!OPTION (Opt_utmpInhibit))
1493	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1382	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1494	int fdstdin;
1495		1383
1496	fdstdin = dup (STDIN_FILENO);	1384	pty->close_tty ();
1497	dup2 (pty.tty, STDIN_FILENO);
1498	#endif
1499		1385
1500	#ifdef UTMP_SUPPORT	1386	child_ev.start (cmd_pid);
1501	privileged_utmp (SAVE);
1502	#endif
1503		1387
1504	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1388	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;	1389	break;
1513	}	1390	}
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	}	1391	}
1523		1392
1524	/* ------------------------------------------------------------------------- *	1393	/* ------------------------------------------------------------------------- *
1525	* CHILD PROCESS OPERATIONS *	1394	* CHILD PROCESS OPERATIONS *
1526	* ------------------------------------------------------------------------- */	1395	* ------------------------------------------------------------------------- */
…		…
1570	// unblock signals (signals are blocked by iom.C	1439	// unblock signals (signals are blocked by iom.C
1571	sigset_t ss;	1440	sigset_t ss;
1572	sigemptyset (&ss);	1441	sigemptyset (&ss);
1573	sigprocmask (SIG_SETMASK, &ss, 0);	1442	sigprocmask (SIG_SETMASK, &ss, 0);
1574		1443
1575	#ifndef __QNX__
1576	/* command interpreter path */	1444	/* command interpreter path */
1577	if (argv != NULL)	1445	if (argv != NULL)
1578	{	1446	{
1579	# ifdef DEBUG_CMD	1447	# ifdef DEBUG_CMD
1580	int i;	1448	int i;
…		…
1606		1474
1607	execlp (shell, argv0, NULL);	1475	execlp (shell, argv0, NULL);
1608	/* no error message: STDERR is closed! */	1476	/* no error message: STDERR is closed! */
1609	}	1477	}
1610		1478
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;	1479	return -1;
1668	}	1480	}
1669		1481
1670	/----------------------- end-of-file (C source) -----------------------/	1482	/----------------------- 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.171 by root, Mon Feb 20 20:44:22 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.171 by root, Mon Feb 20 20:44:22 2006 UTC