Changeset 101:71f0f1f83620

Timestamp:

11/16/08 12:03:47 (2 months ago)

Author:

Diggory Hardy <diggory.hardy@gmail.com>

branch:

default

Message:

Some path adjustments for windows (untested) and fonts. All types of option can be edited.

paths: support for getting the full path for a font when just the file name is entered, in order to unify usage on windows and linux.
paths: Used getSpecialPath for some windows paths; needs testing.
Content: Moved line-editing code to abstract ValueContent? class and added some conversion functions, so that any type of ValueContent? can be edited as text.

Files:

• data/conf/gui.mtt (modified) (1 diff)
• data/conf/options.mtt (modified) (1 diff)
• mde/font/font.d (modified) (2 diffs)
• mde/gui/content/Content.d (modified) (14 diffs)
• mde/gui/widget/createWidget.d (modified) (2 diffs)
• mde/gui/widget/miscContent.d (modified) (1 diff)
• mde/gui/widget/textContent.d (modified) (2 diffs)
• mde/lookup/Options.d (modified) (1 diff)
• mde/scheduler/Scheduler.d (modified) (1 diff)
• mde/setup/Init.d (modified) (1 diff)
• mde/setup/paths.d (modified) (7 diffs)

data/conf/gui.mtt

@@ -15 +15 @@
-<WidgetData|optVal={0:[0x6030]}>
-<WidgetData|optSep={0:[0x21, 0xff],1:["="]}>
-
-
+
-{Basic}
-<WidgetData|root={0:[0x21,0x90D970],1:["A string!"]}>

data/conf/options.mtt

@@ -11 +11 @@
-<int|lcdFilter=2>
-<int|renderMode=0x30000>
-<char[]|defaultFont="/usr/share/fonts/X11/Type1/
-!<char[]|defaultFont="/usr/share/fonts/truetype/ttf-dejavu/
+!<char[]|defaultFont="
+<char[]|defaultFont="
-<int|defaultSize=16>
-

mde/font/font.d

@@ -23 +23 @@
-
-import mde.setup.exception;     // InitStage stuff
+import mde.setup.paths;
-
-import derelict.freetype.ft;
@@ -126 +127 @@
-     * Sharing an FT_Face would require calling FT_Set_Pixel_Sizes each time a glyph is rendered or
-     * swapping the size information (face.size)? */
-path
+file
-    in {
-        assert (library !is null, "font: library is null");
-    } body {
-        if (FT_New_Face (library, toStringz(path)
-path
+   if (FT_New_Face (library, getFontPath (file).ptr
+file[0..$-1]
-        
-        if (!FT_IS_SCALABLE (face))
-            throw new fontLoadException ("Currently no support for non-scalable fonts (which " ~
-path
+file[0..$-1]
-        /* The following will need to be addressed when adding support for non-scalables:
-         *  Use of face.size.metrics.height property.

mde/gui/content/Content.d

@@ -92 +92 @@
-        desc_ = d;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    char[] name_, desc_;// name and description, loaded by lookup.Translation
-}
@@ -114 +182 @@
-    this (char[] symbol, bool val = false) {
-        symb = symbol;
-        v = val
+   assignNoCB (val)
-    }
-    
@@ -123 +191 @@
-    }
-    
-
-
-
-
-
-
-
-
+
+
+
+
-    void opAssign (bool val) {
-        v = val
-        
+   assignNoCB (val)
+   
-            cb(symb, val);
-    }
@@ -141 +205 @@
-    alias opCall opCast;
-    
-
-
-
+
+
+
+
+
+
+
+
-    void delegate (char[],bool)[] cngCb;       // change callbacks
-}
@@ -153 +222 @@
-        symb = symbol;
-        v = val;
-    pos = v.length;
-    }
-    
@@ -162 +230 @@
-    }
-    
-
-
-
-
-
-
-
-
+
+
+
-    void opAssign (char[] val) {
-        v = val;
@@ -180 +243 @@
-    alias opCall opCast;
-    
-    /** Acts on a keystroke and returns the new value.
-     *
-     * Supports one-line editing: left/right, home/end, backspace/delete. */
-    char[] keyStroke (ushort sym, char[] i) {
-    debug assert (i.length, "TextContent.keyStroke: no value (??)");    // impossible?
-    char k = *i;
-    if (k > 0x20) {
-        if (k == 0x7f) {        // delete
-        size_t p = pos;
-        if (p < v.length) ++p;
-        while (p < v.length && (v[p] & 0x80) && !(v[p] & 0x40))
-            ++p;
-        v = v[0..pos] ~ v[p..$];
-        } else {            // insert character
-        char[] tail = v[pos..$];
-        v.length = v.length + i.length;
-        size_t npos = pos+i.length;
-        if (tail) v[npos..$] = tail.dup;    // cannot assign with overlapping ranges
-            v[pos..npos] = i;
-        pos = npos;
-        }
-    } else {            // use sym; many keys output 0
-        if (sym == SDLK_BACKSPACE) {    // backspace; k == 0x8
-        char[] tail = v[pos..$];
-        if (pos) --pos;
-        while (pos && (v[pos] & 0x80) && !(v[pos] & 0x40))
-            --pos;
-        v = v[0..pos] ~ tail;
-        } else if (sym == SDLK_LEFT) {
-        if (pos) --pos;
-        while (pos && (v[pos] & 0x80) && !(v[pos] & 0x40))
-            --pos;
-        } else if (sym == SDLK_RIGHT) {
-        if (pos < v.length) ++pos;
-        while (pos < v.length && (v[pos] & 0x80) && !(v[pos] & 0x40))
-            ++pos;
-        } else if (sym == SDLK_HOME || sym == SDLK_UP) {
-        pos = 0;
-        } else if (sym == SDLK_END || sym == SDLK_DOWN) {
-        pos = v.length;
-        } else
-        debug logger.trace ("Symbol: {}", sym);
-    }
-    return v;
-    }
-    
-    size_t getEditIndex () {
-    size_t i = 0;
-    for (size_t p = 0; p < pos; ++p)
-        if (!(v[p] & 0x80) || v[p] & 0x40)
-        ++i;
-    return i;
-    }
-    
-    /// Gives all callbacks the modified value
-    void endEdit () {
-    foreach (cb; cngCb)
@@ -240 +248 @@
-    }
-    
-
-
-
-
+
+
-    void delegate (char[],char[])[] cngCb;
-}
@@ -253 +259 @@
-    this (char[] symbol, int val = 0) {
-        symb = symbol;
-        v = val
+   assignNoCB (val)
-    }
-    
@@ -262 +268 @@
-    }
-    
-
-
-
-
-
-
-
-
+
+
+
+
-    void opAssign (int val) {
-        v = val
-        
+   assignNoCB (val)
+   
-            cb(symb, val);
-    }
@@ -280 +282 @@
-    alias opCall opCast;
-    
+    void endEdit () {
+    v = Int.toInt (sv);
+    foreach (cb; cngCb)
+        cb(symb, v);
+    }
+    
+protected:
-    int v;
-protected:
-    char[] symb;
-    void delegate (char[],int)[] cngCb;
-}
@@ -292 +299 @@
-    this (char[] symbol, double val = 0) {
-        symb = symbol;
-        v = val
+   assignNoCB (val)
-    }
-    
@@ -301 +308 @@
-    }
-    
-
-
-
-
-
-
-
-
+
+
+
+
-    void opAssign (double val) {
-        v = val
-        
+   assignNoCB (val)
+   
-            cb(symb, val);
-    }
@@ -319 +322 @@
-    alias opCall opCast;
-    
+    void endEdit () {
+    v = Float.toFloat (sv);
+    foreach (cb; cngCb)
+        cb(symb, v);
+    }
+    
+protected:
-    double v;
-protected:
-    char[] symb;
-    void delegate (char[],double)[] cngCb;
-}

mde/gui/widget/createWidget.d

@@ -107 +107 @@
-    DisplayContent  = TAKES_CONTENT | 0x30,
-    BoolContent     = TAKES_CONTENT | 0x31,
-Text
+Value
-    
-    GridLayout      = TAKES_CONTENT | PARENT | 0x100,
@@ -127 +127 @@
-        "DisplayContent",
-        "BoolContent",
-Text
+Value
-        "editContent",
-        "TrialContentLayout",

mde/gui/widget/miscContent.d

@@ -29 +29 @@
-    if (cast(BoolContent) c)
-        return new BoolContentWidget(mgr,id,data,c);
-Text
-Text
+Value
+Value
-    else        // generic uneditable option
-        return new DisplayContentWidget(mgr,id,data,c);

mde/gui/widget/textContent.d

@@ -32 +32 @@
-}
-
-
-Text
+
+Value
-{
-    this (IWidgetManager mgr, widgetID id, WidgetData data, IContent c) {
-        WDCheck(data, 1);
-Text
-
-//
+Value
+//
+
-        adapter = mgr.renderer.getAdapter (content.toString(0));
-        super (mgr, id, data);
@@ -64 +64 @@
-    
-protected:
-Text
+Value
-}

mde/lookup/Options.d

@@ -125 +125 @@
-    if (p) {
-        auto q = cast(`~VContentN!(T)~`) (*p);
-v
+assignNoCB
-    }
-}`;

mde/scheduler/Scheduler.d

@@ -26 +26 @@
-    import tango.util.log.Log : Log, Logger;
-    private Logger logger;
-
-
-debug logger = Log.getLogger ("mde.scheduler.Scheduler");
+
+
+}
-}
-

mde/setup/Init.d

@@ -120 +120 @@
-            if (args.contains("conf-path"))
-                paths.extraConfPath = args["conf-path"];
+        
-            if (args.contains("base-path"))
-                paths.resolvePaths (args["base-path"]);

mde/setup/paths.d

@@ -40 +40 @@
-import tango.io.Console;
-import tango.io.FilePath;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/** Order to read files in.
@@ -112 +124 @@
-        Cout ("\nConf paths found:");
-        confDir.coutPaths;
-
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -191 +211 @@
-/** These are the actual instances, one for each of the data and conf "directories". */
-mdeDirectory dataDir, confDir;
-
+     /// Directory for log files
-
-//BEGIN Path resolution
@@ -203 +223 @@
-// FIXME: use tango/sys/Environment.d
-version (linux) {
+    SortedMap!(char[],char[]) fontFiles;    // key is file name, value is CString path
+    /** Get the actual path of a font file, or throw NoFileException if not found.
+     *
+     * Returns a C string (null terminated). */
+    char[] getFontPath (char[] file) {
+    char[] ret;
+    if (fontFiles.get (file, ret))
+        return ret;
+    throw new NoFileException ("Unable to find font file: "~file);
+    }
+    
-    // base-path not used on posix
-= null
+base = "data"
-        // Home directory:
-        char[] HOME = Environment.get("HOME", ".");
@@ -211 +242 @@
-        // Static data (must exist):
-        FilePath staticPath =
-"data"
+base
-        // Config (can just use defaults if necessary, so long as we can save afterwards):
-        FilePath userPath = findPath (true, HOME~"/.config/mde", HOME~"/.mde");
@@ -230 +261 @@
-        // Logging path:
-        logDir = userPath.toString;
+    
+    // Font paths:
+    auto fs = new FileScan;
+    // Scan for directories containing truetype and type1 fonts:
+    fs.sweep ("/usr/share/fonts", (FilePath fp, bool isDir)
+        {   return isDir || fp.suffix == ".ttf" || fp.suffix == ".pfb"; },
+           true);
+    fontFiles = new SortedMap!(char[],char[]);
+    foreach (fp; fs.files)
+        fontFiles.add (fp.file, fp.cString);    // both strings should be slices of same memory
+    logger.trace ("found {} font files, {} dirs", fs.files.length, fs.folders.length);
-    }
-} else version (Windows) {
+    char[] fontDir;
+    /** Get the actual path of a font file, or throw NoFileException if not found.
+     *
+     * Returns a C string (null terminated). */
+    char[] getFontPath (char[] file) {
+    FilePath path = new FilePath (fontDir~file);
+    if (path.exists && !path.isFolder)
+        return path.CString;
+    throw new NoFileException ("Unable to find font file: "~file);
+    }
+    
-    void resolvePaths (char[] base = "./") {
-
-
-
+
-        
-        // Base paths:
-        FilePath installPath = findPath (false, base);
-append("data").
-
+
+
-        
-        // Static data paths:
@@ -257 +308 @@
-        // Logging path:
-        logDir = userPath.toString;
+    
+    // Font path:
+    fontDir = getSpecialPath (CSIDL_FONTS) ~ "/";   // append separator
-    }
-} else {