[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.153 by root, Wed Jan 25 02:42:06 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	{
221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	182	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222	#ifdef OFF_FOCUS_FADING	183	#ifdef OFF_FOCUS_FADING
…		…
256	bgPixmap.pixmap = None;	217	bgPixmap.pixmap = None;
257	#endif	218	#endif
258		219
259	last_bot = last_state = -1;	220	last_bot = last_state = -1;
260		221
261	#ifdef MENUBAR
262	menu_readonly = 1;
263	# if ! (MENUBAR_MAX > 1)
264	CurrentBar = &BarList;
265	# endif /* (MENUBAR_MAX > 1) */
266	#endif
267
268	return true;	222	return true;
269	}	223	}
270		224
271	void	225	void
272	rxvt_term::init_secondary ()	226	rxvt_term::init_secondary ()
…		…
351	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	305	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
352		306
353	extract_resources ();	307	extract_resources ();
354		308
355	free (r_argv);	309	free (r_argv);
		310
		311	#if ENABLE_PERL
		312	if (!rs[Rs_perl_ext_1])
		313	rs[Rs_perl_ext_1] = "default";
		314
		315	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		316	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		317	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		318	{
		319	rxvt_perl.init (this);
		320	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		321	}
		322	#endif
356		323
357	/*	324	/*
358	* set any defaults not already set	325	* set any defaults not already set
359	*/	326	*/
360	if (cmd_argv && cmd_argv[0])	327	if (cmd_argv && cmd_argv[0])
…		…
670	if (strcmp (key_backspace, "DEC") == 0)	637	if (strcmp (key_backspace, "DEC") == 0)
671	priv_modes \|= PrivMode_HaveBackSpace;	638	priv_modes \|= PrivMode_HaveBackSpace;
672	#endif	639	#endif
673		640
674	/* add value for scrollBar */	641	/* add value for scrollBar */
675	if (scrollbar_visible ())	642	if (scrollBar.state)
676	{	643	{
677	priv_modes \|= PrivMode_scrollBar;	644	priv_modes \|= PrivMode_scrollBar;
678	SavedModes \|= PrivMode_scrollBar;	645	SavedModes \|= PrivMode_scrollBar;
679	}
680
681	if (menubar_visible ())
682	{
683	priv_modes \|= PrivMode_menuBar;
684	SavedModes \|= PrivMode_menuBar;
685	}	646	}
686		647
687	run_command (argv);	648	run_command (argv);
688	}	649	}
689		650
…		…
757	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	718	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	719	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759	}	720	}
760		721
761	/*	722	/*
762	* get scrollBar/menuBar shadow colors	723	* get scrollBar shadow colors
763	*	724	*
764	* The calculations of topShadow/bottomShadow values are adapted	725	* The calculations of topShadow/bottomShadow values are adapted
765	* from the fvwm window manager.	726	* from the fvwm window manager.
766	*/	727	*/
767	#ifdef KEEP_SCROLLCOLOR	728	#ifdef KEEP_SCROLLCOLOR
…		…
918	rxvt_term::create_windows (int argc, const char const argv)	879	rxvt_term::create_windows (int argc, const char const argv)
919	{	880	{
920	XClassHint classHint;	881	XClassHint classHint;
921	XWMHints wmHint;	882	XWMHints wmHint;
922	#if ENABLE_FRILLS	883	#if ENABLE_FRILLS
923	Atom prop = None;
924	MWMHints mwmhints;	884	MWMHints mwmhints;
925	#endif	885	#endif
926	XGCValues gcvalue;	886	XGCValues gcvalue;
927	long vt_emask;
928	XSetWindowAttributes attributes;	887	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;
930	Window top, parent;	888	Window top, parent;
931	dDisp;	889	dDisp;
932		890
933	#ifdef USING_W11LIB	891	xa = display->xa;
934	/* enable W11 callbacks */
935	W11AddEventHandler (disp, rxvt_W11_process_x_event);
936	#endif
937		892
938	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	893	/* grab colors before netscape does */
939	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	894	Get_Colours ();
940		895
941	if (OPTION (Opt_transparent))	896	if (!set_fonts ())
942	{	897	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
943	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	898
944	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	899	parent = display->root;
945	}	900
		901	attributes.override_redirect = !!OPTION (Opt_override_redirect);
946		902
947	#if ENABLE_FRILLS	903	#if ENABLE_FRILLS
948	if (OPTION (Opt_borderLess))	904	if (OPTION (Opt_borderLess))
949	{	905	{
950	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	906	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
951
952	if (prop == None)
953	{	907	{
954	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	908	/* 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;	909	attributes.override_redirect = TRUE;
957	#endif
958	mwmhints.flags = 0;	910	mwmhints.flags = 0;
959	}	911	}
960	else	912	else
961	{	913	{
962	mwmhints.flags = MWM_HINTS_DECORATIONS;	914	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
965	}	917	}
966	else	918	else
967	mwmhints.flags = 0;	919	mwmhints.flags = 0;
968	#endif	920	#endif
969		921
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	922	#if ENABLE_XEMBED
979	if (rs[Rs_embed])	923	if (rs[Rs_embed])
980	{	924	{
981	XWindowAttributes wattr;	925	XWindowAttributes wattr;
982		926
…		…
990	#endif	934	#endif
991		935
992	window_calc (0, 0);	936	window_calc (0, 0);
993		937
994	/* sub-window placement & size in rxvt_resize_subwindows () */	938	/* sub-window placement & size in rxvt_resize_subwindows () */
995	#ifdef PREFER_24BIT
996	attributes.background_pixel = pix_colors_focused[Color_border];	939	attributes.background_pixel = pix_colors_focused[Color_border];
997	attributes.border_pixel = pix_colors_focused[Color_border];	940	attributes.border_pixel = pix_colors_focused[Color_border];
998	attributes.colormap = display->cmap;	941	attributes.colormap = display->cmap;
		942
999	top = XCreateWindow (disp, parent,	943	top = XCreateWindow (disp, parent,
1000	szHint.x, szHint.y,	944	szHint.x, szHint.y,
1001	szHint.width, szHint.height,	945	szHint.width, szHint.height,
1002	ext_bwidth,	946	ext_bwidth,
1003	display->depth, InputOutput,	947	display->depth, InputOutput,
1004	display->visual,	948	display->visual,
1005	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	949	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1006	#else	950	&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		951
1015	this->parent[0] = top;	952	this->parent[0] = top;
1016		953
1017	old_width = szHint.width;	954	old_width = szHint.width;
1018	old_height = szHint.height;	955	old_height = szHint.height;
1019		956
1020	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	957	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1021	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	958	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1022		959
1023	classHint.res_name = (char *)rs[Rs_name];	960	classHint.res_name = (char *)rs[Rs_name];
1024	classHint.res_class = (char *)RESCLASS;	961	classHint.res_class = (char *)RESCLASS;
1025		962
1026	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	963	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1027	wmHint.input = True;	964	wmHint.input = True;
1028	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	965	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1029	wmHint.window_group = top;	966	wmHint.window_group = top;
1030		967
1031	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	968	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1032	&szHint, &wmHint, &classHint);	969	&szHint, &wmHint, &classHint);
		970
		971	#if ENABLE_FRILLS
		972	if (mwmhints.flags)
		973	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		974	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		975	#endif
1033		976
1034	Atom protocols[] = {	977	Atom protocols[] = {
1035	xa[XA_WM_DELETE_WINDOW],	978	xa[XA_WM_DELETE_WINDOW],
1036	#if ENABLE_EWMH	979	#if ENABLE_EWMH
1037	xa[XA_NET_WM_PING],	980	xa[XA_NET_WM_PING],
…		…
1063	\| FocusChangeMask \| VisibilityChangeMask	1006	\| FocusChangeMask \| VisibilityChangeMask
1064	\| ExposureMask \| StructureNotifyMask);	1007	\| ExposureMask \| StructureNotifyMask);
1065		1008
1066	termwin_ev.start (display, top);	1009	termwin_ev.start (display, top);
1067		1010
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 */	1011	/* vt cursor: Black-on-White is standard, but this is more popular */
1075	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1012	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1076		1013
1077	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1014	#ifdef HAVE_SCROLLBARS
1078	/* cursor (menuBar/scrollBar): Black-on-White */	1015	/* cursor scrollBar: Black-on-White */
1079	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1016	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1080	#endif	1017	#endif
1081		1018
1082	/* the vt window */	1019	/* the vt window */
1083	vt = XCreateSimpleWindow (disp, top,	1020	vt = XCreateSimpleWindow (disp, top,
1084	window_vt_x,
1085	window_vt_y,	1021	window_vt_x, window_vt_y,
1086	width,
1087	height,	1022	width, height,
1088	0,	1023	0,
1089	pix_colors_focused[Color_fg],	1024	pix_colors_focused[Color_fg],
1090	pix_colors_focused[Color_bg]);	1025	pix_colors_focused[Color_bg]);
1091	#ifdef DEBUG_X
1092	XStoreName (disp, vt, "vt window");
1093	#endif
1094		1026
1095	attributes.bit_gravity = NorthWestGravity;	1027	attributes.bit_gravity = NorthWestGravity;
1096	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1028	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1097		1029
1098	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1030	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1099		1031
1100	if (OPTION (Opt_pointerBlank)	1032	if (OPTION (Opt_pointerBlank))
1101	#ifdef ENABLE_PERL
1102	\|\| perl.self
1103	#endif
1104	)
1105	vt_emask \|= PointerMotionMask;	1033	vt_emask \|= PointerMotionMask;
1106	else	1034	else
1107	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1035	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1108		1036
1109	XSelectInput (disp, vt, vt_emask);	1037	vt_select_input ();
		1038
1110	vt_ev.start (display, vt);	1039	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		1040
1138	#ifdef XPM_BACKGROUND	1041	#ifdef XPM_BACKGROUND
1139	if (rs[Rs_backgroundPixmap] != NULL	1042	if (rs[Rs_backgroundPixmap] != NULL
1140	&& ! OPTION (Opt_transparent))	1043	&& ! OPTION (Opt_transparent))
1141	{	1044	{
…		…
1151	scr_touch (true);	1054	scr_touch (true);
1152	}	1055	}
1153	#endif	1056	#endif
1154		1057
1155	/* graphics context for the vt window */	1058	/* graphics context for the vt window */
1156	gcvalue.foreground = pix_colors[Color_fg];	1059	gcvalue.foreground = pix_colors[Color_fg];
1157	gcvalue.background = pix_colors[Color_bg];	1060	gcvalue.background = pix_colors[Color_bg];
1158	gcvalue.graphics_exposures = 1;	1061	gcvalue.graphics_exposures = 1;
		1062
1159	gc = XCreateGC (disp, vt,	1063	gc = XCreateGC (disp, vt,
1160	GCForeground \| GCBackground \| GCGraphicsExposures,	1064	GCForeground \| GCBackground \| GCGraphicsExposures,
1161	&gcvalue);	1065	&gcvalue);
1162		1066
1163	drawable = new rxvt_drawable (display, vt);	1067	drawable = new rxvt_drawable (display, vt);
1164		1068
1165	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1069	#ifdef RXVT_SCROLLBAR
1166	gcvalue.foreground = pix_colors[Color_topShadow];	1070	gcvalue.foreground = pix_colors[Color_topShadow];
1167	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1071	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1168	gcvalue.foreground = pix_colors[Color_bottomShadow];	1072	gcvalue.foreground = pix_colors[Color_bottomShadow];
1169	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1073	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1074	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
…		…
1177	pix_colors = pix_colors_unfocused;	1081	pix_colors = pix_colors_unfocused;
1178	#endif	1082	#endif
1179		1083
1180	pointer_unblank ();	1084	pointer_unblank ();
1181	scr_recolour ();	1085	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	}	1086	}
1193		1087
1194	/* ------------------------------------------------------------------------- *	1088	/* ------------------------------------------------------------------------- *
1195	* GET TTY CURRENT STATE *	1089	* GET TTY CURRENT STATE *
1196	* ------------------------------------------------------------------------- */	1090	* ------------------------------------------------------------------------- */
…		…
1413	rxvt_term::run_command (const char const argv)	1307	rxvt_term::run_command (const char const argv)
1414	{	1308	{
1415	#if ENABLE_FRILLS	1309	#if ENABLE_FRILLS
1416	if (rs[Rs_pty_fd])	1310	if (rs[Rs_pty_fd])
1417	{	1311	{
1418	pty.pty = atoi (rs[Rs_pty_fd]);	1312	pty->pty = atoi (rs[Rs_pty_fd]);
1419		1313
1420	if (pty.pty >= 0)	1314	if (pty->pty >= 0)
1421	{	1315	{
1422	if (getfd_hook)	1316	if (getfd_hook)
1423	pty.pty = (*getfd_hook) (pty.pty);	1317	pty->pty = (*getfd_hook) (pty->pty);
1424		1318
1425	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1319	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1426	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1320	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1427	}	1321	}
1428	}	1322	}
1429	else	1323	else
1430	#endif	1324	#endif
1431	if (!pty.get ())	1325	if (!pty->get ())
1432	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1326	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1433		1327
1434	pty.set_utf8_mode (enc_utf8);	1328	pty->set_utf8_mode (enc_utf8);
1435		1329
1436	/* set initial window size */	1330	/* set initial window size */
1437	tt_winch ();	1331	tt_winch ();
1438		1332
1439	int er;	1333	int er;
…		…
1452	#if ENABLE_FRILLS	1346	#if ENABLE_FRILLS
1453	if (rs[Rs_pty_fd])	1347	if (rs[Rs_pty_fd])
1454	return;	1348	return;
1455	#endif	1349	#endif
1456		1350
1457	#ifndef __QNX__
1458	/* spin off the command interpreter */	1351	/* spin off the command interpreter */
1459	switch (cmd_pid = fork ())	1352	switch (cmd_pid = fork ())
1460	{	1353	{
1461	case -1:	1354	case -1:
1462	{	1355	{
…		…
1464	rxvt_fatal ("can't fork, aborting.\n");	1357	rxvt_fatal ("can't fork, aborting.\n");
1465	}	1358	}
1466	case 0:	1359	case 0:
1467	init_env ();	1360	init_env ();
1468		1361
1469	if (!pty.make_controlling_tty ())	1362	if (!pty->make_controlling_tty ())
1470	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1363	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1471	else	1364	else
1472	{	1365	{
1473	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1366	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1474	dup2 (pty.tty, STDIN_FILENO);	1367	dup2 (pty->tty, STDIN_FILENO);
1475	dup2 (pty.tty, STDOUT_FILENO);	1368	dup2 (pty->tty, STDOUT_FILENO);
1476	dup2 (pty.tty, STDERR_FILENO);	1369	dup2 (pty->tty, STDERR_FILENO);
1477		1370
1478	// close all our file handles that we do no longer need	1371	// close all our file handles that we do no longer need
1479	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1372	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1480	{	1373	{
1481	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1374	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1482	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1375	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1483	}	1376	}
1484		1377
1485	run_child (argv);	1378	run_child (argv);
1486	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1379	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1487	}	1380	}
1488		1381
1489	_exit (EXIT_FAILURE);	1382	_exit (EXIT_FAILURE);
1490		1383
1491	default:	1384	default:
1492	{	1385	if (!OPTION (Opt_utmpInhibit))
1493	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1386	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1494	int fdstdin;
1495		1387
1496	fdstdin = dup (STDIN_FILENO);	1388	pty->close_tty ();
1497	dup2 (pty.tty, STDIN_FILENO);
1498	#endif
1499		1389
1500	#ifdef UTMP_SUPPORT	1390	child_ev.start (cmd_pid);
1501	privileged_utmp (SAVE);
1502	#endif
1503		1391
1504	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1392	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;	1393	break;
1513	}	1394	}
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	}	1395	}
1523		1396
1524	/* ------------------------------------------------------------------------- *	1397	/* ------------------------------------------------------------------------- *
1525	* CHILD PROCESS OPERATIONS *	1398	* CHILD PROCESS OPERATIONS *
1526	* ------------------------------------------------------------------------- */	1399	* ------------------------------------------------------------------------- */
…		…
1570	// unblock signals (signals are blocked by iom.C	1443	// unblock signals (signals are blocked by iom.C
1571	sigset_t ss;	1444	sigset_t ss;
1572	sigemptyset (&ss);	1445	sigemptyset (&ss);
1573	sigprocmask (SIG_SETMASK, &ss, 0);	1446	sigprocmask (SIG_SETMASK, &ss, 0);
1574		1447
1575	#ifndef __QNX__
1576	/* command interpreter path */	1448	/* command interpreter path */
1577	if (argv != NULL)	1449	if (argv != NULL)
1578	{	1450	{
1579	# ifdef DEBUG_CMD	1451	# ifdef DEBUG_CMD
1580	int i;	1452	int i;
…		…
1606		1478
1607	execlp (shell, argv0, NULL);	1479	execlp (shell, argv0, NULL);
1608	/* no error message: STDERR is closed! */	1480	/* no error message: STDERR is closed! */
1609	}	1481	}
1610		1482
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;	1483	return -1;
1668	}	1484	}
1669		1485
1670	/----------------------- end-of-file (C source) -----------------------/	1486	/----------------------- 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.153 by root, Wed Jan 25 02:42:06 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.153 by root, Wed Jan 25 02:42:06 2006 UTC