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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.134 by root, Fri Jan 6 05:37:59 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;
256	bgPixmap.pixmap = None;	212	bgPixmap.pixmap = None;
257	#endif	213	#endif
258		214
259	last_bot = last_state = -1;	215	last_bot = last_state = -1;
260
261	#ifdef MENUBAR
262	menu_readonly = 1;
263	# if ! (MENUBAR_MAX > 1)
264	CurrentBar = &BarList;
265	# endif /* (MENUBAR_MAX > 1) */
266	#endif
267		216
268	return true;	217	return true;
269	}	218	}
270		219
271	void	220	void
…		…
339	rs[Rs_name] = rxvt_r_basename (argv[0]);	288	rs[Rs_name] = rxvt_r_basename (argv[0]);
340		289
341	/*	290	/*
342	* Open display, get options/resources and create the window	291	* Open display, get options/resources and create the window
343	*/	292	*/
		293
344	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	294	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345	rs[Rs_display_name] = ":0";	295	rs[Rs_display_name] = ":0";
346		296
347	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
348		298
349	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
350	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	300	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351		301
352	extract_resources ();	302	extract_resources ();
		303
353	free (r_argv);	304	free (r_argv);
		305
		306	#if ENABLE_PERL
		307	if (!rs[Rs_perl_ext_1])
		308	rs[Rs_perl_ext_1] = "default";
		309
		310	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		311	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		312	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		313	{
		314	rxvt_perl.init (this);
		315	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		316	}
		317	#endif
		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);
354		327
355	/*	328	/*
356	* set any defaults not already set	329	* set any defaults not already set
357	*/	330	*/
358	if (cmd_argv && cmd_argv[0])	331	if (cmd_argv && cmd_argv[0])
…		…
391	pointerBlankDelay = 2;	364	pointerBlankDelay = 2;
392	#endif	365	#endif
393		366
394	/* no point having a scrollbar without having any scrollback! */	367	/* no point having a scrollbar without having any scrollback! */
395	if (!saveLines)	368	if (!saveLines)
396	CLR_OPTION (Opt_scrollBar);	369	set_option (Opt_scrollBar, 0);
397		370
398	#ifdef PRINTPIPE	371	#ifdef PRINTPIPE
399	if (!rs[Rs_print_pipe])	372	if (!rs[Rs_print_pipe])
400	rs[Rs_print_pipe] = PRINTPIPE;	373	rs[Rs_print_pipe] = PRINTPIPE;
401	#endif	374	#endif
…		…
519	i = strlen (val);	492	i = strlen (val);
520	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	493	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
521		494
522	sprintf (env_display, "DISPLAY=%s", val);	495	sprintf (env_display, "DISPLAY=%s", val);
523		496
524	/* avoiding the math library:	497	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
525	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
526	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
527	;
528	max_it (i, 1);
529	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
530
531	sprintf (env_windowid, "WINDOWID=%u",
532	(unsigned int)parent[0]);
533		498
534	/* add entries to the environment:	499	/* add entries to the environment:
535	* @ DISPLAY: in case we started with -display	500	* @ DISPLAY: in case we started with -display
536	* @ WINDOWID: X window id number of the window	501	* @ WINDOWID: X window id number of the window
537	* @ COLORTERM: terminal sub-name and also indicates its color	502	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
539	* @ TERMINFO: path to terminfo directory	504	* @ TERMINFO: path to terminfo directory
540	* @ COLORFGBG: fg;bg color codes	505	* @ COLORFGBG: fg;bg color codes
541	*/	506	*/
542	putenv (env_display);	507	putenv (env_display);
543	putenv (env_windowid);	508	putenv (env_windowid);
		509
544	if (env_colorfgbg)	510	if (env_colorfgbg)
545	putenv (env_colorfgbg);	511	putenv (env_colorfgbg);
546		512
547	#ifdef RXVT_TERMINFO	513	#ifdef RXVT_TERMINFO
548	putenv ("TERMINFO=" RXVT_TERMINFO);	514	putenv ("TERMINFO=" RXVT_TERMINFO);
549	#endif	515	#endif
550		516
551	if (display->depth <= 2)	517	if (depth <= 2)
552	putenv ("COLORTERM=" COLORTERMENV "-mono");	518	putenv ("COLORTERM=" COLORTERMENV "-mono");
553	else	519	else
554	putenv ("COLORTERM=" COLORTERMENVFULL);	520	putenv ("COLORTERM=" COLORTERMENVFULL);
555		521
556	if (rs[Rs_term_name] != NULL)	522	if (rs[Rs_term_name] != NULL)
…		…
576	* This should support all European type languages.	542	* This should support all European type languages.
577	*/	543	*/
578	void	544	void
579	rxvt_term::set_locale (const char *locale)	545	rxvt_term::set_locale (const char *locale)
580	{	546	{
		547	set_environ (envv);
		548
581	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	549	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
582	free (this->locale);	550	free (this->locale);
583	this->locale = setlocale (LC_CTYPE, locale);	551	this->locale = setlocale (LC_CTYPE, locale);
584		552
585	if (!this->locale)	553	if (!this->locale)
586	{	554	{
587	if (*locale)	555	if (*locale)
588	{	556	{
589	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	557	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590	setlocale (LC_CTYPE, "");	558	setlocale (LC_CTYPE, "C");
591	}	559	}
592	else	560	else
593	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	561	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594		562
595	this->locale = "";	563	this->locale = "C";
596	}	564	}
597		565
598		566
599	this->locale = rxvt_strdup (this->locale);	567	this->locale = rxvt_strdup (this->locale);
600	SET_LOCALE (this->locale);	568	SET_LOCALE (this->locale);
…		…
615	}	583	}
616		584
617	void	585	void
618	rxvt_term::init_xlocale ()	586	rxvt_term::init_xlocale ()
619	{	587	{
		588	set_environ (envv);
		589
620	#ifdef USE_XIM	590	#ifdef USE_XIM
621	if (!locale)	591	if (!locale)
622	rxvt_warn ("setting locale failed, working without locale support.\n");	592	rxvt_warn ("setting locale failed, working without locale support.\n");
623	else	593	else
624	{	594	{
…		…
664	if (strcmp (key_backspace, "DEC") == 0)	634	if (strcmp (key_backspace, "DEC") == 0)
665	priv_modes \|= PrivMode_HaveBackSpace;	635	priv_modes \|= PrivMode_HaveBackSpace;
666	#endif	636	#endif
667		637
668	/* add value for scrollBar */	638	/* add value for scrollBar */
669	if (scrollbar_visible ())	639	if (scrollBar.state)
670	{	640	{
671	priv_modes \|= PrivMode_scrollBar;	641	priv_modes \|= PrivMode_scrollBar;
672	SavedModes \|= PrivMode_scrollBar;	642	SavedModes \|= PrivMode_scrollBar;
673	}
674
675	if (menubar_visible ())
676	{
677	priv_modes \|= PrivMode_menuBar;
678	SavedModes \|= PrivMode_menuBar;
679	}	643	}
680		644
681	run_command (argv);	645	run_command (argv);
682	}	646	}
683		647
…		…
689		653
690	#ifdef OFF_FOCUS_FADING	654	#ifdef OFF_FOCUS_FADING
691	pix_colors = pix_colors_focused;	655	pix_colors = pix_colors_focused;
692	#endif	656	#endif
693		657
694	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	658	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
695	{	659	{
696	rxvt_color xcol;	660	rxvt_color xcol;
697		661
698	if (!rs[Rs_color + i])	662	if (!rs[Rs_color + i])
699	continue;	663	continue;
…		…
739	SET_PIXCOLOR (i);	703	SET_PIXCOLOR (i);
740	}	704	}
741		705
742	#ifdef OFF_FOCUS_FADING	706	#ifdef OFF_FOCUS_FADING
743	if (rs[Rs_fade])	707	if (rs[Rs_fade])
744	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	708	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
745	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]);
746	#endif	710	#endif
747		711
748	if (display->depth <= 2)	712	if (depth <= 2)
749	{	713	{
750	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];
751	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];
752	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];
753	}	717	}
754		718
755	/*	719	/*
756	* get scrollBar/menuBar shadow colors	720	* get scrollBar shadow colors
757	*	721	*
758	* The calculations of topShadow/bottomShadow values are adapted	722	* The calculations of topShadow/bottomShadow values are adapted
759	* from the fvwm window manager.	723	* from the fvwm window manager.
760	*/	724	*/
761	#ifdef KEEP_SCROLLCOLOR	725	#ifdef KEEP_SCROLLCOLOR
762		726
763	if (display->depth <= 2)	727	if (depth <= 2)
764	{	728	{
765	/* Monochrome */	729	/* Monochrome */
766	pix_colors[Color_scroll] = pix_colors[Color_fg];	730	pix_colors[Color_scroll] = pix_colors[Color_fg];
767	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	pix_colors[Color_topShadow] = pix_colors[Color_bg];
768	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
…		…
773	/* xcol[0] == white	737	/* xcol[0] == white
774	* xcol[1] == top shadow	738	* xcol[1] == top shadow
775	* xcol[2] == bot shadow */	739	* xcol[2] == bot shadow */
776		740
777	xcol[1] = pix_colors[Color_scroll];	741	xcol[1] = pix_colors[Color_scroll];
778	xcol[0].set (display, 65535, 65535, 65535);	742	xcol[0].set (this, 65535, 65535, 65535);
779		743
780	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;	744	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
781		745
782	xcol[0].get (display, pr0, pg0, pb0);	746	xcol[0].get (this, pr0, pg0, pb0);
783	xcol[1].get (display, pr1, pg1, pb1);	747	xcol[1].get (this, pr1, pg1, pb1);
784		748
785	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);	749	pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
786		750
787	/* topShadowColor */	751	/* topShadowColor */
788	if (!xcol[1].set (display,	752	if (!xcol[1].set (this,
789	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	753	min (pr0, max (pr0 / 5, pr1) * 7 / 5),
790	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	754	min (pg0, max (pg0 / 5, pg1) * 7 / 5),
791	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	755	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
792	xcol[1] = pix_colors[Color_White];	756	xcol[1] = pix_colors[Color_White];
793		757
…		…
912	rxvt_term::create_windows (int argc, const char const argv)	876	rxvt_term::create_windows (int argc, const char const argv)
913	{	877	{
914	XClassHint classHint;	878	XClassHint classHint;
915	XWMHints wmHint;	879	XWMHints wmHint;
916	#if ENABLE_FRILLS	880	#if ENABLE_FRILLS
917	Atom prop = None;
918	MWMHints mwmhints;	881	MWMHints mwmhints;
919	#endif	882	#endif
920	XGCValues gcvalue;	883	XGCValues gcvalue;
921	long vt_emask;
922	XSetWindowAttributes attributes;	884	XSetWindowAttributes attributes;
923	XWindowAttributes gattr;
924	Window top, parent;	885	Window top, parent;
925	dDisp;
926		886
927	#ifdef USING_W11LIB	887	dLocal (Display *, xdisp);
928	/* enable W11 callbacks */
929	W11AddEventHandler (disp, rxvt_W11_process_x_event);
930	#endif
931		888
932	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	889	/* grab colors before netscape does */
933	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	890	Get_Colours ();
934		891
935	if (OPTION (Opt_transparent))	892	if (!set_fonts ())
936	{	893	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
937	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	894
938	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	895	parent = display->root;
939	}	896
		897	attributes.override_redirect = !!OPTION (Opt_override_redirect);
940		898
941	#if ENABLE_FRILLS	899	#if ENABLE_FRILLS
942	if (OPTION (Opt_borderLess))	900	if (OPTION (Opt_borderLess))
943	{	901	{
944	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	902	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
945
946	if (prop == None)
947	{	903	{
948	/* 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");*/
949	#ifdef PREFER_24BIT
950	attributes.override_redirect = TRUE;	905	attributes.override_redirect = TRUE;
951	#endif
952	mwmhints.flags = 0;	906	mwmhints.flags = 0;
953	}	907	}
954	else	908	else
955	{	909	{
956	mwmhints.flags = MWM_HINTS_DECORATIONS;	910	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
959	}	913	}
960	else	914	else
961	mwmhints.flags = 0;	915	mwmhints.flags = 0;
962	#endif	916	#endif
963		917
964	/* grab colors before netscape does */
965	Get_Colours ();
966
967	if (!set_fonts ())
968	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
969
970	parent = DefaultRootWindow (disp);
971
972	#if ENABLE_XEMBED	918	#if ENABLE_XEMBED
973	if (rs[Rs_embed])	919	if (rs[Rs_embed])
974	{	920	{
975	XWindowAttributes wattr;	921	XWindowAttributes wattr;
976		922
977	parent = strtol (rs[Rs_embed], 0, 0);	923	parent = strtol (rs[Rs_embed], 0, 0);
978		924
979	if (!XGetWindowAttributes (disp, parent, &wattr))	925	if (!XGetWindowAttributes (xdisp, parent, &wattr))
980	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	926	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
981		927
982	window_calc (wattr.width, wattr.height);	928	window_calc (wattr.width, wattr.height);
983	}	929	}
984	#endif	930	#endif
985		931
986	window_calc (0, 0);	932	window_calc (0, 0);
987		933
988	/* sub-window placement & size in rxvt_resize_subwindows () */	934	/* sub-window placement & size in rxvt_resize_subwindows () */
989	#ifdef PREFER_24BIT
990	attributes.background_pixel = pix_colors_focused[Color_border];	935	attributes.background_pixel = pix_colors_focused [Color_border];
991	attributes.border_pixel = pix_colors_focused[Color_border];	936	attributes.border_pixel = pix_colors_focused [Color_border];
992	attributes.colormap = display->cmap;	937	attributes.colormap = cmap;
		938
993	top = XCreateWindow (disp, parent,	939	top = XCreateWindow (xdisp, parent,
994	szHint.x, szHint.y,	940	szHint.x, szHint.y,
995	szHint.width, szHint.height,	941	szHint.width, szHint.height,
996	ext_bwidth,	942	ext_bwidth,
997	display->depth, InputOutput,	943	depth, InputOutput, visual,
998	display->visual,
999	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	944	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1000	#else	945	&attributes);
1001	top = XCreateSimpleWindow (disp, parent,
1002	szHint.x, szHint.y,
1003	szHint.width, szHint.height,
1004	ext_bwidth,
1005	pix_colors_focused[Color_border],
1006	pix_colors_focused[Color_border]);
1007	#endif
1008		946
1009	this->parent[0] = top;	947	this->parent[0] = top;
1010		948
1011	old_width = szHint.width;	949	old_width = szHint.width;
1012	old_height = szHint.height;	950	old_height = szHint.height;
1013		951
1014	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	952	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1015	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	953	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1016		954
1017	classHint.res_name = (char *)rs[Rs_name];	955	classHint.res_name = (char *)rs[Rs_name];
1018	classHint.res_class = (char *)RESCLASS;	956	classHint.res_class = (char *)RESCLASS;
1019		957
1020	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	958	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1021	wmHint.input = True;	959	wmHint.input = True;
1022	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	960	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1023	wmHint.window_group = top;	961	wmHint.window_group = top;
1024		962
1025	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	963	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1026	&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
1027		971
1028	Atom protocols[] = {	972	Atom protocols[] = {
1029	xa[XA_WM_DELETE_WINDOW],	973	xa[XA_WM_DELETE_WINDOW],
1030	#if ENABLE_EWMH	974	#if ENABLE_EWMH
1031	xa[XA_NET_WM_PING],	975	xa[XA_NET_WM_PING],
1032	#endif	976	#endif
1033	};	977	};
1034		978
1035	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	979	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1036		980
1037	#if ENABLE_FRILLS	981	#if ENABLE_FRILLS
1038	if (rs[Rs_transient_for])	982	if (rs[Rs_transient_for])
1039	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	983	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1040	#endif	984	#endif
1041		985
1042	#if ENABLE_EWMH	986	#if ENABLE_EWMH
1043	long pid = getpid ();	987	long pid = getpid ();
1044		988
1045	XChangeProperty (disp, top,	989	XChangeProperty (xdisp, top,
1046	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	990	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1047	PropModeReplace, (unsigned char *)&pid, 1);	991	PropModeReplace, (unsigned char *)&pid, 1);
1048		992
1049	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	993	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050	#endif	994	#endif
1051		995
1052	XSelectInput (disp, top,	996	XSelectInput (xdisp, top,
1053	KeyPressMask	997	KeyPressMask
1054	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	998	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1055	\| KeyReleaseMask	999	\| KeyReleaseMask
1056	#endif	1000	#endif
1057	\| FocusChangeMask \| VisibilityChangeMask	1001	\| FocusChangeMask \| VisibilityChangeMask
1058	\| ExposureMask \| StructureNotifyMask);	1002	\| ExposureMask \| StructureNotifyMask);
1059		1003
1060	termwin_ev.start (display, top);	1004	termwin_ev.start (display, top);
1061		1005
1062	#if ENABLE_FRILLS
1063	if (mwmhints.flags)
1064	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1065	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1066	#endif
1067
1068	/* 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 */
1069	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1007	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1070		1008
1071	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1009	#ifdef HAVE_SCROLLBARS
1072	/* cursor (menuBar/scrollBar): Black-on-White */	1010	/* cursor scrollBar: Black-on-White */
1073	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1011	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1074	#endif	1012	#endif
1075		1013
1076	/* the vt window */	1014	/* the vt window */
1077	vt = XCreateSimpleWindow (disp, top,	1015	vt = XCreateSimpleWindow (xdisp, top,
1078	window_vt_x,
1079	window_vt_y,	1016	window_vt_x, window_vt_y,
1080	width,
1081	height,	1017	width, height,
1082	0,	1018	0,
1083	pix_colors_focused[Color_fg],	1019	pix_colors_focused[Color_fg],
1084	pix_colors_focused[Color_bg]);	1020	pix_colors_focused[Color_bg]);
1085	#ifdef DEBUG_X
1086	XStoreName (disp, vt, "vt window");
1087	#endif
1088		1021
1089	attributes.bit_gravity = NorthWestGravity;	1022	attributes.bit_gravity = NorthWestGravity;
1090	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1023	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1091		1024
1092	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1025	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1093		1026
1094	if (OPTION (Opt_pointerBlank)	1027	if (OPTION (Opt_pointerBlank))
1095	#ifdef ENABLE_PERL
1096	\|\| self
1097	#endif
1098	)
1099	vt_emask \|= PointerMotionMask;	1028	vt_emask \|= PointerMotionMask;
1100	else	1029	else
1101	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1030	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1102		1031
1103	XSelectInput (disp, vt, vt_emask);	1032	vt_select_input ();
		1033
1104	vt_ev.start (display, vt);	1034	vt_ev.start (display, vt);
1105
1106	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107	if (menuBar_height ())
1108	{
1109	menuBar.win = XCreateSimpleWindow (disp, top,
1110	window_vt_x, 0,
1111	width,
1112	menuBar_TotalHeight (),
1113	0,
1114	pix_colors_focused[Color_fg],
1115	pix_colors_focused[Color_scroll]);
1116
1117	#ifdef DEBUG_X
1118	XStoreName (disp, menuBar.win, "menubar");
1119	#endif
1120
1121	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1122
1123	XDefineCursor (disp, menuBar.win,
1124	XCreateFontCursor (disp, XC_left_ptr));
1125
1126	XSelectInput (disp, menuBar.win,
1127	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1128	menubar_ev.start (display, menuBar.win);
1129	}
1130	#endif
1131		1035
1132	#ifdef XPM_BACKGROUND	1036	#ifdef XPM_BACKGROUND
1133	if (rs[Rs_backgroundPixmap] != NULL	1037	if (rs[Rs_backgroundPixmap] != NULL
1134	&& ! OPTION (Opt_transparent))	1038	&& !OPTION (Opt_transparent))
1135	{	1039	{
1136	const char *p = rs[Rs_backgroundPixmap];	1040	const char *p = rs[Rs_backgroundPixmap];
1137		1041
1138	if ((p = strchr (p, ';')) != NULL)	1042	if ((p = strchr (p, ';')) != NULL)
1139	{	1043	{
…		…
1145	scr_touch (true);	1049	scr_touch (true);
1146	}	1050	}
1147	#endif	1051	#endif
1148		1052
1149	/* graphics context for the vt window */	1053	/* graphics context for the vt window */
1150	gcvalue.foreground = pix_colors[Color_fg];	1054	gcvalue.foreground = pix_colors[Color_fg];
1151	gcvalue.background = pix_colors[Color_bg];	1055	gcvalue.background = pix_colors[Color_bg];
1152	gcvalue.graphics_exposures = 1;	1056	gcvalue.graphics_exposures = 1;
		1057
1153	gc = XCreateGC (disp, vt,	1058	gc = XCreateGC (xdisp, vt,
1154	GCForeground \| GCBackground \| GCGraphicsExposures,	1059	GCForeground \| GCBackground \| GCGraphicsExposures,
1155	&gcvalue);	1060	&gcvalue);
1156		1061
1157	drawable = new rxvt_drawable (display, vt);	1062	drawable = new rxvt_drawable (this, vt);
1158		1063
1159	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1064	#ifdef RXVT_SCROLLBAR
1160	gcvalue.foreground = pix_colors[Color_topShadow];	1065	gcvalue.foreground = pix_colors[Color_topShadow];
1161	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1066	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1162	gcvalue.foreground = pix_colors[Color_bottomShadow];	1067	gcvalue.foreground = pix_colors[Color_bottomShadow];
1163	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1068	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1164	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1069	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1165	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1070	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1166	#endif	1071	#endif
1167		1072
1168	#ifdef OFF_FOCUS_FADING	1073	#ifdef OFF_FOCUS_FADING
1169	// initially we are in unfocused state	1074	// initially we are in unfocused state
1170	if (rs[Rs_fade])	1075	if (rs[Rs_fade])
1171	pix_colors = pix_colors_unfocused;	1076	pix_colors = pix_colors_unfocused;
1172	#endif	1077	#endif
1173		1078
1174	pointer_unblank ();	1079	pointer_unblank ();
1175	scr_recolour ();	1080	scr_recolour ();
1176
1177	#if ENABLE_XEMBED
1178	if (rs[Rs_embed])
1179	{
1180	long info[2] = { 0, XEMBED_MAPPED };
1181
1182	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183	32, PropModeReplace, (unsigned char *)&info, 2);
1184	}
1185	#endif
1186	}	1081	}
1187		1082
1188	/* ------------------------------------------------------------------------- *	1083	/* ------------------------------------------------------------------------- *
1189	* GET TTY CURRENT STATE *	1084	* GET TTY CURRENT STATE *
1190	* ------------------------------------------------------------------------- */	1085	* ------------------------------------------------------------------------- */
…		…
1407	rxvt_term::run_command (const char const argv)	1302	rxvt_term::run_command (const char const argv)
1408	{	1303	{
1409	#if ENABLE_FRILLS	1304	#if ENABLE_FRILLS
1410	if (rs[Rs_pty_fd])	1305	if (rs[Rs_pty_fd])
1411	{	1306	{
1412	pty.pty = atoi (rs[Rs_pty_fd]);	1307	pty->pty = atoi (rs[Rs_pty_fd]);
1413		1308
1414	if (pty.pty >= 0)	1309	if (pty->pty >= 0)
1415	{	1310	{
1416	if (getfd_hook)	1311	if (getfd_hook)
1417	pty.pty = (*getfd_hook) (pty.pty);	1312	pty->pty = (*getfd_hook) (pty->pty);
1418		1313
1419	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1314	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1315	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421	}	1316	}
1422	}	1317	}
1423	else	1318	else
1424	#endif	1319	#endif
1425	if (!pty.get ())	1320	if (!pty->get ())
1426	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1321	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1427		1322
1428	pty.set_utf8_mode (enc_utf8);	1323	pty->set_utf8_mode (enc_utf8);
1429		1324
1430	/* set initial window size */	1325	/* set initial window size */
1431	tt_winch ();	1326	tt_winch ();
1432		1327
1433	int er;	1328	int er;
…		…
1446	#if ENABLE_FRILLS	1341	#if ENABLE_FRILLS
1447	if (rs[Rs_pty_fd])	1342	if (rs[Rs_pty_fd])
1448	return;	1343	return;
1449	#endif	1344	#endif
1450		1345
1451	#ifndef __QNX__
1452	/* spin off the command interpreter */	1346	/* spin off the command interpreter */
1453	switch (cmd_pid = fork ())	1347	switch (cmd_pid = fork ())
1454	{	1348	{
1455	case -1:	1349	case -1:
1456	{	1350	{
…		…
1458	rxvt_fatal ("can't fork, aborting.\n");	1352	rxvt_fatal ("can't fork, aborting.\n");
1459	}	1353	}
1460	case 0:	1354	case 0:
1461	init_env ();	1355	init_env ();
1462		1356
1463	if (!pty.make_controlling_tty ())	1357	if (!pty->make_controlling_tty ())
1464	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1358	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1465	else	1359	else
1466	{	1360	{
1467	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1361	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1468	dup2 (pty.tty, STDIN_FILENO);	1362	dup2 (pty->tty, STDIN_FILENO);
1469	dup2 (pty.tty, STDOUT_FILENO);	1363	dup2 (pty->tty, STDOUT_FILENO);
1470	dup2 (pty.tty, STDERR_FILENO);	1364	dup2 (pty->tty, STDERR_FILENO);
1471		1365
1472	// close all our file handles that we do no longer need	1366	// close all our file handles that we do no longer need
1473	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1367	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1474	{	1368	{
1475	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1369	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1476	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1370	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1477	}	1371	}
1478		1372
1479	run_child (argv);	1373	run_child (argv);
1480	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1374	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1481	}	1375	}
1482		1376
1483	_exit (EXIT_FAILURE);	1377	_exit (EXIT_FAILURE);
1484		1378
1485	default:	1379	default:
1486	{	1380	if (!OPTION (Opt_utmpInhibit))
1487	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1381	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1488	int fdstdin;
1489		1382
1490	fdstdin = dup (STDIN_FILENO);	1383	pty->close_tty ();
1491	dup2 (pty.tty, STDIN_FILENO);
1492	#endif
1493		1384
1494	#ifdef UTMP_SUPPORT	1385	child_ev.start (cmd_pid);
1495	privileged_utmp (SAVE);
1496	#endif
1497		1386
1498	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1387	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1499
1500	dup2 (fdstdin, STDIN_FILENO);
1501	close (fdstdin);
1502	#endif
1503	}
1504
1505	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1506	break;	1388	break;
1507	}	1389	}
1508	#else /* __QNX__ uses qnxspawn () */
1509	fchmod (pty.tty, 0622);
1510	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1511	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1512
1513	if (run_child (argv) == -1)
1514	exit (EXIT_FAILURE);
1515	#endif
1516	}	1390	}
1517		1391
1518	/* ------------------------------------------------------------------------- *	1392	/* ------------------------------------------------------------------------- *
1519	* CHILD PROCESS OPERATIONS *	1393	* CHILD PROCESS OPERATIONS *
1520	* ------------------------------------------------------------------------- */	1394	* ------------------------------------------------------------------------- */
…		…
1564	// unblock signals (signals are blocked by iom.C	1438	// unblock signals (signals are blocked by iom.C
1565	sigset_t ss;	1439	sigset_t ss;
1566	sigemptyset (&ss);	1440	sigemptyset (&ss);
1567	sigprocmask (SIG_SETMASK, &ss, 0);	1441	sigprocmask (SIG_SETMASK, &ss, 0);
1568		1442
1569	#ifndef __QNX__
1570	/* command interpreter path */	1443	/* command interpreter path */
1571	if (argv != NULL)	1444	if (argv != NULL)
1572	{	1445	{
1573	# ifdef DEBUG_CMD	1446	# ifdef DEBUG_CMD
1574	int i;	1447	int i;
…		…
1580	execvp (argv[0], (char const )argv);	1453	execvp (argv[0], (char const )argv);
1581	/* no error message: STDERR is closed! */	1454	/* no error message: STDERR is closed! */
1582	}	1455	}
1583	else	1456	else
1584	{	1457	{
1585	const char argv0, shell;	1458	const char argv0, shell;
1586		1459
1587	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1460	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1588	shell = "/bin/sh";	1461	shell = "/bin/sh";
1589		1462
1590	argv0 = (const char *)rxvt_r_basename (shell);	1463	argv0 = (const char *)rxvt_r_basename (shell);
…		…
1595		1468
1596	login[0] = '-';	1469	login[0] = '-';
1597	strcpy (&login[1], argv0);	1470	strcpy (&login[1], argv0);
1598	argv0 = login;	1471	argv0 = login;
1599	}	1472	}
		1473
1600	execlp (shell, argv0, NULL);	1474	execlp (shell, argv0, NULL);
1601	/* no error message: STDERR is closed! */	1475	/* no error message: STDERR is closed! */
1602	}	1476	}
1603		1477
1604	#else /* __QNX__ uses qnxspawn () */
1605
1606	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1607	char *command = NULL, fullcommand[_MAX_PATH];
1608	char *arg_v, arg_a[2] = { NULL, NULL };
1609
1610	if (argv != NULL)
1611	{
1612	if (access (argv[0], X_OK) == -1)
1613	{
1614	if (strchr (argv[0], '/') == NULL)
1615	{
1616	searchenv (argv[0], "PATH", fullcommand);
1617
1618	if (fullcommand[0] != '\0')
1619	command = fullcommand;
1620	}
1621
1622	if (access (command, X_OK) == -1)
1623	return -1;
1624	}
1625	else
1626	command = argv[0];
1627
1628	arg_v = argv;
1629	}
1630	else
1631	{
1632	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1633	command = "/bin/sh";
1634
1635	arg_a[0] = my_basename (command);
1636
1637	if (OPTION (Opt_loginShell))
1638	{
1639	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1640
1641	login[0] = '-';
1642	strcpy (&login[1], arg_a[0]);
1643	arg_a[0] = login;
1644	}
1645
1646	arg_v = arg_a;
1647	}
1648
1649	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1650	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1651	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1652	command, arg_v, environ, iov_a, 0);
1653	if (login)
1654	free (login);
1655
1656	pty.close_tty ();
1657	return pty.pty;
1658	#endif
1659
1660	return -1;	1478	return -1;
1661	}	1479	}
1662		1480
1663	/----------------------- 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.134 by root, Fri Jan 6 05:37:59 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.134 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.156 by root, Wed Jan 25 21:03:04 2006 UTC