canis 0.0.5 → 0.0.7

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

@@ -7,7 +7,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 07.11.11 - 13:17
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-05-19 12:56
+#  Last update: 2014-09-01 11:47
 # ----------------------------------------------------------------------------- #
 # == TODO
 #    - perhaps we can compile the regexp once and reuse
@@ -30,8 +30,12 @@ module Canis
     # 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
+      # 2014-09-01 - 11:46 setting default fg and bg is wrong, it should either set the 
+      #  objects default (which we do not know in case of statusline, or maybe remain nil)
+      color   = $def_fg_color
+      bgcolor = $def_bg_color
+      color   = nil
+      bgcolor = nil
       attrib  = FFI::NCurses::A_NORMAL
       text    = ""
 

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

@@ -60,6 +60,23 @@ def textdialog mess, config={}
   tv.unbind_key(KEY_ENTER)
   tp.run
 end
+
+# Used to popup and view a hash in a dialog. User may press ENTER or o to expand nodes
+#  and other keys such as "x" to close nodes.
+def treedialog hash, config={}
+  config[:title] ||= "Alert"
+  tp = MessageBox.new config do
+    button_type :ok
+    tree hash
+  end
+  # Not having as default means i can only press SPACE and that is confusing since we are used to pressing
+  #  ENTER on textdialog
+  #tp.default_button = 10  # i don't want a default since ENTER is trapped by tree
+  #tv = tp.form.by_name["message_label"]
+  # 2014-04-15 so that ENTER can hit okay without tabbing to button. FIX IN RBC
+  #tv.unbind_key(KEY_ENTER)
+  tp.run
+end
 # 
 # This uses the new messagebox 2011-11-19 v 1.5.0
 # NOTE: The earlier get_string had only an OK button, this seems to have a CANCEL
@@ -68,6 +85,7 @@ end
 # @yield [Field] field created by messagebox
 def get_string label, config={} # yield Field
   config[:title] ||= "Entry"
+  config[:title_color] ||= $reversecolor
   label_config = config[:label_config] || {}
   label_config[:row] ||= 2
   label_config[:col] ||= 2
@@ -76,7 +94,9 @@ def get_string label, config={} # yield Field
   field_config = config[:field_config] || {}
   field_config[:row] ||= 3
   field_config[:col] ||= 2
-  field_config[:attr] = :reverse
+  #field_config[:attr] = :reverse
+  field_config[:color] ||= :black
+  field_config[:bgcolor] ||= :cyan
   field_config[:maxlen] ||= config[:maxlen]
   field_config[:default] ||= config[:default]
   field_config[:default] = field_config[:default].chomp if field_config[:default]
@@ -119,6 +139,69 @@ def get_string label, config={} # yield Field
     return nil
   end
 end
+# @param [String] a label such as "Enter name:"
+# @return [Array] value entered by user, nil if cancel pressed
+# @yield [textarea] field created by messagebox
+def get_text label, config={} # yield TextArea
+  config[:title] ||= "Entry"
+  config[:title_color] ||= $reversecolor
+  label_config = config[:label_config] || {}
+  label_config[:row] ||= 1
+  label_config[:col] ||= 2
+  label_config[:text] = label
+
+  # I am not changing the name from field to text in case user wishes to swtch between the two
+  field_config = config[:field_config] || {}
+  field_config[:row] ||= 2
+  field_config[:col] ||= 2
+  #field_config[:attr] = :reverse
+  field_config[:color] ||= :black
+  field_config[:bgcolor] ||= :cyan
+  #field_config[:maxlen] ||= config[:maxlen]
+  #field_config[:text] ||= config[:default]
+  #field_config[:default] = field_config[:default].chomp if field_config[:default]
+  field_config[:name] = :name
+  #field_config[:width] ||= 50  # i want it to extend since i don't know the actual width
+  #field_config[:width] ||= 50  # i want it to extend since i don't know the actual width
+
+  defwid = config[:default].nil? ? 30 : config[:default].size + 13
+  #w = [label.size + 8, defwid, field_config[:width]+13 ].max
+  #config[:width] ||= w
+  w = config[:width] = Ncurses.COLS - 5
+  h = config[:height] = Ncurses.LINES - 5
+  row = ((FFI::NCurses.LINES-h)/2).floor
+  col = ((FFI::NCurses.COLS-w)/2).floor
+  config[:row] = row
+  config[:col] = col
+  field_config[:width] ||= w - 7
+  field_config[:height] ||= h - 6
+  field_config[:suppress_borders] = true
+  ## added history 2013-03-06 - 14:25 : we could keep history based on prompt
+  $get_string_history ||= []
+  #$log.debug "XXX:  FIELD SIZE #{w} "
+  #$log.debug "XXX:  FIELD CONFIG #{field_config} "
+  tp = MessageBox.new config do
+    button_type :ok_cancel
+    default_button 0
+    item Label.new nil, label_config
+    fld = TextArea.new nil, field_config
+    item fld
+    ## added field history 2013-03-06 - 14:24 
+  end
+  # added yield to override settings
+  yield tp.form.by_name[:name] if block_given?
+  index = tp.run
+  if index == 0 # OK
+    ## added field history 2013-03-06 - 14:24 
+    t = tp.form.by_name[:name].text
+    #$get_string_history << t if t && !$get_string_history.include?(t)
+    return t
+  else # CANCEL
+    # Should i use nil or blank. I am currently opting for nil, as this may imply to caller
+    # that user does not wish to override whatever value is being prompted for.
+    return nil
+  end
+end
 # new version using new messagebox
 # @param [String] question
 # @return [Boolean] true or false
@@ -195,6 +278,7 @@ def _print_message type, text, aconfig={}, &block  #:nodoc:
   color = aconfig[:color]
   bgcolor = aconfig[:bgcolor]
   ewin = _create_footer_window #*@layout
+  ewin.name = "WINDOW::_print_message"
   r = 0; c = 1;
   case type 
   when :error
@@ -246,6 +330,7 @@ def rb_confirm text, aconfig={}, &block
     text = text.to_s
   end
   ewin = _create_footer_window
+  ewin.name = "WINDOW::rb_confirm"
   r = 0; c = 1;
   #aconfig.each_pair { |k,v| instance_variable_set("@#{k}",v) }
   # changed on 2011-12-6 
@@ -361,6 +446,7 @@ end # }}}
 # TODO FIXME block got ignored
 def status_window aconfig={}, &block
   sw = StatusWindow.new aconfig
+  sw.win.name = "WINDOW::status_window"
   return sw unless block_given?
   begin
     yield sw
@@ -377,6 +463,7 @@ def progress_dialog aconfig={}, &block
   aconfig[:row_offset] ||= 4
   aconfig[:col_offset] ||= 5
   window = status_window aconfig
+  window.win.name = "WINDOW::progress_dialog"
   height = 10; width = 60
   window.win.print_border_mb 1,2, height, width, $normalcolor, FFI::NCurses::A_REVERSE
   return window unless block_given?
@@ -410,20 +497,24 @@ def popuplist list, config={}, &block
     col += layout[:left]
   end
   config.delete :relative_to
-  width = config[:width] || longest_in_list(list)+2 # borders take 2
+  extra = 2 # trying to space the popup slightly, too narrow
+  width = config[:width] || longest_in_list(list)+4 # borders take 2
   if config[:title]
-    width = config[:title].size + 2 if width < config[:title].size
+    width = config[:title].size + 4 if width < config[:title].size + 4
   end
   height = config[:height]
   height ||= [max_visible_items || 10+2, list.length+2].min 
   #layout(1+height, width+4, row, col) 
   layout = { :height => 0+height, :width => 0+width, :top => row, :left => col } 
   window = Canis::Window.new(layout)
+  window.name = "WINDOW:popuplist"
+  window.wbkgd(Ncurses.COLOR_PAIR($reversecolor));
   form = Canis::Form.new window
 
+  less = 0 # earlier 0
   listconfig = config[:listconfig] || {}
   listconfig[:list] = list
-  listconfig[:width] = width
+  listconfig[:width] = width - less
   listconfig[:height] = height
   listconfig[:selection_mode] ||= :single
   listconfig.merge!(config)
@@ -436,7 +527,6 @@ def popuplist list, config={}, &block
   # events such as ENTER_ROW, LEAVE_ROW or LIST_SELECTION_EVENT or PRESS
   # 2011-11-11 
   #yield lb if block_given? # No it won't work since this returns
-  window.bkgd(Ncurses.COLOR_PAIR($reversecolor));
   window.wrefresh
   Ncurses::Panel.update_panels
   form.repaint
@@ -503,6 +593,236 @@ def display_app_help form=@form
     raise "Form needed by display_app_help. Use form.help_manager instead"
   end
 end
+
+## this is a quick dirty menu/popup menu thing, hopnig to replace the complex menubar with something simpler.
+# However, the cursor visually is confusing. since the display takes over the cursor visually. When we display on the right
+# it looks as tho the right menu is active. When we actually move into it with RIGHT, it looks like the left on is active.
+# OKAY, we temporarily fixed that by not opening it until you actually press RIGHT
+# FIXME : there is the issue of when one level is destroyed then the main one has a blank. all need to be 
+#   repainted.
+# FIXME : when diong a LEFT, cursor shows at last row of previous , we need a curpos or setrow for that lb
+def popupmenu hash, config={}, &block
+  if hash.is_a? Hash
+    list = hash.keys
+  else
+    list = hash
+  end
+  raise ArgumentError, "Nil list received by popuplist" unless list
+  #require 'canis/core/widgets/rlist'
+
+  max_visible_items = config[:max_visible_items]
+  # FIXME have to ensure that row and col don't exceed FFI::NCurses.LINES and cols that is the window
+  # should not FINISH outside or padrefresh will fail.
+  row = config[:row] || 5
+  col = config[:col] || 5
+  relative_to = config[:relative_to]
+  if relative_to
+    layout = relative_to.form.window.layout
+    row += layout[:top]
+    col += layout[:left]
+  end
+  config.delete :relative_to
+  extra = 2 # trying to space the popup slightly, too narrow
+  width = config[:width] || longest_in_list(list)+4 # borders take 2
+  if config[:title]
+    width = config[:title].size + 4 if width < config[:title].size + 4
+  end
+  height = config[:height]
+  height ||= [max_visible_items || 10+2, list.length+2].min 
+  #layout(1+height, width+4, row, col) 
+  layout = { :height => 0+height, :width => 0+width, :top => row, :left => col } 
+  window = Canis::Window.new(layout)
+  window.name = "WINDOW:popuplist"
+  window.wbkgd(Ncurses.COLOR_PAIR($reversecolor));
+  form = Canis::Form.new window
+
+  right_actions = config[:right_actions] || {}
+  config.delete(:right_actions)
+  less = 0 # earlier 0
+  listconfig = config[:listconfig] || {}
+  listconfig[:list] = list
+  listconfig[:width] = width - less
+  listconfig[:height] = height
+  listconfig[:selection_mode] ||= :single
+  listconfig.merge!(config)
+  listconfig.delete(:row); 
+  listconfig.delete(:col); 
+  # trying to pass populists block to listbox
+  lb = Canis::Listbox.new form, listconfig, &block
+  #lb.should_show_focus = true
+  #$row_focussed_attr = REVERSE
+
+  
+  # added next line so caller can configure listbox with 
+  # events such as ENTER_ROW, LEAVE_ROW or LIST_SELECTION_EVENT or PRESS
+  # 2011-11-11 
+  #yield lb if block_given? # No it won't work since this returns
+  window.wrefresh
+  Ncurses::Panel.update_panels
+  form.repaint
+  window.wrefresh
+          display_on_enter = false
+  begin
+    windows = []
+    lists = []
+    hashes = []
+    choices = []
+    unentered_window = nil
+    _list = nil
+    while((ch = window.getchar()) != 999 )
+      case ch
+      when -1
+        next
+      when ?\C-q.getbyte(0)
+        break
+      else
+        lb.handle_key ch
+        lb.form.repaint
+        if ch == Ncurses::KEY_DOWN or ch == Ncurses::KEY_UP
+          if unentered_window
+            unentered_window.destroy
+            unentered_window = nil
+          end
+          # we need to update hash as we go along and back it up.
+          if display_on_enter
+            # removed since cursor goes in
+          end
+        elsif ch == Ncurses::KEY_RIGHT
+          if hash.is_a? Hash
+            val = hash[lb.current_value]
+            if val.is_a? Hash or val.is_a? Array
+              unentered_hash = val
+              choices << lb.current_value
+              unentered_window, _list = display_submenu val, :row => lb.current_index, :col => lb.width, :relative_to => lb, 
+                :bgcolor => :cyan
+            end
+          else
+            x = right_actions[lb.current_value]
+            val = nil
+            if x.respond_to? :call
+              val = x.call
+            elsif x.is_a? Symbol
+              val = send(x)
+            end
+            if val
+              choices << lb.current_value
+              unentered_hash = val
+              unentered_window, _list = display_submenu val, :row => lb.current_index, :col => lb.width, :relative_to => lb, 
+                :bgcolor => :cyan
+            end
+
+          end
+          # move into unentered
+          if unentered_window
+            lists << lb
+            hashes << hash
+            hash = unentered_hash
+            lb = _list
+            windows << unentered_window
+            unentered_window = nil
+            _list = nil
+          end
+        elsif ch == Ncurses::KEY_LEFT
+          if unentered_window
+            unentered_window.destroy
+            unentered_window = nil
+          end
+          # close current window
+          curr = nil
+          curr = windows.pop unless windows.empty?
+          curr.destroy if curr
+          lb = lists.pop unless lists.empty?
+          hash = hashes.pop unless hashes.empty?
+          choices.pop unless choices.empty?
+          unless windows.empty?
+            #form = windows.last
+            #lb - lists.pop
+          end
+        end
+        if ch == 13 || ch == 10
+          val = lb.current_value
+          if hash.is_a? Hash
+            val = hash[val]
+            if val.is_a? Symbol
+              #alert "got #{val}"
+              #return val
+              choices << val
+              return choices
+            end
+          else
+            #alert "got value #{val}"
+            #return val
+            choices << val
+            return choices
+          end
+          break
+        end
+      end
+    end
+  ensure
+    window.destroy   if window
+    windows.each do |w| w.destroy if w ; end
+  end
+  return nil
+end
+def display_submenu hash, config={}, &block
+  raise ArgumentError, "Nil list / hash received by popuplist" unless hash
+  if hash.is_a? Hash
+    list = hash.keys
+  else
+    list = hash
+  end
+  raise ArgumentError, "Nil list received by popuplist" unless list
+
+  max_visible_items = config[:max_visible_items]
+  # FIXME have to ensure that row and col don't exceed FFI::NCurses.LINES and cols that is the window
+  # should not FINISH outside or padrefresh will fail.
+  row = config[:row] || 1
+  col = config[:col] || 0
+  relative_to = config[:relative_to]
+  if relative_to
+    layout = relative_to.form.window.layout
+    row += layout[:top]
+    col += layout[:left]
+  end
+  config.delete :relative_to
+  extra = 2 # trying to space the popup slightly, too narrow
+  width = config[:width] || longest_in_list(list)+4 # borders take 2
+  if config[:title]
+    width = config[:title].size + 4 if width < config[:title].size + 4
+  end
+  height = config[:height]
+  height ||= [max_visible_items || 10+2, list.length+2].min 
+  #layout(1+height, width+4, row, col) 
+  layout = { :height => 0+height, :width => 0+width, :top => row, :left => col } 
+  window = Canis::Window.new(layout)
+  window.name = "WINDOW:popuplist"
+  window.wbkgd(Ncurses.COLOR_PAIR($reversecolor));
+  form = Canis::Form.new window
+
+  less = 0 # earlier 0
+  listconfig = config[:listconfig] || {}
+  listconfig[:list] = list
+  listconfig[:width] = width - less
+  listconfig[:height] = height
+  listconfig[:selection_mode] ||= :single
+  listconfig.merge!(config)
+  listconfig.delete(:row); 
+  listconfig.delete(:col); 
+  # trying to pass populists block to listbox
+  lb = Canis::Listbox.new form, listconfig, &block
+
+  
+  # added next line so caller can configure listbox with 
+  # events such as ENTER_ROW, LEAVE_ROW or LIST_SELECTION_EVENT or PRESS
+  # 2011-11-11 
+  #yield lb if block_given? # No it won't work since this returns
+  window.wrefresh
+  Ncurses::Panel.update_panels
+  form.repaint
+  window.wrefresh
+  return window, lb
+end
 #
 =begin  
 http://www.kammerl.de/ascii/AsciiSignature.php

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

@@ -64,7 +64,7 @@ module Canis
 
       v_window = Canis::Window.new(layout)
       v_form = Canis::Form.new v_window
-      v_window.name = "Viewer"
+      v_window.name = "WINDOW::Viewer"
       if wbg
         v_window.wbkgd(Ncurses.COLOR_PAIR(wbg)); #  does not work on xterm-256color
       end

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

@@ -4,7 +4,7 @@
 #               Also, stacks and flows objects
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 05.11.11 - 15:13 
-#  Last update: 2014-07-10 00:40
+#  Last update: 2014-08-29 16:16
 #
 #  I hope this slowly does not become an unmaintainable maze like vimsplit
 #
@@ -26,8 +26,6 @@
 # what is the real purpose of the shortcuts, is it to avoid putting nil
 # for form there if not required.
 # Or is it positioning, such as in a stack. or just a method ?
-#require 'canis/core/widgets/rlist'
-## trying out new list based on textpad 2014-04-07 - 00:02 CANIS
 module Canis
   module WidgetShortcuts
     class Ws
@@ -366,6 +364,8 @@ module Canis
     end
     # make it as simple as possible, don't try to be intelligent or
     # clever, put as much on the user 
+    #
+    # shortcut for a stack.
     def stack config={}, &block
       s = WsStack.new config
       @_ws_active ||= []