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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.132 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.163 by root, Tue Jan 31 16:57:35 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.
…		…
43	const char *const def_colorName[] =	43	const char *const def_colorName[] =
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	"rgb:00/00/00", // 0: black (Black)
49	"Red3", /* 1: red (#CD0000) */	49	"rgb:cd/00/00", // 1: red (Red3)
50	"Green3", /* 2: green (#00CD00) */	50	"rgb:00/cd/00", // 2: green (Green3)
51	"Yellow3", /* 3: yellow (#CDCD00) */	51	"rgb:cd/cd/00", // 3: ywlloe (Yellow3)
52	"Blue3", /* 4: blue (#0000CD) */	52	"rgb:00/00/cd", // 4: blue (Blue3)
53	"Magenta3", /* 5: magenta (#CD00CD) */	53	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"Cyan3", /* 6: cyan (#00CDCD) */	54	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	55	# ifdef XTERM_COLORS
56	"Grey90", /* 7: white (#E5E5E5) */	56	"rgb:e5/e5/e5", // 7: white (Grey90)
57	# else	57	# else
58	"AntiqueWhite", /* 7: white (#FAEBD7) */	58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59	# endif	59	# endif
60	/* high-intensity colors */	60	/* high-intensity colors */
61	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
62	"Grey30", /* 8: bright black (#4D4D4D) */	62	"rgb:4d/4d/4d", // 8: bright black (Grey30)
63	# else	63	# else
64	"Grey25", /* 8: bright black (#404040) */	64	"rgb:40/40/40", // 8: bright black (Grey25)
65	# endif	65	# endif
66	"Red", /* 1/9: bright red (#FF0000) */	66	"rgb:ff/00/00", // 1/9: bright red (Reed)
67	"Green", /* 2/10: bright green (#00FF00) */	67	"rgb:00/ff/00", // 2/10: bright green (Green)
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69	"Blue", /* 4/12: bright blue (#0000FF) */	69	"rgb:00/00/ff", // 4/12: bright blue (Blue)
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71	"Cyan", /* 6/14: bright cyan (#00FFFF) */	71	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72	"White", /* 7/15: bright white (#FFFFFF) */	72	"rgb:ff/ff/ff", // 7/15: bright white (White)
73		73
74	// 88 xterm colours	74	// 88 xterm colours
75	"rgb:00/00/00",	75	"rgb:00/00/00",
76	"rgb:00/00/8b",	76	"rgb:00/00/8b",
77	"rgb:00/00/cd",	77	"rgb:00/00/cd",
…		…
170	#endif /* KEEP_SCROLLCOLOR */	170	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	171	#if TINTING
172	NULL,	172	NULL,
173	#endif	173	#endif
174	#if OFF_FOCUS_FADING	174	#if OFF_FOCUS_FADING
175	"black",	175	"rgb:00/00/00",
176	#endif
177	};
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	176	#endif
216	};	177	};
217		178
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
		302	xa = display->xa;
		303
		304	#if XFT
		305	if (rs[Rs_depth])
		306	set (display, strtol (rs[Rs_depth], 0, 0));
		307	else
		308	#endif
		309	set (display);
		310
352	extract_resources ();	311	extract_resources ();
		312
353	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
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
…		…
509	val = rxvt_network_display (rs[Rs_display_name]);	482	val = rxvt_network_display (rs[Rs_display_name]);
510	rs[Rs_display_name] = (const char *)val;	483	rs[Rs_display_name] = (const char *)val;
511		484
512	if (val == NULL)	485	if (val == NULL)
513	#endif /* DISPLAY_IS_IP */	486	#endif /* DISPLAY_IS_IP */
514	val = XDisplayString (display->display);	487	val = XDisplayString (xdisp);
515		488
516	if (rs[Rs_display_name] == NULL)	489	if (rs[Rs_display_name] == NULL)
517	rs[Rs_display_name] = val; /* use broken `:0' value */	490	rs[Rs_display_name] = val; /* use broken `:0' value */
518		491
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;
700		664
701	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	665	if (!set_color (xcol, rs[Rs_color + i]))
702	{	666	{
703	#ifndef XTERM_REVERSE_VIDEO	667	#ifndef XTERM_REVERSE_VIDEO
704	if (i < 2 && OPTION (Opt_reverseVideo))	668	if (i < 2 && OPTION (Opt_reverseVideo))
705	rs[Rs_color + i] = def_colorName[!i];	669	rs[Rs_color + i] = def_colorName[!i];
706	else	670	else
…		…
708	rs[Rs_color + i] = def_colorName[i];	672	rs[Rs_color + i] = def_colorName[i];
709		673
710	if (!rs[Rs_color + i])	674	if (!rs[Rs_color + i])
711	continue;	675	continue;
712		676
713	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	677	if (!set_color (xcol, rs[Rs_color + i]))
714	{	678	{
715	switch (i)	679	switch (i)
716	{	680	{
717	case Color_fg:	681	case Color_fg:
718	case Color_bg:	682	case Color_bg:
719	/* fatal: need bg/fg color */	683	/* fatal: need bg/fg color */
720	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	684	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
721	/* NOTREACHED */
722	break;	685	break;
723	#ifndef NO_CURSORCOLOR	686	#ifndef NO_CURSORCOLOR
724	case Color_cursor2:	687	case Color_cursor2:
725	xcol = pix_colors[Color_fg];	688	xcol = pix_colors[Color_fg];
726	break;	689	break;
…		…
739	SET_PIXCOLOR (i);	702	SET_PIXCOLOR (i);
740	}	703	}
741		704
742	#ifdef OFF_FOCUS_FADING	705	#ifdef OFF_FOCUS_FADING
743	if (rs[Rs_fade])	706	if (rs[Rs_fade])
744	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	707	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]);	708	{
		709	rxvt_rgba c;
		710	pix_colors[Color_fade].get (this, c);
		711	pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
		712	}
746	#endif	713	#endif
747		714
748	if (display->depth <= 2)	715	if (depth <= 2)
749	{	716	{
750	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	717	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];	718	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];	719	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
753	}	720	}
754		721
755	/*	722	/*
756	* get scrollBar/menuBar shadow colors	723	* get scrollBar shadow colors
757	*	724	*
758	* The calculations of topShadow/bottomShadow values are adapted	725	* The calculations of topShadow/bottomShadow values are adapted
759	* from the fvwm window manager.	726	* from the fvwm window manager.
760	*/	727	*/
761	#ifdef KEEP_SCROLLCOLOR	728	#ifdef KEEP_SCROLLCOLOR
762		729
763	if (display->depth <= 2)	730	if (depth <= 2)
764	{	731	{
765	/* Monochrome */	732	/* Monochrome */
766	pix_colors[Color_scroll] = pix_colors[Color_fg];	733	pix_colors[Color_scroll] = pix_colors[Color_fg];
767	pix_colors[Color_topShadow] = pix_colors[Color_bg];	734	pix_colors[Color_topShadow] = pix_colors[Color_bg];
768	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	735	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
…		…
773	/* xcol[0] == white	740	/* xcol[0] == white
774	* xcol[1] == top shadow	741	* xcol[1] == top shadow
775	* xcol[2] == bot shadow */	742	* xcol[2] == bot shadow */
776		743
777	xcol[1] = pix_colors[Color_scroll];	744	xcol[1] = pix_colors[Color_scroll];
778	xcol[0].set (display, 65535, 65535, 65535);	745	xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
779		746
780	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;	747	rxvt_rgba c0, c1;
781		748
782	xcol[0].get (display, pr0, pg0, pb0);	749	xcol[0].get (this, c0);
783	xcol[1].get (display, pr1, pg1, pb1);	750	xcol[1].get (this, c1);
784		751
785	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);	752	xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
786		753
787	/* topShadowColor */	754	/* topShadowColor */
788	if (!xcol[1].set (display,	755	if (!xcol[1].set (this,
		756	rxvt_rgba (
789	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	757	min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
790	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	758	min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
791	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	759	min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
		760	c1.a) // pa1 vs. pa0: arbitrary
		761	));
792	xcol[1] = pix_colors[Color_White];	762	xcol[1] = pix_colors[Color_White];
793		763
794	pix_colors[Color_topShadow] = xcol[1];	764	pix_colors[Color_topShadow] = xcol[1];
795	}	765	}
796	#endif /* KEEP_SCROLLCOLOR */	766	#endif /* KEEP_SCROLLCOLOR */
…		…
840		810
841	if (rsmod	811	if (rsmod
842	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	812	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
843	requestedmeta = rsmod[3] - '0';	813	requestedmeta = rsmod[3] - '0';
844		814
845	map = XGetModifierMapping (display->display);	815	map = XGetModifierMapping (xdisp);
846	kc = map->modifiermap;	816	kc = map->modifiermap;
847		817
848	for (i = 1; i < 6; i++)	818	for (i = 1; i < 6; i++)
849	{	819	{
850	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	820	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
852	for (j = map->max_keypermod; j--; k++)	822	for (j = map->max_keypermod; j--; k++)
853	{	823	{
854	if (kc[k] == 0)	824	if (kc[k] == 0)
855	break;	825	break;
856		826
857	switch (XKeycodeToKeysym (display->display, kc[k], 0))	827	switch (XKeycodeToKeysym (xdisp, kc[k], 0))
858	{	828	{
859	case XK_Num_Lock:	829	case XK_Num_Lock:
860	ModNumLockMask = modmasks[i - 1];	830	ModNumLockMask = modmasks[i - 1];
861	continue;	831	continue;
862		832
…		…
912	rxvt_term::create_windows (int argc, const char const argv)	882	rxvt_term::create_windows (int argc, const char const argv)
913	{	883	{
914	XClassHint classHint;	884	XClassHint classHint;
915	XWMHints wmHint;	885	XWMHints wmHint;
916	#if ENABLE_FRILLS	886	#if ENABLE_FRILLS
917	Atom prop = None;
918	MWMHints mwmhints;	887	MWMHints mwmhints;
919	#endif	888	#endif
920	XGCValues gcvalue;	889	XGCValues gcvalue;
921	long vt_emask;
922	XSetWindowAttributes attributes;	890	XSetWindowAttributes attributes;
923	XWindowAttributes gattr;
924	Window top, parent;	891	Window top, parent;
925	dDisp;
926		892
927	#ifdef USING_W11LIB	893	dLocal (Display *, xdisp);
928	/* enable W11 callbacks */
929	W11AddEventHandler (disp, rxvt_W11_process_x_event);
930	#endif
931		894
932	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	895	/* grab colors before netscape does */
933	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	896	Get_Colours ();
934		897
935	if (OPTION (Opt_transparent))	898	if (!set_fonts ())
936	{	899	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
937	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	900
938	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	901	parent = display->root;
939	}	902
		903	attributes.override_redirect = !!OPTION (Opt_override_redirect);
940		904
941	#if ENABLE_FRILLS	905	#if ENABLE_FRILLS
942	if (OPTION (Opt_borderLess))	906	if (OPTION (Opt_borderLess))
943	{	907	{
944	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	908	if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
945
946	if (prop == None)
947	{	909	{
948	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	910	/* 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;	911	attributes.override_redirect = true;
951	#endif
952	mwmhints.flags = 0;	912	mwmhints.flags = 0;
953	}	913	}
954	else	914	else
955	{	915	{
956	mwmhints.flags = MWM_HINTS_DECORATIONS;	916	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
959	}	919	}
960	else	920	else
961	mwmhints.flags = 0;	921	mwmhints.flags = 0;
962	#endif	922	#endif
963		923
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	924	#if ENABLE_XEMBED
973	if (rs[Rs_embed])	925	if (rs[Rs_embed])
974	{	926	{
975	XWindowAttributes wattr;	927	XWindowAttributes wattr;
976		928
977	parent = strtol (rs[Rs_embed], 0, 0);	929	parent = strtol (rs[Rs_embed], 0, 0);
978		930
979	if (!XGetWindowAttributes (disp, parent, &wattr))	931	if (!XGetWindowAttributes (xdisp, parent, &wattr))
980	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	932	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
981		933
982	window_calc (wattr.width, wattr.height);	934	window_calc (wattr.width, wattr.height);
983	}	935	}
984	#endif	936	#endif
985		937
986	window_calc (0, 0);	938	window_calc (0, 0);
987		939
988	/* sub-window placement & size in rxvt_resize_subwindows () */	940	/* sub-window placement & size in rxvt_resize_subwindows () */
989	#ifdef PREFER_24BIT
990	attributes.background_pixel = pix_colors_focused[Color_border];	941	attributes.background_pixel = pix_colors_focused [Color_border];
991	attributes.border_pixel = pix_colors_focused[Color_border];	942	attributes.border_pixel = pix_colors_focused [Color_border];
992	attributes.colormap = display->cmap;	943	attributes.colormap = cmap;
		944
993	top = XCreateWindow (disp, parent,	945	top = XCreateWindow (xdisp, parent,
994	szHint.x, szHint.y,	946	szHint.x, szHint.y,
995	szHint.width, szHint.height,	947	szHint.width, szHint.height,
996	ext_bwidth,	948	ext_bwidth,
997	display->depth, InputOutput,	949	depth, InputOutput, visual,
998	display->visual,
999	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	950	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1000	#else	951	&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		952
1009	this->parent[0] = top;	953	this->parent[0] = top;
1010		954
1011	old_width = szHint.width;	955	old_width = szHint.width;
1012	old_height = szHint.height;	956	old_height = szHint.height;
1013		957
1014	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	958	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1015	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	959	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1016		960
1017	classHint.res_name = (char *)rs[Rs_name];	961	classHint.res_name = (char *)rs[Rs_name];
1018	classHint.res_class = (char *)RESCLASS;	962	classHint.res_class = (char *)RESCLASS;
1019		963
1020	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	964	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1021	wmHint.input = True;	965	wmHint.input = True;
1022	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	966	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1023	wmHint.window_group = top;	967	wmHint.window_group = top;
1024		968
1025	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	969	XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1026	&szHint, &wmHint, &classHint);	970	&szHint, &wmHint, &classHint);
		971
		972	#if ENABLE_FRILLS
		973	if (mwmhints.flags)
		974	XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		975	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		976	#endif
1027		977
1028	Atom protocols[] = {	978	Atom protocols[] = {
1029	xa[XA_WM_DELETE_WINDOW],	979	xa[XA_WM_DELETE_WINDOW],
1030	#if ENABLE_EWMH	980	#if ENABLE_EWMH
1031	xa[XA_NET_WM_PING],	981	xa[XA_NET_WM_PING],
1032	#endif	982	#endif
1033	};	983	};
1034		984
1035	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	985	XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		986
		987	#if ENABLE_FRILLS
		988	if (rs[Rs_transient_for])
		989	XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		990	#endif
1036		991
1037	#if ENABLE_EWMH	992	#if ENABLE_EWMH
1038	long pid = getpid ();	993	long pid = getpid ();
1039		994
1040	XChangeProperty (disp, top,	995	XChangeProperty (xdisp, top,
1041	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	996	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1042	PropModeReplace, (unsigned char *)&pid, 1);	997	PropModeReplace, (unsigned char *)&pid, 1);
1043		998
1044	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	999	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1045	#endif	1000	#endif
1046		1001
1047	XSelectInput (disp, top,	1002	XSelectInput (xdisp, top,
1048	KeyPressMask	1003	KeyPressMask
1049	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1004	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1050	\| KeyReleaseMask	1005	\| KeyReleaseMask
1051	#endif	1006	#endif
1052	\| FocusChangeMask \| VisibilityChangeMask	1007	\| FocusChangeMask \| VisibilityChangeMask
1053	\| ExposureMask \| StructureNotifyMask);	1008	\| ExposureMask \| StructureNotifyMask);
1054		1009
1055	termwin_ev.start (display, top);	1010	termwin_ev.start (display, top);
1056		1011
1057	#if ENABLE_FRILLS
1058	if (mwmhints.flags)
1059	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1060	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1061	#endif
1062
1063	/* vt cursor: Black-on-White is standard, but this is more popular */	1012	/* vt cursor: Black-on-White is standard, but this is more popular */
1064	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1013	TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1065		1014
1066	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1015	#ifdef HAVE_SCROLLBARS
1067	/* cursor (menuBar/scrollBar): Black-on-White */	1016	/* cursor scrollBar: Black-on-White */
1068	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1017	leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1069	#endif	1018	#endif
1070		1019
1071	/* the vt window */	1020	/* the vt window */
1072	vt = XCreateSimpleWindow (disp, top,	1021	vt = XCreateSimpleWindow (xdisp, top,
1073	window_vt_x,
1074	window_vt_y,	1022	window_vt_x, window_vt_y,
1075	width,
1076	height,	1023	width, height,
1077	0,	1024	0,
1078	pix_colors_focused[Color_fg],	1025	pix_colors_focused[Color_fg],
1079	pix_colors_focused[Color_bg]);	1026	pix_colors_focused[Color_bg]);
1080	#ifdef DEBUG_X
1081	XStoreName (disp, vt, "vt window");
1082	#endif
1083		1027
1084	attributes.bit_gravity = NorthWestGravity;	1028	attributes.bit_gravity = NorthWestGravity;
1085	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1029	XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1086		1030
1087	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1031	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1088		1032
1089	#ifdef POINTER_BLANK
1090	if (OPTION (Opt_pointerBlank))	1033	if (OPTION (Opt_pointerBlank))
1091	vt_emask \|= PointerMotionMask;	1034	vt_emask \|= PointerMotionMask;
1092	else	1035	else
1093	#endif
1094	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1036	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1095		1037
1096	XSelectInput (disp, vt, vt_emask);	1038	vt_select_input ();
		1039
1097	vt_ev.start (display, vt);	1040	vt_ev.start (display, vt);
1098
1099	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1100	if (menuBar_height ())
1101	{
1102	menuBar.win = XCreateSimpleWindow (disp, top,
1103	window_vt_x, 0,
1104	width,
1105	menuBar_TotalHeight (),
1106	0,
1107	pix_colors_focused[Color_fg],
1108	pix_colors_focused[Color_scroll]);
1109
1110	#ifdef DEBUG_X
1111	XStoreName (disp, menuBar.win, "menubar");
1112	#endif
1113
1114	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1115
1116	XDefineCursor (disp, menuBar.win,
1117	XCreateFontCursor (disp, XC_left_ptr));
1118
1119	XSelectInput (disp, menuBar.win,
1120	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| Button1MotionMask));
1121	menubar_ev.start (display, menuBar.win);
1122	}
1123	#endif
1124		1041
1125	#ifdef XPM_BACKGROUND	1042	#ifdef XPM_BACKGROUND
1126	if (rs[Rs_backgroundPixmap] != NULL	1043	if (rs[Rs_backgroundPixmap] != NULL
1127	&& ! OPTION (Opt_transparent))	1044	&& !OPTION (Opt_transparent))
1128	{	1045	{
1129	const char *p = rs[Rs_backgroundPixmap];	1046	const char *p = rs[Rs_backgroundPixmap];
1130		1047
1131	if ((p = strchr (p, ';')) != NULL)	1048	if ((p = strchr (p, ';')) != NULL)
1132	{	1049	{
…		…
1138	scr_touch (true);	1055	scr_touch (true);
1139	}	1056	}
1140	#endif	1057	#endif
1141		1058
1142	/* graphics context for the vt window */	1059	/* graphics context for the vt window */
1143	gcvalue.foreground = pix_colors[Color_fg];	1060	gcvalue.foreground = pix_colors[Color_fg];
1144	gcvalue.background = pix_colors[Color_bg];	1061	gcvalue.background = pix_colors[Color_bg];
1145	gcvalue.graphics_exposures = 1;	1062	gcvalue.graphics_exposures = 1;
		1063
1146	gc = XCreateGC (disp, vt,	1064	gc = XCreateGC (xdisp, vt,
1147	GCForeground \| GCBackground \| GCGraphicsExposures,	1065	GCForeground \| GCBackground \| GCGraphicsExposures,
1148	&gcvalue);	1066	&gcvalue);
1149		1067
1150	drawable = new rxvt_drawable (display, vt);	1068	drawable = new rxvt_drawable (this, vt);
1151		1069
1152	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1070	#ifdef RXVT_SCROLLBAR
1153	gcvalue.foreground = pix_colors[Color_topShadow];	1071	gcvalue.foreground = pix_colors[Color_topShadow];
1154	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1072	topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1155	gcvalue.foreground = pix_colors[Color_bottomShadow];	1073	gcvalue.foreground = pix_colors[Color_bottomShadow];
1156	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1074	botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1157	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1075	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1158	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1076	scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1159	#endif	1077	#endif
1160		1078
1161	#ifdef OFF_FOCUS_FADING	1079	#ifdef OFF_FOCUS_FADING
1162	// initially we are in unfocused state	1080	// initially we are in unfocused state
1163	if (rs[Rs_fade])	1081	if (rs[Rs_fade])
1164	pix_colors = pix_colors_unfocused;	1082	pix_colors = pix_colors_unfocused;
1165	#endif	1083	#endif
1166		1084
1167	pointer_unblank ();	1085	pointer_unblank ();
1168	scr_recolour ();	1086	scr_recolour ();
1169
1170	#if ENABLE_XEMBED
1171	if (rs[Rs_embed])
1172	{
1173	long info[2] = { 0, XEMBED_MAPPED };
1174
1175	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1176	32, PropModeReplace, (unsigned char *)&info, 2);
1177	}
1178	#endif
1179	}	1087	}
1180		1088
1181	/* ------------------------------------------------------------------------- *	1089	/* ------------------------------------------------------------------------- *
1182	* GET TTY CURRENT STATE *	1090	* GET TTY CURRENT STATE *
1183	* ------------------------------------------------------------------------- */	1091	* ------------------------------------------------------------------------- */
…		…
1400	rxvt_term::run_command (const char const argv)	1308	rxvt_term::run_command (const char const argv)
1401	{	1309	{
1402	#if ENABLE_FRILLS	1310	#if ENABLE_FRILLS
1403	if (rs[Rs_pty_fd])	1311	if (rs[Rs_pty_fd])
1404	{	1312	{
1405	pty.pty = atoi (rs[Rs_pty_fd]);	1313	pty->pty = atoi (rs[Rs_pty_fd]);
1406		1314
1407	if (pty.pty >= 0)	1315	if (pty->pty >= 0)
1408	{	1316	{
1409	if (getfd_hook)	1317	if (getfd_hook)
1410	pty.pty = (*getfd_hook) (pty.pty);	1318	pty->pty = (*getfd_hook) (pty->pty);
1411		1319
1412	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1320	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1413	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1321	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1414	}	1322	}
1415	}	1323	}
1416	else	1324	else
1417	#endif	1325	#endif
1418	if (!pty.get ())	1326	if (!pty->get ())
1419	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1327	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1420		1328
1421	pty.set_utf8_mode (enc_utf8);	1329	pty->set_utf8_mode (enc_utf8);
1422		1330
1423	/* set initial window size */	1331	/* set initial window size */
1424	tt_winch ();	1332	tt_winch ();
1425		1333
1426	int er;	1334	int er;
…		…
1439	#if ENABLE_FRILLS	1347	#if ENABLE_FRILLS
1440	if (rs[Rs_pty_fd])	1348	if (rs[Rs_pty_fd])
1441	return;	1349	return;
1442	#endif	1350	#endif
1443		1351
1444	#ifndef __QNX__
1445	/* spin off the command interpreter */	1352	/* spin off the command interpreter */
1446	switch (cmd_pid = fork ())	1353	switch (cmd_pid = fork ())
1447	{	1354	{
1448	case -1:	1355	case -1:
1449	{	1356	{
…		…
1451	rxvt_fatal ("can't fork, aborting.\n");	1358	rxvt_fatal ("can't fork, aborting.\n");
1452	}	1359	}
1453	case 0:	1360	case 0:
1454	init_env ();	1361	init_env ();
1455		1362
1456	if (!pty.make_controlling_tty ())	1363	if (!pty->make_controlling_tty ())
1457	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1364	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1458	else	1365	else
1459	{	1366	{
1460	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1367	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1461	dup2 (pty.tty, STDIN_FILENO);	1368	dup2 (pty->tty, STDIN_FILENO);
1462	dup2 (pty.tty, STDOUT_FILENO);	1369	dup2 (pty->tty, STDOUT_FILENO);
1463	dup2 (pty.tty, STDERR_FILENO);	1370	dup2 (pty->tty, STDERR_FILENO);
1464		1371
1465	// close all our file handles that we do no longer need	1372	// close all our file handles that we do no longer need
1466	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1373	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1467	{	1374	{
1468	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1375	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1469	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1376	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1470	}	1377	}
1471		1378
1472	run_child (argv);	1379	run_child (argv);
1473	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1380	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1474	}	1381	}
1475		1382
1476	_exit (EXIT_FAILURE);	1383	_exit (EXIT_FAILURE);
1477		1384
1478	default:	1385	default:
1479	{	1386	if (!OPTION (Opt_utmpInhibit))
1480	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1387	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1481	int fdstdin;
1482		1388
1483	fdstdin = dup (STDIN_FILENO);	1389	pty->close_tty ();
1484	dup2 (pty.tty, STDIN_FILENO);
1485	#endif
1486		1390
1487	#ifdef UTMP_SUPPORT	1391	child_ev.start (cmd_pid);
1488	privileged_utmp (SAVE);
1489	#endif
1490		1392
1491	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1393	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1492
1493	dup2 (fdstdin, STDIN_FILENO);
1494	close (fdstdin);
1495	#endif
1496	}
1497
1498	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1499	break;	1394	break;
1500	}	1395	}
1501	#else /* __QNX__ uses qnxspawn () */
1502	fchmod (pty.tty, 0622);
1503	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1504	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1505
1506	if (run_child (argv) == -1)
1507	exit (EXIT_FAILURE);
1508	#endif
1509	}	1396	}
1510		1397
1511	/* ------------------------------------------------------------------------- *	1398	/* ------------------------------------------------------------------------- *
1512	* CHILD PROCESS OPERATIONS *	1399	* CHILD PROCESS OPERATIONS *
1513	* ------------------------------------------------------------------------- */	1400	* ------------------------------------------------------------------------- */
…		…
1557	// unblock signals (signals are blocked by iom.C	1444	// unblock signals (signals are blocked by iom.C
1558	sigset_t ss;	1445	sigset_t ss;
1559	sigemptyset (&ss);	1446	sigemptyset (&ss);
1560	sigprocmask (SIG_SETMASK, &ss, 0);	1447	sigprocmask (SIG_SETMASK, &ss, 0);
1561		1448
1562	#ifndef __QNX__
1563	/* command interpreter path */	1449	/* command interpreter path */
1564	if (argv != NULL)	1450	if (argv != NULL)
1565	{	1451	{
1566	# ifdef DEBUG_CMD	1452	# ifdef DEBUG_CMD
1567	int i;	1453	int i;
…		…
1573	execvp (argv[0], (char const )argv);	1459	execvp (argv[0], (char const )argv);
1574	/* no error message: STDERR is closed! */	1460	/* no error message: STDERR is closed! */
1575	}	1461	}
1576	else	1462	else
1577	{	1463	{
1578	const char argv0, shell;	1464	const char argv0, shell;
1579		1465
1580	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1466	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1581	shell = "/bin/sh";	1467	shell = "/bin/sh";
1582		1468
1583	argv0 = (const char *)rxvt_r_basename (shell);	1469	argv0 = (const char *)rxvt_r_basename (shell);
…		…
1588		1474
1589	login[0] = '-';	1475	login[0] = '-';
1590	strcpy (&login[1], argv0);	1476	strcpy (&login[1], argv0);
1591	argv0 = login;	1477	argv0 = login;
1592	}	1478	}
		1479
1593	execlp (shell, argv0, NULL);	1480	execlp (shell, argv0, NULL);
1594	/* no error message: STDERR is closed! */	1481	/* no error message: STDERR is closed! */
1595	}	1482	}
1596		1483
1597	#else /* __QNX__ uses qnxspawn () */
1598
1599	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1600	char *command = NULL, fullcommand[_MAX_PATH];
1601	char *arg_v, arg_a[2] = { NULL, NULL };
1602
1603	if (argv != NULL)
1604	{
1605	if (access (argv[0], X_OK) == -1)
1606	{
1607	if (strchr (argv[0], '/') == NULL)
1608	{
1609	searchenv (argv[0], "PATH", fullcommand);
1610
1611	if (fullcommand[0] != '\0')
1612	command = fullcommand;
1613	}
1614
1615	if (access (command, X_OK) == -1)
1616	return -1;
1617	}
1618	else
1619	command = argv[0];
1620
1621	arg_v = argv;
1622	}
1623	else
1624	{
1625	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1626	command = "/bin/sh";
1627
1628	arg_a[0] = my_basename (command);
1629
1630	if (OPTION (Opt_loginShell))
1631	{
1632	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1633
1634	login[0] = '-';
1635	strcpy (&login[1], arg_a[0]);
1636	arg_a[0] = login;
1637	}
1638
1639	arg_v = arg_a;
1640	}
1641
1642	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1643	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1644	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1645	command, arg_v, environ, iov_a, 0);
1646	if (login)
1647	free (login);
1648
1649	pty.close_tty ();
1650	return pty.pty;
1651	#endif
1652
1653	return -1;	1484	return -1;
1654	}	1485	}
1655		1486
1656	/----------------------- end-of-file (C source) -----------------------/	1487	/----------------------- 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.132 by root, Fri Jan 6 02:11:15 2006 UTC vs. Revision 1.163 by root, Tue Jan 31 16:57:35 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.132 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.163 by root, Tue Jan 31 16:57:35 2006 UTC