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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.143 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.156 by root, Wed Jan 25 21:03:04 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;
…		…
344	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]);
345		301
346	extract_resources ();	302	extract_resources ();
347		303
348	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
		318
		319	xa = display->xa;
		320
		321	#if ENABLE_FRILLS
		322	if (rs[Rs_depth])
		323	set (display, strtol (rs[Rs_depth], 0, 0));
		324	else
		325	#endif
		326	set (display);
349		327
350	/*	328	/*
351	* set any defaults not already set	329	* set any defaults not already set
352	*/	330	*/
353	if (cmd_argv && cmd_argv[0])	331	if (cmd_argv && cmd_argv[0])
…		…
514	i = strlen (val);	492	i = strlen (val);
515	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
516		494
517	sprintf (env_display, "DISPLAY=%s", val);	495	sprintf (env_display, "DISPLAY=%s", val);
518		496
519	/* avoiding the math library:	497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522	;
523	max_it (i, 1);
524	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
525
526	sprintf (env_windowid, "WINDOWID=%u",
527	(unsigned int)parent[0]);
528		498
529	/* add entries to the environment:	499	/* add entries to the environment:
530	* @ DISPLAY: in case we started with -display	500	* @ DISPLAY: in case we started with -display
531	* @ WINDOWID: X window id number of the window	501	* @ WINDOWID: X window id number of the window
532	* @ COLORTERM: terminal sub-name and also indicates its color	502	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
534	* @ TERMINFO: path to terminfo directory	504	* @ TERMINFO: path to terminfo directory
535	* @ COLORFGBG: fg;bg color codes	505	* @ COLORFGBG: fg;bg color codes
536	*/	506	*/
537	putenv (env_display);	507	putenv (env_display);
538	putenv (env_windowid);	508	putenv (env_windowid);
		509
539	if (env_colorfgbg)	510	if (env_colorfgbg)
540	putenv (env_colorfgbg);	511	putenv (env_colorfgbg);
541		512
542	#ifdef RXVT_TERMINFO	513	#ifdef RXVT_TERMINFO
543	putenv ("TERMINFO=" RXVT_TERMINFO);	514	putenv ("TERMINFO=" RXVT_TERMINFO);
544	#endif	515	#endif
545		516
546	if (display->depth <= 2)	517	if (depth <= 2)
547	putenv ("COLORTERM=" COLORTERMENV "-mono");	518	putenv ("COLORTERM=" COLORTERMENV "-mono");
548	else	519	else
549	putenv ("COLORTERM=" COLORTERMENVFULL);	520	putenv ("COLORTERM=" COLORTERMENVFULL);
550		521
551	if (rs[Rs_term_name] != NULL)	522	if (rs[Rs_term_name] != NULL)
…		…
682		653
683	#ifdef OFF_FOCUS_FADING	654	#ifdef OFF_FOCUS_FADING
684	pix_colors = pix_colors_focused;	655	pix_colors = pix_colors_focused;
685	#endif	656	#endif
686		657
687	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688	{	659	{
689	rxvt_color xcol;	660	rxvt_color xcol;
690		661
691	if (!rs[Rs_color + i])	662	if (!rs[Rs_color + i])
692	continue;	663	continue;
…		…
732	SET_PIXCOLOR (i);	703	SET_PIXCOLOR (i);
733	}	704	}
734		705
735	#ifdef OFF_FOCUS_FADING	706	#ifdef OFF_FOCUS_FADING
736	if (rs[Rs_fade])	707	if (rs[Rs_fade])
737	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	708	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
738	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	709	pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739	#endif	710	#endif
740		711
741	if (display->depth <= 2)	712	if (depth <= 2)
742	{	713	{
743	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	714	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
744	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];
745	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];
746	}	717	}
…		…
751	* The calculations of topShadow/bottomShadow values are adapted	722	* The calculations of topShadow/bottomShadow values are adapted
752	* from the fvwm window manager.	723	* from the fvwm window manager.
753	*/	724	*/
754	#ifdef KEEP_SCROLLCOLOR	725	#ifdef KEEP_SCROLLCOLOR
755		726
756	if (display->depth <= 2)	727	if (depth <= 2)
757	{	728	{
758	/* Monochrome */	729	/* Monochrome */
759	pix_colors[Color_scroll] = pix_colors[Color_fg];	730	pix_colors[Color_scroll] = pix_colors[Color_fg];
760	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	pix_colors[Color_topShadow] = pix_colors[Color_bg];
761	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
…		…
766	/* xcol[0] == white	737	/* xcol[0] == white
767	* xcol[1] == top shadow	738	* xcol[1] == top shadow
768	* xcol[2] == bot shadow */	739	* xcol[2] == bot shadow */
769		740
770	xcol[1] = pix_colors[Color_scroll];	741	xcol[1] = pix_colors[Color_scroll];
771	xcol[0].set (display, 65535, 65535, 65535);	742	xcol[0].set (this, 65535, 65535, 65535);
772		743
773	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;	744	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
774		745
775	xcol[0].get (display, pr0, pg0, pb0);	746	xcol[0].get (this, pr0, pg0, pb0);
776	xcol[1].get (display, pr1, pg1, pb1);	747	xcol[1].get (this, pr1, pg1, pb1);
777		748
778	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);	749	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
779		750
780	/* topShadowColor */	751	/* topShadowColor */
781	if (!xcol[1].set (display,	752	if (!xcol[1].set (this,
782	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	753	min (pr0, max (pr0 / 5, pr1) * 7 / 5),
783	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	754	min (pg0, max (pg0 / 5, pg1) * 7 / 5),
784	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	755	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
785	xcol[1] = pix_colors[Color_White];	756	xcol[1] = pix_colors[Color_White];
786		757
…		…
905	rxvt_term::create_windows (int argc, const char const argv)	876	rxvt_term::create_windows (int argc, const char const argv)
906	{	877	{
907	XClassHint classHint;	878	XClassHint classHint;
908	XWMHints wmHint;	879	XWMHints wmHint;
909	#if ENABLE_FRILLS	880	#if ENABLE_FRILLS
910	Atom prop = None;
911	MWMHints mwmhints;	881	MWMHints mwmhints;
912	#endif	882	#endif
913	XGCValues gcvalue;	883	XGCValues gcvalue;
914	XSetWindowAttributes attributes;	884	XSetWindowAttributes attributes;
915	XWindowAttributes gattr;
916	Window top, parent;	885	Window top, parent;
917	dDisp;
918		886
919	#ifdef USING_W11LIB	887	dLocal (Display *, xdisp);
920	/* enable W11 callbacks */
921	W11AddEventHandler (disp, rxvt_W11_process_x_event);
922	#endif
923		888
924	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	889	/* grab colors before netscape does */
925	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	890	Get_Colours ();
926		891
927	if (OPTION (Opt_transparent))	892	if (!set_fonts ())
928	{	893	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	894
930	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	895	parent = display->root;
931	}	896
		897	attributes.override_redirect = !!OPTION (Opt_override_redirect);
932		898
933	#if ENABLE_FRILLS	899	#if ENABLE_FRILLS
934	if (OPTION (Opt_borderLess))	900	if (OPTION (Opt_borderLess))
935	{	901	{
936	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	902	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
937
938	if (prop == None)
939	{	903	{
940	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	904	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
941	#ifdef PREFER_24BIT
942	attributes.override_redirect = TRUE;	905	attributes.override_redirect = TRUE;
943	#endif
944	mwmhints.flags = 0;	906	mwmhints.flags = 0;
945	}	907	}
946	else	908	else
947	{	909	{
948	mwmhints.flags = MWM_HINTS_DECORATIONS;	910	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
951	}	913	}
952	else	914	else
953	mwmhints.flags = 0;	915	mwmhints.flags = 0;
954	#endif	916	#endif
955		917
956	/* grab colors before netscape does */
957	Get_Colours ();
958
959	if (!set_fonts ())
960	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962	parent = DefaultRootWindow (disp);
963
964	#if ENABLE_XEMBED	918	#if ENABLE_XEMBED
965	if (rs[Rs_embed])	919	if (rs[Rs_embed])
966	{	920	{
967	XWindowAttributes wattr;	921	XWindowAttributes wattr;
968		922
969	parent = strtol (rs[Rs_embed], 0, 0);	923	parent = strtol (rs[Rs_embed], 0, 0);
970		924
971	if (!XGetWindowAttributes (disp, parent, &wattr))	925	if (!XGetWindowAttributes (xdisp, parent, &wattr))
972	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	926	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973		927
974	window_calc (wattr.width, wattr.height);	928	window_calc (wattr.width, wattr.height);
975	}	929	}
976	#endif	930	#endif
977		931
978	window_calc (0, 0);	932	window_calc (0, 0);
979		933
980	/* sub-window placement & size in rxvt_resize_subwindows () */	934	/* sub-window placement & size in rxvt_resize_subwindows () */
981	#ifdef PREFER_24BIT
982	attributes.background_pixel = pix_colors_focused[Color_border];	935	attributes.background_pixel = pix_colors_focused [Color_border];
983	attributes.border_pixel = pix_colors_focused[Color_border];	936	attributes.border_pixel = pix_colors_focused [Color_border];
984	attributes.colormap = display->cmap;	937	attributes.colormap = cmap;
		938
985	top = XCreateWindow (disp, parent,	939	top = XCreateWindow (xdisp, parent,
986	szHint.x, szHint.y,	940	szHint.x, szHint.y,
987	szHint.width, szHint.height,	941	szHint.width, szHint.height,
988	ext_bwidth,	942	ext_bwidth,
989	display->depth, InputOutput,	943	depth, InputOutput, visual,
990	display->visual,
991	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	944	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
992	#else	945	&attributes);
993	top = XCreateSimpleWindow (disp, parent,
994	szHint.x, szHint.y,
995	szHint.width, szHint.height,
996	ext_bwidth,
997	pix_colors_focused[Color_border],
998	pix_colors_focused[Color_border]);
999	#endif
1000		946
1001	this->parent[0] = top;	947	this->parent[0] = top;
1002		948
1003	old_width = szHint.width;	949	old_width = szHint.width;
1004	old_height = szHint.height;	950	old_height = szHint.height;
1005		951
1006	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	952	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	953	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008		954
1009	classHint.res_name = (char *)rs[Rs_name];	955	classHint.res_name = (char *)rs[Rs_name];
1010	classHint.res_class = (char *)RESCLASS;	956	classHint.res_class = (char *)RESCLASS;
1011		957
1012	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	958	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1013	wmHint.input = True;	959	wmHint.input = True;
1014	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	960	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1015	wmHint.window_group = top;	961	wmHint.window_group = top;
1016		962
1017	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	963	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1018	&szHint, &wmHint, &classHint);	964	&szHint, &wmHint, &classHint);
		965
		966	#if ENABLE_FRILLS
		967	if (mwmhints.flags)
		968	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		969	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		970	#endif
1019		971
1020	Atom protocols[] = {	972	Atom protocols[] = {
1021	xa[XA_WM_DELETE_WINDOW],	973	xa[XA_WM_DELETE_WINDOW],
1022	#if ENABLE_EWMH	974	#if ENABLE_EWMH
1023	xa[XA_NET_WM_PING],	975	xa[XA_NET_WM_PING],
1024	#endif	976	#endif
1025	};	977	};
1026		978
1027	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	979	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028		980
1029	#if ENABLE_FRILLS	981	#if ENABLE_FRILLS
1030	if (rs[Rs_transient_for])	982	if (rs[Rs_transient_for])
1031	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	983	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032	#endif	984	#endif
1033		985
1034	#if ENABLE_EWMH	986	#if ENABLE_EWMH
1035	long pid = getpid ();	987	long pid = getpid ();
1036		988
1037	XChangeProperty (disp, top,	989	XChangeProperty (xdisp, top,
1038	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	990	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039	PropModeReplace, (unsigned char *)&pid, 1);	991	PropModeReplace, (unsigned char *)&pid, 1);
1040		992
1041	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	993	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042	#endif	994	#endif
1043		995
1044	XSelectInput (disp, top,	996	XSelectInput (xdisp, top,
1045	KeyPressMask	997	KeyPressMask
1046	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	998	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1047	\| KeyReleaseMask	999	\| KeyReleaseMask
1048	#endif	1000	#endif
1049	\| FocusChangeMask \| VisibilityChangeMask	1001	\| FocusChangeMask \| VisibilityChangeMask
1050	\| ExposureMask \| StructureNotifyMask);	1002	\| ExposureMask \| StructureNotifyMask);
1051		1003
1052	termwin_ev.start (display, top);	1004	termwin_ev.start (display, top);
1053		1005
1054	#if ENABLE_FRILLS
1055	if (mwmhints.flags)
1056	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058	#endif
1059
1060	/* vt cursor: Black-on-White is standard, but this is more popular */	1006	/* vt cursor: Black-on-White is standard, but this is more popular */
1061	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1007	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1062		1008
1063	#ifdef HAVE_SCROLLBARS	1009	#ifdef HAVE_SCROLLBARS
1064	/* cursor scrollBar: Black-on-White */	1010	/* cursor scrollBar: Black-on-White */
1065	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1011	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1066	#endif	1012	#endif
1067		1013
1068	/* the vt window */	1014	/* the vt window */
1069	vt = XCreateSimpleWindow (disp, top,	1015	vt = XCreateSimpleWindow (xdisp, top,
1070	window_vt_x,
1071	window_vt_y,	1016	window_vt_x, window_vt_y,
1072	width,
1073	height,	1017	width, height,
1074	0,	1018	0,
1075	pix_colors_focused[Color_fg],	1019	pix_colors_focused[Color_fg],
1076	pix_colors_focused[Color_bg]);	1020	pix_colors_focused[Color_bg]);
1077	#ifdef DEBUG_X
1078	XStoreName (disp, vt, "vt window");
1079	#endif
1080		1021
1081	attributes.bit_gravity = NorthWestGravity;	1022	attributes.bit_gravity = NorthWestGravity;
1082	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1023	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1083		1024
1084	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1025	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1085		1026
1086	if (OPTION (Opt_pointerBlank))	1027	if (OPTION (Opt_pointerBlank))
1087	vt_emask \|= PointerMotionMask;	1028	vt_emask \|= PointerMotionMask;
…		…
1092		1033
1093	vt_ev.start (display, vt);	1034	vt_ev.start (display, vt);
1094		1035
1095	#ifdef XPM_BACKGROUND	1036	#ifdef XPM_BACKGROUND
1096	if (rs[Rs_backgroundPixmap] != NULL	1037	if (rs[Rs_backgroundPixmap] != NULL
1097	&& ! OPTION (Opt_transparent))	1038	&& !OPTION (Opt_transparent))
1098	{	1039	{
1099	const char *p = rs[Rs_backgroundPixmap];	1040	const char *p = rs[Rs_backgroundPixmap];
1100		1041
1101	if ((p = strchr (p, ';')) != NULL)	1042	if ((p = strchr (p, ';')) != NULL)
1102	{	1043	{
…		…
1108	scr_touch (true);	1049	scr_touch (true);
1109	}	1050	}
1110	#endif	1051	#endif
1111		1052
1112	/* graphics context for the vt window */	1053	/* graphics context for the vt window */
1113	gcvalue.foreground = pix_colors[Color_fg];	1054	gcvalue.foreground = pix_colors[Color_fg];
1114	gcvalue.background = pix_colors[Color_bg];	1055	gcvalue.background = pix_colors[Color_bg];
1115	gcvalue.graphics_exposures = 1;	1056	gcvalue.graphics_exposures = 1;
		1057
1116	gc = XCreateGC (disp, vt,	1058	gc = XCreateGC (xdisp, vt,
1117	GCForeground \| GCBackground \| GCGraphicsExposures,	1059	GCForeground \| GCBackground \| GCGraphicsExposures,
1118	&gcvalue);	1060	&gcvalue);
1119		1061
1120	drawable = new rxvt_drawable (display, vt);	1062	drawable = new rxvt_drawable (this, vt);
1121		1063
1122	#ifdef RXVT_SCROLLBAR	1064	#ifdef RXVT_SCROLLBAR
1123	gcvalue.foreground = pix_colors[Color_topShadow];	1065	gcvalue.foreground = pix_colors[Color_topShadow];
1124	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1066	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1125	gcvalue.foreground = pix_colors[Color_bottomShadow];	1067	gcvalue.foreground = pix_colors[Color_bottomShadow];
1126	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1068	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1127	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1069	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1070	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1129	#endif	1071	#endif
1130		1072
1131	#ifdef OFF_FOCUS_FADING	1073	#ifdef OFF_FOCUS_FADING
1132	// initially we are in unfocused state	1074	// initially we are in unfocused state
1133	if (rs[Rs_fade])	1075	if (rs[Rs_fade])
1134	pix_colors = pix_colors_unfocused;	1076	pix_colors = pix_colors_unfocused;
1135	#endif	1077	#endif
1136		1078
1137	pointer_unblank ();	1079	pointer_unblank ();
1138	scr_recolour ();	1080	scr_recolour ();
1139
1140	#if ENABLE_XEMBED
1141	if (rs[Rs_embed])
1142	{
1143	long info[2] = { 0, XEMBED_MAPPED };
1144
1145	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146	32, PropModeReplace, (unsigned char *)&info, 2);
1147	}
1148	#endif
1149	}	1081	}
1150		1082
1151	/* ------------------------------------------------------------------------- *	1083	/* ------------------------------------------------------------------------- *
1152	* GET TTY CURRENT STATE *	1084	* GET TTY CURRENT STATE *
1153	* ------------------------------------------------------------------------- */	1085	* ------------------------------------------------------------------------- */
…		…
1370	rxvt_term::run_command (const char const argv)	1302	rxvt_term::run_command (const char const argv)
1371	{	1303	{
1372	#if ENABLE_FRILLS	1304	#if ENABLE_FRILLS
1373	if (rs[Rs_pty_fd])	1305	if (rs[Rs_pty_fd])
1374	{	1306	{
1375	pty.pty = atoi (rs[Rs_pty_fd]);	1307	pty->pty = atoi (rs[Rs_pty_fd]);
1376		1308
1377	if (pty.pty >= 0)	1309	if (pty->pty >= 0)
1378	{	1310	{
1379	if (getfd_hook)	1311	if (getfd_hook)
1380	pty.pty = (*getfd_hook) (pty.pty);	1312	pty->pty = (*getfd_hook) (pty->pty);
1381		1313
1382	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1314	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1315	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384	}	1316	}
1385	}	1317	}
1386	else	1318	else
1387	#endif	1319	#endif
1388	if (!pty.get ())	1320	if (!pty->get ())
1389	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1321	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390		1322
1391	pty.set_utf8_mode (enc_utf8);	1323	pty->set_utf8_mode (enc_utf8);
1392		1324
1393	/* set initial window size */	1325	/* set initial window size */
1394	tt_winch ();	1326	tt_winch ();
1395		1327
1396	int er;	1328	int er;
…		…
1409	#if ENABLE_FRILLS	1341	#if ENABLE_FRILLS
1410	if (rs[Rs_pty_fd])	1342	if (rs[Rs_pty_fd])
1411	return;	1343	return;
1412	#endif	1344	#endif
1413		1345
1414	#ifndef __QNX__
1415	/* spin off the command interpreter */	1346	/* spin off the command interpreter */
1416	switch (cmd_pid = fork ())	1347	switch (cmd_pid = fork ())
1417	{	1348	{
1418	case -1:	1349	case -1:
1419	{	1350	{
…		…
1421	rxvt_fatal ("can't fork, aborting.\n");	1352	rxvt_fatal ("can't fork, aborting.\n");
1422	}	1353	}
1423	case 0:	1354	case 0:
1424	init_env ();	1355	init_env ();
1425		1356
1426	if (!pty.make_controlling_tty ())	1357	if (!pty->make_controlling_tty ())
1427	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1358	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1428	else	1359	else
1429	{	1360	{
1430	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1361	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1431	dup2 (pty.tty, STDIN_FILENO);	1362	dup2 (pty->tty, STDIN_FILENO);
1432	dup2 (pty.tty, STDOUT_FILENO);	1363	dup2 (pty->tty, STDOUT_FILENO);
1433	dup2 (pty.tty, STDERR_FILENO);	1364	dup2 (pty->tty, STDERR_FILENO);
1434		1365
1435	// close all our file handles that we do no longer need	1366	// close all our file handles that we do no longer need
1436	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1367	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1437	{	1368	{
1438	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1369	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1439	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1370	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1440	}	1371	}
1441		1372
1442	run_child (argv);	1373	run_child (argv);
1443	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1374	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1444	}	1375	}
1445		1376
1446	_exit (EXIT_FAILURE);	1377	_exit (EXIT_FAILURE);
1447		1378
1448	default:	1379	default:
1449	{	1380	if (!OPTION (Opt_utmpInhibit))
1450	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1381	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1451	int fdstdin;
1452		1382
1453	fdstdin = dup (STDIN_FILENO);	1383	pty->close_tty ();
1454	dup2 (pty.tty, STDIN_FILENO);
1455	#endif
1456		1384
1457	#ifdef UTMP_SUPPORT	1385	child_ev.start (cmd_pid);
1458	privileged_utmp (SAVE);
1459	#endif
1460		1386
1461	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1387	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1462
1463	dup2 (fdstdin, STDIN_FILENO);
1464	close (fdstdin);
1465	#endif
1466	}
1467
1468	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1469	break;	1388	break;
1470	}	1389	}
1471	#else /* __QNX__ uses qnxspawn () */
1472	fchmod (pty.tty, 0622);
1473	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1474	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1475
1476	if (run_child (argv) == -1)
1477	exit (EXIT_FAILURE);
1478	#endif
1479	}	1390	}
1480		1391
1481	/* ------------------------------------------------------------------------- *	1392	/* ------------------------------------------------------------------------- *
1482	* CHILD PROCESS OPERATIONS *	1393	* CHILD PROCESS OPERATIONS *
1483	* ------------------------------------------------------------------------- */	1394	* ------------------------------------------------------------------------- */
…		…
1527	// unblock signals (signals are blocked by iom.C	1438	// unblock signals (signals are blocked by iom.C
1528	sigset_t ss;	1439	sigset_t ss;
1529	sigemptyset (&ss);	1440	sigemptyset (&ss);
1530	sigprocmask (SIG_SETMASK, &ss, 0);	1441	sigprocmask (SIG_SETMASK, &ss, 0);
1531		1442
1532	#ifndef __QNX__
1533	/* command interpreter path */	1443	/* command interpreter path */
1534	if (argv != NULL)	1444	if (argv != NULL)
1535	{	1445	{
1536	# ifdef DEBUG_CMD	1446	# ifdef DEBUG_CMD
1537	int i;	1447	int i;
…		…
1563		1473
1564	execlp (shell, argv0, NULL);	1474	execlp (shell, argv0, NULL);
1565	/* no error message: STDERR is closed! */	1475	/* no error message: STDERR is closed! */
1566	}	1476	}
1567		1477
1568	#else /* __QNX__ uses qnxspawn () */
1569
1570	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1571	char *command = NULL, fullcommand[_MAX_PATH];
1572	char *arg_v, arg_a[2] = { NULL, NULL };
1573
1574	if (argv != NULL)
1575	{
1576	if (access (argv[0], X_OK) == -1)
1577	{
1578	if (strchr (argv[0], '/') == NULL)
1579	{
1580	searchenv (argv[0], "PATH", fullcommand);
1581
1582	if (fullcommand[0] != '\0')
1583	command = fullcommand;
1584	}
1585
1586	if (access (command, X_OK) == -1)
1587	return -1;
1588	}
1589	else
1590	command = argv[0];
1591
1592	arg_v = argv;
1593	}
1594	else
1595	{
1596	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1597	command = "/bin/sh";
1598
1599	arg_a[0] = my_basename (command);
1600
1601	if (OPTION (Opt_loginShell))
1602	{
1603	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1604
1605	login[0] = '-';
1606	strcpy (&login[1], arg_a[0]);
1607	arg_a[0] = login;
1608	}
1609
1610	arg_v = arg_a;
1611	}
1612
1613	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1614	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1615	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1616	command, arg_v, environ, iov_a, 0);
1617	if (login)
1618	free (login);
1619
1620	pty.close_tty ();
1621	return pty.pty;
1622	#endif
1623
1624	return -1;	1478	return -1;
1625	}	1479	}
1626		1480
1627	/----------------------- end-of-file (C source) -----------------------/	1481	/----------------------- 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.143 by root, Mon Jan 16 15:00:20 2006 UTC vs. Revision 1.156 by root, Wed Jan 25 21:03:04 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.143 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.156 by root, Wed Jan 25 21:03:04 2006 UTC