canis 0.0.8 → 0.0.10

data/lib/canis/core/system/colormap.rb

@@ -23,7 +23,7 @@ module Canis
     def ColorMap.get_color_const colorstring
       # added check for fixnum if we go beyond these constants 2011-11-28 
       # e.g. to use full 256 colors
-      return colorstring if colorstring.is_a? Fixnum 
+      return colorstring if colorstring.is_a? Integer 
       ret = FFI::NCurses.const_get "COLOR_#{colorstring.to_s.upcase}"
     end
     ## private
@@ -43,7 +43,7 @@ module Canis
     #
     # returns the colors that make up the given pair
     # you may want to find what makes up $bottomcolor and set color and bgcolor with it.
-    # @param [Fixnum] color_pair
+    # @param [Integer] color_pair
     # @return [Symbol, Symbol]  foreground and backgrounf color
     # @example 
     #     color, bgcolor = get_colors_for_pair $datacolor
@@ -71,7 +71,7 @@ module Canis
     # @param [Symbol] color such as :black :cyan :yellow
     # @return [Boolean] true if valid, else false
     def ColorMap.is_color? color
-      return true if color.is_a? Fixnum # so we can use 256 colors
+      return true if color.is_a? Integer # so we can use 256 colors
       @@colors.include? color.to_sym
     end
 

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

@@ -4,7 +4,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: Around for a long time
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-08-20 15:08
+#  Last update: 2017-03-09 20:43
 #
 #  == CHANGED
 #     removed dead or redudant code - 2014-04-22 - 12:53 
@@ -318,7 +318,7 @@ module Canis
     #--
     # removing some methods that not used or used once
     # leaving here so we not what to do to print in these cases 
-    def print(string, width = width)
+    def print(string, width = self.width)
       w = width == 0? Ncurses.COLS : width
       waddnstr(string.to_s, w) # changed 2011 dts  
     end
@@ -502,7 +502,7 @@ module Canis
     #  with some word in yellow, and then the line continues in red.
     #
     def printstring_formatted(r,c,content, color, att = Ncurses::A_NORMAL)
-      att = get_attrib att unless att.is_a? Fixnum
+      att = get_attrib att unless att.is_a? Integer
       chunkline = convert_to_chunk(content, color, att)
       printstring_or_chunks r,c, chunkline, color, att
     end # print
@@ -590,8 +590,11 @@ module Canis
       # this works for newmessagebox but not for old one.
       # Even now in some cases some black shows through, if the widget is printing spaces
       # such as field or textview on a messagebox.
+      # 2016-01-14 - replacing 1 with space since junk is showing up in some cases.
+      space_char = " ".codepoints.first
       (row-1).upto(row+height-1) do |r|
-        mvwhline(r, col, 1, len)
+        # this loop clears the screen, printing spaces does not work since ncurses does not do anything
+        mvwhline(r, col, space_char, len)
       end
       #attroff(Ncurses.COLOR_PAIR(color) | att)
 

data/lib/canis/core/util/extras/padreader.rb

@@ -4,7 +4,7 @@
   * Author: jkepler (http://github.com/mare-imbrium/canis/)
   * Date: 22.10.11 - 20:35
   * License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-  * Last update:  2014-08-09 20:25
+  * Last update:  2017-03-09 23:12
 
   == CHANGES
   == TODO 
@@ -18,7 +18,7 @@
 # crashes in the most unlikely places. This prevceents me from having to write ternary
 # e.g.
 #     @layout[:width].ifzero(FFI::NCurses::LINES-2)
-class Fixnum
+class Integer
   def ifzero v
     return self if self != 0
     return v

data/lib/canis/core/util/rcommandwindow.rb

@@ -165,7 +165,11 @@ module Canis
         @window.box 0,0
       elsif @box
         @window.attron(Ncurses.COLOR_PAIR($normalcolor) | Ncurses::A_REVERSE)
-        @window.mvhline 0,0,1,@width
+
+        # 2016-01-14 - replacing 1 with space since junk is showing up in some cases.
+        space_char = " ".codepoints.first
+        #@window.mvhline 0,0,1,@width
+        @window.mvhline 0,0,space_char,@width
         @window.printstring 0,0,@title, $normalcolor #, 'normal' if @title
         @window.attroff(Ncurses.COLOR_PAIR($normalcolor) | Ncurses::A_REVERSE)
       else
@@ -433,7 +437,7 @@ module Canis
     # key handler of Controlphandler 
     # This sets +@keyint+ with the value  read by window.
     # This sets +@keychr+ with the +chr+ value of +ch+ if ch between 32 and 127 exclusive.
-    # @param [Fixnum] ch is key read by window.
+    # @param [Integer] ch is key read by window.
     def handle_key ch
       $log.debug "  KeyDispatcher GOT KEY #{ch} "
       @keyint = ch
@@ -454,7 +458,7 @@ module Canis
     end
 
     # checks the key against +@key_map+ if its set
-    # @param [Fixnum] ch character read by +Window+
+    # @param [Integer] ch character read by +Window+
     # @return [0, :UNHANDLED] 0 if processed, :UNHANDLED if not processed so higher level can process
     def process_key ch
       chr = nil
@@ -862,7 +866,7 @@ module Canis
 
     # key handler of Controlphandler which overrides KeyDispatcher since we need to
     # intercept KEY_ENTER
-    # @param [Fixnum] ch is key read by window.
+    # @param [Integer] ch is key read by window.
     # WARNING: Please note that if this is used in +Viewer.view+, that +view+
     # has already trapped CLOSE_KEY which is KEY_ENTER/13 for closing, so we won't get 13 
     # anywhere

data/lib/canis/core/util/rdialogs.rb

@@ -297,7 +297,7 @@ def _print_message type, text, aconfig={}, &block  #:nodoc:
   if aconfig[:wait]
     #try this out, if user wants a wait, then it will wait for 5 seconds, or if a key is pressed sooner
     value = aconfig[:wait]
-    if value.is_a? Fixnum
+    if value.is_a? Integer
       value = value * 10
     else 
       value = 50

data/lib/canis/core/util/widgetshortcuts.rb

@@ -245,9 +245,16 @@ module Canis
       return w
     end
     def tree config={}, &block
-      #require 'canis/core/widgets/rtree'
       require 'canis/core/widgets/tree'
-      events = [:TREE_WILL_EXPAND_EVENT, :TREE_EXPANDED_EVENT, :TREE_SELECTION_EVENT, :PROPERTY_CHANGE, :LEAVE, :ENTER , :ENTER_ROW, :TREE_COLLAPSED_EVENT, :TREE_WILL_EXPAND_EVENT]
+      events = [:TREE_WILL_EXPAND_EVENT,
+                :TREE_EXPANDED_EVENT,
+                :TREE_SELECTION_EVENT,
+                :PROPERTY_CHANGE,
+                :LEAVE,
+                :ENTER ,
+                :ENTER_ROW,
+                :TREE_COLLAPSED_EVENT,
+                :TREE_WILL_EXPAND_EVENT] # EXPAND double?
       block_event = :TREE_WILL_EXPAND_EVENT
       #config[:height] ||= 10
       # if no width given, expand to flows width

data/lib/canis/core/widgets/applicationheader.rb

@@ -8,7 +8,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis-core/
 #         Date: 
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-09-01 13:09
+#  Last update: 2016-01-13 18:42
 #
 #  CHANGES:
 #              For some terminals, like xterm-256color which were not printing spaces
@@ -60,6 +60,8 @@ module Canis
       @text2 ||= ""
       @text_center ||= ""
       @text_right ||= ""
+      # 2016-01-13 - added since "1" was giving problems in mvhline in some cases
+      @space_char = " ".codepoints.first
     end
     # returns value of text1, i.e. text on left of header
     def getvalue
@@ -79,7 +81,9 @@ module Canis
       len = Ncurses.COLS-0 if len == 0
       # print a bar across the screen 
       @window.attron(Ncurses.COLOR_PAIR(@color_pair) | att)
-      @window.mvhline(@row, @col, 1, len)
+      # 2016-01-13 - changed since "1" was giving problems in mvhline in some cases
+      #@window.mvhline(@row, @col, 1, len)
+      @window.mvhline(@row, @col, @space_char, len)
       @window.attroff(Ncurses.COLOR_PAIR(@color_pair) | att)
       #print_header(@text1 + " %15s " % @text2 + " %20s" % @text_center , posy=0, posx=0)
 

data/lib/canis/core/widgets/divider.rb

@@ -98,6 +98,10 @@ module Canis
     def repaint
       woffset = 2
       coffset = 1
+
+      # 2016-01-14 - replacing 1 with space since junk is showing up in some cases (in mvvline/mvhline)
+      space_char = " ".codepoints.first
+
       if @parent
         woffset = 0 if @parent.suppress_borders
         @border_attrib ||= @parent.border_attrib
@@ -142,9 +146,9 @@ module Canis
       $log.debug " XXX DIVIDER #{@row} #{@col} #{@length} "
       case @side
       when :right, :left
-        @graphic.mvvline(@row, @col, 1, @length)
+        @graphic.mvvline(@row, @col, space_char, @length)
       when :top, :bottom
-        @graphic.mvhline(@row, @col, 1, @length)
+        @graphic.mvhline(@row, @col, space_char, @length)
       end
       @graphic.attroff(Ncurses.COLOR_PAIR(bordercolor) | borderatt)
       _paint_marker

data/lib/canis/core/widgets/rmenu.rb

@@ -25,7 +25,6 @@ a user friendly string to identifiy the action, as well as a disabled option.
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-#require 'logger'
 require 'canis'
 
 include Canis
@@ -258,7 +257,7 @@ module Canis
     end
     ## added 2009-01-21 12:09 NEW
     def remove n
-      if n.is_a? Fixnum
+      if n.is_a? Integer
         @items.delete_at n
       else
         @items.delete n
@@ -735,7 +734,7 @@ module Canis
 
     # set the given menu index as the current or active menu
     #  after closing the active menu.
-    # @param Fixnum index of menu to activate, starting 0
+    # @param Integer index of menu to activate, starting 0
     def set_menu index
       #$log.debug "set meu: #{@active_index} #{index}" 
       # first leave the existing window
@@ -897,9 +896,14 @@ module Canis
       @win.bkgd(Ncurses.COLOR_PAIR(5)); # <---- FIXME
       len = @window.width
       len = Ncurses.COLS-0 if len == 0
+
+      # 2016-01-14 - replacing 1 with space since junk is showing up in some cases.
+      space_char = " ".codepoints.first
+
       # print a bar across the screen , which hopefully will not go blank in some terms
       @window.attron(Ncurses.COLOR_PAIR(@color_pair) | att)
-      @window.mvhline(0, 0, 1, len)
+      #@window.mvhline(0, 0, 1, len)
+      @window.mvhline(0, 0, space_char, len)
       @window.attroff(Ncurses.COLOR_PAIR(@color_pair) | att)
       @panel = @win.panel
       return @window

data/lib/canis/core/widgets/rmessagebox.rb

@@ -5,7 +5,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 03.11.11 - 22:15
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-08-30 17:47
+#  Last update: 2017-03-09 23:14
 #  == CHANGES
 #  == TODO 
 #     _ <ENTER> should result in OK being pressed if its default, ESC should result in cancel esp 2 time
@@ -423,7 +423,7 @@ module Canis
     # e.g. a list was declared and we wish to know the selected_indices
     def widget n
       case n
-      when Fixnum
+      when Integer
         @form.widgets[n]
       when String, Symbol
         @form.by_name[n] 

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

@@ -9,7 +9,7 @@
   * Author: jkepler (ABCD)
   * Date: 2008-11-19 12:49 
   * License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-  * Last update: 2014-08-28 16:58
+  * Last update: 2017-03-09 23:10
 
   == CHANGES
   * 2011-10-2 Added PropertyVetoException to rollback changes to property
@@ -47,7 +47,7 @@ end
 # 2009-10-04 14:13 added RK after suggestion on http://www.ruby-forum.com/topic/196618#856703
 # these are for 1.8 compatibility
 unless "a"[0] == "a"
-  class Fixnum
+  class Integer
     def ord
       self
     end
@@ -177,7 +177,7 @@ module Canis
         ch.getbyte(0)
       end
       # returns a string representation of a given int keycode
-      # @param [Fixnum] keycode read by window
+      # @param [Integer] keycode read by window
       #    In some case, such as Meta/Alt codes, the window reads two ints, but still we are using the param
       #    as the value returned by ?\M-a.getbyte(0) and such, which is typically 128 + key
       # @return [String] a string representation which is what is to be used when binding a key to an
@@ -315,7 +315,7 @@ module Canis
       # Use this in order to create a color pair with the colors
       # provided, however, if user has not provided, use supplied
       # default.
-      # @param [Fixnum] color_pair created by ncurses
+      # @param [Integer] color_pair created by ncurses
       # @param [Symbol] color name such as white black cyan magenta red green yellow
       # @param [Symbol] bgcolor name such as white black cyan magenta red green yellow
       # @example get_color $promptcolor, :white, :cyan
@@ -330,13 +330,13 @@ module Canis
       # convert a string to integer attribute
       # FIXME: what if user wishes to OR two attribs, this will give error
       # @param [String] e.g. reverse bold normal underline
-      #     if a Fixnum is passed, it is returned as is assuming to be 
+      #     if a Integer is passed, it is returned as is assuming to be 
       #     an attrib
       def get_attrib str
         return FFI::NCurses::A_NORMAL unless str
         # next line allows us to do a one time conversion and keep the value
         #  in the same variable
-        if str.is_a? Fixnum
+        if str.is_a? Integer
           if [
             FFI::NCurses::A_BOLD,
             FFI::NCurses::A_REVERSE,    
@@ -733,7 +733,7 @@ module Canis
             end
 
             h.each_pair { |name, val| 
-              if name.is_a? Fixnum
+              if name.is_a? Integer
                 name = keycode_tos name
               elsif name.is_a? String
                 name = keycode_tos(name.getbyte(0))
@@ -1480,7 +1480,7 @@ module Canis
        oldvalue = @color_pair
        case val.size
        when 1
-         raise ArgumentError, "Expecting fixnum for color_pair." unless val[0].is_a? Fixnum
+         raise ArgumentError, "Expecting fixnum for color_pair." unless val[0].is_a? Integer
          @color_pair = val[0]
          @color, @bgcolor = ColorMap.get_colors_for_pair @color_pair
        when 2
@@ -2295,7 +2295,7 @@ module Canis
     # this accesses the field created or passed with set_label
     #attr_reader :label
     # this is the class of the field set in +text()+, so value is returned in same class
-    # @example : Fixnum, Integer, Float
+    # @example : Integer, Integer, Float
     attr_accessor :datatype                    # crrently set during set_buffer
     attr_reader :original_value                # value on entering field
     attr_accessor :overwrite_mode              # true or false INSERT OVERWRITE MODE
@@ -2333,10 +2333,10 @@ module Canis
 
     # NOTE: earlier there was some confusion over type, chars_allowed and datatype
     # Now type and chars_allowed are merged into one.
-    # If you pass a symbol such as :integer, :float or Float Fixnum then some
+    # If you pass a symbol such as :integer, :float or Float Integer then some
     #  standard chars_allowed will be used. Otherwise you may pass a regexp.
     #
-    # @param symbol :integer, :float, :alpha, :alnum, Float, Fixnum, Numeric, Regexp
+    # @param symbol :integer, :float, :alpha, :alnum, Float, Integer, Numeric, Regexp
     def type *val
       return @chars_allowed if val.empty?
 
@@ -2348,7 +2348,7 @@ module Canis
       end
       dtype = dtype.to_s.downcase.to_sym if dtype.is_a? String
       case dtype # missing to_sym would have always failed due to to_s 2011-09-30 1.3.1
-      when :integer, Fixnum, Integer
+      when :integer, Integer
         @chars_allowed = /\d/
       when :numeric, :float, Numeric, Float
         @chars_allowed = /[\d\.]/ 
@@ -2368,7 +2368,7 @@ module Canis
     # NOTE: this should return self for chaining operations and throw an exception
     # if disabled or exceeding size
     # @param [char] a character to add
-    # @return [Fixnum] 0 if okay, -1 if not editable or exceeding length
+    # @return [Integer] 0 if okay, -1 if not editable or exceeding length
     def putch char
       return -1 if !@editable 
       return -1 if !@overwrite_mode && (@buffer.length >= @maxlen)
@@ -2460,7 +2460,7 @@ module Canis
       case dt.to_s
       when "String"
         return @buffer
-      when "Fixnum"
+      when "Integer"
         return @buffer.to_i
       when "Float"
         return @buffer.to_f
@@ -3226,7 +3226,7 @@ module Canis
           _color   = @selected_color || _color
         end
         $log.debug "XXX: button #{text}   STATE is #{@state} color #{_color} , bg: #{_bgcolor} "
-        if _bgcolor.is_a?( Fixnum) && _color.is_a?( Fixnum)
+        if _bgcolor.is_a?( Integer) && _color.is_a?( Integer)
           # i think this means they are colorpairs not colors, but what if we use colors on the 256 scale ?
           #  i don;t like this at all. 
         else

data/lib/canis/core/widgets/scrollbar.rb

@@ -87,6 +87,9 @@ module Canis
       @graphic = my_win unless @graphic
       return unless @repaint_required
 
+      # 2016-01-14 - replacing 1 with space in mvvline since junk is showing up in some cases.
+      space_char = " ".codepoints.first
+
       # first print a right side vertical line
       #bc = $bottomcolor  # dark blue
       bc = $datacolor
@@ -97,7 +100,7 @@ module Canis
 
       @graphic.attron(Ncurses.COLOR_PAIR(bordercolor) | borderatt)
       #$log.debug " XXX SCROLL #{@row} #{@col} #{@length} "
-      @graphic.mvvline(@row+0, @col, 1, @length-0)
+      @graphic.mvvline(@row+0, @col, space_char, @length-0)
       @graphic.attroff(Ncurses.COLOR_PAIR(bordercolor) | borderatt)
 
       # now calculate and paint the scrollbar
@@ -116,7 +119,7 @@ module Canis
       r = @row + scloc
       c = @col + 0
       #$log.debug " XXX SCROLLBAR #{r} #{c} #{sclen} "
-      @graphic.mvvline(r, c, 1, sclen)
+      @graphic.mvvline(r, c, space_char, sclen)
       @graphic.attroff(Ncurses.COLOR_PAIR(@scroll_pair) | borderatt)
       @repaint_required = false
     end

data/lib/canis/core/widgets/table.rb

@@ -7,7 +7,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 2013-03-29 - 20:07
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-06-01 13:10
+#  Last update: 2017-03-09 23:14
 # ----------------------------------------------------------------------------- #
 #   table.rb  Copyright (C) 2012-2014 kepler
 
@@ -497,7 +497,7 @@ module Canis
     # Convert current cursor position to a table column
     # calculate column based on curpos since user may not have
     # user w and b keys (:next_column)
-    # @return [Fixnum] column index base 0
+    # @return [Integer] column index base 0
     def _convert_curpos_to_column  #:nodoc:
       _calculate_column_offsets unless @coffsets
       x = 0

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

@@ -10,7 +10,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/mancurses/
 #         Date: 2011-11-09 - 16:59
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-09-03 17:54
+#  Last update: 2017-03-09 23:14
 #
 #  == CHANGES
 #   - changed @content to @list since all multirow widgets use that and so do utils etc
@@ -1422,9 +1422,9 @@ module Canis
     # First time, starts searching current line from cursor position onwards to end of file
     #  If no match, then checks from start of file to current line.
     # @param [String, Regex] pattern to search (uses +:index+)
-    # @param [Fixnum] line number to start with. Optional. +nil+ means start search from current position.
-    # @param [Fixnum] line number to end with. Optional. +nil+ means end search at end of array
-    # @return [Array<Fixnum, Fixnum>] index of line where pattern found, index of offset in line.
+    # @param [Integer] line number to start with. Optional. +nil+ means start search from current position.
+    # @param [Integer] line number to end with. Optional. +nil+ means end search at end of array
+    # @return [Array<Integer, Integer>] index of line where pattern found, index of offset in line.
     #     +nil+ returned if no match.
     # NOTE:
     #    startline and endline are more for internal purposes, externally we would call this only with
@@ -1577,8 +1577,8 @@ module Canis
     # concrete / derived classes should override this for their specific uses.
     # Called if only a row is changed.
     def render pad, lineno, text
-      FFI::NCurses.mvwaddstr(pad,lineno, 0, @clearstring) if @clearstring
-      FFI::NCurses.mvwaddstr(pad,lineno, 0, text)
+      FFI::NCurses.mvwaddstr(pad, lineno, 0, @clearstring) if @clearstring
+      FFI::NCurses.mvwaddstr(pad, lineno, 0, text)
     end
   end
 
@@ -1600,8 +1600,8 @@ module Canis
       ## messabox does have a method to paint the whole window in bg color its in rwidget.rb
       att = NORMAL
       FFI::NCurses.wattron(pad, @cp | att)
-      FFI::NCurses.mvwaddstr(pad,lineno, 0, @clearstring) if @clearstring
-      FFI::NCurses.mvwaddstr(pad,lineno, 0, @list[lineno])
+      FFI::NCurses.mvwaddstr(pad, lineno, 0, @clearstring) if @clearstring
+      FFI::NCurses.mvwaddstr(pad, lineno, 0, @list[lineno])
 
       #FFI::NCurses.mvwaddstr(pad, lineno, 0, text)
       FFI::NCurses.wattroff(pad, @cp | att)