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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.132 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC

…		…
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	11	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>	12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	13	* - QNX support
14	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15	*	15	*
16	* This program is free software; you can redistribute it and/or modify	16	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	17	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	18	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	19	* (at your option) any later version.
…		…
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
…		…
339	rs[Rs_name] = rxvt_r_basename (argv[0]);	288	rs[Rs_name] = rxvt_r_basename (argv[0]);
340		289
341	/*	290	/*
342	* Open display, get options/resources and create the window	291	* Open display, get options/resources and create the window
343	*/	292	*/
		293
344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	294	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345	rs[Rs_display_name] = ":0";	295	rs[Rs_display_name] = ":0";
346		296
347	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
348		298
349	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
350	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]);
351		301
352	extract_resources ();	302	extract_resources ();
		303
353	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
354		318
355	/*	319	/*
356	* set any defaults not already set	320	* set any defaults not already set
357	*/	321	*/
358	if (cmd_argv && cmd_argv[0])	322	if (cmd_argv && cmd_argv[0])
…		…
391	pointerBlankDelay = 2;	355	pointerBlankDelay = 2;
392	#endif	356	#endif
393		357
394	/* no point having a scrollbar without having any scrollback! */	358	/* no point having a scrollbar without having any scrollback! */
395	if (!saveLines)	359	if (!saveLines)
396	CLR_OPTION (Opt_scrollBar);	360	set_option (Opt_scrollBar, 0);
397		361
398	#ifdef PRINTPIPE	362	#ifdef PRINTPIPE
399	if (!rs[Rs_print_pipe])	363	if (!rs[Rs_print_pipe])
400	rs[Rs_print_pipe] = PRINTPIPE;	364	rs[Rs_print_pipe] = PRINTPIPE;
401	#endif	365	#endif
…		…
519	i = strlen (val);	483	i = strlen (val);
520	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	484	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
521		485
522	sprintf (env_display, "DISPLAY=%s", val);	486	sprintf (env_display, "DISPLAY=%s", val);
523		487
524	/* avoiding the math library:	488	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
525	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
526	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
527	;
528	max_it (i, 1);
529	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
530
531	sprintf (env_windowid, "WINDOWID=%u",
532	(unsigned int)parent[0]);
533		489
534	/* add entries to the environment:	490	/* add entries to the environment:
535	* @ DISPLAY: in case we started with -display	491	* @ DISPLAY: in case we started with -display
536	* @ WINDOWID: X window id number of the window	492	* @ WINDOWID: X window id number of the window
537	* @ COLORTERM: terminal sub-name and also indicates its color	493	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
539	* @ TERMINFO: path to terminfo directory	495	* @ TERMINFO: path to terminfo directory
540	* @ COLORFGBG: fg;bg color codes	496	* @ COLORFGBG: fg;bg color codes
541	*/	497	*/
542	putenv (env_display);	498	putenv (env_display);
543	putenv (env_windowid);	499	putenv (env_windowid);
		500
544	if (env_colorfgbg)	501	if (env_colorfgbg)
545	putenv (env_colorfgbg);	502	putenv (env_colorfgbg);
546		503
547	#ifdef RXVT_TERMINFO	504	#ifdef RXVT_TERMINFO
548	putenv ("TERMINFO=" RXVT_TERMINFO);	505	putenv ("TERMINFO=" RXVT_TERMINFO);
…		…
576	* This should support all European type languages.	533	* This should support all European type languages.
577	*/	534	*/
578	void	535	void
579	rxvt_term::set_locale (const char *locale)	536	rxvt_term::set_locale (const char *locale)
580	{	537	{
		538	set_environ (envv);
		539
581	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	540	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
582	free (this->locale);	541	free (this->locale);
583	this->locale = setlocale (LC_CTYPE, locale);	542	this->locale = setlocale (LC_CTYPE, locale);
584		543
585	if (!this->locale)	544	if (!this->locale)
586	{	545	{
587	if (*locale)	546	if (*locale)
588	{	547	{
589	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	548	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590	setlocale (LC_CTYPE, "");	549	setlocale (LC_CTYPE, "C");
591	}	550	}
592	else	551	else
593	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	552	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594		553
595	this->locale = "";	554	this->locale = "C";
596	}	555	}
597		556
598		557
599	this->locale = rxvt_strdup (this->locale);	558	this->locale = rxvt_strdup (this->locale);
600	SET_LOCALE (this->locale);	559	SET_LOCALE (this->locale);
…		…
615	}	574	}
616		575
617	void	576	void
618	rxvt_term::init_xlocale ()	577	rxvt_term::init_xlocale ()
619	{	578	{
		579	set_environ (envv);
		580
620	#ifdef USE_XIM	581	#ifdef USE_XIM
621	if (!locale)	582	if (!locale)
622	rxvt_warn ("setting locale failed, working without locale support.\n");	583	rxvt_warn ("setting locale failed, working without locale support.\n");
623	else	584	else
624	{	585	{
…		…
664	if (strcmp (key_backspace, "DEC") == 0)	625	if (strcmp (key_backspace, "DEC") == 0)
665	priv_modes \|= PrivMode_HaveBackSpace;	626	priv_modes \|= PrivMode_HaveBackSpace;
666	#endif	627	#endif
667		628
668	/* add value for scrollBar */	629	/* add value for scrollBar */
669	if (scrollbar_visible ())	630	if (scrollBar.state)
670	{	631	{
671	priv_modes \|= PrivMode_scrollBar;	632	priv_modes \|= PrivMode_scrollBar;
672	SavedModes \|= PrivMode_scrollBar;	633	SavedModes \|= PrivMode_scrollBar;
673	}
674
675	if (menubar_visible ())
676	{
677	priv_modes \|= PrivMode_menuBar;
678	SavedModes \|= PrivMode_menuBar;
679	}	634	}
680		635
681	run_command (argv);	636	run_command (argv);
682	}	637	}
683		638
…		…
751	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];
752	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];
753	}	708	}
754		709
755	/*	710	/*
756	* get scrollBar/menuBar shadow colors	711	* get scrollBar shadow colors
757	*	712	*
758	* The calculations of topShadow/bottomShadow values are adapted	713	* The calculations of topShadow/bottomShadow values are adapted
759	* from the fvwm window manager.	714	* from the fvwm window manager.
760	*/	715	*/
761	#ifdef KEEP_SCROLLCOLOR	716	#ifdef KEEP_SCROLLCOLOR
…		…
912	rxvt_term::create_windows (int argc, const char const argv)	867	rxvt_term::create_windows (int argc, const char const argv)
913	{	868	{
914	XClassHint classHint;	869	XClassHint classHint;
915	XWMHints wmHint;	870	XWMHints wmHint;
916	#if ENABLE_FRILLS	871	#if ENABLE_FRILLS
917	Atom prop = None;
918	MWMHints mwmhints;	872	MWMHints mwmhints;
919	#endif	873	#endif
920	XGCValues gcvalue;	874	XGCValues gcvalue;
921	long vt_emask;
922	XSetWindowAttributes attributes;	875	XSetWindowAttributes attributes;
923	XWindowAttributes gattr;
924	Window top, parent;	876	Window top, parent;
925	dDisp;	877	dDisp;
926		878
927	#ifdef USING_W11LIB	879	xa = display->xa;
928	/* enable W11 callbacks */
929	W11AddEventHandler (disp, rxvt_W11_process_x_event);
930	#endif
931		880
932	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	881	/* grab colors before netscape does */
933	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	882	Get_Colours ();
934		883
935	if (OPTION (Opt_transparent))	884	if (!set_fonts ())
936	{	885	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
937	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	886
938	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	887	parent = display->root;
939	}	888
		889	attributes.override_redirect = !!OPTION (Opt_override_redirect);
940		890
941	#if ENABLE_FRILLS	891	#if ENABLE_FRILLS
942	if (OPTION (Opt_borderLess))	892	if (OPTION (Opt_borderLess))
943	{	893	{
944	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	894	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
945
946	if (prop == None)
947	{	895	{
948	/* 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");*/
949	#ifdef PREFER_24BIT
950	attributes.override_redirect = TRUE;	897	attributes.override_redirect = TRUE;
951	#endif
952	mwmhints.flags = 0;	898	mwmhints.flags = 0;
953	}	899	}
954	else	900	else
955	{	901	{
956	mwmhints.flags = MWM_HINTS_DECORATIONS;	902	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
959	}	905	}
960	else	906	else
961	mwmhints.flags = 0;	907	mwmhints.flags = 0;
962	#endif	908	#endif
963		909
964	/* grab colors before netscape does */
965	Get_Colours ();
966
967	if (!set_fonts ())
968	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
969
970	parent = DefaultRootWindow (disp);
971
972	#if ENABLE_XEMBED	910	#if ENABLE_XEMBED
973	if (rs[Rs_embed])	911	if (rs[Rs_embed])
974	{	912	{
975	XWindowAttributes wattr;	913	XWindowAttributes wattr;
976		914
…		…
984	#endif	922	#endif
985		923
986	window_calc (0, 0);	924	window_calc (0, 0);
987		925
988	/* sub-window placement & size in rxvt_resize_subwindows () */	926	/* sub-window placement & size in rxvt_resize_subwindows () */
989	#ifdef PREFER_24BIT
990	attributes.background_pixel = pix_colors_focused[Color_border];	927	attributes.background_pixel = pix_colors_focused[Color_border];
991	attributes.border_pixel = pix_colors_focused[Color_border];	928	attributes.border_pixel = pix_colors_focused[Color_border];
992	attributes.colormap = display->cmap;	929	attributes.colormap = display->cmap;
		930
993	top = XCreateWindow (disp, parent,	931	top = XCreateWindow (disp, parent,
994	szHint.x, szHint.y,	932	szHint.x, szHint.y,
995	szHint.width, szHint.height,	933	szHint.width, szHint.height,
996	ext_bwidth,	934	ext_bwidth,
997	display->depth, InputOutput,	935	display->depth, InputOutput,
998	display->visual,	936	display->visual,
999	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	937	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1000	#else	938	&attributes);
1001	top = XCreateSimpleWindow (disp, parent,
1002	szHint.x, szHint.y,
1003	szHint.width, szHint.height,
1004	ext_bwidth,
1005	pix_colors_focused[Color_border],
1006	pix_colors_focused[Color_border]);
1007	#endif
1008		939
1009	this->parent[0] = top;	940	this->parent[0] = top;
1010		941
1011	old_width = szHint.width;	942	old_width = szHint.width;
1012	old_height = szHint.height;	943	old_height = szHint.height;
1013		944
1014	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	945	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1015	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	946	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1016		947
1017	classHint.res_name = (char *)rs[Rs_name];	948	classHint.res_name = (char *)rs[Rs_name];
1018	classHint.res_class = (char *)RESCLASS;	949	classHint.res_class = (char *)RESCLASS;
1019		950
1020	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	951	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1021	wmHint.input = True;	952	wmHint.input = True;
1022	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	953	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1023	wmHint.window_group = top;	954	wmHint.window_group = top;
1024		955
1025	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	956	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1026	&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
1027		964
1028	Atom protocols[] = {	965	Atom protocols[] = {
1029	xa[XA_WM_DELETE_WINDOW],	966	xa[XA_WM_DELETE_WINDOW],
1030	#if ENABLE_EWMH	967	#if ENABLE_EWMH
1031	xa[XA_NET_WM_PING],	968	xa[XA_NET_WM_PING],
1032	#endif	969	#endif
1033	};	970	};
1034		971
1035	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	972	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1036		973
		974	#if ENABLE_FRILLS
		975	if (rs[Rs_transient_for])
		976	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		977	#endif
		978
1037	#if ENABLE_EWMH	979	#if ENABLE_EWMH
1038	long pid = getpid ();	980	long pid = getpid ();
1039		981
1040	XChangeProperty (disp, top,	982	XChangeProperty (disp, top,
1041	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	983	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
…		…
1052	\| FocusChangeMask \| VisibilityChangeMask	994	\| FocusChangeMask \| VisibilityChangeMask
1053	\| ExposureMask \| StructureNotifyMask);	995	\| ExposureMask \| StructureNotifyMask);
1054		996
1055	termwin_ev.start (display, top);	997	termwin_ev.start (display, top);
1056		998
1057	#if ENABLE_FRILLS
1058	if (mwmhints.flags)
1059	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1060	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1061	#endif
1062
1063	/* 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 */
1064	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1000	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1065		1001
1066	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1002	#ifdef HAVE_SCROLLBARS
1067	/* cursor (menuBar/scrollBar): Black-on-White */	1003	/* cursor scrollBar: Black-on-White */
1068	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1004	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1069	#endif	1005	#endif
1070		1006
1071	/* the vt window */	1007	/* the vt window */
1072	vt = XCreateSimpleWindow (disp, top,	1008	vt = XCreateSimpleWindow (disp, top,
1073	window_vt_x,
1074	window_vt_y,	1009	window_vt_x, window_vt_y,
1075	width,
1076	height,	1010	width, height,
1077	0,	1011	0,
1078	pix_colors_focused[Color_fg],	1012	pix_colors_focused[Color_fg],
1079	pix_colors_focused[Color_bg]);	1013	pix_colors_focused[Color_bg]);
1080	#ifdef DEBUG_X
1081	XStoreName (disp, vt, "vt window");
1082	#endif
1083		1014
1084	attributes.bit_gravity = NorthWestGravity;	1015	attributes.bit_gravity = NorthWestGravity;
1085	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1016	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1086		1017
1087	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1018	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1088		1019
1089	#ifdef POINTER_BLANK
1090	if (OPTION (Opt_pointerBlank))	1020	if (OPTION (Opt_pointerBlank))
1091	vt_emask \|= PointerMotionMask;	1021	vt_emask \|= PointerMotionMask;
1092	else	1022	else
1093	#endif
1094	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1023	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1095		1024
1096	XSelectInput (disp, vt, vt_emask);	1025	vt_select_input ();
		1026
1097	vt_ev.start (display, vt);	1027	vt_ev.start (display, vt);
1098
1099	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1100	if (menuBar_height ())
1101	{
1102	menuBar.win = XCreateSimpleWindow (disp, top,
1103	window_vt_x, 0,
1104	width,
1105	menuBar_TotalHeight (),
1106	0,
1107	pix_colors_focused[Color_fg],
1108	pix_colors_focused[Color_scroll]);
1109
1110	#ifdef DEBUG_X
1111	XStoreName (disp, menuBar.win, "menubar");
1112	#endif
1113
1114	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1115
1116	XDefineCursor (disp, menuBar.win,
1117	XCreateFontCursor (disp, XC_left_ptr));
1118
1119	XSelectInput (disp, menuBar.win,
1120	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1121	menubar_ev.start (display, menuBar.win);
1122	}
1123	#endif
1124		1028
1125	#ifdef XPM_BACKGROUND	1029	#ifdef XPM_BACKGROUND
1126	if (rs[Rs_backgroundPixmap] != NULL	1030	if (rs[Rs_backgroundPixmap] != NULL
1127	&& ! OPTION (Opt_transparent))	1031	&& !OPTION (Opt_transparent))
1128	{	1032	{
1129	const char *p = rs[Rs_backgroundPixmap];	1033	const char *p = rs[Rs_backgroundPixmap];
1130		1034
1131	if ((p = strchr (p, ';')) != NULL)	1035	if ((p = strchr (p, ';')) != NULL)
1132	{	1036	{
…		…
1138	scr_touch (true);	1042	scr_touch (true);
1139	}	1043	}
1140	#endif	1044	#endif
1141		1045
1142	/* graphics context for the vt window */	1046	/* graphics context for the vt window */
1143	gcvalue.foreground = pix_colors[Color_fg];	1047	gcvalue.foreground = pix_colors[Color_fg];
1144	gcvalue.background = pix_colors[Color_bg];	1048	gcvalue.background = pix_colors[Color_bg];
1145	gcvalue.graphics_exposures = 1;	1049	gcvalue.graphics_exposures = 1;
		1050
1146	gc = XCreateGC (disp, vt,	1051	gc = XCreateGC (disp, vt,
1147	GCForeground \| GCBackground \| GCGraphicsExposures,	1052	GCForeground \| GCBackground \| GCGraphicsExposures,
1148	&gcvalue);	1053	&gcvalue);
1149		1054
1150	drawable = new rxvt_drawable (display, vt);	1055	drawable = new rxvt_drawable (display, vt);
1151		1056
1152	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1057	#ifdef RXVT_SCROLLBAR
1153	gcvalue.foreground = pix_colors[Color_topShadow];	1058	gcvalue.foreground = pix_colors[Color_topShadow];
1154	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1059	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1155	gcvalue.foreground = pix_colors[Color_bottomShadow];	1060	gcvalue.foreground = pix_colors[Color_bottomShadow];
1156	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1061	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1062	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
…		…
1164	pix_colors = pix_colors_unfocused;	1069	pix_colors = pix_colors_unfocused;
1165	#endif	1070	#endif
1166		1071
1167	pointer_unblank ();	1072	pointer_unblank ();
1168	scr_recolour ();	1073	scr_recolour ();
1169
1170	#if ENABLE_XEMBED
1171	if (rs[Rs_embed])
1172	{
1173	long info[2] = { 0, XEMBED_MAPPED };
1174
1175	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1176	32, PropModeReplace, (unsigned char *)&info, 2);
1177	}
1178	#endif
1179	}	1074	}
1180		1075
1181	/* ------------------------------------------------------------------------- *	1076	/* ------------------------------------------------------------------------- *
1182	* GET TTY CURRENT STATE *	1077	* GET TTY CURRENT STATE *
1183	* ------------------------------------------------------------------------- */	1078	* ------------------------------------------------------------------------- */
…		…
1400	rxvt_term::run_command (const char const argv)	1295	rxvt_term::run_command (const char const argv)
1401	{	1296	{
1402	#if ENABLE_FRILLS	1297	#if ENABLE_FRILLS
1403	if (rs[Rs_pty_fd])	1298	if (rs[Rs_pty_fd])
1404	{	1299	{
1405	pty.pty = atoi (rs[Rs_pty_fd]);	1300	pty->pty = atoi (rs[Rs_pty_fd]);
1406		1301
1407	if (pty.pty >= 0)	1302	if (pty->pty >= 0)
1408	{	1303	{
1409	if (getfd_hook)	1304	if (getfd_hook)
1410	pty.pty = (*getfd_hook) (pty.pty);	1305	pty->pty = (*getfd_hook) (pty->pty);
1411		1306
1412	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1307	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1413	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1308	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1414	}	1309	}
1415	}	1310	}
1416	else	1311	else
1417	#endif	1312	#endif
1418	if (!pty.get ())	1313	if (!pty->get ())
1419	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1314	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1420		1315
1421	pty.set_utf8_mode (enc_utf8);	1316	pty->set_utf8_mode (enc_utf8);
1422		1317
1423	/* set initial window size */	1318	/* set initial window size */
1424	tt_winch ();	1319	tt_winch ();
1425		1320
1426	int er;	1321	int er;
…		…
1439	#if ENABLE_FRILLS	1334	#if ENABLE_FRILLS
1440	if (rs[Rs_pty_fd])	1335	if (rs[Rs_pty_fd])
1441	return;	1336	return;
1442	#endif	1337	#endif
1443		1338
1444	#ifndef __QNX__
1445	/* spin off the command interpreter */	1339	/* spin off the command interpreter */
1446	switch (cmd_pid = fork ())	1340	switch (cmd_pid = fork ())
1447	{	1341	{
1448	case -1:	1342	case -1:
1449	{	1343	{
…		…
1451	rxvt_fatal ("can't fork, aborting.\n");	1345	rxvt_fatal ("can't fork, aborting.\n");
1452	}	1346	}
1453	case 0:	1347	case 0:
1454	init_env ();	1348	init_env ();
1455		1349
1456	if (!pty.make_controlling_tty ())	1350	if (!pty->make_controlling_tty ())
1457	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1351	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1458	else	1352	else
1459	{	1353	{
1460	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1354	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1461	dup2 (pty.tty, STDIN_FILENO);	1355	dup2 (pty->tty, STDIN_FILENO);
1462	dup2 (pty.tty, STDOUT_FILENO);	1356	dup2 (pty->tty, STDOUT_FILENO);
1463	dup2 (pty.tty, STDERR_FILENO);	1357	dup2 (pty->tty, STDERR_FILENO);
1464		1358
1465	// close all our file handles that we do no longer need	1359	// close all our file handles that we do no longer need
1466	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1360	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1467	{	1361	{
1468	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1362	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1469	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1363	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1470	}	1364	}
1471		1365
1472	run_child (argv);	1366	run_child (argv);
1473	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1367	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1474	}	1368	}
1475		1369
1476	_exit (EXIT_FAILURE);	1370	_exit (EXIT_FAILURE);
1477		1371
1478	default:	1372	default:
1479	{	1373	if (!OPTION (Opt_utmpInhibit))
1480	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1374	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1481	int fdstdin;
1482		1375
1483	fdstdin = dup (STDIN_FILENO);	1376	pty->close_tty ();
1484	dup2 (pty.tty, STDIN_FILENO);
1485	#endif
1486		1377
1487	#ifdef UTMP_SUPPORT	1378	child_ev.start (cmd_pid);
1488	privileged_utmp (SAVE);
1489	#endif
1490		1379
1491	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1380	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1492
1493	dup2 (fdstdin, STDIN_FILENO);
1494	close (fdstdin);
1495	#endif
1496	}
1497
1498	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1499	break;	1381	break;
1500	}	1382	}
1501	#else /* __QNX__ uses qnxspawn () */
1502	fchmod (pty.tty, 0622);
1503	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1504	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1505
1506	if (run_child (argv) == -1)
1507	exit (EXIT_FAILURE);
1508	#endif
1509	}	1383	}
1510		1384
1511	/* ------------------------------------------------------------------------- *	1385	/* ------------------------------------------------------------------------- *
1512	* CHILD PROCESS OPERATIONS *	1386	* CHILD PROCESS OPERATIONS *
1513	* ------------------------------------------------------------------------- */	1387	* ------------------------------------------------------------------------- */
…		…
1557	// unblock signals (signals are blocked by iom.C	1431	// unblock signals (signals are blocked by iom.C
1558	sigset_t ss;	1432	sigset_t ss;
1559	sigemptyset (&ss);	1433	sigemptyset (&ss);
1560	sigprocmask (SIG_SETMASK, &ss, 0);	1434	sigprocmask (SIG_SETMASK, &ss, 0);
1561		1435
1562	#ifndef __QNX__
1563	/* command interpreter path */	1436	/* command interpreter path */
1564	if (argv != NULL)	1437	if (argv != NULL)
1565	{	1438	{
1566	# ifdef DEBUG_CMD	1439	# ifdef DEBUG_CMD
1567	int i;	1440	int i;
…		…
1573	execvp (argv[0], (char const )argv);	1446	execvp (argv[0], (char const )argv);
1574	/* no error message: STDERR is closed! */	1447	/* no error message: STDERR is closed! */
1575	}	1448	}
1576	else	1449	else
1577	{	1450	{
1578	const char argv0, shell;	1451	const char argv0, shell;
1579		1452
1580	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1453	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1581	shell = "/bin/sh";	1454	shell = "/bin/sh";
1582		1455
1583	argv0 = (const char *)rxvt_r_basename (shell);	1456	argv0 = (const char *)rxvt_r_basename (shell);
…		…
1588		1461
1589	login[0] = '-';	1462	login[0] = '-';
1590	strcpy (&login[1], argv0);	1463	strcpy (&login[1], argv0);
1591	argv0 = login;	1464	argv0 = login;
1592	}	1465	}
		1466
1593	execlp (shell, argv0, NULL);	1467	execlp (shell, argv0, NULL);
1594	/* no error message: STDERR is closed! */	1468	/* no error message: STDERR is closed! */
1595	}	1469	}
1596		1470
1597	#else /* __QNX__ uses qnxspawn () */
1598
1599	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1600	char *command = NULL, fullcommand[_MAX_PATH];
1601	char *arg_v, arg_a[2] = { NULL, NULL };
1602
1603	if (argv != NULL)
1604	{
1605	if (access (argv[0], X_OK) == -1)
1606	{
1607	if (strchr (argv[0], '/') == NULL)
1608	{
1609	searchenv (argv[0], "PATH", fullcommand);
1610
1611	if (fullcommand[0] != '\0')
1612	command = fullcommand;
1613	}
1614
1615	if (access (command, X_OK) == -1)
1616	return -1;
1617	}
1618	else
1619	command = argv[0];
1620
1621	arg_v = argv;
1622	}
1623	else
1624	{
1625	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1626	command = "/bin/sh";
1627
1628	arg_a[0] = my_basename (command);
1629
1630	if (OPTION (Opt_loginShell))
1631	{
1632	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1633
1634	login[0] = '-';
1635	strcpy (&login[1], arg_a[0]);
1636	arg_a[0] = login;
1637	}
1638
1639	arg_v = arg_a;
1640	}
1641
1642	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1643	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1644	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1645	command, arg_v, environ, iov_a, 0);
1646	if (login)
1647	free (login);
1648
1649	pty.close_tty ();
1650	return pty.pty;
1651	#endif
1652
1653	return -1;	1471	return -1;
1654	}	1472	}
1655		1473
1656	/----------------------- 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.132 by root, Fri Jan 6 02:11:15 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.132 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC