glimmer-dsl-libui 0.3.4 → 0.4.2

data/lib/glimmer/dsl/libui/dsl.rb

@@ -37,7 +37,10 @@ module Glimmer
         Libui,
         %w[
           listener
+          data_binding
+          shine_data_binding
           property
+          string
           control
           shape
         ]

data/lib/glimmer/dsl/libui/observe_expression.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/observe_expression'
+
+module Glimmer
+  module DSL
+    module SWT
+      class ObserveExpression < StaticExpression
+        include TopLevelExpression
+        include Glimmer::DSL::ObserveExpression
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/libui/shine_data_binding_expression.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/shine'
+
+module Glimmer
+  module DSL
+    module Libui
+      class ShineDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 0 and
+            block.nil? and
+            parent.respond_to?(keyword, *args, &block)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::DataBinding::Shine.new(parent, keyword)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/libui/string_expression.rb

@@ -19,7 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/libui/control_proxy/text_proxy'
 require 'glimmer/libui/attributed_string'
@@ -27,14 +26,14 @@ require 'glimmer/libui/attributed_string'
 module Glimmer
   module DSL
     module Libui
-      class StringExpression < StaticExpression
+      class StringExpression < Expression
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
-          super and
+          keyword == 'string' and
             (
               parent.is_a?(Glimmer::LibUI::ControlProxy::TextProxy) or
-              parent.is_a?(Glimmer::LibUI::AttributedString)
+              (parent.is_a?(Glimmer::LibUI::AttributedString) and !args.empty?)
             )
         end
   
@@ -47,7 +46,7 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          parent.post_add_content
+          parent.post_add_content(block)
         end
       end
     end

data/lib/glimmer/libui/attributed_string.rb

@@ -27,7 +27,8 @@ require 'glimmer/libui/control_proxy/transformable'
 module Glimmer
   module LibUI
     class AttributedString
-      attr_reader :block, :keyword, :parent_proxy, :args
+      attr_reader :keyword, :parent_proxy, :args
+      attr_accessor :block
     
       def initialize(keyword, parent_proxy, args, &block)
         @keyword = keyword
@@ -115,10 +116,14 @@ module Glimmer
       alias open_type_features= open_type_features
       alias set_open_type_features open_type_features
       
-      def post_add_content
-        block_result = @block&.call
-        @string = block_result if block_result.is_a?(String)
-        @parent_proxy&.post_initialize_child(self)
+      def post_add_content(block = nil)
+        block ||= @block
+        block_result = block&.call
+        unless @content_added
+          @string = block_result if block_result.is_a?(String)
+          @parent_proxy&.post_initialize_child(self)
+          @content_added = true
+        end
       end
       
       def post_initialize_child(child)
@@ -185,12 +190,20 @@ module Glimmer
       end
       
       def redraw
-        area_proxy&.queue_redraw_all
+        area_proxy&.redraw
+      end
+      
+      def request_auto_redraw
+        area_proxy&.request_auto_redraw
       end
       
       def area_proxy
         @parent_proxy.parent_proxy
       end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Libui::StringExpression.new, @keyword, &block)
+      end
     end
   end
 end

data/lib/glimmer/libui/control_proxy/area_proxy.rb

@@ -86,14 +86,17 @@ module Glimmer
         
         def post_add_content
           unless parent_proxy.is_a?(Box)
-            original_parent_proxy = @parent_proxy
-            @vertical_box_parent_proxy = ControlProxy.create('vertical_box', parent_proxy, []) {} # block prevents calling post add content
-            append_properties.each do |property|
-              @vertical_box_parent_proxy.append_property(property, append_property(property))
+            unless @content_added
+              original_parent_proxy = @parent_proxy
+              @vertical_box_parent_proxy = ControlProxy.create('vertical_box', parent_proxy, []) {} # block prevents calling post add content
+              append_properties.each do |property|
+                @vertical_box_parent_proxy.append_property(property, append_property(property))
+              end
+              @vertical_box_parent_proxy.post_add_content
+              @parent_proxy = @vertical_box_parent_proxy
+              @vertical_box_parent_proxy.post_initialize_child(self)
+              @content_added = true
             end
-            @vertical_box_parent_proxy.post_add_content
-            @parent_proxy = @vertical_box_parent_proxy
-            @vertical_box_parent_proxy.post_initialize_child(self)
           else
             super
           end
@@ -142,48 +145,51 @@ module Glimmer
         end
         
         def install_listeners
-          @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
-            area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
-            area_draw_params = area_draw_params_hash(area_draw_params)
-            AreaProxy.current_area_draw_params = area_draw_params
-            draw(area_draw_params)
-            AreaProxy.current_area_draw_params = nil
-          end
-          @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
-            area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
-            area_mouse_event = area_mouse_event_hash(area_mouse_event)
-            on_mouse_event.each { |listener| listener.call(area_mouse_event)}
-            on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
-            unless @last_area_mouse_event.nil?
-              on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
-              on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
-              on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
-              on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
-              on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+          unless @listeners_installed
+            @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
+              area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
+              area_draw_params = area_draw_params_hash(area_draw_params)
+              AreaProxy.current_area_draw_params = area_draw_params
+              draw(area_draw_params)
+              AreaProxy.current_area_draw_params = nil
             end
-            @last_area_mouse_event = area_mouse_event
-          end
-          @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
-            left = Glimmer::LibUI.integer_to_boolean(left)
-            on_mouse_crossed.each { |listener| listener.call(left) }
-            if left
-              on_mouse_exit.each { |listener| listener.call(left) }
-            else
-              on_mouse_enter.each { |listener| listener.call(left) }
+            @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
+              area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
+              area_mouse_event = area_mouse_event_hash(area_mouse_event)
+              on_mouse_event.each { |listener| listener.call(area_mouse_event)}
+              on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
+              unless @last_area_mouse_event.nil?
+                on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
+                on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
+                on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
+                on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
+                on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+              end
+              @last_area_mouse_event = area_mouse_event
             end
-          end
-          @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
-            on_drag_broken.each { |listener| listener.call }
-          end
-          @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
-            area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
-            area_key_event = area_key_event_hash(area_key_event)
-            on_key_event.each { |listener| listener.call(area_key_event) }
-            if area_key_event[:up]
-              on_key_up.each { |listener| listener.call(area_key_event) }
-            else
-              on_key_down.each { |listener| listener.call(area_key_event) }
+            @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
+              left = Glimmer::LibUI.integer_to_boolean(left)
+              on_mouse_crossed.each { |listener| listener.call(left) }
+              if left
+                on_mouse_exit.each { |listener| listener.call(left) }
+              else
+                on_mouse_enter.each { |listener| listener.call(left) }
+              end
+            end
+            @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
+              on_drag_broken.each { |listener| listener.call }
+            end
+            @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_key_event|
+              area_key_event = ::LibUI::FFI::AreaKeyEvent.new(area_key_event)
+              area_key_event = area_key_event_hash(area_key_event)
+              on_key_event.each { |listener| listener.call(area_key_event) }
+              if area_key_event[:up]
+                on_key_up.each { |listener| listener.call(area_key_event) }
+              else
+                on_key_down.each { |listener| listener.call(area_key_event) }
+              end
             end
+            @listeners_installed = true
           end
         end
         

data/lib/glimmer/libui/control_proxy/image_proxy.rb

@@ -56,9 +56,8 @@ module Glimmer
               draw(AreaProxy.current_area_draw_params)
               destroy
             end
-            @content_added = true
           else # image object not control
-            build_control
+            build_control unless @content_added
             super
           end
         end
@@ -68,7 +67,7 @@ module Glimmer
             @args[0]
           else
             @args[0] = value
-            if @content_added
+            if area_image? && @content_added
               post_add_content
               request_auto_redraw
             end
@@ -167,8 +166,8 @@ module Glimmer
           end
           canvas.resample_nearest_neighbor!(width, height) if width && height
           @data = canvas.to_rgba_stream
-          self.width = canvas.width
-          self.height = canvas.height
+          @args[1] = canvas.width
+          @args[2] = canvas.height
           [@data, width, height]
         end
         

data/lib/glimmer/libui/control_proxy/table_proxy.rb

@@ -55,7 +55,7 @@ module Glimmer
         end
         
         def post_add_content
-          build_control
+          build_control unless @content_added
           super
         end
         

data/lib/glimmer/libui/control_proxy.rb

@@ -136,7 +136,10 @@ module Glimmer
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
-        @parent_proxy&.post_initialize_child(self)
+        unless @content_added
+          @parent_proxy&.post_initialize_child(self)
+          @content_added = true
+        end
       end
       
       # Subclasses may override to perform post initialization work on an added child

data/lib/glimmer/libui/shape.rb

@@ -79,8 +79,11 @@ module Glimmer
       
       # Subclasses may override to perform post add_content work (normally must call super)
       def post_add_content
-        @parent&.post_initialize_child(self)
-        @parent.post_add_content if implicit_path? && dynamic?
+        unless @content_added
+          @parent&.post_initialize_child(self)
+          @parent.post_add_content if implicit_path? && dynamic?
+          @content_added = true
+        end
       end
       
       def post_initialize_child(child, add_child: true)
@@ -102,7 +105,7 @@ module Glimmer
       end
       
       def redraw
-        area_proxy&.auto_redraw
+        area_proxy&.redraw
       end
       
       def request_auto_redraw

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ files:
 - examples/basic_transform2.rb
 - examples/basic_window.rb
 - examples/basic_window2.rb
+- examples/button_counter.rb
 - examples/color_button.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb
@@ -283,14 +284,18 @@ files:
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
+- lib/glimmer/dsl/libui/bind_expression.rb
 - lib/glimmer/dsl/libui/control_expression.rb
+- lib/glimmer/dsl/libui/data_binding_expression.rb
 - lib/glimmer/dsl/libui/dsl.rb
 - lib/glimmer/dsl/libui/file_expression.rb
 - lib/glimmer/dsl/libui/listener_expression.rb
+- lib/glimmer/dsl/libui/observe_expression.rb
 - lib/glimmer/dsl/libui/open_file_expression.rb
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
 - lib/glimmer/dsl/libui/shape_expression.rb
+- lib/glimmer/dsl/libui/shine_data_binding_expression.rb
 - lib/glimmer/dsl/libui/string_expression.rb
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/fiddle_consumer.rb