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