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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.152 by root, Sat Jan 21 22:38:05 2006 UTC vs.
Revision 1.201 by ayin, Fri Aug 3 23:32:14 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",
…		…
166	#endif	166	#endif
167	#ifdef KEEP_SCROLLCOLOR	167	#ifdef KEEP_SCROLLCOLOR
168	COLOR_SCROLLBAR,	168	COLOR_SCROLLBAR,
169	COLOR_SCROLLTROUGH,	169	COLOR_SCROLLTROUGH,
170	#endif /* KEEP_SCROLLCOLOR */	170	#endif /* KEEP_SCROLLCOLOR */
171	#if TINTING	171	#if ENABLE_TRANSPARENCY
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		187
223	if (pix_colors == NULL)
224	return false;
225
226	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
227	pixmap = None;
228	#endif
229		188
230	MEvent.time = CurrentTime;	189	MEvent.time = CurrentTime;
231	MEvent.button = AnyButton;	190	MEvent.button = AnyButton;
232	options = DEFAULT_OPTIONS;
233	want_refresh = 1;	191	want_refresh = 1;
234	priv_modes = SavedModes = PrivMode_Default;	192	priv_modes = SavedModes = PrivMode_Default;
235	focus = 0;
236	ncol = 80;	193	ncol = 80;
237	nrow = 24;	194	nrow = 24;
238	int_bwidth = INTERNALBORDERWIDTH;	195	int_bwidth = INTERNALBORDERWIDTH;
239	ext_bwidth = EXTERNALBORDERWIDTH;	196	ext_bwidth = EXTERNALBORDERWIDTH;
240	lineSpace = LINESPACE;	197	lineSpace = LINESPACE;
241	saveLines = SAVELINES;	198	saveLines = SAVELINES;
242	numpix_colors = TOTAL_COLORS;	199	numpix_colors = TOTAL_COLORS;
243		200
244	refresh_limit = 1;
245	refresh_type = SLOW_REFRESH;	201	refresh_type = SLOW_REFRESH;
246	prev_nrow = prev_ncol = 0;
247		202
248	oldcursor.row = oldcursor.col = -1;	203	oldcursor.row = oldcursor.col = -1;
		204	#ifdef HAVE_BG_PIXMAP
		205	#ifdef HAVE_AFTERIMAGE
		206	bgPixmap.original_asim = NULL;
		207	#endif
		208	/* bgPixmap.w = bgPixmap.h = 0; */
249	#ifdef XPM_BACKGROUND	209	#ifdef XPM_BACKGROUND
250	/* bgPixmap.w = bgPixmap.h = 0; */
251	bgPixmap.x = bgPixmap.y = 50;	210	bgPixmap.h_scale = bgPixmap.v_scale = 0;
		211	bgPixmap.h_align = bgPixmap.v_align = 0;
		212	#endif
		213	bgPixmap.flags = 0;
252	bgPixmap.pixmap = None;	214	bgPixmap.pixmap = None;
253	#endif	215	#endif
254		216
255	last_bot = last_state = -1;	217	last_bot = last_state = -1;
		218
		219	set_option (Opt_scrollBar);
		220	set_option (Opt_scrollTtyOutput);
		221	set_option (Opt_jumpScroll);
		222	set_option (Opt_skipScroll);
		223	set_option (Opt_secondaryScreen);
		224	set_option (Opt_secondaryScroll);
		225	set_option (Opt_pastableTabs);
		226	set_option (Opt_intensityStyles);
		227	set_option (Opt_iso14755_52);
256		228
257	return true;	229	return true;
258	}	230	}
259		231
260	void	232	void
…		…
298	int i, r_argc;	270	int i, r_argc;
299	char *val;	271	char *val;
300	const char cmd_argv, r_argv;	272	const char cmd_argv, r_argv;
301		273
302	/*	274	/*
303	* Look for -exec option. Find => split and make cmd_argv[] of command args	275	* Look for -e option. Find => split and make cmd_argv[] of command args
304	*/	276	*/
305	for (r_argc = 0; r_argc < argc; r_argc++)	277	for (r_argc = 0; r_argc < argc; r_argc++)
306	if (!strcmp (argv[r_argc], "-e") \|\| !strcmp (argv[r_argc], "-exec"))	278	if (!strcmp (argv[r_argc], "-e"))
307	break;	279	break;
308		280
309	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));	281	r_argv = (const char *)rxvt_malloc (sizeof (char ) * (r_argc + 1));
310		282
311	for (i = 0; i < r_argc; i++)	283	for (i = 0; i < r_argc; i++)
…		…
337	get_options (r_argc, r_argv);	309	get_options (r_argc, r_argv);
338		310
339	if (!(display = displays.get (rs[Rs_display_name])))	311	if (!(display = displays.get (rs[Rs_display_name])))
340	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);	312	rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341		313
		314	// using a local pointer decreases code size a lot
		315	xa = display->xa;
		316
		317	set (display);
342	extract_resources ();	318	extract_resources ();
343		319
		320	#if XFT
		321	if (rs[Rs_depth])
		322	select_visual (strtol (rs[Rs_depth], 0, 0));
		323	#endif
		324
		325	#ifdef HAVE_AFTERIMAGE
		326	asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
		327	#endif
344	free (r_argv);	328	free (r_argv);
		329
		330	for (int i = NUM_RESOURCES; i--; )
		331	if (rs [i] == resval_undef)
		332	rs [i] = 0;
345		333
346	#if ENABLE_PERL	334	#if ENABLE_PERL
347	if (!rs[Rs_perl_ext_1])	335	if (!rs[Rs_perl_ext_1])
348	rs[Rs_perl_ext_1] = "default";	336	rs[Rs_perl_ext_1] = "default";
349		337
…		…
448	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);	436	setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449	#endif	437	#endif
450		438
451	#ifdef XTERM_REVERSE_VIDEO	439	#ifdef XTERM_REVERSE_VIDEO
452	/* this is how xterm implements reverseVideo */	440	/* this is how xterm implements reverseVideo */
453	if (OPTION (Opt_reverseVideo))	441	if (option (Opt_reverseVideo))
454	{	442	{
455	if (!rs[Rs_color + Color_fg])	443	if (!rs[Rs_color + Color_fg])
456	rs[Rs_color + Color_fg] = def_colorName[Color_bg];	444	rs[Rs_color + Color_fg] = def_colorName[Color_bg];
		445
457	if (!rs[Rs_color + Color_bg])	446	if (!rs[Rs_color + Color_bg])
458	rs[Rs_color + Color_bg] = def_colorName[Color_fg];	447	rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459	}	448	}
460	#endif	449	#endif
461		450
…		…
463	if (!rs[Rs_color + i])	452	if (!rs[Rs_color + i])
464	rs[Rs_color + i] = def_colorName[i];	453	rs[Rs_color + i] = def_colorName[i];
465		454
466	#ifndef XTERM_REVERSE_VIDEO	455	#ifndef XTERM_REVERSE_VIDEO
467	/* this is how we implement reverseVideo */	456	/* this is how we implement reverseVideo */
468	if (OPTION (Opt_reverseVideo))	457	if (option (Opt_reverseVideo))
469	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);	458	::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470	#endif	459	#endif
471		460
472	/* convenient aliases for setting fg/bg to colors */	461	/* convenient aliases for setting fg/bg to colors */
473	color_aliases (Color_fg);	462	color_aliases (Color_fg);
…		…
513	val = rxvt_network_display (rs[Rs_display_name]);	502	val = rxvt_network_display (rs[Rs_display_name]);
514	rs[Rs_display_name] = (const char *)val;	503	rs[Rs_display_name] = (const char *)val;
515		504
516	if (val == NULL)	505	if (val == NULL)
517	#endif /* DISPLAY_IS_IP */	506	#endif /* DISPLAY_IS_IP */
518	val = XDisplayString (display->display);	507	val = XDisplayString (dpy);
519		508
520	if (rs[Rs_display_name] == NULL)	509	if (rs[Rs_display_name] == NULL)
521	rs[Rs_display_name] = val; /* use broken `:0' value */	510	rs[Rs_display_name] = val; /* use broken `:0' value */
522		511
523	i = strlen (val);	512	i = strlen (val);
524	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));	513	env_display = (char )rxvt_malloc ((i + 9) sizeof (char));
525		514
526	sprintf (env_display, "DISPLAY=%s", val);	515	sprintf (env_display, "DISPLAY=%s", val);
527		516
528	/* avoiding the math library:	517	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		518
538	/* add entries to the environment:	519	/* add entries to the environment:
539	* @ DISPLAY: in case we started with -display	520	* @ DISPLAY: in case we started with -display
540	* @ WINDOWID: X window id number of the window	521	* @ WINDOWID: X window id number of the window
541	* @ COLORTERM: terminal sub-name and also indicates its color	522	* @ COLORTERM: terminal sub-name and also indicates its color
…		…
543	* @ TERMINFO: path to terminfo directory	524	* @ TERMINFO: path to terminfo directory
544	* @ COLORFGBG: fg;bg color codes	525	* @ COLORFGBG: fg;bg color codes
545	*/	526	*/
546	putenv (env_display);	527	putenv (env_display);
547	putenv (env_windowid);	528	putenv (env_windowid);
		529
548	if (env_colorfgbg)	530	if (env_colorfgbg)
549	putenv (env_colorfgbg);	531	putenv (env_colorfgbg);
550		532
551	#ifdef RXVT_TERMINFO	533	#ifdef RXVT_TERMINFO
552	putenv ("TERMINFO=" RXVT_TERMINFO);	534	putenv ("TERMINFO=" RXVT_TERMINFO);
553	#endif	535	#endif
554		536
555	if (display->depth <= 2)	537	if (depth <= 2)
556	putenv ("COLORTERM=" COLORTERMENV "-mono");	538	putenv ("COLORTERM=" COLORTERMENV "-mono");
557	else	539	else
558	putenv ("COLORTERM=" COLORTERMENVFULL);	540	putenv ("COLORTERM=" COLORTERMENVFULL);
559		541
560	if (rs[Rs_term_name] != NULL)	542	if (rs[Rs_term_name] != NULL)
…		…
654	* Initialize the command connection.	636	* Initialize the command connection.
655	* This should be called after the X server connection is established.	637	* This should be called after the X server connection is established.
656	*/	638	*/
657		639
658	#ifdef META8_OPTION	640	#ifdef META8_OPTION
659	meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;	641	meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660	#endif	642	#endif
661		643
662	get_ourmods ();	644	get_ourmods ();
663		645
664	if (!OPTION (Opt_scrollTtyOutput))	646	if (!option (Opt_scrollTtyOutput))
665	priv_modes \|= PrivMode_TtyOutputInh;	647	priv_modes \|= PrivMode_TtyOutputInh;
666	if (OPTION (Opt_scrollTtyKeypress))	648	if (option (Opt_scrollTtyKeypress))
667	priv_modes \|= PrivMode_Keypress;	649	priv_modes \|= PrivMode_Keypress;
668	if (!OPTION (Opt_jumpScroll))	650	if (!option (Opt_jumpScroll))
669	priv_modes \|= PrivMode_smoothScroll;	651	priv_modes \|= PrivMode_smoothScroll;
670		652
671	#ifndef NO_BACKSPACE_KEY	653	#ifndef NO_BACKSPACE_KEY
672	if (strcmp (key_backspace, "DEC") == 0)	654	if (strcmp (key_backspace, "DEC") == 0)
673	priv_modes \|= PrivMode_HaveBackSpace;	655	priv_modes \|= PrivMode_HaveBackSpace;
…		…
691		673
692	#ifdef OFF_FOCUS_FADING	674	#ifdef OFF_FOCUS_FADING
693	pix_colors = pix_colors_focused;	675	pix_colors = pix_colors_focused;
694	#endif	676	#endif
695		677
696	for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)	678	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697	{	679	{
		680	const char *name = rs[Rs_color + i];
		681
		682	if (!name)
		683	continue;
		684
698	rxvt_color xcol;	685	rxvt_color xcol;
699		686
700	if (!rs[Rs_color + i])	687	if (!set_color (xcol, name))
701	continue;
702
703	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704	{	688	{
705	#ifndef XTERM_REVERSE_VIDEO	689	#ifndef XTERM_REVERSE_VIDEO
706	if (i < 2 && OPTION (Opt_reverseVideo))	690	if (i < 2 && option (Opt_reverseVideo))
707	rs[Rs_color + i] = def_colorName[!i];	691	name = def_colorName [1 - i];
708	else	692	else
709	#endif	693	#endif
710	rs[Rs_color + i] = def_colorName[i];	694	name = def_colorName [i];
711		695
712	if (!rs[Rs_color + i])	696	if (!name)
713	continue;	697	continue;
714		698
715	if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))	699	if (!set_color (xcol, name))
716	{	700	{
717	switch (i)	701	switch (i)
718	{	702	{
719	case Color_fg:	703	case Color_fg:
720	case Color_bg:	704	case Color_bg:
721	/* fatal: need bg/fg color */
722	rxvt_fatal ("unable to get foreground/background colour, aborting.\n");	705	rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723	/* NOTREACHED */	706	name = "";
724	break;	707	break;
725	#ifndef NO_CURSORCOLOR	708	#ifndef NO_CURSORCOLOR
726	case Color_cursor2:	709	case Color_cursor2:
727	xcol = pix_colors[Color_fg];	710	#endif
728	break;
729	#endif /* ! NO_CURSORCOLOR */
730	case Color_pointer_fg:	711	case Color_pointer_fg:
731	xcol = pix_colors[Color_fg];	712	name = rs[Rs_color + Color_fg];
		713	xcol.set (this, name);
732	break;	714	break;
733	default:	715	default:
734	xcol = pix_colors[Color_bg]; /* None */	716	name = rs[Rs_color + Color_bg];
		717	xcol.set (this, name);
735	break;	718	break;
736	}	719	}
737	}	720	}
738	}	721	}
739		722
740	pix_colors[i] = xcol;	723	pix_colors[i] = xcol;
741	SET_PIXCOLOR (i);	724	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	{	725	}
		726
		727	if (depth <= 2)
		728	{
752	if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];	729	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];	730	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];	731	if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755	}	732	}
756		733
757	/*	734	/*
758	* get scrollBar shadow colors	735	* get scrollBar shadow colors
759	*	736	*
760	* The calculations of topShadow/bottomShadow values are adapted	737	* The calculations of topShadow/bottomShadow values are adapted
761	* from the fvwm window manager.	738	* from the fvwm window manager.
762	*/	739	*/
763	#ifdef KEEP_SCROLLCOLOR	740	#ifdef KEEP_SCROLLCOLOR
764
765	if (display->depth <= 2)	741	if (depth <= 2)
766	{	742	{
767	/* Monochrome */	743	/* Monochrome */
768	pix_colors[Color_scroll] = pix_colors[Color_fg];	744	alias_color (Color_scroll, Color_fg);
769	pix_colors[Color_topShadow] = pix_colors[Color_bg];	745	alias_color (Color_topShadow, Color_bg);
770	pix_colors[Color_bottomShadow] = pix_colors[Color_bg];	746	alias_color (Color_bottomShadow, Color_bg);
771	}	747	}
772	else	748	else
773	{	749	{
774	rxvt_color xcol[2];	750	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		751
779	xcol[1] = pix_colors[Color_scroll];	752	rgba cscroll;
780	xcol[0].set (display, 65535, 65535, 65535);	753	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		754
789	/* topShadowColor */	755	/* topShadowColor */
790	if (!xcol[1].set (display,	756	if (!pix_colors[Color_topShadow].set (this,
791	min (pr0, max (pr0 / 5, pr1) * 7 / 5),	757	rgba (
792	min (pg0, max (pg0 / 5, pg1) * 7 / 5),	758	min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793	min (pb0, max (pb0 / 5, pb1) * 7 / 5)))	759	min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794	xcol[1] = pix_colors[Color_White];	760	min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795		761	cscroll.a)
796	pix_colors[Color_topShadow] = xcol[1];	762	))
		763	alias_color (Color_topShadow, Color_White);
797	}	764	}
798	#endif /* KEEP_SCROLLCOLOR */	765	#endif /* KEEP_SCROLLCOLOR */
		766
		767	#ifdef OFF_FOCUS_FADING
		768	for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
		769	update_fade_color (i);
		770	#endif
799	}	771	}
800		772
801	/----------------------------------------------------------------------/	773	/----------------------------------------------------------------------/
802	/* color aliases, fg/bg bright-bold */	774	/* color aliases, fg/bg bright-bold */
803	void	775	void
…		…
842		814
843	if (rsmod	815	if (rsmod
844	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)	816	&& strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845	requestedmeta = rsmod[3] - '0';	817	requestedmeta = rsmod[3] - '0';
846		818
847	map = XGetModifierMapping (display->display);	819	map = XGetModifierMapping (dpy);
848	kc = map->modifiermap;	820	kc = map->modifiermap;
849		821
850	for (i = 1; i < 6; i++)	822	for (i = 1; i < 6; i++)
851	{	823	{
852	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */	824	k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
…		…
854	for (j = map->max_keypermod; j--; k++)	826	for (j = map->max_keypermod; j--; k++)
855	{	827	{
856	if (kc[k] == 0)	828	if (kc[k] == 0)
857	break;	829	break;
858		830
859	switch (XKeycodeToKeysym (display->display, kc[k], 0))	831	switch (XKeycodeToKeysym (dpy, kc[k], 0))
860	{	832	{
861	case XK_Num_Lock:	833	case XK_Num_Lock:
862	ModNumLockMask = modmasks[i - 1];	834	ModNumLockMask = modmasks[i - 1];
863	continue;	835	continue;
864		836
…		…
914	rxvt_term::create_windows (int argc, const char const argv)	886	rxvt_term::create_windows (int argc, const char const argv)
915	{	887	{
916	XClassHint classHint;	888	XClassHint classHint;
917	XWMHints wmHint;	889	XWMHints wmHint;
918	#if ENABLE_FRILLS	890	#if ENABLE_FRILLS
919	Atom prop = None;
920	MWMHints mwmhints;	891	MWMHints mwmhints = { };
921	#endif	892	#endif
922	XGCValues gcvalue;	893	XGCValues gcvalue;
923	XSetWindowAttributes attributes;	894	XSetWindowAttributes attributes;
924	XWindowAttributes gattr;
925	Window top, parent;	895	Window top, parent;
926	dDisp;
927		896
928	#ifdef USING_W11LIB	897	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		898
942	/* grab colors before netscape does */	899	/* grab colors before netscape does */
943	Get_Colours ();	900	Get_Colours ();
944		901
945	if (!set_fonts ())	902	if (!set_fonts ())
946	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");	903	rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947		904
948	parent = DefaultRootWindow (disp);	905	parent = display->root;
949		906
950	attributes.override_redirect = !!OPTION (Opt_override_redirect);	907	attributes.override_redirect = !!option (Opt_override_redirect);
951		908
952	#if ENABLE_FRILLS	909	#if ENABLE_FRILLS
953	if (OPTION (Opt_borderLess))	910	if (option (Opt_borderLess))
954	{	911	{
955	prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);	912	if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957	if (prop == None)
958	{	913	{
959	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/	914	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
960	attributes.override_redirect = TRUE;	915	attributes.override_redirect = true;
961	mwmhints.flags = 0;	916	mwmhints.flags = 0;
962	}	917	}
963	else	918	else
964	{	919	{
965	mwmhints.flags = MWM_HINTS_DECORATIONS;	920	mwmhints.flags = MWM_HINTS_DECORATIONS;
…		…
975	{	930	{
976	XWindowAttributes wattr;	931	XWindowAttributes wattr;
977		932
978	parent = strtol (rs[Rs_embed], 0, 0);	933	parent = strtol (rs[Rs_embed], 0, 0);
979		934
980	if (!XGetWindowAttributes (disp, parent, &wattr))	935	if (!XGetWindowAttributes (dpy, parent, &wattr))
981	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");	936	rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982		937
983	window_calc (wattr.width, wattr.height);	938	window_calc (wattr.width, wattr.height);
984	}	939	}
985	#endif	940	#endif
986		941
987	window_calc (0, 0);	942	window_calc (0, 0);
988		943
989	/* sub-window placement & size in rxvt_resize_subwindows () */	944	/* sub-window placement & size in rxvt_resize_subwindows () */
990	attributes.background_pixel = pix_colors_focused[Color_border];	945	attributes.background_pixel = pix_colors_focused [Color_border];
991	attributes.border_pixel = pix_colors_focused[Color_border];	946	attributes.border_pixel = pix_colors_focused [Color_border];
992	attributes.colormap = display->cmap;	947	attributes.colormap = cmap;
		948
993	top = XCreateWindow (disp, parent,	949	top = XCreateWindow (dpy, parent,
994	szHint.x, szHint.y,	950	szHint.x, szHint.y,
995	szHint.width, szHint.height,	951	szHint.width, szHint.height,
996	ext_bwidth,	952	ext_bwidth,
997	display->depth, InputOutput,	953	depth, InputOutput, visual,
998	display->visual,
999	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,	954	CWColormap \| CWBackPixel \| CWBorderPixel \| CWOverrideRedirect,
1000	&attributes);	955	&attributes);
1001		956
1002	this->parent[0] = top;	957	this->parent[0] = top;
1003		958
1004	old_width = szHint.width;	959	old_width = szHint.width;
1005	old_height = szHint.height;	960	old_height = szHint.height;
1006		961
1007	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);	962	process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);	963	process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009		964
1010	classHint.res_name = (char *)rs[Rs_name];	965	classHint.res_name = (char *)rs[Rs_name];
1011	classHint.res_class = (char *)RESCLASS;	966	classHint.res_class = (char *)RESCLASS;
1012		967
1013	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;	968	wmHint.flags = InputHint \| StateHint \| WindowGroupHint;
1014	wmHint.input = True;	969	wmHint.input = True;
1015	wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;	970	wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016	wmHint.window_group = top;	971	wmHint.window_group = top;
1017		972
1018	XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,	973	XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019	&szHint, &wmHint, &classHint);	974	&szHint, &wmHint, &classHint);
		975
		976	#if ENABLE_FRILLS
		977	if (mwmhints.flags)
		978	XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
		979	PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
		980	#endif
1020		981
1021	Atom protocols[] = {	982	Atom protocols[] = {
1022	xa[XA_WM_DELETE_WINDOW],	983	xa[XA_WM_DELETE_WINDOW],
1023	#if ENABLE_EWMH	984	#if ENABLE_EWMH
1024	xa[XA_NET_WM_PING],	985	xa[XA_NET_WM_PING],
1025	#endif	986	#endif
1026	};	987	};
1027		988
1028	XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));	989	XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029		990
1030	#if ENABLE_FRILLS	991	#if ENABLE_FRILLS
1031	if (rs[Rs_transient_for])	992	if (rs[Rs_transient_for])
1032	XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));	993	XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033	#endif	994	#endif
1034		995
1035	#if ENABLE_EWMH	996	#if ENABLE_EWMH
1036	long pid = getpid ();	997	long pid = getpid ();
1037		998
1038	XChangeProperty (disp, top,	999	XChangeProperty (dpy, top,
1039	xa[XA_NET_WM_PID], XA_CARDINAL, 32,	1000	xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040	PropModeReplace, (unsigned char *)&pid, 1);	1001	PropModeReplace, (unsigned char *)&pid, 1);
1041		1002
1042	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default	1003	// _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043	#endif	1004	#endif
1044		1005
1045	XSelectInput (disp, top,	1006	XSelectInput (dpy, top,
1046	KeyPressMask	1007	KeyPressMask
1047	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755	1008	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ENABLE_FRILLS \|\| ISO_14755
1048	\| KeyReleaseMask	1009	\| KeyReleaseMask
1049	#endif	1010	#endif
1050	\| FocusChangeMask \| VisibilityChangeMask	1011	\| FocusChangeMask \| VisibilityChangeMask
1051	\| ExposureMask \| StructureNotifyMask);	1012	\| ExposureMask \| StructureNotifyMask);
1052		1013
1053	termwin_ev.start (display, top);	1014	termwin_ev.start (display, top);
1054		1015
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 */	1016	/* vt cursor: Black-on-White is standard, but this is more popular */
1062	TermWin_cursor = XCreateFontCursor (disp, XC_xterm);	1017	TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063		1018
1064	#ifdef HAVE_SCROLLBARS	1019	#ifdef HAVE_SCROLLBARS
1065	/* cursor scrollBar: Black-on-White */	1020	/* cursor scrollBar: Black-on-White */
1066	leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);	1021	leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067	#endif	1022	#endif
1068		1023
1069	/* the vt window */	1024	/* the vt window */
1070	vt = XCreateSimpleWindow (disp, top,	1025	vt = XCreateSimpleWindow (dpy, top,
1071	window_vt_x,
1072	window_vt_y,	1026	window_vt_x, window_vt_y,
1073	width,
1074	height,	1027	width, height,
1075	0,	1028	0,
1076	pix_colors_focused[Color_fg],	1029	pix_colors_focused[Color_fg],
1077	pix_colors_focused[Color_bg]);	1030	pix_colors_focused[Color_bg]);
1078	#ifdef DEBUG_X
1079	XStoreName (disp, vt, "vt window");
1080	#endif
1081		1031
1082	attributes.bit_gravity = NorthWestGravity;	1032	attributes.bit_gravity = NorthWestGravity;
1083	XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);	1033	XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084		1034
1085	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;	1035	vt_emask = ExposureMask \| ButtonPressMask \| ButtonReleaseMask \| PropertyChangeMask;
1086		1036
1087	if (OPTION (Opt_pointerBlank))	1037	if (option (Opt_pointerBlank))
1088	vt_emask \|= PointerMotionMask;	1038	vt_emask \|= PointerMotionMask;
1089	else	1039	else
1090	vt_emask \|= Button1MotionMask \| Button3MotionMask;	1040	vt_emask \|= Button1MotionMask \| Button3MotionMask;
1091		1041
1092	vt_select_input ();	1042	vt_select_input ();
1093		1043
1094	vt_ev.start (display, vt);	1044	vt_ev.start (display, vt);
1095		1045
1096	#ifdef XPM_BACKGROUND	1046	#ifdef XPM_BACKGROUND
1097	if (rs[Rs_backgroundPixmap] != NULL	1047	if (rs[Rs_backgroundPixmap] != NULL)
1098	&& ! OPTION (Opt_transparent))
1099	{	1048	{
1100	const char *p = rs[Rs_backgroundPixmap];	1049	const char *p = rs[Rs_backgroundPixmap];
1101		1050
1102	if ((p = strchr (p, ';')) != NULL)	1051	if ((p = strchr (p, ';')) != NULL)
1103	{	1052	{
1104	p++;	1053	p++;
1105	scale_pixmap (p);	1054	bgPixmap.handle_geometry (p);
1106	}	1055	}
1107		1056
1108	set_bgPixmap (rs[Rs_backgroundPixmap]);	1057	set_bgPixmap (rs[Rs_backgroundPixmap]);
1109	scr_touch (true);	1058	scr_touch (true);
1110	}	1059	}
1111	#endif	1060	#endif
1112		1061
1113	/* graphics context for the vt window */	1062	/* graphics context for the vt window */
1114	gcvalue.foreground = pix_colors[Color_fg];	1063	gcvalue.foreground = pix_colors[Color_fg];
1115	gcvalue.background = pix_colors[Color_bg];	1064	gcvalue.background = pix_colors[Color_bg];
1116	gcvalue.graphics_exposures = 1;	1065	gcvalue.graphics_exposures = 0;
		1066
1117	gc = XCreateGC (disp, vt,	1067	gc = XCreateGC (dpy, vt,
1118	GCForeground \| GCBackground \| GCGraphicsExposures,	1068	GCForeground \| GCBackground \| GCGraphicsExposures,
1119	&gcvalue);	1069	&gcvalue);
1120		1070
1121	drawable = new rxvt_drawable (display, vt);	1071	drawable = new rxvt_drawable (this, vt);
1122		1072
1123	#ifdef RXVT_SCROLLBAR	1073	#ifdef RXVT_SCROLLBAR
1124	gcvalue.foreground = pix_colors[Color_topShadow];	1074	gcvalue.foreground = pix_colors[Color_topShadow];
1125	topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1075	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126	gcvalue.foreground = pix_colors[Color_bottomShadow];	1076	gcvalue.foreground = pix_colors[Color_bottomShadow];
1127	botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1077	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128	gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];	1078	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129	scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);	1079	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130	#endif	1080	#endif
1131		1081
1132	#ifdef OFF_FOCUS_FADING	1082	#ifdef OFF_FOCUS_FADING
1133	// initially we are in unfocused state	1083	// initially we are in unfocused state
1134	if (rs[Rs_fade])	1084	if (rs[Rs_fade])
1135	pix_colors = pix_colors_unfocused;	1085	pix_colors = pix_colors_unfocused;
1136	#endif	1086	#endif
1137		1087
1138	pointer_unblank ();	1088	pointer_unblank ();
1139	scr_recolour ();	1089	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	}	1090	}
1151		1091
1152	/* ------------------------------------------------------------------------- *	1092	/* ------------------------------------------------------------------------- *
1153	* GET TTY CURRENT STATE *	1093	* GET TTY CURRENT STATE *
1154	* ------------------------------------------------------------------------- */	1094	* ------------------------------------------------------------------------- */
1155	void	1095	void
1156	rxvt_get_ttymode (ttymode_t *tio, int erase)	1096	rxvt_get_ttymode (ttymode_t *tio, int erase)
1157	{	1097	{
1158	#ifdef HAVE_TERMIOS_H
1159	/*	1098	/*
1160	* standard System V termios interface	1099	* standard System V termios interface
1161	*/	1100	*/
1162	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)	1101	if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163	{	1102	{
…		…
1230	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO	1169	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
1231	# if defined (ECHOCTL) && defined (ECHOKE)	1170	# if defined (ECHOCTL) && defined (ECHOKE)
1232	\| ECHOCTL \| ECHOKE	1171	\| ECHOCTL \| ECHOKE
1233	# endif	1172	# endif
1234	\| ECHOE \| ECHOK);	1173	\| 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		1174
1283	/*	1175	/*
1284	* Debugging	1176	* Debugging
1285	*/	1177	*/
1286	#ifdef DEBUG_TTYMODE	1178	#ifdef DEBUG_TTYMODE
…		…
1387	else	1279	else
1388	#endif	1280	#endif
1389	if (!pty->get ())	1281	if (!pty->get ())
1390	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");	1282	rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391		1283
1392	pty->set_utf8_mode (enc_utf8);
1393
1394	/* set initial window size */
1395	tt_winch ();
1396
1397	int er;	1284	int er;
1398		1285
1399	#ifndef NO_BACKSPACE_KEY	1286	#ifndef NO_BACKSPACE_KEY
1400	if (key_backspace[0] && !key_backspace[1])	1287	if (key_backspace[0] && !key_backspace[1])
1401	er = key_backspace[0];	1288	er = key_backspace[0];
…		…
1404	else	1291	else
1405	#endif	1292	#endif
1406	er = -1;	1293	er = -1;
1407		1294
1408	rxvt_get_ttymode (&tio, er);	1295	rxvt_get_ttymode (&tio, er);
		1296	SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
		1297	pty->set_utf8_mode (enc_utf8);
		1298
		1299	/* set initial window size */
		1300	tt_winch ();
1409		1301
1410	#if ENABLE_FRILLS	1302	#if ENABLE_FRILLS
1411	if (rs[Rs_pty_fd])	1303	if (rs[Rs_pty_fd])
1412	return;	1304	return;
1413	#endif	1305	#endif
…		…
1444	}	1336	}
1445		1337
1446	_exit (EXIT_FAILURE);	1338	_exit (EXIT_FAILURE);
1447		1339
1448	default:	1340	default:
1449	if (!OPTION (Opt_utmpInhibit))	1341	if (!option (Opt_utmpInhibit))
1450	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);	1342	pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451		1343
1452	pty->close_tty ();	1344	pty->close_tty ();
1453		1345
1454	child_ev.start (cmd_pid);	1346	child_ev.start (cmd_pid);
1455		1347
…		…
1468	int	1360	int
1469	rxvt_term::run_child (const char const argv)	1361	rxvt_term::run_child (const char const argv)
1470	{	1362	{
1471	char *login;	1363	char *login;
1472		1364
1473	SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474
1475	if (OPTION (Opt_console))	1365	if (option (Opt_console))
1476	{ /* be virtual console, fail silently */	1366	{ /* be virtual console, fail silently */
1477	#ifdef TIOCCONS	1367	#ifdef TIOCCONS
1478	unsigned int on = 1;	1368	unsigned int on = 1;
1479		1369
1480	ioctl (STDIN_FILENO, TIOCCONS, &on);	1370	ioctl (STDIN_FILENO, TIOCCONS, &on);
…		…
1529	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')	1419	if ((shell = getenv ("SHELL")) == NULL \|\| *shell == '\0')
1530	shell = "/bin/sh";	1420	shell = "/bin/sh";
1531		1421
1532	argv0 = (const char *)rxvt_r_basename (shell);	1422	argv0 = (const char *)rxvt_r_basename (shell);
1533		1423
1534	if (OPTION (Opt_loginShell))	1424	if (option (Opt_loginShell))
1535	{	1425	{
1536	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));	1426	login = (char )rxvt_malloc ((strlen (argv0) + 2) sizeof (char));
1537		1427
1538	login[0] = '-';	1428	login[0] = '-';
1539	strcpy (&login[1], argv0);	1429	strcpy (&login[1], argv0);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.152 by root, Sat Jan 21 22:38:05 2006 UTC vs. Revision 1.201 by ayin, Fri Aug 3 23:32:14 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.152 by root, Sat Jan 21 22:38:05 2006 UTC vs.
Revision 1.201 by ayin, Fri Aug 3 23:32:14 2007 UTC