glimmer-dsl-libui 0.1.10 → 0.2.2

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}

data/lib/glimmer/libui/control_proxy/menu_item_proxy/radio_menu_item_proxy.rb

@@ -0,0 +1,69 @@
+# 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/menu_item_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class MenuItemProxy < ControlProxy
+        # Proxy for LibUI radio menu item object
+        #
+        # Follows the Proxy Design Pattern
+        class RadioMenuItemProxy < MenuItemProxy
+          def checked(value = nil)
+            if !value.nil?
+              if Glimmer::LibUI.integer_to_boolean(value) != checked?
+                super
+                if Glimmer::LibUI.integer_to_boolean(value)
+                  (@parent_proxy.children - [self]).select {|c| c.is_a?(MenuItemProxy)}.each do |menu_item|
+                    menu_item.checked = false
+                  end
+                end
+              end
+            end
+          end
+          alias checked? checked
+          alias set_checked checked
+          alias checked= checked
+          
+          def handle_listener(listener_name, &listener)
+            if listener_name.to_s == 'on_clicked'
+              radio_listener = Proc.new do
+                self.checked = true if !checked?
+                listener.call(self)
+              end
+              super(listener_name, &radio_listener)
+            else
+              super
+            end
+          end
+        
+          private
+          
+          def build_control
+            @libui = @parent_proxy.append_check_item(*@args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/control_proxy'
+require 'glimmer/libui/parent'
 
 module Glimmer
   module LibUI
@@ -28,6 +29,8 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class MenuProxy < ControlProxy
+        include Parent
+        
         DEFAULT_TEXT = ''
         
         private

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

@@ -35,12 +35,6 @@ module Glimmer
         DEFAULT_HAS_MENUBAR = 1
         
         def post_initialize_child(child)
-          if child.is_a?(AreaProxy)
-            vertical_box_parent = ControlProxy.create('vertical_box', self, [])
-            child.instance_variable_set(:@parent_proxy, vertical_box_parent)
-            vertical_box_parent.post_initialize_child(child)
-            child = vertical_box_parent
-          end
           ::LibUI.window_set_child(@libui, child.libui)
         end
         

data/lib/glimmer/libui/control_proxy.rb

@@ -223,7 +223,13 @@ module Glimmer
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_set_#{method_name.to_s.sub(/=$/, '')}") && !args.empty?
           property = method_name.to_s.sub(/=$/, '')
           args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
-          ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args)
+          if property.to_s == 'checked'
+            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui))
+            new_value = Glimmer::LibUI.integer_to_boolean(args[0])
+            ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args) if new_value != current_value
+          else
+            ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args)
+          end
         elsif ::LibUI.respond_to?("#{libui_api_keyword}_#{method_name}") && !args.empty?
           ::LibUI.send("#{libui_api_keyword}_#{method_name}", @libui, *args)
         elsif ::LibUI.respond_to?("control_#{method_name.to_s.sub(/\?$/, '')}") && args.empty?
@@ -280,6 +286,7 @@ module Glimmer
         if value.nil?
           @enabled
         elsif value != @enabled
+          @enabled = value == 1 || value
           if value == 1 || value
             send_to_libui('enable')
           else

data/lib/glimmer/libui/shape/arc.rb

@@ -29,11 +29,14 @@ module Glimmer
         parameter_defaults 0, 0, 0, 0, 360, false
                 
         def draw(area_draw_params)
-          @args[5] ||= Glimmer::LibUI.boolean_to_integer(@args[5], allow_nil: false)
+          arc_args = @args.dup
+          arc_args[3] = Glimmer::LibUI.degrees_to_radians(arc_args[3])
+          arc_args[4] = Glimmer::LibUI.degrees_to_radians(arc_args[4])
+          arc_args[5] = Glimmer::LibUI.boolean_to_integer(arc_args[5], allow_nil: false)
           if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
-            ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *@args)
+            ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
           else
-            ::LibUI.draw_path_arc_to(path_proxy.libui, *@args)
+            ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
           end
           super
         end

data/lib/glimmer/libui/shape/circle.rb

@@ -0,0 +1,50 @@
+# 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/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Circle < Shape
+        parameters :x_center, :y_center, :radius
+        parameter_defaults 0, 0, 0
+                
+        def draw(area_draw_params)
+          arc_args = @args.dup
+          arc_args[3] = 0
+          arc_args[4] = Math::PI * 2.0
+          arc_args[5] = 0
+          if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
+            ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
+          else
+            ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+          end
+          super
+        end
+        
+        def include?(x, y)
+          (x - x_center)**2 + (y - y_center)**2 < radius**2
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape/rectangle.rb

@@ -32,6 +32,10 @@ module Glimmer
           ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args)
           super
         end
+        
+        def include?(x, y)
+          x.between?(self.x, self.x + width) && y.between?(self.y, self.y + height)
+        end
       end
     end
   end

data/lib/glimmer/libui/shape/square.rb

@@ -32,6 +32,10 @@ module Glimmer
           ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
           super
         end
+        
+        def include?(x, y)
+          x.between?(self.x, self.x + length) && y.between?(self.y, self.y + length)
+        end
       end
     end
   end

data/lib/glimmer/libui.rb

@@ -19,15 +19,23 @@
 # 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/fiddle_consumer'
+
 module Glimmer
   module LibUI
     class << self
+      include Glimmer::FiddleConsumer
+      
       def integer_to_boolean(int, allow_nil: true)
-        int.nil? ? (allow_nil ? nil : false) : int == 1
+        int.nil? ? (allow_nil ? nil : false) : ((int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : int == 1)
       end
       
       def boolean_to_integer(bool, allow_nil: true)
-        bool.nil? ? (allow_nil ? nil : 0) : (bool ? 1 : 0)
+        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool == true ? 1 : 0))
+      end
+      
+      def degrees_to_radians(degrees)
+        ((Math::PI * 2.0) / 360.00) * degrees.to_f
       end
       
       def interpret_color(value)
@@ -104,6 +112,55 @@ module Glimmer
           enum_symbol_to_value(enum_name, enum_symbols(enum_name)[default_index])
         end
       end
+      
+      def x11_colors
+        Color::RGB.constants.reject {|c| c.to_s.upcase == c.to_s}.map(&:to_s).map(&:underscore).map(&:to_sym)
+      end
+      
+      # Queues block to execute at the nearest opportunity possible on the main GUI event loop
+      def queue_main(&block)
+        closure = fiddle_closure_block_caller(4, [0]) do
+          result = boolean_to_integer(block.call)
+          result = 1 if result.nil?
+          result
+        end
+        ::LibUI.queue_main(closure)
+        closure
+      end
+      
+      # Calls block on the main GUI event loop after time_in_seconds delay, repeating indefinitely by default
+      # If `repeat:` keyword arg is passed with an Integer value, it repeats for that number of times
+      # If `repeat:` keyword arg is passed with false or 0, then the block is only called onces
+      # If block returns false at any point, the timer is stopped from further repetitions regardless of `repeat:` keyword arg value
+      # If block returns true at any point, the timer continues for another repetition regardless of `repeat:` keyword arg value
+      def timer(time_in_seconds = 0.1, repeat: true, &block)
+        closure = fiddle_closure_block_caller(4, [0]) do
+          result = boolean_to_integer(block.call)
+          repeat -= 1 if repeat.is_a?(Integer)
+          if result.nil?
+            if (repeat == true || (repeat.is_a?(Integer) && repeat > 0))
+              result = 1
+            else
+              result = 0
+            end
+          end
+          result
+        end
+        ::LibUI.timer(time_in_seconds * 1000.0, closure)
+        closure
+      end
+      
+      def respond_to?(method_name, *args)
+        super || ::LibUI.respond_to?(method_name, *args)
+      end
+      
+      def method_missing(method_name, *args, &block)
+        if ::LibUI.respond_to?(method_name, true)
+          ::LibUI.send(method_name, *args, &block)
+        else
+          super
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,7 @@ files:
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
+- examples/color_the_circles.rb
 - examples/control_gallery.rb
 - examples/date_time_picker.rb
 - examples/dynamic_area.rb
@@ -238,9 +239,11 @@ files:
 - examples/form_table.rb
 - examples/grid.rb
 - examples/histogram.rb
+- examples/login.rb
 - examples/meta_example.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
+- examples/timer.rb
 - glimmer-dsl-libui.gemspec
 - lib/glimmer-dsl-libui.rb
 - lib/glimmer/dsl/libui/control_expression.rb
@@ -256,6 +259,7 @@ files:
 - lib/glimmer/libui.rb
 - lib/glimmer/libui/control_proxy.rb
 - lib/glimmer/libui/control_proxy/area_proxy.rb
+- lib/glimmer/libui/control_proxy/area_proxy/scrolling_area_proxy.rb
 - lib/glimmer/libui/control_proxy/box.rb
 - lib/glimmer/libui/control_proxy/box/horizontal_box_proxy.rb
 - lib/glimmer/libui/control_proxy/box/vertical_box_proxy.rb
@@ -278,6 +282,9 @@ files:
 - lib/glimmer/libui/control_proxy/editable_column.rb
 - lib/glimmer/libui/control_proxy/editable_combobox_proxy.rb
 - lib/glimmer/libui/control_proxy/enableable_column.rb
+- lib/glimmer/libui/control_proxy/entry_proxy.rb
+- lib/glimmer/libui/control_proxy/entry_proxy/password_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/entry_proxy/search_entry_proxy.rb
 - lib/glimmer/libui/control_proxy/font_button_proxy.rb
 - lib/glimmer/libui/control_proxy/form_proxy.rb
 - lib/glimmer/libui/control_proxy/grid_proxy.rb
@@ -291,6 +298,7 @@ files:
 - lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_item_proxy/preferences_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_item_proxy/quit_menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy/radio_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_item_proxy/separator_menu_item_proxy.rb
 - lib/glimmer/libui/control_proxy/menu_proxy.rb
 - lib/glimmer/libui/control_proxy/message_box.rb
@@ -308,10 +316,17 @@ files:
 - lib/glimmer/libui/shape.rb
 - lib/glimmer/libui/shape/arc.rb
 - lib/glimmer/libui/shape/bezier.rb
+- lib/glimmer/libui/shape/circle.rb
 - lib/glimmer/libui/shape/figure.rb
 - lib/glimmer/libui/shape/line.rb
 - lib/glimmer/libui/shape/rectangle.rb
 - lib/glimmer/libui/shape/square.rb
+- sounds/AlanWalker-Faded.mid
+- sounds/AlanWalker-SingMeToSleep.mid
+- sounds/CalvinHarris-Blame.mid
+- sounds/CalvinHarris-MyWay.mid
+- sounds/deadmau5-2448.mid
+- sounds/deadmau5-SoThereIWas.mid
 homepage: http://github.com/AndyObtiva/glimmer-dsl-libui
 licenses:
 - MIT