textbringer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b377f0a0be9ac761f63bafbc0db3798e14eefecc
-  data.tar.gz: ff3014ee193c52e2be1b028210e8024c0c10f708
+  metadata.gz: df53610e7d9e7a4e7b657d38d9366a3be4752231
+  data.tar.gz: 07ce8c686e767f2d893f44ccb6994b8e6690abf2
 SHA512:
-  metadata.gz: 5928dac977797697ebe072e51fa09fbc892b4e581a5197411cc70d32b9eee8615645d34a62bba7fc11e2e99cab71a63c1c8224083ee6f5b4cd411404423418b4
-  data.tar.gz: 6895b2ad1f81511cf742aa472bb58b60d4785923de48ce1c68750915b39b6911ec80afc30dcec3fd09e0dcc142060840bfb7045bebc3aad27681fa378f8cc195
+  metadata.gz: 64d0421dec0fbab6af6fcb2e9c60497c959fb2d9d1bed99a74c764a8e4ac2f8622e468c452bfec492757967cb7943010529b5da2daad4866fe974cad3e67dfd3
+  data.tar.gz: f9f5ba83a29a959143b37d4388174828bd9414a0f2ddaef7d094075b1b8b314a8d7f708565aaf791a3d59da537eeb0bea685b57c31e40db0776fabbf9952d7ab

data/CHANGES.md

@@ -0,0 +1,14 @@
+## 0.1.2
+
+* Use curses instead of ncursesw.
+* Support Windows.
+* Dump unsaved buffers to ~/.textbringer/buffer_dump when textbringer crashes.
+* Many bug fixes.
+
+## 0.1.1
+
+* Rename exe/tb to exe/textbringer to avoid conflict with akr/tb.
+
+## 0.1.0
+
+* First version

data/exe/textbringer

@@ -17,7 +17,6 @@ $VERBOSE = nil
 
 Controller.current = Controller.new
 Window.start do
-  message("Type C-x C-c to exit Textbringer")
   begin
     load_user_config
     ruby_mode
@@ -26,15 +25,30 @@ Window.start do
         find_file(arg)
       end
     end
+    if Buffer.dumped_buffers_exist?(CONFIG[:buffer_dump_dir])
+      Window.redisplay
+      if yes_or_no?("Dumped buffers found; restore them?")
+        buffers = Buffer.load_dumped_buffers(CONFIG[:buffer_dump_dir])
+        switch_to_buffer(buffers.last)
+      end
+    end
   rescue Exception => e
     handle_exception(e)
   end
   Window.redisplay
-  trap(:CONT) do
-    Window.redraw
+  begin
+    trap(:CONT) { Window.redraw }
+  rescue ArgumentError
   end
-  loop do
-    Controller.current.command_loop(TOP_LEVEL_TAG)
-    Window.redisplay
+  begin
+    loop do
+      Controller.current.command_loop(TOP_LEVEL_TAG)
+      Window.redisplay
+    end
+  rescue Exception => e
+    if !e.is_a?(SystemExit)
+      Buffer.dump_unsaved_buffers(CONFIG[:buffer_dump_dir])
+    end
+    raise
   end
 end

data/lib/textbringer/buffer.rb

@@ -2,6 +2,8 @@
 
 require "nkf"
 require "unicode/display_width"
+require "json"
+require "fileutils"
 
 module Textbringer
   class Buffer
@@ -10,6 +12,7 @@ module Textbringer
     attr_accessor :mode, :keymap
     attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
     attr_reader :current_line, :current_column, :visible_mark
+    attr_writer :modified
 
     GAP_SIZE = 256
     UNDO_LIMIT = 1000
@@ -1092,6 +1095,52 @@ module Textbringer
       insert(s)
     end
 
+    def dump(path)
+      File.write(path, to_s)
+      metadata = {
+        "name" => name,
+        "file_name" => file_name,
+        "file_encoding" => file_encoding.name,
+        "file_format" => file_format.to_s
+      }
+      File.write(path + ".metadata", metadata.to_json)
+    end
+
+    def self.load(path)
+      buffer = Buffer.new(File.read(path))
+      metadata = JSON.parse(File.read(path + ".metadata"))
+      buffer.name = metadata["name"]
+      buffer.file_name = metadata["file_name"] if metadata["file_name"]
+      buffer.file_encoding = Encoding.find(metadata["file_encoding"])
+      buffer.file_format = metadata["file_format"].intern
+      buffer.modified = true
+      buffer
+    end
+
+    def self.dump_unsaved_buffers(dir)
+      FileUtils.mkdir_p(dir)
+      @@list.each do |buffer|
+        if /\A\*/ !~ buffer.name && buffer.modified?
+          buffer.dump(File.expand_path(buffer.object_id.to_s, dir))
+        end
+      end
+    end
+
+    def self.dumped_buffers_exist?(dir)
+      !Dir.glob(File.expand_path("*.metadata", dir)).empty?
+    end
+
+    def self.load_dumped_buffers(dir)
+      Dir.glob(File.expand_path("*.metadata", dir)).map do |metadata_path|
+        path = metadata_path.sub(/\.metadata\z/, "")
+        buffer = Buffer.load(path)
+        add(buffer)
+        File.unlink(metadata_path)
+        File.unlink(path)
+        buffer
+      end
+    end
+
     private
 
     def adjust_gap(min_size = 0, pos = @point)

data/lib/textbringer/commands.rb

@@ -79,7 +79,7 @@ module Textbringer
     end
 
     define_command(:self_insert) do |n = number_prefix_arg|
-      c = Controller.current.last_key.chr(Encoding::UTF_8)
+      c = Controller.current.last_key
       merge_undo = Controller.current.last_command == :self_insert
       n.times do
         Buffer.current.insert(c, merge_undo)
@@ -88,12 +88,11 @@ module Textbringer
 
     define_command(:quoted_insert) do |n = number_prefix_arg|
       c = Controller.current.read_char
-      if !c.is_a?(Integer)
+      if !c.is_a?(String)
         raise "Invalid key"
       end
-      ch = c.chr(Encoding::UTF_8)
       n.times do
-        Buffer.current.insert(ch)
+        Buffer.current.insert(c)
       end
     end
 
@@ -236,7 +235,7 @@ module Textbringer
     end
 
     define_command(:suspend_textbringer) do
-      Ncurses.endwin
+      Curses.close_screen
       Process.kill(:STOP, $$)
     end
 
@@ -439,7 +438,7 @@ module Textbringer
 
     define_command(:digit_argument) do
       |arg = current_prefix_arg|
-      n = last_key.chr.to_i
+      n = last_key.to_i
       Controller.current.prefix_arg =
         case arg
         when Integer
@@ -491,18 +490,13 @@ module Textbringer
     end
 
     ISEARCH_MODE_MAP = Keymap.new
-    (0x20..0x7e).each do |c|
+    (?\x20..?\x7e).each do |c|
       ISEARCH_MODE_MAP.define_key(c, :isearch_printing_char)
     end
     ISEARCH_MODE_MAP.define_key(?\t, :isearch_printing_char)
     ISEARCH_MODE_MAP.handle_undefined_key do |key|
-      if key.is_a?(Integer) && key > 0x80
-        begin
-          key.chr(Encoding::UTF_8)
-          :isearch_printing_char
-        rescue RangeError
-          nil
-        end
+      if key.is_a?(String) && /[\0-\x7f]/ !~ key 
+        :isearch_printing_char
       else
         nil
       end
@@ -574,7 +568,7 @@ module Textbringer
     end
 
     define_command(:isearch_printing_char) do
-      c = Controller.current.last_key.chr(Encoding::UTF_8)
+      c = Controller.current.last_key
       ISEARCH_STATUS[:string].concat(c)
       isearch_search
     end

data/lib/textbringer/config.rb

@@ -2,6 +2,7 @@
 
 module Textbringer
   CONFIG = {
+    buffer_dump_dir: File.expand_path("~/.textbringer/buffer_dump"),
     tab_width: 8,
     indent_tabs_mode: false,
     case_fold_search: true

data/lib/textbringer/controller.rb

@@ -34,7 +34,7 @@ module Textbringer
       catch(tag) do
         loop do
           begin
-            c = Window.current.getch
+            c = Window.current.read_char
             Window.echo_area.clear_message
             @last_key = c
             @key_sequence << @last_key
@@ -76,11 +76,11 @@ module Textbringer
     end
 
     def read_char
-      Window.current.getch
+      Window.current.read_char
     end
 
     def received_keyboard_quit?
-      while (key = Window.current.getch_nonblock) && key >= 0
+      while key = Window.current.read_char_nonblock
         if GLOBAL_MAP.lookup([key]) == :keyboard_quit
           return true
         end
@@ -105,7 +105,7 @@ module Textbringer
       case key
       when Integer
         if key < 0x80
-          s = Ncurses.keyname(key)
+          s = Curses.keyname(key)
           case s
           when /\AKEY_(.*)/
             "<#{$1.downcase}>"

data/lib/textbringer/keymap.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "ncursesw"
+require "curses"
 
 module Textbringer
   class Keymap
@@ -43,10 +43,10 @@ module Textbringer
 
     def kbd(key)
       case key
-      when Integer, Symbol
+      when Symbol
         [key]
       when String
-        key.unpack("C*")
+        key.chars
       when Array
         key
       else
@@ -80,7 +80,7 @@ module Textbringer
   GLOBAL_MAP.define_key(:end, :end_of_line)
   GLOBAL_MAP.define_key("\e<", :beginning_of_buffer)
   GLOBAL_MAP.define_key("\e>", :end_of_buffer)
-  (0x20..0x7e).each do |c|
+  (?\x20..?\x7e).each do |c|
     GLOBAL_MAP.define_key(c, :self_insert)
   end
   GLOBAL_MAP.define_key(?\t, :self_insert)
@@ -123,13 +123,8 @@ module Textbringer
   GLOBAL_MAP.define_key(?\C-r, :isearch_backward)
   GLOBAL_MAP.define_key("\e!", :shell_execute)
   GLOBAL_MAP.handle_undefined_key do |key|
-    if key.is_a?(Integer) && key > 0x80
-      begin
-        key.chr(Encoding::UTF_8)
-        :self_insert
-      rescue RangeError
-        nil
-      end
+    if key.is_a?(String) && /[\0-\x7f]/ !~ key 
+      :self_insert
     else
       nil
     end

data/lib/textbringer/modes/programming_mode.rb

@@ -25,6 +25,9 @@ module Textbringer
 
     def newline_and_reindent
       n = 1
+      if indent_line
+        n += 1
+      end
       @buffer.save_excursion do
         pos = @buffer.point
         @buffer.beginning_of_line

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/textbringer/window.rb

@@ -1,20 +1,46 @@
 # frozen_string_literal: true
 
-require "ncursesw"
+require "curses"
 require "unicode/display_width"
+require "fiddle/import"
 
 module Textbringer
+  begin
+    # These features should be provided by curses.gem.
+    module PDCurses
+      extend Fiddle::Importer
+      dlload "pdcurses.dll"
+      extern "unsigned long PDC_get_key_modifiers(void)"
+      extern "int PDC_save_key_modifiers(unsigned char)"
+      extern "int PDC_return_key_modifiers(unsigned char)"
+
+      KEY_MODIFIER_SHIFT   = 1
+      KEY_MODIFIER_CONTROL = 2
+      KEY_MODIFIER_ALT     = 4
+      KEY_MODIFIER_NUMLOCK = 8
+    end
+  rescue
+    remove_const :PDCurses
+  end
+
   class Window
     KEY_NAMES = {}
-    Ncurses.constants.grep(/\AKEY_/).each do |name|
-      KEY_NAMES[Ncurses.const_get(name)] =
+    Curses.constants.grep(/\AKEY_/).each do |name|
+      KEY_NAMES[Curses.const_get(name)] =
         name.slice(/\AKEY_(.*)/, 1).downcase.intern
     end
 
-    UTF8_CHAR_LEN =
-      Buffer::UTF8_CHAR_LEN.each_with_object(Hash.new(1)) { |(k, v), h|
-        h[k.ord] = v
-      }
+    ALT_IS_FUNCTION_KEY =
+      /mswin32|mingw32/ =~ RUBY_PLATFORM && /PDCurses/ =~ Curses::VERSION
+    if ALT_IS_FUNCTION_KEY
+      KEY_OFFSET = 0xec00
+      ALT_0 = KEY_OFFSET + 0x97
+      ALT_9 = KEY_OFFSET + 0xa0
+      ALT_A = KEY_OFFSET + 0xa1
+      ALT_Z = KEY_OFFSET + 0xba
+      ALT_NUMBER_BASE = ALT_0 - ?0.ord
+      ALT_ALPHA_BASE = ALT_A - ?a.ord
+    end
 
     @@windows = []
     @@current = nil
@@ -88,9 +114,9 @@ module Textbringer
     end
 
     def self.start
-      Ncurses.initscr
-      Ncurses.noecho
-      Ncurses.raw
+      Curses.init_screen
+      Curses.noecho
+      Curses.raw
       begin
         window =
           Textbringer::Window.new(Window.lines - 1, Window.columns, 0, 0)
@@ -99,14 +125,14 @@ module Textbringer
         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)
+        Buffer.minibuffer.keymap = MINIBUFFER_LOCAL_MAP
+        @@echo_area.buffer = Buffer.minibuffer
+        @@windows.push(@@echo_area)
         yield
       ensure
-        Ncurses.echo
-        Ncurses.noraw
-        Ncurses.endwin
+        Curses.echo
+        Curses.noraw
+        Curses.close_screen
       end
     end
 
@@ -127,20 +153,20 @@ module Textbringer
     end
 
     def self.update
-      Ncurses.doupdate
+      Curses.doupdate
     end
 
     def self.lines
-      Ncurses.LINES
+      Curses.lines
     end
 
     def self.columns
-      Ncurses.COLS
+      Curses.cols
     end
 
     def self.resize
       @@windows.delete_if do |window|
-        if window.y > Window.lines - 4
+        if !window.echo_area? && window.y > Window.lines - 4
           window.delete
           true
         else
@@ -148,10 +174,12 @@ module Textbringer
         end
       end
       @@windows.each_with_index do |window, i|
-        if i < @@windows.size - 1
-          window.resize(window.lines, Window.columns)
-        else
-          window.resize(Window.lines - 1 - window.y, Window.columns)
+        unless window.echo_area?
+          if i < @@windows.size - 2
+            window.resize(window.lines, Window.columns)
+          else
+            window.resize(Window.lines - 1 - window.y, Window.columns)
+          end
         end
       end
       @@echo_area.move(Window.lines - 1, 0)
@@ -159,7 +187,7 @@ module Textbringer
     end
 
     def self.beep
-      Ncurses.beep
+      Curses.beep
     end
 
     attr_reader :buffer, :lines, :columns, :y, :x
@@ -170,7 +198,7 @@ module Textbringer
       @y = y
       @x = x
       initialize_window(lines, columns, y, x)
-      @window.keypad(true)
+      @window.keypad = true
       @window.scrollok(false)
       @window.idlok(true)
       @buffer = nil
@@ -178,6 +206,7 @@ module Textbringer
       @bottom_of_window = nil
       @point_mark = nil
       @deleted = false
+      @key_buffer = []
     end
 
     def echo_area?
@@ -198,7 +227,7 @@ module Textbringer
           Window.current = @@windows.first
         end
         delete_marks
-        @window.del
+        @window.close
         @deleted = true
       end
     end
@@ -233,58 +262,61 @@ module Textbringer
       self == @@current
     end
 
-    def getch
-      key = @window.getch
-      if key.nil?
-        nil
-      elsif key > 0xff
-        KEY_NAMES[key]
-      else
-        len = UTF8_CHAR_LEN[key]
-        if len == 1
-          key
-        else
-          buf = [key]
-          (len - 1).times do
-            c = @window.getch
-            if c.nil? || c < 0x80 || c > 0xbf
-              raise EditorError, "Malformed UTF-8 input" 
-            end
-            buf.push(c)
-          end
-          s = buf.pack("C*").force_encoding(Encoding::UTF_8)
-          if s.valid_encoding?
-            s.ord
-          else
-            raise EditorError, "Malformed UTF-8 input"
+    def read_char
+      key = get_char
+      if key.is_a?(Integer)
+        if ALT_IS_FUNCTION_KEY
+          if ALT_0 <= key && key <= ALT_9
+            @key_buffer.push((key - ALT_NUMBER_BASE).chr)
+            return "\e"
+          elsif ALT_A <= key && key <= ALT_Z
+            @key_buffer.push((key - ALT_ALPHA_BASE).chr)
+            return "\e"
           end
         end
+        KEY_NAMES[key] || key
+      else
+        key&.encode(Encoding::UTF_8)&.tr("\r", "\n")
       end
     end
 
-    def getch_nonblock
-      @window.nodelay(true)
+    def read_char_nonblock
+      @window.nodelay = true
       begin
-        getch
+        read_char
       ensure
-        @window.nodelay(false)
+        @window.nodelay = false
       end
     end
 
     def wait_input(msecs)
-      @window.timeout(msecs)
+      @window.timeout = msecs
       begin
-        c = @window.getch
-        if c && c >= 0
-          Ncurses.ungetch(c)
+        c = @window.get_char
+        if c
+          Curses.unget_char(c)
         end
         c
       ensure
-        @window.timeout(-1)
+        @window.timeout = -1
+      end
+    end
+
+    def has_input?
+      @window.nodelay = true
+      begin
+        c = @window.get_char
+        if c
+          Curses.unget_char(c)
+        end
+        !c.nil?
+      ensure
+        @window.nodelay = false
       end
     end
 
     def redisplay
+      return if has_input?
       return if @buffer.nil?
       redisplay_mode_line
       @buffer.save_point do |saved|
@@ -298,51 +330,51 @@ module Textbringer
         y = x = 0
         @buffer.point_to_mark(@top_of_window)
         @window.erase
-        @window.move(0, 0)
+        @window.setpos(0, 0)
         if current? && @buffer.visible_mark &&
            @buffer.point_after_mark?(@buffer.visible_mark)
-          @window.attron(Ncurses::A_REVERSE)
+          @window.attron(Curses::A_REVERSE)
         end
         while !@buffer.end_of_buffer?
           if @buffer.point_at_mark?(point)
-            y, x = @window.getcury, @window.getcurx
+            y, x = @window.cury, @window.curx
             if current? && @buffer.visible_mark
               if @buffer.point_after_mark?(@buffer.visible_mark)
-                @window.attroff(Ncurses::A_REVERSE)
+                @window.attroff(Curses::A_REVERSE)
               elsif @buffer.point_before_mark?(@buffer.visible_mark)
-                @window.attron(Ncurses::A_REVERSE)
+                @window.attron(Curses::A_REVERSE)
               end
             end
           end
           if current? && @buffer.visible_mark &&
              @buffer.point_at_mark?(@buffer.visible_mark)
             if @buffer.point_after_mark?(point)
-              @window.attroff(Ncurses::A_REVERSE)
+              @window.attroff(Curses::A_REVERSE)
             elsif @buffer.point_before_mark?(point)
-              @window.attron(Ncurses::A_REVERSE)
+              @window.attron(Curses::A_REVERSE)
             end
           end
           c = @buffer.char_after
           if c == "\n"
             @window.clrtoeol
-            break if @window.getcury == lines - 2   # lines include mode line
+            break if @window.cury == lines - 2   # lines include mode line
           elsif c == "\t"
-            n = calc_tab_width(@window.getcurx)
+            n = calc_tab_width(@window.curx)
             c = " " * n
           else
             c = escape(c)
           end
           @window.addstr(c)
-          break if @window.getcury == lines - 2 &&  # lines include mode line
-            @window.getcurx == columns
+          break if @window.cury == lines - 2 &&  # lines include mode line
+            @window.curx == columns
           @buffer.forward_char
         end
         if current? && @buffer.visible_mark
-          @window.attroff(Ncurses::A_REVERSE)
+          @window.attroff(Curses::A_REVERSE)
         end
         @buffer.mark_to_point(@bottom_of_window)
         if @buffer.point_at_mark?(point)
-          y, x = @window.getcury, @window.getcurx
+          y, x = @window.cury, @window.curx
         end
         if x == columns - 1
           c = @buffer.char_after(point.location)
@@ -351,28 +383,28 @@ module Textbringer
             x = 0
           end
         end
-        @window.move(y, x)
+        @window.setpos(y, x)
         @window.noutrefresh
       end
     end
     
     def redraw
-      @window.redrawwin
-      @mode_line.redrawwin
+      @window.redraw
+      @mode_line.redraw
     end
 
     def move(y, x)
       @y = y
       @x = x
-      @window.mvwin(y, x)
-      @mode_line.mvwin(y + @window.getmaxy, x)
+      @window.move(y, x)
+      @mode_line.move(y + @window.maxy, x)
     end
 
     def resize(lines, columns)
       @lines = lines
       @columns = columns
       @window.resize(lines - 1, columns)
-      @mode_line.mvwin(@y + lines - 1, @x)
+      @mode_line.move(@y + lines - 1, @x)
       @mode_line.resize(1, columns)
     end
 
@@ -426,8 +458,8 @@ module Textbringer
     private
 
     def initialize_window(num_lines, num_columns, y, x)
-      @window = Ncurses::WINDOW.new(num_lines - 1, num_columns, y, x)
-      @mode_line = Ncurses::WINDOW.new(1, num_columns, y + num_lines - 1, x)
+      @window = Curses::Window.new(num_lines - 1, num_columns, y, x)
+      @mode_line = Curses::Window.new(1, num_columns, y + num_lines - 1, x)
     end
 
     def framer
@@ -454,8 +486,8 @@ module Textbringer
 
     def redisplay_mode_line
       @mode_line.erase
-      @mode_line.move(0, 0)
-      @mode_line.attron(Ncurses::A_REVERSE)
+      @mode_line.setpos(0, 0)
+      @mode_line.attron(Curses::A_REVERSE)
       @mode_line.addstr("#{@buffer.name} ")
       @mode_line.addstr("[+]") if @buffer.modified?
       @mode_line.addstr("[RO]") if @buffer.read_only?
@@ -472,8 +504,8 @@ module Textbringer
       @mode_line.addstr(unicode_codepoint(c))
       @mode_line.addstr(" #{line},#{column}")
       @mode_line.addstr(" (#{@buffer.mode&.name || 'None'})")
-      @mode_line.addstr(" " * (@mode_line.getmaxx - @mode_line.getcurx))
-      @mode_line.attroff(Ncurses::A_REVERSE)
+      @mode_line.addstr(" " * (@mode_line.maxx - @mode_line.curx))
+      @mode_line.attroff(Curses::A_REVERSE)
       @mode_line.noutrefresh
     end
 
@@ -508,6 +540,9 @@ module Textbringer
     def beginning_of_line_and_count(max_lines)
       e = @buffer.point
       @buffer.beginning_of_line
+      if e - @buffer.point < @columns
+        return 0
+      end
       s = @buffer.substring(@buffer.point, e)
       bols = [@buffer.point]
       column = 0
@@ -556,6 +591,36 @@ module Textbringer
         @point_mark = nil
       end
     end
+
+    def get_char
+      if @key_buffer.empty?
+        PDCurses.PDC_save_key_modifiers(1) if defined?(PDCurses)
+        need_retry = false
+        begin
+          key = @window.get_char
+          if defined?(PDCurses)
+            mods = PDCurses.PDC_get_key_modifiers
+            if key.is_a?(String) && key.ascii_only?
+              if (mods & PDCurses::KEY_MODIFIER_CONTROL) != 0
+                key = key == ?? ? "\x7f" : (key.ord & 0x9f).chr
+              end
+              if (mods & PDCurses::KEY_MODIFIER_ALT) != 0
+                if key == "\0"
+                  # Alt + `, Alt + < etc. return NUL, so ignore it.
+                  need_retry = true
+                else
+                  @key_buffer.push(key)
+                  key = "\e"
+                end
+              end
+            end
+          end
+        end while need_retry
+        key
+      else
+        @key_buffer.shift
+      end
+    end
   end
 
   class EchoArea < Window
@@ -595,40 +660,40 @@ module Textbringer
       return if @buffer.nil?
       @buffer.save_point do |saved|
         @window.erase
-        @window.move(0, 0)
+        @window.setpos(0, 0)
         if @message
-          @window.addstr @message
+          @window.addstr(escape(@message))
         else
-          @window.addstr @prompt
+          @window.addstr(escape(@prompt))
           @buffer.beginning_of_line
           while !@buffer.end_of_buffer?
             if @buffer.point_at_mark?(saved)
-              y, x = @window.getcury, @window.getcurx
+              y, x = @window.cury, @window.curx
             end
             c = @buffer.char_after
             if c == "\n"
               break
             end
-            @window.addstr escape(c)
+            @window.addstr(escape(c))
             @buffer.forward_char
           end
           if @buffer.point_at_mark?(saved)
-            y, x = @window.getcury, @window.getcurx
+            y, x = @window.cury, @window.curx
           end
-          @window.move(y, x)
+          @window.setpos(y, x)
         end
         @window.noutrefresh
       end
     end
 
     def redraw
-      @window.redrawwin
+      @window.redraw
     end
 
     def move(y, x)
       @y = y
       @x = x
-      @window.mvwin(y, x)
+      @window.move(y, x)
     end
 
     def resize(lines, columns)
@@ -640,7 +705,7 @@ module Textbringer
     private
 
     def initialize_window(num_lines, num_columns, y, x)
-      @window = Ncurses::WINDOW.new(num_lines, num_columns, y, x)
+      @window = Curses::Window.new(num_lines, num_columns, y, x)
     end
   end
 end

data/textbringer.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_runtime_dependency "ncursesw", "~> 1.4"
+  spec.add_runtime_dependency "curses", "~> 1.1"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
 
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ncursesw
+  name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -119,8 +119,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile