glimmer-dsl-libui 0.2.13 → 0.2.17

data/examples/tetris.rb

@@ -0,0 +1,124 @@
+# 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-libui'
+
+require_relative 'tetris/model/game'
+
+class Tetris
+  include Glimmer
+  
+  BLOCK_SIZE = 25
+  BEVEL_CONSTANT = 20
+    
+  attr_reader :game
+  
+  def initialize
+    @game = Model::Game.new
+    create_gui
+    register_observers
+  end
+  
+  def launch
+    @game.start!
+    @main_window.show
+  end
+  
+  def create_gui
+    @main_window = window('Glimmer Tetris', Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE) {
+      playfield(playfield_width: Model::Game::PLAYFIELD_WIDTH, playfield_height: Model::Game::PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+    }
+  end
+  
+  def register_observers
+    Glimmer::DataBinding::Observer.proc do |game_over|
+      if game_over
+        show_game_over_dialog
+      else
+        start_moving_tetrominos_down
+      end
+    end.observe(@game, :game_over)
+    
+    Model::Game::PLAYFIELD_HEIGHT.times do |row|
+      Model::Game::PLAYFIELD_HEIGHT.times do |column|
+        Glimmer::DataBinding::Observer.proc do |new_color|
+          @blocks[row][column].fill = new_color
+        end.observe(@game.playfield[row][column], :color)
+      end
+    end
+  end
+  
+  def playfield(playfield_width: , playfield_height: , block_size: )
+    area {
+      @blocks = playfield_height.times.map do |row|
+        playfield_width.times.map do |column|
+          block(row: row, column: column, block_size: block_size)
+        end
+      end
+      
+      on_key_down do |key_event|
+        case key_event
+        in ext_key: :down
+          game.down!
+        in ext_key: :up
+          case game.up_arrow_action
+          when :instant_down
+            game.down!(instant: true)
+          when :rotate_right
+            game.rotate!(:right)
+          when :rotate_left
+            game.rotate!(:left)
+          end
+        in ext_key: :left
+          game.left!
+        in ext_key: :right
+          game.right!
+        in modifier: :shift
+          game.rotate!(:right)
+        in modifier: :control
+          game.rotate!(:left)
+        else
+          # Do Nothing
+        end
+      end
+    }
+  end
+  
+  def block(row: , column: , block_size: )
+    path {
+      square(column * block_size, row * block_size, block_size)
+      
+      fill Model::Block::COLOR_CLEAR
+    }
+  end
+  
+  def start_moving_tetrominos_down
+    Glimmer::LibUI.timer(@game.delay) do
+      @game.down! if !@game.game_over? && !@game.paused?
+    end
+  end
+  
+  def show_game_over_dialog
+    msg_box('Game Over', "Score: #{@game.high_scores.first.score}")
+  end
+end
+
+Tetris.new.launch

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

@@ -33,6 +33,8 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
+          @@inverted_keyword_aliases = Glimmer::LibUI::ControlProxy::KEYWORD_ALIASES.invert unless defined?(@@inverted_keyword_aliases)
+          keyword = @@inverted_keyword_aliases[keyword] || keyword
           Glimmer::LibUI::ControlProxy.create(keyword, parent, args, &block)
         end
         

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

@@ -37,6 +37,7 @@ module Glimmer
         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',
@@ -49,6 +50,30 @@ module Glimmer
           on_drag_break: 'on_drag_broken',
         }
         
+        SHIFTED_KEY_CODE_CHARS = {
+          '`' => '~',
+          '1' => '!',
+          '2' => '@',
+          '3' => '#',
+          '4' => '$',
+          '5' => '%',
+          '6' => '^',
+          '7' => '&',
+          '8' => '*',
+          '9' => '(',
+          '10' => ')',
+          '-' => '_',
+          '=' => '+',
+          ',' => '<',
+          '.' => '>',
+          '/' => '?',
+          ';' => ':',
+          "'" => '"',
+          '[' => '{',
+          ']' => '}',
+          "\\" => '|',
+        }
+
         include Glimmer::FiddleConsumer
         include Parent
         prepend Transformable
@@ -164,19 +189,27 @@ module Glimmer
         end
         
         def area_key_event_hash(area_key_event)
+          modifiers = modifiers_to_symbols(area_key_event.Modifiers)
           {
-            key: key_to_char(area_key_event.Key),
+            key: key_to_char(area_key_event.Key, modifiers),
             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),
+            modifiers: modifiers,
             up: Glimmer::LibUI.integer_to_boolean(area_key_event.Up),
           }
         end
         
-        def key_to_char(key)
-          key.chr if key > 0
+        def key_to_char(key, modifiers = [])
+          if key > 0
+            char = key.chr
+            if modifiers == [:shift]
+              SHIFTED_KEY_CODE_CHARS[char]
+            else
+              char
+            end
+          end
         end
         
         def ext_key_to_symbol(ext_key_value)

data/lib/glimmer/libui/control_proxy.rb

@@ -37,7 +37,6 @@ module Glimmer
         end
         
         def widget_proxy_class(keyword)
-          class_name = constant_symbol(keyword)
           descendant_keyword_constant_map[keyword] || ControlProxy
         end
         
@@ -72,7 +71,7 @@ module Glimmer
         end
         
         def descendant_keyword_constant_map
-          @descendant_keyword_constant_map ||= map_descendant_keyword_constants_for(self)
+          @descendant_keyword_constant_map ||= add_aliases_to_keyword_constant_map(map_descendant_keyword_constants_for(self))
         end
         
         def reset_descendant_keyword_constant_map
@@ -91,8 +90,22 @@ module Glimmer
           end
           accumulator
         end
+        
+        private
+        
+        def add_aliases_to_keyword_constant_map(keyword_constant_map)
+          KEYWORD_ALIASES.each do |keyword, alias_keyword|
+            keyword_constant_map[alias_keyword] = keyword_constant_map[keyword]
+          end
+          keyword_constant_map
+        end
       end
       
+      KEYWORD_ALIASES = {
+        'msg_box'       => 'message_box',
+        'msg_box_error' => 'message_box_error',
+      }
+      
       BOOLEAN_PROPERTIES = %w[
         padded
         checked
@@ -223,6 +236,7 @@ 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))
+          args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
           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])
@@ -239,6 +253,7 @@ module Glimmer
         elsif ::LibUI.respond_to?("control_set_#{method_name.to_s.sub(/=$/, '')}")
           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))
+          args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
           ::LibUI.send("control_set_#{method_name.to_s.sub(/=$/, '')}", @libui, *args)
         elsif ::LibUI.respond_to?("control_#{method_name}") && !args.empty?
           ::LibUI.send("control_#{method_name}", @libui, *args)

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

@@ -36,7 +36,11 @@ module Glimmer
           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)
+            if OS.windows? && parent.children.find {|child| child.is_a?(Arc)} == self
+              ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
+            else
+              ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+            end
           end
           super
         end

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

@@ -36,7 +36,11 @@ module Glimmer
           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)
+            if OS.windows? && parent.children.find {|child| child.is_a?(Circle)} == self
+              ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *arc_args)
+            else
+              ::LibUI.draw_path_arc_to(path_proxy.libui, *arc_args)
+            end
           end
           super
         end

data/lib/glimmer/libui.rb

@@ -27,11 +27,11 @@ module Glimmer
       include Glimmer::FiddleConsumer
       
       def integer_to_boolean(int, allow_nil: true)
-        int.nil? ? (allow_nil ? nil : false) : ((int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : int == 1)
+        int.nil? ? (allow_nil ? nil : false) : ((int.is_a?(TrueClass) || int.is_a?(FalseClass)) ? int : (int.is_a?(Integer) ? int == 1 : (allow_nil ? nil : false)))
       end
       
       def boolean_to_integer(bool, allow_nil: true)
-        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool == true ? 1 : 0))
+        bool.nil? ? (allow_nil ? nil : 0) : (bool.is_a?(Integer) ? bool : (bool.is_a?(TrueClass) || bool.is_a?(FalseClass) ? (bool == true ? 1 : 0) : (allow_nil ? nil : 0)))
       end
       
       def degrees_to_radians(degrees)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.17
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -190,12 +190,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: Glimmer DSL for LibUI - Prerequisite-Free Ruby Desktop Development GUI
-  Library (No need to pre-install any prerequisites. Just install the gem and have
+description: Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI
+  Library) - No need to pre-install any prerequisites. Just install the gem and have
   platform-independent native GUI that just works! Glimmer DSL for LibUI aims to provide
   declarative DSL syntax that visually maps to GUI control hierarchy, convention over
   configuration via smart defaults, automation of low-level details, requiring the
-  least amount of syntax possible to build GUI, and custom control support.
+  least amount of syntax possible to build GUI, and custom keyword support.
 email: andy.am@gmail.com
 executables:
 - girb
@@ -233,7 +233,7 @@ files:
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/color_button.rb
-- examples/color_the_shapes.rb
+- examples/color_the_circles.rb
 - examples/control_gallery.rb
 - examples/custom_draw_text.rb
 - examples/custom_draw_text2.rb
@@ -252,6 +252,11 @@ files:
 - examples/method_based_custom_keyword.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
+- examples/tetris.rb
+- examples/tetris/model/block.rb
+- examples/tetris/model/game.rb
+- examples/tetris/model/past_game.rb
+- examples/tetris/model/tetromino.rb
 - examples/timer.rb
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png