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

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.107 by root, Wed Feb 2 08:09:23 2005 UTC vs.
Revision 1.154 by root, Wed Jan 25 02:45:36 2006 UTC