glimmer-dsl-tk 0.0.32 → 0.0.36

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/root_proxy.rb

@@ -36,6 +36,7 @@ module Glimmer
 
       def post_add_content
         set_attribute('iconphoto', File.expand_path('../../../icons/glimmer.png', __dir__)) if @tk.iconphoto.nil?
+        super
       end
       
       def open

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 edit_redo
+        begin
+          @tk.edit_redo
+        rescue => e
+          # No Op
+        end
+      end
+      
+      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 remove_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| remove_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 toggle_selection_format(option, value)
-        process_selection_ranges { |range_start, range_end| toggle_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 add_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| add_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 remove_selection_font_format(option, value)
-        process_selection_ranges { |range_start, range_end| remove_font_format(range_start, range_end, option, value) }
+      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)
-        process_selection_ranges { |range_start, range_end| toggle_font_format(range_start, range_end, option, value) }
+      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(&processor)
-        @tk.tag_ranges('sel').each do |region|
+      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|

data/lib/glimmer/tk/toplevel_proxy.rb

@@ -32,6 +32,19 @@ module Glimmer
       DEFAULT_HEIGHT = 95
       
       attr_reader :tk
+      attr_accessor :escapable
+      alias escapable? escapable
+      
+      def post_add_content
+        if escapable?
+           on('KeyPress') do |event|
+            if event.keysym == 'Escape'
+              grab_release
+              destroy
+            end
+          end
+        end
+      end
       
       def has_attribute?(attribute, *args)
         %w[width height x y].include?(attribute.to_s) || super
@@ -114,6 +127,17 @@ module Glimmer
           destroy
         end
       end
+      
+      def mac_style=(mac_class, mac_attribute_list = nil)
+        if OS.mac?
+          @mac_style = [mac_class, mac_attribute_list]
+          ::Tk.tk_call("::tk::unsupported::MacWindowStyle", "style", @tk, *@mac_style.compact)
+        end
+      end
+      
+      def mac_style
+        @mac_style
+      end
     end
   end
 end

data/lib/glimmer/tk/widget_proxy.rb

@@ -460,14 +460,20 @@ module Glimmer
           parent_proxy.handle_listener(listener_name, &listener) if parent_proxy
           # TODO return a listener registration object that has a deregister method
         else
+          @listeners ||= {}
           begin
-            @tk.bind(listener_name, &listener)
+            @listeners[listener_name] ||= []
+            @tk.bind(listener_name) { |event| @listeners[listener_name].each {|l| l.call(event)} } if @listeners[listener_name].empty?
+            @listeners[listener_name] << listener
           rescue => e
+            @listeners.delete(listener_name)
             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.bind(listener_name, &listener)
+            @listeners[listener_name] ||= []
+            @tk.bind(listener_name) { |event| @listeners[listener_name].each {|l| l.call(event)} } if @listeners[listener_name].empty?
+            @listeners[listener_name] << listener
           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_checkbutton.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Andy Maleh
+`# 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

data/samples/hello/hello_text.rb

@@ -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,21 +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/search.png", __dir__), subsample: 32
+          image File.expand_path("images/redo.png", __dir__), subsample: 32
           
           on('command') do
-            show_find_dialog
+            @text.edit_redo
           end
         }
       }
@@ -290,6 +286,19 @@ 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|
           show_find_dialog if (event.keysym == 'f') && ((OS.mac? && event.state == 8) || (!OS.mac? && event.state == 4))
         end
@@ -318,7 +327,7 @@ class HelloText
             end
           end
         ]
-        
+                
         on('KeyPress') do |event|
           if event.keysym == 'Return'
             find