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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.141 by root, Fri Jan 13 04:19:41 2006 UTC vs.
Revision 1.157 by root, Wed Jan 25 21:09:21 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
…		…
348	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
349		298
350	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
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
		302	xa = display->xa;
		303
		304	#if ENABLE_FRILLS
		305	if (rs[Rs_depth])
		306	set (display, strtol (rs[Rs_depth], 0, 0));
		307	else
		308	#endif
		309	set (display);
		310
353	extract_resources ();	311	extract_resources ();
354		312
355	free (r_argv);	313	free (r_argv);
		314
		315	#if ENABLE_PERL
		316	if (!rs[Rs_perl_ext_1])
		317	rs[Rs_perl_ext_1] = "default";
		318
		319	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		320	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		321	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		322	{
		323	rxvt_perl.init (this);
		324	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		325	}
		326	#endif
356		327
357	/*	328	/*
358	* set any defaults not already set	329	* set any defaults not already set
359	*/	330	*/
360	if (cmd_argv && cmd_argv[0])	331	if (cmd_argv && cmd_argv[0])
…		…
511	val = rxvt_network_display (rs[Rs_display_name]);	482	val = rxvt_network_display (rs[Rs_display_name]);
512	rs[Rs_display_name] = (const char *)val;	483	rs[Rs_display_name] = (const char *)val;
513		484
514	if (val == NULL)	485	if (val == NULL)
515	#endif /* DISPLAY_IS_IP */	486	#endif /* DISPLAY_IS_IP */
516	val = XDisplayString (display->display);	487	val = XDisplayString (xdisp);
517		488
518	if (rs[Rs_display_name] == NULL)	489	if (rs[Rs_display_name] == NULL)
519	rs[Rs_display_name] = val; /* use broken `:0' value */	490	rs[Rs_display_name] = val; /* use broken `:0' value */
520		491
521	i = strlen (val);	492	i = strlen (val);
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		494
524	sprintf (env_display, "DISPLAY=%s", val);	495	sprintf (env_display, "DISPLAY=%s", val);
525		496
526	/* avoiding the math library:	497	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		498
536	/* add entries to the environment:	499	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	500	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	501	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	502	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
541	* @ TERMINFO: path to terminfo directory	504	* @ TERMINFO: path to terminfo directory
542	* @ COLORFGBG: fg;bg color codes	505	* @ COLORFGBG: fg;bg color codes
543	*/	506	*/
544	putenv (env_display);	507	putenv (env_display);
545	putenv (env_windowid);	508	putenv (env_windowid);
		509
546	if (env_colorfgbg)	510	if (env_colorfgbg)
547	putenv (env_colorfgbg);	511	putenv (env_colorfgbg);
548		512
549	#ifdef RXVT_TERMINFO	513	#ifdef RXVT_TERMINFO
550	putenv ("TERMINFO=" RXVT_TERMINFO);	514	putenv ("TERMINFO=" RXVT_TERMINFO);
551	#endif	515	#endif
552		516
553	if (display->depth <= 2)	517	if (depth <= 2)
554	putenv ("COLORTERM=" COLORTERMENV "-mono");	518	putenv ("COLORTERM=" COLORTERMENV "-mono");
555	else	519	else
556	putenv ("COLORTERM=" COLORTERMENVFULL);	520	putenv ("COLORTERM=" COLORTERMENVFULL);
557		521
558	if (rs[Rs_term_name] != NULL)	522	if (rs[Rs_term_name] != NULL)
…		…
670	if (strcmp (key_backspace, "DEC") == 0)	634	if (strcmp (key_backspace, "DEC") == 0)
671	priv_modes \|= PrivMode_HaveBackSpace;	635	priv_modes \|= PrivMode_HaveBackSpace;
672	#endif	636	#endif
673		637
674	/* add value for scrollBar */	638	/* add value for scrollBar */
675	if (scrollbar_visible ())	639	if (scrollBar.state)
676	{	640	{
677	priv_modes \|= PrivMode_scrollBar;	641	priv_modes \|= PrivMode_scrollBar;
678	SavedModes \|= PrivMode_scrollBar;	642	SavedModes \|= PrivMode_scrollBar;
679	}
680
681	if (menubar_visible ())
682	{
683	priv_modes \|= PrivMode_menuBar;
684	SavedModes \|= PrivMode_menuBar;
685	}	643	}
686		644
687	run_command (argv);	645	run_command (argv);
688	}	646	}
689		647
…		…
695		653
696	#ifdef OFF_FOCUS_FADING	654	#ifdef OFF_FOCUS_FADING
697	pix_colors = pix_colors_focused;	655	pix_colors = pix_colors_focused;
698	#endif	656	#endif
699		657
700	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
701	{	659	{
702	rxvt_color xcol;	660	rxvt_color xcol;
703		661
704	if (!rs[Rs_color + i])	662	if (!rs[Rs_color + i])
705	continue;	663	continue;
…		…
745	SET_PIXCOLOR (i);	703	SET_PIXCOLOR (i);
746	}	704	}
747		705
748	#ifdef OFF_FOCUS_FADING	706	#ifdef OFF_FOCUS_FADING
749	if (rs[Rs_fade])	707	if (rs[Rs_fade])
750	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	708	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
751	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]);
752	#endif	710	#endif
753		711
754	if (display->depth <= 2)	712	if (depth <= 2)
755	{	713	{
756	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];
757	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];
758	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];
759	}	717	}
760		718
761	/*	719	/*
762	* get scrollBar/menuBar shadow colors	720	* get scrollBar shadow colors
763	*	721	*
764	* The calculations of topShadow/bottomShadow values are adapted	722	* The calculations of topShadow/bottomShadow values are adapted
765	* from the fvwm window manager.	723	* from the fvwm window manager.
766	*/	724	*/
767	#ifdef KEEP_SCROLLCOLOR	725	#ifdef KEEP_SCROLLCOLOR
768		726
769	if (display->depth <= 2)	727	if (depth <= 2)
770	{	728	{
771	/* Monochrome */	729	/* Monochrome */
772	pix_colors[Color_scroll] = pix_colors[Color_fg];	730	pix_colors[Color_scroll] = pix_colors[Color_fg];
773	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	pix_colors[Color_topShadow] = pix_colors[Color_bg];
774	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
…		…
779	/* xcol[0] == white	737	/* xcol[0] == white
780	* xcol[1] == top shadow	738	* xcol[1] == top shadow
781	* xcol[2] == bot shadow */	739	* xcol[2] == bot shadow */
782		740
783	xcol[1] = pix_colors[Color_scroll];	741	xcol[1] = pix_colors[Color_scroll];
784	xcol[0].set (display, 65535, 65535, 65535);	742	xcol[0].set (this, 65535, 65535, 65535);
785		743
786	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;	744	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
787		745
788	xcol[0].get (display, pr0, pg0, pb0);	746	xcol[0].get (this, pr0, pg0, pb0);
789	xcol[1].get (display, pr1, pg1, pb1);	747	xcol[1].get (this, pr1, pg1, pb1);
790		748
791	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);	749	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
792		750
793	/* topShadowColor */	751	/* topShadowColor */
794	if (!xcol[1].set (display,	752	if (!xcol[1].set (this,
795	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	753	min (pr0, max (pr0 / 5, pr1) * 7 / 5),
796	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	754	min (pg0, max (pg0 / 5, pg1) * 7 / 5),
797	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	755	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
798	xcol[1] = pix_colors[Color_White];	756	xcol[1] = pix_colors[Color_White];
799		757
…		…
846		804
847	if (rsmod	805	if (rsmod
848	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	806	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849	requestedmeta = rsmod[3] - '0';	807	requestedmeta = rsmod[3] - '0';
850		808
851	map = XGetModifierMapping (display->display);	809	map = XGetModifierMapping (xdisp);
852	kc = map->modifiermap;	810	kc = map->modifiermap;
853		811
854	for (i = 1; i < 6; i++)	812	for (i = 1; i < 6; i++)
855	{	813	{
856	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	814	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
858	for (j = map->max_keypermod; j--; k++)	816	for (j = map->max_keypermod; j--; k++)
859	{	817	{
860	if (kc[k] == 0)	818	if (kc[k] == 0)
861	break;	819	break;
862		820
863	switch (XKeycodeToKeysym (display->display, kc[k], 0))	821	switch (XKeycodeToKeysym (xdisp, kc[k], 0))
864	{	822	{
865	case XK_Num_Lock:	823	case XK_Num_Lock:
866	ModNumLockMask = modmasks[i - 1];	824	ModNumLockMask = modmasks[i - 1];
867	continue;	825	continue;
868		826
…		…
918	rxvt_term::create_windows (int argc, const char const argv)	876	rxvt_term::create_windows (int argc, const char const argv)
919	{	877	{
920	XClassHint classHint;	878	XClassHint classHint;
921	XWMHints wmHint;	879	XWMHints wmHint;
922	#if ENABLE_FRILLS	880	#if ENABLE_FRILLS
923	Atom prop = None;
924	MWMHints mwmhints;	881	MWMHints mwmhints;
925	#endif	882	#endif
926	XGCValues gcvalue;	883	XGCValues gcvalue;
927	XSetWindowAttributes attributes;	884	XSetWindowAttributes attributes;
928	XWindowAttributes gattr;
929	Window top, parent;	885	Window top, parent;
930	dDisp;
931		886
932	#ifdef USING_W11LIB	887	dLocal (Display *, xdisp);
933	/* enable W11 callbacks */
934	W11AddEventHandler (disp, rxvt_W11_process_x_event);
935	#endif
936		888
937	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	889	/* grab colors before netscape does */
938	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	890	Get_Colours ();
939		891
940	if (OPTION (Opt_transparent))	892	if (!set_fonts ())
941	{	893	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	894
943	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	895	parent = display->root;
944	}	896
		897	attributes.override_redirect = !!OPTION (Opt_override_redirect);
945		898
946	#if ENABLE_FRILLS	899	#if ENABLE_FRILLS
947	if (OPTION (Opt_borderLess))	900	if (OPTION (Opt_borderLess))
948	{	901	{
949	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	902	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
950
951	if (prop == None)
952	{	903	{
953	/* 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");*/
954	#ifdef PREFER_24BIT
955	attributes.override_redirect = TRUE;	905	attributes.override_redirect = TRUE;
956	#endif
957	mwmhints.flags = 0;	906	mwmhints.flags = 0;
958	}	907	}
959	else	908	else
960	{	909	{
961	mwmhints.flags = MWM_HINTS_DECORATIONS;	910	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
964	}	913	}
965	else	914	else
966	mwmhints.flags = 0;	915	mwmhints.flags = 0;
967	#endif	916	#endif
968		917
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	918	#if ENABLE_XEMBED
978	if (rs[Rs_embed])	919	if (rs[Rs_embed])
979	{	920	{
980	XWindowAttributes wattr;	921	XWindowAttributes wattr;
981		922
982	parent = strtol (rs[Rs_embed], 0, 0);	923	parent = strtol (rs[Rs_embed], 0, 0);
983		924
984	if (!XGetWindowAttributes (disp, parent, &wattr))	925	if (!XGetWindowAttributes (xdisp, parent, &wattr))
985	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	926	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986		927
987	window_calc (wattr.width, wattr.height);	928	window_calc (wattr.width, wattr.height);
988	}	929	}
989	#endif	930	#endif
990		931
991	window_calc (0, 0);	932	window_calc (0, 0);
992		933
993	/* sub-window placement & size in rxvt_resize_subwindows () */	934	/* sub-window placement & size in rxvt_resize_subwindows () */
994	#ifdef PREFER_24BIT
995	attributes.background_pixel = pix_colors_focused[Color_border];	935	attributes.background_pixel = pix_colors_focused [Color_border];
996	attributes.border_pixel = pix_colors_focused[Color_border];	936	attributes.border_pixel = pix_colors_focused [Color_border];
997	attributes.colormap = display->cmap;	937	attributes.colormap = cmap;
		938
998	top = XCreateWindow (disp, parent,	939	top = XCreateWindow (xdisp, parent,
999	szHint.x, szHint.y,	940	szHint.x, szHint.y,
1000	szHint.width, szHint.height,	941	szHint.width, szHint.height,
1001	ext_bwidth,	942	ext_bwidth,
1002	display->depth, InputOutput,	943	depth, InputOutput, visual,
1003	display->visual,
1004	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	944	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1005	#else	945	&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		946
1014	this->parent[0] = top;	947	this->parent[0] = top;
1015		948
1016	old_width = szHint.width;	949	old_width = szHint.width;
1017	old_height = szHint.height;	950	old_height = szHint.height;
1018		951
1019	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	952	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	953	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021		954
1022	classHint.res_name = (char *)rs[Rs_name];	955	classHint.res_name = (char *)rs[Rs_name];
1023	classHint.res_class = (char *)RESCLASS;	956	classHint.res_class = (char *)RESCLASS;
1024		957
1025	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	958	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1026	wmHint.input = True;	959	wmHint.input = True;
1027	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	960	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028	wmHint.window_group = top;	961	wmHint.window_group = top;
1029		962
1030	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	963	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1031	&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
1032		971
1033	Atom protocols[] = {	972	Atom protocols[] = {
1034	xa[XA_WM_DELETE_WINDOW],	973	xa[XA_WM_DELETE_WINDOW],
1035	#if ENABLE_EWMH	974	#if ENABLE_EWMH
1036	xa[XA_NET_WM_PING],	975	xa[XA_NET_WM_PING],
1037	#endif	976	#endif
1038	};	977	};
1039		978
1040	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	979	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041		980
1042	#if ENABLE_FRILLS	981	#if ENABLE_FRILLS
1043	if (rs[Rs_transient_for])	982	if (rs[Rs_transient_for])
1044	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	983	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1045	#endif	984	#endif
1046		985
1047	#if ENABLE_EWMH	986	#if ENABLE_EWMH
1048	long pid = getpid ();	987	long pid = getpid ();
1049		988
1050	XChangeProperty (disp, top,	989	XChangeProperty (xdisp, top,
1051	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	990	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1052	PropModeReplace, (unsigned char *)&pid, 1);	991	PropModeReplace, (unsigned char *)&pid, 1);
1053		992
1054	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	993	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1055	#endif	994	#endif
1056		995
1057	XSelectInput (disp, top,	996	XSelectInput (xdisp, top,
1058	KeyPressMask	997	KeyPressMask
1059	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	998	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1060	\| KeyReleaseMask	999	\| KeyReleaseMask
1061	#endif	1000	#endif
1062	\| FocusChangeMask \| VisibilityChangeMask	1001	\| FocusChangeMask \| VisibilityChangeMask
1063	\| ExposureMask \| StructureNotifyMask);	1002	\| ExposureMask \| StructureNotifyMask);
1064		1003
1065	termwin_ev.start (display, top);	1004	termwin_ev.start (display, top);
1066		1005
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 */	1006	/* vt cursor: Black-on-White is standard, but this is more popular */
1074	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1007	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1075		1008
1076	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1009	#ifdef HAVE_SCROLLBARS
1077	/* cursor (menuBar/scrollBar): Black-on-White */	1010	/* cursor scrollBar: Black-on-White */
1078	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1011	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1079	#endif	1012	#endif
1080		1013
1081	/* the vt window */	1014	/* the vt window */
1082	vt = XCreateSimpleWindow (disp, top,	1015	vt = XCreateSimpleWindow (xdisp, top,
1083	window_vt_x,
1084	window_vt_y,	1016	window_vt_x, window_vt_y,
1085	width,
1086	height,	1017	width, height,
1087	0,	1018	0,
1088	pix_colors_focused[Color_fg],	1019	pix_colors_focused[Color_fg],
1089	pix_colors_focused[Color_bg]);	1020	pix_colors_focused[Color_bg]);
1090	#ifdef DEBUG_X
1091	XStoreName (disp, vt, "vt window");
1092	#endif
1093		1021
1094	attributes.bit_gravity = NorthWestGravity;	1022	attributes.bit_gravity = NorthWestGravity;
1095	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1023	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1096		1024
1097	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1025	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1098		1026
1099	if (OPTION (Opt_pointerBlank)	1027	if (OPTION (Opt_pointerBlank))
1100	#ifdef ENABLE_PERL
1101	\|\| perl.self
1102	#endif
1103	)
1104	vt_emask \|= PointerMotionMask;	1028	vt_emask \|= PointerMotionMask;
1105	else	1029	else
1106	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1030	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1107		1031
1108	XSelectInput (disp, vt, vt_emask);	1032	vt_select_input ();
		1033
1109	vt_ev.start (display, vt);	1034	vt_ev.start (display, vt);
1110
1111	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1112	if (menuBar_height ())
1113	{
1114	menuBar.win = XCreateSimpleWindow (disp, top,
1115	window_vt_x, 0,
1116	width,
1117	menuBar_TotalHeight (),
1118	0,
1119	pix_colors_focused[Color_fg],
1120	pix_colors_focused[Color_scroll]);
1121
1122	#ifdef DEBUG_X
1123	XStoreName (disp, menuBar.win, "menubar");
1124	#endif
1125
1126	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1127
1128	XDefineCursor (disp, menuBar.win,
1129	XCreateFontCursor (disp, XC_left_ptr));
1130
1131	XSelectInput (disp, menuBar.win,
1132	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1133	menubar_ev.start (display, menuBar.win);
1134	}
1135	#endif
1136		1035
1137	#ifdef XPM_BACKGROUND	1036	#ifdef XPM_BACKGROUND
1138	if (rs[Rs_backgroundPixmap] != NULL	1037	if (rs[Rs_backgroundPixmap] != NULL
1139	&& ! OPTION (Opt_transparent))	1038	&& !OPTION (Opt_transparent))
1140	{	1039	{
1141	const char *p = rs[Rs_backgroundPixmap];	1040	const char *p = rs[Rs_backgroundPixmap];
1142		1041
1143	if ((p = strchr (p, ';')) != NULL)	1042	if ((p = strchr (p, ';')) != NULL)
1144	{	1043	{
…		…
1150	scr_touch (true);	1049	scr_touch (true);
1151	}	1050	}
1152	#endif	1051	#endif
1153		1052
1154	/* graphics context for the vt window */	1053	/* graphics context for the vt window */
1155	gcvalue.foreground = pix_colors[Color_fg];	1054	gcvalue.foreground = pix_colors[Color_fg];
1156	gcvalue.background = pix_colors[Color_bg];	1055	gcvalue.background = pix_colors[Color_bg];
1157	gcvalue.graphics_exposures = 1;	1056	gcvalue.graphics_exposures = 1;
		1057
1158	gc = XCreateGC (disp, vt,	1058	gc = XCreateGC (xdisp, vt,
1159	GCForeground \| GCBackground \| GCGraphicsExposures,	1059	GCForeground \| GCBackground \| GCGraphicsExposures,
1160	&gcvalue);	1060	&gcvalue);
1161		1061
1162	drawable = new rxvt_drawable (display, vt);	1062	drawable = new rxvt_drawable (this, vt);
1163		1063
1164	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1064	#ifdef RXVT_SCROLLBAR
1165	gcvalue.foreground = pix_colors[Color_topShadow];	1065	gcvalue.foreground = pix_colors[Color_topShadow];
1166	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1066	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1167	gcvalue.foreground = pix_colors[Color_bottomShadow];	1067	gcvalue.foreground = pix_colors[Color_bottomShadow];
1168	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1068	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1169	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1069	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1170	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1070	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1171	#endif	1071	#endif
1172		1072
1173	#ifdef OFF_FOCUS_FADING	1073	#ifdef OFF_FOCUS_FADING
1174	// initially we are in unfocused state	1074	// initially we are in unfocused state
1175	if (rs[Rs_fade])	1075	if (rs[Rs_fade])
1176	pix_colors = pix_colors_unfocused;	1076	pix_colors = pix_colors_unfocused;
1177	#endif	1077	#endif
1178		1078
1179	pointer_unblank ();	1079	pointer_unblank ();
1180	scr_recolour ();	1080	scr_recolour ();
1181
1182	#if ENABLE_XEMBED
1183	if (rs[Rs_embed])
1184	{
1185	long info[2] = { 0, XEMBED_MAPPED };
1186
1187	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1188	32, PropModeReplace, (unsigned char *)&info, 2);
1189	}
1190	#endif
1191	}	1081	}
1192		1082
1193	/* ------------------------------------------------------------------------- *	1083	/* ------------------------------------------------------------------------- *
1194	* GET TTY CURRENT STATE *	1084	* GET TTY CURRENT STATE *
1195	* ------------------------------------------------------------------------- */	1085	* ------------------------------------------------------------------------- */
…		…
1412	rxvt_term::run_command (const char const argv)	1302	rxvt_term::run_command (const char const argv)
1413	{	1303	{
1414	#if ENABLE_FRILLS	1304	#if ENABLE_FRILLS
1415	if (rs[Rs_pty_fd])	1305	if (rs[Rs_pty_fd])
1416	{	1306	{
1417	pty.pty = atoi (rs[Rs_pty_fd]);	1307	pty->pty = atoi (rs[Rs_pty_fd]);
1418		1308
1419	if (pty.pty >= 0)	1309	if (pty->pty >= 0)
1420	{	1310	{
1421	if (getfd_hook)	1311	if (getfd_hook)
1422	pty.pty = (*getfd_hook) (pty.pty);	1312	pty->pty = (*getfd_hook) (pty->pty);
1423		1313
1424	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1314	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1425	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1315	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426	}	1316	}
1427	}	1317	}
1428	else	1318	else
1429	#endif	1319	#endif
1430	if (!pty.get ())	1320	if (!pty->get ())
1431	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1321	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1432		1322
1433	pty.set_utf8_mode (enc_utf8);	1323	pty->set_utf8_mode (enc_utf8);
1434		1324
1435	/* set initial window size */	1325	/* set initial window size */
1436	tt_winch ();	1326	tt_winch ();
1437		1327
1438	int er;	1328	int er;
…		…
1451	#if ENABLE_FRILLS	1341	#if ENABLE_FRILLS
1452	if (rs[Rs_pty_fd])	1342	if (rs[Rs_pty_fd])
1453	return;	1343	return;
1454	#endif	1344	#endif
1455		1345
1456	#ifndef __QNX__
1457	/* spin off the command interpreter */	1346	/* spin off the command interpreter */
1458	switch (cmd_pid = fork ())	1347	switch (cmd_pid = fork ())
1459	{	1348	{
1460	case -1:	1349	case -1:
1461	{	1350	{
…		…
1463	rxvt_fatal ("can't fork, aborting.\n");	1352	rxvt_fatal ("can't fork, aborting.\n");
1464	}	1353	}
1465	case 0:	1354	case 0:
1466	init_env ();	1355	init_env ();
1467		1356
1468	if (!pty.make_controlling_tty ())	1357	if (!pty->make_controlling_tty ())
1469	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1358	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1470	else	1359	else
1471	{	1360	{
1472	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1361	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1473	dup2 (pty.tty, STDIN_FILENO);	1362	dup2 (pty->tty, STDIN_FILENO);
1474	dup2 (pty.tty, STDOUT_FILENO);	1363	dup2 (pty->tty, STDOUT_FILENO);
1475	dup2 (pty.tty, STDERR_FILENO);	1364	dup2 (pty->tty, STDERR_FILENO);
1476		1365
1477	// close all our file handles that we do no longer need	1366	// close all our file handles that we do no longer need
1478	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1367	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1479	{	1368	{
1480	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1369	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1481	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1370	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1482	}	1371	}
1483		1372
1484	run_child (argv);	1373	run_child (argv);
1485	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1374	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1486	}	1375	}
1487		1376
1488	_exit (EXIT_FAILURE);	1377	_exit (EXIT_FAILURE);
1489		1378
1490	default:	1379	default:
1491	{	1380	if (!OPTION (Opt_utmpInhibit))
1492	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1381	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1493	int fdstdin;
1494		1382
1495	fdstdin = dup (STDIN_FILENO);	1383	pty->close_tty ();
1496	dup2 (pty.tty, STDIN_FILENO);
1497	#endif
1498		1384
1499	#ifdef UTMP_SUPPORT	1385	child_ev.start (cmd_pid);
1500	privileged_utmp (SAVE);
1501	#endif
1502		1386
1503	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1387	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1504
1505	dup2 (fdstdin, STDIN_FILENO);
1506	close (fdstdin);
1507	#endif
1508	}
1509
1510	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1511	break;	1388	break;
1512	}	1389	}
1513	#else /* __QNX__ uses qnxspawn () */
1514	fchmod (pty.tty, 0622);
1515	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1516	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1517
1518	if (run_child (argv) == -1)
1519	exit (EXIT_FAILURE);
1520	#endif
1521	}	1390	}
1522		1391
1523	/* ------------------------------------------------------------------------- *	1392	/* ------------------------------------------------------------------------- *
1524	* CHILD PROCESS OPERATIONS *	1393	* CHILD PROCESS OPERATIONS *
1525	* ------------------------------------------------------------------------- */	1394	* ------------------------------------------------------------------------- */
…		…
1569	// unblock signals (signals are blocked by iom.C	1438	// unblock signals (signals are blocked by iom.C
1570	sigset_t ss;	1439	sigset_t ss;
1571	sigemptyset (&ss);	1440	sigemptyset (&ss);
1572	sigprocmask (SIG_SETMASK, &ss, 0);	1441	sigprocmask (SIG_SETMASK, &ss, 0);
1573		1442
1574	#ifndef __QNX__
1575	/* command interpreter path */	1443	/* command interpreter path */
1576	if (argv != NULL)	1444	if (argv != NULL)
1577	{	1445	{
1578	# ifdef DEBUG_CMD	1446	# ifdef DEBUG_CMD
1579	int i;	1447	int i;
…		…
1605		1473
1606	execlp (shell, argv0, NULL);	1474	execlp (shell, argv0, NULL);
1607	/* no error message: STDERR is closed! */	1475	/* no error message: STDERR is closed! */
1608	}	1476	}
1609		1477
1610	#else /* __QNX__ uses qnxspawn () */
1611
1612	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1613	char *command = NULL, fullcommand[_MAX_PATH];
1614	char *arg_v, arg_a[2] = { NULL, NULL };
1615
1616	if (argv != NULL)
1617	{
1618	if (access (argv[0], X_OK) == -1)
1619	{
1620	if (strchr (argv[0], '/') == NULL)
1621	{
1622	searchenv (argv[0], "PATH", fullcommand);
1623
1624	if (fullcommand[0] != '\0')
1625	command = fullcommand;
1626	}
1627
1628	if (access (command, X_OK) == -1)
1629	return -1;
1630	}
1631	else
1632	command = argv[0];
1633
1634	arg_v = argv;
1635	}
1636	else
1637	{
1638	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1639	command = "/bin/sh";
1640
1641	arg_a[0] = my_basename (command);
1642
1643	if (OPTION (Opt_loginShell))
1644	{
1645	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1646
1647	login[0] = '-';
1648	strcpy (&login[1], arg_a[0]);
1649	arg_a[0] = login;
1650	}
1651
1652	arg_v = arg_a;
1653	}
1654
1655	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1656	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1657	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1658	command, arg_v, environ, iov_a, 0);
1659	if (login)
1660	free (login);
1661
1662	pty.close_tty ();
1663	return pty.pty;
1664	#endif
1665
1666	return -1;	1478	return -1;
1667	}	1479	}
1668		1480
1669	/----------------------- 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.141 by root, Fri Jan 13 04:19:41 2006 UTC vs. Revision 1.157 by root, Wed Jan 25 21:09:21 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.141 by root, Fri Jan 13 04:19:41 2006 UTC vs.
Revision 1.157 by root, Wed Jan 25 21:09:21 2006 UTC