glimmer-dsl-libui 0.1.6 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f447a302c22ea118d50c6d8f1b81c3a74cbd81fb7b6b6d61a7bb0cf22e9dd3
-  data.tar.gz: 50faeffb8a2e2efaece4464432ecb6a51080e9662b4778f606f872a8286332a9
+  metadata.gz: 748bd2b706f088ec5e69da3567dac4b59085b374507f9e3dd5e4a2b0432895a0
+  data.tar.gz: 8ff551d013d3d7524698c3ceaf7c5176e190e5ff6ca3bb8189de56a90fc2b3a1
 SHA512:
-  metadata.gz: 570a7e4002cb5da3dcd49d6eb03c5554817036626c293faf3cbc2abc72063b83954e1c4795ad64a1b975ff6b8bca9d84b31a142914489777754ca5afb0d73cc0
-  data.tar.gz: 0bdfb434406fc6bb3b1dcc08562ca0507d3d58821306dafec68089248910cb4e325fb0dd3282f2424754980682d46595b8fae1e658a5e4636b680f1e9ce52fff
+  metadata.gz: d2cff96b2dfe600c675feb491e9f396fb436b67430fa72dafd2ae88b69f06027a5cef250d18aa9872ed4329782e6ce7da14d78506e9786b8fc62426c9f985455
+  data.tar.gz: c6b565cf1aba0f603c1233a8411a4ad25f78821f832f0576cf97cad7ebf9b06a0b8f1b3d83200a79da5d998fa5849d10e47b2e9257069dc0fdfe6a1cfdb6b57f

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Change Log
 
+## 0.1.10
+
+- Upgrade to glimmer 2.2.1
+- Add a 3rd tab to examples/grid.rb showcasing the halign and valign properties
+- Support `grid` `halign`/`valign` symbol values of `:fill` (default), `:start`, `:center`, `:end`
+- Add `key_value` to `area_key_event` `Hash`
+- Add `ext_key_value` to `area_key_event` `Hash`
+
+## 0.1.9
+
+- Support `area` listener: `on_key_event`
+- Support `area` listener: `on_key_down`
+- Support `area` listener: `on_key_up`
+
+## 0.1.8
+
+- Support `area` listener: `on_mouse_event`
+- Support `area` listener: `on_mouse_down`
+- Support `area` listener: `on_mouse_up`
+- Support `area` listener: `on_mouse_drag_start`
+- Support `area` listener: `on_mouse_drag`
+- Support `area` listener: `on_mouse_drop`
+- Support `area` listener: `on_mouse_crossed`
+- Support `area` listener: `on_mouse_enter`
+- Support `area` listener: `on_mouse_exit`
+- Support `area` listener: `on_drag_broken`
+
+## 0.1.7
+
+- Support `stroke` `:dashes` and use in examples/area_gallery.rb
+- Support symbol values for draw_line_cap (`:round`, `:square`, `:flat`) and draw_line_join (`:miter`, `:round`, `:bevel`) and draw_fill_mode (`:winding` and `:alternate`)
+
 ## 0.1.6
 
 - Update default `window` `width` to `190`

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.1.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.1.10
 ## 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)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-libui/maintainability)
@@ -115,14 +115,62 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc(200, 200, 90, 0, 360, false)
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show
 ```
@@ -143,7 +191,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.1.6](#-glimmer-dsl-for-libui-016)
+- [Glimmer DSL for LibUI 0.1.10](#-glimmer-dsl-for-libui-0110)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -273,7 +321,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.1.6'
+gem 'glimmer-dsl-libui', '~> 0.1.10'
 ```
 
 Add `require 'glimmer-dsl-libui'` at the top, and then `include Glimmer` into the top-level main object for testing or into an actual class for serious usage.
@@ -347,7 +395,7 @@ w.libui # => #<Fiddle::Pointer:0x00007fde53997980 ptr=0x00007fde51352a60 size=0
 Control(Args) | Properties | Listeners
 ------------- | ---------- | ---------
 `about_menu_item` | None | `on_clicked`
-`area` | None | `on_draw`
+`area` | None | `on_draw(area_draw_params)`, `on_mouse_event(area_mouse_event)`, `on_mouse_down(area_mouse_event)`, `on_mouse_up(area_mouse_event)`, `on_mouse_drag_started(area_mouse_event)`, `on_mouse_dragged(area_mouse_event)`, `on_mouse_dropped(area_mouse_event)`, `on_mouse_entered`, `on_mouse_exited`, `on_key_event(area_key_event)`, `on_key_down(area_key_event)`, `on_key_up(area_key_event)`
 `arc(x_center as Numeric, y_center as Numeric, radius as Numeric, start_angle as Numeric, sweep as Numeric, is_negative as Boolean)` | `x_center` (`Numeric`), `y_center` (`Numeric`), `radius` (`Numeric`), `start_angle` (`Numeric`), `sweep` (`Numeric`), `is_negative` (Boolean) | None
 `bezier(c1_x as Numeric, c1_y as Numeric, c2_x as Numeric, c2_y as Numeric, end_x as Numeric, end_y as Numeric)` | `c1_x` (`Numeric`), `c1_y` (`Numeric`), `c2_x` (`Numeric`), `c2_y` (`Numeric`), `end_x` (`Numeric`), `end_y` (`Numeric`) | None
 `button(text as String)` | `text` (`String`) | `on_clicked`
@@ -381,7 +429,7 @@ Control(Args) | Properties | Listeners
 `msg_box(window = main_window as Glimmer::LibUI::WindowProxy, title as String, description as String)` | None | None
 `msg_box_error(window = main_window as Glimmer::LibUI::WindowProxy, title as String, description as String)` | None | None
 `non_wrapping_multiline_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
-`path` | `fill` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`), `stroke` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`, `:cap` as `Numeric`, `:join` as `Numeric`, `:thickness` as `Numeric`, `:miter_limit` as `Numeric` ) | None
+`path(draw_fill_mode = :winding)` | `fill` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`), `stroke` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`, `:cap` as (`:round`, `:square`, `:flat`), `:join` as (`:miter`, `:round`, `:bevel`), `:thickness` as `Numeric`, `:miter_limit` as `Numeric`, `:dashes` as `Array` of `Numeric` ) | None
 `preferences_menu_item` | None | `on_clicked`
 `progress_bar` | `value` (`Numeric`) | None
 `progress_bar_column(name as String)` | None | None
@@ -412,9 +460,9 @@ Control(Args) | Properties | Listeners
 - `xspan` [dsl-only] (`Integer`) [default=`1`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
 - `yspan` [dsl-only] (`Integer`) [default=`1`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
 - `hexpand` [dsl-only] (Boolean) [default=`false`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
-- `halign` [dsl-only] (`Integer`) [default=`0`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `halign` [dsl-only] (`:fill`, `:start`, `:center`, or `:end`) [default=`:fill`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
 - `vexpand` [dsl-only] (Boolean) [default=`false`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
-- `valign` [dsl-only] (`Integer`) [default=`0`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
+- `valign` [dsl-only] (`:fill`, `:start`, `:center`, or `:end`) [default=`:fill`]: available in [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) when nested under `grid`
 
 ### Common Control Operations
 - `destroy`
@@ -585,6 +633,8 @@ window('Basic Area', 400, 400) {
 
 Check [examples/dynamic_area.rb](#dynamic-area) for a more detailed semi-declarative example.
 
+`path` can receive a `draw_fill_mode` argument that can accept values `:winding` or `:alternate` and defaults to `:winding`.
+
 Available nested `path` shapes:
 - `rectangle(x as Numeric, y as Numeric, width as Numeric, height as Numeric)`
 - `square(x as Numeric, y as Numeric, length as Numeric)`
@@ -606,6 +656,41 @@ The `area_draw_params` argument for `on_draw` block is a hash consisting of the
 
 In general, it is recommended to use declarative stable paths whenever feasible since they require less code and simpler maintenance. But, in more advanced cases, semi-declarative dynamic paths could be used instead, especially if there are thousands of dynamic paths that need maximum performance and low memory footprint.
 
+`area` supported mouse listeners are:
+- `on_key_event {|area_key_event| ...}`: general catch-all key event (recommend using fine-grained key events below instead)
+- `on_key_down {|area_key_event| ...}`
+- `on_key_up {|area_key_event| ...}`
+- `on_mouse_event {|area_mouse_event| ...}`: general catch-all mouse event (recommend using fine-grained mouse events below instead)
+- `on_mouse_down {|area_mouse_event| ...}`
+- `on_mouse_up {|area_mouse_event| ...}`
+- `on_mouse_drag_started {|area_mouse_event| ...}`
+- `on_mouse_dragged {|area_mouse_event| ...}`
+- `on_mouse_dropped {|area_mouse_event| ...}`
+- `on_mouse_entered {...}`
+- `on_mouse_exited {...}`
+- `on_mouse_crossed {|left| ...}` (NOT RECOMMENDED; it does what `on_mouse_entered` and `on_mouse_exited` do by returning a `left` argument indicating if mouse left `area`)
+- `on_drag_broken {...}` (NOT RECOMMENDED; varies per platforms; use `on_mouse_dropped` instead)
+
+The `area_mouse_event` `Hash` argument for mouse events that receive it (e.g. `on_mouse_up`, `on_mouse_dragged`) consist of the following hash keys:
+- `:x`: mouse x location in relation to area's top-left-corner
+- `:y`: mouse y location in relation to area's top-left-corner
+- `:area_width`: area current width
+- `:area_height`: area current height
+- `:down`: mouse pressed button (e.g. `1` is left button, `3` is right button)
+- `:up`: mouse depressed button (e.g. `1` is left button, `3` is right button)
+- `:count`: count of mouse clicks (e.g. `2` for double-click, `1` for single-click)
+- `:modifers`: `Array` of `Symbol`s from one of the following: `[:command, :shift, :alt, :control]`
+- `:held`: mouse held button during dragging (e.g. `1` is left button, `4` is right button)
+
+The `area_key_event` `Hash` argument for keyboard events that receive it (e.g. `on_key_up`, `on_key_down`) consist of the following hash keys:
+- `:key`: key character (`String`)
+- `:key_value`: key value (`Integer`). Useful in rare cases for numeric processing of keys instead of dealing with as `:key` character `String`
+- `:ext_key`: non-character extra key (`Symbol`) from `Glimmer::LibUI.enum_symbols(:ext_key)` such as `:left`, `:right`, `:escape`, `:insert`
+- `:ext_key_value`: non-character extra key value (`Integer`). Useful in rare cases for numeric processing of extra keys instead of dealing with as `:ext_key` `Symbol`
+- `:modifier`: modifier key pressed alone (e.g. `:shift` or `:control`)
+- `:modifiers`: modifier keys pressed simultaneously with `:key`, `:ext_key`, or `:modifier`
+- `:up`: indicates if key has been released or not (Boolean)
+
 Note that when nesting an `area` directly underneath `window` (without a layout control like `vertical_box`), it is automatically reparented with `vertical_box` in between the `window` and `area` since it would not show up on Linux otherwise.
 
 To redraw an `area`, you may call the `#queue_redraw_all` method, or simply `#redraw`.
@@ -703,7 +788,7 @@ Check [Histogram](#histogram) example for use of hex colors.
 - When destroying a control nested under a `form`, it is automatically deleted from the form's children
 - When destroying a control nested under a `window` or `group`, it is automatically unset as their child to allow successful destruction
 - For `date_time_picker`, `date_picker`, and `time_picker`, make sure `time` hash values for `mon`, `wday`, and `yday` are 1-based instead of [libui](https://github.com/andlabs/libui) original 0-based values, and return `dst` as Boolean instead of `isdst` as `1`/`0`
-- Smart defaults for `grid` child attributes are `left` (`0`), `top` (`0`), `xspan` (`1`), `yspan` (`1`), `hexpand` (`false`), `halign` (`0`), `vexpand` (`false`), and `valign` (`0`)
+- Smart defaults for `grid` child attributes are `left` (`0`), `top` (`0`), `xspan` (`1`), `yspan` (`1`), `hexpand` (`false`), `halign` (`:fill`), `vexpand` (`false`), and `valign` (`:fill`)
 - The `table` control automatically constructs required `TableModelHandler`, `TableModel`, and `TableParams`, calculating all their arguments from `cell_rows` and `editable` properties (e.g. `NumRows`) as well as nested columns (e.g. `text_column`)
 - Table model instances are automatically freed from memory after `window` is destroyed.
 - Table `cell_rows` data has implicit data-binding to table cell values for deletion, insertion, and change (done by diffing `cell_rows` value before and after change and auto-informing `table` of deletions [`LibUI.table_model_row_deleted`], insertions [`LibUI.table_model_row_deleted`], and changes [`LibUI.table_model_row_changed`]). When deleting data rows from `cell_rows` array, then actual rows from the `table` are automatically deleted. When inserting data rows into `cell_rows` array, then actual `table` rows are automatically inserted. When updating data rows in `cell_rows` array, then actual `table` rows are automatically updated.
@@ -744,6 +829,8 @@ The following examples include reimplementions of the examples in the [LibUI](ht
 
 To browse all examples, simply launch the [Meta-Example](examples/meta_example.rb), which lists all examples and displays each example's code when selected. It also enables code editing to facilitate experimentation and learning.
 
+(note that for examples that emit output to terminal/command-line via `p` or `puts`, you must run them directly to see output)
+
 [examples/meta_example.rb](examples/meta_example.rb)
 
 Run with this command from the root of the project if you cloned the project:
@@ -2012,13 +2099,15 @@ ruby -r glimmer-dsl-libui -e "require 'examples/grid'"
 
 Mac
 
-![glimmer-dsl-libui-mac-grid-spanning.png](images/glimmer-dsl-libui-mac-grid-spanning.png)
-![glimmer-dsl-libui-mac-grid-expanding.png](images/glimmer-dsl-libui-mac-grid-expanding.png)
+![glimmer-dsl-libui-mac-grid-span.png](images/glimmer-dsl-libui-mac-grid-span.png)
+![glimmer-dsl-libui-mac-grid-expand.png](images/glimmer-dsl-libui-mac-grid-expand.png)
+![glimmer-dsl-libui-mac-grid-align.png](images/glimmer-dsl-libui-mac-grid-align.png)
 
 Linux
 
-![glimmer-dsl-libui-linux-grid-spanning.png](images/glimmer-dsl-libui-linux-grid-spanning.png)
-![glimmer-dsl-libui-linux-grid-expanding.png](images/glimmer-dsl-libui-linux-grid-expanding.png)
+![glimmer-dsl-libui-linux-grid-span.png](images/glimmer-dsl-libui-linux-grid-span.png)
+![glimmer-dsl-libui-linux-grid-expand.png](images/glimmer-dsl-libui-linux-grid-expand.png)
+![glimmer-dsl-libui-linux-grid-align.png](images/glimmer-dsl-libui-linux-grid-align.png)
 
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
@@ -2029,7 +2118,7 @@ include Glimmer
 
 window('Grid') {
   tab {
-    tab_item('Spanning') {
+    tab_item('Span') {
       grid {
         4.times { |top_value|
           4.times { |left_value|
@@ -2069,7 +2158,7 @@ window('Grid') {
         }
       }
     }
-    tab_item('Expanding') {
+    tab_item('Expand') {
       grid {
         label("(0, 0) hexpand/vexpand\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
           left 0
@@ -2091,6 +2180,42 @@ window('Grid') {
         }
       }
     }
+    tab_item('Align') {
+      grid {
+        label("(0, 0) halign/valign fill\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
+          left 0
+          top 0
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :fill
+          valign :fill
+        }
+        label("(1, 0) halign/valign start") {
+          left 1
+          top 0
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :start
+          valign :start
+        }
+        label("(0, 1) halign/valign center") {
+          left 0
+          top 1
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :center
+          valign :center
+        }
+        label("(1, 1) halign/valign end") {
+          left 1
+          top 1
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :end
+          valign :end
+        }
+      }
+    }
   }
 }.show
 ```
@@ -3367,14 +3492,62 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc(200, 200, 90, 0, 360, false)
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show
 ```
@@ -3476,7 +3649,7 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc {
@@ -3489,8 +3662,56 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show
 ```
@@ -3539,15 +3760,63 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc(200, 200, 90, 0, 360, false)
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+        
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show
 ```
@@ -3650,7 +3919,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc {
@@ -3663,9 +3932,57 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+        
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show
 ```

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.10

data/examples/area_gallery.rb

@@ -38,13 +38,61 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc(200, 200, 90, 0, 360, false)
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery2.rb

@@ -92,7 +92,7 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
       arc {
@@ -105,7 +105,55 @@ window('Area Gallery', 400, 400) {
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
-      stroke thickness: 2, r: 0, g: 0, b: 0
+      stroke r: 0, g: 0, b: 0, thickness: 2
     }
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery3.rb

@@ -39,14 +39,62 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc(200, 200, 90, 0, 360, false)
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/area_gallery4.rb

@@ -93,7 +93,7 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc {
@@ -106,8 +106,56 @@ window('Area Gallery', 400, 400) {
         }
 
         fill r: 202, g: 102, b: 204, a: 0.5
-        stroke thickness: 2, r: 0, g: 0, b: 0
+        stroke r: 0, g: 0, b: 0, thickness: 2
       }
     end
+    
+    on_mouse_event do |area_mouse_event|
+      p area_mouse_event
+    end
+    
+    on_mouse_moved do |area_mouse_event|
+      puts 'moved'
+    end
+    
+    on_mouse_down do |area_mouse_event|
+      puts 'mouse down'
+    end
+    
+    on_mouse_up do |area_mouse_event|
+      puts 'mouse up'
+    end
+    
+    on_mouse_drag_started do |area_mouse_event|
+      puts 'drag started'
+    end
+    
+    on_mouse_dragged do |area_mouse_event|
+      puts 'dragged'
+    end
+    
+    on_mouse_dropped do |area_mouse_event|
+      puts 'dropped'
+    end
+    
+    on_mouse_entered do
+      puts 'entered'
+    end
+    
+    on_mouse_exited do
+      puts 'exited'
+    end
+    
+    on_key_event do |area_key_event|
+      p area_key_event
+    end
+    
+    on_key_up do |area_key_event|
+      puts 'key up'
+    end
+    
+    on_key_down do |area_key_event|
+      puts 'key down'
+    end
   }
 }.show

data/examples/grid.rb

@@ -6,7 +6,7 @@ include Glimmer
 
 window('Grid') {
   tab {
-    tab_item('Spanning') {
+    tab_item('Span') {
       grid {
         4.times { |top_value|
           4.times { |left_value|
@@ -46,7 +46,7 @@ window('Grid') {
         }
       }
     }
-    tab_item('Expanding') {
+    tab_item('Expand') {
       grid {
         label("(0, 0) hexpand/vexpand\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
           left 0
@@ -68,5 +68,41 @@ window('Grid') {
         }
       }
     }
+    tab_item('Align') {
+      grid {
+        label("(0, 0) halign/valign fill\nall available horizontal space is taken\nand\nall\navailable\nvertical\nspace\nis\ntaken") {
+          left 0
+          top 0
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :fill
+          valign :fill
+        }
+        label("(1, 0) halign/valign start") {
+          left 1
+          top 0
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :start
+          valign :start
+        }
+        label("(0, 1) halign/valign center") {
+          left 0
+          top 1
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :center
+          valign :center
+        }
+        label("(1, 1) halign/valign end") {
+          left 1
+          top 1
+          hexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          vexpand true unless OS.mac? # on Mac, only the first label is given all space, so avoid expanding
+          halign :end
+          valign :end
+        }
+      }
+    }
   }
 }.show

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

@@ -36,6 +36,19 @@ 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']
+        LISTENER_ALIASES = {
+          on_drawn: 'on_draw',
+          on_mouse_moved: 'on_mouse_move',
+          on_mouse_drag_started: 'on_mouse_drag_start',
+          on_mouse_dragged: 'on_mouse_drag',
+          on_mouse_dropped: 'on_mouse_drop',
+          on_mouse_cross: 'on_mouse_crossed',
+          on_mouse_entered: 'on_mouse_enter',
+          on_mouse_exited: 'on_mouse_exit',
+          on_drag_break: 'on_drag_broken',
+        }
+        
         include Glimmer::FiddleConsumer
         include Parent
         prepend Transformable
@@ -47,29 +60,6 @@ module Glimmer
           install_listeners
         end
         
-        def on_draw(&block)
-          @on_draw_procs ||= []
-          if block.nil?
-            @on_draw_procs
-          else
-            @on_draw_procs << block
-            block
-          end
-        end
-        
-        def can_handle_listener?(listener_name)
-          listener_name == 'on_draw' || super
-        end
-        
-        def handle_listener(listener_name, &listener)
-          case listener_name
-          when 'on_draw'
-            on_draw(&listener)
-          else
-            super
-          end
-        end
-        
         def draw(area_draw_params)
           children.dup.each {|child| child.draw(area_draw_params)}
           on_draw.each {|listener| listener.call(area_draw_params)}
@@ -94,10 +84,42 @@ module Glimmer
             draw(area_draw_params)
             AreaProxy.current_area_draw_params = nil
           end
-          @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [0]) {}
-          @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [0]) {}
-          @area_handler.DragBroken   = fiddle_closure_block_caller(0, [0]) {}
-          @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [0]) {}
+          @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])
+            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
+            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) }
+            if left
+              on_mouse_exit.each { |listener| listener.call(left) }
+            else
+              on_mouse_enter.each { |listener| listener.call(left) }
+            end
+          end
+          @area_handler.DragBroken   = fiddle_closure_block_caller(0, [1, 1]) do |_, _|
+            on_drag_broken.each { |listener| listener.call }
+          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) }
+            if area_key_event[:up]
+              on_key_up.each { |listener| listener.call(area_key_event) }
+            else
+              on_key_down.each { |listener| listener.call(area_key_event) }
+            end
+          end
         end
         
         def area_draw_params_hash(area_draw_params)
@@ -111,6 +133,62 @@ module Glimmer
             clip_height: area_draw_params.ClipHeight,
           }
         end
+        
+        def area_mouse_event_hash(area_mouse_event)
+          {
+            x: area_mouse_event.X,
+            y: area_mouse_event.Y,
+            area_width: area_mouse_event.AreaWidth,
+            area_height: area_mouse_event.AreaHeight,
+            down: area_mouse_event.Down,
+            up: area_mouse_event.Up,
+            count: area_mouse_event.Count,
+            modifers: modifiers_to_symbols(area_mouse_event.Modifiers),
+            held: area_mouse_event.Held1To64,
+          }
+        end
+        
+        def area_key_event_hash(area_key_event)
+          {
+            key: key_to_char(area_key_event.Key),
+            key_value: area_key_event.Key,
+            ext_key: ext_key_to_symbol(area_key_event.ExtKey),
+            ext_key_value: area_key_event.ExtKey,
+            modifier: modifiers_to_symbols(area_key_event.Modifier).first,
+            modifiers: modifiers_to_symbols(area_key_event.Modifiers),
+            up: Glimmer::LibUI.integer_to_boolean(area_key_event.Up),
+          }
+        end
+        
+        def key_to_char(key)
+          key.chr if key > 0
+        end
+        
+        def ext_key_to_symbol(ext_key_value)
+          Glimmer::LibUI.enum_symbols(:ext_key)[ext_key_value - 1].to_s.to_sym if ext_key_value > 0
+        end
+                
+        def modifiers_to_symbols(modifiers_value)
+          symbols = []
+          modifiers_value = extract_symbol_from_modifiers_value(modifiers_value, symbols: symbols) while modifiers_value > 0
+          symbols
+        end
+        
+        def extract_symbol_from_modifiers_value(modifiers_value, symbols: )
+          if modifiers_value >= 8
+            symbols << :command
+            modifiers_value -= 8
+          elsif modifiers_value >= 4
+            symbols << :shift
+            modifiers_value -= 4
+          elsif modifiers_value >= 2
+            symbols << :alt
+            modifiers_value -= 2
+          elsif modifiers_value >= 1
+            symbols << :control
+            modifiers_value -= 1
+          end
+        end
       end
     end
   end

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

@@ -36,7 +36,18 @@ module Glimmer
           child.halign = 0 if child.halign.nil?
           child.vexpand = false if child.vexpand.nil?
           child.valign = 0 if child.valign.nil?
-          ::LibUI.grid_append(@libui, child.libui, child.left, child.top, child.xspan, child.yspan, Glimmer::LibUI.boolean_to_integer(child.hexpand), child.halign, Glimmer::LibUI.boolean_to_integer(child.vexpand), child.valign)
+          ::LibUI.grid_append(
+            @libui,
+            child.libui,
+            child.left,
+            child.top,
+            child.xspan,
+            child.yspan,
+            Glimmer::LibUI.boolean_to_integer(child.hexpand),
+            Glimmer::LibUI.enum_symbol_to_value(:align, child.halign),
+            Glimmer::LibUI.boolean_to_integer(child.vexpand),
+            Glimmer::LibUI.enum_symbol_to_value(:align, child.valign)
+          )
           children << child
         end
         

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

@@ -117,17 +117,24 @@ module Glimmer
         
         def draw_stroke_params
           @draw_stroke_params ||= ::LibUI::FFI::DrawStrokeParams.malloc
-          @draw_stroke_params.Cap = @stroke[:cap] || 0 # flat
-          @draw_stroke_params.Join = @stroke[:join] || 0 # miter
+          @draw_stroke_params.Cap = draw_line_cap # flat
+          @draw_stroke_params.Join = draw_line_join # miter
           @draw_stroke_params.Thickness = @stroke[:thickness] || 1
           @draw_stroke_params.MiterLimit = @stroke[:miter_limit] || 10 # DEFAULT_MITER_LIMIT
-          @draw_stroke_params_dashes ||= Fiddle::Pointer.malloc(8)
-          @draw_stroke_params.Dashes = @draw_stroke_params_dashes
-          @draw_stroke_params.NumDashes = @stroke[:num_dashes] || 0 # TODO reimplement this line correctly (perhaps no need to pass num dashes, yet dashes themselves and use their count here)
+          @draw_stroke_params.Dashes = @stroke[:dashes].to_a.pack('d*')
+          @draw_stroke_params.NumDashes = @stroke[:dashes].to_a.count
           @draw_stroke_params.DashPhase = @stroke[:dash_phase] || 0
           @draw_stroke_params
         end
         
+        def draw_line_cap
+          Glimmer::LibUI.enum_symbol_to_value(:draw_line_cap, @stroke && @stroke[:cap])
+        end
+        
+        def draw_line_join
+          Glimmer::LibUI.enum_symbol_to_value(:draw_line_join, @stroke && @stroke[:join])
+        end
+        
         def destroy
           @parent_proxy&.children&.delete(self)
           ControlProxy.control_proxies.delete(self)
@@ -144,20 +151,7 @@ module Glimmer
         end
         
         def init_draw_brush(draw_brush, draw_brush_args)
-          case draw_brush_args[:type]
-          when Integer
-            draw_brush.Type = draw_brush_args[:type]
-          when :solid, 'solid'
-            draw_brush.Type = 0
-          when :linear_gradient, 'linear_gradient'
-            draw_brush.Type = 1
-          when :radial_gradient, 'radial_gradient'
-            draw_brush.Type = 2
-          when :image, 'image'
-            draw_brush.Type = 3
-          else
-            draw_brush.Type = 0
-          end
+          draw_brush.Type = Glimmer::LibUI.enum_symbol_to_value(:draw_brush_type, draw_brush_args[:type])
           draw_brush.R = (draw_brush_args[:r] || draw_brush_args[:red]).to_f / 255.0
           draw_brush.G = (draw_brush_args[:g] || draw_brush_args[:green]).to_f / 255.0
           draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0

data/lib/glimmer/libui/control_proxy.rb

@@ -141,7 +141,8 @@ module Glimmer
 
       def can_handle_listener?(listener_name)
         ::LibUI.respond_to?("#{libui_api_keyword}_#{listener_name}") ||
-          ::LibUI.respond_to?("control_#{listener_name}")
+          ::LibUI.respond_to?("control_#{listener_name}") ||
+          has_custom_listener?(listener_name)
       end
       
       def handle_listener(listener_name, &listener)
@@ -150,6 +151,34 @@ module Glimmer
           ::LibUI.send("#{libui_api_keyword}_#{listener_name}", @libui, &safe_listener)
         elsif ::LibUI.respond_to?("control_#{listener_name}")
           ::LibUI.send("control_#{listener_name}", @libui, &safe_listener)
+        elsif has_custom_listener?(listener_name)
+          handle_custom_listener(listener_name, &listener)
+        end
+      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)
+      end
+      
+      def custom_listeners
+        self.class.constants.include?(:LISTENERS) ? self.class::LISTENERS : []
+      end
+      
+      def custom_listener_aliases
+        self.class.constants.include?(:LISTENER_ALIASES) ? self.class::LISTENER_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"
+        instance_variable_set(instance_variable_name, []) if instance_variable_get(instance_variable_name).nil?
+        if listener.nil?
+          instance_variable_get(instance_variable_name)
+        else
+          instance_variable_get(instance_variable_name) << listener
+          listener
         end
       end
       
@@ -160,6 +189,7 @@ module Glimmer
             (append_properties.include?(method_name.to_s.sub(/\?$/, '')) && BOOLEAN_PROPERTIES.include?(method_name.to_s.sub(/\?$/, ''))) ||
             append_properties.include?(method_name.to_s.sub(/=$/, ''))
           ) ||
+          can_handle_listener?(method_name.to_s) ||
           super(method_name, true)
       end
       
@@ -178,6 +208,8 @@ module Glimmer
         elsif append_properties.include?(method_name.to_s) ||
             append_properties.include?(method_name.to_s.sub(/(=|\?)$/, ''))
           append_property(method_name, *args)
+        elsif can_handle_listener?(method_name.to_s)
+          handle_listener(method_name.to_s, &block)
         else
           super
         end

data/lib/glimmer/libui.rb

@@ -87,6 +87,23 @@ module Glimmer
         end
         value
       end
+      
+      # Returns ruby underscored symbols for enum values starting with enum name (camelcase, e.g. 'ext_key')
+      def enum_symbols(enum_name)
+        enum_name = enum_name.to_s.underscore.to_sym
+        @enum_symbols ||= {}
+        @enum_symbols[enum_name] ||= ::LibUI.constants.select { |c| c.to_s.start_with?(enum_name.to_s.camelcase(:upper)) }.map { |c| c.to_s.underscore.sub("#{enum_name}_", '').to_sym }
+      end
+      
+      def enum_symbol_to_value(enum_name, enum_symbol, default_index: 0)
+        if enum_symbol.is_a?(Integer)
+          enum_symbol
+        elsif enum_symbols(enum_name).include?(enum_symbol.to_s.to_sym)
+          ::LibUI.const_get("#{enum_name}_#{enum_symbol}".camelcase(:upper))
+        else
+          enum_symbol_to_value(enum_name, enum_symbols(enum_name)[default_index])
+        end
+      end
     end
   end
 end

data/lib/glimmer-dsl-libui.rb

@@ -29,6 +29,7 @@ require 'glimmer'
 require 'color'
 require 'os'
 require 'array_include_methods'
+require 'facets/hash/stringify_keys'
 require 'libui'
 
 # Internal requires

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.10
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement