rbcurse-core 0.0.1 → 0.0.2

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

@@ -33,6 +33,7 @@ require 'rbcurse'
 require 'rbcurse/core/include/listscrollable'
 require 'rbcurse/core/widgets/tabular'
 require 'rbcurse/core/include/listselectable'
+require 'rbcurse/core/include/bordertitle'
 
 #include RubyCurses
 module RubyCurses
@@ -49,8 +50,8 @@ module RubyCurses
 
     include ListScrollable
     include NewListSelectable
-    dsl_accessor :title   # set this on top
-    dsl_accessor :title_attrib   # bold, reverse, normal
+    #dsl_accessor :title   # set this on top
+    #dsl_accessor :title_attrib   # bold, reverse, normal
     dsl_accessor :footer_attrib   # bold, reverse, normal
     dsl_accessor :list    # the array of arrays of data to be sent by user XXX RISKY bypasses set_content
     dsl_accessor :maxlen    # max len to be displayed
@@ -58,9 +59,9 @@ module RubyCurses
     ##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 
+    #dsl_accessor :suppress_borders 
     attr_accessor :current_index
-    dsl_accessor :border_attrib, :border_color #  color pair for border
+    #dsl_accessor :border_attrib, :border_color #  color pair for border
     dsl_accessor :header_attrib, :header_fgcolor, :header_bgcolor  #  2010-10-15 13:21 
 
     # boolean, whether lines should be cleaned (if containing tabs/newlines etc)
@@ -125,6 +126,7 @@ module RubyCurses
       install_keys # << almost jnuk now, clean off TODO
       init_vars
       map_keys
+      bordertitle_init
     end
     def init_vars #:nodoc:
       @curpos = @pcol = @toprow = @current_index = 0
@@ -135,8 +137,6 @@ module RubyCurses
       @internal_width = 2
       @internal_width = 0 if @suppress_borders
       # added 2010-02-11 15:11 RFED16 so we don't need a form.
-      @win_left = 0
-      @win_top = 0
       @current_column = 0
       # currently i scroll right only if  current line is longer than display width, i should use 
       # longest line on screen.
@@ -145,19 +145,12 @@ module RubyCurses
 
     end
     def map_keys
-      # remove bindings from here. we call repeatedly
-      bind_key([?g,?g], 'goto start'){ goto_start } # mapping double keys like vim
-      bind_key([?',?'], 'goto last'){ goto_last_position } # vim , goto last row position (not column)
-      bind_key(?/, :ask_search) # XXX TESTME
-      bind_key(?n, :find_more) # XXX TESTME
-      bind_key([?\C-x, ?>], :scroll_right)
-      bind_key([?\C-x, ?<], :scroll_left)
-      #bind_key(?r) { getstr("Enter a word: ") }
-      bind_key(?m, :disp_menu) # enhance this or cut it out - how can app leverage this. TODO
+      require 'rbcurse/core/include/listbindings'
+      bindings()
       bind_key(?w, :next_column)
       bind_key(?b, :previous_column)
-      bind_key(?i, :expand_column)
-      list_bindings
+      bind_key(?>, :expand_column) # just trying out
+      list_bindings # selection bindings
     end
 
     #
@@ -367,7 +360,7 @@ module RubyCurses
     end
     ## print a border
     ## Note that print_border clears the area too, so should be used sparingly.
-    def print_borders #:nodoc:
+    def OLDprint_borders #:nodoc:
       raise "#{self.class} needs width" unless @width
       raise "#{self.class} needs height" unless @height
 
@@ -378,7 +371,7 @@ module RubyCurses
       @graphic.print_border @row, @col, @height-1, @width, bordercolor, borderatt
       print_title
     end
-    def print_title #:nodoc:
+    def OLDprint_title #:nodoc:
       raise "#{self.class} needs width" unless @width
       $log.debug " print_title #{@row}, #{@col}, #{@width}  "
       @graphic.printstring( @row, @col+(@width-@title.length)/2, @title, $datacolor, @title_attrib) unless @title.nil?
@@ -440,30 +433,6 @@ module RubyCurses
         return ret unless ret == :UNHANDLED
       end
       case ch
-      when ?\C-d.getbyte(0) #, 32
-        scroll_forward
-      when ?\C-b.getbyte(0)
-        scroll_backward
-      when ?\C-[.getbyte(0), ?t.getbyte(0)
-        goto_start #start of buffer # cursor_start
-      when ?\C-].getbyte(0), ?G.getbyte(0)
-        goto_end # end / bottom cursor_end
-      when KEY_UP, ?k.getbyte(0)
-        #select_prev_row
-        ret = up
-        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
-        check_curpos
-      when KEY_LEFT, ?h.getbyte(0)
-        cursor_backward
-      when KEY_RIGHT, ?l.getbyte(0)
-        cursor_forward
-      when KEY_BACKSPACE, KEY_BSPACE, KEY_DELETE
-        cursor_backward
       when ?\C-a.getbyte(0) #, ?0.getbyte(0)
         # take care of data that exceeds maxlen by scrolling and placing cursor at start
         @repaint_required = true if @pcol > 0 # tried other things but did not work
@@ -476,11 +445,7 @@ module RubyCurses
         blen = @buffer.rstrip.length
         set_form_col blen
         # search related 
-      when @KEY_ASK_FIND  # FIXME
-        ask_search
-      when @KEY_FIND_MORE  # FIXME
-        find_more
-      when 10, 13, KEY_ENTER
+      when KEY_ENTER, FFI::NCurses::KEY_ENTER
         #fire_handler :PRESS, self
         fire_action_event
       when ?0.getbyte(0)..?9.getbyte(0)
@@ -498,14 +463,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
@@ -516,15 +473,16 @@ module RubyCurses
         rescue => err
           $error_message.value = err.to_s
           #          @form.window.print_error_message # changed 2011 dts  
-          textdialog ["Error in TabularWidget: #{err} ", *err.backtrace], :title => "Exception"
           $log.error " Tabularwidget ERROR #{err} "
           $log.debug(err.backtrace.join("\n"))
+          textdialog ["Error in TabularWidget: #{err} ", *err.backtrace], :title => "Exception"
           # XXX caller app has no idea error occurred so can't do anything !
         end
         return :UNHANDLED if ret == :UNHANDLED
       end
       $multiplier = 0 # you must reset if you've handled a key. if unhandled, don't reset since parent could use
       set_form_row
+      $status_message.value =  "F10 quit, F1 Help, : menu, toprow #{@toprow} current #{@current_index} " if $log.debug?
       return 0 # added 2010-01-12 22:17 else down arrow was going into next field
     end
     #
@@ -658,8 +616,6 @@ module RubyCurses
         my_win = @target_window
       end
       @graphic = my_win unless @graphic
-      @win_left = my_win.left
-      @win_top = my_win.top
       tm = get_content
       rc = tm.length
       _estimate_column_widths if rc > 0  # will set preferred_width 2011-10-4 
@@ -671,7 +627,6 @@ module RubyCurses
 
       print_borders if (@suppress_borders == false && @repaint_all) # do this once only, unless everything changes
       _maxlen = @maxlen || @width-@internal_width
-      $log.debug " #{@name} Tabularwidget repaint width is #{@width}, height is #{@height} , maxlen #{maxlen}/ #{@maxlen}, #{@graphic.name} roff #{@row_offset} coff #{@col_offset}" 
       tr = @toprow
       acolor = get_color $datacolor
       h = scrollatrow() 
@@ -679,6 +634,7 @@ module RubyCurses
       print_header
       r += @_header_adjustment # for column header
       @longest_line = @width #maxlen
+      $log.debug " #{@name} Tabularwidget repaint width is #{@width}, height is #{@height} , maxlen #{maxlen}/ #{@maxlen}, #{@graphic.name} roff #{@row_offset} coff #{@col_offset}, r #{r} top #{toprow} ci #{current_index} "
       0.upto(h - @_header_adjustment) do |hh|
         crow = tr+hh
         if crow < rc
@@ -901,39 +857,10 @@ module RubyCurses
       #$log.debug " FMT : #{@fmstr} "
       #alert "format:     #{@fmstr} "
     end
-    ## this is just a test of prompting user for a string
-    #+ as an alternative to the dialog.
-    def getstr prompt, maxlen=10  #:nodoc:
-      tabc = Proc.new {|str| Dir.glob(str +"*") }
-      config={}; config[:tab_completion] = tabc
-      config[:default] = "default"
-      $log.debug " inside getstr before call "
-      ret, str = rbgetstr(@form.window, @row+@height-1, @col+1, prompt, maxlen, config)
-      $log.debug " rbgetstr returned #{ret} , #{str} "
-      return "" if ret != 0
-      return str
-    end
-    # this is just a test of the simple "most" menu
-    def disp_menu  #:nodoc:
-      $error_message_row ||= 23 # FIXME
-      $error_message_col ||= 1 # FIXME
-      menu = PromptMenu.new self 
-      menu.add( menu.create_mitem( 's', "Goto start ", "Going to start", Proc.new { goto_start} ))
-      menu.add(menu.create_mitem( 'r', "scroll right", "I have scrolled ", :scroll_right ))
-      menu.add(menu.create_mitem( 'l', "scroll left", "I have scrolled ", :scroll_left ))
-      item = menu.create_mitem( 'm', "submenu", "submenu options" )
-      menu1 = PromptMenu.new( self, "Submenu Options")
-      menu1.add(menu1.create_mitem( 's', "CASE sensitive", "Ignoring Case in search" ))
-      menu1.add(menu1.create_mitem( 't', "goto last position", "moved to previous position", Proc.new { goto_last_position} ))
-      item.action = menu1
-      menu.add(item)
-      # how do i know what's available. the application or window should know where to place
-      #menu.display @form.window, 23, 1, $datacolor #, menu
-      menu.display @form.window, $error_message_row, $error_message_col, $datacolor #, menu
-    end
     ##
     # dynamically load a module and execute init method.
     # Hopefully, we can get behavior like this such as vieditable or multibuffers
+    # TODO CUT THIS OUT AND FIX IT, there are simpler ways like extend()
     def load_module requirename, includename
       require "rbcurse/#{requirename}"
       extend Object.const_get("#{includename}")

data/rbcurse-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-core"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = "2011-12-09"
+  s.date = "2011-12-13"
   s.description = "Ruby curses/ncurses widgets for easy application development on text terminals (ruby 1.9, 1.8)"
   s.email = "sentinel1879@gmail.com"
   s.extra_rdoc_files = [
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     "lib/rbcurse/core/include/bordertitle.rb",
     "lib/rbcurse/core/include/chunk.rb",
     "lib/rbcurse/core/include/io.rb",
+    "lib/rbcurse/core/include/listbindings.rb",
     "lib/rbcurse/core/include/listcellrenderer.rb",
     "lib/rbcurse/core/include/listeditable.rb",
     "lib/rbcurse/core/include/listscrollable.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcurse-core
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-ncurses
-  requirement: &2232533180 !ruby/object:Gem::Requirement
+  requirement: &70266141084420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2232533180
+  version_requirements: *70266141084420
 description: Ruby curses/ncurses widgets for easy application development on text
   terminals (ruby 1.9, 1.8)
 email: sentinel1879@gmail.com
@@ -72,6 +72,7 @@ files:
 - lib/rbcurse/core/include/bordertitle.rb
 - lib/rbcurse/core/include/chunk.rb
 - lib/rbcurse/core/include/io.rb
+- lib/rbcurse/core/include/listbindings.rb
 - lib/rbcurse/core/include/listcellrenderer.rb
 - lib/rbcurse/core/include/listeditable.rb
 - lib/rbcurse/core/include/listscrollable.rb