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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.129 by root, Mon Jan 2 22:23:26 2006 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 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.
…		…
44	{	44	{
45	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
47	/* low-intensity colors */	47	/* low-intensity colors */
48	"Black", /* 0: black (#000000) */	48	"Black", /* 0: black (#000000) */
49	#ifndef NO_BRIGHTCOLOR
50	"Red3", /* 1: red (#CD0000) */	49	"Red3", /* 1: red (#CD0000) */
51	"Green3", /* 2: green (#00CD00) */	50	"Green3", /* 2: green (#00CD00) */
52	"Yellow3", /* 3: yellow (#CDCD00) */	51	"Yellow3", /* 3: yellow (#CDCD00) */
53	"Blue3", /* 4: blue (#0000CD) */	52	"Blue3", /* 4: blue (#0000CD) */
54	"Magenta3", /* 5: magenta (#CD00CD) */	53	"Magenta3", /* 5: magenta (#CD00CD) */
…		…
62	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
63	"Grey30", /* 8: bright black (#4D4D4D) */	62	"Grey30", /* 8: bright black (#4D4D4D) */
64	# else	63	# else
65	"Grey25", /* 8: bright black (#404040) */	64	"Grey25", /* 8: bright black (#404040) */
66	# endif	65	# endif
67	#endif /* NO_BRIGHTCOLOR */
68	"Red", /* 1/9: bright red (#FF0000) */	66	"Red", /* 1/9: bright red (#FF0000) */
69	"Green", /* 2/10: bright green (#00FF00) */	67	"Green", /* 2/10: bright green (#00FF00) */
70	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"Yellow", /* 3/11: bright yellow (#FFFF00) */
71	"Blue", /* 4/12: bright blue (#0000FF) */	69	"Blue", /* 4/12: bright blue (#0000FF) */
72	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"Magenta", /* 5/13: bright magenta (#FF00FF) */
…		…
176	#if OFF_FOCUS_FADING	174	#if OFF_FOCUS_FADING
177	"black",	175	"black",
178	#endif	176	#endif
179	};	177	};
180		178
181	const char *const xa_names[] =
182	{
183	"TEXT",
184	"COMPOUND_TEXT",
185	"UTF8_STRING",
186	"MULTIPLE",
187	"TARGETS",
188	"TIMESTAMP",
189	"VT_SELECTION",
190	"INCR",
191	"WM_PROTOCOLS",
192	"WM_DELETE_WINDOW",
193	"CLIPBOARD",
194	#if ENABLE_FRILLS
195	"_MOTIF_WM_HINTS",
196	#endif
197	#if ENABLE_EWMH
198	"_NET_WM_PID",
199	"_NET_WM_NAME",
200	"_NET_WM_ICON_NAME",
201	"_NET_WM_PING",
202	#endif
203	#if USE_XIM
204	"WM_LOCALE_NAME",
205	#endif
206	#ifdef TRANSPARENT
207	"_XROOTPMAP_ID",
208	"ESETROOT_PMAP_ID",
209	#endif
210	#ifdef OFFIX_DND
211	"DndProtocol",
212	"DndSelection",
213	#endif
214	#if ENABLE_XEMBED
215	"_XEMBED",
216	"_XEMBED_INFO",
217	#endif
218	};
219
220	bool	179	bool
221	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
222	{	181	{
223	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	182	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
224	#ifdef OFF_FOCUS_FADING	183	#ifdef OFF_FOCUS_FADING
…		…
258	bgPixmap.pixmap = None;	217	bgPixmap.pixmap = None;
259	#endif	218	#endif
260		219
261	last_bot = last_state = -1;	220	last_bot = last_state = -1;
262		221
263	#ifdef MENUBAR
264	menu_readonly = 1;
265	# if ! (MENUBAR_MAX > 1)
266	CurrentBar = &BarList;
267	# endif /* (MENUBAR_MAX > 1) */
268	#endif
269
270	return true;	222	return true;
271	}	223	}
272		224
273	void	225	void
274	rxvt_term::init_secondary ()	226	rxvt_term::init_secondary ()
…		…
341	rs[Rs_name] = rxvt_r_basename (argv[0]);	293	rs[Rs_name] = rxvt_r_basename (argv[0]);
342		294
343	/*	295	/*
344	* Open display, get options/resources and create the window	296	* Open display, get options/resources and create the window
345	*/	297	*/
		298
346	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	299	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347	rs[Rs_display_name] = ":0";	300	rs[Rs_display_name] = ":0";
348		301
349	get_options (r_argc, r_argv);	302	get_options (r_argc, r_argv);
350		303
351	if (!(display = displays.get (rs[Rs_display_name])))	304	if (!(display = displays.get (rs[Rs_display_name])))
352	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]);
353		306
354	extract_resources ();	307	extract_resources ();
		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])
…		…
393	pointerBlankDelay = 2;	360	pointerBlankDelay = 2;
394	#endif	361	#endif
395		362
396	/* no point having a scrollbar without having any scrollback! */	363	/* no point having a scrollbar without having any scrollback! */
397	if (!saveLines)	364	if (!saveLines)
398	CLR_OPTION (Opt_scrollBar);	365	set_option (Opt_scrollBar, 0);
399		366
400	#ifdef PRINTPIPE	367	#ifdef PRINTPIPE
401	if (!rs[Rs_print_pipe])	368	if (!rs[Rs_print_pipe])
402	rs[Rs_print_pipe] = PRINTPIPE;	369	rs[Rs_print_pipe] = PRINTPIPE;
403	#endif	370	#endif
…		…
578	* This should support all European type languages.	545	* This should support all European type languages.
579	*/	546	*/
580	void	547	void
581	rxvt_term::set_locale (const char *locale)	548	rxvt_term::set_locale (const char *locale)
582	{	549	{
		550	set_environ (envv);
		551
583	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	552	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
584	free (this->locale);	553	free (this->locale);
585	this->locale = setlocale (LC_CTYPE, locale);	554	this->locale = setlocale (LC_CTYPE, locale);
586		555
587	if (!this->locale)	556	if (!this->locale)
588	{	557	{
589	if (*locale)	558	if (*locale)
590	{	559	{
591	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	560	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592	setlocale (LC_CTYPE, "");	561	setlocale (LC_CTYPE, "C");
593	}	562	}
594	else	563	else
595	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	564	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596		565
597	this->locale = "";	566	this->locale = "C";
598	}	567	}
599		568
600		569
601	this->locale = rxvt_strdup (this->locale);	570	this->locale = rxvt_strdup (this->locale);
602	SET_LOCALE (this->locale);	571	SET_LOCALE (this->locale);
…		…
617	}	586	}
618		587
619	void	588	void
620	rxvt_term::init_xlocale ()	589	rxvt_term::init_xlocale ()
621	{	590	{
		591	set_environ (envv);
		592
622	#ifdef USE_XIM	593	#ifdef USE_XIM
623	if (!locale)	594	if (!locale)
624	rxvt_warn ("setting locale failed, working without locale support.\n");	595	rxvt_warn ("setting locale failed, working without locale support.\n");
625	else	596	else
626	{	597	{
…		…
666	if (strcmp (key_backspace, "DEC") == 0)	637	if (strcmp (key_backspace, "DEC") == 0)
667	priv_modes \|= PrivMode_HaveBackSpace;	638	priv_modes \|= PrivMode_HaveBackSpace;
668	#endif	639	#endif
669		640
670	/* add value for scrollBar */	641	/* add value for scrollBar */
671	if (scrollbar_visible ())	642	if (scrollBar.state)
672	{	643	{
673	priv_modes \|= PrivMode_scrollBar;	644	priv_modes \|= PrivMode_scrollBar;
674	SavedModes \|= PrivMode_scrollBar;	645	SavedModes \|= PrivMode_scrollBar;
675	}	646	}
676
677	if (menubar_visible ())
678	{
679	priv_modes \|= PrivMode_menuBar;
680	SavedModes \|= PrivMode_menuBar;
681	}
682
683	#ifdef CURSOR_BLINK
684	if (OPTION (Opt_cursorBlink))
685	(void)gettimeofday (&lastcursorchange, NULL);
686	#endif
687		647
688	run_command (argv);	648	run_command (argv);
689	}	649	}
690		650
691	/----------------------------------------------------------------------/	651	/----------------------------------------------------------------------/
…		…
758	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];
759	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];
760	}	720	}
761		721
762	/*	722	/*
763	* get scrollBar/menuBar shadow colors	723	* get scrollBar shadow colors
764	*	724	*
765	* The calculations of topShadow/bottomShadow values are adapted	725	* The calculations of topShadow/bottomShadow values are adapted
766	* from the fvwm window manager.	726	* from the fvwm window manager.
767	*/	727	*/
768	#ifdef KEEP_SCROLLCOLOR	728	#ifdef KEEP_SCROLLCOLOR
…		…
813	int i = atoi (rs[Rs_color + idx]);	773	int i = atoi (rs[Rs_color + idx]);
814		774
815	if (i >= 8 && i <= 15)	775	if (i >= 8 && i <= 15)
816	{ /* bright colors */	776	{ /* bright colors */
817	i -= 8;	777	i -= 8;
818	#ifndef NO_BRIGHTCOLOR
819	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	778	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820	return;	779	return;
821	#endif
822	}	780	}
823		781
824	if (i >= 0 && i <= 7) /* normal colors */	782	if (i >= 0 && i <= 7) /* normal colors */
825	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	783	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826	}	784	}
…		…
921	rxvt_term::create_windows (int argc, const char const argv)	879	rxvt_term::create_windows (int argc, const char const argv)
922	{	880	{
923	XClassHint classHint;	881	XClassHint classHint;
924	XWMHints wmHint;	882	XWMHints wmHint;
925	#if ENABLE_FRILLS	883	#if ENABLE_FRILLS
926	Atom prop = None;
927	MWMHints mwmhints;	884	MWMHints mwmhints;
928	#endif	885	#endif
929	XGCValues gcvalue;	886	XGCValues gcvalue;
930	long vt_emask;
931	XSetWindowAttributes attributes;	887	XSetWindowAttributes attributes;
932	XWindowAttributes gattr;
933	Window top, parent;	888	Window top, parent;
934	dDisp;	889	dDisp;
935		890
936	#ifdef USING_W11LIB	891	xa = display->xa;
937	/* enable W11 callbacks */
938	W11AddEventHandler (disp, rxvt_W11_process_x_event);
939	#endif
940		892
941	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	893	/* grab colors before netscape does */
942	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	894	Get_Colours ();
943		895
944	if (OPTION (Opt_transparent))	896	if (!set_fonts ())
945	{	897	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	898
947	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	899	parent = display->root;
948	}	900
		901	attributes.override_redirect = !!OPTION (Opt_override_redirect);
949		902
950	#if ENABLE_FRILLS	903	#if ENABLE_FRILLS
951	if (OPTION (Opt_borderLess))	904	if (OPTION (Opt_borderLess))
952	{	905	{
953	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	906	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
954
955	if (prop == None)
956	{	907	{
957	/* 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");*/
958	#ifdef PREFER_24BIT
959	attributes.override_redirect = TRUE;	909	attributes.override_redirect = TRUE;
960	#endif
961	mwmhints.flags = 0;	910	mwmhints.flags = 0;
962	}	911	}
963	else	912	else
964	{	913	{
965	mwmhints.flags = MWM_HINTS_DECORATIONS;	914	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
968	}	917	}
969	else	918	else
970	mwmhints.flags = 0;	919	mwmhints.flags = 0;
971	#endif	920	#endif
972		921
973	/* grab colors before netscape does */
974	Get_Colours ();
975
976	if (!set_fonts ())
977	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979	parent = DefaultRootWindow (disp);
980
981	#if ENABLE_XEMBED	922	#if ENABLE_XEMBED
982	if (rs[Rs_embed])	923	if (rs[Rs_embed])
983	{	924	{
984	XWindowAttributes wattr;	925	XWindowAttributes wattr;
985		926
…		…
993	#endif	934	#endif
994		935
995	window_calc (0, 0);	936	window_calc (0, 0);
996		937
997	/* sub-window placement & size in rxvt_resize_subwindows () */	938	/* sub-window placement & size in rxvt_resize_subwindows () */
998	#ifdef PREFER_24BIT
999	attributes.background_pixel = pix_colors_focused[Color_border];	939	attributes.background_pixel = pix_colors_focused[Color_border];
1000	attributes.border_pixel = pix_colors_focused[Color_border];	940	attributes.border_pixel = pix_colors_focused[Color_border];
1001	attributes.colormap = display->cmap;	941	attributes.colormap = display->cmap;
		942
1002	top = XCreateWindow (disp, parent,	943	top = XCreateWindow (disp, parent,
1003	szHint.x, szHint.y,	944	szHint.x, szHint.y,
1004	szHint.width, szHint.height,	945	szHint.width, szHint.height,
1005	ext_bwidth,	946	ext_bwidth,
1006	display->depth, InputOutput,	947	display->depth, InputOutput,
1007	display->visual,	948	display->visual,
1008	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	949	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1009	#else	950	&attributes);
1010	top = XCreateSimpleWindow (disp, parent,
1011	szHint.x, szHint.y,
1012	szHint.width, szHint.height,
1013	ext_bwidth,
1014	pix_colors_focused[Color_border],
1015	pix_colors_focused[Color_border]);
1016	#endif
1017		951
1018	this->parent[0] = top;	952	this->parent[0] = top;
1019		953
1020	old_width = szHint.width;	954	old_width = szHint.width;
1021	old_height = szHint.height;	955	old_height = szHint.height;
1022		956
1023	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	957	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	958	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025		959
1026	classHint.res_name = (char *)rs[Rs_name];	960	classHint.res_name = (char *)rs[Rs_name];
1027	classHint.res_class = (char *)RESCLASS;	961	classHint.res_class = (char *)RESCLASS;
1028		962
1029	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	963	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1030	wmHint.input = True;	964	wmHint.input = True;
1031	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	965	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032	wmHint.window_group = top;	966	wmHint.window_group = top;
1033		967
1034	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	968	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1035	&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
1036		976
1037	Atom protocols[] = {	977	Atom protocols[] = {
1038	xa[XA_WM_DELETE_WINDOW],	978	xa[XA_WM_DELETE_WINDOW],
1039	#if ENABLE_EWMH	979	#if ENABLE_EWMH
1040	xa[XA_NET_WM_PING],	980	xa[XA_NET_WM_PING],
1041	#endif	981	#endif
1042	};	982	};
1043		983
1044	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	984	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045		985
		986	#if ENABLE_FRILLS
		987	if (rs[Rs_transient_for])
		988	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		989	#endif
		990
1046	#if ENABLE_EWMH	991	#if ENABLE_EWMH
1047	long pid = getpid ();	992	long pid = getpid ();
1048		993
1049	XChangeProperty (disp, top,	994	XChangeProperty (disp, top,
1050	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	995	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
…		…
1061	\| FocusChangeMask \| VisibilityChangeMask	1006	\| FocusChangeMask \| VisibilityChangeMask
1062	\| ExposureMask \| StructureNotifyMask);	1007	\| ExposureMask \| StructureNotifyMask);
1063		1008
1064	termwin_ev.start (display, top);	1009	termwin_ev.start (display, top);
1065		1010
1066	#if ENABLE_FRILLS
1067	if (mwmhints.flags)
1068	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1069	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1070	#endif
1071
1072	/* 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 */
1073	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1012	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1074		1013
1075	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1014	#ifdef HAVE_SCROLLBARS
1076	/* cursor (menuBar/scrollBar): Black-on-White */	1015	/* cursor scrollBar: Black-on-White */
1077	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1016	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1078	#endif	1017	#endif
1079		1018
1080	/* the vt window */	1019	/* the vt window */
1081	vt = XCreateSimpleWindow (disp, top,	1020	vt = XCreateSimpleWindow (disp, top,
1082	window_vt_x,
1083	window_vt_y,	1021	window_vt_x, window_vt_y,
1084	TermWin_TotalWidth (),	1022	width, height,
1085	TermWin_TotalHeight (),
1086	0,	1023	0,
1087	pix_colors_focused[Color_fg],	1024	pix_colors_focused[Color_fg],
1088	pix_colors_focused[Color_bg]);	1025	pix_colors_focused[Color_bg]);
1089	#ifdef DEBUG_X
1090	XStoreName (disp, vt, "vt window");
1091	#endif
1092		1026
1093	attributes.bit_gravity = NorthWestGravity;	1027	attributes.bit_gravity = NorthWestGravity;
1094	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1028	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095		1029
1096	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1030	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1097		1031
1098	#ifdef POINTER_BLANK
1099	if (OPTION (Opt_pointerBlank))	1032	if (OPTION (Opt_pointerBlank))
1100	vt_emask \|= PointerMotionMask;	1033	vt_emask \|= PointerMotionMask;
1101	else	1034	else
1102	#endif
1103	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1035	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1104		1036
1105	XSelectInput (disp, vt, vt_emask);	1037	vt_select_input ();
		1038
1106	vt_ev.start (display, vt);	1039	vt_ev.start (display, vt);
1107
1108	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109	if (menuBar_height ())
1110	{
1111	menuBar.win = XCreateSimpleWindow (disp, top,
1112	window_vt_x, 0,
1113	TermWin_TotalWidth (),
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		1040
1134	#ifdef XPM_BACKGROUND	1041	#ifdef XPM_BACKGROUND
1135	if (rs[Rs_backgroundPixmap] != NULL	1042	if (rs[Rs_backgroundPixmap] != NULL
1136	&& ! OPTION (Opt_transparent))	1043	&& ! OPTION (Opt_transparent))
1137	{	1044	{
…		…
1147	scr_touch (true);	1054	scr_touch (true);
1148	}	1055	}
1149	#endif	1056	#endif
1150		1057
1151	/* graphics context for the vt window */	1058	/* graphics context for the vt window */
1152	gcvalue.foreground = pix_colors[Color_fg];	1059	gcvalue.foreground = pix_colors[Color_fg];
1153	gcvalue.background = pix_colors[Color_bg];	1060	gcvalue.background = pix_colors[Color_bg];
1154	gcvalue.graphics_exposures = 1;	1061	gcvalue.graphics_exposures = 1;
		1062
1155	gc = XCreateGC (disp, vt,	1063	gc = XCreateGC (disp, vt,
1156	GCForeground \| GCBackground \| GCGraphicsExposures,	1064	GCForeground \| GCBackground \| GCGraphicsExposures,
1157	&gcvalue);	1065	&gcvalue);
1158		1066
1159	drawable = new rxvt_drawable (display, vt);	1067	drawable = new rxvt_drawable (display, vt);
1160		1068
1161	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1069	#ifdef RXVT_SCROLLBAR
1162	gcvalue.foreground = pix_colors[Color_topShadow];	1070	gcvalue.foreground = pix_colors[Color_topShadow];
1163	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1071	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164	gcvalue.foreground = pix_colors[Color_bottomShadow];	1072	gcvalue.foreground = pix_colors[Color_bottomShadow];
1165	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1073	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1166	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1074	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
…		…
1173	pix_colors = pix_colors_unfocused;	1081	pix_colors = pix_colors_unfocused;
1174	#endif	1082	#endif
1175		1083
1176	pointer_unblank ();	1084	pointer_unblank ();
1177	scr_recolour ();	1085	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	}	1086	}
1189		1087
1190	/* ------------------------------------------------------------------------- *	1088	/* ------------------------------------------------------------------------- *
1191	* GET TTY CURRENT STATE *	1089	* GET TTY CURRENT STATE *
1192	* ------------------------------------------------------------------------- */	1090	* ------------------------------------------------------------------------- */
…		…
1409	rxvt_term::run_command (const char const argv)	1307	rxvt_term::run_command (const char const argv)
1410	{	1308	{
1411	#if ENABLE_FRILLS	1309	#if ENABLE_FRILLS
1412	if (rs[Rs_pty_fd])	1310	if (rs[Rs_pty_fd])
1413	{	1311	{
1414	pty.pty = atoi (rs[Rs_pty_fd]);	1312	pty->pty = atoi (rs[Rs_pty_fd]);
1415		1313
		1314	if (pty->pty >= 0)
		1315	{
1416	if (getfd_hook)	1316	if (getfd_hook)
1417	pty.pty = (*getfd_hook) (pty.pty);	1317	pty->pty = (*getfd_hook) (pty->pty);
1418		1318
1419	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1319	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1320	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1321	}
1421	}	1322	}
1422	else	1323	else
1423	#endif	1324	#endif
1424	if (!pty.get ())	1325	if (!pty->get ())
1425	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1326	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1426		1327
1427	pty.set_utf8_mode (enc_utf8);	1328	pty->set_utf8_mode (enc_utf8);
1428		1329
1429	/* set initial window size */	1330	/* set initial window size */
1430	tt_winch ();	1331	tt_winch ();
1431		1332
1432	int er;	1333	int er;
…		…
1445	#if ENABLE_FRILLS	1346	#if ENABLE_FRILLS
1446	if (rs[Rs_pty_fd])	1347	if (rs[Rs_pty_fd])
1447	return;	1348	return;
1448	#endif	1349	#endif
1449		1350
1450	#ifndef __QNX__
1451	/* spin off the command interpreter */	1351	/* spin off the command interpreter */
1452	switch (cmd_pid = fork ())	1352	switch (cmd_pid = fork ())
1453	{	1353	{
1454	case -1:	1354	case -1:
1455	{	1355	{
…		…
1457	rxvt_fatal ("can't fork, aborting.\n");	1357	rxvt_fatal ("can't fork, aborting.\n");
1458	}	1358	}
1459	case 0:	1359	case 0:
1460	init_env ();	1360	init_env ();
1461		1361
1462	if (!pty.make_controlling_tty ())	1362	if (!pty->make_controlling_tty ())
1463	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1363	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1464	else	1364	else
1465	{	1365	{
1466	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1366	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1467	dup2 (pty.tty, STDIN_FILENO);	1367	dup2 (pty->tty, STDIN_FILENO);
1468	dup2 (pty.tty, STDOUT_FILENO);	1368	dup2 (pty->tty, STDOUT_FILENO);
1469	dup2 (pty.tty, STDERR_FILENO);	1369	dup2 (pty->tty, STDERR_FILENO);
1470		1370
1471	// close all our file handles that we do no longer need	1371	// close all our file handles that we do no longer need
1472	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1372	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1473	{	1373	{
1474	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1374	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1475	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1375	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1476	}	1376	}
1477		1377
1478	run_child (argv);	1378	run_child (argv);
1479	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1379	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1480	}	1380	}
1481		1381
1482	_exit (EXIT_FAILURE);	1382	_exit (EXIT_FAILURE);
1483		1383
1484	default:	1384	default:
1485	{	1385	if (!OPTION (Opt_utmpInhibit))
1486	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1386	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1487	int fdstdin;
1488		1387
1489	fdstdin = dup (STDIN_FILENO);	1388	pty->close_tty ();
1490	dup2 (pty.tty, STDIN_FILENO);
1491	#endif
1492		1389
1493	#ifdef UTMP_SUPPORT	1390	child_ev.start (cmd_pid);
1494	privileged_utmp (SAVE);
1495	#endif
1496		1391
1497	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1392	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1498
1499	dup2 (fdstdin, STDIN_FILENO);
1500	close (fdstdin);
1501	#endif
1502	}
1503
1504	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1505	break;	1393	break;
1506	}	1394	}
1507	#else /* __QNX__ uses qnxspawn () */
1508	fchmod (pty.tty, 0622);
1509	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1510	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1511
1512	if (run_child (argv) == -1)
1513	exit (EXIT_FAILURE);
1514	#endif
1515	}	1395	}
1516		1396
1517	/* ------------------------------------------------------------------------- *	1397	/* ------------------------------------------------------------------------- *
1518	* CHILD PROCESS OPERATIONS *	1398	* CHILD PROCESS OPERATIONS *
1519	* ------------------------------------------------------------------------- */	1399	* ------------------------------------------------------------------------- */
…		…
1563	// unblock signals (signals are blocked by iom.C	1443	// unblock signals (signals are blocked by iom.C
1564	sigset_t ss;	1444	sigset_t ss;
1565	sigemptyset (&ss);	1445	sigemptyset (&ss);
1566	sigprocmask (SIG_SETMASK, &ss, 0);	1446	sigprocmask (SIG_SETMASK, &ss, 0);
1567		1447
1568	#ifndef __QNX__
1569	/* command interpreter path */	1448	/* command interpreter path */
1570	if (argv != NULL)	1449	if (argv != NULL)
1571	{	1450	{
1572	# ifdef DEBUG_CMD	1451	# ifdef DEBUG_CMD
1573	int i;	1452	int i;
…		…
1579	execvp (argv[0], (char const )argv);	1458	execvp (argv[0], (char const )argv);
1580	/* no error message: STDERR is closed! */	1459	/* no error message: STDERR is closed! */
1581	}	1460	}
1582	else	1461	else
1583	{	1462	{
1584	const char argv0, shell;	1463	const char argv0, shell;
1585		1464
1586	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1465	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1587	shell = "/bin/sh";	1466	shell = "/bin/sh";
1588		1467
1589	argv0 = (const char *)rxvt_r_basename (shell);	1468	argv0 = (const char *)rxvt_r_basename (shell);
…		…
1594		1473
1595	login[0] = '-';	1474	login[0] = '-';
1596	strcpy (&login[1], argv0);	1475	strcpy (&login[1], argv0);
1597	argv0 = login;	1476	argv0 = login;
1598	}	1477	}
		1478
1599	execlp (shell, argv0, NULL);	1479	execlp (shell, argv0, NULL);
1600	/* no error message: STDERR is closed! */	1480	/* no error message: STDERR is closed! */
1601	}	1481	}
1602		1482
1603	#else /* __QNX__ uses qnxspawn () */
1604
1605	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1606	char *command = NULL, fullcommand[_MAX_PATH];
1607	char *arg_v, arg_a[2] = { NULL, NULL };
1608
1609	if (argv != NULL)
1610	{
1611	if (access (argv[0], X_OK) == -1)
1612	{
1613	if (strchr (argv[0], '/') == NULL)
1614	{
1615	searchenv (argv[0], "PATH", fullcommand);
1616
1617	if (fullcommand[0] != '\0')
1618	command = fullcommand;
1619	}
1620
1621	if (access (command, X_OK) == -1)
1622	return -1;
1623	}
1624	else
1625	command = argv[0];
1626
1627	arg_v = argv;
1628	}
1629	else
1630	{
1631	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1632	command = "/bin/sh";
1633
1634	arg_a[0] = my_basename (command);
1635
1636	if (OPTION (Opt_loginShell))
1637	{
1638	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1639
1640	login[0] = '-';
1641	strcpy (&login[1], arg_a[0]);
1642	arg_a[0] = login;
1643	}
1644
1645	arg_v = arg_a;
1646	}
1647
1648	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1649	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1650	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1651	command, arg_v, environ, iov_a, 0);
1652	if (login)
1653	free (login);
1654
1655	pty.close_tty ();
1656	return pty.pty;
1657	#endif
1658
1659	return -1;	1483	return -1;
1660	}	1484	}
1661		1485
1662	/----------------------- 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.129 by root, Mon Jan 2 22:23:26 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.129 by root, Mon Jan 2 22:23:26 2006 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 2006 UTC