projects/mde: mde/lookup/Options.d annotate

annotate mde/lookup/Options.d @ 102:ba035eba07b4

Compilation fixes for windows and unittest code.

author	Cyborg16@cyborg64-win.lan
date	Sat, 22 Nov 2008 20:59:36 +0000
parents	71f0f1f83620
children	42e241e7be3e

rev	line source
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	1 /* LICENSE BLOCK
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	2 Part of mde: a Modular D game-oriented Engine
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	3 Copyright © 2007-2008 Diggory Hardy
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	4
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	5 This program is free software: you can redistribute it and/or modify it under the terms
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	6 of the GNU General Public License as published by the Free Software Foundation, either
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	7 version 2 of the License, or (at your option) any later version.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	8
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	9 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	10 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	11 See the GNU General Public License for more details.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	12
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	13 You should have received a copy of the GNU General Public License
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	14 along with this program. If not, see <http://www.gnu.org/licenses/>. */
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	15
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	16 /** This module handles stored options, currently all except input maps.
84 e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	17 *
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	18 * The purpose of having all options centrally controlled is to allow generic handling by the GUI
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	19 * and ease saving and loading of values. The Options class is only really designed around handling
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	20 * small numbers of variables for now.
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	21 *
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	22 * Note: This module uses some non-spec functionality, which "works for me", but may need to be
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	23 * changed if it throws up problems. Specifically: templated virtual functions (Options.set, get
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	24 * and list), and accessing private templates from an unrelated class (Options.TName, TYPES).
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	25 * OptionChanges used to have a templated set member function (used by Options.set), which caused
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	26 * linker problems when the module wasn't compiled from scratch.
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	27 */
63 66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 62 diff changeset	28 module mde.lookup.Options;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	29
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: 67 diff changeset	30 import mde.setup.paths;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	31 import mde.exception;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	32
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	33 public import mde.gui.content.Content;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	34
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	35 import mde.file.mergetag.Reader;
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	36 import mde.file.mergetag.Writer;
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	37 import mde.file.mergetag.DataSet;
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	38 import mde.file.serialize;
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	39
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	40 import tango.core.Exception : ArrayBoundsException;
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	41 import tango.util.log.Log : Log, Logger;
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	42 private Logger logger;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	43 static this() {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	44 logger = Log.getLogger ("mde.lookup.Options");
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	45 }
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	46
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	47 /** Base class for handling options.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	48 *
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	49 * This class itself handles no options and should not be instantiated, but provides a sub-classable
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	50 * base for generic options handling. Also, the static portion of this class tracks sub-class
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	51 * instances and provides loading and saving methods.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	52 *
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	53 * Each sub-class provides named variables for maximal-speed reading. Local sub-class references
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	54 * should be used for reading variables, and via the addOptionsClass() hook will be loaded from
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	55 * files during pre-init (init0 stage). Do not write changes directly to the subclasses or they will
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	56 * not be saved; instead use set(), for example, miscOpts.set!(char[])("L10n","en-GB"). Use an
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	57 * example like MiscOptions as a template for creating a new Options sub-class.
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	58 *
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	59 * Optionally, overload the validate() function. This is called after loading, allowing conditions
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	60 * to be enforced on variables. Use set!()() to change the variables. If an exception is thrown,
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	61 * init will abort and the executable won't start.
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	62 *
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	63 * Details: Options sub-classes hold associative arrays of pointers to all option variables, with a
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	64 * char[] id. This list is used for saving, loading and to provide generic GUI options screens. The
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	65 * built-in support in Options is only for bool, int and char[] types (a float type may get added).
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	66 * Further to this, a generic class is used to store all options which have been changed, and if any
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	67 * have been changed, is merged with options from the user conf dir and saved on exit.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	68 */
84 e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	69 /* An idea for potentially extending Options, but which doesn't seem necessary now:
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	70 Move static code from Options to an OptionSet class, which may be sub-classed. These sub-classes
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	71 may be hooked in to the master OptionSet class to shadow all Options classes and be notified of
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	72 changes, and may or may not have values loaded from files during init. Change-sets could be
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	73 rewritten to use this.
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	74 However, only the changesets should need to be notified of each change (gui interfaces could simply
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	75 be notified that a change occured and redraw everything; users of options can just re-take their
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	76 values every time they use them). */
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	77 class Options : IDataSection
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	78 {
84 e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	79 protected this() {} /// Do not instantiate directly.
e0f1ec7fe73a Merge plus a few tweaks. Diggory Hardy <diggory.hardy@gmail.com> parents: 82 diff changeset	80
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	81 // All supported types, for generic handling via templates. It should be possible to change
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	82 // the supported types simply by changing this list now (untested).
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	83 template store(A...) { alias A store; }
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	84 // NOTE: currently all types have transitioned to the new method, but the old method remains
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	85 alias store!(bool, int, double, char[]) TYPES; // all types
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	86 alias store!(bool, int, double, char[]) CTYPES; // types stored with a content
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	87 //BEGIN Templates: internal
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	88 private {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	89 // Get name of a type. Basically just stringof, but special handling for arrays.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	90 // Use TName!(T) for a valid symbol name, and T.stringof for a type.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	91 template TName(T : T[]) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	92 const char[] TName = TName!(T) ~ "A";
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	93 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	94 template TName(T) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	95 const char[] TName = T.stringof;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	96 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	97
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	98 // Pointer lists
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	99 template PLists(A...) {
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	100 static if (A.length) {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	101 static if (TIsIn!(A[0], CTYPES)) {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	102 const char[] PLists = PLists!(A[1..$]);
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	103 } else
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	104 const char[] PLists = A[0].stringof~"*[ID] opts"~TName!(A[0])~";\n" ~ PLists!(A[1..$]);
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	105 } else
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	106 const char[] PLists = "";
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	107 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	108
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	109 // True if type is one of A
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	110 template TIsIn(T, A...) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	111 static if (A.length) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	112 static if (is(T == A[0]))
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	113 const bool TIsIn = true;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	114 else
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	115 const bool TIsIn = TIsIn!(T,A[1..$]);
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	116 } else
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	117 const bool TIsIn = false; // no more possibilities
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	118 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	119
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	120 // For addTag
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	121 template addTagMixin(T, A...) {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	122 static if (TIsIn!(T, CTYPES)) {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	123 const char[] ifBlock = `if (tp == "`~T.stringof~`") {
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	124 auto p = id in opts;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	125 if (p) {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	126 auto q = cast(`~VContentN!(T)~`) (*p);
101 71f0f1f83620 Some path adjustments for windows (untested) and fonts. All types of option can be edited. Diggory Hardy <diggory.hardy@gmail.com> parents: 98 diff changeset	127 if (q) q.assignNoCB = parseTo!(`~T.stringof~`) (dt);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	128 }
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	129 }`;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	130 } else
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	131 const char[] ifBlock = `if (tp == "`~T.stringof~`") {
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	132 `~T.stringof~`** p = id in opts`~TName!(T)~`;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	133 if (p !is null) **p = parseTo!(`~T.stringof~`) (dt);
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	134 }`;
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	135 static if (A.length)
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	136 const char[] addTagMixin = ifBlock~` else `~addTagMixin!(A).addTagMixin;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	137 else
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	138 const char[] addTagMixin = ifBlock;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	139 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	140
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	141 // For list
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	142 template listMixin(A...) {
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	143 static if (A.length) {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	144 static if (TIsIn!(A, CTYPES))
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	145 const char[] listMixin = listMixin!(A[1..$]);
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	146 else
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	147 const char[] listMixin = `ret ~= opts`~TName!(A[0])~`.keys;` ~ listMixin!(A[1..$]);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	148 } else
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	149 const char[] listMixin = ``;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	150 }
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	151 }
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	152 //END Templates: internal
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	153
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	154
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	155 //BEGIN Static
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	156 static {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	157 /** Add an options sub-class to the list for loading and saving.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	158 *
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	159 * Call from static this() (before Init calls load()). */
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	160 void addOptionsClass (Options c, char[] i)
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	161 in { // Trap a couple of potential coding errors:
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	162 assert (c !is null); // Instance must be created before calling addOptionsClass
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	163 assert (((cast(ID) i) in subClasses) is null); // Don't allow a silent replacement
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	164 } body {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	165 c.secName = i;
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	166 subClasses[cast(ID) i] = c;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	167 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	168
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	169 // Track all sections for saving/loading/other generic handling.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	170 Options[ID] subClasses;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	171 bool changed = false; // any changes at all, i.e. do we need to save?
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	172
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	173 /* Load/save options from file.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	174 *
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	175 * If the file doesn't exist, no reading is attempted (options are left at default values).
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	176 */
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	177 private const fileName = "options";
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	178 void load () {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	179 try {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	180 IReader reader;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	181 reader = confDir.makeMTReader (fileName, PRIORITY.LOW_HIGH);
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	182 reader.dataSecCreator = delegate IDataSection(ID id) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	183 /* Recognise each defined section, and return null for unrecognised sections. */
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	184 Options* p = id in subClasses;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	185 if (p !is null) return *p;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	186 else return null;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	187 };
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	188 reader.read;
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	189 } catch (NoFileException e) {
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	190 // Just return. Options file will be created on exit.
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	191 } catch (Exception e) {
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	192 logger.warn ("Loading options failed: "~e.msg);
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	193 logger.warn ("If warning persists, delete the offending file."); // FIXME - delete the bad file somehow
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	194 }
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	195 foreach (opts; subClasses)
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	196 opts.validate; // post-load checking of variables
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	197 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	198 void save () {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	199 if (!changed) return; // no changes to save
86 79d816b3e2d2 New InitStage system, Screen & Screen.Drawable, separate testing and guiDemo binaries. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	200 debug logger.trace ("Saving options...");
79d816b3e2d2 New InitStage system, Screen & Screen.Drawable, separate testing and guiDemo binaries. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	201
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	202 DataSet ds = new DataSet();
86 79d816b3e2d2 New InitStage system, Screen & Screen.Drawable, separate testing and guiDemo binaries. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	203 foreach (id, subOpts; subClasses)
85 56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 84 diff changeset	204 ds.sec[id] = subOpts.optionChanges;
56c0ddd90193 Intermediate commit (not stable). Changes to init system. Diggory Hardy <diggory.hardy@gmail.com> parents: 84 diff changeset	205
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	206 // Read locally-stored options
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	207 try {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	208 IReader reader;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	209 reader = confDir.makeMTReader (fileName, PRIORITY.HIGH_ONLY, ds);
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	210 reader.dataSecCreator = delegate IDataSection(ID id) {
86 79d816b3e2d2 New InitStage system, Screen & Screen.Drawable, separate testing and guiDemo binaries. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	211 debug logger.warn ("New section appearing in options.mtt during save (ignored & overwritten): "~id);
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	212 return null; // All recognised sections are already in the dataset.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	213 };
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	214 reader.read;
75 25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	215 } catch (NoFileException) {
25cb7420dc91 A massive overhaul/rewrite for the gui's data management and setup code. Currently much that was working is broken. Diggory Hardy <diggory.hardy@gmail.com> parents: 72 diff changeset	216 // No user file exists; not an error.
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	217 } catch (Exception e) {
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	218 // Log a message and continue, overwriting the file:
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	219 logger.error ("Loading options aborted: " ~ e.msg);
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	220 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	221
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	222 try {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	223 IWriter writer;
86 79d816b3e2d2 New InitStage system, Screen & Screen.Drawable, separate testing and guiDemo binaries. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	224 writer = confDir.makeMTWriter (fileName, ds);
79d816b3e2d2 New InitStage system, Screen & Screen.Drawable, separate testing and guiDemo binaries. Diggory Hardy <diggory.hardy@gmail.com> parents: 85 diff changeset	225 writer.write();
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	226 } catch (Exception e) {
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 80 diff changeset	227 logger.error ("Saving options aborted: "~e.msg);
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	228 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	229 }
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	230 }
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	231 //END Static
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	232
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	233
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	234 //BEGIN Non-static
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	235 /+ NOTE: according to spec: "Templates cannot be used to add non-static members or virtual
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	236 functions to classes." However, this appears to work (but linking problems did occur).
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	237 Alternative: use mixins. From OptionsChanges:
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	238 // setT (used to be a template, but:
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	239 // Templates cannot be used to add non-static members or virtual functions to classes. )
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	240 template setMixin(A...) {
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	241 static if (A.length) {
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	242 const char[] setMixin = `void set`~TName!(A[0])~` (ID id, `~A[0].stringof~` x) {
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	243 `~TName!(T)~`s[id] = x;
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	244 }
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	245 ` ~ setMixin!(A[1..$]);
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	246 } else
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	247 const char[] setMixin = ``;
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	248 }+/
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	249 /** Set option symbol of an Options sub-class to val.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	250 *
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	251 * Due to the way options are handled generically, string IDs must be used to access the options
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	252 * via hash-maps, which is a little slower than direct access but necessary since the option
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	253 * must be changed in two separate places. */
102 ba035eba07b4 Compilation fixes for windows and unittest code. Cyborg16@cyborg64-win.lan parents: 101 diff changeset	254 /+deprecated void set(T) (char[] symbol, T val) {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	255 static assert (TIsIn!(T,TYPES) && !TIsIn!(T, CTYPES), "Options.set does not support type "~T.stringof);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	256
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	257 changed = true; // something got set (don't bother checking this isn't what it already was)
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	258
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	259 try {
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	260 mixin (`*(opts`~TName!(T)~`[cast(ID) symbol]) = val;`);
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	261 mixin (`optionChanges.`~TName!(T)~`s[symbol] = val;`);
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	262 } catch (ArrayBoundsException) {
57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	263 // log and ignore:
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	264 logger.error ("Options.set: invalid symbol");
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	265 }
102 ba035eba07b4 Compilation fixes for windows and unittest code. Cyborg16@cyborg64-win.lan parents: 101 diff changeset	266 }+/
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	267 /+
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	268 /** Get option symbol of an Options sub-class.
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	269 *
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	270 * Using this method to read an option is not necessary, but allows for generic use. */
102 ba035eba07b4 Compilation fixes for windows and unittest code. Cyborg16@cyborg64-win.lan parents: 101 diff changeset	271 deprecated T get(T) (char[] symbol) {
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	272 static assert (TIsIn!(T,TYPES), "Options does not support type "~T.stringof);
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	273
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	274 mixin (`alias opts`~TName!(T)~` optsVars;`);
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	275
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	276 try {
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	277 return *(optsVars[cast(ID) symbol]);
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	278 } catch (ArrayBoundsException) {
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	279 // log and ignore:
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	280 logger.error ("Options.get: invalid symbol");
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	281 }
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	282 }+/
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	283
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	284 /** List the names of all options of a specific type. */
102 ba035eba07b4 Compilation fixes for windows and unittest code. Cyborg16@cyborg64-win.lan parents: 101 diff changeset	285 deprecated char[][] list () {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	286 char[][] ret;
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	287 mixin (listMixin!(TYPES));
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	288 return ret;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	289 }
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	290
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	291 /// Get all Options stored with a ValueContent.
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	292 ValueContent[char[]] content() {
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	293 return opts;
72 159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	294 }
159775502bb4 The first dynamically generated widget lists, based on Options, are here! Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	295
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	296 /// Variable validate function. This implementation does nothing.
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	297 void validate() {}
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	298
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	299 protected {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	300 char[] secName; // name of this option setting; set null after translation is loaded
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	301 OptionChanges optionChanges; // all changes to options (for saving)
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	302
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 75 diff changeset	303 // The "pointer lists", e.g. char[]*[ID] optscharA;
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	304 mixin (PLists!(TYPES));
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	305 ValueContent[char[]] opts; // generic list of option values
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	306 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	307
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	308 //BEGIN Mergetag loading/saving code
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	309 void addTag (char[] tp, ID id, char[] dt) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	310 mixin(addTagMixin!(TYPES).addTagMixin);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	311 }
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	312 // Only OptionChanges writes stuff
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	313 void writeAll (ItemDelg dlg) {}
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	314 //END Mergetag loading/saving code
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	315 //END Non-static
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	316
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	317
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	318 //BEGIN Templates: impl & optionsThis
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	319 private {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	320 // Replace, e.g., bool, with BoolContent
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	321 template contentName(A) {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	322 static if (TIsIn!(A, CTYPES)) {
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	323 const char[] contentName = VContentN!(A);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	324 } else
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	325 const char[] contentName = A.stringof;
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	326 }
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	327 // Return index of first comma, or halts if not found.
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	328 template cIndex(char[] A) {
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	329 static if (A.length == 0)
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	330 static assert (false, "Error in implementation");
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	331 else static if (A[0] == ',')
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	332 const size_t cIndex = 0;
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	333 else
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	334 const size_t cIndex = 1 + cIndex!(A[1..$]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	335 }
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	336 // Return index of first semi-colon, or halts if not found.
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	337 template scIndex(char[] A) {
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	338 static if (A.length == 0)
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	339 static assert (false, "Error: no trailing semi-colon");
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	340 else static if (A[0] == ';')
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	341 const size_t scIndex = 0;
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	342 else
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	343 const size_t scIndex = 1 + scIndex!(A[1..$]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	344 }
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	345 /* Look for "type symbols;" in A and return symbols as a comma separated list of names
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	346 (even if type is encountered more than once). Output may contain spaces and will have a
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	347 trailing comma unless no match was found in which case an empty string is returned.
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	348 Assumes scIndex always returns less than A.$ . */
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	349 template parseT(char[] type, char[] A) {
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	350 static if (A.length < type.length + 1) // end of input, no match
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	351 const char[] parseT = "";
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	352 else static if (A[0] == ' ') // leading whitespace: skip
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	353 const char[] parseT = parseT!(type, A[1..$]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	354 else static if (A[0..type.length] == type && A[type.length] == ' ') // match
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	355 const char[] parseT = A[type.length+1 .. scIndex!(A)] ~ "," ~
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	356 parseT!(type, A[scIndex!(A)+1 .. $]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	357 else // no match
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	358 const char[] parseT = parseT!(type, A[scIndex!(A)+1 .. $]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	359 }
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	360 // May have a trailing comma. Assumes cIndex always returns less than A.$ .
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	361 template aaVars(char[] A) {
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	362 static if (A.length == 0)
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	363 const char[] aaVars = "";
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	364 else static if (A[0] == ' ')
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	365 const char[] aaVars = aaVars!(A[1..$]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	366 else
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	367 const char[] aaVars = "\""~A[0..cIndex!(A)]~"\"[]:&"~A[0..cIndex!(A)] ~ "," ~
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	368 aaVars!(A[cIndex!(A)+1..$]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	369 }
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	370 // May have a trailing comma. Assumes cIndex always returns less than A.$ .
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	371 template aaVarsContent(char[] A) {//FIXME
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	372 static if (A.length == 0)
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	373 const char[] aaVarsContent = "";
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	374 else static if (A[0] == ' ')
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	375 const char[] aaVarsContent = aaVarsContent!(A[1..$]);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	376 else
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	377 const char[] aaVarsContent = "\""~A[0..cIndex!(A)]~"\"[]:cast(ValueContent)"~A[0..cIndex!(A)] ~ "," ~
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	378 aaVarsContent!(A[cIndex!(A)+1..$]);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	379 }
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	380 // strip Trailing Comma
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	381 template sTC(char[] A) {
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	382 static if (A.length && A[$-1] == ',')
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	383 const char[] sTC = A[0..$-1];
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	384 else
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	385 const char[] sTC = A;
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	386 }
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	387 // if string is empty (other than space) return null, otherwise enclose: [A]
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	388 template listOrNull(char[] A) {
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	389 static if (A.length == 0)
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	390 const char[] listOrNull = "null";
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	391 else static if (A[0] == ' ')
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	392 const char[] listOrNull = listOrNull!(A[1..$]);
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	393 else
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	394 const char[] listOrNull = "["~A~"]";
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	395 }
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	396 // if B is empty return an empty string otherswise return what's below:
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	397 template catOrNothing(char[] A,char[] B) {
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	398 static if (B.length)
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	399 const char[] catOrNothing = A~` `~sTC!(B)~";\n";
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	400 else
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	401 const char[] catOrNothing = ``;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	402 }
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	403 // foreach decl...
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	404 template createContents(T, char[] A) {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	405 static if (A.length == 0)
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	406 const char[] createContents = "";
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	407 else static if (A[0] == ' ')
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	408 const char[] createContents = createContents!(T,A[1..$]);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	409 else
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	410 const char[] createContents = "opts[\""~A[0..cIndex!(A)]~"\"] = " ~ A[0..cIndex!(A)]~ " = (new "~VContentN!(T)~" (\""~A[0..cIndex!(A)]~"\")).addChangeCb (&optionChanges.set);\n"~
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	411 createContents!(T,A[cIndex!(A)+1..$]);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	412 }
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	413 // for recursing on TYPES
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	414 template optionsThisInternal(char[] A, B...) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	415 static if (B.length) {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	416 static if (TIsIn!(B[0], CTYPES)) {
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	417 const char[] optionsThisInternal = createContents!(B[0],parseT!(B[0].stringof,A))~
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	418 optionsThisInternal!(A,B[1..$]);
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	419 } else
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	420 const char[] optionsThisInternal = `opts`~TName!(B[0])~` = `~listOrNull!(sTC!(aaVars!(parseT!(B[0].stringof,A))))~";\n" ~ optionsThisInternal!(A,B[1..$]);
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	421 } else
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	422 const char[] optionsThisInternal = ``;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	423 }
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	424 template declValsInternal(char[] A, B...) {
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	425 static if (B.length) {
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	426 const char[] declValsInternal = catOrNothing!(contentName!(B[0]),parseT!(B[0].stringof,A)) ~ declValsInternal!(A,B[1..$]);
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	427 } else
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	428 const char[] declValsInternal = ``;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	429 }
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	430 } protected {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	431 /** Declares the values.
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	432 *
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	433 * Basic types are replaced with a ValueContent class to keep the option synchronized and
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	434 * generalize use. */
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	435 template declVals(char[] A) {
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	436 const char[] declVals = declValsInternal!(A, TYPES);
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	437 }
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	438 /** Produces the implementation code to go in the constuctor. */
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	439 template optionsThis(char[] A) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	440 const char[] optionsThis =
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	441 "optionChanges = new OptionChanges;\n" ~
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	442 optionsThisInternal!(A,TYPES);
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	443 }
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	444 /+ Needs too many custom parameters to be worth it? Plus makes class less readable.
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	445 /** Produces the implementation code to go in the static constuctor. */
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	446 template optClassAdd(char[] symb) {
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	447 const char[] optClassAdd = symb ~ "=new "~classinfo(this).name~";\n";//Options.addOptionsClass("~symb~", );\n";
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	448 }+/
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	449 /** mixin impl("type symbol[, symbol[...]];[type symbol[...];][...]")
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	450 *
62 960206198cbd Documentation changes only. (Idea for new gui.content.Items module; unused gl.texture module commented out.) Diggory Hardy <diggory.hardy@gmail.com> parents: 53 diff changeset	451 * Where type is one of bool, int, double, char[]. E.g.
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	452 * ---
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	453 * mixin (impl ("bool a, b; int i;"));
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	454 * ---
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	455 *
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	456 * In case this() needs to be customized, mixin(impl!(A)) is equivalent to:
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	457 * ---
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	458 * mixin (declVals!(A)~`
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	459 this () {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	460 `~optionsThis!(A)~`
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	461 }`);
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	462 * ---
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	463 *
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	464 * Notes: Only use space as whitespace (no new-lines or tabs). Make sure to add a trailing
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	465 * semi-colon (;) or you'll get told off! :D
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	466 * In general errors aren't reported well. Trial with pragma (msg, impl!(...)); if
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	467 * necessary.
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	468 *
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	469 * Extending: mixins could also be used for the static this() {...} or even the whole
62 960206198cbd Documentation changes only. (Idea for new gui.content.Items module; unused gl.texture module commented out.) Diggory Hardy <diggory.hardy@gmail.com> parents: 53 diff changeset	470 * class, but doing so would rather decrease readability of any implementation. */
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	471 template impl(char[] A /+, char[] symb+/) {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	472 const char[] impl = declVals!(A)~"\nthis(){\n"~optionsThis!(A)~"}";
50 f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	473 // ~"\nstatic this(){\n"~optClassAdd!(symb)~"}"
f68ae1d667f9 Options: impl template & new OptionsFont class. Diggory Hardy <diggory.hardy@gmail.com> parents: 43 diff changeset	474 }
36 57d000574d75 Enabled drawing on demand, and made the polling interval configurable. Diggory Hardy <diggory.hardy@gmail.com> parents: 32 diff changeset	475 }
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	476 //END Templates: impl & optionsThis
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	477 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	478
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	479 /** Special class to store all locally changed options, whatever the section. */
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	480 class OptionChanges : IDataSection
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	481 {
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	482 //BEGIN Templates
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	483 private {
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	484 alias Options.TName TName;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	485 alias Options.TYPES TYPES;
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	486 template Vars(A...) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	487 static if (A.length) {
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	488 const char[] Vars = A[0].stringof~`[ID] `~TName!(A[0])~`s;` ~ Vars!(A[1..$]);
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	489 } else
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	490 const char[] Vars = ``;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	491 }
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	492 // For set
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	493 template Set(A...) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	494 static if (A.length) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	495 const char[] Set= `void set (char[] s,`~A[0].stringof~` v) {
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	496 Options.changed = true;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	497 `~TName!(A[0])~`s[s] = v;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	498 }`~ Set!(A[1..$]);
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	499 } else
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	500 const char[] Set = ``;
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	501 }
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	502
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	503 // For addTag
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	504 template addTagMixin(T, A...) {
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	505 const char[] ifBlock = `if (tp == "`~T.stringof~`") {
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	506 if ((id in `~TName!(T)~`s) is null)
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	507 `~TName!(T)~`s[id] = parseTo!(`~T.stringof~`) (dt);
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	508 }`;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	509 static if (A.length)
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	510 const char[] addTagMixin = ifBlock~` else `~addTagMixin!(A).addTagMixin;
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	511 else
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	512 const char[] addTagMixin = ifBlock;
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	513 }
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	514 // For writeAll
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	515 template writeAllMixin(A...) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	516 static if (A.length) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	517 const char[] writeAllMixin =
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	518 `foreach (id, val; `~TName!(A[0])~`s)
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	519 dlg ("`~A[0].stringof~`", id, serialize (val));
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	520 ` ~ writeAllMixin!(A[1..$]);
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	521 } else
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	522 const char[] writeAllMixin = ``;
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	523 }
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	524 }
cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	525 //END Templates
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	526 // These store the actual values, but are never accessed directly except when initially added.
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	527 // optsX store pointers to each item added along with the ID and are used for access.
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	528 mixin(Vars!(TYPES));
95 2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	529 // set (char[] symbol, T value); (not templates but for each type T)
2a364c7d82c9 Boolean options can be adjusted from the gui now (using a very basic widget). Also some bug-fixes. Diggory Hardy <diggory.hardy@gmail.com> parents: 94 diff changeset	530 mixin(Set!(TYPES));
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	531
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	532 this () {}
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	533
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	534 //BEGIN Mergetag loading/saving code
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	535 // HIGH_LOW priority: only load symbols not currently existing
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	536 void addTag (char[] tp, ID id, char[] dt) {
64 cc3763817b8a Overhauled Options so that it now uses templates and mixins for type-specific internals, and supported types can be adjusted via just one list. Diggory Hardy <diggory.hardy@gmail.com> parents: 63 diff changeset	537 mixin (addTagMixin!(TYPES).addTagMixin);
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	538 }
80 ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	539 void writeAll (ItemDelg dlg) {
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	540 mixin(writeAllMixin!(TYPES));
ea58f277f487 Gui reorganization and changes; partial implementation of floating widgets. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	541 }
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	542 //END Mergetag loading/saving code
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	543 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	544
63 66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 62 diff changeset	545 /* NOTE: Options sub-classes are expected to use a template to ease inserting contents and
66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 62 diff changeset	546 * hide some of the "backend" functionality. Use impl as below, or read the documentation for impl.
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	547 *
63 66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 62 diff changeset	548 * Each entry should have a Translation entry with humanized names and descriptions in
66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 62 diff changeset	549 * data/L10n/ClassName.mtt
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	550 *
63 66d555da083e Moved many modules/packages to better reflect usage. Diggory Hardy <diggory.hardy@gmail.com> parents: 62 diff changeset	551 * To create a new Options sub-class, just copy, paste and adjust.
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	552 */
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	553
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	554 /** A home for all miscellaneous options, at least for now. */
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	555 MiscOptions miscOpts;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	556 class MiscOptions : Options {
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	557 const A = "bool exitImmediately; int maxThreads, logLevel, logOutput; double pollInterval; char[] L10n;";
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	558 //pragma (msg, impl!(A));
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	559 mixin (impl!(A));
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	560
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	561 void validate() {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	562 // Try to enforce sensible values, whilst being reasonably flexible:
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	563 if (maxThreads() < 1 \|\| maxThreads() > 64) {
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	564 logger.warn ("maxThreads must be in the range 1-64. Defaulting to 4.");
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	565 maxThreads = 4;
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	566 }
98 49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	567 if (pollInterval() !<= 1.0 \|\| pollInterval() !>= 0.0)
49e7cfed4b34 All types of Option have been converted to use ValueContent classes, and their values can be displayed. Diggory Hardy <diggory.hardy@gmail.com> parents: 95 diff changeset	568 pollInterval = 0.01;
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	569 }
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	570
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	571 static this() {
94 9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	572 miscOpts = new MiscOptions;
9520cc0448e5 Boolean options are now encapsulated within a Content class (currently an experiment). Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	573 Options.addOptionsClass (miscOpts, "MiscOptions");
32 316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	574 }
316b0230a849 Lots more work on the GUI. Also renamed lots of files. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	575 }

Mercurial > projects > mde

annotate mde/lookup/Options.d @ 102:ba035eba07b4