rbcurse 1.2.0 → 1.3.0

data/lib/rbcurse/rtabbedwindow.rb

@@ -15,11 +15,11 @@
 
 =end
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -159,7 +159,7 @@ module RubyCurses
         form = tab.form
         form.window = @window if form.window.nil? ## XXX
         panel = form.window.panel
-        @buttons.last.command { Ncurses::Panel.top_panel(panel) 
+        @buttons.last.command { Ncurses::Panel.top_panel(panel.pointer) 
           Ncurses::Panel.update_panels();
           Ncurses.doupdate();
           form.repaint
@@ -173,7 +173,7 @@ module RubyCurses
     end
     def display_form form
       panel = form.window.panel
-      Ncurses::Panel.top_panel(panel) 
+      Ncurses::Panel.top_panel(panel.pointer) 
       Ncurses::Panel.update_panels();
       Ncurses.doupdate();
       form.repaint

data/lib/rbcurse/rtable.rb

@@ -25,7 +25,7 @@
 
 =end
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/table/tablecellrenderer'
@@ -34,7 +34,7 @@ require 'rbcurse/checkboxcellrenderer'
 require 'rbcurse/listselectable'
 require 'rbcurse/listkeys'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -1023,8 +1023,11 @@ module RubyCurses
       marker = @_first_column_print > 0 ?  Ncurses::ACS_CKBOARD : Ncurses::ACS_HLINE
       @graphic.mvwaddch @row+@height-1, @col+@_first_column_print+1, marker
     end
+    # print table header
+    # 2011-09-17 added repaint all check so that external components can triger this
+    # e.g. multi-container when it changes tables.
     def print_header
-      return unless @table_changed
+      return unless @table_changed || @repaint_all
           $log.debug " TABLE: inside printheader 2009-10-07 11:51  DDD "
 
       r,c = rowcol

data/lib/rbcurse/rtextarea.rb

@@ -16,14 +16,14 @@ Todo:
 
 =end
 require 'rubygems'
-require 'ncurses'
+##require 'ncurses' # FFI removed
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/listscrollable'
 require 'rbcurse/rinputdataevent'
 require 'rbcurse/listeditable'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -241,10 +241,10 @@ module RubyCurses
 
     def map_keys
       return if @keys_mapped
-      bind_key(KEY_LEFT){ cursor_backward }
-      bind_key(KEY_RIGHT){ cursor_forward }
-      bind_key(KEY_UP){ up }
-      bind_key(KEY_DOWN){ down }
+      bind_key(Ncurses::KEY_LEFT){ cursor_backward }
+      bind_key(Ncurses::KEY_RIGHT){ cursor_forward }
+      bind_key(Ncurses::KEY_UP){ up }
+      bind_key(Ncurses::KEY_DOWN){ down }
       bind_key(?\C-a){ cursor_bol }
       bind_key(?\C-e){ cursor_eol }
       bind_key(?\C-n) { scroll_forward }
@@ -297,11 +297,11 @@ module RubyCurses
         #cursor_backward
       #when KEY_RIGHT
         #cursor_forward
-      when KEY_BACKSPACE, KEY_BSPACE
+      when Ncurses.KEY_BACKSPACE, Ncurses.KEY_BSPACE
         if @editable   # checking here means that i can programmatically bypass!!
           delete_prev_char 
         end
-      when KEY_DELETE, ?\C-d.getbyte(0) # delete char
+      when Ncurses.KEY_DELETE, ?\C-d.getbyte(0) # delete char
         if @editable
           delete_curr_char 
         end

data/lib/rbcurse/rtextview.rb

@@ -16,12 +16,12 @@ TODO
 
 =end
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/listscrollable'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -497,6 +497,7 @@ module RubyCurses
     def sanitize content  #:nodoc:
       if content.is_a? String
         content.chomp!
+        # trying out since gsub giving #<ArgumentError: invalid byte sequence in UTF-8> 2011-09-11 
         content = content.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?")
         content.gsub!(/\t/, '  ') # don't display tab
         content.gsub!(/[^[:print:]]/, '')  # don't display non print characters

data/lib/rbcurse/rtree.rb

@@ -19,7 +19,7 @@ require 'rbcurse/tree/treecellrenderer'
 
 TreeSelectionEvent = Struct.new(:node, :tree, :state, :previous_node, :row_first)
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 module RubyCurses
   extend self
   # a representation of heirarchical data in outline form
@@ -430,7 +430,7 @@ module RubyCurses
 
       $log.debug "rtree repaint  #{@name} graphic #{@graphic}"
       print_borders unless @suppress_borders # do this once only, unless everything changes
-      maxlen = @maxlen ||= @width-@internal_width
+      maxlen = @maxlen || @width-@internal_width
       tm = _list()
       select_default_values
       rc = row_count

data/lib/rbcurse/rviewport.rb

@@ -17,12 +17,12 @@ Major change 2010-02-11 23:32
 
 =end
 #require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rchangeevent'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self

data/lib/rbcurse/rvimsplit.rb

@@ -95,7 +95,7 @@ module RubyCurses
       bind_key([?\C-w,?6], :increase_current_component)
       bind_key([?\C-w,?5], :decrease_current_component)
       # this needs to be set at application level
-      bind_key(KEY_F3) {RubyCurses::FocusManager.toggle_focusable}
+      bind_key(FFI::NCurses::KEY_F3) {RubyCurses::FocusManager.toggle_focusable}
     end
     def init_vars
       @repaint_required = true
@@ -498,7 +498,7 @@ module RubyCurses
           return ret 
         end
       end
-      $log.debug "XXX VIM unahdled by comp #{comp.name} "
+      $log.debug "XXX VIM key unhandled by comp #{comp.name} "
       case ch
       when ?\C-c.getbyte(0)
         $multiplier = 0
@@ -731,6 +731,7 @@ module RubyCurses
         if v?
           case ev.type
           when KEY_RIGHT
+            $log.debug "VIMSPLIT RIGHT "
             if @rc < @width - 3
               @recalculate_splits = true
               @rc += 1

data/lib/rbcurse/rwidget.rb

@@ -21,7 +21,7 @@ TODO
 
 =end
 require 'rubygems'
-require 'ncurses'
+##require 'ncurses'
 require 'logger'
 #require 'rbcurse/mapper'
 require 'rbcurse/colormap'
@@ -31,11 +31,20 @@ require 'rbcurse/io'
 
 # some of these will get overriden by ncurses when we include
 KEY_TAB    = 9
-#KEY_BTAB  = 353 # nc gives same
+KEY_F1  = FFI::NCurses::KEY_F1
+KEY_ENTER  = 10 # FFI::NCurses::KEY_ENTER gives 343
+KEY_BTAB  = 353 # nc gives same
 KEY_RETURN = 13  # Nc gives 343 for KEY_ENTER
 KEY_DELETE = 330
-KEY_BSPACE = 127 # Nc gives 263 for BACKSPACE
+KEY_BACKSPACE = KEY_BSPACE = 127 # Nc gives 263 for BACKSPACE
 KEY_CC     = 3   # C-c
+KEY_LEFT  = FFI::NCurses::KEY_LEFT
+KEY_RIGHT  = FFI::NCurses::KEY_RIGHT
+KEY_UP  = FFI::NCurses::KEY_UP
+KEY_DOWN  = FFI::NCurses::KEY_DOWN
+C_LEFT = 18168
+C_RIGHT = 18167
+S_F9 = 17949126
 
 class Object
 # thanks to terminal-table for this method
@@ -111,7 +120,7 @@ class Fixnum
    end
 end unless "a"[0] == "a"
 
-include Ncurses
+#include Ncurses XXX 2011-09-8 testing FFI
 module RubyCurses
   extend self
   include ColorMap
@@ -169,7 +178,7 @@ module RubyCurses
           return "left"
         when 261
           return "right"
-        when KEY_F1..KEY_F12
+        when FFI::NCurses::KEY_F1..FFI::NCurses::KEY_F12
           return "F"+ (keycode-264).to_s
         when 330
           return "delete"
@@ -185,6 +194,12 @@ module RubyCurses
           return "C-space" # i hope this is correct, just guessing
         when 160
           return "M-space" # at least on OSX Leopard now (don't remember this working on PPC)
+        when C_LEFT
+          return "C-left"
+        when C_RIGHT
+          return "C-right"
+        when S_F9
+          return "S_F9"
         else
           others=[?\M--,?\M-+,?\M-=,?\M-',?\M-",?\M-;,?\M-:,?\M-\,, ?\M-.,?\M-<,?\M->,?\M-?,?\M-/]
           others.collect! {|x| x.getbyte(0)  }  ## added 2009-10-04 14:25 for 1.9
@@ -243,6 +258,7 @@ module RubyCurses
         when String
           keycode = keycode.getbyte(0) #if keycode.class==String ##    1.9 2009-10-05 19:40 
           #$log.debug " #{name} Widg String called bind_key BIND #{keycode}, #{keycode_tos(keycode)}  "
+          $log.debug "XXX XX assigning #{keycode}  " if $log.debug? 
           @key_handler[keycode] = blk
         when Array
           # for starters lets try with 2 keys only
@@ -252,6 +268,7 @@ module RubyCurses
           a1 = keycode[1]
           a1 = keycode[1].getbyte(0) if keycode[1].class == String
           @key_handler[a0] ||= OrderedHash.new
+          $log.debug "XXX XX assigning #{keycode} , A0 #{a0} , A1 #{a1} " if $log.debug? 
           @key_handler[a0][a1] = blk
           #$log.debug "XXX XX assigning #{keycode} to  key_handler " if $log.debug? 
         else
@@ -284,16 +301,21 @@ module RubyCurses
           $log.debug " process_key: got #{keycode} , #{ch} "
           yn = ch.chr
           blk1 = blk[ch]
-          return nil if blk1.nil?
+          window.ungetch(ch) if blk1.nil? # trying  2011-09-27 
+          return :UNHANDLED if blk1.nil? # changed nil to unhandled 2011-09-27 
           $log.debug " process_key: found block for #{keycode} , #{ch} "
           blk = blk1
         end
         #$log.debug "called process_key #{object}, kc: #{keycode}, args  #{@key_args[keycode]}"
         if blk.is_a? Symbol
           $log.debug "SYMBOL " if $log.debug? 
-          return send(blk, *@key_args[keycode])
+          if respond_to? blk
+            return send(blk, *@key_args[keycode])
+          else
+            alert "This does not respond to #{blk.to_s} "
+          end
         else
-          $log.debug "BLOCJ " if $log.debug? 
+          $log.debug "rwidget BLOCK called _process_key " if $log.debug? 
           return blk.call object,  *@key_args[keycode]
         end
         #0
@@ -337,7 +359,7 @@ module RubyCurses
       # TODO: if an object throws a subclass of VetoException we should not catch it and throw it back for 
       # caller to catch and take care of, such as prevent LEAVE or update etc.
       def fire_handler event, object
-        $log.debug "inside def fire_handler evt:#{event}, o: #{object.class}, hdnler:#{@handler}"
+        $log.debug "inside def fire_handler evt:#{event}, o: #{object.class}"
         if !@handler.nil?
           if @_events
             raise ArgumentError, "#{self.class} does not support this event: #{event}. #{@_events} " if !@_events.include? event
@@ -349,15 +371,21 @@ module RubyCurses
             aeve = @event_args[event]
             ablk.each_with_index do |blk, ix|
               #$log.debug "#{self} called EventHandler firehander #{@name}, #{event}, obj: #{object},args: #{aeve[ix]}"
-              $log.debug "#{self} called EventHandler firehander #{@name}, #{event}"
+              #$log.debug "#{self} called EventHandler firehander #{@name}, #{event}"
               begin
                 blk.call object,  *aeve[ix]
+              rescue FieldValidationException => fve
+                # added 2011-09-26 1.3.0 so a user raised exception on LEAVE
+                # keeps cursor in same field.
+                raise fve
               rescue => ex
-                $log.error "======= Error ERROR in block event #{self}: #{name}, #{event}"
+                ## some don't have name
+                #$log.error "======= Error ERROR in block event #{self}: #{name}, #{event}"
+                $log.error "======= Error ERROR in block event #{self}:  #{event}"
                 $log.error ex
                 $log.error(ex.backtrace.join("\n")) 
                 #$error_message = "#{ex}" # changed 2010  
-                $error_message.value = "#{ex}"
+                $error_message.value = "#{ex.to_s}"
                 Ncurses.beep
               end
             end
@@ -566,6 +594,7 @@ module RubyCurses
     end
     ##
     # default repaint method. Called by form for all widgets.
+    # XXX widget does not have display_length.
     def repaint
         r,c = rowcol
         $log.debug("widget repaint : r:#{r} c:#{c} col:#{@color}" )
@@ -586,7 +615,7 @@ module RubyCurses
     def destroy
       $log.debug "DESTROY : widget #{@name} "
       panel = @window.panel
-      Ncurses::Panel.del_panel(panel) if !panel.nil?   
+      Ncurses::Panel.del_panel(panel.pointer) if !panel.nil?   
       @window.delwin if !@window.nil?
     end
     # @deprecated pls call windows method
@@ -1221,6 +1250,9 @@ module RubyCurses
          $log.debug " formrepaint #{@name} calling window.wrefresh #{@window} "
          @window.wrefresh
          Ncurses::Panel.update_panels ## added 2010-11-05 00:30 to see if clears the stdscr problems
+       else
+         $log.warn " XXX formrepaint #{@name} no refresh called  2011-09-19  #{@window} "
+         #@window.wrefresh # trying FFI 2011-09-19 
        end
     end
     ## 
@@ -1330,7 +1362,7 @@ module RubyCurses
         @active_index = ix0
         @row, @col = f.rowcol
        #$log.debug " WMOVE insdie sele nxt field : ROW #{@row} COL #{@col} " 
-        @window.wmove @row, @col
+        @window.wmove @row, @col # added RK FFI 2011-09-7 
         on_enter f
         f.curpos = 0
         repaint
@@ -1603,7 +1635,8 @@ module RubyCurses
         case ch
         when -1
           return
-        when Ncurses::KEY_RESIZE # SIGWINCH
+        #when Ncurses::KEY_RESIZE # SIGWINCH
+        when FFI::NCurses::KEY_RESIZE # SIGWINCH #  FFI
           lines = Ncurses.LINES
           cols = Ncurses.COLS
           x = Ncurses.stdscr.getmaxy
@@ -1625,12 +1658,12 @@ module RubyCurses
               ret = select_next_field
               return ret if ret == :NO_NEXT_FIELD
               # alt-shift-tab  or backtab (in case Table eats backtab)
-            when KEY_BTAB, 481 ## backtab added 2008-12-14 18:41 
+            when FFI::NCurses::KEY_BTAB, 481 ## backtab added 2008-12-14 18:41 
               ret = select_prev_field
               return ret if ret == :NO_PREV_FIELD
-            when KEY_UP
+            when FFI::NCurses::KEY_UP
               select_prev_field
-            when KEY_DOWN
+            when FFI::NCurses::KEY_DOWN
               select_next_field
             #when ?\M-L.getbyte(0)
               ### trying out these for fuun and testing splitpane 2010-01-10 20:32 
@@ -1649,7 +1682,7 @@ module RubyCurses
             else
               #$log.debug "XXX before calling process_key in form #{ch}  " if $log.debug? 
               ret = process_key ch, self
-              $log.debug " process_key #{ch} got ret #{ret} in #{self} "
+              $log.debug "FORM process_key #{ch} got ret #{ret} in #{self} "
               return :UNHANDLED if ret == :UNHANDLED
             end
           end
@@ -1991,9 +2024,9 @@ module RubyCurses
   end
   def map_keys
     return if @keys_mapped
-    bind_key(KEY_LEFT){ cursor_backward }
-    bind_key(KEY_RIGHT){ cursor_forward }
-    bind_key(KEY_BACKSPACE){ delete_prev_char }
+    bind_key(FFI::NCurses::KEY_LEFT){ cursor_backward }
+    bind_key(FFI::NCurses::KEY_RIGHT){ cursor_forward }
+    bind_key(FFI::NCurses::KEY_BACKSPACE){ delete_prev_char }
     bind_key(127){ delete_prev_char }
     bind_key(330){ delete_curr_char }
     bind_key(?\C-a){ cursor_home }
@@ -2166,6 +2199,7 @@ module RubyCurses
       if modified?
         set_modified true
       end
+      # if super fails we would have still set modified to true
       super
       #return valid
     end
@@ -2497,6 +2531,7 @@ module RubyCurses
     def repaint  # button
         #$log.debug("BUTTon repaint : #{self}  r:#{@row} c:#{@col} #{getvalue_for_paint}" )
         r,c = @row, @col #rowcol include offset for putting cursor
+        # NOTE: please override both (if using a string), or else it won't work 
         @highlight_foreground ||= $reversecolor
         @highlight_background ||= 0
         bgcolor = @state==:HIGHLIGHTED ? @highlight_background : @bgcolor
@@ -2544,13 +2579,13 @@ module RubyCurses
     # Button
     def handle_key ch
       case ch
-      when KEY_LEFT, KEY_UP
+      when FFI::NCurses::KEY_LEFT, FFI::NCurses::KEY_UP
         return :UNHANDLED
         #  @form.select_prev_field
-      when KEY_RIGHT, KEY_DOWN
+      when FFI::NCurses::KEY_RIGHT, FFI::NCurses::KEY_DOWN
         return :UNHANDLED
         #  @form.select_next_field
-      when KEY_ENTER, 10, 13, 32  # added space bar also
+      when FFI::NCurses::KEY_ENTER, 10, 13, 32  # added space bar also
         if respond_to? :fire
           fire
         end
@@ -2764,7 +2799,9 @@ module RubyCurses
 
   def self.startup
     VER::start_ncurses
-    $log = Logger.new("view.log")
+    path = File.join(ENV["LOGDIR"] || "./" ,"rbc13.log")
+    file   = File.open(path, File::WRONLY|File::TRUNC|File::CREAT) 
+    $log = Logger.new(path)
     $log.level = Logger::DEBUG
   end