rbcurse 1.2.0 → 1.3.0

data/lib/rbcurse/rmenu.rb

@@ -21,11 +21,11 @@ NOTE on 2010-09-10 11:40 : this interface is based on Java's and is not block fr
 
 =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
@@ -388,7 +388,7 @@ module RubyCurses
       return if @window.nil?
       @visible = false
       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?
       @items.each do |item|
         #next if item == :SEPARATOR
@@ -662,7 +662,7 @@ module RubyCurses
       $log.debug "DESTRY menubar "
       @visible = false
       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?
       @items.each do |item|
         item.destroy

data/lib/rbcurse/rmessagebox.rb

@@ -214,7 +214,7 @@ module RubyCurses
     def print_borders
       width = @layout[:width]
       height = @layout[:height]
-      @window.print_border_mb 1,2, height, width, $normalcolor, A_REVERSE
+      @window.print_border_mb 1,2, height, width, $normalcolor, FFI::NCurses::A_REVERSE
 =begin
       start = 2
       hline = "+%s+" % [ "-"*(width-((start+1)*2)) ]
@@ -268,7 +268,11 @@ module RubyCurses
       # 2008-12-30 19:45 experimenting with label so we can get justify and wrapping.
       #@window.printstring( row, @message_col , message, color=$reversecolor)
         #$log.debug " print_message: row #{row}, col #{@message_col} "
-      message_label = RubyCurses::Label.new @form, {'text' => message, "name"=>"message_label","row" => row, "col" => @message_col, "display_length" => display_length,  "height" => @message_height, "attr"=>"reverse"}
+      #message_label = RubyCurses::Label.new @form, {'text' => message, "name"=>"message_label","row" => row, "col" => @message_col, "display_length" => display_length,  "height" => @message_height, "attr"=>"reverse"}
+      # 2011-09-20 trying to take care of when user changes color and bgcolor while calling.
+      clr = @color || :black
+      bgclr = @bgcolor || :white
+      message_label = RubyCurses::Label.new @form, {'text' => message, "name"=>"message_label","row" => row, "col" => @message_col, "display_length" => display_length,  "height" => @message_height, 'bgcolor' => bgclr , 'color' => clr}
 
     end
     def print_input
@@ -280,7 +284,7 @@ module RubyCurses
       c = @message_col
       disp_len = @layout[:width]-8
       defaultvalue = @default_value || ""
-      input_config = @config["input_config"] || {}
+      input_config = @config["input_config"] || {} # see test1.rb for usage example
       case @type.to_s 
       when "input"
         @input = RubyCurses::Field.new @form, input_config do
@@ -337,9 +341,10 @@ module RubyCurses
       @layout = { :height => height, :width => width, :top => top, :left => left } 
     end
     def destroy
-      $log.debug "DESTROY : widget"
+      $log.debug "DESTROY : messagebox"
       panel = @window.panel
-      Ncurses::Panel.del_panel(panel) if !panel.nil?   
+      #Ncurses::Panel.del_panel(panel) if !panel.nil?   
+      panel.del_panel if !panel.nil?
       @window.delwin if !@window.nil?
     end
   end

data/lib/rbcurse/rmulticontainer.rb

@@ -9,11 +9,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
@@ -37,10 +37,15 @@ module RubyCurses
     end
     def init_vars
       super
+      # the following allows us to navigate buffers with :bn :bp etc (with Alt pressed)
       bind_key(?\M-:, :buffer_menu)
+      bind_key(?\M-;, :buffer_menu)
       # bind_key([?\C-x, ?f], :file_edit)
       bind_key([?\C-x, ?k], :delete_component)
       bind_key([?\C-x, ?\C-b], :list_components)
+      bind_key(?\M-n, :goto_next_component)
+      bind_key(?\M-p, :goto_prev_component)
+      bind_key(?\M-1, :goto_first_component)
       # easily cycle using p. n is used for next search.
       #bind_key(?p, :buffer_previous)
       @suppress_borders = false 
@@ -55,16 +60,21 @@ module RubyCurses
     ## 
     # multi-container
     def handle_key ch  #:nodoc:
-      $log.debug " MULTI handlekey #{ch}, #{@current_component}  "
+      #$log.debug " MULTI handlekey #{ch}, #{@current_component}"
       ret = :UNHANDLED
       return :UNHANDLED unless @current_component
       ret = @current_component.handle_key(ch)
-      $log.debug " MULTI = comp returned #{ret} "
+      $log.debug " MULTI = comp #{@current_component} returned #{ret} "
       if ret == :UNHANDLED
         # check for bindings, these cannot override above keys since placed at end
         begin
           ret = process_key ch, self
           $log.debug " MULTI = process_key returned #{ret} "
+          if ch > 177 && ch < 187
+            n = ch - 177
+            component_at(n)
+            # go to component n
+          end
         rescue => err
 #          $error_message = err # changed 2010 dts  
           $error_message.value = err
@@ -155,8 +165,10 @@ module RubyCurses
     end
 
     def component_at index
-      @current_component = @bmanager.element_at index
-      $log.debug " buffer_last got #{@current_component} "
+      cc = @bmanager.element_at index
+      return unless cc 
+      @current_component = cc 
+      #$log.debug " buffer_last got #{@current_component} "
       set_current_component
     end
     ##
@@ -164,14 +176,15 @@ module RubyCurses
     # @param [Widget] component
     # @param [String] title
     def add component, title
-      component.row = @row+@row_offset+0 # changed 1 to 0 2011-09-14 
-      component.col = @col+@col_offset+0 # changed 1 to 0 2011-09-14 
+      component.row = @row+@row_offset+0 # FFI changed 1 to 0 2011-09-12 
+      component.col = @col+@col_offset+0 # FFI changed 1 to 0 2011-09-12 
       component.width = @width-2
       component.height = @height-2
       component.form = @form
       component.override_graphic(@graphic)
       @current_component = @bmanager.add component, title
       set_current_component
+      set_form_row ## FFI added 2011-09-12 to get cursor at start when adding
       $log.debug " ADD got cb : #{@current_component} "
     end
     def set_current_component

data/lib/rbcurse/rmultisplit.rb

@@ -18,11 +18,11 @@ Todo:
 
 =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

data/lib/rbcurse/rmultitextview.rb

@@ -12,13 +12,13 @@
 
 =end
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rtextview'
 require 'rbcurse/listscrollable'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -258,7 +258,9 @@ module RubyCurses
     end
     def insert filename, position, title=nil
       # read up file
-      list = @source.set_content File.open(filename,"r").readlines
+      lines = File.open(filename,"r").readlines
+      $log.debug "multitextview loaded #{filename}, #{lines.size} lines " if $log.debug? 
+      list = @source.set_content lines
       # set new RBuffer
       title = filename unless title
       raise "invalid value for list, Should be an array #{list.class} " unless list.is_a? Array

data/lib/rbcurse/rpopupmenu.rb

@@ -394,7 +394,7 @@ module RubyCurses
       return if @window.nil?
       @visible = false
       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? # FFI
       @items.each do |item|
         #next if item == :SEPARATOR
@@ -527,7 +527,7 @@ module RubyCurses
       $log.debug "DESTRY popup "
       @visible = false
       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? # FFI
       @items.each do |item|
         item.destroy
@@ -699,7 +699,7 @@ module RubyCurses
       $log.debug "DESTRY menubar "
       @visible = false
       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?
       @items.each do |item|
         item.destroy

data/lib/rbcurse/rprogress.rb

@@ -1,8 +1,8 @@
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -22,6 +22,7 @@ module RubyCurses
       @col = config.fetch("col",-1) 
       @bgcolor = config.fetch("bgcolor", $def_bg_color)
       @color = config.fetch("color", $def_fg_color)
+      @name = config.fetch("name", "pbar")
       @editable = false
       @focusable = false
       super

data/lib/rbcurse/rscrollform.rb

@@ -19,11 +19,11 @@ area but finish outside, or vice versa.
     What if we wish some static text to be displayed at top or bottom of ScrollForm
 =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

data/lib/rbcurse/rscrollpane.rb

@@ -31,12 +31,12 @@ Major changes 2010-02-11 19:51 to simplify version RFED16
 
 =end
 #require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rviewport'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -449,10 +449,10 @@ module RubyCurses
       r = @row #+ @ext_row_offset # 2010-02-11 11:57 RFED16
       c = @col #+ @ext_col_offset # 2010-02-11 11:57 RFED16
       $log.debug " h_scroll_bar start #{start}, r #{r} c #{c} h:#{@height} "
-      @graphic.rb_mvwhline(r+@height-1, c+1, ACS_HLINE, @width-2)
+      @graphic.rb_mvwhline(r+@height-1, c+1, FFI::NCurses::ACS_HLINE, @width-2)
       # draw scroll bar
-      #sz.times{ |i| @graphic.mvaddch(r+@height-1, c+start+1+i, ACS_CKBOARD) }
-      sz.times{ |i| @graphic.rb_mvaddch(r+@height-1, c+start+1+i, ACS_CKBOARD) }
+      #sz.times{ |i| @graphic.mvaddch(r+@height-1, c+start+1+i, FFI::NCurses::ACS_CKBOARD) }
+      sz.times{ |i| @graphic.rb_mvaddch(r+@height-1, c+start+1+i, FFI::NCurses::ACS_CKBOARD) }
     end
     def v_scroll_bar
         return if @viewport.nil?
@@ -470,11 +470,11 @@ module RubyCurses
       # # the problem with next 2 lines is that attributes of border could be overwritten
       # draw verti line
       # this is needed to erase previous bar when shrinking
-      #@graphic.mvwvline(r+1,c+@width-1, ACS_VLINE, @height-2)
-      @graphic.rb_mvwvline(r+1,c+@width-1, ACS_VLINE, @height-2)
+      #@graphic.mvwvline(r+1,c+@width-1, FFI::NCurses::ACS_VLINE, @height-2)
+      @graphic.rb_mvwvline(r+1,c+@width-1, FFI::NCurses::ACS_VLINE, @height-2)
       # draw scroll bar
-      #sz.times{ |i| @graphic.mvaddch(r+start+1+i, c+@width-1, ACS_CKBOARD) }
-      sz.times{ |i| @graphic.rb_mvaddch(r+start+1+i, c+@width-1, ACS_CKBOARD) }
+      #sz.times{ |i| @graphic.mvaddch(r+start+1+i, c+@width-1, FFI::NCurses::ACS_CKBOARD) }
+      sz.times{ |i| @graphic.rb_mvaddch(r+start+1+i, c+@width-1, FFI::NCurses::ACS_CKBOARD) }
     end
     # set height
     # a container must pass down changes in size to it's children

data/lib/rbcurse/rsplitpane.rb

@@ -18,11 +18,11 @@ Todo:
 
 =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

data/lib/rbcurse/rsplitpane2.rb

@@ -22,11 +22,11 @@ Todo:
 
 =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

data/lib/rbcurse/rtabbedpane.rb

@@ -3,6 +3,9 @@
   * Description: 
   * A tabbed pane, mostly based (iirc) on the Terminal Preferences in OSX PPC 10.5.x
   * Starting a new version using pads 2009-10-25 12:05 
+TODO - need to rewrite this pronto. 1.3.1 or 1.3.2 should have a rewritten TabbedPane
+NOTE:  PLEASE AVOID THIS. USE MULTI_CONTAINERS if you need inside a form.
+       TABBEDWINDOW IS OKAY IF YOU ARE POPPING A TABBEDPANE UP.
   * Author: rkumar
   
   --------
@@ -22,13 +25,13 @@ NOTE:
   # TODO :  disable/hide tab ???
 =end
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 
 KEY_TAB = 9
 KEY_BTAB = 353
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
@@ -112,7 +115,7 @@ module RubyCurses
     end
     # In order to get tab display as we traverse buttons, we need to tamper with KEY_DOWN
     # since that's the only way of getting down to selected tab in this case.
-    def handle_key ch
+    def handle_key ch # tabbed button
       case ch
       when  KEY_DOWN
         # form will not do a next_field, it will ignore this
@@ -299,7 +302,7 @@ module RubyCurses
     ## create a form for tab, if multiple components are to be placed inside tab.
     #  Tabbedpane has no control over placement and width etc of what's inside a form
     def form tab
-      if tab.form.nil?
+      if !tab.has_form?
         @forms << create_tab_form(tab)
         tab.form = @forms.last
       end
@@ -338,6 +341,7 @@ module RubyCurses
       _recreate_buttons if @recreate_buttons
       $log.debug " tabbedpane repaint #{@window.name} "
       @window.show
+      @window.wrefresh # trying out FFI 2011-09-19 since form not being refreshed
       #x set_buffer_modified()
     end
     def show
@@ -380,12 +384,13 @@ module RubyCurses
         # if col exceeds pad_w then we need to expand pad
         # but here we don't know that a pad is being used
         $log.debug " button col #{col} " 
-        form = tab.form
+#        form = tab.form # changed 2011  2011-09-26 
+        form = form(tab)
         form.set_parent_buffer(@window) if form
 
         b = @buttons.last
         b.command(b) { 
-          $log.debug " calling display form from button press #{b.name} #{b.state} "
+          $log.debug " calling tab.repaint,button_form_repaint from button press #{b.name} #{b.state} "
           # form.rep essentially sees that buttons get correct attributes
           # when triggering M-<char>. This button should get highlighted.
           tab.repaint
@@ -456,7 +461,8 @@ module RubyCurses
         # repaint form and refresh pad
         @form.repaint
       else
-        # only refresh pad
+        # only refresh pad 
+        # - 2011-09-19 I don't think this is called, prolly give an error
         @form.prefresh
       end
     end
@@ -632,7 +638,7 @@ module RubyCurses
       attr_accessor :text
       attr_reader :config
       attr_reader :component
-      attr_accessor :form
+      #attr_accessor :form
       attr_accessor :parent_component
       attr_accessor :index
       def initialize text, parent_component,  aconfig={}, &block
@@ -661,13 +667,20 @@ module RubyCurses
       end
       # tab should handle key instead of TP.
       # Pass to component or form
-      def handle_key ch
+      def handle_key ch # Tab
         kh = @component || @form
         ret = kh.handle_key(ch)
+       $log.debug "DEBUG : handle_key Tab got ret #{ret} "
         # forms seem to returning a nil when the pad has been updated. We need to copy it
         ret ||= 0
-        if ret == 0 
+        if ret == 0 || ret == :UNHANDLED
+          $log.debug "COMPONENT REPAINT CALLING " if $log.debug? 
           @component.repaint if @component
+          #@form.window.refresh
+          #$log.debug "DEBUG calling display form(false) from handle_key XXX" if @form
+          #display_form false if @form # this caused others to go blank 2011-09-26 
+        elsif ret != :UNHANDLED # FFI trying out, since forms with components not displaying changes
+          # since moving to FFI. 
           display_form false if @form
         end
         # XXX i need to call repaint of compoent if updated !!
@@ -675,6 +688,7 @@ module RubyCurses
       end
       def repaint # Tab
         if @form
+          $log.debug "DEBUG calling display form(true) from repaint XXX" if $log.debug?
           display_form
         elsif @component
           # we ask the component to paint its buffer only, no actual repainting
@@ -706,7 +720,7 @@ module RubyCurses
           if !@form.nil?
             # move to first field of existing form
             #@current_form = @current_tab.form # 2010-02-27 20:22 
-            $log.debug " calling display form from handle_key NO_NEXT_FIELD: #{first_last} "
+            $log.debug " calling display form(true) from handle_key NO_NEXT_FIELD: #{first_last} "
             first_last == :FIRST ? @form.req_first_field : @form.req_last_field
             display_form
           else 
@@ -734,7 +748,7 @@ module RubyCurses
       end
       pc = @parent_component
       form.repaint if flag #   added 2009-11-03 23:27  paint widgets in inside form
-      $log.debug " TP display form before pad copy: #{pad.name}, set_backing: #{form}: #{form.name} parent: #{@parent_component} : #{pc.row} , #{pc.col}. #{pc.height} , #{pc.width}: repaint flag #{flag}   "
+      $log.debug " TP display form(#{flag})  before pad copy: #{pad.name}, set_backing: #{form}: #{form.name} parent: #{@parent_component} : #{pc.row} , #{pc.col}. #{pc.height} , #{pc.width}: repaint flag #{flag}   "
       ret = -1
       pminr = pminc = 0
       r = pc.row + 2
@@ -747,6 +761,28 @@ module RubyCurses
       $log.debug " display form after pad copy #{ret}. #{form.name} "
     end
 
+    # 2011-09-19 @since 1.3.0 changed so that calling form throws an exception
+    # if it's nil. Please use Tabbedpane's form() to get a form. This throws an exception
+    # so i can catch old programs that use the incorrect method
+    def form(*val)
+      if val.empty?
+        return @form if @form
+        raise "Form is nil. You may be using deprecated method. Use @tp.form, not @tab.form"
+      else
+        #raise ArgumentError "form should be ... " if val[0] ...
+        oldvalue = @form
+        @form = val[0]
+      end
+      self
+    end
+    # used by TP to set form
+    def form=(val)
+      @form = val
+    end
+    # used by TP to check form, since the other methods throws an exception
+    def has_form?
+      !@form.nil?
+    end
     end # class Tab
 
   end # class Tabbedpane