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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.135 by root, Sat Jan 7 19:29:17 2006 UTC vs.
Revision 1.172 by root, Mon Feb 20 22:42:00 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: init.C	2	* File: init.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
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
…		…
309	int i, r_argc;	258	int i, r_argc;
310	char *val;	259	char *val;
311	const char cmd_argv, r_argv;	260	const char cmd_argv, r_argv;
312		261
313	/*	262	/*
314	* Look for -exec option. Find => split and make cmd_argv[] of command args	263	* Look for -e option. Find => split and make cmd_argv[] of command args
315	*/	264	*/
316	for (r_argc = 0; r_argc < argc; r_argc++)	265	for (r_argc = 0; r_argc < argc; r_argc++)
317	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	266	if (!strcmp (argv[r_argc], "-e"))
318	break;	267	break;
319		268
320	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	269	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
321		270
322	for (i = 0; i < r_argc; i++)	271	for (i = 0; i < r_argc; i++)
…		…
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	// using a local pointer decreases code size a lot
		303	xa = display->xa;
		304
		305	#if XFT
		306	if (rs[Rs_depth])
		307	set (display, strtol (rs[Rs_depth], 0, 0));
		308	else
		309	#endif
		310	set (display);
		311
352	extract_resources ();	312	extract_resources ();
		313
353	free (r_argv);	314	free (r_argv);
		315
		316	for (int i = NUM_RESOURCES; i--; )
		317	if (rs [i] == resval_undef)
		318	rs [i] = 0;
		319
		320	#if ENABLE_PERL
		321	if (!rs[Rs_perl_ext_1])
		322	rs[Rs_perl_ext_1] = "default";
		323
		324	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		325	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		326	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		327	{
		328	rxvt_perl.init (this);
		329	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		330	}
		331	#endif
354		332
355	/*	333	/*
356	* set any defaults not already set	334	* set any defaults not already set
357	*/	335	*/
358	if (cmd_argv && cmd_argv[0])	336	if (cmd_argv && cmd_argv[0])
…		…
391	pointerBlankDelay = 2;	369	pointerBlankDelay = 2;
392	#endif	370	#endif
393		371
394	/* no point having a scrollbar without having any scrollback! */	372	/* no point having a scrollbar without having any scrollback! */
395	if (!saveLines)	373	if (!saveLines)
396	CLR_OPTION (Opt_scrollBar);	374	set_option (Opt_scrollBar, 0);
397		375
398	#ifdef PRINTPIPE	376	#ifdef PRINTPIPE
399	if (!rs[Rs_print_pipe])	377	if (!rs[Rs_print_pipe])
400	rs[Rs_print_pipe] = PRINTPIPE;	378	rs[Rs_print_pipe] = PRINTPIPE;
401	#endif	379	#endif
…		…
448	/* this is how xterm implements reverseVideo */	426	/* this is how xterm implements reverseVideo */
449	if (OPTION (Opt_reverseVideo))	427	if (OPTION (Opt_reverseVideo))
450	{	428	{
451	if (!rs[Rs_color + Color_fg])	429	if (!rs[Rs_color + Color_fg])
452	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	430	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		431
453	if (!rs[Rs_color + Color_bg])	432	if (!rs[Rs_color + Color_bg])
454	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	433	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
455	}	434	}
456	#endif	435	#endif
457		436
…		…
509	val = rxvt_network_display (rs[Rs_display_name]);	488	val = rxvt_network_display (rs[Rs_display_name]);
510	rs[Rs_display_name] = (const char *)val;	489	rs[Rs_display_name] = (const char *)val;
511		490
512	if (val == NULL)	491	if (val == NULL)
513	#endif /* DISPLAY_IS_IP */	492	#endif /* DISPLAY_IS_IP */
514	val = XDisplayString (display->display);	493	val = XDisplayString (dpy);
515		494
516	if (rs[Rs_display_name] == NULL)	495	if (rs[Rs_display_name] == NULL)
517	rs[Rs_display_name] = val; /* use broken `:0' value */	496	rs[Rs_display_name] = val; /* use broken `:0' value */
518		497
519	i = strlen (val);	498	i = strlen (val);
520	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	499	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
521		500
522	sprintf (env_display, "DISPLAY=%s", val);	501	sprintf (env_display, "DISPLAY=%s", val);
523		502
524	/* avoiding the math library:	503	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		504
534	/* add entries to the environment:	505	/* add entries to the environment:
535	* @ DISPLAY: in case we started with -display	506	* @ DISPLAY: in case we started with -display
536	* @ WINDOWID: X window id number of the window	507	* @ WINDOWID: X window id number of the window
537	* @ COLORTERM: terminal sub-name and also indicates its color	508	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
539	* @ TERMINFO: path to terminfo directory	510	* @ TERMINFO: path to terminfo directory
540	* @ COLORFGBG: fg;bg color codes	511	* @ COLORFGBG: fg;bg color codes
541	*/	512	*/
542	putenv (env_display);	513	putenv (env_display);
543	putenv (env_windowid);	514	putenv (env_windowid);
		515
544	if (env_colorfgbg)	516	if (env_colorfgbg)
545	putenv (env_colorfgbg);	517	putenv (env_colorfgbg);
546		518
547	#ifdef RXVT_TERMINFO	519	#ifdef RXVT_TERMINFO
548	putenv ("TERMINFO=" RXVT_TERMINFO);	520	putenv ("TERMINFO=" RXVT_TERMINFO);
549	#endif	521	#endif
550		522
551	if (display->depth <= 2)	523	if (depth <= 2)
552	putenv ("COLORTERM=" COLORTERMENV "-mono");	524	putenv ("COLORTERM=" COLORTERMENV "-mono");
553	else	525	else
554	putenv ("COLORTERM=" COLORTERMENVFULL);	526	putenv ("COLORTERM=" COLORTERMENVFULL);
555		527
556	if (rs[Rs_term_name] != NULL)	528	if (rs[Rs_term_name] != NULL)
…		…
576	* This should support all European type languages.	548	* This should support all European type languages.
577	*/	549	*/
578	void	550	void
579	rxvt_term::set_locale (const char *locale)	551	rxvt_term::set_locale (const char *locale)
580	{	552	{
		553	set_environ (envv);
		554
581	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	555	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
582	free (this->locale);	556	free (this->locale);
583	this->locale = setlocale (LC_CTYPE, locale);	557	this->locale = setlocale (LC_CTYPE, locale);
584		558
585	if (!this->locale)	559	if (!this->locale)
586	{	560	{
587	if (*locale)	561	if (*locale)
588	{	562	{
589	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	563	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590	setlocale (LC_CTYPE, "");	564	setlocale (LC_CTYPE, "C");
591	}	565	}
592	else	566	else
593	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	567	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594		568
595	this->locale = "";	569	this->locale = "C";
596	}	570	}
597		571
598		572
599	this->locale = rxvt_strdup (this->locale);	573	this->locale = rxvt_strdup (this->locale);
600	SET_LOCALE (this->locale);	574	SET_LOCALE (this->locale);
…		…
615	}	589	}
616		590
617	void	591	void
618	rxvt_term::init_xlocale ()	592	rxvt_term::init_xlocale ()
619	{	593	{
		594	set_environ (envv);
		595
620	#ifdef USE_XIM	596	#ifdef USE_XIM
621	if (!locale)	597	if (!locale)
622	rxvt_warn ("setting locale failed, working without locale support.\n");	598	rxvt_warn ("setting locale failed, working without locale support.\n");
623	else	599	else
624	{	600	{
…		…
664	if (strcmp (key_backspace, "DEC") == 0)	640	if (strcmp (key_backspace, "DEC") == 0)
665	priv_modes \|= PrivMode_HaveBackSpace;	641	priv_modes \|= PrivMode_HaveBackSpace;
666	#endif	642	#endif
667		643
668	/* add value for scrollBar */	644	/* add value for scrollBar */
669	if (scrollbar_visible ())	645	if (scrollBar.state)
670	{	646	{
671	priv_modes \|= PrivMode_scrollBar;	647	priv_modes \|= PrivMode_scrollBar;
672	SavedModes \|= PrivMode_scrollBar;	648	SavedModes \|= PrivMode_scrollBar;
673	}
674
675	if (menubar_visible ())
676	{
677	priv_modes \|= PrivMode_menuBar;
678	SavedModes \|= PrivMode_menuBar;
679	}	649	}
680		650
681	run_command (argv);	651	run_command (argv);
682	}	652	}
683		653
…		…
689		659
690	#ifdef OFF_FOCUS_FADING	660	#ifdef OFF_FOCUS_FADING
691	pix_colors = pix_colors_focused;	661	pix_colors = pix_colors_focused;
692	#endif	662	#endif
693		663
694	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	664	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
695	{	665	{
		666	const char *name = rs[Rs_color + i];
		667
		668	if (!name)
		669	continue;
		670
696	rxvt_color xcol;	671	rxvt_color xcol;
697		672
698	if (!rs[Rs_color + i])	673	if (!set_color (xcol, name))
699	continue;
700
701	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
702	{	674	{
703	#ifndef XTERM_REVERSE_VIDEO	675	#ifndef XTERM_REVERSE_VIDEO
704	if (i < 2 && OPTION (Opt_reverseVideo))	676	if (i < 2 && OPTION (Opt_reverseVideo))
705	rs[Rs_color + i] = def_colorName[!i];	677	name = def_colorName [1 - i];
706	else	678	else
707	#endif	679	#endif
708	rs[Rs_color + i] = def_colorName[i];	680	name = def_colorName [i];
709		681
710	if (!rs[Rs_color + i])	682	if (!name)
711	continue;	683	continue;
712		684
713	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	685	if (!set_color (xcol, name))
714	{	686	{
715	switch (i)	687	switch (i)
716	{	688	{
717	case Color_fg:	689	case Color_fg:
718	case Color_bg:	690	case Color_bg:
719	/* fatal: need bg/fg color */
720	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	691	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
721	/* NOTREACHED */	692	name = "";
722	break;	693	break;
723	#ifndef NO_CURSORCOLOR	694	#ifndef NO_CURSORCOLOR
724	case Color_cursor2:	695	case Color_cursor2:
725	xcol = pix_colors[Color_fg];	696	#endif
726	break;
727	#endif /* ! NO_CURSORCOLOR */
728	case Color_pointer_fg:	697	case Color_pointer_fg:
729	xcol = pix_colors[Color_fg];	698	name = rs[Rs_color + Color_fg];
		699	xcol.set (this, name);
730	break;	700	break;
731	default:	701	default:
732	xcol = pix_colors[Color_bg]; /* None */	702	name = rs[Rs_color + Color_bg];
		703	xcol.set (this, name);
733	break;	704	break;
734	}	705	}
735	}	706	}
736	}	707	}
737		708
738	pix_colors[i] = xcol;	709	pix_colors[i] = xcol;
739	SET_PIXCOLOR (i);	710	rs[Rs_color + i] = name;
740	}
741
742	#ifdef OFF_FOCUS_FADING
743	if (rs[Rs_fade])
744	for (i = 0; i < (display->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]);
746	#endif
747
748	if (display->depth <= 2)
749	{	711	}
		712
		713	if (depth <= 2)
		714	{
750	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	715	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
751	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	716	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
752	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	717	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
753	}	718	}
754		719
755	/*	720	/*
756	* get scrollBar/menuBar shadow colors	721	* get scrollBar shadow colors
757	*	722	*
758	* The calculations of topShadow/bottomShadow values are adapted	723	* The calculations of topShadow/bottomShadow values are adapted
759	* from the fvwm window manager.	724	* from the fvwm window manager.
760	*/	725	*/
761	#ifdef KEEP_SCROLLCOLOR	726	#ifdef KEEP_SCROLLCOLOR
762
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	alias_color (Color_scroll, Color_fg);
767	pix_colors[Color_topShadow] = pix_colors[Color_bg];	731	alias_color (Color_topShadow, Color_bg);
768	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	732	alias_color (Color_bottomShadow, Color_bg);
769	}	733	}
770	else	734	else
771	{	735	{
772	rxvt_color xcol[2];	736	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
773	/* xcol[0] == white
774	* xcol[1] == top shadow
775	* xcol[2] == bot shadow */
776		737
777	xcol[1] = pix_colors[Color_scroll];	738	rgba cscroll;
778	xcol[0].set (display, 65535, 65535, 65535);	739	pix_colors [Color_scroll].get (cscroll);
779
780	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
781
782	xcol[0].get (display, pr0, pg0, pb0);
783	xcol[1].get (display, pr1, pg1, pb1);
784
785	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
786		740
787	/* topShadowColor */	741	/* topShadowColor */
788	if (!xcol[1].set (display,	742	if (!pix_colors[Color_topShadow].set (this,
789	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	743	rgba (
790	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	744	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
791	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	745	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
792	xcol[1] = pix_colors[Color_White];	746	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
793		747	cscroll.a)
794	pix_colors[Color_topShadow] = xcol[1];	748	))
		749	alias_color (Color_topShadow, Color_White);
795	}	750	}
796	#endif /* KEEP_SCROLLCOLOR */	751	#endif /* KEEP_SCROLLCOLOR */
		752
		753	#ifdef OFF_FOCUS_FADING
		754	if (rs[Rs_fade])
		755	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		756	{
		757	rgba c;
		758	pix_colors [Color_fade].get (c);
		759	pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
		760	}
		761	#endif
797	}	762	}
798		763
799	/----------------------------------------------------------------------/	764	/----------------------------------------------------------------------/
800	/* color aliases, fg/bg bright-bold */	765	/* color aliases, fg/bg bright-bold */
801	void	766	void
…		…
840		805
841	if (rsmod	806	if (rsmod
842	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	807	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
843	requestedmeta = rsmod[3] - '0';	808	requestedmeta = rsmod[3] - '0';
844		809
845	map = XGetModifierMapping (display->display);	810	map = XGetModifierMapping (dpy);
846	kc = map->modifiermap;	811	kc = map->modifiermap;
847		812
848	for (i = 1; i < 6; i++)	813	for (i = 1; i < 6; i++)
849	{	814	{
850	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	815	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
852	for (j = map->max_keypermod; j--; k++)	817	for (j = map->max_keypermod; j--; k++)
853	{	818	{
854	if (kc[k] == 0)	819	if (kc[k] == 0)
855	break;	820	break;
856		821
857	switch (XKeycodeToKeysym (display->display, kc[k], 0))	822	switch (XKeycodeToKeysym (dpy, kc[k], 0))
858	{	823	{
859	case XK_Num_Lock:	824	case XK_Num_Lock:
860	ModNumLockMask = modmasks[i - 1];	825	ModNumLockMask = modmasks[i - 1];
861	continue;	826	continue;
862		827
…		…
912	rxvt_term::create_windows (int argc, const char const argv)	877	rxvt_term::create_windows (int argc, const char const argv)
913	{	878	{
914	XClassHint classHint;	879	XClassHint classHint;
915	XWMHints wmHint;	880	XWMHints wmHint;
916	#if ENABLE_FRILLS	881	#if ENABLE_FRILLS
917	Atom prop = None;
918	MWMHints mwmhints;	882	MWMHints mwmhints;
919	#endif	883	#endif
920	XGCValues gcvalue;	884	XGCValues gcvalue;
921	long vt_emask;
922	XSetWindowAttributes attributes;	885	XSetWindowAttributes attributes;
923	XWindowAttributes gattr;
924	Window top, parent;	886	Window top, parent;
925	dDisp;
926		887
927	#ifdef USING_W11LIB	888	dLocal (Display *, dpy);
928	/* enable W11 callbacks */
929	W11AddEventHandler (disp, rxvt_W11_process_x_event);
930	#endif
931		889
932	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	890	/* grab colors before netscape does */
933	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	891	Get_Colours ();
934		892
935	if (OPTION (Opt_transparent))	893	if (!set_fonts ())
936	{	894	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
937	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	895
938	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	896	parent = display->root;
939	}	897
		898	attributes.override_redirect = !!OPTION (Opt_override_redirect);
940		899
941	#if ENABLE_FRILLS	900	#if ENABLE_FRILLS
942	if (OPTION (Opt_borderLess))	901	if (OPTION (Opt_borderLess))
943	{	902	{
944	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	903	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
945
946	if (prop == None)
947	{	904	{
948	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	905	/* 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;	906	attributes.override_redirect = true;
951	#endif
952	mwmhints.flags = 0;	907	mwmhints.flags = 0;
953	}	908	}
954	else	909	else
955	{	910	{
956	mwmhints.flags = MWM_HINTS_DECORATIONS;	911	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
959	}	914	}
960	else	915	else
961	mwmhints.flags = 0;	916	mwmhints.flags = 0;
962	#endif	917	#endif
963		918
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	919	#if ENABLE_XEMBED
973	if (rs[Rs_embed])	920	if (rs[Rs_embed])
974	{	921	{
975	XWindowAttributes wattr;	922	XWindowAttributes wattr;
976		923
977	parent = strtol (rs[Rs_embed], 0, 0);	924	parent = strtol (rs[Rs_embed], 0, 0);
978		925
979	if (!XGetWindowAttributes (disp, parent, &wattr))	926	if (!XGetWindowAttributes (dpy, parent, &wattr))
980	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	927	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
981		928
982	window_calc (wattr.width, wattr.height);	929	window_calc (wattr.width, wattr.height);
983	}	930	}
984	#endif	931	#endif
985		932
986	window_calc (0, 0);	933	window_calc (0, 0);
987		934
988	/* sub-window placement & size in rxvt_resize_subwindows () */	935	/* sub-window placement & size in rxvt_resize_subwindows () */
989	#ifdef PREFER_24BIT
990	attributes.background_pixel = pix_colors_focused[Color_border];	936	attributes.background_pixel = pix_colors_focused [Color_border];
991	attributes.border_pixel = pix_colors_focused[Color_border];	937	attributes.border_pixel = pix_colors_focused [Color_border];
992	attributes.colormap = display->cmap;	938	attributes.colormap = cmap;
		939
993	top = XCreateWindow (disp, parent,	940	top = XCreateWindow (dpy, parent,
994	szHint.x, szHint.y,	941	szHint.x, szHint.y,
995	szHint.width, szHint.height,	942	szHint.width, szHint.height,
996	ext_bwidth,	943	ext_bwidth,
997	display->depth, InputOutput,	944	depth, InputOutput, visual,
998	display->visual,
999	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);	945	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1000	#else	946	&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		947
1009	this->parent[0] = top;	948	this->parent[0] = top;
1010		949
1011	old_width = szHint.width;	950	old_width = szHint.width;
1012	old_height = szHint.height;	951	old_height = szHint.height;
1013		952
1014	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	953	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1015	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	954	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1016		955
1017	classHint.res_name = (char *)rs[Rs_name];	956	classHint.res_name = (char *)rs[Rs_name];
1018	classHint.res_class = (char *)RESCLASS;	957	classHint.res_class = (char *)RESCLASS;
1019		958
1020	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	959	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1021	wmHint.input = True;	960	wmHint.input = True;
1022	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	961	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1023	wmHint.window_group = top;	962	wmHint.window_group = top;
1024		963
1025	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	964	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1026	&szHint, &wmHint, &classHint);	965	&szHint, &wmHint, &classHint);
		966
		967	#if ENABLE_FRILLS
		968	if (mwmhints.flags)
		969	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		970	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		971	#endif
1027		972
1028	Atom protocols[] = {	973	Atom protocols[] = {
1029	xa[XA_WM_DELETE_WINDOW],	974	xa[XA_WM_DELETE_WINDOW],
1030	#if ENABLE_EWMH	975	#if ENABLE_EWMH
1031	xa[XA_NET_WM_PING],	976	xa[XA_NET_WM_PING],
1032	#endif	977	#endif
1033	};	978	};
1034		979
1035	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	980	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1036		981
1037	#if ENABLE_FRILLS	982	#if ENABLE_FRILLS
1038	if (rs[Rs_transient_for])	983	if (rs[Rs_transient_for])
1039	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	984	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1040	#endif	985	#endif
1041		986
1042	#if ENABLE_EWMH	987	#if ENABLE_EWMH
1043	long pid = getpid ();	988	long pid = getpid ();
1044		989
1045	XChangeProperty (disp, top,	990	XChangeProperty (dpy, top,
1046	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	991	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1047	PropModeReplace, (unsigned char *)&pid, 1);	992	PropModeReplace, (unsigned char *)&pid, 1);
1048		993
1049	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	994	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050	#endif	995	#endif
1051		996
1052	XSelectInput (disp, top,	997	XSelectInput (dpy, top,
1053	KeyPressMask	998	KeyPressMask
1054	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	999	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1055	\| KeyReleaseMask	1000	\| KeyReleaseMask
1056	#endif	1001	#endif
1057	\| FocusChangeMask \| VisibilityChangeMask	1002	\| FocusChangeMask \| VisibilityChangeMask
1058	\| ExposureMask \| StructureNotifyMask);	1003	\| ExposureMask \| StructureNotifyMask);
1059		1004
1060	termwin_ev.start (display, top);	1005	termwin_ev.start (display, top);
1061		1006
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 */	1007	/* vt cursor: Black-on-White is standard, but this is more popular */
1069	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1008	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1070		1009
1071	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1010	#ifdef HAVE_SCROLLBARS
1072	/* cursor (menuBar/scrollBar): Black-on-White */	1011	/* cursor scrollBar: Black-on-White */
1073	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1012	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1074	#endif	1013	#endif
1075		1014
1076	/* the vt window */	1015	/* the vt window */
1077	vt = XCreateSimpleWindow (disp, top,	1016	vt = XCreateSimpleWindow (dpy, top,
1078	window_vt_x,
1079	window_vt_y,	1017	window_vt_x, window_vt_y,
1080	width,
1081	height,	1018	width, height,
1082	0,	1019	0,
1083	pix_colors_focused[Color_fg],	1020	pix_colors_focused[Color_fg],
1084	pix_colors_focused[Color_bg]);	1021	pix_colors_focused[Color_bg]);
1085	#ifdef DEBUG_X
1086	XStoreName (disp, vt, "vt window");
1087	#endif
1088		1022
1089	attributes.bit_gravity = NorthWestGravity;	1023	attributes.bit_gravity = NorthWestGravity;
1090	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1024	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1091		1025
1092	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1026	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1093		1027
1094	if (OPTION (Opt_pointerBlank)	1028	if (OPTION (Opt_pointerBlank))
1095	#ifdef ENABLE_PERL
1096	\|\| perl.self
1097	#endif
1098	)
1099	vt_emask \|= PointerMotionMask;	1029	vt_emask \|= PointerMotionMask;
1100	else	1030	else
1101	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1031	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1102		1032
1103	XSelectInput (disp, vt, vt_emask);	1033	vt_select_input ();
		1034
1104	vt_ev.start (display, vt);	1035	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		1036
1132	#ifdef XPM_BACKGROUND	1037	#ifdef XPM_BACKGROUND
1133	if (rs[Rs_backgroundPixmap] != NULL	1038	if (rs[Rs_backgroundPixmap] != NULL
1134	&& ! OPTION (Opt_transparent))	1039	&& !OPTION (Opt_transparent))
1135	{	1040	{
1136	const char *p = rs[Rs_backgroundPixmap];	1041	const char *p = rs[Rs_backgroundPixmap];
1137		1042
1138	if ((p = strchr (p, ';')) != NULL)	1043	if ((p = strchr (p, ';')) != NULL)
1139	{	1044	{
…		…
1145	scr_touch (true);	1050	scr_touch (true);
1146	}	1051	}
1147	#endif	1052	#endif
1148		1053
1149	/* graphics context for the vt window */	1054	/* graphics context for the vt window */
1150	gcvalue.foreground = pix_colors[Color_fg];	1055	gcvalue.foreground = pix_colors[Color_fg];
1151	gcvalue.background = pix_colors[Color_bg];	1056	gcvalue.background = pix_colors[Color_bg];
1152	gcvalue.graphics_exposures = 1;	1057	gcvalue.graphics_exposures = 0;
		1058
1153	gc = XCreateGC (disp, vt,	1059	gc = XCreateGC (dpy, vt,
1154	GCForeground \| GCBackground \| GCGraphicsExposures,	1060	GCForeground \| GCBackground \| GCGraphicsExposures,
1155	&gcvalue);	1061	&gcvalue);
1156		1062
1157	drawable = new rxvt_drawable (display, vt);	1063	drawable = new rxvt_drawable (this, vt);
1158		1064
1159	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1065	#ifdef RXVT_SCROLLBAR
1160	gcvalue.foreground = pix_colors[Color_topShadow];	1066	gcvalue.foreground = pix_colors[Color_topShadow];
1161	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1067	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1162	gcvalue.foreground = pix_colors[Color_bottomShadow];	1068	gcvalue.foreground = pix_colors[Color_bottomShadow];
1163	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1069	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1164	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1070	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1165	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1071	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1166	#endif	1072	#endif
1167		1073
1168	#ifdef OFF_FOCUS_FADING	1074	#ifdef OFF_FOCUS_FADING
1169	// initially we are in unfocused state	1075	// initially we are in unfocused state
1170	if (rs[Rs_fade])	1076	if (rs[Rs_fade])
1171	pix_colors = pix_colors_unfocused;	1077	pix_colors = pix_colors_unfocused;
1172	#endif	1078	#endif
1173		1079
1174	pointer_unblank ();	1080	pointer_unblank ();
1175	scr_recolour ();	1081	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	}	1082	}
1187		1083
1188	/* ------------------------------------------------------------------------- *	1084	/* ------------------------------------------------------------------------- *
1189	* GET TTY CURRENT STATE *	1085	* GET TTY CURRENT STATE *
1190	* ------------------------------------------------------------------------- */	1086	* ------------------------------------------------------------------------- */
…		…
1407	rxvt_term::run_command (const char const argv)	1303	rxvt_term::run_command (const char const argv)
1408	{	1304	{
1409	#if ENABLE_FRILLS	1305	#if ENABLE_FRILLS
1410	if (rs[Rs_pty_fd])	1306	if (rs[Rs_pty_fd])
1411	{	1307	{
1412	pty.pty = atoi (rs[Rs_pty_fd]);	1308	pty->pty = atoi (rs[Rs_pty_fd]);
1413		1309
1414	if (pty.pty >= 0)	1310	if (pty->pty >= 0)
1415	{	1311	{
1416	if (getfd_hook)	1312	if (getfd_hook)
1417	pty.pty = (*getfd_hook) (pty.pty);	1313	pty->pty = (*getfd_hook) (pty->pty);
1418		1314
1419	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))	1315	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");	1316	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421	}	1317	}
1422	}	1318	}
1423	else	1319	else
1424	#endif	1320	#endif
1425	if (!pty.get ())	1321	if (!pty->get ())
1426	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1322	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1427		1323
1428	pty.set_utf8_mode (enc_utf8);	1324	pty->set_utf8_mode (enc_utf8);
1429		1325
1430	/* set initial window size */	1326	/* set initial window size */
1431	tt_winch ();	1327	tt_winch ();
1432		1328
1433	int er;	1329	int er;
…		…
1446	#if ENABLE_FRILLS	1342	#if ENABLE_FRILLS
1447	if (rs[Rs_pty_fd])	1343	if (rs[Rs_pty_fd])
1448	return;	1344	return;
1449	#endif	1345	#endif
1450		1346
1451	#ifndef __QNX__
1452	/* spin off the command interpreter */	1347	/* spin off the command interpreter */
1453	switch (cmd_pid = fork ())	1348	switch (cmd_pid = fork ())
1454	{	1349	{
1455	case -1:	1350	case -1:
1456	{	1351	{
…		…
1458	rxvt_fatal ("can't fork, aborting.\n");	1353	rxvt_fatal ("can't fork, aborting.\n");
1459	}	1354	}
1460	case 0:	1355	case 0:
1461	init_env ();	1356	init_env ();
1462		1357
1463	if (!pty.make_controlling_tty ())	1358	if (!pty->make_controlling_tty ())
1464	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1359	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1465	else	1360	else
1466	{	1361	{
1467	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1362	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1468	dup2 (pty.tty, STDIN_FILENO);	1363	dup2 (pty->tty, STDIN_FILENO);
1469	dup2 (pty.tty, STDOUT_FILENO);	1364	dup2 (pty->tty, STDOUT_FILENO);
1470	dup2 (pty.tty, STDERR_FILENO);	1365	dup2 (pty->tty, STDERR_FILENO);
1471		1366
1472	// close all our file handles that we do no longer need	1367	// close all our file handles that we do no longer need
1473	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1368	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1474	{	1369	{
1475	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1370	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1476	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1371	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1477	}	1372	}
1478		1373
1479	run_child (argv);	1374	run_child (argv);
1480	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1375	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1481	}	1376	}
1482		1377
1483	_exit (EXIT_FAILURE);	1378	_exit (EXIT_FAILURE);
1484		1379
1485	default:	1380	default:
1486	{	1381	if (!OPTION (Opt_utmpInhibit))
1487	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1382	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1488	int fdstdin;
1489		1383
1490	fdstdin = dup (STDIN_FILENO);	1384	pty->close_tty ();
1491	dup2 (pty.tty, STDIN_FILENO);
1492	#endif
1493		1385
1494	#ifdef UTMP_SUPPORT	1386	child_ev.start (cmd_pid);
1495	privileged_utmp (SAVE);
1496	#endif
1497		1387
1498	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1388	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;	1389	break;
1507	}	1390	}
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	}	1391	}
1517		1392
1518	/* ------------------------------------------------------------------------- *	1393	/* ------------------------------------------------------------------------- *
1519	* CHILD PROCESS OPERATIONS *	1394	* CHILD PROCESS OPERATIONS *
1520	* ------------------------------------------------------------------------- */	1395	* ------------------------------------------------------------------------- */
…		…
1564	// unblock signals (signals are blocked by iom.C	1439	// unblock signals (signals are blocked by iom.C
1565	sigset_t ss;	1440	sigset_t ss;
1566	sigemptyset (&ss);	1441	sigemptyset (&ss);
1567	sigprocmask (SIG_SETMASK, &ss, 0);	1442	sigprocmask (SIG_SETMASK, &ss, 0);
1568		1443
1569	#ifndef __QNX__
1570	/* command interpreter path */	1444	/* command interpreter path */
1571	if (argv != NULL)	1445	if (argv != NULL)
1572	{	1446	{
1573	# ifdef DEBUG_CMD	1447	# ifdef DEBUG_CMD
1574	int i;	1448	int i;
…		…
1580	execvp (argv[0], (char const )argv);	1454	execvp (argv[0], (char const )argv);
1581	/* no error message: STDERR is closed! */	1455	/* no error message: STDERR is closed! */
1582	}	1456	}
1583	else	1457	else
1584	{	1458	{
1585	const char argv0, shell;	1459	const char argv0, shell;
1586		1460
1587	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1461	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1588	shell = "/bin/sh";	1462	shell = "/bin/sh";
1589		1463
1590	argv0 = (const char *)rxvt_r_basename (shell);	1464	argv0 = (const char *)rxvt_r_basename (shell);
…		…
1595		1469
1596	login[0] = '-';	1470	login[0] = '-';
1597	strcpy (&login[1], argv0);	1471	strcpy (&login[1], argv0);
1598	argv0 = login;	1472	argv0 = login;
1599	}	1473	}
		1474
1600	execlp (shell, argv0, NULL);	1475	execlp (shell, argv0, NULL);
1601	/* no error message: STDERR is closed! */	1476	/* no error message: STDERR is closed! */
1602	}	1477	}
1603		1478
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;	1479	return -1;
1661	}	1480	}
1662		1481
1663	/----------------------- end-of-file (C source) -----------------------/	1482	/----------------------- 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.135 by root, Sat Jan 7 19:29:17 2006 UTC vs. Revision 1.172 by root, Mon Feb 20 22:42:00 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.135 by root, Sat Jan 7 19:29:17 2006 UTC vs.
Revision 1.172 by root, Mon Feb 20 22:42:00 2006 UTC