rbcurse 1.2.0 → 1.3.0

data/lib/rbcurse/extras/tabular.rb

@@ -70,11 +70,12 @@ module RubyCurses
     # set columns names 
     # @param [Array<String>] column names, preferably padded out to width for column
     def columns=(array)
+      $log.debug "tabular got columns #{array.count} #{array.inspect} " if $log
       @columns = array
       @columns.each_with_index { |c,i| 
         @chash[i] = ColumnInfo.new(c, c.to_s.length) 
         @cw[i] ||= c.to_s.length
-        @calign[i] ||= :left
+        #@calign[i] ||= :left # 2011-09-27 prevent setting later on
       }
     end
     alias :headings= :columns=
@@ -82,14 +83,15 @@ module RubyCurses
     # set data as an array of arrays
     # @param [Array<Array>] data as array of arrays
     def data=(list)
-      puts "got data: #{list.size} "
-      puts list
+      puts "got data: #{list.size} " if !$log
+      puts list if !$log
       @list = list
     end
 
     # add a row of data 
     # @param [Array] an array containing entries for each column
     def add array
+      $log.debug "tabular got add  #{array.count} #{array.inspect} " if $log
       @list ||= []
       @list << array
     end
@@ -210,12 +212,14 @@ module RubyCurses
         end
       }
       @fmstr = fmt.join(@y)
+      puts "format: #{@fmstr} "
     end
   end
 end
 
 if __FILE__ == $PROGRAM_NAME
   include RubyCurses
+  $log = nil
   t = Tabular.new(['a', 'b'], [1, 2], [3, 4])
   puts t.to_s
   puts 
@@ -223,6 +227,7 @@ if __FILE__ == $PROGRAM_NAME
   t.add %w{ rahul 32 r@ruby.org }
   t << %w{ _why 133 j@gnu.org }
   t << %w{ Jane 1331 jane@gnu.org }
+  t.column_width 1, 10
   t.align_column 1, :right
   puts t.to_s
   puts

data/lib/rbcurse/extras/viewer.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 
 # NOTE: experimental, not yet firmed up
 # If you use in application, please copy to some application folder in case i change this.
+# Can be used for print_help_page
 # TODO: add vi_keys here
 # SUGGESTIONS WELCOME.
 # @since 1.2.0
@@ -11,6 +12,8 @@ module RubyCurses
   # view filename, :close_key => KEY_RETURN
   # send data in an array
   # view Array, :close_key => KEY_RETURN, :layout => [0,0,23,80]
+  # when passing layout reserve 4 rows for window and border. So for 2 lines of text
+  # give 6 rows.
   class Viewer
     # @param filename as string or content as array
     # @yield textview object for further configuration before display
@@ -44,14 +47,27 @@ module RubyCurses
         row  0
         col  0
         width ww
-        height wh-2
+        height wh-0 # earlier 2 but seems to be leaving space.
         title fp
         title_attrib ta
         print_footer pf
         footer_attrib fa
       end
       textview.set_content content #, :WRAP_WORD
-      
+
+      t = textview
+      t.bind_key('<'){ f = t.form.window; c = f.left - 1; f.hide; f.mvwin(f.top, c); f.show;
+        f.reset_layout([f.height, f.width, f.top, c]); 
+      }
+      t.bind_key('>'){ f = t.form.window; c = f.left + 1; f.hide; f.mvwin(f.top, c); 
+        f.reset_layout([f.height, f.width, f.top, c]); f.show;
+      }
+      t.bind_key('^'){ f = t.form.window; c = f.top - 1 ; f.hide; f.mvwin(c, f.left); 
+        f.reset_layout([f.height, f.width, c, f.left]) ; f.show;
+      }
+      t.bind_key('V'){ f = t.form.window; c = f.top + 1 ; f.hide; f.mvwin(c, f.left); 
+        f.reset_layout([f.height, f.width, c, f.left]); f.show;
+      }
       # yielding textview so you may further configure or bind keys or events
       yield textview if block_given? # tentative
       v_form.repaint

data/lib/rbcurse/io.rb

@@ -40,8 +40,8 @@ module Io
   #def rbgetstr(win, r, c, prompt, maxlen, default, labels, validints=[], helptext="")
   def rbgetstr(win, r, c, prompt, maxlen, config={})
     #win ||= @target_window
-    $log.debug " inside rbgetstr #{win} r:#{r} c:#{c} p:#{prompt} m:#{maxlen} "
     raise "rbgetstr got no window. io.rb" if win.nil?
+    $log.debug " inside io.rb rbgetstr #{win} r:#{r} c:#{c} p:#{prompt} m:#{maxlen} #{win.name} "
     ins_mode = false
     default = config[:default] || ""
     prompt = "#{prompt} [#{default}]: " unless default
@@ -56,7 +56,7 @@ module Io
     #x mylabels=["^G~Help  ", "^C~Cancel"]
     #x mylabels += labels if !labels.nil?
     begin
-      Ncurses.echo();
+      Ncurses.noecho(); # FFI RK 2011-09-11 seems this was causing issue of writing on top
       #x print_key_labels( 0, 0, mylabels)
       #curpos = 0
       curpos = str.length
@@ -66,7 +66,7 @@ module Io
       while true
         #ch=win.mvwgetch(r, len) # get to right of prompt - WHY  NOT WORKING ??? 
         ch=win.getchar()
-        $log.debug " rbgetstr got ch:#{ch}, str:#{str}. "
+        $log.debug "io.rb rbgetstr got ch:#{ch}, #{win} , str:#{str}, len: #{len} "
         case ch
         when 3 # -1 # C-c
           return -1, nil
@@ -74,7 +74,8 @@ module Io
           return -1, nil
         when 10, 13 # hits ENTER
           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
+          # currently hitting C-h is giving 263 instead of 8
           len -= 1 if len > prompt.length
           curpos -= 1 if curpos > 0
           str.slice!(curpos)
@@ -94,14 +95,31 @@ module Io
           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.wrefresh # FFI 2011-09-19 otherwise not showing
           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.wrefresh # FFI 2011-09-19 otherwise not showing
           end
           next
+        when ?\C-a.getbyte(0)
+          #olen = str.length
+          #clear_this win, r, c, color, len+maxlen+1
+          #clear_line len+maxlen+1, @prompt_length
+          len -= curpos
+          curpos = 0
+          win.move r, c+len # since getchar is not going back on del and bs
+          win.wrefresh # FFI 2011-09-19 otherwise not showing
+        when ?\C-e.getbyte(0)
+          olen = str.length
+          len += (olen - curpos)
+          curpos = olen
+          #clear_line len+maxlen+1, @prompt_length
+          win.move r, c+len # since getchar is not going back on del and bs
+          win.wrefresh # FFI 2011-09-19 otherwise not showing
         when ?\M-i.getbyte(0) 
           ins_mode = !ins_mode
           next
@@ -147,6 +165,7 @@ module Io
         end
         print_this(win, prompt+str, color, r, c)
         win.wmove r, c+len # more for arrow keys, curpos may not be end
+        win.wrefresh
         prevchar = ch
       end
       str = default if str == ""
@@ -509,16 +528,10 @@ module Io
     sleep(5)
   end
   def print_help_page(filename = "TODO")
-    #require 'transactionviewer'
-    #tp = TransactionViewer.new(nil)
-    #tp.run
-    require 'panelreader'
-    tp = PanelReader.new()
-    tp.view_file(filename)
-    
-    #require 'padreader'
-    #tp = PadReader.new()
+    #require 'panelreader' obsolete used FORN and fiELD
+    #tp = PanelReader.new()
     #tp.view_file(filename)
+    
   end
   #def newaskyesno(win, askstr, default = "N", helptext="Helptext for this question")
   ## 

data/lib/rbcurse/keylabelprinter.rb

@@ -1,5 +1,5 @@
 require 'rbcurse/rwidget'
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   class KeyLabelPrinter < Widget
@@ -80,7 +80,8 @@ module RubyCurses
       print_key_labels_row(posy, posx, even)
       posy = @row+1
       print_key_labels_row(posy, posx, odd)
-      #@win.wrefresh   # needed else secod row not shown after askchoice XXX
+      # uncommented next line after ffi-ncurses else not showing till key press FFI 2011-09-17 
+      @win.wrefresh   # needed else secod row not shown after askchoice XXX 
     end
     def print_key_labels_row(posy, posx, arr)
       # FIXME: this logic of padding needs to take into account

data/lib/rbcurse/listcellrenderer.rb

@@ -107,6 +107,7 @@ module RubyCurses
         end
       end
       len = @display_length || value.length
+      #$log.debug " XXX @display_length: #{@display_length}, #{value.length}, L:#{len}, pw:#{@parent.width} ::attr:: #{@attr} "
       graphic.printstring r, c, @format % [len, value], @color_pair, @attr
     end # repaint
 

data/lib/rbcurse/listkeys.rb

@@ -4,8 +4,9 @@ module RubyCurses
     # That was possible earlier, but now that i am binding the key at construction time
     # any changes to the vars after construction won't have an effect.
     def install_list_keys
-      @KEY_ROW_SELECTOR ||= ?\C-x.getbyte(0)
-      @KEY_BLOCK_SELECTOR ||= ?\M-x.getbyte(0)
+#      @KEY_ROW_SELECTOR ||= ?\C-x.getbyte(0)  # need to changed from C-x since used for actions # changed 2011 dts  
+      @KEY_ROW_SELECTOR ||= 0  # need to changed from C-x since used for actions
+      @KEY_BLOCK_SELECTOR ||= ?\M-x.getbyte(0)  # need to change since M-x used for commands
       @KEY_GOTO_TOP ||= ?\M-0.getbyte(0)
       @KEY_GOTO_BOTTOM ||= ?\M-9.getbyte(0)
       #@KEY_ASK_FIND_FORWARD ||= ?\M-f.getbyte(0)

data/lib/rbcurse/listselectable.rb

@@ -27,7 +27,7 @@ module RubyCurses
     alias :is_row_selected :is_selected?
 
     def add_row_selection_interval ix0, ix1
-      $log.debug " def add_row_selection_interval #{ix0}, ix1"
+      $log.debug " def add_row_selection_interval #{ix0}, #{ix1}"
       # if row_selection_allowed
       @list_selection_model.add_selection_interval ix0, ix1
       @repaint_required = true
@@ -51,9 +51,10 @@ module RubyCurses
       @repaint_required = true
     end
     # why is this commented off XXX could it override listscrollable
-    def selected_item
+    #def selected_item
+      #$log.warn "came in dummy selected_item of listselectable.rb"
     #  @list[@current_index]
-    end
+    #end
     # returns selected indices
     # TODO : if array passed, set those as selected indices
     def selected_rows

data/lib/rbcurse/rbasiclistbox.rb

@@ -16,7 +16,7 @@ require 'rbcurse/listcellrenderer'
 require 'forwardable'
 
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 module RubyCurses
   extend self
   ##
@@ -281,7 +281,7 @@ module RubyCurses
         @repaint_required = true
       when 27, ?\C-c.getbyte(0)
         #editing_canceled @current_index if @cell_editing_allowed
-        #cancel_block # block
+        #cancel_block # block NW XXX don't think its required. 2011-09-9  FFI
         $multiplier = 0
       when @KEY_ASK_FIND_FORWARD
       # ask_search_forward
@@ -414,15 +414,17 @@ module RubyCurses
       @win_left = my_win.left
       @win_top = my_win.top
       @left_margin ||= @row_selected_symbol.length
+      # we are making sure display len does not exceed width XXX hope this does not wreak havoc elsewhere
+      _dl = [@display_length || 100, @width-2].min # 2011-09-17 RK overwriting when we move grabbar in vimsplit
 
       $log.debug "basicrlistbox repaint  #{@name} graphic #{@graphic}"
       #$log.debug "XXX repaint to_print #{@to_print_borders} "
       print_borders unless @suppress_borders # do this once only, unless everything changes
-      #maxlen = @maxlen ||= @width-2
+      #maxlen = @maxlen || @width-2
       tm = list()
       rc = row_count
       @longest_line = @width
-      $log.debug " rlistbox #{row_count} "
+      $log.debug " rbasiclistbox #{row_count}, w:#{@width} , maxlen:#{@maxlen} "
       if rc > 0     # just added in case no data passed
         tr = @toprow
         acolor = get_color $datacolor
@@ -455,6 +457,7 @@ module RubyCurses
             end
             #renderer = get_default_cell_renderer_for_class content.class.to_s
             renderer = cell_renderer()
+            renderer.display_length = _dl # 2011-09-17 RK overwriting when we move grabbar in vimsplit
             renderer.repaint @graphic, r+hh, c+@left_margin, crow, content, focus_type, selected
           else
             # clear rows
@@ -495,7 +498,11 @@ module RubyCurses
     # returns only the visible portion of string taking into account display length
     # and horizontal scrolling. MODIFIES STRING
     def truncate content # :nodoc:
-      maxlen = @maxlen ||= @width-2
+      maxlen = @maxlen || @width-2
+      if maxlen == 0 # (otherwise it becoems -1 below)
+        content.replace ""
+        return
+      end
       if !content.nil? 
         if content.length > maxlen # only show maxlen
           @longest_line = content.length if content.length > @longest_line

data/lib/rbcurse/rcombo.rb

@@ -12,7 +12,7 @@
 require 'rbcurse'
 require 'rbcurse/rlistbox'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   META_KEY = 128
@@ -44,7 +44,7 @@ module RubyCurses
     def init_vars
       super
       @show_symbol ||= true
-      @COMBO_SYMBOL ||= Ncurses::ACS_DARROW #GEQUAL
+      @COMBO_SYMBOL ||= FFI::NCurses::ACS_DARROW #GEQUAL
       bind_key(KEY_UP) { previous_row }
       bind_key(KEY_DOWN) { next_row }
     end

data/lib/rbcurse/rcommandwindow.rb

@@ -157,7 +157,7 @@ module RubyCurses
       if @window
         begin
           panel = @window.panel
-          Ncurses::Panel.del_panel(panel) if panel
+          Ncurses::Panel.del_panel(panel.pointer) if panel
           @window.delwin
         rescue => exc
         end
@@ -248,8 +248,8 @@ module RubyCurses
         @to = ListObject.new self, text, config
       end
       yield @to if block_given?
-      @to.display_interactive
-      @to
+      @to.display_interactive # this returns the item selected
+      @to   # this will return the ListObject to the user with list and current_index
     end
     # non interactive list display - EACH CALL IS CREATING A LIST OBJECT
     def udisplay_list text, config={}
@@ -312,6 +312,7 @@ module RubyCurses
       def display_interactive
         display_content
         while !@stop
+          @window.wrefresh # FFI 2011-09-12 
           # FIXME only clear and redisplay if change has happened (repaint_require)
           handle_keys { |ch| @cw.clear; display_content }
         end
@@ -524,6 +525,7 @@ module RubyCurses
 
         #setrowcol row, nil
         @window.wmove row, c
+        @window.wrefresh   # FFI added to keep cursor display in synch with selection
       end
       def OLDbounds_check
         @start = 0 if @start < 0

data/lib/rbcurse/rdialogs.rb

@@ -13,7 +13,7 @@ TODO:
     Add select_one (message, values, default)
 =end
 require 'rubygems'
-require 'ncurses'
+##require 'ncurses'
 require 'logger'
 require 'rbcurse/rwidget'
 require 'rbcurse/rmessagebox'
@@ -29,6 +29,9 @@ require 'rbcurse/rmessagebox'
 def alert text, config={}, &block
   title = config['title'] || "Alert"
   #instance_eval &block if block_given?
+  if text.is_a? RubyCurses::Variable # added 2011-09-20 incase variable passed
+    text = text.get_value
+  end
   mb = RubyCurses::MessageBox.new nil, config  do
     title title
     message text
@@ -49,7 +52,10 @@ end
 ##
 # allows user entry of a string.
 # In config you may pass Field related properties such as chars_allowed, valid_regex, values, etc.
-def get_string(message, len=20, default="", config={})
+def get_string(message, len=50, default="", config={})
+
+  config["input_config"] = {}
+  config["input_config"]["maxlen"] = len
   config["maxlen"]=len
   title = config["title"] || "Input required"
   mb = RubyCurses::MessageBox.new nil, config do

data/lib/rbcurse/rlistbox.rb

@@ -18,7 +18,7 @@ require 'rbcurse/listkeys'
 require 'forwardable'
 
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 module RubyCurses
   extend self
   ##
@@ -307,9 +307,10 @@ module RubyCurses
           @stop = true
           return
         when KEY_ENTER, 10, 13
+          # if you press ENTER without selecting, it won't come here
+          # it will fire button OK's fire, if that's the default button
           fire_handler :PRESS, @listbox.focussed_index
           # since Listbox is handling enter, COMBO_SELECT will not be fired
-        # $log.debug "popup ENTER : #{@selected_index} "
         # $log.debug "popup ENTER :  #{field.name}" if !field.nil?
           @stop = true
           return
@@ -701,6 +702,11 @@ module RubyCurses
       $log.debug " listbox got ch #{ch}"
       #$log.debug " when kps #{@KEY_PREV_SELECTION}  "
       case ch
+      when 10,13, KEY_ENTER
+        # this means you cannot just bind_key 10 or 13 like we once did
+        fire_action_event # trying out REMOVE 2011-09-16 FFI
+        $log.debug " 333 listbox catching 10,13 fire_action_event "
+        return 0
       when KEY_UP  # show previous value
         return previous_row
       when KEY_DOWN  # show previous value
@@ -779,6 +785,7 @@ module RubyCurses
               ret = set_selection_for_char ch.chr
             else
               ret = process_key ch, self
+      $log.debug "111 listbox #{@current_index} "
               @multiplier = 0
               return :UNHANDLED if ret == :UNHANDLED
             end
@@ -1039,6 +1046,7 @@ module RubyCurses
     # returns only the visible portion of string taking into account display length
     # and horizontal scrolling. MODIFIES STRING
     # if you;ve truncated the data, it could stay truncated even if lb is increased. be careful
+    # FIXME if _maxlen becomes 0 then maxlen -1 will print whole string again
     def truncate content
       _maxlen = @maxlen || @width-@internal_width
       _maxlen = @width-@internal_width if _maxlen > @width-@internal_width