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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.187 by root, Mon Jun 18 12:53:26 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_secondaryScreen);
		219	set_option (Opt_secondaryScroll);
		220	set_option (Opt_pastableTabs);
		221	set_option (Opt_intensityStyles);
		222	set_option (Opt_iso14755_52);
256		223
257	return true;	224	return true;
258	}	225	}
259		226
260	void	227	void
…		…
298	int i, r_argc;	265	int i, r_argc;
299	char *val;	266	char *val;
300	const char cmd_argv, r_argv;	267	const char cmd_argv, r_argv;
301		268
302	/*	269	/*
303	* Look for -exec option. Find => split and make cmd_argv[] of command args	270	* Look for -e option. Find => split and make cmd_argv[] of command args
304	*/	271	*/
305	for (r_argc = 0; r_argc < argc; r_argc++)	272	for (r_argc = 0; r_argc < argc; r_argc++)
306	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	273	if (!strcmp (argv[r_argc], "-e"))
307	break;	274	break;
308		275
309	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	276	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
310		277
311	for (i = 0; i < r_argc; i++)	278	for (i = 0; i < r_argc; i++)
…		…
337	get_options (r_argc, r_argv);	304	get_options (r_argc, r_argv);
338		305
339	if (!(display = displays.get (rs[Rs_display_name])))	306	if (!(display = displays.get (rs[Rs_display_name])))
340	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	307	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341		308
		309	// using a local pointer decreases code size a lot
		310	xa = display->xa;
		311
		312	set (display);
342	extract_resources ();	313	extract_resources ();
343		314
		315	#if XFT
		316	if (rs[Rs_depth])
		317	select_visual (strtol (rs[Rs_depth], 0, 0));
		318	#endif
		319
344	free (r_argv);	320	free (r_argv);
		321
		322	for (int i = NUM_RESOURCES; i--; )
		323	if (rs [i] == resval_undef)
		324	rs [i] = 0;
		325
		326	#if ENABLE_PERL
		327	if (!rs[Rs_perl_ext_1])
		328	rs[Rs_perl_ext_1] = "default";
		329
		330	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		331	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		332	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		333	{
		334	rxvt_perl.init (this);
		335	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		336	}
		337	#endif
345		338
346	/*	339	/*
347	* set any defaults not already set	340	* set any defaults not already set
348	*/	341	*/
349	if (cmd_argv && cmd_argv[0])	342	if (cmd_argv && cmd_argv[0])
…		…
435	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	428	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
436	#endif	429	#endif
437		430
438	#ifdef XTERM_REVERSE_VIDEO	431	#ifdef XTERM_REVERSE_VIDEO
439	/* this is how xterm implements reverseVideo */	432	/* this is how xterm implements reverseVideo */
440	if (OPTION (Opt_reverseVideo))	433	if (option (Opt_reverseVideo))
441	{	434	{
442	if (!rs[Rs_color + Color_fg])	435	if (!rs[Rs_color + Color_fg])
443	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	436	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		437
444	if (!rs[Rs_color + Color_bg])	438	if (!rs[Rs_color + Color_bg])
445	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	439	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
446	}	440	}
447	#endif	441	#endif
448		442
…		…
450	if (!rs[Rs_color + i])	444	if (!rs[Rs_color + i])
451	rs[Rs_color + i] = def_colorName[i];	445	rs[Rs_color + i] = def_colorName[i];
452		446
453	#ifndef XTERM_REVERSE_VIDEO	447	#ifndef XTERM_REVERSE_VIDEO
454	/* this is how we implement reverseVideo */	448	/* this is how we implement reverseVideo */
455	if (OPTION (Opt_reverseVideo))	449	if (option (Opt_reverseVideo))
456	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	450	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
457	#endif	451	#endif
458		452
459	/* convenient aliases for setting fg/bg to colors */	453	/* convenient aliases for setting fg/bg to colors */
460	color_aliases (Color_fg);	454	color_aliases (Color_fg);
…		…
500	val = rxvt_network_display (rs[Rs_display_name]);	494	val = rxvt_network_display (rs[Rs_display_name]);
501	rs[Rs_display_name] = (const char *)val;	495	rs[Rs_display_name] = (const char *)val;
502		496
503	if (val == NULL)	497	if (val == NULL)
504	#endif /* DISPLAY_IS_IP */	498	#endif /* DISPLAY_IS_IP */
505	val = XDisplayString (display->display);	499	val = XDisplayString (dpy);
506		500
507	if (rs[Rs_display_name] == NULL)	501	if (rs[Rs_display_name] == NULL)
508	rs[Rs_display_name] = val; /* use broken `:0' value */	502	rs[Rs_display_name] = val; /* use broken `:0' value */
509		503
510	i = strlen (val);	504	i = strlen (val);
511	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	505	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
512		506
513	sprintf (env_display, "DISPLAY=%s", val);	507	sprintf (env_display, "DISPLAY=%s", val);
514		508
515	/* avoiding the math library:	509	sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516	* i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
517	for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
518	;
519	max_it (i, 1);
520	env_windowid = (char )rxvt_malloc ((i + 10) sizeof (char));
521
522	sprintf (env_windowid, "WINDOWID=%u",
523	(unsigned int)parent[0]);
524		510
525	/* add entries to the environment:	511	/* add entries to the environment:
526	* @ DISPLAY: in case we started with -display	512	* @ DISPLAY: in case we started with -display
527	* @ WINDOWID: X window id number of the window	513	* @ WINDOWID: X window id number of the window
528	* @ COLORTERM: terminal sub-name and also indicates its color	514	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
530	* @ TERMINFO: path to terminfo directory	516	* @ TERMINFO: path to terminfo directory
531	* @ COLORFGBG: fg;bg color codes	517	* @ COLORFGBG: fg;bg color codes
532	*/	518	*/
533	putenv (env_display);	519	putenv (env_display);
534	putenv (env_windowid);	520	putenv (env_windowid);
		521
535	if (env_colorfgbg)	522	if (env_colorfgbg)
536	putenv (env_colorfgbg);	523	putenv (env_colorfgbg);
537		524
538	#ifdef RXVT_TERMINFO	525	#ifdef RXVT_TERMINFO
539	putenv ("TERMINFO=" RXVT_TERMINFO);	526	putenv ("TERMINFO=" RXVT_TERMINFO);
540	#endif	527	#endif
541		528
542	if (display->depth <= 2)	529	if (depth <= 2)
543	putenv ("COLORTERM=" COLORTERMENV "-mono");	530	putenv ("COLORTERM=" COLORTERMENV "-mono");
544	else	531	else
545	putenv ("COLORTERM=" COLORTERMENVFULL);	532	putenv ("COLORTERM=" COLORTERMENVFULL);
546		533
547	if (rs[Rs_term_name] != NULL)	534	if (rs[Rs_term_name] != NULL)
…		…
641	* Initialize the command connection.	628	* Initialize the command connection.
642	* This should be called after the X server connection is established.	629	* This should be called after the X server connection is established.
643	*/	630	*/
644		631
645	#ifdef META8_OPTION	632	#ifdef META8_OPTION
646	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	633	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
647	#endif	634	#endif
648		635
649	get_ourmods ();	636	get_ourmods ();
650		637
651	if (!OPTION (Opt_scrollTtyOutput))	638	if (!option (Opt_scrollTtyOutput))
652	priv_modes \|= PrivMode_TtyOutputInh;	639	priv_modes \|= PrivMode_TtyOutputInh;
653	if (OPTION (Opt_scrollTtyKeypress))	640	if (option (Opt_scrollTtyKeypress))
654	priv_modes \|= PrivMode_Keypress;	641	priv_modes \|= PrivMode_Keypress;
655	if (!OPTION (Opt_jumpScroll))	642	if (!option (Opt_jumpScroll))
656	priv_modes \|= PrivMode_smoothScroll;	643	priv_modes \|= PrivMode_smoothScroll;
657		644
658	#ifndef NO_BACKSPACE_KEY	645	#ifndef NO_BACKSPACE_KEY
659	if (strcmp (key_backspace, "DEC") == 0)	646	if (strcmp (key_backspace, "DEC") == 0)
660	priv_modes \|= PrivMode_HaveBackSpace;	647	priv_modes \|= PrivMode_HaveBackSpace;
…		…
678		665
679	#ifdef OFF_FOCUS_FADING	666	#ifdef OFF_FOCUS_FADING
680	pix_colors = pix_colors_focused;	667	pix_colors = pix_colors_focused;
681	#endif	668	#endif
682		669
683	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	670	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
684	{	671	{
		672	const char *name = rs[Rs_color + i];
		673
		674	if (!name)
		675	continue;
		676
685	rxvt_color xcol;	677	rxvt_color xcol;
686		678
687	if (!rs[Rs_color + i])	679	if (!set_color (xcol, name))
688	continue;
689
690	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
691	{	680	{
692	#ifndef XTERM_REVERSE_VIDEO	681	#ifndef XTERM_REVERSE_VIDEO
693	if (i < 2 && OPTION (Opt_reverseVideo))	682	if (i < 2 && option (Opt_reverseVideo))
694	rs[Rs_color + i] = def_colorName[!i];	683	name = def_colorName [1 - i];
695	else	684	else
696	#endif	685	#endif
697	rs[Rs_color + i] = def_colorName[i];	686	name = def_colorName [i];
698		687
699	if (!rs[Rs_color + i])	688	if (!name)
700	continue;	689	continue;
701		690
702	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	691	if (!set_color (xcol, name))
703	{	692	{
704	switch (i)	693	switch (i)
705	{	694	{
706	case Color_fg:	695	case Color_fg:
707	case Color_bg:	696	case Color_bg:
708	/* fatal: need bg/fg color */
709	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	697	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
710	/* NOTREACHED */	698	name = "";
711	break;	699	break;
712	#ifndef NO_CURSORCOLOR	700	#ifndef NO_CURSORCOLOR
713	case Color_cursor2:	701	case Color_cursor2:
714	xcol = pix_colors[Color_fg];	702	#endif
715	break;
716	#endif /* ! NO_CURSORCOLOR */
717	case Color_pointer_fg:	703	case Color_pointer_fg:
718	xcol = pix_colors[Color_fg];	704	name = rs[Rs_color + Color_fg];
		705	xcol.set (this, name);
719	break;	706	break;
720	default:	707	default:
721	xcol = pix_colors[Color_bg]; /* None */	708	name = rs[Rs_color + Color_bg];
		709	xcol.set (this, name);
722	break;	710	break;
723	}	711	}
724	}	712	}
725	}	713	}
726		714
727	pix_colors[i] = xcol;	715	pix_colors[i] = xcol;
728	SET_PIXCOLOR (i);	716	rs[Rs_color + i] = name;
729	}
730
731	#ifdef OFF_FOCUS_FADING
732	if (rs[Rs_fade])
733	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
734	pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
735	#endif
736
737	if (display->depth <= 2)
738	{	717	}
		718
		719	if (depth <= 2)
		720	{
739	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	721	if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
740	if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];	722	if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
741	if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];	723	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
742	}	724	}
743		725
744	/*	726	/*
745	* get scrollBar shadow colors	727	* get scrollBar shadow colors
746	*	728	*
747	* The calculations of topShadow/bottomShadow values are adapted	729	* The calculations of topShadow/bottomShadow values are adapted
748	* from the fvwm window manager.	730	* from the fvwm window manager.
749	*/	731	*/
750	#ifdef KEEP_SCROLLCOLOR	732	#ifdef KEEP_SCROLLCOLOR
751
752	if (display->depth <= 2)	733	if (depth <= 2)
753	{	734	{
754	/* Monochrome */	735	/* Monochrome */
755	pix_colors[Color_scroll] = pix_colors[Color_fg];	736	alias_color (Color_scroll, Color_fg);
756	pix_colors[Color_topShadow] = pix_colors[Color_bg];	737	alias_color (Color_topShadow, Color_bg);
757	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	738	alias_color (Color_bottomShadow, Color_bg);
758	}	739	}
759	else	740	else
760	{	741	{
761	rxvt_color xcol[2];	742	pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
762	/* xcol[0] == white
763	* xcol[1] == top shadow
764	* xcol[2] == bot shadow */
765		743
766	xcol[1] = pix_colors[Color_scroll];	744	rgba cscroll;
767	xcol[0].set (display, 65535, 65535, 65535);	745	pix_colors [Color_scroll].get (cscroll);
768
769	unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
770
771	xcol[0].get (display, pr0, pg0, pb0);
772	xcol[1].get (display, pr1, pg1, pb1);
773
774	pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
775		746
776	/* topShadowColor */	747	/* topShadowColor */
777	if (!xcol[1].set (display,	748	if (!pix_colors[Color_topShadow].set (this,
778	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	749	rgba (
779	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	750	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
780	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	751	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
781	xcol[1] = pix_colors[Color_White];	752	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
782		753	cscroll.a)
783	pix_colors[Color_topShadow] = xcol[1];	754	))
		755	alias_color (Color_topShadow, Color_White);
784	}	756	}
785	#endif /* KEEP_SCROLLCOLOR */	757	#endif /* KEEP_SCROLLCOLOR */
		758
		759	#ifdef OFF_FOCUS_FADING
		760	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		761	update_fade_color (i);
		762	#endif
786	}	763	}
787		764
788	/----------------------------------------------------------------------/	765	/----------------------------------------------------------------------/
789	/* color aliases, fg/bg bright-bold */	766	/* color aliases, fg/bg bright-bold */
790	void	767	void
…		…
829		806
830	if (rsmod	807	if (rsmod
831	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	808	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
832	requestedmeta = rsmod[3] - '0';	809	requestedmeta = rsmod[3] - '0';
833		810
834	map = XGetModifierMapping (display->display);	811	map = XGetModifierMapping (dpy);
835	kc = map->modifiermap;	812	kc = map->modifiermap;
836		813
837	for (i = 1; i < 6; i++)	814	for (i = 1; i < 6; i++)
838	{	815	{
839	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	816	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
841	for (j = map->max_keypermod; j--; k++)	818	for (j = map->max_keypermod; j--; k++)
842	{	819	{
843	if (kc[k] == 0)	820	if (kc[k] == 0)
844	break;	821	break;
845		822
846	switch (XKeycodeToKeysym (display->display, kc[k], 0))	823	switch (XKeycodeToKeysym (dpy, kc[k], 0))
847	{	824	{
848	case XK_Num_Lock:	825	case XK_Num_Lock:
849	ModNumLockMask = modmasks[i - 1];	826	ModNumLockMask = modmasks[i - 1];
850	continue;	827	continue;
851		828
…		…
901	rxvt_term::create_windows (int argc, const char const argv)	878	rxvt_term::create_windows (int argc, const char const argv)
902	{	879	{
903	XClassHint classHint;	880	XClassHint classHint;
904	XWMHints wmHint;	881	XWMHints wmHint;
905	#if ENABLE_FRILLS	882	#if ENABLE_FRILLS
906	Atom prop = None;
907	MWMHints mwmhints;	883	MWMHints mwmhints;
908	#endif	884	#endif
909	XGCValues gcvalue;	885	XGCValues gcvalue;
910	XSetWindowAttributes attributes;	886	XSetWindowAttributes attributes;
911	XWindowAttributes gattr;
912	Window top, parent;	887	Window top, parent;
913	dDisp;
914		888
915	#ifdef USING_W11LIB	889	dLocal (Display *, dpy);
916	/* enable W11 callbacks */
917	W11AddEventHandler (disp, rxvt_W11_process_x_event);
918	#endif
919
920	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
921	XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
922
923	if (OPTION (Opt_transparent))
924	{
925	XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
926	display->depth = gattr.depth; // doh //TODO, per-term not per-display?
927	}
928		890
929	/* grab colors before netscape does */	891	/* grab colors before netscape does */
930	Get_Colours ();	892	Get_Colours ();
931		893
932	if (!set_fonts ())	894	if (!set_fonts ())
933	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	895	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
934		896
935	parent = DefaultRootWindow (disp);	897	parent = display->root;
936		898
937	attributes.override_redirect = !!OPTION (Opt_override_redirect);	899	attributes.override_redirect = !!option (Opt_override_redirect);
938		900
939	#if ENABLE_FRILLS	901	#if ENABLE_FRILLS
940	if (OPTION (Opt_borderLess))	902	if (option (Opt_borderLess))
941	{	903	{
942	prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);	904	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
943
944	if (prop == None)
945	{	905	{
946	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	906	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
947	attributes.override_redirect = TRUE;	907	attributes.override_redirect = true;
948	mwmhints.flags = 0;	908	mwmhints.flags = 0;
949	}	909	}
950	else	910	else
951	{	911	{
952	mwmhints.flags = MWM_HINTS_DECORATIONS;	912	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
962	{	922	{
963	XWindowAttributes wattr;	923	XWindowAttributes wattr;
964		924
965	parent = strtol (rs[Rs_embed], 0, 0);	925	parent = strtol (rs[Rs_embed], 0, 0);
966		926
967	if (!XGetWindowAttributes (disp, parent, &wattr))	927	if (!XGetWindowAttributes (dpy, parent, &wattr))
968	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	928	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
969		929
970	window_calc (wattr.width, wattr.height);	930	window_calc (wattr.width, wattr.height);
971	}	931	}
972	#endif	932	#endif
973		933
974	window_calc (0, 0);	934	window_calc (0, 0);
975		935
976	/* sub-window placement & size in rxvt_resize_subwindows () */	936	/* sub-window placement & size in rxvt_resize_subwindows () */
977	attributes.background_pixel = pix_colors_focused[Color_border];	937	attributes.background_pixel = pix_colors_focused [Color_border];
978	attributes.border_pixel = pix_colors_focused[Color_border];	938	attributes.border_pixel = pix_colors_focused [Color_border];
979	attributes.colormap = display->cmap;	939	attributes.colormap = cmap;
		940
980	top = XCreateWindow (disp, parent,	941	top = XCreateWindow (dpy, parent,
981	szHint.x, szHint.y,	942	szHint.x, szHint.y,
982	szHint.width, szHint.height,	943	szHint.width, szHint.height,
983	ext_bwidth,	944	ext_bwidth,
984	display->depth, InputOutput,	945	depth, InputOutput, visual,
985	display->visual,
986	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	946	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
987	&attributes);	947	&attributes);
988		948
989	this->parent[0] = top;	949	this->parent[0] = top;
990		950
991	old_width = szHint.width;	951	old_width = szHint.width;
992	old_height = szHint.height;	952	old_height = szHint.height;
993		953
994	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	954	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
995	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	955	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
996		956
997	classHint.res_name = (char *)rs[Rs_name];	957	classHint.res_name = (char *)rs[Rs_name];
998	classHint.res_class = (char *)RESCLASS;	958	classHint.res_class = (char *)RESCLASS;
999		959
1000	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	960	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1001	wmHint.input = True;	961	wmHint.input = True;
1002	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	962	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1003	wmHint.window_group = top;	963	wmHint.window_group = top;
1004		964
1005	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	965	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1006	&szHint, &wmHint, &classHint);	966	&szHint, &wmHint, &classHint);
		967
		968	#if ENABLE_FRILLS
		969	if (mwmhints.flags)
		970	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		971	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		972	#endif
1007		973
1008	Atom protocols[] = {	974	Atom protocols[] = {
1009	xa[XA_WM_DELETE_WINDOW],	975	xa[XA_WM_DELETE_WINDOW],
1010	#if ENABLE_EWMH	976	#if ENABLE_EWMH
1011	xa[XA_NET_WM_PING],	977	xa[XA_NET_WM_PING],
1012	#endif	978	#endif
1013	};	979	};
1014		980
1015	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	981	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1016		982
1017	#if ENABLE_FRILLS	983	#if ENABLE_FRILLS
1018	if (rs[Rs_transient_for])	984	if (rs[Rs_transient_for])
1019	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	985	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1020	#endif	986	#endif
1021		987
1022	#if ENABLE_EWMH	988	#if ENABLE_EWMH
1023	long pid = getpid ();	989	long pid = getpid ();
1024		990
1025	XChangeProperty (disp, top,	991	XChangeProperty (dpy, top,
1026	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	992	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027	PropModeReplace, (unsigned char *)&pid, 1);	993	PropModeReplace, (unsigned char *)&pid, 1);
1028		994
1029	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	995	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1030	#endif	996	#endif
1031		997
1032	XSelectInput (disp, top,	998	XSelectInput (dpy, top,
1033	KeyPressMask	999	KeyPressMask
1034	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1000	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1035	\| KeyReleaseMask	1001	\| KeyReleaseMask
1036	#endif	1002	#endif
1037	\| FocusChangeMask \| VisibilityChangeMask	1003	\| FocusChangeMask \| VisibilityChangeMask
1038	\| ExposureMask \| StructureNotifyMask);	1004	\| ExposureMask \| StructureNotifyMask);
1039		1005
1040	termwin_ev.start (display, top);	1006	termwin_ev.start (display, top);
1041		1007
1042	#if ENABLE_FRILLS
1043	if (mwmhints.flags)
1044	XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1045	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1046	#endif
1047
1048	/* vt cursor: Black-on-White is standard, but this is more popular */	1008	/* vt cursor: Black-on-White is standard, but this is more popular */
1049	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1009	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1050		1010
1051	#ifdef HAVE_SCROLLBARS	1011	#ifdef HAVE_SCROLLBARS
1052	/* cursor scrollBar: Black-on-White */	1012	/* cursor scrollBar: Black-on-White */
1053	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1013	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1054	#endif	1014	#endif
1055		1015
1056	/* the vt window */	1016	/* the vt window */
1057	vt = XCreateSimpleWindow (disp, top,	1017	vt = XCreateSimpleWindow (dpy, top,
1058	window_vt_x,
1059	window_vt_y,	1018	window_vt_x, window_vt_y,
1060	width,
1061	height,	1019	width, height,
1062	0,	1020	0,
1063	pix_colors_focused[Color_fg],	1021	pix_colors_focused[Color_fg],
1064	pix_colors_focused[Color_bg]);	1022	pix_colors_focused[Color_bg]);
1065	#ifdef DEBUG_X
1066	XStoreName (disp, vt, "vt window");
1067	#endif
1068		1023
1069	attributes.bit_gravity = NorthWestGravity;	1024	attributes.bit_gravity = NorthWestGravity;
1070	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1025	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1071		1026
1072	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1027	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1073		1028
1074	if (OPTION (Opt_pointerBlank))	1029	if (option (Opt_pointerBlank))
1075	vt_emask \|= PointerMotionMask;	1030	vt_emask \|= PointerMotionMask;
1076	else	1031	else
1077	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1032	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1078		1033
1079	vt_select_input ();	1034	vt_select_input ();
1080		1035
1081	vt_ev.start (display, vt);	1036	vt_ev.start (display, vt);
1082		1037
1083	#ifdef XPM_BACKGROUND	1038	#ifdef XPM_BACKGROUND
1084	if (rs[Rs_backgroundPixmap] != NULL	1039	if (rs[Rs_backgroundPixmap] != NULL
		1040	#ifndef HAVE_AFTERIMAGE
1085	&& ! OPTION (Opt_transparent))	1041	&& !option (Opt_transparent)
		1042	#endif
		1043	)
1086	{	1044	{
1087	const char *p = rs[Rs_backgroundPixmap];	1045	const char *p = rs[Rs_backgroundPixmap];
1088		1046
1089	if ((p = strchr (p, ';')) != NULL)	1047	if ((p = strchr (p, ';')) != NULL)
1090	{	1048	{
…		…
1096	scr_touch (true);	1054	scr_touch (true);
1097	}	1055	}
1098	#endif	1056	#endif
1099		1057
1100	/* graphics context for the vt window */	1058	/* graphics context for the vt window */
1101	gcvalue.foreground = pix_colors[Color_fg];	1059	gcvalue.foreground = pix_colors[Color_fg];
1102	gcvalue.background = pix_colors[Color_bg];	1060	gcvalue.background = pix_colors[Color_bg];
1103	gcvalue.graphics_exposures = 1;	1061	gcvalue.graphics_exposures = 0;
		1062
1104	gc = XCreateGC (disp, vt,	1063	gc = XCreateGC (dpy, vt,
1105	GCForeground \| GCBackground \| GCGraphicsExposures,	1064	GCForeground \| GCBackground \| GCGraphicsExposures,
1106	&gcvalue);	1065	&gcvalue);
1107		1066
1108	drawable = new rxvt_drawable (display, vt);	1067	drawable = new rxvt_drawable (this, vt);
1109		1068
1110	#ifdef RXVT_SCROLLBAR	1069	#ifdef RXVT_SCROLLBAR
1111	gcvalue.foreground = pix_colors[Color_topShadow];	1070	gcvalue.foreground = pix_colors[Color_topShadow];
1112	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1071	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1113	gcvalue.foreground = pix_colors[Color_bottomShadow];	1072	gcvalue.foreground = pix_colors[Color_bottomShadow];
1114	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1073	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1074	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1116	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1075	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117	#endif	1076	#endif
1118		1077
1119	#ifdef OFF_FOCUS_FADING	1078	#ifdef OFF_FOCUS_FADING
1120	// initially we are in unfocused state	1079	// initially we are in unfocused state
1121	if (rs[Rs_fade])	1080	if (rs[Rs_fade])
1122	pix_colors = pix_colors_unfocused;	1081	pix_colors = pix_colors_unfocused;
1123	#endif	1082	#endif
1124		1083
1125	pointer_unblank ();	1084	pointer_unblank ();
1126	scr_recolour ();	1085	scr_recolour ();
1127
1128	#if ENABLE_XEMBED
1129	if (rs[Rs_embed])
1130	{
1131	long info[2] = { 0, XEMBED_MAPPED };
1132
1133	XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1134	32, PropModeReplace, (unsigned char *)&info, 2);
1135	}
1136	#endif
1137	}	1086	}
1138		1087
1139	/* ------------------------------------------------------------------------- *	1088	/* ------------------------------------------------------------------------- *
1140	* GET TTY CURRENT STATE *	1089	* GET TTY CURRENT STATE *
1141	* ------------------------------------------------------------------------- */	1090	* ------------------------------------------------------------------------- */
1142	void	1091	void
1143	rxvt_get_ttymode (ttymode_t *tio, int erase)	1092	rxvt_get_ttymode (ttymode_t *tio, int erase)
1144	{	1093	{
1145	#ifdef HAVE_TERMIOS_H
1146	/*	1094	/*
1147	* standard System V termios interface	1095	* standard System V termios interface
1148	*/	1096	*/
1149	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1097	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1150	{	1098	{
…		…
1217	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1165	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1218	# if defined (ECHOCTL) && defined (ECHOKE)	1166	# if defined (ECHOCTL) && defined (ECHOKE)
1219	\| ECHOCTL \| ECHOKE	1167	\| ECHOCTL \| ECHOKE
1220	# endif	1168	# endif
1221	\| ECHOE \| ECHOK);	1169	\| ECHOE \| ECHOK);
1222	# else /* HAVE_TERMIOS_H */
1223
1224	/*
1225	* sgtty interface
1226	*/
1227
1228	/* get parameters -- gtty */
1229	if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1230	{
1231	tio->sg.sg_erase = CERASE; /* ^H */
1232	tio->sg.sg_kill = CKILL; /* ^U */
1233	}
1234
1235	if (erase != -1)
1236	tio->sg.sg_erase = (char)erase;
1237
1238	tio->sg.sg_flags = (CRMOD \| ECHO \| EVENP \| ODDP);
1239
1240	/* get special characters */
1241	if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1242	{
1243	tio->tc.t_intrc = CINTR; /* ^C */
1244	tio->tc.t_quitc = CQUIT; /* ^\ */
1245	tio->tc.t_startc = CSTART; /* ^Q */
1246	tio->tc.t_stopc = CSTOP; /* ^S */
1247	tio->tc.t_eofc = CEOF; /* ^D */
1248	tio->tc.t_brkc = -1;
1249	}
1250
1251	/* get local special chars */
1252	if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1253	{
1254	tio->lc.t_suspc = CSUSP; /* ^Z */
1255	tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1256	tio->lc.t_rprntc = CRPRNT; /* ^R */
1257	tio->lc.t_flushc = CFLUSH; /* ^O */
1258	tio->lc.t_werasc = CWERASE; /* ^W */
1259	tio->lc.t_lnextc = CLNEXT; /* ^V */
1260	}
1261	/* get line discipline */
1262	ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1263	# ifdef NTTYDISC
1264	tio->line = NTTYDISC;
1265	# endif /* NTTYDISC */
1266
1267	tio->local = (LCRTBS \| LCRTERA \| LCTLECH \| LPASS8 \| LCRTKIL);
1268	#endif /* HAVE_TERMIOS_H */
1269		1170
1270	/*	1171	/*
1271	* Debugging	1172	* Debugging
1272	*/	1173	*/
1273	#ifdef DEBUG_TTYMODE	1174	#ifdef DEBUG_TTYMODE
…		…
1374	else	1275	else
1375	#endif	1276	#endif
1376	if (!pty->get ())	1277	if (!pty->get ())
1377	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1278	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1378		1279
1379	pty->set_utf8_mode (enc_utf8);
1380
1381	/* set initial window size */
1382	tt_winch ();
1383
1384	int er;	1280	int er;
1385		1281
1386	#ifndef NO_BACKSPACE_KEY	1282	#ifndef NO_BACKSPACE_KEY
1387	if (key_backspace[0] && !key_backspace[1])	1283	if (key_backspace[0] && !key_backspace[1])
1388	er = key_backspace[0];	1284	er = key_backspace[0];
…		…
1391	else	1287	else
1392	#endif	1288	#endif
1393	er = -1;	1289	er = -1;
1394		1290
1395	rxvt_get_ttymode (&tio, er);	1291	rxvt_get_ttymode (&tio, er);
		1292	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
		1293	pty->set_utf8_mode (enc_utf8);
		1294
		1295	/* set initial window size */
		1296	tt_winch ();
1396		1297
1397	#if ENABLE_FRILLS	1298	#if ENABLE_FRILLS
1398	if (rs[Rs_pty_fd])	1299	if (rs[Rs_pty_fd])
1399	return;	1300	return;
1400	#endif	1301	#endif
…		…
1431	}	1332	}
1432		1333
1433	_exit (EXIT_FAILURE);	1334	_exit (EXIT_FAILURE);
1434		1335
1435	default:	1336	default:
1436	#if UTMP_SUPPORT
1437	if (!OPTION (Opt_utmpInhibit))	1337	if (!option (Opt_utmpInhibit))
1438	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1338	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1439	#endif
1440		1339
1441	pty->close_tty ();	1340	pty->close_tty ();
1442		1341
1443	child_ev.start (cmd_pid);	1342	child_ev.start (cmd_pid);
1444		1343
…		…
1457	int	1356	int
1458	rxvt_term::run_child (const char const argv)	1357	rxvt_term::run_child (const char const argv)
1459	{	1358	{
1460	char *login;	1359	char *login;
1461		1360
1462	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1463
1464	if (OPTION (Opt_console))	1361	if (option (Opt_console))
1465	{ /* be virtual console, fail silently */	1362	{ /* be virtual console, fail silently */
1466	#ifdef TIOCCONS	1363	#ifdef TIOCCONS
1467	unsigned int on = 1;	1364	unsigned int on = 1;
1468		1365
1469	ioctl (STDIN_FILENO, TIOCCONS, &on);	1366	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1518	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1415	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1519	shell = "/bin/sh";	1416	shell = "/bin/sh";
1520		1417
1521	argv0 = (const char *)rxvt_r_basename (shell);	1418	argv0 = (const char *)rxvt_r_basename (shell);
1522		1419
1523	if (OPTION (Opt_loginShell))	1420	if (option (Opt_loginShell))
1524	{	1421	{
1525	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1422	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1526		1423
1527	login[0] = '-';	1424	login[0] = '-';
1528	strcpy (&login[1], argv0);	1425	strcpy (&login[1], argv0);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC vs. Revision 1.187 by root, Mon Jun 18 12:53:26 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.187 by root, Mon Jun 18 12:53:26 2007 UTC