Update windows and inputs

config.nims

@@ -8,7 +8,6 @@ switch("styleCheck", "hint")
 
 --d:windyNoHttp
 --d:printDebugTimings
-# --d:nimStrictDelete
 --deepcopy:on
 --debugger:native
 --debugInfo

src/figuro/common/fontutils.nim

@@ -81,8 +81,8 @@ proc generateGlyphImage(arrangement: GlyphArrangement) =
   ## 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
-  runtimeThreads:
-    MainThread
+  threadEffects:
+    AppMainThread
 
   for glyph in arrangement.glyphs():
     if unicode.isWhiteSpace(glyph.rune):
@@ -148,8 +148,8 @@ proc readTypefaceImpl(name, data: string, kind: TypeFaceKinds): Typeface {.raise
 
 proc getTypefaceImpl*(name: string): FontId =
   ## loads a font from a file and adds it to the font index
-  runtimeThreads:
-    MainThread
+  threadEffects:
+    AppMainThread
 
   let
     typefacePath = DataDirPath.string / name
@@ -161,8 +161,8 @@ proc getTypefaceImpl*(name: string): FontId =
 
 proc getTypefaceImpl*(name, data: string, kind: TypeFaceKinds): FontId =
   ## loads a font from buffer and adds it to the font index
-  runtimeThreads:
-    MainThread
+  threadEffects:
+    AppMainThread
 
   let
     typeface = readTypefaceImpl(name, data, kind)
@@ -174,8 +174,9 @@ proc getTypefaceImpl*(name, data: string, kind: TypeFaceKinds): FontId =
 proc convertFont*(font: UiFont): (FontId, Font) =
   ## does the typesetting using pixie, then converts to Figuro's internal
   ## types
-  runtimeThreads:
-    MainThread
+  threadEffects:
+    AppMainThread
+
   let
     id = font.getId()
     typeface = typefaceTable[font.typefaceId]
@@ -212,8 +213,8 @@ proc getTypesetImpl*(
   ## does the typesetting using pixie, then converts the typeseet results 
   ## into Figuro's own internal types
   ## Primarily done for thread safety
-  runtimeThreads:
-    MainThread
+  threadEffects:
+    AppMainThread
 
   var
     wh = box.scaled().wh

src/figuro/common/inputs.nim

@@ -1,191 +1,20 @@
 import std/[unicode, sequtils]
 import pkg/vmath
+import pkg/patty
 
 import nodes/basics
-import uimaths
-export uimaths
-
-when defined(nimscript):
-  {.pragma: runtimeVar, compileTime.}
-else:
-  {.pragma: runtimeVar, global.}
+import nodes/render
+import uimaths, keys
+export uimaths, keys
 
 type
-  KeyState* = enum
-    Empty
-    Up
-    Down
-    Repeat
-    Press # Used for text input
-
-  MouseCursorStyle* = enum
-    Default
-    Pointer
-    Grab
-    NSResize
-
-  Mouse* = object
-    pos*: Position
-    prev*: Position
-    delta*: Position
-    wheelDelta*: Position
-    consumed*: bool ## Consumed - need to prevent default action.
-
-  Keyboard* = object
-    consumed*: bool ## Consumed - need to prevent default action.
-    rune*: Option[Rune]
-    textCursor*: int ## At which character in the input string are we
-    selectionCursor*: int ## To which character are we selecting to
-
-  EventKinds* {.size: sizeof(int8).} = enum
-    evClick
-    evClickOut
-    evHover
-    evOverlapped
-    evPress
-    evDown
-    evRelease
-    evScroll
-    evDrag
-    evDragEnd
-    evKeyboardInput
-    evKeyPress
-
-  EventKind* = enum
-    Exit
-    Enter
-
-  EventFlags* = set[EventKinds]
-
-  UiButton* = enum
-    ButtonUnknown
-    MouseLeft
-    MouseRight
-    MouseMiddle
-    MouseButton4
-    MouseButton5
-    DoubleClick
-    TripleClick
-    QuadrupleClick
-    Key0
-    Key1
-    Key2
-    Key3
-    Key4
-    Key5
-    Key6
-    Key7
-    Key8
-    Key9
-    KeyA
-    KeyB
-    KeyC
-    KeyD
-    KeyE
-    KeyF
-    KeyG
-    KeyH
-    KeyI
-    KeyJ
-    KeyK
-    KeyL
-    KeyM
-    KeyN
-    KeyO
-    KeyP
-    KeyQ
-    KeyR
-    KeyS
-    KeyT
-    KeyU
-    KeyV
-    KeyW
-    KeyX
-    KeyY
-    KeyZ
-    KeyBacktick # `
-    KeyMinus # -
-    KeyEqual # =
-    KeyBackspace
-    KeyTab
-    KeyLeftBracket # [
-    KeyRightBracket # ]
-    KeyBackslash # \
-    KeyCapsLock
-    KeySemicolon # :
-    KeyApostrophe # '
-    KeyEnter
-    KeyLeftShift
-    KeyComma # ,
-    KeyPeriod # .
-    KeySlash # /
-    KeyRightShift
-    KeyLeftControl
-    KeyLeftSuper
-    KeyLeftAlt
-    KeySpace
-    KeyRightAlt
-    KeyRightSuper
-    KeyMenu
-    KeyRightControl
-    KeyDelete
-    KeyHome
-    KeyEnd
-    KeyInsert
-    KeyPageUp
-    KeyPageDown
-    KeyEscape
-    KeyUp
-    KeyDown
-    KeyLeft
-    KeyRight
-    KeyPrintScreen
-    KeyScrollLock
-    KeyPause
-    KeyF1
-    KeyF2
-    KeyF3
-    KeyF4
-    KeyF5
-    KeyF6
-    KeyF7
-    KeyF8
-    KeyF9
-    KeyF10
-    KeyF11
-    KeyF12
-    KeyNumLock
-    Numpad0
-    Numpad1
-    Numpad2
-    Numpad3
-    Numpad4
-    Numpad5
-    Numpad6
-    Numpad7
-    Numpad8
-    Numpad9
-    NumpadDecimal # .
-    NumpadEnter
-    NumpadAdd # +
-    NumpadSubtract # -
-    NumpadMultiply # *
-    NumpadDivide # /
-    NumpadEqual # =
-
-  UiButtonView* = set[UiButton]
-  KeyRange* = KeyA .. NumpadEqual
+  FrameStyle* {.pure.} = enum
+    DecoratedResizable, DecoratedFixedSized, Undecorated, Transparent
 
-const
-  MouseButtons* = {
-    MouseLeft, MouseRight, MouseMiddle, MouseButton4, MouseButton5, DoubleClick,
-    TripleClick, QuadrupleClick,
-  }
-
-  ModifierButtons* = {
-    KeyLeftControl, KeyRightControl, KeyLeftSuper, KeyRightSuper, KeyLeftAlt,
-    KeyRightAlt, KeyLeftShift, KeyRightShift, KeyMenu,
-  }
+variantp RenderCommands:
+  RenderQuit
+  RenderUpdate(n: Renders)
+  RenderSetTitle(name: string)
 
 type AppInputs* = object
   empty*: bool
@@ -199,55 +28,21 @@ type AppInputs* = object
 
   windowSize*: Option[Box]
 
-var uxInputs* {.runtimeVar.} = AppInputs()
-
-when not defined(nimscript):
-  import threading/channels
-  export channels
-
-type ModifierKeys* = enum
-  KNone
-  KMeta
-  KControl
-  KAlt
-  KShift
-  KMenu
-
-proc defaultKeyConfigs(): array[ModifierKeys, UiButtonView] =
-  result[KNone] = {}
-  result[KMeta] =
-    when defined(macosx):
-      {KeyLeftSuper, KeyRightSuper}
-    else:
-      {KeyLeftControl, KeyRightControl}
-  result[KAlt] = {KeyLeftAlt, KeyRightAlt}
-  result[KShift] = {KeyLeftShift, KeyRightShift}
-  result[KMenu] = {KeyMenu}
-
-var keyConfig* {.runtimeVar.}: array[ModifierKeys, UiButtonView] = defaultKeyConfigs()
-
-proc `==`*(keys: UiButtonView, commands: ModifierKeys): bool =
-  let ck = keys * ModifierButtons
-  if ck == {} and keyConfig[commands] == {}:
-    return true
-  else:
-    ck != {} and ck < keyConfig[commands]
-
-proc click*(mouse: Mouse): bool =
+proc click*(inputs: AppInputs): bool =
   when defined(clickOnDown):
-    return MouseButtons * uxInputs.buttonDown != {}
+    return MouseButtons * inputs.buttonDown != {}
   else:
-    return MouseButtons * uxInputs.buttonRelease != {}
+    return MouseButtons * inputs.buttonRelease != {}
 
-proc down*(mouse: Mouse): bool =
-  return MouseButtons * uxInputs.buttonDown != {}
+proc down*(inputs: AppInputs): bool =
+  return MouseButtons * inputs.buttonDown != {}
 
-proc release*(mouse: Mouse): bool =
-  return MouseButtons * uxInputs.buttonRelease != {}
+proc release*(inputs: AppInputs): bool =
+  return MouseButtons * inputs.buttonRelease != {}
 
-proc scrolled*(mouse: Mouse): bool =
-  mouse.wheelDelta.x != 0.0'ui
+proc scrolled*(inputs: AppInputs): bool =
+  inputs.mouse.wheelDelta.x != 0.0'ui
 
-proc dragging*(mouse: Mouse): bool =
-  return MouseButtons * uxInputs.buttonDown != {}
-  return MouseButtons * uxInputs.buttonRelease != {}
+proc dragging*(inputs: AppInputs): bool =
+  return MouseButtons * inputs.buttonDown != {}
+  return MouseButtons * inputs.buttonRelease != {}