rkumar-rbcurse 0.1.1 → 0.1.2

data/lib/rbcurse/rtextarea.rb

@@ -27,6 +27,8 @@ module RubyCurses
   ## a multiline text editing widget
   # TODO - giving data to user - adding newlines, and withog adding.
   #  - respect newlines for incoming data
+  #  we need a set_text method, passing nil or blank clears
+  #  current way is not really good. remove_all sucks.
   #   
   class TextArea < Widget
     include ListScrollable
@@ -58,7 +60,7 @@ module RubyCurses
       # this does result in a blank line if we insert after creating. That's required at 
       # present if we wish to only insert
       if @list.empty?
-        @list << "\r"
+      #  @list << "\r"   # removed this on 2009-02-15 17:25 lets see how it goes
       end
      # @scrollatrow = @height-2
       @content_rows = @list.length
@@ -66,6 +68,7 @@ module RubyCurses
     #  init_scrollable
       print_borders
       @maxlen ||= @width-2
+      install_keys
       init_vars
     end
     def init_vars
@@ -90,6 +93,7 @@ module RubyCurses
     end
     def remove_all
       @list = []
+      set_modified  # added 2009-02-13 22:28 so repaints
     end
     ## 
     # trying to wrap and insert
@@ -259,6 +263,18 @@ module RubyCurses
       when ?\C-e
         cursor_eol
         #set_form_col @buffer.length
+      #when @KEY_ASK_FIND_FORWARD
+      #  ask_search_forward
+      #when @KEY_ASK_FIND_BACKWARD
+      #  ask_search_backward
+      when @KEY_ASK_FIND
+        ask_search
+      when @KEY_FIND_MORE
+        find_more
+      #when @KEY_FIND_NEXT
+      #  find_next
+      #when @KEY_FIND_PREV
+      #  find_prev
       else
         #$log.debug(" textarea ch #{ch}")
         ret = putc ch
@@ -622,6 +638,7 @@ module RubyCurses
       end
       str
     end
+    alias :get_text :to_s
     ## ---- for listscrollable ---- ##
     def scrollatrow
       @height-2
@@ -644,7 +661,7 @@ module RubyCurses
         if crow < rc
             #focussed = @current_index == crow ? true : false 
             #selected = is_row_selected crow
-            content = tm[crow].chomp
+          content = tm[crow].chomp rescue ""
             content.gsub!(/\t/, '  ') # don't display tab
             content.gsub!(/[^[:print:]]/, '')  # don't display non print characters
             if !content.nil? 
@@ -659,6 +676,11 @@ module RubyCurses
             #renderer.repaint @form.window, r+hh, c+(colix*11), content, focussed, selected
             #renderer.repaint @form.window, r+hh, c, content, focussed, selected
             @form.window.printstring  r+hh, c, "%-*s" % [@width-2,content], acolor, @attr
+            if @search_found_ix == tr+hh
+              if !@find_offset.nil?
+                @form.window.mvchgat(y=r+hh, x=c+@find_offset, @find_offset1-@find_offset, Ncurses::A_NORMAL, $reversecolor, nil)
+              end
+            end
 
         else
           # clear rows
@@ -668,6 +690,16 @@ module RubyCurses
       @table_changed = false
       @repaint_required = false
     end
+    def ask_search_forward
+        regex =  get_string("Enter regex to search", 20, @last_regex||"")
+        ix = _find_next regex, @current_index
+        if ix.nil?
+          alert("No matching data for: #{regex}")
+        else
+          set_focus_on(ix)
+          set_form_col @find_offset
+        end
+    end
   end # class textarea
   ##
 end # modul

data/lib/rbcurse/rtextview.rb

@@ -59,6 +59,7 @@ module RubyCurses
       #init_scrollable
       print_borders
       @maxlen ||= @width-2
+      install_keys
       init_vars
     end
     def init_vars
@@ -174,13 +175,13 @@ module RubyCurses
         @buffer = @list[@current_index]
       end
       return if @buffer.nil?
-      $log.debug " before: curpos #{@curpos} blen: #{@buffer.length}"
+      #$log.debug " before: curpos #{@curpos} blen: #{@buffer.length}"
       if @curpos > @buffer.length
         addcol((@buffer.length-@curpos)+1)
         @curpos = @buffer.length
         set_form_col 
       end
-      $log.debug "TV after loop : curpos #{@curpos} blen: #{@buffer.length}"
+      #$log.debug "TV after loop : curpos #{@curpos} blen: #{@buffer.length}"
       #pre_key
       case ch
       when ?\C-n
@@ -216,6 +217,8 @@ module RubyCurses
       when ?\C-e
         # take care of data that exceeds maxlen by scrolling and placing cursor at end
         blen = @buffer.rstrip.length
+          set_form_col blen
+=begin
         if blen < @maxlen
           set_form_col blen
         else
@@ -223,8 +226,14 @@ module RubyCurses
           #wrong curpos wiill be reported
           set_form_col @maxlen-1
         end
+=end
+        # search related added on 2009-02-15 21:36 
+      when @KEY_ASK_FIND
+        ask_search
+      when @KEY_FIND_MORE
+        find_more
       else
-        $log.debug("TEXTVIEW XXX ch #{ch}")
+        #$log.debug("TEXTVIEW XXX ch #{ch}")
         return :UNHANDLED
       end
       #post_key
@@ -253,7 +262,13 @@ module RubyCurses
     # set cursor on correct column tview
     def set_form_col col=@curpos
       @curpos = col
-      @curpos = @maxlen if @curpos > @maxlen
+      #@curpos = @maxlen if @curpos > @maxlen
+      if @curpos > @maxlen
+        @pcol = @curpos - @maxlen
+        @curpos = @maxlen - 1
+      else
+        @pcol = 0
+      end
       @form.col = @orig_col + @col_offset + @curpos
       @repaint_required = true
     end
@@ -322,6 +337,14 @@ module RubyCurses
             #renderer.repaint @form.window, r+hh, c+(colix*11), content, focussed, selected
             #renderer.repaint @form.window, r+hh, c, content, focussed, selected
             @form.window.printstring  r+hh, c, "%-*s" % [@width-2,content], acolor, @attr
+            if @search_found_ix == tr+hh
+              if !@find_offset.nil?
+                # handle exceed bounds, and if scrolling
+                if @find_offset1 < maxlen+@pcol and @find_offset > @pcol
+                @form.window.mvchgat(y=r+hh, x=c+@find_offset-@pcol, @find_offset1-@find_offset, Ncurses::A_NORMAL, $reversecolor, nil)
+                end
+              end
+            end
 
         else
           # clear rows

data/lib/rbcurse/rwidget.rb

@@ -143,9 +143,11 @@ module RubyCurses
           return "btab"
         when 481
           return "M-S-tab"
+        when 393..402
+          return "M-F"+ (keycode-392).to_s
         else
-          others=[?\M--,?\M-+,?\M-=,?\M-',?\M-",?\M-;,?\M-:,?\M-\,, ?\M-.,?\M-<,?\M->]
-          s_others=%w[M-- M-+ M-= M-' M-"   M-;   M-:   M-\, M-. M-<]
+          others=[?\M--,?\M-+,?\M-=,?\M-',?\M-",?\M-;,?\M-:,?\M-\,, ?\M-.,?\M-<,?\M->,?\M-?,?\M-/]
+          s_others=%w[M-- M-+ M-= M-' M-"   M-;   M-:   M-, M-. M-< M-> M-? M-/ ]
           if others.include? keycode
             index =  others.index keycode
             return s_others[index]
@@ -882,7 +884,7 @@ module RubyCurses
     attr_reader :form
     attr_reader :handler             # event handler
     attr_reader :type                # datatype of field, currently only sets chars_allowed
-    attr_reader :curpos              # cursor position in buffer current
+    #attr_reader :curpos              # cursor position in buffer current, in WIDGET 
     attr_accessor :datatype              # crrently set during set_buffer
     attr_reader :original_value              # value on entering field
 
@@ -997,6 +999,9 @@ module RubyCurses
   end
   def repaint
 #    $log.debug("FIELD: #{id}, #{zorder}, #{focusable}")
+    #return if display_length <= 0 # added 2009-02-17 00:17 sometimes editor comp has 0 and that
+    # becomes negative below, no because editing still happens
+    @display_length = 1 if display_length == 0
     printval = getvalue_for_paint().to_s # added 2009-01-06 23:27 
     printval = show()*printval.length unless @show.nil?
     if !printval.nil? 
@@ -1472,6 +1477,7 @@ module RubyCurses
       @text_variable.nil? ? @text : @text_variable.get_value(@name)
     end
 
+    # ensure text has been passed or action
     def getvalue_for_paint
       ret = getvalue
       @text_offset = @surround_chars[0].length

data/lib/rbcurse/table/tablecellrenderer.rb

@@ -51,6 +51,7 @@ module RubyCurses
           lablist << value
         end
         len = @display_length || value.length
+        $log.debug "less ZERO #{@display_length} || #{value.length}, ri: #{row_index}" if len < 0
         acolor = get_color $datacolor
         #acolor =get_color $datacolor, @color || @parent.color, @bgcolor || @parent.bgcolor #unless @parent.nil?
         _attr = Ncurses::A_NORMAL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rkumar-rbcurse
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -14,6 +14,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -86,6 +87,8 @@ files:
 - examples/testtabp.rb
 - examples/testtodo.rb
 - examples/viewtodo.rb
+- examples/todocsv.csv
+- examples/sqlc.rb
 has_rdoc: false
 homepage: http://rbcurse.rubyforge.org/
 post_install_message: