glimmer-dsl-tk 0.0.45 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a9655c46ab2b4638e96077e0795a6b7201456baf020ade27838d139797d3a44
-  data.tar.gz: dc2b2924a180df216a16161aa938b4429f814a59f18e0fba945b73eb40513bd6
+  metadata.gz: 362c0a5cd2265930f395295435fd7d7b9cc63b20d3c68afba754a57bf6c6dd38
+  data.tar.gz: c38b13a059e821f94de00fbb15c979f3fd4a9a8869d33fac0c0b39da38b25717
 SHA512:
-  metadata.gz: cab872767a730b059ebdaee18a124f0ded5e9fa0d5f980592b2c9fc9a20d756894846a4662b1f20043108987424daf6b79f895df639d1e273b66cad90f8437ae
-  data.tar.gz: 5a92bbe321b0ca538fbebc84d5e076047b2a761294f47be236f041853873c60787ce593dd142e7a5ba9671b9cdc7faaf1ca6d9f41c9a45fed1dde8cc55b5f184
+  metadata.gz: 39de4985ef3f10898d7d45d6c336780ad9222e560e20b2d35832f649363fbf60db2d3a2831251c44ba2cc1ca7d34f4adfe3394198c7f95408664976937051a82
+  data.tar.gz: 554fffc52441411d7cf81fd0baefb5ca0fbc3406a7f6b61e960599f684bb855a97abfa2892a01bd8ce9f0f0214a6d5664e403ff618ab53fe184c178b83471917

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 0.0.49
+
+- [API Breaking] Update menu bar support to require `menu_bar` keyword under `root` or `toplevel`
+- Support contextual menu by nesting `menu` keyword under `root` or `toplevel`
+
+## 0.0.48
+
+- Moved `OS` class to `Glimmer::Tk::OS` to avoid clashing with os gem when installed for users
+- Moved `DragAndDropEvent` from `Glimmer::Tk::DraggableAndDroppable` into `Glimmer::Tk` namespace directly as `Glimmer::Tk::DragAndDropEvent`
+
+## 0.0.47
+
+- Upgrade to glimmer 2.5.1 (includes more advanced data-binding/observer features)
+
+## 0.0.46
+
+- Support `drag_source true` on `list` widget
+- Support `drop_target true` keyword alternative to `on_drop` for cases where it is implied what to drop (text in the case of label, entry, combo, list, and button)
+- Support `on('drag_start')` (instead of `on_drag_start`), `on('drag_motion')`, and `on('drop')` for consistency with Glimmer DSL for general Tk listener style (`on('event')`)
+
 ## 0.0.45
 
 - Support `lbl` widget as the non-tile-themed version of `label` (i.e. `::TkLabel` not `::Tk::Tile::TLabel`)

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 Tk 0.0.45
+# [<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 Tk 0.0.49
 ## MRI Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Ruby](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml)
@@ -53,7 +53,7 @@ Glimmer app:
 
 NOTE: Glimmer DSL for Tk is currently in early alpha mode (incomplete). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
+Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems you might be interested in:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
 - [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
@@ -125,6 +125,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
     - [Hello, Scrollbar!](#hello-scrollbar)
     - [Hello, Scrollbar Frame!](#hello-scrollbar-frame)
     - [Hello, Menu Bar!](#hello-menu-bar)
+    - [Hello, Contextual Menu!](#hello-contextual-menu)
   - [Applications](#applications)
     - [Glimmer Tk Calculator](#glimmer-tk-calculator)
     - [Y3network Ruby UI](#y3network-ruby-ui)
@@ -182,7 +183,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '0.0.45'
+gem 'glimmer-dsl-tk', '0.0.49'
 ```
 
 And, then run:
@@ -306,10 +307,11 @@ keyword(args) | attributes | event bindings & callbacks
 `spinbox` | `text`, `from`, `to`, `increment`, `format`, [more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `command {}`, `'increment'`, `'decrement'`
 `frame(text: nil)` | `width`, `height`, `borderwidth`, `relief` (`'flat' (default), 'raised', 'sunken', 'solid', 'ridge', 'groove'`) | None
 `label` | `text`, `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `font` (`'default', 'text', 'fixed', 'menu', 'heading', 'caption', 'small_caption', 'icon', 'tooltip'`), `relief` (`'flat' (default), 'raised', 'sunken', 'solid', 'ridge', 'groove'`), `justify` (`'left', 'center', 'right'`), `foreground`, `background` | None
-`lbl` (non-theme version of `label`) | `text`, `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `font` (`'default', 'text', 'fixed', 'menu', 'heading', 'caption', 'small_caption', 'icon', 'tooltip'`), `relief` (`'flat' (default), 'raised', 'sunken', 'solid', 'ridge', 'groove'`), `justify` (`'left', 'center', 'right'`), `foreground`, `background`, `bg`, `bitmap`, [more here](https://tcl.tk/man/tcl8.6/TkCmd/label.htm) | None
+`lbl` (non-tile-themed version of `label`) | `text`, `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `font` (`'default', 'text', 'fixed', 'menu', 'heading', 'caption', 'small_caption', 'icon', 'tooltip'`), `relief` (`'flat' (default), 'raised', 'sunken', 'solid', 'ridge', 'groove'`), `justify` (`'left', 'center', 'right'`), `foreground`, `background`, `bg`, `bitmap`, [more here](https://tcl.tk/man/tcl8.6/TkCmd/label.htm) | None
 `list` | `selectmode`, `selection` | None
 `message_box(type: , message: , detail: , title: , icon: , default: , parent: )` | None | None
 `menu(label: nil) (label is nil if nested under root/toplevel for menu bar)` | None | None
+`menu_bar` | None | None
 `menu_item(style = :command, label: , underline: )` (style also can be `:radiobutton`, `:checkbutton`, `:separator`, `:about`, `:preferences`, `:quit`, `:help`) | `state`, `accelerator`, `selection` & `variable` (if `:radiobutton` or `:checkbutton`), `image`, `compound` | `command`
 `notebook` | None | None
 `radiobutton` | `text`, `variable` (Boolean), `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `value` (default: `text`) | `command {}`
@@ -480,14 +482,23 @@ Check out the [Hello, Scrollbar!](#hello-scrollbar) sample for a `text` demo wit
 
 #### Drag and Drop API
 
-Drag and drop works by simply designating a widget as a drag source with attribute `drag_source true`
+Drag and drop works by simply designating a widget as a drag source with attribute `drag_source true` and another widget as a drop target with attribute `drop_target true`.
 
-Alternatively, add listeners:
-- `on_drag_start {|event| ...}`: fires on drag start receiving an `event` arg to set `data` and configure `source`
-- `on_drag_motion {|event| ...}`: fires on drag motion receiving an `event` arg to check `event#drop_accepted`, and configure `source` and `tooltip`
+Alternatively, add listeners on the drag source:
+- `on('drag_start') {|event| ...}`: fires on drag start receiving an `event` arg to set `data` and configure `source`
+- `on('drag_motion') {|event| ...}`: fires on drag motion receiving an `event` arg to check `event#drop_accepted`, and configure `source` and `tooltip`
 
-On the drop target, you simply define:
-- `on_drop { |event| ...}`: fires on drop, receiving an `event` arg with `event#target` and `event#data` (set during drag). You can even destroy the `event#source` if you want to get rid of the dragged widget.
+And on the drop target, add listener:
+- `on('drop') { |event| ...}`: fires on drop, receiving an `event` arg with `event#target` and `event#data` (set during drag). You can even destroy the `event#source` if you want to get rid of the dragged widget.
+
+These are all the available attributes on event, which is of type `DragAndDropEvent`:
+- `source`: drag source widget proxy
+- `target`: drop target widget proxy
+- `tooltip`: tooltip widget proxy
+- `x_root`: x coordinate from top-left root corner
+- `y_root`: y coordinate from top-left root corner
+- `data`: data being transferred through drag and drop
+- `drop_accepted`: boolean indicating if drop was accepted
 
 Learn more at the [Hello, Drag and Drop!](#hello-drag-and-drop) sample.
 
@@ -834,6 +845,9 @@ More details can be found in the [Hello, Button!](#hello-button) sample below.
 - Widget blocks are always declared with curly braces `{}` to clearly visualize hierarchical view code and separate from logic code.
 - Widget attribute declarations always have arguments that are never wrapped inside parentheses and never take a block.
 - Widget listeners are always declared with `on` keyword receiving listener event name as an argument. Their multi-line blocks have a `do; end` style to distinguish as logic from widget keywords and attributes.
+- In a widget's content block, group attributes on top first, with the `grid` geometry management attribute being first, and separate by an empty line from nested widgets and listeners following afterwards.
+- In a widget's content block, after attributes, you may either include nested widgets second and listeners third or vice versa.
+- Unlike attributes, nested widgets and listeners are all separated by an empty line to make readability easier except where it helps to group two widgets together (e.g. label and described entry)
 - Pure logic multi-line blocks that do not constitute GUI DSL view elements in general always have `do; end` style to clearly separate logic code from view code.
 
 ## Samples
@@ -1038,14 +1052,14 @@ class HelloButton
           text 'Text Button'
         }
         
-        button {
+        button { |b|
           text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
           default 'active'
           focus true
           
-          command {
+          on('command') do
             self.count += 1
-          }
+          end
         }
       }
         
@@ -1060,9 +1074,9 @@ class HelloButton
         button {
           image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
           
-          command {
+          on('command') do
             message_box(title: 'Image Button', message: 'Image Button Clicked!')
-          }
+          end
         }
       }
       
@@ -1077,12 +1091,12 @@ class HelloButton
         ['center', 'top', 'bottom', 'left', 'right'].each do |compound_option|
           button {
             image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
-            text 'Text Image Button'
+            text "#{compound_option.capitalize} Image"
             compound compound_option
             
-            command {
+            on('command') do
               message_box(title: 'Text Image Button', message: 'Text Image Button Clicked!', detail: "(#{compound_option})")
-            }
+            end
           }
         end
       }
@@ -2729,11 +2743,12 @@ root {
         text "Drag entry text"
         width 30
         
+        # drag_source true
         # This is how to do `drag_source true` the manual way for use in exceptional cases
-        on_drag_start do |event|
+        on('drag_start') do |event|
           event.data = event.source.text
           event.source.configure(:cursor => "hand2")
-          event.tooltip.content {
+          event.tooltip.content { # re-open tooltip content and add a label
             lbl { # non-tile-theme version of label
               text event.data + " "
               bg "yellow"
@@ -2742,7 +2757,7 @@ root {
             }
           }
         end
-        on_drag_motion do |event|
+        on('drag_motion') do |event|
           if event.drop_accepted?
             event.source.configure(:cursor => "hand1")
           else
@@ -2762,9 +2777,7 @@ root {
         values %w[USA Canada Mexico Columbia UK Australia Germany Italy Spain]
         width 27
         
-        on_drag_start do |event|
-          event.data = event.source.text
-        end
+        drag_source true
       }
       
       label {
@@ -2778,7 +2791,9 @@ root {
         selection 'Canada'
         height 3
         
-        on_drag_start do |event|
+        # drag_source true
+        # This is another alternative to `drag_source true` with manual specification of transferred data only
+        on('drag_start') do |event|
           event.data = event.source.selection.first
         end
       }
@@ -2809,9 +2824,7 @@ root {
         borderwidth 2
         relief "solid"
         
-        on_drop do |event|
-          event.target.text = event.data
-        end
+        drop_target true
       }
       
       label {
@@ -2822,9 +2835,7 @@ root {
         grid :row => 1, :column => 1, :pady => 5, :sticky => "e"
         width 30
         
-        on_drop { |event|
-          event.target.text = event.data
-        }
+        drop_target true
       }
       
       label {
@@ -2835,9 +2846,7 @@ root {
         grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
         width 27
         
-        on_drop do |event|
-          event.target.text = event.data
-        end
+        drop_target true
       }
       
       label {
@@ -2849,9 +2858,7 @@ root {
         selectmode 'browse'
         height 3
         
-        on_drop do |event|
-          event.target.items += [event.data]
-        end
+        drop_target true
       }
       
       label {
@@ -2862,9 +2869,7 @@ root {
         grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here"
         
-        on_drop do |event|
-          event.target.text = event.data
-        end
+        drop_target true
       }
       
       label {
@@ -2874,8 +2879,10 @@ root {
       checkbutton {
         grid :row => 5, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here to destroy a widget"
-        
-        on_drop do |event|
+
+        # drop_target true
+        # This is an alternative to `drop_target true` with manual consumption of transferred data
+        on('drop') do |event|
           event.target.text = event.data
           # execute asynchronously after 100ms to ensure all events have been processed before destruction
           ::Tk.after(100) {event.source.destroy}
@@ -3491,6 +3498,164 @@ Glimmer app:
 
 ![glimmer dsl tk screenshot sample hello menu-bar](images/glimmer-dsl-tk-screenshot-sample-hello-menu-bar-help.png)
 
+### Hello, Contextual Menu!
+
+Glimmer code (from [samples/hello/hello_contextual_menu.rb](samples/hello/hello_contextual_menu.rb)):
+
+```ruby
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+COLORS = [:white, :red, :yellow, :green, :blue, :magenta, :gray, :black]
+
+Tk::Tile::Style.theme_use 'classic' if OS.mac? # this enables setting background on label just for demo purposes
+
+root { |r|
+  title 'Hello, Contextual Menu!'
+  
+  @label = label {
+    grid row_weight: 1, column_weight: 1
+    text 'Right-Click To Pop Up Contextual Menu!'
+    font size: 50
+    anchor 'center'
+  }
+  
+  menu {
+    menu(label: 'Edit', underline: 0) {
+      menu_item(label: 'Cut', underline: 2) {
+        accelerator OS.mac? ? 'Command+X' : 'Control+X'
+      }
+      
+      menu_item(label: 'Copy', underline: 0) {
+        accelerator OS.mac? ? 'Command+C' : 'Control+C'
+      }
+      
+      menu_item(label: 'Paste', underline: 0) {
+        accelerator OS.mac? ? 'Command+V' : 'Control+V'
+      }
+    }
+    
+    menu(label: 'Options', underline: 0) {
+      menu_item(:checkbutton, label: 'Enabled', underline: 0) {
+        on('command') do
+          @select_one_menu.children.each { |menu_item| menu_item.state = menu_item.state == 'disabled' ? 'normal' : 'disabled' }
+          @select_multiple_menu.children.each { |menu_item| menu_item.state = menu_item.state == 'disabled' ? 'normal' : 'disabled' }
+        end
+      }
+      
+      @select_one_menu = menu(label: 'Select One', underline: 7) {
+        menu_item(:radiobutton, label: 'Option 1') {
+          state 'disabled'
+        }
+        menu_item(:radiobutton, label: 'Option 2') {
+          state 'disabled'
+        }
+        menu_item(:radiobutton, label: 'Option 3') {
+          state 'disabled'
+        }
+      }
+      
+      @select_multiple_menu = menu(label: 'Select Multiple', underline: 7) {
+        menu_item(:checkbutton, label: 'Option 4') {
+          state 'disabled'
+        }
+        menu_item(:checkbutton, label: 'Option 5') {
+          state 'disabled'
+        }
+        menu_item(:checkbutton, label: 'Option 6') {
+          state 'disabled'
+        }
+      }
+    }
+    
+    menu(label: 'Language', underline: 3) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+        }
+      end
+    }
+    
+    menu(label: 'Country', underline: 0) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+          compound 'left'
+        }
+      end
+    }
+    
+    menu(label: 'Format', underline: 3) {
+      menu(label: 'Background Color', underline: 0) {
+        COLORS.each { |color_style|
+          menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
+            on('command') do
+              @label.background = color_style
+            end
+          }
+        }
+      }
+      
+      menu(label: 'Foreground Color', underline: 11) {
+        COLORS.each { |color_style|
+          menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
+            on('command') do
+              @label.foreground = color_style
+            end
+          }
+        }
+      }
+    }
+    
+    menu(label: 'View', underline: 0) {
+      menu_item(:radiobutton, label: 'Small', underline: 0) {
+        accelerator 'Control+S'
+        
+        on('command') do
+          @label.font = {size: 25}
+        end
+      }
+      
+      menu_item(:radiobutton, label: 'Medium', underline: 0) {
+        accelerator 'Control+M'
+        selection true
+
+        on('command') do
+          @label.font = {size: 50}
+        end
+      }
+      
+      menu_item(:radiobutton, label: 'Large', underline: 0) {
+        accelerator 'Control+L'
+        
+        on('command') do
+          @label.font = {size: 75}
+        end
+      }
+    }
+  }
+}.open
+```
+
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_contextual_menu'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r ./lib/glimmer-dsl-tk.rb samples/hello/hello_contextual_menu.rb
+```
+
+Glimmer app:
+
+![glimmer dsl tk screenshot sample hello contextual-menu](images/glimmer-dsl-tk-screenshot-sample-hello-contextual-menu.png)
+
 ## Applications
 
 ### Glimmer Tk Calculator

data/VERSION

@@ -1 +1 @@
-0.0.45
+0.0.49

data/lib/glimmer/tk/drag_and_drop_event.rb

@@ -0,0 +1,23 @@
+module Glimmer
+  module Tk
+    DragAndDropEvent = Struct.new(:source, :target, :tooltip, :x_root, :y_root, :data, :drop_accepted) do
+      alias drop_accepted? drop_accepted
+      
+      def as_json(*)
+        klass = self.class.name
+        {
+          JSON.create_id => klass,
+          "v" => [values[0].object_id, values[1].object_id, values[2].object_id].concat(values.drop 3),
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json(*args)
+      end
+
+      def self.json_create(object)
+        new(*[ObjectSpace._id2ref(object["v"][0]), ObjectSpace._id2ref(object["v"][1]).proxy, ObjectSpace._id2ref(object["v"][2])].concat(object["v"].drop 3))
+      end
+    end
+  end
+end

data/lib/glimmer/tk/{drag_and_drop_extension.rb → draggable_and_droppable.rb}

@@ -19,12 +19,26 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require_relative 'drag_and_drop_event'
 require "json"
 
 module Glimmer
   module Tk
-    class WidgetProxy
+    module DraggableAndDroppable
       attr_accessor :on_drag_motion_block
+      
+      def handle_listener(listener_name, &listener)
+        case listener_name.to_s.downcase
+        when 'drag_start'
+          self.on_drag_start_block = listener
+        when 'drag_motion'
+          self.on_drag_motion_block = listener
+        when 'drop'
+          self.on_drop_block = listener
+        else
+          super
+        end
+      end
 
       def drag_source=(value)
         @drag_source = value
@@ -35,6 +49,15 @@ module Glimmer
         end
       end
 
+      def drop_target=(value)
+        @drop_target = value
+        if @drop_target
+          make_droppable
+        else
+          make_non_droppable
+        end
+      end
+
       def on_drag_start_block=(block)
         @on_drag_start_block = block
         make_draggable
@@ -43,11 +66,11 @@ module Glimmer
       def on_drop_block=(value)
         @on_drop_block = value
         self.tk.bind("<DropEvent>", proc { |tk_event|
-          drop_event = DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
+          drop_event = Glimmer::Tk::DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
           @on_drop_block.call(drop_event) if self == drop_event.target
         })
         self.tk.bind("<DropCheckEvent>", proc { |tk_event|
-          drop_check_event = DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
+          drop_check_event = Glimmer::Tk::DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
           drop_check_event.source.event_generate("<DropAcceptedEvent>")
         })
       end
@@ -64,11 +87,17 @@ module Glimmer
             tooltip = WidgetProxy.new('toplevel', root_parent_proxy, [])
             tooltip.overrideredirect(1) #create tooltip window to display dragged data
             tooltip.geometry("+#{tk_event.x_root + 10}+#{tk_event.y_root - 2}")
-            drag_event = DragAndDropEvent.new(self, nil, tooltip, tk_event.x_root, tk_event.y_root, nil, false)
+            drag_event = Glimmer::Tk::DragAndDropEvent.new(self, nil, tooltip, tk_event.x_root, tk_event.y_root, nil, false)
             if @drag_source
               tk_event.widget.configure(:cursor => "hand2")
               # Default data to drag is text
-              drag_event.data = if textvariable_defined? then tk.textvariable.value elsif has_attribute?(:text) then tk.text end
+              drag_event.data = if textvariable_defined?
+                tk.textvariable.value
+              elsif has_attribute?('text')
+                tk.text
+              elsif has_attribute?('selection')
+                selection.first
+              end
               tooltip_label = WidgetProxy.new('label', tooltip, [])
               tooltip_label.text = drag_event.data
               tooltip_label.pack # TODO look into using grid instead to be consistent with the modern Tk way
@@ -118,24 +147,18 @@ module Glimmer
         @tk.bind_remove("<DropAcceptedEvent>")
       end
 
-      DragAndDropEvent = Struct.new(:source, :target, :tooltip, :x_root, :y_root, :data, :drop_accepted) do
-        alias drop_accepted? drop_accepted
-        
-        def as_json(*)
-          klass = self.class.name
-          {
-            JSON.create_id => klass,
-            "v" => [values[0].object_id, values[1].object_id, values[2].object_id].concat(values.drop 3),
-          }
-        end
-
-        def to_json(*args)
-          as_json.to_json(*args)
+      def make_droppable
+        self.on_drop_block = Proc.new do |event|
+          event.target.text = event.data if event.target.has_attribute?('text')
+          event.target.items += [event.data] if event.target.has_attribute?('items')
+          event.target.selection += [event.data] if event.target.has_attribute?('selection')
         end
+      end
 
-        def self.json_create(object)
-          new(*[ObjectSpace._id2ref(object["v"][0]), ObjectSpace._id2ref(object["v"][1]).proxy, ObjectSpace._id2ref(object["v"][2])].concat(object["v"].drop 3))
-        end
+      def make_non_droppable
+        @tk.bind_remove('<DropEvent>')
+        @tk.bind_remove('<DropCheckEvent>')
+        @on_drop_block = nil
       end
     end
   end

data/lib/glimmer/tk/menu_proxy.rb

@@ -34,7 +34,16 @@ module Glimmer
       def post_add_content
         case @parent_proxy
         when ToplevelProxy
-          @parent_proxy.tk['menu'] = @tk
+          if @keyword == 'menu_bar'
+            @parent_proxy.tk['menu'] = @tk
+          else
+            if OS.mac?
+              @parent_proxy.tk.bind '2', proc{|x,y| tk.popup(x,y)}, "%X %Y"
+              @parent_proxy.tk.bind 'Control-1', proc{|x,y| tk.popup(x,y)}, "%X %Y"
+            else
+              @parent_proxy.tk.bind '3', proc{|x,y| tk.popup(x,y)}, "%X %Y"
+            end
+          end
         end
       end
       
@@ -75,8 +84,7 @@ module Glimmer
 #           elsif @parent_proxy.parent_proxy.is_a?(ToplevelProxy) && OS.windows? && system?
 #             @tk = ::TkSysMenu_System.new(@parent_proxy.tk).tap {|tk| tk.singleton_class.include(Glimmer::Tk::Widget); tk.proxy = self}
           else
-            tk_widget_class = self.class.tk_widget_class_for(@keyword)
-            @tk = tk_widget_class.new(@parent_proxy.tk).tap {|tk| tk.singleton_class.include(Glimmer::Tk::Widget); tk.proxy = self}
+            @tk = ::Tk::Menu.new(@parent_proxy.tk).tap {|tk| tk.singleton_class.include(Glimmer::Tk::Widget); tk.proxy = self}
           end
           case @parent_proxy
           when MenuProxy
@@ -85,5 +93,6 @@ module Glimmer
         end
       end
     end
+    MenuBarProxy = MenuProxy
   end
 end

data/lib/{os.rb → glimmer/tk/os.rb}

@@ -19,18 +19,30 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class OS
-  class << self
-    def mac?
-      Tk.windowingsystem == 'aqua'
-    end
-    
-    def windows?
-      Tk.windowingsystem == 'win32'
-    end
-    
-    def linux?
-      Tk.windowingsystem == 'x11'
+require 'tk'
+
+module Glimmer
+  module Tk
+    class OS
+      class << self
+        def mac?
+          ::Tk.windowingsystem == 'aqua'
+        end
+        
+        def windows?
+          ::Tk.windowingsystem == 'win32'
+        end
+        
+        def linux?
+          ::Tk.windowingsystem == 'x11'
+        end
+      end
     end
   end
 end
+
+begin
+  OS
+rescue
+  ::OS = Glimmer::Tk::OS
+end

data/lib/glimmer/tk/widget_proxy.rb

@@ -21,6 +21,7 @@
 
 require 'glimmer/data_binding/tk/one_time_observer'
 require 'glimmer/tk/widget'
+require 'glimmer/tk/draggable_and_droppable'
 
 module Glimmer
   module Tk
@@ -69,6 +70,8 @@ module Glimmer
         end
       end
       
+      prepend DraggableAndDroppable
+      
       FONTS_PREDEFINED = %w[default text fixed menu heading caption small_caption icon tooltip]
       
       attr_reader :parent_proxy, :tk, :args, :keyword, :children, :bind_ids, :destroyed
@@ -155,6 +158,7 @@ module Glimmer
       end
       
       def has_state?(attribute)
+        attribute = attribute.to_s
         attribute = attribute.sub(/\?$/, '').sub(/=$/, '')
         if @tk.respond_to?(:tile_state)
           begin
@@ -170,6 +174,7 @@ module Glimmer
       end
       
       def has_attributes_attribute?(attribute)
+        attribute = attribute.to_s
         attribute = attribute.sub(/\?$/, '').sub(/=$/, '')
         @tk.respond_to?(:attributes) && @tk.attributes.keys.include?(attribute.to_s)
       end

data/lib/glimmer-dsl-tk.rb

@@ -29,7 +29,6 @@ require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 require 'tk'
 #require 'tkextlib/bwidget' # does not work on Windows
 #require 'tkextlib/iwidgets' # does not work on Windows
-require 'os'
 require 'facets/hash/symbolize_keys'
 require 'facets/string/underscore'
 require 'facets/string/camelcase'
@@ -38,8 +37,8 @@ require 'delegate'
 # Internal requires
 # require 'ext/glimmer/config'
 # require 'ext/glimmer'
+require 'glimmer/tk/os'
 require 'glimmer/dsl/tk/dsl'
-require 'glimmer/tk/drag_and_drop_extension'
 
 Glimmer::Config.loop_max_count = -1
 
@@ -49,11 +48,11 @@ Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   result ||= method == 'load_iseq'
 end
 
-Tk::Tile::Style.theme_use 'clam' if OS.linux?
+::Tk::Tile::Style.theme_use 'clam' if OS.linux?
 
 ::TkOption.add '*tearOff', 0
 
-class ::Tk::TkSysMenu_Window < Tk::Menu
-  include Tk::SystemMenu
+class ::Tk::TkSysMenu_Window < ::Tk::Menu
+  include ::Tk::SystemMenu
   SYSMENU_NAME = 'window'
 end

data/samples/hello/hello_button.rb

@@ -47,9 +47,9 @@ class HelloButton
           default 'active'
           focus true
           
-          on('command') {
+          on('command') do
             self.count += 1
-          }
+          end
         }
       }
         
@@ -64,9 +64,9 @@ class HelloButton
         button {
           image File.expand_path('../../icons/glimmer.png', __dir__), subsample: 5
           
-          on('command') {
+          on('command') do
             message_box(title: 'Image Button', message: 'Image Button Clicked!')
-          }
+          end
         }
       }
       
@@ -84,9 +84,9 @@ class HelloButton
             text "#{compound_option.capitalize} Image"
             compound compound_option
             
-            on('command') {
+            on('command') do
               message_box(title: 'Text Image Button', message: 'Text Image Button Clicked!', detail: "(#{compound_option})")
-            }
+            end
           }
         end
       }

data/samples/hello/hello_contextual_menu.rb

@@ -0,0 +1,156 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+COLORS = [:white, :red, :yellow, :green, :blue, :magenta, :gray, :black]
+
+Tk::Tile::Style.theme_use 'classic' if OS.mac? # this enables setting background on label just for demo purposes
+
+root { |r|
+  title 'Hello, Contextual Menu!'
+  
+  @label = label {
+    grid row_weight: 1, column_weight: 1
+    text 'Right-Click To Pop Up Contextual Menu!'
+    font size: 50
+    anchor 'center'
+  }
+  
+  menu {
+    menu(label: 'Edit', underline: 0) {
+      menu_item(label: 'Cut', underline: 2) {
+        accelerator OS.mac? ? 'Command+X' : 'Control+X'
+      }
+      
+      menu_item(label: 'Copy', underline: 0) {
+        accelerator OS.mac? ? 'Command+C' : 'Control+C'
+      }
+      
+      menu_item(label: 'Paste', underline: 0) {
+        accelerator OS.mac? ? 'Command+V' : 'Control+V'
+      }
+    }
+    
+    menu(label: 'Options', underline: 0) {
+      menu_item(:checkbutton, label: 'Enabled', underline: 0) {
+        on('command') do
+          @select_one_menu.children.each { |menu_item| menu_item.state = menu_item.state == 'disabled' ? 'normal' : 'disabled' }
+          @select_multiple_menu.children.each { |menu_item| menu_item.state = menu_item.state == 'disabled' ? 'normal' : 'disabled' }
+        end
+      }
+      
+      @select_one_menu = menu(label: 'Select One', underline: 7) {
+        menu_item(:radiobutton, label: 'Option 1') {
+          state 'disabled'
+        }
+        menu_item(:radiobutton, label: 'Option 2') {
+          state 'disabled'
+        }
+        menu_item(:radiobutton, label: 'Option 3') {
+          state 'disabled'
+        }
+      }
+      
+      @select_multiple_menu = menu(label: 'Select Multiple', underline: 7) {
+        menu_item(:checkbutton, label: 'Option 4') {
+          state 'disabled'
+        }
+        menu_item(:checkbutton, label: 'Option 5') {
+          state 'disabled'
+        }
+        menu_item(:checkbutton, label: 'Option 6') {
+          state 'disabled'
+        }
+      }
+    }
+    
+    menu(label: 'Language', underline: 3) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+        }
+      end
+    }
+    
+    menu(label: 'Country', underline: 0) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+          compound 'left'
+        }
+      end
+    }
+    
+    menu(label: 'Format', underline: 3) {
+      menu(label: 'Background Color', underline: 0) {
+        COLORS.each { |color_style|
+          menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
+            on('command') do
+              @label.background = color_style
+            end
+          }
+        }
+      }
+      
+      menu(label: 'Foreground Color', underline: 11) {
+        COLORS.each { |color_style|
+          menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
+            on('command') do
+              @label.foreground = color_style
+            end
+          }
+        }
+      }
+    }
+    
+    menu(label: 'View', underline: 0) {
+      menu_item(:radiobutton, label: 'Small', underline: 0) {
+        accelerator 'Control+S'
+        
+        on('command') do
+          @label.font = {size: 25}
+        end
+      }
+      
+      menu_item(:radiobutton, label: 'Medium', underline: 0) {
+        accelerator 'Control+M'
+        selection true
+
+        on('command') do
+          @label.font = {size: 50}
+        end
+      }
+      
+      menu_item(:radiobutton, label: 'Large', underline: 0) {
+        accelerator 'Control+L'
+        
+        on('command') do
+          @label.font = {size: 75}
+        end
+      }
+    }
+  }
+}.open

data/samples/hello/hello_drag_and_drop.rb

@@ -53,11 +53,12 @@ root {
         text "Drag entry text"
         width 30
         
+        # drag_source true
         # This is how to do `drag_source true` the manual way for use in exceptional cases
-        on_drag_start do |event|
+        on('drag_start') do |event|
           event.data = event.source.text
           event.source.configure(:cursor => "hand2")
-          event.tooltip.content {
+          event.tooltip.content { # re-open tooltip content and add a label
             lbl { # non-tile-theme version of label
               text event.data + " "
               bg "yellow"
@@ -66,7 +67,7 @@ root {
             }
           }
         end
-        on_drag_motion do |event|
+        on('drag_motion') do |event|
           if event.drop_accepted?
             event.source.configure(:cursor => "hand1")
           else
@@ -86,9 +87,7 @@ root {
         values %w[USA Canada Mexico Columbia UK Australia Germany Italy Spain]
         width 27
         
-        on_drag_start do |event|
-          event.data = event.source.text
-        end
+        drag_source true
       }
       
       label {
@@ -102,7 +101,9 @@ root {
         selection 'Canada'
         height 3
         
-        on_drag_start do |event|
+        # drag_source true
+        # This is another alternative to `drag_source true` with manual specification of transferred data only
+        on('drag_start') do |event|
           event.data = event.source.selection.first
         end
       }
@@ -133,9 +134,7 @@ root {
         borderwidth 2
         relief "solid"
         
-        on_drop do |event|
-          event.target.text = event.data
-        end
+        drop_target true
       }
       
       label {
@@ -146,9 +145,7 @@ root {
         grid :row => 1, :column => 1, :pady => 5, :sticky => "e"
         width 30
         
-        on_drop { |event|
-          event.target.text = event.data
-        }
+        drop_target true
       }
       
       label {
@@ -159,9 +156,7 @@ root {
         grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
         width 27
         
-        on_drop do |event|
-          event.target.text = event.data
-        end
+        drop_target true
       }
       
       label {
@@ -173,9 +168,7 @@ root {
         selectmode 'browse'
         height 3
         
-        on_drop do |event|
-          event.target.items += [event.data]
-        end
+        drop_target true
       }
       
       label {
@@ -186,9 +179,7 @@ root {
         grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here"
         
-        on_drop do |event|
-          event.target.text = event.data
-        end
+        drop_target true
       }
       
       label {
@@ -198,8 +189,10 @@ root {
       checkbutton {
         grid :row => 5, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here to destroy a widget"
-        
-        on_drop do |event|
+
+        # drop_target true
+        # This is an alternative to `drop_target true` with manual consumption of transferred data
+        on('drop') do |event|
           event.target.text = event.data
           # execute asynchronously after 100ms to ensure all events have been processed before destruction
           ::Tk.after(100) {event.source.destroy}

data/samples/hello/hello_menu_bar.rb

@@ -37,7 +37,7 @@ root { |r|
     anchor 'center'
   }
   
-  menu {
+  menu_bar {
     # Mac-specific application menu (right next to the Apple menu)
     if OS.mac?
       menu(:application) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.49
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: puts_debuggerer
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,8 @@ files:
 - lib/glimmer/dsl/tk/widget_expression.rb
 - lib/glimmer/tk/checkbutton_proxy.rb
 - lib/glimmer/tk/combobox_proxy.rb
-- lib/glimmer/tk/drag_and_drop_extension.rb
+- lib/glimmer/tk/drag_and_drop_event.rb
+- lib/glimmer/tk/draggable_and_droppable.rb
 - lib/glimmer/tk/entry_proxy.rb
 - lib/glimmer/tk/frame_proxy.rb
 - lib/glimmer/tk/label_proxy.rb
@@ -217,6 +218,7 @@ files:
 - lib/glimmer/tk/menu_item_proxy.rb
 - lib/glimmer/tk/menu_proxy.rb
 - lib/glimmer/tk/notebook_proxy.rb
+- lib/glimmer/tk/os.rb
 - lib/glimmer/tk/radiobutton_proxy.rb
 - lib/glimmer/tk/root_proxy.rb
 - lib/glimmer/tk/scrollbar_frame_proxy.rb
@@ -228,7 +230,6 @@ files:
 - lib/glimmer/tk/variable_owner.rb
 - lib/glimmer/tk/widget.rb
 - lib/glimmer/tk/widget_proxy.rb
-- lib/os.rb
 - samples/elaborate/meta_sample.rb
 - samples/hello/hello_built_in_dialog.rb
 - samples/hello/hello_button.rb
@@ -236,6 +237,7 @@ files:
 - samples/hello/hello_combobox.rb
 - samples/hello/hello_computed.rb
 - samples/hello/hello_computed/contact.rb
+- samples/hello/hello_contextual_menu.rb
 - samples/hello/hello_drag_and_drop.rb
 - samples/hello/hello_entry.rb
 - samples/hello/hello_frame.rb