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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.137 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.154 by root, Wed Jan 25 02:45:36 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
…		…
256	bgPixmap.pixmap = None;	214	bgPixmap.pixmap = None;
257	#endif	215	#endif
258		216
259	last_bot = last_state = -1;	217	last_bot = last_state = -1;
260		218
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;	219	return true;
269	}	220	}
270		221
271	void	222	void
272	rxvt_term::init_secondary ()	223	rxvt_term::init_secondary ()
…		…
339	rs[Rs_name] = rxvt_r_basename (argv[0]);	290	rs[Rs_name] = rxvt_r_basename (argv[0]);
340		291
341	/*	292	/*
342	* Open display, get options/resources and create the window	293	* Open display, get options/resources and create the window
343	*/	294	*/
344	{
345	TEMP_ENV;
346		295
347	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	296	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348	rs[Rs_display_name] = ":0";	297	rs[Rs_display_name] = ":0";
349		298
350	get_options (r_argc, r_argv);	299	get_options (r_argc, r_argv);
351		300
352	if (!(display = displays.get (rs[Rs_display_name])))	301	if (!(display = displays.get (rs[Rs_display_name])))
353	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	302	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354	}
355		303
356	extract_resources ();	304	extract_resources ();
		305
357	free (r_argv);	306	free (r_argv);
		307
		308	#if ENABLE_PERL
		309	if (!rs[Rs_perl_ext_1])
		310	rs[Rs_perl_ext_1] = "default";
		311
		312	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		313	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		314	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		315	{
		316	rxvt_perl.init (this);
		317	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		318	}
		319	#endif
358		320
359	/*	321	/*
360	* set any defaults not already set	322	* set any defaults not already set
361	*/	323	*/
362	if (cmd_argv && cmd_argv[0])	324	if (cmd_argv && cmd_argv[0])
…		…
580	* This should support all European type languages.	542	* This should support all European type languages.
581	*/	543	*/
582	void	544	void
583	rxvt_term::set_locale (const char *locale)	545	rxvt_term::set_locale (const char *locale)
584	{	546	{
585	TEMP_ENV;	547	set_environ (envv);
586		548
587	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	549	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
588	free (this->locale);	550	free (this->locale);
589	this->locale = setlocale (LC_CTYPE, locale);	551	this->locale = setlocale (LC_CTYPE, locale);
590		552
…		…
621	}	583	}
622		584
623	void	585	void
624	rxvt_term::init_xlocale ()	586	rxvt_term::init_xlocale ()
625	{	587	{
626	TEMP_ENV;	588	set_environ (envv);
627		589
628	#ifdef USE_XIM	590	#ifdef USE_XIM
629	if (!locale)	591	if (!locale)
630	rxvt_warn ("setting locale failed, working without locale support.\n");	592	rxvt_warn ("setting locale failed, working without locale support.\n");
631	else	593	else
…		…
672	if (strcmp (key_backspace, "DEC") == 0)	634	if (strcmp (key_backspace, "DEC") == 0)
673	priv_modes \|= PrivMode_HaveBackSpace;	635	priv_modes \|= PrivMode_HaveBackSpace;
674	#endif	636	#endif
675		637
676	/* add value for scrollBar */	638	/* add value for scrollBar */
677	if (scrollbar_visible ())	639	if (scrollBar.state)
678	{	640	{
679	priv_modes \|= PrivMode_scrollBar;	641	priv_modes \|= PrivMode_scrollBar;
680	SavedModes \|= PrivMode_scrollBar;	642	SavedModes \|= PrivMode_scrollBar;
681	}
682
683	if (menubar_visible ())
684	{
685	priv_modes \|= PrivMode_menuBar;
686	SavedModes \|= PrivMode_menuBar;
687	}	643	}
688		644
689	run_command (argv);	645	run_command (argv);
690	}	646	}
691		647
…		…
759	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	715	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
760	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	716	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
761	}	717	}
762		718
763	/*	719	/*
764	* get scrollBar/menuBar shadow colors	720	* get scrollBar shadow colors
765	*	721	*
766	* The calculations of topShadow/bottomShadow values are adapted	722	* The calculations of topShadow/bottomShadow values are adapted
767	* from the fvwm window manager.	723	* from the fvwm window manager.
768	*/	724	*/
769	#ifdef KEEP_SCROLLCOLOR	725	#ifdef KEEP_SCROLLCOLOR
…		…
920	rxvt_term::create_windows (int argc, const char const argv)	876	rxvt_term::create_windows (int argc, const char const argv)
921	{	877	{
922	XClassHint classHint;	878	XClassHint classHint;
923	XWMHints wmHint;	879	XWMHints wmHint;
924	#if ENABLE_FRILLS	880	#if ENABLE_FRILLS
925	Atom prop = None;
926	MWMHints mwmhints;	881	MWMHints mwmhints;
927	#endif	882	#endif
928	XGCValues gcvalue;	883	XGCValues gcvalue;
929	long vt_emask;
930	XSetWindowAttributes attributes;	884	XSetWindowAttributes attributes;
931	XWindowAttributes gattr;
932	Window top, parent;	885	Window top, parent;
933	dDisp;	886	dDisp;
934		887
935	#ifdef USING_W11LIB	888	xa = display->xa;
936	/* enable W11 callbacks */
937	W11AddEventHandler (disp, rxvt_W11_process_x_event);
938	#endif
939		889
940	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	890	/* grab colors before netscape does */
941	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	891	Get_Colours ();
942		892
943	if (OPTION (Opt_transparent))	893	if (!set_fonts ())
944	{	894	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	895
946	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	896	parent = display->root;
947	}	897
		898	attributes.override_redirect = !!OPTION (Opt_override_redirect);
948		899
949	#if ENABLE_FRILLS	900	#if ENABLE_FRILLS
950	if (OPTION (Opt_borderLess))	901	if (OPTION (Opt_borderLess))
951	{	902	{
952	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	903	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
953
954	if (prop == None)
955	{	904	{
956	/* 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");*/
957	#ifdef PREFER_24BIT
958	attributes.override_redirect = TRUE;	906	attributes.override_redirect = TRUE;
959	#endif
960	mwmhints.flags = 0;	907	mwmhints.flags = 0;
961	}	908	}
962	else	909	else
963	{	910	{
964	mwmhints.flags = MWM_HINTS_DECORATIONS;	911	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
967	}	914	}
968	else	915	else
969	mwmhints.flags = 0;	916	mwmhints.flags = 0;
970	#endif	917	#endif
971		918
972	/* grab colors before netscape does */
973	Get_Colours ();
974
975	if (!set_fonts ())
976	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978	parent = DefaultRootWindow (disp);
979
980	#if ENABLE_XEMBED	919	#if ENABLE_XEMBED
981	if (rs[Rs_embed])	920	if (rs[Rs_embed])
982	{	921	{
983	XWindowAttributes wattr;	922	XWindowAttributes wattr;
984		923
…		…
992	#endif	931	#endif
993		932
994	window_calc (0, 0);	933	window_calc (0, 0);
995		934
996	/* sub-window placement & size in rxvt_resize_subwindows () */	935	/* sub-window placement & size in rxvt_resize_subwindows () */
997	#ifdef PREFER_24BIT
998	attributes.background_pixel = pix_colors_focused[Color_border];	936	attributes.background_pixel = pix_colors_focused[Color_border];
999	attributes.border_pixel = pix_colors_focused[Color_border];	937	attributes.border_pixel = pix_colors_focused[Color_border];
1000	attributes.colormap = display->cmap;	938	attributes.colormap = display->cmap;
		939
1001	top = XCreateWindow (disp, parent,	940	top = XCreateWindow (disp, parent,
1002	szHint.x, szHint.y,	941	szHint.x, szHint.y,
1003	szHint.width, szHint.height,	942	szHint.width, szHint.height,
1004	ext_bwidth,	943	ext_bwidth,
1005	display->depth, InputOutput,	944	display->depth, InputOutput,
1006	display->visual,	945	display->visual,
1007	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	946	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1008	#else	947	&attributes);
1009	top = XCreateSimpleWindow (disp, parent,
1010	szHint.x, szHint.y,
1011	szHint.width, szHint.height,
1012	ext_bwidth,
1013	pix_colors_focused[Color_border],
1014	pix_colors_focused[Color_border]);
1015	#endif
1016		948
1017	this->parent[0] = top;	949	this->parent[0] = top;
1018		950
1019	old_width = szHint.width;	951	old_width = szHint.width;
1020	old_height = szHint.height;	952	old_height = szHint.height;
1021		953
1022	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	954	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1023	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	955	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1024		956
1025	classHint.res_name = (char *)rs[Rs_name];	957	classHint.res_name = (char *)rs[Rs_name];
1026	classHint.res_class = (char *)RESCLASS;	958	classHint.res_class = (char *)RESCLASS;
1027		959
1028	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	960	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1029	wmHint.input = True;	961	wmHint.input = True;
1030	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	962	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031	wmHint.window_group = top;	963	wmHint.window_group = top;
1032		964
1033	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	965	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1034	&szHint, &wmHint, &classHint);	966	&szHint, &wmHint, &classHint);
		967
		968	#if ENABLE_FRILLS
		969	if (mwmhints.flags)
		970	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		971	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		972	#endif
1035		973
1036	Atom protocols[] = {	974	Atom protocols[] = {
1037	xa[XA_WM_DELETE_WINDOW],	975	xa[XA_WM_DELETE_WINDOW],
1038	#if ENABLE_EWMH	976	#if ENABLE_EWMH
1039	xa[XA_NET_WM_PING],	977	xa[XA_NET_WM_PING],
…		…
1065	\| FocusChangeMask \| VisibilityChangeMask	1003	\| FocusChangeMask \| VisibilityChangeMask
1066	\| ExposureMask \| StructureNotifyMask);	1004	\| ExposureMask \| StructureNotifyMask);
1067		1005
1068	termwin_ev.start (display, top);	1006	termwin_ev.start (display, top);
1069		1007
1070	#if ENABLE_FRILLS
1071	if (mwmhints.flags)
1072	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1073	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1074	#endif
1075
1076	/* vt cursor: Black-on-White is standard, but this is more popular */	1008	/* vt cursor: Black-on-White is standard, but this is more popular */
1077	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1009	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1078		1010
1079	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1011	#ifdef HAVE_SCROLLBARS
1080	/* cursor (menuBar/scrollBar): Black-on-White */	1012	/* cursor scrollBar: Black-on-White */
1081	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1013	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1082	#endif	1014	#endif
1083		1015
1084	/* the vt window */	1016	/* the vt window */
1085	vt = XCreateSimpleWindow (disp, top,	1017	vt = XCreateSimpleWindow (disp, top,
1086	window_vt_x,
1087	window_vt_y,	1018	window_vt_x, window_vt_y,
1088	width,
1089	height,	1019	width, height,
1090	0,	1020	0,
1091	pix_colors_focused[Color_fg],	1021	pix_colors_focused[Color_fg],
1092	pix_colors_focused[Color_bg]);	1022	pix_colors_focused[Color_bg]);
1093	#ifdef DEBUG_X
1094	XStoreName (disp, vt, "vt window");
1095	#endif
1096		1023
1097	attributes.bit_gravity = NorthWestGravity;	1024	attributes.bit_gravity = NorthWestGravity;
1098	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1025	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1099		1026
1100	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1027	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1101		1028
1102	if (OPTION (Opt_pointerBlank)	1029	if (OPTION (Opt_pointerBlank))
1103	#ifdef ENABLE_PERL
1104	\|\| perl.self
1105	#endif
1106	)
1107	vt_emask \|= PointerMotionMask;	1030	vt_emask \|= PointerMotionMask;
1108	else	1031	else
1109	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1032	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1110		1033
1111	XSelectInput (disp, vt, vt_emask);	1034	vt_select_input ();
		1035
1112	vt_ev.start (display, vt);	1036	vt_ev.start (display, vt);
1113
1114	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1115	if (menuBar_height ())
1116	{
1117	menuBar.win = XCreateSimpleWindow (disp, top,
1118	window_vt_x, 0,
1119	width,
1120	menuBar_TotalHeight (),
1121	0,
1122	pix_colors_focused[Color_fg],
1123	pix_colors_focused[Color_scroll]);
1124
1125	#ifdef DEBUG_X
1126	XStoreName (disp, menuBar.win, "menubar");
1127	#endif
1128
1129	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1130
1131	XDefineCursor (disp, menuBar.win,
1132	XCreateFontCursor (disp, XC_left_ptr));
1133
1134	XSelectInput (disp, menuBar.win,
1135	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1136	menubar_ev.start (display, menuBar.win);
1137	}
1138	#endif
1139		1037
1140	#ifdef XPM_BACKGROUND	1038	#ifdef XPM_BACKGROUND
1141	if (rs[Rs_backgroundPixmap] != NULL	1039	if (rs[Rs_backgroundPixmap] != NULL
1142	&& ! OPTION (Opt_transparent))	1040	&& !OPTION (Opt_transparent))
1143	{	1041	{
1144	const char *p = rs[Rs_backgroundPixmap];	1042	const char *p = rs[Rs_backgroundPixmap];
1145		1043
1146	if ((p = strchr (p, ';')) != NULL)	1044	if ((p = strchr (p, ';')) != NULL)
1147	{	1045	{
…		…
1153	scr_touch (true);	1051	scr_touch (true);
1154	}	1052	}
1155	#endif	1053	#endif
1156		1054
1157	/* graphics context for the vt window */	1055	/* graphics context for the vt window */
1158	gcvalue.foreground = pix_colors[Color_fg];	1056	gcvalue.foreground = pix_colors[Color_fg];
1159	gcvalue.background = pix_colors[Color_bg];	1057	gcvalue.background = pix_colors[Color_bg];
1160	gcvalue.graphics_exposures = 1;	1058	gcvalue.graphics_exposures = 1;
		1059
1161	gc = XCreateGC (disp, vt,	1060	gc = XCreateGC (disp, vt,
1162	GCForeground \| GCBackground \| GCGraphicsExposures,	1061	GCForeground \| GCBackground \| GCGraphicsExposures,
1163	&gcvalue);	1062	&gcvalue);
1164		1063
1165	drawable = new rxvt_drawable (display, vt);	1064	drawable = new rxvt_drawable (display, vt);
1166		1065
1167	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1066	#ifdef RXVT_SCROLLBAR
1168	gcvalue.foreground = pix_colors[Color_topShadow];	1067	gcvalue.foreground = pix_colors[Color_topShadow];
1169	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1068	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170	gcvalue.foreground = pix_colors[Color_bottomShadow];	1069	gcvalue.foreground = pix_colors[Color_bottomShadow];
1171	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1070	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1172	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1071	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
…		…
1179	pix_colors = pix_colors_unfocused;	1078	pix_colors = pix_colors_unfocused;
1180	#endif	1079	#endif
1181		1080
1182	pointer_unblank ();	1081	pointer_unblank ();
1183	scr_recolour ();	1082	scr_recolour ();
1184
1185	#if ENABLE_XEMBED
1186	if (rs[Rs_embed])
1187	{
1188	long info[2] = { 0, XEMBED_MAPPED };
1189
1190	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1191	32, PropModeReplace, (unsigned char *)&info, 2);
1192	}
1193	#endif
1194	}	1083	}
1195		1084
1196	/* ------------------------------------------------------------------------- *	1085	/* ------------------------------------------------------------------------- *
1197	* GET TTY CURRENT STATE *	1086	* GET TTY CURRENT STATE *
1198	* ------------------------------------------------------------------------- */	1087	* ------------------------------------------------------------------------- */
…		…
1415	rxvt_term::run_command (const char const argv)	1304	rxvt_term::run_command (const char const argv)
1416	{	1305	{
1417	#if ENABLE_FRILLS	1306	#if ENABLE_FRILLS
1418	if (rs[Rs_pty_fd])	1307	if (rs[Rs_pty_fd])
1419	{	1308	{
1420	pty.pty = atoi (rs[Rs_pty_fd]);	1309	pty->pty = atoi (rs[Rs_pty_fd]);
1421		1310
1422	if (pty.pty >= 0)	1311	if (pty->pty >= 0)
1423	{	1312	{
1424	if (getfd_hook)	1313	if (getfd_hook)
1425	pty.pty = (*getfd_hook) (pty.pty);	1314	pty->pty = (*getfd_hook) (pty->pty);
1426		1315
1427	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1316	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1428	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1317	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1429	}	1318	}
1430	}	1319	}
1431	else	1320	else
1432	#endif	1321	#endif
1433	if (!pty.get ())	1322	if (!pty->get ())
1434	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1323	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1435		1324
1436	pty.set_utf8_mode (enc_utf8);	1325	pty->set_utf8_mode (enc_utf8);
1437		1326
1438	/* set initial window size */	1327	/* set initial window size */
1439	tt_winch ();	1328	tt_winch ();
1440		1329
1441	int er;	1330	int er;
…		…
1454	#if ENABLE_FRILLS	1343	#if ENABLE_FRILLS
1455	if (rs[Rs_pty_fd])	1344	if (rs[Rs_pty_fd])
1456	return;	1345	return;
1457	#endif	1346	#endif
1458		1347
1459	#ifndef __QNX__
1460	/* spin off the command interpreter */	1348	/* spin off the command interpreter */
1461	switch (cmd_pid = fork ())	1349	switch (cmd_pid = fork ())
1462	{	1350	{
1463	case -1:	1351	case -1:
1464	{	1352	{
…		…
1466	rxvt_fatal ("can't fork, aborting.\n");	1354	rxvt_fatal ("can't fork, aborting.\n");
1467	}	1355	}
1468	case 0:	1356	case 0:
1469	init_env ();	1357	init_env ();
1470		1358
1471	if (!pty.make_controlling_tty ())	1359	if (!pty->make_controlling_tty ())
1472	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1360	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1473	else	1361	else
1474	{	1362	{
1475	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1363	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1476	dup2 (pty.tty, STDIN_FILENO);	1364	dup2 (pty->tty, STDIN_FILENO);
1477	dup2 (pty.tty, STDOUT_FILENO);	1365	dup2 (pty->tty, STDOUT_FILENO);
1478	dup2 (pty.tty, STDERR_FILENO);	1366	dup2 (pty->tty, STDERR_FILENO);
1479		1367
1480	// close all our file handles that we do no longer need	1368	// close all our file handles that we do no longer need
1481	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1369	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1482	{	1370	{
1483	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1371	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1484	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1372	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1485	}	1373	}
1486		1374
1487	run_child (argv);	1375	run_child (argv);
1488	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1376	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1489	}	1377	}
1490		1378
1491	_exit (EXIT_FAILURE);	1379	_exit (EXIT_FAILURE);
1492		1380
1493	default:	1381	default:
1494	{	1382	if (!OPTION (Opt_utmpInhibit))
1495	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1383	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1496	int fdstdin;
1497		1384
1498	fdstdin = dup (STDIN_FILENO);	1385	pty->close_tty ();
1499	dup2 (pty.tty, STDIN_FILENO);
1500	#endif
1501		1386
1502	#ifdef UTMP_SUPPORT	1387	child_ev.start (cmd_pid);
1503	privileged_utmp (SAVE);
1504	#endif
1505		1388
1506	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1389	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1507
1508	dup2 (fdstdin, STDIN_FILENO);
1509	close (fdstdin);
1510	#endif
1511	}
1512
1513	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1514	break;	1390	break;
1515	}	1391	}
1516	#else /* __QNX__ uses qnxspawn () */
1517	fchmod (pty.tty, 0622);
1518	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1519	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1520
1521	if (run_child (argv) == -1)
1522	exit (EXIT_FAILURE);
1523	#endif
1524	}	1392	}
1525		1393
1526	/* ------------------------------------------------------------------------- *	1394	/* ------------------------------------------------------------------------- *
1527	* CHILD PROCESS OPERATIONS *	1395	* CHILD PROCESS OPERATIONS *
1528	* ------------------------------------------------------------------------- */	1396	* ------------------------------------------------------------------------- */
…		…
1532	*/	1400	*/
1533	int	1401	int
1534	rxvt_term::run_child (const char const argv)	1402	rxvt_term::run_child (const char const argv)
1535	{	1403	{
1536	char *login;	1404	char *login;
1537
1538	TEMP_ENV; // not very temporary...
1539		1405
1540	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1406	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541		1407
1542	if (OPTION (Opt_console))	1408	if (OPTION (Opt_console))
1543	{ /* be virtual console, fail silently */	1409	{ /* be virtual console, fail silently */
…		…
1574	// unblock signals (signals are blocked by iom.C	1440	// unblock signals (signals are blocked by iom.C
1575	sigset_t ss;	1441	sigset_t ss;
1576	sigemptyset (&ss);	1442	sigemptyset (&ss);
1577	sigprocmask (SIG_SETMASK, &ss, 0);	1443	sigprocmask (SIG_SETMASK, &ss, 0);
1578		1444
1579	#ifndef __QNX__
1580	/* command interpreter path */	1445	/* command interpreter path */
1581	if (argv != NULL)	1446	if (argv != NULL)
1582	{	1447	{
1583	# ifdef DEBUG_CMD	1448	# ifdef DEBUG_CMD
1584	int i;	1449	int i;
…		…
1610		1475
1611	execlp (shell, argv0, NULL);	1476	execlp (shell, argv0, NULL);
1612	/* no error message: STDERR is closed! */	1477	/* no error message: STDERR is closed! */
1613	}	1478	}
1614		1479
1615	#else /* __QNX__ uses qnxspawn () */
1616
1617	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1618	char *command = NULL, fullcommand[_MAX_PATH];
1619	char *arg_v, arg_a[2] = { NULL, NULL };
1620
1621	if (argv != NULL)
1622	{
1623	if (access (argv[0], X_OK) == -1)
1624	{
1625	if (strchr (argv[0], '/') == NULL)
1626	{
1627	searchenv (argv[0], "PATH", fullcommand);
1628
1629	if (fullcommand[0] != '\0')
1630	command = fullcommand;
1631	}
1632
1633	if (access (command, X_OK) == -1)
1634	return -1;
1635	}
1636	else
1637	command = argv[0];
1638
1639	arg_v = argv;
1640	}
1641	else
1642	{
1643	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1644	command = "/bin/sh";
1645
1646	arg_a[0] = my_basename (command);
1647
1648	if (OPTION (Opt_loginShell))
1649	{
1650	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1651
1652	login[0] = '-';
1653	strcpy (&login[1], arg_a[0]);
1654	arg_a[0] = login;
1655	}
1656
1657	arg_v = arg_a;
1658	}
1659
1660	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1661	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1662	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1663	command, arg_v, environ, iov_a, 0);
1664	if (login)
1665	free (login);
1666
1667	pty.close_tty ();
1668	return pty.pty;
1669	#endif
1670
1671	return -1;	1480	return -1;
1672	}	1481	}
1673		1482
1674	/----------------------- end-of-file (C source) -----------------------/	1483	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.137 by root, Wed Jan 11 00:59:58 2006 UTC vs. Revision 1.154 by root, Wed Jan 25 02:45:36 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.137 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.154 by root, Wed Jan 25 02:45:36 2006 UTC