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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 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.
…		…
34	#include "../config.h" /* NECESSARY */	34	#include "../config.h" /* NECESSARY */
35	#include "rxvt.h" /* NECESSARY */	35	#include "rxvt.h" /* NECESSARY */
36	#include "rxvtutil.h"	36	#include "rxvtutil.h"
37	#include "init.h"	37	#include "init.h"
38		38
		39	#include <limits>
		40
39	#include <csignal>	41	#include <csignal>
40		42
41	const char *const def_colorName[] =	43	const char *const def_colorName[] =
42	{	44	{
43	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
44	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
45	/* low-intensity colors */	47	/* low-intensity colors */
46	"Black", /* 0: black (#000000) */	48	"Black", /* 0: black (#000000) */
47	#ifndef NO_BRIGHTCOLOR
48	"Red3", /* 1: red (#CD0000) */	49	"Red3", /* 1: red (#CD0000) */
49	"Green3", /* 2: green (#00CD00) */	50	"Green3", /* 2: green (#00CD00) */
50	"Yellow3", /* 3: yellow (#CDCD00) */	51	"Yellow3", /* 3: yellow (#CDCD00) */
51	"Blue3", /* 4: blue (#0000CD) */	52	"Blue3", /* 4: blue (#0000CD) */
52	"Magenta3", /* 5: magenta (#CD00CD) */	53	"Magenta3", /* 5: magenta (#CD00CD) */
…		…
60	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
61	"Grey30", /* 8: bright black (#4D4D4D) */	62	"Grey30", /* 8: bright black (#4D4D4D) */
62	# else	63	# else
63	"Grey25", /* 8: bright black (#404040) */	64	"Grey25", /* 8: bright black (#404040) */
64	# endif	65	# endif
65	#endif /* NO_BRIGHTCOLOR */
66	"Red", /* 1/9: bright red (#FF0000) */	66	"Red", /* 1/9: bright red (#FF0000) */
67	"Green", /* 2/10: bright green (#00FF00) */	67	"Green", /* 2/10: bright green (#00FF00) */
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"Yellow", /* 3/11: bright yellow (#FFFF00) */
69	"Blue", /* 4/12: bright blue (#0000FF) */	69	"Blue", /* 4/12: bright blue (#0000FF) */
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"Magenta", /* 5/13: bright magenta (#FF00FF) */
…		…
169	COLOR_SCROLLTROUGH,	169	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	170	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	171	#if TINTING
172	NULL,	172	NULL,
173	#endif	173	#endif
174	};	174	#if OFF_FOCUS_FADING
175		175	"black",
176	const char *const xa_names[] =
177	{
178	"TEXT",
179	"COMPOUND_TEXT",
180	"UTF8_STRING",
181	"MULTIPLE",
182	"TARGETS",
183	"TIMESTAMP",
184	"VT_SELECTION",
185	"INCR",
186	"WM_DELETE_WINDOW",
187	"CLIPBOARD",
188	#if ENABLE_FRILLS
189	"_NET_WM_PID",
190	"_MOTIF_WM_HINTS",
191	"_NET_WM_NAME",
192	"_NET_WM_ICON_NAME",
193	#endif
194	#if USE_XIM
195	"WM_LOCALE_NAME",
196	#endif
197	#ifdef TRANSPARENT
198	"_XROOTPMAP_ID",
199	"ESETROOT_PMAP_ID",
200	#endif
201	#ifdef OFFIX_DND
202	"DndProtocol",
203	"DndSelection",
204	#endif	176	#endif
205	};	177	};
206		178
207	bool	179	bool
208	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
209	{	181	{
210	sw_term.start (SIGTERM);
211
212	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	182	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
213	#ifdef OFF_FOCUS_FADING	183	#ifdef OFF_FOCUS_FADING
214	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	184	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
215	#endif	185	#endif
216	pix_colors = pix_colors_focused;	186	pix_colors = pix_colors_focused;
217		187
218	if (pix_colors == NULL)	188	if (pix_colors == NULL)
219	return false;	189	return false;
220		190
221	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	191	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
222	TermWin.pixmap = None;	192	pixmap = None;
223	#endif	193	#endif
224		194
225	MEvent.time = CurrentTime;	195	MEvent.time = CurrentTime;
226	MEvent.button = AnyButton;	196	MEvent.button = AnyButton;
227	options = DEFAULT_OPTIONS;	197	options = DEFAULT_OPTIONS;
228	want_refresh = 1;	198	want_refresh = 1;
229	cmd_pid = -1;
230	pty.pty = pty.tty = -1;
231	priv_modes = SavedModes = PrivMode_Default;	199	priv_modes = SavedModes = PrivMode_Default;
232	TermWin.focus = 0;	200	focus = 0;
233	TermWin.ncol = 80;	201	ncol = 80;
234	TermWin.nrow = 24;	202	nrow = 24;
235	TermWin.int_bwidth = INTERNALBORDERWIDTH;	203	int_bwidth = INTERNALBORDERWIDTH;
236	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	204	ext_bwidth = EXTERNALBORDERWIDTH;
237	TermWin.lineSpace = LINESPACE;	205	lineSpace = LINESPACE;
238	TermWin.saveLines = SAVELINES;	206	saveLines = SAVELINES;
239	numpix_colors = TOTAL_COLORS;	207	numpix_colors = TOTAL_COLORS;
240		208
241	refresh_limit = 1;	209	refresh_limit = 1;
242	refresh_type = SLOW_REFRESH;	210	refresh_type = SLOW_REFRESH;
243	prev_nrow = prev_ncol = 0;	211	prev_nrow = prev_ncol = 0;
…		…
248	bgPixmap.x = bgPixmap.y = 50;	216	bgPixmap.x = bgPixmap.y = 50;
249	bgPixmap.pixmap = None;	217	bgPixmap.pixmap = None;
250	#endif	218	#endif
251		219
252	last_bot = last_state = -1;	220	last_bot = last_state = -1;
253
254	#ifdef MENUBAR
255	menu_readonly = 1;
256	# if ! (MENUBAR_MAX > 1)
257	CurrentBar = & (BarList);
258	# endif /* (MENUBAR_MAX > 1) */
259	#endif
260		221
261	return true;	222	return true;
262	}	223	}
263		224
264	void	225	void
…		…
332	rs[Rs_name] = rxvt_r_basename (argv[0]);	293	rs[Rs_name] = rxvt_r_basename (argv[0]);
333		294
334	/*	295	/*
335	* Open display, get options/resources and create the window	296	* Open display, get options/resources and create the window
336	*/	297	*/
		298
337	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	299	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338	rs[Rs_display_name] = ":0";	300	rs[Rs_display_name] = ":0";
339		301
340	get_options (r_argc, r_argv);	302	get_options (r_argc, r_argv);
		303
		304	if (!(display = displays.get (rs[Rs_display_name])))
		305	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
		306
		307	extract_resources ();
		308
341	free (r_argv);	309	free (r_argv);
342		310
343	#ifdef LOCAL_X_IS_UNIX	311	#if ENABLE_PERL
344	if (rs[Rs_display_name][0] == ':')	312	if (!rs[Rs_perl_ext_1])
345	{	313	rs[Rs_perl_ext_1] = "default";
346	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));	314
347	strcpy (val, "unix");	315	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
348	strcat (val, rs[Rs_display_name]);	316	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
349	display = displays.get (val);	317	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
350	free (val);
351	}	318	{
		319	rxvt_perl.init (this);
		320	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		321	}
352	#endif	322	#endif
353
354	if (!display
355	&& ! (display = displays.get (rs[Rs_display_name])))
356	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357
358	extract_resources (display->display, rs[Rs_name]);
359		323
360	/*	324	/*
361	* set any defaults not already set	325	* set any defaults not already set
362	*/	326	*/
363	if (cmd_argv && cmd_argv[0])	327	if (cmd_argv && cmd_argv[0])
…		…
374	if (!rs[Rs_iconName])	338	if (!rs[Rs_iconName])
375	rs[Rs_iconName] = rs[Rs_name];	339	rs[Rs_iconName] = rs[Rs_name];
376	}	340	}
377		341
378	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	342	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
379	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	343	saveLines = min (i, MAX_SAVELINES);
380		344
381	#if ENABLE_FRILLS	345	#if ENABLE_FRILLS
382	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	346	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
383	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	347	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		348
384	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	349	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
385	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	350	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		351
386	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	352	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
387	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	353	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
388	#endif	354	#endif
389		355
390	#ifdef POINTER_BLANK	356	#ifdef POINTER_BLANK
391	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	357	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
392	pointerBlankDelay = i;	358	pointerBlankDelay = i;
393	else	359	else
394	pointerBlankDelay = 2;	360	pointerBlankDelay = 2;
395	#endif	361	#endif
396		362
397	/* no point having a scrollbar without having any scrollback! */	363	/* no point having a scrollbar without having any scrollback! */
398	if (!TermWin.saveLines)	364	if (!saveLines)
399	options &= ~Opt_scrollBar;	365	set_option (Opt_scrollBar, 0);
400		366
401	#ifdef PRINTPIPE	367	#ifdef PRINTPIPE
402	if (!rs[Rs_print_pipe])	368	if (!rs[Rs_print_pipe])
403	rs[Rs_print_pipe] = PRINTPIPE;	369	rs[Rs_print_pipe] = PRINTPIPE;
404	#endif	370	#endif
…		…
447	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	413	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
448	#endif	414	#endif
449		415
450	#ifdef XTERM_REVERSE_VIDEO	416	#ifdef XTERM_REVERSE_VIDEO
451	/* this is how xterm implements reverseVideo */	417	/* this is how xterm implements reverseVideo */
452	if (options & Opt_reverseVideo)	418	if (OPTION (Opt_reverseVideo))
453	{	419	{
454	if (!rs[Rs_color + Color_fg])	420	if (!rs[Rs_color + Color_fg])
455	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	421	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
456	if (!rs[Rs_color + Color_bg])	422	if (!rs[Rs_color + Color_bg])
457	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	423	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
462	if (!rs[Rs_color + i])	428	if (!rs[Rs_color + i])
463	rs[Rs_color + i] = def_colorName[i];	429	rs[Rs_color + i] = def_colorName[i];
464		430
465	#ifndef XTERM_REVERSE_VIDEO	431	#ifndef XTERM_REVERSE_VIDEO
466	/* this is how we implement reverseVideo */	432	/* this is how we implement reverseVideo */
467	if (options & Opt_reverseVideo)	433	if (OPTION (Opt_reverseVideo))
468	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	434	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
469	#endif	435	#endif
470		436
471	/* convenient aliases for setting fg/bg to colors */	437	/* convenient aliases for setting fg/bg to colors */
472	color_aliases (Color_fg);	438	color_aliases (Color_fg);
473	color_aliases (Color_bg);	439	color_aliases (Color_bg);
…		…
523	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	489	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
524		490
525	sprintf (env_display, "DISPLAY=%s", val);	491	sprintf (env_display, "DISPLAY=%s", val);
526		492
527	/* avoiding the math library:	493	/* avoiding the math library:
528	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */	494	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
529	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)	495	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
530	;	496	;
531	MAX_IT (i, 1);	497	max_it (i, 1);
532	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));	498	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
533		499
534	sprintf (env_windowid, "WINDOWID=%u",	500	sprintf (env_windowid, "WINDOWID=%u",
535	(unsigned int)TermWin.parent[0]);	501	(unsigned int)parent[0]);
536		502
537	/* add entries to the environment:	503	/* add entries to the environment:
538	* @ DISPLAY: in case we started with -display	504	* @ DISPLAY: in case we started with -display
539	* @ WINDOWID: X window id number of the window	505	* @ WINDOWID: X window id number of the window
540	* @ COLORTERM: terminal sub-name and also indicates its color	506	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
579	* This should support all European type languages.	545	* This should support all European type languages.
580	*/	546	*/
581	void	547	void
582	rxvt_term::set_locale (const char *locale)	548	rxvt_term::set_locale (const char *locale)
583	{	549	{
		550	set_environ (envv);
		551
584	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	552	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
585	free (this->locale);	553	free (this->locale);
586	this->locale = setlocale (LC_CTYPE, locale);	554	this->locale = setlocale (LC_CTYPE, locale);
587		555
588	if (!this->locale)	556	if (!this->locale)
589	{	557	{
590	if (*locale)	558	if (*locale)
591	{	559	{
592	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	560	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
593	setlocale (LC_CTYPE, "");	561	setlocale (LC_CTYPE, "C");
594	}	562	}
595	else	563	else
596	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	564	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
597		565
598	this->locale = "";	566	this->locale = "C";
599	}	567	}
600		568
601		569
602	this->locale = rxvt_strdup (this->locale);	570	this->locale = rxvt_strdup (this->locale);
603	SET_LOCALE (this->locale);	571	SET_LOCALE (this->locale);
…		…
618	}	586	}
619		587
620	void	588	void
621	rxvt_term::init_xlocale ()	589	rxvt_term::init_xlocale ()
622	{	590	{
		591	set_environ (envv);
		592
623	#ifdef USE_XIM	593	#ifdef USE_XIM
624	if (!locale)	594	if (!locale)
625	rxvt_warn ("setting locale failed, working without locale support.\n");	595	rxvt_warn ("setting locale failed, working without locale support.\n");
626	else	596	else
627	{	597	{
…		…
649	* Initialize the command connection.	619	* Initialize the command connection.
650	* This should be called after the X server connection is established.	620	* This should be called after the X server connection is established.
651	*/	621	*/
652		622
653	#ifdef META8_OPTION	623	#ifdef META8_OPTION
654	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	624	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
655	#endif	625	#endif
656		626
657	get_ourmods ();	627	get_ourmods ();
658		628
659	if (!(options & Opt_scrollTtyOutput))	629	if (!OPTION (Opt_scrollTtyOutput))
660	priv_modes \|= PrivMode_TtyOutputInh;	630	priv_modes \|= PrivMode_TtyOutputInh;
661	if (options & Opt_scrollTtyKeypress)	631	if (OPTION (Opt_scrollTtyKeypress))
662	priv_modes \|= PrivMode_Keypress;	632	priv_modes \|= PrivMode_Keypress;
663	if (!(options & Opt_jumpScroll))	633	if (!OPTION (Opt_jumpScroll))
664	priv_modes \|= PrivMode_smoothScroll;	634	priv_modes \|= PrivMode_smoothScroll;
665		635
666	#ifndef NO_BACKSPACE_KEY	636	#ifndef NO_BACKSPACE_KEY
667	if (strcmp (key_backspace, "DEC") == 0)	637	if (strcmp (key_backspace, "DEC") == 0)
668	priv_modes \|= PrivMode_HaveBackSpace;	638	priv_modes \|= PrivMode_HaveBackSpace;
669	#endif	639	#endif
670		640
671	/* add value for scrollBar */	641	/* add value for scrollBar */
672	if (scrollbar_visible ())	642	if (scrollBar.state)
673	{	643	{
674	priv_modes \|= PrivMode_scrollBar;	644	priv_modes \|= PrivMode_scrollBar;
675	SavedModes \|= PrivMode_scrollBar;	645	SavedModes \|= PrivMode_scrollBar;
676	}	646	}
677	if (menubar_visible ())
678	{
679	priv_modes \|= PrivMode_menuBar;
680	SavedModes \|= PrivMode_menuBar;
681	}
682
683	#ifdef CURSOR_BLINK
684	if (options & Opt_cursorBlink)
685	(void)gettimeofday (&lastcursorchange, NULL);
686	#endif
687		647
688	run_command (argv);	648	run_command (argv);
689	}	649	}
690		650
691	/----------------------------------------------------------------------/	651	/----------------------------------------------------------------------/
…		…
706	continue;	666	continue;
707		667
708	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	668	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709	{	669	{
710	#ifndef XTERM_REVERSE_VIDEO	670	#ifndef XTERM_REVERSE_VIDEO
711	if (i < 2 && (options & Opt_reverseVideo))	671	if (i < 2 && OPTION (Opt_reverseVideo))
712	rs[Rs_color + i] = def_colorName[!i];	672	rs[Rs_color + i] = def_colorName[!i];
713	else	673	else
714	#endif	674	#endif
715	rs[Rs_color + i] = def_colorName[i];	675	rs[Rs_color + i] = def_colorName[i];
716		676
…		…
741	}	701	}
742	}	702	}
743	}	703	}
744		704
745	pix_colors[i] = xcol;	705	pix_colors[i] = xcol;
		706	SET_PIXCOLOR (i);
		707	}
		708
746	#ifdef OFF_FOCUS_FADING	709	#ifdef OFF_FOCUS_FADING
747	if (rs[Rs_fade])	710	if (rs[Rs_fade])
		711	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));	712	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749	#endif	713	#endif
750	SET_PIXCOLOR (i);
751	}
752		714
753	if (display->depth <= 2)	715	if (display->depth <= 2)
754	{	716	{
755	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];
756	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];
757	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];
758	}	720	}
759		721
760	/*	722	/*
761	* get scrollBar/menuBar shadow colors	723	* get scrollBar shadow colors
762	*	724	*
763	* The calculations of topShadow/bottomShadow values are adapted	725	* The calculations of topShadow/bottomShadow values are adapted
764	* from the fvwm window manager.	726	* from the fvwm window manager.
765	*/	727	*/
766	#ifdef KEEP_SCROLLCOLOR	728	#ifdef KEEP_SCROLLCOLOR
767		729
768	if (display->depth <= 2)	730	if (display->depth <= 2)
		731	{
769	{ /* Monochrome */	732	/* Monochrome */
770	pix_colors[Color_scroll] = pix_colors[Color_fg];	733	pix_colors[Color_scroll] = pix_colors[Color_fg];
771	pix_colors[Color_topShadow] = pix_colors[Color_bg];	734	pix_colors[Color_topShadow] = pix_colors[Color_bg];
772	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	735	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773	}	736	}
774	else	737	else
…		…
810	int i = atoi (rs[Rs_color + idx]);	773	int i = atoi (rs[Rs_color + idx]);
811		774
812	if (i >= 8 && i <= 15)	775	if (i >= 8 && i <= 15)
813	{ /* bright colors */	776	{ /* bright colors */
814	i -= 8;	777	i -= 8;
815	#ifndef NO_BRIGHTCOLOR
816	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	778	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
817	return;	779	return;
818	#endif
819	}	780	}
820		781
821	if (i >= 0 && i <= 7) /* normal colors */	782	if (i >= 0 && i <= 7) /* normal colors */
822	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	783	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823	}	784	}
…		…
829	* Use resource ``modifier'' to override the Meta modifier	790	* Use resource ``modifier'' to override the Meta modifier
830	*/	791	*/
831	void	792	void
832	rxvt_term::get_ourmods ()	793	rxvt_term::get_ourmods ()
833	{	794	{
834	int i, j, k;	795	int i, j, k;
835	int requestedmeta, realmeta, realalt;	796	int requestedmeta, realmeta, realalt;
836	const char cm, rsmod;	797	const char cm, rsmod;
837	XModifierKeymap *map;	798	XModifierKeymap *map;
838	KeyCode *kc;	799	KeyCode *kc;
839	const unsigned int modmasks[] =	800	const unsigned int modmasks[] =
840	{	801	{
841	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask	802	Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842	};	803	};
843		804
…		…
918	rxvt_term::create_windows (int argc, const char const argv)	879	rxvt_term::create_windows (int argc, const char const argv)
919	{	880	{
920	XClassHint classHint;	881	XClassHint classHint;
921	XWMHints wmHint;	882	XWMHints wmHint;
922	#if ENABLE_FRILLS	883	#if ENABLE_FRILLS
923	Atom prop = None;
924	MWMHints mwmhints;	884	MWMHints mwmhints;
925	#endif	885	#endif
926	XGCValues gcvalue;	886	XGCValues gcvalue;
927	long vt_emask;
928	XSetWindowAttributes attributes;	887	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;	888	Window top, parent;
		889	dDisp;
930		890
931	#ifdef USING_W11LIB	891	xa = display->xa;
932	/* enable W11 callbacks */
933	W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934	#endif
935		892
936	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	893	/* grab colors before netscape does */
937	XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);	894	Get_Colours ();
938		895
939	if (options & Opt_transparent)	896	if (!set_fonts ())
940	{	897	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
941	XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);	898
942	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	899	parent = display->root;
943	}	900
		901	attributes.override_redirect = !!OPTION (Opt_override_redirect);
944		902
945	#if ENABLE_FRILLS	903	#if ENABLE_FRILLS
946	if (options & Opt_borderLess)	904	if (OPTION (Opt_borderLess))
947	{	905	{
948	prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);	906	if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
949
950	if (prop == None)
951	{	907	{
952	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	908	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953	#ifdef PREFER_24BIT
954	attributes.override_redirect = TRUE;	909	attributes.override_redirect = TRUE;
955	#endif
956	mwmhints.flags = 0;	910	mwmhints.flags = 0;
957	}	911	}
958	else	912	else
959	{	913	{
960	mwmhints.flags = MWM_HINTS_DECORATIONS;	914	mwmhints.flags = MWM_HINTS_DECORATIONS;
961	mwmhints.decorations = 0;	915	mwmhints.decorations = 0;
962	}	916	}
963	}	917	}
964	else	918	else
965	{
966	mwmhints.flags = 0;	919	mwmhints.flags = 0;
		920	#endif
		921
		922	#if ENABLE_XEMBED
		923	if (rs[Rs_embed])
967	}	924	{
968	#endif	925	XWindowAttributes wattr;
969		926
970	/* grab colors before netscape does */	927	parent = strtol (rs[Rs_embed], 0, 0);
971	Get_Colours ();
972		928
973	if (!set_fonts ())	929	if (!XGetWindowAttributes (disp, parent, &wattr))
974	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	930	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
		931
		932	window_calc (wattr.width, wattr.height);
		933	}
		934	#endif
975		935
976	window_calc (0, 0);	936	window_calc (0, 0);
		937
		938	/* sub-window placement & size in rxvt_resize_subwindows () */
		939	attributes.background_pixel = pix_colors_focused[Color_border];
		940	attributes.border_pixel = pix_colors_focused[Color_border];
		941	attributes.colormap = display->cmap;
		942
		943	top = XCreateWindow (disp, parent,
		944	szHint.x, szHint.y,
		945	szHint.width, szHint.height,
		946	ext_bwidth,
		947	display->depth, InputOutput,
		948	display->visual,
		949	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
		950	&attributes);
		951
		952	this->parent[0] = top;
		953
977	old_width = szHint.width;	954	old_width = szHint.width;
978	old_height = szHint.height;	955	old_height = szHint.height;
979		956
980	/* sub-window placement & size in rxvt_resize_subwindows () */
981
982	#ifdef PREFER_24BIT
983	attributes.background_pixel = pix_colors_focused[Color_border];
984	attributes.border_pixel = pix_colors_focused[Color_border];
985	attributes.colormap = display->cmap;
986	TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
987	szHint.x, szHint.y,
988	szHint.width, szHint.height,
989	TermWin.ext_bwidth,
990	display->depth, InputOutput,
991	display->visual,
992	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
993	#else
994	TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
995	szHint.x, szHint.y,
996	szHint.width, szHint.height,
997	TermWin.ext_bwidth,
998	pix_colors_focused[Color_border],
999	pix_colors_focused[Color_border]);
1000	#endif
1001
1002	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	957	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	958	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004		959
1005	classHint.res_name = (char *)rs[Rs_name];	960	classHint.res_name = (char *)rs[Rs_name];
1006	classHint.res_class = (char *)RESCLASS;	961	classHint.res_class = (char *)RESCLASS;
1007		962
1008	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	963	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1009	wmHint.input = True;	964	wmHint.input = True;
1010	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	965	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1011	wmHint.window_group = TermWin.parent[0];	966	wmHint.window_group = top;
1012		967
1013	XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,	968	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1014	(char **)argv, argc, &szHint, &wmHint, &classHint);	969	&szHint, &wmHint, &classHint);
1015
1016	/* Enable delete window protocol */
1017	XSetWMProtocols (display->display, TermWin.parent[0],
1018	&xa[XA_WMDELETEWINDOW], 1);
1019		970
1020	#if ENABLE_FRILLS	971	#if ENABLE_FRILLS
		972	if (mwmhints.flags)
		973	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		974	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		975	#endif
		976
		977	Atom protocols[] = {
		978	xa[XA_WM_DELETE_WINDOW],
		979	#if ENABLE_EWMH
		980	xa[XA_NET_WM_PING],
		981	#endif
		982	};
		983
		984	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		985
		986	#if ENABLE_FRILLS
		987	if (rs[Rs_transient_for])
		988	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		989	#endif
		990
		991	#if ENABLE_EWMH
1021	long pid = getpid ();	992	long pid = getpid ();
1022		993
1023	XChangeProperty (display->display, TermWin.parent[0],	994	XChangeProperty (disp, top,
1024	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	995	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025	PropModeReplace, (unsigned char *)&pid, 1);	996	PropModeReplace, (unsigned char *)&pid, 1);
1026	#endif
1027		997
1028	XSelectInput (display->display, TermWin.parent[0],	998	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
		999	#endif
		1000
		1001	XSelectInput (disp, top,
1029	KeyPressMask	1002	KeyPressMask
1030	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1003	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1031	\| KeyReleaseMask	1004	\| KeyReleaseMask
1032	#endif	1005	#endif
1033	\| FocusChangeMask \| VisibilityChangeMask	1006	\| FocusChangeMask \| VisibilityChangeMask
1034	\| ExposureMask
1035	\| StructureNotifyMask);	1007	\| ExposureMask \| StructureNotifyMask);
		1008
1036	termwin_ev.start (display, TermWin.parent[0]);	1009	termwin_ev.start (display, top);
1037
1038	#if ENABLE_FRILLS
1039	if (mwmhints.flags)
1040	XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042	#endif
1043		1010
1044	/* vt cursor: Black-on-White is standard, but this is more popular */	1011	/* vt cursor: Black-on-White is standard, but this is more popular */
1045	TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);	1012	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1046		1013
1047	#if defined(HAVE_SCROLLBARS) \|\| defined(MENUBAR)	1014	#ifdef HAVE_SCROLLBARS
1048	/* cursor (menuBar/scrollBar): Black-on-White */	1015	/* cursor scrollBar: Black-on-White */
1049	leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);	1016	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1050	#endif	1017	#endif
1051		1018
1052	/* the vt window */	1019	/* the vt window */
1053	TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],	1020	vt = XCreateSimpleWindow (disp, top,
1054	window_vt_x,
1055	window_vt_y,	1021	window_vt_x, window_vt_y,
1056	TermWin_TotalWidth (),	1022	width, height,
1057	TermWin_TotalHeight (),
1058	0,	1023	0,
1059	pix_colors_focused[Color_fg],	1024	pix_colors_focused[Color_fg],
1060	pix_colors_focused[Color_bg]);	1025	pix_colors_focused[Color_bg]);
1061	#ifdef DEBUG_X
1062	XStoreName (display->display, TermWin.vt, "vt window");
1063	#endif
1064		1026
1065	attributes.bit_gravity = NorthWestGravity;	1027	attributes.bit_gravity = NorthWestGravity;
1066	XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);	1028	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1067		1029
1068	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1030	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1069		1031
1070	pointer_unblank ();	1032	if (OPTION (Opt_pointerBlank))
1071
1072	#ifdef POINTER_BLANK
1073	if (options & Opt_pointerBlank)
1074	vt_emask \|= PointerMotionMask;	1033	vt_emask \|= PointerMotionMask;
1075	else	1034	else
1076	#endif
1077	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1035	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1078		1036
1079	XSelectInput (display->display, TermWin.vt, vt_emask);	1037	vt_select_input ();
		1038
1080	vt_ev.start (display, TermWin.vt);	1039	vt_ev.start (display, vt);
1081
1082	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083	if (menuBar_height ())
1084	{
1085	menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1086	window_vt_x, 0,
1087	TermWin_TotalWidth (),
1088	menuBar_TotalHeight (),
1089	0,
1090	pix_colors_focused[Color_fg],
1091	pix_colors_focused[Color_scroll]);
1092
1093	#ifdef DEBUG_X
1094	XStoreName (display->display, menuBar.win, "menubar");
1095	#endif
1096
1097	menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098
1099	XDefineCursor (display->display, menuBar.win,
1100	XCreateFontCursor (display->display, XC_left_ptr));
1101
1102	XSelectInput (display->display, menuBar.win,
1103	(ExposureMask \| ButtonPressMask \| ButtonReleaseMask
1104	\| Button1MotionMask));
1105	menubar_ev.start (display, menuBar.win);
1106	}
1107	#endif
1108		1040
1109	#ifdef XPM_BACKGROUND	1041	#ifdef XPM_BACKGROUND
1110	if (rs[Rs_backgroundPixmap] != NULL	1042	if (rs[Rs_backgroundPixmap] != NULL
1111	&& ! (options & Opt_transparent))	1043	&& ! OPTION (Opt_transparent))
1112	{	1044	{
1113	const char *p = rs[Rs_backgroundPixmap];	1045	const char *p = rs[Rs_backgroundPixmap];
1114		1046
1115	if ((p = strchr (p, ';')) != NULL)	1047	if ((p = strchr (p, ';')) != NULL)
1116	{	1048	{
…		…
1122	scr_touch (true);	1054	scr_touch (true);
1123	}	1055	}
1124	#endif	1056	#endif
1125		1057
1126	/* graphics context for the vt window */	1058	/* graphics context for the vt window */
1127	gcvalue.foreground = pix_colors[Color_fg];	1059	gcvalue.foreground = pix_colors[Color_fg];
1128	gcvalue.background = pix_colors[Color_bg];	1060	gcvalue.background = pix_colors[Color_bg];
1129	gcvalue.graphics_exposures = 1;	1061	gcvalue.graphics_exposures = 1;
1130	TermWin.gc = XCreateGC (display->display, TermWin.vt,	1062
		1063	gc = XCreateGC (disp, vt,
1131	GCForeground \| GCBackground \| GCGraphicsExposures,	1064	GCForeground \| GCBackground \| GCGraphicsExposures,
1132	&gcvalue);	1065	&gcvalue);
1133		1066
1134	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1067	drawable = new rxvt_drawable (display, vt);
1135		1068
1136	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1069	#ifdef RXVT_SCROLLBAR
1137	gcvalue.foreground = pix_colors[Color_topShadow];	1070	gcvalue.foreground = pix_colors[Color_topShadow];
1138	topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1071	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1139	gcvalue.foreground = pix_colors[Color_bottomShadow];	1072	gcvalue.foreground = pix_colors[Color_bottomShadow];
1140	botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1073	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1141	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1074	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1142	scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);	1075	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1143	#endif	1076	#endif
1144		1077
1145	#ifdef OFF_FOCUS_FADING	1078	#ifdef OFF_FOCUS_FADING
1146	// initially we are in unfocused state	1079	// initially we are in unfocused state
1147	if (rs[Rs_fade])	1080	if (rs[Rs_fade])
1148	pix_colors = pix_colors_unfocused;	1081	pix_colors = pix_colors_unfocused;
1149	#endif	1082	#endif
1150		1083
		1084	pointer_unblank ();
1151	scr_recolour ();	1085	scr_recolour ();
1152	}	1086	}
1153		1087
1154	/* ------------------------------------------------------------------------- *	1088	/* ------------------------------------------------------------------------- *
1155	* GET TTY CURRENT STATE *	1089	* GET TTY CURRENT STATE *
…		…
1161	/*	1095	/*
1162	* standard System V termios interface	1096	* standard System V termios interface
1163	*/	1097	*/
1164	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1098	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1165	{	1099	{
1166	/* return error - use system defaults */	1100	// return error - use system defaults,
		1101	// where possible, and zero elsewhere
		1102	memset (tio, 0, sizeof (ttymode_t));
		1103
1167	tio->c_cc[VINTR] = CINTR;	1104	tio->c_cc[VINTR] = CINTR;
1168	tio->c_cc[VQUIT] = CQUIT;	1105	tio->c_cc[VQUIT] = CQUIT;
1169	tio->c_cc[VERASE] = CERASE;	1106	tio->c_cc[VERASE] = CERASE;
		1107	#ifdef VERASE2
		1108	tio->c_cc[VERASE2] = CERASE2;
		1109	#endif
1170	tio->c_cc[VKILL] = CKILL;	1110	tio->c_cc[VKILL] = CKILL;
1171	tio->c_cc[VSTART] = CSTART;	1111	tio->c_cc[VSTART] = CSTART;
1172	tio->c_cc[VSTOP] = CSTOP;	1112	tio->c_cc[VSTOP] = CSTOP;
1173	tio->c_cc[VSUSP] = CSUSP;	1113	tio->c_cc[VSUSP] = CSUSP;
1174	# ifdef VDSUSP	1114	# ifdef VDSUSP
1175
1176	tio->c_cc[VDSUSP] = CDSUSP;	1115	tio->c_cc[VDSUSP] = CDSUSP;
1177	# endif	1116	# endif
1178	# ifdef VREPRINT	1117	# ifdef VREPRINT
1179
1180	tio->c_cc[VREPRINT] = CRPRNT;	1118	tio->c_cc[VREPRINT] = CRPRNT;
1181	# endif	1119	# endif
1182	# ifdef VDISCRD	1120	# ifdef VDISCRD
1183
1184	tio->c_cc[VDISCRD] = CFLUSH;	1121	tio->c_cc[VDISCRD] = CFLUSH;
1185	# endif	1122	# endif
1186	# ifdef VWERSE	1123	# ifdef VWERSE
1187
1188	tio->c_cc[VWERSE] = CWERASE;	1124	tio->c_cc[VWERSE] = CWERASE;
1189	# endif	1125	# endif
1190	# ifdef VLNEXT	1126	# ifdef VLNEXT
1191
1192	tio->c_cc[VLNEXT] = CLNEXT;	1127	tio->c_cc[VLNEXT] = CLNEXT;
1193	# endif	1128	# endif
1194
1195	}	1129	}
		1130
1196	tio->c_cc[VEOF] = CEOF;	1131	tio->c_cc[VEOF] = CEOF;
1197	tio->c_cc[VEOL] = VDISABLE;	1132	tio->c_cc[VEOL] = VDISABLE;
1198	# ifdef VEOL2	1133	# ifdef VEOL2
1199
1200	tio->c_cc[VEOL2] = VDISABLE;	1134	tio->c_cc[VEOL2] = VDISABLE;
1201	# endif	1135	# endif
1202	# ifdef VSWTC	1136	# ifdef VSWTC
1203
1204	tio->c_cc[VSWTC] = VDISABLE;	1137	tio->c_cc[VSWTC] = VDISABLE;
1205	# endif	1138	# endif
1206	# ifdef VSWTCH	1139	# ifdef VSWTCH
1207
1208	tio->c_cc[VSWTCH] = VDISABLE;	1140	tio->c_cc[VSWTCH] = VDISABLE;
1209	# endif	1141	# endif
1210	# if VMIN != VEOF	1142	# if VMIN != VEOF
1211
1212	tio->c_cc[VMIN] = 1;	1143	tio->c_cc[VMIN] = 1;
1213	# endif	1144	# endif
1214	# if VTIME != VEOL	1145	# if VTIME != VEOL
1215
1216	tio->c_cc[VTIME] = 0;	1146	tio->c_cc[VTIME] = 0;
1217	# endif	1147	# endif
1218		1148
1219	if (erase != -1)	1149	if (erase != -1)
1220	tio->c_cc[VERASE] = (char)erase;	1150	tio->c_cc[VERASE] = (char)erase;
…		…
1248	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1178	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1249	{	1179	{
1250	tio->sg.sg_erase = CERASE; /* ^H */	1180	tio->sg.sg_erase = CERASE; /* ^H */
1251	tio->sg.sg_kill = CKILL; /* ^U */	1181	tio->sg.sg_kill = CKILL; /* ^U */
1252	}	1182	}
		1183
1253	if (erase != -1)	1184	if (erase != -1)
1254	tio->sg.sg_erase = (char)erase;	1185	tio->sg.sg_erase = (char)erase;
1255		1186
1256	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1187	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1257		1188
…		…
1263	tio->tc.t_startc = CSTART; /* ^Q */	1194	tio->tc.t_startc = CSTART; /* ^Q */
1264	tio->tc.t_stopc = CSTOP; /* ^S */	1195	tio->tc.t_stopc = CSTOP; /* ^S */
1265	tio->tc.t_eofc = CEOF; /* ^D */	1196	tio->tc.t_eofc = CEOF; /* ^D */
1266	tio->tc.t_brkc = -1;	1197	tio->tc.t_brkc = -1;
1267	}	1198	}
		1199
1268	/* get local special chars */	1200	/* get local special chars */
1269	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1201	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1270	{	1202	{
1271	tio->lc.t_suspc = CSUSP; /* ^Z */	1203	tio->lc.t_suspc = CSUSP; /* ^Z */
1272	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1204	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1276	tio->lc.t_lnextc = CLNEXT; /* ^V */	1208	tio->lc.t_lnextc = CLNEXT; /* ^V */
1277	}	1209	}
1278	/* get line discipline */	1210	/* get line discipline */
1279	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1211	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1280	# ifdef NTTYDISC	1212	# ifdef NTTYDISC
1281
1282	tio->line = NTTYDISC;	1213	tio->line = NTTYDISC;
1283	# endif /* NTTYDISC */	1214	# endif /* NTTYDISC */
1284		1215
1285	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1216	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1286	#endif /* HAVE_TERMIOS_H */	1217	#endif /* HAVE_TERMIOS_H */
…		…
1309	FOO (IGNCR, "IGNCR");	1240	FOO (IGNCR, "IGNCR");
1310	FOO (ICRNL, "ICRNL");	1241	FOO (ICRNL, "ICRNL");
1311	FOO (IXON, "IXON");	1242	FOO (IXON, "IXON");
1312	FOO (IXOFF, "IXOFF");	1243	FOO (IXOFF, "IXOFF");
1313	# ifdef IUCLC	1244	# ifdef IUCLC
1314
1315	FOO (IUCLC, "IUCLC");	1245	FOO (IUCLC, "IUCLC");
1316	# endif	1246	# endif
1317	# ifdef IXANY	1247	# ifdef IXANY
1318
1319	FOO (IXANY, "IXANY");	1248	FOO (IXANY, "IXANY");
1320	# endif	1249	# endif
1321	# ifdef IMAXBEL	1250	# ifdef IMAXBEL
1322
1323	FOO (IMAXBEL, "IMAXBEL");	1251	FOO (IMAXBEL, "IMAXBEL");
1324	# endif	1252	# endif
1325		1253
1326	fprintf (stderr, "\n");	1254	fprintf (stderr, "\n");
1327		1255
…		…
1334	FOO (VERASE, "VERASE");	1262	FOO (VERASE, "VERASE");
1335	FOO (VKILL, "VKILL");	1263	FOO (VKILL, "VKILL");
1336	FOO (VEOF, "VEOF");	1264	FOO (VEOF, "VEOF");
1337	FOO (VEOL, "VEOL");	1265	FOO (VEOL, "VEOL");
1338	# ifdef VEOL2	1266	# ifdef VEOL2
1339
1340	FOO (VEOL2, "VEOL2");	1267	FOO (VEOL2, "VEOL2");
1341	# endif	1268	# endif
1342	# ifdef VSWTC	1269	# ifdef VSWTC
1343
1344	FOO (VSWTC, "VSWTC");	1270	FOO (VSWTC, "VSWTC");
1345	# endif	1271	# endif
1346	# ifdef VSWTCH	1272	# ifdef VSWTCH
1347
1348	FOO (VSWTCH, "VSWTCH");	1273	FOO (VSWTCH, "VSWTCH");
1349	# endif	1274	# endif
1350
1351	FOO (VSTART, "VSTART");	1275	FOO (VSTART, "VSTART");
1352	FOO (VSTOP, "VSTOP");	1276	FOO (VSTOP, "VSTOP");
1353	FOO (VSUSP, "VSUSP");	1277	FOO (VSUSP, "VSUSP");
1354	# ifdef VDSUSP	1278	# ifdef VDSUSP
1355
1356	FOO (VDSUSP, "VDSUSP");	1279	FOO (VDSUSP, "VDSUSP");
1357	# endif	1280	# endif
1358	# ifdef VREPRINT	1281	# ifdef VREPRINT
1359
1360	FOO (VREPRINT, "VREPRINT");	1282	FOO (VREPRINT, "VREPRINT");
1361	# endif	1283	# endif
1362	# ifdef VDISCRD	1284	# ifdef VDISCRD
1363
1364	FOO (VDISCRD, "VDISCRD");	1285	FOO (VDISCRD, "VDISCRD");
1365	# endif	1286	# endif
1366	# ifdef VWERSE	1287	# ifdef VWERSE
1367
1368	FOO (VWERSE, "VWERSE");	1288	FOO (VWERSE, "VWERSE");
1369	# endif	1289	# endif
1370	# ifdef VLNEXT	1290	# ifdef VLNEXT
1371
1372	FOO (VLNEXT, "VLNEXT");	1291	FOO (VLNEXT, "VLNEXT");
1373	# endif	1292	# endif
1374		1293
1375	fprintf (stderr, "\n");	1294	fprintf (stderr, "\n");
1376	# undef FOO	1295	# undef FOO
…		…
1385	* the slave.	1304	* the slave.
1386	*/	1305	*/
1387	void	1306	void
1388	rxvt_term::run_command (const char const argv)	1307	rxvt_term::run_command (const char const argv)
1389	{	1308	{
		1309	#if ENABLE_FRILLS
		1310	if (rs[Rs_pty_fd])
		1311	{
		1312	pty->pty = atoi (rs[Rs_pty_fd]);
		1313
		1314	if (pty->pty >= 0)
		1315	{
		1316	if (getfd_hook)
		1317	pty->pty = (*getfd_hook) (pty->pty);
		1318
		1319	if (pty->pty < 0 \|\| fcntl (pty->pty, F_SETFL, O_NONBLOCK))
		1320	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1321	}
		1322	}
		1323	else
		1324	#endif
1390	if (!pty.get ())	1325	if (!pty->get ())
1391	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1326	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392		1327
1393	pty.set_utf8_mode (enc_utf8);	1328	pty->set_utf8_mode (enc_utf8);
1394		1329
1395	/* set initial window size */	1330	/* set initial window size */
1396	tt_winch ();	1331	tt_winch ();
1397		1332
1398	int er;	1333	int er;
…		…
1406	#endif	1341	#endif
1407	er = -1;	1342	er = -1;
1408		1343
1409	rxvt_get_ttymode (&tio, er);	1344	rxvt_get_ttymode (&tio, er);
1410		1345
1411	sw_chld.start (SIGCHLD);	1346	#if ENABLE_FRILLS
		1347	if (rs[Rs_pty_fd])
		1348	return;
		1349	#endif
1412		1350
1413	#ifndef __QNX__
1414	/* spin off the command interpreter */	1351	/* spin off the command interpreter */
1415	switch (cmd_pid = fork ())	1352	switch (cmd_pid = fork ())
1416	{	1353	{
1417	case -1:	1354	case -1:
		1355	{
		1356	cmd_pid = 0;
1418	rxvt_fatal ("can't fork, aborting.\n");	1357	rxvt_fatal ("can't fork, aborting.\n");
		1358	}
1419	case 0:	1359	case 0:
1420	init_env ();	1360	init_env ();
1421		1361
1422	if (!pty.make_controlling_tty ())	1362	if (!pty->make_controlling_tty ())
1423	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);	1363	fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424	else	1364	else
1425	{	1365	{
1426	/* Reopen stdin, stdout and stderr over the tty file descriptor */	1366	/* Reopen stdin, stdout and stderr over the tty file descriptor */
1427	dup2 (pty.tty, STDIN_FILENO);	1367	dup2 (pty->tty, STDIN_FILENO);
1428	dup2 (pty.tty, STDOUT_FILENO);	1368	dup2 (pty->tty, STDOUT_FILENO);
1429	dup2 (pty.tty, STDERR_FILENO);	1369	dup2 (pty->tty, STDERR_FILENO);
1430		1370
1431	// close all our file handles that we do no longer need	1371	// close all our file handles that we do no longer need
1432	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	1372	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433	{	1373	{
1434	if ((t)->pty.pty > 2) close ((t)->pty.pty);	1374	if ((t)->pty->pty > 2) close ((t)->pty->pty);
1435	if ((t)->pty.tty > 2) close ((t)->pty.tty);	1375	if ((t)->pty->tty > 2) close ((t)->pty->tty);
1436	}	1376	}
1437		1377
1438	run_child (argv);	1378	run_child (argv);
1439	fprintf (stderr, "%s: unable to exec child.", RESNAME);	1379	fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440	}	1380	}
1441		1381
1442	_exit (EXIT_FAILURE);	1382	_exit (EXIT_FAILURE);
1443		1383
1444	default:	1384	default:
1445	{	1385	if (!OPTION (Opt_utmpInhibit))
1446	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1386	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1447	int fdstdin;
1448		1387
1449	fdstdin = dup (STDIN_FILENO);	1388	pty->close_tty ();
1450	dup2 (pty.tty, STDIN_FILENO);
1451	#endif
1452		1389
1453	#ifdef UTMP_SUPPORT	1390	child_ev.start (cmd_pid);
1454	privileged_utmp (SAVE);
1455	#endif
1456		1391
1457	#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)	1392	HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1458
1459	dup2 (fdstdin, STDIN_FILENO);
1460	close (fdstdin);
1461	#endif
1462	}
1463
1464	pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1465	break;	1393	break;
1466	}	1394	}
1467	#else /* __QNX__ uses qnxspawn () */
1468	fchmod (pty.tty, 0622);
1469	fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1470	fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1471
1472	if (run_child (argv) == -1)
1473	exit (EXIT_FAILURE);
1474	#endif
1475	}	1395	}
1476		1396
1477	/* ------------------------------------------------------------------------- *	1397	/* ------------------------------------------------------------------------- *
1478	* CHILD PROCESS OPERATIONS *	1398	* CHILD PROCESS OPERATIONS *
1479	* ------------------------------------------------------------------------- */	1399	* ------------------------------------------------------------------------- */
…		…
1486	{	1406	{
1487	char *login;	1407	char *login;
1488		1408
1489	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1409	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490		1410
1491	if (options & Opt_console)	1411	if (OPTION (Opt_console))
1492	{ /* be virtual console, fail silently */	1412	{ /* be virtual console, fail silently */
1493	#ifdef TIOCCONS	1413	#ifdef TIOCCONS
1494	unsigned int on = 1;	1414	unsigned int on = 1;
1495		1415
1496	ioctl (STDIN_FILENO, TIOCCONS, &on);	1416	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1523	// unblock signals (signals are blocked by iom.C	1443	// unblock signals (signals are blocked by iom.C
1524	sigset_t ss;	1444	sigset_t ss;
1525	sigemptyset (&ss);	1445	sigemptyset (&ss);
1526	sigprocmask (SIG_SETMASK, &ss, 0);	1446	sigprocmask (SIG_SETMASK, &ss, 0);
1527		1447
1528	#ifndef __QNX__
1529	/* command interpreter path */	1448	/* command interpreter path */
1530	if (argv != NULL)	1449	if (argv != NULL)
1531	{	1450	{
1532	# ifdef DEBUG_CMD	1451	# ifdef DEBUG_CMD
1533	int i;	1452	int i;
…		…
1539	execvp (argv[0], (char const )argv);	1458	execvp (argv[0], (char const )argv);
1540	/* no error message: STDERR is closed! */	1459	/* no error message: STDERR is closed! */
1541	}	1460	}
1542	else	1461	else
1543	{	1462	{
1544	const char argv0, shell;	1463	const char argv0, shell;
1545		1464
1546	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1465	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1547	shell = "/bin/sh";	1466	shell = "/bin/sh";
1548		1467
1549	argv0 = (const char *)rxvt_r_basename (shell);	1468	argv0 = (const char *)rxvt_r_basename (shell);
1550		1469
1551	if (options & Opt_loginShell)	1470	if (OPTION (Opt_loginShell))
1552	{	1471	{
1553	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1472	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1554		1473
1555	login[0] = '-';	1474	login[0] = '-';
1556	strcpy (&login[1], argv0);	1475	strcpy (&login[1], argv0);
1557	argv0 = login;	1476	argv0 = login;
1558	}	1477	}
		1478
1559	execlp (shell, argv0, NULL);	1479	execlp (shell, argv0, NULL);
1560	/* no error message: STDERR is closed! */	1480	/* no error message: STDERR is closed! */
1561	}	1481	}
1562		1482
1563	#else /* __QNX__ uses qnxspawn () */
1564
1565	char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1566	char *command = NULL, fullcommand[_MAX_PATH];
1567	char *arg_v, arg_a[2] = { NULL, NULL };
1568
1569	if (argv != NULL)
1570	{
1571	if (access (argv[0], X_OK) == -1)
1572	{
1573	if (strchr (argv[0], '/') == NULL)
1574	{
1575	searchenv (argv[0], "PATH", fullcommand);
1576
1577	if (fullcommand[0] != '\0')
1578	command = fullcommand;
1579	}
1580
1581	if (access (command, X_OK) == -1)
1582	return -1;
1583	}
1584	else
1585	command = argv[0];
1586
1587	arg_v = argv;
1588	}
1589	else
1590	{
1591	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1592	command = "/bin/sh";
1593
1594	arg_a[0] = my_basename (command);
1595
1596	if (options & Opt_loginShell)
1597	{
1598	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1599
1600	login[0] = '-';
1601	strcpy (&login[1], arg_a[0]);
1602	arg_a[0] = login;
1603	}
1604
1605	arg_v = arg_a;
1606	}
1607
1608	iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1609	cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1610	_SPAWN_SETSID \| _SPAWN_TCSETPGRP,
1611	command, arg_v, environ, iov_a, 0);
1612	if (login)
1613	free (login);
1614
1615	pty.close_tty ();
1616	return pty.pty;
1617	#endif
1618
1619	return -1;	1483	return -1;
1620	}	1484	}
1621		1485
1622	/----------------------- end-of-file (C source) -----------------------/	1486	/----------------------- 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.105 by root, Mon Jan 17 00:59:23 2005 UTC vs. Revision 1.153 by root, Wed Jan 25 02:42:06 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 2006 UTC