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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.110 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.130 by root, Wed Jan 4 04:42:45 2006 UTC

…		…
33		33
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
		39	#include <limits>
38		40
39	#include <csignal>	41	#include <csignal>
40		42
41	const char *const def_colorName[] =	43	const char *const def_colorName[] =
42	{	44	{
…		…
169	COLOR_SCROLLTROUGH,	171	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	172	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	173	#if TINTING
172	NULL,	174	NULL,
173	#endif	175	#endif
		176	#if OFF_FOCUS_FADING
		177	"black",
		178	#endif
174	};	179	};
175		180
176	const char *const xa_names[] =	181	const char *const xa_names[] =
177	{	182	{
178	"TEXT",	183	"TEXT",
…		…
181	"MULTIPLE",	186	"MULTIPLE",
182	"TARGETS",	187	"TARGETS",
183	"TIMESTAMP",	188	"TIMESTAMP",
184	"VT_SELECTION",	189	"VT_SELECTION",
185	"INCR",	190	"INCR",
		191	"WM_PROTOCOLS",
186	"WM_DELETE_WINDOW",	192	"WM_DELETE_WINDOW",
187	"CLIPBOARD",	193	"CLIPBOARD",
188	#if ENABLE_FRILLS	194	#if ENABLE_FRILLS
		195	"_MOTIF_WM_HINTS",
		196	#endif
		197	#if ENABLE_EWMH
189	"_NET_WM_PID",	198	"_NET_WM_PID",
190	"_MOTIF_WM_HINTS",
191	"_NET_WM_NAME",	199	"_NET_WM_NAME",
192	"_NET_WM_ICON_NAME",	200	"_NET_WM_ICON_NAME",
		201	"_NET_WM_PING",
193	#endif	202	#endif
194	#if USE_XIM	203	#if USE_XIM
195	"WM_LOCALE_NAME",	204	"WM_LOCALE_NAME",
196	#endif	205	#endif
197	#ifdef TRANSPARENT	206	#ifdef TRANSPARENT
…		…
200	#endif	209	#endif
201	#ifdef OFFIX_DND	210	#ifdef OFFIX_DND
202	"DndProtocol",	211	"DndProtocol",
203	"DndSelection",	212	"DndSelection",
204	#endif	213	#endif
		214	#if ENABLE_XEMBED
		215	"_XEMBED",
		216	"_XEMBED_INFO",
		217	#endif
205	};	218	};
206		219
207	bool	220	bool
208	rxvt_term::init_vars ()	221	rxvt_term::init_vars ()
209	{	222	{
210	sw_term.start (SIGTERM);
211	sw_int.start (SIGINT);
212
213	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	223	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214	#ifdef OFF_FOCUS_FADING	224	#ifdef OFF_FOCUS_FADING
215	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	225	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216	#endif	226	#endif
217	pix_colors = pix_colors_focused;	227	pix_colors = pix_colors_focused;
218		228
219	if (pix_colors == NULL)	229	if (pix_colors == NULL)
220	return false;	230	return false;
221		231
222	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	232	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
223	TermWin.pixmap = None;	233	pixmap = None;
224	#endif	234	#endif
225		235
226	MEvent.time = CurrentTime;	236	MEvent.time = CurrentTime;
227	MEvent.button = AnyButton;	237	MEvent.button = AnyButton;
228	options = DEFAULT_OPTIONS;	238	options = DEFAULT_OPTIONS;
229	want_refresh = 1;	239	want_refresh = 1;
230	priv_modes = SavedModes = PrivMode_Default;	240	priv_modes = SavedModes = PrivMode_Default;
231	TermWin.focus = 0;	241	focus = 0;
232	TermWin.ncol = 80;	242	ncol = 80;
233	TermWin.nrow = 24;	243	nrow = 24;
234	TermWin.int_bwidth = INTERNALBORDERWIDTH;	244	int_bwidth = INTERNALBORDERWIDTH;
235	TermWin.ext_bwidth = EXTERNALBORDERWIDTH;	245	ext_bwidth = EXTERNALBORDERWIDTH;
236	TermWin.lineSpace = LINESPACE;	246	lineSpace = LINESPACE;
237	TermWin.saveLines = SAVELINES;	247	saveLines = SAVELINES;
238	numpix_colors = TOTAL_COLORS;	248	numpix_colors = TOTAL_COLORS;
239		249
240	refresh_limit = 1;	250	refresh_limit = 1;
241	refresh_type = SLOW_REFRESH;	251	refresh_type = SLOW_REFRESH;
242	prev_nrow = prev_ncol = 0;	252	prev_nrow = prev_ncol = 0;
…		…
336	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)	346	if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337	rs[Rs_display_name] = ":0";	347	rs[Rs_display_name] = ":0";
338		348
339	get_options (r_argc, r_argv);	349	get_options (r_argc, r_argv);
340		350
341	#ifdef LOCAL_X_IS_UNIX
342	if (rs[Rs_display_name][0] == ':')
343	{
344	val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345	strcpy (val, "unix");
346	strcat (val, rs[Rs_display_name]);
347	display = displays.get (val);
348	free (val);
349	}
350	#endif
351
352	if (!display
353	&& ! (display = displays.get (rs[Rs_display_name])))	351	if (!(display = displays.get (rs[Rs_display_name])))
354	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	352	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355		353
356	extract_resources ();	354	extract_resources ();
357	free (r_argv);	355	free (r_argv);
358		356
…		…
373	if (!rs[Rs_iconName])	371	if (!rs[Rs_iconName])
374	rs[Rs_iconName] = rs[Rs_name];	372	rs[Rs_iconName] = rs[Rs_name];
375	}	373	}
376		374
377	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)	375	if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378	TermWin.saveLines = BOUND_POSITIVE_INT16 (i);	376	saveLines = min (i, MAX_SAVELINES);
379		377
380	#if ENABLE_FRILLS	378	#if ENABLE_FRILLS
381	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)	379	if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382	TermWin.int_bwidth = min (i, 100); /* arbitrary limit */	380	int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		381
383	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)	382	if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384	TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */	383	ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
		384
385	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)	385	if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386	TermWin.lineSpace = min (i, 100); /* arbitrary limit */	386	lineSpace = min (i, std::numeric_limits<int16_t>::max ());
387	#endif	387	#endif
388		388
389	#ifdef POINTER_BLANK	389	#ifdef POINTER_BLANK
390	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)	390	if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391	pointerBlankDelay = i;	391	pointerBlankDelay = i;
392	else	392	else
393	pointerBlankDelay = 2;	393	pointerBlankDelay = 2;
394	#endif	394	#endif
395		395
396	/* no point having a scrollbar without having any scrollback! */	396	/* no point having a scrollbar without having any scrollback! */
397	if (!TermWin.saveLines)	397	if (!saveLines)
398	options &= ~Opt_scrollBar;	398	CLR_OPTION (Opt_scrollBar);
399		399
400	#ifdef PRINTPIPE	400	#ifdef PRINTPIPE
401	if (!rs[Rs_print_pipe])	401	if (!rs[Rs_print_pipe])
402	rs[Rs_print_pipe] = PRINTPIPE;	402	rs[Rs_print_pipe] = PRINTPIPE;
403	#endif	403	#endif
…		…
446	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	446	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447	#endif	447	#endif
448		448
449	#ifdef XTERM_REVERSE_VIDEO	449	#ifdef XTERM_REVERSE_VIDEO
450	/* this is how xterm implements reverseVideo */	450	/* this is how xterm implements reverseVideo */
451	if (options & Opt_reverseVideo)	451	if (OPTION (Opt_reverseVideo))
452	{	452	{
453	if (!rs[Rs_color + Color_fg])	453	if (!rs[Rs_color + Color_fg])
454	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	454	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455	if (!rs[Rs_color + Color_bg])	455	if (!rs[Rs_color + Color_bg])
456	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	456	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
…		…
461	if (!rs[Rs_color + i])	461	if (!rs[Rs_color + i])
462	rs[Rs_color + i] = def_colorName[i];	462	rs[Rs_color + i] = def_colorName[i];
463		463
464	#ifndef XTERM_REVERSE_VIDEO	464	#ifndef XTERM_REVERSE_VIDEO
465	/* this is how we implement reverseVideo */	465	/* this is how we implement reverseVideo */
466	if (options & Opt_reverseVideo)	466	if (OPTION (Opt_reverseVideo))
467	SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);	467	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468	#endif	468	#endif
469		469
470	/* convenient aliases for setting fg/bg to colors */	470	/* convenient aliases for setting fg/bg to colors */
471	color_aliases (Color_fg);	471	color_aliases (Color_fg);
472	color_aliases (Color_bg);	472	color_aliases (Color_bg);
…		…
522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	522	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
523		523
524	sprintf (env_display, "DISPLAY=%s", val);	524	sprintf (env_display, "DISPLAY=%s", val);
525		525
526	/* avoiding the math library:	526	/* avoiding the math library:
527	* i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */	527	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528	for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)	528	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529	;	529	;
530	MAX_IT (i, 1);	530	max_it (i, 1);
531	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));	531	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
532		532
533	sprintf (env_windowid, "WINDOWID=%u",	533	sprintf (env_windowid, "WINDOWID=%u",
534	(unsigned int)TermWin.parent[0]);	534	(unsigned int)parent[0]);
535		535
536	/* add entries to the environment:	536	/* add entries to the environment:
537	* @ DISPLAY: in case we started with -display	537	* @ DISPLAY: in case we started with -display
538	* @ WINDOWID: X window id number of the window	538	* @ WINDOWID: X window id number of the window
539	* @ COLORTERM: terminal sub-name and also indicates its color	539	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
648	* Initialize the command connection.	648	* Initialize the command connection.
649	* This should be called after the X server connection is established.	649	* This should be called after the X server connection is established.
650	*/	650	*/
651		651
652	#ifdef META8_OPTION	652	#ifdef META8_OPTION
653	meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);	653	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654	#endif	654	#endif
655		655
656	get_ourmods ();	656	get_ourmods ();
657		657
658	if (!(options & Opt_scrollTtyOutput))	658	if (!OPTION (Opt_scrollTtyOutput))
659	priv_modes \|= PrivMode_TtyOutputInh;	659	priv_modes \|= PrivMode_TtyOutputInh;
660	if (options & Opt_scrollTtyKeypress)	660	if (OPTION (Opt_scrollTtyKeypress))
661	priv_modes \|= PrivMode_Keypress;	661	priv_modes \|= PrivMode_Keypress;
662	if (!(options & Opt_jumpScroll))	662	if (!OPTION (Opt_jumpScroll))
663	priv_modes \|= PrivMode_smoothScroll;	663	priv_modes \|= PrivMode_smoothScroll;
664		664
665	#ifndef NO_BACKSPACE_KEY	665	#ifndef NO_BACKSPACE_KEY
666	if (strcmp (key_backspace, "DEC") == 0)	666	if (strcmp (key_backspace, "DEC") == 0)
667	priv_modes \|= PrivMode_HaveBackSpace;	667	priv_modes \|= PrivMode_HaveBackSpace;
…		…
677	if (menubar_visible ())	677	if (menubar_visible ())
678	{	678	{
679	priv_modes \|= PrivMode_menuBar;	679	priv_modes \|= PrivMode_menuBar;
680	SavedModes \|= PrivMode_menuBar;	680	SavedModes \|= PrivMode_menuBar;
681	}	681	}
682
683	#ifdef CURSOR_BLINK
684	if (options & Opt_cursorBlink)
685	(void)gettimeofday (&lastcursorchange, NULL);
686	#endif
687		682
688	run_command (argv);	683	run_command (argv);
689	}	684	}
690		685
691	/----------------------------------------------------------------------/	686	/----------------------------------------------------------------------/
…		…
706	continue;	701	continue;
707		702
708	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	703	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709	{	704	{
710	#ifndef XTERM_REVERSE_VIDEO	705	#ifndef XTERM_REVERSE_VIDEO
711	if (i < 2 && (options & Opt_reverseVideo))	706	if (i < 2 && OPTION (Opt_reverseVideo))
712	rs[Rs_color + i] = def_colorName[!i];	707	rs[Rs_color + i] = def_colorName[!i];
713	else	708	else
714	#endif	709	#endif
715	rs[Rs_color + i] = def_colorName[i];	710	rs[Rs_color + i] = def_colorName[i];
716		711
…		…
741	}	736	}
742	}	737	}
743	}	738	}
744		739
745	pix_colors[i] = xcol;	740	pix_colors[i] = xcol;
		741	SET_PIXCOLOR (i);
		742	}
		743
746	#ifdef OFF_FOCUS_FADING	744	#ifdef OFF_FOCUS_FADING
747	if (rs[Rs_fade])	745	if (rs[Rs_fade])
		746	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748	pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));	747	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749	#endif	748	#endif
750	SET_PIXCOLOR (i);
751	}
752		749
753	if (display->depth <= 2)	750	if (display->depth <= 2)
754	{	751	{
755	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	752	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];	753	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
…		…
764	* from the fvwm window manager.	761	* from the fvwm window manager.
765	*/	762	*/
766	#ifdef KEEP_SCROLLCOLOR	763	#ifdef KEEP_SCROLLCOLOR
767		764
768	if (display->depth <= 2)	765	if (display->depth <= 2)
		766	{
769	{ /* Monochrome */	767	/* Monochrome */
770	pix_colors[Color_scroll] = pix_colors[Color_fg];	768	pix_colors[Color_scroll] = pix_colors[Color_fg];
771	pix_colors[Color_topShadow] = pix_colors[Color_bg];	769	pix_colors[Color_topShadow] = pix_colors[Color_bg];
772	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	770	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773	}	771	}
774	else	772	else
…		…
925	#endif	923	#endif
926	XGCValues gcvalue;	924	XGCValues gcvalue;
927	long vt_emask;	925	long vt_emask;
928	XSetWindowAttributes attributes;	926	XSetWindowAttributes attributes;
929	XWindowAttributes gattr;	927	XWindowAttributes gattr;
930	Window top;	928	Window top, parent;
931	dDisp;	929	dDisp;
932		930
933	#ifdef USING_W11LIB	931	#ifdef USING_W11LIB
934	/* enable W11 callbacks */	932	/* enable W11 callbacks */
935	W11AddEventHandler (disp, rxvt_W11_process_x_event);	933	W11AddEventHandler (disp, rxvt_W11_process_x_event);
936	#endif	934	#endif
937		935
938	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	936	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
939	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);	937	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
940		938
941	if (options & Opt_transparent)	939	if (OPTION (Opt_transparent))
942	{	940	{
943	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);	941	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
944	display->depth = gattr.depth; // doh //TODO, per-term not per-display?	942	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
945	}	943	}
946		944
947	#if ENABLE_FRILLS	945	#if ENABLE_FRILLS
948	if (options & Opt_borderLess)	946	if (OPTION (Opt_borderLess))
949	{	947	{
950	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);	948	prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
951		949
952	if (prop == None)	950	if (prop == None)
953	{	951	{
…		…
962	mwmhints.flags = MWM_HINTS_DECORATIONS;	960	mwmhints.flags = MWM_HINTS_DECORATIONS;
963	mwmhints.decorations = 0;	961	mwmhints.decorations = 0;
964	}	962	}
965	}	963	}
966	else	964	else
967	{
968	mwmhints.flags = 0;	965	mwmhints.flags = 0;
969	}
970	#endif	966	#endif
971		967
972	/* grab colors before netscape does */	968	/* grab colors before netscape does */
973	Get_Colours ();	969	Get_Colours ();
974		970
975	if (!set_fonts ())	971	if (!set_fonts ())
976	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	972	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977		973
978	#if ENABLE_FRILLS	974	parent = DefaultRootWindow (disp);
		975
		976	#if ENABLE_XEMBED
979	if (rs[Rs_embed])	977	if (rs[Rs_embed])
980	{	978	{
981	top = strtol (rs[Rs_embed], 0, 0);
982
983	XWindowAttributes wattr;	979	XWindowAttributes wattr;
		980
		981	parent = strtol (rs[Rs_embed], 0, 0);
		982
984	XGetWindowAttributes (disp, top, &wattr);	983	if (!XGetWindowAttributes (disp, parent, &wattr))
		984	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985		985
986	window_calc (wattr.width, wattr.height);	986	window_calc (wattr.width, wattr.height);
		987	}
		988	#endif
987		989
988	#if 0	990	window_calc (0, 0);
989	if (wattr.map_state == IsViewable)	991
990	{	992	/* sub-window placement & size in rxvt_resize_subwindows () */
991	TermWin.mapped = 1;	993	#ifdef PREFER_24BIT
992	refresh_type = FAST_REFRESH;	994	attributes.background_pixel = pix_colors_focused[Color_border];
993	XClearWindow (disp, top);	995	attributes.border_pixel = pix_colors_focused[Color_border];
994	// TODO: make XMapNotify-event-code a function and call it	996	attributes.colormap = display->cmap;
995	// TODO: how can I detetc visibility without unmpa/map?	997	top = XCreateWindow (disp, parent,
996	// TODO: focusin etc.	998	szHint.x, szHint.y,
997	}	999	szHint.width, szHint.height,
		1000	ext_bwidth,
		1001	display->depth, InputOutput,
		1002	display->visual,
		1003	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
998	#else	1004	#else
999	// it'S easiets just to unmap/map to get all state correctly set-up	1005	top = XCreateSimpleWindow (disp, parent,
1000	XUnmapWindow (disp, top);
1001	#endif
1002	}
1003	else
1004	#endif
1005	{
1006	window_calc (0, 0);
1007
1008	/* sub-window placement & size in rxvt_resize_subwindows () */
1009	#ifdef PREFER_24BIT
1010	attributes.background_pixel = pix_colors_focused[Color_border];
1011	attributes.border_pixel = pix_colors_focused[Color_border];
1012	attributes.colormap = display->cmap;
1013	top = XCreateWindow (disp, DefaultRootWindow (disp),
1014	szHint.x, szHint.y,	1006	szHint.x, szHint.y,
1015	szHint.width, szHint.height,	1007	szHint.width, szHint.height,
1016	TermWin.ext_bwidth,	1008	ext_bwidth,
1017	display->depth, InputOutput,
1018	display->visual,
1019	CWColormap \| CWBackPixel \| CWBorderPixel, &attributes);
1020	#else
1021	top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1022	szHint.x, szHint.y,
1023	szHint.width, szHint.height,
1024	TermWin.ext_bwidth,
1025	pix_colors_focused[Color_border],	1009	pix_colors_focused[Color_border],
1026	pix_colors_focused[Color_border]);	1010	pix_colors_focused[Color_border]);
1027	#endif	1011	#endif
1028	}
1029		1012
1030	TermWin.parent[0] = top;	1013	this->parent[0] = top;
1031		1014
1032	old_width = szHint.width;	1015	old_width = szHint.width;
1033	old_height = szHint.height;	1016	old_height = szHint.height;
1034		1017
1035	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	1018	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
…		…
1038	classHint.res_name = (char *)rs[Rs_name];	1021	classHint.res_name = (char *)rs[Rs_name];
1039	classHint.res_class = (char *)RESCLASS;	1022	classHint.res_class = (char *)RESCLASS;
1040		1023
1041	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	1024	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1042	wmHint.input = True;	1025	wmHint.input = True;
1043	wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;	1026	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1044	wmHint.window_group = top;	1027	wmHint.window_group = top;
1045		1028
1046	XSetWMProperties (disp, top, NULL, NULL,	1029	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1047	(char **)argv, argc, &szHint, &wmHint, &classHint);	1030	&szHint, &wmHint, &classHint);
1048		1031
1049	/* Enable delete window protocol */	1032	Atom protocols[] = {
1050	XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);	1033	xa[XA_WM_DELETE_WINDOW],
		1034	#if ENABLE_EWMH
		1035	xa[XA_NET_WM_PING],
		1036	#endif
		1037	};
1051		1038
1052	#if ENABLE_FRILLS	1039	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
		1040
		1041	#if ENABLE_EWMH
1053	long pid = getpid ();	1042	long pid = getpid ();
1054		1043
1055	XChangeProperty (disp, top,	1044	XChangeProperty (disp, top,
1056	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1045	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1057	PropModeReplace, (unsigned char *)&pid, 1);	1046	PropModeReplace, (unsigned char *)&pid, 1);
		1047
		1048	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058	#endif	1049	#endif
1059		1050
1060	XSelectInput (disp, top,	1051	XSelectInput (disp, top,
1061	KeyPressMask	1052	KeyPressMask
1062	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1053	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1063	\| KeyReleaseMask	1054	\| KeyReleaseMask
1064	#endif	1055	#endif
1065	\| FocusChangeMask \| VisibilityChangeMask	1056	\| FocusChangeMask \| VisibilityChangeMask
1066	\| ExposureMask
1067	\| StructureNotifyMask);	1057	\| ExposureMask \| StructureNotifyMask);
		1058
1068	termwin_ev.start (display, top);	1059	termwin_ev.start (display, top);
1069		1060
1070	#if ENABLE_FRILLS	1061	#if ENABLE_FRILLS
1071	if (mwmhints.flags)	1062	if (mwmhints.flags)
1072	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,	1063	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
…		…
1080	/* cursor (menuBar/scrollBar): Black-on-White */	1071	/* cursor (menuBar/scrollBar): Black-on-White */
1081	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1072	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1082	#endif	1073	#endif
1083		1074
1084	/* the vt window */	1075	/* the vt window */
1085	TermWin.vt = XCreateSimpleWindow (disp, top,	1076	vt = XCreateSimpleWindow (disp, top,
1086	window_vt_x,	1077	window_vt_x,
1087	window_vt_y,	1078	window_vt_y,
1088	TermWin_TotalWidth (),	1079	width,
1089	TermWin_TotalHeight (),	1080	height,
1090	0,	1081	0,
1091	pix_colors_focused[Color_fg],	1082	pix_colors_focused[Color_fg],
1092	pix_colors_focused[Color_bg]);	1083	pix_colors_focused[Color_bg]);
1093	#ifdef DEBUG_X	1084	#ifdef DEBUG_X
1094	XStoreName (disp, TermWin.vt, "vt window");	1085	XStoreName (disp, vt, "vt window");
1095	#endif	1086	#endif
1096		1087
1097	attributes.bit_gravity = NorthWestGravity;	1088	attributes.bit_gravity = NorthWestGravity;
1098	XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);	1089	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1099		1090
1100	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1091	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1101		1092
1102	pointer_unblank ();
1103
1104	#ifdef POINTER_BLANK	1093	#ifdef POINTER_BLANK
1105	if (options & Opt_pointerBlank)	1094	if (OPTION (Opt_pointerBlank))
1106	vt_emask \|= PointerMotionMask;	1095	vt_emask \|= PointerMotionMask;
1107	else	1096	else
1108	#endif	1097	#endif
1109	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1098	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1110		1099
1111	XSelectInput (disp, TermWin.vt, vt_emask);	1100	XSelectInput (disp, vt, vt_emask);
1112	vt_ev.start (display, TermWin.vt);	1101	vt_ev.start (display, vt);
1113		1102
1114	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	1103	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1115	if (menuBar_height ())	1104	if (menuBar_height ())
1116	{	1105	{
1117	menuBar.win = XCreateSimpleWindow (disp, top,	1106	menuBar.win = XCreateSimpleWindow (disp, top,
1118	window_vt_x, 0,	1107	window_vt_x, 0,
1119	TermWin_TotalWidth (),	1108	width,
1120	menuBar_TotalHeight (),	1109	menuBar_TotalHeight (),
1121	0,	1110	0,
1122	pix_colors_focused[Color_fg],	1111	pix_colors_focused[Color_fg],
1123	pix_colors_focused[Color_scroll]);	1112	pix_colors_focused[Color_scroll]);
1124		1113
…		…
1137	}	1126	}
1138	#endif	1127	#endif
1139		1128
1140	#ifdef XPM_BACKGROUND	1129	#ifdef XPM_BACKGROUND
1141	if (rs[Rs_backgroundPixmap] != NULL	1130	if (rs[Rs_backgroundPixmap] != NULL
1142	&& ! (options & Opt_transparent))	1131	&& ! OPTION (Opt_transparent))
1143	{	1132	{
1144	const char *p = rs[Rs_backgroundPixmap];	1133	const char *p = rs[Rs_backgroundPixmap];
1145		1134
1146	if ((p = strchr (p, ';')) != NULL)	1135	if ((p = strchr (p, ';')) != NULL)
1147	{	1136	{
…		…
1156		1145
1157	/* graphics context for the vt window */	1146	/* graphics context for the vt window */
1158	gcvalue.foreground = pix_colors[Color_fg];	1147	gcvalue.foreground = pix_colors[Color_fg];
1159	gcvalue.background = pix_colors[Color_bg];	1148	gcvalue.background = pix_colors[Color_bg];
1160	gcvalue.graphics_exposures = 1;	1149	gcvalue.graphics_exposures = 1;
1161	TermWin.gc = XCreateGC (disp, TermWin.vt,	1150	gc = XCreateGC (disp, vt,
1162	GCForeground \| GCBackground \| GCGraphicsExposures,	1151	GCForeground \| GCBackground \| GCGraphicsExposures,
1163	&gcvalue);	1152	&gcvalue);
1164		1153
1165	TermWin.drawable = new rxvt_drawable (display, TermWin.vt);	1154	drawable = new rxvt_drawable (display, vt);
1166		1155
1167	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	1156	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
1168	gcvalue.foreground = pix_colors[Color_topShadow];	1157	gcvalue.foreground = pix_colors[Color_topShadow];
1169	topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1158	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170	gcvalue.foreground = pix_colors[Color_bottomShadow];	1159	gcvalue.foreground = pix_colors[Color_bottomShadow];
1171	botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1160	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1172	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1161	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1173	scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);	1162	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174	#endif	1163	#endif
1175		1164
1176	#ifdef OFF_FOCUS_FADING	1165	#ifdef OFF_FOCUS_FADING
1177	// initially we are in unfocused state	1166	// initially we are in unfocused state
1178	if (rs[Rs_fade])	1167	if (rs[Rs_fade])
1179	pix_colors = pix_colors_unfocused;	1168	pix_colors = pix_colors_unfocused;
1180	#endif	1169	#endif
1181		1170
		1171	pointer_unblank ();
1182	scr_recolour ();	1172	scr_recolour ();
		1173
		1174	#if ENABLE_XEMBED
		1175	if (rs[Rs_embed])
		1176	{
		1177	long info[2] = { 0, XEMBED_MAPPED };
		1178
		1179	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		1180	32, PropModeReplace, (unsigned char *)&info, 2);
		1181	}
		1182	#endif
1183	}	1183	}
1184		1184
1185	/* ------------------------------------------------------------------------- *	1185	/* ------------------------------------------------------------------------- *
1186	* GET TTY CURRENT STATE *	1186	* GET TTY CURRENT STATE *
1187	* ------------------------------------------------------------------------- */	1187	* ------------------------------------------------------------------------- */
…		…
1192	/*	1192	/*
1193	* standard System V termios interface	1193	* standard System V termios interface
1194	*/	1194	*/
1195	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1195	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1196	{	1196	{
1197	/* return error - use system defaults */	1197	// return error - use system defaults,
		1198	// where possible, and zero elsewhere
		1199	memset (tio, 0, sizeof (ttymode_t));
		1200
1198	tio->c_cc[VINTR] = CINTR;	1201	tio->c_cc[VINTR] = CINTR;
1199	tio->c_cc[VQUIT] = CQUIT;	1202	tio->c_cc[VQUIT] = CQUIT;
1200	tio->c_cc[VERASE] = CERASE;	1203	tio->c_cc[VERASE] = CERASE;
		1204	#ifdef VERASE2
		1205	tio->c_cc[VERASE2] = CERASE2;
		1206	#endif
1201	tio->c_cc[VKILL] = CKILL;	1207	tio->c_cc[VKILL] = CKILL;
1202	tio->c_cc[VSTART] = CSTART;	1208	tio->c_cc[VSTART] = CSTART;
1203	tio->c_cc[VSTOP] = CSTOP;	1209	tio->c_cc[VSTOP] = CSTOP;
1204	tio->c_cc[VSUSP] = CSUSP;	1210	tio->c_cc[VSUSP] = CSUSP;
1205	# ifdef VDSUSP	1211	# ifdef VDSUSP
1206
1207	tio->c_cc[VDSUSP] = CDSUSP;	1212	tio->c_cc[VDSUSP] = CDSUSP;
1208	# endif	1213	# endif
1209	# ifdef VREPRINT	1214	# ifdef VREPRINT
1210
1211	tio->c_cc[VREPRINT] = CRPRNT;	1215	tio->c_cc[VREPRINT] = CRPRNT;
1212	# endif	1216	# endif
1213	# ifdef VDISCRD	1217	# ifdef VDISCRD
1214
1215	tio->c_cc[VDISCRD] = CFLUSH;	1218	tio->c_cc[VDISCRD] = CFLUSH;
1216	# endif	1219	# endif
1217	# ifdef VWERSE	1220	# ifdef VWERSE
1218
1219	tio->c_cc[VWERSE] = CWERASE;	1221	tio->c_cc[VWERSE] = CWERASE;
1220	# endif	1222	# endif
1221	# ifdef VLNEXT	1223	# ifdef VLNEXT
1222
1223	tio->c_cc[VLNEXT] = CLNEXT;	1224	tio->c_cc[VLNEXT] = CLNEXT;
1224	# endif	1225	# endif
1225
1226	}	1226	}
		1227
1227	tio->c_cc[VEOF] = CEOF;	1228	tio->c_cc[VEOF] = CEOF;
1228	tio->c_cc[VEOL] = VDISABLE;	1229	tio->c_cc[VEOL] = VDISABLE;
1229	# ifdef VEOL2	1230	# ifdef VEOL2
1230
1231	tio->c_cc[VEOL2] = VDISABLE;	1231	tio->c_cc[VEOL2] = VDISABLE;
1232	# endif	1232	# endif
1233	# ifdef VSWTC	1233	# ifdef VSWTC
1234
1235	tio->c_cc[VSWTC] = VDISABLE;	1234	tio->c_cc[VSWTC] = VDISABLE;
1236	# endif	1235	# endif
1237	# ifdef VSWTCH	1236	# ifdef VSWTCH
1238
1239	tio->c_cc[VSWTCH] = VDISABLE;	1237	tio->c_cc[VSWTCH] = VDISABLE;
1240	# endif	1238	# endif
1241	# if VMIN != VEOF	1239	# if VMIN != VEOF
1242
1243	tio->c_cc[VMIN] = 1;	1240	tio->c_cc[VMIN] = 1;
1244	# endif	1241	# endif
1245	# if VTIME != VEOL	1242	# if VTIME != VEOL
1246
1247	tio->c_cc[VTIME] = 0;	1243	tio->c_cc[VTIME] = 0;
1248	# endif	1244	# endif
1249		1245
1250	if (erase != -1)	1246	if (erase != -1)
1251	tio->c_cc[VERASE] = (char)erase;	1247	tio->c_cc[VERASE] = (char)erase;
…		…
1279	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)	1275	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1280	{	1276	{
1281	tio->sg.sg_erase = CERASE; /* ^H */	1277	tio->sg.sg_erase = CERASE; /* ^H */
1282	tio->sg.sg_kill = CKILL; /* ^U */	1278	tio->sg.sg_kill = CKILL; /* ^U */
1283	}	1279	}
		1280
1284	if (erase != -1)	1281	if (erase != -1)
1285	tio->sg.sg_erase = (char)erase;	1282	tio->sg.sg_erase = (char)erase;
1286		1283
1287	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);	1284	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1288		1285
…		…
1294	tio->tc.t_startc = CSTART; /* ^Q */	1291	tio->tc.t_startc = CSTART; /* ^Q */
1295	tio->tc.t_stopc = CSTOP; /* ^S */	1292	tio->tc.t_stopc = CSTOP; /* ^S */
1296	tio->tc.t_eofc = CEOF; /* ^D */	1293	tio->tc.t_eofc = CEOF; /* ^D */
1297	tio->tc.t_brkc = -1;	1294	tio->tc.t_brkc = -1;
1298	}	1295	}
		1296
1299	/* get local special chars */	1297	/* get local special chars */
1300	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)	1298	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1301	{	1299	{
1302	tio->lc.t_suspc = CSUSP; /* ^Z */	1300	tio->lc.t_suspc = CSUSP; /* ^Z */
1303	tio->lc.t_dsuspc = CDSUSP; /* ^Y */	1301	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
…		…
1307	tio->lc.t_lnextc = CLNEXT; /* ^V */	1305	tio->lc.t_lnextc = CLNEXT; /* ^V */
1308	}	1306	}
1309	/* get line discipline */	1307	/* get line discipline */
1310	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));	1308	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1311	# ifdef NTTYDISC	1309	# ifdef NTTYDISC
1312
1313	tio->line = NTTYDISC;	1310	tio->line = NTTYDISC;
1314	# endif /* NTTYDISC */	1311	# endif /* NTTYDISC */
1315		1312
1316	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);	1313	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1317	#endif /* HAVE_TERMIOS_H */	1314	#endif /* HAVE_TERMIOS_H */
…		…
1340	FOO (IGNCR, "IGNCR");	1337	FOO (IGNCR, "IGNCR");
1341	FOO (ICRNL, "ICRNL");	1338	FOO (ICRNL, "ICRNL");
1342	FOO (IXON, "IXON");	1339	FOO (IXON, "IXON");
1343	FOO (IXOFF, "IXOFF");	1340	FOO (IXOFF, "IXOFF");
1344	# ifdef IUCLC	1341	# ifdef IUCLC
1345
1346	FOO (IUCLC, "IUCLC");	1342	FOO (IUCLC, "IUCLC");
1347	# endif	1343	# endif
1348	# ifdef IXANY	1344	# ifdef IXANY
1349
1350	FOO (IXANY, "IXANY");	1345	FOO (IXANY, "IXANY");
1351	# endif	1346	# endif
1352	# ifdef IMAXBEL	1347	# ifdef IMAXBEL
1353
1354	FOO (IMAXBEL, "IMAXBEL");	1348	FOO (IMAXBEL, "IMAXBEL");
1355	# endif	1349	# endif
1356		1350
1357	fprintf (stderr, "\n");	1351	fprintf (stderr, "\n");
1358		1352
…		…
1365	FOO (VERASE, "VERASE");	1359	FOO (VERASE, "VERASE");
1366	FOO (VKILL, "VKILL");	1360	FOO (VKILL, "VKILL");
1367	FOO (VEOF, "VEOF");	1361	FOO (VEOF, "VEOF");
1368	FOO (VEOL, "VEOL");	1362	FOO (VEOL, "VEOL");
1369	# ifdef VEOL2	1363	# ifdef VEOL2
1370
1371	FOO (VEOL2, "VEOL2");	1364	FOO (VEOL2, "VEOL2");
1372	# endif	1365	# endif
1373	# ifdef VSWTC	1366	# ifdef VSWTC
1374
1375	FOO (VSWTC, "VSWTC");	1367	FOO (VSWTC, "VSWTC");
1376	# endif	1368	# endif
1377	# ifdef VSWTCH	1369	# ifdef VSWTCH
1378
1379	FOO (VSWTCH, "VSWTCH");	1370	FOO (VSWTCH, "VSWTCH");
1380	# endif	1371	# endif
1381
1382	FOO (VSTART, "VSTART");	1372	FOO (VSTART, "VSTART");
1383	FOO (VSTOP, "VSTOP");	1373	FOO (VSTOP, "VSTOP");
1384	FOO (VSUSP, "VSUSP");	1374	FOO (VSUSP, "VSUSP");
1385	# ifdef VDSUSP	1375	# ifdef VDSUSP
1386
1387	FOO (VDSUSP, "VDSUSP");	1376	FOO (VDSUSP, "VDSUSP");
1388	# endif	1377	# endif
1389	# ifdef VREPRINT	1378	# ifdef VREPRINT
1390
1391	FOO (VREPRINT, "VREPRINT");	1379	FOO (VREPRINT, "VREPRINT");
1392	# endif	1380	# endif
1393	# ifdef VDISCRD	1381	# ifdef VDISCRD
1394
1395	FOO (VDISCRD, "VDISCRD");	1382	FOO (VDISCRD, "VDISCRD");
1396	# endif	1383	# endif
1397	# ifdef VWERSE	1384	# ifdef VWERSE
1398
1399	FOO (VWERSE, "VWERSE");	1385	FOO (VWERSE, "VWERSE");
1400	# endif	1386	# endif
1401	# ifdef VLNEXT	1387	# ifdef VLNEXT
1402
1403	FOO (VLNEXT, "VLNEXT");	1388	FOO (VLNEXT, "VLNEXT");
1404	# endif	1389	# endif
1405		1390
1406	fprintf (stderr, "\n");	1391	fprintf (stderr, "\n");
1407	# undef FOO	1392	# undef FOO
…		…
1420	{	1405	{
1421	#if ENABLE_FRILLS	1406	#if ENABLE_FRILLS
1422	if (rs[Rs_pty_fd])	1407	if (rs[Rs_pty_fd])
1423	{	1408	{
1424	pty.pty = atoi (rs[Rs_pty_fd]);	1409	pty.pty = atoi (rs[Rs_pty_fd]);
		1410
		1411	if (getfd_hook)
		1412	pty.pty = (*getfd_hook) (pty.pty);
		1413
1425	fcntl (pty.pty, F_SETFL, O_NONBLOCK);	1414	if (pty.pty < 0 \|\| fcntl (pty.pty, F_SETFL, O_NONBLOCK))
		1415	rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426	}	1416	}
1427	else	1417	else
1428	#endif	1418	#endif
1429	if (!pty.get ())	1419	if (!pty.get ())
1430	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1420	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
…		…
1449		1439
1450	#if ENABLE_FRILLS	1440	#if ENABLE_FRILLS
1451	if (rs[Rs_pty_fd])	1441	if (rs[Rs_pty_fd])
1452	return;	1442	return;
1453	#endif	1443	#endif
1454
1455	sw_chld.start (SIGCHLD);
1456		1444
1457	#ifndef __QNX__	1445	#ifndef __QNX__
1458	/* spin off the command interpreter */	1446	/* spin off the command interpreter */
1459	switch (cmd_pid = fork ())	1447	switch (cmd_pid = fork ())
1460	{	1448	{
…		…
1533	{	1521	{
1534	char *login;	1522	char *login;
1535		1523
1536	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */	1524	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1537		1525
1538	if (options & Opt_console)	1526	if (OPTION (Opt_console))
1539	{ /* be virtual console, fail silently */	1527	{ /* be virtual console, fail silently */
1540	#ifdef TIOCCONS	1528	#ifdef TIOCCONS
1541	unsigned int on = 1;	1529	unsigned int on = 1;
1542		1530
1543	ioctl (STDIN_FILENO, TIOCCONS, &on);	1531	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1593	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1581	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1594	shell = "/bin/sh";	1582	shell = "/bin/sh";
1595		1583
1596	argv0 = (const char *)rxvt_r_basename (shell);	1584	argv0 = (const char *)rxvt_r_basename (shell);
1597		1585
1598	if (options & Opt_loginShell)	1586	if (OPTION (Opt_loginShell))
1599	{	1587	{
1600	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1588	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1601		1589
1602	login[0] = '-';	1590	login[0] = '-';
1603	strcpy (&login[1], argv0);	1591	strcpy (&login[1], argv0);
…		…
1638	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')	1626	if ((command = getenv ("SHELL")) == NULL \|\| *command == '\0')
1639	command = "/bin/sh";	1627	command = "/bin/sh";
1640		1628
1641	arg_a[0] = my_basename (command);	1629	arg_a[0] = my_basename (command);
1642		1630
1643	if (options & Opt_loginShell)	1631	if (OPTION (Opt_loginShell))
1644	{	1632	{
1645	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));	1633	login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1646		1634
1647	login[0] = '-';	1635	login[0] = '-';
1648	strcpy (&login[1], arg_a[0]);	1636	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.110 by root, Thu Feb 17 15:07:48 2005 UTC vs. Revision 1.130 by root, Wed Jan 4 04:42:45 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.110 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.130 by root, Wed Jan 4 04:42:45 2006 UTC