rbcurse 1.3.0 → 1.4.0

data/lib/rbcurse/rdialogs.rb

@@ -5,6 +5,11 @@
   
   --------
   * Date:  2008-12-30 12:22 
+  * 2011-10-1 : moving print_error and print_status methods here as alternatives
+                to alert and confirm. Anyone who has included those will get these.
+                And this file is included in the base file.
+
+               Shucks, this file has no module. It's bare !
   * License:
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
@@ -12,8 +17,6 @@ TODO:
     Add one get_string(message, len, regex ...)
     Add select_one (message, values, default)
 =end
-require 'rubygems'
-##require 'ncurses'
 require 'logger'
 require 'rbcurse/rwidget'
 require 'rbcurse/rmessagebox'
@@ -26,6 +29,7 @@ require 'rbcurse/rmessagebox'
 # alert("You did not enter anything!", "title"=>"Wake Up")
 # alert("You did not enter anything!", {"title"=>"Wake Up", "bgcolor"=>"blue", "color"=>"white"})
 # block currently ignored. don't know what to do, can't pass it to MB since alread sending in a block
+#
 def alert text, config={}, &block
   title = config['title'] || "Alert"
   #instance_eval &block if block_given?
@@ -38,6 +42,8 @@ def alert text, config={}, &block
     button_type :ok
   end
 end
+# confirms from user returning :YES or :NO
+# Darn, should have returned boolean, now have to live with it.
 def confirm text, config={}, &block
   title = config['title'] || "Confirm"
   #instance_eval &block if block_given?
@@ -158,6 +164,185 @@ def get_string_with_options(message, len=20, default="", config={})
   return mb.selected_index, mform.by_name['input'].getvalue, hash
 end
 
+# ------------------------ We've Moved here from window class ---------------- #
+#                                                                              #
+#  Moving some methods from window. They no longer require having a window.    #
+#                                                                              #
+# ---------------------------------------------------------------------------- #
+#
+#
+
+  # new version with a window created on 2011-10-1 12:37 AM 
+  # Now can be separate from window class, needing nothing, just a util class
+  # prints a status message and pauses for a char
+  def print_status_message text, aconfig={}, &block
+    _print_message :status, text, aconfig, &block
+  end
+  # new version with a window created on 2011-10-1 12:30 AM 
+  # Now can be separate from window class, needing nothing, just a util class
+  # Why are we dealing with $error_message, that was due to old idea which failed
+  # scrap it and send the message.
+  def print_error_message text, aconfig={}, &block
+    _print_message :error, text, aconfig, &block
+  end
+  def _create_footer_window h = 2 , w = Ncurses.COLS, t = Ncurses.LINES-2, l = 0
+    ewin = VER::Window.new(h, w , t, l)
+  end
+  # @param [:symbol] :error or :status kind of message
+  # @private
+  def _print_message type, text, aconfig={}, &block
+    case text
+    when RubyCurses::Variable # added 2011-09-20 incase variable passed
+      text = text.get_value
+    when Exception
+      text = text.to_s
+    end
+    # NOTE we are polluting global namespace
+    aconfig.each_pair { |k,v| instance_variable_set("@#{k}",v) }
+    ewin = _create_footer_window #*@layout
+    r = 0; c = 1;
+    case type 
+    when :error
+      @color ||= 'red'
+      @bgcolor ||= 'black'
+    else
+      @color ||= :white
+      @bgcolor ||= :black
+    end
+    color_pair = get_color($promptcolor, @color, @bgcolor)
+    ewin.bkgd(Ncurses.COLOR_PAIR(color_pair));
+    ewin.printstring r, c, text, color_pair
+    ewin.printstring r+1, c, "Press a key", color_pair
+    ewin.wrefresh
+    ewin.getchar
+    ewin.destroy
+  end
+  #
+  # Alternative to confirm dialog, if you want this look and feel, at last 2 lines of screen
+  # @param [String] text to prompt
+  # @return [true, false] 'y' is true, all else if false
+  def confirm_window text, aconfig={}, &block
+    case text
+    when RubyCurses::Variable # added 2011-09-20 incase variable passed
+      text = text.get_value
+    when Exception
+      text = text.to_s
+    end
+    ewin = _create_footer_window
+    r = 0; c = 1;
+    aconfig.each_pair { |k,v| instance_variable_set("@#{k}",v) }
+    @color ||= :white
+    @bgcolor ||= :black
+    color_pair = get_color($promptcolor, @color, @bgcolor)
+    ewin.bkgd(Ncurses.COLOR_PAIR(color_pair));
+    ewin.printstring r, c, text, color_pair
+    ewin.printstring r+1, c, "[y/n]", color_pair
+    ewin.wrefresh
+    #retval = false
+    retval = :NO # consistent with confirm
+    begin
+      ch =  ewin.getchar 
+      retval = :YES if ch.chr == 'y' 
+    ensure
+      ewin.destroy
+    end
+    retval
+  end
+  # class created to display multiple messages without asking for user to hit a key
+  # returns a window to which one can keep calling printstring with 0 or 1 as row.
+  # destroy when finished.
+  # Also, one can pause if one wants, or linger.
+  # This is meant to be a replacement for the message_immediate and message_raw
+  # I was trying out in App.rb. 2011-10-1 1:27 AM 
+  # Testing from test2.rb
+  # TODO: add option of putting progress_bar
+  class StatusWindow
+    attr_reader :h, :w, :top, :left # height, width, top row, left col of window
+    attr_reader :win
+    attr_accessor :color_pair
+    def initialize config={}, &block
+      @color_pair = config[:color_pair]
+      @row_offset = config[:row_offset] || 0
+      @col_offset = config[:col_offset] || 0
+      create_window *config[:layout]
+    end
+    def create_window h = 2 , w = Ncurses.COLS-0, t = Ncurses.LINES-2, l = 0
+      return @win if @win
+      @win = VER::Window.new(h, w , t, l)
+      @h = h ; @w = w; @top = t ; @left = l
+      @color_pair ||= get_color($promptcolor, 'white','black')
+      @win.bkgd(Ncurses.COLOR_PAIR(@color_pair));
+      @win
+    end
+    # creates a color pair based on given bg and fg colors as strings
+    #def set_colors bgcolor, fgcolor='white'
+      #@color_pair = get_color($datacolor, 'white','black')
+    #end
+    # prints a string on given row (0 or 1)
+    def printstring r, c, text, color_pair=@color_pair
+      create_window unless @win
+      show unless @visible
+      r = @h-1 if r > @h-1
+      #@win.printstring r, c, ' '*@w, @color_pair
+      # FIXME this padding overwrites the border and the offset means next line wiped
+      # However, now it may now totally clear a long line.
+      @win.printstring r+@row_offset, c+@col_offset, "%-*s" % [@w-(@col_offset*2)-c, text], color_pair
+      @win.wrefresh
+    end
+    # print given strings from first first column onwards
+    def print *textarray
+      create_window unless @win
+      show unless @visible
+      c = 1
+      textarray.each_with_index { |s, i|  
+        @win.printstring i+@row_offset, c+@col_offset, "%-*s" % [@w-(@col_offset*2)-c, s], @color_pair
+      }
+      @win.wrefresh
+    end
+    def pause; @win.getchar; end
+    # pauses with the message, but doesn't ask the user to press a key.
+    # If he does, the key should be used by underlying window.
+    # Do not call destroy if you call linger, it does the destroy.
+    def linger caller_window=nil
+      begin
+        if caller_window
+          ch = @win.getchar
+          caller_window.ungetch(ch) # will this be available to underlying window XXX i think not !!
+        else
+          sleep 1
+        end
+      ensure
+        destroy
+      end
+    end
+    # caller must destroy after he's finished printing messages, unless
+    # user calls linger
+    def destroy; @win.destroy if @win; @win = nil;  end
+    def hide
+      @win.hide
+      @visible = false
+    end
+    def show
+      @win.show unless @visible
+      @visible = true
+    end
+  end
+  # returns instance of a status_window for sending multiple
+  # statuses during some process
+  def status_window aconfig={}, &block
+    return StatusWindow.new aconfig
+  end
+  # this is a popup dialog box on which statuses can be printed as a process is taking place.
+  # I am reusing StatusWindow and so there's an issue since I've put a box, so in clearing 
+  # the line, I might overwrite the box
+  def progress_dialog aconfig={}, &block
+    aconfig[:layout] = [10,60,10,20]
+    window = status_window aconfig
+    height = 10; width = 60
+    window.win.print_border_mb 1,2, height, width, $normalcolor, FFI::NCurses::A_REVERSE
+    return window
+  end
+#
 =begin  
 http://www.kammerl.de/ascii/AsciiSignature.php
  ___  

data/lib/rbcurse/rlistbox.rb

@@ -58,9 +58,6 @@ module RubyCurses
     def each(&blk)
       @list.each(&blk)
     end
-    #def each 
-    #  @list.each { |item| yield item }
-    #end
     # not sure how to do this XXX  removed on 2009-01-14 12:28 
     #def <=>(other)
     #  @list <=> other
@@ -309,7 +306,13 @@ module RubyCurses
         when KEY_ENTER, 10, 13
           # if you press ENTER without selecting, it won't come here
           # it will fire button OK's fire, if that's the default button
-          fire_handler :PRESS, @listbox.focussed_index
+
+          # returns an array of indices if multiple selection
+          if @listbox.selection_mode == :multiple
+            fire_handler :PRESS, @listbox
+          else
+            fire_handler :PRESS, @listbox.focussed_index
+          end
           # since Listbox is handling enter, COMBO_SELECT will not be fired
         # $log.debug "popup ENTER :  #{field.name}" if !field.nil?
           @stop = true
@@ -462,8 +465,6 @@ module RubyCurses
       @win_left = 0
       @win_top = 0
 
-#x      safe_create_buffer # 2010-01-04 12:36 BUFFERED moved here 2010-01-05 18:07 
-#x      print_borders unless @win.nil?   # in messagebox we don;t have window as yet!
       # next 2 lines carry a redundancy
       select_default_values   
       # when the combo box has a certain row in focus, the popup should have the same row in focus
@@ -471,6 +472,7 @@ module RubyCurses
       install_keys
       init_vars
       install_list_keys
+      bind(:PROPERTY_CHANGE){|e| @cell_renderer = nil } # will be recreated if anything changes 2011-09-28 V1.3.1  
 
       if @list && !@list.selected_index.nil? 
         set_focus_on @list.selected_index # the new version
@@ -627,7 +629,7 @@ module RubyCurses
       end
     end
     # added 2010-09-15 00:11 to make life easier
-    def_delegators :@list, :insert, :remove_all, :delete_at, :include?
+    def_delegators :@list, :insert, :remove_all, :delete_at, :include?, :each, :values
     # get element at
     # @param [Fixnum] index for element
     # @return [Object] element
@@ -661,7 +663,8 @@ module RubyCurses
       startcol = @col 
       startrow = @row 
       @color_pair = get_color($datacolor)
-      bordercolor = @border_color || $datacolor
+#      bordercolor = @border_color || $datacolor # changed 2011 dts  
+      bordercolor = @border_color || @color_pair
       borderatt = @border_attrib || Ncurses::A_NORMAL
 
       #$log.debug "rlistb #{name}: window.print_border #{startrow}, #{startcol} , h:#{height}, w:#{width} , @color_pair, @attr "
@@ -737,7 +740,7 @@ module RubyCurses
       when @KEY_CLEAR_SELECTION
         clear_selection 
         @repaint_required = true
-      when 27, ?\C-c.getbyte(0)
+      when 27, ?\C-c.getbyte(0), ?\C-g.getbyte(0)
         editing_canceled @current_index if @cell_editing_allowed
         cancel_block # block
         $multiplier = 0
@@ -847,7 +850,8 @@ module RubyCurses
     # @return [Boolean] false if no data
     def on_enter
       if @list.nil? || @list.size == 0
-        Ncurses.beep
+        #Ncurses.beep
+        get_window.ungetch($current_key) # 2011-10-4 push key back so form can go next
         return :UNHANDLED
       end
       on_enter_row @current_index
@@ -886,10 +890,10 @@ module RubyCurses
       editor.component.curpos = 0 # reset it after search, if user scrols down
       #editor.component.graphic = @graphic #  2010-01-05 00:36 TRYING OUT BUFFERED
       ## override is required if the listbox uses a buffer
-      if @should_create_buffer
-        $log.debug " overriding editors comp with GRAPHIC #{@graphic} "
-        editor.component.override_graphic(@graphic) #  2010-01-05 00:36 TRYING OUT BUFFERED
-      end
+      #if @should_create_buffer # removed on 2011-09-29 
+        #$log.debug " overriding editors comp with GRAPHIC #{@graphic} "
+        #editor.component.override_graphic(@graphic) #  2010-01-05 00:36 TRYING OUT BUFFERED
+      #end
       set_form_col 0 #@left_margin
 
       # set original value so we can cancel
@@ -951,7 +955,6 @@ module RubyCurses
     # processing. also, it pans the data horizontally giving the renderer
     # a section of it.
     def repaint
-      safe_create_buffer # 2010-01-04 12:36 BUFFERED moved here 2010-01-05 18:07 
       return unless @repaint_required
       # not sure where to put this, once for all or repeat 2010-02-17 23:07 RFED16
       my_win = @form ? @form.window : @target_window
@@ -972,7 +975,7 @@ module RubyCurses
       $log.debug " rlistbox #{row_count} "
       if rc > 0     # just added in case no data passed
         tr = @toprow
-        acolor = get_color $datacolor
+        acolor = get_color $datacolor # should be set once, if color or bgcolor changs TODO FIXME
         h = scrollatrow()
         r,c = rowcol
         0.upto(h) do |hh|
@@ -1015,8 +1018,6 @@ module RubyCurses
       end # rc == 0
       #@table_changed = false
       @repaint_required = false
-      @buffer_modified = true # required by form to call buffer_to_screen BUFFERED
-      buffer_to_window # RFED16 2010-02-17 23:16 
     end
     # the idea here is to allow users who subclass Listbox to easily override parts of the cumbersome repaint
     # method. This assumes your List has some data, but you print a lot more. Now you don't need to
@@ -1139,7 +1140,8 @@ module RubyCurses
     # the earlier painted edited comp in yellow keeps showing until a key is pressed
  
     def set_buffering params
-      super
+      $log.warn "CALLED set_buffering in LISTBOX listbox " if $log.debug? 
+      super # removed from widget 2011-09-29 
       ## Ensuring that changes to top get reflect in editing comp
       #+ otherwise it raises an exception. Still the earlier cell_edit is being
       #+ printed where it was , until a key is moved
@@ -1159,6 +1161,23 @@ module RubyCurses
       @repaint_required = true
     end
 
+    # trying to simplify usage. The Java way has made listboxes very difficult to use
+    # Returns selected indices
+    # Indices are often required since the renderer may modify the values displayed
+    #
+    def get_selected_indices
+      @list_selection_model.get_selected_indices
+    end
+
+    # Returns selected values
+    #
+    def get_selected_values
+      selected = []
+      @list_selection_model.get_selected_indices.each { |i| selected << list_data_model[i] }
+      return selected
+    end
+    alias :selected_values :get_selected_values
+    alias :selected_indices :get_selected_indices
 
     # ADD HERE
   end # class listb

data/lib/rbcurse/rmenu.rb

@@ -2,46 +2,52 @@
   * Name: menu and related classes
   * Description   
   * Author: rkumar
+  * I am redoing this totally, since this was one my first ruby programs and needs 
+  *  simplification. It was hard to maintain.
 TODO 
-FIXME : works with 2 levels, but focus does not go into third level. This has been fixed in rpopupmenu
-      and needs to be fixed here. DONE 2009-01-21 12:50 
-    - menu bar : what to do if adding a menu, or option later.
-      we dnt show disabld options in a way that user can know its disabled
-    - separate file created on 2008-12-24 17:58 
-NOTE : this program works but is one of the first programs and is untouched. It needs to be rewritten
-      since its quite crappy.
-      Also, we should move to Action classes as against just blokcs of code. And action class would have
+ -- cursor to be on current menuitem if possible ... UNABLE TO !!
+ -- Number and letter indexing for item_list
+ -- Use Box characters and hline for separator
+  -- MenuSeparator and MenuItem should be common to popups and menus, so we don't need
+     2 separate names, there was clobbering the same namespace.
+
+  ??  Also, we should move to Action classes as against just blokcs of code. And action class would have
 a user friendly string to identifiy the action, as well as a disabled option.
-NOTE on 2010-09-10 11:40 : this interface is based on Java's and is not block friendy. Also, i tried to keep the same class to work for horizontal menu bar and vertical submenus as per java's classes and this makes the code very complex. I should just make 2 classes and keep it simple.
   
   --------
-  * Date: 2008-11-14 23:43 
+  * Date: 2011-09-23  (old 2008-11-14 23:43 )
+ == Major changes v1.3.1
+ 2011-09-24 V1.3.1 added item_list for dynamic menuitem generation, see examples/menu1.rb
+ 2011-09-24 V1.3.1 added multicolumn outputs
+ 2011-09-24 V1.3.1 left and right keys on menua, C-g to abort
+
   * License:
     Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
 
 =end
-require 'rubygems'
-#require 'ncurses'
-require 'logger'
+#require 'logger'
 require 'rbcurse'
 
-#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
 
 
+  # The separator that separates menuitems, helping to group them.
   class MenuSeparator
     attr_accessor :enabled
     attr_accessor :parent
     attr_accessor :row
     attr_accessor :col
+    attr_accessor :coffset
     attr_accessor :width
+    attr_accessor :color, :bgcolor # 2011-09-25 V1.3.1 
     def initialize 
       @enable = false
     end
     def repaint
-      @parent.window.printstring( @row, 0, "|%s|" % ("-"*@width), $reversecolor)
+      acolor = get_color($reversecolor, @color, @bgcolor)
+      @parent.window.printstring( @row, 0, "|%s|" % ("-"*@width), acolor)
     end
     def destroy
     end
@@ -54,18 +60,31 @@ module RubyCurses
     end
   end
   ##
+  # Items in menus. These will usually result in an action which closes the entire
+  #  menubar.
   class MenuItem
     attr_accessor :parent
 #    attr_accessor :window
     attr_accessor :row
     attr_accessor :col
+    attr_accessor :coffset
     attr_accessor :width
     attr_writer :accelerator
     attr_accessor :enabled
+    attr_accessor :color, :bgcolor # 2011-09-25 V1.3.1 
+    attr_accessor :color_pair # 2011-09-25 V1.3.1 
+    attr_reader :active_index # 2011-09-24 V1.3.1  trying to do a right
     attr_accessor :text, :mnemonic  # changed reader to accessor 
     def initialize text, mnemonic=nil, &block
       @text = text
       @enabled = true
+      # check for mnem that is not one char, could be an accelerator
+      if mnemonic
+        if mnemonic.length != 1
+          $log.error "MenuItem #{text} mnemonic #{mnemonic}  should be one character. Maybe you meant accelerator? " 
+          mnemonic = nil
+        end
+      end
       @mnemonic = mnemonic
       instance_eval &block if block_given?
     end
@@ -75,6 +94,7 @@ module RubyCurses
     def command *args, &block 
       $log.debug ">>>command : #{@text} "
       @command = block if block_given?
+      alert "Command nil or some error! #{text} " unless @command
       @args = args
     end
     # add accelerator for a menu item
@@ -92,15 +112,17 @@ module RubyCurses
         @accelerator = val[0]
       end
     end
-    def on_enter
+    def on_enter #item
       highlight
+      #@parent.window.wmove @row, @col+1  # 2011-09-25 V1.3.1  NO EFFECT
     end
     def on_leave
       highlight false
     end
     ## XXX it could be a menu again
+    #  We should not be firing a :NO_MENUITEMS
     def fire
-      #$log.debug ">>>fire menuitem : #{@text} #{@command} "
+      $log.debug ">>>fire menuitem : #{@text} #{@command} "
       @command.call self, *@args if !@command.nil?
       @parent.clear_menus
       return :CLOSE # added 2009-01-02 00:09 to close only actions, not submenus
@@ -111,10 +133,14 @@ module RubyCurses
         #$log.debug "HL XXX #{self} - > #{@parent} parent nil"
       end
       if tf
-        color = $datacolor
+        #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)
+#        @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
@@ -126,11 +152,18 @@ module RubyCurses
       #  return
       end
       r = @row
-      acolor = $reversecolor
-      acolor = get_color($reversecolor, 'green', 'white') if !@enabled
-      @parent.window.printstring( @row, 0, "|%-*s|" % [@width, text], acolor)
+      c = @col
+      ltext = text
+      ltext = "* No Items *" if text == :NO_MENUITEMS
+      @color_pair  = get_color($reversecolor, @color, @bgcolor)
+      #acolor = $reversecolor
+      acolor = @color_pair
+      acolor = get_color($reversecolor, 'green', @bgcolor) if !@enabled
+#      @parent.window.printstring( @row, 0, "|%-*s|" % [@width, ltext], acolor) # changed 2011 2011-09-24  
+      @parent.window.printstring( @row, c, "|%-*s|" % [@width, ltext], acolor)
       if @enabled # 2010-09-10 23:56 
       if !@accelerator.nil?
+        # FIXME add c earlier 0 was offset
         @parent.window.printstring( r, (@width+1)-@accelerator.length, @accelerator, acolor)
       elsif !@mnemonic.nil?
         m = @mnemonic
@@ -140,17 +173,20 @@ module RubyCurses
         # prev line changed since not working in vt100 and vt200
         @parent.window.printstring( r, ix+1, charm, $reversecolor, 'reverse') if !ix.nil?
       end
+      #@parent.window.wmove r, c # NO EFFECT
       end
     end
     def destroy
      $log.debug "DESTROY menuitem #{@text}"
     end
   end
-  ##class Menu
-  class Menu < MenuItem  ## NEW 
+  ## class Menu. Contains menuitems, and can be a menuitem itself.
+  # Opens out another list of menuitems.
+  class Menu < MenuItem
     attr_accessor :parent
     attr_accessor :row
     attr_accessor :col
+    attr_accessor :coffset
     attr_accessor :width
     attr_accessor :enabled
     attr_reader :text
@@ -173,7 +209,9 @@ module RubyCurses
       super text, nil, &block
       @row ||=10
       @col ||=10
+      @coffset = 0
       @@menus ||= []
+      @active_index = nil # 2011-09-25 V1.3.1 otherwise crashing in select_right
     end
     ## called upon firing so when we next show menubar there are not any left overs in here.
     def clear_menus
@@ -192,7 +230,7 @@ module RubyCurses
 
     # add item method which could be used from blocks
     # add 2010-09-10 12:20 simplifying
-    def item text, mnem, &block
+    def item text, mnem=nil, &block
       #$log.debug "YYYY inside M: menuitem text #{text}  "
       m =  MenuItem.new text, mnem, &block 
       add m
@@ -227,30 +265,64 @@ module RubyCurses
         @items.delete n
       end
     end
+    # generate an item list at runtime for this menu
+    def item_list *args, &block 
+      $log.debug ">>>item_list : #{@text} "
+      @item_list = block if block_given?
+      @item_list_args = args
+    end
     # menu - 
     def fire
       $log.debug "menu fire called: #{text}  " 
       if @window.nil?
         #repaint
-        create_window
+        # added 2011-09-24 adding ability to generate list of items
+        if @item_list
+          # generate a list, but we need to know what to do with that list.
+          @items = []
+          l = @item_list.call self, *@item_list_args if !@item_list.nil?
+          if l.nil? || l.size == 0
+            item(:NO_MENUITEMS)
+          else
+            # for each element returned create a menuitem, and attach the command to it.
+            l.each { |e| it = item(e); 
+              if @command # there should be a command otherwise what's the point
+                it.command(@args) do @command.call(it, it.text) end;
+              else
+                it.command(@args) do alert("No command attached to #{it.text} ") end;
+                $log.warn "No command attached to item_list "
+              end
+            }
+          end
+          $log.debug "menu got items #{@items.count} " 
+        end
+        if @items.empty? # user did not specify any items
+            item(:NO_MENUITEMS)
+        end
+        create_window 
         if !@parent.is_a? RubyCurses::MenuBar 
           @parent.current_menu << self
           @@menus << self # NEW
         end
       else
         ### shouod this not just show ?
-        $log.debug "menu fire called: #{text} ELSE XXX WHEN IS THIS CALLED ? 658  " 
-        return @items[@active_index].fire # this should happen if selected. else selected()
+        $log.debug "menu fire called: #{text} ELSE XXX WHEN IS THIS CALLED ? 658 #{@items[@active_index].text}  " 
+        if @active_index # sometimes no menu item specified 2011-09-24 NEWMENU
+          return @items[@active_index].fire # this should happen if selected. else selected()
+        end
       end
       #@action.call if !@action.nil?
     end
     # user has clicked down, we shoud display items
     # DRAW menuitems
     def repaint # menu.repaint
-      return if @items.nil? or @items.empty?
+      # OMG will not print anything if no items !
+      # When we do item generation this list will be empty
+      #return if @items.nil? or @items.empty? # commented 2011-09-24 NEWMENU
       #$log.debug "menu repaint: #{text} row #{@row} col #{@col}  " 
+      @color_pair  = get_color($reversecolor, @color, @bgcolor)
       if !@parent.is_a? RubyCurses::MenuBar 
-        @parent.window.printstring( @row, 0, "|%-*s>|" % [@width-1, text], $reversecolor)
+        @parent.window.printstring( @row, 0, "|%-*s>|" % [@width-1, text], @color_pair)
         @parent.window.refresh
       end
       if @window.nil?
@@ -302,14 +374,55 @@ module RubyCurses
       #select_item @items.length-1
       end
     end
+    #
+    # If multi-column menuitems then try going to a left item (prev column same row)
+    # NOTE It should only come here if items are open, otherwise row and col will be blank. 
+    # NOTE active_index nil means no items open
+    #
+    def select_left_item
+      return :UNHANDLED if @items.nil? or @items.empty? or @active_index.nil?
+      index = nil
+      crow = @items[@active_index].row 
+      ccol = @items[@active_index].col 
+      @items.each_with_index { |e, i| index = i if e.row == crow && e.col < ccol }
+      if index
+        select_item index
+      else
+        return :UNHANDLED
+      end
+    end
+    # @since 1.3.1 2011-09-24 
+    # If multi-column menuitems then try going to a right item (next column same row)
+    # Only if items are open, not from a menubar menu
+    def select_right_item
+      return :UNHANDLED if @items.nil? or @items.empty? or @active_index.nil?
+      crow = @items[@active_index].row 
+      ccol = @items[@active_index].col 
+      #alert "inside select right with #{@items.size} #{@items[@active_index].text}: items. r #{crow} col #{ccol}  "
+      index = nil
+      @items.each_with_index { |e, i| 
+        $log.debug " select_right #{e.row} == #{crow} , #{e.col} > #{ccol}  " if $log.debug? 
+        if e.row == crow && e.col > ccol 
+          index = i
+          $log.debug "YYY select_right #{e.row} == #{crow} , #{e.col} > #{ccol} FOUND #{i}  " if $log.debug? 
+          break
+        end
+      }
+      if index
+        select_item index
+      else
+        return :UNHANDLED
+      end
+    end
     def on_enter # menu.on_enter
       #$log.debug "menu onenter: #{text} #{@row} #{@col}  " 
       # call parent method. XXX
-        if @parent.is_a? RubyCurses::MenuBar 
-          @parent.window.printstring( @row, @col, " %s " % text, $datacolor)
-        else
+        #if @parent.is_a? RubyCurses::MenuBar 
+          #acolor = get_color($datacolor, @bgcolor, @color)
+          #@parent.window.printstring( @row, @col, " %s " % text, acolor)
+        #else
           highlight
-        end
+        #end
         if !@window.nil? #and @parent.selected
           #$log.debug "menu onenter: #{text} calling window,show"
           @window.show
@@ -324,8 +437,10 @@ module RubyCurses
     def on_leave # menu.on_leave
       #$log.debug "menu onleave: #{text} #{@row} #{@col}  " 
       # call parent method. XXX
+      @color_pair  ||= get_color($reversecolor, @color, @bgcolor)
         if @parent.is_a? RubyCurses::MenuBar 
-          @parent.window.printstring( @row, @col, " %s " % text, $reversecolor)
+#          @parent.window.printstring( @row, @col, " %s " % text, $reversecolor) # changed 2011 2011-09-24   
+          @parent.window.printstring( @row, @col, " %s " % text, @color_pair)
           @window.hide if !@window.nil?
         else
           #$log.debug "MENU SUBMEN. menu onleave: #{text} #{@row} #{@col}  " 
@@ -337,43 +452,87 @@ module RubyCurses
         end
     end
     def highlight tf=true # menu
-          #$log.debug "MENU SUBMENU menu highlight: #{text} #{@row} #{@col}, PW #{@parent.width}  " 
-      color = tf ? $datacolor : $reversecolor
-      att = tf ? Ncurses::A_REVERSE : Ncurses::A_NORMAL
-      #@parent.window.mvchgat(y=@row, x=1, @width, Ncurses::A_NORMAL, color, nil)
-      #@parent.window.mvchgat(y=@row, x=1, @parent.width, Ncurses::A_NORMAL, color, nil)
-      # above line did not work with vt100/vt200 next does
-      @parent.window.mvchgat(y=@row, x=1, @parent.width, att, $reversecolor, nil)
-      @parent.window.wrefresh
-    end
-    def create_window # menu
-      margin = 3
-      @width = array_width @items
-      #$log.debug "create window menu #{@text}: #{@row} ,#{@col},wd #{@width}   " 
-      @layout = { :height => @items.length+3, :width => @width+margin, :top => @row+1, :left => @col } 
+      if @parent.is_a? RubyCurses::MenuBar  # top level menu
+        #acolor = get_color($datacolor, @bgcolor, @color)
+        #@parent.window.printstring( @row, @col, " %s " % text, acolor)
+        @color_pair  ||= get_color($reversecolor, @color, @bgcolor)
+          att =  Ncurses::A_REVERSE
+          @parent.window.mvchgat(y=@row, x=@col+1, text.length+1, att, @color_pair, nil)
+      else
+        #$log.debug "MENU SUBMENU menu highlight: #{text} #{@row} #{@col}, PW #{@parent.width}  " 
+        acolor = tf ? $datacolor : $reversecolor
+        att = tf ? Ncurses::A_REVERSE : Ncurses::A_NORMAL
+        #@parent.window.mvchgat(y=@row, x=1, @width, Ncurses::A_NORMAL, color, nil)
+        #@parent.window.mvchgat(y=@row, x=1, @parent.width, Ncurses::A_NORMAL, color, nil)
+        # above line did not work with vt100/vt200 next does
+        #      @parent.window.mvchgat(y=@row, x=1, @parent.width, att, $reversecolor, nil) # changed 2011 2011-09-24   
+        @parent.window.mvchgat(y=@row, x=1, @parent.width, att, @color_pair, nil)
+        @parent.window.wrefresh
+      end
+    end
+    def create_window  # menu
+      margin = 2 # flush against parent
+      @width = array_width(@items) + 1 # adding 1 since menus append a ">" 2011-09-24 
+      $log.debug "create window menu #{@text}: r #{@row} ,col #{@col}, wd #{@width}   " 
+      t = @row+1
+      h = @items.length+3
+      ww = @width+margin
+      ww1 = @width
+      max = Ncurses.LINES-1
+      if t + h > max
+        t = 2 # one below menubar, not touching
+        if h > max
+          i = ((h*1.0)/max).ceil
+          h = max - 1
+          ww = ww * i # FIXME we need to calculate
+        end
+      end # t + 1
+      $log.debug "create window menu #{@text}: t  #{t} ,h #{h}, w: #{ww} , col #{@col}   max #{max}   " 
+
+      #@layout = { :height => @items.length+3, :width => ww, :top => @row+1, :left => @col } 
+      # earlier col had the offset to start the next level, I was not using it to print 
+      # but with mulitple cols i am using it. So, this col will overwrite existing menu.
+      @layout = { :height => h-1, :width => ww, :top => t, :left => @coffset } 
       @win = VER::Window.new(@layout)
       @window = @win
-      @win.bkgd(Ncurses.COLOR_PAIR($datacolor));
+      @color_pair ||= get_color($datacolor, @color, @bgcolor)
+      @rev_color_pair ||= get_color($reversecolor, @color, @bgcolor)
+      @win.bkgd(Ncurses.COLOR_PAIR(@color_pair));
       @panel = @win.panel
-        @window.printstring( 0, 0, "+%s+" % ("-"*@width), $reversecolor)
+        #@window.printstring( 0, 0, "+%s+" % ("-"*@width), $reversecolor)
+        @window.printstring( 0, 0, "+%s+" % ("-"*(ww1)), @rev_color_pair)
+        saved_r = 1
         r = 1
+        #saved_c = @col+@width+margin # margins???
+        saved_c = 0 ; # actual program uses 0 in repain for col
+        c = saved_c
+            $log.debug "create window menu #{@text}: first col  r  #{r} ,c #{c}" 
         @items.each do |item|
-          #if item == :SEPARATOR
-          #  @window.printstring( r, 0, "|%s|" % ("-"*@width), $reversecolor)
-          #else
+          #break if r > h # added 2011-09-24 for large number of items - causes error
+          if r >= h-2
+            @window.printstring( h-2, c, "+%s+" % ("-"*(ww1)), @rev_color_pair)
+            r = saved_r
+            c += (@width + 2)
+            @window.printstring( 0, c, "+%s+" % ("-"*(ww1)), @rev_color_pair)
+            $log.debug "create window menu #{@text}: new col  r  #{r} ,c #{c}, #{item.text} " 
+          end
             item.row = r
-            item.col = 0
-            item.col = @col+@width+margin # margins???
- #         $log.debug "create window menu loop passing col : #{item.col} " 
+            item.col = c
+            item.coffset = @coffset+@width+margin # margins???
+
+
             item.width = @width
             #item.window = @window
             item.parent = self
+            item.color = @color; item.bgcolor = @bgcolor
             item.repaint
-          #end
           r+=1
         end
-        @window.printstring( r, 0, "+%s+" % ("-"*@width), $reversecolor)
-      select_item 0
+#        @window.printstring( r, 0, "+%s+" % ("-"*@width), $reversecolor) # changed 2011 2011-09-24 
+        @window.printstring( h-2, 0, "+%s+" % ("-"*(ww1)), @rev_color_pair)
+        # in case of multiple rows
+        @window.printstring( r, c, "+%s+" % ("-"*(ww1)), @rev_color_pair)
+        select_item 0
       @window.refresh
       return @window
     end
@@ -415,7 +574,7 @@ module RubyCurses
         cmenu.select_next_item
         #return cmenu.fire # XXX 2010-10-16 21:39 trying out
         if cmenu.is_a? RubyCurses::Menu 
-          #alert "is a menu"
+          #alert "is a menu" # this gets triggered even when we are on items
         end
       when KEY_UP
         cmenu.select_prev_item
@@ -426,27 +585,48 @@ module RubyCurses
        #$log.debug "LEFT IN MENU : #{cmenu.parent.class} len: #{cmenu.parent.current_menu.length}"
        #$log.debug "left IN MENU : #{cmenu.parent.class} len: #{cmenu.current_menu.length}"
         end
-        if cmenu.parent.is_a? RubyCurses::Menu and !cmenu.parent.current_menu.empty?
-       #$log.debug " ABOU TO DESTROY DUE TO LEFT"
-          cmenu.parent.current_menu.pop
-          @@menus.pop ## NEW
-          cmenu.destroy
-        else
-          return :UNHANDLED
+        ret = cmenu.select_left_item # 2011-09-24 V1.3.1 attempt to goto left item if columns
+        if ret == :UNHANDLED
+          if cmenu.parent.is_a? RubyCurses::MenuBar #and !cmenu.parent.current_menu.empty?
+            #$log.debug " ABOU TO DESTROY DUE TO LEFT"
+            cmenu.current_menu.pop
+            @@menus.pop ## NEW
+            cmenu.destroy
+            return :UNHANDLED
+          end
+          # LEFT on a menu list allows me to close and return to higher level
+          if cmenu.parent.is_a? RubyCurses::Menu #and !cmenu.parent.current_menu.empty?
+            #$log.debug " ABOU TO DESTROY DUE TO LEFT"
+            cmenu.current_menu.pop
+            @@menus.pop ## NEW
+            cmenu.destroy
+            #return :UNHANDLED
+          end
         end
       when KEY_RIGHT
-       #$log.debug "RIGHTIN MENU : "
-        if cmenu.parent.is_a? RubyCurses::Menu 
+       $log.debug "RIGHTIN MENU : #{text}  "
+       if cmenu.active_index
+        if cmenu.items[cmenu.active_index].is_a?  RubyCurses::Menu 
+          #alert "could fire here cmenu: #{cmenu.text}, par: #{cmenu.parent.text} "
+          cmenu.fire
+          return
        #$log.debug "right IN MENU : #{cmenu.parent.class} len: #{cmenu.parent.current_menu.length}"
        #$log.debug "right IN MENU : #{cmenu.parent.class} len: #{cmenu.current_menu.length}"
         end
-        if cmenu.parent.is_a? RubyCurses::Menu and !cmenu.parent.current_menu.empty?
-          #$log.debug " ABOU TO DESTROY DUE TO RIGHT"
-          cmenu.parent.current_menu.pop
-          @@menus.pop
-          cmenu.destroy
+       end
+       # This introduces a bug if no open items
+       ret = cmenu.select_right_item # 2011-09-24 V1.3.1 attempt to goto right item if columns
+       #alert "attempting to select right #{ret} "
+        if ret == :UNHANDLED
+          #if cmenu.parent.is_a? RubyCurses::Menu and !cmenu.parent.current_menu.empty?
+          if cmenu.parent.is_a? RubyCurses::MenuBar #and !cmenu.current_menu.empty?
+            $log.debug " ABOU TO DESTROY DUE TO RIGHT"
+            cmenu.current_menu.pop
+            @@menus.pop
+            cmenu.destroy
+            return :UNHANDLED
+          end
         end
-        return :UNHANDLED
       else
         ret = check_mnemonics cmenu, ch
         return ret
@@ -472,7 +652,7 @@ module RubyCurses
     def show # menu.show
       #$log.debug "show (menu) : #{@text} "
       if @window.nil?
-        create_window
+        create_window #@col+@width
       end
         @window.show 
         select_item 0
@@ -487,12 +667,16 @@ module RubyCurses
     attr_reader :window
     attr_reader :panel
     attr_reader :selected
+    attr_reader :text # temp 2011-09-24 V1.3.1 
     attr_accessor :visible
     attr_accessor :active_index
     attr_accessor :state              # normal, selected, highlighted
     attr_accessor :toggle_key              # key used to popup, should be set prior to attaching to form
+    attr_accessor :color, :bgcolor # 2011-09-25 V1.3.1 
+    attr_accessor  :_object_created   # 2011-10-7 if visible then Form will call this
     def initialize &block
       @window = nil
+      @text = "menubar"
       @items = []
       init_vars
       @visible = false
@@ -519,6 +703,8 @@ module RubyCurses
     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
@@ -549,6 +735,13 @@ module RubyCurses
 #     menu.show
 #     menu.window.wrefresh # XXX we need this
     end
+
+    def keep_visible flag=nil
+      return @keep_visible unless flag
+      @keep_visible = flag
+      @visible = flag
+      self
+    end
     # menubar LEFT, RIGHT, DOWN 
     def handle_keys
       @selected = false
@@ -590,6 +783,8 @@ module RubyCurses
           #$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
@@ -608,15 +803,24 @@ module RubyCurses
       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 
-      destroy  # Note that we destroy the menu bar upon exit
+        current_menu.clear_menus #@@menus = [] # added 2009-01-23 13:21 
+        destroy  # Note that we destroy the menu bar upon exit
       end
     end
     def current_menu
       @items[@active_index]
     end
+    # called by set_menu_bar in widget.rb (class Form).
     def toggle
-      @items.each { |i| $log.debug " ITEM DDD : #{i.text}" }
+      # added keeping it visible, 2011-10-7 being tested in dbdemo
+      if @keep_visible
+        init_vars
+        show
+        @items[0].highlight
+        @window.ungetch(KEY_DOWN)
+        return
+      end
+      #@items.each { |i| $log.debug " ITEM DDD : #{i.text}" }
       @visible = !@visible
       if !@visible
         hide
@@ -627,7 +831,7 @@ module RubyCurses
     end
     def hide
       @visible = false
-      @window.hide if !@window.nil?
+      @window.hide if !@window.nil? # seems to cause auto-firing when we resume toggle 2011-09-26 
     end
     def show
       @visible = true
@@ -638,35 +842,49 @@ module RubyCurses
       end
     end
     ## menubar
+    # TODO: check for menu to be flush right (only for last one).
     def repaint
       return if !@visible
-      @window ||= create_window
-      @window.printstring( 0, 0, "%-*s" % [@cols," "], $reversecolor)
+      @color_pair = get_color($reversecolor, @color, @bgcolor)
+      @window ||= create_window_menubar
+#      @window.printstring( 0, 0, "%-*s" % [@cols," "], $reversecolor) # changed 2011 2011-09-24   
+      @window.printstring( 0, 0, "%-*s" % [@cols," "], @color_pair)
       c = 1; r = 0;
       @items.each do |item|
-        item.row = r; item.col = c; item.parent = self
-        @window.printstring( r, c, " %s " % item.text, $reversecolor)
+        item.row = r; item.col = c; item.coffset = c; item.parent = self
+        item.color = @color
+        item.bgcolor = @bgcolor
+        @window.printstring( r, c, " %s " % item.text, @color_pair)
+        # 2011-09-26 V1.3.1 quick dirty highlighting of first menu on menubar
+        # on opening since calling highlight was giving bug in parent.width
+        #if c == 1
+          #att =  Ncurses::A_REVERSE
+          #@window.mvchgat(y=r, x=c+1, item.text.length+1, att, @color_pair, nil)
+        #end
         c += (item.text.length + 2)
       end
+      #@items[0].on_enter # 2011-09-25 V1.3.1  caused issues when toggling, first item fired on DOWN
+      @items[0].highlight unless @keep_visible # 2011-09-26 V1.3.1   fixed to take both cases into account
       @window.wrefresh
     end
-    def create_window
+    def create_window_menubar
       @layout = { :height => 1, :width => 0, :top => 0, :left => 0 } 
       @win = VER::Window.new(@layout)
       @window = @win
-      @win.bkgd(Ncurses.COLOR_PAIR(5));
+      @win.bkgd(Ncurses.COLOR_PAIR(5)); # <---- FIXME
       @panel = @win.panel
       return @window
     end
     def destroy
       $log.debug "DESTRY menubar "
+      @items.each do |item|
+        item.destroy
+      end
+      return if @keep_visible
       @visible = false
       panel = @window.panel
       Ncurses::Panel.del_panel(panel.pointer) if !panel.nil?   
       @window.delwin if !@window.nil?
-      @items.each do |item|
-        item.destroy
-      end
       @window = nil
     end
   end # menubar
@@ -702,8 +920,10 @@ module RubyCurses
       repaint
       highlight true
     end
-    def repaint
-      @parent.window.printstring( row, 0, getvalue_for_paint, $reversecolor)
+    def repaint # checkbox
+      # FIXME need @color_pair here
+        @color_pair  ||= get_color($reversecolor, @color, @bgcolor)
+      @parent.window.printstring( row, 0, getvalue_for_paint, @color_pair)
       parent.window.wrefresh
     end
     def method_missing(sym, *args)
@@ -714,6 +934,6 @@ module RubyCurses
         $log.error("ERROR CHECKBOXMENU #{sym} called")
       end
     end
+  end # class
 
-  end
 end # modul