textbringer 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68977203d454a58e4191f2b74aba7239793f01ed
-  data.tar.gz: fc172a9d8466197a4cd2383d1fd25a04b5f31056
+  metadata.gz: bb6561f5d595d683562f67d0553ef75b556b99b9
+  data.tar.gz: 9f7caf1348f813c52dd69654625e15dcd267e55e
 SHA512:
-  metadata.gz: 428028614b59f7c75b9740ce2567f7f40887e2df3b13f4a860416c0b742ffcc41c117011a77d5b31f9138bb79f79e8b5142c288f72d803ee676881ceaf1b4eeb
-  data.tar.gz: 5da641c9f7a42d4535a3f3889200fb97c83987f8223fba81a2c7d5e7324649804281c4965dcefce897762ba7dac400a406d93f483601ec9745f201fafe5e5ded
+  metadata.gz: 21644b91f2a282c768345186da700628d221f4b177f5b8184d203029d8c0daa0e6b25ff82b93b1432f424e55fe81c144495c980dd56191113f24106c8ba92051
+  data.tar.gz: fb3bf64d60ba016956c87e3dc040aa3de4bcb12f78aa30362e15a015aa355c988c1cf67a635cea327775651ed0c81a251e922754c1f4cd9d07add6f3f5228528

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.2.0
+
+* Add bury_buffer and unbury_buffer.
+
 ## 0.1.9
 
 * Support registers.

data/lib/textbringer/buffer.rb

@@ -70,9 +70,13 @@ module Textbringer
       @@detect_encoding_proc = f
     end
 
+    def self.list
+      @@list.dup
+    end
+
     def self.add(buffer)
       @@table[buffer.name] = buffer
-      @@list.unshift(buffer)
+      @@list.push(buffer)
     end
 
     def self.current
@@ -82,7 +86,7 @@ module Textbringer
     def self.current=(buffer)
       if buffer && buffer.name && @@table.key?(buffer.name)
         @@list.delete(buffer)
-        @@list.push(buffer)
+        @@list.unshift(buffer)
       end
       @@current = buffer
     end
@@ -95,12 +99,18 @@ module Textbringer
       @@global_mark_ring ||= Ring.new(CONFIG[:global_mark_ring_max])
     end
 
+    def self.other(buffer = @@current)
+      @@list.find { |buf|  buf != buffer } || Buffer.find_or_new("*scratch*")
+    end
+
     def self.last
-      if @@list.last == @@current
-        @@list[-2]
-      else
-        @@list.last
-      end
+      @@list.last
+    end
+
+    def self.bury(buffer = @@current)
+      @@list.delete(buffer)
+      @@list.push(buffer)
+      @@current = @@list.first
     end
 
     def self.count

data/lib/textbringer/commands/misc.rb

@@ -80,7 +80,7 @@ module Textbringer
     def update_completions(xs)
       if xs.size > 1
         if COMPLETION[:original_buffer].nil?
-          COMPLETION[:completions_window] = Window.windows[-2]
+          COMPLETION[:completions_window] = Window.list.last
           COMPLETION[:original_buffer] =
             COMPLETION[:completions_window].buffer
         end

data/lib/textbringer/commands/windows.rb

@@ -82,6 +82,23 @@ module Textbringer
       end
     end
 
+    define_command(:bury_buffer, doc: <<~EOD) do
+        Put buffer at the end of the buffer list.
+      EOD
+      |buffer = Buffer.current|
+      if buffer.is_a?(String)
+        buffer = Buffer[buffer]
+      end
+      Buffer.bury(buffer)
+      Window.current.buffer = Buffer.current
+    end
+
+    define_command(:unbury_buffer, doc: <<~EOD) do
+        Switch to the last buffer in the buffer list.
+      EOD
+      switch_to_buffer(Buffer.last)
+    end
+
     define_command(:kill_buffer, doc: "Kill buffer.") do
       |buffer = read_buffer("Kill buffer: ", default: Buffer.current.name)|
       if buffer.is_a?(String)
@@ -92,11 +109,8 @@ module Textbringer
         message("Arioch! Arioch! Blood and souls for my Lord Arioch!")
       end
       buffer.kill
-      if Buffer.count == 0
-        buffer = Buffer.new_buffer("*scratch*")
-        switch_to_buffer(buffer)
-      elsif Buffer.current.nil?
-        switch_to_buffer(Buffer.last)
+      if Buffer.current.nil?
+        switch_to_buffer(Buffer.other)
       end
     end
   end

data/lib/textbringer/modes/completion_list_mode.rb

@@ -5,7 +5,7 @@ module Textbringer
     define_generic_command :choose_completion
 
     COMPLETION_LIST_MODE_MAP = Keymap.new
-    COMPLETION_LIST_MODE_MAP.define_key("\n", :choose_completion_command)
+    COMPLETION_LIST_MODE_MAP.define_key("\C-m", :choose_completion_command)
 
     define_syntax :link, /^.+$/
 

data/lib/textbringer/modes/help_mode.rb

@@ -10,6 +10,7 @@ module Textbringer
     HELP_MODE_MAP.define_key("\C-c\C-b", :help_go_back)
     HELP_MODE_MAP.define_key(?r, :help_go_forward)
     HELP_MODE_MAP.define_key("\C-c\C-f", :help_go_forward)
+    HELP_MODE_MAP.define_key("q", :bury_buffer)
 
     define_syntax :link, /
       (?: ^\S*?:\d+$ ) |

data/lib/textbringer/utils.rb

@@ -160,7 +160,7 @@ module Textbringer
       candidates.select { |i| i.start_with?(s) }
     end
 
-    def read_buffer(prompt, default: (Buffer.last || Buffer.current)&.name)
+    def read_buffer(prompt, default: Buffer.other.name)
       f = ->(s) { complete_for_minibuffer(s, Buffer.names) }
       read_from_minibuffer(prompt, completion_proc: f, default: default)
     end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/textbringer/window.rb

@@ -49,13 +49,17 @@ module Textbringer
     end
 
     @@started = false
-    @@windows = []
+    @@list = []
     @@current = nil
     @@echo_area = nil
     @@has_colors = false
 
-    def self.windows
-      @@windows
+    def self.list(include_echo_area: false)
+      if include_echo_area
+        @@list.dup
+      else
+        @@list.reject(&:echo_area?)
+      end
     end
 
     def self.current
@@ -64,7 +68,7 @@ module Textbringer
 
     def self.current=(window)
       if window.deleted?
-        window = @@windows.first
+        window = @@list.first
       end
       @@current.save_point if @@current && !@@current.deleted?
       @@current = window
@@ -76,19 +80,19 @@ module Textbringer
       if @@current.echo_area?
         raise EditorError, "Can't delete the echo area"
       end
-      if @@windows.size == 2
+      if @@list.size == 2
         raise EditorError, "Can't delete the sole window"
       end
-      i = @@windows.index(@@current)
+      i = @@list.index(@@current)
       if i == 0
-        window = @@windows[1]
+        window = @@list[1]
         window.move(0, 0)
       else
-        window = @@windows[i - 1]
+        window = @@list[i - 1]
       end
       window.resize(@@current.lines + window.lines, window.columns)
       @@current.delete
-      @@windows.delete_at(i)
+      @@list.delete_at(i)
       self.current = window
     end
 
@@ -96,7 +100,7 @@ module Textbringer
       if @@current.echo_area?
         raise EditorError, "Can't expand the echo area to full screen"
       end
-      @@windows.delete_if do |window|
+      @@list.delete_if do |window|
         if window.current? || window.echo_area?
           false
         else
@@ -109,10 +113,10 @@ module Textbringer
     end
 
     def self.other_window
-      i = @@windows.index(@@current)
+      i = @@list.index(@@current)
       begin
         i += 1
-        window = @@windows[i % @@windows.size]
+        window = @@list[i % @@list.size]
       end while !window.active?
       self.current = window
     end
@@ -161,20 +165,20 @@ module Textbringer
         window =
           Textbringer::Window.new(Window.lines - 1, Window.columns, 0, 0)
         window.buffer = Buffer.new_buffer("*scratch*")
-        @@windows.push(window)
+        @@list.push(window)
         Window.current = window
         @@echo_area = Textbringer::EchoArea.new(1, Window.columns,
                                                 Window.lines - 1, 0)
         Buffer.minibuffer.keymap = MINIBUFFER_LOCAL_MAP
         @@echo_area.buffer = Buffer.minibuffer
-        @@windows.push(@@echo_area)
+        @@list.push(@@echo_area)
         @@started = true
         yield
       ensure
-        @@windows.each do |win|
-          win.delete
+        @@list.each do |win|
+          win.close
         end
-        @@windows.clear
+        @@list.clear
         Curses.echo
         Curses.noraw
         Curses.nl
@@ -186,7 +190,7 @@ module Textbringer
     def self.redisplay
       return if Controller.current.executing_keyboard_macro?
       return if Window.current.has_input?
-      @@windows.each do |window|
+      @@list.each do |window|
         window.redisplay unless window.current?
       end
       current.redisplay
@@ -194,7 +198,7 @@ module Textbringer
     end
 
     def self.redraw
-      @@windows.each do |window|
+      @@list.each do |window|
         window.redraw unless window.current?
       end
       current.redraw
@@ -214,7 +218,7 @@ module Textbringer
     end
 
     def self.resize
-      @@windows.delete_if do |window|
+      @@list.delete_if do |window|
         if !window.echo_area? &&
             window.y > Window.lines - CONFIG[:window_min_height]
           window.delete
@@ -223,9 +227,9 @@ module Textbringer
           false
         end
       end
-      @@windows.each_with_index do |window, i|
+      @@list.each_with_index do |window, i|
         unless window.echo_area?
-          if i < @@windows.size - 2
+          if i < @@list.size - 2
             window.resize(window.lines, Window.columns)
           else
             window.resize(Window.lines - 1 - window.y, Window.columns)
@@ -275,7 +279,7 @@ module Textbringer
     def delete
       unless @deleted
         if current?
-          Window.current = @@windows.first
+          Window.current = @@list.first
         end
         delete_marks
         @window.close
@@ -283,6 +287,10 @@ module Textbringer
       end
     end
 
+    def close
+      @window.close
+    end
+
     def buffer=(buffer)
       delete_marks
       @buffer = buffer
@@ -571,23 +579,23 @@ module Textbringer
       resize(new_lines, columns)
       new_window = Window.new(old_lines - new_lines, columns, y + new_lines, x)
       new_window.buffer = buffer
-      i = @@windows.index(self)
-      @@windows.insert(i + 1, new_window)
+      i = @@list.index(self)
+      @@list.insert(i + 1, new_window)
     end
 
     def enlarge(n)
       if n > 0
         max_height = Window.lines -
-          CONFIG[:window_min_height] * (@@windows.size - 2) - 1
+          CONFIG[:window_min_height] * (@@list.size - 2) - 1
         new_lines = [lines + n, max_height].min
         needed_lines = new_lines - lines
         resize(new_lines, columns)
-        i = @@windows.index(self)
-        indices = (i + 1).upto(@@windows.size - 2).to_a +
+        i = @@list.index(self)
+        indices = (i + 1).upto(@@list.size - 2).to_a +
           (i - 1).downto(0).to_a
         indices.each do |j|
           break if needed_lines == 0
-          window = @@windows[j]
+          window = @@list[j]
           extended_lines = [
             window.lines - CONFIG[:window_min_height],
             needed_lines
@@ -596,20 +604,20 @@ module Textbringer
           needed_lines -= extended_lines
         end
         y = 0
-        @@windows.each do |win|
+        @@list.each do |win|
           win.move(y, win.x)
           y += win.lines
         end
-      elsif n < 0 && @@windows.size > 2
+      elsif n < 0 && @@list.size > 2
         new_lines = [lines + n, CONFIG[:window_min_height]].max
         diff = lines - new_lines
         resize(new_lines, columns)
-        i = @@windows.index(self)
-        if i < @@windows.size - 2
-          window = @@windows[i + 1]
+        i = @@list.index(self)
+        if i < @@list.size - 2
+          window = @@list[i + 1]
           window.move(window.y - diff, window.x)
         else
-          window = @@windows[i - 1]
+          window = @@list[i - 1]
           move(self.y + diff, self.x)
         end
         window.resize(window.lines + diff, window.columns)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses