mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-06 22:51:41 +00:00
Code Issues Releases Activity
0c7fb40446
freebsd-ports/x11-wm/fvwm95/files/patch-ad

212 lines
9.2 KiB
Plaintext
Raw Normal View History

- remove unnecessary files/sample.fvwm95 rc file - changed icon paths in the real rc file in the sources - tabified the file a bit - removed occurrences of xterm_color and substituted them by xterm +cm -tn xterm-color - Wrong icon paths in the system.fvwm95rc file were causing fvwm95 to function improperly. PR: closes 3511 (closed!)
1997-06-09 19:01:44 +00:00
--- 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
Reference in New Issue Copy Permalink