rbcurse-core 0.0.13 → 0.0.14

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

@@ -177,12 +177,16 @@ module RubyCurses
       alist = val[0]
       case alist
       when Array
-          @list = alist
-          @current_index = 0
+        @list = alist
+        # I possibly should call init_vars in these 3 cases but am doing the minimal 2013-04-10 - 18:27 
+        # Based no issue: https://github.com/rkumar/rbcurse/issues/15
+        @current_index = @toprow = @pcol = 0
       when NilClass
           @list = [] # or nil ?
+          @current_index = @toprow = @pcol = 0
       when Variable
         @list = alist.value
+        @current_index = @toprow = @pcol = 0
       else
         raise ArgumentError, "Listbox list(): do not know how to handle #{alist.class} " 
       end

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

@@ -9,7 +9,7 @@
   * Author: rkumar (http://github.com/rkumar/rbcurse/)
   * Date: 22.10.11 - 20:35
   * License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-  * Last update:  Sat Oct 22 20:35:46 IST 2011
+  * Last update:  2013-04-01 13:42
 
   == CHANGES
   == TODO 
@@ -19,50 +19,52 @@ require 'rbcurse/core/widgets/rtabbedpane'
 require 'rbcurse/core/widgets/rcontainer'
 
 include RubyCurses
-class TabbedWindow
-  attr_reader :tabbed_pane
-  # The given block is passed to the TabbedPane
-  # The given dimensions are used to create the window.
-  # The TabbedPane is placed at 0,0 and fills the window.
-  def initialize config={}, &block
-    
-    h = config.fetch(:height, 0)
-    w = config.fetch(:width, 0)
-    t = config.fetch(:row, 0)
-    l = config.fetch(:col, 0)
-    @window = VER::Window.new :height => h, :width => w, :top => t, :left => l
-    @form = Form.new @window
-    config[:row] = config[:col] = 0
-    @tabbed_pane = TabbedPane.new @form, config , &block
-  end
-  # returns button index
-  # Call this after instantiating the window
-  def run
-    @form.repaint
-    @window.wrefresh
-    return handle_keys
-  end
-  # returns button index
-  private
-  def handle_keys
-    buttonindex = catch(:close) do 
-      while((ch = @window.getchar()) != FFI::NCurses::KEY_F10 )
-        break if ch == ?\C-q.getbyte(0) 
-        begin
-          @form.handle_key(ch)
-          @window.wrefresh
-        rescue => err
-          $log.debug( err) if err
-          $log.debug(err.backtrace.join("\n")) if err
-          textdialog ["Error in TabbedWindow: #{err} ", *err.backtrace], :title => "Exception"
-          $error_message.value = ""
-        ensure
-        end
+module RubyCurses
+  class TabbedWindow
+    attr_reader :tabbed_pane
+    # The given block is passed to the TabbedPane
+    # The given dimensions are used to create the window.
+    # The TabbedPane is placed at 0,0 and fills the window.
+    def initialize config={}, &block
+
+      h = config.fetch(:height, 0)
+      w = config.fetch(:width, 0)
+      t = config.fetch(:row, 0)
+      l = config.fetch(:col, 0)
+      @window = VER::Window.new :height => h, :width => w, :top => t, :left => l
+      @form = Form.new @window
+      config[:row] = config[:col] = 0
+      @tabbed_pane = TabbedPane.new @form, config , &block
+    end
+    # returns button index
+    # Call this after instantiating the window
+    def run
+      @form.repaint
+      @window.wrefresh
+      return handle_keys
+    end
+    # returns button index
+    private
+    def handle_keys
+      buttonindex = catch(:close) do 
+        while((ch = @window.getchar()) != FFI::NCurses::KEY_F10 )
+          break if ch == ?\C-q.getbyte(0) 
+          begin
+            @form.handle_key(ch)
+            @window.wrefresh
+          rescue => err
+            $log.debug( err) if err
+            $log.debug(err.backtrace.join("\n")) if err
+            textdialog ["Error in TabbedWindow: #{err} ", *err.backtrace], :title => "Exception"
+            $error_message.value = ""
+          ensure
+          end
 
-      end # while loop
-    end # close
-    $log.debug "XXX: CALLER GOT #{buttonindex} "
-    @window.destroy
-    return buttonindex 
+        end # while loop
+      end # close
+      $log.debug "XXX: CALLER GOT #{buttonindex} "
+      @window.destroy
+      return buttonindex 
+    end
   end
 end

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

@@ -8,7 +8,7 @@
 #       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-29 18:59
+#  Last update: 2013-04-04 00:55
 #
 #  == CHANGES
 #  == TODO 
@@ -55,7 +55,7 @@ module RubyCurses
       @startrow = 0
       @startcol = 0
       # @list is unused, think it can be removed
-      @list = []
+      #@list = []
       super
 
       ## NOTE 
@@ -145,9 +145,9 @@ module RubyCurses
     # 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|
+      @content.each_with_index { |line, ix|
         #FFI::NCurses.mvwaddstr(@pad,ix, 0, @content[ix])
-        render @pad, ix, @content[ix]
+        render @pad, ix, line
       }
     end
 
@@ -299,6 +299,7 @@ module RubyCurses
       @formatted_text = text
       @color_parser = fmt
       @repaint_required = true
+      _convert_formatted
       # don't know if start is always required. so putting in caller
       #goto_start
       #remove_all
@@ -361,20 +362,23 @@ module RubyCurses
         padrefresh 
         return 
       end
-      if @formatted_text
-        #$log.debug "XXX:  INSIDE FORMATTED TEXT "
-
-        l = RubyCurses::Utils.parse_formatted_text(@color_parser,
-                                               @formatted_text)
-
-        text(l)
-        @formatted_text = nil
-      end
+      # I can't recall why we are doing this late. Is the rreason relevant any longer
+      # Some methods that expect data are crashing like tablewidgets model_row
+      _convert_formatted
 
-      ## moved this line up or else create_p was crashing
       @window ||= @graphic
       populate_pad if @_populate_needed
       #HERE we need to populate once so user can pass a renderer
+
+      _do_borders
+
+      padrefresh
+      Ncurses::Panel.update_panels
+      @repaint_required = false
+      @repaint_all = false
+    end
+
+    def _do_borders
       unless @suppress_borders
         if @repaint_all
           ## XXX im not getting the background color.
@@ -390,11 +394,16 @@ module RubyCurses
           @window.wrefresh
         end
       end
+    end
+    def _convert_formatted
+      if @formatted_text
 
-      padrefresh
-      Ncurses::Panel.update_panels
-      @repaint_required = false
-      @repaint_all = false
+        l = RubyCurses::Utils.parse_formatted_text(@color_parser,
+                                               @formatted_text)
+
+        text(l)
+        @formatted_text = nil
+      end
     end
 
     #

data/rbcurse-core.gemspec

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