glimmer-cs-gladiator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d1ccef9ac560b19d5acff7ff5513145fa26fef6f326a9e5d0679890783a0c6
-  data.tar.gz: f23b2e85d6158c3e1fa7b3314939042a0fc13a0a2707800ecc3233907ebc4640
+  metadata.gz: f660a554a1e716632a2eec69dc0204d014b93b8f2e10f35f0c6b3b5a29563a47
+  data.tar.gz: cb7758e6669b03bfbdc8925e2c6639885db5406e424edc0860bb7e713c20181c
 SHA512:
-  metadata.gz: 0b46d9f5617ef754cc5b791a8e57b60581a355f6f267300dc3282c8dbe937b78adf6cfe55efb5045dd9d7c46653a5bf0cd7fb79bac6451054c588aef088a7784
-  data.tar.gz: b4dbe7eabd3345ce74ea585584ba5e0bf6acd6b0192289f885418cc51ef6ec5fa3ab9f98fd5223a89cd0efbe09a00974f5bf4bb3cbc4038a8f3a3ab08e86e903
+  metadata.gz: 6a3f4d16e7b301079ccf0af079b53304b07d392ecb12f9f9512366fd95e13ed7b658e5dfeb4f8510aa50b2d49fd4b4ed96c14cdcb0bf7049b06a594500445009
+  data.tar.gz: 184c54cea2a6411bd5a82b078939c637b27cdb37a238e37301447655dc7e7bb646776e3ce247e57d59c088ccd5efbb407870c753b8f3511ad8dbf1604993c7ff

data/README.md

@@ -1,4 +1,4 @@
-# Gladiator (Glimmer Editor) 0.1.2 - Glimmer Custom Shell
+# Gladiator (Glimmer Editor) 0.1.3 - Glimmer Custom Shell
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
@@ -14,7 +14,8 @@ Gladiator currently supports the following text editing features:
 - Find & Replace
 - Show Line Numbers
 - Jump to Line
-- Remember last opened file, caret position, and top line
+- Multiple tab support
+- Remember last opened file, caret position, top line, window size, and window location
 - Autosave on focus out/quit/open new file
 - Watch open file for external changes to reflect in editor
 - Watch subdirectories for changes to reflect in file explorer/file lookup
@@ -50,7 +51,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '0.1.2'
+gem 'glimmer-cs-gladiator', '0.1.3'
 ```
 
 Run:

data/lib/models/glimmer/gladiator/dir.rb

@@ -24,7 +24,7 @@ module Glimmer
         end
       end
   
-      attr_accessor :selected_child, :filter, :children, :filtered_path_options
+      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path
       attr_reader :path, :display_path
   
       def initialize(path)
@@ -102,9 +102,6 @@ module Glimmer
         @selected_child&.path
       end
   
-      alias filtered_path selected_child_path
-      alias filtered_path= selected_child_path=
-  
       def to_s
         path
       end

data/lib/models/glimmer/gladiator/file.rb

@@ -6,11 +6,12 @@ module Glimmer
       include Glimmer
   
       attr_accessor :dirty_content, :line_numbers_content, :caret_position, :selection_count, :line_number, :find_text, :replace_text, :top_index
-      attr_reader :path, :display_path
+      attr_reader :path, :display_path, :name
   
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
         @display_path = path
+        @name = ::File.basename(path)
         @path = ::File.expand_path(path)
         read_dirty_content = ::File.read(path)
         begin
@@ -28,7 +29,7 @@ module Glimmer
             if line_number
               line_index = line_number - 1
               new_caret_position = caret_position_for_line_index(line_index)
-              self.caret_position = new_caret_position unless line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(caret_position)
+              self.caret_position = new_caret_position unless self.caret_position && line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(caret_position)
             end
           end
         rescue
@@ -57,18 +58,22 @@ module Glimmer
       def stop_filewatcher
         @filewatcher&.stop
       end
-  
-      def write_dirty_content
+
+      def format_dirty_content_for_writing!
         new_dirty_content = "#{dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"      
         self.dirty_content = new_dirty_content if new_dirty_content != self.dirty_content
-        ::File.write(path, dirty_content) if ::File.exists?(path) && dirty_content.to_s.strip.size > 0
+      end
+  
+      def write_dirty_content
+        format_dirty_content_for_writing!
+        ::File.write(path, dirty_content) if ::File.exists?(path)
       rescue => e
         puts "Error in writing dirty content for #{path}"
         puts e.full_message
       end
   
       def write_raw_dirty_content
-        ::File.write(path, dirty_content) if ::File.exists?(path) && dirty_content.to_s.strip.size > 0
+        ::File.write(path, dirty_content) if ::File.exists?(path)
       rescue => e
         puts "Error in writing raw dirty content for #{path}"
         puts e.full_message
@@ -99,7 +104,7 @@ module Glimmer
           end
         end
         self.dirty_content = new_lines.join("\n")   
-        if old_selection_count > 0
+        if old_selection_count.to_i > 0
           self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
@@ -125,7 +130,7 @@ module Glimmer
         end
         old_caret_position = self.caret_position
         self.dirty_content = new_lines.join("\n")   
-        if old_selection_count > 0
+        if old_selection_count.to_i > 0
           self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
@@ -154,7 +159,7 @@ module Glimmer
           end
         end
         self.dirty_content = new_lines.join("\n")   
-        if old_selection_count > 0
+        if old_selection_count.to_i > 0
           self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
@@ -166,12 +171,15 @@ module Glimmer
   
       def kill_line!
         new_lines = lines
-        return if new_lines.size < 2
+        return if new_lines.size < 1
         line_indices = line_indices_for_selection(caret_position, selection_count)
         new_lines = new_lines[0...line_indices.first] + new_lines[(line_indices.last+1)...new_lines.size]
         old_caret_position = self.caret_position
-        self.dirty_content = new_lines.join("\n")
-        self.caret_position = old_caret_position
+        old_line_index = self.line_number - 1
+        line_position = line_position_for_caret_position(old_caret_position)
+        self.dirty_content = "#{new_lines.join("\n")}\n"
+        self.caret_position = caret_position_for_line_index(old_line_index) + [line_position, lines[old_line_index].to_s.size].min
+        self.selection_count = 0
       end
   
       def duplicate_line!
@@ -190,7 +198,7 @@ module Glimmer
           new_lines.insert(the_line_indices.first + i, the_line)
         end
         self.dirty_content = new_lines.join("\n")
-        if old_selection_count > 0
+        if old_selection_count.to_i > 0
           self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
@@ -202,12 +210,21 @@ module Glimmer
         return if find_text.to_s.empty?
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
-        all_lines.rotate(the_line_index + 1).each_with_index do |the_line, the_index|
-          the_index = (the_index + the_line_index + 1)%all_lines.size
-          if the_line.downcase.include?(find_text.to_s.downcase)
-            self.caret_position = the_line.downcase.index(find_text.to_s.downcase) + caret_position_for_line_index(the_index)
-            self.selection_count = find_text.to_s.size
-            return
+        line_position = line_position_for_caret_position(caret_position)
+        found = 
+        2.times do |i|
+          rotation = the_line_index
+          all_lines.rotate(rotation).each_with_index do |the_line, the_index|
+            the_index = (the_index + rotation)%all_lines.size
+            start_position = 0
+            start_position = line_position + find_text.to_s.size if i == 0 && the_index == the_line_index && found_text?(caret_position)
+            text_to_find_in = the_line.downcase[start_position..-1]
+            occurrence_index = text_to_find_in.index(find_text.to_s.downcase)
+            if occurrence_index
+              self.caret_position = caret_position_for_line_index(the_index) + start_position + occurrence_index
+              self.selection_count = find_text.to_s.size
+              return
+            end
           end
         end
       end
@@ -216,21 +233,34 @@ module Glimmer
         return if find_text.to_s.empty?
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
-        all_lines.rotate(the_line_index).each_with_index.map do |the_line, the_index|
-          the_index = (the_index + the_line_index)%all_lines.size
-          [the_line, the_index]
-        end.reverse.each do |the_line, the_index|
-          if the_line.downcase.include?(find_text.to_s.downcase)
-            self.caret_position = the_line.downcase.index(find_text.to_s.downcase) + caret_position_for_line_index(the_index)
-            self.selection_count = find_text.to_s.size
-            return
+        line_position = line_position_for_caret_position(caret_position)
+        2.times do |i|
+          rotation = - the_line_index - 1 + all_lines.size
+          all_lines.reverse.rotate(rotation).each_with_index do |the_line, the_index|
+            the_index = all_lines.size - 1 - (the_index + rotation)%all_lines.size
+            if the_index == the_line_index
+              start_position = i > 0 ? 0 : (the_line.size - line_position)
+            else
+              start_position = 0
+            end
+            text_to_find_in = the_line.downcase.reverse[start_position...the_line.size].to_s
+            occurrence_index = text_to_find_in.index(find_text.to_s.downcase.reverse)
+            if occurrence_index
+              self.caret_position = caret_position_for_line_index(the_index) + (the_line.size - (start_position + occurrence_index + find_text.to_s.size))
+              self.selection_count = find_text.to_s.size
+              return
+            end
           end
         end
       end
   
       def ensure_find_next
         return if find_text.to_s.empty? || dirty_content.to_s.strip.size < 1
-        find_next unless dirty_content[caret_position.to_i, find_text.to_s.size] == find_text
+        find_next unless found_text?(self.caret_position)
+      end
+
+      def found_text?(caret_position)
+        dirty_content[caret_position.to_i, find_text.to_s.size].to_s.downcase == find_text.to_s.downcase
       end
   
       def replace_next!
@@ -263,23 +293,18 @@ module Glimmer
         return if old_lines.size < 2
         old_selection_count = self.selection_count
         old_caret_position = self.caret_position
-        old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
-        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position_line_index)
+        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position)
+        old_caret_position_line_position = old_caret_position - old_caret_position_line_caret_position
         old_end_caret_line_index = end_caret_position_line_index(caret_position, selection_count)
         new_lines = lines
         the_line_indices = line_indices_for_selection(caret_position, selection_count)
         the_lines = lines_for_selection(caret_position, selection_count)
         new_line_index = [the_line_indices.first - 1, 0].max
-        delta = -1 * (new_lines[new_line_index].size + 1)
         new_lines[the_line_indices.first..the_line_indices.last] = []
         new_lines[new_line_index...new_line_index] = the_lines
         self.dirty_content = new_lines.join("\n")
-        if old_selection_count > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index) + delta
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position + delta)
-        else
-          self.caret_position = old_caret_position + delta
-        end
+        self.caret_position = caret_position_for_line_index(new_line_index) + [old_caret_position_line_position, new_lines[new_line_index].size].min
+        self.selection_count = old_selection_count.to_i if old_selection_count.to_i > 0
       end
   
       def move_down!
@@ -287,23 +312,18 @@ module Glimmer
         return if old_lines.size < 2
         old_selection_count = self.selection_count
         old_caret_position = self.caret_position
-        old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
-        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position_line_index)
+        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position)
+        old_caret_position_line_position = old_caret_position - old_caret_position_line_caret_position
         old_end_caret_line_index = end_caret_position_line_index(caret_position, selection_count)
         new_lines = lines
         the_line_indices = line_indices_for_selection(caret_position, selection_count)
         the_lines = lines_for_selection(caret_position, selection_count)
         new_line_index = [the_line_indices.first + 1, new_lines.size - 1].min
-        delta = new_lines[new_line_index].size + 1
         new_lines[the_line_indices.first..the_line_indices.last] = []
         new_lines[new_line_index...new_line_index] = the_lines
         self.dirty_content = new_lines.join("\n")
-        if old_selection_count > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index) + delta
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position + delta)
-        else
-          self.caret_position = old_caret_position + delta
-        end
+        self.caret_position = caret_position_for_line_index(new_line_index) + [old_caret_position_line_position, new_lines[new_line_index].size].min
+        self.selection_count = old_selection_count.to_i if old_selection_count.to_i > 0
       end
   
       def lines
@@ -327,6 +347,13 @@ module Glimmer
       def caret_position_for_caret_position_start_of_line(caret_position)
         caret_position_for_line_index(line_index_for_caret_position(caret_position))
       end
+
+      # position within line containing "caret position" (e.g. for caret position 5 in 1st line, they match as 5, for 15 in line 2 with line 1 having 10 characters, line position is 4)
+      # TODO consider renaming to line_character_position_for_caret_position
+      def line_position_for_caret_position(caret_position)
+        caret_position = caret_position.to_i
+        caret_position - caret_position_for_caret_position_start_of_line(caret_position)
+      end
   
       def line_caret_positions_for_selection(caret_position, selection_count)
         line_indices = line_indices_for_selection(caret_position, selection_count)

data/lib/views/glimmer/gladiator/text_editor.rb

@@ -0,0 +1,95 @@
+module Glimmer
+  class Gladiator
+    class TextEditor
+      include Glimmer::UI::CustomWidget
+
+      options :file
+
+      attr_reader :text_widget
+
+      after_body {
+        @text_widget = @text.swt_widget
+      }
+      
+      body {
+        composite {
+          layout_data :fill, :fill, true, true
+          grid_layout 2, false
+          @line_numbers_text = text(:multi) {
+            layout_data(:right, :fill, false, true)
+            font name: 'Consolas', height: 15
+            background color(:widget_background)
+            foreground rgb(75, 75, 75)
+            text bind(file, 'line_numbers_content')
+            top_index bind(file, 'top_index')
+            on_focus_gained {
+              @text&.swt_widget.setFocus
+            }
+            on_key_pressed {
+              @text&.swt_widget.setFocus
+            }
+            on_mouse_up {
+              @text&.swt_widget.setFocus
+            }
+          }
+          @text = text(:multi, :border, :h_scroll, :v_scroll) {
+            layout_data :fill, :fill, true, true
+            font name: 'Consolas', height: 15
+            foreground rgb(75, 75, 75)
+            text bind(file, 'dirty_content')
+            focus true
+            caret_position bind(file, 'caret_position')
+            selection_count bind(file, 'selection_count')
+            top_index bind(file, 'top_index')
+            on_focus_lost {
+              file&.write_dirty_content
+            }
+      	     on_key_pressed { |key_event|
+              if key_event.stateMask == swt(:command) && key_event.character.chr.downcase == '/'
+                file.comment_line!
+              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == 'k'
+                file.kill_line!
+              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == 'd'
+                file.duplicate_line!
+              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == '['
+                file.outdent!
+              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == ']'
+                file.indent!
+              elsif key_event.keyCode == swt(:page_up)
+                file.page_up
+                key_event.doit = false
+              elsif key_event.keyCode == swt(:page_down)
+                file.page_down
+                key_event.doit = false
+              elsif key_event.keyCode == swt(:home)
+                file.home
+                key_event.doit = false
+              elsif key_event.keyCode == swt(:end)
+                file.end
+                key_event.doit = false
+              elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:arrow_up)
+                file.move_up!
+                key_event.doit = false
+              elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:arrow_down)
+                file.move_down!
+                key_event.doit = false
+              end
+            }
+            on_verify_text { |verify_event|
+              key_code = verify_event.keyCode
+              case key_code
+              when swt(:tab)
+                if file.selection_count.to_i > 0
+                  file.indent!
+                  verify_event.doit = false
+                else
+                  verify_event.text = '  '
+                end
+              end
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/lib/views/glimmer/gladiator.rb

@@ -1,6 +1,8 @@
 require 'models/glimmer/gladiator/dir'
 require 'models/glimmer/gladiator/file'
 
+require 'views/glimmer/gladiator/text_editor'
+
 Clipboard.implementation = Clipboard::Java
 Clipboard.copy(Clipboard.paste) # pre-initialize library to avoid slowdown during use
 
@@ -24,12 +26,11 @@ module Glimmer
       @config_file_path = ::File.join(local_dir, '.gladiator')
       @config = {}
       Gladiator::Dir.local_dir.all_children # pre-caches children
-      load_config
       @display = display {
         on_event_keydown { |key_event|
           if Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'f'
-            if @text.swt_widget.getSelectionText && @text.swt_widget.getSelectionText.size > 0
-              @find_text.swt_widget.setText @text.swt_widget.getSelectionText
+            if @text_editor.text_widget.getSelectionText && @text_editor.text_widget.getSelectionText.size > 0
+              @find_text.swt_widget.setText @text_editor.text_widget.getSelectionText
             end
             @find_text.swt_widget.selectAll
             @find_text.swt_widget.setFocus
@@ -37,6 +38,26 @@ module Glimmer
             Clipboard.copy(Gladiator::Dir.local_dir.selected_child.path)
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == 'g'
             Gladiator::Dir.local_dir.selected_child.find_previous
+#           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == 'w'
+#             @tab_folder.swt_widget.getItems.each(&:dispose)
+#           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :alt) && key_event.character.chr.downcase == 'w'
+#             @tab_folder.swt_widget.getItems.each do |ti|
+#               ti.dispose unless ti == @tab_folder.swt_widget.getSelection()
+#             end
+#           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'w'
+#             @tab_folder.swt_widget.getSelection.each(&:dispose)
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == ']'
+            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() + 1, @tab_folder.swt_widget.getItemCount - 1].min) if @tab_folder.swt_widget.getItemCount > 0
+            @text_editor.text_widget.setFocus
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == '['
+            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() - 1, 0].max) if @tab_folder.swt_widget.getItemCount > 0
+            @text_editor.text_widget.setFocus
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '1'
+            @tab_folder.swt_widget.setSelection(0) if @tab_folder.swt_widget.getItemCount > 0
+            @text_editor.text_widget.setFocus
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '9'
+            @tab_folder.swt_widget.setSelection(@tab_folder.swt_widget.getItemCount - 1) if @tab_folder.swt_widget.getItemCount > 0
+            @text_editor.text_widget.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'g'
             Gladiator::Dir.local_dir.selected_child.find_next
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'l'
@@ -56,20 +77,42 @@ module Glimmer
     #
     after_body {
       observe(Gladiator::Dir.local_dir, 'selected_child') do
-        @field_container.swt_widget.pack
-      end
-      observe(Gladiator::Dir.local_dir, 'selected_child.line_numbers_content') do
-        if @last_line_numbers_content != Gladiator::Dir.local_dir.selected_child.line_numbers_content
+        selected_file = Gladiator::Dir.local_dir.selected_child
+        found_tab_item = @tab_folder.swt_widget.getItems.detect {|ti| ti.getData('file_path') == selected_file.path}
+        if found_tab_item
+          @tab_folder.swt_widget.setSelection(found_tab_item)
+          @tab_item = found_tab_item.getData('tab_item')
+          @text_editor = found_tab_item.getData('text_editor')
+        else
+          @tab_folder.content {
+            @tab_item = tab_item { |the_tab_item|
+              text selected_file.name
+              fill_layout :horizontal
+              @text_editor = the_text_editor = text_editor(file: selected_file)
+              on_event_show {
+                Gladiator::Dir.local_dir.selected_child = selected_file
+                @tab_item = the_tab_item
+                @text_editor = the_text_editor
+              }
+            }
+            @tab_item.swt_tab_item.setData('file_path', selected_file.path)
+            @tab_item.swt_tab_item.setData('tab_item', @tab_item)
+            @tab_item.swt_tab_item.setData('text_editor', @text_editor)
+          }                  
+          @tab_folder.swt_widget.setSelection(@tab_item.swt_tab_item)
           body_root.pack_same_size
-          @last_line_numbers_content = Gladiator::Dir.local_dir.selected_child.line_numbers_content
         end
       end
+      observe(Gladiator::Dir.local_dir, 'selected_child') do
+        save_config
+      end
       observe(Gladiator::Dir.local_dir, 'selected_child.caret_position') do
         save_config
       end
       observe(Gladiator::Dir.local_dir, 'selected_child.top_index') do
         save_config
-      end     
+      end
+      load_config
     }
 
     ## Add widget content inside custom shell body
@@ -87,6 +130,12 @@ module Glimmer
         on_widget_disposed {
           Gladiator::Dir.local_dir.selected_child&.write_dirty_content
         }
+        on_control_resized {
+          save_config
+        }
+        on_control_moved {
+          save_config
+        }
         composite {
           grid_layout 1, false
           layout_data(:fill, :fill, false, true) {
@@ -104,7 +153,7 @@ module Glimmer
                 @list.swt_widget.select(0) if @list.swt_widget.getSelectionIndex() == -1
                 @list.swt_widget.setFocus
               elsif key_event.keyCode == swt(:esc)
-                @text.swt_widget.setFocus
+                @text_editor.text_widget.setFocus
               end
             }    
           }
@@ -116,13 +165,13 @@ module Glimmer
               }
               #visible bind(Gladiator::Dir, 'local_dir.filter') {|f| !!f}
               selection bind(Gladiator::Dir.local_dir, :filtered_path)
-              on_widget_selected {
+              on_mouse_up {
                 Gladiator::Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
               }
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr) || Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :lf)
                   Gladiator::Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
-                  @text.swt_widget.setFocus
+                  @text_editor.text_widget.setFocus
                 end
               }
             }
@@ -138,7 +187,7 @@ module Glimmer
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr) || Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :lf)
                   Gladiator::Dir.local_dir.selected_child_path = @tree.swt_widget.getSelection&.first&.getText
-                  @text.swt_widget.setFocus
+                  @text_editor.text_widget.setFocus
                 end
               }
               on_paint_control {
@@ -150,10 +199,10 @@ module Glimmer
             }
           }
         }
-        composite {
+        @editor_container = composite {
           grid_layout 1, false
           layout_data :fill, :fill, true, true
-          @field_container = composite {
+          composite {
             grid_layout 2, false
             @file_path_label = styled_text(:none) {
               layout_data(:fill, :fill, true, false) {
@@ -180,7 +229,7 @@ module Glimmer
               text bind(Gladiator::Dir.local_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
               on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
-                  @text.swt_widget.setFocus
+                  @text_editor.text_widget.setFocus
                 end
               }
             }
@@ -196,7 +245,7 @@ module Glimmer
                 if key_event.keyCode == swt(:cr)
                   Gladiator::Dir.local_dir.selected_child.find_next
                 elsif key_event.keyCode == swt(:esc)
-                  @text.swt_widget.setFocus
+                  @text_editor.text_widget.setFocus
                 end
               }
             }
@@ -215,87 +264,13 @@ module Glimmer
                 if key_event.keyCode == swt(:cr)
                   Gladiator::Dir.local_dir.selected_child.replace_next!
                 elsif key_event.keyCode == swt(:esc)
-                  @text.swt_widget.setFocus
+                  @text_editor.text_widget.setFocus
                 end
               }
             }
           }
-          composite {
-            layout_data :fill, :fill, true, true
-            grid_layout 2, false  
-            @line_numbers_text = text(:multi) {
-              layout_data(:right, :fill, false, true)
-              font name: 'Consolas', height: 15
-              background color(:widget_background)
-              foreground rgb(75, 75, 75)
-              text bind(Gladiator::Dir.local_dir, 'selected_child.line_numbers_content')
-              top_index bind(Gladiator::Dir.local_dir, 'selected_child.top_index')
-              on_focus_gained {
-                @text&.swt_widget.setFocus
-              }
-              on_key_pressed {
-                @text&.swt_widget.setFocus
-              }
-              on_mouse_up {
-                @text&.swt_widget.setFocus
-              }
-            }
-            @text = text(:multi, :border, :h_scroll, :v_scroll) {
-              layout_data :fill, :fill, true, true
-              font name: 'Consolas', height: 15
-              foreground rgb(75, 75, 75)
-              text bind(Gladiator::Dir.local_dir, 'selected_child.dirty_content')
-              focus true
-              caret_position bind(Gladiator::Dir.local_dir, 'selected_child.caret_position')
-              selection_count bind(Gladiator::Dir.local_dir, 'selected_child.selection_count')
-              top_index bind(Gladiator::Dir.local_dir, 'selected_child.top_index')
-              on_focus_lost {
-                Gladiator::Dir.local_dir.selected_child&.write_dirty_content
-              }
-        	     on_key_pressed { |key_event|
-                if Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '/'
-                  Gladiator::Dir.local_dir.selected_child.comment_line!
-                elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'k'
-                  Gladiator::Dir.local_dir.selected_child.kill_line!
-                elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'd'
-                  Gladiator::Dir.local_dir.selected_child.duplicate_line!
-                elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '['
-                  Gladiator::Dir.local_dir.selected_child.outdent!
-                elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == ']'
-                  Gladiator::Dir.local_dir.selected_child.indent!
-                elsif key_event.keyCode == swt(:page_up)
-                  Gladiator::Dir.local_dir.selected_child.page_up
-                  key_event.doit = false
-                elsif key_event.keyCode == swt(:page_down)
-                  Gladiator::Dir.local_dir.selected_child.page_down
-                  key_event.doit = false
-                elsif key_event.keyCode == swt(:home)
-                  Gladiator::Dir.local_dir.selected_child.home
-                  key_event.doit = false
-                elsif key_event.keyCode == swt(:end)
-                  Gladiator::Dir.local_dir.selected_child.end
-                  key_event.doit = false
-                elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:arrow_up)
-                  Gladiator::Dir.local_dir.selected_child.move_up!
-                  key_event.doit = false
-                elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:arrow_down)
-                  Gladiator::Dir.local_dir.selected_child.move_down!
-                  key_event.doit = false
-                end
-              }
-              on_verify_text { |verify_event|
-                key_code = verify_event.keyCode
-                case key_code
-                when swt(:tab)
-                  if Gladiator::Dir.local_dir.selected_child.selection_count.to_i > 0
-                    Gladiator::Dir.local_dir.selected_child.indent!
-                    verify_event.doit = false
-                  else
-                    verify_event.text = '  '
-                  end
-                end
-              }
-            }
+          @tab_folder = tab_folder {
+            layout_data(:fill, :fill, true, true) 
           }
         }
       }
@@ -309,16 +284,26 @@ module Glimmer
         Gladiator::Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
         Gladiator::Dir.local_dir.selected_child&.caret_position  = Gladiator::Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position]) if @config[:caret_position]
         Gladiator::Dir.local_dir.selected_child&.top_index = @config[:top_index] if @config[:top_index]
+        body_root.on_event_show do
+          swt_widget.setSize(@config[:shell_width], @config[:shell_height]) if @config[:shell_width] && @config[:shell_height]
+          swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]
+          @loaded_config = true
+        end
       end
     end
   
     def save_config
+      return unless @loaded_config
       child = Gladiator::Dir.local_dir.selected_child
       return if child.nil?
       @config = {
         selected_child_path: child.path,
         caret_position: child.caret_position,
         top_index: child.top_index,
+        shell_width: swt_widget&.getBounds&.width,
+        shell_height: swt_widget&.getBounds&.height,
+        shell_x: swt_widget&.getBounds&.x,
+        shell_y: swt_widget&.getBounds&.y,
       }
       config_yaml = YAML.dump(@config)
       ::File.write(@config_file_path, config_yaml) unless config_yaml.to_s.empty?

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  name: puts_debuggerer
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: Gladiator (short for Glimmer Editor) is a Glimmer sample project under
   on-going development. It is not intended to be a full-fledged editor by any means,
   yet mostly a fun educational exercise in using Glimmer to build a text editor. Gladiator
@@ -116,6 +130,7 @@ files:
 - lib/models/glimmer/gladiator/dir.rb
 - lib/models/glimmer/gladiator/file.rb
 - lib/views/glimmer/gladiator.rb
+- lib/views/glimmer/gladiator/text_editor.rb
 homepage: http://github.com/AndyObtiva/glimmer-cs-gladiator
 licenses:
 - MIT