rbcurse 1.4.0 → 1.4.1.pre2

data/lib/rbcurse/rlistbox.rb

@@ -9,8 +9,6 @@ NOTE: listbox now traps RETURN/ENTER/13 so if you are trapping it, please use bi
 TODO 
   Perhaps keep printed data created by convert_value_to_text cached, and used for searching
   cursor movement and other functions. 
-  [ ] XXX Can we separate editing out. Make a ReadonlyList, and extend it as EditableList. This way the usual
-  use case remains cleaner.
 =end
 require 'rbcurse'
 require 'rbcurse/listcellrenderer'
@@ -221,7 +219,7 @@ module RubyCurses
       @height ||= [@max_visible_items || 10, @list.length].min 
       $log.debug " POPUP XXX #{@max_visible_items} ll:#{@list.length} h:#{@height}"
       # get widgets absolute coords
-      if !@relative_to.nil?
+      if @relative_to
         layout = @relative_to.form.window.layout
         @row = @row + layout[:top]
         @col = @col + layout[:left]
@@ -245,7 +243,7 @@ module RubyCurses
       @form = RubyCurses::Form.new @window
       @window.bkgd(Ncurses.COLOR_PAIR($reversecolor));
       @window.wrefresh
-      @panel = @window.panel  # useless line ?
+      #@panel = @window.panel  # useless line ?
       Ncurses::Panel.update_panels
       print_input # creates the listbox
       @form.repaint
@@ -429,7 +427,7 @@ module RubyCurses
     dsl_property :left_margin
     # please set these in he constructor block. Settin them later will have no effect
     # since i would have bound them to actions
-    dsl_accessor :KEY_ROW_SELECTOR          # this is going to go XXX TODO
+    dsl_accessor :KEY_ROW_SELECTOR          # editable lists may want to use 0 or some other key
     dsl_accessor :KEY_GOTO_TOP          # this is going to go
     dsl_accessor :KEY_GOTO_BOTTOM          # this is going to go
     dsl_accessor :KEY_CLEAR_SELECTION          # this is going to go
@@ -472,7 +470,14 @@ module RubyCurses
       install_keys
       init_vars
       install_list_keys
-      bind(:PROPERTY_CHANGE){|e| @cell_renderer = nil } # will be recreated if anything changes 2011-09-28 V1.3.1  
+      # OMG What about people whove installed custom renders such as rfe.rb 2011-10-15 
+      #bind(:PROPERTY_CHANGE){|e| @cell_renderer = nil } # will be recreated if anything changes 2011-09-28 V1.3.1  
+      bind(:PROPERTY_CHANGE){|e| 
+        # I can't delete the cell renderer, but this may not have full effect if one color is passed.
+        if @cell_renderer.respond_to? e.property_name
+          @cell_renderer.send(e.property_name.to_sym, e.newvalue)
+        end
+      } # will be recreated if anything changes 2011-09-28 V1.3.1  
 
       if @list && !@list.selected_index.nil? 
         set_focus_on @list.selected_index # the new version
@@ -508,7 +513,11 @@ module RubyCurses
       bind_key([?g,?g]){ goto_top() }
       bind_key(?/){ ask_search() }
       bind_key(?n){ find_more() }
-      bind_key(32){ toggle_row_selection() }
+      #bind_key(32){ toggle_row_selection() } # some guys may want another selector
+      if @cell_editing_allowed && @KEY_ROW_SELECTOR == 32
+        @KEY_ROW_SELECTOR = 0 # Ctrl-Space
+      end
+      bind_key(@KEY_ROW_SELECTOR){ toggle_row_selection() }
       bind_key(10){ fire_action_event }
       bind_key(13){ fire_action_event }
       @keys_mapped = true
@@ -629,7 +638,7 @@ module RubyCurses
       end
     end
     # added 2010-09-15 00:11 to make life easier
-    def_delegators :@list, :insert, :remove_all, :delete_at, :include?, :each, :values
+    def_delegators :@list, :insert, :remove_all, :delete_at, :include?, :each, :values, :size
     # get element at
     # @param [Fixnum] index for element
     # @return [Object] element
@@ -684,6 +693,7 @@ module RubyCurses
     ### START FOR scrollable ###
     def get_content
       #@list 2008-12-01 23:13 
+      # NOTE: we never stored the listvariable, so its redundant, we used its value to set list
       @list_variable && @list_variable.value || @list 
     end
     def get_window
@@ -972,7 +982,7 @@ module RubyCurses
       tm = list()
       rc = row_count
       @longest_line = @width
-      $log.debug " rlistbox #{row_count} "
+      $log.debug " rlistbox repaint #{row_count} #{name} "
       if rc > 0     # just added in case no data passed
         tr = @toprow
         acolor = get_color $datacolor # should be set once, if color or bgcolor changs TODO FIXME

data/lib/rbcurse/rmessagebox.rb

@@ -257,18 +257,14 @@ module RubyCurses
       else
         row=(@layout[:height]/3) if row.nil?
         @message_col = (width-message.length)/2
+        @message_col = 4 if @message.is_a? Array
         @message_col = 4 if @message_col < 4 # this was often disappearing 2010-10-17 13:00 
         #$log.debug "XX ALERT col #{@message_col} w: #{width} len: #{message.length} "
       end
       @message_row = row
       # added 2009-11-05 14:53 to fix erasure of border
       display_length -= @message_col
-      # FIXME : wont print if newline at end of message !!!
-      #@window.printstring( row, @message_col , message, color=$reversecolor)
       # 2008-12-30 19:45 experimenting with label so we can get justify and wrapping.
-      #@window.printstring( row, @message_col , message, color=$reversecolor)
-        #$log.debug " print_message: row #{row}, col #{@message_col} "
-      #message_label = RubyCurses::Label.new @form, {'text' => message, "name"=>"message_label","row" => row, "col" => @message_col, "display_length" => display_length,  "height" => @message_height, "attr"=>"reverse"}
       # 2011-09-20 trying to take care of when user changes color and bgcolor while calling.
       clr = @color || :black
       bgclr = @bgcolor || :white

data/lib/rbcurse/rmulticontainer.rb

@@ -8,12 +8,8 @@
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-#require 'rubygems'
-##require 'ncurses'
-#require 'logger'
 require 'rbcurse'
 
-#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -25,7 +21,7 @@ module RubyCurses
   # or TextArea or even ListBox or Table someday. Should then be a Module rather than a class.
   class MultiContainer < Widget
     dsl_accessor :title
-    #include ListScrollable
+
 
     def initialize form = nil, config={}, &block
       @focusable = true
@@ -57,14 +53,61 @@ module RubyCurses
     def current_component
       @bmanager.current
     end
+    ##
+    # Add a component with a title
+    # @param [Widget] component
+    # @param [String] title
+    def add component, title
+      component.row    = @row+@row_offset+0 # FFI changed 1 to 0 2011-09-12
+      component.col    = @col+@col_offset+0 # FFI changed 1 to 0 2011-09-12
+      component.width  = @width-2
+      component.height = @height-2
+      component.form   = @form
+      component.override_graphic(@graphic)
+      @current_buffer = @bmanager.add component, title
+      @current_component = @current_buffer.component
+      #set_current_component
+      #set_form_row ## FFI added 2011-09-12 to get cursor at start when adding
+      $log.debug "MULTICONT ADD got cb : #{@current_component} "
+    end
+    def set_current_component
+      @current_component = @current_buffer.component
+      @current_title = @current_component.title          # NOTE: unused, don't knw what for
+      set_form_row 
+      @current_component.repaint_all true
+    end
+    # required otherwise some components may not get correct cursor position on entry
+    # e.g. table
+    def on_enter
+      set_form_row
+    end
+    def set_form_row  #:nodoc:
+      if !@current_component.nil?
+        cc = @current_component
+    
+        @current_component.on_enter # 2011-10-19 why was this not there earlier
+
+        # 2011-10-21 I've tried removing next 2 lines but there are certain case
+        # that do need them. See testmulticontainer.rb
+        
+        @current_component.set_form_row 
+        @current_component.set_form_col 
+  
+      end
+    end
+    def set_form_col
+      # deliberately empty since Form will call this and Widgets one is unsuitable
+      # for us
+    end
     ## 
     # multi-container
     def handle_key ch  #:nodoc:
-      #$log.debug " MULTI handlekey #{ch}, #{@current_component}"
+      $log.debug " MULTI handlekey #{ch}, #{@current_component}"
       ret = :UNHANDLED
       return :UNHANDLED unless @current_component
+
       ret = @current_component.handle_key(ch)
-      $log.debug " MULTI = comp #{@current_component} returned #{ret} "
+      $log.debug " MULTI = current comp #{@current_component} returned #{ret} "
       if ret == :UNHANDLED
         # check for bindings, these cannot override above keys since placed at end
         begin
@@ -72,13 +115,13 @@ module RubyCurses
           $log.debug " MULTI = process_key returned #{ret} "
           if ch > 177 && ch < 187
             n = ch - 177
+      
             component_at(n)
+            ret = 0 # other unhandled goes back
             # go to component n
           end
         rescue => err
-#          $error_message = err # changed 2010 dts  
           $error_message.value = err.to_s
-          #@form.window.print_error_message PLEASE CREATE LABEL
           $log.error " Multicomponent process_key #{err} "
           $log.debug(err.backtrace.join("\n"))
           alert err.to_s
@@ -91,18 +134,19 @@ module RubyCurses
     def repaint
       print_border if (@suppress_borders == false && @repaint_all) # do this once only, unless everything changes
       return unless @current_component
-      $log.debug " MULTI REPAINT "
+      $log.debug " MULTI REPAINT - calling current_comps repaint #{@current_component} "
       ret = @current_component.repaint
     end
     def print_border  #:nodoc:
-      $log.debug " #{@name} print_borders,  #{@graphic.name} "
+      #$log.debug " #{@name} print_borders,  #{@graphic.name} "
       color = $datacolor
       @graphic.print_border_only @row, @col, @height-1, @width, color #, Ncurses::A_REVERSE
       print_title
     end
     def print_title  #:nodoc:
-      $log.debug " print_title #{@row}, #{@col}, #{@width}  "
-      @graphic.printstring( @row, @col+(@width-@title.length)/2, @title, $datacolor, @title_attrib) unless @title.nil?
+      #$log.debug " print_title #{@row}, #{@col}, #{@width}  "
+      _title = @title || "" + @current_title
+      @graphic.printstring( @row, @col+(@width-_title.length)/2, _title, $datacolor, @title_attrib) unless _title.nil?
     end
     # this is just a test of the simple "most" menu
     # can use this for next, prev, first, last, new, delete, overwrite etc
@@ -122,37 +166,29 @@ module RubyCurses
       menu.display @form.window, $error_message_row, $error_message_col, $datacolor #, menu
     end
 
-    #%w[next previous first last].each do |pos|
-      #eval(
-           #"def _buffer_#{pos}
-              #@current_component = @bmanager.#{pos}
-              #set_current_buffer
-           #end"
-          #)
-    #end
 
     def goto_next_component
       perror "No other buffer" and return if @bmanager.size < 2
 
-      @current_component = @bmanager.next
+      @current_buffer = @bmanager.next
       set_current_component
     end
 
     def goto_prev_component
       perror "No other buffer" and return if @bmanager.size < 2
 
-      @current_component = @bmanager.previous
-      $log.debug " buffer_prev got #{@current_component} "
+      @current_buffer = @bmanager.previous
+      $log.debug " buffer_prev got #{@current_buffer} "
       set_current_component
     end
     def goto_first_component
-      @current_component = @bmanager.first
-      $log.debug " buffer_first got #{@current_component} "
+      @current_buffer = @bmanager.first
+      $log.debug " buffer_first got #{@current_buffer} "
       set_current_component
     end
     def goto_last_component
-      @current_component = @bmanager.last
-      $log.debug " buffer_last got #{@current_component} "
+      @current_buffer = @bmanager.last
+      $log.debug " buffer_last got #{@current_buffer} "
       set_current_component
     end
     def delete_component
@@ -172,27 +208,6 @@ module RubyCurses
       #$log.debug " buffer_last got #{@current_component} "
       set_current_component
     end
-    ##
-    # Add a component with a title
-    # @param [Widget] component
-    # @param [String] title
-    def add component, title
-      component.row = @row+@row_offset+0 # FFI changed 1 to 0 2011-09-12 
-      component.col = @col+@col_offset+0 # FFI changed 1 to 0 2011-09-12 
-      component.width = @width-2
-      component.height = @height-2
-      component.form = @form
-      component.override_graphic(@graphic)
-      @current_component = @bmanager.add component, title
-      set_current_component
-      set_form_row ## FFI added 2011-09-12 to get cursor at start when adding
-      $log.debug " ADD got cb : #{@current_component} "
-    end
-    def set_current_component
-      @current_component = @current_component.component
-      @current_title = @current_component.title
-      @current_component.repaint_all true
-    end
     def perror errmess
       alert errmess
       #@form.window.print_error_message errmess
@@ -208,18 +223,6 @@ module RubyCurses
       }
       menu.display @form.window, $error_message_row, $error_message_col, $datacolor
     end
-    # required otherwise some components may not get correct cursor position on entry
-    # e.g. table
-    def on_enter
-      set_form_row
-    end
-    def set_form_row  #:nodoc:
-      if !@current_component.nil?
-        #$log.debug " #{@name} set_form_row calling sfr for #{@current_component.name} "
-        @current_component.set_form_row 
-        @current_component.set_form_col 
-      end
-    end
   end # class multicontainer
   ##
   # Handles multiple buffers, navigation, maintenance etc

data/lib/rbcurse/rmultitextview.rb

@@ -11,8 +11,6 @@
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-require 'rubygems'
-#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rtextview'

data/lib/rbcurse/rpopupmenu.rb

@@ -24,8 +24,6 @@ a user friendly string to identifiy the action, as well as a disabled option.
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-require 'rubygems'
-#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/action'

data/lib/rbcurse/rscrollform.rb

@@ -18,8 +18,6 @@ area but finish outside, or vice versa.
 
     What if we wish some static text to be displayed at top or bottom of ScrollForm
 =end
-require 'rubygems'
-#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 
@@ -32,8 +30,8 @@ module RubyCurses
     attr_accessor :pmincol # advance / scroll columns
     # the pad prints from this row to window, usually 0
     attr_accessor :pminrow # advance / scroll rows (vertically)
-    attr_accessor :display_w # width of screen display
-    attr_accessor :display_h # ht of screen display
+    #attr_accessor :display_w # width of screen display NOW METHODS
+    #attr_accessor :display_h # ht of screen display
     attr_accessor :row_offset, :col_offset
     attr_accessor :scroll_unit # by how much should be scroll
     attr_reader :orig_top, :orig_left
@@ -52,12 +50,23 @@ module RubyCurses
       # take display dimensions from window. It is safe to override immediately after form creation
       @display_h = win.height
       @display_w = win.width
-      @display_h = (Ncurses.LINES - win.top - 2) if @display_h == 0
-      @display_w = (Ncurses.COLS - win.left - 2) if @display_w == 0
+      if @display_h == 0
+        @display_h = (Ncurses.LINES - win.top - 2)
+      else
+        @display_h = win.height - 2
+      end
+      if @display_w == 0
+        @display_w = (Ncurses.COLS - win.left - 2) 
+      else
+        # copywin fails unless u use rootwindow, so what gives in this case
+        @display_w = win.width - 2
+      end
       
       init_vars
     end
     def init_vars
+      # maybe we should use C-x combinations rather than these keys which might be used
+      #  by other widgets, apps
       bind_key(?\M-h, :scroll_left)
       bind_key(?\M-l, :scroll_right)
       bind_key(?\M-n, :scroll_down)
@@ -81,14 +90,51 @@ module RubyCurses
       @left = @orig_left = l
       create_pad
     end
+    # old program tabbed pane uses this. fix
+    # @deprecated use set_pad_dimensions
+    def set_layout h,w,t,l
+      set_pad_dimensions t,l,h,w
+    end
+    def display_h(*val)
+      if val.empty?
+        return @display_h
+      else
+        #raise ArgumentError "display_h should be ... " if val[0] ...
+        oldvalue = @display_h
+        @display_h = val[0]
+        $log.debug "XXX:given display_h to #{@display_h} "
+        @display_h = [@display_h, @target_window.height - 2].min unless @target_window.height == 0
+        $log.debug "XXX:set display_h to #{@display_h} "
+        #fire_property_handler(:display_h, oldvalue, @display_h)
+      end
+      self
+    end
+    #
+    # By default we are determining these 2 values based on window's dims.
+    # However, if you use a widget that is smaller than the window, then
+    # you will want to overwrite these values. 
+    def display_w(*val)
+      if val.empty?
+        return @display_w
+      else
+        #raise ArgumentError "display_h should be ... " if val[0] ...
+        oldvalue = @display_w
+        @display_w = val[0]
+        @display_w = [@display_w, @target_window.width - 2].min unless @target_window.width == 0
+        $log.debug "XXX:set display_w to #{@display_w} "
+        #fire_property_handler(:display_h, oldvalue, @display_h)
+      end
+      self
+    end
     ## 
     # create a pad to work on. 
     # XXX We reuse window, which is already the main window
     # So if we try creating pad later, then old external window is used.
     # However, many methods in superclass operate on window so we needed to overwrite. What do i do ?
-    private
+    #private
     def create_pad
-      raise "Pad already created" if @pad
+      #raise "Pad already created" if @pad
+      return @pad if @pad
       r = @top
       c = @left
       layout = { :height => @pad_h, :width => @pad_w, :top => r, :left => c } 
@@ -171,12 +217,14 @@ module RubyCurses
     #  super may need target window
     def repaint
       print_border if @repaint_all and @print_border_flag
-      print_footer
+      print_footer if @print_border_flag
       $log.debug " scrollForm repaint calling parent #{@row} #{@col}+ #{@cols_panned} #{@col_offset} "
       super
       prefresh
-      _print_more_data_marker true
-      _print_more_columns_marker true
+      if @print_border_flag
+        _print_more_data_marker true
+        _print_more_columns_marker true
+      end
       #$log.debug " @target_window.wmove #{@row+@rows_panned+@row_offset}, #{@col+@cols_panned+@col_offset}  "
       @target_window.wmove @row+@rows_panned+@row_offset, @col+@cols_panned+@col_offset
       @window.modified = false
@@ -215,6 +263,7 @@ module RubyCurses
       # this works but if want to avoid copying border
       #ret = @window.prefresh(@pminrow, @pmincol, @top+@row_offset, @left+@col_offset, @top + @display_h - @row_offset , @left + @display_w - @col_offset)
       #
+      $log.debug "ret = @window.copywin( #{@pminrow} , #{@pmincol} , #{@top+@row_offset} , #{@left+@col_offset} , #{@top} + #{@display_h} - #{@row_offset} , #{@left} + #{@display_w} - #{@col_offset} ,  0)"
       ## Haha , we are back to the old notorious copywin which has given mankind
       # so much grief that it should be removed in the next round of creation.
       ret = @window.copywin(@target_window.get_window, @pminrow, @pmincol, @top+@row_offset, @left+@col_offset, 
@@ -291,7 +340,7 @@ module RubyCurses
       return false if c+@cols_panned > @orig_left + @display_w
       # XXX TODO for rows UNTESTED for rows
       return false if r + @rows_panned < @orig_top
-      return false if r + @rows_panned > @orig_top + @display_h
+      return false if r + @rows_panned > @orig_top + @display_h - 2
 
       return true
     end