rbcurse 1.4.0 → 1.4.1.pre2

data/lib/rbcurse/rtable.rb

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

data/lib/rbcurse/rtextarea.rb

@@ -15,8 +15,6 @@ Todo:
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-require 'rubygems'
-##require 'ncurses' # FFI removed
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/listscrollable'
@@ -120,14 +118,20 @@ module RubyCurses
         data = wrap_text data
       #  $log.debug "after wrap text done :#{data}"
         data = data.split("\n")
-         data[-1] << "\r" #XXXX
-      else
-        data << "\r" if data[-1,1] != "\r" #XXXX
-      end
+        data[-1] << "\r" #XXXX
       data.each do |row|
         @list.insert off0, row
         off0 += 1
       end
+      else
+        data << "\r" if data[-1,1] != "\r" #XXXX
+        @list.insert off0, data
+      end
+      # expecting array !! 
+      #data.each do |row|
+        #@list.insert off0, row
+        #off0 += 1
+      #end
       #$log.debug " AFTER INSERT: #{@list}"
     end
     ##
@@ -183,9 +187,6 @@ module RubyCurses
       borderatt = @border_attrib || Ncurses::A_NORMAL
       #color = $datacolor
       #window.print_border @row, @col, @height, @width, color
-      ## NOTE: If it bombs in next line, either no form passed
-      ##+ or you using this embedded and need to set should_create_buffer true when
-      ##+ creating. See examples/testscrollta.rb.
       window.print_border @row, @col, @height-1, @width, bordercolor, borderatt
       print_title
 =begin
@@ -248,6 +249,7 @@ module RubyCurses
       @list.replace lines
       @repaint_required = true
     end
+    alias :text :set_content
     def get_window
       @graphic
     end
@@ -838,17 +840,15 @@ module RubyCurses
     end
     def paint
       # not sure where to put this, once for all or repeat 2010-02-12 RFED16
-      my_win = @form? @form.window : @target_window
-      $log.warn "neither form not target window given!!! TA paint 751" unless my_win
-      @win_left = my_win.left # unused remove TODO
-      @win_top = my_win.top
+      #my_win = @form? @form.window : @target_window
+      #$log.warn "neither form not target window given!!! TA paint 751" unless my_win
+      raise "Height or width nil h:#{@height} , w: #{@width} " if @height.nil? || @width.nil?
       print_borders if (@suppress_borders == false && @repaint_all) # do this once only, unless everything changes
       rc = row_count
       _maxlen = @maxlen || @width-@internal_width # TODO fix in other branches remove ||= 
       $log.debug " #{@name} textarea repaint width is #{@width}, height is #{@height} , maxlen #{_maxlen}/ #{@maxlen}, #{@graphic.name} "
       tm = get_content
       tr = @toprow
-      raise "textarea height not specified" unless @height
       acolor = get_color $datacolor
       h = scrollatrow()
       r,c = rowcol

data/lib/rbcurse/rtextview.rb

@@ -4,10 +4,6 @@
   * Author: rkumar (arunachalesha)
   * file created 2009-01-08 15:23  
   * major change: 2010-02-10 19:43 simplifying the buffer stuff.
-  * FIXME : since currently paint is directly doing copywin, there are no checks
-    to prevent crashing or -1 when panning. We need to integrate it back to a call to Pad.
-  * unnecessary repainting when moving cursor, evn if no change in coords and data
-  * on reentering cursor does not go to where it last was (test2.rb) - sure it used to.
 TODO 
    * border, and footer could be objects (classes) at some future stage.
   --------
@@ -15,13 +11,10 @@ TODO
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-require 'rubygems'
-#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/listscrollable'
 
-#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -42,7 +35,7 @@ module RubyCurses
     dsl_accessor :maxlen    # max len to be displayed
     attr_reader :toprow    # the toprow in the view (offsets are 0)
 #    attr_reader :prow     # the row on which cursor/focus is
-    attr_reader :winrow   # the row in the viewport/window
+    #attr_reader :winrow   # the row in the viewport/window
     # painting the footer does slow down cursor painting slightly if one is moving cursor fast
     dsl_accessor :print_footer
     dsl_accessor :suppress_borders # added 2010-02-10 20:05 values true or false
@@ -76,11 +69,10 @@ module RubyCurses
       @curpos = @pcol = @toprow = @current_index = 0
       @repaint_all=true 
       @repaint_required=true 
+      @widget_scrolled = true
       ## 2010-02-10 20:20 RFED16 taking care if no border requested
       @row_offset = @col_offset = 0 if @suppress_borders == true
       # added 2010-02-11 15:11 RFED16 so we don't need a form.
-      @win_left = 0
-      @win_top = 0
       $error_message_row ||= 23
       $error_message_col ||= 1
       # currently i scroll right only if  current line is longer than display width, i should use 
@@ -97,8 +89,10 @@ module RubyCurses
       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(?r) { getstr("Enter a word: ") }
       bind_key(?m, :disp_menu)
     end
     ## 
@@ -128,6 +122,15 @@ module RubyCurses
       end
       init_vars
     end
+    # for consistency with other objects that respect text
+    alias :text :set_content
+    def formatted_text text, fmt
+      require 'rbcurse/common/chunk'
+      @formatted_text = text
+      @color_parser = fmt
+      remove_all
+    end
+
     def remove_all
       @list = []
       init_vars
@@ -191,19 +194,18 @@ module RubyCurses
       return unless @title
       raise "textview needs width" unless @width
       @color_pair ||= get_color($datacolor) # should we not use this ??? XXX 
-      #$log.debug " print_title #{@row}, #{@col}, #{@width}  "
+
       # check title.length and truncate if exceeds width
       _title = @title
       if @title.length > @width - 2
         _title = @title[0..@width-2]
       end
-#      @graphic.printstring( @row, @col+(@width-_title.length)/2, _title, $datacolor, @title_attrib) unless @title.nil? # changed 2011 dts  
       @graphic.printstring( @row, @col+(@width-_title.length)/2, _title, @color_pair, @title_attrib) unless @title.nil?
     end
     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"
+      $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
@@ -216,11 +218,16 @@ module RubyCurses
     end
 
     def repaint # textview :nodoc:
-      $log.debug "TEXTVIEW repaint r c #{@row}, #{@col} "  
+      #$log.debug "TEXTVIEW repaint r c #{@row}, #{@col}, key: #{$current_key}, reqd #{@repaint_required} "  
 
       #return unless @repaint_required # 2010-02-12 19:08  TRYING - won't let footer print for col move
+      # TRYING OUT dangerous 2011-10-13 
+      @repaint_required = false
+      @repaint_required = true if @widget_scrolled || @pcol != @old_pcol || @record_changed || @property_changed
+
       paint if @repaint_required
-    #  raise "TV 175 graphic nil " unless @graphic
+
+      @repaint_footer_required = true if @oldrow != @current_index # 2011-10-15 
       print_foot if @print_footer && !@suppress_borders && @repaint_footer_required
     end
     def getvalue
@@ -229,19 +236,46 @@ module RubyCurses
     def current_value
       @list[@current_index]
     end
+
+    # determine length of row since we have chunks now.
+    # Since chunk implements length, so not required except for the old
+    # cases of demos that use an array.
+    def row_length
+      case @buffer
+      when String
+        @buffer.length
+      when Chunks::ChunkLine
+        return @buffer.length
+      when Array
+        # this is for those old cases like rfe.rb which sent in an array
+        # (before we moved to chunks) 
+        # line is an array of arrays
+        if @buffer[0].is_a? Array
+          result = 0
+          @buffer.each {|e| result += e[1].length  }
+          return result
+        end
+        # line is one single chunk
+        return @buffer[1].length
+      end
+    end
     # textview
+    # NOTE: i think this should return if list is nil or empty. No need to put
+    #
+    # stuff into buffer and continue. will trouble other classes that extend.
     def handle_key ch #:nodoc:
       $log.debug " textview got ch #{ch} "
+      @old_pcol = @pcol
       @buffer = @list[@current_index]
       if @buffer.nil? and row_count == 0
         @list << "\r"
         @buffer = @list[@current_index]
       end
       return if @buffer.nil?
-      #$log.debug " before: curpos #{@curpos} blen: #{@buffer.length}"
-      if @curpos > @buffer.length
-        addcol((@buffer.length-@curpos)+1)
-        @curpos = @buffer.length
+      #$log.debug " before: curpos #{@curpos} blen: #{row_length}"
+      if @curpos > row_length #@buffer.length
+        addcol((row_length-@curpos)+1)
+        @curpos = row_length
         set_form_col 
       end
       # We can improve later
@@ -257,12 +291,14 @@ module RubyCurses
       when KEY_UP, ?k.getbyte(0)
         #select_prev_row
         ret = up
-        get_window.ungetch(KEY_BTAB) if ret == :NO_PREVIOUS_ROW
+        # next removed as very irritating, can be configured if required 2011-11-2 
+        #get_window.ungetch(KEY_BTAB) if ret == :NO_PREVIOUS_ROW
         check_curpos
         
       when KEY_DOWN, ?j.getbyte(0)
         ret = down
-        get_window.ungetch(KEY_TAB) if ret == :NO_NEXT_ROW
+        # This should be configurable, or only if all rows are visible
+        #get_window.ungetch(KEY_TAB) if ret == :NO_NEXT_ROW
         check_curpos
       when KEY_LEFT, ?h.getbyte(0)
         cursor_backward
@@ -279,7 +315,7 @@ module RubyCurses
         # take care of data that exceeds maxlen by scrolling and placing cursor at end
         # This use to actually pan the screen to actual end of line, but now somewhere
         # it only goes to end of visible screen, set_form probably does a sanity check
-        blen = @buffer.rstrip.length
+        blen = row_length # @buffer.rstrip.length FIXME
         set_form_col blen
         # search related 
       when @KEY_ASK_FIND
@@ -304,14 +340,6 @@ module RubyCurses
         # storing digits entered so we can multiply motion actions
         $multiplier *= 10 ; $multiplier += (ch-48)
         return 0
-      #when ?\C-u.getbyte(0)
-        ## multiplier. Series is 4 16 64
-        #@multiplier = (@multiplier == 0 ? 4 : @multiplier *= 4)
-        #return 0
-      when ?\M-l.getbyte(0) # just added 2010-03-05 not perfect
-        scroll_right # scroll data horizontally 
-      when ?\M-h.getbyte(0)
-        scroll_left
       when ?\C-c.getbyte(0)
         $multiplier = 0
         return 0
@@ -334,9 +362,9 @@ module RubyCurses
     def check_curpos #:nodoc:
       @buffer = @list[@current_index]
       # if the cursor is ahead of data in this row then move it back
-      if @pcol+@curpos > @buffer.length
-        addcol((@pcol+@buffer.length-@curpos)+1)
-        @curpos = @buffer.length 
+      if @pcol+@curpos > row_length
+        addcol((@pcol+row_length-@curpos)+1)
+        @curpos = row_length 
         maxlen = (@maxlen || @width-@internal_width)
 
         # even this row is gt maxlen, i.e., scrolled right
@@ -379,7 +407,7 @@ module RubyCurses
         @curpos += 1
         addcol 1
       else
-        @pcol += 1 if @pcol <= @buffer.length
+        @pcol += 1 if @pcol <= row_length
       end
       }
       set_form_col 
@@ -424,15 +452,26 @@ module RubyCurses
     end
     # @deprecated
     def do_relative_row num  #:nodoc:
+      raise "unused will be removed"
       yield @list[@current_index+num] 
     end
 
+    # supply with a color parser, if you supplied formatted text
+    def color_parser f
+      $log.debug "XXX: parser setting color_parser to #{f} "
+      #@window.color_parser f
+      @color_parser = f
+    end
+
+
+
     ## NOTE: earlier print_border was called only once in constructor, but when
     ##+ a window is resized, and destroyed, then this was never called again, so the 
     ##+ border would not be seen in splitpane unless the width coincided exactly with
     ##+ what is calculated in divider_location.
     def paint  #:nodoc:
     
+      $log.debug "XXX TEXTVIEW repaint HAPPENING #{@current_index} "
       my_win = nil
       if @form
         my_win = @form.window
@@ -440,8 +479,22 @@ module RubyCurses
         my_win = @target_window
       end
       @graphic = my_win unless @graphic
-      @win_left = my_win.left
-      @win_top = my_win.top
+      if @formatted_text
+        $log.debug "XXX:  INSIDE FORMATTED TEXT "
+
+        # I don't want to do this in 20 places and then have to change
+        # it and retest. Let me push it to util.
+        l = RubyCurses::Utils.parse_formatted_text(@color_parser,
+                                               @formatted_text)
+
+        #cp = Chunks::ColorParser.new @color_parser
+        #l = []
+        #@formatted_text.each { |e| l << cp.convert_to_chunk(e) }
+
+        text(l)
+        @formatted_text = nil
+
+      end
 
       print_borders if (@suppress_borders == false && @repaint_all) # do this once only, unless everything changes
       rc = row_count
@@ -462,10 +515,44 @@ module RubyCurses
             # next call modified string. you may wanna dup the string.
             # rlistbox does
             # scrolling fails if you do not dup, since content gets truncated
-            content = content.dup
-            sanitize content if @sanitization_required
-            truncate content
-            @graphic.printstring  r+hh, c, "%-*s" % [@width-@internal_width,content], acolor, @attr
+            if content.is_a? String
+              content = content.dup
+              sanitize(content) if @sanitization_required
+              truncate content
+              @graphic.printstring  r+hh, c, "%-*s" % [@width-@internal_width,content], 
+                acolor, @attr
+            elsif content.is_a? Chunks::ChunkLine
+              @graphic.printstring  r+hh, c, " "* (@width-@internal_width), 
+                acolor, @attr
+              @graphic.wmove r+hh, c
+              # either we have to loop through and put in default color and attr
+              # or pass it to show_col
+              a = get_attrib @attrib
+              # FIXME this does not clear till the eol
+              @graphic.show_colored_chunks content, acolor, a
+            elsif content.is_a? Chunks::Chunk
+              raise "TODO chunk in textview"
+            elsif content.is_a? Array
+                # several chunks in one row - NOTE Very experimental may change
+              if content[0].is_a? Array
+                # clearing the line since colored_chunks does not yet XXX FIXME if possible
+                @graphic.printstring  r+hh, c, " "* (@width-@internal_width), 
+                  acolor, @attr
+                @graphic.wmove r+hh, c
+                # either we have to loop through and put in default color and attr
+                # or pass it to show_col
+                a = get_attrib @attrib
+                # FIXME this does not clear till the eol
+                @graphic.show_colored_chunks content, acolor, a
+              else
+                # a single row chunk - NOTE Very experimental may change
+                text = content[1].dup
+                sanitize(text) if @sanitization_required
+                truncate text
+                @graphic.printstring  r+hh, c, "%-*s" % [@width-@internal_width,text], 
+                  content[0] || acolor, content[2] || @attr
+              end
+            end
 
             # highlighting search results.
             if @search_found_ix == tr+hh
@@ -482,21 +569,28 @@ module RubyCurses
           @graphic.printstring r+hh, c, " " * (@width-@internal_width), acolor,@attr
         end
       end
-      #show_caret_func
-      #@table_changed = false
+
+
       @repaint_required = false
       @repaint_footer_required = true
       @repaint_all = false 
+      # 2011-10-15 
+      @widget_scrolled = false
+      @record_changed = false
+      @property_changed = false
+      @old_pcol = @pcol
 
     end
     # takes a block, this way anyone extending this class can just pass a block to do his job
     # This modifies the string
     def sanitize content  #:nodoc:
+
       if content.is_a? String
         content.chomp!
         # trying out since gsub giving #<ArgumentError: invalid byte sequence in UTF-8> 2011-09-11 
-        content = content.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?")
-        content.gsub!(/[\t\n\r]/, '  ') # don't display tab
+        
+        content.replace(content.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?")) if content.respond_to?(:encode)
+        content.gsub!(/[\t\n\r]/, '  ') # don't display tab or newlines
         content.gsub!(/[^[:print:]]/, '')  # don't display non print characters
       else
         content
@@ -534,16 +628,35 @@ module RubyCurses
     end
     # this is just a test of the simple "most" menu
     # How can application add to this, or override
+    # TODO: use another window at bottom, statuswindow
     def disp_menu  #:nodoc:
       require 'rbcurse/extras/menutree'
       # we need to put this into data-structure so that i can be manipulated by calling apps
       # This should not be at the widget level, too many types of menus. It should be at the app
       # level only if the user wants his app to use this kind of menu.
 
-      @menu = RubyCurses::MenuTree.new "Main", { s: :goto_start, r: :scroll_right, l: :scroll_left, m: :submenu }
-      @menu.submenu :m, "submenu", {s: :noignorecase, t: :goto_last_position, f: :next3 }
-      menu = PromptMenu.new self 
-      menu.menu_tree @menu
+      if false
+        #@menu = RubyCurses::MenuTree.new "Main", { s: :goto_start, r: :scroll_right, l: :scroll_left, m: :submenu }
+        #@menu.submenu :m, "submenu", {s: :noignorecase, t: :goto_last_position, f: :next3 }
+        #menu = PromptMenu.new self 
+        #menu.menu_tree @menu
+        #menu.display @form.window, $error_message_row, $error_message_col, $datacolor #, menu
+      end
+      # trying to find a more rubyesque way of doing
+      menu = PromptMenu.new self do
+        item :s, :goto_start
+        item :b, :goto_bottom
+        item :r, :scroll_backward
+        item :l, :scroll_forward
+        submenu :m, "submenu..." do
+          item :p, :goto_last_position
+          item :r, :scroll_right
+          item :l, :scroll_left
+        end
+      end
+      #menu.display @form.window, $error_message_row, $error_message_col, $datacolor #, menu
+      menu.display_new :title => "Menu"
+
 
 =begin
       menu = PromptMenu.new self 
@@ -559,7 +672,6 @@ module RubyCurses
       # how do i know what's available. the application or window should know where to place
       #menu.display @form.window, 23, 1, $datacolor #, menu
 =end
-      menu.display @form.window, $error_message_row, $error_message_col, $datacolor #, menu
     end
     ##
     # dynamically load a module and execute init method.
@@ -575,6 +687,7 @@ module RubyCurses
     # FIXME we can create this once and reuse
     #++
     def fire_action_event
+      return if @list.nil? || @list.size == 0
       require 'rbcurse/ractionevent'
       aev = TextActionEvent.new self, :PRESS, current_value(), @current_index, @curpos
       fire_handler :PRESS, aev
@@ -585,6 +698,8 @@ module RubyCurses
       @repaint_required = true
     end
     # added 2010-09-30 18:48 so standard with other components, esp on enter 
+    # NOTE: the on_enter repaint required causes this to be repainted 2 times
+    # if its the first object, once with the entire form, then with on_enter.
     def on_enter
       if @list.nil? || @list.size == 0
         Ncurses.beep