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