rbcurse 1.3.0 → 1.4.0

data/lib/rbcurse/extras/viewer.rb

@@ -53,7 +53,6 @@ module RubyCurses
         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;
@@ -69,25 +68,30 @@ module RubyCurses
         f.reset_layout([f.height, f.width, c, f.left]); f.show;
       }
       # yielding textview so you may further configure or bind keys or events
+      begin
+      textview.set_content content #, :WRAP_WORD
       yield textview if block_given? # tentative
       v_form.repaint
       v_window.wrefresh
       Ncurses::Panel.update_panels
-      begin
+      # allow closing using q and Ctrl-q in addition to any key specified
+      #  user should not need to specify key, since that becomes inconsistent across usages
         while((ch = v_window.getchar()) != ?\C-q.getbyte(0) )
-          break if ch == config[:close_key]
+          break if ch == config[:close_key] || ch == ?q.ord
           # if you've asked for RETURN then i also check for 10 and 13
           break if (ch == 10 || ch == 13) && config[:close_key] == KEY_RETURN
           v_form.handle_key ch
           v_form.repaint
         end
+      rescue => err
+        alert err.to_s
       ensure
         v_window.destroy if !v_window.nil?
       end
     end
     private
     def self._get_contents fp
-      return nil unless File.readable? fp 
+      return "File #{fp} not readable"  unless File.readable? fp 
       return Dir.new(fp).entries if File.directory? fp
       case File.extname(fp)
       when '.tgz','.gz'
@@ -96,6 +100,14 @@ module RubyCurses
       when '.zip'
         cmd = "unzip -l #{fp}"
         content = %x[#{cmd}]
+      when '.jar', '.gem'
+        cmd = "tar -tvf #{fp}"
+        content = %x[#{cmd}]
+      when '.png', '.out','.jpg', '.gif','.pdf'
+        content = "File #{fp} not displayable"
+      when '.sqlite'
+        cmd = "sqlite3 #{fp} 'select name from sqlite_master;'"
+        content = %x[#{cmd}]
       else
         content = File.open(fp,"r").readlines
       end

data/lib/rbcurse/keylabelprinter.rb

@@ -2,12 +2,37 @@ require 'rbcurse/rwidget'
 #include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
+  #
+  # This paints labels for various keys at the bottom of the screen, in 2 rows. 
+  # This is based on alpines last 2 rows. Modes are supported so that the 
+  # labels change as you enter a widget.
+  # For an example, see dbdemo.rb or rfe.rb
+  # NOTE: applications using 'App' use a shortcut "dock" to create this.
+  #
+  # The most minimal keylabel to print one label in first row, and none in second is:
+  #     [["F1", "Help"], nil]
+  # To print 2 labels, one over the other:
+  #     [["F1", "Help"], ["F10", "Quit"]]
+  #
   class KeyLabelPrinter < Widget
     attr_reader :key_labels
+    # the current mode (labels are based on mode, changing the mode, changes the labels
+    #  displayed)
     dsl_property :mode
+    # set the color of the labels, overriding the defaults
+    dsl_accessor :footer_color_pair
+    # set the color of the mnemonic, overriding the defaults
+    dsl_accessor :footer_mnemonic_color_pair
 
     def initialize form, key_labels, config={}, &block
 
+      case key_labels
+      when Hash
+        raise "KeyLabelPrinter: KeyLabels cannot be a hash, Array of key labels required. Perhaps you did not pass labels"
+      when Array
+      else
+        raise "KeyLabelPrinter: Array of key labels required. Perhaps you did not pass labels"
+      end
       super form, config, &block
       @mode ||= :normal
       #@key_labels = key_labels
@@ -16,14 +41,14 @@ module RubyCurses
       @editable = false
       @focusable = false
       @cols ||= Ncurses.COLS-1
-      @row ||= Ncurses.LINES-3
+      @row ||= Ncurses.LINES-2
       @col ||= 0
       @repaint_required = true
       @footer_color_pair ||= $bottomcolor
       @footer_mnemonic_color_pair ||= $reversecolor #2
     end
     def key_labels mode=@mode
-      @key_hash[mode]
+      @key_hash[mode] 
     end
     # returns the keys as printed. these may or may not help
     # in validation depedign on what you passed as zeroth index
@@ -46,16 +71,21 @@ module RubyCurses
     def repaint
       return unless @repaint_required
       r,c = rowcol
-      print_key_labels(arr = key_labels(), mode=@mode)
+      arr = key_labels()
+      print_key_labels(arr, mode=@mode)
       @repaint_required = false
     end
+    # ?? does not use mode, i think key_labels is unused. a hash is now used 2011-10-11 XXX FIXME
+    # WARNING, i have not tested this after changing it. 
     def append_key_label key, label, mode=@mode
-      @key_labels << [key, label] if !@key_labels.include? [key, label]
+      #@key_labels << [key, label] if !@key_labels.include? [key, label]
+      @key_hash[mode] << [key, label] if !@key_hash[mode].include? [key, label]
       @repaint_required = true
     end
     def print_key_labels(arr = key_labels(), mode=@mode)
       #return if !@show_key_labels # XXX
       @win ||= @form.window
+      $log.debug "XXX: PKL #{arr.length}, #{arr}"
       @padding = @cols / (arr.length/2)
       posx = 0
       even = []

data/lib/rbcurse/listeditable.rb

@@ -142,9 +142,11 @@ module ListEditable
         # user requested this kill to be appened to last kill, so it can be yanked as one
         #$kill_ring.last << list
         last = $kill_ring.pop 
+        $log.debug "YANK: addto : last= #{last} , list= #{list} "
         case list
         when Array
-          list.insert 0, last
+          #list.insert 0, last
+          list.insert 0, *last # 2011-10-10 changed as it was wrong in textarea
           $kill_ring << list
         when String
           $kill_ring << [last, list]
@@ -154,6 +156,7 @@ module ListEditable
       end
       $kill_ring_pointer = $kill_ring.size
       $append_next_kill = false
+      $log.debug "YANK: kill_ring: #{$kill_ring} "
     end
 
     # pastes recent (last) entry of kill_ring.
@@ -163,6 +166,7 @@ module ListEditable
       return -1 if !@editable 
       return if $kill_ring.empty?
       row = $kill_ring.last
+      $log.debug "YANK: row #{row} "
       index = where
       case row
       when Array

data/lib/rbcurse/listkeys.rb

@@ -4,7 +4,7 @@ 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)  # need to changed from C-x since used for actions # changed 2011 dts  
+      #@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)

data/lib/rbcurse/listscrollable.rb

@@ -12,7 +12,7 @@ module ListScrollable
   attr_accessor :show_caret # 2010-01-23 23:06 our own fake insertion point
   def previous_row num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
     #return :UNHANDLED if @current_index == 0 # EVIL
-    return false if @current_index == 0 
+    return :NO_PREVIOUS_ROW if @current_index == 0 
     @oldrow = @current_index
     # NOTE that putting a multiplier inside, prevents an event from being triggered for each row's
     # on leave and on enter
@@ -29,7 +29,7 @@ module ListScrollable
     # next field. however, in long lists when user scrolls the sudden jumping to next is very annoying.
     # In combos, if focus was on last row, the combo closed which is not accceptable.
     #return :UNHANDLED if @current_index == rc-1 # EVIL !!!
-    return false if @current_index == rc-1 
+    return :NO_NEXT_ROW if @current_index == rc-1  # changed 2011-10-5 so process can do something
     @oldrow = @current_index
     @current_index += 1*num if @current_index < rc
     bounds_check
@@ -160,7 +160,7 @@ module ListScrollable
   def scroll_right
     $log.debug " inside scroll_right "
     hscrollcols = $multiplier > 0 ? $multiplier : @width/2
-    $log.debug " scroll_right  mult:#{$multiplier} , hscrollcols  #{hscrollcols}, w: #{@width} ll:#{@longest_line} "
+    $log.debug " scroll_right  mult:#{$multiplier} , hscrollcols  #{hscrollcols}, pcol #{@pcol} w: #{@width} ll:#{@longest_line} "
     #blen = @buffer.rstrip.length
     blen = @longest_line
     @pcol += hscrollcols if @pcol + @width < blen 
@@ -292,7 +292,11 @@ module ListScrollable
       @search_start_ix = start
       regex = Regexp.new(regex, Regexp::IGNORECASE) if @search_case
       start.upto(fend) do |ix| 
-        row = @list[ix].to_s
+        row1 = @list[ix].to_s
+
+        # 2011-09-29 crashing on a character F3 in log file
+        row = row1.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?")
+
         m=row.match(regex)
         if !m.nil?
           @find_offset = m.offset(0)[0]
@@ -473,13 +477,16 @@ module ListScrollable
     end
     # returns only the visible portion of string taking into account display length
     # and horizontal scrolling. MODIFIES STRING
+    # NOTE truncate does not take into account left_margin that some widgets might use
     def truncate content  #:nodoc:
-      maxlen = @maxlen || @width-2
+      #maxlen = @maxlen || @width-2
+      _maxlen = @maxlen || @width-@internal_width
+      _maxlen = @width-@internal_width if _maxlen > @width-@internal_width
       if !content.nil? 
-        if content.length > maxlen # only show maxlen
+        if content.length > _maxlen # only show maxlen
           @longest_line = content.length if content.length > @longest_line
-          #content = content[@pcol..@pcol+maxlen-1] 
-          content.replace content[@pcol..@pcol+maxlen-1] 
+          #content = content[@pcol..@pcol+_maxlen-1] 
+          content.replace content[@pcol..@pcol+_maxlen-1] 
         else
           # can this be avoided if pcol is 0 XXX
           content.replace content[@pcol..-1] if @pcol > 0

data/lib/rbcurse/rbasiclistbox.rb

@@ -16,7 +16,6 @@ require 'rbcurse/listcellrenderer'
 require 'forwardable'
 
 
-#include Ncurses # FFI 2011-09-8 
 module RubyCurses
   extend self
   ##
@@ -34,9 +33,9 @@ module RubyCurses
   class BasicListbox < Widget
 
     require 'rbcurse/listscrollable'
-    #require 'rbcurse/listselectable'
-    #require 'rbcurse/defaultlistselectionmodel'
+    require 'rbcurse/extras/listselectable'             # added 2011-10-8 
     include ListScrollable
+    include NewListSelectable                           # added 2011-10-8 
     extend Forwardable
     dsl_accessor :height
     dsl_accessor :title
@@ -94,8 +93,6 @@ module RubyCurses
       @_events.push(*[:ENTER_ROW, :LEAVE_ROW, :LIST_SELECTION_EVENT, :PRESS])
       @selection_mode ||= :multiple # default is multiple, anything else given becomes single
       @win = @graphic    # 2010-01-04 12:36 BUFFERED  replace form.window with graphic
-      # moving down to repaint so that scrollpane can set should_buffered
-      # added 2010-02-17 23:05  RFED16 so we don't need a form.
       @win_left = 0
       @win_top = 0
 
@@ -140,6 +137,7 @@ module RubyCurses
       bind_key(32){ toggle_row_selection() }
       bind_key(10){ fire_action_event }
       bind_key(13){ fire_action_event }
+      list_bindings
       @keys_mapped = true
 
     end
@@ -185,12 +183,16 @@ module RubyCurses
       else
         raise ArgumentError, "Listbox list(): do not know how to handle #{alist.class} " 
       end
-      # added on 2009-01-13 23:19 since updates are not automatic now
-      #create_default_list_selection_model
-      #@list_selection_model.selection_mode = @tmp_selection_mode if @tmp_selection_mode
+      clear_selection
+    
       @repaint_required = true
       @list
     end
+    # conv method to insert data, trying to keep names same across along with Tabular, TextView,
+    # TextArea and listbox. Don;t use this till i am certain.
+    def data=(val)
+      list(val)
+    end
     # get element at
     # @param [Fixnum] index for element
     # @return [Object] element
@@ -375,6 +377,7 @@ module RubyCurses
         Ncurses.beep
         return :UNHANDLED
       end
+      super  # forgot this 2011-10-9 that's why events not firign
       on_enter_row @current_index
       set_form_row # added 2009-01-11 23:41 
       true
@@ -404,7 +407,6 @@ module RubyCurses
     # processing. also, it pans the data horizontally giving the renderer
     # a section of it.
     def repaint #:nodoc:
-      #safe_create_buffer # 2010-01-04 12:36 BUFFERED moved here 2010-01-05 18:07 
       return unless @repaint_required
       # not sure where to put this, once for all or repeat 2010-02-17 23:07 RFED16
       my_win = @form ? @form.window : @target_window
@@ -467,8 +469,6 @@ module RubyCurses
       end # rc == 0
       #@table_changed = false
       @repaint_required = false
-      #@buffer_modified = true # required by form to call buffer_to_screen BUFFERED
-      #buffer_to_window # RFED16 2010-02-17 23:16 
     end
     # the idea here is to allow users who subclass Listbox to easily override parts of the cumbersome repaint
     # method. This assumes your List has some data, but you print a lot more. Now you don't need to
@@ -484,7 +484,7 @@ module RubyCurses
         value.to_s if value
       end
     end
-    # takes a block, this way anyone extending this class can just pass a block to do his job
+    # takes a block, this way anyone extending this klass can just pass a block to do his job
     # This modifies the string
     def sanitize content #:nodoc:
       if content.is_a? String
@@ -531,8 +531,6 @@ module RubyCurses
     def set_form_col col1=0               #:nodoc:
       @cols_panned ||= 0 
       # editable listboxes will involve changing cursor and the form issue
-      ## added win_col on 2010-01-04 23:28 for embedded forms BUFFERED TRYING OUT
-      #win_col=@form.window.left
       win_col = 0 
       col2 = win_col + @col + @col_offset + col1 + @cols_panned + @left_margin
       $log.debug " set_form_col in rlistbox #{@col}+ left_margin #{@left_margin} ( #{col2} ) "
@@ -543,17 +541,25 @@ module RubyCurses
     
     # change selection of current row on pressing space bar
     # If mode is multiple, then other selections are cleared and this is added
-    def toggle_row_selection crow=@current_index
+    # NOTE: 2011-10-8 allow multiple select on spacebar. Using C-Space was quite unfriendly
+    # although it will still work
+    def OLDtoggle_row_selection crow=@current_index
       @repaint_required = true
+      row = crow
       case @selection_mode 
       when :multiple
-        clear_selection
-        @selected_indices[0] = crow #@current_index
+        add_to_selection
+        #clear_selection
+        #@selected_indices[0] = crow #@current_index
       else
         if @selected_index == crow #@current_index
           @selected_index = nil
+          lse = ListSelectionEvent.new(crow, crow, self, :DELETE)
+          fire_handler :LIST_SELECTION_EVENT, lse
         else
           @selected_index = crow #@current_index
+          lse = ListSelectionEvent.new(crow, crow, self, :INSERT)
+          fire_handler :LIST_SELECTION_EVENT, lse
         end
       end
     end
@@ -562,24 +568,29 @@ module RubyCurses
     # add an item to selection, if selection mode is multiple
     # if item already selected, it is deselected, else selected
     # typically bound to Ctrl-Space
-    def add_to_selection
+    def OLDadd_to_selection
+      crow = @current_index
       case @selection_mode 
       when :multiple
         if @selected_indices.include? @current_index
           @selected_indices.delete @current_index
+          lse = ListSelectionEvent.new(crow, crow, self, :DELETE)
+          fire_handler :LIST_SELECTION_EVENT, lse
         else
           @selected_indices << @current_index
+          lse = ListSelectionEvent.new(crow, crow, self, :INSERT)
+          fire_handler :LIST_SELECTION_EVENT, lse
         end
       else
       end
       @repaint_required = true
     end
     # clears selected indices
-    def clear_selection
+    def OLDclear_selection
       @selected_indices = []
       @repaint_required = true
     end
-    def is_row_selected crow=@current_index
+    def OLDis_row_selected crow=@current_index
       case @selection_mode 
       when :multiple
         @selected_indices.include? crow
@@ -602,6 +613,19 @@ module RubyCurses
       @current_index = row
       @repaint_required = true # fire list_select XXX
     end
+    # Returns selected indices
+    # Indices are often required since the renderer may modify the values displayed
+    #
+    def get_selected_indices; @selected_indices; end
+
+    # Returns selected values
+    #
+    def get_selected_values
+      selected = []
+      @selected_indices.each { |i| selected << @list[i] }
+      return selected
+    end
+    alias :selected_values :get_selected_values
  
 
 
@@ -648,9 +672,6 @@ module RubyCurses
       @attrs[:focussed] = $row_focussed_attr
 
     end
-    def getvalue
-      @text
-    end
     ##
     # sets @color_pair and @attr
     def select_colors focussed, selected

data/lib/rbcurse/rcommandwindow.rb

@@ -26,7 +26,6 @@ module RubyCurses
     dsl_accessor :height, :width, :top, :left  #  2009-01-06 00:05 after removing meth missing
 
     def initialize form=nil, aconfig={}, &block
-      #@form = form
       @config = aconfig
       @config.each_pair { |k,v| instance_variable_set("@#{k}",v) }
       instance_eval &block if block_given?
@@ -44,15 +43,6 @@ module RubyCurses
       @bottomline.name = "rcommandwindow's bl"
       extend Forwardable
       def_delegators :@bottomline, :ask, :say, :agree, :choose #, :display_text_interactive
-      #if @form.nil?
-        #@form = RubyCurses::Form.new @window
-      #else
-        #@form.window = @window
-      #end
-      #acolor = get_color $reversecolor
-      #color = get_color $datacolor
-      #@window.printstring 0,0,"hello there", $normalcolor, 'normal'
-      #@window.bkgd(Ncurses.COLOR_PAIR(acolor));
       if @box == :border
         @window.box 0,0
       elsif @box
@@ -66,9 +56,7 @@ module RubyCurses
       @window.wrefresh
       @panel = @window.panel
       Ncurses::Panel.update_panels
-      #@form.repaint
       @window.wrefresh
-      #handle_keys
       @row_offset = 0
       if @box
         @row_offset = 1
@@ -127,7 +115,6 @@ module RubyCurses
       when 0
         @start = 0
       end
-      #@form.repaint
       Ncurses::Panel.update_panels();
       Ncurses.doupdate();
       @window.wrefresh
@@ -166,7 +153,7 @@ module RubyCurses
     # do not go more than 3 columns and do not print more than window TODO FIXME
     def display_menu list, options={}
       indexing = options[:indexing]
-      max_cols = 3
+      max_cols = 3 #  maximum no of columns, we will reduce based on data size
       l_succ = "`"
       act_height = @height
       if @box
@@ -194,6 +181,13 @@ module RubyCurses
         h = act_height
         cols = (lh*1.0 / h).ceil
         cols = max_cols if cols > max_cols
+        # sometimes elements are large like directory paths, so check size
+        datasize = list.first.length
+        if datasize > @width/3 # keep safety margin since checking only first row
+          cols = 1
+        elsif datasize > @width/2
+          cols = [2,cols].min
+        end
         adv = (@width/cols).to_i
         colct = 0
         col = 1