hokusai-zero 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83cc0a077934960a9cfec3c52388de538b6816b6b4b9eb606ef449dac6f90608
-  data.tar.gz: 514429bc54c1b49743a425e1f6fb1056dd8f564658b4ff8d46905a595c2a0fd9
+  metadata.gz: f58887af318a4986f8526a3868146766c62dbc6fa72e1a6a6f1a52cf1b4623e2
+  data.tar.gz: 76df215d1555e0930643485c626aa7d1ab8511d4430095f10f79b3ceff041c50
 SHA512:
-  metadata.gz: 337549e39f52146323156c2c9f9deb4e2efd6ee03dfdce73eb6ccaee7416acc59924a3641d36e48c14425e9e1066c6f3c3c32736cfb20afe557c0927bf1572c2
-  data.tar.gz: d29d8c032605dba3a48e930029a3e8ef588950ae2a4aaae70da6849b00a3243ff9505e5cdfce8edfc8635c2ff4b96d6aeab6d207ae0e81a8a0d70e9931b18e37
+  metadata.gz: 53552edadd8e5d20f770e6b9331963296bc406c629084fb781c4a5307cfca514c71a23d89db38a48abc87794ef6950738b6a19315373a68dcf8e751ed32030f5
+  data.tar.gz: d2172018d5129c5be0078ab04dd4d611ddb9bbca61296d8786fbb14c1f57c21fc28bb1de55c3ed05e2f6afc2fb9fd043704417f0c1c18f62bd61528fff8af04e

data/README.md

@@ -9,13 +9,13 @@ A Ruby library for authoring GUI applications
 
 ## Getting started
 
-The build tooling of this project is [xmake](https://xmake.io/#/).  You will need it to compile dependencies and run demos.
-
-Hokusai contains a tree-sitter grammar to parse templates, and uses `md4c` to parse markdown.
+In your Gemfile
 
-When compiling the C portion of hokusai, tree-sitter will be statically linked.
+```ruby
+gem "hokusai-zero",  "0.1.4"
+```
 
-## In order to run an application, you will also need to install a backend
+## In order to run an application, you will need to install a backend
 
 ### Raylib
 
@@ -23,7 +23,7 @@ When compiling the C portion of hokusai, tree-sitter will be statically linked.
 * Write your app
 * Run app with `RAYLIB_PATH=/libpath/for/libraylib.(so|dylib) ruby <your app>.rb`
 
-### SDL
+### SDL2
 
 * Install the following deps
 
@@ -35,13 +35,6 @@ When compiling the C portion of hokusai, tree-sitter will be statically linked.
 * Write your app
 * Run app with `SDL_PATH=/libpath/for/libsdl.(so|dylib) ruby <your app>.rb`
 
-
-## Gemfile
-
-```ruby
-gem "hokusai-zero"
-```
-
 ## Example counter application
 
 ```ruby
@@ -49,86 +42,35 @@ require "hokusai"
 require "hokusai/backends/raylib"
 
 class Counter < Hokusai::Block
-  style <<~EOF
-  [style]
-  additionStyles {
-    background: rgb(214, 49, 24);
-    rounding: 0.0;
-    outline: outline(1,4,4,1);
-    outline_color: rgb(216, 26, 137);
-  }
-
-  additionLabel {
-    size: 40;
-    color: rgb(255,255,255);
-  }
-
-  subtractStyles {
-    background: rgb(0, 85, 170);
-    rounding: 0.0;
-  }
-
-  subtractLabel {
-    size: 50;
-    color: rgb(255,255,255);
-  }
-
-  scrollbar {
-    width: 25;
-    control_height: 100;
-    control_padding: 5;
-    control_rounding: 5;
-  }
-  EOF
-
   template <<-EOF
   [template]
-    hblock { @keypress="update_keys"}
-      vblock
-        hblock
-          label#count {
-            :content="count"
-            size="130" 
-            :color="count_color"
+    vblock
+      hblock
+        label {
+          :content="count"
+          size="130" 
+          :color="count_color"
+        }
+      hblock
+        vblock
+          label { 
+            content="Add"
+            @click="increment" 
+          }
+        vblock
+          label { 
+            content="Subtract"
+            @click="decrement" 
           }
-        hblock
-          vblock#add { ...additionStyles }
-            label { 
-              content="Add"
-              @click="increment" 
-              ...additionLabel 
-            }
-          vblock#subtract { ...subtractStyles }
-            label { 
-              content="Subtract"
-              @click="decrement" 
-              ...subtractLabel 
-            }
-      [if="count_positive"]
-        scrollbar { ...scrollbar }
   EOF
 
   uses(
     vblock: Hokusai::Blocks::Vblock,
     hblock: Hokusai::Blocks::Hblock,
     label: Hokusai::Blocks::Label,
-    scrollbar: Hokusai::Blocks::Scrollbar,
-    image: Hokusai::Blocks::Image
   )
 
-  attr_accessor :count, :keys
-
-  def count_positive
-    count > 0
-  end
-
-  def modal
-    !keys.empty?
-  end
-
-  def update_keys(event)
-    @keys << event.char
-  end
+  attr_accessor :count
 
   def increment(event)
     self.count += 1
@@ -144,7 +86,7 @@ class Counter < Hokusai::Block
 
   def initialize(**args)
     @count = 0
-    @keys = ""
+
     super(**args)
   end
 end
@@ -158,6 +100,12 @@ end
 
 ## Development
 
+The build tooling of this project is [xmake](https://xmake.io/#/).  You will need it to compile dependencies and run demos.
+
+Hokusai contains a tree-sitter grammar to parse templates, and uses `md4c` to parse markdown.
+
+When compiling the C portion of hokusai, tree-sitter will be statically linked.
+
 Requirements:
 * [xmake](https://xmake.io/#/) to build dependencies
 * Ruby to run applications

data/ast/src/core/text.c

@@ -3,6 +3,26 @@
 
 #include "text.h"
 
+#ifdef _WIN32
+size_t my_strnlen(const char* src, size_t n) {
+  size_t len = 0;
+  while (len < n && src[len]) len++;
+  return len;
+}
+
+char* strndup(const char* s, size_t n) {
+  size_t len = my_strnlen(s, n);
+  char* p = malloc(len + 1);
+  if (p) 
+  {
+    memcpy(p, s, len);
+    p[len] = '\0';
+  }
+
+  return p;
+}
+#endif
+
 int hoku_text_char_init(hoku_char** character, int offset, int width)
 {
   hoku_char* init = malloc(sizeof(hoku_char));

data/ext/extconf.rb

@@ -3,14 +3,19 @@ require "mini_portile2"
 
 if MiniPortile.darwin?
   suffix = "dylib"
+  ext = "zip"
 elsif MiniPortile.linux?
   suffix = "so"
+  ext = "tar.gz"
+elsif MiniPortile.windows?
+  suffix = "dll"
+  ext = "zip"
 else
   raise "Currently only supporting darwin and linux"
 end
 
-tree_sitter = MiniPortile.new("libtree-sitter", "0.22.2", make_command: "make all")
-tree_sitter.files = ["https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.22.2.zip"]
+tree_sitter = MiniPortile.new("libtree-sitter", "master", make_command: "make")
+tree_sitter.files = ["https://github.com/tree-sitter/tree-sitter/archive/refs/heads/master.#{ext}"]
 tree_sitter.tap do |t|
   if t.source_directory
     t.prepare_build_directory
@@ -23,7 +28,7 @@ tree_sitter.tap do |t|
   def t.install
     return if installed?
 
-    execute('install', %Q(PREFIX=#{File.expand_path(port_path)} #{make_cmd} all install))
+    execute('install', %Q(#{make_cmd} all install CC=gcc AR=ar PREFIX=#{File.expand_path(port_path)}), { env: { "PREFIX" => File.expand_path(port_path) }})
   end
 
   t.install
@@ -32,7 +37,7 @@ end
 tree_sitter.activate
 
 md4c = MiniPortileCMake.new("md4c", "0.5.2")
-md4c.files = ["https://github.com/mity/md4c/archive/refs/tags/release-0.5.2.zip"]
+md4c.files = ["https://github.com/mity/md4c/archive/refs/tags/release-0.5.2.#{ext}"]
 
 def md4c.cmake_compile_flags
   [*super, "-DBUILD_SHARED_LIBS=OFF"]
@@ -42,11 +47,27 @@ md4c.cook
 md4c.activate
 
 pre = "#{__dir__}/.."
+cwd = "#{__dir__}"
+
+files = %w[ast/src/core/hml.c ast/src/core/ast.c ast/rc/core/style.c ast/src/core/input.c ast/src/core/component.c ast/src/core/util.c ast/src/core/text.c grammar/src/parser.c grammar/src/scanner.c ast/include/hashmap.c]
+objects = %w[hml.o ast.o style.o input.o component.o util.o text.o parser.o scanner.o hashmap.o]
+libraries = [File.expand_path("#{tree_sitter.path}/lib/libtree-sitter.a"), File.expand_path("#{md4c.path}/lib/libmd4c.a")]
+src_files = ["#{tree_sitter.path}/lib/libtree-sitter.a", "#{md4c.path}/lib/libmd4c.a", "#{pre}/ast/src/core/hml.c", "#{pre}/ast/src/core/ast.c", "#{pre}/ast/src/core/style.c", "#{pre}/ast/src/core/input.c", "#{pre}/ast/src/core/component.c", "#{pre}/ast/src/core/util.c", "#{pre}/ast/src/core/text.c", "#{pre}/grammar/src/parser.c", "#{pre}/grammar/src/scanner.c", "#{pre}/ast/include/hashmap.c"]
+if MiniPortile.windows?
+  cflags = "-shared -Wall -Wl,--export-all-symbols -Wl,--enable-auto-import"
+  mkdir = "mkdir #{pre}\\vendor\\lib"
+else
+  cflags = "-fPIC -shared -Wall"
+  mkdir = "mkdir -p #{pre}/vendor/lib"
+end
 
 File.open("Makefile", "w") do |io|
   io << <<~EOF
-  src_files = #{tree_sitter.path}/lib/libtree-sitter.a #{md4c.path}/lib/libmd4c.a #{pre}/ast/src/core/hml.c #{pre}/ast/src/core/ast.c #{pre}/ast/src/core/style.c #{pre}/ast/src/core/input.c #{pre}/ast/src/core/component.c #{pre}/ast/src/core/util.c #{pre}/ast/src/core/text.c #{pre}/grammar/src/parser.c #{pre}/grammar/src/scanner.c #{pre}/ast/include/hashmap.c
-  includes = -I#{pre}/ast/include -I#{pre}/ast/src -I#{pre}/grammar/src -I#{tree_sitter.path}/include -I#{md4c.path}/include
+  src_files = #{files.map {|file| File.expand_path("#{pre}/#{file}")}.join(" ")}
+  object_files = #{objects.map {|file| File.expand_path("#{cwd}/#{file}")}.join(" ")}
+  libraries = #{libraries.join(" ")}
+  src_files = #{src_files.map { |file| File.expand_path(file)}.join(" ")}
+  includes = -I#{File.expand_path("#{pre}/ast/include")} -I#{File.expand_path("#{pre}/ast/src")} -I#{File.expand_path("#{pre}/grammar/src")} -I#{File.expand_path("#{tree_sitter.path}/include")} -I#{File.expand_path("#{md4c.path}/include")}
   all: clean hokusai
   
   .PHONY: hokuasi
@@ -55,11 +76,12 @@ File.open("Makefile", "w") do |io|
   #{"\t"}echo "done"
 
   hokusai:
-  #{"\t"}mkdir -p #{pre}/vendor/lib
-  #{"\t"}gcc -shared -Wall $(includes) -o #{pre}/vendor/lib/libhokusai.#{suffix} $(src_files)
+  #{"\t"}#{mkdir}
+  #{"\t"}gcc -c $(includes) $(src_files) $(libraries)
+  #{"\t"}gcc #{cflags} $(includes) -o #{File.expand_path("#{pre}/vendor/lib/libhokusai.#{suffix}")} $(object_files) $(libraries)
 
   clean:
-  #{"\t"}rm -f vendor/lib/libhokusai.*
-  #{"\t"}rm -f vendor/lib/libmd4c.*
+  #{"\t"}rm -f #{File.expand_path("vendor/lib/libhokusai.*")}
+  #{"\t"}rm -f #{File.expand_path("vendor/lib/libmd4c.*")}
   EOF
 end

data/hokusai.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hokusai-zero'
-  s.version     = '0.1.4'
+  s.version     = '0.1.6'
   s.licenses    = ['PPL']
   s.summary     = "A Ruby library for writing GUI applications"
   s.authors     = ["skinnyjames"]
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.metadata    = { "source_code_uri" => "https://codeberg.org/skinnyjames/hokusai" }
   
   s.add_dependency "ffi", "~> 1.16"
+  s.add_dependency "colorize"
   s.add_dependency "concurrent-ruby", "~> 1.3.4"
   s.add_dependency "raylib-bindings", "~> 0.7.9"
   s.add_dependency "sdl2-bindings", "~> 0.2.3"

data/ui/examples/counter.rb

@@ -33,33 +33,38 @@ module Demos
       control_padding: 5;
       control_rounding: 5;
     }
+    modalContent {
+      width: 300.0;
+      height: 300.0;
+      background: rgb(255, 255, 255);
+    }
     EOF
 
     template <<-EOF
     [template]
-      hblock { @keypress="update_keys"}
-        vblock
-          hblock
-            label#count {
-              :content="count"
-              size="130" 
-              :color="count_color"
+      vblock
+        hblock
+          label#count {
+            :content="count"
+            size="130" 
+            :color="count_color"
+          }
+          modal { :active="over_20" @close="close_modal" }
+            vblock { ...modalContent }
+              text { content="okay" }
+        hblock
+          vblock#add { ...additionStyles }
+            label { 
+              content="Add"
+              @click="increment" 
+              ...additionLabel 
+            }
+          vblock#subtract { ...subtractStyles }
+            label { 
+              content="Subtract"
+              @click="decrement" 
+              ...subtractLabel 
             }
-          hblock
-            vblock#add { ...additionStyles }
-              label { 
-                content="Add"
-                @click="increment" 
-                ...additionLabel 
-              }
-            vblock#subtract { ...subtractStyles }
-              label { 
-                content="Subtract"
-                @click="decrement" 
-                ...subtractLabel 
-              }
-        [if="count_positive"]
-          scrollbar { ...scrollbar }
     EOF
 
     uses(
@@ -67,21 +72,23 @@ module Demos
       hblock: Hokusai::Blocks::Hblock,
       label: Hokusai::Blocks::Label,
       scrollbar: Hokusai::Blocks::Scrollbar,
-      image: Hokusai::Blocks::Image
+      image: Hokusai::Blocks::Image,
+      modal: Hokusai::Blocks::Modal,
+      text: Hokusai::Blocks::Text
     )
 
-    attr_accessor :count, :keys
+    attr_accessor :count, :keys, :modal_open
 
     def count_positive
       count > 0
     end
 
-    def modal
-      !keys.empty?
+    def over_20
+      count > 20
     end
 
-    def update_keys(event)
-      @keys << event.char
+    def close_modal
+      self.count = 0
     end
 
     def increment(event)
@@ -99,6 +106,7 @@ module Demos
     def initialize(**args)
       @count = 0
       @keys = ""
+      @modal_open = false
       super(**args)
     end
   end

data/ui/examples/forum.rb

@@ -70,29 +70,29 @@ module Demos
           label { 
             ...appTitle
           }
-        panel#app { ...panelStyle }
-          vblock { :height="50.0" }
-          hblock { :height="forum_height" }
-            hblock { :width="margin_width" }
-            vblock { :width="panel_width" }
-              [for="post in posts"]
-                post {
-                  @height_updated="update_forum_height"
-                  :width="panel_width"
-                  :index="index"
-                  :key="index"
-                  :post="post"
-                }
-            vblock.recents
-              hblock.header { width="100" }
-                image { ...ernestImage }
-                vblock { width="20" }
-                vblock { width="300" }
-                  text { ...recentsLabel }
-                  music { height="50" }
-                  [for="item in files"]
-                    file { height="30" :item="item" :key="index" :index="index" }
-
+        selectable
+          panel#app { ...panelStyle }
+            vblock { :height="50.0" }
+            hblock { :height="forum_height" }
+              hblock { :width="margin_width" }
+              vblock { :width="panel_width" }
+                [for="post in posts"]
+                  post {
+                    @height_updated="update_forum_height"
+                    :width="panel_width"
+                    :index="index"
+                    :key="index"
+                    :post="post"
+                  }
+              vblock.recents
+                hblock.header { width="100" }
+                  image { ...ernestImage }
+                  vblock { width="20" }
+                  vblock { width="300" }
+                    text { ...recentsLabel }
+                    music { height="50" }
+                    [for="item in files"]
+                      file { height="30" :item="item" :key="index" :index="index" }
       EOF
 
       uses(
@@ -106,7 +106,8 @@ module Demos
         text: Hokusai::Blocks::Text,
         label: Hokusai::Blocks::Label,
         titlebar: Hokusai::Blocks::Titlebar::OSX,
-        image: Hokusai::Blocks::Image
+        image: Hokusai::Blocks::Image,
+        selectable: Hokusai::Blocks::Selectable
       )
 
       def update_forum_height(height, index)

data/ui/examples/spreadsheet/csv.rb

@@ -12,6 +12,7 @@ module Demos
         padding: padding(5.0, 5.0, 5.0, 5.0);
         size: 20;
         text_color: rgb(244, 244, 244);
+        text_selection_color: rgb(74, 74, 95);
       }
       EOF
 
@@ -181,7 +182,8 @@ module Demos
         hblock: Hokusai::Blocks::Hblock,
         panel: Hokusai::Blocks::Panel,
         row: Spreadsheet::Row,
-        label: Hokusai::Blocks::Label
+        label: Hokusai::Blocks::Label,
+        selectable: Hokusai::Blocks::Selectable
       )
 
       computed! :csv

data/ui/examples/spreadsheet.rb

@@ -45,7 +45,8 @@ module Demos
           label { ...appTitle size="14" content="somecsv.csv" }
           label { ...appTitle size="14" :content="status" }
         [if="has_spreadsheet"]
-          csv { @modified="set_status" :csv="spreadsheet" @keypress="handle_keypress" }
+          selectable
+            csv { @modified="set_status" :csv="spreadsheet" @keypress="handle_keypress" }
       EOF
 
       uses(
@@ -56,7 +57,8 @@ module Demos
         label: Hokusai::Blocks::Label,
         titlebar: Hokusai::Blocks::Titlebar::OSX,
         image: Hokusai::Blocks::Image,
-        csv: Spreadsheet::CSV
+        csv: Spreadsheet::CSV,
+        selectable: Hokusai::Blocks::Selectable
       )
 
       attr_reader :spreadsheet

data/ui/lib/lib_hokusai.rb

@@ -9,6 +9,8 @@ module LibHokusai
     ffi_lib "#{__dir__}/../../vendor/lib/libhokusai.dylib"
   when /linux/
     ffi_lib "#{__dir__}/../../vendor/lib/libhokusai.so"
+  when /mingw32|mswin|msys/
+    ffi_lib "#{__dir__}/../../vendor/lib/libhokusai.dll"
   else
     raise "Unsupported platform!"
   end

data/ui/src/hokusai/assets/chevron-down.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><title>finite-icons</title><path d="M13.60851,6.08611L8.35425,11.339,3.06908,6.05389a0.5,0.5,0,0,1,0-.70711l0.539-.539a0.5,0.5,0,0,1,.70711,0l4.03907,4.039L12.36249,4.8399a0.5,0.5,0,0,1,.70705.00006l0.539,0.539A0.5,0.5,0,0,1,13.60851,6.08611Z" fill="#231f20"/></svg>

data/ui/src/hokusai/backends/raylib.rb

@@ -5,7 +5,18 @@ require 'memory_profiler'
 
 module Hokusai::Backends
   class RaylibBackend
-    RAYLIB_PATH = ENV["RAYLIB_PATH"] || "#{__dir__}/../../../../vendor/lib"
+    
+    RAYLIB_PATH = ENV["RAYLIB_PATH"] || begin
+      path = "#{__dir__}/../../../../vendor/lib"
+      case RbConfig::CONFIG['host_os']
+      when /darwin/
+        "#{path}/libraylib.dylib"
+      when /mswin|msys|mingw/
+        "#{path}/libraylib.dll"
+      when /linux/
+        "#{path}/libraylib.so"
+      end
+    end
 
     attr_reader :config
 
@@ -137,14 +148,7 @@ module Hokusai::Backends
     def run(block)
       self.class.reset
 
-      case RbConfig::CONFIG['host_os']
-      when /darwin/
-        Raylib.load_lib("#{RAYLIB_PATH}/libraylib.dylib")
-      when /mswin|msys|mingw/
-        Raylib.load_lib("#{RAYLIB_PATH}/libraylib.dll")
-      when /linux/
-        Raylib.load_lib("#{RAYLIB_PATH}/libraylib.so")
-      end
+      Raylib.load_lib(RAYLIB_PATH)
 
       resize = false
       initial = true
@@ -237,6 +241,10 @@ module Hokusai::Backends
         Raylib.UnloadFont(font.raw)
       end
 
+      self.class.images.each do |_, texture|
+        Raylib.UnloadTexture(texture)
+      end
+
       LibHokusai.hoku_input_free(input.raw)
 
       if ENV["PROFILE"]
@@ -329,7 +337,6 @@ module Hokusai::Backends
       end
 
       Hokusai::Commands::SVG.on_draw do |command|
-        command = command.as(Hokusai::Commands::SVG)
         texture = begin
                     if self.class.images[command.source]
                       self.class.images[command.source]

data/ui/src/hokusai/backends/sdl2.rb

@@ -402,6 +402,33 @@ module Hokusai::Backends
         SDL.RenderCopy(renderer, texture, nil, rect)
       end
 
+      Hokusai::Commands::SVG.on_draw do |command|
+        next unless inside_scissor(command.x, command.y, command.height)
+
+        texture = begin
+                    if self.class.images[command.source]
+                      self.class.images[command.source]
+                    else
+                      file = File.read(command.source)
+
+                      rw = SDL.RWFromConstMem(file, file.size)
+                      surface_ptr = SDL.IMG_Load_RW(rw, 1)
+                      if surface_ptr.null?
+                        raise Hokusai::Error.new("Can't load Image: #{SDL.GetError.read_string}")
+                      end
+
+                      texture = SDL.CreateTextureFromSurface(renderer, surface_ptr)
+                      self.class.images[command.source] = texture
+                      SDL.FreeSurface(surface_ptr)
+                      texture
+                    end
+                  end
+
+          SDL.SetTextureColorMod(texture, command.color.r, command.color.g, command.color.b)
+          rect = sdl_rect(command.x, command.y, command.width, command.height)
+          SDL.RenderCopy(renderer, texture, nil, rect)
+      end
+
       Hokusai::Commands::Rect.on_draw do |command|
         next unless inside_scissor(command.x, command.y, command.height)
         # draw background first