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

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

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.137 by root, Wed Jan 11 00:59:58 2006 UTC