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