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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.142 by root, Fri Jan 13 04:59:04 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;
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
…		…
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
353	extract_resources ();	302	extract_resources ();
354		303
355	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
356		318
357	/*	319	/*
358	* set any defaults not already set	320	* set any defaults not already set
359	*/	321	*/
360	if (cmd_argv && cmd_argv[0])	322	if (cmd_argv && cmd_argv[0])
…		…
521	i = strlen (val);	483	i = strlen (val);
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	484	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		485
524	sprintf (env_display, "DISPLAY=%s", val);	486	sprintf (env_display, "DISPLAY=%s", val);
525		487
526	/* avoiding the math library:	488	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		489
536	/* add entries to the environment:	490	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	491	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	492	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	493	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
541	* @ TERMINFO: path to terminfo directory	495	* @ TERMINFO: path to terminfo directory
542	* @ COLORFGBG: fg;bg color codes	496	* @ COLORFGBG: fg;bg color codes
543	*/	497	*/
544	putenv (env_display);	498	putenv (env_display);
545	putenv (env_windowid);	499	putenv (env_windowid);
		500
546	if (env_colorfgbg)	501	if (env_colorfgbg)
547	putenv (env_colorfgbg);	502	putenv (env_colorfgbg);
548		503
549	#ifdef RXVT_TERMINFO	504	#ifdef RXVT_TERMINFO
550	putenv ("TERMINFO=" RXVT_TERMINFO);	505	putenv ("TERMINFO=" RXVT_TERMINFO);
…		…
670	if (strcmp (key_backspace, "DEC") == 0)	625	if (strcmp (key_backspace, "DEC") == 0)
671	priv_modes \|= PrivMode_HaveBackSpace;	626	priv_modes \|= PrivMode_HaveBackSpace;
672	#endif	627	#endif
673		628
674	/* add value for scrollBar */	629	/* add value for scrollBar */
675	if (scrollbar_visible ())	630	if (scrollBar.state)
676	{	631	{
677	priv_modes \|= PrivMode_scrollBar;	632	priv_modes \|= PrivMode_scrollBar;
678	SavedModes \|= PrivMode_scrollBar;	633	SavedModes \|= PrivMode_scrollBar;
679	}
680
681	if (menubar_visible ())
682	{
683	priv_modes \|= PrivMode_menuBar;
684	SavedModes \|= PrivMode_menuBar;
685	}	634	}
686		635
687	run_command (argv);	636	run_command (argv);
688	}	637	}
689		638
…		…
757	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	706	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];	707	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759	}	708	}
760		709
761	/*	710	/*
762	* get scrollBar/menuBar shadow colors	711	* get scrollBar shadow colors
763	*	712	*
764	* The calculations of topShadow/bottomShadow values are adapted	713	* The calculations of topShadow/bottomShadow values are adapted
765	* from the fvwm window manager.	714	* from the fvwm window manager.
766	*/	715	*/
767	#ifdef KEEP_SCROLLCOLOR	716	#ifdef KEEP_SCROLLCOLOR
…		…
918	rxvt_term::create_windows (int argc, const char const argv)	867	rxvt_term::create_windows (int argc, const char const argv)
919	{	868	{
920	XClassHint classHint;	869	XClassHint classHint;
921	XWMHints wmHint;	870	XWMHints wmHint;
922	#if ENABLE_FRILLS	871	#if ENABLE_FRILLS
923	Atom prop = None;
924	MWMHints mwmhints;	872	MWMHints mwmhints;
925	#endif	873	#endif
926	XGCValues gcvalue;	874	XGCValues gcvalue;
927	XSetWindowAttributes attributes;	875	XSetWindowAttributes attributes;
928	XWindowAttributes gattr;
929	Window top, parent;	876	Window top, parent;
930	dDisp;	877	dDisp;
931		878
932	#ifdef USING_W11LIB	879	xa = display->xa;
933	/* enable W11 callbacks */
934	W11AddEventHandler (disp, rxvt_W11_process_x_event);
935	#endif
936		880
937	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	881	/* grab colors before netscape does */
938	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	882	Get_Colours ();
939		883
940	if (OPTION (Opt_transparent))	884	if (!set_fonts ())
941	{	885	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	886
943	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	887	parent = display->root;
944	}	888
		889	attributes.override_redirect = !!OPTION (Opt_override_redirect);
945		890
946	#if ENABLE_FRILLS	891	#if ENABLE_FRILLS
947	if (OPTION (Opt_borderLess))	892	if (OPTION (Opt_borderLess))
948	{	893	{
949	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	894	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
950
951	if (prop == None)
952	{	895	{
953	/* 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");*/
954	#ifdef PREFER_24BIT
955	attributes.override_redirect = TRUE;	897	attributes.override_redirect = TRUE;
956	#endif
957	mwmhints.flags = 0;	898	mwmhints.flags = 0;
958	}	899	}
959	else	900	else
960	{	901	{
961	mwmhints.flags = MWM_HINTS_DECORATIONS;	902	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
964	}	905	}
965	else	906	else
966	mwmhints.flags = 0;	907	mwmhints.flags = 0;
967	#endif	908	#endif
968		909
969	/* grab colors before netscape does */
970	Get_Colours ();
971
972	if (!set_fonts ())
973	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975	parent = DefaultRootWindow (disp);
976
977	#if ENABLE_XEMBED	910	#if ENABLE_XEMBED
978	if (rs[Rs_embed])	911	if (rs[Rs_embed])
979	{	912	{
980	XWindowAttributes wattr;	913	XWindowAttributes wattr;
981		914
…		…
989	#endif	922	#endif
990		923
991	window_calc (0, 0);	924	window_calc (0, 0);
992		925
993	/* sub-window placement & size in rxvt_resize_subwindows () */	926	/* sub-window placement & size in rxvt_resize_subwindows () */
994	#ifdef PREFER_24BIT
995	attributes.background_pixel = pix_colors_focused[Color_border];	927	attributes.background_pixel = pix_colors_focused[Color_border];
996	attributes.border_pixel = pix_colors_focused[Color_border];	928	attributes.border_pixel = pix_colors_focused[Color_border];
997	attributes.colormap = display->cmap;	929	attributes.colormap = display->cmap;
		930
998	top = XCreateWindow (disp, parent,	931	top = XCreateWindow (disp, parent,
999	szHint.x, szHint.y,	932	szHint.x, szHint.y,
1000	szHint.width, szHint.height,	933	szHint.width, szHint.height,
1001	ext_bwidth,	934	ext_bwidth,
1002	display->depth, InputOutput,	935	display->depth, InputOutput,
1003	display->visual,	936	display->visual,
1004	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	937	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1005	#else	938	&attributes);
1006	top = XCreateSimpleWindow (disp, parent,
1007	szHint.x, szHint.y,
1008	szHint.width, szHint.height,
1009	ext_bwidth,
1010	pix_colors_focused[Color_border],
1011	pix_colors_focused[Color_border]);
1012	#endif
1013		939
1014	this->parent[0] = top;	940	this->parent[0] = top;
1015		941
1016	old_width = szHint.width;	942	old_width = szHint.width;
1017	old_height = szHint.height;	943	old_height = szHint.height;
1018		944
1019	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	945	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	946	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021		947
1022	classHint.res_name = (char *)rs[Rs_name];	948	classHint.res_name = (char *)rs[Rs_name];
1023	classHint.res_class = (char *)RESCLASS;	949	classHint.res_class = (char *)RESCLASS;
1024		950
1025	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	951	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1026	wmHint.input = True;	952	wmHint.input = True;
1027	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	953	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028	wmHint.window_group = top;	954	wmHint.window_group = top;
1029		955
1030	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	956	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1031	&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
1032		964
1033	Atom protocols[] = {	965	Atom protocols[] = {
1034	xa[XA_WM_DELETE_WINDOW],	966	xa[XA_WM_DELETE_WINDOW],
1035	#if ENABLE_EWMH	967	#if ENABLE_EWMH
1036	xa[XA_NET_WM_PING],	968	xa[XA_NET_WM_PING],
…		…
1062	\| FocusChangeMask \| VisibilityChangeMask	994	\| FocusChangeMask \| VisibilityChangeMask
1063	\| ExposureMask \| StructureNotifyMask);	995	\| ExposureMask \| StructureNotifyMask);
1064		996
1065	termwin_ev.start (display, top);	997	termwin_ev.start (display, top);
1066		998
1067	#if ENABLE_FRILLS
1068	if (mwmhints.flags)
1069	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1070	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1071	#endif
1072
1073	/* 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 */
1074	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1000	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1075		1001
1076	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1002	#ifdef HAVE_SCROLLBARS
1077	/* cursor (menuBar/scrollBar): Black-on-White */	1003	/* cursor scrollBar: Black-on-White */
1078	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1004	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1079	#endif	1005	#endif
1080		1006
1081	/* the vt window */	1007	/* the vt window */
1082	vt = XCreateSimpleWindow (disp, top,	1008	vt = XCreateSimpleWindow (disp, top,
1083	window_vt_x,
1084	window_vt_y,	1009	window_vt_x, window_vt_y,
1085	width,
1086	height,	1010	width, height,
1087	0,	1011	0,
1088	pix_colors_focused[Color_fg],	1012	pix_colors_focused[Color_fg],
1089	pix_colors_focused[Color_bg]);	1013	pix_colors_focused[Color_bg]);
1090	#ifdef DEBUG_X
1091	XStoreName (disp, vt, "vt window");
1092	#endif
1093		1014
1094	attributes.bit_gravity = NorthWestGravity;	1015	attributes.bit_gravity = NorthWestGravity;
1095	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1016	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1096		1017
1097	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1018	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
…		…
1103		1024
1104	vt_select_input ();	1025	vt_select_input ();
1105		1026
1106	vt_ev.start (display, vt);	1027	vt_ev.start (display, vt);
1107		1028
1108	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109	if (menuBar_height ())
1110	{
1111	menuBar.win = XCreateSimpleWindow (disp, top,
1112	window_vt_x, 0,
1113	width,
1114	menuBar_TotalHeight (),
1115	0,
1116	pix_colors_focused[Color_fg],
1117	pix_colors_focused[Color_scroll]);
1118
1119	#ifdef DEBUG_X
1120	XStoreName (disp, menuBar.win, "menubar");
1121	#endif
1122
1123	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125	XDefineCursor (disp, menuBar.win,
1126	XCreateFontCursor (disp, XC_left_ptr));
1127
1128	XSelectInput (disp, menuBar.win,
1129	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1130	menubar_ev.start (display, menuBar.win);
1131	}
1132	#endif
1133
1134	#ifdef XPM_BACKGROUND	1029	#ifdef XPM_BACKGROUND
1135	if (rs[Rs_backgroundPixmap] != NULL	1030	if (rs[Rs_backgroundPixmap] != NULL
1136	&& ! OPTION (Opt_transparent))	1031	&& !OPTION (Opt_transparent))
1137	{	1032	{
1138	const char *p = rs[Rs_backgroundPixmap];	1033	const char *p = rs[Rs_backgroundPixmap];
1139		1034
1140	if ((p = strchr (p, ';')) != NULL)	1035	if ((p = strchr (p, ';')) != NULL)
1141	{	1036	{
…		…
1147	scr_touch (true);	1042	scr_touch (true);
1148	}	1043	}
1149	#endif	1044	#endif
1150		1045
1151	/* graphics context for the vt window */	1046	/* graphics context for the vt window */
1152	gcvalue.foreground = pix_colors[Color_fg];	1047	gcvalue.foreground = pix_colors[Color_fg];
1153	gcvalue.background = pix_colors[Color_bg];	1048	gcvalue.background = pix_colors[Color_bg];
1154	gcvalue.graphics_exposures = 1;	1049	gcvalue.graphics_exposures = 1;
		1050
1155	gc = XCreateGC (disp, vt,	1051	gc = XCreateGC (disp, vt,
1156	GCForeground \| GCBackground \| GCGraphicsExposures,	1052	GCForeground \| GCBackground \| GCGraphicsExposures,
1157	&gcvalue);	1053	&gcvalue);
1158		1054
1159	drawable = new rxvt_drawable (display, vt);	1055	drawable = new rxvt_drawable (display, vt);
1160		1056
1161	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1057	#ifdef RXVT_SCROLLBAR
1162	gcvalue.foreground = pix_colors[Color_topShadow];	1058	gcvalue.foreground = pix_colors[Color_topShadow];
1163	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1059	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164	gcvalue.foreground = pix_colors[Color_bottomShadow];	1060	gcvalue.foreground = pix_colors[Color_bottomShadow];
1165	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1061	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1166	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1062	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
…		…
1173	pix_colors = pix_colors_unfocused;	1069	pix_colors = pix_colors_unfocused;
1174	#endif	1070	#endif
1175		1071
1176	pointer_unblank ();	1072	pointer_unblank ();
1177	scr_recolour ();	1073	scr_recolour ();
1178
1179	#if ENABLE_XEMBED
1180	if (rs[Rs_embed])
1181	{
1182	long info[2] = { 0, XEMBED_MAPPED };
1183
1184	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185	32, PropModeReplace, (unsigned char *)&info, 2);
1186	}
1187	#endif
1188	}	1074	}
1189		1075
1190	/* ------------------------------------------------------------------------- *	1076	/* ------------------------------------------------------------------------- *
1191	* GET TTY CURRENT STATE *	1077	* GET TTY CURRENT STATE *
1192	* ------------------------------------------------------------------------- */	1078	* ------------------------------------------------------------------------- */
…		…
1409	rxvt_term::run_command (const char const argv)	1295	rxvt_term::run_command (const char const argv)
1410	{	1296	{
1411	#if ENABLE_FRILLS	1297	#if ENABLE_FRILLS
1412	if (rs[Rs_pty_fd])	1298	if (rs[Rs_pty_fd])
1413	{	1299	{
1414	pty.pty = atoi (rs[Rs_pty_fd]);	1300	pty->pty = atoi (rs[Rs_pty_fd]);
1415		1301
1416	if (pty.pty >= 0)	1302	if (pty->pty >= 0)
1417	{	1303	{
1418	if (getfd_hook)	1304	if (getfd_hook)
1419	pty.pty = (*getfd_hook) (pty.pty);	1305	pty->pty = (*getfd_hook) (pty->pty);
1420		1306
1421	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1307	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1422	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1308	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1423	}	1309	}
1424	}	1310	}
1425	else	1311	else
1426	#endif	1312	#endif
1427	if (!pty.get ())	1313	if (!pty->get ())
1428	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1314	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1429		1315
1430	pty.set_utf8_mode (enc_utf8);	1316	pty->set_utf8_mode (enc_utf8);
1431		1317
1432	/* set initial window size */	1318	/* set initial window size */
1433	tt_winch ();	1319	tt_winch ();
1434		1320
1435	int er;	1321	int er;
…		…
1448	#if ENABLE_FRILLS	1334	#if ENABLE_FRILLS
1449	if (rs[Rs_pty_fd])	1335	if (rs[Rs_pty_fd])
1450	return;	1336	return;
1451	#endif	1337	#endif
1452		1338
1453	#ifndef __QNX__
1454	/* spin off the command interpreter */	1339	/* spin off the command interpreter */
1455	switch (cmd_pid = fork ())	1340	switch (cmd_pid = fork ())
1456	{	1341	{
1457	case -1:	1342	case -1:
1458	{	1343	{
…		…
1460	rxvt_fatal ("can't fork, aborting.\n");	1345	rxvt_fatal ("can't fork, aborting.\n");
1461	}	1346	}
1462	case 0:	1347	case 0:
1463	init_env ();	1348	init_env ();
1464		1349
1465	if (!pty.make_controlling_tty ())	1350	if (!pty->make_controlling_tty ())
1466	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1351	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1467	else	1352	else
1468	{	1353	{
1469	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1354	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1470	dup2 (pty.tty, STDIN_FILENO);	1355	dup2 (pty->tty, STDIN_FILENO);
1471	dup2 (pty.tty, STDOUT_FILENO);	1356	dup2 (pty->tty, STDOUT_FILENO);
1472	dup2 (pty.tty, STDERR_FILENO);	1357	dup2 (pty->tty, STDERR_FILENO);
1473		1358
1474	// close all our file handles that we do no longer need	1359	// close all our file handles that we do no longer need
1475	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1360	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1476	{	1361	{
1477	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1362	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1478	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1363	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1479	}	1364	}
1480		1365
1481	run_child (argv);	1366	run_child (argv);
1482	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1367	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1483	}	1368	}
1484		1369
1485	_exit (EXIT_FAILURE);	1370	_exit (EXIT_FAILURE);
1486		1371
1487	default:	1372	default:
1488	{	1373	if (!OPTION (Opt_utmpInhibit))
1489	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1374	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1490	int fdstdin;
1491		1375
1492	fdstdin = dup (STDIN_FILENO);	1376	pty->close_tty ();
1493	dup2 (pty.tty, STDIN_FILENO);
1494	#endif
1495		1377
1496	#ifdef UTMP_SUPPORT	1378	child_ev.start (cmd_pid);
1497	privileged_utmp (SAVE);
1498	#endif
1499		1379
1500	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1380	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1501
1502	dup2 (fdstdin, STDIN_FILENO);
1503	close (fdstdin);
1504	#endif
1505	}
1506
1507	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1508	break;	1381	break;
1509	}	1382	}
1510	#else /* __QNX__ uses qnxspawn () */
1511	fchmod (pty.tty, 0622);
1512	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1513	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1514
1515	if (run_child (argv) == -1)
1516	exit (EXIT_FAILURE);
1517	#endif
1518	}	1383	}
1519		1384
1520	/* ------------------------------------------------------------------------- *	1385	/* ------------------------------------------------------------------------- *
1521	* CHILD PROCESS OPERATIONS *	1386	* CHILD PROCESS OPERATIONS *
1522	* ------------------------------------------------------------------------- */	1387	* ------------------------------------------------------------------------- */
…		…
1566	// unblock signals (signals are blocked by iom.C	1431	// unblock signals (signals are blocked by iom.C
1567	sigset_t ss;	1432	sigset_t ss;
1568	sigemptyset (&ss);	1433	sigemptyset (&ss);
1569	sigprocmask (SIG_SETMASK, &ss, 0);	1434	sigprocmask (SIG_SETMASK, &ss, 0);
1570		1435
1571	#ifndef __QNX__
1572	/* command interpreter path */	1436	/* command interpreter path */
1573	if (argv != NULL)	1437	if (argv != NULL)
1574	{	1438	{
1575	# ifdef DEBUG_CMD	1439	# ifdef DEBUG_CMD
1576	int i;	1440	int i;
…		…
1602		1466
1603	execlp (shell, argv0, NULL);	1467	execlp (shell, argv0, NULL);
1604	/* no error message: STDERR is closed! */	1468	/* no error message: STDERR is closed! */
1605	}	1469	}
1606		1470
1607	#else /* __QNX__ uses qnxspawn () */
1608
1609	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1610	char *command = NULL, fullcommand[_MAX_PATH];
1611	char *arg_v, arg_a[2] = { NULL, NULL };
1612
1613	if (argv != NULL)
1614	{
1615	if (access (argv[0], X_OK) == -1)
1616	{
1617	if (strchr (argv[0], '/') == NULL)
1618	{
1619	searchenv (argv[0], "PATH", fullcommand);
1620
1621	if (fullcommand[0] != '\0')
1622	command = fullcommand;
1623	}
1624
1625	if (access (command, X_OK) == -1)
1626	return -1;
1627	}
1628	else
1629	command = argv[0];
1630
1631	arg_v = argv;
1632	}
1633	else
1634	{
1635	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1636	command = "/bin/sh";
1637
1638	arg_a[0] = my_basename (command);
1639
1640	if (OPTION (Opt_loginShell))
1641	{
1642	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1643
1644	login[0] = '-';
1645	strcpy (&login[1], arg_a[0]);
1646	arg_a[0] = login;
1647	}
1648
1649	arg_v = arg_a;
1650	}
1651
1652	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1653	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1654	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1655	command, arg_v, environ, iov_a, 0);
1656	if (login)
1657	free (login);
1658
1659	pty.close_tty ();
1660	return pty.pty;
1661	#endif
1662
1663	return -1;	1471	return -1;
1664	}	1472	}
1665		1473
1666	/----------------------- 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.142 by root, Fri Jan 13 04:59:04 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.142 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC