canis 0.0.5 → 0.0.7

data/lib/canis/core/include/appmethods.rb

@@ -1,3 +1,5 @@
+# Some methods an application may like to use such as the ability to suspend cooked mode
+#  and go to shell, or run a command and view output without leaving the app.
 module Canis
   module Utils
     private
@@ -77,17 +79,24 @@ module Canis
     # takes a unix command (system) and executes the same. No output
     # @return return value of system command
     # 
-    def shell_out command
-      w = @window || @form.window
-      w.hide
+    def shell_out command=nil
+      $shell_history ||= []
+      command ||= get_string("Enter system command:", :maxlen => 50) do |f|
+        require 'canis/core/include/rhistory'
+        f.extend(FieldHistory)
+        f.history($shell_history)
+      end
+      ##w = @window || @form.window
+      #w.hide
       Ncurses.endwin
       ret = system command
       Ncurses.refresh
       #Ncurses.curs_set 0  # why ?
-      w.show
+      #w.show
       return ret
     end
   end # utils
+
   class PrefixCommand
     attr_accessor :object
     def initialize _symbol, calling, config={}, &block

data/lib/canis/core/include/colorparser.rb

@@ -5,7 +5,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 07.11.11 - 12:31 
 #  Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-06-23 01:43
+#  Last update: 2014-09-01 11:57
 # ------------------------------------------------------------ #
 #
 
@@ -236,8 +236,8 @@ module Canis
           self.form = cp
         end
         @attr     ||= FFI::NCurses::A_NORMAL
-        @color      ||= :white
-        @bgcolor    ||= :black
+        @color      ||= $def_fg_color
+        @bgcolor    ||= $def_bg_color
         @color_pair = get_color($datacolor, @color, @bgcolor)
         @color_array = [@color]
         @bgcolor_array = [@bgcolor]
@@ -345,6 +345,7 @@ module Canis
         res = ChunkLine.new
         # stack the values, so when user issues "/end" we can pop earlier ones
 
+        _color, _bgcolor = ColorMap.get_colors_for_pair colorp # 2014-08-31 - 13:31 
         newblockflag = false
         @chunk_parser.parse_format(s) do |p|
           case p
@@ -358,26 +359,32 @@ module Canis
             if ls
               #sc, sb, sa = resolve_style ls
               map = resolve_style ls
-              $log.debug "  STYLLE #{ls} : #{map} "
+              #$log.debug "  STYLLE #{ls} : #{map} "
               lc ||= map[:color]
               lb ||= map[:bgcolor]
               la ||= map[:attr]
             end
+            # 2014-09-01 should i set these to _color and _bgcolor if nil. NOTE
             @_bgcolor = lb
             @_color = lc
             if la
               @attr = get_attrib la
             end
             @_color_pair = nil
+            @_color_pair = colorp # 2014-08-31 - 13:20 
+            # 2014-09-01 - 11:52 if only one of the two is given we were ignoring, now we 
+            #  need to derive the other one
             if lc && lb
               # we know only store color_pair if both are mentioned in style or tag
-              @_color_pair = get_color(nil, lc, lb)
+              @_color_pair = get_color(colorp, lc, lb)
+              # added next two conditions on 2014-09-01 - 11:56 to take care of only one mentioned in
+              # #{ block.
+            elsif lc
+              @_color_pair = get_color(colorp, lc, _bgcolor)
+            elsif lb
+              @_color_pair = get_color(colorp, _color, lb)
             end
 
-            #@color_pair_array << @color_pair
-            #@attrib_array << @attr
-            #$log.debug "XXX: CHUNK start cp=#{@color_pair} , a=#{@attr} :: c:#{lc} b:#{lb} : @c:#{@color} @bg: #{@bgcolor} "
-            #$log.debug "XXX: CHUNK start arr #{@color_pair_array} :: #{@attrib_array} ::#{@color_array} ::: #{@bgcolor_array} "
 
           when :endcolor
 
@@ -387,6 +394,11 @@ module Canis
             @_color_pair = nil
             @attr = nil
 
+            # trying out 2014-08-31 - 13:09 since we have to respect passed in colors
+            @_color ,  @_bgcolor = _color, _bgcolor
+            @_color_pair = colorp
+            @attr = att
+
             #$log.debug "XXX: CHUNK end parents:#{@parents.count}, last: #{@parents.last} "
           when :reset   # ansi has this
             # end all previous colors
@@ -396,6 +408,11 @@ module Canis
             @_bgcolor = @_color = nil
             @_color_pair = nil
             @attr = nil
+            
+            # trying out 2014-08-31 - 13:09 since we have to respect passed in colors
+            @_color, @_bgcolor = _color, _bgcolor
+            @_color_pair = colorp
+            @attr = att
 
 
           when String
@@ -403,7 +420,11 @@ module Canis
             ## create the chunk
             #$log.debug "XXX:  CHUNK     using on #{p}  : #{@_color_pair} , #{@attr}, fg: #{@_color}, #{@_bgcolor}, parent: #{@parents.last} " # 2011-12-10 12:38:51
 
-            #chunk =  [color_pair, p, attr] 
+            # trying out 2014-08-31 - 13:09 since we have to respect passed in colors
+            @_color ||= _color
+            @_bgcolor ||= _bgcolor
+            @color_pair ||= colorp
+            @attr ||= att
             chunk = Chunk.new @_color_pair, p, @attr
             chunk.color = @_color
             chunk.bgcolor = @_bgcolor

data/lib/canis/core/include/listselectionmodel.rb

@@ -5,7 +5,7 @@
 #       Author: j kepler  http://github.com/mare-imbrium/canis/
 #         Date: 2014-04-10 - 21:04
 #      License: Same as ruby license
-#  Last update: 2014-07-07 00:36
+#  Last update: 2014-08-28 18:30
 # ----------------------------------------------------------------------------- #
 #  listselectionmodel.rb  Copyright (C) 2012-2014 j kepler
 # ----------------------------------------------------------------------------- #
@@ -43,7 +43,7 @@ module Canis
       # selection modes may be :multiple, :single or :none
       dsl_accessor :selection_mode
       # color of selected rows, and attribute of selected rows
-      dsl_accessor :selected_color, :selected_bgcolor, :selected_attr
+      dsl_property :selected_color, :selected_bgcolor, :selected_attr
       # indices of selected rows
       dsl_accessor :selected_indices
       # model that takes care of selection operations

data/lib/canis/core/include/rhistory.rb

@@ -9,7 +9,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 2011-11-27 - 18:10
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2011-11-27 - 20:11
+#  Last update: 2014-08-19 00:02
 # ----------------------------------------------------------------------------- #
 #
 # supply history for this object, at least give an empty array
@@ -83,7 +83,7 @@ module Canis
       #end
       r = @_history_config[:row] || r
       c = @_history_config[:col] || c
-      ret = popuplist(list, :row => r, :col => c, :title  => " History ")
+      ret = popuplist(list, :row => r, :col => c, :title  => " History ", :color => :white, :bgcolor => :cyan)
       if ret
         self.text = list[ret] 
         self.set_form_col 

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

@@ -82,8 +82,8 @@ module Canis
       $color_map = {}
       FFI::NCurses.start_color();
       # Initialize few color pairs 
-      $def_fg_color = :white   # pls set these 2 for your application
-      $def_bg_color = :black
+      $def_fg_color ||= :white   # pls set these 2 for your application
+      $def_bg_color ||= :black
       #COLORS = [COLOR_BLACK, COLOR_RED, COLOR_GREEN, COLOR_YELLOW, COLOR_BLUE, 
       #     COLOR_MAGENTA, COLOR_CYAN, COLOR_WHITE]
       @@colors = [:black, :red, :green, :yellow, :blue, :magenta, :cyan, :white]
@@ -100,7 +100,7 @@ module Canis
       $errorcolor = ColorMap.get_color :white, :red
       #$promptcolor = $selectedcolor = ColorMap.get_color(:yellow, :red)
       $promptcolor = ColorMap.get_color(:yellow, :red)
-      $normalcolor = $datacolor = ColorMap.get_color(:white, :black)
+      $normalcolor = $datacolor = ColorMap.get_color($def_fg_color, $def_bg_color)
       $bottomcolor = $topcolor = ColorMap.get_color(:white, :blue)
       $selectedcolor = $datacolor # since we now use reverse attr in list
 

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-15 12:12
+#  Last update: 2014-08-20 15:08
 #
 #  == CHANGED
 #     removed dead or redudant code - 2014-04-22 - 12:53 
@@ -88,7 +88,7 @@ module Canis
       @visible = true
       set_layout(layout)
 
-      #$log.debug "XXX:WINDOW got h #{@height}, w #{@width}, t #{@top}, l #{@left} "
+      $log.debug "XXX:WINDOW got h #{@height}, w #{@width}, t #{@top}, l #{@left} "
 
       @height = FFI::NCurses.LINES if @height == 0   # 2011-11-14 added since tired of checking for zero
       @width = FFI::NCurses.COLS   if @width == 0
@@ -97,7 +97,7 @@ module Canis
       # trying out refreshing underlying window.
       $global_windows ||= []
       # this causes issues padrefresh failing when display_list does a resize.
-      #$global_windows << self
+      $global_windows << self
       @panel = Ncurses::Panel.new(@window) # added FFI 2011-09-6 
       #$error_message_row = $status_message_row = Ncurses.LINES-1
       $error_message_row ||= Ncurses.LINES-1
@@ -125,6 +125,7 @@ module Canis
       #Ncurses::wtimeout(@window, $ncurses_timeout || 500) # will wait a second on wgetch so we can get gg and qq
       #@stack = [] # since we have moved to handler 2014-04-20 - 11:15 
       @name ||="#{self}"
+      $log.debug "  WINDOW NAME is #{@name} "
       @modified = true
       $catch_alt_digits ||= false # is this where is should put globals ? 2010-03-14 14:00 XXX
     end
@@ -163,6 +164,7 @@ module Canis
       # above blanks out entire screen
       # in case of multiple root windows lets just do last otherwise too much refreshing.
       gw = $global_windows
+      $log.debug " REFRESH_ALL windows count = #{gw.count} "
       if current_win
         gw = $global_windows.select {|e| e != current_win }
       end
@@ -177,6 +179,8 @@ module Canis
         if f
           # send hack to root windows form if passed. 
           f.handle_key 1000
+        else
+          $log.warn " REFRESH_ALL on #{w.name} (#{i}) NO FORM so could not send 1000 #{f}"
         end
         #w.ungetch(1000)
       # below blanks out entire screen too
@@ -440,6 +444,7 @@ module Canis
       # added here to hopefully take care of this issue once and for all. 
       # Whenever any window is destroyed, the root window is repainted.
       #
+      # 2014-08-18 - 20:35 trying out without refresh  all since lower dialog gets erased
       Window.refresh_all
       #$log.debug "win destroy end"
     end

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

@@ -1,7 +1,8 @@
 =begin
   * Name: App
-  * Description: Experimental Application class
-  * Author: jkepler (ABCD)
+  * Description: Application class that wraps starting and shutting ncurses and creating a root window
+    and form.
+  * Author: jkepler 
   * file created 2010-09-04 22:10 
 Todo: 
 
@@ -34,7 +35,6 @@ module Canis
   # - box / rect
   # - para looks like a label that is more than one line, and calculates rows itself based on text
   # - multicontainer
-  # - multitextview, multisplit
   # - tabbedpane
   # / table - more work regarding vim keys, also editable
   # - margin - is left offset
@@ -42,6 +42,8 @@ module Canis
   #  
   
   # 2014-04-17 - 13:15 XXX are these used. required ???
+=begin
+  # 2014-08-19 - 20:48 trying to remove excess convenience code
   class Widget
     def changed *args, &block
       bind :CHANGED, *args, &block
@@ -57,9 +59,11 @@ module Canis
       bind :PRESS, *args, &block
     end
   end
+=end
   class CheckBox
     # a little dicey XXX 
     def text(*val)
+      raise "FIXME this is being used Checkbox app.rb text(), otherwise delete this. 2014-08-19 - 21:01 "
       if val.empty?
         @value ? @onvalue : @offvalue
       else
@@ -75,8 +79,6 @@ module Canis
     attr_reader :form
     attr_reader :window
     attr_writer :quit_key
-    # the row on which to prompt user for any inputs
-    #attr_accessor :prompt_row # 2011-10-17 14:06:22
 
     # TODO: i should be able to pass window coords here in config
     # :title
@@ -87,7 +89,7 @@ module Canis
       widget_shortcuts_init
       @variables = {}
       # if we are creating child objects then we will not use outer form. this object will manage
-      @current_object = [] 
+      #@current_object = []  # 2014-08-29 - 17:35 unused
       @_system_commands = %w{ bind_global bind_component field_help_text }
 
       init_vars
@@ -102,8 +104,6 @@ module Canis
         init_ncurses
       end
       $lastline = Ncurses.LINES - 1
-      #@message_row = Ncurses.LINES-1
-      #@prompt_row = @message_row # hope to use for ask etc # 2011-10-17 14:06:27
       unless $log
         logpath=ENV["CANIS_LOG_PATH"]
         $log = create_logger(logpath || "/dev/null")
@@ -112,7 +112,7 @@ module Canis
     def logger; return $log; end
     def close
       $log.debug " INSIDE CLOSE, #{@stop_ncurses_on_close} "
-      @window.destroy if !@window.nil?
+      @window.destroy if @window
       $log.debug " INSIDE CLOSE, #{@stop_ncurses_on_close} "
       if @stop_ncurses_on_close
         Canis::stop_ncurses
@@ -138,39 +138,39 @@ module Canis
       while true
         catch :close do
           while((ch = @window.getchar()) != 999 )
-            #break if ch == @break_key
             if ch == @break_key || ch == @quit_key
-              #stopping = @window.fire_close_handler
-              #break if stopping.nil? || stopping
               break
             end
 
-            # execute a code block so caller program can handle keys from a hash or whatever.
-            # Currently this has the issue that the key is still evaluated again in the next block
-            # - A double evaluation can happen
-            # - these keys will not appear in help
-            # FIXME
-            if @keyblock
-              str = keycode_tos ch
-              # why did we ever want to convert to a symbol. why not just pass it as is.
-              #@keyblock.call(str.gsub(/-/, "_").to_sym) # not used ever
-              ret = @keyblock.call(str) 
-              @form.repaint if ret
-            end
 
-            yield ch if block # <<<----
+            # 2014-08-19 - 22:51 commented next line, too much choice. keep it simple. delete in a month FIXME
+            #yield ch if block # <<<----
+
             # this is what the user should have control ove. earlier we would put this in
             # a try catch block so user could do what he wanted with the error. Now we
             # need to get it to him somehow, perhaps through a block or on_error event
             begin
+              # execute a code block so caller program can handle keys from a hash or whatever.
+              # NOTE: these keys will not appear in help
+              # FIXME : ideally if its just a hash, we should allow user to give it to form
+              #  or widget which it will use, or merge, and be able to print help from
+              if @keyblock
+                str = keycode_tos ch
+                # why did we ever want to convert to a symbol. why not just pass it as is.
+                #@keyblock.call(str.gsub(/-/, "_").to_sym) # not used ever
+                ret = @keyblock.call(str) 
+                if ret
+                  @form.repaint 
+                  next
+                end
+              end
               @form.handle_key ch
             rescue => err
-              $log.debug( "handle_key rescue reached ")
+              $log.debug( "app.rb handle_key rescue reached ")
               $log.debug( err.to_s) 
               $log.debug(err.backtrace.join("\n")) 
               textdialog [err.to_s, *err.backtrace], :title => "Exception"
             end
-            #@form.repaint # was this duplicate ?? handle calls repaint not needed
             @window.wrefresh
           end
         end # catch
@@ -181,6 +181,7 @@ module Canis
     end
     # if calling loop separately better to call this, since it will shut off ncurses
     # and print error on screen.
+    # UNUSED
     def safe_loop &block
       begin
         loop &block
@@ -296,14 +297,6 @@ module Canis
         @form.bind_key(key){ send(cmd.to_sym) }
       end
     end
-    def bind_component
-      #rb_puts "Todo. ", :color_pair => get_color($promptcolor, :red, :black)
-      print_error_message "Todo this. "
-      # the idea here is to get the current component
-      # and bind some keys to some methods.
-      # however, how do we divine the methods we can map to
-      # and also in some cases the components itself has multiple components
-    end
     # displays help_text associated with field. 2011-10-15 
     def field_help_text
       f = @form.get_current_field
@@ -389,6 +382,7 @@ module Canis
     # @example
     #    hline :width => 55  
     def hline config={}
+      raise "I think this is unused. removed if this does not raise 2014-08-29 - 12:43 "
       row = config[:row] || @app_row
       width = config[:width] || 20
       _position config
@@ -457,63 +451,6 @@ module Canis
         awin = @window
         catch(:close) do
           @form = Form.new @window
-          @form.bind_key([?\C-x, ?c], 'suspend') { suspend(false) do
-            system("tput cup 26 0")
-            system("tput ed")
-            system("echo Enter C-d to return to application")
-            system (ENV['PS1']='\s-\v\$ ')
-            system(ENV['SHELL']);
-          end
-          }
-          # this is a very rudimentary default command executer, it does not 
-          # allow tab completion. App should use M-x with names of commands
-          # as in appgmail
-          # NOTE: This is gonna change very soon - 2012-01-8 
-          @form.bind_key(?:, 'prompt') { 
-            str = get_command_from_user
-          }
-
-          # this M-x stuff has to be moved out so it can be used by all. One should be able
-          # to add_commands properly to this, and to C-x. I am thinking how to go about this,
-          # and what function M-x actually serves.
-
-          @form.bind_key(?\M-x, 'M-x commands'){
-            # TODO previous command to be default
-            opts = get_all_commands()
-            @_command_history ||= Array.new
-            # previous command should be in opts, otherwise it is not in this context
-            cmd = rb_gets("Command: ", opts){ |q| q.default = @_previous_command; q.history = @_command_history }
-            if cmd.nil? || cmd == ""
-            else
-              @_command_history << cmd unless @_command_history.include? cmd
-              cmdline = cmd.split
-              cmd = cmdline.shift
-              # check if command is a substring of a larger command
-              if !opts.include?(cmd)
-                rcmd = _resolve_command(opts, cmd) if !opts.include?(cmd)
-                if rcmd.size == 1
-                  cmd = rcmd.first
-                elsif !rcmd.empty?
-                  rb_puts "Cannot resolve #{cmd}. Matches are: #{rcmd} "
-                end
-              end
-              if respond_to?(cmd, true)
-                @_previous_command = cmd
-                begin
-                  send cmd, *cmdline
-                rescue => exc
-                  $log.error "ERR EXC: send throwing an exception now. Duh. IMAP keeps crashing haha !! #{exc}  " if $log.debug? 
-                  if exc
-                    $log.debug( exc) 
-                    $log.debug(exc.backtrace.join("\n")) 
-                    rb_puts exc.to_s
-                  end
-                end
-              else
-                rb_puts("Command [#{cmd}] not supported by #{self.class} ", :color_pair => $promptcolor)
-              end
-            end
-          }
           #@form.bind_key(KEY_F1, 'help'){ display_app_help } # NOT REQUIRED NOW 2012-01-7 since form does it
           @form.bind_key([?q,?q], 'quit' ){ throw :close } if $log.debug?
 
@@ -524,7 +461,7 @@ module Canis
           #$error_message.update_command { @message.set_value($error_message.value) }
           if block
             begin
-              yield_or_eval &block if block_given? # modified 2010-11-17 20:36 
+              yield_or_eval &block if block_given? 
               # how the hell does a user trap exception if the loop is hidden from him ? FIXME
               loop
             rescue => ex
@@ -549,8 +486,72 @@ module Canis
         end # :close
       end
     end
+    # Some bindings that were earlier part of App (in the run block), but now optional for an 
+    #  app. I would like to move it out, so they can be mapped separately to whatever a user wants
+    #  and be improved. these are very experimental and bare as yet.
+    # They should also be usable outside of App.
+    def app_bindings
+      @form.bind_key([?\C-x, ?c], 'suspend') { suspend(false) do
+        system("tput cup 26 0")
+        system("tput ed")
+        system("echo Enter C-d to return to application")
+        system (ENV['PS1']='\s-\v\$ ')
+        system(ENV['SHELL']);
+      end
+      }
+      # this is a very rudimentary default command executer, it does not 
+      # allow tab completion. App should use M-x with names of commands
+      # as in appgmail
+      # NOTE: This is gonna change very soon - 2012-01-8 
+      @form.bind_key(?:, 'prompt') { 
+        str = get_command_from_user
+      }
+
+      # this M-x stuff has to be moved out so it can be used by all. One should be able
+      # to add_commands properly to this, and to C-x. I am thinking how to go about this,
+      # and what function M-x actually serves.
+
+      @form.bind_key(?\M-x, 'M-x commands'){
+        # TODO previous command to be default
+        opts = get_all_commands()
+        @_command_history ||= Array.new
+        # previous command should be in opts, otherwise it is not in this context
+        cmd = rb_gets("Command: ", opts){ |q| q.default = @_previous_command; q.history = @_command_history }
+        if cmd.nil? || cmd == ""
+        else
+          @_command_history << cmd unless @_command_history.include? cmd
+          cmdline = cmd.split
+          cmd = cmdline.shift
+          # check if command is a substring of a larger command
+          if !opts.include?(cmd)
+            rcmd = _resolve_command(opts, cmd) if !opts.include?(cmd)
+            if rcmd.size == 1
+              cmd = rcmd.first
+            elsif !rcmd.empty?
+              rb_puts "Cannot resolve #{cmd}. Matches are: #{rcmd} "
+            end
+          end
+          if respond_to?(cmd, true)
+            @_previous_command = cmd
+            begin
+              send cmd, *cmdline
+            rescue => exc
+              $log.error "ERR EXC: send throwing an exception now. Duh. IMAP keeps crashing haha !! #{exc}  " if $log.debug? 
+              if exc
+                $log.debug( exc) 
+                $log.debug(exc.backtrace.join("\n")) 
+                rb_puts exc.to_s
+              end
+            end
+          else
+            rb_puts("Command [#{cmd}] not supported by #{self.class} ", :color_pair => $promptcolor)
+          end
+        end
+      }
+    end
     # process args, all widgets should call this
     def _process_args args, config, block_event, events  #:nodoc:
+      raise "FIXME seems uncalled _process_args, remove it this does not come up within a month 2014-08-19 "
       args.each do |arg| 
         case arg
         when Array