rbcurse-core 0.0.12 → 0.0.13

data/CHANGELOG

@@ -1,3 +1,7 @@
+**2013-03-25**
+## 0.0.12 rbcurse-core
+   * Minor tweaks and fixes to statusline (tested in ribhu gem)
+
 **2013-03-22**
 ## 0.0.11 rbcurse-core
    * Added textpad (tested in cygnus gem)

data/NOTES

@@ -1,7 +1,7 @@
 NOTES
 =====
 /// vim:ts=4:sw=4:tw=80:ai:formatoptions=tcqnl:
-/// this was posted with appenddiary.sh
+/// this was posted with appenddiary.sh (notes)
 
 Subject: Update rubyforge
 -------------------------
@@ -2149,3 +2149,22 @@ you use a field in a messagebox which is created over and over again, then we
 manually have to keep the history and pass it to the field when creating the messagebox.
 
 * * * * * * * *
+
+Subject: pad version of widgets
+-------------------------------
+Date: 2013-03-26 11:56
+
+We have textpad functioning as a replacement of textview. Should we
+replace the code inside textview with pad, this involves a lot of
+testing and not knowing what can break. What user apps can break?
+
+Or create parallel widgets. I have used textpad in cygnus for lists,
+popups and textviews. Now I need to use it for tree and tabularwidget.
+
+If i keep parallel widgets then there's a naming issue. Should i use
+another module name Pad so i have Pad::tree etc or a different name ?
+
+I would go with another module name but same widget name so it is clear
+that it is the same widget.
+
+* * * * * * * *

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

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

@@ -96,11 +96,11 @@ module RubyCurses
       else
         t = Time.now
         tt = t.strftime "%F %H:%M:%S"
-        r = Ncurses.LINES
+        #r = Ncurses.LINES
         # somehow the bg defined here affects the bg in left text, if left does not define
         # a bg. The bgcolor defined of statusline is ignored in left or overriden by this
-        ftext = "#[fg=green,bg=blue] %-20s#[/end]" % [tt] # print a default
-        @form.window.printstring_formatted_right @row, nil, ftext, $datacolor, Ncurses::A_REVERSE
+        #ftext = "#[fg=white,bg=blue] %-20s#[/end]" % [tt] # print a default
+        @form.window.printstring_formatted_right @row, nil, tt, @color_pair, Ncurses::A_REVERSE
       end
 
       @repaint_required = false

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

@@ -760,6 +760,7 @@ module RubyCurses
         w = @cw[i]
         l = e.to_s.length
         fmt = "%-#{w}s "
+        # if value is longer than width, then truncate it
         if l > w
           fmt = "%.#{w}s "
         else

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

@@ -8,22 +8,19 @@
 #       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-25 01:52
+#  Last update: 2013-03-29 18:59
 #
 #  == CHANGES
 #  == TODO 
-#     _ 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
+#  Take care of 3 cases:
+#     1. complete data change, then recreate pad, and call init_vars resetting row, col and curpos etc
+#        This is done by method text().
+#     2. row added or minor change - recreate pad, repaint data but don't call initvars. must maintain cursor
+#        ignore recreate of pad if width or ht is less than w and h of container.
+#     3. only rewrite a row - row data changed, no recreate pad or anything else
+#
 #
-#     x add mappings and process key in handle_keys and other widget things
-#     - can pad movement and other ops be abstracted into module for reuse
-#     / get scrolling like in vim (C-f e y b d)
 #
-#   == TODO 2013-03-07 - 20:34 
-#   _ key bindings not showing up -- bind properly
 # ----------------------------------------------------------------------------- #
 #
 require 'rbcurse'
@@ -35,10 +32,14 @@ module RubyCurses
   class TextPad < Widget
     include BorderTitle
 
-    dsl_accessor :suppress_border
+    dsl_accessor :suppress_borders
     dsl_accessor :print_footer
     attr_reader :current_index
     attr_reader :rows , :cols
+    # adding these only for debugging table, to see where cursor is.
+    attr_reader :lastrow, :lastcol
+    # for external methods or classes to advance cursor
+    #attr_accessor :curpos
     # 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
@@ -53,6 +54,7 @@ module RubyCurses
       @prow = @pcol = 0
       @startrow = 0
       @startcol = 0
+      # @list is unused, think it can be removed
       @list = []
       super
 
@@ -68,27 +70,27 @@ module RubyCurses
       # NOTE XXX if cols is > COLS then padrefresh can fail
       @startrow = @row
       @startcol = @col
-      #@suppress_border = config[:suppress_border]
-      @row_offset = @col_offset = 1
-      unless @suppress_border
+      unless @suppress_borders
+        @row_offset = @col_offset = 1
         @startrow += 1
         @startcol += 1
         @rows -=3  # 3 is since print_border_only reduces one from width, to check whether this is correct
         @cols -=3
+        @scrollatrows = @height - 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
+        # no borders printed
+        @rows -= 1  # 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
+        @scrollatrows = @height - 1 # check this out 0 or 1
+        @row_offset = @col_offset = 0 
       end
-      @row_offset = @col_offset = 0 if @suppress_borders
       @top = @row
       @left = @col
-      @lastrow = @row + 1
-      @lastcol = @col + 1
+      @lastrow = @row + @row_offset
+      @lastcol = @col + @col_offset
       @_events << :PRESS
       @_events << :ENTER_ROW
-      @scrollatrows = @height - 3
       init_vars
     end
     def init_vars
@@ -97,10 +99,11 @@ module RubyCurses
       # column cursor
       @prow = @pcol = @curpos = 0
       if @row && @col
-        @lastrow = @row + 1
-        @lastcol = @col + 1
+        @lastrow = @row + @row_offset
+        @lastcol = @col + @col_offset
       end
       @repaint_required = true
+      map_keys unless @mapped_keys
     end
     def rowcol #:nodoc:
       return @row+@row_offset, @col+@col_offset
@@ -118,19 +121,14 @@ module RubyCurses
     # create and populate pad
     def populate_pad
       @_populate_needed = false
-      # how can we make this more sensible ? FIXME
-      #@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 is the string required to clear the pad to background color
       @clearstring = nil
       cp = get_color($datacolor, @color, @bgcolor)
       @cp = FFI::NCurses.COLOR_PAIR(cp)
@@ -139,11 +137,18 @@ module RubyCurses
       end
 
       Ncurses::Panel.update_panels
+      render_all
+
+    end
+    #
+    # iterate through content rendering each row
+    # 2013-03-27 - 01:51 separated so that widgets with headers such as tables can
+    # override this for better control
+    def render_all
       @content.each_index { |ix|
         #FFI::NCurses.mvwaddstr(@pad,ix, 0, @content[ix])
         render @pad, ix, @content[ix]
       }
-
     end
 
     public
@@ -226,6 +231,8 @@ module RubyCurses
       self
     end
     alias :list :text
+    # for compat with textview
+    alias :set_content :text
     def content
       raise "content is nil " unless @content
       return @content
@@ -285,6 +292,7 @@ module RubyCurses
 
     # 
     # pass in formatted text along with parser (:tmux or :ansi)
+    # NOTE this does not call init_vars, i think it should, text() does
     def formatted_text text, fmt
 
       require 'rbcurse/core/include/chunk'
@@ -327,16 +335,34 @@ module RubyCurses
     end
 
     public
+    # to be called with program / user has added a row or changed column widths so that 
+    # the pad needs to be recreated. However, cursor positioning is maintained since this
+    # is considered to be a minor change. 
+    # We do not call init_vars since user is continuing to do some work on a row/col.
+    def fire_dimension_changed
+      # recreate pad since width or ht has changed (row count or col width changed)
+      @_populate_needed = true
+      @repaint_required = true
+      @repaint_all = true
+    end
+    # repaint only one row since content of that row has changed. 
+    # No recreate of pad is done.
+    def fire_row_changed ix
+      render @pad, ix, @content[ix]
+      # may need to call padrefresh TODO TESTING
+    end
     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
+      unless @repaint_required
+        padrefresh 
+        return 
+      end
       if @formatted_text
-        $log.debug "XXX:  INSIDE FORMATTED TEXT "
+        #$log.debug "XXX:  INSIDE FORMATTED TEXT "
 
         l = RubyCurses::Utils.parse_formatted_text(@color_parser,
                                                @formatted_text)
@@ -349,7 +375,7 @@ module RubyCurses
       @window ||= @graphic
       populate_pad if @_populate_needed
       #HERE we need to populate once so user can pass a renderer
-      unless @suppress_border
+      unless @suppress_borders
         if @repaint_all
           ## XXX im not getting the background color.
           #@window.print_border_only @top, @left, @height-1, @width, $datacolor
@@ -464,7 +490,11 @@ module RubyCurses
     def down num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
       #@oldindex = @current_index if num > 10
       @current_index += num
-      ensure_visible
+      # no , i don't like this here. it scrolls up too much making prow = current_index
+      unless is_visible? @current_index
+          @prow += num
+      end
+      #ensure_visible
       $multiplier = 0
     end
 
@@ -555,7 +585,6 @@ module RubyCurses
     #
     def handle_key ch
       return :UNHANDLED unless @content
-      map_keys unless @mapped_keys
 
 
       @oldrow = @prow
@@ -681,7 +710,11 @@ module RubyCurses
       @crow = @current_index + r - @prow
       @crow = r if @crow < r
       # 2 depends on whetehr suppressborders
-      @crow = @row + @height -2 if @crow >= r + @height -2
+      if @suppress_borders
+        @crow = @row + @height -1 if @crow >= r + @height -1
+      else
+        @crow = @row + @height -2 if @crow >= r + @height -2
+      end
       setrowcol @crow, @curpos+c
       lastcurpos @crow, @curpos+c
       if @oldindex != @current_index
@@ -728,8 +761,13 @@ module RubyCurses
     # 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: ")
+    # @param str default nil. If not passed, then user is prompted using get_string dialog
+    #    This allows caller to use own method to prompt for string such as 'get_line' or 'rbgetstr' /
+    #    'ask()'
+    def ask_search str=nil
+      # the following is a change that enables callers to prompt for the string
+      # using some other style, basically the classical style and send the string in
+      str = get_string("Enter pattern: ") unless str
       return if str.nil? 
       str = @last_regex if str == ""
       return if str == ""
@@ -891,6 +929,10 @@ module RubyCurses
 
   # a test renderer to see how things go
   class DefaultFileRenderer
+    #
+    # @param pad for calling print methods on
+    # @param lineno the line number on the pad to print on
+    # @param text data to print
     def render pad, lineno, text
       bg = :black
       fg = :white

data/rbcurse-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-core"
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = "2013-03-25"
+  s.date = "2013-03-29"
   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.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-ncurses