glimmer-dsl-libui 0.4.21 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659e2536562c00af0982adb20c0bd5a808efc6e541d14b2aa49f27e6587fcdd8
-  data.tar.gz: 67e757172d34f71143693367dcf6ce7923be978f8acb759ddb895b6fd4a0686b
+  metadata.gz: e5fd4f6d3b6fcc780223f17cd51767f153a77c73472434fdc8d13995ba8ddc00
+  data.tar.gz: 965a9726bf24afe64ac5e5288e60e9b9a2f1dd2e7ae6f81e49fbfead40bc07ed
 SHA512:
-  metadata.gz: 7ee798767c387417d3dfba823a6514430f342bdeeaefb68008aef0fc239fe9b063ed9138e8d3163dee0b7e6cdc7bc7dc453d34521b854db358c9c12512dee56e
-  data.tar.gz: 7aea1219101dc352a01723834970638c51a57c00253ec345ad98bf4db98f0afa35f9b044ad6d3bc5de33c512839fa89e3ca701ae0a2b95f045f8f166e9b0ea57
+  metadata.gz: 9f3e4b130032060d4ea47528c6b6f80c8080917a9d50fcb3f0d4d11718594f1913e6a417c83d25a7e8c74136a7ce3597bf501f29339f48aa3ea577532f0af5e2
+  data.tar.gz: 66f8aa203283d3a4ef570690573c6344b0024f57164abfd16502153efa9ad49b1eaedf8d204a9723882fd86068bf2be44f30eb3b890b4e1d20ba73189677ca2e

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## 0.5.2
+
+- Support `line` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Support `bezier` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+
+## 0.5.1
+
+- Upgrade to libui 0.0.14
+- Alter `Shape#contain?` to support `outline: ` and `distance_tolerance: ` options as per perfect-shape gem
+- Support `arc` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Support `circle` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+
+## 0.5.0
+
+- Upgrade to glimmer 2.6.0
+- Support `rectangle` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+- Support `square` `bounding_box` (minx, miny, width, height), `contain?` method (checking if shape contains point inside) and `include?` method (checking on outline if stroked and inside if filled?)
+
+## 0.4.22
+
+- examples/tetris.rb "Show Next Block Preview" menu item under "View" menu
+- examples/tetris.rb "Speed" menu
+- Fix issue with examples/tetris.rb not accelerating upon level ups
+
 ## 0.4.21
 
 - Pause via spacebar in examples/snake.rb (all versions)

data/README.md

@@ -1,9 +1,11 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.4.21
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.5.2
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [LibUI](https://github.com/kojix2/LibUI) is a prerequisite-free Ruby desktop development GUI (Graphical User Interface) library. No need to pre-install any prerequisites. Just install the [gem](https://rubygems.org/gems/glimmer-dsl-libui) and have platform-independent native GUI that just works!
+[**(Fukuoka Ruby Award Competition 2022 Special Award Winner)**](http://www.digitalfukuoka.jp/topics/187?locale=ja)
+
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [LibUI](https://github.com/kojix2/LibUI) is a prerequisite-free [MRI Ruby](https://www.ruby-lang.org) desktop development GUI (Graphical User Interface) library. No need to pre-install any prerequisites. Just install the [gem](https://rubygems.org/gems/glimmer-dsl-libui) and have platform-independent native GUI that just works!
 
 Mac | Windows | Linux
 ----|---------|------
@@ -328,15 +330,21 @@ Mac | Windows | Linux
 
 ![glimmer-dsl-libui-mac-tetris.gif](images/glimmer-dsl-libui-mac-tetris.gif)
 
-NOTE: [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) is 100% feature-complete and in beta mode (though the C [libui](https://github.com/andlabs/libui) is still mid-alpha). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. The more feedback and issues you report the better.
-
-Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interested in:
-- [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
-- [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
-- [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)
-- [glimmer-dsl-gtk](https://github.com/AndyObtiva/glimmer-dsl-gtk): Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library)
-- [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
-- [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS
+NOTE: [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) is 100% feature-complete with regards to covering the C [libui](https://github.com/andlabs/libui) library API and in beta mode (though the C [libui](https://github.com/andlabs/libui) is still mid-alpha, which is why [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) cannot be declared v1.0.0 yet). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. The more feedback and issues you report the better.
+
+**[Glimmer](https://rubygems.org/gems/glimmer) DSL Comparison Table:**
+DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
+----|-----------|---------|------------------|------|------|--------
+[Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)](https://github.com/AndyObtiva/glimmer-dsl-swt) | Mac / Windows / Linux | Yes | Yes (Canvas Shape DSL) | Very Mature / Scaffolding / Native Executable Packaging / Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint | Java / JRuby
+[Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)](https://github.com/AndyObtiva/glimmer-dsl-opal) | All Web Browsers | No | Yes (Canvas Shape DSL) | Simpler than All JavaScript Technologies / Auto-Webify Desktop Apps | Setup Process / Only Rails 5 Support for Now | Rails
+[Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-libui) | Mac / Windows / Linux | Yes | Yes (Area API) | Fast Startup Time / Light Memory Footprint | LibUI is an Incomplete Mid-Alpha Only | None Other Than MRI Ruby
+[Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-tk) | Mac / Windows / Linux | Some Native-Themed Widgets (Not Truly Native) | Yes (Canvas) | Fast Startup Time / Light Memory Footprint | Widgets Do Not Look Truly Native, Espcially on Linux | ActiveTcl / MRI Ruby
+[Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-gtk) | Mac / Windows / Linux | Only on Linux | Yes (Cairo) | Complete Access to GNOME Features on Linux (Forte) | Not Native on Mac and Windows | None Other Than MRI Ruby on Linux / Brew Packages on Mac / MSYS & MING Toolchains on Windows / MRI Ruby
+[Glimmer DSL for FX (FOX Toolkit Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-fx) | Mac (requires XQuartz) / Windows / Linux | No | Yes (Canvas) | No Prerequisites on Windows (Forte Since Binaries Are Included Out of The Box) | Widgets Do Not Look Native / Mac Usage Obtrusively Starts XQuartz | None Other Than MRI Ruby on Windows / XQuarts on Mac / MRI Ruby
+[Glimmer DSL for JFX (JRuby JavaFX Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-jfx) | Mac / Windows / Linux | No | Yes (javafx.scene.shape and javafx.scene.canvas) | Rich in Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint / Widgets Do Not Look Native | Java / JRuby / JavaFX SDK
+[Glimmer DSL for Swing (JRuby Swing Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-swing) | Mac / Windows / Linux | No | Yes (Java2D) | Very Mature | Slow JRuby Startup Time / Heavy Memory Footprint / Widgets Do Not Look Native | Java / JRuby
+[Glimmer DSL for XML (& HTML)](https://github.com/AndyObtiva/glimmer-dsl-xml) | All Web Browsers | No | Yes (SVG) | Programmable / Lighter-weight Than Actual XML | XML Elements Are Sometimes Not Well-Named (Many Types of Input) | None
+[Glimmer DSL for CSS](https://github.com/AndyObtiva/glimmer-dsl-css) | All Web Browsers | No | Yes | Programmable | CSS Is Over-Engineered / Too Many Features To Learn | None
 
 ## Table of Contents
 
@@ -511,7 +519,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.4.21'
+gem 'glimmer-dsl-libui', '~> 0.5.2'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -581,13 +589,14 @@ w.set_title 'aloha'
 puts w.title # => aloha
 ```
 
-Controls are wrapped as Ruby proxy objects, having a `#libui` method to obtain the wrapped [LibUI](https://github.com/kojix2/LibUI) Fiddle pointer object. Ruby proxy objects rely on composition (via [Proxy Design Pattern](https://en.wikipedia.org/wiki/Proxy_pattern)) instead of inheritance to shield consumers from having to deal with lower-level details unless absolutely needed.
+Controls are wrapped as Ruby proxy objects, having a `#libui` method to obtain the wrapped [LibUI](https://github.com/kojix2/LibUI) Fiddle pointer object. Ruby proxy objects rely on composition (via [Proxy Design Pattern](https://en.wikipedia.org/wiki/Proxy_pattern)) instead of inheritance to shield consumers from having to deal with lower-level details unless absolutely needed. That said, you can invoke any [LibUI operation](#libui-operations) on the Glimmer proxy object directly and it gets proxied automatically to the wrapped Fiddle pointer object (e.g. `window_proxy.title` gets proxied to `LibUI.window_title(window_proxy.libui).to_s` automatically), so you rarely have to refer to the wrapped `#libui` Fiddle pointer object directly.
 
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
 
 ```ruby
 w = window('hello world') # => #<Glimmer::LibUI::WindowProxy:0x00007fde4ea39fb0
 w.libui # => #<Fiddle::Pointer:0x00007fde53997980 ptr=0x00007fde51352a60 size=0 free=0x0000000000000000>
+w.title == LibUI.window_title(w.libui).to_s # => true
 ```
 
 ### Supported Keywords
@@ -976,6 +985,14 @@ Mac | Windows | Linux
 ----|---------|------
 ![glimmer-dsl-libui-mac-area-gallery.png](images/glimmer-dsl-libui-mac-area-gallery.png) | ![glimmer-dsl-libui-windows-area-gallery.png](images/glimmer-dsl-libui-windows-area-gallery.png) | ![glimmer-dsl-libui-linux-area-gallery.png](images/glimmer-dsl-libui-linux-area-gallery.png)
 
+##### Shape Methods
+
+- `::parameters`: returns parameters of a shape class
+- `#bounding_box`: returns `Array` containing `[min_x, min_y, width, height]`
+- `#contain?(*point, outline: false, distance_tolerance: 0)`: Returns if point (`[x, y]` `Array` or args) is inside the shape when `outline` is `false` or on the outline when `outline` is `true`. `distance_tolerance` is used when `outline` is `true` as a fuzz factor for declaring a point on the outline of the shape (e.g. helps users select a shape from its outline more easily).
+- `#include?(*point)`: Returns if point (`[x, y]` `Array` or args) is inside the shape when filled (having `fill` value) or on the outline when stroked (not having `fill` value yet `stroke` value only)
+- `#perfect_shape`: returns [PerfectShape](https://github.com/AndyObtiva/perfect-shape) object matching the [libui](https://github.com/andlabs/libui) shape.
+
 #### Area Text
 
 To draw `text` in an `area`, you simply nest a `text(x, y, width)` control directly under `area` or inside a `on_draw` listener, and then nest attributed `string {[attributes]; string_value}` controls underneath it returning an actual `String` (think of them as the `<span>` or `<p>` element in html, which contains a string of text). Alternatively, you can nest attributed `string(string_value) {[attributes]}` if `string_value` is a short single-line string. An attributed `string` value can be changed dynamically via its `string` property.
@@ -999,15 +1016,49 @@ To draw `text` in an `area`, you simply nest a `text(x, y, width)` control direc
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
 
 ```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
 window('area text drawing') {
   area {
     text {
       default_font family: 'Helvetica', size: 12, weight: :normal, italic: :normal, stretch: :normal
         
+      string('This ') {
+        font size: 20, weight: :bold, italic: :normal, stretch: :normal
+        color r: 128, g: 0, b: 0, a: 1
+      }
+        
+      string('is ') {
+        font size: 20, weight: :bold, italic: :normal, stretch: :normal
+        color r: 0, g: 128, b: 0, a: 1
+      }
+        
+      string('a ') {
+        font size: 20, weight: :bold, italic: :normal, stretch: :normal
+        color r: 0, g: 0, b: 128, a: 1
+      }
+        
+      string('short ') {
+        font size: 20, weight: :bold, italic: :italic, stretch: :normal
+        color r: 128, g: 128, b: 0, a: 1
+      }
+        
+      string('attributed ') {
+        font size: 20, weight: :bold, italic: :normal, stretch: :normal
+        color r: 0, g: 128, b: 128, a: 1
+      }
+        
+      string("string \n\n") {
+        font size: 20, weight: :bold, italic: :normal, stretch: :normal
+        color r: 128, g: 0, b: 128, a: 1
+      }
+        
       string {
         font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
-        color r: 230, g: 100, b: 50, a: 0.5
-        background r: 230, g: 200, b: 250, a: 0.8
+        color r: 0, g: 128, b: 255, a: 1
+        background r: 255, g: 255, b: 0, a: 0.5
         underline :single
         underline_color :spelling
         open_type_features {
@@ -1020,13 +1071,14 @@ window('area text drawing') {
         "attributed string\n" \
         "spanning multiple lines\n\n"
       }
-      
-      string('This is a short unattributed string')
     }
   }
 }.show
 ```
 
+![glimmer-dsl-libui-mac-area-text-drawing.png](/images/glimmer-dsl-libui-mac-area-text-drawing.png)
+
+
 You may checkout [examples/basic_draw_text.rb](#basic-draw-text) and [examples/custom_draw_text.rb](#custom-draw-text) for examples of using `text` inside `area`.
 
 Mac | Windows | Linux
@@ -1844,6 +1896,8 @@ For Mac, consider [Platypus](https://github.com/sveinbjornt/Platypus) (builds a
 
 For Linux, simply package your app as a [Ruby Gem](https://guides.rubygems.org/what-is-a-gem/) and [build rpm package from Ruby Gem](https://www.redpill-linpro.com/sysadvent/2015/12/07/building-rpms-from-gems.html) or [build deb package from Ruby Gem](https://openpreservation.org/blogs/building-debian-package-ruby-program/).
 
+Also, there is a promising project called [ruby-packer](https://github.com/pmq20/ruby-packer) that supports all platforms.
+
 ## Glimmer Style Guide
 
 **1 - Control arguments are always wrapped by parentheses.**
@@ -5487,7 +5541,7 @@ class ColorTheCircles
   
   def color_circle(x, y)
     clicked_circle_data = @circles_data.find do |circle_data|
-      circle_data[:fill].nil? && circle_data[:circle]&.include?(x, y)
+      circle_data[:fill].nil? && circle_data[:circle]&.contain?(x, y)
     end
     if clicked_circle_data
       clicked_circle_data[:fill] = clicked_circle_data[:stroke]
@@ -9313,6 +9367,8 @@ TinyMidiPlayer.new
 
 Snake provides an example of building a desktop application [test-first](/spec/examples/snake/model/game_spec.rb) following the MVP ([Model](/examples/snake/model/game.rb) / [View](/examples/snake.rb) / [Presenter](/examples/snake/presenter/grid.rb)) architectural pattern.
 
+Use arrows to move and spacebar to pause/resume.
+
 [examples/snake.rb](examples/snake.rb)
 
 Run with this command from the root of the project if you cloned the project:
@@ -9553,7 +9609,7 @@ ruby -r glimmer-dsl-libui -e "require 'examples/tetris'"
 
 Mac | Windows | Linux
 ----|---------|------
-![glimmer-dsl-libui-mac-tetris.png](images/glimmer-dsl-libui-mac-tetris.png) ![glimmer-dsl-libui-mac-tetris-game-over.png](images/glimmer-dsl-libui-mac-tetris-game-over.png) ![glimmer-dsl-libui-mac-tetris-high-scores.png](images/glimmer-dsl-libui-mac-tetris-high-scores.png) | ![glimmer-dsl-libui-windows-tetris.png](images/glimmer-dsl-libui-windows-tetris.png) ![glimmer-dsl-libui-windows-tetris-game-over.png](images/glimmer-dsl-libui-windows-tetris-game-over.png) ![glimmer-dsl-libui-windows-tetris-high-scores.png](images/glimmer-dsl-libui-windows-tetris-high-scores.png) | ![glimmer-dsl-libui-linux-tetris.png](images/glimmer-dsl-libui-linux-tetris.png) ![glimmer-dsl-libui-linux-tetris-game-over.png](images/glimmer-dsl-libui-linux-tetris-game-over.png) ![glimmer-dsl-libui-linux-tetris-high-scores.png](images/glimmer-dsl-libui-linux-tetris-high-scores.png)
+![glimmer-dsl-libui-mac-tetris.png](images/glimmer-dsl-libui-mac-tetris.png) | ![glimmer-dsl-libui-windows-tetris.png](images/glimmer-dsl-libui-windows-tetris.png) | ![glimmer-dsl-libui-linux-tetris.png](images/glimmer-dsl-libui-linux-tetris.png)
 
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
@@ -9631,18 +9687,31 @@ class Tetris
     
     Model::Game::PREVIEW_PLAYFIELD_HEIGHT.times do |row|
       Model::Game::PREVIEW_PLAYFIELD_WIDTH.times do |column|
-        observe(@game.preview_playfield[row][column], :color) do |new_color|
+        preview_updater = proc do
           Glimmer::LibUI.queue_main do
+            new_color = @game.preview_playfield[row][column].color
             color = Glimmer::LibUI.interpret_color(new_color)
             block = @preview_playfield_blocks[row][column]
-            block[:background_square].fill = color
-            block[:top_bevel_edge].fill = {r: color[:r] + 4*BEVEL_CONSTANT, g: color[:g] + 4*BEVEL_CONSTANT, b: color[:b] + 4*BEVEL_CONSTANT}
-            block[:right_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
-            block[:bottom_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
-            block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
-            block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+            if @game.show_preview_tetromino?
+              block[:background_square].fill = color
+              block[:top_bevel_edge].fill = {r: color[:r] + 4*BEVEL_CONSTANT, g: color[:g] + 4*BEVEL_CONSTANT, b: color[:b] + 4*BEVEL_CONSTANT}
+              block[:right_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+              block[:bottom_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+              block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+              block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+            else
+              transparent_color = {r: 255, g: 255, b: 255, a: 0}
+              block[:background_square].fill = transparent_color
+              block[:top_bevel_edge].fill = transparent_color
+              block[:right_bevel_edge].fill = transparent_color
+              block[:bottom_bevel_edge].fill = transparent_color
+              block[:left_bevel_edge].fill = transparent_color
+              block[:border_square].stroke = transparent_color
+            end
           end
         end
+        observe(@game.preview_playfield[row][column], :color, &preview_updater)
+        observe(@game, :show_preview_tetromino, &preview_updater)
       end
     end
 
@@ -9690,6 +9759,12 @@ class Tetris
     }
     
     menu('View') {
+      check_menu_item('Show Next Block Preview') {
+        checked <=> [@game, :show_preview_tetromino]
+      }
+      
+      separator_menu_item
+      
       menu_item('Show High Scores') {
         on_clicked do
           show_high_scores
@@ -9701,18 +9776,20 @@ class Tetris
           @game.clear_high_scores!
         }
       }
+      
+      separator_menu_item
     }
 
     menu('Options') {
-      radio_menu_item('Instant Down on Up Arrow') { |r|
+      radio_menu_item('Instant Down on Up Arrow') {
         checked <=> [@game, :instant_down_on_up]
       }
       
-      radio_menu_item('Rotate Right on Up Arrow') { |r|
+      radio_menu_item('Rotate Right on Up Arrow') {
         checked <=> [@game, :rotate_right_on_up]
       }
       
-      radio_menu_item('Rotate Left on Up Arrow') { |r|
+      radio_menu_item('Rotate Left on Up Arrow') {
         checked <=> [@game, :rotate_left_on_up]
       }
     }
@@ -9759,7 +9836,7 @@ class Tetris
     block = {}
     bevel_pixel_size = 0.16 * block_size.to_f
     color = Glimmer::LibUI.interpret_color(Model::Block::COLOR_CLEAR)
-    area {
+    block[:area] = area {
       block[:background_square] = square(0, 0, block_size) {
         fill color
       }
@@ -9835,12 +9912,6 @@ class Tetris
   
   def score_board(block_size: , &extra_content)
     vertical_box {
-      horizontal_box {
-        label # filler
-        @preview_playfield_blocks = playfield(playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: block_size)
-        label # filler
-      }
-
       horizontal_box {
         label # filler
         grid {
@@ -9881,6 +9952,12 @@ class Tetris
         }
         label # filler
       }
+      
+      horizontal_box {
+        label # filler
+        @preview_playfield_blocks = playfield(playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: block_size)
+        label # filler
+      }
     
       extra_content&.call
     }
@@ -10430,6 +10507,10 @@ https://github.com/AndyObtiva/befunge98/tree/gui
 
 https://github.com/iraamaro/i3off-gtk-ruby
 
+### Chess
+
+https://github.com/mikeweber/chess
+
 ## Process
 
 [Glimmer Process](https://github.com/AndyObtiva/glimmer/blob/master/PROCESS.md)

data/VERSION

@@ -1 +1 @@
-0.4.21
+0.5.2

data/examples/color_the_circles.rb

@@ -81,7 +81,7 @@ class ColorTheCircles
   
   def color_circle(x, y)
     clicked_circle_data = @circles_data.find do |circle_data|
-      circle_data[:fill].nil? && circle_data[:circle]&.include?(x, y)
+      circle_data[:fill].nil? && circle_data[:circle]&.contain?(x, y)
     end
     if clicked_circle_data
       clicked_circle_data[:fill] = clicked_circle_data[:stroke]

data/examples/tetris/model/game.rb

@@ -36,21 +36,27 @@ class Tetris
       PREVIEW_PLAYFIELD_WIDTH = 4
       PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
+      UP_ARROW_ACTIONS = %i[instant_down rotate_right rotate_left]
+      SPEEDS = %i[snail sloth turtle rabbit gorilla bear horse gazelle cheetah falcon]
+      SPEED_INITIAL_DELAYS = SPEEDS.each_with_index.inject({}) {|hash, speed_index_pair| hash.merge(speed_index_pair.first => 1.1 - speed_index_pair.last*(0.1)) }
       
       attr_reader :playfield_width, :playfield_height
-      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score, :show_high_scores, :up_arrow_action
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score, :show_high_scores, :up_arrow_action, :show_preview_tetromino, :initial_delay
       alias game_over? game_over
       alias paused? paused
       alias beeping? beeping
       alias added_high_score? added_high_score
+      alias show_preview_tetromino? show_preview_tetromino
       
       def initialize(playfield_width = PLAYFIELD_WIDTH, playfield_height = PLAYFIELD_HEIGHT)
+        @initial_delay = SPEED_INITIAL_DELAYS[:snail]
         @playfield_width = playfield_width
         @playfield_height = playfield_height
         @high_scores = []
         @show_high_scores = false
         @beeping = true
         @up_arrow_action = :rotate_left
+        @show_preview_tetromino = true
         load_high_scores!
       end
       
@@ -200,35 +206,31 @@ class Tetris
       end
       
       def delay
-        [1.1 - (level.to_i * 0.1), 0.001].max
+        [@initial_delay - (level.to_i * 0.1), 0.001].max
       end
       
       def beep
         @beeper&.call if beeping
       end
-      
-      def instant_down_on_up=(value)
-        self.up_arrow_action = :instant_down if value
-      end
-      
-      def instant_down_on_up
-        self.up_arrow_action == :instant_down
-      end
-      
-      def rotate_right_on_up=(value)
-        self.up_arrow_action = :rotate_right if value
-      end
-      
-      def rotate_right_on_up
-        self.up_arrow_action == :rotate_right
-      end
-      
-      def rotate_left_on_up=(value)
-        self.up_arrow_action = :rotate_left if value
+
+      SPEED_INITIAL_DELAYS.each do |speed, speed_initial_day|
+        define_method("speed_#{speed}=") do |is_true|
+          self.initial_delay = speed_initial_day if is_true
+        end
+        
+        define_method("speed_#{speed}") do
+          self.initial_delay == speed_initial_day
+        end
       end
       
-      def rotate_left_on_up
-        self.up_arrow_action == :rotate_left
+      UP_ARROW_ACTIONS.each do |up_arrow_action_symbol|
+        define_method("#{up_arrow_action_symbol}_on_up=") do |is_true|
+          self.up_arrow_action = up_arrow_action_symbol if is_true
+        end
+        
+        define_method("#{up_arrow_action_symbol}_on_up") do
+          self.up_arrow_action == up_arrow_action_symbol
+        end
       end
       
       def reset_tetrominoes

data/examples/tetris.rb

@@ -5,7 +5,7 @@ require_relative 'tetris/model/game'
 class Tetris
   include Glimmer
   
-  BLOCK_SIZE = 25
+  BLOCK_SIZE = OS.linux? ? 28 : 25
   BEVEL_CONSTANT = 20
   COLOR_GRAY = {r: 192, g: 192, b: 192}
     
@@ -71,18 +71,31 @@ class Tetris
     
     Model::Game::PREVIEW_PLAYFIELD_HEIGHT.times do |row|
       Model::Game::PREVIEW_PLAYFIELD_WIDTH.times do |column|
-        observe(@game.preview_playfield[row][column], :color) do |new_color|
+        preview_updater = proc do
           Glimmer::LibUI.queue_main do
+            new_color = @game.preview_playfield[row][column].color
             color = Glimmer::LibUI.interpret_color(new_color)
             block = @preview_playfield_blocks[row][column]
-            block[:background_square].fill = color
-            block[:top_bevel_edge].fill = {r: color[:r] + 4*BEVEL_CONSTANT, g: color[:g] + 4*BEVEL_CONSTANT, b: color[:b] + 4*BEVEL_CONSTANT}
-            block[:right_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
-            block[:bottom_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
-            block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
-            block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+            if @game.show_preview_tetromino?
+              block[:background_square].fill = color
+              block[:top_bevel_edge].fill = {r: color[:r] + 4*BEVEL_CONSTANT, g: color[:g] + 4*BEVEL_CONSTANT, b: color[:b] + 4*BEVEL_CONSTANT}
+              block[:right_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+              block[:bottom_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+              block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
+              block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+            else
+              transparent_color = {r: 255, g: 255, b: 255, a: 0}
+              block[:background_square].fill = transparent_color
+              block[:top_bevel_edge].fill = transparent_color
+              block[:right_bevel_edge].fill = transparent_color
+              block[:bottom_bevel_edge].fill = transparent_color
+              block[:left_bevel_edge].fill = transparent_color
+              block[:border_square].stroke = transparent_color
+            end
           end
         end
+        observe(@game.preview_playfield[row][column], :color, &preview_updater)
+        observe(@game, :show_preview_tetromino, &preview_updater)
       end
     end
 
@@ -130,6 +143,12 @@ class Tetris
     }
     
     menu('View') {
+      check_menu_item('Show Next Block Preview') {
+        checked <=> [@game, :show_preview_tetromino]
+      }
+      
+      separator_menu_item
+      
       menu_item('Show High Scores') {
         on_clicked do
           show_high_scores
@@ -141,18 +160,28 @@ class Tetris
           @game.clear_high_scores!
         }
       }
+      
+      separator_menu_item
+    }
+
+    menu('Speed') {
+      Model::Game::SPEEDS.each do |speed|
+        radio_menu_item(speed.to_s.capitalize) {
+          checked <=> [@game, "speed_#{speed}"]
+        }
+      end
     }
 
     menu('Options') {
-      radio_menu_item('Instant Down on Up Arrow') { |r|
+      radio_menu_item('Instant Down on Up Arrow') {
         checked <=> [@game, :instant_down_on_up]
       }
       
-      radio_menu_item('Rotate Right on Up Arrow') { |r|
+      radio_menu_item('Rotate Right on Up Arrow') {
         checked <=> [@game, :rotate_right_on_up]
       }
       
-      radio_menu_item('Rotate Left on Up Arrow') { |r|
+      radio_menu_item('Rotate Left on Up Arrow') {
         checked <=> [@game, :rotate_left_on_up]
       }
     }
@@ -199,7 +228,7 @@ class Tetris
     block = {}
     bevel_pixel_size = 0.16 * block_size.to_f
     color = Glimmer::LibUI.interpret_color(Model::Block::COLOR_CLEAR)
-    area {
+    block[:area] = area {
       block[:background_square] = square(0, 0, block_size) {
         fill color
       }
@@ -275,12 +304,6 @@ class Tetris
   
   def score_board(block_size: , &extra_content)
     vertical_box {
-      horizontal_box {
-        label # filler
-        @preview_playfield_blocks = playfield(playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: block_size)
-        label # filler
-      }
-
       horizontal_box {
         label # filler
         grid {
@@ -321,6 +344,12 @@ class Tetris
         }
         label # filler
       }
+      
+      horizontal_box {
+        label # filler
+        @preview_playfield_blocks = playfield(playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: block_size)
+        label # filler
+      }
     
       extra_content&.call
     }
@@ -329,9 +358,11 @@ class Tetris
   def start_moving_tetrominos_down
     unless @tetrominos_start_moving_down
       @tetrominos_start_moving_down = true
-      Glimmer::LibUI.timer(@game.delay) do
+      tetromino_move = proc do
         @game.down! if !@game.game_over? && !@game.paused?
+        Glimmer::LibUI.timer(@game.delay, repeat: false, &tetromino_move)
       end
+      Glimmer::LibUI.timer(@game.delay, repeat: false, &tetromino_move)
     end
   end
   

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

@@ -44,6 +44,23 @@ module Glimmer
           end
           super
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = [x_center, y_center, radius, start_angle, sweep, is_negative]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x_center, y_center, radius, start_angle, sweep, is_negative = @perfect_shape_dependencies = perfect_shape_dependencies
+            sign = is_negative ? 1 : -1
+            start = is_negative ? (360 - start_angle) : -1*start_angle
+            extent = is_negative ? (360 - sweep) : -1*sweep
+            @perfect_shape = PerfectShape::Arc.new(
+              type: :open,
+              center_x: x_center, center_y: y_center,
+              radius_x: radius, radius_y: radius,
+              start: start, extent: extent
+            )
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -49,6 +49,15 @@ module Glimmer
         def include_start_point?
           x && y
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = [x, y, c1_x, c1_y, c2_x, c2_y, end_x, end_y]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x, y, c1_x, c1_y, c2_x, c2_y, end_x, end_y = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::CubicBezierCurve.new(points: [[x, y], [c1_x, c1_y], [c2_x, c2_y], [end_x, end_y]])
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -45,8 +45,13 @@ module Glimmer
           super
         end
         
-        def include?(x, y)
-          (x - x_center)**2 + (y - y_center)**2 < radius**2
+        def perfect_shape
+          perfect_shape_dependencies = [x_center, y_center, radius]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x_center, y_center, radius = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Circle.new(center_x: x_center, center_y: y_center, radius: radius)
+          end
+          @perfect_shape
         end
       end
     end

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

@@ -52,6 +52,15 @@ module Glimmer
           # start point
           !parent.is_a?(Figure) && end_x && end_y
         end
+        
+        def perfect_shape
+          perfect_shape_dependencies = [x, y, end_x, end_y]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x, y, end_x, end_y = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Line.new(points: [[x, y], [end_x, end_y]])
+          end
+          @perfect_shape
+        end
       end
     end
   end

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

@@ -33,8 +33,13 @@ module Glimmer
           super
         end
         
-        def include?(x, y)
-          x.between?(self.x, self.x + width) && y.between?(self.y, self.y + height)
+        def perfect_shape
+          perfect_shape_dependencies = [x, y, width, height]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            x, y, width, height = @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Rectangle.new(x: x, y: y, width: width, height: height)
+          end
+          @perfect_shape
         end
       end
     end

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

@@ -33,8 +33,15 @@ module Glimmer
           super
         end
         
-        def include?(x, y)
-          x.between?(self.x, self.x + length) && y.between?(self.y, self.y + length)
+        # TODO look into refactoring/unifying code with Rectangle
+        
+        def perfect_shape
+          perfect_shape_dependencies = [x, y, length]
+          if perfect_shape_dependencies != @perfect_shape_dependencies
+            @perfect_shape_dependencies = perfect_shape_dependencies
+            @perfect_shape = PerfectShape::Square.new(x: @perfect_shape_dependencies[0], y: @perfect_shape_dependencies[1], length: @perfect_shape_dependencies[2])
+          end
+          @perfect_shape
         end
       end
     end

data/lib/glimmer/libui/shape.rb

@@ -145,6 +145,46 @@ module Glimmer
       end
       alias transform= transform
       alias set_transform transform
+    
+      # Returns if shape contains point on the inside when outline is false (default)
+      # or if point is on the outline when outline is true
+      # distance_tolerance is used when outline is true to enable a fuzz factor in
+      # determining if a point lies on the outline (e.g. makes it easier to select
+      # a shape by mouse)
+      def contain?(*point, outline: false, distance_tolerance: 0)
+        perfect_shape&.contain?(*point, outline: outline, distance_tolerance: distance_tolerance)
+      end
+      
+      # Returns if shape includes point on the inside when filled
+      # or if shape includes point on the outline when stroked
+      def include?(*point)
+        if fill.empty?
+          contain?(*point, outline: true, distance_tolerance: ((stroke[:thickness] || 1) - 1))
+        else
+          contain?(*point)
+        end
+      end
+      
+      # Returns bounding box Array consisting of
+      # [minx, miny, width, height]
+      def bounding_box
+        perfect_shape_bounding_box = perfect_shape&.bounding_box
+        return if perfect_shape_bounding_box.nil?
+        [
+          perfect_shape_bounding_box.x,
+          perfect_shape_bounding_box.y,
+          perfect_shape_bounding_box.width,
+          perfect_shape_bounding_box.height,
+        ]
+      end
+      
+      # Returns PerfectShape object matching this shape to enable
+      # executing computational geometry algorithms
+      #
+      # Subclasses must implement
+      def perfect_shape
+        # No Op
+      end
       
       def respond_to?(method_name, *args, &block)
         self.class.parameters.include?(method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym) or

data/lib/glimmer-dsl-libui.rb

@@ -23,6 +23,7 @@ $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 # External requires
 require 'glimmer'
+require 'perfect-shape'
 # require 'logging'
 # require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 # require 'super_module'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.5.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: perfect-shape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -205,12 +219,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.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
-  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, bidirectional data-binding, and custom
-  keyword support.
+  Library) - Winner of Fukuoka Ruby Award Competition 2022 Special Award - 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, bidirectional data-binding, and custom keyword
+  support.
 email: andy.am@gmail.com
 executables:
 - girb