rbcurse 1.2.0 → 1.3.0

data/lib/rbcurse/celleditor.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 #require 'lib/rbcurse/rwidget'
 

data/lib/rbcurse/colormap.rb

@@ -1,21 +1,21 @@
-require 'rubygems'
 require 'ver/ncurses'
 module ColorMap
   # 2010-09-20 12:22 changed colors from string to symbol
   ## private
   # returns a color constant for a human color string
   def ColorMap.get_color_const colorstring
-    Ncurses.const_get "COLOR_#{colorstring.upcase}"
+    ret = FFI::NCurses.const_get "COLOR_#{colorstring.upcase}"
+    #raise  "color const nil ColorMap 8 " if !ret
   end
   ## private
   # creates a new color pair, puts in color map and returns color_pair
   # number
   def ColorMap.install_color fgc, bgc
-#      $log.debug " install_color found #{fgc} #{@bgc} "
+      #$log.debug " install_color found #{fgc} #{@bgc} "
       @color_id += 1
     fg = ColorMap.get_color_const fgc
     bg = ColorMap.get_color_const bgc
-    Ncurses.init_pair(@color_id, fg, bg);
+    FFI::NCurses.init_pair(@color_id, fg, bg);
     $color_map[[fgc, bgc]] = @color_id
     return @color_id
   end
@@ -36,10 +36,10 @@ module ColorMap
     fgc = fgc.to_sym if fgc.is_a? String
     bgc = bgc.to_sym if bgc.is_a? String
     if $color_map.include? [fgc, bgc]
-#      $log.debug " get_color found #{fgc} #{@bgc} "
+      #$log.debug " get_color found #{fgc} #{@bgc} "
       return $color_map[[fgc, bgc]]
     else
-#      $log.debug " get_color NOT found #{fgc} #{@bgc} "
+      #$log.debug " get_color NOT found #{fgc} #{@bgc} "
       return ColorMap.install_color fgc, bgc
     end
   end
@@ -58,7 +58,7 @@ module ColorMap
   def ColorMap.setup
     @color_id = 0
     $color_map = {}
-    Ncurses.start_color();
+    FFI::NCurses.start_color();
     # Initialize few color pairs 
     $def_fg_color = :white   # pls set these 2 for your application
     $def_bg_color = :black
@@ -92,14 +92,14 @@ module ColorMap
 end # modul
 if $0 == __FILE__
 require 'logger'
-require 'lib/ver/window'
-include Ncurses
+require 'ver/window'
+#include Ncurses # FFI 2011-09-8 
 include ColorMap
   # Initialize curses
   begin
+    $log = Logger.new("rbc13.log")
     VER::start_ncurses
     @window = VER::Window.root_window
-    $log = Logger.new("view.log")
     $log.level = Logger::DEBUG
     ColorMap.setup
 
@@ -115,7 +115,7 @@ include ColorMap
 
       
 
-      while((ch = @window.getchar()) != KEY_F1 )
+      while((ch = @window.getchar()) != FFI::NCurses::KEY_F1 )
         next if ch == -1
         break if ch == ?q.getbyte(0)
         case ch

data/lib/rbcurse/comboboxcellrenderer.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 #require 'lib/rbcurse/rwidget'
 module RubyCurses

data/lib/rbcurse/extras/bottomline.rb

@@ -1076,7 +1076,7 @@ module RubyCurses
       #win.mvprintw(x, y, "%-40s" % text);
       win.mvprintw(x, y, "%s" % text);
       win.attroff(color);
-      win.refresh
+      win.refresh # FFI NW 2011-09-9  , added back gets overwritten
     end
 
     # actual input routine, gets each character from user, taking care of echo, limit,
@@ -1094,7 +1094,7 @@ module RubyCurses
       maxlen = @limit || 100 # fixme
 
 
-      raise "rbgetstr got no window. io.rb" if win.nil?
+      raise "rbgetstr got no window. bottomline.rb" if win.nil?
       ins_mode = false
       oldstr = nil # for tab completion, origal word entered by user
       default = @default || ""
@@ -1122,7 +1122,7 @@ module RubyCurses
         entries = nil
         while true
           ch=win.getchar()
-          #$log.debug " rbgetstr got ch:#{ch}, str:#{str}. "
+          $log.debug " XXXX FFI rbgetstr got ch:#{ch}, str:#{str}. "
           case ch
           when 3 # -1 # C-c  # sometimes this causes an interrupt and crash
             return -1, nil
@@ -1131,7 +1131,8 @@ module RubyCurses
           when 10, 13 # hits ENTER, complete entry and return
             @history_list.push str
             break
-          when ?\C-h.getbyte(0), ?\C-?.getbyte(0), KEY_BSPACE # delete previous character/backspace
+          when ?\C-h.getbyte(0), ?\C-?.getbyte(0), KEY_BSPACE, 263 # delete previous character/backspace
+            # C-h is giving 263 i/o 8. 2011-09-19 
             len -= 1 if len > @prompt_length
             curpos -= 1 if curpos > 0
             str.slice!(curpos)
@@ -1149,13 +1150,13 @@ module RubyCurses
           when KEY_LEFT
             curpos -= 1 if curpos > 0
             len -= 1 if len > @prompt_length
-            win.wmove r, c+len # since getchar is not going back on del and bs
+            win.move r, c+len # since getchar is not going back on del and bs wmove to move FFIWINDOW
             next
           when KEY_RIGHT
             if curpos < str.length
               curpos += 1 #if curpos < str.length
               len += 1 
-              win.wmove r, c+len # since getchar is not going back on del and bs
+              win.move r, c+len # since getchar is not going back on del and bs
             end
             next
           when ?\C-a.getbyte(0)
@@ -1163,13 +1164,13 @@ module RubyCurses
             clear_line len+maxlen+1, @prompt_length
             len -= curpos
             curpos = 0
-            win.wmove r, c+len # since getchar is not going back on del and bs
+            win.move r, c+len # since getchar is not going back on del and bs
           when ?\C-e.getbyte(0)
             olen = str.length
             len += (olen - curpos)
             curpos = olen
             clear_line len+maxlen+1, @prompt_length
-            win.wmove r, c+len # since getchar is not going back on del and bs
+            win.move r, c+len # since getchar is not going back on del and bs
 
           when ?\M-i.getbyte(0) 
             ins_mode = !ins_mode
@@ -1310,7 +1311,10 @@ module RubyCurses
             begin
               cpentries = @change_proc.call(str) if @change_proc # added 2010-11-09 23:28 
             rescue => exc
-              $log.debug "bottomline: change_proc EXC #{exc} " if $log.debug? 
+              $log.error "bottomline: change_proc EXC #{exc} " if $log.debug? 
+              $log.error( exc) if exc
+              $log.error(exc.backtrace.join("\n")) if exc
+              Ncurses.error
             end
             print_str(str, :y => @prompt_length+0)
           when false
@@ -1318,9 +1322,11 @@ module RubyCurses
           else
             print_str(@question.echo * str.length, :y => @prompt_length+0)
           end
-          win.wmove r, c+len # more for arrow keys, curpos may not be end
+          win.move r, c+len # more for arrow keys, curpos may not be end
           prevchar = ch
         end
+              $log.debug "XXXW bottomline: after while loop"
+
         str = default if str == ""
       ensure
         Ncurses.noecho();
@@ -1416,10 +1422,12 @@ module RubyCurses
           val = list1[ret-1]
           if val.is_a? Array
             retval << val[0]
+            $log.debug "NL: #{retval} "
             list1 = val[1..-1]
             rc.clear
           else
             retval << val
+            $log.debug "NL1: #{retval} "
             break
           end
         end
@@ -1428,6 +1436,7 @@ module RubyCurses
         rc = nil
       end
       #list1[ret-1]
+            $log.debug "NL2: #{retval} , #{retval.class} "
       retval
     end
     # Allows a selection in which options are shown over prompt. As user types
@@ -1456,6 +1465,7 @@ module RubyCurses
       begin
         w = rc.window
         rc.display_menu list1
+        # earlier wmove bombed, now move is (window.rb 121)
         str = ask(prompt) { |q| q.change_proc = Proc.new { |str| w.wmove(1,1) ; w.wclrtobot;  l = list1.select{|e| e.index(str)==0}  ; rc.display_menu l; l} }
         # need some validation here that its in the list TODO
       ensure
@@ -1477,6 +1487,8 @@ module RubyCurses
       rc = nil
     end
     #def display_list_interactive text, config={}
+    # returns a ListObject since you may not know what the list itself contained
+    # You can do ret.list[ret.current_index] to get value
     def display_list text, config={}
       require 'rbcurse/rcommandwindow'
       ht = config[:height] || 15

data/lib/rbcurse/extras/directorylist.rb

@@ -83,7 +83,10 @@ module RubyCurses
       list @entries
       @list.insert 0, @_header
       @title = @current_path
-      @current_index = @_first_data_index
+      #@current_index = @_first_data_index
+      # this next line will keep the cursor on header after sorting
+      # earlier cursor would appear in header but selection would be data row
+      @current_index = @_header_row_index # FFI 2011-09-16 keeping cursor synched with selection
     end
     # called by parent's repaint
     def convert_value_to_text file, crow
@@ -213,6 +216,7 @@ module RubyCurses
         Ncurses.error
         return
       end
+      $log.debug "inside fire_action_event of directorylist #{@current_index} #{toprow} "
       if @_header_row_index == @current_index
         # user hit enter on the header row. we determine column and sort.
         header = _get_word_under_cursor
@@ -236,6 +240,7 @@ module RubyCurses
       if File.directory? _path
         populate _path
       end
+      $log.debug "after fire_action_event of directorylist #{@current_index} #{toprow} "
 
       super
     end
@@ -337,7 +342,12 @@ module RubyCurses
     ret, str = rbgetstr(@form.window, $error_message_row, $error_message_col,  prompt, maxlen, config)
     return if ret != 0
     @file_pattern = str
+    # 2011-09-19 doesn't work if pwd changed
+    if Dir.pwd != @current_path
+      Dir.chdir @current_path
+    end
     values = Dir.glob(str)
+    $log.debug "ask select dir.glob got #{values} "
     select_values values unless values.empty?
     @repaint_required = true
   end
@@ -349,6 +359,9 @@ module RubyCurses
     ret, str = rbgetstr(@form.window, $error_message_row, $error_message_col,  prompt, maxlen, config)
     return if ret != 0
     @file_pattern = str
+    if Dir.pwd != @current_path
+      Dir.chdir @current_path
+    end
     values = Dir.glob(str)
     unselect_values values unless values.empty?
     @repaint_required = true

data/lib/rbcurse/extras/divider.rb

@@ -1,5 +1,5 @@
 require 'rbcurse/app'
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 
 # TODO : We can consider making it independent of objects, or allow for a margin so it does not write

data/lib/rbcurse/extras/listselectable.rb

@@ -175,7 +175,7 @@ module RubyCurses
       @repaint_required = true
     end
     def get_matching_indices pattern
-      alert "please implement this method get_matching_indices in your class "
+      alert "please implement this method get_matching_indices(pattern)->[] in your class  "
       return []
     end # mod
     # Applications may call this or just copy and modify
@@ -185,7 +185,7 @@ module RubyCurses
       bind_key(32) { toggle_row_selection }
       bind_key(0) { add_to_selection }
       bind_key(?+, :ask_select) # --> calls select_values
-      bind_key(?-, :ask_unselect)
+      bind_key(?-, :ask_unselect) # please implement FIXME TODO
       bind_key(?a, :select_all)
       bind_key(?*, :invert_selection)
       bind_key(?u, :clear_selection)

data/lib/rbcurse/extras/masterdetail.rb

@@ -91,7 +91,7 @@ class MasterDetail < Widget
       #s.add @right1, :SECOND
       #s.add @right2, :SECOND
       s.bind :COMPONENT_RESIZE_EVENT do |e|
-        #alert "got a resize event #{e.type}  "
+        alert "masterdetail got a resize event #{e.type}, #{e.source}  "
         case e.type
         when :INCREASE
           case e.source
@@ -100,6 +100,7 @@ class MasterDetail < Widget
           when @right1
             increase_headers
           when @left
+            alert "masterdetail left increase - not handled"
 
           end
         when :DECREASE
@@ -117,6 +118,7 @@ class MasterDetail < Widget
             @right2.repaint_required  true
             @right1.repaint_required  true
             @left.repaint_required  true
+            alert "masterdetail left decrease"
           end
         when :EXPAND
           case e.source

data/lib/rbcurse/extras/scrollbar.rb

@@ -1,5 +1,5 @@
 require 'rbcurse/app'
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 
 # This paints a vertical white bar given row and col, and length. It also calculates and prints

data/lib/rbcurse/extras/stdscrwindow.rb

@@ -9,12 +9,18 @@ module RubyCurses
   # We should be able to pass this window to bottomline and have one global bottomline
   # created once (by window class ?)
   #
+  # FFI: 2011-09-9 The change to FFI has affected this a lot since I do not get window
+  # methods in rbcurse for stdscr whereas suprisingly if i run the samples, i get them
+  # all.
   class StdscrWindow 
     attr_reader :width, :height, :top, :left
 
     def initialize
 
-      @window = Ncurses.stdscr
+      #@window_pointer = FFI::NCurses.initscr
+      @window_pointer = Ncurses.initscr # FFIWINDOW
+      $log.debug "STDSCR window pointer is #{@window_pointer.class}"
+      #$log.debug "STDSCR window pointer mehtods #{@window_pointer.public_methods}"
       $error_message_row ||= Ncurses.LINES-1
       $error_message_col ||= 1
       init_vars
@@ -22,29 +28,63 @@ module RubyCurses
 
     end
     def init_vars
-      Ncurses::keypad(@window, true)
+      #Ncurses::keypad(@window_pointer, true)
+      Ncurses.keypad(@window_pointer.pointer, true)
       @stack = []
     end
     ##
 
     # Ncurses
 
-    def method_missing(meth, *args)
-      @window.send(meth, *args)
+
+    # taken from Window
+    def method_missing(name, *args)
+      name = name.to_s
+      if (name[0,2] == "mv")
+        test_name = name.dup
+        test_name[2,0] = "w" # insert "w" after"mv"
+        if (@window_pointer.respond_to?(test_name)) # FFIPOINTER
+          return @window_pointer.send(test_name,*args)
+        end
+
+        if (FFI::NCurses.respond_to?(test_name))
+          return FFI::NCurses.send(test_name, @window_pointer, *args)
+        end
+      end
+      test_name = "w" + name
+      # FFI responds but the pointer does not !!! bottomline 1045
+      if (@window_pointer.respond_to?(test_name)) # FFIPOINTER
+        return @window_pointer.send(test_name,*args)
+      end
+      if (FFI::NCurses.respond_to?(test_name))
+        return FFI::NCurses.send(test_name, @window_pointer, *args)
+      end
+      # what if it does not respond, can go into loop and give stack overflow
+      FFI::NCurses.send(name, @window_pointer, *args)
+    end
+    def respond_to?(name)
+      name = name.to_s
+      if (name[0,2] == "mv" && FFI::NCurses.respond_to?("mvw" + name[2..-1]))
+        return true
+      end
+      FFI::NCurses.respond_to?("w" + name) || FFI::NCurses.respond_to?(name)
     end
+      #@window.send(meth, *args)
 
+    # FFI WARNING XXX I think these methods one window_pointer will fail
+    # since somehow stdscr is not getting these methods here.
     def print(string, width = width)
       return unless visible?
-      @window.waddnstr(string.to_s, width)
+      @window_pointer.waddnstr(string.to_s, width)
     end
 
     def print_yx(string, y = 0, x = 0)
-      @window.mvwaddnstr(y, x, string, width)
+      @window_pointer.mvwaddnstr(y, x, string, width)
     end
 
     def print_empty_line
       return unless visible?
-      @window.printw(' ' * width)
+      @window_pointer.printw(' ' * width)
     end
 
     def print_line(string)
@@ -55,27 +95,37 @@ module RubyCurses
       print(strings.join("\n") << "\n")
     end
 
-    def refresh
-      @window.refresh
+    # FFI 2011-09-9 commented off so it goes to method missing
+    def XXXrefresh
+      @window_pointer.refresh
     end
 
 
     def color=(color)
       @color = color
-      @window.color_set(color, nil)
+      @window_pointer.color_set(color, nil)
     end
 
     def highlight_line(color, y, x, max)
-      @window.mvchgat(y, x, max, Ncurses::A_NORMAL, color, nil)
+      @window_pointer.mvchgat(y, x, max, FFI::NCurses::A_NORMAL, color, nil)
     end
 
     def ungetch(ch)
-      Ncurses.ungetch(ch)
+      FFI::NCurses.ungetch(ch)
     end
 
+    # this used to work fine in ncursesruby
+    # but somehow in ffi, stdscr does not have most methods, i am unable to figure
+    # this out. C-c will crash this.
     def getch
-      c = @window.getch
-      #if c == Ncurses::KEY_RESIZE
+      c = @window_pointer.getch # FFI NW stdscr must get key not some window
+      #raise "Ncurses.stdscr does not have getch" if !Ncurses.stdscr.respond_to? :getch
+      #$log.debug " XXXX before calling getch"
+      #c = Ncurses.stdscr.getch # FFIW if you use the FFIWINDOW
+      #c = FFI::NCurses.getch # FFI 2011-09-9  # without FFIWINDOW
+      #$log.debug " XXXX after calling getch #{c}"
+      #if c == FFI::NCurses::KEY_RESIZE
+      return c
     rescue Interrupt => ex
       3 # is C-c
     end
@@ -85,8 +135,9 @@ module RubyCurses
     # Please test with above combinations before using on your terminal
     # added by rkumar 2008-12-12 23:07 
     def getchar 
+      FFI::NCurses.raw # FFI required so that getch does not crash on C-c
       while 1 
-        ch = getch
+        ch = getch 
         #$log.debug "window getchar() GOT: #{ch}" if ch != -1
         if ch == -1
           # the returns escape 27 if no key followed it, so its SLOW if you want only esc
@@ -174,26 +225,26 @@ module RubyCurses
     # @param color - color pair
     # @ param att - ncurses attribute: normal, bold, reverse, blink,
     # underline
-    def printstring(r,c,string, color, att = Ncurses::A_NORMAL)
+    def printstring(r,c,string, color, att = FFI::NCurses::A_NORMAL)
         prv_printstring(r,c,string, color, att )
     end
 
     ## name changed from printstring to prv_prinstring
-    def prv_printstring(r,c,string, color, att = Ncurses::A_NORMAL)
+    def prv_printstring(r,c,string, color, att = FFI::NCurses::A_NORMAL)
 
       #$log.debug " #{@name} inside window printstring r #{r} c #{c} #{string} "
-      att = Ncurses::A_NORMAL if att.nil? 
+      att = FFI::NCurses::A_NORMAL if att.nil? 
       case att.to_s.downcase
       when 'normal'
-        att = Ncurses::A_NORMAL
+        att = FFI::NCurses::A_NORMAL
       when 'underline'
-        att = Ncurses::A_UNDERLINE
+        att = FFI::NCurses::A_UNDERLINE
       when 'bold'
-        att = Ncurses::A_BOLD
+        att = FFI::NCurses::A_BOLD
       when 'blink'
-        att = Ncurses::A_BLINK    # unlikely to work
+        att = FFI::NCurses::A_BLINK    # unlikely to work
       when 'reverse'
-        att = Ncurses::A_REVERSE    
+        att = FFI::NCurses::A_REVERSE    
       end
 
       attron(Ncurses.COLOR_PAIR(color) | att)
@@ -241,7 +292,7 @@ module RubyCurses
       $error_message_clear_pending = false
     end
     ##
-    def get_window; @window; end
+    def get_window; @window_pointer; end
     def to_s; @name || self; end
   end
 end