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