glimmer-dsl-libui 0.1.4 → 0.1.8

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

@@ -31,7 +31,7 @@ module Glimmer
         def can_interpret?(parent, keyword, *args, &block)
           Glimmer::LibUI::Shape.exists?(keyword) and
             (
-              parent.is_a?(Glimmer::LibUI::PathProxy) or
+              parent.is_a?(Glimmer::LibUI::ControlProxy::PathProxy) or
                 parent.is_a?(Glimmer::LibUI::Shape)
             )
         end
@@ -50,7 +50,5 @@ module Glimmer
   end
 end
 
-# TODO Consider moving all shapes underneath Shape namespace
-require 'glimmer/libui/path_proxy'
+require 'glimmer/libui/control_proxy/path_proxy'
 require 'glimmer/libui/shape'
-Dir[File.expand_path('../../libui/*.rb', __dir__)].each {|f| require f}

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

@@ -20,14 +20,14 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/libui/tab_item_proxy'
+require 'glimmer/libui/control_proxy/tab_item_proxy'
 
 module Glimmer
   module DSL
     module Libui
       class TabItemExpression < StaticExpression
         def interpret(parent, keyword, *args, &block)
-          Glimmer::LibUI::TabItemProxy.create(keyword, parent, args, &block)
+          Glimmer::LibUI::ControlProxy::TabItemProxy.create(keyword, parent, args, &block)
         end
       end
     end

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

@@ -0,0 +1,166 @@
+# 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/libui/control_proxy'
+require 'glimmer/fiddle_consumer'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/control_proxy/transformable'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI area objects
+      #
+      # Follows the Proxy Design Pattern
+      class AreaProxy < ControlProxy
+        class << self
+          # this attribute is only populated during on_draw call
+          attr_accessor :current_area_draw_params
+        end
+        
+        LISTENERS = ['on_draw', 'on_mouse_event', 'on_mouse_move', 'on_mouse_down', 'on_mouse_up', 'on_mouse_drag_start', 'on_mouse_drag', 'on_mouse_drop', 'on_mouse_crossed', 'on_mouse_enter', 'on_mouse_exit', 'on_drag_broken']
+        LISTENER_ALIASES = {
+          on_drawn: 'on_draw',
+          on_mouse_moved: 'on_mouse_move',
+          on_mouse_drag_started: 'on_mouse_drag_start',
+          on_mouse_dragged: 'on_mouse_drag',
+          on_mouse_dropped: 'on_mouse_drop',
+          on_mouse_cross: 'on_mouse_crossed',
+          on_mouse_entered: 'on_mouse_enter',
+          on_mouse_exited: 'on_mouse_exit',
+          on_drag_break: 'on_drag_broken',
+        }
+        
+        include Glimmer::FiddleConsumer
+        include Parent
+        prepend Transformable
+        
+        attr_reader :area_handler
+        
+        def post_add_content
+          super
+          install_listeners
+        end
+        
+        def draw(area_draw_params)
+          children.dup.each {|child| child.draw(area_draw_params)}
+          on_draw.each {|listener| listener.call(area_draw_params)}
+        end
+        
+        def redraw
+          queue_redraw_all
+        end
+        
+        private
+        
+        def build_control
+          @area_handler = ::LibUI::FFI::AreaHandler.malloc
+          @libui    = ::LibUI.new_area(@area_handler)
+        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
+            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) }
+            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, [0]) {}
+        end
+        
+        def area_draw_params_hash(area_draw_params)
+          {
+            context: area_draw_params.Context,
+            area_width: area_draw_params.AreaWidth,
+            area_height: area_draw_params.AreaHeight,
+            clip_x: area_draw_params.ClipX,
+            clip_y: area_draw_params.ClipY,
+            clip_width: area_draw_params.ClipWidth,
+            clip_height: area_draw_params.ClipHeight,
+          }
+        end
+        
+        def area_mouse_event_hash(area_mouse_event)
+          {
+            x: area_mouse_event.X,
+            y: area_mouse_event.Y,
+            area_width: area_mouse_event.AreaWidth,
+            area_height: area_mouse_event.AreaHeight,
+            down: area_mouse_event.Down,
+            up: area_mouse_event.Up,
+            count: area_mouse_event.Count,
+            modifers: modifiers_to_symbols(area_mouse_event.Modifiers),
+            held: area_mouse_event.Held1To64,
+          }
+        end
+        
+        def modifiers_to_symbols(modifiers_value)
+          symbols = []
+          modifiers_value = extract_symbol_from_modifiers_value(modifiers_value, symbols: symbols) while modifiers_value > 0
+          symbols
+        end
+        
+        def extract_symbol_from_modifiers_value(modifiers_value, symbols: )
+          if modifiers_value >= 8
+            symbols << :command
+            modifiers_value -= 8
+          elsif modifiers_value >= 4
+            symbols << :shift
+            modifiers_value -= 4
+          elsif modifiers_value >= 2
+            symbols << :alt
+            modifiers_value -= 2
+          elsif modifiers_value >= 1
+            symbols << :control
+            modifiers_value -= 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/{menu_item_proxy.rb → control_proxy/box/horizontal_box_proxy.rb}

@@ -20,21 +20,18 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/control_proxy/box'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI menu item objects
-    #
-    # Follows the Proxy Design Pattern
-    class MenuItemProxy < ControlProxy
-      def libui_api_keyword
-        'menu_item'
-      end
-    
-      private
-      
-      def build_control
-        @libui = @parent_proxy.append_item(*@args)
+    class ControlProxy
+      module Box
+        # Proxy for LibUI horizontal box objects
+        #
+        # Follows the Proxy Design Pattern
+        class HorizontalBoxProxy < ControlProxy
+          include Box
+        end
       end
     end
   end

data/lib/glimmer/libui/{horizontal_box_proxy.rb → control_proxy/box/vertical_box_proxy.rb}

@@ -20,15 +20,19 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
-require 'glimmer/libui/box'
+require 'glimmer/libui/control_proxy/box'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI horizontal box objects
-    #
-    # Follows the Proxy Design Pattern
-    class HorizontalBoxProxy < ControlProxy
-      include Box
+    class ControlProxy
+      module Box
+        # Proxy for LibUI vertical box objects
+        #
+        # Follows the Proxy Design Pattern
+        class VerticalBoxProxy < ControlProxy
+          include Box
+        end
+      end
     end
   end
 end

data/lib/glimmer/libui/{box.rb → control_proxy/box.rb}

@@ -23,35 +23,39 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    module Box
-      APPEND_PROPERTIES = %w[stretchy]
-      
-      def post_initialize_child(child)
-        child.stretchy = true if child.stretchy.nil?
-        ::LibUI.box_append(@libui, child.libui, ControlProxy.boolean_to_integer(child.stretchy))
-        children << child
-      end
-      
-      def libui_api_keyword
-        'box'
-      end
-      
-      def children
-        @children ||= []
-      end
-      
-      def destroy_child(child)
-        ::LibUI.send("box_delete", @libui, children.index(child))
-        ControlProxy.control_proxies.delete(child)
-      end
-      
-      private
-      
-      def build_control
-        super.tap do
-          self.padded = true
+    class ControlProxy
+      module Box
+        APPEND_PROPERTIES = %w[stretchy]
+        
+        def post_initialize_child(child)
+          child.stretchy = true if child.stretchy.nil?
+          ::LibUI.box_append(@libui, child.libui, Glimmer::LibUI.boolean_to_integer(child.stretchy))
+          children << child
+        end
+        
+        def libui_api_keyword
+          'box'
+        end
+        
+        def children
+          @children ||= []
+        end
+        
+        def destroy_child(child)
+          ::LibUI.send("box_delete", @libui, children.index(child))
+          ControlProxy.control_proxies.delete(child)
+        end
+        
+        private
+        
+        def build_control
+          super.tap do
+            self.padded = true
+          end
         end
       end
     end
   end
 end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer/libui/{button_proxy.rb → control_proxy/button_proxy.rb}

@@ -23,18 +23,20 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI button objects
-    #
-    # Follows the Proxy Design Pattern
-    class ButtonProxy < ControlProxy
-      DEFAULT_TEXT = ''
-      
-      private
-      
-      def build_control
-        construction_args = @args.dup
-        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
-        @libui = ControlProxy.new_control(@keyword, construction_args)
+    class ControlProxy
+      # Proxy for LibUI button objects
+      #
+      # Follows the Proxy Design Pattern
+      class ButtonProxy < ControlProxy
+        DEFAULT_TEXT = ''
+        
+        private
+        
+        def build_control
+          construction_args = @args.dup
+          construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+          @libui = ControlProxy.new_control(@keyword, construction_args)
+        end
       end
     end
   end

data/lib/glimmer/libui/{checkbox_proxy.rb → control_proxy/checkbox_proxy.rb}

@@ -23,18 +23,20 @@ require 'glimmer/libui/control_proxy'
 
 module Glimmer
   module LibUI
-    # Proxy for LibUI checkbox objects
-    #
-    # Follows the Proxy Design Pattern
-    class CheckboxProxy < ControlProxy
-      DEFAULT_TEXT = ''
-      
-      private
-      
-      def build_control
-        construction_args = @args.dup
-        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
-        @libui = ControlProxy.new_control(@keyword, construction_args)
+    class ControlProxy
+      # Proxy for LibUI checkbox objects
+      #
+      # Follows the Proxy Design Pattern
+      class CheckboxProxy < ControlProxy
+        DEFAULT_TEXT = ''
+        
+        private
+        
+        def build_control
+          construction_args = @args.dup
+          construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+          @libui = ControlProxy.new_control(@keyword, construction_args)
+        end
       end
     end
   end

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

@@ -0,0 +1,118 @@
+# 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/libui/control_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI color button objects
+      #
+      # Follows the Proxy Design Pattern
+      class ColorButtonProxy < ControlProxy
+        def color(value = nil)
+          # TODO support hex color value
+          if value.nil?
+            @red ||= Fiddle::Pointer.malloc(8) # double
+            @green ||= Fiddle::Pointer.malloc(8) # double
+            @blue ||= Fiddle::Pointer.malloc(8) # double
+            @alpha ||= Fiddle::Pointer.malloc(8) # double
+            ::LibUI.color_button_color(@libui, @red, @green, @blue, @alpha)
+            {
+              r: @red[0, 8].unpack1('d') * 255.0,
+              g: @green[0, 8].unpack1('d') * 255.0,
+              b: @blue[0, 8].unpack1('d') * 255.0,
+              a: @alpha[0, 8].unpack1('d')
+            }
+          else
+            current_color = color
+            value = Glimmer::LibUI.interpret_color(value)
+            value[:r] ||= current_color[:r]
+            value[:g] ||= current_color[:g]
+            value[:b] ||= current_color[:b]
+            value[:a] ||= current_color[:a]
+            ::LibUI.color_button_set_color(@libui, value[:r].to_f / 255.0, value[:g].to_f / 255.0, value[:b].to_f / 255.0, value[:a])
+          end
+        end
+        
+        def red(value = nil)
+          if value.nil?
+            color[:r]
+          else
+            self.color = {r: value}
+          end
+        end
+        alias red= red
+        alias set_red red
+        alias r red
+        alias r= red
+        alias set_r red
+        
+        def green(value = nil)
+          if value.nil?
+            color[:g]
+          else
+            self.color = {g: value}
+          end
+        end
+        alias green= green
+        alias set_green green
+        alias g green
+        alias g= green
+        alias set_g green
+        
+        def blue(value = nil)
+          if value.nil?
+            color[:b]
+          else
+            self.color = {b: value}
+          end
+        end
+        alias blue= blue
+        alias set_blue blue
+        alias b blue
+        alias b= blue
+        alias set_b blue
+        
+        def alpha(value = nil)
+          if value.nil?
+            color[:a]
+          else
+            self.color = {a: value}
+          end
+        end
+        alias alpha= alpha
+        alias set_alpha alpha
+        alias a alpha
+        alias a= alpha
+        alias set_a alpha
+        
+        def destroy
+          Fiddle.free @red unless @red.nil?
+          Fiddle.free @green unless @green.nil?
+          Fiddle.free @blue unless @blue.nil?
+          Fiddle.free @alpha unless @alpha.nil?
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/column/button_column_proxy.rb

@@ -0,0 +1,76 @@
+# 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/libui/control_proxy'
+require 'glimmer/libui/control_proxy/column'
+require 'glimmer/libui/control_proxy/enableable_column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI button column objects
+        #
+        # Follows the Proxy Design Pattern
+        class ButtonColumnProxy < ControlProxy
+          include Column
+          include EnableableColumn
+          
+          def on_clicked(&block)
+            # TODO consider generalizing into custom listeners and moving to ControlProxy
+            @on_clicked_procs ||= []
+            if block.nil?
+              @on_clicked_procs
+            else
+              @on_clicked_procs << block
+              block
+            end
+          end
+          
+          def can_handle_listener?(listener_name)
+            listener_name == 'on_clicked' || super
+          end
+          
+          def handle_listener(listener_name, &listener)
+            case listener_name
+            when 'on_clicked'
+              on_clicked(&listener)
+            else
+              super
+            end
+          end
+          
+          def notify_listeners(listener_name, *args)
+            @on_clicked_procs&.each do |on_clicked_proc|
+              on_clicked_proc.call(*args)
+            end
+          end
+              
+          private
+          
+          def build_control
+            @parent_proxy.append_button_column(name, column_index, enabled_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb

@@ -0,0 +1,46 @@
+# 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/libui/control_proxy'
+require 'glimmer/libui/control_proxy/column'
+require 'glimmer/libui/control_proxy/editable_column'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      module Column
+        # Proxy for LibUI checkbox column objects
+        #
+        # Follows the Proxy Design Pattern
+        class CheckboxColumnProxy < ControlProxy
+          include Column
+          include EditableColumn
+          
+          private
+          
+          def build_control
+            @parent_proxy.append_checkbox_column(name, column_index, editable_value)
+          end
+        end
+      end
+    end
+  end
+end