rbcurse 1.1.5 → 1.2.0.pre

data/lib/rbcurse/rmenu.rb

@@ -12,6 +12,7 @@ NOTE : this program works but is one of the first programs and is untouched. It
       since its quite crappy.
       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 
@@ -59,7 +60,7 @@ module RubyCurses
     attr_accessor :row
     attr_accessor :col
     attr_accessor :width
-    attr_accessor :accelerator
+    attr_writer :accelerator
     attr_accessor :enabled
     attr_accessor :text, :mnemonic  # changed reader to accessor 
     def initialize text, mnemonic=nil, &block
@@ -76,25 +77,38 @@ module RubyCurses
       @command = block if block_given?
       @args = args
     end
+    # add accelerator for a menu item
+    # NOTE: accelerator means that the application has tied this string to some action, outside
+    # of the menu bar. It does not mean that the menu bar will trigger the action. So the app still has to 
+    # define the action and bind a key to that accelerator. This is only informative.
+    # Had to do this since dsl_accessor was throwing some nilclass does not have []= nomethod error
+    # This allows user to put accelerator inside dsl block
+    # @example
+    #    accelerator "Ctrl-X"
+    def accelerator(*val)
+      if val.empty?
+        return @accelerator
+      else
+        @accelerator = val[0]
+      end
+    end
     def on_enter
-      $log.debug ">>>on enter menuitem : #{@text} #{@row} #{@width} "
       highlight
     end
     def on_leave
-      $log.debug ">>>on leave menuitem : #{@text} "
       highlight false
     end
     ## XXX it could be a menu again
     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
     end
     def highlight tf=true
       if @parent.nil? or @parent.window.nil?
-        $log.debug "HL XXX #{self} parent nil"
-        $log.debug "HL XXX #{self} - > #{@parent} parent nil"
+        #$log.debug "HL XXX #{self} parent nil"
+        #$log.debug "HL XXX #{self} - > #{@parent} parent nil"
       end
       if tf
         color = $datacolor
@@ -115,6 +129,7 @@ module RubyCurses
       acolor = $reversecolor
       acolor = get_color($reversecolor, 'green', 'white') if !@enabled
       @parent.window.printstring( @row, 0, "|%-*s|" % [@width, text], acolor)
+      if @enabled # 2010-09-10 23:56 
       if !@accelerator.nil?
         @parent.window.printstring( r, (@width+1)-@accelerator.length, @accelerator, acolor)
       elsif !@mnemonic.nil?
@@ -125,9 +140,10 @@ 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
+      end
     end
     def destroy
-     $log.debug "DESTRY menuitem #{@text}"
+     $log.debug "DESTROY menuitem #{@text}"
     end
   end
   ##class Menu
@@ -150,12 +166,11 @@ module RubyCurses
     @@col = 0
 
     def initialize text, &block
-      super text, nil, &block
       @text = text
       @items = []
       @enabled = true
       @current_menu = []
-      instance_eval &block if block_given?
+      super text, nil, &block
       @row ||=10
       @col ||=10
       @@menus ||= []
@@ -167,17 +182,39 @@ module RubyCurses
     def to_s
       @text
     end
-    # item could be menuitem or another menu
+    # item could be menuitem or another menu (precreated)
     def add menuitem
+      #$log.debug " YYYY inside add menuitem #{menuitem.text} "
       @items << menuitem
       return self
     end
+    alias :<< :add
+
+    # add item method which could be used from blocks
+    # add 2010-09-10 12:20 simplifying
+    def item text, mnem, &block
+      #$log.debug "YYYY inside M: menuitem text #{text}  "
+      m =  MenuItem.new text, mnem, &block 
+      add m
+      return m
+    end
+    # create a menu within a menu
+    # add menu method which could be used from blocks
+    # add 2010-09-10 12:20 simplifying
+    def menu text, &block
+      #$log.debug "YYYY inside M: menu text #{text}  "
+      m = Menu.new text, &block 
+      add m
+      return m
+    end
     def insert_separator ix
       @items.insert ix, MenuSeparator.new
     end
     def add_separator 
       @items << MenuSeparator.new
     end
+    alias :separator :add_separator
+
     ## added 2009-01-21 12:09 NEW
     def get_item i
       @items[i]
@@ -211,7 +248,7 @@ module RubyCurses
     # DRAW menuitems
     def repaint # menu.repaint
       return if @items.nil? or @items.empty?
-      $log.debug "menu repaint: #{text} row #{@row} col #{@col}  " 
+      #$log.debug "menu repaint: #{text} row #{@row} col #{@col}  " 
       if !@parent.is_a? RubyCurses::MenuBar 
         @parent.window.printstring( @row, 0, "|%-*s>|" % [@width-1, text], $reversecolor)
         @parent.window.refresh
@@ -228,7 +265,7 @@ module RubyCurses
     # recursive if given one not enabled goes to next enabled
     def select_item ix0
       return if @items.nil? or @items.empty?
-       $log.debug "insdie select  item :  #{ix0} active: #{@active_index}" 
+       #$log.debug "insdie select  item :  #{ix0} active: #{@active_index}" 
       if !@active_index.nil?
         @items[@active_index].on_leave 
       end
@@ -237,7 +274,7 @@ module RubyCurses
       if @items[ix0].enabled
         @items[ix0].on_enter
       else
-        $log.debug "insdie sele nxt item ENABLED FALSE :  #{ix0}" 
+        #$log.debug "insdie sele nxt item ENABLED FALSE :  #{ix0}" 
         if @active_index > previtem
           select_next_item
         else
@@ -248,7 +285,7 @@ module RubyCurses
     end
     def select_next_item
       return if @items.nil? or @items.empty?
-       $log.debug "insdie sele nxt item :  #{@active_index}" 
+       #$log.debug "insdie sele nxt item :  #{@active_index}" 
       @active_index = -1 if @active_index.nil?
       if @active_index < @items.length-1
         select_item @active_index + 1
@@ -258,7 +295,7 @@ module RubyCurses
     end
     def select_prev_item
       return if @items.nil? or @items.empty?
-       $log.debug "insdie sele prv item :  #{@active_index}" 
+       #$log.debug "insdie sele prv item :  #{@active_index}" 
       if @active_index > 0
         select_item @active_index - 1
       else
@@ -266,7 +303,7 @@ module RubyCurses
       end
     end
     def on_enter # menu.on_enter
-      $log.debug "menu onenter: #{text} #{@row} #{@col}  " 
+      #$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)
@@ -274,24 +311,24 @@ module RubyCurses
           highlight
         end
         if !@window.nil? #and @parent.selected
-          $log.debug "menu onenter: #{text} calling window,show"
+          #$log.debug "menu onenter: #{text} calling window,show"
           @window.show
           select_item 0
         elsif @parent.is_a? RubyCurses::MenuBar and  @parent.selected
           # only on the top level do we open a window if a previous one was opened
-          $log.debug "menu onenter: #{text} calling repaint CLASS: #{@parent.class}"
+          #$log.debug "menu onenter: #{text} calling repaint CLASS: #{@parent.class}"
         #  repaint
           create_window
         end
     end
     def on_leave # menu.on_leave
-      $log.debug "menu onleave: #{text} #{@row} #{@col}  " 
+      #$log.debug "menu onleave: #{text} #{@row} #{@col}  " 
       # call parent method. XXX
         if @parent.is_a? RubyCurses::MenuBar 
           @parent.window.printstring( @row, @col, " %s " % text, $reversecolor)
           @window.hide if !@window.nil?
         else
-          $log.debug "MENU SUBMEN. menu onleave: #{text} #{@row} #{@col}  " 
+          #$log.debug "MENU SUBMEN. menu onleave: #{text} #{@row} #{@col}  " 
           # parent is a menu
           highlight false
           #@parent.current_menu.pop
@@ -300,7 +337,7 @@ module RubyCurses
         end
     end
     def highlight tf=true # menu
-          $log.debug "MENU SUBMENU menu highlight: #{text} #{@row} #{@col}, PW #{@parent.width}  " 
+          #$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)
@@ -312,7 +349,7 @@ module RubyCurses
     def create_window # menu
       margin = 3
       @width = array_width @items
-      $log.debug "create window menu #{@text}: #{@row} ,#{@col},wd #{@width}   " 
+      #$log.debug "create window menu #{@text}: #{@row} ,#{@col},wd #{@width}   " 
       @layout = { :height => @items.length+3, :width => @width+margin, :top => @row+1, :left => @col } 
       @win = VER::Window.new(@layout)
       @window = @win
@@ -343,7 +380,7 @@ module RubyCurses
     # private
     def array_width a
       longest = a.max {|a,b| a.to_s.length <=> b.to_s.length }
-      $log.debug "array width #{longest}"
+      #$log.debug "array width #{longest}"
       longest.to_s.length
     end
     def destroy
@@ -375,18 +412,22 @@ module RubyCurses
       end
       case ch
       when KEY_DOWN
-          cmenu.select_next_item
+        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"
+        end
       when KEY_UP
         cmenu.select_prev_item
       when KEY_ENTER, 10, 13, 32 # added 32 2008-11-27 23:50 
         return cmenu.fire
       when KEY_LEFT
         if cmenu.parent.is_a? RubyCurses::Menu 
-       $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}"
+       #$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"
+       #$log.debug " ABOU TO DESTROY DUE TO LEFT"
           cmenu.parent.current_menu.pop
           @@menus.pop ## NEW
           cmenu.destroy
@@ -394,13 +435,13 @@ module RubyCurses
           return :UNHANDLED
         end
       when KEY_RIGHT
-       $log.debug "RIGHTIN MENU : "
+       #$log.debug "RIGHTIN MENU : "
         if cmenu.parent.is_a? RubyCurses::Menu 
-       $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}"
+       #$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"
+          #$log.debug " ABOU TO DESTROY DUE TO RIGHT"
           cmenu.parent.current_menu.pop
           @@menus.pop
           cmenu.destroy
@@ -420,7 +461,7 @@ module RubyCurses
       cmenu.items.each do |item|
         next if !item.respond_to? :mnemonic or item.mnemonic.nil?
 #       $log.debug "inside check_mnemonics #{item.mnemonic}"
-        if key == item.mnemonic.downcase
+        if key == item.mnemonic.downcase && item.enabled # 2010-09-11 00:03 enabled
           ret = item.fire
           return ret #0 2009-01-23 00:45 
         end
@@ -429,7 +470,7 @@ module RubyCurses
     end
     ## menu 
     def show # menu.show
-      $log.debug "show (menu) : #{@text} "
+      #$log.debug "show (menu) : #{@text} "
       if @window.nil?
         create_window
       end
@@ -464,12 +505,25 @@ module RubyCurses
     def focusable
       false
     end
+    # add a precreated menu
     def add menu
+      #$log.debug "YYYY inside MB: add #{menu.text}  "
       @items << menu
       return self
     end
+    alias :<< :add
+
+    # add a menu through the block, this would happen through instance eval
+    # 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 
+      add m
+      return m
+    end
     def next_menu
-      $log.debug "next meu: #{@active_index}  " 
+      #$log.debug "next meu: #{@active_index}  " 
       if @active_index < @items.length-1
         set_menu @active_index + 1
       else
@@ -477,7 +531,7 @@ module RubyCurses
       end
     end
     def prev_menu
-      $log.debug "prev meu: #{@active_index} " 
+      #$log.debug "prev meu: #{@active_index} " 
       if @active_index > 0
         set_menu @active_index-1
       else
@@ -485,7 +539,7 @@ module RubyCurses
       end
     end
     def set_menu index
-      $log.debug "set meu: #{@active_index} #{index}" 
+      #$log.debug "set meu: #{@active_index} #{index}" 
       menu = @items[@active_index]
       menu.on_leave # hide its window, if open
       @active_index = index
@@ -503,12 +557,12 @@ module RubyCurses
       begin
       catch(:menubarclose) do
       while((ch = @window.getchar()) != @toggle_key )
-       $log.debug "menuubar inside handle_keys :  #{ch}"  if ch != -1
+       #$log.debug "menuubar inside handle_keys :  #{ch}"  if ch != -1
         case ch
         when -1
           next
         when KEY_DOWN
-          $log.debug "insdie keyDOWN :  #{ch}" 
+          #$log.debug "insdie keyDOWN :  #{ch}" 
           if !@selected
             current_menu.fire
           else
@@ -518,26 +572,26 @@ module RubyCurses
           @selected = true
         when KEY_ENTER, 10, 13, 32
           @selected = true
-            $log.debug " mb insdie ENTER :  #{current_menu}" 
+            #$log.debug " mb insdie ENTER :  #{current_menu}" 
             ret = current_menu.handle_key ch
-            $log.debug "ret = #{ret}  mb insdie ENTER :  #{current_menu}" 
+            #$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
         when KEY_UP
-          $log.debug " mb insdie keyUPP :  #{ch}" 
+          #$log.debug " mb insdie keyUPP :  #{ch}" 
           current_menu.handle_key ch
         when KEY_LEFT
-          $log.debug " mb insdie KEYLEFT :  #{ch}" 
+          #$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}" 
+          #$log.debug " mb insdie KEYRIGHT :  #{ch}" 
           ret = current_menu.handle_key ch
           next_menu if ret == :UNHANDLED
         else
-          $log.debug " mb insdie ELSE :  #{ch}" 
+          #$log.debug " mb insdie ELSE :  #{ch}" 
           ret = current_menu.handle_key ch
           if ret == :UNHANDLED
             Ncurses.beep 
@@ -618,7 +672,6 @@ module RubyCurses
   end # menubar
 
   class CheckBoxMenuItem < MenuItem
-    include DSL
     attr_reader :checkbox
     def initialize text, mnemonic=nil, &block
       @checkbox = CheckBox.new nil
@@ -655,7 +708,7 @@ module RubyCurses
     end
     def method_missing(sym, *args)
       if checkbox.respond_to? sym
-        $log.debug("calling CHECKBOXMENU #{sym} called #{args[0]}")
+        #$log.debug("calling CHECKBOXMENU #{sym} called #{args[0]}")
         checkbox.send(sym, args)
       else
         $log.error("ERROR CHECKBOXMENU #{sym} called")

data/lib/rbcurse/rmessagebox.rb

@@ -15,7 +15,6 @@ module RubyCurses
   # dimensions of window should be derived on content
   #
   class MessageBox
-    include DSL
     include RubyCurses::Utils
     dsl_accessor :title
     dsl_accessor :message
@@ -193,9 +192,9 @@ module RubyCurses
           #$log.debug "popup ENTER :  #{field.name}" if !field.nil?
           @stop = true
           return
-        when 9
+        when KEY_TAB
           @form.select_next_field
-        when 353
+        when KEY_BTAB
           @form.select_prev_field
         else
           # fields must return unhandled else we will miss hotkeys. 
@@ -243,7 +242,7 @@ module RubyCurses
       # XXX this needs to go up and decide height of window
       if @message_height.nil?
         @message_height = (message.length/display_length)+1
-        $log.debug " print_message: mh:#{@message_height}, ml: #{message.length}"
+        #$log.debug " print_message: mh:#{@message_height}, ml: #{message.length}"
       end
       @message_height ||= 1
       width = @layout[:width]
@@ -258,6 +257,8 @@ module RubyCurses
       else
         row=(@layout[:height]/3) if row.nil?
         @message_col = (width-message.length)/2
+        @message_col = 4 if @message_col < 4 # this was often disappearing 2010-10-17 13:00 
+        #$log.debug "XX ALERT col #{@message_col} w: #{width} len: #{message.length} "
       end
       @message_row = row
       # added 2009-11-05 14:53 to fix erasure of border
@@ -266,7 +267,7 @@ module RubyCurses
       #@window.printstring( row, @message_col , message, color=$reversecolor)
       # 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} "
+        #$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"}
 
     end
@@ -298,9 +299,15 @@ module RubyCurses
           name   "input" 
           row  r 
           col  c 
-#         attr 'reverse'
+
           color 'black'
           bgcolor 'white'
+          # now listcellrenderer only uses BOLD for selected, with a white bgcolor
+          # so here it won't show up on white bg
+          selected_color 'red'
+          selected_bgcolor 'black'
+          # just added 2010-10-14 21:24 
+          border_attrib :reverse
           width 30
           height 6
           list  list