aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/fvwm95/files/patch-ad
blob: 4cf8e6e682960b39f0b1e7088d0a1a9971b04718 (plain) (blame)
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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
--- sample.fvwmrc/system.fvwm95rc.orig	Mon Jun  9 20:49:46 1997
+++ sample.fvwmrc/system.fvwm95rc	Mon Jun  9 20:50:01 1997
@@ -90,8 +90,8 @@
 # Paths are a colon-separated list, just like regular unix PATH
 #
 ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
-PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
-IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
+PixmapPath /usr/include/X11/pixmaps/:/usr/X11R6/icons/
+IconPath   /usr/include/X11/bitmaps/:/usr/X11R6/icons/
 
 #========================================================================#
 
@@ -173,7 +173,7 @@
 + "I"	Module FvwmTaskBar
 # uncomment the followin line to enable auto-raise with mouse focus:
 #+ "I"  Module FvwmAuto 500
-#+ "I"	Exec xv -root -quit /usr/local/icons/bckgnd3.xpm &
+#+ "I"	Exec xv -root -quit /usr/X11R6/icons/bckgnd3.xpm &
 #+ "I"	Module FvwmButtons MiniButtons
 #+ "I"	Module FvwmBanner
 #+ "I"	Module FvwmPager 0 3
@@ -303,12 +303,12 @@
 DestroyMenu "Accessories"
 AddToMenu "Accessories" \
   "View Running processes%mini-run.xpm%" Exec xterm -font 7x14 \
-                                              -bg \#c0c0c0 -fg black \
-                                              -T Top -n Top -e top & 
+						-bg \#c0c0c0 -fg black \
+						-T Top -n Top -e top & 
 + "Control processes%mini-hex.xpm%"	Exec tkps &
-+ "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 -fg black \
-                                                   -T Hifs -name Hifs -geometry 26x24 \
-                                                   -e hifs &
++ "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 \
+						-fg black -T Hifs -name Hifs \
+						-geometry 26x24 -e hifs &
 + "System load%mini-perf.xpm%"		Exec xload &
 + "Memory usage%mini-perf.xpm%"		Exec xmem &
 + "Calculator%mini-calc.xpm%"		Exec xcalc &
@@ -368,8 +368,12 @@
 DestroyMenu "Internet"
 AddToMenu "Internet" \
   "Netscape%mini-nscape.xpm%"	Exec netscape -geometry 790x543+0+0 &
-+ "Mail (Pine)%mini-mail.xpm%"	Exec color_xterm -name Mail -T Mail -ls -fn 8x13 -e pine -i &
-+ "NcFTP%mini-ftp.xpm%"		Exec color_xterm -name NcFtp -T FTP -ls -fn 8x13 -e ncftp &
++ "Mail (Pine)%mini-mail.xpm%"	Exec xterm +cm -tn xterm-color \
+						-name Mail -T Mail \
+						-ls -fn 8x13 -e pine -i &
++ "NcFTP%mini-ftp.xpm%"		Exec xterm +cm -tn xterm-color \
+						-name NcFtp -T FTP \
+						-ls -fn 8x13 -e ncftp &
 
 #--------- Editors
 
@@ -393,13 +397,13 @@
 
 DestroyMenu "SciApps"
 AddToMenu "SciApps" \
-  "IDL%mini-zoom.xpm%"		Exec xterm -T "IDL prompt" -name IDL \
-                                           -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-                                           -e xterm_idl &
+  "IDL%mini-zoom.xpm%"	Exec xterm -T "IDL prompt" -name IDL \
+				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
+				-e xterm_idl &
 + "IDL tool%mini-zoom.xpm%"	Exec xidl &
-+ "GNU plot%mini-zoom.xpm%"	Exec xterm -T "GNU plot" -name GNUplot \
-                                           -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-                                           -e gnuplot &
++ "GNU plot%mini-zoom.xpm%" Exec xterm -T "GNU plot" -name GNUplot \
+				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
+				-e gnuplot &
 
 #--------- File managers
 
@@ -414,21 +418,25 @@
 DestroyMenu "Shells"
 AddToMenu "Shells" \
   "Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
-                                                     -j -ls -fn 7x14 &
+							-j -ls -fn 7x14 &
 + "Color Rxvt	(VT100)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
-+ "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
-                                                     -j -ls -fn 7x14 \
-                                                     -fb 7x14bold \
-                                                     -title "Color xterm" &
-+ "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
-                                                     -j -ls -fn 8x13 \
-                                                     -title "Color xterm" &
++ "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
+							-sb -sl 500 \
+							-j -ls -fn 7x14 \
+							-fb 7x14bold \
+							-title "Color xterm" &
++ "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
+							-sb -sl 500 \
+							-j -ls -fn 8x13 \
+							-title "Color xterm" &
 + ""					    	Nop
 + "Large Xterm	(10x20 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
-                                                     -j -ls -fn 10x20 &
+							-j -ls -fn 10x20 &
 + "Large Rxvt	(10x20 font)%mini-term.xpm%"	Exec rxvt -font 10x20 -ls &
-+ "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec color_xterm -sb \
-                                                -sl 500 -j -ls -fn 10x20 &
++ "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec xterm \
+							+cm -tn xterm-color
+							-sb -sl 500 \
+							-j -ls -fn 10x20 &
 
 #--------- Modules
 
@@ -561,16 +569,17 @@
 DestroyMenu "Utilities"
 AddToMenu "Utilities@utilities-menu.xpm@^white^" \
   "Running processes%mini-run.xpm%"	Exec xterm -font 7x14 \
-                                             -bg \#c0c0c0 -fg black \
-                                             -T Top -n Top -e top & 
+						-bg \#c0c0c0 -fg black \
+						-T Top -n Top -e top & 
 + "Calculator%mini-calc.xpm%"		Exec xcalc &
 + "Manual pages%mini-book1.xpm%" 	Exec xman &
 + "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
 + "Oclock%mini-clock.xpm%" 		Exec oclock &
 + "Fvwm95 Explorer%mini-ofolder.xpm%"	Exec explorer &
-+ "Xterm%mini-term.xpm%" 		Exec color_xterm -sb -sl 500 -j \
-                                             -ls -fn 8x13 \
-                                             -title "Color xterm" &
++ "Xterm%mini-term.xpm%" 		Exec xterm +cm -tn xterm-color \
+						-sb -sl 500 -j \
+						-ls -fn 8x13 \
+						-title "Color xterm" &
 + ""					Nop
 + "Modules%mini-modules.xpm%"		Popup Module-Popup
 + ""					Nop
@@ -754,26 +763,27 @@
 # Define the buttons to use.....
 
 *FvwmButtons(Title xclock, \
-             Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
-             -padding 0 -geometry -1500-1500 &')
+		Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
+			-padding 0 -geometry -1500-1500 &')
 *FvwmButtons(2x1, Title load, \
-             Swallow(UseOld) "xload" 'Exec xload \
-                     -nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
+		Swallow(UseOld) "xload" 'Exec xload \
+			-nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
 *FvwmButtons(Title xterm, Icon rterm.xpm, \
-             Action 'Exec "XTerm" color_xterm \
-                     -ls -sb -fn 8x13 -title "Color xterm" &')
+		Action 'Exec "XTerm" xterm \
+			+cm -tn xterm-color \
+			-ls -sb -fn 8x13 -title "Color xterm" &')
 *FvwmButtons(Title xfm, Icon Xfm.xpm, \
-             Action 'Exec "Xfm" xfm -title "File Manager" &') 
+		Action 'Exec "Xfm" xfm -title "File Manager" &') 
 *FvwmButtons(Title textedit, Icon textedit.xpm, \
-             Action 'Exec "Textedit" textedit &')
+		Action 'Exec "Textedit" textedit &')
 *FvwmButtons(Title xcalc, Icon rcalc.xpm, \
-             Action 'Exec "Calculator" xcalc &')
+		Action 'Exec "Calculator" xcalc &')
 *FvwmButtons(Title xview, Icon xview.xpm, \
-             Action 'Exec "xv" xv &')
+		Action 'Exec "xv" xv &')
 *FvwmButtons(Title gview, Icon gv.xpm, \
-             Action 'Exec "ghostview" ghostview &')
+		Action 'Exec "ghostview" ghostview &')
 *FvwmButtons(Title netscape, Icon nscape.xpm, \
-             Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
+		Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
 *FvwmButtons(Title kill, Icon rbomb.xpm, Action Destroy)
 *FvwmButtons(2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
 
@@ -788,13 +798,17 @@
 *MiniButtonsRows 1
 *MiniButtonsPadding 1 1
 
-*MiniButtons -   mini-term.xpm        Exec    "XTerm" color_xterm -ls -sb -fn 8x13 -title "Color xterm" &
-*MiniButtons -   mini-filemgr.xpm     Exec    "Xfm" xfm -title "File Manager" & 
-*MiniButtons -   mini-edit.xpm        Exec  "Textedit" textedit -En 32 &
-*MiniButtons -   mini-calc.xpm        Exec    "Calculator" xcalc &
-*MiniButtons -   mini-xv.xpm          Exec    "xv" xv &
-*MiniButtons -   mini-gv.xpm          Exec    "ghostview" ghostview &
-*MiniButtons -   mini-nscape.xpm      Exec    "Netscape" netscape -geometry 790x543+0+0 &
+*MiniButtons -   mini-term.xpm        Exec "XTerm" xterm \
+						+cm -tn xterm-color \
+						-ls -sb -fn 8x13 \
+						-title "Color xterm" &
+*MiniButtons -   mini-filemgr.xpm     Exec "Xfm" xfm -title "File Manager" & 
+*MiniButtons -   mini-edit.xpm        Exec "Textedit" textedit -En 32 &
+*MiniButtons -   mini-calc.xpm        Exec "Calculator" xcalc &
+*MiniButtons -   mini-xv.xpm          Exec "xv" xv &
+*MiniButtons -   mini-gv.xpm          Exec "ghostview" ghostview &
+*MiniButtons -   mini-nscape.xpm      Exec "Netscape" netscape \
+						-geometry 790x543+0+0 &
 #*MiniButtons -   mini-bomb.xpm        Destroy
 
 #------------------ Identify
@@ -837,7 +851,9 @@
 #*FvwmTaskBarShowTransients
 #*FvwmTaskBarClockFormat %I:%M%p
 #*FvwmTaskBarHighlightFocus
-*FvwmTaskBarMailCommand Exec color_xterm -name Mail -T mail -ls -fn 8x13 -e pine -i 
+*FvwmTaskBarMailCommand Exec xterm \
+				+cm -tn xterm-color \
+				-name Mail -T mail -ls -fn 8x13 -e pine -i 
 #*FvwmTaskBarAutoHide
 *FvwmTaskBarDeskOnly