rbcurse-core 0.0.13 → 0.0.14

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

@@ -127,7 +127,7 @@ module VER
     $stderr.puts @last_error, *@last_error.backtrace
   end
 require 'rbcurse/core/system/colormap'
-include ColorMap
+include RubyCurses::ColorMap
 end
 module Ncurses
   extend self

data/lib/rbcurse/core/util/ansiparser.rb

@@ -7,111 +7,113 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 07.11.11 - 13:17
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-21 00:44
+#  Last update: 2013-04-01 13:43
 # ----------------------------------------------------------------------------- #
 # == TODO
 #    - perhaps we can compile the regexp once and reuse
 # 
 
-class AnsiParser
+module RubyCurses
+  class AnsiParser
 
-  # NOTE: Experimental and minimal
-  # parses the formatted string and yields either an array of color, bgcolor and attrib
-  # or the text. This will be called by convert_to_chunk.
-  #
-  # Currently, assumes colors and attributes are correct. No error checking or fancy stuff.
-  #  s="#[fg=green]hello there#[fg=yellow, bg=black, dim]"
-  # @since 1.4.1  2011-11-3 experimental, can change
-  # @return [nil] knows nothign about output format. 
+    # NOTE: Experimental and minimal
+    # parses the formatted string and yields either an array of color, bgcolor and attrib
+    # or the text. This will be called by convert_to_chunk.
+    #
+    # Currently, assumes colors and attributes are correct. No error checking or fancy stuff.
+    #  s="#[fg=green]hello there#[fg=yellow, bg=black, dim]"
+    # @since 1.4.1  2011-11-3 experimental, can change
+    # @return [nil] knows nothign about output format. 
 
-  def parse_format s  # yields attribs or text
-    ## set default colors
-    color   = :white
-    bgcolor = :black
-    attrib  = FFI::NCurses::A_NORMAL
-    text    = ""
+    def parse_format s  # yields attribs or text
+      ## set default colors
+      color   = :white
+      bgcolor = :black
+      attrib  = FFI::NCurses::A_NORMAL
+      text    = ""
 
-    ## split #[...]
-    #a       = s.split /(#\[[^\]]*\])/
-    a       = s.split /(\x1b\[\d*(?:;\d+)*?[a-zA-Z])/
-    a.each { |e| 
-      ## process color or attrib portion
-      #[ "", "\e[1m", "", "\e[34m", "", "\e[47m", "Showing all items...", "\e[0m", "", "\e[0m", "\n"]
-      if e[0,1] == "\x1b" && e[-1,1] == "m"
+      ## split #[...]
+      #a       = s.split /(#\[[^\]]*\])/
+      a       = s.split /(\x1b\[\d*(?:;\d+)*?[a-zA-Z])/
+        a.each { |e| 
+        ## process color or attrib portion
+        #[ "", "\e[1m", "", "\e[34m", "", "\e[47m", "Showing all items...", "\e[0m", "", "\e[0m", "\n"]
+        if e[0,1] == "\x1b" && e[-1,1] == "m"
 
-        #e.each { |f|  x=/^.\[(.*).$/.match(f) 
+          #e.each { |f|  x=/^.\[(.*).$/.match(f) 
           $log.debug "XXX: ANSI e #{e} "
           x=/^.\[(.*).$/.match(e) 
-          color, bgcolor, attrib = nil, nil, nil
-          $log.debug "XXX: ANSI #{x} ..... #{x[1]}  "
-          args = x[1].split ';'
-          ## first split on commas to separate fg, bg and attr
-          # http://ascii-table.com/ansi-escape-sequences.php
-          args.each { |att|  
-            $log.debug "XXX: ANSI att: #{att}   "
-            case att.to_i
-            when 0
-              color, bgcolor, attrib = nil, nil, nil
-              yield :reset # actually this resets all so we need an endall or clearall reset
+            color, bgcolor, attrib = nil, nil, nil
+            $log.debug "XXX: ANSI #{x} ..... #{x[1]}  "
+            args = x[1].split ';'
+            ## first split on commas to separate fg, bg and attr
+            # http://ascii-table.com/ansi-escape-sequences.php
+            args.each { |att|  
+              $log.debug "XXX: ANSI att: #{att}   "
+              case att.to_i
+              when 0
+                color, bgcolor, attrib = nil, nil, nil
+                yield :reset # actually this resets all so we need an endall or clearall reset
 
-            when 1
-              attrib = 'bold'
-            when 2
-              attrib = 'dim'
-            when 4
-              attrib = 'underline'
-            when 5
-              attrib = 'blink'
-            when 7
-              attrib = 'reverse'
-            when 8
-              attrib = 'hidden' # XXX
-            when 30 
-              color = 'black'
-            when 31  
-              color = 'red'
-            when 32  
-              color = 'green'
-            when 33  
-              color = 'yellow'
-            when 34  
-              color = 'blue'
-            when 35  
-              color = 'magenta'
-            when 36  
-              color = 'cyan'
-            when 37  
-              color = 'white'
+              when 1
+                attrib = 'bold'
+              when 2
+                attrib = 'dim'
+              when 4
+                attrib = 'underline'
+              when 5
+                attrib = 'blink'
+              when 7
+                attrib = 'reverse'
+              when 8
+                attrib = 'hidden' # XXX
+              when 30 
+                color = 'black'
+              when 31  
+                color = 'red'
+              when 32  
+                color = 'green'
+              when 33  
+                color = 'yellow'
+              when 34  
+                color = 'blue'
+              when 35  
+                color = 'magenta'
+              when 36  
+                color = 'cyan'
+              when 37  
+                color = 'white'
 
-              #Background colors
-            when 40  
-              bgcolor = 'black'
-            when 41  
-              bgcolor = 'red'
-            when 42  
-              bgcolor = 'green'
-            when 43  
-              bgcolor = 'yellow'
-            when 44  
-              bgcolor = 'blue'
-            when 45  
-              bgcolor = 'magenta'
-            when 46  
-              bgcolor = 'cyan'
-            when 47  
-              bgcolor = 'white'
-            else
-              $log.warn "XXX: WARN ANSI not used #{att} "
-            end
-          } # args.ea
-        #} # e.each
-          $log.debug "XXX:  ANSI YIELDING #{color} , #{bgcolor} , #{attrib} "
-        yield [color,bgcolor,attrib] if block_given?
-      else
-        text = e
-        yield text if block_given?
-      end
-    } # a.each
-  end
+                #Background colors
+              when 40  
+                bgcolor = 'black'
+              when 41  
+                bgcolor = 'red'
+              when 42  
+                bgcolor = 'green'
+              when 43  
+                bgcolor = 'yellow'
+              when 44  
+                bgcolor = 'blue'
+              when 45  
+                bgcolor = 'magenta'
+              when 46  
+                bgcolor = 'cyan'
+              when 47  
+                bgcolor = 'white'
+              else
+                $log.warn "XXX: WARN ANSI not used #{att} "
+              end
+            } # args.ea
+            #} # e.each
+            $log.debug "XXX:  ANSI YIELDING #{color} , #{bgcolor} , #{attrib} "
+            yield [color,bgcolor,attrib] if block_given?
+        else
+          text = e
+          yield text if block_given?
+        end
+      } # a.each
+    end
 
+  end
 end

data/lib/rbcurse/core/util/colorparser.rb

@@ -7,69 +7,71 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 07.11.11 - 13:17
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-25 13:32
+#  Last update: 2013-04-01 13:42
 # ----------------------------------------------------------------------------- #
 # == TODO
 #    - perhaps we can compile the regexp once and reuse
 # 
 
-class DefaultColorParser
+module RubyCurses
+  class DefaultColorParser
 
-  # NOTE: Experimental and minimal
-  # parses the formatted string and yields either an array of color, bgcolor and attrib
-  # or the text. This will be called by convert_to_chunk.
-  #
-  # Currently, assumes colors and attributes are correct. No error checking or fancy stuff.
-  #  s="#[fg=green]hello there#[fg=yellow, bg=black, dim]"
-  # @since 1.4.1  2011-11-3 experimental, can change
-  # @return [nil] knows nothign about output format. 
+    # NOTE: Experimental and minimal
+    # parses the formatted string and yields either an array of color, bgcolor and attrib
+    # or the text. This will be called by convert_to_chunk.
+    #
+    # Currently, assumes colors and attributes are correct. No error checking or fancy stuff.
+    #  s="#[fg=green]hello there#[fg=yellow, bg=black, dim]"
+    # @since 1.4.1  2011-11-3 experimental, can change
+    # @return [nil] knows nothign about output format. 
 
-  # 187compat 2013-03-20 - 19:33 not working in 187 so added ,1 in some cases for string
-  def parse_format s  # yields attribs or text
-    ## set default colors
-    color   = :white
-    bgcolor = :black
-    attrib  = FFI::NCurses::A_NORMAL
-    text    = ""
+    # 187compat 2013-03-20 - 19:33 not working in 187 so added ,1 in some cases for string
+    def parse_format s  # yields attribs or text
+      ## set default colors
+      color   = :white
+      bgcolor = :black
+      attrib  = FFI::NCurses::A_NORMAL
+      text    = ""
 
-    ## split #[...]
-    a       = s.split /(#\[[^\]]*\])/
-    a.each { |e| 
-      ## process color or attrib portion
-      if e[0,2] == "#[" && e[-1,1] == "]"
-        # now resetting 1:20 PM November 3, 2011 , earlier we were  carrying over
-        color, bgcolor, attrib = nil, nil, nil
-        catch(:done) do
-          e = e[2..-2]
-          ## first split on commas to separate fg, bg and attr
-          atts = e.split /\s*,\s*/
-          atts.each { |att|  
-            ## next split on =
-            part = att.split /\s*=\s*/
-            case part[0]
-            when "fg"
-              color = part[1]
-            when "bg"
-              bgcolor = part[1]
-            when "/end", "end"
-              yield :endcolor if block_given?
-              #next
-              throw :done
-            else
-              # attrib
-              attrib = part[0]
-            end
-          }
-          # 2013-03-25 - 13:31 if numeric color specified
-          color = color.to_i if color =~ /^[0-9]+$/
-          bgcolor = bgcolor.to_i if bgcolor =~ /^[0-9]+$/
-          yield [color,bgcolor,attrib] if block_given?
-        end # catch
-      else
-        text = e
-        yield text if block_given?
-      end
-    }
-  end
+      ## split #[...]
+      a       = s.split /(#\[[^\]]*\])/
+        a.each { |e| 
+        ## process color or attrib portion
+        if e[0,2] == "#[" && e[-1,1] == "]"
+          # now resetting 1:20 PM November 3, 2011 , earlier we were  carrying over
+          color, bgcolor, attrib = nil, nil, nil
+          catch(:done) do
+            e = e[2..-2]
+            ## first split on commas to separate fg, bg and attr
+            atts = e.split /\s*,\s*/
+              atts.each { |att|  
+              ## next split on =
+              part = att.split /\s*=\s*/
+                case part[0]
+                when "fg"
+                  color = part[1]
+                when "bg"
+                  bgcolor = part[1]
+                when "/end", "end"
+                  yield :endcolor if block_given?
+                  #next
+                  throw :done
+                else
+                  # attrib
+                  attrib = part[0]
+                end
+            }
+            # 2013-03-25 - 13:31 if numeric color specified
+            color = color.to_i if color =~ /^[0-9]+$/
+              bgcolor = bgcolor.to_i if bgcolor =~ /^[0-9]+$/
+              yield [color,bgcolor,attrib] if block_given?
+          end # catch
+        else
+          text = e
+          yield text if block_given?
+        end
+      }
+    end
 
+  end
 end

data/lib/rbcurse/core/util/padreader.rb

@@ -4,7 +4,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:  2011-11-14 - 20:57
+  * Last update:  2013-04-01 13:43
 
   == CHANGES
   == TODO 
@@ -17,164 +17,166 @@
 require 'rbcurse'
 
 include RubyCurses
-class PadReader
+module RubyCurses
+  class PadReader
 
-  # You may pass height, width, row and col for creating a window otherwise a fullscreen window
-  # will be created. If you pass a window from caller then that window will be used.
-  # Some keys are trapped, jkhl space, pgup, pgdown, end, home, t b
-  # This is currently very minimal and was created to get me started to integrating
-  # pads into other classes such as textview.
-  def initialize config={}, &block
+    # You may pass height, width, row and col for creating a window otherwise a fullscreen window
+    # will be created. If you pass a window from caller then that window will be used.
+    # Some keys are trapped, jkhl space, pgup, pgdown, end, home, t b
+    # This is currently very minimal and was created to get me started to integrating
+    # pads into other classes such as textview.
+    def initialize config={}, &block
 
-    @config = config
-    @rows = FFI::NCurses.LINES-1
-    @cols = FFI::NCurses.COLS-1
-    @prow = @pcol = 0
-    @startrow = 0
-    @startcol = 0
-    
-    h = config.fetch(:height, 0)
-    w = config.fetch(:width, 0)
-    t = config.fetch(:row, 0)
-    l = config.fetch(:col, 0)
-    @rows = h unless h == 0
-    @cols = w unless w == 0
-    @startrow = t unless t == 0
-    @startcol = l unless l == 0
-    @suppress_border = config[:suppress_border]
-    unless @suppress_border
-      @startrow += 1
-      @startcol += 1
-      @rows -=3  # 3 is since print_border_only reduces one from width, to check whether this is correct
-      @cols -=3
-    end
-    @top = t
-    @left = l
-    view_file config[:filename]
-    @window = config[:window] || VER::Window.new(:height => h, :width => w, :top => t, :left => l)
-    # print border reduces on from width for some historical reason
-    @window.print_border_only @top, @left, h-1, w, $datacolor
-    @ph = @content_rows
-    @pw = @content_cols # get max col
-    @pad = FFI::NCurses.newpad(@ph, @pw)
+      @config = config
+      @rows = FFI::NCurses.LINES-1
+      @cols = FFI::NCurses.COLS-1
+      @prow = @pcol = 0
+      @startrow = 0
+      @startcol = 0
 
-    Ncurses::Panel.update_panels
-    @content.each_index { |ix|
+      h = config.fetch(:height, 0)
+      w = config.fetch(:width, 0)
+      t = config.fetch(:row, 0)
+      l = config.fetch(:col, 0)
+      @rows = h unless h == 0
+      @cols = w unless w == 0
+      @startrow = t unless t == 0
+      @startcol = l unless l == 0
+      @suppress_border = config[:suppress_border]
+      unless @suppress_border
+        @startrow += 1
+        @startcol += 1
+        @rows -=3  # 3 is since print_border_only reduces one from width, to check whether this is correct
+        @cols -=3
+      end
+      @top = t
+      @left = l
+      view_file config[:filename]
+      @window = config[:window] || VER::Window.new(:height => h, :width => w, :top => t, :left => l)
+      # print border reduces on from width for some historical reason
+      @window.print_border_only @top, @left, h-1, w, $datacolor
+      @ph = @content_rows
+      @pw = @content_cols # get max col
+      @pad = FFI::NCurses.newpad(@ph, @pw)
 
-      FFI::NCurses.mvwaddstr(@pad,ix, 0, @content[ix])
-    }
-    @window.wrefresh
-    padrefresh
-    #FFI::NCurses.prefresh(@pad, 0,0, @startrow ,@startcol, @rows,@cols);
+      Ncurses::Panel.update_panels
+      @content.each_index { |ix|
 
-    @window.bkgd(Ncurses.COLOR_PAIR(5));
-    FFI::NCurses.keypad(@pad, true);
-    #@form = Form.new @window
-    config[:row] = config[:col] = 0 # ??? XXX
-  end
+        FFI::NCurses.mvwaddstr(@pad,ix, 0, @content[ix])
+      }
+      @window.wrefresh
+      padrefresh
+      #FFI::NCurses.prefresh(@pad, 0,0, @startrow ,@startcol, @rows,@cols);
 
-  private
-  def view_file(filename)
-    @file = filename
-    @content = File.open(filename,"r").readlines
-    @content_rows = @content.count
-    @content_cols = content_cols()
-    #run()
-  end
-  # write pad onto window
-  private
-  def padrefresh
-    FFI::NCurses.prefresh(@pad,@prow,@pcol, @startrow,@startcol, @rows + @startrow,@cols+@startcol);
-  end
-  # returns button index
-  # Call this after instantiating the window
-  public
-  def run
-    #@form.repaint
-    #@window.wrefresh
-    return handle_keys
-  end
+      @window.bkgd(Ncurses.COLOR_PAIR(5));
+      FFI::NCurses.keypad(@pad, true);
+      #@form = Form.new @window
+      config[:row] = config[:col] = 0 # ??? XXX
+    end
 
-  # convenience method
-  private
-  def key x
-    x.getbyte(0)
-  end
-  def content_cols
-    longest = @content.max_by(&:length)
-    longest.length
-  end
+    private
+    def view_file(filename)
+      @file = filename
+      @content = File.open(filename,"r").readlines
+      @content_rows = @content.count
+      @content_cols = content_cols()
+      #run()
+    end
+    # write pad onto window
+    private
+    def padrefresh
+      FFI::NCurses.prefresh(@pad,@prow,@pcol, @startrow,@startcol, @rows + @startrow,@cols+@startcol);
+    end
+    # returns button index
+    # Call this after instantiating the window
+    public
+    def run
+      #@form.repaint
+      #@window.wrefresh
+      return handle_keys
+    end
 
-  # returns button index
-  private
-  def handle_keys
-    ht = @window.height.ifzero FFI::NCurses.LINES-1
-    buttonindex = catch(:close) do 
-      @maxrow = @content_rows - @rows
-      @maxcol = @content_cols - @cols 
-      while((ch = @window.getchar()) != FFI::NCurses::KEY_F10 )
-        #while((ch = FFI::NCurses.wgetch(@pad)) != FFI::NCurses::KEY_F10 )
-        break if ch == ?\C-q.getbyte(0) 
-        begin
-          case ch
-          when key(?g), 279 # home as per iterm2
-            @prow = 0
-          when key(?b), key(?G), 277 # end as per iterm2
-            @prow = @maxrow-1
-          when key(?j)
-            @prow += 1
-          when key(?k)
-            @prow -= 1
-          when 32, 338   # Page Down abd Page Up as per iTerm2
-            @prow += 10
-          when key(?\C-d)
-            @prow += ht
-          when key(?\C-b)
-            @prow -= ht
-          when 339
-            @prow -= 10
-          when key(?l)
-            @pcol += 1
-          when key(?$)
-            @pcol = @maxcol - 1
-          when key(?h)
-            @pcol -= 1
-          when key(?0)
-            @pcol = 0
-          when key(?q)
-            throw :close
-          else 
-            alert " #{ch} not mapped "
-          end
-          @prow = 0 if @prow < 0
-          @pcol = 0 if @pcol < 0
-          if @prow > @maxrow-1
-            @prow = @maxrow-1
-          end
-          if @pcol > @maxcol-1
-            @pcol = @maxcol-1
-          end
-          #@window.wclear
-          #FFI::NCurses.prefresh(@pad,@prow,@pcol, @startrow,0, @rows,@cols);
-          padrefresh
-          Ncurses::Panel.update_panels
-          #@form.handle_key(ch)
-          #@window.wrefresh
-        rescue => err
-          $log.debug( err) if err
-          $log.debug(err.backtrace.join("\n")) if err
+    # convenience method
+    private
+    def key x
+      x.getbyte(0)
+    end
+    def content_cols
+      longest = @content.max_by(&:length)
+      longest.length
+    end
+
+    # returns button index
+    private
+    def handle_keys
+      ht = @window.height.ifzero FFI::NCurses.LINES-1
+      buttonindex = catch(:close) do 
+        @maxrow = @content_rows - @rows
+        @maxcol = @content_cols - @cols 
+        while((ch = @window.getchar()) != FFI::NCurses::KEY_F10 )
+          #while((ch = FFI::NCurses.wgetch(@pad)) != FFI::NCurses::KEY_F10 )
+          break if ch == ?\C-q.getbyte(0) 
+          begin
+            case ch
+            when key(?g), 279 # home as per iterm2
+              @prow = 0
+            when key(?b), key(?G), 277 # end as per iterm2
+              @prow = @maxrow-1
+            when key(?j)
+              @prow += 1
+            when key(?k)
+              @prow -= 1
+            when 32, 338   # Page Down abd Page Up as per iTerm2
+              @prow += 10
+            when key(?\C-d)
+              @prow += ht
+            when key(?\C-b)
+              @prow -= ht
+            when 339
+              @prow -= 10
+            when key(?l)
+              @pcol += 1
+            when key(?$)
+              @pcol = @maxcol - 1
+            when key(?h)
+              @pcol -= 1
+            when key(?0)
+              @pcol = 0
+            when key(?q)
+              throw :close
+            else 
+              alert " #{ch} not mapped "
+            end
+            @prow = 0 if @prow < 0
+            @pcol = 0 if @pcol < 0
+            if @prow > @maxrow-1
+              @prow = @maxrow-1
+            end
+            if @pcol > @maxcol-1
+              @pcol = @maxcol-1
+            end
+            #@window.wclear
+            #FFI::NCurses.prefresh(@pad,@prow,@pcol, @startrow,0, @rows,@cols);
+            padrefresh
+            Ncurses::Panel.update_panels
+            #@form.handle_key(ch)
+            #@window.wrefresh
+          rescue => err
+            $log.debug( err) if err
+            $log.debug(err.backtrace.join("\n")) if err
 
-          textdialog ["Error in padreader: #{err} ", *err.backtrace], :title => "Exception"
-          $error_message.value = ""
-        ensure
-        end
+            textdialog ["Error in padreader: #{err} ", *err.backtrace], :title => "Exception"
+            $error_message.value = ""
+          ensure
+          end
 
-      end # while loop
-    end # close
-    $log.debug "XXX: CALLER GOT #{buttonindex} "
-    @window.destroy unless @config[:window]
-    FFI::NCurses.delwin(@pad)
-    return buttonindex 
+        end # while loop
+      end # close
+      $log.debug "XXX: CALLER GOT #{buttonindex} "
+      @window.destroy unless @config[:window]
+      FFI::NCurses.delwin(@pad)
+      return buttonindex 
+    end
   end
 end
 if __FILE__ == $PROGRAM_NAME