rbcurse-core 0.0.10 → 0.0.11

data/CHANGELOG

@@ -1,3 +1,7 @@
+**2013-03-22**
+## 0.0.11 rbcurse-core
+   * Added textpad (tested in cygnus gem)
+
 **2013-03-22**
 ## 0.0.10 rbcurse-core
    * Added method_missing to chunkline, required for ribhu gem

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/rbcurse/core/widgets/textpad.rb

@@ -1,26 +1,29 @@
+#!/usr/bin/env ruby
 # ----------------------------------------------------------------------------- #
 #         File: textpad.rb
 #  Description: A class that displays text using a pad.
 #         The motivation for this is to put formatted text and not care about truncating and 
 #         stuff. Also, there will be only one write, not each time scrolling happens.
 #         I found textview code for repaint being more complex than required.
-#       Author: rkumar http://github.com/rkumar/rbcurse/
+#       Author: rkumar http://github.com/rkumar/mancurses/
 #         Date: 2011-11-09 - 16:59
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-05 19:55
+#  Last update: 2013-03-22 20:09
 #
 #  == CHANGES
 #  == TODO 
-#     when moving right, also don't pan straight away
+#     _ in popup case allowing scrolling when it should not so you get an extra char at end
+#     _ The list one needs a f-char like functionality.
+#     x handle putting data again and overwriting existing
+#       When reputting data, the underlying pad needs to be properly cleared
+#       esp last row and last col
+#
 #     x add mappings and process key in handle_keys and other widget things
-#     - user can put text or list
-#     - handle putting data again and overwriting existing
-#     - formatted text
-#     - search and other features
 #     - can pad movement and other ops be abstracted into module for reuse
 #     / get scrolling like in vim (C-f e y b d)
-#     - alert issue of leaving a blank is poss due to using prefresh i/o copywin
 #
+#   == TODO 2013-03-07 - 20:34 
+#   _ key bindings not showing up -- bind properly
 # ----------------------------------------------------------------------------- #
 #
 require 'rbcurse'
@@ -33,6 +36,9 @@ module RubyCurses
     include BorderTitle
 
     dsl_accessor :suppress_border
+    dsl_accessor :print_footer
+    attr_reader :current_index
+    attr_reader :rows , :cols
     # You may pass height, width, row and col for creating a window otherwise a fullscreen window
     # will be created. If you pass a window from caller then that window will be used.
     # Some keys are trapped, jkhl space, pgup, pgdown, end, home, t b
@@ -43,20 +49,23 @@ module RubyCurses
       @editable = false
       @focusable = true
       @config = config
-      #@rows = FFI::NCurses.LINES-1
-      #@cols = FFI::NCurses.COLS-1
+      @row = @col = 0
       @prow = @pcol = 0
       @startrow = 0
       @startcol = 0
       @list = []
       super
 
-      # FIXME 0 as height craps out. need to make it LINES
-
-      @height = @height.ifzero(FFI::NCurses.LINES)
-      @width = @width.ifzero(FFI::NCurses.COLS)
+      ## NOTE 
+      #  ---------------------------------------------------
+      #  Since we are using pads, you need to get your height, width and rows correct
+      #  Make sure the height factors in the row, else nothing may show
+      #  ---------------------------------------------------
+      #@height = @height.ifzero(FFI::NCurses.LINES)
+      #@width = @width.ifzero(FFI::NCurses.COLS)
       @rows = @height
       @cols = @width
+      # NOTE XXX if cols is > COLS then padrefresh can fail
       @startrow = @row
       @startcol = @col
       #@suppress_border = config[:suppress_border]
@@ -66,15 +75,31 @@ module RubyCurses
         @startcol += 1
         @rows -=3  # 3 is since print_border_only reduces one from width, to check whether this is correct
         @cols -=3
+      else
+        # seeing why nothing is printing
+        @rows -=0  # 3 is since print_border_only reduces one from width, to check whether this is correct
+        ## if next is 0 then padrefresh doesn't print
+        @cols -=1
       end
       @row_offset = @col_offset = 0 if @suppress_borders
       @top = @row
       @left = @col
+      @lastrow = @row + 1
+      @lastcol = @col + 1
+      @_events << :PRESS
+      @_events << :ENTER_ROW
+      @scrollatrows = @height - 3
       init_vars
     end
     def init_vars
-      @scrollatrows = @height - 3
+      $multiplier = 0
       @oldindex = @current_index = 0
+      # column cursor
+      @prow = @pcol = @curpos = 0
+      if @row && @col
+        @lastrow = @row + 1
+        @lastcol = @col + 1
+      end
       @repaint_required = true
     end
     def rowcol #:nodoc:
@@ -82,10 +107,11 @@ module RubyCurses
     end
 
     private
+    ## XXX in list text returns the selected row, list returns the full thing, keep consistent
     def create_pad
       destroy if @pad
       #@pad = FFI::NCurses.newpad(@content_rows, @content_cols)
-      @pad = @window.get_pad(@content_rows, @content_cols)
+      @pad = @window.get_pad(@content_rows, @content_cols )
     end
 
     private
@@ -93,12 +119,25 @@ module RubyCurses
     def populate_pad
       @_populate_needed = false
       # how can we make this more sensible ? FIXME
-      @renderer ||= DefaultRubyRenderer.new if ".rb" == @filetype
+      #@renderer ||= DefaultFileRenderer.new #if ".rb" == @filetype
       @content_rows = @content.count
       @content_cols = content_cols()
+      # this should be explicit and not "intelligent"
+      #@title += " [ #{@content_rows},#{@content_cols}] " if @cols > 50
+      @content_rows = @rows if @content_rows < @rows
+      @content_cols = @cols if @content_cols < @cols
+      #$log.debug "XXXX content_cols = #{@content_cols}"
 
       create_pad
 
+      # clearstring is the string required to clear the pad to backgroud color
+      @clearstring = nil
+      cp = get_color($datacolor, @color, @bgcolor)
+      @cp = FFI::NCurses.COLOR_PAIR(cp)
+      if cp != $datacolor
+        @clearstring ||= " " * @width
+      end
+
       Ncurses::Panel.update_panels
       @content.each_index { |ix|
         #FFI::NCurses.mvwaddstr(@pad,ix, 0, @content[ix])
@@ -127,35 +166,93 @@ module RubyCurses
       if @renderer
         @renderer.render @pad, lineno, text
       else
+        ## messabox does have a method to paint the whole window in bg color its in rwidget.rb
+        att = NORMAL
+        FFI::NCurses.wattron(@pad, @cp | att)
+        FFI::NCurses.mvwaddstr(@pad,lineno, 0, @clearstring) if @clearstring
         FFI::NCurses.mvwaddstr(@pad,lineno, 0, @content[lineno])
+
+        #FFI::NCurses.mvwaddstr(pad, lineno, 0, text)
+        FFI::NCurses.wattroff(@pad, @cp | att)
       end
     end
 
     # supply a filename as source for textpad
     # Reads up file into @content
-
-    def filename(filename)
+    # One can optionally send in a method which takes a filename and returns an array of data
+    # This is required if you are processing files which are binary such as zip/archives and wish
+    # to print the contents. (e.g. cygnus gem sends in :get_file_contents).
+    #      filename("a.c", method(:get_file_contents))
+    #
+    def filename(filename, reader=nil)
       @file = filename
+      unless File.exists? filename
+        alert "#{filename} does not exist"
+        return
+      end
       @filetype = File.extname filename
-      @content = File.open(filename,"r").readlines
+      if reader
+        @content = reader.call(filename)
+      else
+        @content = File.open(filename,"r").readlines
+      end
+      if @filetype == ""
+        if @content.first.index("ruby")
+          @filetype = ".rb"
+        end
+      end
+      init_vars
+      @repaint_all = true
       @_populate_needed = true
     end
 
     # Supply an array of string to be displayed
     # This will replace existing text
 
-    def text lines
+    # display text given in an array format. This is the principal way of giving content
+    # to a textpad, other than filename().
+    # @param Array of lines
+    # @param format (optional) can be :tmux :ansi or :none
+    # If a format other than :none is given, then formatted_text is called.
+    def text(lines, fmt=:none)
+      # added so callers can have one interface and avoid an if condition
+      return formatted_text(lines, fmt) unless fmt == :none
+
+      return @content if lines.empty?
       @content = lines
       @_populate_needed = true
+      @repaint_all = true
+      init_vars
+      self
+    end
+    alias :list :text
+    def content
+      raise "content is nil " unless @content
+      return @content
+    end
+    alias :get_content :content
+
+    # print footer containing line and position
+    # XXX UNTESTED TODO TESTING
+    def print_foot #:nodoc:
+      @footer_attrib ||= Ncurses::A_REVERSE
+      footer = "R: #{@current_index+1}, C: #{@curpos+@pcol}, #{@list.length} lines  "
+      $log.debug " print_foot calling printstring with #{@row} + #{@height} -1, #{@col}+2"
+      @graphic.printstring( @row + @height -1 , @col+2, footer, @color_pair || $datacolor, @footer_attrib) 
+      @repaint_footer_required = false # 2010-01-23 22:55 
     end
 
     ## ---- the next 2 methods deal with printing chunks
     # we should put it int a common module and include it
     # in Window and Pad stuff and perhaps include it conditionally.
 
-    def print(string, width = width)
+    ## 2013-03-07 - 19:57 changed width to @content_cols since data not printing
+    # in some cases fully when ansi sequences were present int some line but not in others
+    # lines without ansi were printing less by a few chars.
+    # This was prolly copied from rwindow, where it is okay since its for a specific width
+    def print(string, _width = @content_cols)
       #return unless visible?
-      w = width == 0? Ncurses.COLS : width
+      w = _width == 0? Ncurses.COLS : _width
       FFI::NCurses.waddnstr(@pad,string.to_s, w) # changed 2011 dts  
     end
 
@@ -186,17 +283,30 @@ module RubyCurses
       end
     end
 
+    # 
+    # pass in formatted text along with parser (:tmux or :ansi)
     def formatted_text text, fmt
+
       require 'rbcurse/core/include/chunk'
       @formatted_text = text
       @color_parser = fmt
+      @repaint_required = true
+      # don't know if start is always required. so putting in caller
+      #goto_start
       #remove_all
     end
 
     # write pad onto window
-    private
+    #private
     def padrefresh
-      FFI::NCurses.prefresh(@pad,@prow,@pcol, @startrow,@startcol, @rows + @startrow,@cols+@startcol);
+      top = @window.top
+      left = @window.left
+      sr = @startrow + top
+      sc = @startcol + left
+      retval = FFI::NCurses.prefresh(@pad,@prow,@pcol, sr , sc , @rows + sr , @cols+ sc );
+      $log.warn "XXX:  PADREFRESH #{retval}, #{@prow}, #{@pcol}, #{sr}, #{sc}, #{@rows+sr}, #{@cols+sc}." if retval == -1
+      # padrefresh can fail if width is greater than NCurses.COLS
+      #FFI::NCurses.prefresh(@pad,@prow,@pcol, @startrow + top, @startcol + left, @rows + @startrow + top, @cols+@startcol + left);
     end
 
     # convenience method to return byte
@@ -206,13 +316,24 @@ module RubyCurses
     end
 
     # length of longest string in array
+    # This will give a 'wrong' max length if the array has ansi color escape sequences in it
+    # which inc the length but won't be printed. Such lines actually have less length when printed
+    # So in such cases, give more space to the pad.
     def content_cols
       longest = @content.max_by(&:length)
+      ## 2013-03-06 - 20:41 crashes here for some reason when man gives error message no man entry
+      return 0 unless longest
       longest.length
     end
 
     public
     def repaint
+      ## 2013-03-08 - 21:01 This is the fix to the issue of form callign an event like ? or F1
+      # which throws up a messagebox which leaves a black rect. We have no place to put a refresh
+      # However, form does call repaint for all objects, so we can do a padref here. Otherwise,
+      # it would get rejected. UNfortunately this may happen more often we want, but we never know
+      # when something pops up on the screen.
+      padrefresh unless @repaint_required
       return unless @repaint_required
       if @formatted_text
         $log.debug "XXX:  INSIDE FORMATTED TEXT "
@@ -230,13 +351,22 @@ module RubyCurses
       #HERE we need to populate once so user can pass a renderer
       unless @suppress_border
         if @repaint_all
-          @window.print_border_only @top, @left, @height-1, @width, $datacolor
+          ## XXX im not getting the background color.
+          #@window.print_border_only @top, @left, @height-1, @width, $datacolor
+          clr = get_color $datacolor, @color, @bgcolor
+          #@window.print_border @top, @left, @height-1, @width, clr
+          @window.print_border_only @top, @left, @height-1, @width, clr
           print_title
+
+          @repaint_footer_required = true if @oldrow != @current_index 
+          print_foot if @print_footer && !@suppress_borders && @repaint_footer_required
+
           @window.wrefresh
         end
       end
 
       padrefresh
+      Ncurses::Panel.update_panels
       @repaint_required = false
       @repaint_all = false
     end
@@ -246,66 +376,109 @@ module RubyCurses
     #
     def map_keys
       @mapped_keys = true
-      bind_key([?g,?g]){ goto_start } # mapping double keys like vim
-      bind_key(279){ goto_start } 
-      bind_keys([?G,277]){ goto_end } 
-      bind_keys([?k,KEY_UP]){ up } 
-      bind_keys([?j,KEY_DOWN]){ down } 
-      bind_key(?\C-e){ scroll_window_down } 
-      bind_key(?\C-y){ scroll_window_up } 
-      bind_keys([32,338, ?\C-d]){ scroll_forward } 
+      bind_key([?g,?g], 'goto_start'){ goto_start } # mapping double keys like vim
+      bind_key(279, 'goto_start'){ goto_start } 
+      bind_keys([?G,277], 'goto end'){ goto_end } 
+      bind_keys([?k,KEY_UP], "Up"){ up } 
+      bind_keys([?j,KEY_DOWN], "Down"){ down } 
+      bind_key(?\C-e, "Scroll Window Down"){ scroll_window_down } 
+      bind_key(?\C-y, "Scroll Window Up"){ scroll_window_up } 
+      bind_keys([32,338, ?\C-d], "Scroll Forward"){ scroll_forward } 
       bind_keys([?\C-b,339]){ scroll_backward } 
-      bind_key([?',?']){ goto_last_position } # vim , goto last row position (not column)
-      #bind_key(?/, :ask_search)
-      #bind_key(?n, :find_more)
+      # the next one invalidates the single-quote binding for bookmarks
+      #bind_key([?',?']){ goto_last_position } # vim , goto last row position (not column)
+      bind_key(?/, :ask_search)
+      bind_key(?n, :find_more)
       bind_key([?\C-x, ?>], :scroll_right)
       bind_key([?\C-x, ?<], :scroll_left)
       bind_key(?\M-l, :scroll_right)
       bind_key(?\M-h, :scroll_left)
-      bind_key([?\C-x, ?\C-s], :saveas)
-      #bind_key(?r) { getstr("Enter a word: ") }
-      bind_key(?m, :disp_menu)
+      bind_key(?L, :bottom_of_window)
+      bind_key(?M, :middle_of_window)
+      bind_key(?H, :top_of_window)
+      bind_key(?w, :forward_word)
+      bind_key(?l, :cursor_forward)
+      bind_key(?h, :cursor_backward)
+      bind_key(?$, :cursor_eol)
+      bind_key(KEY_ENTER, :fire_action_event)
     end
 
     # goto first line of file
     def goto_start
-      @oldindex = @current_index
+      #@oldindex = @current_index
+      $multiplier ||= 0
+      if $multiplier > 0
+        goto_line $multiplier - 1
+        return
+      end
       @current_index = 0
+      @curpos = @pcol = @prow = 0
       @prow = 0
+      $multiplier = 0
     end
 
     # goto last line of file
     def goto_end
-      @oldindex = @current_index
-      @current_index = @content_rows-1
+      #@oldindex = @current_index
+      $multiplier ||= 0
+      if $multiplier > 0
+        goto_line $multiplier - 1
+        return
+      end
+      @current_index = @content.count() - 1
       @prow = @current_index - @scrollatrows
+      $multiplier = 0
+    end
+    def goto_line line
+      ## we may need to calculate page, zfm style and place at right position for ensure visible
+      #line -= 1
+      @current_index = line
+      ensure_visible line
+      bounds_check
+      $multiplier = 0
+    end
+    def top_of_window
+      @current_index = @prow 
+      $multiplier ||= 0
+      if $multiplier > 0
+        @current_index += $multiplier
+        $multiplier = 0
+      end
+    end
+    def bottom_of_window
+      @current_index = @prow + @scrollatrows
+      $multiplier ||= 0
+      if $multiplier > 0
+        @current_index -= $multiplier
+        $multiplier = 0
+      end
+    end
+    def middle_of_window
+      @current_index = @prow + (@scrollatrows/2)
+      $multiplier = 0
     end
 
     # move down a line mimicking vim's j key
     # @param [int] multiplier entered prior to invoking key
     def down num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
-      @oldindex = @current_index if num > 10
+      #@oldindex = @current_index if num > 10
       @current_index += num
-      unless is_visible? @current_index
-        if @current_index > @scrollatrows
-          @prow += 1
-        end
-      end
+      ensure_visible
       $multiplier = 0
     end
 
     # move up a line mimicking vim's k key
     # @param [int] multiplier entered prior to invoking key
     def up num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
-      @oldindex = @current_index if num > 10
+      #@oldindex = @current_index if num > 10
       @current_index -= num
-      unless is_visible? @current_index
-        if @prow > @current_index
-          $status_message.value = "1 #{@prow} > #{@current_index} "
-          @prow -= 1
-        else
-        end
-      end
+      #unless is_visible? @current_index
+        #if @prow > @current_index
+          ##$status_message.value = "1 #{@prow} > #{@current_index} "
+          #@prow -= 1
+        #else
+        #end
+      #end
       $multiplier = 0
     end
 
@@ -333,7 +506,7 @@ module RubyCurses
 
     # scrolls lines a window full at a time, on pressing ENTER or C-d or pagedown
     def scroll_forward
-      @oldindex = @current_index
+      #@oldindex = @current_index
       @current_index += @scrollatrows
       @prow = @current_index - @scrollatrows
     end
@@ -341,7 +514,7 @@ module RubyCurses
     # scrolls lines backward a window full at a time, on pressing pageup 
     # C-u may not work since it is trapped by form earlier. Need to fix
     def scroll_backward
-      @oldindex = @current_index
+      #@oldindex = @current_index
       @current_index -= @scrollatrows
       @prow = @current_index - @scrollatrows
     end
@@ -352,34 +525,46 @@ module RubyCurses
       @oldindex = tmp
       bounds_check
     end
+    def scroll_right
+      # I don't think it will ever be less since we've increased it to cols
+      if @content_cols <= @cols
+        maxpcol = 0
+        @pcol = 0
+      else
+        maxpcol = @content_cols - @cols - 1
+        @pcol += 1
+        @pcol = maxpcol if @pcol > maxpcol
+      end
+      # to prevent right from retaining earlier painted values
+      # padreader does not do a clear, yet works fine.
+      # OK it has an update_panel after padrefresh, that clears it seems.
+      #this clears entire window not just the pad
+      #FFI::NCurses.wclear(@window.get_window)
+      # so border and title is repainted after window clearing
+      #
+      # Next line was causing all sorts of problems when scrolling  with ansi formatted text
+      #@repaint_all = true
+    end
+    def scroll_left
+      @pcol -= 1
+    end
+    #
+    #
+    #
+    #
     def handle_key ch
       return :UNHANDLED unless @content
       map_keys unless @mapped_keys
 
-      @maxrow = @content_rows - @rows
-      @maxcol = @content_cols - @cols 
+
       @oldrow = @prow
       @oldcol = @pcol
-      $log.debug "XXX: PAD got #{ch} "
+      $log.debug "XXX: PAD got #{ch} prow = #{@prow}"
       begin
         case ch
-        when key(?l)
-          # TODO take multipler
-          @pcol += 1
-        when key(?$)
-          @pcol = @maxcol - 1
-        when key(?h)
-          # TODO take multipler
-          if @pcol > 0
-            @pcol -= 1
-          end
-        when key(?q)
-          #throw :close
       when ?0.getbyte(0)..?9.getbyte(0)
         if ch == ?0.getbyte(0) && $multiplier == 0
-          # copy of C-a - start of line
-          @repaint_required = true if @pcol > 0 # tried other things but did not work
-          @pcol = 0
+          cursor_bol
           return 0
         end
         # storing digits entered so we can multiply motion actions
@@ -392,6 +577,8 @@ module RubyCurses
           # check for bindings, these cannot override above keys since placed at end
           begin
             ret = process_key ch, self
+            $multiplier = 0
+            bounds_check
             ## If i press C-x > i get an alert from rwidgets which blacks the screen
             # if i put a padrefresh here it becomes okay but only for one pad,
             # i still need to do it for all pads.
@@ -399,23 +586,54 @@ module RubyCurses
             $log.error " TEXTPAD ERROR INS #{err} "
             $log.debug(err.backtrace.join("\n"))
             textdialog ["Error in TextPad: #{err} ", *err.backtrace], :title => "Exception"
-            # FIXME why does this result in a blank spot on screen till its refreshed again
-            # should not happen if its deleting its panel and doing an update panel
           end
+          ## NOTE if textpad does not handle the event and it goes to form which pops
+          # up a messagebox, then padrefresh does not happen, since control does not 
+          # come back here, so a black rect is left on screen
+          # please note that a bounds check will not happen for stuff that 
+          # is triggered by form, so you'll have to to it yourself or 
+          # call setrowcol explicity if the cursor is not updated
           return :UNHANDLED if ret == :UNHANDLED
         end
-        bounds_check
       rescue => err
-        $log.error " TEXTPAD ERROR 111 #{err} "
+        $log.error " TEXTPAD ERROR 591 #{err} "
         $log.debug( err) if err
         $log.debug(err.backtrace.join("\n")) if err
         textdialog ["Error in TextPad: #{err} ", *err.backtrace], :title => "Exception"
         $error_message.value = ""
       ensure
+        padrefresh
+        Ncurses::Panel.update_panels
       end
       return 0
     end # while loop
 
+    #
+    # event when user hits enter on a row, user would bind :PRESS
+    #
+    def fire_action_event
+      return if @content.nil? || @content.size == 0
+      require 'rbcurse/core/include/ractionevent'
+      aev = TextActionEvent.new self, :PRESS, current_value().to_s, @current_index, @curpos
+      fire_handler :PRESS, aev
+    end
+    #
+    # returns current value (what cursor is on)
+    def current_value
+      @content[@current_index]
+    end
+    # 
+    # execute binding when a row is entered, used more in lists to display some text
+    # in a header or footer as one traverses
+    #
+    def on_enter_row arow
+      return if @content.nil? || @content.size == 0
+      require 'rbcurse/core/include/ractionevent'
+      aev = TextActionEvent.new self, :ENTER_ROW, current_value().to_s, @current_index, @curpos
+      fire_handler :ENTER_ROW, aev
+      @repaint_required = true
+    end
+
     # destroy the pad, this needs to be called from somewhere, like when the app
     # closes or the current window closes , or else we could have a seg fault
     # or some ugliness on the screen below this one (if nested).
@@ -426,10 +644,24 @@ module RubyCurses
       FFI::NCurses.delwin(@pad) if @pad # when do i do this ? FIXME
       @pad = nil
     end
+    # 
+    # return true if the given row is visible
     def is_visible? index
       j = index - @prow #@toprow
       j >= 0 && j <= @scrollatrows
     end
+    #
+    # called when this widget is entered, by form
+    def on_enter
+      set_form_row
+    end
+    # called by form
+    def set_form_row
+      setrowcol @lastrow, @lastcol
+    end
+    # called by form
+    def set_form_col
+    end
 
     private
     
@@ -440,65 +672,228 @@ module RubyCurses
     def bounds_check
       r,c = rowcol
       @current_index = 0 if @current_index < 0
-      @current_index = @content_rows-1 if @current_index > @content_rows-1
-      $status_message.value = "visible #{@prow} , #{@current_index} "
-      unless is_visible? @current_index
-        if @prow > @current_index
-          $status_message.value = "1 #{@prow} > #{@current_index} "
-          @prow -= 1
-        else
-        end
-      end
-      #end
+      @current_index = @content.count()-1 if @current_index > @content.count()-1
+      ensure_visible
+
       check_prow
-      $log.debug "XXX: PAD BOUNDS ci:#{@current_index} , old #{@oldrow},pr #{@prow}, max #{@maxrow} "
+      #$log.debug "XXX: PAD BOUNDS ci:#{@current_index} , old #{@oldrow},pr #{@prow}, max #{@maxrow} pcol #{@pcol} maxcol #{@maxcol}"
       @crow = @current_index + r - @prow
       @crow = r if @crow < r
       # 2 depends on whetehr suppressborders
       @crow = @row + @height -2 if @crow >= r + @height -2
-      setrowcol @crow, nil
+      setrowcol @crow, @curpos+c
+      lastcurpos @crow, @curpos+c
+      if @oldindex != @current_index
+        on_enter_row @current_index
+        @oldindex = @current_index
+      end
       if @oldrow != @prow || @oldcol != @pcol
+        # only if scrolling has happened.
         @repaint_required = true
       end
     end
-  end
+    # 
+    # save last cursor position so when reentering, cursor can be repositioned
+    def lastcurpos r,c
+      @lastrow = r
+      @lastcol = c
+    end
+
 
-  # check that prow and pcol are within bounds
+    # check that prow and pcol are within bounds
+    #
+    def check_prow
+      @prow = 0 if @prow < 0
+      @pcol = 0 if @pcol < 0
+
+      cc = @content.count
 
-  def check_prow
-    @prow = 0 if @prow < 0
-    @pcol = 0 if @pcol < 0
-    if @prow > @maxrow-1
-      @prow = @maxrow-1
+      if cc < @rows
+        @prow = 0
+      else
+        maxrow = cc - @rows - 1
+        if @prow > maxrow
+          @prow = maxrow
+        end
+      end
+      # we still need to check the max that prow can go otherwise
+      # the pad shows earlier stuff.
+      # 
+      return
     end
-    if @pcol > @maxcol-1
-      @pcol = @maxcol-1
+    public
+    ## 
+    # Ask user for string to search for
+    # This uses the dialog, but what if user wants the old style.
+    # Isn't there a cleaner way to let user override style, or allow user
+    # to use own UI for getting pattern and then passing here.
+    def ask_search
+      str = get_string("Enter pattern: ")
+      return if str.nil? 
+      str = @last_regex if str == ""
+      return if str == ""
+      ix = next_match str
+      return unless ix
+      @last_regex = str
+
+      #@oldindex = @current_index
+      @current_index = ix[0]
+      @curpos = ix[1]
+      ensure_visible
+    end
+    ## 
+    # Find next matching row for string accepted in ask_search
+    #
+    def find_more
+      return unless @last_regex
+      ix = next_match @last_regex
+      return unless ix
+      #@oldindex = @current_index
+      @current_index = ix[0]
+      @curpos = ix[1]
+      ensure_visible
+    end
+
+    ## 
+    # Find the next row that contains given string
+    # @return row and col offset of match, or nil
+    # @param String to find
+    def next_match str
+      first = nil
+      ## content can be string or Chunkline, so we had to write <tt>index</tt> for this.
+      ## =~ does not give an error, but it does not work.
+      @content.each_with_index do |line, ix|
+        col = line.index str
+        if col
+          first ||= [ ix, col ]
+          if ix > @current_index
+            return [ix, col]
+          end
+        end
+      end
+      return first
     end
-  end
+    ## 
+    # Ensure current row is visible, if not make it first row
+    # NOTE - need to check if its at end and then reduce scroll at rows, check_prow does that
+    # 
+    # @param current_index (default if not given)
+    #
+    def ensure_visible row = @current_index
+      unless is_visible? row
+          @prow = @current_index
+      end
+    end
+    #
+    # jumps cursor to next work, like vim's w key
+    #
+    def forward_word
+      $multiplier = 1 if !$multiplier || $multiplier == 0
+      line = @current_index
+      buff = @content[line].to_s
+      return unless buff
+      pos = @curpos || 0 # list does not have curpos
+      $multiplier.times {
+        found = buff.index(/[[:punct:][:space:]]\w/, pos)
+        if !found
+          # if not found, we've lost a counter
+          if line+1 < @content.length
+            line += 1
+          else
+            return
+          end
+          pos = 0
+        else
+          pos = found + 1
+        end
+        $log.debug " forward_word: pos #{pos} line #{line} buff: #{buff}"
+      }
+      $multiplier = 0
+      @current_index = line
+      @curpos = pos
+      ensure_visible
+      @repaint_required = true
+    end
+    #
+    # move cursor forward by one char (currently will not pan)
+    def cursor_forward
+      $multiplier = 1 if $multiplier == 0
+      if @curpos < @cols
+        @curpos += $multiplier
+        if @curpos > @cols
+          @curpos = @cols
+        end
+        @repaint_required = true
+      end
+      $multiplier = 0
+    end
+    #
+    # move cursor backward by one char (currently will not pan)
+    def cursor_backward
+      $multiplier = 1 if $multiplier == 0
+      if @curpos > 0
+        @curpos -= $multiplier
+        @curpos = 0 if @curpos < 0
+        @repaint_required = true
+      end
+      $multiplier = 0
+    end
+    # moves cursor to end of line also panning window if necessary
+    # NOTE: if one line on another page (not displayed) is way longer than any
+    # displayed line, then this will pan way ahead, so may not be very intelligent
+    # in such situations.
+    def cursor_eol
+      # pcol is based on max length not current line's length
+      @pcol = @content_cols - @cols - 1
+      @curpos = @content[@current_index].size
+      @repaint_required = true
+    end
+    # 
+    # moves cursor to start of line, panning if required
+    def cursor_bol
+      # copy of C-a - start of line
+      @repaint_required = true if @pcol > 0
+      @pcol = 0
+      @curpos = 0
+    end
+
+  end  # class textpad
+
   # a test renderer to see how things go
-  class DefaultRubyRenderer
+  class DefaultFileRenderer
     def render pad, lineno, text
       bg = :black
       fg = :white
       att = NORMAL
-      cp = $datacolor
-      if text =~ /^\s*# /
+      #cp = $datacolor
+      cp = get_color($datacolor, fg, bg)
+      ## XXX believe it or not, the next line can give you "invalid byte sequence in UTF-8
+      # even when processing filename at times. Or if its an mp3 or non-text file.
+      if text =~ /^\s*# / || text =~ /^\s*## /
         fg = :red
+        #att = BOLD
         cp = get_color($datacolor, fg, bg)
       elsif text =~ /^\s*#/
         fg = :blue
         cp = get_color($datacolor, fg, bg)
-      elsif text =~ /^\s*class /
-        fg = :magenta
+      elsif text =~ /^\s*(class|module) /
+        fg = :cyan
+        att = BOLD
         cp = get_color($datacolor, fg, bg)
-      elsif text =~ /^\s*def /
+      elsif text =~ /^\s*def / || text =~ /^\s*function /
         fg = :yellow
         att = BOLD
         cp = get_color($datacolor, fg, bg)
-      elsif text =~ /^\s*(begin|rescue|ensure|end)/
+      elsif text =~ /^\s*(end|if |elsif|else|begin|rescue|ensure|include|extend|while|unless|case |when )/
         fg = :magenta
         att = BOLD
         cp = get_color($datacolor, fg, bg)
+      elsif text =~ /^\s*=/
+        # rdoc case
+        fg = :blue
+        bg = :white
+        cp = get_color($datacolor, fg, bg)
+        att = REVERSE
       end
       FFI::NCurses.wattron(pad,FFI::NCurses.COLOR_PAIR(cp) | att)
       FFI::NCurses.mvwaddstr(pad, lineno, 0, text)
@@ -507,18 +902,3 @@ module RubyCurses
     end
   end
 end
-if __FILE__ == $PROGRAM_NAME
-  require 'rbcurse/core/util/app'
-  App.new do
-    w = 50
-    w2 = FFI::NCurses.COLS-w-1
-    ## create two side by side pads on for ansi and one for ruby
-    p = RubyCurses::TextPad.new @form, :height => FFI::NCurses.LINES, :width => w, :row => 0, :col => 0 , :title => " ansi "
-    fn = "../../../../examples/data/color.2"
-    text = File.open(fn,"r").readlines
-    p.formatted_text(text, :ansi)
-    RubyCurses::TextPad.new @form, :filename => "textpad.rb", :height => FFI::NCurses.LINES, :width => w2, :row => 0, :col => w+1 , :title => " ruby "
-    #throw :close
-    #status_line
-  end
-end

data/rbcurse-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-core"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = "2013-03-21"
+  s.date = "2013-03-23"
   s.description = "Ruby curses/ncurses widgets for easy application development on text terminals (ruby 1.9)"
   s.email = "sentinel1879@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcurse-core
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-ncurses