glimmer-dsl-tk 0.0.31 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 883bb9d265c58ea872a90069aba8e308ee4688653d2ca200fb5289976850dc1c
-  data.tar.gz: 34f92aa593f48fbe0edf1b469ebc5ec0b81e2789a8995d1b04cd77748c72c081
+  metadata.gz: daadce6a22be7ae817b7e0a3f5679a8c3d04d7ed6a0205fa30b03da206dc156a
+  data.tar.gz: f0324e91b54ac7e3179ffe122de59f714731d336d982937a92e76c6d0fd95079
 SHA512:
-  metadata.gz: a8a0d78446483775e82da34e94ede3a1566b2e1201cd5c3bbbfaa1ed27f424bcb1d61826b7f600616550e999bcec117560d52742f3a4779d94dd8aa7adf18661
-  data.tar.gz: fbc6ad5515dc20099c7e1c1827738f7d2edc133575f030afa69c2256c3e2bc6981986e494ada3498eeda6e4809bc5409dd7a61cc91666898d0dd48d7f1805277
+  metadata.gz: 461c26dee79b7a387eddc3107f342dffe14b39d49f307ab469a49afda8112af2ad75a350f88ab64fad616e458a217570c0f3414570c195aeef884c170bff9656
+  data.tar.gz: b7b2cd0c333de05d2c923ed461147fd245d58f55a622e57f7631c049b32344b7730801e3c49e271e5a0d7e884dcb1f64981f0feb5a57300952e05f191b1537eb

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Change Log
 
+## 0.0.35
+
+- Improved Meta-Sample by utilizing Ruby from `RbConfig.ruby`
+- Improved girb_runner.rb to be more platform independent
+- Fixed `text` widget binding of standard bind events (e.g. `'KeyPress'` or `'ButtonPress'`)
+- Fixed Hello, Text! issue with not being able to bring up Find Dialog once all text is deleted and new text is entered
+- Fixed undo/redo issue
+
+## 0.0.34
+
+- When applying a `text` selection format without having a selection, have it apply to current insert mark word
+- Support registering multiple general event listeners on `text` widget (previously, later event listener registrations replaced former ones)
+- Implement `:no_selection_default` option of `:insert_word`, `insert_letter`, or `none` for `text` selection formatting methods (`add_selection_format`, `remove_selection_format`, `toggle_selection_format`, `add_selection_font_format`, `remove_selection_font_format`, `toggle_selection_font_format`)
+- Make sure to only allow `text` undo/redo when there are changes to be undoed/redoed
+- Fix issue with Hello, Text! Find Dialog not coming up with keyboard shortcut (e.g. CMD+F) anymore
+- Fix issue with Hello, Text! whereby after applying background, and foreground to a selection, you cannot apply bold, italic, or underline for the same selection (or font-size or font-family)
+
+## 0.0.33
+
+- Support `text` widget `InsertMarkMoved` listener event to track insert mark movement (or aliases `InsertMarkMove`, `insert_mark_move`, `insert_mark_moved`, all case-insensitive)
+- Support `entry` widget `changed` and `modified` listener event aliases for `change` event
+- Autodiscover format options when moving cursor in `text` widget (auto-derive from applied tags and widget font) and show in top Hello, Text! toolbar comboboxes and buttons
+- Fix issue with encountering error 'NoMethodError: undefined method "size" for' when launching Hello, Text!, performing Select-All (CMD+A or CONTROL+A) and then attempting to Bold all the text.
+- Fix issue in Hello, Text! whereby bolding a small region of text affects the font of the following region of text till the end of the document
+- Fix issue in Hello, Text! where if all text is copied and then pasted multiple times, the `text` widget loses its keyboard/mouse listeners and CMD+F does not work anymore to bring Find dialog
+
+## 0.0.32
+
+- Hello, Text! Find Dialog toolbar button
+- Hello, Text! Find Dialog Windows/Linux CONTROL+F shortcut alternative to Mac CMD+F
+
 ## 0.0.31
 
 - Improve Hello, Text! (toolbar buttons: justify left, justify center, justify right)

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.30
+# [<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.35
 ## 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)
@@ -55,8 +55,9 @@ NOTE: Glimmer DSL for Tk is currently in early alpha mode (incomplete). Please h
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
-- [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
 - [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)
+- [glimmer-dsl-gtk](https://github.com/AndyObtiva/glimmer-dsl-gtk): Ruby-GNOME Desktop Development GUI Library
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS (Cascading Style Sheets)
 
@@ -158,7 +159,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.30'
+gem 'glimmer-dsl-tk', '~> 0.0.35'
 ```
 
 And, then run:
@@ -200,7 +201,7 @@ The Glimmer GUI DSL follows these simple concepts in mapping from Tk syntax:
 - **Widget Keyword**: Any Tk widget (e.g. `Tk::Tile::Label`) or toplevel window (e.g. `TkRoot`) may be declared by its lower-case underscored name without the namespace (e.g. `label` or `root`). This is called a keyword and is represented in the Glimmer GUI DSL by a Ruby method behind the scenes.
 - **Args**: Any keyword method may optionally take arguments surrounded by parentheses (e.g. a `frame` nested under a `notebook` may receive tab options like `frame(text: 'Users')`, which gets used behind the scenes by Tk code such as `notebook.add tab, text: 'Users'`)
 - **Content/Options Block**: Any keyword may optionally be followed by a Ruby curly-brace block containing nested widgets (content) and attributes (options). Attributes are simply Tk option keywords followed by arguments and no block (e.g. `title 'Hello, World!'` under a `root`)
-- **Event Binding Block**: `on(event) {}` keyword receiving a Tk binding event name (e.g. `KeyPress` or `ComboboxSelected`). No need to surround event by `<>` as [Glimmer DSL for Tk](https://rubygems.org/gems/glimmer-dsl-tk) takes care of that automatically.
+- **Event Binding Block**: `on(event) {}` keyword receiving a Tk binding event name (e.g. `KeyPress` or `ComboboxSelected`). Surrounding event by `<>` is optional as [Glimmer DSL for Tk](https://rubygems.org/gems/glimmer-dsl-tk) can take care of that automatically.
 
 Example of an app written in [Tk](https://www.tcl.tk/) imperative syntax:
 
@@ -273,7 +274,7 @@ keyword(args) | attributes | event bindings & callbacks
 `choose_directory(options = nil)` | None | None
 `choose_font(options = nil) {|font| ... }` | None | None
 `combobox` | `state`, `text` | `'ComboboxSelected'`
-`entry` | `width`, `text`, `validate`, `show` (`'none', 'focus', 'focusin', 'focusout', 'key', or 'all'`) | `'validate'`, `'invalid'`, `'change'`, `validatecommand {}`, `invalidcommand {}`
+`entry` | `width`, `text`, `validate`, `show` (`'none', 'focus', 'focusin', 'focusout', 'key', or 'all'`) | `'validate'`, `'invalid'`, `'change'` (alias: `'changed'`), `validatecommand {}`, `invalidcommand {}`
 `get_multiple_open_file(options = nil)` | None | None
 `get_open_file(options = nil)` | None | None
 `get_save_file(options = nil)` | None | None
@@ -286,7 +287,7 @@ keyword(args) | attributes | event bindings & callbacks
 `radiobutton` | `text`, `variable` (Boolean), `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `value` (default: `text`) | `command {}`
 `root` | `title`, `iconphoto`, `background`, `alpha`, `fullscreen?`, `topmost?`, `transparent?`, `stackorder`, `winfo_screendepth`, `winfo_screenvisual`, `winfo_screenwidth`, `winfo_screenheight`, `winfo_pixels('li')`, `winfo_screen`, `wm_maxsize`, `state` (`'normal', 'iconic', 'withdrawn', 'icon', 'zoomed'`) | `'DELETE_WINDOW'`, `'OPEN_WINDOW'`
 `separator` | `orient` (`'horizontal' (default) or 'vertical'`) | None
-`text` | `value`, [many more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `'modified'`, `'selection'`
+`text` | `value`, [many more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `'modified'`, `'selection'`, `'insert_mark_moved'` (alias: `'insert_mark_move', 'InsertMarkMove', 'InsertMarkMoved'`)
 
 Options for `get_open_file` and `get_multiple_open_file` include:
 - `filetypes`: `Hash` of `'Group Name' => '.ext'` entries (e.g. `filetypes: {'PNG Images' => '.png'}`
@@ -349,15 +350,20 @@ The `text` widget is enhanced by [Glimmer DSL for Tk](https://rubygems.org/gems/
 - `add_font_format(region_start, region_end, font_option, value)`
 - `remove_font_format(region_start, region_end, font_option, value)`
 - `toggle_font_format(region_start, region_end, font_option, value)`
-- `add_selection_format(region_start, region_end, option, value)`
-- `remove_selection_format(region_start, region_end, option, value)`
-- `toggle_selection_format(region_start, region_end, option, value)`
-- `add_selection_font_format(region_start, region_end, font_option, value)`
-- `remove_selection_font_format(region_start, region_end, font_option, value)`
-- `toggle_selection_font_format(region_start, region_end, font_option, value)`
+- `add_selection_format(option, value, no_selection_default: :insert_word)`: adds format to selection. If there is no selection, then applies format to current insert mark word.
+- `remove_selection_format(option, value, no_selection_default: :insert_word)`
+- `toggle_selection_format(option, value, no_selection_default: :insert_word)`: toggles format on selection. If there is no selection, then toggles format on current insert mark word.
+- `add_selection_font_format(font_option, value, no_selection_default: :insert_word)`
+- `remove_selection_font_format(font_option, value, no_selection_default: :insert_word)`
+- `toggle_selection_font_format(font_option, value, no_selection_default: :insert_word)`
 - `text#insert_image(text_index, *image_args)`: inserts image into `text` `value` content at `text_index` location (e.g. `'insert'`)
 - `text#get_open_file_to_insert_image(text_index = 'insert')`: opens a file dialog to select one of the available image formats and then inserts image into `text` `value` content
 
+The `:no_selection_default` keyword arg to `*_selection_*` methods determines what region to cover when no explicit selection is set:
+- `:insert_word`: current word for insert mark
+- `:insert_letter`: current letter for insert mark
+- `:none`: no behavior when no selection is in place
+
 Available options:
 
 - `background`
@@ -1869,7 +1875,7 @@ Glimmer app:
 
 ### Hello, Text!
 
-You may use the META+F shortcut to bring up the Find Dialog.
+You may press META+F to bring up the Find Dialog on the Mac and CONTROL+F to bring it up on Windows/Linux.
 
 Icons used in this sample were made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>
 
@@ -1921,7 +1927,7 @@ class HelloText
     MULTI_LINE_STRING
   end
   
-  attr_accessor :document
+  attr_accessor :document, :find_text
       
   attr_accessor :foreground
   
@@ -1947,8 +1953,16 @@ class HelloText
     [FONT_SIZE_PROMPT] + (9..64).to_a.map(&:to_s)
   end
   
+  def find
+    text_index = @text.search(/#{find_text}/i, @text.tag_ranges('sel')&.first&.last || @text.index('insert'))
+    unless text_index.to_s.empty?
+      @text.tag_remove('sel', '1.0', 'end')
+      @text.tag_add('sel', text_index, "#{text_index} + #{find_text.size} chars")
+    end
+  end
+  
   def launch
-    root {
+    @root = root {
       title 'Hello, Text!'
       width 1280
       height 800
@@ -1956,11 +1970,6 @@ class HelloText
       frame {
         grid row: 0, column: 0
         
-        label {
-          grid row: 0, column: 0, columnspan: 17
-          text 'Select a region of text and then apply formatting from the toolbar'
-        }
-        
         column_index = -1
         
         combobox {
@@ -1992,7 +2001,7 @@ class HelloText
           orient 'vertical'
         }
         
-        button {
+        @bold_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'B'
           style font: {weight: 'bold'}
@@ -2002,7 +2011,7 @@ class HelloText
           end
         }
         
-        button {
+        @italic_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'I'
           style font: {slant: 'italic'}
@@ -2012,7 +2021,7 @@ class HelloText
           end
         }
         
-        button {
+        @underline_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'U'
           style font: {underline: true}
@@ -2021,36 +2030,36 @@ class HelloText
             @text.toggle_selection_font_format('underline', true)
           end
         }
-        
+
         separator {
           grid row: 1, column: column_index += 1, column_weight: 0
           orient 'vertical'
         }
         
-        button {
+        @justify_left_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/cut.png", __dir__), subsample: 32
+          image File.expand_path("images/align-left.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_cut
+            @text.add_selection_format('justify', 'left')
           end
         }
         
-        button {
+        @justify_center_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/copy.png", __dir__), subsample: 32
+          image File.expand_path("images/align-center.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_copy
+            @text.add_selection_format('justify', 'center')
           end
         }
         
-        button {
+        @justify_right_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/paste.png", __dir__), subsample: 32
+          image File.expand_path("images/align-right.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_paste
+            @text.add_selection_format('justify', 'right')
           end
         }
         
@@ -2061,51 +2070,51 @@ class HelloText
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-left.png", __dir__), subsample: 32
+          image File.expand_path("images/picture.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'left')
+            @text.get_open_file_to_insert_image
           end
         }
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-center.png", __dir__), subsample: 32
+          image File.expand_path("images/search.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'center')
+            show_find_dialog
           end
         }
         
+        separator {
+          grid row: 1, column: column_index += 1, column_weight: 0
+          orient 'vertical'
+        }
+        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-right.png", __dir__), subsample: 32
+          image File.expand_path("images/cut.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'right')
+            @text.text_cut
           end
         }
         
-        separator {
-          grid row: 1, column: column_index += 1, column_weight: 0
-          orient 'vertical'
-        }
-        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/undo.png", __dir__), subsample: 32
+          image File.expand_path("images/copy.png", __dir__), subsample: 32
           
           on('command') do
-            @text.edit_undo
+            @text.text_copy
           end
         }
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/redo.png", __dir__), subsample: 32
+          image File.expand_path("images/paste.png", __dir__), subsample: 32
           
           on('command') do
-            @text.edit_redo
+            @text.text_paste
           end
         }
         
@@ -2114,12 +2123,22 @@ class HelloText
           orient 'vertical'
         }
         
+        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/picture.png", __dir__), subsample: 32
+          image File.expand_path("images/undo.png", __dir__), subsample: 32
           
           on('command') do
-            @text.get_open_file_to_insert_image
+            @text.edit_undo
+          end
+        }
+        
+        button {
+          grid row: 1, column: column_index += 1, column_weight: 0
+          image File.expand_path("images/redo.png", __dir__), subsample: 32
+          
+          on('command') do
+            @text.edit_redo
           end
         }
       }
@@ -2129,8 +2148,67 @@ class HelloText
         wrap 'word'
         undo true
         value <=> [self, :document]
+        
+        on('KeyPress') do |event|
+          show_find_dialog if (event.keysym == 'f') && ((OS.mac? && event.state == 8) || (!OS.mac? && event.state == 4))
+        end
+                
+        on('InsertMarkMoved') do
+          self.font_family = @text.applied_font_format_value('family')
+          self.font_size = @text.applied_font_format_value('size')
+          @bold_button.default = @text.applied_font_format_value('weight') == 'bold' ? 'active' : 'normal'
+          @italic_button.default = @text.applied_font_format_value('slant') == 'italic' ? 'active' : 'normal'
+          @underline_button.default = @text.applied_font_format_value('underline') == true ? 'active' : 'normal'
+          self.background = @text.applied_format_value('background')
+          self.foreground = @text.applied_format_value('foreground')
+          @justify_left_button.default = @text.applied_format_value('justify') == 'left' ? 'active' : 'normal'
+          @justify_center_button.default = @text.applied_format_value('justify') == 'center' ? 'active' : 'normal'
+          @justify_right_button.default = @text.applied_format_value('justify') == 'right' ? 'active' : 'normal'
+        end
       }
-    }.open
+    }
+    @root.open
+  end
+  
+  def show_find_dialog
+    toplevel(@root) { |tl|
+      title 'Find'
+      
+      label {
+        text 'Text:'
+      }
+      entry { |e|
+        focus true
+        text <=> [
+          self,
+          :find_text,
+          after_write: lambda do
+            text_index = @text.search(/#{find_text}/i, 'insert')
+            unless text_index.to_s.empty?
+              @text.tag_remove('sel', '1.0', 'end')
+              @text.tag_add('sel', text_index, "#{text_index} + #{find_text.size} chars")
+            end
+          end
+        ]
+                
+        on('KeyPress') do |event|
+          if event.keysym == 'Return'
+            find
+          elsif event.keysym == 'Escape'
+            tl.grab_release
+            tl.destroy
+          end
+        end
+      }
+      button {
+        text 'Find'
+        default 'active'
+        
+        on('command') do
+          find
+        end
+      }
+    }
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.0.31
+0.0.35

data/bin/girb_runner.rb

@@ -27,7 +27,7 @@ require_relative '../lib/glimmer-dsl-tk'
 
 include Glimmer
 
-GIRB_RUNNER_EXIT_FILE = "#{Etc.getpwuid.dir}/.girb_runner_exit"
+GIRB_RUNNER_EXIT_FILE = "#{Dir.home}/.girb_runner_exit"
 FileUtils.rm_rf GIRB_RUNNER_EXIT_FILE
 
 @exit_method = method(:exit)

data/lib/glimmer/tk/entry_proxy.rb

@@ -40,7 +40,7 @@ module Glimmer
       
       def handle_listener(listener_name, &listener)
         case listener_name.to_s.downcase
-        when 'change'
+        when 'change', 'changed', 'modified'
           tk.textvariable.trace('write') {
             listener.call(@tk.textvariable)
           }

data/lib/glimmer/tk/text_proxy.rb

@@ -27,59 +27,106 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TextProxy < WidgetProxy
+      ALL_TAG = '__all__'
+      FORMAT_DEFAULT_MAP = {
+        'justify' => 'left',
+      }
+    
       def handle_listener(listener_name, &listener)
         case listener_name.to_s.downcase
         when '<<modified>>', '<modified>', 'modified'
           modified_listener = Proc.new do |*args|
+            @modified_count ||= 0
+            @modified_count += 1
             listener.call(*args)
+            @insert_mark_moved_proc&.call
             @tk.modified = false
           end
-          bind('<Modified>', modified_listener)
+          @tk.bind('<Modified>', modified_listener)
         when '<<selection>>', '<selection>', 'selection'
-          bind('<Selection>', listener)
+          @tk.bind('<Selection>', listener)
         when 'destroy'
           super
-        else
-          @tk.tag_add('__all__', '1.0', 'end') unless @tk.tag_names.include?('__all__')
-          # TODO make listener pass an event that has a modifiers attribute for easy representation of :shift, :meta, :control, etc... while a letter button is pressed
-          begin
-            @tk.tag_bind('__all__', listener_name, &listener)
-          rescue => e
-            Glimmer::Config.logger.debug {"Unable to bind to #{listener_name} .. attempting to surround with <>"}
-            Glimmer::Config.logger.debug {e.full_message}
-            listener_name = "<#{listener_name}" if !listener_name.start_with?('<')
-            listener_name = "#{listener_name}>" if !listener_name.end_with?('>')
-            @tk.tag_bind('__all__', listener_name, &listener)
+        when 'insertmarkmove', 'insertmarkmoved', 'insert_mark_move', 'insert_mark_moved'
+          if @insert_mark_moved_proc.nil?
+            handle_listener('KeyPress') do |event|
+              @insert_mark_moved_proc&.call
+            end
+            handle_listener('KeyRelease') do |event|
+              @insert_mark_moved_proc&.call
+            end
+            handle_listener('ButtonPress') do |event|
+              @insert_mark_moved_proc&.call
+            end
+            handle_listener('ButtonRelease') do |event|
+              @insert_mark_moved_proc&.call
+            end
+          end
+          @insert_mark = @tk.index('insert')
+          @insert_mark_moved_proc = Proc.new do
+            new_insert_mark = @tk.index('insert')
+            if new_insert_mark != @insert_mark
+              @insert_mark = new_insert_mark
+              listener.call(new_insert_mark)
+            end
           end
+        else
+          super
         end
       end
-    
-      def add_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| add_format(range_start, range_end, option, value) }
+      
+      def edit_undo
+        # <Modified> fires twice the first time, which is equivalent to one change.
+        if @modified_count.to_i > 2
+          # must count the extra 2 modified count that will occur upon undo too
+          @modified_count -= 4
+          @tk.edit_undo
+        end
       end
       
-      def remove_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| remove_format(range_start, range_end, option, value) }
+      def edit_redo
+        begin
+          @tk.edit_redo
+        rescue => e
+          # No Op
+        end
       end
       
-      def toggle_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| toggle_format(range_start, range_end, option, value) }
+      def add_selection_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| add_format(range_start, range_end, option, value) }
       end
       
-      def add_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| add_font_format(range_start, range_end, option, value) }
+      def remove_selection_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| remove_format(range_start, range_end, option, value) }
       end
       
-      def remove_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| remove_font_format(range_start, range_end, option, value) }
+      def toggle_selection_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| toggle_format(range_start, range_end, option, value) }
       end
       
-      def toggle_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| toggle_font_format(range_start, range_end, option, value) }
+      def add_selection_font_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| add_font_format(range_start, range_end, option, value) }
       end
       
-      def process_selection_ranges(&processor)
-        @tk.tag_ranges('sel').each do |region|
+      def remove_selection_font_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| remove_font_format(range_start, range_end, option, value) }
+      end
+      
+      def toggle_selection_font_format(option, value, no_selection_default: :insert_word)
+        process_selection_ranges(no_selection_default: no_selection_default) { |range_start, range_end| toggle_font_format(range_start, range_end, option, value) }
+      end
+      
+      def process_selection_ranges(no_selection_default: :insert_word, &processor)
+        regions = @tk.tag_ranges('sel')
+        if regions.empty?
+          case no_selection_default
+          when :insert_word
+            regions = [[@tk.index('insert wordstart'), @tk.index('insert wordend + 1 char')]]
+          when :insert_letter
+            regions = [[@tk.index('insert'), @tk.index('insert + 1 char')]]
+          end
+        end
+        regions.each do |region|
           range_start = region.first
           range_end = region.last
           processor.call(range_start, range_end)
@@ -91,7 +138,7 @@ module Glimmer
       end
       
       def applied_format_tags(region_start, region_end, option, value)
-        tag_names = @tk.tag_names - ['sel']
+        tag_names = @tk.tag_names - ['sel', ALL_TAG]
         
         tag_names.select do |tag_name|
           @tk.tag_ranges(tag_name).any? do |range|
@@ -102,9 +149,26 @@ module Glimmer
         end
       end
             
+      def applied_format_value(text_index = nil, option)
+        text_index ||= @tk.index('insert')
+        region_start = text_index
+        region_end = text_index
+        tag_names = @tk.tag_names - ['sel', ALL_TAG]
+        
+        values = tag_names.map do |tag_name|
+          @tk.tag_ranges(tag_name).map do |range|
+            if text_index_less_than_or_equal_to_other_text_index?(range.first, region_start) && text_index_greater_than_or_equal_to_other_text_index?(range.last, region_end)
+              @tk.tag_cget(tag_name, option)
+            end
+          end
+        end.flatten.reject {|value| value.to_s.empty?}
+        
+        values.last || (@tk.send(option) rescue FORMAT_DEFAULT_MAP[option])
+      end
+            
       def add_format(region_start, region_end, option, value)
         @@tag_number = 0 unless defined?(@@tag_number)
-        tag = "tag#{@@tag_number += 1}"
+        tag = "tag_#{option}_#{@@tag_number += 1}"
         @tk.tag_configure(tag, {option => value})
         @tk.tag_add(tag, region_start, region_end)
         tag
@@ -155,15 +219,14 @@ module Glimmer
       def applied_font_format_tags_and_regions(region_start, region_end)
         lines = value.split("\n")
         tags_and_regions = []
-        all_tag_names = @tk.tag_names - ['sel']
+        all_tag_names = (@tk.tag_names - ['sel', ALL_TAG]).select {|tag_name| tag_name.include?('_font_')}
         (region_start.to_i..region_end.to_i).each do |line_number|
           start_character_index = 0
           start_character_index = region_start.to_s.split('.').last.to_i if line_number == region_start.to_i
-          end_character_index = lines[line_number - 1].size
+          end_character_index = lines[line_number - 1].to_s.size
           end_character_index = region_end.to_s.split('.').last.to_i if line_number == region_end.to_i
           (start_character_index...end_character_index).each do |character_index|
             text_index = "#{line_number}.#{character_index}"
-            # TODO reimplement the following using @tk.tag_names without arg since passing an arg seems broken and returns inaccurate results
             region_tag = all_tag_names.reverse.find do |tag|
               @tk.tag_cget(tag, 'font') && @tk.tag_ranges(tag).any? do |range_start, range_end|
                 text_index_less_than_or_equal_to_other_text_index?(range_start, text_index) && text_index_greater_than_or_equal_to_other_text_index?(range_end, text_index)
@@ -179,6 +242,27 @@ module Glimmer
         end
         tags_and_regions
       end
+      
+      def applied_font_format_value(text_index = nil, font_option)
+        text_index ||= @tk.index('insert')
+        region_start = text_index
+        region_end = @tk.index("#{text_index} + 1 chars")
+        tag_names = applied_font_format_tags_and_regions(region_start, region_end).map(&:first)
+        
+        values = tag_names.map do |tag_name|
+          @tk.tag_ranges(tag_name).map do |range|
+            if text_index_less_than_or_equal_to_other_text_index?(range.first, region_start) && text_index_greater_than_or_equal_to_other_text_index?(range.last, region_end)
+              @tk.tag_cget(tag_name, 'font')
+            end
+          end
+        end.flatten.reject {|value| value.to_s.empty?}
+        
+        font = values.last
+        
+        value = font && font.send(font_option)
+        
+        value || Hash[@tk.font.actual][font_option]
+      end
 
       def add_font_format(region_start, region_end, font_option, value)
         applied_font_format_tags_and_regions(region_start, region_end).each do |tag, tag_region_start, tag_region_end|
@@ -348,11 +432,16 @@ module Glimmer
         self.wrap = 'none'
         self.padx = 5
         self.pady = 5
+#         on('Modified') { apply_all_tag }
       end
       
       def clone_font(font)
         ::TkFont.new(Hash[font.actual])
       end
+      
+#       def apply_all_tag
+#         @tk.tag_add(ALL_TAG, '1.0', 'end')
+#       end
     end
   end
 end

data/samples/elaborate/meta_sample.rb

@@ -56,7 +56,7 @@ class MetaSample
   
   def run_sample(sample)
     Thread.new do
-      command = "ruby -r #{glimmer_dsl_tk_file} #{sample} 2>&1"
+      command = "#{RbConfig.ruby} -r #{glimmer_dsl_tk_file} #{sample} 2>&1"
       result = ''
       IO.popen(command) do |f|
         f.each_line do |line|

data/samples/hello/hello_text.rb

@@ -99,7 +99,7 @@ class HelloText
   end
   
   def launch
-    root { |r|
+    @root = root {
       title 'Hello, Text!'
       width 1280
       height 800
@@ -107,11 +107,6 @@ class HelloText
       frame {
         grid row: 0, column: 0
         
-        label {
-          grid row: 0, column: 0, columnspan: 17
-          text 'Select a region of text and then apply formatting from the toolbar'
-        }
-        
         column_index = -1
         
         combobox {
@@ -143,7 +138,7 @@ class HelloText
           orient 'vertical'
         }
         
-        button {
+        @bold_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'B'
           style font: {weight: 'bold'}
@@ -153,7 +148,7 @@ class HelloText
           end
         }
         
-        button {
+        @italic_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'I'
           style font: {slant: 'italic'}
@@ -163,7 +158,7 @@ class HelloText
           end
         }
         
-        button {
+        @underline_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'U'
           style font: {underline: true}
@@ -172,36 +167,36 @@ class HelloText
             @text.toggle_selection_font_format('underline', true)
           end
         }
-        
+
         separator {
           grid row: 1, column: column_index += 1, column_weight: 0
           orient 'vertical'
         }
         
-        button {
+        @justify_left_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/cut.png", __dir__), subsample: 32
+          image File.expand_path("images/align-left.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_cut
+            @text.add_selection_format('justify', 'left')
           end
         }
         
-        button {
+        @justify_center_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/copy.png", __dir__), subsample: 32
+          image File.expand_path("images/align-center.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_copy
+            @text.add_selection_format('justify', 'center')
           end
         }
         
-        button {
+        @justify_right_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/paste.png", __dir__), subsample: 32
+          image File.expand_path("images/align-right.png", __dir__), subsample: 32
           
           on('command') do
-            @text.text_paste
+            @text.add_selection_format('justify', 'right')
           end
         }
         
@@ -212,51 +207,51 @@ class HelloText
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-left.png", __dir__), subsample: 32
+          image File.expand_path("images/picture.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'left')
+            @text.get_open_file_to_insert_image
           end
         }
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-center.png", __dir__), subsample: 32
+          image File.expand_path("images/search.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'center')
+            show_find_dialog
           end
         }
         
+        separator {
+          grid row: 1, column: column_index += 1, column_weight: 0
+          orient 'vertical'
+        }
+        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/align-right.png", __dir__), subsample: 32
+          image File.expand_path("images/cut.png", __dir__), subsample: 32
           
           on('command') do
-            @text.add_selection_format('justify', 'right')
+            @text.text_cut
           end
         }
         
-        separator {
-          grid row: 1, column: column_index += 1, column_weight: 0
-          orient 'vertical'
-        }
-        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/undo.png", __dir__), subsample: 32
+          image File.expand_path("images/copy.png", __dir__), subsample: 32
           
           on('command') do
-            @text.edit_undo
+            @text.text_copy
           end
         }
         
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/redo.png", __dir__), subsample: 32
+          image File.expand_path("images/paste.png", __dir__), subsample: 32
           
           on('command') do
-            @text.edit_redo
+            @text.text_paste
           end
         }
         
@@ -265,12 +260,22 @@ class HelloText
           orient 'vertical'
         }
         
+        
         button {
           grid row: 1, column: column_index += 1, column_weight: 0
-          image File.expand_path("images/picture.png", __dir__), subsample: 32
+          image File.expand_path("images/undo.png", __dir__), subsample: 32
           
           on('command') do
-            @text.get_open_file_to_insert_image
+            @text.edit_undo
+          end
+        }
+        
+        button {
+          grid row: 1, column: column_index += 1, column_weight: 0
+          image File.expand_path("images/redo.png", __dir__), subsample: 32
+          
+          on('command') do
+            @text.edit_redo
           end
         }
       }
@@ -281,50 +286,66 @@ class HelloText
         undo true
         value <=> [self, :document]
         
+        on('InsertMarkMoved') do
+          self.font_family = @text.applied_font_format_value('family')
+          self.font_size = @text.applied_font_format_value('size')
+          @bold_button.default = @text.applied_font_format_value('weight') == 'bold' ? 'active' : 'normal'
+          @italic_button.default = @text.applied_font_format_value('slant') == 'italic' ? 'active' : 'normal'
+          @underline_button.default = @text.applied_font_format_value('underline') == true ? 'active' : 'normal'
+          self.background = @text.applied_format_value('background')
+          self.foreground = @text.applied_format_value('foreground')
+          @justify_left_button.default = @text.applied_format_value('justify') == 'left' ? 'active' : 'normal'
+          @justify_center_button.default = @text.applied_format_value('justify') == 'center' ? 'active' : 'normal'
+          @justify_right_button.default = @text.applied_format_value('justify') == 'right' ? 'active' : 'normal'
+        end
+        
         on('KeyPress') do |event|
-          if event.state == 8 && event.char == 'f'
-            toplevel(r) { |tl|
-              title 'Find'
-              
-              label {
-                text 'Text:'
-              }
-              entry { |e|
-                focus true
-                text <=> [
-                  self,
-                  :find_text,
-                  after_write: lambda do
-                    text_index = @text.search(/#{find_text}/i, 'insert')
-                    unless text_index.to_s.empty?
-                      @text.tag_remove('sel', '1.0', 'end')
-                      @text.tag_add('sel', text_index, "#{text_index} + #{find_text.size} chars")
-                    end
-                  end
-                ]
-                
-                on('KeyPress') do |event|
-                  if event.keysym == 'Return'
-                    find
-                  elsif event.keysym == 'Escape'
-                    tl.grab_release
-                    tl.destroy
-                  end
-                end
-              }
-              button {
-                text 'Find'
-                default 'active'
+          show_find_dialog if (event.keysym == 'f') && ((OS.mac? && event.state == 8) || (!OS.mac? && event.state == 4))
+        end
+      }
+    }
+    @root.open
+  end
+  
+  def show_find_dialog
+    toplevel(@root) { |tl|
+      title 'Find'
+      
+      label {
+        text 'Text:'
+      }
+      entry { |e|
+        focus true
+        text <=> [
+          self,
+          :find_text,
+          after_write: lambda do
+            text_index = @text.search(/#{find_text}/i, 'insert')
+            unless text_index.to_s.empty?
+              @text.tag_remove('sel', '1.0', 'end')
+              @text.tag_add('sel', text_index, "#{text_index} + #{find_text.size} chars")
+            end
+          end
+        ]
                 
-                on('command') do
-                  find
-                end
-              }
-            }
+        on('KeyPress') do |event|
+          if event.keysym == 'Return'
+            find
+          elsif event.keysym == 'Escape'
+            tl.grab_release
+            tl.destroy
           end
         end
       }
-    }.open
+      button {
+        text 'Find'
+        default 'active'
+        
+        on('command') do
+          find
+        end
+      }
+    }
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.35
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer