change approach; now each view has graphics context assigned in View.init

Author: quantimnot

editor/nimxedit.nim

@@ -1,16 +1,4 @@
-import tables
-
-import nimx/matrixes
-import nimx/system_logger
-import nimx/animation
-import nimx/image
-import nimx/window
-import nimx/autotest
-import nimx/button, nimx/text_field
-import nimx/all_views
-import nimx/editor/edit_view
-
-const isMobile = defined(ios) or defined(android)
+import nimx
 
 proc runAutoTestsIfNeeded() =
     uiTest generalUITest:
@@ -22,7 +10,7 @@ proc runAutoTestsIfNeeded() =
         startRegisteredTests()
 
 proc startApplication() =
-    when isMobile:
+    when mobile:
         var mainWindow = newFullscreenWindow()
     else:
         var mainWindow = newWindow(newRect(40, 40, 1200, 600))

kiwi

@@ -0,0 +1 @@
+Subproject commit 64d1c62c1eb07538371990e15a257bcb5fb4b7a9

nim_emscripten_tutorial

@@ -0,0 +1 @@
+Subproject commit 0640d403bf84f6eac78da971006252463a808c20

nimsl

@@ -0,0 +1 @@
+Subproject commit 491120cefac5bcf1bd7fbaa096ff80cd7c688d92

nimx.nim

@@ -0,0 +1,31 @@
+import nimx / [
+  backends,
+  window,
+  autotest,
+]
+
+# Views
+import nimx / [
+  button,
+  text_field,
+  image_view,
+  slider,
+  segmented_control,
+  collection_view,
+  editor/edit_view,
+]
+
+export
+  # core
+  backends,
+  window,
+  autotest,
+
+  # views
+  button,
+  text_field,
+  image_view,
+  slider,
+  segmented_control,
+  collection_view,
+  edit_view

nimx.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version     = "0.1"
+version     = "0.2"
 author      = "Yuriy Glukhov"
 description = "GUI framework"
 license     = "MIT"

nimx/abstract_window.nim

@@ -83,13 +83,13 @@ method drawWindow*(w: Window) {.base.} =
     w.needsDisplay = false
 
     w.recursiveDrawSubviews()
-    let c = w.gfxCtx
+    template c: untyped = w.gfx
 
     let profiler = sharedProfiler()
     if profiler.enabled:
         updateFps()
-        profiler["Overdraw"] = getOverdrawValue(w.gfxCtx)
-        profiler["DIPs"] = getDIPValue(w.gfxCtx)
+        profiler["Overdraw"] = getOverdrawValue(w.gfx)
+        profiler["DIPs"] = getDIPValue(w.gfx)
         profiler["Animations"] = totalAnims
 
         const fontSize = 14
@@ -125,7 +125,7 @@ method drawWindow*(w: Window) {.base.} =
             c.drawRect(rect)
 
 method draw*(w: Window, rect: Rect) =
-    let gl = w.gfxCtx.gl
+    template gl: untyped = w.gfx.gl
     if w.mActiveBgColor != w.backgroundColor:
         gl.clearColor(w.backgroundColor.r, w.backgroundColor.g, w.backgroundColor.b, w.backgroundColor.a)
         w.mActiveBgColor = w.backgroundColor
@@ -202,12 +202,14 @@ proc onFocusChange*(w: Window, inFocus: bool)=
         sharedNotificationCenter().postNotification(AW_FOCUS_LEAVE)
 
 var newWindow*: proc(r: Rect): Window
+var newWindowWithGfxContext*: proc(gfx: GraphicsContext, r: Rect): Window
 var newFullscreenWindow*: proc(): Window
+var newFullscreenWindowWithGfxContext*: proc(gfx: GraphicsContext): Window
 var newWindowWithNative*: proc(handle: pointer, r: Rect): Window
 var newFullscreenWindowWithNative*: proc(handle: pointer): Window
 
-method init*(w: Window, _: Window, frame: Rect) =
-    procCall w.View.init(w, frame)
+method init*(w: Window, gfx: GraphicsContext, frame: Rect) =
+    procCall w.View.init(gfx, frame)
     w.window = w
     w.needsDisplay = true
     w.mCurrentTouches = newTable[int, View]()

nimx/autotest.nim

@@ -1,5 +1,5 @@
 import macros, logging, strutils
-import nimx / [ timer, app, event, abstract_window, button ]
+import nimx / [ backends, timer, app, event, window, button ]
 
 type UITestSuiteStep* = tuple
     code : proc()
@@ -10,8 +10,6 @@ type UITestSuite* = ref object
     name: string
     steps: seq[UITestSuiteStep]
 
-const web = defined(js) or defined(emscripten) or defined(wasm)
-
 when web:
     when defined(emscripten) or defined(wasm):
         import jsbind/emscripten

nimx/backends.nim

@@ -0,0 +1,60 @@
+type OsApi* {.pure.} = enum
+  web
+  android
+  ios
+  macosx
+  linux
+  windows
+
+type WindowApi* {.pure.} = enum
+  web
+  sdl
+  x11
+  appkit
+  winapi
+
+type InputApi* {.pure.} = enum
+  web
+  sdl
+  x11
+  appkit
+  winapi
+
+type GraphicApi* {.pure.} = enum
+  opengles2
+
+type AudioApi* {.pure.} = enum
+  web
+  sdl
+  appkit
+  winapi
+
+type Backend* = tuple
+  os: OsApi
+  win: WindowApi
+  input: InputApi
+  gfx: GraphicApi
+  audio: AudioApi
+
+const backend*: Backend = 
+  when defined js:
+    (OsApi.web, WindowApi.web, InputApi.web, GraphicApi.opengles2, AudioApi.web)
+  elif defined emscripten:
+    (OsApi.web, WindowApi.web, InputApi.web, GraphicApi.opengles2, AudioApi.web)
+  elif defined wasm:
+    (OsApi.web, WindowApi.web, InputApi.web, GraphicApi.opengles2, AudioApi.web)
+  elif defined ios:
+    (OsApi.ios, WindowApi.sdl, InputApi.sdl, GraphicApi.opengles2, AudioApi.sdl)
+  elif defined android:
+    (OsApi.android, WindowApi.sdl, InputApi.sdl, GraphicApi.opengles2, AudioApi.sdl)
+  elif defined macosx:
+    (OsApi.macosx, WindowApi.sdl, InputApi.sdl, GraphicApi.opengles2, AudioApi.sdl)
+  elif defined linux:
+    (OsApi.linux, WindowApi.sdl, InputApi.sdl, GraphicApi.opengles2, AudioApi.sdl)
+  elif defined windows:
+    (OsApi.windows, WindowApi.sdl, InputApi.sdl, GraphicApi.opengles2, AudioApi.sdl)
+  else: {.error: "unknown backend".}
+
+
+const web* = backend.os == OsApi.web
+const mobile* = defined(ios) or defined(android)

nimx/button.nim

@@ -52,38 +52,38 @@ Button.properties:
     imageMarginLeft
     image
 
-proc newButton*(w: Window, r: Rect): Button =
+proc newButton*(gfx: GraphicsContext, r: Rect): Button =
     result.new()
-    result.init(w, r)
+    result.init(gfx, r)
 
-proc newButton*(parent: View = nil, w: Window, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), title: string = "Button"): Button =
-    result = newButton(w, newRect(position.x, position.y, size.width, size.height))
+proc newButton*(parent: View = nil, gfx: GraphicsContext, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), title: string = "Button"): Button =
+    result = newButton(gfx, newRect(position.x, position.y, size.width, size.height))
     result.title = title
     if not isNil(parent):
         parent.addSubview(result)
 
-proc newCheckbox*(w: Window, r: Rect): Button =
-    result = newButton(w, r)
+proc newCheckbox*(gfx: GraphicsContext, r: Rect): Button =
+    result = newButton(gfx, r)
     result.style = bsCheckbox
     result.behavior = bbToggle
 
-proc newRadiobox*(w: Window, r: Rect): Button =
-    result = newButton(w, r)
+proc newRadiobox*(gfx: GraphicsContext, r: Rect): Button =
+    result = newButton(gfx, r)
     result.style = bsRadiobox
     result.behavior = bbToggle
 
-proc newImageButton*(w: Window, r: Rect): Button =
-    result = newButton(w, r)
+proc newImageButton*(gfx: GraphicsContext, r: Rect): Button =
+    result = newButton(gfx, r)
     result.style = bsImage
 
-proc newImageButton*(parent: View = nil, w: Window, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), image: Image = nil): Button =
-    result = newImageButton(w, newRect(position.x, position.y, size.width, size.height))
+proc newImageButton*(parent: View = nil, gfx: GraphicsContext, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), image: Image = nil): Button =
+    result = newImageButton(gfx, newRect(position.x, position.y, size.width, size.height))
     result.image = image
     if not isNil(parent):
         parent.addSubview(result)
 
-method init*(b: Button, w: Window, frame: Rect) =
-    procCall b.Control.init(w, frame)
+method init*(b: Button, gfx: GraphicsContext, frame: Rect) =
+    procCall b.Control.init(gfx, frame)
     b.state = bsUp
     b.enabled = true
     b.backgroundColor = whiteColor()
@@ -93,22 +93,22 @@ method init*(b: Button, w: Window, frame: Rect) =
     b.imageMarginTop = 2
     b.imageMarginBottom = 2
 
-method init*(b: Checkbox, w: Window, frame: Rect) =
-    procCall b.Button.init(w, frame)
+method init*(b: Checkbox, gfx: GraphicsContext, frame: Rect) =
+    procCall b.Button.init(gfx, frame)
     b.style = bsCheckbox
     b.behavior = bbToggle
 
-method init*(b: Radiobox, w: Window, frame: Rect) =
-    procCall b.Button.init(w, frame)
+method init*(b: Radiobox, gfx: GraphicsContext, frame: Rect) =
+    procCall b.Button.init(gfx, frame)
     b.style = bsRadiobox
     b.behavior = bbToggle
 
 proc drawTitle(b: Button, xOffset: Coord) =
-    template gfxCtx: untyped = b.window.gfxCtx
-    template fontCtx: untyped = b.window.gfxCtx.fontCtx
-    template gl: untyped = b.window.gfxCtx.gl
+    template gfx: untyped = b.gfx
+    template fontCtx: untyped = b.gfx.fontCtx
+    template gl: untyped = b.gfx.gl
     if b.title.len != 0:
-        gfxCtx.fillColor = if b.state == bsDown and b.style == bsRegular:
+        gfx.fillColor = if b.state == bsDown and b.style == bsRegular:
                 whiteColor()
             else:
                 blackColor()
@@ -117,7 +117,7 @@ proc drawTitle(b: Button, xOffset: Coord) =
         var titleRect = b.bounds
         var pt = centerInRect(sizeOfString(fontCtx, gl, font, b.title), titleRect)
         if pt.x < xOffset: pt.x = xOffset
-        gfxCtx.drawText(font, pt, b.title)
+        gfx.drawText(font, pt, b.title)
 
 var regularButtonComposition = newComposition """
 uniform vec4 uStrokeColor;
@@ -136,7 +136,7 @@ void compose() {
 """
 
 proc drawRegularBezel(b: Button) =
-    draw b.window.gfxCtx, regularButtonComposition, b.bounds:
+    draw b.gfx, regularButtonComposition, b.bounds:
         if b.state == bsUp:
             setUniform("uStrokeColor", newGrayColor(0.78))
             setUniform("uFillColorStart", if b.enabled: b.backgroundColor else: grayColor())
@@ -164,7 +164,7 @@ proc drawCheckboxStyle(b: Button, r: Rect) =
     let
         size = b.bounds.height
         bezelRect = newRect(0, 0, size, size)
-        c = b.window.gfxCtx
+        c = b.gfx
 
     if b.value != 0:
         draw c, checkButtonComposition, bezelRect:
@@ -208,7 +208,7 @@ void compose() {
 
 proc drawRadioboxStyle(b: Button, r: Rect) =
     let bezelRect = newRect(0, 0, b.bounds.height, b.bounds.height)
-    let c = b.window.gfxCtx
+    template c: untyped = b.gfx
 
     # Selected
     if b.value != 0:
@@ -227,7 +227,7 @@ proc drawRadioboxStyle(b: Button, r: Rect) =
     b.drawTitle(bezelRect.width + 1)
 
 proc drawImage(b: Button) =
-    let c = b.window.gfxCtx
+    template c: untyped = b.gfx
     let r = b.bounds
     if b.imageMarginLeft != 0 or b.imageMarginRight != 0 or
             b.imageMarginTop != 0 or b.imageMarginBottom != 0: