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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.143 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC

…		…
174	#if OFF_FOCUS_FADING	174	#if OFF_FOCUS_FADING
175	"black",	175	"black",
176	#endif	176	#endif
177	};	177	};
178		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
216	};
217
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;
…		…
344	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]);
345		301
346	extract_resources ();	302	extract_resources ();
347		303
348	free (r_argv);	304	free (r_argv);
		305
		306	#if ENABLE_PERL
		307	if (!rs[Rs_perl_ext_1])
		308	rs[Rs_perl_ext_1] = "default";
		309
		310	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		311	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		312	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		313	{
		314	rxvt_perl.init (this);
		315	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		316	}
		317	#endif
349		318
350	/*	319	/*
351	* set any defaults not already set	320	* set any defaults not already set
352	*/	321	*/
353	if (cmd_argv && cmd_argv[0])	322	if (cmd_argv && cmd_argv[0])
…		…
514	i = strlen (val);	483	i = strlen (val);
515	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	484	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
516		485
517	sprintf (env_display, "DISPLAY=%s", val);	486	sprintf (env_display, "DISPLAY=%s", val);
518		487
519	/* avoiding the math library:	488	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522	;
523	max_it (i, 1);
524	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
525
526	sprintf (env_windowid, "WINDOWID=%u",
527	(unsigned int)parent[0]);
528		489
529	/* add entries to the environment:	490	/* add entries to the environment:
530	* @ DISPLAY: in case we started with -display	491	* @ DISPLAY: in case we started with -display
531	* @ WINDOWID: X window id number of the window	492	* @ WINDOWID: X window id number of the window
532	* @ COLORTERM: terminal sub-name and also indicates its color	493	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
534	* @ TERMINFO: path to terminfo directory	495	* @ TERMINFO: path to terminfo directory
535	* @ COLORFGBG: fg;bg color codes	496	* @ COLORFGBG: fg;bg color codes
536	*/	497	*/
537	putenv (env_display);	498	putenv (env_display);
538	putenv (env_windowid);	499	putenv (env_windowid);
		500
539	if (env_colorfgbg)	501	if (env_colorfgbg)
540	putenv (env_colorfgbg);	502	putenv (env_colorfgbg);
541		503
542	#ifdef RXVT_TERMINFO	504	#ifdef RXVT_TERMINFO
543	putenv ("TERMINFO=" RXVT_TERMINFO);	505	putenv ("TERMINFO=" RXVT_TERMINFO);
…		…
905	rxvt_term::create_windows (int argc, const char const argv)	867	rxvt_term::create_windows (int argc, const char const argv)
906	{	868	{
907	XClassHint classHint;	869	XClassHint classHint;
908	XWMHints wmHint;	870	XWMHints wmHint;
909	#if ENABLE_FRILLS	871	#if ENABLE_FRILLS
910	Atom prop = None;
911	MWMHints mwmhints;	872	MWMHints mwmhints;
912	#endif	873	#endif
913	XGCValues gcvalue;	874	XGCValues gcvalue;
914	XSetWindowAttributes attributes;	875	XSetWindowAttributes attributes;
915	XWindowAttributes gattr;
916	Window top, parent;	876	Window top, parent;
917	dDisp;	877	dDisp;
918		878
919	#ifdef USING_W11LIB	879	xa = display->xa;
920	/* enable W11 callbacks */
921	W11AddEventHandler (disp, rxvt_W11_process_x_event);
922	#endif
923		880
924	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	881	/* grab colors before netscape does */
925	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	882	Get_Colours ();
926		883
927	if (OPTION (Opt_transparent))	884	if (!set_fonts ())
928	{	885	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	886
930	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	887	parent = display->root;
931	}	888
		889	attributes.override_redirect = !!OPTION (Opt_override_redirect);
932		890
933	#if ENABLE_FRILLS	891	#if ENABLE_FRILLS
934	if (OPTION (Opt_borderLess))	892	if (OPTION (Opt_borderLess))
935	{	893	{
936	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	894	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
937
938	if (prop == None)
939	{	895	{
940	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	896	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
941	#ifdef PREFER_24BIT
942	attributes.override_redirect = TRUE;	897	attributes.override_redirect = TRUE;
943	#endif
944	mwmhints.flags = 0;	898	mwmhints.flags = 0;
945	}	899	}
946	else	900	else
947	{	901	{
948	mwmhints.flags = MWM_HINTS_DECORATIONS;	902	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
951	}	905	}
952	else	906	else
953	mwmhints.flags = 0;	907	mwmhints.flags = 0;
954	#endif	908	#endif
955		909
956	/* grab colors before netscape does */
957	Get_Colours ();
958
959	if (!set_fonts ())
960	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962	parent = DefaultRootWindow (disp);
963
964	#if ENABLE_XEMBED	910	#if ENABLE_XEMBED
965	if (rs[Rs_embed])	911	if (rs[Rs_embed])
966	{	912	{
967	XWindowAttributes wattr;	913	XWindowAttributes wattr;
968		914
…		…
976	#endif	922	#endif
977		923
978	window_calc (0, 0);	924	window_calc (0, 0);
979		925
980	/* sub-window placement & size in rxvt_resize_subwindows () */	926	/* sub-window placement & size in rxvt_resize_subwindows () */
981	#ifdef PREFER_24BIT
982	attributes.background_pixel = pix_colors_focused[Color_border];	927	attributes.background_pixel = pix_colors_focused[Color_border];
983	attributes.border_pixel = pix_colors_focused[Color_border];	928	attributes.border_pixel = pix_colors_focused[Color_border];
984	attributes.colormap = display->cmap;	929	attributes.colormap = display->cmap;
		930
985	top = XCreateWindow (disp, parent,	931	top = XCreateWindow (disp, parent,
986	szHint.x, szHint.y,	932	szHint.x, szHint.y,
987	szHint.width, szHint.height,	933	szHint.width, szHint.height,
988	ext_bwidth,	934	ext_bwidth,
989	display->depth, InputOutput,	935	display->depth, InputOutput,
990	display->visual,	936	display->visual,
991	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	937	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
992	#else	938	&attributes);
993	top = XCreateSimpleWindow (disp, parent,
994	szHint.x, szHint.y,
995	szHint.width, szHint.height,
996	ext_bwidth,
997	pix_colors_focused[Color_border],
998	pix_colors_focused[Color_border]);
999	#endif
1000		939
1001	this->parent[0] = top;	940	this->parent[0] = top;
1002		941
1003	old_width = szHint.width;	942	old_width = szHint.width;
1004	old_height = szHint.height;	943	old_height = szHint.height;
1005		944
1006	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	945	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	946	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008		947
1009	classHint.res_name = (char *)rs[Rs_name];	948	classHint.res_name = (char *)rs[Rs_name];
1010	classHint.res_class = (char *)RESCLASS;	949	classHint.res_class = (char *)RESCLASS;
1011		950
1012	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	951	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1013	wmHint.input = True;	952	wmHint.input = True;
1014	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	953	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1015	wmHint.window_group = top;	954	wmHint.window_group = top;
1016		955
1017	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	956	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1018	&szHint, &wmHint, &classHint);	957	&szHint, &wmHint, &classHint);
		958
		959	#if ENABLE_FRILLS
		960	if (mwmhints.flags)
		961	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		962	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		963	#endif
1019		964
1020	Atom protocols[] = {	965	Atom protocols[] = {
1021	xa[XA_WM_DELETE_WINDOW],	966	xa[XA_WM_DELETE_WINDOW],
1022	#if ENABLE_EWMH	967	#if ENABLE_EWMH
1023	xa[XA_NET_WM_PING],	968	xa[XA_NET_WM_PING],
…		…
1049	\| FocusChangeMask \| VisibilityChangeMask	994	\| FocusChangeMask \| VisibilityChangeMask
1050	\| ExposureMask \| StructureNotifyMask);	995	\| ExposureMask \| StructureNotifyMask);
1051		996
1052	termwin_ev.start (display, top);	997	termwin_ev.start (display, top);
1053		998
1054	#if ENABLE_FRILLS
1055	if (mwmhints.flags)
1056	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058	#endif
1059
1060	/* vt cursor: Black-on-White is standard, but this is more popular */	999	/* vt cursor: Black-on-White is standard, but this is more popular */
1061	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1000	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1062		1001
1063	#ifdef HAVE_SCROLLBARS	1002	#ifdef HAVE_SCROLLBARS
1064	/* cursor scrollBar: Black-on-White */	1003	/* cursor scrollBar: Black-on-White */
1065	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1004	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1066	#endif	1005	#endif
1067		1006
1068	/* the vt window */	1007	/* the vt window */
1069	vt = XCreateSimpleWindow (disp, top,	1008	vt = XCreateSimpleWindow (disp, top,
1070	window_vt_x,
1071	window_vt_y,	1009	window_vt_x, window_vt_y,
1072	width,
1073	height,	1010	width, height,
1074	0,	1011	0,
1075	pix_colors_focused[Color_fg],	1012	pix_colors_focused[Color_fg],
1076	pix_colors_focused[Color_bg]);	1013	pix_colors_focused[Color_bg]);
1077	#ifdef DEBUG_X
1078	XStoreName (disp, vt, "vt window");
1079	#endif
1080		1014
1081	attributes.bit_gravity = NorthWestGravity;	1015	attributes.bit_gravity = NorthWestGravity;
1082	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1016	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1083		1017
1084	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1018	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
…		…
1092		1026
1093	vt_ev.start (display, vt);	1027	vt_ev.start (display, vt);
1094		1028
1095	#ifdef XPM_BACKGROUND	1029	#ifdef XPM_BACKGROUND
1096	if (rs[Rs_backgroundPixmap] != NULL	1030	if (rs[Rs_backgroundPixmap] != NULL
1097	&& ! OPTION (Opt_transparent))	1031	&& !OPTION (Opt_transparent))
1098	{	1032	{
1099	const char *p = rs[Rs_backgroundPixmap];	1033	const char *p = rs[Rs_backgroundPixmap];
1100		1034
1101	if ((p = strchr (p, ';')) != NULL)	1035	if ((p = strchr (p, ';')) != NULL)
1102	{	1036	{
…		…
1108	scr_touch (true);	1042	scr_touch (true);
1109	}	1043	}
1110	#endif	1044	#endif
1111		1045
1112	/* graphics context for the vt window */	1046	/* graphics context for the vt window */
1113	gcvalue.foreground = pix_colors[Color_fg];	1047	gcvalue.foreground = pix_colors[Color_fg];
1114	gcvalue.background = pix_colors[Color_bg];	1048	gcvalue.background = pix_colors[Color_bg];
1115	gcvalue.graphics_exposures = 1;	1049	gcvalue.graphics_exposures = 1;
		1050
1116	gc = XCreateGC (disp, vt,	1051	gc = XCreateGC (disp, vt,
1117	GCForeground \| GCBackground \| GCGraphicsExposures,	1052	GCForeground \| GCBackground \| GCGraphicsExposures,
1118	&gcvalue);	1053	&gcvalue);
1119		1054
1120	drawable = new rxvt_drawable (display, vt);	1055	drawable = new rxvt_drawable (display, vt);
1121		1056
1122	#ifdef RXVT_SCROLLBAR	1057	#ifdef RXVT_SCROLLBAR
1123	gcvalue.foreground = pix_colors[Color_topShadow];	1058	gcvalue.foreground = pix_colors[Color_topShadow];
…		…
1134	pix_colors = pix_colors_unfocused;	1069	pix_colors = pix_colors_unfocused;
1135	#endif	1070	#endif
1136		1071
1137	pointer_unblank ();	1072	pointer_unblank ();
1138	scr_recolour ();	1073	scr_recolour ();
1139
1140	#if ENABLE_XEMBED
1141	if (rs[Rs_embed])
1142	{
1143	long info[2] = { 0, XEMBED_MAPPED };
1144
1145	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146	32, PropModeReplace, (unsigned char *)&info, 2);
1147	}
1148	#endif
1149	}	1074	}
1150		1075
1151	/* ------------------------------------------------------------------------- *	1076	/* ------------------------------------------------------------------------- *
1152	* GET TTY CURRENT STATE *	1077	* GET TTY CURRENT STATE *
1153	* ------------------------------------------------------------------------- */	1078	* ------------------------------------------------------------------------- */
…		…
1370	rxvt_term::run_command (const char const argv)	1295	rxvt_term::run_command (const char const argv)
1371	{	1296	{
1372	#if ENABLE_FRILLS	1297	#if ENABLE_FRILLS
1373	if (rs[Rs_pty_fd])	1298	if (rs[Rs_pty_fd])
1374	{	1299	{
1375	pty.pty = atoi (rs[Rs_pty_fd]);	1300	pty->pty = atoi (rs[Rs_pty_fd]);
1376		1301
1377	if (pty.pty >= 0)	1302	if (pty->pty >= 0)
1378	{	1303	{
1379	if (getfd_hook)	1304	if (getfd_hook)
1380	pty.pty = (*getfd_hook) (pty.pty);	1305	pty->pty = (*getfd_hook) (pty->pty);
1381		1306
1382	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1307	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1308	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384	}	1309	}
1385	}	1310	}
1386	else	1311	else
1387	#endif	1312	#endif
1388	if (!pty.get ())	1313	if (!pty->get ())
1389	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1314	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390		1315
1391	pty.set_utf8_mode (enc_utf8);	1316	pty->set_utf8_mode (enc_utf8);
1392		1317
1393	/* set initial window size */	1318	/* set initial window size */
1394	tt_winch ();	1319	tt_winch ();
1395		1320
1396	int er;	1321	int er;
…		…
1409	#if ENABLE_FRILLS	1334	#if ENABLE_FRILLS
1410	if (rs[Rs_pty_fd])	1335	if (rs[Rs_pty_fd])
1411	return;	1336	return;
1412	#endif	1337	#endif
1413		1338
1414	#ifndef __QNX__
1415	/* spin off the command interpreter */	1339	/* spin off the command interpreter */
1416	switch (cmd_pid = fork ())	1340	switch (cmd_pid = fork ())
1417	{	1341	{
1418	case -1:	1342	case -1:
1419	{	1343	{
…		…
1421	rxvt_fatal ("can't fork, aborting.\n");	1345	rxvt_fatal ("can't fork, aborting.\n");
1422	}	1346	}
1423	case 0:	1347	case 0:
1424	init_env ();	1348	init_env ();
1425		1349
1426	if (!pty.make_controlling_tty ())	1350	if (!pty->make_controlling_tty ())
1427	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1351	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1428	else	1352	else
1429	{	1353	{
1430	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1354	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1431	dup2 (pty.tty, STDIN_FILENO);	1355	dup2 (pty->tty, STDIN_FILENO);
1432	dup2 (pty.tty, STDOUT_FILENO);	1356	dup2 (pty->tty, STDOUT_FILENO);
1433	dup2 (pty.tty, STDERR_FILENO);	1357	dup2 (pty->tty, STDERR_FILENO);
1434		1358
1435	// close all our file handles that we do no longer need	1359	// close all our file handles that we do no longer need
1436	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1360	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1437	{	1361	{
1438	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1362	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1439	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1363	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1440	}	1364	}
1441		1365
1442	run_child (argv);	1366	run_child (argv);
1443	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1367	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1444	}	1368	}
1445		1369
1446	_exit (EXIT_FAILURE);	1370	_exit (EXIT_FAILURE);
1447		1371
1448	default:	1372	default:
1449	{	1373	if (!OPTION (Opt_utmpInhibit))
1450	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1374	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1451	int fdstdin;
1452		1375
1453	fdstdin = dup (STDIN_FILENO);	1376	pty->close_tty ();
1454	dup2 (pty.tty, STDIN_FILENO);
1455	#endif
1456		1377
1457	#ifdef UTMP_SUPPORT	1378	child_ev.start (cmd_pid);
1458	privileged_utmp (SAVE);
1459	#endif
1460		1379
1461	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1380	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1462
1463	dup2 (fdstdin, STDIN_FILENO);
1464	close (fdstdin);
1465	#endif
1466	}
1467
1468	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1469	break;	1381	break;
1470	}	1382	}
1471	#else /* __QNX__ uses qnxspawn () */
1472	fchmod (pty.tty, 0622);
1473	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1474	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1475
1476	if (run_child (argv) == -1)
1477	exit (EXIT_FAILURE);
1478	#endif
1479	}	1383	}
1480		1384
1481	/* ------------------------------------------------------------------------- *	1385	/* ------------------------------------------------------------------------- *
1482	* CHILD PROCESS OPERATIONS *	1386	* CHILD PROCESS OPERATIONS *
1483	* ------------------------------------------------------------------------- */	1387	* ------------------------------------------------------------------------- */
…		…
1527	// unblock signals (signals are blocked by iom.C	1431	// unblock signals (signals are blocked by iom.C
1528	sigset_t ss;	1432	sigset_t ss;
1529	sigemptyset (&ss);	1433	sigemptyset (&ss);
1530	sigprocmask (SIG_SETMASK, &ss, 0);	1434	sigprocmask (SIG_SETMASK, &ss, 0);
1531		1435
1532	#ifndef __QNX__
1533	/* command interpreter path */	1436	/* command interpreter path */
1534	if (argv != NULL)	1437	if (argv != NULL)
1535	{	1438	{
1536	# ifdef DEBUG_CMD	1439	# ifdef DEBUG_CMD
1537	int i;	1440	int i;
…		…
1563		1466
1564	execlp (shell, argv0, NULL);	1467	execlp (shell, argv0, NULL);
1565	/* no error message: STDERR is closed! */	1468	/* no error message: STDERR is closed! */
1566	}	1469	}
1567		1470
1568	#else /* __QNX__ uses qnxspawn () */
1569
1570	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1571	char *command = NULL, fullcommand[_MAX_PATH];
1572	char *arg_v, arg_a[2] = { NULL, NULL };
1573
1574	if (argv != NULL)
1575	{
1576	if (access (argv[0], X_OK) == -1)
1577	{
1578	if (strchr (argv[0], '/') == NULL)
1579	{
1580	searchenv (argv[0], "PATH", fullcommand);
1581
1582	if (fullcommand[0] != '\0')
1583	command = fullcommand;
1584	}
1585
1586	if (access (command, X_OK) == -1)
1587	return -1;
1588	}
1589	else
1590	command = argv[0];
1591
1592	arg_v = argv;
1593	}
1594	else
1595	{
1596	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1597	command = "/bin/sh";
1598
1599	arg_a[0] = my_basename (command);
1600
1601	if (OPTION (Opt_loginShell))
1602	{
1603	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1604
1605	login[0] = '-';
1606	strcpy (&login[1], arg_a[0]);
1607	arg_a[0] = login;
1608	}
1609
1610	arg_v = arg_a;
1611	}
1612
1613	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1614	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1615	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1616	command, arg_v, environ, iov_a, 0);
1617	if (login)
1618	free (login);
1619
1620	pty.close_tty ();
1621	return pty.pty;
1622	#endif
1623
1624	return -1;	1471	return -1;
1625	}	1472	}
1626		1473
1627	/----------------------- end-of-file (C source) -----------------------/	1474	/----------------------- 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.143 by root, Mon Jan 16 15:00:20 2006 UTC vs. Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.143 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC