glimmer-dsl-libui 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d51961908ec1315a42fe183bc79cbe86bc8d86e2dea9ac9a35d2dfaefaf3912d
-  data.tar.gz: af6c03eb6d451816d32242c7f7d99ce3ed28755f363f3620faea2a590c3e0ea8
+  metadata.gz: 34cb8eb1da8d200b96163b3e2a0a607ed32dda75cb0df62088c5fcfaad2e2b18
+  data.tar.gz: 169bb5a5d620cc28606cdb03a7cd1e19544ae14d7c5d11dd2704cca869e3a2fe
 SHA512:
-  metadata.gz: cb828f87dfbc9c56fd15123ecb29a3c499f22c315ef6582d47c629353e444f16c2b0755b958abe8d77f0506ee25c1cffbafa0a682ea2bfb1e9d649fa49cb7e9f
-  data.tar.gz: ff5f76d4c7868c28d223a95bff04a5a3b9cf01879eec9231a709afd2e67a6ce6bb2a4df8a8ccf41406a1cf69aaf7250a40c7c726952f8e8b8cc280b0e8e77175
+  metadata.gz: b00b7729fcc0635faa743f9310d048a132d679d1550033302ee39b13dedd5d5f9e4ab79e5673b2cfceb2d887d87f33c24774a3b5d4f0b2bbfdfd8e366844acb2
+  data.tar.gz: c879ccd0d7f27b08080905669bff25543673e9117d44650dd31a57674596cf09aee3034a49b8af8c73f7976c1143ec0a8f7892a77252eb945318fafcc6f49da2

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 0.4.15
+
+- Support ability to attach multiple listeners on a control (e.g. multiple `on_changed {}` on `entry` or multiple `on_clicked` on `button`)
+- Ensure clearing custom listeners on `#destroy` of a control
+- Add `on_destroyed` as alias for `on_destroy` listener on `window`
+- Avoid wasting time on `destroy` of a control (e.g. freeing resources) when the main window is getting destroyed, thus closing entire application instantaneously
+- Have validation in examples/form_table.rb complain about nil values (no value entered)
+- Fix Reset button in examples/meta_example.rb when on a version other than version 1
+- Fix issue with calling `#destroy` on `open_type_features`
+
 ## 0.4.14
 
 - Support passing width or height alone to `image` keyword, calculating the other dimension automatically while preserving original aspect ratio

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.4.14
+# [<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.15
 ## 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)
@@ -100,7 +100,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -138,8 +138,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to explicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -184,6 +184,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }
@@ -500,7 +506,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.4.14'
+gem 'glimmer-dsl-libui', '~> 0.4.15'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -769,7 +775,7 @@ data = [
   ['Melody Hanheimer', 'melody@hanheimer.com', '213-493-8274', 'Los Angeles', 'CA'],
 ]
 
-window('Contacts', 600, 600) { |w|
+window('Contacts', 600, 600) {
   margined true
   
   vertical_box {
@@ -802,8 +808,8 @@ window('Contacts', 600, 600) { |w|
       
       on_clicked do
         new_row = [@name_entry.text, @email_entry.text, @phone_entry.text, @city_entry.text, @state_entry.text]
-        if new_row.include?('')
-          msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+        if new_row.map(&:to_s).include?('')
+          msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
         else
           data << new_row # automatically inserts a row into the table due to implicit data-binding
           @unfiltered_data = data.dup
@@ -847,6 +853,12 @@ window('Contacts', 600, 600) { |w|
       
       on_changed do |row, type, row_data|
         puts "Row #{row} #{type}: #{row_data}"
+        $stdout.flush # for Windows
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+        $stdout.flush # for Windows
       end
     }
   }
@@ -1340,13 +1352,16 @@ Note that `area`, `path`, and nested shapes are all truly declarative, meaning t
 - `horizontal_box`, `vertical_box`, `grid`, and `form` controls have `padded` as `true` upon instantiation to ensure more user-friendly GUI by default
 - `group` controls have `margined` as `true` upon instantiation to ensure more user-friendly GUI by default
 - All controls nested under a `horizontal_box`, `vertical_box`, and `form` have `stretchy` property (fill maximum space) as `true` by default (passed to `box_append`/`form_append` method)
+- If an event listener is repeated under a control (e.g. two `on_clicked {}` listeners under `button`), it does not overwrite the previous listener, yet it is added to an `Array` of listeners for the event. [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) provides multiple-event-listener support unlike [LibUI](https://github.com/kojix2/LibUI)
 - `window` instatiation args can be left off, having the following defaults when unspecified: `title` as `''`, `width` as `190`, `height` as `150`, and `has_menubar` as `true`)
 - `window` has an `on_closing` listener by default that quits application upon hitting the close button (can be overridden with a manual `on_closing` implementation that returns integer `0` for success)
 - `group` has `title` property default to `''` if not specified in instantiation args, so it can be instantiated without args with `title` property specified in nested block (e.g. `group {title 'Address'; ...}`)
 - `button`, `checkbox`, and `label` have `text` default to `''` if not specified in instantiation args, so they can be instantiated without args with `text` property specified in nested block (e.g. `button {text 'Greet'; on_clicked {puts 'Hello'}}`)
 - `quit_menu_item` has an `on_clicked` listener by default that quits application upon selecting the quit menu item (can be overridden with a manual `on_clicked` implementation that returns integer `0` for success)
 - If an `on_closing` listener was defined on `window` and it does not return an integer, default exit behavior is assumed (`window.destroy` is called followed by `LibUI.quit`, returning `0`).
-- If an `on_clicked` listener was defined on `quit_menu_item` and it does not return an integer, default exit behavior is assumed (`main_window.destroy` is called followed by `LibUI.quit`, returning `0`).
+- If multiple `on_closing` listeners were added for `window`, and none return an integer, they are all executed. On the other hand, if one of them returns an integer, it is counted as the final return value and stops the chain of listener execution.
+- If an `on_clicked` listener was defined on `quit_menu_item` and it does not return an integer, default exit behavior is assumed (`quit_menu_item.destroy` and `main_window.destroy` are called followed by `LibUI.quit`, returning `0`).
+- If multiple `on_clicked` listeners were added for `quit_menu_item`, and none return an integer, they are all executed. On the other hand, if one of them returns an integer, it is counted as the final return value and stops the chain of listener execution.
 - All boolean property readers return `true` or `false` in Ruby instead of the [libui](https://github.com/andlabs/libui) original `0` or `1` in C.
 - All boolean property writers accept `true`/`false` in addition to `1`/`0` in Ruby
 - All string property readers return a `String` object in Ruby instead of the [libui](https://github.com/andlabs/libui) Fiddle pointer object.
@@ -6710,6 +6725,11 @@ window('Editable column animal sounds', 400, 200) {
       }
 
       cell_rows data
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+        $stdout.flush
+      end
     }
   }
   
@@ -6822,7 +6842,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -6860,8 +6880,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to explicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -6906,6 +6926,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }
@@ -6916,13 +6942,13 @@ end
 FormTable.new.launch
 ```
 
-New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version (with explicit [data-binding](#data-binding)):
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 2 (with explicit [data-binding](#data-binding)):
 
 ```ruby
 require 'glimmer-dsl-libui'
 
 class FormTable
-  Contact = Struct.new(:name, :email, :phone, :city, :state)
+  Contact = Struct.new(:name, :email, :phone, :city, :state_province)
   
   include Glimmer
   
@@ -6939,7 +6965,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -6977,8 +7003,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -7016,13 +7042,19 @@ class FormTable
           text_column('Email')
           text_column('Phone')
           text_column('City')
-          text_column('State/Province')
+          text_column('State')
     
           editable true
-          cell_rows <=> [self, :contacts, column_attributes: {'State/Province' => :state}] # explicit data-binding to Model Array with column_attributes mapping for a specific column
+          cell_rows <=> [self, :contacts, column_attributes: {'State' => :state_province}] # explicit data-binding to Model Array with column_attributes mapping for a specific column
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }
@@ -7033,7 +7065,7 @@ end
 FormTable.new.launch
 ```
 
-New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version (with explicit [data-binding](#data-binding)):
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 3 (with explicit [data-binding](#data-binding)):
 
 ```ruby
 
@@ -7057,7 +7089,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -7095,8 +7127,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -7141,6 +7173,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }
@@ -7172,7 +7210,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -7210,8 +7248,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               data << new_row # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_data = data.dup
@@ -7256,6 +7294,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }
@@ -7281,7 +7325,7 @@ data = [
   ['Melody Hanheimer', 'melody@hanheimer.com', '213-493-8274', 'Los Angeles', 'CA'],
 ]
 
-window('Contacts', 600, 600) { |w|
+window('Contacts', 600, 600) {
   margined true
   
   vertical_box {
@@ -7314,8 +7358,8 @@ window('Contacts', 600, 600) { |w|
       
       on_clicked do
         new_row = [@name_entry.text, @email_entry.text, @phone_entry.text, @city_entry.text, @state_entry.text]
-        if new_row.include?('')
-          msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+        if new_row.map(&:to_s).include?('')
+          msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
         else
           data << new_row # automatically inserts a row into the table due to implicit data-binding
           @unfiltered_data = data.dup
@@ -7359,6 +7403,12 @@ window('Contacts', 600, 600) { |w|
       
       on_changed do |row, type, row_data|
         puts "Row #{row} #{type}: #{row_data}"
+        $stdout.flush # for Windows
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+        $stdout.flush # for Windows
       end
     }
   }

data/VERSION

@@ -1 +1 @@
-0.4.14
+0.4.15

data/examples/editable_column_table.rb

@@ -22,6 +22,11 @@ window('Editable column animal sounds', 400, 200) {
       }
 
       cell_rows data
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+        $stdout.flush
+      end
     }
   }
   

data/examples/form_table.rb

@@ -18,7 +18,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -56,8 +56,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to explicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -102,6 +102,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+      
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table2.rb

@@ -1,7 +1,7 @@
 require 'glimmer-dsl-libui'
 
 class FormTable
-  Contact = Struct.new(:name, :email, :phone, :city, :state)
+  Contact = Struct.new(:name, :email, :phone, :city, :state_province)
   
   include Glimmer
   
@@ -18,7 +18,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -56,8 +56,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -95,13 +95,19 @@ class FormTable
           text_column('Email')
           text_column('Phone')
           text_column('City')
-          text_column('State/Province')
+          text_column('State')
     
           editable true
-          cell_rows <=> [self, :contacts, column_attributes: {'State/Province' => :state}] # explicit data-binding to Model Array with column_attributes mapping for a specific column
+          cell_rows <=> [self, :contacts, column_attributes: {'State' => :state_province}] # explicit data-binding to Model Array with column_attributes mapping for a specific column
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table3.rb

@@ -19,7 +19,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -57,8 +57,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               @contacts << Contact.new(*new_row) # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_contacts = @contacts.dup
@@ -103,6 +103,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table4.rb

@@ -16,7 +16,7 @@ class FormTable
   end
   
   def launch
-    window('Contacts', 600, 600) { |w|
+    window('Contacts', 600, 600) {
       margined true
       
       vertical_box {
@@ -54,8 +54,8 @@ class FormTable
           
           on_clicked do
             new_row = [name, email, phone, city, state]
-            if new_row.include?('')
-              msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+            if new_row.map(&:to_s).include?('')
+              msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
             else
               data << new_row # automatically inserts a row into the table due to implicit data-binding
               @unfiltered_data = data.dup
@@ -100,6 +100,12 @@ class FormTable
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
+            $stdout.flush # for Windows
+          end
+          
+          on_edited do |row, row_data| # only fires on direct table editing
+            puts "Row #{row} edited: #{row_data}"
+            $stdout.flush # for Windows
           end
         }
       }

data/examples/form_table5.rb

@@ -10,7 +10,7 @@ data = [
   ['Melody Hanheimer', 'melody@hanheimer.com', '213-493-8274', 'Los Angeles', 'CA'],
 ]
 
-window('Contacts', 600, 600) { |w|
+window('Contacts', 600, 600) {
   margined true
   
   vertical_box {
@@ -43,8 +43,8 @@ window('Contacts', 600, 600) { |w|
       
       on_clicked do
         new_row = [@name_entry.text, @email_entry.text, @phone_entry.text, @city_entry.text, @state_entry.text]
-        if new_row.include?('')
-          msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
+        if new_row.map(&:to_s).include?('')
+          msg_box_error('Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
         else
           data << new_row # automatically inserts a row into the table due to implicit data-binding
           @unfiltered_data = data.dup
@@ -88,6 +88,12 @@ window('Contacts', 600, 600) { |w|
       
       on_changed do |row, type, row_data|
         puts "Row #{row} #{type}: #{row_data}"
+        $stdout.flush # for Windows
+      end
+      
+      on_edited do |row, row_data| # only fires on direct table editing
+        puts "Row #{row} edited: #{row_data}"
+        $stdout.flush # for Windows
       end
     }
   }

data/examples/meta_example.rb

@@ -180,7 +180,9 @@ class MetaExample
             }
             button('Reset') {
               on_clicked do
-                self.code_text = File.read(file_path_for(selected_example))
+                version_number = @version_spinbox.value == 1 ? '' : @version_spinbox.value
+                example = "#{selected_example}#{version_number}"
+                self.code_text = File.read(file_path_for(example))
               end
             }
           }

data/lib/glimmer/libui/attributed_string.rb

@@ -22,7 +22,6 @@
 require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/control_proxy/area_proxy'
 require 'glimmer/libui/parent'
-require 'glimmer/libui/control_proxy/transformable'
 require 'glimmer/libui/data_bindable'
 
 module Glimmer
@@ -48,7 +47,7 @@ module Glimmer
           @string
         else
           @string = value
-          redraw
+          request_auto_redraw
         end
       end
       alias string= string
@@ -59,7 +58,7 @@ module Glimmer
           @font
         else
           @font = value
-          redraw
+          request_auto_redraw
         end
       end
       alias font= font
@@ -70,7 +69,7 @@ module Glimmer
           @color
         else
           @color = Glimmer::LibUI.interpret_color(value)
-          redraw
+          request_auto_redraw
         end
       end
       alias color= color
@@ -81,7 +80,7 @@ module Glimmer
           @background
         else
           @background = Glimmer::LibUI.interpret_color(value)
-          redraw
+          request_auto_redraw
         end
       end
       alias background= background
@@ -92,7 +91,7 @@ module Glimmer
           @underline
         else
           @underline = value
-          redraw
+          request_auto_redraw
         end
       end
       alias underline= underline
@@ -103,7 +102,7 @@ module Glimmer
           @underline_color
         else
           @underline_color = value
-          redraw
+          request_auto_redraw
         end
       end
       alias underline_color= underline_color
@@ -114,12 +113,21 @@ module Glimmer
           @open_type_features
         else
           @open_type_features = value
-          redraw
+          request_auto_redraw
         end
       end
       alias open_type_features= open_type_features
       alias set_open_type_features open_type_features
       
+      def remove_open_type_features
+        return if @removing_open_type_features
+        @removing_open_type_features = true
+        @open_type_features&.destroy
+        @open_type_features = nil
+        request_auto_redraw
+        @removing_open_type_features = false
+      end
+      
       def post_add_content(block = nil)
         block ||= @block
         block_result = block&.call
@@ -189,6 +197,7 @@ module Glimmer
       end
       
       def destroy
+        return if ControlProxy.main_window_proxy&.destroying?
         open_type_features.destroy unless open_type_features.nil?
         @parent_proxy&.children&.delete(self)
       end

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

@@ -36,9 +36,9 @@ module Glimmer
           attr_accessor :current_area_draw_params
         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']
+        CUSTOM_LISTENER_NAMES = ['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 = {
+        CUSTOM_LISTENER_NAME_ALIASES = {
           on_drawn: 'on_draw',
           on_mouse_moved: 'on_mouse_move',
           on_mouse_drag_started: 'on_mouse_drag_start',
@@ -105,7 +105,7 @@ module Glimmer
         
         def draw(area_draw_params)
           children.dup.each {|child| child.draw(area_draw_params)}
-          on_draw.each {|listener| listener.call(area_draw_params)}
+          notify_custom_listeners('on_draw', area_draw_params)
         end
         
         def redraw
@@ -156,37 +156,37 @@ module Glimmer
             @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_mouse_event|
               area_mouse_event = ::LibUI::FFI::AreaMouseEvent.new(area_mouse_event)
               area_mouse_event = area_mouse_event_hash(area_mouse_event)
-              on_mouse_event.each { |listener| listener.call(area_mouse_event)}
-              on_mouse_move.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
+              notify_custom_listeners('on_mouse_event', area_mouse_event)
+              notify_custom_listeners('on_mouse_move', area_mouse_event) if area_mouse_event[:x].between?(0, area_mouse_event[:area_width]) && area_mouse_event[:y].between?(0, area_mouse_event[:area_height])
               unless @last_area_mouse_event.nil?
-                on_mouse_down.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
-                on_mouse_up.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
-                on_mouse_drag_start.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
-                on_mouse_drag.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] > 0
-                on_mouse_drop.each { |listener| listener.call(area_mouse_event)} if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
+                notify_custom_listeners('on_mouse_down', area_mouse_event) if area_mouse_event[:down] > 0 && @last_area_mouse_event[:down] == 0
+                notify_custom_listeners('on_mouse_up', area_mouse_event) if area_mouse_event[:up] > 0 && @last_area_mouse_event[:up] == 0
+                notify_custom_listeners('on_mouse_drag_start', area_mouse_event) if area_mouse_event[:held] > 0 && @last_area_mouse_event[:held] == 0
+                notify_custom_listeners('on_mouse_drag', area_mouse_event) if area_mouse_event[:held] > 0
+                notify_custom_listeners('on_mouse_drop', area_mouse_event) if area_mouse_event[:held] == 0 && @last_area_mouse_event[:held] > 0
               end
               @last_area_mouse_event = area_mouse_event
             end
             @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [1, 1, 4]) do |_, _, left|
               left = Glimmer::LibUI.integer_to_boolean(left)
-              on_mouse_crossed.each { |listener| listener.call(left) }
+              notify_custom_listeners('on_mouse_crossed', left)
               if left
-                on_mouse_exit.each { |listener| listener.call(left) }
+                notify_custom_listeners('on_mouse_exit', left)
               else
-                on_mouse_enter.each { |listener| listener.call(left) }
+                notify_custom_listeners('on_mouse_enter', left)
               end
             end
             @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
-              on_drag_broken.each { |listener| listener.call }
+              notify_custom_listeners('on_drag_broken')
             end
             @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [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)
-              on_key_event.each { |listener| listener.call(area_key_event) }
+              notify_custom_listeners('on_key_event', area_key_event)
               if area_key_event[:up]
-                on_key_up.each { |listener| listener.call(area_key_event) }
+                notify_custom_listeners('on_key_up', area_key_event)
               else
-                on_key_down.each { |listener| listener.call(area_key_event) }
+                notify_custom_listeners('on_key_down', area_key_event)
               end
             end
             @listeners_installed = true

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

@@ -42,6 +42,7 @@ module Glimmer
         end
         
         def destroy_child(child)
+          child.deregister_all_custom_listeners
           ::LibUI.send("box_delete", @libui, children.index(child))
           ControlProxy.control_proxies.delete(child)
         end

data/lib/glimmer/libui/control_proxy/column/button_column_proxy.rb

@@ -34,36 +34,8 @@ module Glimmer
           include Column
           include EnableableColumn
           
-          def on_clicked(&block)
-            # TODO consider generalizing into custom listeners and moving to ControlProxy
-            @on_clicked_procs ||= []
-            if block.nil?
-              @on_clicked_procs
-            else
-              @on_clicked_procs << block
-              block
-            end
-          end
-          
-          def can_handle_listener?(listener_name)
-            listener_name == 'on_clicked' || super
-          end
+          CUSTOM_LISTENER_NAMES = ['on_clicked']
           
-          def handle_listener(listener_name, &listener)
-            case listener_name
-            when 'on_clicked'
-              on_clicked(&listener)
-            else
-              super
-            end
-          end
-          
-          def notify_listeners(listener_name, *args)
-            @on_clicked_procs&.each do |on_clicked_proc|
-              on_clicked_proc.call(*args)
-            end
-          end
-              
           private
           
           def build_control

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

@@ -39,6 +39,7 @@ module Glimmer
         end
         
         def destroy_child(child)
+          child.deregister_all_custom_listeners
           ::LibUI.send("form_delete", @libui, children.index(child))
           ControlProxy.control_proxies.delete(child)
         end

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

@@ -179,6 +179,8 @@ module Glimmer
         end
         
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end

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

@@ -35,29 +35,39 @@ module Glimmer
         
           def handle_listener(listener_name, &listener)
             if listener_name == 'on_clicked'
-              @default_behavior_listener = Proc.new do
-                return_value = listener.call(self)
+              @on_clicked_listeners ||= []
+              @on_clicked_listeners << listener
+              @default_behavior_listener ||= Proc.new do
+                return_value = nil
+                @on_clicked_listeners.each do |l|
+                  return_value = l.call(self)
+                  break if return_value.is_a?(Numeric)
+                end
                 if return_value.is_a?(Numeric)
                   return_value
                 else
                   destroy
+                  ControlProxy.main_window_proxy&.destroy
                   ::LibUI.quit
                   0
                 end
+              end.tap do |default_behavior_listener|
+                ::LibUI.on_should_quit(&default_behavior_listener)
               end
-              ::LibUI.on_should_quit(&@default_behavior_listener)
             end
           end
+          
+          def destroy
+            @on_clicked_listeners&.clear
+            super
+          end
         
           private
           
           def build_control
             @libui = @parent_proxy.append_quit_item(*@args)
-            handle_listener('on_clicked') do
-              ControlProxy.main_window_proxy&.destroy
-              ::LibUI.quit
-              0
-            end
+            # setup default on_clicked listener if no on_clicked listeners are setup
+            handle_listener('on_clicked') {} if @on_clicked_listeners.nil? || @on_clicked_listeners.empty?
           end
         end
       end

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

@@ -33,15 +33,24 @@ module Glimmer
         include Parent
       
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          return if @destroying
+          @destroying = true
+          deregister_all_custom_listeners
           ::LibUI.free_open_type_features(@libui)
-          @parent_proxy&.children&.delete(self)
+          @parent_proxy&.remove_open_type_features
           ControlProxy.control_proxies.delete(self)
+          @destroying = false
         end
         
         def redraw
-          @parent_proxy.redraw
+          @parent_proxy&.redraw
         end
         
+        def request_auto_redraw
+          @parent_proxy&.request_auto_redraw
+        end
+                        
         private
         
         def build_control

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

@@ -31,6 +31,8 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class OpenTypeTagProxy < ControlProxy
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end

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

@@ -140,6 +140,8 @@ module Glimmer
         end
         
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end

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

@@ -36,7 +36,7 @@ module Glimmer
       class TableProxy < ControlProxy
         include Glimmer::FiddleConsumer
         
-        LISTENERS = ['on_changed', 'on_edited']
+        CUSTOM_LISTENER_NAMES = ['on_changed', 'on_edited']
         
         attr_reader :model_handler, :model, :table_params, :columns, :column_attributes
       
@@ -91,18 +91,18 @@ module Glimmer
                 if @cell_rows.size < @last_cell_rows.size && @last_cell_rows.include_all?(*@cell_rows)
                   @last_cell_rows.array_diff_indexes(@cell_rows).reverse.each do |row|
                     ::LibUI.table_model_row_deleted(model, row)
-                    on_changed.each {|listener| listener.call(row, :deleted, @last_cell_rows[row])}
+                    notify_custom_listeners('on_changed', row, :deleted, @last_cell_rows[row])
                   end
                 elsif @cell_rows.size > @last_cell_rows.size && @cell_rows.include_all?(*@last_cell_rows)
                   @cell_rows.array_diff_indexes(@last_cell_rows).each do |row|
                     ::LibUI.table_model_row_inserted(model, row)
-                    on_changed.each {|listener| listener.call(row, :inserted, @cell_rows[row])}
+                    notify_custom_listeners('on_changed', row, :inserted, @cell_rows[row])
                   end
                 else
                   @cell_rows.each_with_index do |new_row_data, row|
                     if new_row_data != @last_cell_rows[row]
                       ::LibUI.table_model_row_changed(model, row)
-                      on_changed.each {|listener| listener.call(row, :changed, @cell_rows[row])}
+                      notify_custom_listeners('on_changed', row, :changed, @cell_rows[row])
                     end
                   end
                 end
@@ -270,7 +270,7 @@ module Glimmer
                 @cell_rows[row].send(attribute)[1] = ::LibUI.table_value_string(val).to_s
               end
             when Column::ButtonColumnProxy
-              @columns[column].notify_listeners(:on_clicked, row)
+              @columns[column].notify_custom_listeners('on_clicked', row)
             when Column::CheckboxColumnProxy
               column = @columns[column].index
               @cell_rows[row] ||= []
@@ -292,7 +292,7 @@ module Glimmer
                 @cell_rows[row].send(attribute)[0] = ::LibUI.table_value_int(val).to_i == 1
               end
             end
-            on_edited.each {|listener| listener.call(row, @cell_rows[row])}
+            notify_custom_listeners('on_edited', row, @cell_rows[row])
           end
           
           @model = ::LibUI.new_table_model(@model_handler)

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

@@ -60,6 +60,8 @@ module Glimmer
         end
         
         def destroy
+          return if ControlProxy.main_window_proxy&.destroying?
+          deregister_all_custom_listeners
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
         end

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

@@ -29,6 +29,10 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class WindowProxy < ControlProxy
+        CUSTOM_LISTENER_NAMES = ['on_destroy']
+        CUSTOM_LISTENER_NAME_ALIASES = {
+          on_destroyed: 'on_destroy',
+        }
         DEFAULT_TITLE = ''
         DEFAULT_WIDTH = 190
         DEFAULT_HEIGHT = 150
@@ -44,22 +48,20 @@ module Glimmer
         end
         
         def destroy
+          return if @destroying
+          @destroying = true
+          @on_closing_listeners&.clear
           super
           ControlProxy.image_proxies.each { |image_proxy| ::LibUI.free_image(image_proxy.libui) unless image_proxy.area_image? }
-          @on_destroy_procs&.each { |on_destroy_proc| on_destroy_proc.call(self)}
+          notify_custom_listeners('on_destroy', self)
+          deregister_custom_listeners('on_destroy')
+          @destroying = false
         end
         
-        def on_destroy(&block)
-          # TODO look into a way to generalize this logic for multiple listeners
-          @on_destroy_procs ||= []
-          if block.nil?
-            @on_destroy_procs
-          else
-            @on_destroy_procs << block
-            block
-          end
+        def destroying?
+          @destroying
         end
-      
+        
         def show
           super
           unless @shown_at_least_once
@@ -69,29 +71,29 @@ module Glimmer
           end
         end
         
-        def can_handle_listener?(listener_name)
-          listener_name == 'on_destroy' || super
-        end
-        
         def handle_listener(listener_name, &listener)
           case listener_name
-          when 'on_destroy'
-            on_destroy(&listener)
-          else
-            default_behavior_listener = nil
-            if listener_name == 'on_closing'
-              default_behavior_listener = Proc.new do
-                return_value = listener.call(self)
-                if return_value.is_a?(Numeric)
-                  return_value
-                else
-                  destroy
-                  ::LibUI.quit
-                  0
-                end
+          when 'on_closing'
+            @on_closing_listeners ||= []
+            @on_closing_listeners << listener
+            @default_behavior_listener ||= Proc.new do
+              return_value = nil
+              @on_closing_listeners.each do |l|
+                return_value = l.call(self)
+                break if return_value.is_a?(Numeric)
+              end
+              if return_value.is_a?(Numeric)
+                return_value
+              else
+                destroy
+                ::LibUI.quit
+                0
               end
+            end.tap do |default_behavior_listener|
+              super(listener_name, &default_behavior_listener)
             end
-            super(listener_name, &(default_behavior_listener || listener))
+          else
+            super
           end
         end
         
@@ -168,11 +170,8 @@ module Glimmer
           @height = construction_args[2]
           @libui = ControlProxy.new_control(@keyword, construction_args)
           @libui.tap do
-            handle_listener('on_closing') do
-              destroy
-              ::LibUI.quit
-              0
-            end
+            # setup default on_closing listener if no on_closing listeners are setup
+            handle_listener('on_closing') {} if @on_closing_listeners.nil? || @on_closing_listeners.empty?
           end
         end
       end

data/lib/glimmer/libui/control_proxy.rb

@@ -169,31 +169,49 @@ module Glimmer
       def handle_listener(listener_name, &listener)
         safe_listener = Proc.new { listener.call(self) }
         if ::LibUI.respond_to?("#{libui_api_keyword}_#{listener_name}")
-          ::LibUI.send("#{libui_api_keyword}_#{listener_name}", @libui, &safe_listener)
+          if listeners[listener_name].nil?
+            ::LibUI.send("#{libui_api_keyword}_#{listener_name}", @libui) do
+              listeners_for(listener_name).map { |listener| listener.call }.last
+            end
+          end
+          listeners_for(listener_name) << safe_listener
         elsif ::LibUI.respond_to?("control_#{listener_name}")
-          ::LibUI.send("control_#{listener_name}", @libui, &safe_listener)
+          if listeners[listener_name].nil?
+            ::LibUI.send("control_#{listener_name}", @libui) do
+              listeners_for(listener_name).map { |listener| listener.call }.last
+            end
+          end
+          listeners_for(listener_name) << safe_listener
         elsif has_custom_listener?(listener_name)
           handle_custom_listener(listener_name, &listener)
         end
       end
       
+      def listeners
+        @listeners ||= {}
+      end
+      
+      def listeners_for(listener_name)
+        listeners[listener_name] ||= []
+      end
+      
       def has_custom_listener?(listener_name)
         listener_name = listener_name.to_s
-        custom_listeners.include?(listener_name) || custom_listener_aliases.stringify_keys.keys.include?(listener_name)
+        custom_listener_names.include?(listener_name) || custom_listener_name_aliases.stringify_keys.keys.include?(listener_name)
       end
       
-      def custom_listeners
-        self.class.constants.include?(:LISTENERS) ? self.class::LISTENERS : []
+      def custom_listener_names
+        self.class.constants.include?(:CUSTOM_LISTENER_NAMES) ? self.class::CUSTOM_LISTENER_NAMES : []
       end
       
-      def custom_listener_aliases
-        self.class.constants.include?(:LISTENER_ALIASES) ? self.class::LISTENER_ALIASES : {}
+      def custom_listener_name_aliases
+        self.class.constants.include?(:CUSTOM_LISTENER_NAME_ALIASES) ? self.class::CUSTOM_LISTENER_NAME_ALIASES : {}
       end
       
       def handle_custom_listener(listener_name, &listener)
         listener_name = listener_name.to_s
-        listener_name = custom_listener_aliases.stringify_keys[listener_name] || listener_name
-        instance_variable_name = "@#{listener_name}_procs"
+        listener_name = custom_listener_name_aliases.stringify_keys[listener_name] || listener_name
+        instance_variable_name = "@#{listener_name}_procs" # TODO ensure clearing custom listeners on destroy of a control
         instance_variable_set(instance_variable_name, []) if instance_variable_get(instance_variable_name).nil?
         if listener.nil?
           instance_variable_get(instance_variable_name)
@@ -203,6 +221,21 @@ module Glimmer
         end
       end
       
+      def notify_custom_listeners(listener_name, *args)
+        handle_custom_listener(listener_name).each do |listener|
+          listener.call(*args)
+        end
+      end
+      
+      def deregister_custom_listeners(listener_name)
+        handle_custom_listener(listener_name).clear
+      end
+      
+      # deregisters all custom listeners except on_destroy, which can only be deregistered after destruction of a control, using deregister_custom_listeners
+      def deregister_all_custom_listeners
+        (custom_listener_names - ['on_destroy']).each { |listener_name| deregister_custom_listeners(listener_name) }
+      end
+      
       def respond_to?(method_name, *args, &block)
         respond_to_libui?(method_name, *args, &block) ||
           (
@@ -289,6 +322,8 @@ module Glimmer
       end
       
       def destroy
+        # TODO exclude menus from this initial return
+        return if !is_a?(ControlProxy::WindowProxy) && ControlProxy.main_window_proxy&.destroying?
         data_binding_model_attribute_observer_registrations.each(&:deregister)
         if parent_proxy.nil?
           default_destroy
@@ -302,6 +337,7 @@ module Glimmer
       end
       
       def default_destroy
+        deregister_all_custom_listeners
         send_to_libui('destroy')
         ControlProxy.control_proxies.delete(self)
       end

data/lib/glimmer/libui/shape.rb

@@ -116,6 +116,7 @@ module Glimmer
       end
       
       def destroy
+        return if ControlProxy.main_window_proxy&.destroying?
         @parent.children.delete(self)
       end
       

metadata

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