glimmer-dsl-libui 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a51c465651c0e505932930498ce9a827401b91a4d3cd4371a0b8dc58b8da8348
-  data.tar.gz: e422609e3e0400f8dc5ad55fd90f40040cc7a30cba33b66813b7adc14ff9b2ce
+  metadata.gz: cc2c8178ea922168b2df15740230c175155c96313d847dd117137ba18eba0991
+  data.tar.gz: 49cbaff89df8bb0d1099b6adf9f0dcdaefe05010c4ee7b295160b0f7fbe8bd66
 SHA512:
-  metadata.gz: d6bd5b18f925857c9505eef4b36d893ddcfe5b5bcc1203b4581d5cc91f5bd319527d1123584cb7a9730d28693d668fe877d00872afea1f828e08a2cc2fc91ebe
-  data.tar.gz: 34e80b9accde5252b992f8d1517f34fc74ca023f5ce7fcfa179bf311426c817cc0c89a863ff58157ea86e0f5c3f92653cbc8d7d7cef2ebaeb8cc3269a4186b27
+  metadata.gz: 30c0cbe41224d6c18e32c204a9f8fab80330ce27d8174f3293399ea9aeb73474f2083145d361d708f062d7035762a4417a135be886dacc09785034ed2b8f0887
+  data.tar.gz: 3f5adf2374b390a21f4e6e7c28003c0446d5fd2a1c810beaebedb820530f56f7415c4a44f91887056be8e7745bc6cc6cd9728c9833cbd7688886f1b3a293d355

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.7.7
+
+- Support ability for `area` `on_key_event`/`on_key_down`/`on_key_up` listeners to return a boolean value indicating whether they handled a key event or not in case some key events need to be left to other operating system key handlers like COMMAND+Q for the Mac quit menu item
+- Update `examples/tetris.rb` to return `false` in its `on_key_down` listener for unhandled events
+- Update `examples/area_gallery.rb` to return `false` in its `on_key_event`/`on_key_down`/`on_key_up` listeners for unhandled events
+
 ## 0.7.6
 
 - Fix issue with hearing "fonk" sound on every key press when handling `on_key_event`/`on_key_down`/`on_key_up` listeners (by returning expected `1` value if the listeners are handled properly or otherwise allowing the "fonk" sound to ring when the listeners are not handled)

data/README.md

@@ -1,4 +1,4 @@
-# [<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.7.6
+# [<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.7.7
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 ### The Quickest Way From Zero To GUI
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
@@ -544,7 +544,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.7.6'
+gem 'glimmer-dsl-libui', '~> 0.7.7'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/examples/area_gallery.rb

@@ -92,14 +92,50 @@ window('Area Gallery', 400, 400) {
     
     on_key_event do |area_key_event|
       p area_key_event
+      # As a smart default, key events are assumed to be handled if you add a key event listener,
+      # but you can return false to indicate a key event is not handled to allow it
+      # to propagate to other operating system key handlers, like the Mac quit menu item,
+      # which expects a COMMAND+Q shortcut usually.
+      # Otherwise, if you return false in all key event handlers for a specific key combo,
+      # the Mac beeps (makes a "fonk" sound), which is normal behavior on the Mac.
+      case area_key_event
+      in modifiers: [:command], key: 'q'
+        false if OS.mac? # allow to propagate to Mac quit menu item
+      else
+        # true # no return value (nil) or any return value other than false or 0 means true (event handled)
+      end
     end
     
     on_key_up do |area_key_event|
       puts 'key up'
+      # As a smart default, key events are assumed to be handled if you add a key event listener,
+      # but you can return false to indicate a key event is not handled to allow it
+      # to propagate to other operating system key handlers, like the Mac quit menu item,
+      # which expects a COMMAND+Q shortcut usually.
+      # Otherwise, if you return false in all key event handlers for a specific key combo,
+      # the Mac beeps (makes a "fonk" sound), which is normal behavior on the Mac.
+      case area_key_event
+      in modifiers: [:command], key: 'q'
+        false if OS.mac? # allow to propagate to Mac quit menu item
+      else
+        # true # no return value (nil) or any return value other than false or 0 means true (event handled)
+      end
     end
     
     on_key_down do |area_key_event|
       puts 'key down'
+      # As a smart default, key events are assumed to be handled if you add a key event listener,
+      # but you can return false to indicate a key event is not handled to allow it
+      # to propagate to other operating system key handlers, like the Mac quit menu item,
+      # which expects a COMMAND+Q shortcut usually.
+      # Otherwise, if you return false in all key event handlers for a specific key combo,
+      # the Mac beeps (makes a "fonk" sound), which is normal behavior on the Mac.
+      case area_key_event
+      in modifiers: [:command], key: 'q'
+        false if OS.mac? # allow to propagate to Mac quit menu item
+      else
+        # true # no return value (nil) or any return value other than false or 0 means true (event handled)
+      end
     end
   }
 }.show

data/examples/tetris.rb

@@ -258,6 +258,7 @@ class Tetris
       }
       
       on_key_down do |key_event|
+        handled = true # assume it is handled for all cases except the else clause below
         case key_event
         in ext_key: :down
           if OS.windows?
@@ -292,13 +293,13 @@ class Tetris
           @game.rotate!(:right)
         in modifier: :control
           @game.rotate!(:left)
-        in modifiers: [:command], key: 'q'
-          exit(0) if OS.mac?
-        in modifiers: [:alt], ext_key: :f4
-          exit(0) unless OS.mac?
         else
-          # Do Nothing
+          # returning false explicitly means the key event was not handled, which
+          # propagates the event to other handlers, like the quit menu item, which
+          # can handle COMMAND+Q on the Mac to quit an application
+          handled = false
         end
+        handled
       end
       
       extra_content&.call

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

@@ -182,16 +182,29 @@ module Glimmer
             @area_handler.KeyEvent     = fiddle_closure_block_caller(1, [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)
-              notify_custom_listeners('on_key_event', area_key_event)
+              on_key_up_results = on_key_down_results = []
+              on_key_event_results = notify_custom_listeners('on_key_event', area_key_event)
               if area_key_event[:up]
-                notify_custom_listeners('on_key_up', area_key_event)
+                on_key_up_results = notify_custom_listeners('on_key_up', area_key_event)
               else
-                notify_custom_listeners('on_key_down', area_key_event)
+                on_key_down_results = notify_custom_listeners('on_key_down', area_key_event)
               end
-              if handle_custom_listener('on_key_event').any? || handle_custom_listener('on_key_up').any? || handle_custom_listener('on_key_down').any?
-                1
-              else
+              if ((
+                    handle_custom_listener('on_key_event').empty? ||
+                    (handle_custom_listener('on_key_event').any? && on_key_event_results.all? {|result| LibUI.boolean_to_integer(result) == 0})
+                  ) &&
+                  (
+                    handle_custom_listener('on_key_up').empty? ||
+                    (handle_custom_listener('on_key_up').any? && on_key_up_results.all? {|result| LibUI.boolean_to_integer(result) == 0})
+                  ) &&
+                  (
+                    handle_custom_listener('on_key_down').empty? ||
+                    (handle_custom_listener('on_key_down').any? && on_key_down_results.all? {|result| LibUI.boolean_to_integer(result) == 0})
+                  )
+                 )
                 0
+              else
+                1
               end
             end
             @listeners_installed = true

data/lib/glimmer/libui/control_proxy.rb

@@ -223,7 +223,7 @@ module Glimmer
       end
       
       def notify_custom_listeners(listener_name, *args)
-        handle_custom_listener(listener_name).each do |listener|
+        handle_custom_listener(listener_name).map do |listener|
           listener.call(*args)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-14 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer