glimmer-dsl-libui 0.1.7 → 0.1.11

data/examples/area_gallery.rb

@@ -46,5 +46,53 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery2.rb

@@ -107,5 +107,53 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery3.rb

@@ -48,5 +48,53 @@ window('Area Gallery', 400, 400) {
         stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery4.rb

@@ -109,5 +109,53 @@ window('Area Gallery', 400, 400) {
         stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/control_gallery.rb

@@ -78,7 +78,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
           date_picker { stretchy false }
 
           time_picker { stretchy false }
-
+          
           date_time_picker { stretchy false }
 
           font_button { stretchy false }

data/examples/form_table.rb

@@ -45,6 +45,7 @@ window('Contacts', 600, 600) { |w|
           msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
         else
           data << new_row # automatically inserts a row into the table due to implicit data-binding
+          @unfiltered_data = data.dup
           @name_entry.text = ''
           @email_entry.text = ''
           @phone_entry.text = ''
@@ -54,6 +55,25 @@ window('Contacts', 600, 600) { |w|
       end
     }
     
+    search_entry { |se|
+      stretchy false
+      
+      on_changed do
+        filter_value = se.text
+        @unfiltered_data ||= data.dup
+        # Unfilter first to remove any previous filters
+        data.replace(@unfiltered_data) # affects table indirectly through implicit data-binding
+        # Now, apply filter if entered
+        unless filter_value.empty?
+          data.filter! do |row_data| # affects table indirectly through implicit data-binding
+            row_data.any? do |cell|
+              cell.to_s.downcase.include?(filter_value.downcase)
+            end
+          end
+        end
+      end
+    }
+    
     table {
       text_column('Name')
       text_column('Email')

data/examples/grid.rb

@@ -6,7 +6,7 @@ include Glimmer
 
 window('Grid') {
   tab {
-    tab_item('Spanning') {
+    tab_item('Span') {
       grid {
         4.times { |top_value|
           4.times { |left_value|
@@ -46,7 +46,7 @@ window('Grid') {
         }
       }
     }
-    tab_item('Expanding') {
+    tab_item('Expand') {
       grid {
         label("(0, 0) hexpand/vexpand\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
           left 0
@@ -68,5 +68,41 @@ window('Grid') {
         }
       }
     }
+    tab_item('Align') {
+      grid {
+        label("(0, 0) halign/valign fill\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
+          left 0
+          top 0
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :fill
+          valign :fill
+        }
+        label("(1, 0) halign/valign start") {
+          left 1
+          top 0
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :start
+          valign :start
+        }
+        label("(0, 1) halign/valign center") {
+          left 0
+          top 1
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :center
+          valign :center
+        }
+        label("(1, 1) halign/valign end") {
+          left 1
+          top 1
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :end
+          valign :end
+        }
+      }
+    }
   }
 }.show

data/examples/login.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Login') {
+  margined true
+  
+  vertical_box {
+    form {
+      @username_entry = entry {
+        label 'Username:'
+      }
+      
+      @password_entry = password_entry {
+        label 'Password:'
+      }
+    }
+    
+    horizontal_box {
+      @login_button = button('Login') {
+        on_clicked do
+          @username_entry.enabled = false
+          @password_entry.enabled = false
+          @login_button.enabled = false
+          @logout_button.enabled = true
+        end
+      }
+      
+      @logout_button = button('Logout') {
+        enabled false
+        
+        on_clicked do
+          @username_entry.text = ''
+          @password_entry.text = ''
+          @username_entry.enabled = true
+          @password_entry.enabled = true
+          @login_button.enabled = true
+          @logout_button.enabled = false
+        end
+      }
+    }
+  }
+}.show

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

@@ -0,0 +1,40 @@
+# 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/area_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class AreaProxy < ControlProxy
+        # Proxy for LibUI scrolling area objects
+        #
+        # Follows the Proxy Design Pattern
+        class ScrollingAreaProxy < AreaProxy
+          def build_control
+            @area_handler = ::LibUI::FFI::AreaHandler.malloc
+            @libui    = ::LibUI.new_scrolling_area(@area_handler, *@args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -36,40 +36,34 @@ module Glimmer
           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', 'on_key_event', 'on_key_down', 'on_key_up']
+        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 libui_api_keyword
+          'area'
+        end
+        
         def post_add_content
           super
           install_listeners
         end
         
-        def on_draw(&block)
-          @on_draw_procs ||= []
-          if block.nil?
-            @on_draw_procs
-          else
-            @on_draw_procs << block
-            block
-          end
-        end
-        
-        def can_handle_listener?(listener_name)
-          listener_name == 'on_draw' || super
-        end
-        
-        def handle_listener(listener_name, &listener)
-          case listener_name
-          when 'on_draw'
-            on_draw(&listener)
-          else
-            super
-          end
-        end
-        
         def draw(area_draw_params)
           children.dup.each {|child| child.draw(area_draw_params)}
           on_draw.each {|listener| listener.call(area_draw_params)}
@@ -94,10 +88,42 @@ module Glimmer
             draw(area_draw_params)
             AreaProxy.current_area_draw_params = nil
           end
-          @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [0]) {}
-          @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [0]) {}
-          @area_handler.DragBroken   = fiddle_closure_block_caller(0, [0]) {}
-          @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [0]) {}
+          @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, [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
         end
         
         def area_draw_params_hash(area_draw_params)
@@ -111,7 +137,65 @@ module Glimmer
             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 area_key_event_hash(area_key_event)
+          {
+            key: key_to_char(area_key_event.Key),
+            key_value: area_key_event.Key,
+            ext_key: ext_key_to_symbol(area_key_event.ExtKey),
+            ext_key_value: area_key_event.ExtKey,
+            modifier: modifiers_to_symbols(area_key_event.Modifier).first,
+            modifiers: modifiers_to_symbols(area_key_event.Modifiers),
+            up: Glimmer::LibUI.integer_to_boolean(area_key_event.Up),
+          }
+        end
+        
+        def key_to_char(key)
+          key.chr if key > 0
+        end
+        
+        def ext_key_to_symbol(ext_key_value)
+          Glimmer::LibUI.enum_symbols(:ext_key)[ext_key_value - 1].to_s.to_sym if ext_key_value > 0
+        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
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer/libui/control_proxy/entry_proxy/password_entry_proxy.rb

@@ -0,0 +1,36 @@
+# 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/entry_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class EntryProxy < ControlProxy
+        # Proxy for LibUI password entry objects
+        #
+        # Follows the Proxy Design Pattern
+        class PasswordEntryProxy < EntryProxy
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/entry_proxy/search_entry_proxy.rb

@@ -0,0 +1,36 @@
+# 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/entry_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class EntryProxy < ControlProxy
+        # Proxy for LibUI search entry objects
+        #
+        # Follows the Proxy Design Pattern
+        class SearchEntryProxy < EntryProxy
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# 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 entry objects
+      #
+      # Follows the Proxy Design Pattern
+      class EntryProxy < ControlProxy
+        def libui_api_keyword
+          'entry'
+        end
+      end
+    end
+  end
+end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}