rbcurse 1.1.3 → 1.1.4

data/lib/rbcurse/extras/tableextended.rb

@@ -0,0 +1,40 @@
+# Provides extended abilities to a table
+# so user does not need to code it into his app.
+# At the same time, i don't want to weigh down Table with too much functionality/
+# I am putting in some stuff, so that table columns can be resized, using multipliers.
+# That allows us to redistribute the space taken or released across rows.
+# Other options: dd, C, . (repeat) and how about range operations
+#
+module TableExtended
+
+  ##
+  # increase the focused column
+  # If no size passed, then use numeric multiplier, else 1
+  # Typically, one would bind a key such as + to this method
+  # e.g. atable.bind_key(?+) { atable.increase_column ; }
+  # See examples/viewtodo.rb for usage
+  def increase_column num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
+
+    acolumn = column focussed_col()
+    #num = $multiplier || 1
+    $multiplier = 0
+    w = acolumn.width + num
+    acolumn.width w
+    #atable.table_structure_changed
+  end
+  # decrease the focused column
+  # If no size passed, then use numeric multiplier, else 1
+  # Typically, one would bind a key such as - to this method
+  def decrease_column num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
+    acolumn = column focussed_col()
+    w = acolumn.width - num
+    $multiplier = 0
+    if w > 3
+      acolumn.width w
+      #atable.table_structure_changed
+    end
+  end
+
+
+
+end

data/lib/rbcurse/rlistbox.rb

@@ -163,6 +163,14 @@ module RubyCurses
       return nil
       #return find_match @last_regex, start, @search_end_ix
     end
+    ##
+    # added 2010-05-23 12:10 for listeditable
+    def slice!(line, howmany)
+      ret = @list.slice!(line, howmany)
+      lde = ListDataEvent.new(line, line+howmany-1, self, :INTERVAL_REMOVED)
+      fire_handler :LIST_DATA_EVENT, lde
+      return ret
+    end
 
     alias :to_array :values
   end # class ListDataModel

data/lib/rbcurse/rtable.rb

@@ -113,6 +113,16 @@ module RubyCurses
       bind_key(@KEY_ASK_FIND_BACKWARD) { ask_search_backward }
       bind_key(@KEY_FIND_NEXT) { find_next }
       bind_key(@KEY_FIND_PREV) { find_prev }
+      # added 2010-05-12 21:41 for vim keys, will work if cell editing allowed is false
+      # user should be able to switch to editable and off so he can use keys TODO
+      # TODO vim_editable mode: C dd etc . to repeat change, how about range commands like vim
+      # TODO use numeric to widen, so we can distribute spacing
+      bind_key(?j){ next_row() }
+      bind_key(?k){ previous_row() }
+      bind_key(?G){ goto_bottom() }
+      bind_key([?g,?g]){ goto_top() }
+      bind_key(?l) { next_column }
+      bind_key(?h) { previous_column }
     end
 
     def focussed_row
@@ -538,7 +548,7 @@ module RubyCurses
       when ?\C-p.getbyte(0)
         editing_stopped if @is_editing # 2009-01-16 16:06 
         scroll_backward
-      when 48, @KEY_GOTO_TOP
+      when @KEY_GOTO_TOP # removed 48 (0) from here so we can trap numbers
         # please note that C-[ gives 27, same as esc so will respond after ages
         editing_stopped if @is_editing # 2009-01-16 16:06 
         goto_top
@@ -551,9 +561,14 @@ module RubyCurses
       when @KEY_SCROLL_LEFT
         editing_stopped if @is_editing # dts 2009-02-17 00:35 
         scroll_left
+      when ?0.getbyte(0)..?9.getbyte(0)
+        $multiplier *= 10 ; $multiplier += (ch-48)
+        #$log.debug " setting mult to #{$multiplier} in list "
+        return 0
       else
         # there could be a case of editing here too!
         ret = process_key ch, self
+        $multiplier = 0 
         return :UNHANDLED if ret == :UNHANDLED
       end
       return 0 # added 2010-03-14 13:27 
@@ -607,26 +622,40 @@ module RubyCurses
       cancel_editor
     end
     ##
-    def previous_row
+    #def previous_row
+    def previous_row num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
       @oldrow = @current_index
-      @current_index -= 1 if @current_index > 0
+    #  @current_index -= 1 if @current_index > 0
+      num.times { 
+        @current_index -= 1 if @current_index > 0
+      }
+      $multiplier = 0
       bounds_check
     end
-    def next_row
+    #def next_row
+    # goto next row
+    # added multipler 2010-05-12 20:51 
+    def next_row num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
       rc = row_count
       @oldrow = @current_index
       # don't go on if rc 2009-01-16 19:55  XXX
       if @current_index < rc
-        @current_index += 1 
+        #@current_index += 1 
+        @current_index += 1*num if @current_index < rc
         bounds_check
       end
+      $multiplier = 0
     end
     # move focus to next column
     #  2009-10-07 12:47 behavior change. earlier this would move to next row
     #  if focus was on last visible field. Now it scrolls so that first invisible
     #  field becomes the first column. 
-    def next_column
-      v =  @current_column+1 
+    #  # 2010-05-13 12:42 added multiplier
+    #def next_column
+    def next_column num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
+      $multiplier = 0 # so not used again in next row
+      #v =  @current_column+1 
+      v =  @current_column + num
       # normal situation, there is a next column go to
       if v < @table_column_model.column_count 
         if v <= @_last_column_print
@@ -647,7 +676,7 @@ module RubyCurses
           @current_column = 0
           #@current_column = @_first_column_print # added 2009-02-17 00:01 
           @_first_column_print = 0 # added 2009-10-07 11:25 
-          next_row
+          next_row 1
           set_form_col
           @repaint_required = true
           @table_changed = true    # so columns are modified by print_header
@@ -659,8 +688,9 @@ module RubyCurses
     # move focus to previous column
     # if you are on first column, check if scrolling required, else move up to
     # last *visible* column of prev row
-    def previous_column
-      v =  @current_column-1 
+    #def previous_column
+    def previous_column num=(($multiplier.nil? or $multiplier == 0) ? 1 : $multiplier)
+      v =  @current_column - num # 2010-05-13 12:44 1 to num
       # returning unhandled so focus can go to prev field auto
       if v < @_first_column_print and @current_index <= 0
         return :UNHANDLED
@@ -674,7 +704,7 @@ module RubyCurses
           @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
+          previous_row 1
         end
       else
         current_column v
@@ -1090,8 +1120,12 @@ module RubyCurses
         end
       end
       total = 0
-      colwidths.each_pair do |k,v|
+      # crashing in 1.9.2 due to hash key no insert in iteration 2010-08-22 20:09 
+      #colwidths.each_pair do |k,v|
+      tkeys = colwidths.keys
+      tkeys.each do |k|
         name = columns[k.to_i]
+        v = colwidths[k]
         colwidths[name] = v
         total += v
       end

data/lib/rbcurse/rwidget.rb

@@ -348,7 +348,12 @@ module RubyCurses
        # this bypasses our methods and sets directly !
       def config_setup aconfig
         @config = aconfig
-        @config.each_pair { |k,v| variable_set(k,v) }
+        # this creates a problem in 1.9.2 since variable_set sets @config 2010-08-22 19:05 RK
+        #@config.each_pair { |k,v| variable_set(k,v) }
+        keys = @config.keys
+        keys.each do |e| 
+          variable_set(e, @config[e])
+        end
       end
     end # module config
     ##
@@ -1041,7 +1046,7 @@ module RubyCurses
       @rows_panned = @cols_panned = 0 # how many rows were panned, typically at a higher level
       @firsttime = true; # added on 2010-01-02 19:21 to prevent scrolling crash ! 
       @name ||= ""
-      $kill_ring ||= [] # 2010-03-09 22:42 so textarea and others can copy and paste
+      $kill_ring ||= [] # 2010-03-09 22:42 so textarea and others can copy and paste emacs EMACS
       $kill_ring_pointer = 0 # needs to be incremented with each append, moved with yank-pop
       $append_next_kill = false
       $kill_last_pop_size = 0 # size of last pop which has to be cleared
@@ -1548,7 +1553,7 @@ module RubyCurses
           return 0 if ret == 0
           ch = ret # unhandled char
         elsif ch >= ?\M-1.getbyte(0) && ch <= ?\M-9.getbyte(0)
-          if $catch_alt_digits
+          if $catch_alt_digits # emacs EMACS
             ret = digit_argument ch
             $log.debug " FORM set MULT DA to #{$multiplier}, ret = #{ret}  "
             return 0 if ret == 0 # don't see this happening

data/lib/rbcurse/undomanager.rb

@@ -164,7 +164,14 @@ module RubyCurses
         @source.list[row].slice!(col,howmany)
       when :DELETE_LINE
         #$log.debug " UNDO redo got deleteline #{row} "
-        @source.list.delete_at row
+        #@source.list.delete_at row
+        # changed on 2010-05-23 12:21 since was not handling mult delete
+        case act.text
+        when Array
+          act.text.size.times { @source.list.delete_at row }
+        when String
+          @source.list.delete_at row
+        end
       when :INSERT_LINE
         case act.text
         when Array

data/lib/rbcurse/vieditable.rb

@@ -12,13 +12,14 @@ require 'rbcurse/listeditable'
 module ViEditable
   include ListEditable
 
-  #def ViEditable.vieditable_init
   def vieditable_init
     $log.debug " inside vieditable_init "
     @editable = true
     bind_key( ?C, :edit_line)
-    bind_key( ?o, :insert_line)
-    bind_key( ?O) { insert_line(@current_index-1) } 
+    #bind_key( ?o, :insert_line)
+    #bind_key( ?O) { insert_line(@current_index-1) } 
+    bind_key( ?o) { insert_line(@current_index+1) } 
+    bind_key( ?O) { insert_line(@current_index) } 
     bind_key( ?D, :delete_eol)
     bind_key( [?d, ?$], :delete_eol)
     bind_key( [?d, ?d] , :delete_line ) 
@@ -35,25 +36,64 @@ module ViEditable
     bind_key( ?P ) { yank(@current_index - 1) } # should be before this line
     bind_key(?\w, :forward_word)
     bind_key(?f, :forward_char)
+    bind_key(?\M-y, :yank_pop)
+    bind_key(?\M-w, :kill_ring_save)
+
+  end
+  ##
+  # Separate mappings for listboxes.
+  # Some methods don;'t make sense for listboxes and are crashing
+  # since not present for them. f was being overwritten, too.
+  # Sorry for duplication, need to clean this somehow.
+  def vieditable_init_listbox
+    $log.debug " inside vieditable_init_listbox "
+    @editable = true
+    bind_key( ?C, :edit_line)
+    bind_key( ?o) { insert_line(@current_index+1) } 
+    bind_key( ?O) { insert_line(@current_index) } 
+    #bind_key( ?D, :delete_eol)
+    #bind_key( [?d, ?$], :delete_eol)
+    bind_key( [?d, ?d] , :delete_line ) 
+    #bind_key( [?d, ?w], :delete_word )
+    #bind_key( [?d, ?t], :delete_till )
+    #bind_key( [?d, ?f], :delete_forward )
+    bind_key( ?\C-_ ) { @undo_handler.undo if @undo_handler }
+    bind_key( ?u ) { @undo_handler.undo if @undo_handler }
+    bind_key( ?\C-r ) { @undo_handler.redo if @undo_handler }
+    #bind_key( ?x, :delete_curr_char )
+    #bind_key( ?X, :delete_prev_char )
+    bind_key( [?y, ?y] , :kill_ring_save ) 
+    bind_key( ?p, :yank ) # paste after this line
+    bind_key( ?P ) { yank(@current_index - 1) } # should be before this line
+    bind_key(?\w, :forward_word)
+    #bind_key(?f, :forward_char)
+    bind_key(?\M-y, :yank_pop)
+    bind_key(?\C-y, :yank)
+    bind_key(?\M-w, :kill_ring_save)
 
   end
 
   ##
   # edit current or given line
+  # FIXME needs to fire handler 2010-05-23 11:40 
   def edit_line lineno=@current_index
     line = @list[lineno]
     prompt = "Edit: "
     maxlen = 80
     config={}; 
+    oldline = line.dup
     config[:default] = line
     ret, str = rbgetstr(@form.window, $error_message_row, $error_message_col,  prompt, maxlen, config)
     $log.debug " rbgetstr returned #{ret} , #{str} "
     return if ret != 0
     @list[lineno].replace(str)
+    fire_handler :CHANGE, InputDataEvent.new(0,oldline.length, self, :DELETE_LINE, lineno, oldline)     #  2008-12-24 18:34 
+    fire_handler :CHANGE, InputDataEvent.new(0,str.length, self, :INSERT_LINE, lineno, str)
     @repaint_required = true
   end
   ##
   # insert a line 
+  # FIXME needs to fire handler 2010-05-23 11:40 
   def insert_line lineno=@current_index
     prompt = "Insert: "
     maxlen = 80
@@ -65,6 +105,8 @@ module ViEditable
     $log.debug " rbgetstr returned #{ret} , #{str} "
     return if ret != 0
     @list.insert lineno, str
+    ## added handler on 2010-05-23 11:46 - undo works - tested in testlistbox.rb
+    fire_handler :CHANGE, InputDataEvent.new(0,str.length, self, :INSERT_LINE, lineno, str)
     @repaint_required = true
   end
   ##

data/rbcurse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbcurse}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-08-30}
   s.default_executable = %q{rbcurse}
   s.description = %q{Ruby curses widgets for easy application development on text terminals (ruby 1.9, 1.8)}
   s.email = %q{sentinel.2001@gmx.com}
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/rbcurse",
      "examples/README.txt",
+     "examples/data.txt",
      "examples/keytest.rb",
      "examples/mpad2.rb",
      "examples/newtesttabp.rb",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
      "examples/testchars.rb",
      "examples/testcombo.rb",
      "examples/testkeypress.rb",
+     "examples/testlistbox.rb",
      "examples/testmenu.rb",
      "examples/testmulticomp.rb",
      "examples/testscroller.rb",
@@ -69,6 +71,7 @@ Gem::Specification.new do |s|
      "examples/testtpane.rb",
      "examples/testtpane2.rb",
      "examples/testtpanetable.rb",
+     "examples/todo.db",
      "examples/todo.yml",
      "examples/todocsv.csv",
      "examples/viewtodo.rb",
@@ -80,6 +83,7 @@ Gem::Specification.new do |s|
      "lib/rbcurse/colormap.rb",
      "lib/rbcurse/comboboxcellrenderer.rb",
      "lib/rbcurse/defaultlistselectionmodel.rb",
+     "lib/rbcurse/extras/tableextended.rb",
      "lib/rbcurse/io.rb",
      "lib/rbcurse/keylabelprinter.rb",
      "lib/rbcurse/listcellrenderer.rb",
@@ -126,7 +130,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://rbcurse.rubyforge.org/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby Curses Toolkit}
   s.test_files = [
     "test/test_rbcurse.rb",
@@ -144,6 +148,7 @@ Gem::Specification.new do |s|
      "examples/testchars.rb",
      "examples/testcombo.rb",
      "examples/testkeypress.rb",
+     "examples/testlistbox.rb",
      "examples/testmenu.rb",
      "examples/testmulticomp.rb",
      "examples/testscroller.rb",
@@ -167,6 +172,7 @@ Gem::Specification.new do |s|
      "examples/testtpane.rb",
      "examples/testtpane2.rb",
      "examples/testtpanetable.rb",
+     "examples/todo.rb",
      "examples/viewtodo.rb"
   ]
 
@@ -174,7 +180,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 +05:30
+date: 2010-08-30 00:00:00 +05:30
 default_executable: rbcurse
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - VERSION
 - bin/rbcurse
 - examples/README.txt
+- examples/data.txt
 - examples/keytest.rb
 - examples/mpad2.rb
 - examples/newtesttabp.rb
@@ -55,6 +56,7 @@ files:
 - examples/testchars.rb
 - examples/testcombo.rb
 - examples/testkeypress.rb
+- examples/testlistbox.rb
 - examples/testmenu.rb
 - examples/testmulticomp.rb
 - examples/testscroller.rb
@@ -78,6 +80,7 @@ files:
 - examples/testtpane.rb
 - examples/testtpane2.rb
 - examples/testtpanetable.rb
+- examples/todo.db
 - examples/todo.yml
 - examples/todocsv.csv
 - examples/viewtodo.rb
@@ -89,6 +92,7 @@ files:
 - lib/rbcurse/colormap.rb
 - lib/rbcurse/comboboxcellrenderer.rb
 - lib/rbcurse/defaultlistselectionmodel.rb
+- lib/rbcurse/extras/tableextended.rb
 - lib/rbcurse/io.rb
 - lib/rbcurse/keylabelprinter.rb
 - lib/rbcurse/listcellrenderer.rb
@@ -131,6 +135,7 @@ files:
 - lib/ver/window.rb
 - rbcurse.gemspec
 - test/test_rbcurse.rb
+- examples/todo.rb
 has_rdoc: true
 homepage: http://rbcurse.rubyforge.org/
 licenses: []
@@ -141,6 +146,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -148,6 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -157,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Curses Toolkit
@@ -177,6 +184,7 @@ test_files:
 - examples/testchars.rb
 - examples/testcombo.rb
 - examples/testkeypress.rb
+- examples/testlistbox.rb
 - examples/testmenu.rb
 - examples/testmulticomp.rb
 - examples/testscroller.rb
@@ -200,4 +208,5 @@ test_files:
 - examples/testtpane.rb
 - examples/testtpane2.rb
 - examples/testtpanetable.rb
+- examples/todo.rb
 - examples/viewtodo.rb