From 50bc241d1d9c026d128eb29c7f3bdc2ba5525c46 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 12 Oct 2014 10:09:51 -0700 Subject: [PATCH] replaced hardcoded pngdir with built-in ~~ don't need to create xboard.conf from xboard.conf.in anymore --- Makefile.am | 17 +------ xboard.conf | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xboard.conf.in | 149 -------------------------------------------------------- 3 files changed, 150 insertions(+), 165 deletions(-) create mode 100644 xboard.conf delete mode 100644 xboard.conf.in diff --git a/Makefile.am b/Makefile.am index 847084a..5316962 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ EXTRA_DIST = pixmaps themes png sounds winboard \ xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \ xboard-fen-viewer.desktop xboard-pgn-viewer.desktop xboard-tourney.desktop xboard.xml \ COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm zippy.README \ - xboard.conf.in SHORTLOG DIFFSTAT history.c ABOUT-NLS $(FRONTENDextras) + xboard.conf SHORTLOG DIFFSTAT history.c ABOUT-NLS $(FRONTENDextras) DISTCLEANFILES = stamp-h @@ -198,21 +198,6 @@ dist_sounds_DATA = \ sounds/cymbal.wav sounds/pop2.wav sounds/slap.wav sounds/ding1.wav sounds/laser.wav \ sounds/woodthunk.wav sounds/gong.wav sounds/penalty.wav sounds/honkhonk.wav sounds/phone.wav sounds/roar.wav - -### set correct dir in xboard.conf - -edit = sed -e 's|@pngdir[@]|$(pngdir)|g' \ - -e 's|@soundsdir[@]|$(soundsdir)|g' - -xboard.conf: Makefile $(srcdir)/xboard.conf.in - @echo ' 'GEN ' ' $@; - @rm -f $@ $@.tmp - @$(edit) $(srcdir)/$@.in >$@.tmp - @mv $@.tmp $@ - -distclean-local: - -rm -f xboard.conf - ### the man page depends on several files, so we add a special rule xboard.man: xboard.texi copyright.texi gpl.texinfo version.texi diff --git a/xboard.conf b/xboard.conf new file mode 100644 index 0000000..6c43b97 --- /dev/null +++ b/xboard.conf @@ -0,0 +1,149 @@ +; +; xboard 4.8 Save Settings file +; +; This file contains the system-wide settings of XBoard, in so far they +; deviate from the compiled-in defaults, and are not settable through menus, +; to comfort users that have no history of xboard usage. +; You can edit the values of options that are already set in this file, +; or add other options that you think are convenient as defaults for all users. +; This file is not automatically overwritten, because it redefines the +; -saveSettingsFile to .xboardrc in the user's home directory, so that +; user settings will be saved in a place the user has write access to. +; +; Looks +; +-size 49 +-internetChessServerInputBox false +-titleInWindow false +-showButtonBar true +-moveHistoryUp false +-evalGraphUp false +-engineOutputUp false +-monoMode false +-flashCount 0 +-flashRate 5 +-fontSizeTolerance 4 +-useBoardTexture true +-liteBackTextureFile "~~/themes/textures/wood_l.png" +-darkBackTextureFile "~~/themes/textures/wood_d.png" +-overrideLineGap 1 +-highlightMoveWithArrow true +-recentEngines 4 +-gameListW 500 +-gameListH 300 +-evalGraphW 300 +-evalGraphH 150 +-stickyWindows false +; +; Behavior +; +-sweepPromotions true +-pieceMenu false +-showTargetSquares true +-seekGraph true +-soundProgram "aplay -q" +-soundDirectory "~~/sounds" +-soundTell phone.wav +-soundChallenge gong.wav +-soundMove woodthunk.wav +-soundRoar roar.wav +-soundIcsAlarm penalty.wav +-pasteSelection false +-keepLineBreaksICS false +-timeDelay 1 +-autoDisplayComment true +-autoDisplayTags true +-lowTimeWarning false +-icsAlarm false +-icsAlarmTime 5000 +-msLoginDelay 0 +-delayBeforeQuit 0 +-delayAfterQuit 0 +-defaultTourneyName "Tourney_%y%M%d_%h%m.trn" +-variations true +-appendPV true +-memoHeaders true +-autoInstall "ALL" +; +; PGN format & Game List +; +-pgnExtendedInfo true +-saveOutOfBookInfo true +-gameListTags "eprd" +; +; Engines & adjudicatons in engine-engine games +; +-firstChessProgram fairymax +-firstChessProgramNames {fairymax +"Fruit 2.1" -fcp fruit -fUCI +"Crafty" -fcp crafty +"GNU Chess" -fcp gnuchess +} +-niceEngines 0 +-polyglotDir "" +-adapterCommand 'polyglot -noini -ec "%fcp" -ed "%fd" -uci NalimovCache=%defaultCacheSizeEGTB -pg ShowTbHits=true' +-defaultPathEGTB "/egtb" +-egtFormats "" +-testClaims true +-checkMates true +-materialDraws true +-trivialDraws false +; +; preconfigure some ICS nams, for use with -is option +; +-icsNames {"fics" -icshost freechess.org -icshelper timeseal +"icc" -icshost chessclub.com -icshelper timestamp +"kc" -icshost alanimus.com -icshelper timeseal +} +; +; Configure the ICS text menu +; +-icsMenu {Give me;ptell Please give me $input; +Avoid;ptell Please don't let him get $input; +Q;$add a Queen $input; +R;$add a Rook $input; +B;$add a Bishop $input; +N;$add a Knight $input; +P;$add a Pawn $input; +Dead;ptell I will be checkmated; +MultiLine; +set open 0 +set seek 0 +set tell 1; +Kill;ptell I will checkmate him!; +Who;who; +Finger (name);finger $name; +Players;players; +Vars (name);vars $name; +Games;games; +Observe (name);observe $name; +Sought;sought; +Match (name);match $name; +Tell (name);tell $name $input; +Play (name);play $name; +Message (name);message $name $input; +Copy;$copy; +Open Chat Box (name);$chat; +} +; +; pre-define some themes +; +-themeNames {"native" -ubt false -pid "" -trueColors false -flipBlack false -overrideLineGap -1 +"classic" -ubt false -lsc #c8c365 -dsc #77a26d -pid "" -wpc #ffffcc -bpc #202020 -hsc #ffff00 -phc #ff0000 -overrideLineGap -1 -flipBlack false +"wood" -ubt true -lbtf ~~/themes/textures/wood_l.png -dbtf ~~/themes/textures/wood_d.png -pid "" -hsc #ffff00 -phc #ff0000 -overrideLineGap 1 +"diagram" -ubt true -lbtf "" -dbtf ~~/themes/textures/hatch.png -lsc #ffffff -wpc #ffffff -bpc #000000 -pid "" -hsc #808080 -phc #808080 -trueColors false -overrideLineGap 1 +"icy" -ubt false -lsc #ffffff -dsc #80ffff -pid "" -wpc #f1f8f8 -bpc #202020 -hsc #0000ff -phc #ff0000 +# ORIENTAL THEMES +"shogi" -ubt true -lbtf ~~/themes/textures/wood_d.png -dbtf ~~/themes/textures/wood_d.png -pid ~~/themes/shogi -trueColors true -hsc #ffff00 -phc #0080ff -overrideLineGap 1 +"xiangqi" -ubt true -lbtf ~~/themes/textures/xqboard.png -dbtf ~~/themes/textures/xqboard.png -pid ~~/themes/xiangqi -trueColors true -hsc #ffff00 -phc #ff0000 -overrideLineGap 0 +"chu shogi" -ubt false -lsc #ff8040 -dsc #ff8040 -pid ~~/themes/chu -trueColors true -hsc #0000ff -phc #00ff00 +# end +} +; +; Save user settings. +; Must be last in file to make user options prevail over system-wide settings! +; +-saveSettingsOnExit true +-saveSettingsFile "~/.xboardrc" +-settingsFile "~/.xboardrc" + diff --git a/xboard.conf.in b/xboard.conf.in deleted file mode 100644 index 56e5f84..0000000 --- a/xboard.conf.in +++ /dev/null @@ -1,149 +0,0 @@ -; -; xboard 4.8 Save Settings file -; -; This file contains the system-wide settings of XBoard, in so far they -; deviate from the compiled-in defaults, and are not settable through menus, -; to comfort users that have no history of xboard usage. -; You can edit the values of options that are already set in this file, -; or add other options that you think are convenient as defaults for all users. -; This file is not automatically overwritten, because it redefines the -; -saveSettingsFile to .xboardrc in the user's home directory, so that -; user settings will be saved in a place the user has write access to. -; -; Looks -; --size 49 --internetChessServerInputBox false --titleInWindow false --showButtonBar true --moveHistoryUp false --evalGraphUp false --engineOutputUp false --monoMode false --flashCount 0 --flashRate 5 --fontSizeTolerance 4 --useBoardTexture true --liteBackTextureFile "@pngdir@/wood_l.png" --darkBackTextureFile "@pngdir@/wood_d.png" --overrideLineGap 1 --highlightMoveWithArrow true --recentEngines 4 --gameListW 500 --gameListH 300 --evalGraphW 300 --evalGraphH 150 --stickyWindows false -; -; Behavior -; --sweepPromotions true --pieceMenu false --showTargetSquares true --seekGraph true --soundProgram "aplay -q" --soundDirectory "@soundsdir@" --soundTell phone.wav --soundChallenge gong.wav --soundMove woodthunk.wav --soundRoar roar.wav --soundIcsAlarm penalty.wav --pasteSelection false --keepLineBreaksICS false --timeDelay 1 --autoDisplayComment true --autoDisplayTags true --lowTimeWarning false --icsAlarm false --icsAlarmTime 5000 --msLoginDelay 0 --delayBeforeQuit 0 --delayAfterQuit 0 --defaultTourneyName "Tourney_%y%M%d_%h%m.trn" --variations true --appendPV true --memoHeaders true --autoInstall "ALL" -; -; PGN format & Game List -; --pgnExtendedInfo true --saveOutOfBookInfo true --gameListTags "eprd" -; -; Engines & adjudicatons in engine-engine games -; --firstChessProgram fairymax --firstChessProgramNames {fairymax -"Fruit 2.1" -fcp fruit -fUCI -"Crafty" -fcp crafty -"GNU Chess" -fcp gnuchess -} --niceEngines 0 --polyglotDir "" --adapterCommand 'polyglot -noini -ec "%fcp" -ed "%fd" -uci NalimovCache=%defaultCacheSizeEGTB -pg ShowTbHits=true' --defaultPathEGTB "/egtb" --egtFormats "" --testClaims true --checkMates true --materialDraws true --trivialDraws false -; -; preconfigure some ICS nams, for use with -is option -; --icsNames {"fics" -icshost freechess.org -icshelper timeseal -"icc" -icshost chessclub.com -icshelper timestamp -"kc" -icshost alanimus.com -icshelper timeseal -} -; -; Configure the ICS text menu -; --icsMenu {Give me;ptell Please give me $input; -Avoid;ptell Please don't let him get $input; -Q;$add a Queen $input; -R;$add a Rook $input; -B;$add a Bishop $input; -N;$add a Knight $input; -P;$add a Pawn $input; -Dead;ptell I will be checkmated; -MultiLine; -set open 0 -set seek 0 -set tell 1; -Kill;ptell I will checkmate him!; -Who;who; -Finger (name);finger $name; -Players;players; -Vars (name);vars $name; -Games;games; -Observe (name);observe $name; -Sought;sought; -Match (name);match $name; -Tell (name);tell $name $input; -Play (name);play $name; -Message (name);message $name $input; -Copy;$copy; -Open Chat Box (name);$chat; -} -; -; pre-define some themes -; --themeNames {"native" -ubt false -pid "" -trueColors false -flipBlack false -overrideLineGap -1 -"classic" -ubt false -lsc #c8c365 -dsc #77a26d -pid "" -wpc #ffffcc -bpc #202020 -hsc #ffff00 -phc #ff0000 -overrideLineGap -1 -flipBlack false -"wood" -ubt true -lbtf ~~/themes/textures/wood_l.png -dbtf ~~/themes/textures/wood_d.png -pid "" -hsc #ffff00 -phc #ff0000 -overrideLineGap 1 -"diagram" -ubt true -lbtf "" -dbtf ~~/themes/textures/hatch.png -lsc #ffffff -wpc #ffffff -bpc #000000 -pid "" -hsc #808080 -phc #808080 -trueColors false -overrideLineGap 1 -"icy" -ubt false -lsc #ffffff -dsc #80ffff -pid "" -wpc #f1f8f8 -bpc #202020 -hsc #0000ff -phc #ff0000 -# ORIENTAL THEMES -"shogi" -ubt true -lbtf ~~/themes/textures/wood_d.png -dbtf ~~/themes/textures/wood_d.png -pid ~~/themes/shogi -trueColors true -hsc #ffff00 -phc #0080ff -overrideLineGap 1 -"xiangqi" -ubt true -lbtf ~~/themes/textures/xqboard.png -dbtf ~~/themes/textures/xqboard.png -pid ~~/themes/xiangqi -trueColors true -hsc #ffff00 -phc #ff0000 -overrideLineGap 0 -"chu shogi" -ubt false -lsc #ff8040 -dsc #ff8040 -pid ~~/themes/chu -trueColors true -hsc #0000ff -phc #00ff00 -# end -} -; -; Save user settings. -; Must be last in file to make user options prevail over system-wide settings! -; --saveSettingsOnExit true --saveSettingsFile "~/.xboardrc" --settingsFile "~/.xboardrc" - -- 1.7.0.4