1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -1,55 +1,8 @@
XCOMM!SHELL_CMD
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=XINITDIR/.Xresources
-sysmodmap=XINITDIR/.Xmodmap
+XCOMM /etc/X11/xinit/xinitrc
+XCOMM
+XCOMM global xinitrc file, used by all X sessions started by xinit (startx)
-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
-
-if [ -d XINITDIR/xinitrc.d ] ; then
- for f in XINITDIR/xinitrc.d/?*.sh ; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-TWM &
-XCLOCK -geometry 50x50-1+1 &
-XTERM -geometry 80x50+494+51 &
-XTERM -geometry 80x20+494-0 &
-exec XTERM -geometry 80x66+0+0 -name login
+XCOMM invoke global X session script
+. /etc/X11/Xsession
|
