rkumar-rbcurse 0.1.1 → 0.1.2

data/lib/rbcurse/listselectable.rb

@@ -3,8 +3,13 @@
 module RubyCurses
   module ListSelectable
 
-    def list_selection_model lsm
-      @list_selection_model = lsm
+    ## modified on 2009-02-13 23:41 to return model if no param passed
+    def list_selection_model(*lsm)
+      if lsm.empty?
+        @list_selection_model 
+      else
+        @list_selection_model = lsm[0]
+      end
       #@list_selection_model.selection_mode = @selection_mode || :MULTIPLE
     end
     def create_default_list_selection_model
@@ -15,6 +20,7 @@ module RubyCurses
     end
 
     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
     end
@@ -64,4 +70,19 @@ module RubyCurses
     attr_accessor :row_selection_allowed
     attr_accessor :column_selection_allowed
   end
+  class ListSelectionEvent
+    attr_accessor :firstrow, :lastrow, :source, :type
+    def initialize firstrow, lastrow, source, type
+      @firstrow = firstrow
+      @lastrow = lastrow
+      @source = source
+      @type = type
+    end
+    def to_s
+      "#{@type.to_s}, firstrow: #{@firstrow}, lastrow: #{@lastrow}, source: #{@source}"
+    end
+    def inspect
+      to_s
+    end
+  end
 end

data/lib/rbcurse/rlistbox.rb

@@ -44,6 +44,7 @@ module RubyCurses
     include Enumerable
     include RubyCurses::EventHandler
     attr_accessor :selected_index
+    attr_reader :last_regex # should i really keep here as public or maintain in listbox
 
     def initialize anarray
       @list = anarray.dup
@@ -64,6 +65,7 @@ module RubyCurses
       @list.index(obj)
     end
     def length ; @list.length; end
+    alias :size :length
 
     def insert off0, *data
       @list.insert off0, *data
@@ -112,7 +114,7 @@ module RubyCurses
       @list.dup
     end
     def on_enter_row object
-      $log.debug " XXX on_enter_row of list_data"
+      #$log.debug " XXX on_enter_row of list_data"
       fire_handler :ENTER_ROW, object
     end
     # ##
@@ -143,10 +145,10 @@ module RubyCurses
       return find_match @last_regex, start, @search_end_ix
     end
     ##
-    # find backwards
+    # find backwards, list_data_model
     # Using this to start a search or continue search
     def find_prev regex=@last_regex, start = @search_found_ix 
-      raise "No previous search" if @last_regex.nil?
+      raise "No previous search" if regex.nil? # @last_regex.nil?
       $log.debug " find_prev #{@search_found_ix} : #{@current_index}"
       start -= 1 unless start == 0
       @last_regex = regex
@@ -427,6 +429,7 @@ module RubyCurses
       select_default_values   
       # when the combo box has a certain row in focus, the popup should have the same row in focus
 
+      install_keys
       init_vars
       install_list_keys
 
@@ -531,7 +534,7 @@ module RubyCurses
       h = scrollatrow()
       rc = row_count
       $log.debug " listbxo got ch #{ch}"
-      $log.debug " when kps #{@KEY_PREV_SELECTION}  "
+      #$log.debug " when kps #{@KEY_PREV_SELECTION}  "
       case ch
       when KEY_UP  # show previous value
         previous_row
@@ -565,14 +568,21 @@ module RubyCurses
         @repaint_required = true
       when 27, ?\C-c:
         editing_canceled @current_index if @cell_editing_allowed
+        cancel_block # block
       when @KEY_ASK_FIND_FORWARD
-        ask_search_forward
+      # ask_search_forward
       when @KEY_ASK_FIND_BACKWARD
-        ask_search_backward
+      # ask_search_backward
       when @KEY_FIND_NEXT
-        find_next
+      # find_next
       when @KEY_FIND_PREV
-        find_prev
+      # find_prev
+      when @KEY_ASK_FIND
+        ask_search
+      when @KEY_FIND_MORE
+        find_more
+      when @KEY_BLOCK_SELECTOR
+        mark_block #selection
       else
         # this has to be fixed, if compo does not handle key it has to continue into next part FIXME
         ret = :UNHANDLED # changed on 2009-01-27 13:14 not going into unhandled, tab not released
@@ -606,8 +616,10 @@ module RubyCurses
           set_focus_on(ix)
         end
     end
+    # gets string to search and calls data models find prev
     def ask_search_backward
       regex =  get_string("Enter regex to search (backward)")
+      @last_regex = regex
       ix = @list.find_prev regex, @current_index
       if ix.nil?
         alert("No matching data for: #{regex}")
@@ -615,7 +627,8 @@ module RubyCurses
         set_focus_on(ix)
       end
     end
-    def find_prev
+    ## listbox find_prev
+    def OLDfind_prev
         ix = @list.find_prev
         regex = @last_regex 
         if ix.nil?
@@ -627,7 +640,7 @@ module RubyCurses
         end
     end
     # table find_next
-    def find_next
+    def OLDfind_next
         ix = @list.find_next
         regex = @last_regex 
         if ix.nil?
@@ -639,12 +652,12 @@ module RubyCurses
     def on_enter
       on_enter_row @current_index
       set_form_row # added 2009-01-11 23:41 
-      $log.debug " ONE ENTER LIST #{@current_index}, #{@form.row}"
-      @repaint_required
+      #$log.debug " ONE ENTER LIST #{@current_index}, #{@form.row}"
+      @repaint_required = true
       fire_handler :ENTER, self
     end
     def on_enter_row arow
-      $log.debug " Listbox #{self} ENTER_ROW with curr #{@current_index}. row: #{arow} H: #{@handler.keys}"
+      #$log.debug " Listbox #{self} ENTER_ROW with curr #{@current_index}. row: #{arow} H: #{@handler.keys}"
       #fire_handler :ENTER_ROW, arow
       fire_handler :ENTER_ROW, self
       @list.on_enter_row self
@@ -668,7 +681,8 @@ module RubyCurses
       col = c+@left_margin # @form.col
       # unfortunately 2009-01-11 19:47 combo boxes editable allows changing value
       editor.prepare_editor self, row, col, value
-      set_form_col @left_margin
+      editor.component.curpos = 0 # reset it after search, if user scrols down
+      set_form_col 0 #@left_margin
 
       # set original value so we can cancel
       # set row and col,
@@ -676,7 +690,7 @@ module RubyCurses
     end
     def on_leave_row arow
       #$log.debug " Listbox #{self} leave with (cr: #{@current_index}) #{arow}: list[row]:#{@list[arow]}"
-      $log.debug " Listbox #{self} leave with (cr: #{@current_index}) #{arow}: "
+      #$log.debug " Listbox #{self} leave with (cr: #{@current_index}) #{arow}: "
       #fire_handler :LEAVE_ROW, arow
       fire_handler :LEAVE_ROW, self
       editing_completed arow
@@ -797,7 +811,47 @@ module RubyCurses
       end
       @repaint_required = true
     end
+    def set_form_col col=0
+      super col+@left_margin
+    end
+    # experimental selection of multiple rows via block
+    # specify a block start and then a block end
+    # usage: bind mark_selection to a key. It works as a toggle.
+    # C-c will cancel any selection  that has begun.
+    # added on 2009-02-19 22:37 
+    def mark_block #selection
+      if @inside_block
+        @inside_block = false
+        end_block #selection
+      else
+        @inside_block = true
+        start_block #selection
+      end
+    end
+    # added on 2009-02-19 22:37 
+    def cancel_block
+      @first_index = @last_index = nil
+      @inside_block = false
+    end
+    # sets marker for start of block
+    # added on 2009-02-19 22:37 
+    def start_block #selection
+      @first_index = @current_index
+      @last_index = nil
+    end
+    # sets marker for end of block
+    # added on 2009-02-19 22:37 
+    def end_block #selection
+      @last_index = current_index
+      lower = [@first_index, @last_index].min
+      higher = [@first_index, @last_index].max
+      #lower.upto(higher) do |i| @list.toggle_row_selection i; end
+      add_row_selection_interval(lower, higher)
+      @repaint_required = true
+    end
+ 
 
+    # ADD HERE
   end # class listb
 
 

data/lib/rbcurse/rmessagebox.rb

@@ -111,8 +111,14 @@ module RubyCurses
         make_buttons ["&OK"]
       when "ok_cancel" #, "input", "list", "field_list"
         make_buttons %w[&OK &Cancel]
+        # experience 2009-02-22 12:52 trapping y and n - hopefully wont cause an edit problem
+        @form.bind_key(?o){ press(?\M-o) }
+        @form.bind_key(?c){ press(?\M-c) }
       when "yes_no"
         make_buttons %w[&Yes &No]
+        # experience 2009-02-22 12:52 trapping y and n - hopefully wont cause an edit problem
+        @form.bind_key(?y){ press(?\M-y) }
+        @form.bind_key(?n){ press(?\M-n) }
       when "yes_no_cancel"
         make_buttons ["&Yes", "&No", "&Cancel"]
       when "custom"
@@ -170,7 +176,6 @@ module RubyCurses
       return @selected_index
     end
     def press ch
-       #$log.debug "message box handle_keys :  #{ch}"  if ch != -1
         case ch
         when -1
           return
@@ -183,12 +188,14 @@ module RubyCurses
           if field.respond_to? :fire
             field.fire
           end
-          $log.debug "popup ENTER : #{@selected_index} "
-          $log.debug "popup ENTER :  #{field.name}" if !field.nil?
+          #$log.debug "popup ENTER : #{@selected_index} "
+          #$log.debug "popup ENTER :  #{field.name}" if !field.nil?
           @stop = true
           return
         when 9
           @form.select_next_field
+        when 353
+          @form.select_prev_field
         else
           # fields must return unhandled else we will miss hotkeys. 
           # On messageboxes, often if no edit field, then O and C are hot.
@@ -234,7 +241,7 @@ module RubyCurses
       # XXX this needs to go up and decide height of window
       if @message_height.nil?
         @message_height = (message.length/display_length)+1
-        $log.debug " print_message: mh:#{@message_height}"
+        $log.debug " print_message: mh:#{@message_height}, ml: #{message.length}"
       end
       @message_height ||= 1
       width = @layout[:width]
@@ -251,6 +258,7 @@ module RubyCurses
         @message_col = (width-message.length)/2
       end
       @message_row = row
+      # 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)
@@ -264,6 +272,7 @@ module RubyCurses
       @message_col ||= 2
       r = @message_row + @message_height + 1
       c = @message_col
+      disp_len = @layout[:width]-8
       defaultvalue = @default_value || ""
       input_config = @config["input_config"] || {}
       case @type.to_s 
@@ -272,7 +281,7 @@ module RubyCurses
           name   "input" 
           row  r 
           col  c 
-          display_length  30
+          display_length disp_len
           set_buffer defaultvalue
         end
       when "list"

data/lib/rbcurse/rtabbedpane.rb

@@ -74,6 +74,9 @@ module RubyCurses
     include EventHandler
     dsl_accessor :row, :col
     dsl_accessor :height, :width
+    dsl_accessor :button_type      # ok, ok_cancel, yes_no
+    dsl_accessor :buttons           # used if type :custom
+    attr_reader :selected_index
     def initialize win, aconfig={}, &block
       @parent = win
       @tabs ||= []
@@ -161,6 +164,7 @@ module RubyCurses
         }
  
       end
+      create_buttons
       @form.repaint
     end
     def display_form form
@@ -183,7 +187,14 @@ module RubyCurses
       return form
     end
     def handle_keys
-      while (( ch=@window.getchar()) != KEY_F1)
+      begin
+      while (( ch=@window.getchar()) != 999)
+        if ch == ?\C-q
+          @selected_index = -1  # this signifies cancel by ?C-q
+          @stop = true
+          return
+        end
+        return if @stop
         @current_form ||= @form
         ret = @current_form.handle_key(ch)
         case ret
@@ -220,15 +231,66 @@ module RubyCurses
           @form.repaint
           #return :UNHANDLED if ret == :UNHANDLED
         end
+        return if @stop
         @current_form.window.wrefresh
         @window.refresh
       end
-      destroy
+      ensure
+        destroy
+      end
     end
     def destroy
       @window.destroy
       @forms.each { |f| w = f.window; w.destroy unless w.nil? }
     end
+    def create_buttons
+      case @button_type.to_s.downcase
+      when "ok"
+        make_buttons ["&OK"]
+      when "ok_cancel" #, "input", "list", "field_list"
+        make_buttons %w[&OK &Cancel]
+      when "yes_no"
+        make_buttons %w[&Yes &No]
+      when "yes_no_cancel"
+        make_buttons ["&Yes", "&No", "&Cancel"]
+      when "custom"
+        raise "Blank list of buttons passed to custom" if @buttons.nil? or @buttons.size == 0
+        make_buttons @buttons
+      else
+        $log.debug "No buttontype passed for creating tabbedpane. Using default (OK)"
+        make_buttons ["&OK"]
+      end
+    end
+    def make_buttons names
+      total = names.inject(0) {|total, item| total + item.length + 4}
+      bcol = center_column total
+
+      brow = @layout[:height]-2
+      button_ct=0
+      names.each_with_index do |bname, ix|
+        text = bname
+        #underline = @underlines[ix] if !@underlines.nil?
+
+        button = Button.new @form do
+          text text
+          name bname
+          row brow
+          col bcol
+          #underline underline
+          highlight_background $reversecolor 
+          color $datacolor
+          bgcolor $datacolor
+        end
+        index = button_ct
+        button.command { |form| @selected_index = index; @stop = true; $log.debug "Pressed Button #{bname}";}
+        button_ct += 1
+        bcol += text.length+6
+      end
+    end
+    def center_column textlen
+      width = @layout[:width]
+      return (width-textlen)/2
+    end
 
     ##
     # nested class tab

data/lib/rbcurse/rtable.rb

@@ -4,7 +4,7 @@
   * Author: rkumar (arunachalesha)
 
 
-  TODO: NOTE: Needs to be tested under conditions such as no data, deleting all data
+  TODO: NOTE: 
      A few higher level methods check for no data but lower level ones do not.
   
   --------
@@ -78,7 +78,11 @@ module RubyCurses
       @toprow = 0
       @to_print_borders ||= 1
       @show_grid ||= 1
+      @_first_column_print = 0 # intro for horiz scrolling 2009-02-14 16:20 
+      @_last_column_print = 0 # 2009-02-16 23:57 so we don't tab further etc. 
+      # table needs to know what columns are being printed.
       @curpos = 0
+      @inter_column_spacing = 1
       # @selected_color ||= 'yellow'
       # @selected_bgcolor ||= 'black'
       @table_changed = true
@@ -112,6 +116,7 @@ module RubyCurses
     end
     # added 2009-01-07 13:05 so new scrollable can use
     def row_count
+      return 0 if @table_model.nil?
       @table_model.row_count
     end
     # added 2009-01-07 13:05 so new scrollable can use
@@ -123,17 +128,24 @@ module RubyCurses
     # Sets the data in models
     # Should replace if these are created. TODO FIXME
     def set_data data, colnames_array
+      # next 2 added in case set_data called again
+      @table_changed = true
+      @repaint_required = true
       if data.is_a? Array
         model = RubyCurses::DefaultTableModel.new data, colnames_array
         table_model model
       elsif data.is_a? RubyCurses::TableModel
         table_model data
+      else
+        raise "set_data: don't know how to handle data: #{data.class.to_s}"
       end
       if colnames_array.is_a? Array
         model = DefaultTableColumnModel.new colnames_array
         table_column_model model
       elsif colnames_array.is_a? RubyCurses::TableColumnModel
         table_column_model  colnames_array
+      else
+        raise "set_data: don't know how to handle column data: #{colnames_array.class.to_s}"
       end
       create_default_list_selection_model
       create_table_header
@@ -164,8 +176,13 @@ module RubyCurses
         @table_model.bind(:TABLE_MODEL_EVENT){|lde| table_data_changed(lde) }
       end
     end
-    def table_column_model tcm
-      raise "data error" if !tcm.is_a? RubyCurses::TableColumnModel
+    # updated this so no param will return the tcm 2009-02-14 12:31 
+    def table_column_model(*val)
+      if val.empty?
+        return @table_column_model
+      end
+      tcm = val[0]
+      raise "data error: table_column_model wrong class" if !tcm.is_a? RubyCurses::TableColumnModel
       @table_column_model = tcm
       @table_column_model.bind(:TABLE_COLUMN_MODEL_EVENT) {|e| 
         table_structure_changed e
@@ -175,8 +192,9 @@ module RubyCurses
       #@table_header.column_model(tcm) unless @table_header.nil?
       @table_header.table_column_model=(tcm) unless @table_header.nil?
     end
-    # FIX THIS SO NO GET_ XXX
+    # @deprecated, avoid usage
     def get_table_column_model
+      $log.debug " DEPRECATED. Pls use table_column_model()"
       @table_column_model 
     end
     # 
@@ -381,11 +399,16 @@ module RubyCurses
           end
         end
         editor = get_default_cell_editor_for_class cls
+        #$log.debug "EDIT_CELL_AT:1 #{cls}  #{editor.component.display_length} = #{@table_column_model.column(col).width}i maxlen #{editor.component.maxlen}"
         editor.component.display_length = @table_column_model.column(col).width
-        editor.component.maxlen = editor.component.display_length if editor.component.respond_to? :maxlen and editor.component.maxlen.nil? # 2009-01-18 00:59  XXX don't overwrite if user has set
+        # maxlen won't be nil ! This used to work earlier
+        #editor.component.maxlen = editor.component.display_length if editor.component.respond_to? :maxlen and editor.component.maxlen.nil? # 2009-01-18 00:59  XXX don't overwrite if user has set
+        if editor.component.respond_to? :maxlen 
+          editor.component.maxlen = @table_column_model.column(col).edit_length || editor.component.display_length 
+        end
         #$log.debug "EDIT_CELL_AT: #{cls}  #{editor.component.display_length} = #{@table_column_model.column(col).width}i maxlen #{editor.component.maxlen}"
       end
-      $log.debug " got an EDITOR #{editor} ::  #{editor.component} "
+      #$log.debug " got an EDITOR #{editor} ::  #{editor.component} "
       # by now we should have something to edit with. We just need to prepare the widgey.
       prepare_editor editor, row, col, value
     
@@ -395,6 +418,14 @@ module RubyCurses
       row = r + (row - @toprow) +1  #  @form.row , 1 added for header row!
       col = c+get_column_offset()
       editor.prepare_editor self, row, col, value
+      # added on 2009-02-16 23:49 
+      # if data is longer than can be displayed then update editors disp len too
+      if (col+editor.component.display_length)>= @col+@width
+        editor.component.display_length = @width-1-col
+        $log.debug "DDDXXX #{editor.component.display_length} = @width-1-col"
+      else
+      $log.debug "EEE if (#{col+editor.component.display_length})> #{@col+@width}"
+      end
       @cell_editor = editor
       @repaint_required = true
       set_form_col 
@@ -452,6 +483,7 @@ module RubyCurses
     # key handling
     # make separate methods so callable programmatically
     def handle_key(ch)
+      return :UNHANDLED if @table_model.nil?
       @current_index ||= 0
       @toprow ||= 0
       h = scrollatrow()
@@ -494,6 +526,12 @@ module RubyCurses
       when @KEY_GOTO_BOTTOM
         editing_stopped if @is_editing # 2009-01-16 16:06 
         goto_bottom
+      when @KEY_SCROLL_RIGHT
+        editing_stopped if @is_editing # dts 2009-02-17 00:35 
+        scroll_right
+      when @KEY_SCROLL_LEFT
+        editing_stopped if @is_editing # dts 2009-02-17 00:35 
+        scroll_left
       else
         # there could be a case of editing here too!
         ret = process_key ch, self
@@ -565,14 +603,16 @@ module RubyCurses
     end
     def next_column
       v =  @current_column+1 
-      if v < @table_column_model.column_count
+      if v < @table_column_model.column_count and v <= @_last_column_print
         $log.debug " if v < #{@table_column_model.column_count} "
         current_column v
       else
-        if @current_index < row_count()-1
+        if @current_index < row_count()-1 
           $log.debug " GOING TO NEXT ROW FROM NEXT COL : #{@current_index} : #{row_count}"
           @current_column = 0
+          @current_column = @_first_column_print # added 2009-02-17 00:01 
           next_row
+          set_form_col
         else
           return :UNHANDLED
         end
@@ -581,11 +621,14 @@ module RubyCurses
     def previous_column
       v =  @current_column-1 
       # returning unhandled so focus can go to prev field auto
-      if v < 0 and @current_index <= 0
+      if v < @_first_column_print and @current_index <= 0
         return :UNHANDLED
       end
-      if v < 0 and @current_index > 0
+      if v < @_first_column_print and @current_index >  0
         @current_column = @table_column_model.column_count-1
+        @current_column = @_last_column_print # added 2009-02-17 00:01 
+        $log.debug " XXXXXX prev col #{@current_column}, las #{@_last_column_print}, fi: #{@_first_column_print}"
+        set_form_col
         previous_row
       else
         current_column @current_column-1 
@@ -693,7 +736,7 @@ module RubyCurses
       super
       set_form_row
       set_form_col # 2009-01-17 01:35 
-      on_enter_cell focussed_row(), focussed_col()
+      on_enter_cell focussed_row(), focussed_col() unless focussed_row().nil? or focussed_col().nil?
     end
     def on_leave
       super
@@ -713,6 +756,7 @@ module RubyCurses
     end
     # protected
     def get_column_offset columnid=@current_column
+      return 0 if @table_column_model.nil?
       return @table_column_model.column(columnid).column_offset || 0
     end
 
@@ -720,11 +764,16 @@ module RubyCurses
     def repaint
       return unless @repaint_required
       print_border @form.window if @to_print_borders == 1 # do this once only, unless everything changes
+      return if @table_model.nil? # added 2009-02-17 12:45 
+      @_first_column_print ||= 0
       cc = @table_model.column_count
       rc = @table_model.row_count
+      inter_column_padding = " " * @inter_column_spacing 
+      @_last_column_print = cc-1
       tcm = @table_column_model
       tm = @table_model
       tr = @toprow
+      _column_scrolling = false
       acolor = get_color $datacolor
       h = scrollatrow()
       r,c = rowcol
@@ -734,18 +783,19 @@ module RubyCurses
       # TCM should give modelindex of col which is used to fetch data from TM
       r += 1 # save for header
       0.upto(h) do |hh|
-        crow = tr+hh
+        crow = tr+hh  # crow is the row
         if crow < rc
-          offset = 0
+          offset = 0 # offset of column
     #      0.upto(cc-1) do |colix|
+          focussed = @current_index == crow ? true : false 
+          selected = is_row_selected crow
           # we loop through column_model and fetch data based on model index
           # FIXED better to call table.get_value_at since we may now 
           # introduce a view - 2009-01-18 18:21 
           tcm.each_with_index do |acolumn, colix|
+            next if colix < @_first_column_print
             #acolumn = tcm.column(colix)
             #model_index = acolumn.model_index
-            focussed = @current_index == crow ? true : false 
-            selected = is_row_selected crow
             content = get_value_at(crow, colix)  # tables
             #renderer = get_default_cell_renderer_for_class content.class.to_s
             renderer = get_cell_renderer(crow, colix)
@@ -753,9 +803,33 @@ module RubyCurses
               renderer = get_default_cell_renderer_for_class(content.class.to_s) if renderer.nil?
               renderer.display_length acolumn.width unless acolumn.nil?
             end
-            width = renderer.display_length + 1
+            width = renderer.display_length + @inter_column_spacing
             #renderer.repaint @form.window, r+hh, c+(colix*11), content, focussed, selected
             acolumn.column_offset = offset
+            # trying to ensure that no overprinting
+            #  $log.debug "  c+offset+width > @col+@width #{c+offset+width} > #{@col}+#{@width}"
+            #  $log.debug "  #{c}+#{offset}+#{width} > @col+@width #{c+offset+width} > #{@col}+#{@width}"
+            if c+offset+width > @col+@width
+              _column_scrolling = true
+              @_last_column_print = colix
+              #$log.debug " TABLE BREAKING SINCE "
+              #$log.debug " if c+offset+width > @col+@width #{c+offset+width} > #{@col}+#{@width}"
+              #$log.debug " if #{c}+#{offset}+#{width} > @col+@width #{c+offset+width} > #{@col}+#{@width}"
+              # experimental to print subset of last
+              space_left = (@width-3)-(offset) # 3 due to boundaries
+              space_left = 0 if space_left < 0
+              if content.length > space_left
+                clen = space_left
+                renderer.display_length clen
+              else
+                clen = -1
+                renderer.display_length space_left # content.length
+              end
+              # print the inter cell padding just in case things mess up while scrolling
+              @form.window.mvprintw r+hh, c+offset-@inter_column_spacing, inter_column_padding
+              renderer.repaint @form.window, r+hh, c+offset, crow, content[0..clen], focussed, selected
+              break
+            end
             # added crow on 2009-02-11 22:46 
             renderer.repaint @form.window, r+hh, c+(offset), crow, content, focussed, selected
             offset += width
@@ -768,12 +842,33 @@ module RubyCurses
       if @is_editing
         @cell_editor.component.repaint unless @cell_editor.nil? or @cell_editor.component.form.nil?
       end
+      _print_more_columns_marker _column_scrolling
+      _print_more_data_marker(rc-1 > tr + h)
+      $log.debug " _print_more_data_marker(#{rc} >= #{tr} + #{h})"
       @table_changed = false
       @repaint_required = false
     end
     def print_border g
       return unless @table_changed
       g.print_border @row, @col, @height, @width, $datacolor
+      return if @table_model.nil?
+      rc = @table_model.row_count
+      h = scrollatrow()
+      _print_more_data_marker (rc>h)
+    end
+    # private
+    def _print_more_data_marker tf
+      marker = tf ?  Ncurses::ACS_CKBOARD : Ncurses::ACS_VLINE
+      @form.window.mvwaddch @row+@height-1, @col+@width-1, marker
+      marker = @toprow > 0 ?  Ncurses::ACS_CKBOARD : Ncurses::ACS_VLINE
+      @form.window.mvwaddch @row+1, @col+@width-1, marker
+    end
+    def _print_more_columns_marker tf
+      marker = tf ?  Ncurses::ACS_CKBOARD : Ncurses::ACS_HLINE
+      @form.window.mvwaddch @row+@height, @col+@width-2, marker
+      # show if columns to left or not
+      marker = @_first_column_print > 0 ?  Ncurses::ACS_CKBOARD : Ncurses::ACS_HLINE
+      @form.window.mvwaddch @row+@height, @col+@_first_column_print+1, marker
     end
     def print_header
       return unless @table_changed
@@ -782,12 +877,29 @@ module RubyCurses
       tcm = @table_column_model ## could have been overridden, should we use this at all
       offset = 0
       header_model.each_with_index do |tc, colix|
+        next if colix < @_first_column_print # added for scrolling rt and left 2009-02-14 17:49 
         acolumn = tcm.column colix
         renderer = tc.cell_renderer
         renderer = @table_header.default_renderer if renderer.nil?
         renderer.display_length acolumn.width unless acolumn.nil?
         width = renderer.display_length + 1
         content = tc.header_value
+        if c+offset+width > @col+@width
+          #$log.debug " TABLE: experimental code to NOT print if chance of exceeding table width"
+          # 2009-02-14 14:24 now printing, but truncating data for last column
+              space_left = (@width-3)-(offset)
+              space_left = 0 if space_left < 0
+              if content.length > space_left
+                clen = space_left
+                renderer.display_length clen
+              else
+                clen = -1
+                renderer.display_length space_left
+              end
+              #$log.debug " TABLE BREAKING SINCE sl: #{space_left},#{crow},#{colix}: #{clen} "
+              renderer.repaint @form.window, r, c+(offset), 0, content[0..clen], false, false
+          break
+        end
         renderer.repaint @form.window, r, c+(offset),0, content, false, false
         offset += width
       end
@@ -837,6 +949,97 @@ module RubyCurses
         set_focus_on(ix)
       end
     end
+    def scroll_right
+      cc = @table_model.column_count
+      if @_first_column_print < cc-1
+        @_first_column_print += 1
+        @current_column =  @_first_column_print
+          set_form_col # FIXME not looking too good till key press
+        @repaint_required = true
+        @table_changed = true    # so columns are modified
+      end
+    end
+    def scroll_left
+      if @_first_column_print > 0
+        @_first_column_print -= 1
+        @current_column =  @_first_column_print
+          set_form_col
+        @repaint_required = true
+        @table_changed = true
+      end
+    end
+    ## 
+    # Makes an estimate of columns sizes, returning a hash, and storing it as @column_widths
+    # based on checking first 20 rows of data.
+    # This does not try to fit all columns into table, but gives best width, so you
+    # can scroll right to see other columns.
+    # @params - columns is columns returned by database
+    # using the command: @columns, *rows = @db.execute2(command)
+    # @param - datatypes is an array returned by following command to DB
+    # @datatypes = @content[0].types 
+    def estimate_column_widths columns, datatypes
+      tablewidth = @width-3
+      colwidths = {}
+      min_column_width = (tablewidth/columns.length) -1
+      $log.debug("min: #{min_column_width}, #{tablewidth}")
+      0.upto(20) do |rowix|
+        break if rowix >= row_count
+      #@content.each_with_index do |row, cix|
+      #  break if cix >= 20
+        @table_column_model.each_with_index do |acolumn, ix|
+          col = get_value_at(rowix, ix)
+          colwidths[ix] ||= 0
+          colwidths[ix] = [colwidths[ix], col.length].max
+        end
+      end
+      total = 0
+      colwidths.each_pair do |k,v|
+        name = columns[k.to_i]
+        colwidths[name] = v
+        total += v
+      end
+      colwidths["__TOTAL__"] = total
+      column_widths = colwidths
+      @max_data_widths = column_widths.dup
+
+      columns.each_with_index do | col, i|
+      if datatypes[i].match(/(real|int)/) != nil
+        wid = column_widths[i]
+        #   cw = [column_widths[i], [8,min_column_width].min].max
+        $log.debug("XXX #{wid}. #{columns[i].length}")
+        cw = [wid, columns[i].length].max
+        $log.debug("int #{col} #{column_widths[i]}, #{cw}")
+      elsif datatypes[i].match(/(date)/) != nil
+        cw = [column_widths[i], [12,min_column_width].min].max
+        #cw = [12,min_column_width].min
+        $log.debug("date #{col}  #{column_widths[i]}, #{cw}")
+      else
+        cw = [column_widths[i], min_column_width].max
+        if column_widths[i] <= col.length and col.length <= min_column_width
+          cw = col.length
+        end
+        $log.debug("else #{col} #{column_widths[i]}, #{col.length} #{cw}")
+      end
+      column_widths[i] = cw
+      total += cw
+      end
+      column_widths["__TOTAL__"] = total
+      $log.debug("Estimated col widths: #{column_widths.inspect}")
+      @column_widths = column_widths
+      return column_widths
+    end
+    ##
+    # convenience method
+    # sets column widths given an array of ints
+    # You may get such an array from estimate_column_widths
+    def set_column_widths cw
+      tcm = @table_column_model
+      tcm.each_with_index do |col, ix|
+        col.width cw[ix]
+      end
+      table_structure_changed(nil)
+    end
+    # ADD METHODS HERE
   end # class Table
 
   ## TC 
@@ -863,6 +1066,7 @@ module RubyCurses
     ## added column_offset on 2009-01-12 19:01 
     attr_accessor :column_offset # where we've place this guy. in case we need to position cursor
     attr_accessor :cell_editor
+    dsl_accessor :edit_length # corresponds to maxlen, if not set, col width will be useda 2009-02-16 21:55 
 
 
     def initialize model_index, identifier, header_value, width, config={}, &block
@@ -1161,8 +1365,8 @@ module RubyCurses
 
     ##
     # LSM 
-    #
-    class DefaultListSelectionModel
+    # XXX UNUSED
+    class OLDDefaultListSelectionModel
       include RubyCurses::EventHandler 
       attr_accessor :selection_mode
       attr_reader :anchor_selection_index
@@ -1172,6 +1376,7 @@ module RubyCurses
         @anchor_selection_index = -1
         @lead_selection_index = -1
         @selection_mode = :MULTIPLE
+        $log.debug " OLD VERSION OF LIST SELECTION MODEL IN rtable.rb"
       end
 
       def clear_selection