Attachment #185918 for bug #263192





XCOMM merge in defaults and keymaps

if [ -f $sysresources ]; then
#ifdef __APPLE__
    if [ -x /usr/bin/cpp ] ; then
        XRDB -merge $sysresources
    else
        XRDB -nocpp -merge $sysresources
    fi
#else
    XRDB -merge $sysresources
#endif
fi

if [ -f $sysmodmap ]; then
    XMODMAP $sysmodmap
fi

if [ -f $userresources ]; then
#ifdef __APPLE__
    if [ -x /usr/bin/cpp ] ; then
        XRDB -merge $userresources
    else
        XRDB -nocpp -merge $userresources
    fi
#else
    XRDB -merge $userresources
#endif
fi

if [ -f $usermodmap ]; then
    XMODMAP $usermodmap
fi

XCOMM start some nice programs

exec /usr/bin/idle.sh
if [ -r /etc/default/xdesktops ]; then
  . /etc/default/xdesktops
fi

if [ -r $HOME/.x11rc ]; then
  . $HOME/.x11rc
else
  if [ -r /etc/default/X11 ]; then
  . /etc/default/X11
  fi
fi

#if defined(__SCO__)
if [ -n "$XSESSION" ]; then
  case "$XSESSION" in
    [Yy][Ee][Ss])
      [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession
      ;;
  esac
fi

if [ -n "$XDESKTOP" ]; then
  exec `eval echo $"$XDESKTOP"`
else
  if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then
    /usr/bin/X11/scoterm 2> /dev/null &
    exec /usr/bin/X11/pmwm    2> /dev/null
  fi
fi
#elif defined(__UNIXWARE__)
if [ -n "$XDESKTOP" ]; then
  exec `eval echo $"$XDESKTOP"`
else
  if [ -x /usr/X/bin/pmwm ]; then
    exec /usr/X/bin/pmwm    2> /dev/null
  fi
fi
#endif

XCOMM This is the fallback case if nothing else is executed above
#endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */

#ifdef __APPLE__

if [ -d XINITDIR/xinitrc.d ] ; then
	for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
		[ -x "$f" ] && . "$f"
	done
	unset f
fi

#endif

TWM &
XCLOCK -geometry 50x50-1+1 &
XTERM -geometry 80x50+494+51 &
XTERM -geometry 80x20+494-0 &
exec XTERM -geometry 80x66+0+0 -name login

Lines 174-180 Link Here

(-)xinit-1.0.8/xinit.c.orig (-1 / +1 lines)
174		174
175	static char *default_server = "X";	175	static char *default_server = "X";
176	static char default_display = ":0"; / choose most efficient */	176	static char default_display = ":0"; / choose most efficient */
177	static char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};	177	static char *default_client[] = {"idle.sh", NULL};
178	static char *serverargv[100];	178	static char *serverargv[100];
179	static char *clientargv[100];	179	static char *clientargv[100];
180	static char *server = serverargv + 2; / make sure room for sh .xserverrc args */	180	static char *server = serverargv + 2; / make sure room for sh .xserverrc args */




If no specific client program is given on the command line,
\fIxinit\fP will look for a file in the user's home directory
called \fI.xinitrc\fP to run as a shell script to start up client programs.
If no such file exists, \fIxinit\fP will use nothing as a default and will
not exit unless terminated.
	xterm  \-geometry  +1+1  \-n  login  \-display  :0
.sp
.PP
If no specific server program is given on the command line,
\fIxinit\fP will look for a file in the user's home directory

.TP 8
.B "xinit"
This will start up a server named \fIX\fP and run the user's \fI\.xinitrc\fP,
if it exists.
.TP 8
.B "xinit \-\^\- /usr/local/bin/Xqdss  :1"
This is how one could start a specific type of server on an alternate display.
.TP 8
.B "xinit \-\^\- ./Xsun \-l \-c"
This will use the command \fI\.\/Xsun \-l \-c\fP to start the server.
arguments to the default \fIxterm\fP command.  It will ignore \fI\.xinitrc\fP.
.TP 8
.B "xinit \-e widgets \-\^\- ./Xsun \-l \-c"
This will use the command \fI\.\/Xsun \-l \-c\fP to start the server and will
append the arguments \fI\-e widgets\fP to the default \fIxterm\fP command.
.TP 8
.B "xinit /usr/ucb/rsh fasthost cpupig \-display ws:1 \-\^\-  :1 \-a 2 \-t 5"
This will start a server named \fIX\fP on display 1 with the arguments

.I .xinitrc
default client script
.TP 15
.I xterm
client to run if \fI.xinitrc\fP does not exist
.TP 15
.I .xserverrc
default server script
.TP 15

Return to bug 263192

Lines 8-103 Link Here

(-)xinit-1.0.8/xinitrc.cpp.orig (-91 / +1 lines)
8		8
9	XCOMM merge in defaults and keymaps	9	XCOMM merge in defaults and keymaps
10		10
11	if [ -f $sysresources ]; then
12	#ifdef __APPLE__
13	if [ -x /usr/bin/cpp ] ; then
14	XRDB -merge $sysresources
15	else
16	XRDB -nocpp -merge $sysresources
17	fi
18	#else
19	XRDB -merge $sysresources
20	#endif
21	fi
22
23	if [ -f $sysmodmap ]; then
24	XMODMAP $sysmodmap
25	fi
26
27	if [ -f $userresources ]; then
28	#ifdef __APPLE__
29	if [ -x /usr/bin/cpp ] ; then
30	XRDB -merge $userresources
31	else
32	XRDB -nocpp -merge $userresources
33	fi
34	#else
35	XRDB -merge $userresources
36	#endif
37	fi
38
39	if [ -f $usermodmap ]; then
40	XMODMAP $usermodmap
41	fi
42
43	XCOMM start some nice programs	11	XCOMM start some nice programs
44		12
45	#if defined(__SCO__) \|\| defined(__UNIXWARE__)	13	exec /usr/bin/idle.sh
46	if [ -r /etc/default/xdesktops ]; then
47	. /etc/default/xdesktops
48	fi
49
50	if [ -r $HOME/.x11rc ]; then
51	. $HOME/.x11rc
52	else
53	if [ -r /etc/default/X11 ]; then
54	. /etc/default/X11
55	fi
56	fi
57
58	#if defined(__SCO__)
59	if [ -n "$XSESSION" ]; then
60	case "$XSESSION" in
61	[Yy][Ee][Ss])
62	[ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession
63	;;
64	esac
65	fi
66
67	if [ -n "$XDESKTOP" ]; then
68	exec `eval echo $"$XDESKTOP"`
69	else
70	if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then
71	/usr/bin/X11/scoterm 2> /dev/null &
72	exec /usr/bin/X11/pmwm 2> /dev/null
73	fi
74	fi
75	#elif defined(__UNIXWARE__)
76	if [ -n "$XDESKTOP" ]; then
77	exec `eval echo $"$XDESKTOP"`
78	else
79	if [ -x /usr/X/bin/pmwm ]; then
80	exec /usr/X/bin/pmwm 2> /dev/null
81	fi
82	fi
83	#endif
84
85	XCOMM This is the fallback case if nothing else is executed above
86	#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
87
88	#ifdef __APPLE__
89
90	if [ -d XINITDIR/xinitrc.d ] ; then
91	for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
92	[ -x "$f" ] && . "$f"
93	done
94	unset f
95	fi
96
97	#endif
98
99	TWM &
100	XCLOCK -geometry 50x50-1+1 &
101	XTERM -geometry 80x50+494+51 &
102	XTERM -geometry 80x20+494-0 &
103	exec XTERM -geometry 80x66+0+0 -name login

Lines 53-62 Link Here

(-)xinit-1.0.8/xinit.man.orig (-15 / +5 lines)
53	If no specific client program is given on the command line,	53	If no specific client program is given on the command line,
54	\fIxinit\fP will look for a file in the user's home directory	54	\fIxinit\fP will look for a file in the user's home directory
55	called \fI.xinitrc\fP to run as a shell script to start up client programs.	55	called \fI.xinitrc\fP to run as a shell script to start up client programs.
56	If no such file exists, \fIxinit\fP will use the following as a default:	56	If no such file exists, \fIxinit\fP will use nothing as a default and will
57	.sp	57	not exit unless terminated.
58	xterm \-geometry +1+1 \-n login \-display :0
59	.sp
60	.PP	58	.PP
61	If no specific server program is given on the command line,	59	If no specific server program is given on the command line,
62	\fIxinit\fP will look for a file in the user's home directory	60	\fIxinit\fP will look for a file in the user's home directory
Lines 110-127 Link Here
110	.TP 8	108	.TP 8
111	.B "xinit"	109	.B "xinit"
112	This will start up a server named \fIX\fP and run the user's \fI\.xinitrc\fP,	110	This will start up a server named \fIX\fP and run the user's \fI\.xinitrc\fP,
113	if it exists, or else start an \fIxterm\fP.	111	if it exists.
114	.TP 8	112	.TP 8
115	.B "xinit \-\^\- /usr/local/bin/Xqdss :1"	113	.B "xinit \-\^\- /usr/local/bin/Xqdss :1"
116	This is how one could start a specific type of server on an alternate display.	114	This is how one could start a specific type of server on an alternate display.
117	.TP 8	115	.TP 8
118	.B "xinit \-geometry =80x65+10+10 \-fn 8x13 \-j \-fg white \-bg navy"	116	.B "xinit \-\^\- ./Xsun \-l \-c"
119	This will start up a server named \fIX\fP, and will append the given	117	This will use the command \fI\.\/Xsun \-l \-c\fP to start the server.
120	arguments to the default \fIxterm\fP command. It will ignore \fI\.xinitrc\fP.
121	.TP 8
122	.B "xinit \-e widgets \-\^\- ./Xsun \-l \-c"
123	This will use the command \fI\.\/Xsun \-l \-c\fP to start the server and will
124	append the arguments \fI\-e widgets\fP to the default \fIxterm\fP command.
125	.TP 8	118	.TP 8
126	.B "xinit /usr/ucb/rsh fasthost cpupig \-display ws:1 \-\^\- :1 \-a 2 \-t 5"	119	.B "xinit /usr/ucb/rsh fasthost cpupig \-display ws:1 \-\^\- :1 \-a 2 \-t 5"
127	This will start a server named \fIX\fP on display 1 with the arguments	120	This will start a server named \fIX\fP on display 1 with the arguments
Lines 183-191 Link Here
183	.I .xinitrc	176	.I .xinitrc
184	default client script	177	default client script
185	.TP 15	178	.TP 15
186	.I xterm
187	client to run if \fI.xinitrc\fP does not exist
188	.TP 15
189	.I .xserverrc	179	.I .xserverrc
190	default server script	180	default server script
191	.TP 15	181	.TP 15