canis 0.0.5 → 0.0.7

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-08-10 14:53
+#  Last update: 2014-09-01 13:09
 #
 #  CHANGES:
 #              For some terminals, like xterm-256color which were not printing spaces
@@ -96,7 +96,6 @@ module Canis
       #len = @window.width
       #len = Ncurses.COLS-0 if len == 0
       #
-      #@form.window.printstring r, c, "%-*s" % [len, htext], @color_pair, @attr
       @form.window.printstring r, c, htext, @color_pair, @attr
     end
     # internal method, called by repaint to print text_center in the center
@@ -105,7 +104,6 @@ module Canis
       len = win.getmaxx
       len = Ncurses.COLS-0 if len == 0 || len > Ncurses.COLS
       #
-      #@form.window.printstring r, c, "%-*s" % [len, htext], @color_pair, @attr
       win.printstring r, ((len-htext.length)/2).floor, htext, @color_pair, @attr
     end
     # internal method to print text_right
@@ -113,7 +111,7 @@ module Canis
       hlen = htext.length
       len = @window.getmaxx # width was not changing when resize happens
       len = Ncurses.COLS-0 if len == 0 || len > Ncurses.COLS
-      $log.debug " def print_top_right(#{htext}) #{len} #{Ncurses.COLS} "
+      #$log.debug " def print_top_right(#{htext}) #{len} #{Ncurses.COLS} "
       @form.window.printstring 0, len-hlen, htext, @color_pair, @attr
     end
     ##

data/lib/canis/core/widgets/extras/rtextarea.rb

@@ -269,6 +269,7 @@ module Canis
     ### FOR scrollable ###
     def repaint # textarea
       #return unless @repaint_required # 2010-02-12 19:08  TRYING - won't let footer print if only col move
+      @graphic = @form.window unless @graphic # print_border not getting it 2014-08-30 - 20:41 
       paint if @repaint_required
       print_foot if @print_footer && !@suppress_borders && (@repaint_footer_required || @repaint_required)
     end
@@ -839,7 +840,8 @@ module Canis
       # not sure where to put this, once for all or repeat 2010-02-12 RFED16
       #my_win = @form? @form.window : @target_window
       #$log.warn "neither form not target window given!!! TA paint 751" unless my_win
-      raise "Height or width nil h:#{@height} , w: #{@width} " if @height.nil? || @width.nil?
+      raise "height or width nil h:#{@height} , w: #{@width} " if @height.nil? || @width.nil?
+      raise "graphic is nil in textarea paint()" unless @graphic
       print_borders if (@suppress_borders == false && @repaint_all) # do this once only, unless everything changes
       rc = row_count
       _maxlen = @maxlen || @width-@internal_width # TODO fix in other branches remove ||= 

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

@@ -5,7 +5,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 2014-04-06 - 19:37 
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-07-07 00:36
+#  Last update: 2014-08-28 17:05
 # ----------------------------------------------------------------------------- #
 #   listbox.rb Copyright (C) 2012-2014 kepler
 
@@ -272,6 +272,7 @@ module Canis
         bg = @source.selected_bgcolor || bg
         att = @source.selected_attr || REVERSE
         cp = get_color($datacolor, fg, bg)
+
       elsif lineno == @source.current_index 
         # print focussed row in different attrib
         if @source.should_show_focus

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

@@ -47,7 +47,11 @@ module Canis
     end
     def repaint
       acolor = get_color($reversecolor, @color, @bgcolor)
-      @parent.window.printstring( @row, 0, "|%s|" % ("-"*@width), acolor)
+      #@parent.window.printstring( @row, 0, "|%s|" % ("-"*@width), acolor)
+      @parent.window.mvwhline( @row, 1, Ncurses::ACS_HLINE, @width)
+      # these 2 are probably overwritten by the borders
+      @parent.window.mvaddch( @row, 0, Ncurses::ACS_LTEE)
+      @parent.window.mvaddch( @row, @width+1, Ncurses::ACS_RTEE)
     end
     def destroy
     end
@@ -133,14 +137,8 @@ module Canis
         #$log.debug "HL XXX #{self} - > #{@parent} parent nil"
       end
       if tf
-        #color = $datacolor
-        #@parent.window.mvchgat(y=@row, x=1, @width, Ncurses::A_NORMAL, color, nil)
-        # above line did not work in vt100, 200 terminals, next works.
-#        @parent.window.mvchgat(y=@row, x=1, @width, Ncurses::A_REVERSE, $reversecolor, nil) # changed 2011 dts  2011-09-24  multicolumn, 1 skips the border
         @color_pair  ||= get_color($reversecolor, @color, @bgcolor)
         @parent.window.mvchgat(y=@row, x=@col+1, @width, Ncurses::A_REVERSE, @color_pair, nil)
-        #@parent.window.mvaddch @row, @col, "*".ord
-        #@parent.window.wmove @row, @col # 2011-09-25 V1.3.1  NO EFFECT
       else
         repaint
       end
@@ -148,7 +146,6 @@ module Canis
     end
     def repaint # menuitem.repaint
       if @parent.nil? or @parent.window.nil?
-        $log.debug "repaint #{self} parent nil"
       #  return
       end
       r = @row
@@ -168,16 +165,18 @@ module Canis
       elsif !@mnemonic.nil?
         m = @mnemonic
         ix = text.index(m) || text.index(m.swapcase)
-        charm = text[ix,1]
-        #@parent.window.printstring( r, ix+1, charm, $datacolor) if !ix.nil?
-        # prev line changed since not working in vt100 and vt200
-        @parent.window.printstring( r, ix+1, charm, $reversecolor, 'reverse') if !ix.nil?
+        if ix
+          charm = text[ix,1]
+          #@parent.window.printstring( r, ix+1, charm, $datacolor) if !ix.nil?
+          # prev line changed since not working in vt100 and vt200
+          @parent.window.printstring( r, ix+1, charm, $reversecolor, 'reverse') if !ix.nil?
+        end
       end
       #@parent.window.wmove r, c # NO EFFECT
       end
     end
     def destroy
-     $log.debug "DESTROY menuitem #{@text}"
+     #$log.debug "DESTROY menuitem #{@text}"
     end
   end
   ## class Menu. Contains menuitems, and can be a menuitem itself.
@@ -495,6 +494,7 @@ module Canis
       @layout = { :height => h-1, :width => ww, :top => t, :left => @coffset } 
       @win = Canis::Window.new(@layout)
       @window = @win
+      @window.name = "WINDOW:menu"
       @color_pair ||= get_color($datacolor, @color, @bgcolor)
       @rev_color_pair ||= get_color($reversecolor, @color, @bgcolor)
       @win.bkgd(Ncurses.COLOR_PAIR(@color_pair));
@@ -532,18 +532,22 @@ module Canis
         @window.printstring( h-2, 0, "+%s+" % ("-"*(ww1)), @rev_color_pair)
         # in case of multiple rows
         @window.printstring( r, c, "+%s+" % ("-"*(ww1)), @rev_color_pair)
+        # added box with proper ncurses extended char set 2014-08-27 - 14:30 
+        @window.print_border_only 0,0,h-2, ww, @rev_color_pair
         select_item 0
       @window.refresh
       return @window
     end
     # private
+    # returns length of longest item in array
     def array_width a
       longest = a.max {|a,b| a.to_s.length <=> b.to_s.length }
       #$log.debug "array width #{longest}"
       longest.to_s.length
     end
+    # destroys windows and each item within (submenus)
     def destroy
-      $log.debug "DESTRY menu #{@text}"
+      $log.debug "DESTROY menu #{@text}"
       return if @window.nil?
       @visible = false
       #2014-05-12 - 20:53 next 3 replaced with destroy since destroy refreshes root window.
@@ -552,7 +556,6 @@ module Canis
       #@window.delwin if !@window.nil?
       @window.destroy
       @items.each do |item|
-        #next if item == :SEPARATOR
         item.destroy
       end
       @window = nil
@@ -689,13 +692,13 @@ module Canis
       @active_index = 0
       @repaint_required = true
     end
+    # is this widget focusable, always returns false
     def focusable
       false
     end
     alias :focusable? focusable
-    # add a precreated menu
+    # add a precreated menu, returning self
     def add menu
-      #$log.debug "YYYY inside MB: add #{menu.text}  "
       @items << menu
       return self
     end
@@ -705,13 +708,13 @@ module Canis
     # 2010-09-10 12:07 added while simplifying the interface
     # this calls add so you get the MB back, not a ref to the menu created NOTE
     def menu text, &block
-      #$log.debug "YYYY inside MB: menu text #{text} "
       m = Menu.new text, &block 
       m.color = @color
       m.bgcolor = @bgcolor
       add m
       return m
     end
+    # move focus to next menu
     def next_menu
       #$log.debug "next meu: #{@active_index}  " 
       if @active_index < @items.length-1
@@ -720,6 +723,7 @@ module Canis
         set_menu 0
       end
     end
+    # move focus to previous menu
     def prev_menu
       #$log.debug "prev meu: #{@active_index} " 
       if @active_index > 0
@@ -728,18 +732,29 @@ module Canis
         set_menu @items.length-1
       end
     end
+
+    # 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
     def set_menu index
       #$log.debug "set meu: #{@active_index} #{index}" 
+      # first leave the existing window
       menu = @items[@active_index]
       menu.on_leave # hide its window, if open
+      # now move to given menu
       @active_index = index
       menu = @items[@active_index]
       menu.on_enter #display window, if previous was displayed
+      # move cursor to selected menu option on top, not inside list
       @window.wmove menu.row, menu.col
 #     menu.show
 #     menu.window.wrefresh # XXX we need this
     end
 
+    # keep the menu bar visible at all times. 
+    # If not, then it appears only on using the toggle key.
+    # In any case, control only goes to the menubar when you use the toggle key,
+    # so it is best NOT to keep it visible.
     def keep_visible flag=nil
       return @keep_visible unless flag
       @keep_visible = flag
@@ -760,7 +775,7 @@ module Canis
         when -1
           next
         when KEY_DOWN
-          #$log.debug "insdie keyDOWN :  #{ch}" 
+    
           if !@selected
             current_menu.fire
           else
@@ -770,28 +785,20 @@ module Canis
           @selected = true
         when KEY_ENTER, 10, 13, 32
           @selected = true
-            #$log.debug " mb insdie ENTER :  #{current_menu}" 
-            ret = current_menu.handle_key ch
-            #$log.debug "ret = #{ret}  mb insdie ENTER :  #{current_menu}" 
-            #break; ## 2008-12-29 18:00  This will close after firing
-            #anything
-            break if ret == :CLOSE
+          ret = current_menu.handle_key ch
+          #break; ## 2008-12-29 18:00  This will close after firing anything
+          break if ret == :CLOSE
         when KEY_UP
-          #$log.debug " mb insdie keyUPP :  #{ch}" 
           current_menu.handle_key ch
         when KEY_LEFT
-          #$log.debug " mb insdie KEYLEFT :  #{ch}" 
           ret = current_menu.handle_key ch
           prev_menu if ret == :UNHANDLED
-          #display_items if @selected
         when KEY_RIGHT
-          #$log.debug " mb insdie KEYRIGHT :  #{ch}" 
           ret = current_menu.handle_key ch
           next_menu if ret == :UNHANDLED
         when ?\C-g.getbyte(0) # abort
           throw :menubarclose
         else
-          #$log.debug " mb insdie ELSE :  #{ch}" 
           ret = current_menu.handle_key ch
           if ret == :UNHANDLED
             Ncurses.beep 
@@ -808,11 +815,13 @@ module Canis
       ensure
         #ensure is required becos one can throw a :close
         $log.debug " DESTROY IN ENSURE"
-        current_menu.clear_menus #@@menus = [] # added 2009-01-23 13:21 
+        current_menu.clear_menus
         @repaint_required = false
         destroy  # Note that we destroy the menu bar upon exit
       end
     end
+
+    # returns current_menu
     def current_menu
       @items[@active_index]
     end
@@ -877,8 +886,13 @@ module Canis
     end
     def create_window_menubar
       @layout = { :height => 1, :width => 0, :top => 0, :left => 0 } 
+      $log.debug "create window menu bar "
       @win = Canis::Window.new(@layout)
+      @win.name = "WINDOW:menubar"
       @window = @win
+      # hack since we put all windows in there, and this should not be coming after Root.
+      # This should not have been a window in the first place.
+      $global_windows.delete @win
       att = get_attrib @attr
       @win.bkgd(Ncurses.COLOR_PAIR(5)); # <---- FIXME
       len = @window.width

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-07-08 18:05
+#  Last update: 2014-08-30 17:47
 #  == CHANGES
 #  == TODO 
 #     _ <ENTER> should result in OK being pressed if its default, ESC should result in cancel esp 2 time
@@ -74,6 +74,8 @@ module Canis
 
     end
     def item widget
+      # # normalcolor gives a white on black stark title like links and elinks
+      # You can also do 'acolor' to give you a sober title that does not take attention away, like mc
       # remove from existing form if set, problem with this is mnemonics -- rare situation.
       if widget.form
         f = widget.form
@@ -134,8 +136,11 @@ module Canis
       @window.print_border_mb 1,2, @height, @width, bordercolor, borderatt
       @window.wattroff(Ncurses.COLOR_PAIR(bordercolor) | (borderatt || FFI::NCurses::A_NORMAL))
       @title ||= "+-+"
+      @title_color ||= $normalcolor
       title = " "+@title+" "
-      @window.printstring(@row=1,@col=(@width-title.length)/2,title, color=$normalcolor)
+      # normalcolor gives a white on black stark title like links and elinks
+      # You can also do 'acolor' to give you a sober title that does not take attention away, like mc
+      @window.printstring(@row=1,@col=(@width-title.length)/2,title, color=@title_color)
       #print_message if @message
       create_action_buttons unless @action_buttons
     end
@@ -227,6 +232,46 @@ module Canis
     end
     alias :text= :text
 
+    # similar to +text+ but to view a hash using a tree object, so one can
+    #  drill down.
+    # Added on 2014-08-30 - 17:39 to view an objects instance_variables and public_methods.
+    def tree message
+      require 'canis/core/widgets/tree'
+      @suggested_w = @width || (FFI::NCurses.COLS * 0.80).floor
+      @suggested_h = @height || (FFI::NCurses.LINES * 0.80).floor
+
+      message_col = 3
+      r = 2
+      display_length = @suggested_w-4
+      display_length -= message_col
+      clr = @color || :white
+      bgclr = @bgcolor || :black
+
+      # now that we have moved to textpad that +8 was causing black lines to remain after the text
+      #message_height = message.size #+ 8
+      message_height = 20
+      # reduce if possible if its not required.
+      #
+      r1 = (FFI::NCurses.LINES-@suggested_h)/2
+      r1 = r1.floor
+      w = @suggested_w
+      c1 = (FFI::NCurses.COLS-w)/2
+      c1 = c1.floor
+      @suggested_row = r1
+      @suggested_col = c1
+      brow = @button_row || @suggested_h-4
+      available_ht = brow - r + 1
+      message_height = [message_height, available_ht].min
+      # replaced 2014-04-14 - 23:51 
+      tree = Canis::Tree.new @form, {:name=>"treedialogtree", :data => message,
+        :row => r, :col => message_col, :width => display_length, :suppress_borders => true,
+        :height => message_height, :bgcolor => bgclr , :color => clr}
+      #message_label.set_content message
+      tree.treemodel.root_visible = false
+      yield tree if block_given?
+
+    end
+
     # returns button index (or in some cases, whatever value was thrown
     # if user did not specify any button_type but gave his own and did throw (:close, x)
     private
@@ -235,6 +280,10 @@ module Canis
         while((ch = @window.getchar()) != FFI::NCurses::KEY_F10 )
           break if ch == ?\C-q.getbyte(0) || ch == 2727 # added double esc
           begin
+            # trying out repaint of window also if repaint all asked for. 12 is C-l
+            if ch == 1000 or ch == 12
+              repaint
+            end
             @form.handle_key(ch)
             @window.wrefresh
           rescue => err

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-18 14:58
+  * Last update: 2014-08-28 16:58
 
   == CHANGES
   * 2011-10-2 Added PropertyVetoException to rollback changes to property
@@ -477,8 +477,7 @@ module Canis
         case keycode
         when String
           # single assignment
-          keycode = keycode.getbyte(0) #if keycode.class==String ##    1.9 2009-10-05 19:40 
-          #@_key_map[keycode] = blk
+          keycode = keycode.getbyte(0) 
         when Array
           # double assignment
           # this means that all these keys have to be pressed in succession for this block, like "gg" or "C-x C-c"
@@ -545,7 +544,7 @@ module Canis
         $log.debug " composite contains #{key} : #{val} "
       end
       def check_composite_mapping key, window
-        $log.debug  "inside check with #{key} "
+        #$log.debug  "inside check with #{key} "
         return nil if !@_key_composite_map
         return nil if !@_key_composite_map.key? key
         $log.debug "  composite has #{key} "
@@ -577,7 +576,7 @@ module Canis
             # instead of just nil, we need to go back up, but since not recursive ...
             #return nil unless n
             unless n
-              # testing shift otherwise it seems current key evaluated twice
+              # testing shift otherwise it seems current key evaluated twice 2014-08-17
               unconsumed.shift
               $log.debug  "push unconsumed:#{unconsumed} " unless n
               unconsumed.each {|e| window.ungetch(e)} unless n
@@ -1244,7 +1243,7 @@ module Canis
         fire_handler :ENTER, self
       end
     end
-    ## got left out by mistake 2008-11-26 20:20 
+    ## Called when user exits a widget
     def on_leave
       @state = :NORMAL    # duplicating since often these are inside containers
       @focussed = false
@@ -1609,7 +1608,8 @@ module Canis
       # what kind of key-bindings do you want, :vim or :emacs
       $key_map_type ||= :vim ## :emacs or :vim, keys to be defined accordingly. TODO
 
-      bind_key(KEY_F1, 'help') { hm = help_manager(); hm.display_help }
+      #bind_key(KEY_F1, 'help') { hm = help_manager(); hm.display_help }
+      map_keys unless @keys_mapped
     end
     ##
     # set this menubar as the form's menu bar.
@@ -2064,6 +2064,7 @@ module Canis
   #
   def map_keys
     return if @keys_mapped
+    bind_key(KEY_F1, 'help') { hm = help_manager(); hm.display_help }
     bind_keys([?\M-?,?\?], 'show field help') { 
       #if get_current_field.help_text 
         #textdialog(get_current_field.help_text, 'title' => 'Help Text', :bgcolor => 'green', :color => :white) 
@@ -2084,17 +2085,19 @@ module Canis
   # this forces a repaint of all visible widgets and has been added for the case of overlapping
   # windows, since a black rectangle is often left when a window is destroyed. This is internally
   # triggered whenever a window is destroyed, and currently only for root window.
+  # NOTE: often the window itself or spaces between widgets also gets cleared, so basically
+  # the window itself may need recreating ? 2014-08-18 - 21:03 
   def repaint_all_widgets
-    #$log.debug "  REPAINT ALL in FORM called "
+    $log.debug "  REPAINT ALL in FORM called "
     @widgets.each do |w|
       next if w.visible == false
       next if w.class.to_s == "Canis::MenuBar"
-      #$log.debug "   ---- REPAINT ALL #{w.name} "
+      $log.debug "   ---- REPAINT ALL #{w.name} "
       #w.repaint_required true
       w.repaint_all true
       w.repaint
     end
-    #$log.debug "  REPAINT ALL in FORM complete "
+    $log.debug "  REPAINT ALL in FORM complete "
     #  place cursor on current_widget 
     setpos
   end
@@ -2107,7 +2110,8 @@ module Canis
   # NOTE : please rescue exceptions when you use this in your main loop and alert() user
   #
   def handle_key(ch)
-    map_keys unless @keys_mapped
+    # 2014-08-19 - 21:10 moving to init, so that user may override or remove
+    #map_keys unless @keys_mapped
     handled = :UNHANDLED # 2011-10-4 
         if ch ==  ?\C-u.getbyte(0)
           ret = universal_argument
@@ -2127,11 +2131,16 @@ module Canis
         case ch
         when -1
           return
-        when 1000
-          $log.debug " form RESIZE HK #{ch} #{self}, #{@name} "
+        when 1000, 12
+          # NOTE this works if widgets cover entire screen like text areas and lists but not in 
+          #  dialogs where there is blank space. only widgets are painted.
+          # testing out 12 is C-l
+          $log.debug " form REFRESH_ALL repaint_all HK #{ch} #{self}, #{@name} "
           repaint_all_widgets
           return
-        when FFI::NCurses::KEY_RESIZE # SIGWINCH 
+        when FFI::NCurses::KEY_RESIZE  # SIGWINCH 
+          # note that in windows that have dialogs or text painted on window such as title or 
+          #  box, the clear call will clear it out. these are not redrawn.
           lines = Ncurses.LINES
           cols = Ncurses.COLS
           x = Ncurses.stdscr.getmaxy
@@ -2578,7 +2587,6 @@ module Canis
   # 
   def handle_key ch
     @repaint_required = true 
-    #map_keys unless @keys_mapped # moved to init
     case ch
     when 32..126
       #$log.debug("FIELD: ch #{ch} ,at #{@curpos}, buffer:[#{@buffer}] bl: #{@buffer.to_s.length}")