hokusai-zero 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85dc0be97bf2f9c770f53b45a7790bd5b1dbfda261fb0f0da4f71c6c2c9c67eb
-  data.tar.gz: eb62a84b75ba128fbcd6b052e97a95853a0379572be85ea5584c98117af84b61
+  metadata.gz: f58887af318a4986f8526a3868146766c62dbc6fa72e1a6a6f1a52cf1b4623e2
+  data.tar.gz: 76df215d1555e0930643485c626aa7d1ab8511d4430095f10f79b3ceff041c50
 SHA512:
-  metadata.gz: 1ac8520911b6ba9b3112c68d1f1f653b179b43678c320489a732c97462ba930b637545f018aadc190418be97a6b9fac725eae62dc133ec576e253e87ac518cc6
-  data.tar.gz: fad9fccafdca8cca5ad855dd69b6e7741bd251c39152fb04bdcf1a9027dc47acb59661b247eeb2dbbc32dae09c7c8c7b1273eb1c55afd35db62301477da4e7c5
+  metadata.gz: 53552edadd8e5d20f770e6b9331963296bc406c629084fb781c4a5307cfca514c71a23d89db38a48abc87794ef6950738b6a19315373a68dcf8e751ed32030f5
+  data.tar.gz: d2172018d5129c5be0078ab04dd4d611ddb9bbca61296d8786fbb14c1f57c21fc28bb1de55c3ed05e2f6afc2fb9fd043704417f0c1c18f62bd61528fff8af04e

data/ext/extconf.rb

@@ -3,16 +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", "master", make_command: "make")
-tree_sitter.files = ["https://github.com/tree-sitter/tree-sitter/archive/refs/heads/master.zip"]
+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
@@ -25,7 +28,7 @@ tree_sitter.tap do |t|
   def t.install
     return if installed?
 
-    execute('install', %Q(#{make_cmd} all install CC=gcc AR=ar), { env: { "PREFIX" => File.expand_path(port_path) }})
+    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
@@ -34,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"]
@@ -48,23 +51,23 @@ 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 = ["#{tree_sitter.path}/lib/libtree-sitter.a", "#{md4c.path}/lib/libmd4c.a"]
-
+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 = "-shared -Wall"
+  cflags = "-fPIC -shared -Wall"
   mkdir = "mkdir -p #{pre}/vendor/lib"
 end
 
 File.open("Makefile", "w") do |io|
   io << <<~EOF
-  src_files = #{files.map {|file| "#{pre}/#{file}"}.join(" ")}
-  object_files = #{objects.map {|file| "#{cwd}/#{file}"}.join(" ")}
+  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 = #{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 = #{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
@@ -75,10 +78,10 @@ File.open("Makefile", "w") do |io|
   hokusai:
   #{"\t"}#{mkdir}
   #{"\t"}gcc -c $(includes) $(src_files) $(libraries)
-  #{"\t"}gcc #{cflags} $(includes) -o #{pre}/vendor/lib/libhokusai.#{suffix} $(object_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.5'
+  s.version     = '0.1.6'
   s.licenses    = ['PPL']
   s.summary     = "A Ruby library for writing GUI applications"
   s.authors     = ["skinnyjames"]

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/src/hokusai/backends/raylib.rb

@@ -241,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"]

data/ui/src/hokusai/block.rb

@@ -30,6 +30,10 @@ module Hokusai
       @provides ||= {}
     end
 
+    def self.injectables
+      @injectables ||= []
+    end
+
     # Sets the template for this block
     #
     # @param [String] template to set
@@ -118,16 +122,18 @@ module Hokusai
     end
 
     def self.inject(name, aliased = name)
+      injectables << name
+
       define_method(aliased) do
-        if provider = Node.provides[node.uuid]&.[](name)
-          provider.call
-        end
+        @injections[name]&.call
       end
     end
 
     def self.inject!(name, aliased)
+      injectables << name
+
       define_method(aliased) do
-        if provider = Node.provides[node.uuid]&.[](name)
+        if provider = @injections[name]
           return provider.call
         end
 
@@ -147,6 +153,25 @@ module Hokusai
       raise Hokusai::Error.new("Must supply node argument to #{self.class}.new") unless args[:node]
 
       @node = args[:node]
+      @injections = {}
+
+      self.class.injectables.each do |name|
+        if value = args[:providers][name]
+          @injections[name] = value
+        end
+      end
+    end
+
+    def providers
+      self.class.provides.map do |k, v|
+        if v.is_a?(Symbol)
+          [k, -> { public_send(v) }]
+        elsif v.is_a?(Proc)
+          [k, v]
+        else
+          [k, -> { v }]
+        end
+      end.to_h
     end
 
     def children?

data/ui/src/hokusai/blocks/cursor.rb

@@ -9,7 +9,7 @@ class Hokusai::Blocks::Cursor < Hokusai::Block
   computed :x, default: 0.0
   computed :y, default: 0.0
   computed :show, default: false
-  computed :speed, default: 0.1
+  computed :speed, default: 0.5
   computed :cursor_width, default: 2.0
   computed :cursor_height, default: 0.0
   computed :color, default: DEFAULT_COLOR, convert: Hokusai::Color

data/ui/src/hokusai/blocks/input.rb

@@ -195,7 +195,7 @@ class Hokusai::Blocks::Input < Hokusai::Block
       flush
 
       if table.pieces.size > 10
-        self.table = Util::PieceTable.new(table.to_s)
+        self.table = ::Hokusai::Util::PieceTable.new(table.to_s)
       end
 
       self.start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)

data/ui/src/hokusai/blocks/text.rb

@@ -69,7 +69,7 @@ class Hokusai::Blocks::Text < Hokusai::Block
       iterator.on_draw do |text, x, y, group|
         if selector = selection
           if cursor_offset&.zero? && !selector.started
-            selector.cursor = [x, y + offset_y, 0.0, size.to_f]
+            # selector.cursor = [x, y + offset_y, 0.0, size.to_f]
 
             self.last_cursor_offset = cursor_offset
           end
@@ -113,6 +113,8 @@ class Hokusai::Blocks::Text < Hokusai::Block
                     system("open #{group.link}")
                   when /linux/
                     system("xdg-open #{group.link}")
+                  when /msys|mingw/
+                    system("Start-Process \"#{group.link}\"")
                   end
 
                   self.click_position = nil
@@ -126,9 +128,9 @@ class Hokusai::Blocks::Text < Hokusai::Block
       end
 
       iterator.on_draw_selection do |x, y, width, height|
-        # commands.rect(x, y, width, height) do |command|
-        #   command.color = selection_color
-        # end
+        commands.rect(x, y, width, height) do |command|
+          command.color = selection_color
+        end
       end
 
       iterator.on_selection_change do |start, stop|

data/ui/src/hokusai/font.rb

@@ -224,7 +224,7 @@ module Hokusai
       end
 
       def char_is_selected(char)
-        return false if select_begin.nil? || select_end.nil?
+        return false if select_begin.nil? || select_end.nil? || (select_end - select_begin).zero?
 
         (select_begin..select_end).include?(char.offset)
       end

data/ui/src/hokusai/mounting/loop_entry.rb

@@ -27,7 +27,7 @@ module Hokusai
 
       INDEX_KEY = "index".freeze
 
-      def_delegators :@entry, :ast, :block, :target, :parent
+      def_delegators :@entry, :ast, :block, :target, :parent, :providers
 
       def initialize(mount_entry)
         @entry = mount_entry
@@ -78,12 +78,12 @@ module Hokusai
           block.node.meta << child_block
 
           node.ast.children.each_with_index do |child, idx|
-            entries_to_return << MountEntry.new(index, child, child_block, child_block, child_block, context: nil)
+            entries_to_return << MountEntry.new(index, child, child_block, child_block, child_block, context: nil, providers: providers.merge(child_block.providers))
           end
 
           siblings = []
           portal.ast.children.each_with_index do |child, idx|
-            siblings << MountEntry.new(idx, child, child_block, child_block, target, context: ctx)
+            siblings << MountEntry.new(idx, child, child_block, child_block, target, context: ctx, providers: providers.merge(child_block.providers))
           end
 
           secondary_entries << siblings

data/ui/src/hokusai/mounting/mount_entry.rb

@@ -1,14 +1,15 @@
 module Hokusai
   module Mounting
     class MountEntry
-      attr_reader :block, :parent, :ast, :target, :index, :ctx
+      attr_reader :block, :parent, :ast, :target, :index, :ctx, :providers
 
-      def initialize(index, ast, block, parent, target = parent, context: nil)
+      def initialize(index, ast, block, parent, target = parent, context: nil, providers: {})
         @index = index
         @ast = ast
         @block = block
         @parent = parent
         @target = target
+        @providers = providers
         @ctx = context
       end
 
@@ -28,6 +29,7 @@ module Hokusai
         StringIO.open do |io|
           io << "#{block.class} | #{ast.type} (#{index})\n"
           io << "#{block.node.ast.children.map(&:type)}"
+          io << "providers: #{providers.map {|k,v| k }.join(", ")}\n"
           io << "parent: #{parent.class}\n"
           io << "target: #{target.class}\n\n"
         end.string
@@ -35,7 +37,7 @@ module Hokusai
 
       def with_block(new_block, supercede_parent: false)
         parent_block = supercede_parent ? block : parent
-        MountEntry.new(index, ast, new_block, parent_block, target, context: ctx)
+        MountEntry.new(index, ast, new_block, parent_block, target, context: ctx, providers: providers)
       end
 
       def mount(context: nil)
@@ -46,23 +48,11 @@ module Hokusai
         node.add_styles(target.class)
         node.add_props_from_block(target, context: context || ctx)
 
-        child_block = klass.new(node: node)
+        # handle provides / dependency injection
+        child_block = klass.new(node: node, providers: providers)
         child_block.node.meta.publisher.add(target) # todo
         UpdateEntry.new(child_block, block, target).register(context: context || ctx)
 
-        block.class.provides.each do |k, v|
-          if v.is_a?(Symbol)
-            Node.provide(child_block.node, k, ->{ block.public_send(v) })
-
-            # child_block.node.meta.provides[k] = -> { block.public_send(v) }
-            # child_block.class.provides[k] = -> { block.public_send(v) }
-          else
-            Node.provide(child_block.node, k, v)
-            # child_block.node.meta.provides[k] = v
-            # child_block.class.provides[k] = v
-          end
-        end
-
         block.node.meta << child_block
 
         yield child_block

data/ui/src/hokusai/node.rb

@@ -12,15 +12,6 @@ module Hokusai
 
     def_delegators :@ast, :slot?, :type, :event
 
-    def self.provides
-      @provides ||= {}
-    end
-
-    def self.provide(node, key, value)
-      provides[node.uuid] ||= {}
-      provides[node.uuid][key] = value
-    end
-
     def self.parse(template, name = "root", parent = nil)
       ast = Ast.parse(template, name)
 

data/ui/src/hokusai/node_mounter.rb

@@ -13,7 +13,7 @@ module Hokusai
       @primary_stack = []
 
       node.ast.children.each_with_index do |child, index|
-        primary_stack << Mounting::MountEntry.new(index, child, root, root, previous_target || root)
+        primary_stack << Mounting::MountEntry.new(index, child, root, root, previous_target || root, providers: root.providers)
       end
     end
 
@@ -78,7 +78,7 @@ module Hokusai
 
           entry.ast.children.each_with_index do |child, child_index|
             child.has_if_condition?
-            items << Mounting::MountEntry.new(child_index, child, child_block, entry.parent, entry.target, context: entry.ctx)
+            items << Mounting::MountEntry.new(child_index, child, child_block, entry.parent, entry.target, context: entry.ctx, providers: entry.providers.merge(child_block.providers))
           end
 
           secondary_stack.unshift items
@@ -88,7 +88,7 @@ module Hokusai
           primary_items = []
 
           child_block.node.ast.children.each_with_index do |child, child_index|
-            primary_items << Mounting::MountEntry.new(child_index, child, child_block, child_block, context: entry.ctx)
+            primary_items << Mounting::MountEntry.new(child_index, child, child_block, child_block, context: entry.ctx, providers: entry.providers.merge(child_block.providers))
           end
 
           self.primary_stack = primary_items + primary_stack

data/ui/src/hokusai/util/clamping_iterator.rb

@@ -15,11 +15,11 @@ module Hokusai::Util
     end
 
     def draw(font_size, boundary, selection: nil)
-      # selection_extract(font_size, boundary, selection: selection)
+      selection_extract(font_size, boundary, selection: selection)
       draw_text(font_size, boundary)
-      # selection_update(selection)
-      # self.start_select = 0.0
-      # self.stop_select = nil
+      selection_update(selection)
+      self.start_select = 0.0
+      self.stop_select = nil
     end
 
     def selection_extract(font_size, boundary, selection: nil)
@@ -165,6 +165,8 @@ module Hokusai::Util
         if start = start_select
           on_selection_change_cb&.call(start, stop_select)
         end
+
+        nil
       end
     ensure
       @i += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hokusai-zero
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - skinnyjames
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi