rbcurse-core 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,11 @@
+**2012-01-04**
+## 0.0.3 rbcurse-core
+   * ActionManager added to widgets so actions can be 
+used from multiple places
+   * changes in ncurses setting cbreak and halfdelay etc 
+	 since C-c was crashing program out
+	 * Added history to field
+
 **2011-12-13**
 ## 0.0.2 rbcurse-core
 Mostly refactoring of multi-row components

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/examples/abasiclist.rb

@@ -34,6 +34,7 @@ require 'rbcurse/core/widgets/rlist'
 # just a simple test to ensure that rbasiclistbox is running inside a container.
 App.new do 
   def disp_menu
+    # ideally this shuld get action_manager and add_action so these are added to widgets actions
     f = @form.get_current_field
 
     if f.name == "lb1"

data/lib/rbcurse/core/include/action.rb

@@ -1,5 +1,21 @@
+# ----------------------------------------------------------------------------- #
+#         File: action.rb
+#  Description: A common action class which can be used with buttons, popupmenu
+#               and anythign else that takes an action or command
+#       Author: rkumar http://github.com/rkumar/rbcurse/
+#         Date: been around since the beginning
+#      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
+#  Last update: use ,,L
+#  NOTE: I don't like the dependence on rwidget and EventHandler. Seems it needs
+#   that only for fire_handler and not sure if that's used. I've not bound :FIRE
+#   ever.
+#
+#   Darn, do i really need to have dsl_accessors and property This is not a 
+#   widget and there's no repaint. Do button's and popups really repaint
+#   themselves when a dsl_property is modified ?
+# ----------------------------------------------------------------------------- #
+#
 require 'rbcurse/core/widgets/rwidget'
-#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   ## encapsulates behaviour allowing centralization
@@ -12,8 +28,8 @@ module RubyCurses
   #      ...
   #    end
   class Action < Proc
-    include EventHandler
-    include ConfigSetup
+    include EventHandler # removed 2012-01-3 maybe you can bind FIRE
+    #include ConfigSetup # removed 2012-01-3 
     # name used on button or menu
     dsl_property :name
     dsl_property :enabled
@@ -27,14 +43,38 @@ module RubyCurses
       @name = name
       @name.freeze
       @enabled = true
-      config_setup config # @config.each_pair { |k,v| variable_set(k,v) }
+      # removing dependency from config
+      #config_setup config # @config.each_pair { |k,v| variable_set(k,v) }
+      @config = config
+      keys = @config.keys
+      keys.each do |e| 
+        variable_set(e, @config[e])
+      end
       @_events = [:FIRE]
     end
     def call
       return unless @enabled
-      fire_handler :FIRE, self
+      # seems to be here, if you've bound :FIRE no this, not on any widget
+      fire_handler :FIRE, self  
       super
     end
+    # the next 3 are to adapt this to CMenuitems
+    def hotkey
+      return @mnemonic if @mnemonic
+      ix = @name.index('&')
+      if ix
+        return @name[ix+1, 1].downcase
+      end
+    end
+    # to adapt this to CMenuitems
+    def label
+      @name.sub('&','')
+    end
+    # to adapt this to CMenuitems
+    def action
+      self
+    end
+
   end # class
 end # module
 

data/lib/rbcurse/core/include/actionmanager.rb

@@ -0,0 +1,49 @@
+# ----------------------------------------------------------------------------- #
+#         File: actionmanager.rb
+#  Description: a class that manages actions for a widget
+#
+#       Author: rkumar http://github.com/rkumar/rbcurse/
+#         Date: 2012-01-4 
+#      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
+#  Last update: ,,L
+# ----------------------------------------------------------------------------- #
+#
+# Maintains actions for a widget
+module RubyCurses
+  class ActionManager
+    include Io
+    attr_reader :actions
+
+    def initialize #form, config={}, &block
+      @actions = []
+       #instance_eval &block if block_given?
+    end
+    def add_action act
+      @actions << act
+    end
+    def remove_action act
+      @actions.remove act
+    end
+    #
+    # insert an item at given position (index)
+    def insert_action pos, *val
+      @actions[pos] = val
+    end
+    #def create_menuitem *args
+      #PromptMenu.create_menuitem *args
+    #end
+
+    # popup the hist 
+    # 
+    def show_actions
+      return if @actions.empty?
+      list = @actions
+      menu = PromptMenu.new self do |m|
+      list.each { |e| 
+        m.add *e
+      }
+      end
+      menu.display_new :title => 'Widget Menu (Press letter)'
+    end
+  end # class
+end # mod RubyC

data/lib/rbcurse/core/include/appmethods.rb

@@ -78,9 +78,15 @@ module RubyCurses
     # prompts user for unix command and displays output in viewer
     # 
     def shell_output
-      cmd = get_string("Enter shell command:", 50)
+      $shell_history ||= []
+      cmd = get_string("Enter shell command:", :maxlen => 50) do |f|
+        require 'rbcurse/core/include/rhistory'
+        f.extend(FieldHistory)
+        f.history($shell_history)
+      end
       if cmd && !cmd.empty?
         run_command cmd
+        $shell_history.push(cmd) unless $shell_history.include? cmd
       end
     end
 

data/lib/rbcurse/core/include/io.rb

@@ -314,7 +314,7 @@ module Io
       @caller = caller
       @text = text
       @options = []
-      instance_eval &block if block_given?
+      yield_or_eval &block if block_given?
     end
     def add *menuitem
       item = nil
@@ -330,6 +330,14 @@ module Io
           # if user only sends key and symbol
           menuitem[3] = menuitem[1]
           item = CMenuItem.new(*menuitem.flatten)
+        when 1
+          if menuitem.first.is_a? Action
+            item = menuitem.first
+          else
+            raise ArgumentError, "Don't know how to handle #{menuitem.size} : #{menuitem} "
+          end
+        else
+          raise ArgumentError, "Don't know how to handle #{menuitem.size} : #{menuitem} "
         end
         @options << item
       end
@@ -339,6 +347,10 @@ module Io
     def create_mitem *args
       item = CMenuItem.new(*args.flatten)
     end
+    # Added this, since actually it could have been like this 2011-12-22  
+    def self.create_menuitem *args
+      item = CMenuItem.new(*args.flatten)
+    end
     # create the whole thing using a MenuTree which has minimal information.
     # It uses a hotkey and a code only. We are supposed to resolve the display text
     # and actual proc from the caller using this code.
@@ -369,7 +381,7 @@ module Io
     def display_columns config={}
       prompt = config[:prompt] || "Choose: "
       require 'rbcurse/core/util/rcommandwindow'
-      layout = { :height => 5, :width => Ncurses.COLS-1, :top => Ncurses.LINES-6, :left => 0 }
+      layout = { :height => 5, :width => Ncurses.COLS-0, :top => Ncurses.LINES-6, :left => 0 }
       rc = CommandWindow.new nil, :layout => layout, :box => true, :title => config[:title] || "Menu"
       w = rc.window
       r = 4
@@ -385,7 +397,11 @@ module Io
           valid = []
           labels = []
           menu.each{ |item|
-            hk = item.hotkey.to_s
+            if item.respond_to? :hotkey
+              hk = item.hotkey.to_s
+            else
+              raise ArgumentError, "Promptmenu needs hotkey or mnemonic"
+            end
             labels << "%c. %s " % [ hk, item.label ]
             h[hk] = item
             valid << hk
@@ -413,11 +429,14 @@ module Io
           end
           #$log.debug " index is #{index} "
           item = h[ch]
-          desc = item.desc
-          #desc ||= "Could not find desc for #{ch} "
-          desc ||= ""
-          clear_this w, r, c, color, len
-          print_this(w, desc, color, r,c)
+          # I don;t think this even shows now, its useless
+          if item.respond_to? :desc
+            desc = item.desc
+            #desc ||= "Could not find desc for #{ch} "
+            desc ||= ""
+            clear_this w, r, c, color, len
+            print_this(w, desc, color, r,c)
+          end
           action = item.action
           case action
             #when Array

data/lib/rbcurse/core/include/listbindings.rb

@@ -17,7 +17,8 @@ module RubyCurses
     $log.debug "XXX:  INSIDE LISTBINDING FOR #{self.class} "
       bind_key(Ncurses::KEY_LEFT, 'cursor backward'){ cursor_backward } if respond_to? :cursor_backward
       bind_key(Ncurses::KEY_RIGHT, 'cursor_forward'){ cursor_forward } if respond_to? :cursor_forward
-      bind_key(Ncurses::KEY_UP, 'previous row'){ ret = up;  get_window.ungetch(KEY_BTAB) if ret == :NO_PREVIOUS_ROW }
+      # very irritating when user pressed up arrow, commented off 2012-01-4  can be made optional
+      bind_key(Ncurses::KEY_UP, 'previous row'){ ret = up;  } #get_window.ungetch(KEY_BTAB) if ret == :NO_PREVIOUS_ROW }
       # the next was irritating if user wanted to add a row ! 2011-10-10 
       #bind_key(Ncurses::KEY_DOWN){ ret = down ; get_window.ungetch(KEY_TAB) if ret == :NO_NEXT_ROW }
       bind_key(Ncurses::KEY_DOWN, 'next row'){ ret = down ; }

data/lib/rbcurse/core/include/listscrollable.rb

@@ -271,12 +271,20 @@ module ListScrollable
     end
     def ask_search
       options = ["Search backwards", "case insensitive", "Wrap around"]
-      defaults = [@search_direction_prev,@search_case,@search_wrap]
+      defaults = [@search_direction_prev, @search_case, @search_wrap]
       regex = @last_regex || ""
+      # persist search history so one can popup and see
+      # How does user know that there is some history here.
+      $list_search_history ||= []
+      $list_search_history << @last_regex if @last_regex && !$list_search_history.include?(@last_regex)
 
       mb = MessageBox.new :title => "Search" , :width => 70 do
-        add Field.new :label => 'Enter regex to search', :name => "patt", :display_length => 30, 
-          :bgcolor => :cyan, :text => regex
+        fld =  Field.new :label => 'Enter regex to search', :name => "patt", :display_length => 30, 
+          :bgcolor => :cyan #, :text => regex
+        require 'rbcurse/core/include/rhistory'
+        fld.extend(FieldHistory)
+        fld.history($list_search_history)
+        add fld
         add CheckBox.new :text => options[0], :value => defaults[0], :name => "0"
         add CheckBox.new :text => options[1], :value => defaults[1], :name => "1"
         add CheckBox.new :text => options[2], :value => defaults[2], :name => "2"
@@ -285,7 +293,10 @@ module ListScrollable
       end
       index = mb.run
       return if index != 0
-      regex = mb.widget("patt").text
+      regex = mb.widget("patt").text || regex # if user enters nothing use existing regex
+      regex = @last_regex if regex == ""
+      return if regex.nil? || regex == ""
+      #$list_search_history << @last_regex if @last_regex
       @search_direction_prev =  mb.widget("0").value
       @search_case = mb.widget("1").value
       @search_wrap = mb.widget("2").value
@@ -391,7 +402,8 @@ module ListScrollable
     ##
     # find backwards
     # Using this to start a search or continue search
-    def _find_prev regex=@last_regex, start = @search_found_ix 
+    def _find_prev regex=@last_regex, start = @search_found_ix, first_time = false
+      #TODO the firsttime part, see find_next
       #raise "No previous search" if regex.nil?
       warn "No previous search" and return if regex.nil?
       #$log.debug " _find_prev #{@search_found_ix} : #{@current_index}"

data/lib/rbcurse/core/include/rhistory.rb

@@ -20,16 +20,29 @@
 module RubyCurses
   extend self
   module FieldHistory
+    def self.extended(obj)
+
+      obj.instance_exec {
+        @history ||= []
+        $history_key ||= ?\M-h
+        # ensure that the field is not overriding this in handle_key
+        bind_key($history_key) { _show_history }
+        # widget should have CHANGED event, or this will either give error, or just not work
+        # else please update history whenever you want a value to be retrieved
+        bind(:CHANGED) { @history << @text if @text && (!@history.include? @text) }
+      }
+    end
+
     # pass the array of history values
+    # Trying out a change where an item can also be sent in.
+    # I am lost, i want the initialization to happen once.
     def history arr
       return @history unless arr
-      @history = arr 
-      $history_key ||= ?\M-h
-      # ensure that the field is not overriding this in handle_key
-      bind_key($history_key) { _show_history }
-      # widget should have CHANGED event, or this will either give error, or just not work
-      # else please update history whenever you want a value to be retrieved
-      bind(:CHANGED) { @history << @text if @text && (!@history.include? @text) }
+      if arr.is_a? Array
+        @history = arr 
+      else
+        @history << arr unless @history.include? arr
+      end
     end
     def history=(x); history(x); end
     
@@ -50,7 +63,9 @@ module RubyCurses
       raise ArgumentError, "show_history got nil list" unless list
       # calculate r and c
       # col if fine, except for when there's a label.
-      c = @_history_config[:col] || @field_col || @col # this is also dependent on window coords, as in a status_window or messagebox
+      wcol = 0 # taking care of when dialog uses history 2012-01-4 
+      wcol = self.form.window.left if self.form
+      c = wcol + ( @field_col || @col) # this is also dependent on window coords, as in a status_window or messagebox
       sz = @history.size
       wrow = 0
       wrow = self.form.window.top if self.form
@@ -67,6 +82,7 @@ module RubyCurses
         #r = @row + 1
       #end
       r = @_history_config[:row] || r
+      c = @_history_config[:col] || c
       ret = popuplist(list, :row => r, :col => c, :title  => " History ")
       if ret
         self.text = list[ret] 

data/lib/rbcurse/core/include/widgetmenu.rb

@@ -0,0 +1,66 @@
+# ----------------------------------------------------------------------------- #
+#         File: widgetmenu.rb
+#  Description: a module that displays a menu for customization of a field
+#               e.g.,
+#               field.extend(WidgetMenu)
+#
+#       Author: rkumar http://github.com/rkumar/rbcurse/
+#         Date: 2011-12-2x
+#      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
+#  Last update: 2011-12-26 - 20:25
+# ----------------------------------------------------------------------------- #
+#
+# Provide a system for us to define a menu for customizing a widget, such that
+# applicatin can also add more menuitems
+module RubyCurses
+  extend self
+  module WidgetMenu
+    include Io # added 2011-12-26 
+    # add a menu item which can any one of 
+    # @param key, label, desc, action | symbol
+    #        key, symbol
+    #        Action
+    #        Action[] (maybe)
+    def self.extended(obj)
+      # don't want this executed each time
+      @objects ||= []
+      return if @objects.include? obj
+      @objects << obj
+
+      obj.instance_exec {
+        @_menuitems ||= []
+        # callign this method means that no other programs can use those actions else
+        # that method will be called more than once, so it must either be called in the constructor
+        # or else have a check that it is only called once.
+        obj.init_menu if obj.respond_to? :init_menu
+      }
+
+    end
+    def add_menu_item *val
+      #@_menuitems ||= []
+      @_menuitems << val
+    end
+    #
+    # insert an item at given position (index)
+    def insert_menu_item pos, *val
+      #@_menuitems ||= []
+      @_menuitems[pos] = val
+    end
+    def create_menuitem *args
+      PromptMenu.create_menuitem *args
+    end
+
+    # popup the hist 
+    # 
+    def _show_menu
+      return if @_menuitems.nil? || @_menuitems.empty?
+      list = @_menuitems
+      menu = PromptMenu.new self do |m|
+      list.each { |e| 
+        m.add *e
+      }
+      end
+      menu.display_new :title => 'Widget Menu (Press letter)'
+    end
+  end # mod History
+end # mod RubyC

data/lib/rbcurse/core/system/ncurses.rb

@@ -7,6 +7,11 @@ module VER
   def start_ncurses
     return if $ncurses_started
     $ncurses_started = true
+    # in case we want a blocking getch, you may want to first
+    # set wtimeout to -1, and then reset it to this value.
+    # Please first check that we are using this.
+    $ncurses_wtimeout = 500 # used by windows for timeout of wgetch
+
     # The initscr code determines the terminal type and initializes all curses
     # data structures.
     # initscr also causes the first call to refresh to clear the screen.
@@ -59,7 +64,9 @@ module VER
     # erase/kill character-processing (interrupt and flow control characters
     # are unaffected), making characters typed by the user immediately
     # available to the program.
-    Ncurses.cbreak
+    #Ncurses.cbreak
+    # I have removed cbreak and halfdelay since they were causing C-c
+    # to crash if i pressed it in succession
 
     # The echo and noecho routines control whether characters typed by the user
     # are echoed by getch as they are typed.
@@ -80,12 +87,19 @@ module VER
     # nothing has been typed.
     # The value of tenths must be a number between 1 and 255.
     # Use nocbreak to leave half-delay mode.
-    Ncurses::halfdelay(tenths = 10)
+    #Ncurses::halfdelay(tenths = 10)
+    # See above why switched off
 
     # The nodelay option causes getch to be a non-blocking call. If no input is
     # ready, getch returns ERR. If disabled (bf is FALSE), getch waits until a
     # key is pressed.
-    # Ncurses::nodelay(Ncurses::stdscr, bf = true)
+    # I am using the next line for the window when creating, this does not
+    # have any impact on window.
+    # For this to have any effect your getch should be Ncurses.getch and not
+    # wgetch(@window), For that do this with window.
+    # I am disableing this 2011-12-20 since it does not work with combinations
+    # such as gg. Any routine that does a getch will just immediatelt return an ERR.
+    #Ncurses::nodelay(stdscr.pointer, bf = true)
   end
 
   # this should happen only in outermost program that started ncurses

data/lib/rbcurse/core/system/window.rb

@@ -71,6 +71,7 @@ module VER
       $status_message ||= RubyCurses::Variable.new # in case not an App
 
       $key_map ||= :vim
+      $esc_esc = true; # gove me double esc as 2727 so i can map it.
       init_vars
 
 
@@ -78,6 +79,11 @@ module VER
     def init_vars
       @window_type = :WINDOW
       Ncurses::keypad(@window, true)
+      # Added this so we can get Esc, and also C-c pressed in succession does not crash system
+      #  2011-12-20 half-delay crashes system as does cbreak
+      #This causes us to be unable to process gg qq since getch won't wait.
+      #Ncurses::nodelay(@window, bf = true)
+      Ncurses::wtimeout(@window, $ncurses_timeout || 500) # will wait a second on wgetch so we can get gg and qq
       @stack = []
       @name ||="#{self}"
       @modified = true
@@ -327,11 +333,17 @@ module VER
 
     def getch
       #c = @window.getch
-      c = Ncurses.getch
+      c = FFI::NCurses.wgetch(@window)
+      # 2011-12-20 - i am trying setting a timer on wgetch, see timeout
+      #c = FFI::NCurses.getch # this will keep waiting, nodelay won't be used on it, since 
+      # we've put nodelay on window
       #if c == Ncurses::KEY_RESIZE
 
-    rescue Interrupt => ex
+    rescue SystemExit, Interrupt 
+      #FFI::NCurses.flushinp
       3 # is C-c
+    rescue StandardError
+      -1 # is C-c
     end
 
     #  2011-09-23 @since 1.3.1
@@ -352,8 +364,8 @@ module VER
     #  2 cases, so abandoned.
     def getchar 
       while 1 
-        ch = getch
-        $log.debug "window getchar() GOT: #{ch}" if ch != -1
+        ch = self.getch
+        #$log.debug "window getchar() GOT: #{ch}" if ch != -1
         sf = @stack.first
         if ch == -1
           # the returns escape 27 if no key followed it, so its SLOW if you want only esc
@@ -393,7 +405,8 @@ module VER
           # experimental. 2 escapes in quick succession to make exit faster
           if @stack.size == 1 && ch == 27
             @stack.clear
-            return ch
+            return 2727 if $esc_esc # this is double-esc if you wanna trap it, trying out
+            return 27
           end
           # possible F1..F3 on xterm-color
           if ch == 79 || ch == 91

data/lib/rbcurse/core/util/app.rb

@@ -166,7 +166,7 @@ module RubyCurses
               @form.handle_key ch
             rescue => err
               $log.debug( "handle_key rescue reached ")
-              $log.debug( err) 
+              $log.debug( err.to_s) 
               $log.debug(err.backtrace.join("\n")) 
               textdialog [err.to_s, *err.backtrace], :title => "Exception"
             end

data/lib/rbcurse/core/util/rdialogs.rb

@@ -43,7 +43,12 @@ end
 # Alert user with a block of text. This will popup a textview in which the user can scroll
 # Use this if you are not sure of the size of the text, such as printing a stack trace,
 # exception
+#  2011-12-25 just pass in an exceptino object and we do the rest
 def textdialog mess, config={}
+  if mess.is_a? Exception
+    mess = [mess.to_s, *mess.backtrace]
+    config[:title] ||= "Exception"
+  end
   config[:title] ||= "Alert"
   tp = MessageBox.new config do
     button_type :ok
@@ -81,8 +86,8 @@ def get_string label, config={} # yield Field
   defwid = config[:default].nil? ? 30 : config[:default].size + 13
   w = [label.size + 8, defwid, field_config[:width]+13 ].max
   config[:width] ||= w
-  $log.debug "XXX:  FIELD SIZE #{w} "
-  $log.debug "XXX:  FIELD CONFIG #{field_config} "
+  #$log.debug "XXX:  FIELD SIZE #{w} "
+  #$log.debug "XXX:  FIELD CONFIG #{field_config} "
   tp = MessageBox.new config do
     button_type :ok_cancel
     default_button 0
@@ -373,6 +378,9 @@ def popuplist list, config={}, &block
   end
   config.delete :relative_to
   width = config[:width] || longest_in_list(list)+2 # borders take 2
+  if config[:title]
+    width = config[:title].size + 2 if width < config[:title].size
+  end
   height = config[:height]
   height ||= [max_visible_items || 10+2, list.length+2].min 
   #layout(1+height, width+4, row, col) 

data/lib/rbcurse/core/util/viewer.rb

@@ -89,7 +89,7 @@ module RubyCurses
       # allow closing using q and Ctrl-q in addition to any key specified
       #  user should not need to specify key, since that becomes inconsistent across usages
         while((ch = v_window.getchar()) != ?\C-q.getbyte(0) )
-          break if ch == config[:close_key] || ch == ?q.ord
+          break if ch == config[:close_key] || ch == ?q.ord || ch == 2727 # added double esc 2011-12-27 
           # if you've asked for ENTER then i also check for 10 and 13
           break if (ch == 10 || ch == 13) && config[:close_key] == KEY_ENTER
           v_form.handle_key ch

data/lib/rbcurse/core/widgets/divider.rb

@@ -129,7 +129,7 @@ module RubyCurses
 
       # first print a right side vertical line
       #bc = $bottomcolor  # dark blue
-      bc = $datacolor
+      bc = get_color($datacolor, :cyan, :black)
       bordercolor = @border_color || bc
       borderatt = @border_attrib || Ncurses::A_REVERSE
       if @focussed 

data/lib/rbcurse/core/widgets/rlist.rb

@@ -50,6 +50,7 @@ module RubyCurses
     #dsl_accessor :default_values  # array of default values
     #dsl_accessor :is_popup       # if it is in a popup and single select, selection closes
     attr_accessor :current_index
+    # selection mode multiple, single and none (none added 2011-12-26)
     dsl_accessor :selection_mode
     dsl_accessor :selected_color, :selected_bgcolor, :selected_attr
     dsl_accessor :max_visible_items   # how many to display 2009-01-11 16:15 
@@ -96,11 +97,11 @@ module RubyCurses
       @row_offset = @col_offset = 1
       @should_show_focus = true # Here's its on since the cellrenderer will show it on repaint
       @one_key_selection = false # use vim keys
+      @selection_mode = :multiple # default is multiple, anything else given becomes single
       super
       @_events.push(*[:ENTER_ROW, :LEAVE_ROW, :LIST_SELECTION_EVENT, :PRESS])
       # I have moved this here so user can override keys.
       map_keys unless @keys_mapped
-      @selection_mode ||= :multiple # default is multiple, anything else given becomes single
       @win = @graphic    # 2010-01-04 12:36 BUFFERED  replace form.window with graphic
       @win_left = 0
       @win_top = 0
@@ -113,6 +114,7 @@ module RubyCurses
       if @list && !@selected_index.nil?  # XXX
         set_focus_on @selected_index # the new version
       end
+      init_actions
     end
     # this is called several times, from constructor
     # and when list data changed, so only put relevant resets here.
@@ -138,7 +140,7 @@ module RubyCurses
       bind_key(?f, 'next row starting with char'){ ask_selection_for_char() }
       bind_key(?\M-v, 'toggle one_key_selection'){ @one_key_selection = !@one_key_selection }
       bind_key(13, 'fire action event'){ fire_action_event }
-      list_bindings # listselectable
+      list_bindings unless @selection_mode == :none  # listselectable
       @keys_mapped = true
 
     end
@@ -670,6 +672,13 @@ module RubyCurses
     end
     alias :selected_values :get_selected_values
  
+    # Define actions that can be popped up by PromptMenu or other menubar
+    # Currently, only PromptMenu, but we can start contextually appending to Menubar or others
+    def init_actions
+      am = action_manager()
+      am.add_action(Action.new("&Disable selection") { @selection_mode = :none; unbind_key(32); bind_key(32, :scroll_forward); } )
+      am.add_action(Action.new("&Edit Toggle") { @edit_toggle = !@edit_toggle; $status_message.value = "Edit toggle is #{@edit_toggle}" })
+    end
 
 
     # ADD HERE

data/lib/rbcurse/core/widgets/rmessagebox.rb

@@ -65,7 +65,8 @@ module RubyCurses
       @bgcolor ||= :white
       @maxrow = 3
 
-      instance_eval &block if block_given?
+      #instance_eval &block if block_given?
+      yield_or_eval &block if block_given?
 
     end
     def item widget
@@ -163,6 +164,7 @@ module RubyCurses
       @maxrow = 3
       yield message_label if block_given?
     end
+    alias :message= :message
 
     # This is for larger messages, or messages where the size is not known.
     # A textview object is created and yielded.
@@ -214,13 +216,15 @@ module RubyCurses
       yield message_label if block_given?
 
     end
+    alias :text= :text
+
     # returns button index (or in some cases, whatever value was thrown
     # if user did not specify any button_type but gave his own and did throw (:close, x)
     private
     def handle_keys
       buttonindex = catch(:close) do 
         while((ch = @window.getchar()) != FFI::NCurses::KEY_F10 )
-          break if ch == ?\C-q.getbyte(0) 
+          break if ch == ?\C-q.getbyte(0) || ch == 2727 # added double esc
           begin
             @form.handle_key(ch)
             @window.wrefresh

data/lib/rbcurse/core/widgets/rtextarea.rb

@@ -74,6 +74,7 @@ module RubyCurses
       install_keys
       init_vars
       bordertitle_init
+      init_actions
     end
     def init_vars
       @repaint_required = true
@@ -945,6 +946,13 @@ module RubyCurses
       }
       rb_puts "#{name} written."
     end
+    
+    def init_actions
+      editor = ENV['EDITOR'] || 'vi'
+      am = action_manager()
+      am.add_action(Action.new("&Edit in #{editor} ") { edit_external })
+      am.add_action(Action.new("&Saveas") { saveas() } )
+    end
   end # class textarea
   ##
 end # modul

data/lib/rbcurse/core/widgets/rtextview.rb

@@ -64,6 +64,7 @@ module RubyCurses
       install_keys # do something about this nonsense FIXME
       bordertitle_init
       init_vars
+      init_actions
     end
     def init_vars #:nodoc:
       @curpos = @pcol = @toprow = @current_index = 0
@@ -91,8 +92,8 @@ module RubyCurses
       bind_key(32, 'scroll forward'){ scroll_forward() }
       # have placedhere so multi-bufer can override BS to prev buffer
       bind_keys([KEY_BACKSPACE,KEY_BSPACE,KEY_DELETE], :cursor_backward)
-      bind_key(?r) { getstr("Enter a word: ") } if $log.debug?
-      bind_key(?m, :disp_menu)                  if $log.debug?
+      #bind_key(?r) { getstr("Enter a word: ") } if $log.debug?
+      #bind_key(?m, :disp_menu)                  if $log.debug?
     end
     ## 
     # send in a list
@@ -619,53 +620,6 @@ module RubyCurses
       return "" if ret != 0
       return str
     end
-    # this is just a test of the simple "most" menu
-    # How can application add to this, or override
-    # TODO: use another window at bottom, statuswindow
-    def disp_menu  #:nodoc:
-      # we need to put this into data-structure so that i can be manipulated by calling apps
-      # This should not be at the widget level, too many types of menus. It should be at the app
-      # level only if the user wants his app to use this kind of menu.
-
-      if false
-        #@menu = RubyCurses::MenuTree.new "Main", { s: :goto_start, r: :scroll_right, l: :scroll_left, m: :submenu }
-        #@menu.submenu :m, "submenu", {s: :noignorecase, t: :goto_last_position, f: :next3 }
-        #menu = PromptMenu.new self 
-        #menu.menu_tree @menu
-        #menu.display @form.window, $error_message_row, $error_message_col, $datacolor #, menu
-      end
-      # trying to find a more rubyesque way of doing
-      menu = PromptMenu.new self do
-        item :s, :goto_start
-        item :b, :goto_bottom
-        item :r, :scroll_backward
-        item :l, :scroll_forward
-        submenu :m, "submenu..." do
-          item :p, :goto_last_position
-          item :r, :scroll_right
-          item :l, :scroll_left
-        end
-      end
-      #menu.display @form.window, $error_message_row, $error_message_col, $datacolor #, menu
-      menu.display_new :title => "Menu"
-
-
-=begin
-      require 'rbcurse/extras/widgets/menutree'
-      menu = PromptMenu.new self 
-      menu.add( menu.create_mitem( 's', "Goto start ", "Going to start", Proc.new { goto_start} ))
-      menu.add(menu.create_mitem( 'r', "scroll right", "I have scrolled ", :scroll_right ))
-      menu.add(menu.create_mitem( 'l', "scroll left", "I have scrolled ", :scroll_left ))
-      item = menu.create_mitem( 'm', "submenu", "submenu options" )
-      menu1 = PromptMenu.new( self, "Submenu Options")
-      menu1.add(menu1.create_mitem( 's', "CASE sensitive", "Ignoring Case in search" ))
-      menu1.add(menu1.create_mitem( 't', "goto last position", "moved to previous position", Proc.new { goto_last_position} ))
-      item.action = menu1
-      menu.add(item)
-      # how do i know what's available. the application or window should know where to place
-      #menu.display @form.window, 23, 1, $datacolor #, menu
-=end
-    end
     ##
     # dynamically load a module and execute init method.
     # Hopefully, we can get behavior like this such as vieditable or multibuffers
@@ -768,6 +722,12 @@ module RubyCurses
         set_content(lines, :content_type => @old_content_type)
       end
     end
+    def init_actions
+      editor = ENV['EDITOR'] || 'vi'
+      am = action_manager()
+      am.add_action( Action.new("&Edit in #{editor} ") { edit_external } )
+      am.add_action( Action.new("&Saveas") { saveas() })
+    end
 
 
   end # class textview

data/lib/rbcurse/core/widgets/rwidget.rb

@@ -57,22 +57,14 @@ class Module
           if val.empty?
             @#{sym}
           else
-            #if @frozen # 2011-10-1  prevent object from being changed # changed 2011 dts  
-               #return if @frozen && (@frozen_list.nil? || @frozen_list.include?(:#{sym}) )
-            #end
             @#{sym} = val.size == 1 ? val[0] : val
             # i am itching to deprecate next line XXX
-            @config["#{sym}"]=@#{sym}
+            # @config["#{sym}"]=@#{sym} # commented out 2011-12-18 to simplify
             self # 2011-10-2 
           end
         end
       # can the next bypass validations
-      # I don't think anyone will expect self to be returned if using = to assign
     attr_writer sym #2011-10-2 
-        #def #{sym}=(val)
-           ##{sym}(val)
-           # self
-        #end
       }
     }
   end
@@ -86,7 +78,6 @@ class Module
           if val.empty?
             @#{sym}
           else
-            #return(self) if @frozen && (@frozen_list.nil? || @frozen_list.include?(:#{sym}) )
             oldvalue = @#{sym}
             # @#{sym} = val.size == 1 ? val[0] : val
             tmp = val.size == 1 ? val[0] : val
@@ -94,7 +85,7 @@ class Module
             # i am itching to deprecate config setting
             if oldvalue.nil? || @_object_created.nil?
                @#{sym} = tmp
-               @config["#{sym}"]=@#{sym}
+               # @config["#{sym}"]=@#{sym} # 2011-12-18 
             end
             return(self) if oldvalue.nil? || @_object_created.nil?
 
@@ -251,11 +242,11 @@ module RubyCurses
         when S_F9
           return "S_F9"
         else
-          others=[?\M--,?\M-+,?\M-=,?\M-',?\M-",?\M-;,?\M-:,?\M-\,, ?\M-.,?\M-<,?\M->,?\M-?,?\M-/]
+          others=[?\M--,?\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
-          s_others=%w[M-- M-+ M-= M-' M-"   M-;   M-:   M-, M-. M-< M-> M-? M-/ ]
+          s_others=%w[M-- M-+ M-= M-' M-"   M-;   M-:   M-, M-. M-< M-> M-? M-/ M-!]
           if others.include? keycode
-            index =  others.index keycode
+            index = others.index keycode
             return s_others[index]
           end
           # all else failed
@@ -364,7 +355,7 @@ module RubyCurses
       #  2010-02-24 12:43 trying to take in multiple key bindings, TODO unbind
       #  TODO add symbol so easy to map from config file or mapping file
       def bind_key keycode, *args, &blk
-        $log.debug " #{@name} bind_key received #{keycode} "
+        #$log.debug " #{@name} bind_key received #{keycode} "
         @key_handler ||= {}
         #
         # added on 2011-12-4 so we can pass a description for a key and print it
@@ -407,18 +398,25 @@ module RubyCurses
         @key_args[keycode] = args
 
       end
+      # Display key bindings for current widget and form in dialog
       def print_key_bindings *args
         f  = get_current_field
         #labels = [@key_label, f.key_label]
-        labels = [@key_label]
-        labels << f.key_label if f.key_label
+        #labels = [@key_label]
+        #labels << f.key_label if f.key_label
+        labels = []
+        labels << (f.key_label || {}) #if f.key_label
+        labels << @key_label
         arr = []
+        if get_current_field.help_text 
+          arr << get_current_field.help_text 
+        end
         labels.each_with_index { |h, i|  
           case i
           when 0
-            arr << "  ===  Form bindings ==="
+            arr << "  ===  Current widget bindings ==="
           when 1
-            arr << "  === Current field bindings ==="
+            arr << "  === Form bindings ==="
           end
 
           h.each_pair { |name, val| 
@@ -459,14 +457,22 @@ module RubyCurses
         blk = @key_handler[keycode]
         return :UNHANDLED if blk.nil?
         if blk.is_a? OrderedHash
+          #Ncurses::nodelay(window.get_window, bf = false)
+          # if you set nodelay in ncurses.rb then this will not
+          # wait for second key press, so you then must either make it blocking
+          # here, or set a wtimeout here.
           ch = window.getch
+          #Ncurses::nodelay(window.get_window, bf = true)
+
+          $log.debug " process_key: got #{keycode} , #{ch} "
           if ch < 0 || ch > 255
-            #next
             return nil
           end
-          $log.debug " process_key: got #{keycode} , #{ch} "
           yn = ch.chr
           blk1 = blk[ch]
+          # FIXME we are only returning the second key, what if form
+          # has mapped first and second combo. We should unget keycode and ch. 2011-12-23 
+          # check this out first.
           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} "
@@ -668,6 +674,7 @@ module RubyCurses
   
  
   class Widget
+    require 'rbcurse/core/include/action'          # added 2012-01-3 for add_action
     include EventHandler
     include ConfigSetup
     include RubyCurses::Utils
@@ -1128,7 +1135,13 @@ module RubyCurses
          bind :CHANGED, *args, &block
        end
      end
-     ##
+     # return an object of actionmanager class, creating if required
+     # Widgets and apps may add_action and show_menu using the same
+     def action_manager
+       require 'rbcurse/core/include/actionmanager'
+       @action_manager ||= ActionManager.new
+     end
+     #
     ## ADD HERE WIDGET
   end
 
@@ -1230,7 +1243,7 @@ module RubyCurses
       mb.toggle_key ||= Ncurses.KEY_F2
       if !mb.toggle_key.nil?
         ch = mb.toggle_key
-        bind_key(ch) do |_form| 
+        bind_key(ch, 'Menu Bar') do |_form| 
           if !@menu_bar.nil?
             @menu_bar.toggle
             @menu_bar.handle_keys
@@ -1683,13 +1696,19 @@ module RubyCurses
   def map_keys
     return if @keys_mapped
     bind_keys([?\M-?,?\?], 'show field help') { 
-      if get_current_field.help_text 
-        textdialog(get_current_field.help_text, 'title' => 'Help Text', :bgcolor => 'green', :color => :white) 
-      else
+      #if get_current_field.help_text 
+        #textdialog(get_current_field.help_text, 'title' => 'Help Text', :bgcolor => 'green', :color => :white) 
+      #else
         print_key_bindings
-      end
+      #end
     }
     bind_key(FFI::NCurses::KEY_F9, "Print keys", :print_key_bindings) # show bindings, tentative on F9
+    bind_key(?\M-:, 'show menu') {
+      fld = get_current_field
+      am = fld.action_manager()
+      #fld.init_menu
+      am.show_actions
+    }
     @keys_mapped = true
   end
   
@@ -1735,7 +1754,7 @@ module RubyCurses
           field =  get_current_field
           if $log.debug?
             keycode = keycode_tos(ch)
-            $log.debug " form HK #{ch} #{self}, #{@name}, #{keycode}, field: giving to: #{field}, #{field.name}  " if field
+            #$log.debug " form HK #{ch} #{self}, #{@name}, #{keycode}, field: giving to: #{field}, #{field.name}  " if field
           end
           handled = :UNHANDLED 
           handled = field.handle_key ch unless field.nil? # no field focussable
@@ -2158,17 +2177,17 @@ module RubyCurses
   end
   def map_keys
     return if @keys_mapped
-    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 }
-    bind_key(?\C-e){ cursor_end }
-    bind_key(?\C-k){ delete_eol }
-    bind_key(?\C-_){ undo_delete_eol }
+    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 )
+    bind_key(?\C-e, :cursor_end )
+    bind_key(?\C-k, :delete_eol )
+    bind_key(?\C-_, :undo_delete_eol )
     #bind_key(27){ set_buffer @original_value }
-    bind_key(?\C-g){ set_buffer @original_value } # 2011-09-29 V1.3.1 ESC did not work
+    bind_key(?\C-g, 'revert'){ set_buffer @original_value } # 2011-09-29 V1.3.1 ESC did not work
     @keys_mapped = true
   end
 
@@ -2537,10 +2556,10 @@ module RubyCurses
         # meta key 
         mch = ?\M-a.getbyte(0) + (ch - ?a.getbyte(0))  ## 1.9
         if (@label_for.is_a? RubyCurses::Button ) && (@label_for.respond_to? :fire)
-          @form.bind_key(mch, @label_for) { |_form, _butt| _butt.fire }
+          @form.bind_key(mch, "hotkey for button #{@label_for.text} ") { |_form, _butt| @label_for.fire }
         else
           $log.debug " bind_hotkey label for: #{@label_for}"
-          @form.bind_key(mch, @label_for) { |_form, _field| _field.focus }
+          @form.bind_key(mch, "hotkey for label #{text} ") { |_form, _field| @label_for.focus }
         end
       end
     end
@@ -2649,6 +2668,7 @@ module RubyCurses
           s.slice!(ix,1)
           # 2011-10-20 NOTE XXX I have removed form check since bindkey is called conditionally
           @underline = ix #unless @form.nil? # this setting a fake underline in messageboxes
+          @text = s # mnemo needs this for setting description
           mnemonic s[ix,1]
         end
         @text = s
@@ -2676,7 +2696,8 @@ module RubyCurses
       # meta key 
       ch = ?\M-a.getbyte(0) + (ch - ?a.getbyte(0)) unless @hotkey
       $log.debug " #{self} setting MNEMO to #{char} #{ch}, #{@hotkey} "
-      @form.bind_key(ch, self) { |_form, _butt| _butt.fire }
+      _t = self.text || self.name || "Unnamed #{self.class} "
+      @form.bind_key(ch, "hotkey for button #{_t} ") { |_form, _butt| self.fire }
     end
 
     ##
@@ -2697,7 +2718,7 @@ module RubyCurses
       @mnemonic = _value[@underline,1]
       # meta key 
       mch = ?\M-a.getbyte(0) + (ch - ?a.getbyte(0))
-      @form.bind_key(mch, self) { |_form, _butt| _butt.fire }
+      @form.bind_key(mch, "hotkey for button #{self.text}" ) { |_form, _butt| self.fire }
     end
     def default_button tf=nil
       return @default_button unless tf
@@ -2706,7 +2727,7 @@ module RubyCurses
       @default_button = tf
       if tf
         @surround_chars = @default_chars
-        @form.bind_key(13, self) { |_form, _butt| _butt.fire }
+        @form.bind_key(13, "fire #{self.text} ") { |_form, _butt| self.fire }
       else
         # i have no way of reversing the above
       end
@@ -2967,7 +2988,6 @@ module RubyCurses
 
   ##
   # A checkbox, may be selected or unselected
-  # TODO hotkey should work here too.
   #
   class CheckBox < ToggleButton
     dsl_accessor :align_right    # the button will be on the right 2008-12-09 23:41 

data/lib/rbcurse.rb

@@ -4,5 +4,5 @@ require 'rbcurse/core/system/window'
 require 'rbcurse/core/widgets/rwidget'
 require 'rbcurse/core/util/rdialogs'
 class Rbcurse
-  VERSION = '0.0.0'
+  VERSION = '0.0.3'
 end

data/rbcurse-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-core"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = "2011-12-13"
+  s.date = "2012-01-05"
   s.description = "Ruby curses/ncurses widgets for easy application development on text terminals (ruby 1.9, 1.8)"
   s.email = "sentinel1879@gmail.com"
   s.extra_rdoc_files = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/rbcurse.rb",
     "lib/rbcurse/core/docs/index.txt",
     "lib/rbcurse/core/include/action.rb",
+    "lib/rbcurse/core/include/actionmanager.rb",
     "lib/rbcurse/core/include/appmethods.rb",
     "lib/rbcurse/core/include/bordertitle.rb",
     "lib/rbcurse/core/include/chunk.rb",
@@ -70,6 +71,7 @@ Gem::Specification.new do |s|
     "lib/rbcurse/core/include/rhistory.rb",
     "lib/rbcurse/core/include/rinputdataevent.rb",
     "lib/rbcurse/core/include/vieditable.rb",
+    "lib/rbcurse/core/include/widgetmenu.rb",
     "lib/rbcurse/core/system/colormap.rb",
     "lib/rbcurse/core/system/keyboard.rb",
     "lib/rbcurse/core/system/keydefs.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcurse-core
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-ncurses
-  requirement: &70266141084420 !ruby/object:Gem::Requirement
+  requirement: &70102876538580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266141084420
+  version_requirements: *70102876538580
 description: Ruby curses/ncurses widgets for easy application development on text
   terminals (ruby 1.9, 1.8)
 email: sentinel1879@gmail.com
@@ -68,6 +68,7 @@ files:
 - lib/rbcurse.rb
 - lib/rbcurse/core/docs/index.txt
 - lib/rbcurse/core/include/action.rb
+- lib/rbcurse/core/include/actionmanager.rb
 - lib/rbcurse/core/include/appmethods.rb
 - lib/rbcurse/core/include/bordertitle.rb
 - lib/rbcurse/core/include/chunk.rb
@@ -84,6 +85,7 @@ files:
 - lib/rbcurse/core/include/rhistory.rb
 - lib/rbcurse/core/include/rinputdataevent.rb
 - lib/rbcurse/core/include/vieditable.rb
+- lib/rbcurse/core/include/widgetmenu.rb
 - lib/rbcurse/core/system/colormap.rb
 - lib/rbcurse/core/system/keyboard.rb
 - lib/rbcurse/core/system/keydefs.rb