textbringer 0.3.2 → 1.0.4

data/lib/textbringer/commands/fill.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+require "stringio"
 
 module Textbringer
   module FillExtension
@@ -38,7 +38,7 @@ def fill_paragraph
 
       def fill_string(str, column)
         input = StringIO.new(str)
-        output = String.new
+        output = +""
         fill_column = CONFIG[:fill_column]
         prev_c = nil
         while c = input.getc

data/lib/textbringer/commands/help.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     HELP_RING = Ring.new
@@ -23,27 +21,36 @@ def show_help
     end
     private :show_help
 
+    def keymap_bindings(keymap)
+      s = format("%-16s  %s\n", "Key", "Binding")
+      s << format("%-16s  %s\n", "---", "-------")
+      s << "\n"
+      keymap.each do |key_sequence, command|
+        if command != :self_insert
+          s << format("%-16s  [%s]\n",
+                      Keymap.key_sequence_string(key_sequence),
+                      command)
+        end
+      end
+      s
+    end
+
     define_command(:describe_bindings,
                    doc: "Display the key bindings.") do
       show_help do |help|
-        s = format("%-16s  %s\n", "Key", "Binding")
-        s << format("%-16s  %s\n", "---", "-------")
-        s << "\n"
-        bindings = {}
-        [
-          GLOBAL_MAP,
-          Buffer.current.keymap,
-          Controller.current.overriding_map
-        ].each do |map|
-          map&.each do |key_sequence, command|
-            bindings[key_sequence] = command
-          end
+        s = ""
+        if Controller.current.overriding_map
+          s << "Overriding Bindings:\n"
+          s << keymap_bindings(Controller.current.overriding_map)
+          s << "\n"
         end
-        bindings.each do |key_sequence, command|
-          s << format("%-16s  [%s]\n",
-                      Keymap.key_sequence_string(key_sequence),
-                      command)
+        if Buffer.current.keymap
+          s << "Current Buffer Bindings:\n"
+          s << keymap_bindings(Buffer.current.keymap)
+          s << "\n"
         end
+        s << "Global Bindings:\n"
+        s << keymap_bindings(GLOBAL_MAP)
         help.insert(s)
       end
       push_help_command([:describe_bindings])

data/lib/textbringer/commands/isearch.rb

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
-    ISEARCH_MODE_MAP = Keymap.new
+    define_keymap :ISEARCH_MODE_MAP
     (?\x20..?\x7e).each do |c|
       ISEARCH_MODE_MAP.define_key(c, :isearch_printing_char)
     end
@@ -21,6 +19,7 @@ module Commands
     ISEARCH_MODE_MAP.define_key(?\C-w, :isearch_yank_word_or_char)
     ISEARCH_MODE_MAP.define_key(?\C-m, :isearch_exit)
     ISEARCH_MODE_MAP.define_key(?\C-g, :isearch_abort)
+    ISEARCH_MODE_MAP.define_key(?\C-q, :isearch_quoted_insert)
 
     ISEARCH_STATUS = {
       forward: true,
@@ -43,7 +42,7 @@ module Commands
 
     def isearch_mode(forward, recursive_edit: false)
       ISEARCH_STATUS[:forward] = forward
-      ISEARCH_STATUS[:string] = String.new
+      ISEARCH_STATUS[:string] = +""
       ISEARCH_STATUS[:recursive_edit] = recursive_edit
       Controller.current.overriding_map = ISEARCH_MODE_MAP
       run_hooks(:isearch_mode_hook)
@@ -116,6 +115,14 @@ def isearch_done
       end
     end
 
+    define_command(:isearch_quoted_insert, doc: <<~EOD) do
+        Read a character, and add it to the search string and search.
+      EOD
+      c = Controller.current.read_event
+      ISEARCH_STATUS[:string].concat(c)
+      isearch_search
+    end
+
     def isearch_search
       forward = ISEARCH_STATUS[:forward]
       options = if /\A[A-Z]/.match?(ISEARCH_STATUS[:string])

data/lib/textbringer/commands/keyboard_macro.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     KEYBOARD_MACROS = {}

data/lib/textbringer/commands/misc.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     define_command(:version) do
@@ -141,7 +139,7 @@ def complete_minibuffer_with_string(s)
       end
     end
 
-    UNIVERSAL_ARGUMENT_MAP = Keymap.new
+    define_keymap :UNIVERSAL_ARGUMENT_MAP
     (?0..?9).each do |c|
       UNIVERSAL_ARGUMENT_MAP.define_key(c, :digit_argument)
       GLOBAL_MAP.define_key("\e#{c}", :digit_argument)
@@ -278,35 +276,39 @@ def goto_global_mark
       Window.redisplay
       signals = [:INT, :TERM, :KILL]
       begin
-        opts = /mswin32|mingw32/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
+        opts = /mswin|mingw/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
         if CONFIG[:shell_file_name]
           cmd = [CONFIG[:shell_file_name], CONFIG[:shell_command_switch], cmd]
         end
-        Open3.popen2e(*cmd, opts) do |input, output, wait_thread|
+        Open3.popen3(*cmd, opts) do |input, output, error, wait_thread|
           input.close
-          loop do
-            status = output.wait_readable(0.5)
-            if status
-              begin
-                s = output.read_nonblock(1024).force_encoding("utf-8").
-                  scrub("\u{3013}").gsub(/\r\n/, "\n")
-                buffer.insert(s)
-                Window.redisplay
-              rescue EOFError
-                break
-              rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-                next
+          catch(:finish) do
+            loop do
+              rs, = IO.select([output, error], nil, nil, 0.5)
+              Window.redisplay
+              rs&.each do |r|
+                begin
+                  s = r.read_nonblock(1024).force_encoding("utf-8").
+                    scrub("\u{3013}").gsub(/\r\n/, "\n")
+                  buffer.insert(s)
+                  Window.redisplay
+                rescue EOFError
+                  throw(:finish)
+                rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+                  Window.redisplay
+                  next
+                end
               end
-            end
-            if received_keyboard_quit?
-              if signals.empty?
-                keyboard_quit
-              else
-                sig = signals.shift
-                pid = wait_thread.pid
-                pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
-                message("Send #{sig} to #{pid}")
-                Process.kill(sig, pid)
+              if received_keyboard_quit?
+                if signals.empty?
+                  keyboard_quit
+                else
+                  sig = signals.shift
+                  pid = wait_thread.pid
+                  pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
+                  message("Send #{sig} to #{pid}")
+                  Process.kill(sig, pid)
+                end
               end
             end
           end

data/lib/textbringer/commands/register.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     class BufferPosition

data/lib/textbringer/commands/replace.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     RE_SEARCH_STATUS = {

data/lib/textbringer/commands/server.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "drb"
 
 module Textbringer

data/lib/textbringer/commands/windows.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     define_command(:resize_window,

data/lib/textbringer/config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   CONFIG = {
     east_asian_ambiguous_width: 1,

data/lib/textbringer/controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   TOP_LEVEL_TAG = Object.new
   RECURSIVE_EDIT_TAG = Object.new
@@ -128,7 +126,7 @@ def read_event
         else
           wait_files = [STDIN, @next_tick_input]
         end
-        files, = IO.select(wait_files, [], [], 1)
+        files, = IO.select(wait_files, nil, nil, 1)
         # KEY_RESIZE may be returned even if STDIN is not included in files.
         event = read_event_nonblock
         if event
@@ -178,7 +176,7 @@ def echo_input
           return if wait_input(1000)
         end
         @echo_immediately = true
-        s = String.new
+        s = +""
         if @prefix_arg
           s << "C-u"
           if @prefix_arg != [4]

data/lib/textbringer/errors.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class EditorError < StandardError
   end

data/lib/textbringer/face.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "curses"
 
 module Textbringer

data/lib/textbringer/faces/basic.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   Face.define :mode_line, reverse: true
   Face.define :link, foreground: "blue", bold: true

data/lib/textbringer/faces/programming.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   Face.define :comment, foreground: "yellow"
   Face.define :preprocessing_directive, foreground: "green"

data/lib/textbringer/keymap.rb

@@ -1,4 +1,10 @@
-# frozen_string_literal: true
+class Module
+  def define_keymap(name)
+    unless const_defined?(name, false)
+      const_set(name, Textbringer::Keymap.new)
+    end
+  end
+end
 
 module Textbringer
   class Keymap
@@ -74,7 +80,16 @@ def self.key_name(key)
     end
 
     def self.key_sequence_string(key_sequence)
-      key_sequence.map { |key| key_name(key) }.join(" ")
+      ks = key_sequence.dup
+      key_names = []
+      while key = ks.shift
+        if key == "\e" && !ks.empty?
+          key_names.push("M-" + key_name(ks.shift))
+        else
+          key_names.push(key_name(key))
+        end
+      end
+      key_names.join(" ")
     end
 
     private
@@ -84,7 +99,7 @@ def kbd(key)
       when Symbol
         [key]
       when String
-        key.chars
+        key.b.gsub(/[\x80-\xff]/n) { |c| "\e" + (c.ord & 0x7f).chr }.chars
       when Array
         key
       else
@@ -93,17 +108,17 @@ def kbd(key)
     end
   end
 
-  GLOBAL_MAP = Keymap.new
+  define_keymap :GLOBAL_MAP
   GLOBAL_MAP.define_key(:resize, :resize_window)
   GLOBAL_MAP.define_key(:right, :forward_char)
   GLOBAL_MAP.define_key(?\C-f, :forward_char)
   GLOBAL_MAP.define_key(:left, :backward_char)
   GLOBAL_MAP.define_key(?\C-b, :backward_char)
-  GLOBAL_MAP.define_key("\ef", :forward_word)
-  GLOBAL_MAP.define_key("\eb", :backward_word)
-  GLOBAL_MAP.define_key("\egc", :goto_char)
-  GLOBAL_MAP.define_key("\egg", :goto_line)
-  GLOBAL_MAP.define_key("\eg\eg", :goto_line)
+  GLOBAL_MAP.define_key("\M-f", :forward_word)
+  GLOBAL_MAP.define_key("\M-b", :backward_word)
+  GLOBAL_MAP.define_key("\M-gc", :goto_char)
+  GLOBAL_MAP.define_key("\M-gg", :goto_line)
+  GLOBAL_MAP.define_key("\M-g\M-g", :goto_line)
   GLOBAL_MAP.define_key(:down, :next_line)
   GLOBAL_MAP.define_key(?\C-n, :next_line)
   GLOBAL_MAP.define_key(:up, :previous_line)
@@ -117,8 +132,8 @@ def kbd(key)
   GLOBAL_MAP.define_key(:home, :beginning_of_line)
   GLOBAL_MAP.define_key(?\C-e, :end_of_line)
   GLOBAL_MAP.define_key(:end, :end_of_line)
-  GLOBAL_MAP.define_key("\e<", :beginning_of_buffer)
-  GLOBAL_MAP.define_key("\e>", :end_of_buffer)
+  GLOBAL_MAP.define_key("\M-<", :beginning_of_buffer)
+  GLOBAL_MAP.define_key("\M->", :end_of_buffer)
   (?\x20..?\x7e).each do |c|
     GLOBAL_MAP.define_key(c, :self_insert)
   end
@@ -126,15 +141,15 @@ def kbd(key)
   GLOBAL_MAP.define_key(?\C-q, :quoted_insert)
   GLOBAL_MAP.define_key("\C-@", :set_mark_command)
   GLOBAL_MAP.define_key("\C-x\C-@", :pop_global_mark)
-  GLOBAL_MAP.define_key("\e*", :next_global_mark)
-  GLOBAL_MAP.define_key("\e?", :previous_global_mark)
+  GLOBAL_MAP.define_key("\M-*", :next_global_mark)
+  GLOBAL_MAP.define_key("\M-?", :previous_global_mark)
   GLOBAL_MAP.define_key("\C-x\C-x", :exchange_point_and_mark)
-  GLOBAL_MAP.define_key("\ew", :copy_region)
+  GLOBAL_MAP.define_key("\M-w", :copy_region)
   GLOBAL_MAP.define_key(?\C-w, :kill_region)
   GLOBAL_MAP.define_key(?\C-k, :kill_line)
-  GLOBAL_MAP.define_key("\ed", :kill_word)
+  GLOBAL_MAP.define_key("\M-d", :kill_word)
   GLOBAL_MAP.define_key(?\C-y, :yank)
-  GLOBAL_MAP.define_key("\ey", :yank_pop)
+  GLOBAL_MAP.define_key("\M-y", :yank_pop)
   GLOBAL_MAP.define_key(?\C-_, :undo)
   GLOBAL_MAP.define_key("\C-xu", :undo)
   GLOBAL_MAP.define_key("\C-x\C-_", :redo_command)
@@ -142,12 +157,14 @@ def kbd(key)
   GLOBAL_MAP.define_key("\C-j", :newline)
   GLOBAL_MAP.define_key("\C-m", :newline)
   GLOBAL_MAP.define_key("\C-o", :open_line)
-  GLOBAL_MAP.define_key("\em", :back_to_indentation)
-  GLOBAL_MAP.define_key("\e^", :delete_indentation)
+  GLOBAL_MAP.define_key("\M-m", :back_to_indentation)
+  GLOBAL_MAP.define_key("\M-^", :delete_indentation)
+  GLOBAL_MAP.define_key("\C-xh", :mark_whole_buffer)
+  GLOBAL_MAP.define_key("\M-z", :zap_to_char)
   GLOBAL_MAP.define_key("\C-l", :recenter)
   GLOBAL_MAP.define_key("\C-v", :scroll_up)
   GLOBAL_MAP.define_key(:npage, :scroll_up)
-  GLOBAL_MAP.define_key("\ev", :scroll_down)
+  GLOBAL_MAP.define_key("\M-v", :scroll_down)
   GLOBAL_MAP.define_key(:ppage, :scroll_down)
   GLOBAL_MAP.define_key("\C-x0", :delete_window)
   GLOBAL_MAP.define_key("\C-x1", :delete_other_windows)
@@ -158,6 +175,7 @@ def kbd(key)
   GLOBAL_MAP.define_key("\C-x\C-c", :exit_textbringer)
   GLOBAL_MAP.define_key("\C-z", :suspend_textbringer)
   GLOBAL_MAP.define_key("\C-x\C-f", :find_file)
+  GLOBAL_MAP.define_key("\C-x\C-v", :find_alternate_file)
   GLOBAL_MAP.define_key("\C-xb", :switch_to_buffer)
   GLOBAL_MAP.define_key("\C-x\C-b", :list_buffers)
   GLOBAL_MAP.define_key("\C-x\C-s", :save_buffer)
@@ -166,15 +184,15 @@ def kbd(key)
   GLOBAL_MAP.define_key("\C-x\C-mf", :set_buffer_file_encoding)
   GLOBAL_MAP.define_key("\C-x\C-mn", :set_buffer_file_format)
   GLOBAL_MAP.define_key("\C-x\C-mr", :revert_buffer_with_encoding)
-  GLOBAL_MAP.define_key("\e.", :find_tag)
-  GLOBAL_MAP.define_key("\ex", :execute_command)
-  GLOBAL_MAP.define_key("\e:", :eval_expression)
+  GLOBAL_MAP.define_key("\M-.", :find_tag)
+  GLOBAL_MAP.define_key("\M-x", :execute_command)
+  GLOBAL_MAP.define_key("\M-:", :eval_expression)
   GLOBAL_MAP.define_key(?\C-u, :universal_argument)
   GLOBAL_MAP.define_key(?\C-g, :keyboard_quit)
   GLOBAL_MAP.define_key(?\C-s, :isearch_forward)
   GLOBAL_MAP.define_key(?\C-r, :isearch_backward)
-  GLOBAL_MAP.define_key("\e%", :query_replace_regexp)
-  GLOBAL_MAP.define_key("\e!", :shell_execute)
+  GLOBAL_MAP.define_key("\M-%", :query_replace_regexp)
+  GLOBAL_MAP.define_key("\M-!", :shell_execute)
   GLOBAL_MAP.define_key("\C-xr ", :point_to_register)
   GLOBAL_MAP.define_key("\C-xrj", :jump_to_register)
   GLOBAL_MAP.define_key("\C-xrx", :copy_to_register)
@@ -188,7 +206,7 @@ def kbd(key)
   GLOBAL_MAP.define_key("\C-x)", :end_keyboard_macro)
   GLOBAL_MAP.define_key("\C-xe", :end_and_call_keyboard_macro)
   GLOBAL_MAP.define_key(:f4, :end_or_call_keyboard_macro)
-  GLOBAL_MAP.define_key("\eq", :fill_paragraph)
+  GLOBAL_MAP.define_key("\M-q", :fill_paragraph)
   GLOBAL_MAP.define_key([:f1, "b"], :describe_bindings)
   GLOBAL_MAP.define_key([:f1, "f"], :describe_command)
   GLOBAL_MAP.define_key([:f1, "k"], :describe_key)
@@ -201,7 +219,7 @@ def kbd(key)
     end
   end
 
-  MINIBUFFER_LOCAL_MAP = Keymap.new
+  define_keymap :MINIBUFFER_LOCAL_MAP
   MINIBUFFER_LOCAL_MAP.define_key("\C-j", :exit_recursive_edit)
   MINIBUFFER_LOCAL_MAP.define_key("\C-m", :exit_recursive_edit)
   MINIBUFFER_LOCAL_MAP.define_key(?\t, :complete_minibuffer)

data/lib/textbringer/mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class Mode
     extend Commands