rbcurse-core 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/rbcurse/core/include/listscrollable.rb

@@ -178,7 +178,13 @@ module ListScrollable
     $log.debug " scroll_right  mult:#{$multiplier} , hscrollcols  #{hscrollcols}, pcol #{@pcol} w: #{@width} ll:#{@longest_line} "
     #blen = @buffer.rstrip.length
     blen = @longest_line
-    @pcol += hscrollcols if @pcol + @width < blen 
+    if @pcol + @width < blen 
+      @pcol += hscrollcols if @pcol + @width < blen 
+    else
+      # due to some change somewhere, sometimes width = longest which is not true
+      hscrollcols = $multiplier > 0 ? $multiplier : 1
+      @pcol += hscrollcols
+    end
     @repaint_required = true
   end
   def scroll_left

data/lib/rbcurse/core/system/window.rb

@@ -4,7 +4,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: Around for a long time
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: use ,,L
+#  Last update: 2013-03-05 20:56
 #
 #  == CHANGED
 #     removed Pad and Subwin to lib/ver/rpad.rb - hopefully I've seen the last of both
@@ -600,7 +600,7 @@ module VER
     def destroy
       # typically the ensure block should have this
 
-      $log.debug "win destroy start"
+      #$log.debug "win destroy start"
 
       Ncurses::Panel.del_panel(@panel.pointer) if @panel
       delwin() if @window 
@@ -611,7 +611,7 @@ module VER
         FFI::NCurses.delwin(pad) if pad 
         pad = nil
       } if @pads
-      $log.debug "win destroy end"
+      #$log.debug "win destroy end"
     end
 
     # 
@@ -619,10 +619,12 @@ module VER
     # Widgets can get window to create a pad for them. This way when the window
     #  is destroyed, it will delete all the pads. A widget wold not be able to do this.
     # The destroy method of the widget will be called.
-    def get_pad content_row, content_cols
+    def get_pad content_rows, content_cols
       pad = FFI::NCurses.newpad(content_rows, content_cols)
       @pads ||= []
       @pads << pad
+      ## added 2013-03-05 - 19:21 without next line how was pad being returned
+      return pad
     end
 
     #
@@ -790,7 +792,7 @@ module VER
       raise "width needs to be supplied." if width.nil?
       att ||= Ncurses::A_NORMAL
 
-      $log.debug " inside window print_border r #{row} c #{col} h #{height} w #{width} "
+      #$log.debug " inside window print_border r #{row} c #{col} h #{height} w #{width} "
 
       # 2009-11-02 00:45 made att nil for blanking out
       # FIXME - in tabbedpanes this clears one previous line ??? XXX when using a textarea/view

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

@@ -548,13 +548,17 @@ module RubyCurses
         return
       end
       if !content.nil? 
-        if content.length > maxlen # only show maxlen
-          @longest_line = content.length if content.length > @longest_line
+        cl = content.length
+        if cl > maxlen # only show maxlen
+          @longest_line = cl if cl > @longest_line
           #content = content[@pcol..@pcol+maxlen-1] 
-          content.replace content[@pcol..@pcol+maxlen-1] 
+          ## taking care of when scrolling is needed but longest_line is misreported
+          # So we scroll always and need to check 2013-03-06 - 00:09 
+          content.replace(content[@pcol..@pcol+maxlen-1] || " ")
         else
-          # can this be avoided if pcol is 0 XXX
-          content.replace content[@pcol..-1] if @pcol > 0
+          ## taking care of when scrolling is needed but longest_line is misreported
+          # So we scroll always and need to check 2013-03-06 - 00:09 
+          content.replace(content[@pcol..-1]||" ") if @pcol > 0 
         end
       end
       content

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

@@ -862,9 +862,11 @@ module RubyCurses
             if !content.nil? 
               if content.length > _maxlen # only show _maxlen
                 @longest_line = content.length if content.length > @longest_line
-                content = content[@pcol..@pcol+_maxlen-1] 
+                ## added nil check since we are allowing scrolling in listscrollable anyway 2013-03-06 - 00:14 
+                content = content[@pcol..@pcol+_maxlen-1] || " "
               else
-                content = content[@pcol..-1]
+                ## added nil check since we are allowing scrolling in listscrollable anyway
+                content = content[@pcol..-1] || " "
               end
             end
             #renderer = get_default_cell_renderer_for_class content.class.to_s

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

@@ -9,7 +9,7 @@
   * Author: rkumar (arunachalesha)
   * Date: 2008-11-19 12:49 
   * License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-  * Last update: 2011-11-08 - 16:55
+  * Last update: 2013-03-05 19:50
 
   == CHANGES
   * 2011-10-2 Added PropertyVetoException to rollback changes to property
@@ -566,14 +566,14 @@ module RubyCurses
           $log.debug " process_key: found block for #{keycode} , #{ch} "
           blk = blk1
         end
-        #$log.debug "called process_key #{object}, kc: #{keycode}, args  #{@key_args[keycode]}"
         if blk.is_a? Symbol
-          #$log.debug "SYMBOL #{blk.to_s}  " if $log.debug? 
           if respond_to? blk
-          #$log.debug "SYMBOL calling #{blk.to_s}  " if $log.debug? 
             return send(blk, *@key_args[keycode])
           else
+            ## 2013-03-05 - 19:50 why the hell is there an alert here, nowhere else
             alert "This ( #{self.class} ) does not respond to #{blk.to_s} "
+            # added 2013-03-05 - 19:50 so called can know
+            return :UNHANDLED 
           end
         else
           $log.debug "rwidget BLOCK called _process_key " if $log.debug? 

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

@@ -685,13 +685,16 @@ module RubyCurses
       _maxlen = @width-@internal_width if _maxlen > @width-@internal_width
       _maxlen -= @left_margin
       if !content.nil? 
-        if content.length > _maxlen # only show maxlen
-          @longest_line = content.length if content.length > @longest_line
-          #content = content[@pcol..@pcol+_maxlen-1] 
-          content.replace content[@pcol..@pcol+_maxlen-1] 
+        cl = content.length
+        if cl > _maxlen # only show maxlen
+          @longest_line = cl if cl > @longest_line
+          ## taking care of when scrolling is needed but longest_line is misreported
+          # So we scroll always and need to check 2013-03-06 - 00:09 
+          #content.replace content[@pcol..@pcol+_maxlen-1] 
+          content.replace(content[@pcol..@pcol+maxlen-1] || " ")
         else
-          # can this be avoided if pcol is 0 XXX
-          content.replace content[@pcol..-1] if @pcol > 0
+          #content.replace content[@pcol..-1] if @pcol > 0
+          content.replace(content[@pcol..-1]||" ") if @pcol > 0 
         end
       end
       content

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

@@ -7,7 +7,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 2011-11-09 - 16:59
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2011-11-10 - 12:39
+#  Last update: 2013-03-05 19:55
 #
 #  == CHANGES
 #  == TODO 
@@ -224,9 +224,10 @@ module RubyCurses
         @formatted_text = nil
       end
 
+      ## 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
-      @window ||= @graphic
       unless @suppress_border
         if @repaint_all
           @window.print_border_only @top, @left, @height-1, @width, $datacolor
@@ -252,7 +253,7 @@ module RubyCurses
       bind_keys([?j,KEY_DOWN]){ down } 
       bind_key(?\C-e){ scroll_window_down } 
       bind_key(?\C-y){ scroll_window_up } 
-      bind_keys([32,338]){ scroll_forward } 
+      bind_keys([32,338, ?\C-d]){ scroll_forward } 
       bind_keys([?\C-b,339]){ scroll_backward } 
       bind_key([?',?']){ goto_last_position } # vim , goto last row position (not column)
       #bind_key(?/, :ask_search)
@@ -363,10 +364,12 @@ module RubyCurses
       begin
         case ch
         when key(?l)
+          # TODO take multipler
           @pcol += 1
         when key(?$)
           @pcol = @maxcol - 1
         when key(?h)
+          # TODO take multipler
           if @pcol > 0
             @pcol -= 1
           end
@@ -389,8 +392,11 @@ module RubyCurses
           # check for bindings, these cannot override above keys since placed at end
           begin
             ret = process_key ch, self
+            ## If i press C-x > i get an alert from rwidgets which blacks the screen
+            # if i put a padrefresh here it becomes okay but only for one pad,
+            # i still need to do it for all pads.
           rescue => err
-            $log.error " TEXTPAD ERROR #{err} "
+            $log.error " TEXTPAD ERROR INS #{err} "
             $log.debug(err.backtrace.join("\n"))
             textdialog ["Error in TextPad: #{err} ", *err.backtrace], :title => "Exception"
             # FIXME why does this result in a blank spot on screen till its refreshed again
@@ -400,6 +406,7 @@ module RubyCurses
         end
         bounds_check
       rescue => err
+        $log.error " TEXTPAD ERROR 111 #{err} "
         $log.debug( err) if err
         $log.debug(err.backtrace.join("\n")) if err
         textdialog ["Error in TextPad: #{err} ", *err.backtrace], :title => "Exception"
@@ -505,8 +512,9 @@ if __FILE__ == $PROGRAM_NAME
   App.new do
     w = 50
     w2 = FFI::NCurses.COLS-w-1
+    ## create two side by side pads on for ansi and one for ruby
     p = RubyCurses::TextPad.new @form, :height => FFI::NCurses.LINES, :width => w, :row => 0, :col => 0 , :title => " ansi "
-    fn = "../../../examples/color.2"
+    fn = "../../../../examples/data/color.2"
     text = File.open(fn,"r").readlines
     p.formatted_text(text, :ansi)
     RubyCurses::TextPad.new @form, :filename => "textpad.rb", :height => FFI::NCurses.LINES, :width => w2, :row => 0, :col => w+1 , :title => " ruby "

data/lib/rbcurse.rb

@@ -4,5 +4,5 @@ require 'rbcurse/core/system/window'
 require 'rbcurse/core/widgets/rwidget'
 require 'rbcurse/core/util/rdialogs'
 class Rbcurse
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/rbcurse-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-core"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcurse-core
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: