Refactor paths

examples/config.nims

@@ -1 +1 @@
---path:"../"
+--path:"../src"

examples/hnbrowser.nim

@@ -1,7 +1,6 @@
 # Compile with nim c -d:ssl
 import figuro/widgets/[button]
 import figuro/widgets/[scrollpane, vertical, horizontal]
-import figuro/widget
 import figuro
 import hnloader
 
@@ -102,6 +101,7 @@ proc draw*(self: Main) {.slot.} =
             Button.new "story":
               with node:
                 size 1'fr, 60'ux
+                fill blueColor.lighten(0.2)
               # connect(node, doHover, self, Main.hover)
               # echo "story: ", story.link.title
               Text.new "text":

figuro.nimble

@@ -1,8 +1,8 @@
-version       = "0.9.0"
+version       = "0.9.1"
 author        = "Jaremy Creechley"
 description   = "UI Engine for Nim"
 license       = "MIT"
-srcDir        = "."
+srcDir        = "src"
 
 # Dependencies
 

figuro.nim → src/figuro.nim

@@ -1,19 +1,19 @@
 
-import figuro/shared
+import figuro/commons
 import figuro/ui/apis
 import figuro/widget
 import sigils
 import chronicles
 
 export chronicles
-export shared, apis, widget, sigils
+export commons, apis, widget, sigils
 
 when defined(compilervm) or defined(nimscript):
-  import figuro/wrappers
+  import figuro/runtime/wrappers
   export wrappers
 else:
-  import figuro/execApps
-  export execApps
+  import figuro/runtime/runtimeNative
+  export runtimeNative
 
 when defined(macosx):
   {.passc: "-Wno-incompatible-function-pointer-types".}

figuro/renderer/opengl/fontutils.nim → src/figuro/common/fontutils.nim

@@ -1,4 +1,4 @@
-import std/[os, unicode, strutils, sets, hashes]
+import std/[os, unicode, sequtils, tables, strutils, sets, hashes]
 import std/isolation
 
 import pkg/vmath
@@ -7,7 +7,7 @@ import pkg/pixie/fonts
 import pkg/windy
 import pkg/threading/channels
 
-import commons
+import glyphs, extras, shared
 
 import pretty
 
@@ -37,12 +37,8 @@ proc hash*(glyph: GlyphPosition): Hash {.inline.} =
 proc getId*(typeface: Typeface): TypefaceId =
   TypefaceId typeface.hash()
 
-# proc getId*(font: Font): FontId =
-#   FontId font.hash()
-
 iterator glyphs*(arrangement: GlyphArrangement): GlyphPosition =
   var idx = 0
-  # if arrangement != nil:
 
   var mlh = 0.0 # maximum line height per row (though this does in total?)
   for f in arrangement.fonts:
@@ -76,16 +72,16 @@ iterator glyphs*(arrangement: GlyphArrangement): GlyphPosition =
           break
 
 var
-  typefaceTable*: Table[TypefaceId, Typeface]
+  typefaceTable*: Table[TypefaceId, Typeface] ## holds the table of parsed fonts
   fontTable* {.threadvar.}: Table[FontId, Font]
 
-proc generateGlyphImage*(arrangement: GlyphArrangement) =
+proc generateGlyphImage(arrangement: GlyphArrangement) =
   ## returns Glyph's hash, will generate glyph if needed
   ## 
   ## Font Glyphs are generated with Bottom vAlign and Center hAlign
   ## this puts the glyphs in the right position
   ## so that the renderer doesn't need to figure out adjustments
-  threads:
+  runtimeThreads:
     MainThread
 
   for glyph in arrangement.glyphs():
@@ -128,8 +124,31 @@ proc generateGlyphImage*(arrangement: GlyphArrangement) =
       except PixieError:
         discard
 
-proc getTypeface*(name: string): FontId =
-  threads:
+type
+  TypeFaceKinds* = enum
+    TTF
+    OTF
+    SVG
+
+proc readTypefaceImpl(name, data: string, kind: TypeFaceKinds): Typeface {.raises: [PixieError].} =
+  ## Loads a typeface from a buffer
+  try:
+    result =
+      case kind
+        of TTF:
+          parseTtf(data)
+        of OTF:
+          parseOtf(data)
+        of SVG:
+          parseSvgFont(data)
+  except IOError as e:
+    raise newException(PixieError, e.msg, e)
+
+  result.filePath = name
+
+proc getTypefaceImpl*(name: string): FontId =
+  ## loads a font from a file and adds it to the font index
+  runtimeThreads:
     MainThread
 
   let
@@ -139,19 +158,27 @@ proc getTypeface*(name: string): FontId =
 
   typefaceTable[id] = typeface
   result = id
-  # echo "typefaceTable:addr: ", getThreadId()
-  # echo "getTypeFace: ", result
-  # echo "getTypeFace:res: ", typefaceTable[id].hash()
+
+proc getTypefaceImpl*(name, data: string, kind: TypeFaceKinds): FontId =
+  ## loads a font from buffer and adds it to the font index
+  runtimeThreads:
+    MainThread
+
+  let
+    typeface = readTypefaceImpl(name, data, kind)
+    id = typeface.getId()
+
+  typefaceTable[id] = typeface
+  result = id
 
 proc convertFont*(font: UiFont): (FontId, Font) =
-  threads:
+  ## does the typesetting using pixie, then converts to Figuro's internal
+  ## types
+  runtimeThreads:
     MainThread
-  # echo "convertFont: ", font.typefaceId
-  # echo "typefaceTable:addr: ", getThreadId()
   let
     id = font.getId()
     typeface = typefaceTable[font.typefaceId]
-  # echo "convertFont:res: ", typeface.hash
 
   if not fontTable.hasKey(id):
     var pxfont = newFont(typeface)
@@ -171,20 +198,21 @@ proc convertFont*(font: UiFont): (FontId, Font) =
 
     fontTable[id] = pxfont
     result = (id, pxfont)
-    # echo "getFont:input: "
-    # print font
   else:
     result = (id, fontTable[id])
 
 import sugar
 
-proc getTypeset*(
+proc getTypesetImpl*(
     box: Box,
     uiSpans: openArray[(UiFont, string)],
     hAlign = FontHorizontal.Left,
     vAlign = FontVertical.Top,
 ): GlyphArrangement =
-  threads:
+  ## does the typesetting using pixie, then converts the typeseet results 
+  ## into Figuro's own internal types
+  ## Primarily done for thread safety
+  runtimeThreads:
     MainThread
 
   var
@@ -222,10 +250,6 @@ proc getTypeset*(
 
   let arrangement = pixie.typeset(spans, bounds = wh, hAlign = ha, vAlign = va)
 
-  # echo "getTypeset:"
-  # echo "getTypeset:wh: ", wh
-  # print arrangement
-
   var
     lines = newSeqOfCap[Slice[int]](arrangement.lines.len())
     spanSlices = newSeqOfCap[Slice[int]](arrangement.spans.len())

figuro/inputs.nim → src/figuro/common/inputs.nim

@@ -1,8 +1,8 @@
 import std/[unicode, sequtils]
 import pkg/vmath
 
-import common/nodes/basics
-import common/uimaths
+import nodes/basics
+import uimaths
 export uimaths
 
 when defined(nimscript):

figuro/ui/basiccss.nim → src/figuro/common/nodes/basiccss.nim

@@ -5,7 +5,7 @@ import cssgrid
 import stylus
 import patty
 import chroma
-import ../common/nodes/basics
+import basics
 import chronicles
 
 variantp CssValue:

figuro/common/nodes/transfer.nim → src/figuro/common/nodes/transfer.nim

@@ -1,6 +1,6 @@
-import ui as ui
+import uinodes as ui
 import render as render
-import ../../shared
+import ../shared
 
 type
   RenderList* = object

figuro/common/nodes/ui.nim → src/figuro/common/nodes/uinodes.nim

@@ -1,18 +1,18 @@
 import std/unicode
 import std/monotimes
 import std/hashes
+import pkg/stack_strings
+import pkg/sigils/weakrefs
+import pkg/sigils
+import pkg/cssgrid
+
 import basics
-import sigils
-import ../../inputs
-import ../../ui/basiccss
-import cssgrid
-import stack_strings
-import sigils/weakrefs
-
-export basics, inputs, cssgrid, stack_strings
+import basiccss
+import ../inputs
+
 export unicode, monotimes
-export weakrefs
-export basiccss
+export cssgrid, stack_strings, weakrefs
+export basics, inputs, basiccss
 
 when defined(nimscript):
   {.pragma: runtimeVar, compileTime.}

figuro/shared.nim → src/figuro/common/shared.nim

@@ -1,18 +1,17 @@
 import std/[sequtils, tables, hashes]
 import std/[options, unicode, strformat]
 import std/paths
-import pkg/[variant]
+import std/os
+import pkg/variant
+export paths, sequtils, strformat, tables, hashes
+export variant
 
-import common/[extras, uimaths]
-import inputs
+import extras, uimaths, inputs
+export extras, uimaths, inputs
 
-export sequtils, strformat, tables, hashes
-export variant
-export extras, uimaths
-export inputs
-export paths
+import pkg/chroma
 
-import chroma
+type FiguroError* = object of CatchableError
 
 type
   MainThreadEff* = object of RootEffect ## MainThr effect
@@ -25,7 +24,7 @@ proc MainThread*() {.tags: [MainThreadEff].} =
 proc RenderThread*() {.tags: [RenderThreadEff].} =
   discard
 
-template threads*(arg: typed) =
+template runtimeThreads*(arg: typed) =
   arg()
 
 {.pop.}
@@ -42,7 +41,7 @@ const
   blueColor* = color(0, 0, 1, 1)
 
 const DataDirPath* {.strdefine.} =
-  Path(currentSourcePath()).splitPath().head /../ "data".Path
+  Path(currentSourcePath()).splitPath().head / Path(".." / ".." / ".." / "data")
 
 type ScaleInfo* = object
   x*: float32