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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.128 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC

…		…
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	10	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11	* - extensive modifications	11	* - extensive modifications
12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>	12	* Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13	* - QNX support	13	* - QNX support
14	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	14	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15	*	15	*
16	* This program is free software; you can redistribute it and/or modify	16	* This program is free software; you can redistribute it and/or modify
17	* it under the terms of the GNU General Public License as published by	17	* it under the terms of the GNU General Public License as published by
18	* the Free Software Foundation; either version 2 of the License, or	18	* the Free Software Foundation; either version 2 of the License, or
19	* (at your option) any later version.	19	* (at your option) any later version.
…		…
44	{	44	{
45	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
47	/* low-intensity colors */	47	/* low-intensity colors */
48	"Black", /* 0: black (#000000) */	48	"Black", /* 0: black (#000000) */
49	#ifndef NO_BRIGHTCOLOR
50	"Red3", /* 1: red (#CD0000) */	49	"Red3", /* 1: red (#CD0000) */
51	"Green3", /* 2: green (#00CD00) */	50	"Green3", /* 2: green (#00CD00) */
52	"Yellow3", /* 3: yellow (#CDCD00) */	51	"Yellow3", /* 3: yellow (#CDCD00) */
53	"Blue3", /* 4: blue (#0000CD) */	52	"Blue3", /* 4: blue (#0000CD) */
54	"Magenta3", /* 5: magenta (#CD00CD) */	53	"Magenta3", /* 5: magenta (#CD00CD) */
…		…
62	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
63	"Grey30", /* 8: bright black (#4D4D4D) */	62	"Grey30", /* 8: bright black (#4D4D4D) */
64	# else	63	# else
65	"Grey25", /* 8: bright black (#404040) */	64	"Grey25", /* 8: bright black (#404040) */
66	# endif	65	# endif
67	#endif /* NO_BRIGHTCOLOR */
68	"Red", /* 1/9: bright red (#FF0000) */	66	"Red", /* 1/9: bright red (#FF0000) */
69	"Green", /* 2/10: bright green (#00FF00) */	67	"Green", /* 2/10: bright green (#00FF00) */
70	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"Yellow", /* 3/11: bright yellow (#FFFF00) */
71	"Blue", /* 4/12: bright blue (#0000FF) */	69	"Blue", /* 4/12: bright blue (#0000FF) */
72	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"Magenta", /* 5/13: bright magenta (#FF00FF) */
…		…
176	#if OFF_FOCUS_FADING	174	#if OFF_FOCUS_FADING
177	"black",	175	"black",
178	#endif	176	#endif
179	};	177	};
180		178
181	const char *const xa_names[] =
182	{
183	"TEXT",
184	"COMPOUND_TEXT",
185	"UTF8_STRING",
186	"MULTIPLE",
187	"TARGETS",
188	"TIMESTAMP",
189	"VT_SELECTION",
190	"INCR",
191	"WM_PROTOCOLS",
192	"WM_DELETE_WINDOW",
193	"CLIPBOARD",
194	#if ENABLE_FRILLS
195	"_MOTIF_WM_HINTS",
196	#endif
197	#if ENABLE_EWMH
198	"_NET_WM_PID",
199	"_NET_WM_NAME",
200	"_NET_WM_ICON_NAME",
201	"_NET_WM_PING",
202	#endif
203	#if USE_XIM
204	"WM_LOCALE_NAME",
205	#endif
206	#ifdef TRANSPARENT
207	"_XROOTPMAP_ID",
208	"ESETROOT_PMAP_ID",
209	#endif
210	#ifdef OFFIX_DND
211	"DndProtocol",
212	"DndSelection",
213	#endif
214	#if ENABLE_XEMBED
215	"_XEMBED",
216	"_XEMBED_INFO",
217	#endif
218	};
219
220	bool	179	bool
221	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
222	{	181	{
		182	pix_colors = //
223	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
224	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
225	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
226	#endif	186	#endif
227	pix_colors = pix_colors_focused;
228
229	if (pix_colors == NULL)
230	return false;
231		187
232	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
233	pixmap = None;	189	pixmap = None;
234	#endif	190	#endif
235		191
236	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
237	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
238	options = DEFAULT_OPTIONS;	194	options = DEFAULT_OPTIONS;
239	want_refresh = 1;	195	want_refresh = 1;
240	priv_modes = SavedModes = PrivMode_Default;	196	priv_modes = SavedModes = PrivMode_Default;
241	focus = 0;
242	ncol = 80;	197	ncol = 80;
243	nrow = 24;	198	nrow = 24;
244	int_bwidth = INTERNALBORDERWIDTH;	199	int_bwidth = INTERNALBORDERWIDTH;
245	ext_bwidth = EXTERNALBORDERWIDTH;	200	ext_bwidth = EXTERNALBORDERWIDTH;
246	lineSpace = LINESPACE;	201	lineSpace = LINESPACE;
247	saveLines = SAVELINES;	202	saveLines = SAVELINES;
248	numpix_colors = TOTAL_COLORS;	203	numpix_colors = TOTAL_COLORS;
249		204
250	refresh_limit = 1;	205	refresh_limit = 1;
251	refresh_type = SLOW_REFRESH;	206	refresh_type = SLOW_REFRESH;
252	prev_nrow = prev_ncol = 0;
253		207
254	oldcursor.row = oldcursor.col = -1;	208	oldcursor.row = oldcursor.col = -1;
255	#ifdef XPM_BACKGROUND	209	#ifdef XPM_BACKGROUND
256	/* bgPixmap.w = bgPixmap.h = 0; */	210	/* bgPixmap.w = bgPixmap.h = 0; */
257	bgPixmap.x = bgPixmap.y = 50;	211	bgPixmap.x = bgPixmap.y = 50;
258	bgPixmap.pixmap = None;	212	bgPixmap.pixmap = None;
259	#endif	213	#endif
260		214
261	last_bot = last_state = -1;	215	last_bot = last_state = -1;
262
263	#ifdef MENUBAR
264	menu_readonly = 1;
265	# if ! (MENUBAR_MAX > 1)
266	CurrentBar = &BarList;
267	# endif /* (MENUBAR_MAX > 1) */
268	#endif
269		216
270	return true;	217	return true;
271	}	218	}
272		219
273	void	220	void
…		…
341	rs[Rs_name] = rxvt_r_basename (argv[0]);	288	rs[Rs_name] = rxvt_r_basename (argv[0]);
342		289
343	/*	290	/*
344	* Open display, get options/resources and create the window	291	* Open display, get options/resources and create the window
345	*/	292	*/
		293
346	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	294	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347	rs[Rs_display_name] = ":0";	295	rs[Rs_display_name] = ":0";
348		296
349	get_options (r_argc, r_argv);	297	get_options (r_argc, r_argv);
350		298
351	if (!(display = displays.get (rs[Rs_display_name])))	299	if (!(display = displays.get (rs[Rs_display_name])))
352	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]);
353		301
354	extract_resources ();	302	extract_resources ();
		303
355	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
356		318
357	/*	319	/*
358	* set any defaults not already set	320	* set any defaults not already set
359	*/	321	*/
360	if (cmd_argv && cmd_argv[0])	322	if (cmd_argv && cmd_argv[0])
…		…
393	pointerBlankDelay = 2;	355	pointerBlankDelay = 2;
394	#endif	356	#endif
395		357
396	/* no point having a scrollbar without having any scrollback! */	358	/* no point having a scrollbar without having any scrollback! */
397	if (!saveLines)	359	if (!saveLines)
398	CLR_OPTION (Opt_scrollBar);	360	set_option (Opt_scrollBar, 0);
399		361
400	#ifdef PRINTPIPE	362	#ifdef PRINTPIPE
401	if (!rs[Rs_print_pipe])	363	if (!rs[Rs_print_pipe])
402	rs[Rs_print_pipe] = PRINTPIPE;	364	rs[Rs_print_pipe] = PRINTPIPE;
403	#endif	365	#endif
…		…
521	i = strlen (val);	483	i = strlen (val);
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	484	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		485
524	sprintf (env_display, "DISPLAY=%s", val);	486	sprintf (env_display, "DISPLAY=%s", val);
525		487
526	/* avoiding the math library:	488	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		489
536	/* add entries to the environment:	490	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	491	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	492	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	493	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
541	* @ TERMINFO: path to terminfo directory	495	* @ TERMINFO: path to terminfo directory
542	* @ COLORFGBG: fg;bg color codes	496	* @ COLORFGBG: fg;bg color codes
543	*/	497	*/
544	putenv (env_display);	498	putenv (env_display);
545	putenv (env_windowid);	499	putenv (env_windowid);
		500
546	if (env_colorfgbg)	501	if (env_colorfgbg)
547	putenv (env_colorfgbg);	502	putenv (env_colorfgbg);
548		503
549	#ifdef RXVT_TERMINFO	504	#ifdef RXVT_TERMINFO
550	putenv ("TERMINFO=" RXVT_TERMINFO);	505	putenv ("TERMINFO=" RXVT_TERMINFO);
…		…
578	* This should support all European type languages.	533	* This should support all European type languages.
579	*/	534	*/
580	void	535	void
581	rxvt_term::set_locale (const char *locale)	536	rxvt_term::set_locale (const char *locale)
582	{	537	{
		538	set_environ (envv);
		539
583	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	540	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
584	free (this->locale);	541	free (this->locale);
585	this->locale = setlocale (LC_CTYPE, locale);	542	this->locale = setlocale (LC_CTYPE, locale);
586		543
587	if (!this->locale)	544	if (!this->locale)
588	{	545	{
589	if (*locale)	546	if (*locale)
590	{	547	{
591	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	548	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592	setlocale (LC_CTYPE, "");	549	setlocale (LC_CTYPE, "C");
593	}	550	}
594	else	551	else
595	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	552	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596		553
597	this->locale = "";	554	this->locale = "C";
598	}	555	}
599		556
600		557
601	this->locale = rxvt_strdup (this->locale);	558	this->locale = rxvt_strdup (this->locale);
602	SET_LOCALE (this->locale);	559	SET_LOCALE (this->locale);
…		…
617	}	574	}
618		575
619	void	576	void
620	rxvt_term::init_xlocale ()	577	rxvt_term::init_xlocale ()
621	{	578	{
		579	set_environ (envv);
		580
622	#ifdef USE_XIM	581	#ifdef USE_XIM
623	if (!locale)	582	if (!locale)
624	rxvt_warn ("setting locale failed, working without locale support.\n");	583	rxvt_warn ("setting locale failed, working without locale support.\n");
625	else	584	else
626	{	585	{
…		…
648	* Initialize the command connection.	607	* Initialize the command connection.
649	* This should be called after the X server connection is established.	608	* This should be called after the X server connection is established.
650	*/	609	*/
651		610
652	#ifdef META8_OPTION	611	#ifdef META8_OPTION
653	meta_char = OPTION ((Opt_meta8) ? 0x80 : C0_ESC);	612	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654	#endif	613	#endif
655		614
656	get_ourmods ();	615	get_ourmods ();
657		616
658	if (!OPTION (Opt_scrollTtyOutput))	617	if (!OPTION (Opt_scrollTtyOutput))
…		…
666	if (strcmp (key_backspace, "DEC") == 0)	625	if (strcmp (key_backspace, "DEC") == 0)
667	priv_modes \|= PrivMode_HaveBackSpace;	626	priv_modes \|= PrivMode_HaveBackSpace;
668	#endif	627	#endif
669		628
670	/* add value for scrollBar */	629	/* add value for scrollBar */
671	if (scrollbar_visible ())	630	if (scrollBar.state)
672	{	631	{
673	priv_modes \|= PrivMode_scrollBar;	632	priv_modes \|= PrivMode_scrollBar;
674	SavedModes \|= PrivMode_scrollBar;	633	SavedModes \|= PrivMode_scrollBar;
675	}	634	}
676
677	if (menubar_visible ())
678	{
679	priv_modes \|= PrivMode_menuBar;
680	SavedModes \|= PrivMode_menuBar;
681	}
682
683	#ifdef CURSOR_BLINK
684	if (OPTION (Opt_cursorBlink))
685	(void)gettimeofday (&lastcursorchange, NULL);
686	#endif
687		635
688	run_command (argv);	636	run_command (argv);
689	}	637	}
690		638
691	/----------------------------------------------------------------------/	639	/----------------------------------------------------------------------/
…		…
758	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	706	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
759	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	707	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
760	}	708	}
761		709
762	/*	710	/*
763	* get scrollBar/menuBar shadow colors	711	* get scrollBar shadow colors
764	*	712	*
765	* The calculations of topShadow/bottomShadow values are adapted	713	* The calculations of topShadow/bottomShadow values are adapted
766	* from the fvwm window manager.	714	* from the fvwm window manager.
767	*/	715	*/
768	#ifdef KEEP_SCROLLCOLOR	716	#ifdef KEEP_SCROLLCOLOR
…		…
813	int i = atoi (rs[Rs_color + idx]);	761	int i = atoi (rs[Rs_color + idx]);
814		762
815	if (i >= 8 && i <= 15)	763	if (i >= 8 && i <= 15)
816	{ /* bright colors */	764	{ /* bright colors */
817	i -= 8;	765	i -= 8;
818	#ifndef NO_BRIGHTCOLOR
819	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	766	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820	return;	767	return;
821	#endif
822	}	768	}
823		769
824	if (i >= 0 && i <= 7) /* normal colors */	770	if (i >= 0 && i <= 7) /* normal colors */
825	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	771	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826	}	772	}
…		…
921	rxvt_term::create_windows (int argc, const char const argv)	867	rxvt_term::create_windows (int argc, const char const argv)
922	{	868	{
923	XClassHint classHint;	869	XClassHint classHint;
924	XWMHints wmHint;	870	XWMHints wmHint;
925	#if ENABLE_FRILLS	871	#if ENABLE_FRILLS
926	Atom prop = None;
927	MWMHints mwmhints;	872	MWMHints mwmhints;
928	#endif	873	#endif
929	XGCValues gcvalue;	874	XGCValues gcvalue;
930	long vt_emask;
931	XSetWindowAttributes attributes;	875	XSetWindowAttributes attributes;
932	XWindowAttributes gattr;
933	Window top, parent;	876	Window top, parent;
934	dDisp;	877	dDisp;
935		878
936	#ifdef USING_W11LIB	879	xa = display->xa;
937	/* enable W11 callbacks */
938	W11AddEventHandler (disp, rxvt_W11_process_x_event);
939	#endif
940		880
941	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	881	/* grab colors before netscape does */
942	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	882	Get_Colours ();
943		883
944	if (OPTION (Opt_transparent))	884	if (!set_fonts ())
945	{	885	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	886
947	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	887	parent = display->root;
948	}	888
		889	attributes.override_redirect = !!OPTION (Opt_override_redirect);
949		890
950	#if ENABLE_FRILLS	891	#if ENABLE_FRILLS
951	if (OPTION (Opt_borderLess))	892	if (OPTION (Opt_borderLess))
952	{	893	{
953	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	894	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
954
955	if (prop == None)
956	{	895	{
957	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	896	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
958	#ifdef PREFER_24BIT
959	attributes.override_redirect = TRUE;	897	attributes.override_redirect = TRUE;
960	#endif
961	mwmhints.flags = 0;	898	mwmhints.flags = 0;
962	}	899	}
963	else	900	else
964	{	901	{
965	mwmhints.flags = MWM_HINTS_DECORATIONS;	902	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
968	}	905	}
969	else	906	else
970	mwmhints.flags = 0;	907	mwmhints.flags = 0;
971	#endif	908	#endif
972		909
973	/* grab colors before netscape does */
974	Get_Colours ();
975
976	if (!set_fonts ())
977	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979	parent = DefaultRootWindow (disp);
980
981	#if ENABLE_XEMBED	910	#if ENABLE_XEMBED
982	if (rs[Rs_embed])	911	if (rs[Rs_embed])
983	{	912	{
984	XWindowAttributes wattr;	913	XWindowAttributes wattr;
985		914
…		…
993	#endif	922	#endif
994		923
995	window_calc (0, 0);	924	window_calc (0, 0);
996		925
997	/* sub-window placement & size in rxvt_resize_subwindows () */	926	/* sub-window placement & size in rxvt_resize_subwindows () */
998	#ifdef PREFER_24BIT
999	attributes.background_pixel = pix_colors_focused[Color_border];	927	attributes.background_pixel = pix_colors_focused[Color_border];
1000	attributes.border_pixel = pix_colors_focused[Color_border];	928	attributes.border_pixel = pix_colors_focused[Color_border];
1001	attributes.colormap = display->cmap;	929	attributes.colormap = display->cmap;
		930
1002	top = XCreateWindow (disp, parent,	931	top = XCreateWindow (disp, parent,
1003	szHint.x, szHint.y,	932	szHint.x, szHint.y,
1004	szHint.width, szHint.height,	933	szHint.width, szHint.height,
1005	ext_bwidth,	934	ext_bwidth,
1006	display->depth, InputOutput,	935	display->depth, InputOutput,
1007	display->visual,	936	display->visual,
1008	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	937	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1009	#else	938	&attributes);
1010	top = XCreateSimpleWindow (disp, parent,
1011	szHint.x, szHint.y,
1012	szHint.width, szHint.height,
1013	ext_bwidth,
1014	pix_colors_focused[Color_border],
1015	pix_colors_focused[Color_border]);
1016	#endif
1017		939
1018	this->parent[0] = top;	940	this->parent[0] = top;
1019		941
1020	old_width = szHint.width;	942	old_width = szHint.width;
1021	old_height = szHint.height;	943	old_height = szHint.height;
1022		944
1023	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	945	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	946	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025		947
1026	classHint.res_name = (char *)rs[Rs_name];	948	classHint.res_name = (char *)rs[Rs_name];
1027	classHint.res_class = (char *)RESCLASS;	949	classHint.res_class = (char *)RESCLASS;
1028		950
1029	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	951	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1030	wmHint.input = True;	952	wmHint.input = True;
1031	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	953	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032	wmHint.window_group = top;	954	wmHint.window_group = top;
1033		955
1034	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	956	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1035	&szHint, &wmHint, &classHint);	957	&szHint, &wmHint, &classHint);
		958
		959	#if ENABLE_FRILLS
		960	if (mwmhints.flags)
		961	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		962	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		963	#endif
1036		964
1037	Atom protocols[] = {	965	Atom protocols[] = {
1038	xa[XA_WM_DELETE_WINDOW],	966	xa[XA_WM_DELETE_WINDOW],
1039	#if ENABLE_EWMH	967	#if ENABLE_EWMH
1040	xa[XA_NET_WM_PING],	968	xa[XA_NET_WM_PING],
1041	#endif	969	#endif
1042	};	970	};
1043		971
1044	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	972	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045		973
		974	#if ENABLE_FRILLS
		975	if (rs[Rs_transient_for])
		976	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		977	#endif
		978
1046	#if ENABLE_EWMH	979	#if ENABLE_EWMH
1047	long pid = getpid ();	980	long pid = getpid ();
1048		981
1049	XChangeProperty (disp, top,	982	XChangeProperty (disp, top,
1050	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	983	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
…		…
1061	\| FocusChangeMask \| VisibilityChangeMask	994	\| FocusChangeMask \| VisibilityChangeMask
1062	\| ExposureMask \| StructureNotifyMask);	995	\| ExposureMask \| StructureNotifyMask);
1063		996
1064	termwin_ev.start (display, top);	997	termwin_ev.start (display, top);
1065		998
1066	#if ENABLE_FRILLS
1067	if (mwmhints.flags)
1068	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1069	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1070	#endif
1071
1072	/* vt cursor: Black-on-White is standard, but this is more popular */	999	/* vt cursor: Black-on-White is standard, but this is more popular */
1073	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1000	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1074		1001
1075	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1002	#ifdef HAVE_SCROLLBARS
1076	/* cursor (menuBar/scrollBar): Black-on-White */	1003	/* cursor scrollBar: Black-on-White */
1077	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1004	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1078	#endif	1005	#endif
1079		1006
1080	/* the vt window */	1007	/* the vt window */
1081	vt = XCreateSimpleWindow (disp, top,	1008	vt = XCreateSimpleWindow (disp, top,
1082	window_vt_x,
1083	window_vt_y,	1009	window_vt_x, window_vt_y,
1084	TermWin_TotalWidth (),	1010	width, height,
1085	TermWin_TotalHeight (),
1086	0,	1011	0,
1087	pix_colors_focused[Color_fg],	1012	pix_colors_focused[Color_fg],
1088	pix_colors_focused[Color_bg]);	1013	pix_colors_focused[Color_bg]);
1089	#ifdef DEBUG_X
1090	XStoreName (disp, vt, "vt window");
1091	#endif
1092		1014
1093	attributes.bit_gravity = NorthWestGravity;	1015	attributes.bit_gravity = NorthWestGravity;
1094	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1016	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095		1017
1096	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1018	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1097		1019
1098	#ifdef POINTER_BLANK
1099	if (OPTION (Opt_pointerBlank))	1020	if (OPTION (Opt_pointerBlank))
1100	vt_emask \|= PointerMotionMask;	1021	vt_emask \|= PointerMotionMask;
1101	else	1022	else
1102	#endif
1103	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1023	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1104		1024
1105	XSelectInput (disp, vt, vt_emask);	1025	vt_select_input ();
		1026
1106	vt_ev.start (display, vt);	1027	vt_ev.start (display, vt);
1107
1108	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109	if (menuBar_height ())
1110	{
1111	menuBar.win = XCreateSimpleWindow (disp, top,
1112	window_vt_x, 0,
1113	TermWin_TotalWidth (),
1114	menuBar_TotalHeight (),
1115	0,
1116	pix_colors_focused[Color_fg],
1117	pix_colors_focused[Color_scroll]);
1118
1119	#ifdef DEBUG_X
1120	XStoreName (disp, menuBar.win, "menubar");
1121	#endif
1122
1123	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125	XDefineCursor (disp, menuBar.win,
1126	XCreateFontCursor (disp, XC_left_ptr));
1127
1128	XSelectInput (disp, menuBar.win,
1129	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1130	menubar_ev.start (display, menuBar.win);
1131	}
1132	#endif
1133		1028
1134	#ifdef XPM_BACKGROUND	1029	#ifdef XPM_BACKGROUND
1135	if (rs[Rs_backgroundPixmap] != NULL	1030	if (rs[Rs_backgroundPixmap] != NULL
1136	&& ! OPTION (Opt_transparent))	1031	&& !OPTION (Opt_transparent))
1137	{	1032	{
1138	const char *p = rs[Rs_backgroundPixmap];	1033	const char *p = rs[Rs_backgroundPixmap];
1139		1034
1140	if ((p = strchr (p, ';')) != NULL)	1035	if ((p = strchr (p, ';')) != NULL)
1141	{	1036	{
…		…
1147	scr_touch (true);	1042	scr_touch (true);
1148	}	1043	}
1149	#endif	1044	#endif
1150		1045
1151	/* graphics context for the vt window */	1046	/* graphics context for the vt window */
1152	gcvalue.foreground = pix_colors[Color_fg];	1047	gcvalue.foreground = pix_colors[Color_fg];
1153	gcvalue.background = pix_colors[Color_bg];	1048	gcvalue.background = pix_colors[Color_bg];
1154	gcvalue.graphics_exposures = 1;	1049	gcvalue.graphics_exposures = 1;
		1050
1155	gc = XCreateGC (disp, vt,	1051	gc = XCreateGC (disp, vt,
1156	GCForeground \| GCBackground \| GCGraphicsExposures,	1052	GCForeground \| GCBackground \| GCGraphicsExposures,
1157	&gcvalue);	1053	&gcvalue);
1158		1054
1159	drawable = new rxvt_drawable (display, vt);	1055	drawable = new rxvt_drawable (display, vt);
1160		1056
1161	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1057	#ifdef RXVT_SCROLLBAR
1162	gcvalue.foreground = pix_colors[Color_topShadow];	1058	gcvalue.foreground = pix_colors[Color_topShadow];
1163	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1059	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164	gcvalue.foreground = pix_colors[Color_bottomShadow];	1060	gcvalue.foreground = pix_colors[Color_bottomShadow];
1165	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1061	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1166	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1062	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
…		…
1173	pix_colors = pix_colors_unfocused;	1069	pix_colors = pix_colors_unfocused;
1174	#endif	1070	#endif
1175		1071
1176	pointer_unblank ();	1072	pointer_unblank ();
1177	scr_recolour ();	1073	scr_recolour ();
1178
1179	#if ENABLE_XEMBED
1180	if (rs[Rs_embed])
1181	{
1182	long info[2] = { 0, XEMBED_MAPPED };
1183
1184	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185	32, PropModeReplace, (unsigned char *)&info, 2);
1186	}
1187	#endif
1188	}	1074	}
1189		1075
1190	/* ------------------------------------------------------------------------- *	1076	/* ------------------------------------------------------------------------- *
1191	* GET TTY CURRENT STATE *	1077	* GET TTY CURRENT STATE *
1192	* ------------------------------------------------------------------------- */	1078	* ------------------------------------------------------------------------- */
…		…
1409	rxvt_term::run_command (const char const argv)	1295	rxvt_term::run_command (const char const argv)
1410	{	1296	{
1411	#if ENABLE_FRILLS	1297	#if ENABLE_FRILLS
1412	if (rs[Rs_pty_fd])	1298	if (rs[Rs_pty_fd])
1413	{	1299	{
1414	pty.pty = atoi (rs[Rs_pty_fd]);	1300	pty->pty = atoi (rs[Rs_pty_fd]);
1415		1301
		1302	if (pty->pty >= 0)
		1303	{
1416	if (getfd_hook)	1304	if (getfd_hook)
1417	pty.pty = (*getfd_hook) (pty.pty);	1305	pty->pty = (*getfd_hook) (pty->pty);
1418		1306
1419	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1307	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1308	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1309	}
1421	}	1310	}
1422	else	1311	else
1423	#endif	1312	#endif
1424	if (!pty.get ())	1313	if (!pty->get ())
1425	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1314	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1426		1315
1427	pty.set_utf8_mode (enc_utf8);	1316	pty->set_utf8_mode (enc_utf8);
1428		1317
1429	/* set initial window size */	1318	/* set initial window size */
1430	tt_winch ();	1319	tt_winch ();
1431		1320
1432	int er;	1321	int er;
…		…
1445	#if ENABLE_FRILLS	1334	#if ENABLE_FRILLS
1446	if (rs[Rs_pty_fd])	1335	if (rs[Rs_pty_fd])
1447	return;	1336	return;
1448	#endif	1337	#endif
1449		1338
1450	#ifndef __QNX__
1451	/* spin off the command interpreter */	1339	/* spin off the command interpreter */
1452	switch (cmd_pid = fork ())	1340	switch (cmd_pid = fork ())
1453	{	1341	{
1454	case -1:	1342	case -1:
1455	{	1343	{
…		…
1457	rxvt_fatal ("can't fork, aborting.\n");	1345	rxvt_fatal ("can't fork, aborting.\n");
1458	}	1346	}
1459	case 0:	1347	case 0:
1460	init_env ();	1348	init_env ();
1461		1349
1462	if (!pty.make_controlling_tty ())	1350	if (!pty->make_controlling_tty ())
1463	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1351	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1464	else	1352	else
1465	{	1353	{
1466	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1354	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1467	dup2 (pty.tty, STDIN_FILENO);	1355	dup2 (pty->tty, STDIN_FILENO);
1468	dup2 (pty.tty, STDOUT_FILENO);	1356	dup2 (pty->tty, STDOUT_FILENO);
1469	dup2 (pty.tty, STDERR_FILENO);	1357	dup2 (pty->tty, STDERR_FILENO);
1470		1358
1471	// close all our file handles that we do no longer need	1359	// close all our file handles that we do no longer need
1472	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1360	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1473	{	1361	{
1474	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1362	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1475	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1363	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1476	}	1364	}
1477		1365
1478	run_child (argv);	1366	run_child (argv);
1479	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1367	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1480	}	1368	}
1481		1369
1482	_exit (EXIT_FAILURE);	1370	_exit (EXIT_FAILURE);
1483		1371
1484	default:	1372	default:
1485	{	1373	if (!OPTION (Opt_utmpInhibit))
1486	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1374	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1487	int fdstdin;
1488		1375
1489	fdstdin = dup (STDIN_FILENO);	1376	pty->close_tty ();
1490	dup2 (pty.tty, STDIN_FILENO);
1491	#endif
1492		1377
1493	#ifdef UTMP_SUPPORT	1378	child_ev.start (cmd_pid);
1494	privileged_utmp (SAVE);
1495	#endif
1496		1379
1497	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1380	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1498
1499	dup2 (fdstdin, STDIN_FILENO);
1500	close (fdstdin);
1501	#endif
1502	}
1503
1504	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1505	break;	1381	break;
1506	}	1382	}
1507	#else /* __QNX__ uses qnxspawn () */
1508	fchmod (pty.tty, 0622);
1509	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1510	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1511
1512	if (run_child (argv) == -1)
1513	exit (EXIT_FAILURE);
1514	#endif
1515	}	1383	}
1516		1384
1517	/* ------------------------------------------------------------------------- *	1385	/* ------------------------------------------------------------------------- *
1518	* CHILD PROCESS OPERATIONS *	1386	* CHILD PROCESS OPERATIONS *
1519	* ------------------------------------------------------------------------- */	1387	* ------------------------------------------------------------------------- */
…		…
1563	// unblock signals (signals are blocked by iom.C	1431	// unblock signals (signals are blocked by iom.C
1564	sigset_t ss;	1432	sigset_t ss;
1565	sigemptyset (&ss);	1433	sigemptyset (&ss);
1566	sigprocmask (SIG_SETMASK, &ss, 0);	1434	sigprocmask (SIG_SETMASK, &ss, 0);
1567		1435
1568	#ifndef __QNX__
1569	/* command interpreter path */	1436	/* command interpreter path */
1570	if (argv != NULL)	1437	if (argv != NULL)
1571	{	1438	{
1572	# ifdef DEBUG_CMD	1439	# ifdef DEBUG_CMD
1573	int i;	1440	int i;
…		…
1579	execvp (argv[0], (char const )argv);	1446	execvp (argv[0], (char const )argv);
1580	/* no error message: STDERR is closed! */	1447	/* no error message: STDERR is closed! */
1581	}	1448	}
1582	else	1449	else
1583	{	1450	{
1584	const char argv0, shell;	1451	const char argv0, shell;
1585		1452
1586	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1453	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1587	shell = "/bin/sh";	1454	shell = "/bin/sh";
1588		1455
1589	argv0 = (const char *)rxvt_r_basename (shell);	1456	argv0 = (const char *)rxvt_r_basename (shell);
…		…
1594		1461
1595	login[0] = '-';	1462	login[0] = '-';
1596	strcpy (&login[1], argv0);	1463	strcpy (&login[1], argv0);
1597	argv0 = login;	1464	argv0 = login;
1598	}	1465	}
		1466
1599	execlp (shell, argv0, NULL);	1467	execlp (shell, argv0, NULL);
1600	/* no error message: STDERR is closed! */	1468	/* no error message: STDERR is closed! */
1601	}	1469	}
1602		1470
1603	#else /* __QNX__ uses qnxspawn () */
1604
1605	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1606	char *command = NULL, fullcommand[_MAX_PATH];
1607	char *arg_v, arg_a[2] = { NULL, NULL };
1608
1609	if (argv != NULL)
1610	{
1611	if (access (argv[0], X_OK) == -1)
1612	{
1613	if (strchr (argv[0], '/') == NULL)
1614	{
1615	searchenv (argv[0], "PATH", fullcommand);
1616
1617	if (fullcommand[0] != '\0')
1618	command = fullcommand;
1619	}
1620
1621	if (access (command, X_OK) == -1)
1622	return -1;
1623	}
1624	else
1625	command = argv[0];
1626
1627	arg_v = argv;
1628	}
1629	else
1630	{
1631	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1632	command = "/bin/sh";
1633
1634	arg_a[0] = my_basename (command);
1635
1636	if (OPTION (Opt_loginShell))
1637	{
1638	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1639
1640	login[0] = '-';
1641	strcpy (&login[1], arg_a[0]);
1642	arg_a[0] = login;
1643	}
1644
1645	arg_v = arg_a;
1646	}
1647
1648	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1649	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1650	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1651	command, arg_v, environ, iov_a, 0);
1652	if (login)
1653	free (login);
1654
1655	pty.close_tty ();
1656	return pty.pty;
1657	#endif
1658
1659	return -1;	1471	return -1;
1660	}	1472	}
1661		1473
1662	/----------------------- end-of-file (C source) -----------------------/	1474	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.128 by root, Sat Dec 31 17:16:17 2005 UTC vs. Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.128 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC