rbcurse 1.2.0 → 1.3.0

data/examples/testsplit3_1.rb

@@ -21,7 +21,7 @@
 #               Copyright 2010, Rahul Kumar             #
 #*******************************************************#
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rsplitpane'
@@ -35,7 +35,7 @@ if $0 == __FILE__
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-        $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+        $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
     show_caret_flag = true
 

data/examples/testsplit3a.rb

@@ -25,7 +25,7 @@
 #               Copyright 2010, Rahul Kumar             #
 #*******************************************************#
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rsplitpane'
@@ -40,7 +40,7 @@ if $0 == __FILE__
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
 
     @window = VER::Window.root_window

data/examples/testsplit3b.rb

@@ -26,7 +26,7 @@
 #               Copyright 2010, Rahul Kumar             #
 #*******************************************************#
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rsplitpane'
@@ -41,7 +41,7 @@ if $0 == __FILE__
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
     show_caret_flag = false #true
 

data/examples/testsplitta.rb

@@ -11,7 +11,7 @@
 #               Copyright 2010, Rahul Kumar             #
 #*******************************************************#
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rsplitpane'
@@ -31,7 +31,7 @@ if $0 == __FILE__
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
 
     @window = VER::Window.root_window

data/examples/testsplittv.rb

@@ -11,7 +11,7 @@
 #               Copyright 2010, Rahul Kumar             #
 #*******************************************************#
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rsplitpane'
@@ -29,7 +29,7 @@ if $0 == __FILE__
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
 
     @window = VER::Window.root_window

data/examples/testsplittvv.rb

@@ -12,7 +12,7 @@
 #               Copyright 2010, Rahul Kumar             #
 #*******************************************************#
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rsplitpane'
@@ -30,7 +30,7 @@ if $0 == __FILE__
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
 
     @window = VER::Window.root_window

data/examples/testtable.rb

@@ -1,6 +1,6 @@
 #$LOAD_PATH << "/Users/rahul/work/projects/rbcurse/"
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 #require 'ver/keyboard'
 require 'rbcurse'
@@ -37,7 +37,7 @@ if $0 == __FILE__
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
 
     @window = VER::Window.root_window

data/examples/testtabp.rb

@@ -2,7 +2,7 @@
 #
 #$LOAD_PATH << "/Users/rahul/work/projects/rbcurse/"
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 #require 'rbcurse/rtabbedpane'
@@ -94,7 +94,7 @@ if $0 == __FILE__
   begin
     # XXX update with new color and kb
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
     n = TestTabbedPane.new
     n.run

data/examples/testtodo.rb

@@ -566,7 +566,7 @@ module TestTodo
     begin
       # Initialize curses
       VER::start_ncurses  # this is initializing colors via ColorMap.setup
-      $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+      $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
       $log.level = Logger::DEBUG
 
       colors = Ncurses.COLORS

data/examples/testtpane.rb

@@ -17,7 +17,7 @@
 #
 #$LOAD_PATH << "/Users/rahul/work/projects/rbcurse/"
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rtabbedpane'
@@ -188,7 +188,7 @@ if $0 == __FILE__
   begin
     # XXX update with new color and kb
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
     n = TestTabbedPane.new
     n.run

data/examples/testtpane2.rb

@@ -15,7 +15,7 @@
 #
 #$LOAD_PATH << "/Users/rahul/work/projects/rbcurse/"
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rtabbedpane'
@@ -130,7 +130,7 @@ if $0 == __FILE__
   begin
     # XXX update with new color and kb
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
     n = TestTabbedPane.new
     n.run

data/examples/testtpanetable.rb

@@ -11,10 +11,11 @@
 #*******************************************************#
 
 # this is a test program, tests out tabbed panes. type F1 to exit
-#
-$LOAD_PATH << "/Users/rahul/work/projects/rbcurse/lib/"
+# Avoid using ScrollPane at present, I intend rewriting it some day
+# It sucks. Even the TabbedPane code will be rewritten completely.
+# Don't use this demo.
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rtabbedpane'
@@ -40,7 +41,7 @@ class TestTabbedPane
         #button_type :ok
       end
       @tab1 = @tp.add_tab "&Table" 
-      f1 = @tab1.form
+      #f1 = @tab1.form
       f1 = @tp.form @tab1
       raise "form f1 nil" unless f1
       $log.debug " TABLE FORM #{f1} "
@@ -187,7 +188,7 @@ if $0 == __FILE__
   begin
     # XXX update with new color and kb
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
     n = TestTabbedPane.new
     n.run

data/examples/testvimsplit.rb

@@ -39,7 +39,7 @@ class Tester
     lb2 = Listbox.new nil, :list => `gem list --local`.split("\n") , :name => "mylist2"
 
     alist = %w[ ruby perl python java jruby macruby rubinius rails rack sinatra pylons django cakephp grails] 
-    str = "Hello people of this world.\nThis is a textbox.\nUse arrow keys, j/k/h/l/gg/G/C-a/C-a/C-n/C-p\n"
+    str = "Hello people of this world.\nThis is a textbox.\nUse arrow keys, j/k/h/l/gg/G/C-a/C-e/C-n/C-p\n"
     str << alist.join("\n")
     stfl = vf == :V ? :FLOW : :STACK
     @vim.add lb, :FIRST, :AUTO
@@ -96,7 +96,7 @@ end
   begin
     # XXX update with new color and kb
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new("view.log")
+    $log = Logger.new("rbc13.log")
     $log.level = Logger::DEBUG
     n = Tester.new
     n.run

data/examples/viewtodo.rb

@@ -557,7 +557,7 @@ if $0 == __FILE__
   begin
     # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new("view.log")
+    $log = Logger.new("rbc13.log")
     $log.level = Logger::DEBUG
 
     colors = Ncurses.COLORS

data/lib/rbcurse.rb

@@ -1,7 +1,8 @@
+require 'ffi-ncurses' # ADDED FFI 2011-09-6 
 require 'ver/ncurses'
 require 'ver/window'
 require 'rbcurse/rwidget'
 require 'rbcurse/rdialogs'
 class Rbcurse
-  VERSION = '1.1.2'
+  VERSION = '1.3.0'
 end

data/lib/rbcurse/action.rb

@@ -1,5 +1,5 @@
 require 'rbcurse/rwidget'
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   ## encapsulates behaviour allowing centralization

data/lib/rbcurse/app.rb

@@ -9,7 +9,7 @@ Todo:
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 
@@ -21,7 +21,7 @@ module Kernel
   extend Forwardable
   def_delegators :$tt, :ask, :say, :agree, :choose, :numbered_menu, :display_text, :display_text_interactive, :display_list, :say_with_pause
 end
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 include RubyCurses::Utils
 include Io
@@ -105,7 +105,7 @@ module RubyCurses
       run &block
     end
     def init_vars
-      @quit_key ||= KEY_F1
+      @quit_key ||= FFI::NCurses::KEY_F10
       # actually this should be maintained inside ncurses pack, so not loaded 2 times.
       # this way if we call an app from existing program, App won't start ncurses.
       unless $ncurses_started
@@ -115,8 +115,10 @@ module RubyCurses
       @message_row = Ncurses.LINES-1
       @prompt_row = @message_row # hope to use for ask etc
       unless $log
-        $log = Logger.new((File.join(ENV["LOGDIR"] || "./" ,"view.log")))
-        $log.level = Logger::DEBUG
+        path = File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")
+        file   = File.open(path, File::WRONLY|File::TRUNC|File::CREAT) 
+        $log = Logger.new(path)
+        $log.level = Logger::DEBUG # change to warn when you've tested your app.
         colors = Ncurses.COLORS
         $log.debug "START #{colors} colors  --------- #{$0} win: #{@window} "
       end
@@ -193,6 +195,7 @@ module RubyCurses
     # during a process, when you wish to update status, since ordinarily the thread is busy
     # and form does not get control back, so the window won't refresh.
     # NOTE: use this only if +message+ is not working
+    # XXX Not sure if this is working after move to ffi-ncurses, check the demos
     def message_immediate text
       message text
       @message_label.repaint
@@ -207,7 +210,7 @@ module RubyCurses
     # (similar to message_immediate) but faster and less involved
     def raw_message text
       # experimentally trying stdscr instead of label
-      scr = Ncurses.stdscr
+      scr = FFI::NCurses.stdscr
       text = "%-80s" % text
       Ncurses.mvprintw @message_label.row ,0, text
       #@_stext ||= ""
@@ -215,7 +218,8 @@ module RubyCurses
       ## appending is quite a pain, maybe we should make it separate.
       #stext = "%-80s" % @_stext
       #Ncurses.mvprintw @message_label.row ,0, stext[-80..-1]
-      scr.refresh()
+      #scr.refresh() # NW w FFI XXX
+      #FFI::NCurses.refresh
     end
     # shows a simple progress bar on last row, using stdscr
     # @param [Float, Array<Fixnum,Fixnum>] percentage, or part/total
@@ -239,7 +243,7 @@ module RubyCurses
       text = "[" + "%-10s" % stext + "]"
       Ncurses.mvprintw( @message_label.row ,startcol-10, s) if s
       Ncurses.mvprintw @message_label.row ,startcol, text
-      scr.refresh()
+      #scr.refresh() # XXX FFI NW
 
     end
     # used only by LiveConsole, if enables in an app, usually only during testing.
@@ -287,6 +291,36 @@ module RubyCurses
       end
       opts
     end
+    def display_app_help
+      if respond_to? :help_text
+        arr = help_text
+      else
+        arr = []
+        arr << "    NO HELP SPECIFIED FOR APP "
+        arr << "    "
+        arr << "     --- General help ---          "
+        arr << "    F10         -  exit application "
+        arr << "    Alt-x       -  select commands  "
+        arr << "    :           -  select commands  "
+        arr << "    "
+      end
+      case arr
+      when String
+        arr = arr.split("\n")
+      when Array
+      end
+      w = arr.max_by(&:length).length
+
+      require 'rbcurse/extras/viewer'
+      RubyCurses::Viewer.view(arr, :layout => [2, 10, [4+arr.size, 24].min, w+2],:close_key => KEY_RETURN, :title => "<Enter> to close", :print_footer => true) do |t|
+      # you may configure textview further here.
+      #t.suppress_borders true
+      #t.color = :black
+      #t.bgcolor = :white
+      # or
+      t.attr = :reverse
+      end
+    end
     # bind a key to a method at global (form) level
     # Note that individual component may be overriding this.
     def bind_global
@@ -298,8 +332,8 @@ module RubyCurses
       end
       key = []
       str = ""
-      raw_message "Enter one or 2 keys. Finish with ENTER:"
-      raw_message "Enter first key:"
+      raw_message "Enter one or 2 keys. Finish with ENTER. Enter first key:"
+      #raw_message "Enter first key:"
       ch = @window.getchar()
       if [KEY_ENTER, 10, 13, ?\C-g.getbyte(0)].include? ch
         raw_message "Aborted."
@@ -321,7 +355,8 @@ module RubyCurses
       if !key.empty?
         raw_message "Binding #{cmd} to #{str} "
         key = key[0] if key.size == 1
-        @form.bind_key(key, cmd.to_sym)
+        #@form.bind_key(key, cmd.to_sym) # not finding it, getting called by that comp
+        @form.bind_key(key){ send(cmd.to_sym) }
       end
       #message "Bound #{str} to #{cmd} "
     end
@@ -336,7 +371,7 @@ module RubyCurses
     # Actually, this is naive, you would want to pass some values in like current data value
     # or lines ??
     # Also may want command completion, or help so all commands can be displayed
-    def get_command_from_user choices=nil
+    def get_command_from_user choices=["quit"]
       #code, str = rbgetstr(@window, $lastline, 0, "", 80, :default => ":")
       #return unless code == 0
             @_command_history ||= Array.new
@@ -364,9 +399,10 @@ module RubyCurses
         str = str.to_s #= str[1..-1]
         cmdline = str.split
         cmd = cmdline.shift #.to_sym
+        return unless cmd # added 2011-09-11 FFI
         if respond_to?(cmd, true)
           if cmd == "close"
-            throw :close
+            throw :close # other seg faults in del_panel window.destroy executes 2x
           else
             send cmd, *cmdline
           end
@@ -682,7 +718,7 @@ module RubyCurses
       @color_pair = config[:color_pair] || $datacolor
       @attrib = config[:attrib] || Ncurses::A_NORMAL
       @window.attron(Ncurses.COLOR_PAIR(@color_pair) | @attrib)
-      @window.mvwhline( row, col, ACS_HLINE, width)
+      @window.mvwhline( row, col, FFI::NCurses::ACS_HLINE, width)
       @window.attron(Ncurses.COLOR_PAIR(@color_pair) | @attrib)
       @app_row += 1
     end
@@ -1089,6 +1125,7 @@ module RubyCurses
               end
             end
           }
+          @form.bind_key(KEY_F1){ display_app_help }
           @message = Variable.new
           @message.value = ""
           @message_label = RubyCurses::Label.new @form, {:text_variable => @message, :name=>"message_label",:row => Ncurses.LINES-1, :col => 0, :display_length => Ncurses.COLS,  :height => 1, :color => :white}

data/lib/rbcurse/applicationheader.rb

@@ -1,5 +1,5 @@
 require 'rbcurse/rwidget'
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   class ApplicationHeader < Widget