sup in sup-0.15.2

- old
+ new

@@ -2,13 +2,14 @@
 # encoding: utf-8
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'rubygems'
-
 require 'ncursesw'
 
+require 'sup/util/ncurses'
+
 no_gpgme = false
 begin
   require 'gpgme'
 rescue LoadError
   no_gpgme = true
@@ -134,10 +135,11 @@
   Ncurses.cbreak
   Ncurses.stdscr.keypad 1
   Ncurses.use_default_colors
   Ncurses.curs_set 0
   Ncurses.start_color
+  Ncurses.prepare_form_driver
   $cursing = true
 end
 
 def stop_cursing
   return unless $cursing
@@ -234,27 +236,27 @@
     SearchResultsMode.spawn_from_query $opts[:search]
   end
 
   until Redwood::exceptions.nonempty? || $die
     c = begin
-      Ncurses.nonblocking_getch
+      Ncurses::CharCode.get false
     rescue Interrupt
       raise if BufferManager.ask_yes_or_no "Die ungracefully now?"
       BufferManager.draw_screen
-      nil
+      Ncurses::CharCode.empty
     end
 
-    if c.nil?
+    if c.empty?
       if BufferManager.sigwinch_happened?
         debug "redrawing screen on sigwinch"
         BufferManager.completely_redraw_screen
       end
       next
     end
 
     IdleManager.ping
 
-    if c == 410
+    if c.is_keycode? 410
       ## this is ncurses's way of telling us it's detected a refresh.
       ## since we have our own sigwinch handler, we don't do anything.
       next
     end
 