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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs.
Revision 1.139 by root, Wed Jan 11 03:13:26 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	#if OFF_FOCUS_FADING
		175	"black",
		176	#endif
174	};	177	};
175		178
176	const char *const xa_names[] =	179	const char *const xa_names[] =
177	{	180	{
178	"TEXT",	181	"TEXT",
…		…
181	"MULTIPLE",	184	"MULTIPLE",
182	"TARGETS",	185	"TARGETS",
183	"TIMESTAMP",	186	"TIMESTAMP",
184	"VT_SELECTION",	187	"VT_SELECTION",
185	"INCR",	188	"INCR",
		189	"WM_PROTOCOLS",
186	"WM_DELETE_WINDOW",	190	"WM_DELETE_WINDOW",
187	"CLIPBOARD",	191	"CLIPBOARD",
188	#if ENABLE_FRILLS	192	#if ENABLE_FRILLS
		193	"_MOTIF_WM_HINTS",
		194	#endif
		195	#if ENABLE_EWMH
189	"_NET_WM_PID",	196	"_NET_WM_PID",
190	"_MOTIF_WM_HINTS",
191	"_NET_WM_NAME",	197	"_NET_WM_NAME",
192	"_NET_WM_ICON_NAME",	198	"_NET_WM_ICON_NAME",
		199	"_NET_WM_PING",
193	#endif	200	#endif
194	#if USE_XIM	201	#if USE_XIM
195	"WM_LOCALE_NAME",	202	"WM_LOCALE_NAME",
196	#endif	203	#endif
197	#ifdef TRANSPARENT	204	#ifdef TRANSPARENT
…		…
200	#endif	207	#endif
201	#ifdef OFFIX_DND	208	#ifdef OFFIX_DND
202	"DndProtocol",	209	"DndProtocol",
203	"DndSelection",	210	"DndSelection",
204	#endif	211	#endif
		212	#if ENABLE_XEMBED
		213	"_XEMBED",
		214	"_XEMBED_INFO",
		215	#endif
205	};	216	};
206		217
207	bool	218	bool
208	rxvt_term::init_vars ()	219	rxvt_term::init_vars ()
209	{	220	{
210	sw_term.start (SIGTERM);
211	sw_int.start (SIGINT);
212
213	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	221	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214	#ifdef OFF_FOCUS_FADING	222	#ifdef OFF_FOCUS_FADING
215	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	223	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216	#endif	224	#endif
217	pix_colors = pix_colors_focused;	225	pix_colors = pix_colors_focused;
218		226
219	if (pix_colors == NULL)	227	if (pix_colors == NULL)
220	return false;	228	return false;
221		229
222	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	230	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
223	TermWin.pixmap = None;	231	pixmap = None;
224	#endif	232	#endif
225		233
226	MEvent.time = CurrentTime;	234	MEvent.time = CurrentTime;
227	MEvent.button = AnyButton;	235	MEvent.button = AnyButton;
228	options = DEFAULT_OPTIONS;	236	options = DEFAULT_OPTIONS;
229	want_refresh = 1;	237	want_refresh = 1;
230	priv_modes = SavedModes = PrivMode_Default;	238	priv_modes = SavedModes = PrivMode_Default;
231	TermWin.focus = 0;	239	focus = 0;
232	TermWin.ncol = 80;	240	ncol = 80;
233	TermWin.nrow = 24;	241	nrow = 24;
234	TermWin.int_bwidth = INTERNALBORDERWIDTH;	242	int_bwidth = INTERNALBORDERWIDTH;
235	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	243	ext_bwidth = EXTERNALBORDERWIDTH;
236	TermWin.lineSpace = LINESPACE;	244	lineSpace = LINESPACE;
237	TermWin.saveLines = SAVELINES;	245	saveLines = SAVELINES;
238	numpix_colors = TOTAL_COLORS;	246	numpix_colors = TOTAL_COLORS;
239		247
240	refresh_limit = 1;	248	refresh_limit = 1;
241	refresh_type = SLOW_REFRESH;	249	refresh_type = SLOW_REFRESH;
242	prev_nrow = prev_ncol = 0;	250	prev_nrow = prev_ncol = 0;
…		…
331	rs[Rs_name] = rxvt_r_basename (argv[0]);	339	rs[Rs_name] = rxvt_r_basename (argv[0]);
332		340
333	/*	341	/*
334	* Open display, get options/resources and create the window	342	* Open display, get options/resources and create the window
335	*/	343	*/
		344	{
		345	TEMP_ENV;
		346
336	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	347	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337	rs[Rs_display_name] = ":0";	348	rs[Rs_display_name] = ":0";
338		349
339	get_options (r_argc, r_argv);	350	get_options (r_argc, r_argv);
340		351
341	#ifdef LOCAL_X_IS_UNIX
342	if (rs[Rs_display_name][0] == ':')
343	{
344	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345	strcpy (val, "unix");
346	strcat (val, rs[Rs_display_name]);
347	display = displays.get (val);
348	free (val);
349	}
350	#endif
351
352	if (!display
353	&& ! (display = displays.get (rs[Rs_display_name])))	352	if (!(display = displays.get (rs[Rs_display_name])))
354	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	353	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355		354
356	extract_resources ();	355	extract_resources ();
		356	}
		357
357	free (r_argv);	358	free (r_argv);
358		359
359	/*	360	/*
360	* set any defaults not already set	361	* set any defaults not already set
361	*/	362	*/
…		…
373	if (!rs[Rs_iconName])	374	if (!rs[Rs_iconName])
374	rs[Rs_iconName] = rs[Rs_name];	375	rs[Rs_iconName] = rs[Rs_name];
375	}	376	}
376		377
377	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	378	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	379	saveLines = min (i, MAX_SAVELINES);
379		380
380	#if ENABLE_FRILLS	381	#if ENABLE_FRILLS
381	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	382	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	383	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		384
383	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	385	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	386	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		387
385	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	388	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	389	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
387	#endif	390	#endif
388		391
389	#ifdef POINTER_BLANK	392	#ifdef POINTER_BLANK
390	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	393	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391	pointerBlankDelay = i;	394	pointerBlankDelay = i;
392	else	395	else
393	pointerBlankDelay = 2;	396	pointerBlankDelay = 2;
394	#endif	397	#endif
395		398
396	/* no point having a scrollbar without having any scrollback! */	399	/* no point having a scrollbar without having any scrollback! */
397	if (!TermWin.saveLines)	400	if (!saveLines)
398	options &= ~Opt_scrollBar;	401	set_option (Opt_scrollBar, 0);
399		402
400	#ifdef PRINTPIPE	403	#ifdef PRINTPIPE
401	if (!rs[Rs_print_pipe])	404	if (!rs[Rs_print_pipe])
402	rs[Rs_print_pipe] = PRINTPIPE;	405	rs[Rs_print_pipe] = PRINTPIPE;
403	#endif	406	#endif
…		…
446	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	449	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447	#endif	450	#endif
448		451
449	#ifdef XTERM_REVERSE_VIDEO	452	#ifdef XTERM_REVERSE_VIDEO
450	/* this is how xterm implements reverseVideo */	453	/* this is how xterm implements reverseVideo */
451	if (options & Opt_reverseVideo)	454	if (OPTION (Opt_reverseVideo))
452	{	455	{
453	if (!rs[Rs_color + Color_fg])	456	if (!rs[Rs_color + Color_fg])
454	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	457	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455	if (!rs[Rs_color + Color_bg])	458	if (!rs[Rs_color + Color_bg])
456	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	459	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
461	if (!rs[Rs_color + i])	464	if (!rs[Rs_color + i])
462	rs[Rs_color + i] = def_colorName[i];	465	rs[Rs_color + i] = def_colorName[i];
463		466
464	#ifndef XTERM_REVERSE_VIDEO	467	#ifndef XTERM_REVERSE_VIDEO
465	/* this is how we implement reverseVideo */	468	/* this is how we implement reverseVideo */
466	if (options & Opt_reverseVideo)	469	if (OPTION (Opt_reverseVideo))
467	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	470	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468	#endif	471	#endif
469		472
470	/* convenient aliases for setting fg/bg to colors */	473	/* convenient aliases for setting fg/bg to colors */
471	color_aliases (Color_fg);	474	color_aliases (Color_fg);
472	color_aliases (Color_bg);	475	color_aliases (Color_bg);
…		…
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	525	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		526
524	sprintf (env_display, "DISPLAY=%s", val);	527	sprintf (env_display, "DISPLAY=%s", val);
525		528
526	/* avoiding the math library:	529	/* avoiding the math library:
527	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */	530	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)	531	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529	;	532	;
530	MAX_IT (i, 1);	533	max_it (i, 1);
531	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));	534	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
532		535
533	sprintf (env_windowid, "WINDOWID=%u",	536	sprintf (env_windowid, "WINDOWID=%u",
534	(unsigned int)TermWin.parent[0]);	537	(unsigned int)parent[0]);
535		538
536	/* add entries to the environment:	539	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	540	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	541	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	542	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
578	* This should support all European type languages.	581	* This should support all European type languages.
579	*/	582	*/
580	void	583	void
581	rxvt_term::set_locale (const char *locale)	584	rxvt_term::set_locale (const char *locale)
582	{	585	{
		586	TEMP_ENV;
		587
583	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE	588	#if HAVE_XSETLOCALE \|\| HAVE_SETLOCALE
584	free (this->locale);	589	free (this->locale);
585	this->locale = setlocale (LC_CTYPE, locale);	590	this->locale = setlocale (LC_CTYPE, locale);
586		591
587	if (!this->locale)	592	if (!this->locale)
588	{	593	{
589	if (*locale)	594	if (*locale)
590	{	595	{
591	rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);	596	rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592	setlocale (LC_CTYPE, "");	597	setlocale (LC_CTYPE, "C");
593	}	598	}
594	else	599	else
595	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");	600	rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596		601
597	this->locale = "";	602	this->locale = "C";
598	}	603	}
599		604
600		605
601	this->locale = rxvt_strdup (this->locale);	606	this->locale = rxvt_strdup (this->locale);
602	SET_LOCALE (this->locale);	607	SET_LOCALE (this->locale);
…		…
617	}	622	}
618		623
619	void	624	void
620	rxvt_term::init_xlocale ()	625	rxvt_term::init_xlocale ()
621	{	626	{
		627	TEMP_ENV;
		628
622	#ifdef USE_XIM	629	#ifdef USE_XIM
623	if (!locale)	630	if (!locale)
624	rxvt_warn ("setting locale failed, working without locale support.\n");	631	rxvt_warn ("setting locale failed, working without locale support.\n");
625	else	632	else
626	{	633	{
…		…
648	* Initialize the command connection.	655	* Initialize the command connection.
649	* This should be called after the X server connection is established.	656	* This should be called after the X server connection is established.
650	*/	657	*/
651		658
652	#ifdef META8_OPTION	659	#ifdef META8_OPTION
653	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	660	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654	#endif	661	#endif
655		662
656	get_ourmods ();	663	get_ourmods ();
657		664
658	if (!(options & Opt_scrollTtyOutput))	665	if (!OPTION (Opt_scrollTtyOutput))
659	priv_modes \|= PrivMode_TtyOutputInh;	666	priv_modes \|= PrivMode_TtyOutputInh;
660	if (options & Opt_scrollTtyKeypress)	667	if (OPTION (Opt_scrollTtyKeypress))
661	priv_modes \|= PrivMode_Keypress;	668	priv_modes \|= PrivMode_Keypress;
662	if (!(options & Opt_jumpScroll))	669	if (!OPTION (Opt_jumpScroll))
663	priv_modes \|= PrivMode_smoothScroll;	670	priv_modes \|= PrivMode_smoothScroll;
664		671
665	#ifndef NO_BACKSPACE_KEY	672	#ifndef NO_BACKSPACE_KEY
666	if (strcmp (key_backspace, "DEC") == 0)	673	if (strcmp (key_backspace, "DEC") == 0)
667	priv_modes \|= PrivMode_HaveBackSpace;	674	priv_modes \|= PrivMode_HaveBackSpace;
…		…
677	if (menubar_visible ())	684	if (menubar_visible ())
678	{	685	{
679	priv_modes \|= PrivMode_menuBar;	686	priv_modes \|= PrivMode_menuBar;
680	SavedModes \|= PrivMode_menuBar;	687	SavedModes \|= PrivMode_menuBar;
681	}	688	}
682
683	#ifdef CURSOR_BLINK
684	if (options & Opt_cursorBlink)
685	(void)gettimeofday (&lastcursorchange, NULL);
686	#endif
687		689
688	run_command (argv);	690	run_command (argv);
689	}	691	}
690		692
691	/----------------------------------------------------------------------/	693	/----------------------------------------------------------------------/
…		…
706	continue;	708	continue;
707		709
708	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	710	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709	{	711	{
710	#ifndef XTERM_REVERSE_VIDEO	712	#ifndef XTERM_REVERSE_VIDEO
711	if (i < 2 && (options & Opt_reverseVideo))	713	if (i < 2 && OPTION (Opt_reverseVideo))
712	rs[Rs_color + i] = def_colorName[!i];	714	rs[Rs_color + i] = def_colorName[!i];
713	else	715	else
714	#endif	716	#endif
715	rs[Rs_color + i] = def_colorName[i];	717	rs[Rs_color + i] = def_colorName[i];
716		718
…		…
741	}	743	}
742	}	744	}
743	}	745	}
744		746
745	pix_colors[i] = xcol;	747	pix_colors[i] = xcol;
		748	SET_PIXCOLOR (i);
		749	}
		750
746	#ifdef OFF_FOCUS_FADING	751	#ifdef OFF_FOCUS_FADING
747	if (rs[Rs_fade])	752	if (rs[Rs_fade])
		753	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));	754	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749	#endif	755	#endif
750	SET_PIXCOLOR (i);
751	}
752		756
753	if (display->depth <= 2)	757	if (display->depth <= 2)
754	{	758	{
755	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	759	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
756	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	760	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
…		…
764	* from the fvwm window manager.	768	* from the fvwm window manager.
765	*/	769	*/
766	#ifdef KEEP_SCROLLCOLOR	770	#ifdef KEEP_SCROLLCOLOR
767		771
768	if (display->depth <= 2)	772	if (display->depth <= 2)
		773	{
769	{ /* Monochrome */	774	/* Monochrome */
770	pix_colors[Color_scroll] = pix_colors[Color_fg];	775	pix_colors[Color_scroll] = pix_colors[Color_fg];
771	pix_colors[Color_topShadow] = pix_colors[Color_bg];	776	pix_colors[Color_topShadow] = pix_colors[Color_bg];
772	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	777	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773	}	778	}
774	else	779	else
…		…
810	int i = atoi (rs[Rs_color + idx]);	815	int i = atoi (rs[Rs_color + idx]);
811		816
812	if (i >= 8 && i <= 15)	817	if (i >= 8 && i <= 15)
813	{ /* bright colors */	818	{ /* bright colors */
814	i -= 8;	819	i -= 8;
815	#ifndef NO_BRIGHTCOLOR
816	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];	820	rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
817	return;	821	return;
818	#endif
819	}	822	}
820		823
821	if (i >= 0 && i <= 7) /* normal colors */	824	if (i >= 0 && i <= 7) /* normal colors */
822	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];	825	rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823	}	826	}
…		…
925	#endif	928	#endif
926	XGCValues gcvalue;	929	XGCValues gcvalue;
927	long vt_emask;	930	long vt_emask;
928	XSetWindowAttributes attributes;	931	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;	932	XWindowAttributes gattr;
930	Window top;	933	Window top, parent;
931	dDisp;	934	dDisp;
932		935
933	#ifdef USING_W11LIB	936	#ifdef USING_W11LIB
934	/* enable W11 callbacks */	937	/* enable W11 callbacks */
935	W11AddEventHandler (disp, rxvt_W11_process_x_event);	938	W11AddEventHandler (disp, rxvt_W11_process_x_event);
936	#endif	939	#endif
937		940
938	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	941	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
939	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	942	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
940		943
941	if (options & Opt_transparent)	944	if (OPTION (Opt_transparent))
942	{	945	{
943	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	946	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
944	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	947	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
945	}	948	}
946		949
947	#if ENABLE_FRILLS	950	#if ENABLE_FRILLS
948	if (options & Opt_borderLess)	951	if (OPTION (Opt_borderLess))
949	{	952	{
950	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	953	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
951		954
952	if (prop == None)	955	if (prop == None)
953	{	956	{
…		…
962	mwmhints.flags = MWM_HINTS_DECORATIONS;	965	mwmhints.flags = MWM_HINTS_DECORATIONS;
963	mwmhints.decorations = 0;	966	mwmhints.decorations = 0;
964	}	967	}
965	}	968	}
966	else	969	else
967	{
968	mwmhints.flags = 0;	970	mwmhints.flags = 0;
969	}
970	#endif	971	#endif
971		972
972	/* grab colors before netscape does */	973	/* grab colors before netscape does */
973	Get_Colours ();	974	Get_Colours ();
974		975
975	if (!set_fonts ())	976	if (!set_fonts ())
976	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	977	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977		978
978	#if ENABLE_FRILLS	979	parent = DefaultRootWindow (disp);
		980
		981	#if ENABLE_XEMBED
979	if (rs[Rs_embed])	982	if (rs[Rs_embed])
980	{	983	{
981	XWindowAttributes wattr;	984	XWindowAttributes wattr;
982		985
983	top = strtol (rs[Rs_embed], 0, 0);	986	parent = strtol (rs[Rs_embed], 0, 0);
984		987
985	if (!XGetWindowAttributes (disp, top, &wattr))	988	if (!XGetWindowAttributes (disp, parent, &wattr))
986	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	989	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987		990
988	window_calc (wattr.width, wattr.height);	991	window_calc (wattr.width, wattr.height);
		992	}
		993	#endif
989		994
990	#if 0	995	window_calc (0, 0);
991	if (wattr.map_state == IsViewable)	996
992	{	997	/* sub-window placement & size in rxvt_resize_subwindows () */
993	TermWin.mapped = 1;	998	#ifdef PREFER_24BIT
994	refresh_type = FAST_REFRESH;	999	attributes.background_pixel = pix_colors_focused[Color_border];
995	XClearWindow (disp, top);	1000	attributes.border_pixel = pix_colors_focused[Color_border];
996	// TODO: make XMapNotify-event-code a function and call it	1001	attributes.colormap = display->cmap;
997	// TODO: how can I detetc visibility without unmpa/map?	1002	top = XCreateWindow (disp, parent,
998	// TODO: focusin etc.	1003	szHint.x, szHint.y,
999	}	1004	szHint.width, szHint.height,
		1005	ext_bwidth,
		1006	display->depth, InputOutput,
		1007	display->visual,
		1008	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
1000	#else	1009	#else
1001	// it'S easiets just to unmap/map to get all state correctly set-up	1010	top = XCreateSimpleWindow (disp, parent,
1002	XUnmapWindow (disp, top);
1003	#endif
1004	}
1005	else
1006	#endif
1007	{
1008	window_calc (0, 0);
1009
1010	/* sub-window placement & size in rxvt_resize_subwindows () */
1011	#ifdef PREFER_24BIT
1012	attributes.background_pixel = pix_colors_focused[Color_border];
1013	attributes.border_pixel = pix_colors_focused[Color_border];
1014	attributes.colormap = display->cmap;
1015	top = XCreateWindow (disp, DefaultRootWindow (disp),
1016	szHint.x, szHint.y,	1011	szHint.x, szHint.y,
1017	szHint.width, szHint.height,	1012	szHint.width, szHint.height,
1018	TermWin.ext_bwidth,	1013	ext_bwidth,
1019	display->depth, InputOutput,
1020	display->visual,
1021	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
1022	#else
1023	top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1024	szHint.x, szHint.y,
1025	szHint.width, szHint.height,
1026	TermWin.ext_bwidth,
1027	pix_colors_focused[Color_border],	1014	pix_colors_focused[Color_border],
1028	pix_colors_focused[Color_border]);	1015	pix_colors_focused[Color_border]);
1029	#endif	1016	#endif
1030	}
1031		1017
1032	TermWin.parent[0] = top;	1018	this->parent[0] = top;
1033		1019
1034	old_width = szHint.width;	1020	old_width = szHint.width;
1035	old_height = szHint.height;	1021	old_height = szHint.height;
1036		1022
1037	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1023	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
…		…
1040	classHint.res_name = (char *)rs[Rs_name];	1026	classHint.res_name = (char *)rs[Rs_name];
1041	classHint.res_class = (char *)RESCLASS;	1027	classHint.res_class = (char *)RESCLASS;
1042		1028
1043	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1029	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1044	wmHint.input = True;	1030	wmHint.input = True;
1045	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1031	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1046	wmHint.window_group = top;	1032	wmHint.window_group = top;
1047		1033
1048	XSetWMProperties (disp, top, NULL, NULL,	1034	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1049	(char **)argv, argc, &szHint, &wmHint, &classHint);	1035	&szHint, &wmHint, &classHint);
1050		1036
1051	/* Enable delete window protocol */	1037	Atom protocols[] = {
1052	XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);	1038	xa[XA_WM_DELETE_WINDOW],
		1039	#if ENABLE_EWMH
		1040	xa[XA_NET_WM_PING],
		1041	#endif
		1042	};
		1043
		1044	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1053		1045
1054	#if ENABLE_FRILLS	1046	#if ENABLE_FRILLS
		1047	if (rs[Rs_transient_for])
		1048	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
		1049	#endif
		1050
		1051	#if ENABLE_EWMH
1055	long pid = getpid ();	1052	long pid = getpid ();
1056		1053
1057	XChangeProperty (disp, top,	1054	XChangeProperty (disp, top,
1058	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1055	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1059	PropModeReplace, (unsigned char *)&pid, 1);	1056	PropModeReplace, (unsigned char *)&pid, 1);
		1057
		1058	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1060	#endif	1059	#endif
1061		1060
1062	XSelectInput (disp, top,	1061	XSelectInput (disp, top,
1063	KeyPressMask	1062	KeyPressMask
1064	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1063	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1065	\| KeyReleaseMask	1064	\| KeyReleaseMask
1066	#endif	1065	#endif
1067	\| FocusChangeMask \| VisibilityChangeMask	1066	\| FocusChangeMask \| VisibilityChangeMask
1068	\| ExposureMask
1069	\| StructureNotifyMask);	1067	\| ExposureMask \| StructureNotifyMask);
		1068
1070	termwin_ev.start (display, top);	1069	termwin_ev.start (display, top);
1071		1070
1072	#if ENABLE_FRILLS	1071	#if ENABLE_FRILLS
1073	if (mwmhints.flags)	1072	if (mwmhints.flags)
1074	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1073	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1082	/* cursor (menuBar/scrollBar): Black-on-White */	1081	/* cursor (menuBar/scrollBar): Black-on-White */
1083	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1082	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1084	#endif	1083	#endif
1085		1084
1086	/* the vt window */	1085	/* the vt window */
1087	TermWin.vt = XCreateSimpleWindow (disp, top,	1086	vt = XCreateSimpleWindow (disp, top,
1088	window_vt_x,	1087	window_vt_x,
1089	window_vt_y,	1088	window_vt_y,
1090	TermWin_TotalWidth (),	1089	width,
1091	TermWin_TotalHeight (),	1090	height,
1092	0,	1091	0,
1093	pix_colors_focused[Color_fg],	1092	pix_colors_focused[Color_fg],
1094	pix_colors_focused[Color_bg]);	1093	pix_colors_focused[Color_bg]);
1095	#ifdef DEBUG_X	1094	#ifdef DEBUG_X
1096	XStoreName (disp, TermWin.vt, "vt window");	1095	XStoreName (disp, vt, "vt window");
1097	#endif	1096	#endif
1098		1097
1099	attributes.bit_gravity = NorthWestGravity;	1098	attributes.bit_gravity = NorthWestGravity;
1100	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1099	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1101		1100
1102	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1101	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1103		1102
1104	pointer_unblank ();	1103	if (OPTION (Opt_pointerBlank)
1105		1104	#ifdef ENABLE_PERL
1106	#ifdef POINTER_BLANK	1105	\|\| perl.self
1107	if (options & Opt_pointerBlank)	1106	#endif
		1107	)
1108	vt_emask \|= PointerMotionMask;	1108	vt_emask \|= PointerMotionMask;
1109	else	1109	else
1110	#endif
1111	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1110	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1112		1111
1113	XSelectInput (disp, TermWin.vt, vt_emask);	1112	XSelectInput (disp, vt, vt_emask);
1114	vt_ev.start (display, TermWin.vt);	1113	vt_ev.start (display, vt);
1115		1114
1116	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	1115	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1117	if (menuBar_height ())	1116	if (menuBar_height ())
1118	{	1117	{
1119	menuBar.win = XCreateSimpleWindow (disp, top,	1118	menuBar.win = XCreateSimpleWindow (disp, top,
1120	window_vt_x, 0,	1119	window_vt_x, 0,
1121	TermWin_TotalWidth (),	1120	width,
1122	menuBar_TotalHeight (),	1121	menuBar_TotalHeight (),
1123	0,	1122	0,
1124	pix_colors_focused[Color_fg],	1123	pix_colors_focused[Color_fg],
1125	pix_colors_focused[Color_scroll]);	1124	pix_colors_focused[Color_scroll]);
1126		1125
…		…
1139	}	1138	}
1140	#endif	1139	#endif
1141		1140
1142	#ifdef XPM_BACKGROUND	1141	#ifdef XPM_BACKGROUND
1143	if (rs[Rs_backgroundPixmap] != NULL	1142	if (rs[Rs_backgroundPixmap] != NULL
1144	&& ! (options & Opt_transparent))	1143	&& ! OPTION (Opt_transparent))
1145	{	1144	{
1146	const char *p = rs[Rs_backgroundPixmap];	1145	const char *p = rs[Rs_backgroundPixmap];
1147		1146
1148	if ((p = strchr (p, ';')) != NULL)	1147	if ((p = strchr (p, ';')) != NULL)
1149	{	1148	{
…		…
1158		1157
1159	/* graphics context for the vt window */	1158	/* graphics context for the vt window */
1160	gcvalue.foreground = pix_colors[Color_fg];	1159	gcvalue.foreground = pix_colors[Color_fg];
1161	gcvalue.background = pix_colors[Color_bg];	1160	gcvalue.background = pix_colors[Color_bg];
1162	gcvalue.graphics_exposures = 1;	1161	gcvalue.graphics_exposures = 1;
1163	TermWin.gc = XCreateGC (disp, TermWin.vt,	1162	gc = XCreateGC (disp, vt,
1164	GCForeground \| GCBackground \| GCGraphicsExposures,	1163	GCForeground \| GCBackground \| GCGraphicsExposures,
1165	&gcvalue);	1164	&gcvalue);
1166		1165
1167	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1166	drawable = new rxvt_drawable (display, vt);
1168		1167
1169	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1168	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1170	gcvalue.foreground = pix_colors[Color_topShadow];	1169	gcvalue.foreground = pix_colors[Color_topShadow];
1171	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1170	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1172	gcvalue.foreground = pix_colors[Color_bottomShadow];	1171	gcvalue.foreground = pix_colors[Color_bottomShadow];
1173	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1172	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1173	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1175	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1174	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1176	#endif	1175	#endif
1177		1176
1178	#ifdef OFF_FOCUS_FADING	1177	#ifdef OFF_FOCUS_FADING
1179	// initially we are in unfocused state	1178	// initially we are in unfocused state
1180	if (rs[Rs_fade])	1179	if (rs[Rs_fade])
1181	pix_colors = pix_colors_unfocused;	1180	pix_colors = pix_colors_unfocused;
1182	#endif	1181	#endif
1183		1182
		1183	pointer_unblank ();
1184	scr_recolour ();	1184	scr_recolour ();
		1185
		1186	#if ENABLE_XEMBED
		1187	if (rs[Rs_embed])
		1188	{
		1189	long info[2] = { 0, XEMBED_MAPPED };
		1190
		1191	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		1192	32, PropModeReplace, (unsigned char *)&info, 2);
		1193	}
		1194	#endif
1185	}	1195	}
1186		1196
1187	/* ------------------------------------------------------------------------- *	1197	/* ------------------------------------------------------------------------- *
1188	* GET TTY CURRENT STATE *	1198	* GET TTY CURRENT STATE *
1189	* ------------------------------------------------------------------------- */	1199	* ------------------------------------------------------------------------- */
…		…
1194	/*	1204	/*
1195	* standard System V termios interface	1205	* standard System V termios interface
1196	*/	1206	*/
1197	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1207	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1198	{	1208	{
1199	/* return error - use system defaults */	1209	// return error - use system defaults,
		1210	// where possible, and zero elsewhere
		1211	memset (tio, 0, sizeof (ttymode_t));
		1212
1200	tio->c_cc[VINTR] = CINTR;	1213	tio->c_cc[VINTR] = CINTR;
1201	tio->c_cc[VQUIT] = CQUIT;	1214	tio->c_cc[VQUIT] = CQUIT;
1202	tio->c_cc[VERASE] = CERASE;	1215	tio->c_cc[VERASE] = CERASE;
		1216	#ifdef VERASE2
		1217	tio->c_cc[VERASE2] = CERASE2;
		1218	#endif
1203	tio->c_cc[VKILL] = CKILL;	1219	tio->c_cc[VKILL] = CKILL;
1204	tio->c_cc[VSTART] = CSTART;	1220	tio->c_cc[VSTART] = CSTART;
1205	tio->c_cc[VSTOP] = CSTOP;	1221	tio->c_cc[VSTOP] = CSTOP;
1206	tio->c_cc[VSUSP] = CSUSP;	1222	tio->c_cc[VSUSP] = CSUSP;
1207	# ifdef VDSUSP	1223	# ifdef VDSUSP
1208
1209	tio->c_cc[VDSUSP] = CDSUSP;	1224	tio->c_cc[VDSUSP] = CDSUSP;
1210	# endif	1225	# endif
1211	# ifdef VREPRINT	1226	# ifdef VREPRINT
1212
1213	tio->c_cc[VREPRINT] = CRPRNT;	1227	tio->c_cc[VREPRINT] = CRPRNT;
1214	# endif	1228	# endif
1215	# ifdef VDISCRD	1229	# ifdef VDISCRD
1216
1217	tio->c_cc[VDISCRD] = CFLUSH;	1230	tio->c_cc[VDISCRD] = CFLUSH;
1218	# endif	1231	# endif
1219	# ifdef VWERSE	1232	# ifdef VWERSE
1220
1221	tio->c_cc[VWERSE] = CWERASE;	1233	tio->c_cc[VWERSE] = CWERASE;
1222	# endif	1234	# endif
1223	# ifdef VLNEXT	1235	# ifdef VLNEXT
1224
1225	tio->c_cc[VLNEXT] = CLNEXT;	1236	tio->c_cc[VLNEXT] = CLNEXT;
1226	# endif	1237	# endif
1227
1228	}	1238	}
		1239
1229	tio->c_cc[VEOF] = CEOF;	1240	tio->c_cc[VEOF] = CEOF;
1230	tio->c_cc[VEOL] = VDISABLE;	1241	tio->c_cc[VEOL] = VDISABLE;
1231	# ifdef VEOL2	1242	# ifdef VEOL2
1232
1233	tio->c_cc[VEOL2] = VDISABLE;	1243	tio->c_cc[VEOL2] = VDISABLE;
1234	# endif	1244	# endif
1235	# ifdef VSWTC	1245	# ifdef VSWTC
1236
1237	tio->c_cc[VSWTC] = VDISABLE;	1246	tio->c_cc[VSWTC] = VDISABLE;
1238	# endif	1247	# endif
1239	# ifdef VSWTCH	1248	# ifdef VSWTCH
1240
1241	tio->c_cc[VSWTCH] = VDISABLE;	1249	tio->c_cc[VSWTCH] = VDISABLE;
1242	# endif	1250	# endif
1243	# if VMIN != VEOF	1251	# if VMIN != VEOF
1244
1245	tio->c_cc[VMIN] = 1;	1252	tio->c_cc[VMIN] = 1;
1246	# endif	1253	# endif
1247	# if VTIME != VEOL	1254	# if VTIME != VEOL
1248
1249	tio->c_cc[VTIME] = 0;	1255	tio->c_cc[VTIME] = 0;
1250	# endif	1256	# endif
1251		1257
1252	if (erase != -1)	1258	if (erase != -1)
1253	tio->c_cc[VERASE] = (char)erase;	1259	tio->c_cc[VERASE] = (char)erase;
…		…
1281	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1287	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1282	{	1288	{
1283	tio->sg.sg_erase = CERASE; /* ^H */	1289	tio->sg.sg_erase = CERASE; /* ^H */
1284	tio->sg.sg_kill = CKILL; /* ^U */	1290	tio->sg.sg_kill = CKILL; /* ^U */
1285	}	1291	}
		1292
1286	if (erase != -1)	1293	if (erase != -1)
1287	tio->sg.sg_erase = (char)erase;	1294	tio->sg.sg_erase = (char)erase;
1288		1295
1289	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1296	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1290		1297
…		…
1296	tio->tc.t_startc = CSTART; /* ^Q */	1303	tio->tc.t_startc = CSTART; /* ^Q */
1297	tio->tc.t_stopc = CSTOP; /* ^S */	1304	tio->tc.t_stopc = CSTOP; /* ^S */
1298	tio->tc.t_eofc = CEOF; /* ^D */	1305	tio->tc.t_eofc = CEOF; /* ^D */
1299	tio->tc.t_brkc = -1;	1306	tio->tc.t_brkc = -1;
1300	}	1307	}
		1308
1301	/* get local special chars */	1309	/* get local special chars */
1302	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1310	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1303	{	1311	{
1304	tio->lc.t_suspc = CSUSP; /* ^Z */	1312	tio->lc.t_suspc = CSUSP; /* ^Z */
1305	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1313	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1309	tio->lc.t_lnextc = CLNEXT; /* ^V */	1317	tio->lc.t_lnextc = CLNEXT; /* ^V */
1310	}	1318	}
1311	/* get line discipline */	1319	/* get line discipline */
1312	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1320	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1313	# ifdef NTTYDISC	1321	# ifdef NTTYDISC
1314
1315	tio->line = NTTYDISC;	1322	tio->line = NTTYDISC;
1316	# endif /* NTTYDISC */	1323	# endif /* NTTYDISC */
1317		1324
1318	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1325	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1319	#endif /* HAVE_TERMIOS_H */	1326	#endif /* HAVE_TERMIOS_H */
…		…
1342	FOO (IGNCR, "IGNCR");	1349	FOO (IGNCR, "IGNCR");
1343	FOO (ICRNL, "ICRNL");	1350	FOO (ICRNL, "ICRNL");
1344	FOO (IXON, "IXON");	1351	FOO (IXON, "IXON");
1345	FOO (IXOFF, "IXOFF");	1352	FOO (IXOFF, "IXOFF");
1346	# ifdef IUCLC	1353	# ifdef IUCLC
1347
1348	FOO (IUCLC, "IUCLC");	1354	FOO (IUCLC, "IUCLC");
1349	# endif	1355	# endif
1350	# ifdef IXANY	1356	# ifdef IXANY
1351
1352	FOO (IXANY, "IXANY");	1357	FOO (IXANY, "IXANY");
1353	# endif	1358	# endif
1354	# ifdef IMAXBEL	1359	# ifdef IMAXBEL
1355
1356	FOO (IMAXBEL, "IMAXBEL");	1360	FOO (IMAXBEL, "IMAXBEL");
1357	# endif	1361	# endif
1358		1362
1359	fprintf (stderr, "\n");	1363	fprintf (stderr, "\n");
1360		1364
…		…
1367	FOO (VERASE, "VERASE");	1371	FOO (VERASE, "VERASE");
1368	FOO (VKILL, "VKILL");	1372	FOO (VKILL, "VKILL");
1369	FOO (VEOF, "VEOF");	1373	FOO (VEOF, "VEOF");
1370	FOO (VEOL, "VEOL");	1374	FOO (VEOL, "VEOL");
1371	# ifdef VEOL2	1375	# ifdef VEOL2
1372
1373	FOO (VEOL2, "VEOL2");	1376	FOO (VEOL2, "VEOL2");
1374	# endif	1377	# endif
1375	# ifdef VSWTC	1378	# ifdef VSWTC
1376
1377	FOO (VSWTC, "VSWTC");	1379	FOO (VSWTC, "VSWTC");
1378	# endif	1380	# endif
1379	# ifdef VSWTCH	1381	# ifdef VSWTCH
1380
1381	FOO (VSWTCH, "VSWTCH");	1382	FOO (VSWTCH, "VSWTCH");
1382	# endif	1383	# endif
1383
1384	FOO (VSTART, "VSTART");	1384	FOO (VSTART, "VSTART");
1385	FOO (VSTOP, "VSTOP");	1385	FOO (VSTOP, "VSTOP");
1386	FOO (VSUSP, "VSUSP");	1386	FOO (VSUSP, "VSUSP");
1387	# ifdef VDSUSP	1387	# ifdef VDSUSP
1388
1389	FOO (VDSUSP, "VDSUSP");	1388	FOO (VDSUSP, "VDSUSP");
1390	# endif	1389	# endif
1391	# ifdef VREPRINT	1390	# ifdef VREPRINT
1392
1393	FOO (VREPRINT, "VREPRINT");	1391	FOO (VREPRINT, "VREPRINT");
1394	# endif	1392	# endif
1395	# ifdef VDISCRD	1393	# ifdef VDISCRD
1396
1397	FOO (VDISCRD, "VDISCRD");	1394	FOO (VDISCRD, "VDISCRD");
1398	# endif	1395	# endif
1399	# ifdef VWERSE	1396	# ifdef VWERSE
1400
1401	FOO (VWERSE, "VWERSE");	1397	FOO (VWERSE, "VWERSE");
1402	# endif	1398	# endif
1403	# ifdef VLNEXT	1399	# ifdef VLNEXT
1404
1405	FOO (VLNEXT, "VLNEXT");	1400	FOO (VLNEXT, "VLNEXT");
1406	# endif	1401	# endif
1407		1402
1408	fprintf (stderr, "\n");	1403	fprintf (stderr, "\n");
1409	# undef FOO	1404	# undef FOO
…		…
1418	* the slave.	1413	* the slave.
1419	*/	1414	*/
1420	void	1415	void
1421	rxvt_term::run_command (const char const argv)	1416	rxvt_term::run_command (const char const argv)
1422	{	1417	{
		1418	TEMP_ENV; // not very temporary...
		1419
1423	#if ENABLE_FRILLS	1420	#if ENABLE_FRILLS
1424	if (rs[Rs_pty_fd])	1421	if (rs[Rs_pty_fd])
1425	{	1422	{
1426	pty.pty = atoi (rs[Rs_pty_fd]);	1423	pty.pty = atoi (rs[Rs_pty_fd]);
		1424
		1425	if (pty.pty >= 0)
		1426	{
		1427	if (getfd_hook)
		1428	pty.pty = (*getfd_hook) (pty.pty);
		1429
1427	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1430	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))
		1431	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
		1432	}
1428	}	1433	}
1429	else	1434	else
1430	#endif	1435	#endif
1431	if (!pty.get ())	1436	if (!pty.get ())
1432	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1437	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
…		…
1451		1456
1452	#if ENABLE_FRILLS	1457	#if ENABLE_FRILLS
1453	if (rs[Rs_pty_fd])	1458	if (rs[Rs_pty_fd])
1454	return;	1459	return;
1455	#endif	1460	#endif
1456
1457	sw_chld.start (SIGCHLD);
1458		1461
1459	#ifndef __QNX__	1462	#ifndef __QNX__
1460	/* spin off the command interpreter */	1463	/* spin off the command interpreter */
1461	switch (cmd_pid = fork ())	1464	switch (cmd_pid = fork ())
1462	{	1465	{
…		…
1535	{	1538	{
1536	char *login;	1539	char *login;
1537		1540
1538	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1541	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1539		1542
1540	if (options & Opt_console)	1543	if (OPTION (Opt_console))
1541	{ /* be virtual console, fail silently */	1544	{ /* be virtual console, fail silently */
1542	#ifdef TIOCCONS	1545	#ifdef TIOCCONS
1543	unsigned int on = 1;	1546	unsigned int on = 1;
1544		1547
1545	ioctl (STDIN_FILENO, TIOCCONS, &on);	1548	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1588	execvp (argv[0], (char const )argv);	1591	execvp (argv[0], (char const )argv);
1589	/* no error message: STDERR is closed! */	1592	/* no error message: STDERR is closed! */
1590	}	1593	}
1591	else	1594	else
1592	{	1595	{
1593	const char argv0, shell;	1596	const char argv0, shell;
1594		1597
1595	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1598	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1596	shell = "/bin/sh";	1599	shell = "/bin/sh";
1597		1600
1598	argv0 = (const char *)rxvt_r_basename (shell);	1601	argv0 = (const char *)rxvt_r_basename (shell);
1599		1602
1600	if (options & Opt_loginShell)	1603	if (OPTION (Opt_loginShell))
1601	{	1604	{
1602	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1605	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1603		1606
1604	login[0] = '-';	1607	login[0] = '-';
1605	strcpy (&login[1], argv0);	1608	strcpy (&login[1], argv0);
1606	argv0 = login;	1609	argv0 = login;
1607	}	1610	}
		1611
1608	execlp (shell, argv0, NULL);	1612	execlp (shell, argv0, NULL);
1609	/* no error message: STDERR is closed! */	1613	/* no error message: STDERR is closed! */
1610	}	1614	}
1611		1615
1612	#else /* __QNX__ uses qnxspawn () */	1616	#else /* __QNX__ uses qnxspawn () */
…		…
1640	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')	1644	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1641	command = "/bin/sh";	1645	command = "/bin/sh";
1642		1646
1643	arg_a[0] = my_basename (command);	1647	arg_a[0] = my_basename (command);
1644		1648
1645	if (options & Opt_loginShell)	1649	if (OPTION (Opt_loginShell))
1646	{	1650	{
1647	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));	1651	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1648		1652
1649	login[0] = '-';	1653	login[0] = '-';
1650	strcpy (&login[1], arg_a[0]);	1654	strcpy (&login[1], arg_a[0]);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs. Revision 1.139 by root, Wed Jan 11 03:13:26 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.111 by root, Thu Feb 17 20:52:48 2005 UTC vs.
Revision 1.139 by root, Wed Jan 11 03:13:26 2006 UTC