glimmer-dsl-tk 0.0.18 → 0.0.23

data/lib/glimmer/dsl/tk/on_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/tk/widget_proxy'
+
+module Glimmer
+  module DSL
+    module Tk
+      class OnExpression < StaticExpression
+        def interpret(parent, keyword, *args, &block)
+          parent.handle_listener(args.first, &block)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/tk/widget_expression.rb

@@ -52,10 +52,3 @@ module Glimmer
 end
 
 require 'glimmer/tk/widget_proxy'
-require 'glimmer/tk/notebook_proxy'
-require 'glimmer/tk/frame_proxy'
-require 'glimmer/tk/button_proxy'
-require 'glimmer/tk/label_proxy'
-require 'glimmer/tk/list_proxy'
-require 'glimmer/tk/entry_proxy'
-require 'glimmer/tk/treeview_proxy'

data/lib/glimmer/tk/button_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/commandable'
 
 module Glimmer
   module Tk
@@ -27,9 +28,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ButtonProxy < WidgetProxy
-      def command_block=(proc)
-        tk.command(proc)
-      end
+      include Commandable
     end
   end
 end

data/lib/glimmer/tk/checkbutton_proxy.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2020-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/tk/widget_proxy'
+require 'glimmer/tk/commandable'
+require 'glimmer/tk/variable_owner'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::Checkbutton
+    #
+    # Follows the Proxy Design Pattern
+    class CheckbuttonProxy < WidgetProxy
+      include Commandable
+      include VariableOwner
+    end
+  end
+end

data/lib/glimmer/tk/combobox_proxy.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2020-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/tk/widget_proxy'
+require 'glimmer/tk/text_variable_owner'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::Combobox
+    #
+    # Follows the Proxy Design Pattern
+    class ComboboxProxy < WidgetProxy
+      include TextVariableOwner
+    end
+  end
+end

data/lib/glimmer/tk/commandable.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2020-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/tk/widget_proxy'
+
+module Glimmer
+  module Tk
+    # Represents widgets that can invoke a command
+    module Commandable
+      def command_block=(proc)
+        tk.command(proc)
+      end
+      
+      def handle_listener(listener_name, &listener)
+        case listener_name.to_s.downcase
+        when 'command'
+          command(listener)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/tk/entry_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/text_variable_owner'
 
 module Glimmer
   module Tk
@@ -27,6 +28,8 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class EntryProxy < WidgetProxy
+      include TextVariableOwner
+    
       def validatecommand_block=(proc)
         tk.validatecommand(proc)
       end

data/lib/glimmer/tk/frame_proxy.rb

@@ -33,6 +33,7 @@ module Glimmer
         if parent_proxy.is_a?(NotebookProxy)
           @tab_options, args[0] = args[0].to_h.partition {|key, value| NotebookProxy::TAB_OPTIONS.include?(key.to_s)}
           @tab_options = Hash[@tab_options]
+          @tab_options[:text] = @tab_options.delete(:title) if @tab_options.keys.include?(:title)
           args.delete_at(0) if args[0].to_a.empty?
         end
         super

data/lib/glimmer/tk/label_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/text_variable_owner'
 
 module Glimmer
   module Tk
@@ -27,6 +28,8 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class LabelProxy < WidgetProxy
+      include TextVariableOwner
+      
       def set_attribute(attribute, *args)
         if attribute.to_s == 'font'
           args[0] = "tk_#{args[0]}_font".camelcase(:upper) if (args[0].is_a?(Symbol) || args[0].is_a?(String)) && args[0].to_s == args[0].to_s.downcase

data/lib/glimmer/tk/notebook_proxy.rb

@@ -27,17 +27,12 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class NotebookProxy < WidgetProxy
-      TAB_OPTIONS = ['state', 'sticky', 'padding', 'text', 'image', 'compound', 'underline']
+      TAB_OPTIONS = ['state', 'sticky', 'padding', 'text', 'title', 'image', 'compound', 'underline']
     
-      attr_reader :tab_proxies
-    
-      def initialize(*args)
-        @tab_proxies = []
-        super
-      end
+      alias tab_proxies children
     
       def post_initialize_child(child)
-        @tab_proxies << child
+        super
         @tk.add child.tk, child.tab_options
       end
     end

data/lib/glimmer/tk/radiobutton_proxy.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2020-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/tk/widget_proxy'
+require 'glimmer/tk/commandable'
+
+module Glimmer
+  module Tk
+    # Proxy for Tk::Tile::Radiobutton
+    #
+    # Follows the Proxy Design Pattern
+    class RadiobuttonProxy < WidgetProxy
+      include Commandable
+      
+      def sibling_radio_buttons
+        @parent_proxy.children.select {|child| child.is_a?(RadiobuttonProxy)}
+      end
+      
+      private
+      
+      def initialize_defaults
+        super
+        sibling_variable = sibling_radio_buttons.map(&:tk).map(&:variable).compact.first
+        tk.variable = sibling_variable.nil? ? ::TkVariable.new : sibling_variable
+      end
+    end
+  end
+end

data/lib/glimmer/tk/root_proxy.rb

@@ -27,8 +27,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class RootProxy < WidgetProxy
+      REGEX_GEOMETRY = /[x+-]/
+      DEFAULT_WIDTH = 190
+      DEFAULT_HEIGHT = 95
+      
       def initialize(*args)
         @tk = ::TkRoot.new
+        @tk.minsize = DEFAULT_WIDTH, DEFAULT_HEIGHT
       end
 
       def post_add_content
@@ -43,19 +48,134 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Tk::RootExpression.new, keyword, *args, &block)
       end
       
+      def has_attribute?(attribute, *args)
+        %w[width height x y].include?(attribute.to_s) || super
+      end
+      
       def set_attribute(attribute, *args)
-        if attribute.to_s == 'iconphoto'
+        case attribute.to_s
+        when 'iconphoto'
           args[0..-1] = [image_argument(args)]
           super
+        when 'width'
+          @width = args.first.to_i
+          self.geometry = "#{args.first.to_i}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
+        when 'height'
+          @height = args.first.to_i
+          self.geometry = "#{@width || DEFAULT_WIDTH}x#{args.first.to_i}#{x_sign}#{abs_x}#{y_sign}#{abs_y}"
+        when 'x'
+          self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{args.first.to_i > 0 ? '+' : '-'}#{args.first.to_i.abs}#{y_sign}#{abs_y}"
+        when 'y'
+          self.geometry = "#{@width || DEFAULT_WIDTH}x#{@height || DEFAULT_HEIGHT}#{x_sign}#{abs_x}#{args.first.to_i > 0 ? '+' : '-'}#{args.first.to_i.abs}"
+        when 'resizable'
+          if args.size == 1 && !args.first.is_a?(Array)
+            self.resizable = [args.first]*2
+          else
+            super
+          end
         else
           super
         end
       end
-
+      
+      def get_attribute(attribute)
+        attribute = attribute.to_s
+        case attribute
+        when 'width'
+          geometry.split(REGEX_GEOMETRY)[0].to_i
+        when 'height'
+          geometry.split(REGEX_GEOMETRY)[1].to_i
+        when 'x'
+          sign_number(x_sign, geometry.split(REGEX_GEOMETRY)[2].to_i)
+        when 'y'
+          sign_number(y_sign, geometry.split(REGEX_GEOMETRY)[3].to_i)
+        else
+          super
+        end
+      end
+      
+      def width
+        get_attribute(:width)
+      end
+      
+      def height
+        get_attribute(:height)
+      end
+      
+      def x
+        get_attribute(:x)
+      end
+      
+      def y
+        get_attribute(:y)
+      end
+      
+      def width=(value)
+        set_attribute(:width, value)
+      end
+      
+      def height=(value)
+        set_attribute(:height, value)
+      end
+      
+      def x=(value)
+        set_attribute(:x, value)
+      end
+      
+      def y=(value)
+        set_attribute(:y, value)
+      end
+      
+      def handle_listener(listener_name, &listener)
+        case listener_name.to_s.upcase
+        when 'WM_DELETE_WINDOW', 'DELETE_WINDOW'
+          listener_name = 'WM_DELETE_WINDOW'
+          @tk.protocol(listener_name, &listener)
+        when 'WM_OPEN_WINDOW', 'OPEN_WINDOW'
+          @on_open_window_procs ||= []
+          @on_open_window_procs << listener
+        else
+          super
+        end
+      end
+      
       # Starts Tk mainloop
       def start_event_loop
+        if @on_open_window_procs.to_a.any?
+          ::Tk.after(100) do # ensure root window showed up first
+            @on_open_window_procs.to_a.each do |on_open_window|
+              ::Tk.after(0, on_open_window)
+            end
+          end
+        end
         ::Tk.mainloop
       end
+      
+      private
+      
+      def sign_number(sign, number)
+        "#{sign}1".to_i * number
+      end
+      
+      def abs_x
+        geometry.split(REGEX_GEOMETRY)[2].to_i
+      end
+      
+      def abs_y
+        geometry.split(REGEX_GEOMETRY)[3].to_i
+      end
+      
+      def x_sign
+        geometry_signs[0]
+      end
+      
+      def y_sign
+        geometry_signs[1]
+      end
+      
+      def geometry_signs
+        geometry.chars.select {|char| char.match(/[+-]/)}
+      end
     end
   end
 end

data/lib/glimmer/tk/text_variable_owner.rb

@@ -0,0 +1,31 @@
+# Copyright (c) 2020-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.
+
+module Glimmer
+  module Tk
+    module TextVariableOwner
+      def initialize_defaults
+        super
+        tk.textvariable = ::TkVariable.new
+      end
+    end
+  end
+end

data/lib/glimmer/tk/variable_owner.rb

@@ -0,0 +1,31 @@
+# Copyright (c) 2020-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.
+
+module Glimmer
+  module Tk
+    module VariableOwner
+      def initialize_defaults
+        super
+        tk.variable = ::TkVariable.new
+      end
+    end
+  end
+end