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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.151 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.188 by root, Mon Jun 18 13:38:12 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: init.C	2	* File: init.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
43	const char *const def_colorName[] =	43	const char *const def_colorName[] =
44	{	44	{
45	COLOR_FOREGROUND,	45	COLOR_FOREGROUND,
46	COLOR_BACKGROUND,	46	COLOR_BACKGROUND,
47	/* low-intensity colors */	47	/* low-intensity colors */
48	"Black", /* 0: black (#000000) */	48	"rgb:00/00/00", // 0: black (Black)
49	"Red3", /* 1: red (#CD0000) */	49	"rgb:cd/00/00", // 1: red (Red3)
50	"Green3", /* 2: green (#00CD00) */	50	"rgb:00/cd/00", // 2: green (Green3)
51	"Yellow3", /* 3: yellow (#CDCD00) */	51	"rgb:cd/cd/00", // 3: yellow (Yellow3)
52	"Blue3", /* 4: blue (#0000CD) */	52	"rgb:00/00/cd", // 4: blue (Blue3)
53	"Magenta3", /* 5: magenta (#CD00CD) */	53	"rgb:cd/00/cd", // 5: magenta (Magenta3)
54	"Cyan3", /* 6: cyan (#00CDCD) */	54	"rgb:00/cd/cd", // 6: cyan (Cyan3)
55	# ifdef XTERM_COLORS	55	# ifdef XTERM_COLORS
56	"Grey90", /* 7: white (#E5E5E5) */	56	"rgb:e5/e5/e5", // 7: white (Grey90)
57	# else	57	# else
58	"AntiqueWhite", /* 7: white (#FAEBD7) */	58	"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59	# endif	59	# endif
60	/* high-intensity colors */	60	/* high-intensity colors */
61	# ifdef XTERM_COLORS	61	# ifdef XTERM_COLORS
62	"Grey30", /* 8: bright black (#4D4D4D) */	62	"rgb:4d/4d/4d", // 8: bright black (Grey30)
63	# else	63	# else
64	"Grey25", /* 8: bright black (#404040) */	64	"rgb:40/40/40", // 8: bright black (Grey25)
65	# endif	65	# endif
66	"Red", /* 1/9: bright red (#FF0000) */	66	"rgb:ff/00/00", // 1/9: bright red (Reed)
67	"Green", /* 2/10: bright green (#00FF00) */	67	"rgb:00/ff/00", // 2/10: bright green (Green)
68	"Yellow", /* 3/11: bright yellow (#FFFF00) */	68	"rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69	"Blue", /* 4/12: bright blue (#0000FF) */	69	"rgb:00/00/ff", // 4/12: bright blue (Blue)
70	"Magenta", /* 5/13: bright magenta (#FF00FF) */	70	"rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71	"Cyan", /* 6/14: bright cyan (#00FFFF) */	71	"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72	"White", /* 7/15: bright white (#FFFFFF) */	72	"rgb:ff/ff/ff", // 7/15: bright white (White)
73		73
74	// 88 xterm colours	74	// 88 xterm colours
75	"rgb:00/00/00",	75	"rgb:00/00/00",
76	"rgb:00/00/8b",	76	"rgb:00/00/8b",
77	"rgb:00/00/cd",	77	"rgb:00/00/cd",
…		…
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	174	#if OFF_FOCUS_FADING
175	"black",	175	"rgb:00/00/00",
176	#endif
177	};
178
179	const char *const xa_names[] =
180	{
181	"TEXT",
182	"COMPOUND_TEXT",
183	"UTF8_STRING",
184	"MULTIPLE",
185	"TARGETS",
186	"TIMESTAMP",
187	"VT_SELECTION",
188	"INCR",
189	"WM_PROTOCOLS",
190	"WM_DELETE_WINDOW",
191	"CLIPBOARD",
192	#if ENABLE_FRILLS
193	"_MOTIF_WM_HINTS",
194	#endif
195	#if ENABLE_EWMH
196	"_NET_WM_PID",
197	"_NET_WM_NAME",
198	"_NET_WM_ICON_NAME",
199	"_NET_WM_PING",
200	#endif
201	#if USE_XIM
202	"WM_LOCALE_NAME",
203	#endif
204	#ifdef TRANSPARENT
205	"_XROOTPMAP_ID",
206	"ESETROOT_PMAP_ID",
207	#endif
208	#if ENABLE_XEMBED
209	"_XEMBED",
210	"_XEMBED_INFO",
211	#endif	176	#endif
212	};	177	};
213		178
214	bool	179	bool
215	rxvt_term::init_vars ()	180	rxvt_term::init_vars ()
216	{	181	{
		182	pix_colors = //
217	pix_colors_focused = new rxvt_color [TOTAL_COLORS];	183	pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218	#ifdef OFF_FOCUS_FADING	184	#ifdef OFF_FOCUS_FADING
219	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];	185	pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220	#endif	186	#endif
221	pix_colors = pix_colors_focused;
222
223	if (pix_colors == NULL)
224	return false;
225		187
226	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	188	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
227	pixmap = None;	189	pixmap = None;
228	#endif	190	#endif
229		191
230	MEvent.time = CurrentTime;	192	MEvent.time = CurrentTime;
231	MEvent.button = AnyButton;	193	MEvent.button = AnyButton;
232	options = DEFAULT_OPTIONS;
233	want_refresh = 1;	194	want_refresh = 1;
234	priv_modes = SavedModes = PrivMode_Default;	195	priv_modes = SavedModes = PrivMode_Default;
235	focus = 0;
236	ncol = 80;	196	ncol = 80;
237	nrow = 24;	197	nrow = 24;
238	int_bwidth = INTERNALBORDERWIDTH;	198	int_bwidth = INTERNALBORDERWIDTH;
239	ext_bwidth = EXTERNALBORDERWIDTH;	199	ext_bwidth = EXTERNALBORDERWIDTH;
240	lineSpace = LINESPACE;	200	lineSpace = LINESPACE;
241	saveLines = SAVELINES;	201	saveLines = SAVELINES;
242	numpix_colors = TOTAL_COLORS;	202	numpix_colors = TOTAL_COLORS;
243		203
244	refresh_limit = 1;
245	refresh_type = SLOW_REFRESH;	204	refresh_type = SLOW_REFRESH;
246	prev_nrow = prev_ncol = 0;
247		205
248	oldcursor.row = oldcursor.col = -1;	206	oldcursor.row = oldcursor.col = -1;
249	#ifdef XPM_BACKGROUND	207	#ifdef XPM_BACKGROUND
250	/* bgPixmap.w = bgPixmap.h = 0; */	208	/* bgPixmap.w = bgPixmap.h = 0; */
251	bgPixmap.x = bgPixmap.y = 50;	209	bgPixmap.x = bgPixmap.y = 0;
252	bgPixmap.pixmap = None;	210	bgPixmap.pixmap = None;
253	#endif	211	#endif
254		212
255	last_bot = last_state = -1;	213	last_bot = last_state = -1;
		214
		215	set_option (Opt_scrollBar);
		216	set_option (Opt_scrollTtyOutput);
		217	set_option (Opt_jumpScroll);
		218	set_option (Opt_skipScroll);
		219	set_option (Opt_secondaryScreen);
		220	set_option (Opt_secondaryScroll);
		221	set_option (Opt_pastableTabs);
		222	set_option (Opt_intensityStyles);
		223	set_option (Opt_iso14755_52);
256		224
257	return true;	225	return true;
258	}	226	}
259		227
260	void	228	void
…		…
298	int i, r_argc;	266	int i, r_argc;
299	char *val;	267	char *val;
300	const char cmd_argv, r_argv;	268	const char cmd_argv, r_argv;
301		269
302	/*	270	/*
303	* Look for -exec option. Find => split and make cmd_argv[] of command args	271	* Look for -e option. Find => split and make cmd_argv[] of command args
304	*/	272	*/
305	for (r_argc = 0; r_argc < argc; r_argc++)	273	for (r_argc = 0; r_argc < argc; r_argc++)
306	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	274	if (!strcmp (argv[r_argc], "-e"))
307	break;	275	break;
308		276
309	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	277	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
310		278
311	for (i = 0; i < r_argc; i++)	279	for (i = 0; i < r_argc; i++)
…		…
337	get_options (r_argc, r_argv);	305	get_options (r_argc, r_argv);
338		306
339	if (!(display = displays.get (rs[Rs_display_name])))	307	if (!(display = displays.get (rs[Rs_display_name])))
340	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	308	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341		309
		310	// using a local pointer decreases code size a lot
		311	xa = display->xa;
		312
		313	set (display);
342	extract_resources ();	314	extract_resources ();
343		315
		316	#if XFT
		317	if (rs[Rs_depth])
		318	select_visual (strtol (rs[Rs_depth], 0, 0));
		319	#endif
		320
344	free (r_argv);	321	free (r_argv);
		322
		323	for (int i = NUM_RESOURCES; i--; )
		324	if (rs [i] == resval_undef)
		325	rs [i] = 0;
345		326
346	#if ENABLE_PERL	327	#if ENABLE_PERL
347	if (!rs[Rs_perl_ext_1])	328	if (!rs[Rs_perl_ext_1])
348	rs[Rs_perl_ext_1] = "default";	329	rs[Rs_perl_ext_1] = "default";
349		330
…		…
448	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	429	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449	#endif	430	#endif
450		431
451	#ifdef XTERM_REVERSE_VIDEO	432	#ifdef XTERM_REVERSE_VIDEO
452	/* this is how xterm implements reverseVideo */	433	/* this is how xterm implements reverseVideo */
453	if (OPTION (Opt_reverseVideo))	434	if (option (Opt_reverseVideo))
454	{	435	{
455	if (!rs[Rs_color + Color_fg])	436	if (!rs[Rs_color + Color_fg])
456	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	437	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		438
457	if (!rs[Rs_color + Color_bg])	439	if (!rs[Rs_color + Color_bg])
458	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	440	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459	}	441	}
460	#endif	442	#endif
461		443
…		…
463	if (!rs[Rs_color + i])	445	if (!rs[Rs_color + i])
464	rs[Rs_color + i] = def_colorName[i];	446	rs[Rs_color + i] = def_colorName[i];
465		447
466	#ifndef XTERM_REVERSE_VIDEO	448	#ifndef XTERM_REVERSE_VIDEO
467	/* this is how we implement reverseVideo */	449	/* this is how we implement reverseVideo */
468	if (OPTION (Opt_reverseVideo))	450	if (option (Opt_reverseVideo))
469	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	451	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470	#endif	452	#endif
471		453
472	/* convenient aliases for setting fg/bg to colors */	454	/* convenient aliases for setting fg/bg to colors */
473	color_aliases (Color_fg);	455	color_aliases (Color_fg);
…		…
513	val = rxvt_network_display (rs[Rs_display_name]);	495	val = rxvt_network_display (rs[Rs_display_name]);
514	rs[Rs_display_name] = (const char *)val;	496	rs[Rs_display_name] = (const char *)val;
515		497
516	if (val == NULL)	498	if (val == NULL)
517	#endif /* DISPLAY_IS_IP */	499	#endif /* DISPLAY_IS_IP */
518	val = XDisplayString (display->display);	500	val = XDisplayString (dpy);
519		501
520	if (rs[Rs_display_name] == NULL)	502	if (rs[Rs_display_name] == NULL)
521	rs[Rs_display_name] = val; /* use broken `:0' value */	503	rs[Rs_display_name] = val; /* use broken `:0' value */
522		504
523	i = strlen (val);	505	i = strlen (val);
524	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	506	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
525		507
526	sprintf (env_display, "DISPLAY=%s", val);	508	sprintf (env_display, "DISPLAY=%s", val);
527		509
528	/* avoiding the math library:	510	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531	;
532	max_it (i, 1);
533	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
534
535	sprintf (env_windowid, "WINDOWID=%u",
536	(unsigned int)parent[0]);
537		511
538	/* add entries to the environment:	512	/* add entries to the environment:
539	* @ DISPLAY: in case we started with -display	513	* @ DISPLAY: in case we started with -display
540	* @ WINDOWID: X window id number of the window	514	* @ WINDOWID: X window id number of the window
541	* @ COLORTERM: terminal sub-name and also indicates its color	515	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
543	* @ TERMINFO: path to terminfo directory	517	* @ TERMINFO: path to terminfo directory
544	* @ COLORFGBG: fg;bg color codes	518	* @ COLORFGBG: fg;bg color codes
545	*/	519	*/
546	putenv (env_display);	520	putenv (env_display);
547	putenv (env_windowid);	521	putenv (env_windowid);
		522
548	if (env_colorfgbg)	523	if (env_colorfgbg)
549	putenv (env_colorfgbg);	524	putenv (env_colorfgbg);
550		525
551	#ifdef RXVT_TERMINFO	526	#ifdef RXVT_TERMINFO
552	putenv ("TERMINFO=" RXVT_TERMINFO);	527	putenv ("TERMINFO=" RXVT_TERMINFO);
553	#endif	528	#endif
554		529
555	if (display->depth <= 2)	530	if (depth <= 2)
556	putenv ("COLORTERM=" COLORTERMENV "-mono");	531	putenv ("COLORTERM=" COLORTERMENV "-mono");
557	else	532	else
558	putenv ("COLORTERM=" COLORTERMENVFULL);	533	putenv ("COLORTERM=" COLORTERMENVFULL);
559		534
560	if (rs[Rs_term_name] != NULL)	535	if (rs[Rs_term_name] != NULL)
…		…
654	* Initialize the command connection.	629	* Initialize the command connection.
655	* This should be called after the X server connection is established.	630	* This should be called after the X server connection is established.
656	*/	631	*/
657		632
658	#ifdef META8_OPTION	633	#ifdef META8_OPTION
659	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	634	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660	#endif	635	#endif
661		636
662	get_ourmods ();	637	get_ourmods ();
663		638
664	if (!OPTION (Opt_scrollTtyOutput))	639	if (!option (Opt_scrollTtyOutput))
665	priv_modes \|= PrivMode_TtyOutputInh;	640	priv_modes \|= PrivMode_TtyOutputInh;
666	if (OPTION (Opt_scrollTtyKeypress))	641	if (option (Opt_scrollTtyKeypress))
667	priv_modes \|= PrivMode_Keypress;	642	priv_modes \|= PrivMode_Keypress;
668	if (!OPTION (Opt_jumpScroll))	643	if (!option (Opt_jumpScroll))
669	priv_modes \|= PrivMode_smoothScroll;	644	priv_modes \|= PrivMode_smoothScroll;
670		645
671	#ifndef NO_BACKSPACE_KEY	646	#ifndef NO_BACKSPACE_KEY
672	if (strcmp (key_backspace, "DEC") == 0)	647	if (strcmp (key_backspace, "DEC") == 0)
673	priv_modes \|= PrivMode_HaveBackSpace;	648	priv_modes \|= PrivMode_HaveBackSpace;
…		…
691		666
692	#ifdef OFF_FOCUS_FADING	667	#ifdef OFF_FOCUS_FADING
693	pix_colors = pix_colors_focused;	668	pix_colors = pix_colors_focused;
694	#endif	669	#endif
695		670
696	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	671	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697	{	672	{
		673	const char *name = rs[Rs_color + i];
		674
		675	if (!name)
		676	continue;
		677
698	rxvt_color xcol;	678	rxvt_color xcol;
699		679
700	if (!rs[Rs_color + i])	680	if (!set_color (xcol, name))
701	continue;
702
703	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704	{	681	{
705	#ifndef XTERM_REVERSE_VIDEO	682	#ifndef XTERM_REVERSE_VIDEO
706	if (i < 2 && OPTION (Opt_reverseVideo))	683	if (i < 2 && option (Opt_reverseVideo))
707	rs[Rs_color + i] = def_colorName[!i];	684	name = def_colorName [1 - i];
708	else	685	else
709	#endif	686	#endif
710	rs[Rs_color + i] = def_colorName[i];	687	name = def_colorName [i];
711		688
712	if (!rs[Rs_color + i])	689	if (!name)
713	continue;	690	continue;
714		691
715	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	692	if (!set_color (xcol, name))
716	{	693	{
717	switch (i)	694	switch (i)
718	{	695	{
719	case Color_fg:	696	case Color_fg:
720	case Color_bg:	697	case Color_bg:
721	/* fatal: need bg/fg color */
722	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	698	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723	/* NOTREACHED */	699	name = "";
724	break;	700	break;
725	#ifndef NO_CURSORCOLOR	701	#ifndef NO_CURSORCOLOR
726	case Color_cursor2:	702	case Color_cursor2:
727	xcol = pix_colors[Color_fg];	703	#endif
728	break;
729	#endif /* ! NO_CURSORCOLOR */
730	case Color_pointer_fg:	704	case Color_pointer_fg:
731	xcol = pix_colors[Color_fg];	705	name = rs[Rs_color + Color_fg];
		706	xcol.set (this, name);
732	break;	707	break;
733	default:	708	default:
734	xcol = pix_colors[Color_bg]; /* None */	709	name = rs[Rs_color + Color_bg];
		710	xcol.set (this, name);
735	break;	711	break;
736	}	712	}
737	}	713	}
738	}	714	}
739		715
740	pix_colors[i] = xcol;	716	pix_colors[i] = xcol;
741	SET_PIXCOLOR (i);	717	rs[Rs_color + i] = name;
742	}
743
744	#ifdef OFF_FOCUS_FADING
745	if (rs[Rs_fade])
746	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
747	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
748	#endif
749
750	if (display->depth <= 2)
751	{	718	}
		719
		720	if (depth <= 2)
		721	{
752	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	722	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
753	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	723	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
754	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	724	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755	}	725	}
756		726
757	/*	727	/*
758	* get scrollBar shadow colors	728	* get scrollBar shadow colors
759	*	729	*
760	* The calculations of topShadow/bottomShadow values are adapted	730	* The calculations of topShadow/bottomShadow values are adapted
761	* from the fvwm window manager.	731	* from the fvwm window manager.
762	*/	732	*/
763	#ifdef KEEP_SCROLLCOLOR	733	#ifdef KEEP_SCROLLCOLOR
764
765	if (display->depth <= 2)	734	if (depth <= 2)
766	{	735	{
767	/* Monochrome */	736	/* Monochrome */
768	pix_colors[Color_scroll] = pix_colors[Color_fg];	737	alias_color (Color_scroll, Color_fg);
769	pix_colors[Color_topShadow] = pix_colors[Color_bg];	738	alias_color (Color_topShadow, Color_bg);
770	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	739	alias_color (Color_bottomShadow, Color_bg);
771	}	740	}
772	else	741	else
773	{	742	{
774	rxvt_color xcol[2];	743	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775	/* xcol[0] == white
776	* xcol[1] == top shadow
777	* xcol[2] == bot shadow */
778		744
779	xcol[1] = pix_colors[Color_scroll];	745	rgba cscroll;
780	xcol[0].set (display, 65535, 65535, 65535);	746	pix_colors [Color_scroll].get (cscroll);
781
782	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784	xcol[0].get (display, pr0, pg0, pb0);
785	xcol[1].get (display, pr1, pg1, pb1);
786
787	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788		747
789	/* topShadowColor */	748	/* topShadowColor */
790	if (!xcol[1].set (display,	749	if (!pix_colors[Color_topShadow].set (this,
791	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	750	rgba (
792	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	751	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	752	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794	xcol[1] = pix_colors[Color_White];	753	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795		754	cscroll.a)
796	pix_colors[Color_topShadow] = xcol[1];	755	))
		756	alias_color (Color_topShadow, Color_White);
797	}	757	}
798	#endif /* KEEP_SCROLLCOLOR */	758	#endif /* KEEP_SCROLLCOLOR */
		759
		760	#ifdef OFF_FOCUS_FADING
		761	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		762	update_fade_color (i);
		763	#endif
799	}	764	}
800		765
801	/----------------------------------------------------------------------/	766	/----------------------------------------------------------------------/
802	/* color aliases, fg/bg bright-bold */	767	/* color aliases, fg/bg bright-bold */
803	void	768	void
…		…
842		807
843	if (rsmod	808	if (rsmod
844	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	809	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845	requestedmeta = rsmod[3] - '0';	810	requestedmeta = rsmod[3] - '0';
846		811
847	map = XGetModifierMapping (display->display);	812	map = XGetModifierMapping (dpy);
848	kc = map->modifiermap;	813	kc = map->modifiermap;
849		814
850	for (i = 1; i < 6; i++)	815	for (i = 1; i < 6; i++)
851	{	816	{
852	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	817	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
854	for (j = map->max_keypermod; j--; k++)	819	for (j = map->max_keypermod; j--; k++)
855	{	820	{
856	if (kc[k] == 0)	821	if (kc[k] == 0)
857	break;	822	break;
858		823
859	switch (XKeycodeToKeysym (display->display, kc[k], 0))	824	switch (XKeycodeToKeysym (dpy, kc[k], 0))
860	{	825	{
861	case XK_Num_Lock:	826	case XK_Num_Lock:
862	ModNumLockMask = modmasks[i - 1];	827	ModNumLockMask = modmasks[i - 1];
863	continue;	828	continue;
864		829
…		…
914	rxvt_term::create_windows (int argc, const char const argv)	879	rxvt_term::create_windows (int argc, const char const argv)
915	{	880	{
916	XClassHint classHint;	881	XClassHint classHint;
917	XWMHints wmHint;	882	XWMHints wmHint;
918	#if ENABLE_FRILLS	883	#if ENABLE_FRILLS
919	Atom prop = None;
920	MWMHints mwmhints;	884	MWMHints mwmhints;
921	#endif	885	#endif
922	XGCValues gcvalue;	886	XGCValues gcvalue;
923	XSetWindowAttributes attributes;	887	XSetWindowAttributes attributes;
924	XWindowAttributes gattr;
925	Window top, parent;	888	Window top, parent;
926	dDisp;
927		889
928	#ifdef USING_W11LIB	890	dLocal (Display *, dpy);
929	/* enable W11 callbacks */
930	W11AddEventHandler (disp, rxvt_W11_process_x_event);
931	#endif
932
933	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936	if (OPTION (Opt_transparent))
937	{
938	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
939	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
940	}
941		891
942	/* grab colors before netscape does */	892	/* grab colors before netscape does */
943	Get_Colours ();	893	Get_Colours ();
944		894
945	if (!set_fonts ())	895	if (!set_fonts ())
946	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	896	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947		897
948	parent = DefaultRootWindow (disp);	898	parent = display->root;
949		899
950	attributes.override_redirect = !!OPTION (Opt_override_redirect);	900	attributes.override_redirect = !!option (Opt_override_redirect);
951		901
952	#if ENABLE_FRILLS	902	#if ENABLE_FRILLS
953	if (OPTION (Opt_borderLess))	903	if (option (Opt_borderLess))
954	{	904	{
955	prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);	905	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957	if (prop == None)
958	{	906	{
959	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	907	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
960	attributes.override_redirect = TRUE;	908	attributes.override_redirect = true;
961	mwmhints.flags = 0;	909	mwmhints.flags = 0;
962	}	910	}
963	else	911	else
964	{	912	{
965	mwmhints.flags = MWM_HINTS_DECORATIONS;	913	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
975	{	923	{
976	XWindowAttributes wattr;	924	XWindowAttributes wattr;
977		925
978	parent = strtol (rs[Rs_embed], 0, 0);	926	parent = strtol (rs[Rs_embed], 0, 0);
979		927
980	if (!XGetWindowAttributes (disp, parent, &wattr))	928	if (!XGetWindowAttributes (dpy, parent, &wattr))
981	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	929	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982		930
983	window_calc (wattr.width, wattr.height);	931	window_calc (wattr.width, wattr.height);
984	}	932	}
985	#endif	933	#endif
986		934
987	window_calc (0, 0);	935	window_calc (0, 0);
988		936
989	/* sub-window placement & size in rxvt_resize_subwindows () */	937	/* sub-window placement & size in rxvt_resize_subwindows () */
990	attributes.background_pixel = pix_colors_focused[Color_border];	938	attributes.background_pixel = pix_colors_focused [Color_border];
991	attributes.border_pixel = pix_colors_focused[Color_border];	939	attributes.border_pixel = pix_colors_focused [Color_border];
992	attributes.colormap = display->cmap;	940	attributes.colormap = cmap;
		941
993	top = XCreateWindow (disp, parent,	942	top = XCreateWindow (dpy, parent,
994	szHint.x, szHint.y,	943	szHint.x, szHint.y,
995	szHint.width, szHint.height,	944	szHint.width, szHint.height,
996	ext_bwidth,	945	ext_bwidth,
997	display->depth, InputOutput,	946	depth, InputOutput, visual,
998	display->visual,
999	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	947	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1000	&attributes);	948	&attributes);
1001		949
1002	this->parent[0] = top;	950	this->parent[0] = top;
1003		951
1004	old_width = szHint.width;	952	old_width = szHint.width;
1005	old_height = szHint.height;	953	old_height = szHint.height;
1006		954
1007	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	955	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	956	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009		957
1010	classHint.res_name = (char *)rs[Rs_name];	958	classHint.res_name = (char *)rs[Rs_name];
1011	classHint.res_class = (char *)RESCLASS;	959	classHint.res_class = (char *)RESCLASS;
1012		960
1013	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	961	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1014	wmHint.input = True;	962	wmHint.input = True;
1015	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	963	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016	wmHint.window_group = top;	964	wmHint.window_group = top;
1017		965
1018	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	966	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019	&szHint, &wmHint, &classHint);	967	&szHint, &wmHint, &classHint);
		968
		969	#if ENABLE_FRILLS
		970	if (mwmhints.flags)
		971	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		972	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		973	#endif
1020		974
1021	Atom protocols[] = {	975	Atom protocols[] = {
1022	xa[XA_WM_DELETE_WINDOW],	976	xa[XA_WM_DELETE_WINDOW],
1023	#if ENABLE_EWMH	977	#if ENABLE_EWMH
1024	xa[XA_NET_WM_PING],	978	xa[XA_NET_WM_PING],
1025	#endif	979	#endif
1026	};	980	};
1027		981
1028	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	982	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029		983
1030	#if ENABLE_FRILLS	984	#if ENABLE_FRILLS
1031	if (rs[Rs_transient_for])	985	if (rs[Rs_transient_for])
1032	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	986	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033	#endif	987	#endif
1034		988
1035	#if ENABLE_EWMH	989	#if ENABLE_EWMH
1036	long pid = getpid ();	990	long pid = getpid ();
1037		991
1038	XChangeProperty (disp, top,	992	XChangeProperty (dpy, top,
1039	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	993	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040	PropModeReplace, (unsigned char *)&pid, 1);	994	PropModeReplace, (unsigned char *)&pid, 1);
1041		995
1042	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	996	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043	#endif	997	#endif
1044		998
1045	XSelectInput (disp, top,	999	XSelectInput (dpy, top,
1046	KeyPressMask	1000	KeyPressMask
1047	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1001	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1048	\| KeyReleaseMask	1002	\| KeyReleaseMask
1049	#endif	1003	#endif
1050	\| FocusChangeMask \| VisibilityChangeMask	1004	\| FocusChangeMask \| VisibilityChangeMask
1051	\| ExposureMask \| StructureNotifyMask);	1005	\| ExposureMask \| StructureNotifyMask);
1052		1006
1053	termwin_ev.start (display, top);	1007	termwin_ev.start (display, top);
1054		1008
1055	#if ENABLE_FRILLS
1056	if (mwmhints.flags)
1057	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1058	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1059	#endif
1060
1061	/* vt cursor: Black-on-White is standard, but this is more popular */	1009	/* vt cursor: Black-on-White is standard, but this is more popular */
1062	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1010	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063		1011
1064	#ifdef HAVE_SCROLLBARS	1012	#ifdef HAVE_SCROLLBARS
1065	/* cursor scrollBar: Black-on-White */	1013	/* cursor scrollBar: Black-on-White */
1066	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1014	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067	#endif	1015	#endif
1068		1016
1069	/* the vt window */	1017	/* the vt window */
1070	vt = XCreateSimpleWindow (disp, top,	1018	vt = XCreateSimpleWindow (dpy, top,
1071	window_vt_x,
1072	window_vt_y,	1019	window_vt_x, window_vt_y,
1073	width,
1074	height,	1020	width, height,
1075	0,	1021	0,
1076	pix_colors_focused[Color_fg],	1022	pix_colors_focused[Color_fg],
1077	pix_colors_focused[Color_bg]);	1023	pix_colors_focused[Color_bg]);
1078	#ifdef DEBUG_X
1079	XStoreName (disp, vt, "vt window");
1080	#endif
1081		1024
1082	attributes.bit_gravity = NorthWestGravity;	1025	attributes.bit_gravity = NorthWestGravity;
1083	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1026	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084		1027
1085	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1028	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1086		1029
1087	if (OPTION (Opt_pointerBlank))	1030	if (option (Opt_pointerBlank))
1088	vt_emask \|= PointerMotionMask;	1031	vt_emask \|= PointerMotionMask;
1089	else	1032	else
1090	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1033	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1091		1034
1092	vt_select_input ();	1035	vt_select_input ();
1093		1036
1094	vt_ev.start (display, vt);	1037	vt_ev.start (display, vt);
1095		1038
1096	#ifdef XPM_BACKGROUND	1039	#ifdef XPM_BACKGROUND
1097	if (rs[Rs_backgroundPixmap] != NULL	1040	if (rs[Rs_backgroundPixmap] != NULL
		1041	#ifndef HAVE_AFTERIMAGE
1098	&& ! OPTION (Opt_transparent))	1042	&& !option (Opt_transparent)
		1043	#endif
		1044	)
1099	{	1045	{
1100	const char *p = rs[Rs_backgroundPixmap];	1046	const char *p = rs[Rs_backgroundPixmap];
1101		1047
1102	if ((p = strchr (p, ';')) != NULL)	1048	if ((p = strchr (p, ';')) != NULL)
1103	{	1049	{
…		…
1109	scr_touch (true);	1055	scr_touch (true);
1110	}	1056	}
1111	#endif	1057	#endif
1112		1058
1113	/* graphics context for the vt window */	1059	/* graphics context for the vt window */
1114	gcvalue.foreground = pix_colors[Color_fg];	1060	gcvalue.foreground = pix_colors[Color_fg];
1115	gcvalue.background = pix_colors[Color_bg];	1061	gcvalue.background = pix_colors[Color_bg];
1116	gcvalue.graphics_exposures = 1;	1062	gcvalue.graphics_exposures = 0;
		1063
1117	gc = XCreateGC (disp, vt,	1064	gc = XCreateGC (dpy, vt,
1118	GCForeground \| GCBackground \| GCGraphicsExposures,	1065	GCForeground \| GCBackground \| GCGraphicsExposures,
1119	&gcvalue);	1066	&gcvalue);
1120		1067
1121	drawable = new rxvt_drawable (display, vt);	1068	drawable = new rxvt_drawable (this, vt);
1122		1069
1123	#ifdef RXVT_SCROLLBAR	1070	#ifdef RXVT_SCROLLBAR
1124	gcvalue.foreground = pix_colors[Color_topShadow];	1071	gcvalue.foreground = pix_colors[Color_topShadow];
1125	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1072	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126	gcvalue.foreground = pix_colors[Color_bottomShadow];	1073	gcvalue.foreground = pix_colors[Color_bottomShadow];
1127	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1074	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1075	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1076	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130	#endif	1077	#endif
1131		1078
1132	#ifdef OFF_FOCUS_FADING	1079	#ifdef OFF_FOCUS_FADING
1133	// initially we are in unfocused state	1080	// initially we are in unfocused state
1134	if (rs[Rs_fade])	1081	if (rs[Rs_fade])
1135	pix_colors = pix_colors_unfocused;	1082	pix_colors = pix_colors_unfocused;
1136	#endif	1083	#endif
1137		1084
1138	pointer_unblank ();	1085	pointer_unblank ();
1139	scr_recolour ();	1086	scr_recolour ();
1140
1141	#if ENABLE_XEMBED
1142	if (rs[Rs_embed])
1143	{
1144	long info[2] = { 0, XEMBED_MAPPED };
1145
1146	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147	32, PropModeReplace, (unsigned char *)&info, 2);
1148	}
1149	#endif
1150	}	1087	}
1151		1088
1152	/* ------------------------------------------------------------------------- *	1089	/* ------------------------------------------------------------------------- *
1153	* GET TTY CURRENT STATE *	1090	* GET TTY CURRENT STATE *
1154	* ------------------------------------------------------------------------- */	1091	* ------------------------------------------------------------------------- */
1155	void	1092	void
1156	rxvt_get_ttymode (ttymode_t *tio, int erase)	1093	rxvt_get_ttymode (ttymode_t *tio, int erase)
1157	{	1094	{
1158	#ifdef HAVE_TERMIOS_H
1159	/*	1095	/*
1160	* standard System V termios interface	1096	* standard System V termios interface
1161	*/	1097	*/
1162	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1098	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163	{	1099	{
…		…
1230	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1166	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1231	# if defined (ECHOCTL) && defined (ECHOKE)	1167	# if defined (ECHOCTL) && defined (ECHOKE)
1232	\| ECHOCTL \| ECHOKE	1168	\| ECHOCTL \| ECHOKE
1233	# endif	1169	# endif
1234	\| ECHOE \| ECHOK);	1170	\| ECHOE \| ECHOK);
1235	# else /* HAVE_TERMIOS_H */
1236
1237	/*
1238	* sgtty interface
1239	*/
1240
1241	/* get parameters -- gtty */
1242	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1243	{
1244	tio->sg.sg_erase = CERASE; /* ^H */
1245	tio->sg.sg_kill = CKILL; /* ^U */
1246	}
1247
1248	if (erase != -1)
1249	tio->sg.sg_erase = (char)erase;
1250
1251	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1252
1253	/* get special characters */
1254	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1255	{
1256	tio->tc.t_intrc = CINTR; /* ^C */
1257	tio->tc.t_quitc = CQUIT; /* ^\ */
1258	tio->tc.t_startc = CSTART; /* ^Q */
1259	tio->tc.t_stopc = CSTOP; /* ^S */
1260	tio->tc.t_eofc = CEOF; /* ^D */
1261	tio->tc.t_brkc = -1;
1262	}
1263
1264	/* get local special chars */
1265	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266	{
1267	tio->lc.t_suspc = CSUSP; /* ^Z */
1268	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1269	tio->lc.t_rprntc = CRPRNT; /* ^R */
1270	tio->lc.t_flushc = CFLUSH; /* ^O */
1271	tio->lc.t_werasc = CWERASE; /* ^W */
1272	tio->lc.t_lnextc = CLNEXT; /* ^V */
1273	}
1274	/* get line discipline */
1275	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276	# ifdef NTTYDISC
1277	tio->line = NTTYDISC;
1278	# endif /* NTTYDISC */
1279
1280	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1281	#endif /* HAVE_TERMIOS_H */
1282		1171
1283	/*	1172	/*
1284	* Debugging	1173	* Debugging
1285	*/	1174	*/
1286	#ifdef DEBUG_TTYMODE	1175	#ifdef DEBUG_TTYMODE
…		…
1387	else	1276	else
1388	#endif	1277	#endif
1389	if (!pty->get ())	1278	if (!pty->get ())
1390	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1279	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391		1280
1392	pty->set_utf8_mode (enc_utf8);
1393
1394	/* set initial window size */
1395	tt_winch ();
1396
1397	int er;	1281	int er;
1398		1282
1399	#ifndef NO_BACKSPACE_KEY	1283	#ifndef NO_BACKSPACE_KEY
1400	if (key_backspace[0] && !key_backspace[1])	1284	if (key_backspace[0] && !key_backspace[1])
1401	er = key_backspace[0];	1285	er = key_backspace[0];
…		…
1404	else	1288	else
1405	#endif	1289	#endif
1406	er = -1;	1290	er = -1;
1407		1291
1408	rxvt_get_ttymode (&tio, er);	1292	rxvt_get_ttymode (&tio, er);
		1293	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
		1294	pty->set_utf8_mode (enc_utf8);
		1295
		1296	/* set initial window size */
		1297	tt_winch ();
1409		1298
1410	#if ENABLE_FRILLS	1299	#if ENABLE_FRILLS
1411	if (rs[Rs_pty_fd])	1300	if (rs[Rs_pty_fd])
1412	return;	1301	return;
1413	#endif	1302	#endif
…		…
1444	}	1333	}
1445		1334
1446	_exit (EXIT_FAILURE);	1335	_exit (EXIT_FAILURE);
1447		1336
1448	default:	1337	default:
1449	#if UTMP_SUPPORT
1450	if (!OPTION (Opt_utmpInhibit))	1338	if (!option (Opt_utmpInhibit))
1451	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1339	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1452	#endif
1453		1340
1454	pty->close_tty ();	1341	pty->close_tty ();
1455		1342
1456	child_ev.start (cmd_pid);	1343	child_ev.start (cmd_pid);
1457		1344
…		…
1470	int	1357	int
1471	rxvt_term::run_child (const char const argv)	1358	rxvt_term::run_child (const char const argv)
1472	{	1359	{
1473	char *login;	1360	char *login;
1474		1361
1475	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1476
1477	if (OPTION (Opt_console))	1362	if (option (Opt_console))
1478	{ /* be virtual console, fail silently */	1363	{ /* be virtual console, fail silently */
1479	#ifdef TIOCCONS	1364	#ifdef TIOCCONS
1480	unsigned int on = 1;	1365	unsigned int on = 1;
1481		1366
1482	ioctl (STDIN_FILENO, TIOCCONS, &on);	1367	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1531	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1416	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1532	shell = "/bin/sh";	1417	shell = "/bin/sh";
1533		1418
1534	argv0 = (const char *)rxvt_r_basename (shell);	1419	argv0 = (const char *)rxvt_r_basename (shell);
1535		1420
1536	if (OPTION (Opt_loginShell))	1421	if (option (Opt_loginShell))
1537	{	1422	{
1538	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1423	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1539		1424
1540	login[0] = '-';	1425	login[0] = '-';
1541	strcpy (&login[1], argv0);	1426	strcpy (&login[1], argv0);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.151 by root, Fri Jan 20 12:16:28 2006 UTC vs. Revision 1.188 by root, Mon Jun 18 13:38:12 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.151 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.188 by root, Mon Jun 18 13:38:12 2007 UTC