rbcurse 1.4.0 → 1.4.1.pre2

data/lib/rbcurse/rvimsplit.rb

@@ -18,7 +18,6 @@
 # i am tired of maintaining this everywhere.
 require 'rbcurse'
 require 'rbcurse/rlistbox'
-require 'rbcurse/rtextview'
 require 'rbcurse/extras/divider'
 require 'rbcurse/extras/focusmanager'
 
@@ -184,6 +183,7 @@ module RubyCurses
           lb = Listbox.new nil, :list => c , :name => "list#{@components.size}"
           c = lb
         when String
+          require 'rbcurse/rtextview'
           lb = TextView.new nil, :name => "text#{@components.size}"
           lb.set_content c
           c = lb
@@ -273,10 +273,7 @@ module RubyCurses
     def repaint
       my_win = @form ? @form.window : @target_window
       @graphic = my_win unless @graphic
-      raise " #{@name} neither form, nor target window given TV paint " unless my_win
-      raise " #{@name} NO GRAPHIC set as yet                 TV paint " unless @graphic
-      @win_left = my_win.left
-      @win_top = my_win.top
+      raise " #{@name} NO GRAPHIC set as yet                 VIMSPLIT paint " unless @graphic
 
       #return unless @repaint_required
       @recalculate_splits = true if @rc.nil?
@@ -292,31 +289,37 @@ module RubyCurses
 
 
         @graphic.attron(Ncurses.COLOR_PAIR(bordercolor) | borderatt)
-        @gbwid ||= 0
+
+        ##  The following calculations are only calcing the 2 split areas
+        ##   and divider locations based on V or H and weight.
+
+        @gbwid ||= 0    # grabbar width
         roffset = 1
         loffset = 2
         if @suppress_borders
           loffset = roffset = 0
         end
+        # vertical split 
         if v?
           @rc ||= (@width * @weight).to_i
-          rc = @rc
+          rc = @rc            # divider location
           $log.debug "SPLP #{@name} prtingign split vline divider 1, rc: #{rc}, h:#{@height} - 2 "
-          unless @vb
+          unless @vb             # if grabbar not created
             @gbwid = 1
             _create_divider
-          else
+          else                   # created, so set it
             @vb.row @row+roffset
             @vb.col rc+@col
             #@vb.repaint
           end
           #@graphic.mvvline(@row+1, rc+@col, 0, @height-2)
           # TODO don;t keep recreating, if present, reset values
+          ## calculate cordinated of both split areas/boxes
           @c1rc = Coord.new(@row,@col, @height -0, rc-@gbwid)
           @c2rc = Coord.new(@row,rc+@col+@gbwid,@height-0, @width - rc-@gbwid)
-        else
+        else #  horizontal split
           @rc ||= (@height * @weight).to_i
-          rc = @rc
+          rc = @rc         # dividers row col location
           $log.debug "SPLP #{@name} prtingign split hline divider rc: #{rc} , 1 , w:#{@width} - 2"
           unless @vb
             @gbwid = 1
@@ -334,7 +337,7 @@ module RubyCurses
             @c1rc = Coord.new(@row+a,@col+a, rc-a, @width-@internal_width)
             @c2rc = Coord.new(@row+rc+a,@col+a, @height-rc-2, @width - @internal_width)
           else
-            # flush
+            # flush against border
           #@c1rc = Coord.new(@row,@col, @height -0, rc-@gbwid)
           #@c2rc = Coord.new(@row,rc+@col+@gbwid,@height-0, @width - rc-@gbwid)
             a = 0

data/lib/rbcurse/rwidget.rb

@@ -1,6 +1,5 @@
 =begin
-  * Name: rwidget: base class and then popup and other derived widgets
-  * $Id$
+  * Name: rwidget: base class and then basic widgets like field, button and label
   * Description   
     Some simple light widgets for creating ncurses applications. No reliance on ncurses
     forms and fields.
@@ -10,6 +9,7 @@
   * Author: rkumar (arunachalesha)
   * Date: 2008-11-19 12:49 
   * License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
+  * Last update: 2011-11-08 - 16:55
 
   == CHANGES
   * 2011-10-2 Added PropertyVetoException to rollback changes to property
@@ -24,28 +24,16 @@
 
 =end
 require 'logger'
-#require 'rbcurse/mapper'
 require 'rbcurse/colormap'
 require 'rbcurse/orderedhash'
 require 'rbcurse/rinputdataevent' # for FIELD 2010-09-11 12:31 
 require 'rbcurse/io'
+require 'rbcurse/common/keydefs'
 
-# some of these will get overriden by ncurses when we include
-KEY_TAB    = 9
-KEY_F1  = FFI::NCurses::KEY_F1
-KEY_ENTER  = 10 # FFI::NCurses::KEY_ENTER gives 343
-KEY_BTAB  = 353 # nc gives same
-KEY_RETURN = 13  # Nc gives 343 for KEY_ENTER
-KEY_DELETE = 330
-KEY_BACKSPACE = KEY_BSPACE = 127 # Nc gives 263 for BACKSPACE
-KEY_CC     = 3   # C-c
-KEY_LEFT  = FFI::NCurses::KEY_LEFT
-KEY_RIGHT  = FFI::NCurses::KEY_RIGHT
-KEY_UP  = FFI::NCurses::KEY_UP
-KEY_DOWN  = FFI::NCurses::KEY_DOWN
-C_LEFT = 18168
-C_RIGHT = 18167
-S_F9 = 17949126
+BOLD = FFI::NCurses::A_BOLD
+REVERSE = FFI::NCurses::A_REVERSE
+UNDERLINE = FFI::NCurses::A_UNDERLINE
+NORMAL = FFI::NCurses::A_NORMAL
 
 class Object
 # thanks to terminal-table for this method
@@ -116,11 +104,12 @@ class Module
             if oldvalue != newvalue
               # trying to reduce calls to fire, when object is being created
                begin
+                 @property_changed = true
                  fire_property_change("#{sym}", oldvalue, newvalue) if !oldvalue.nil?
                  @#{sym} = tmp
                  @config["#{sym}"]=@#{sym}
                rescue PropertyVetoException
-                 $log.warn "PropertyVetoException for #{sym}:" + oldvalue + "->  "+newvalue
+                  $log.warn "PropertyVetoException for #{sym}:" + oldvalue.to_s + "->  "+ newvalue.to_s
                end
             end # if old
             self
@@ -177,6 +166,28 @@ module RubyCurses
       # e.g. a single call of foo() may set a var, a repeated call of foo() may append to var
       $inside_multiplier_action = true
 
+      # This has been put here since the API is not yet stable, and i
+      # don't want to have to change in many places. 2011-11-10 
+      #
+      # Converts formatted text into chunkline objects.
+      #
+      # To print chunklines you may for each row:
+      #       window.wmove row+height, col
+      #       a = get_attrib @attrib
+      #       window.show_colored_chunks content, color, a
+      #
+      # @param [color_parser] object or symbol :tmux, :ansi
+      #       the color_parser implements parse_format, the symbols
+      #       relate to default parsers provided.
+      # @param [String] string containing formatted text
+      def parse_formatted_text(color_parser, formatted_text)
+        require 'rbcurse/common/chunk'
+        cp = Chunks::ColorParser.new color_parser
+        l = []
+        formatted_text.each { |e| l << cp.convert_to_chunk(e) }
+        return l
+      end
+
       ## 
       # wraps text given max length, puts newlines in it.
       # it does not take into account existing newlines
@@ -271,6 +282,73 @@ module RubyCurses
         acolor = ColorMap.get_color(color, bgcolor)
         return acolor
       end
+      #
+      # convert a string to integer attribute
+      # FIXME: what if user wishes to OR two attribs, this will give error
+      # @param [String] e.g. reverse bold normal underline
+      #     if a Fixnum is passed, it is returned as is assuming to be 
+      #     an attrib
+      def get_attrib str
+        return FFI::NCurses::A_NORMAL unless str
+        # next line allows us to do a one time conversion and keep the value
+        #  in the same variable
+        if str.is_a? Fixnum
+          if [
+            FFI::NCurses::A_BOLD,
+            FFI::NCurses::A_REVERSE,    
+            FFI::NCurses::A_NORMAL,
+            FFI::NCurses::A_UNDERLINE,
+            FFI::NCurses::A_STANDOUT,    
+            FFI::NCurses::A_DIM,    
+            FFI::NCurses::A_BOLD | FFI::NCurses::A_REVERSE,    
+            FFI::NCurses::A_BOLD | FFI::NCurses::A_UNDERLINE,    
+            FFI::NCurses::A_REVERSE | FFI::NCurses::A_UNDERLINE,    
+            FFI::NCurses::A_BLINK
+          ].include? str
+          return str
+          else
+            raise ArgumentError, "get_attrib got a wrong value: #{str} "
+          end
+        end
+
+
+        att = nil
+        str = str.downcase.to_sym if str.is_a? String
+        case str #.to_s.downcase
+        when :bold
+          att = FFI::NCurses::A_BOLD
+        when :reverse
+          att = FFI::NCurses::A_REVERSE    
+        when :normal
+          att = FFI::NCurses::A_NORMAL
+        when :underline
+          att = FFI::NCurses::A_UNDERLINE
+        when :standout
+          att = FFI::NCurses::A_STANDOUT
+        when :bold_reverse
+          att = FFI::NCurses::A_BOLD | FFI::NCurses::A_REVERSE
+        when :bold_underline
+          att = FFI::NCurses::A_BOLD | FFI::NCurses::A_UNDERLINE
+        when :dim
+          att = FFI::NCurses::A_DIM    
+        when :blink
+          att = FFI::NCurses::A_BLINK    # unlikely to work
+        else
+          att = FFI::NCurses::A_NORMAL
+        end
+        return att
+      end
+
+      # returns last line of full screen, should it be current window ?
+      def last_line; FFI::NCurses.LINES-1; end
+      
+      # Create a one line window typically at the bottom
+      # should we really put this here, too much clutter ?
+      def one_line_window at=last_line(), config={}, &blk
+        at ||= last_line()
+        at = FFI::NCurses.LINES-at if at < 0
+        VER::Window.new(1,0,at,0)
+      end
       ## repeats the given action based on how value of universal numerica argument
       ##+ set using the C-u key. Or in vim-mode using numeric keys
       def repeatm
@@ -320,6 +398,9 @@ module RubyCurses
         @key_args ||= {}
         @key_args[keycode] = args
       end
+      def bind_keys keycodes, *args, &blk
+        keycodes.each { |k| bind_key k, *args, &blk }
+      end
       # e.g. process_key ch, self
       # returns UNHANDLED if no block for it
       # after form handles basic keys, it gives unhandled key to current field, if current field returns
@@ -494,6 +575,7 @@ module RubyCurses
       end
     end # module config
     
+    # Adding widget shortcuts here for non-App cases 2011-10-12 . MOVE these to widget shortcuts
     #
     # prints a status line at bottom where mode's statuses et can be reflected
     def status_line config={}, &block
@@ -501,15 +583,33 @@ module RubyCurses
       sl = RubyCurses::StatusLine.new @form, config, &block
     end
 
+    # add a standard application header
+    # == Example
+    #    header = app_header "rbcurse ", :text_center => "Browser Demo", :text_right =>"New Improved!", 
+    #         :color => :black, :bgcolor => :white, :attr => :bold 
+    def app_header title, config={}, &block
+      require 'rbcurse/applicationheader'
+      header = ApplicationHeader.new @form, title, config, &block
+    end
+    
+    # prints pine-like key labels
+    def dock labels, config={}, &block
+      require 'rbcurse/keylabelprinter'
+      klp = RubyCurses::KeyLabelPrinter.new @form, labels, config, &block
+    end
+
     ##
-    # Basic widget class. 
-    # NOTE: I may soon remove the config hash. I don't use it and its just making things heavy.
-    # Unless someone convinces me otherwise.
+    # Basic widget class superclass. Anything embedded in a form should
+    # extend this, if it wants to be repainted or wants focus. Otherwise.
+    # form will be unaware of it.
+  
+ 
   class Widget
     include EventHandler
     include ConfigSetup
     include RubyCurses::Utils
     include Io # added 2010-03-06 13:05 
+    # common interface for text related to a field, label, textview, button etc
     dsl_property :text
 
     # next 3 to be checked if used or not. Copied from TK.
@@ -517,11 +617,12 @@ module RubyCurses
     dsl_property :highlight_foreground, :highlight_background  # color init_pair
     dsl_property :disabled_foreground, :disabled_background  # color init_pair
 
-    # FIXME is enabled used?
+    # FIXME is enabled used? is menu using it
     dsl_accessor :focusable, :enabled # boolean
     dsl_property :row, :col            # location of object
     dsl_property :color, :bgcolor      # normal foreground and background
-    dsl_property :color_pair           # instead of colors give just color_pair
+    # moved to a method which calculates color 2011-11-12 
+    #dsl_property :color_pair           # instead of colors give just color_pair
     dsl_property :attr                 # attribute bold, normal, reverse
     dsl_accessor :name                 # name to refr to or recall object by_name
     attr_accessor :id #, :zorder
@@ -538,6 +639,7 @@ module RubyCurses
     dsl_property :preferred_height  # added 2009-10-28 13:40 for splitpanes and better resizing
     dsl_property :min_width  # added 2009-10-28 13:40 for splitpanes and better resizing
     dsl_property :min_height  # added 2009-10-28 13:40 for splitpanes and better resizing
+    # widget also has height and width as a method
 
     attr_accessor  :_object_created   # 2010-09-16 12:12 to prevent needless property change firing when object being set
     
@@ -563,7 +665,7 @@ module RubyCurses
       @col_offset ||= 0
       #@ext_row_offset = @ext_col_offset = 0 # 2010-02-07 20:18  # removed on 2011-09-29 
       @state = :NORMAL
-      @attr = nil
+      #@attr = nil    # 2011-11-5 i could be removing what's been entered since super is called
 
       @handler = nil # we can avoid firing if nil
       @event_args = {}
@@ -584,9 +686,8 @@ module RubyCurses
       end
       # 2010-09-20 13:12 moved down, so it does not create problems with other who want to set their
       # own default
-      @bgcolor ||=  "black" # 0
-      @color ||= "white" # $datacolor
-  #    @id = form.add_widget(self) if !form.nil? and form.respond_to? :add_widget
+      #@bgcolor ||=  "black" # 0
+      #@color ||= "white" # $datacolor
       set_form(form) unless form.nil? 
     end
     def init_vars
@@ -622,6 +723,7 @@ module RubyCurses
 
     ## got left out by mistake 2008-11-26 20:20 
     def on_enter
+      @state = :HIGHLIGHTED    # duplicating since often these are inside containers
       @focussed = true
       if @handler && @handler.has_key?(:ENTER)
         fire_handler :ENTER, self
@@ -629,6 +731,7 @@ module RubyCurses
     end
     ## got left out by mistake 2008-11-26 20:20 
     def on_leave
+      @state = :NORMAL    # duplicating since often these are inside containers
       @focussed = false
       if @handler && @handler.has_key?(:LEAVE)
         fire_handler :LEAVE, self
@@ -657,6 +760,8 @@ module RubyCurses
     #  widget does not have display_length.
     def repaint
         r,c = rowcol
+        @bgcolor ||= $def_bg_color # moved down 2011-11-5 
+        @color   ||= $def_fg_color
         $log.debug("widget repaint : r:#{r} c:#{c} col:#{@color}" )
         value = getvalue_for_paint
         len = @display_length || value.length
@@ -673,32 +778,7 @@ module RubyCurses
       Ncurses::Panel.del_panel(panel.pointer) if !panel.nil?   
       @window.delwin if !@window.nil?
     end
-    # @deprecated pls call windows method
-    def printstring(win, r,c,string, color, att = Ncurses::A_NORMAL)
-
-      att = Ncurses::A_NORMAL if att.nil?
-      case att.to_s.downcase
-      when 'underline'
-        att = Ncurses::A_UNDERLINE
-        $log.debug "UL att #{att}"
-      when 'bold'
-        att = Ncurses::A_BOLD
-      when 'blink'
-        att = Ncurses::A_BLINK
-      when 'reverse'
-        att = Ncurses::A_REVERSE
-      else
-        att = Ncurses::A_NORMAL
-      end
-      #$log.debug "att #{att}"
-
-      #att = bold ? Ncurses::A_BLINK|Ncurses::A_BOLD : Ncurses::A_NORMAL
-      #     att = bold ? Ncurses::A_BOLD : Ncurses::A_NORMAL
-      win.attron(Ncurses.COLOR_PAIR(color) | att)
-      win.mvprintw(r, c, "%s", string);
-      win.attroff(Ncurses.COLOR_PAIR(color) | att)
-    end
-    # in those rare cases where we create widget without a form, and later give it to 
+    # in those cases where we create widget without a form, and later give it to 
     # some other program which sets the form. Dirty, we should perhaps create widgets
     # without forms, and add explicitly. 
     def set_form form
@@ -720,10 +800,13 @@ module RubyCurses
       #@form.row = @row + 1 
       r, c = rowcol
       $log.warn " empty set_form_row in widget #{self} r = #{r} , c = #{c}  "
+      #raise "trying to set 0, maybe called repaint before container has set value" if row <= 0
       setrowcol row, nil
     end
     # set cursor on correct column, widget
     # Ideally, this should be overriden, as it is not likely to be correct.
+    # NOTE: this is okay for some widgets but NOT for containers
+    # that will call their own components SFR and SFC
     def set_form_col col1=@curpos
       @curpos = col1 || 0 # 2010-01-14 21:02 
       #@form.col = @col + @col_offset + @curpos
@@ -810,6 +893,7 @@ module RubyCurses
          newvalue = @width
          @config["width"]=@width
          if oldvalue != newvalue
+           @property_changed = true
            fire_property_change(:width, oldvalue, newvalue)
            repaint_all(true)  # added 2010-01-08 18:51 so widgets can redraw everything.
          end
@@ -841,9 +925,9 @@ module RubyCurses
          newvalue = @height
          @config[:height]=@height
          if oldvalue != newvalue
+           @property_changed = true
            fire_property_change(:height, oldvalue, newvalue)
-           $log.debug " widget #{@name} setting repaint_all to true"
-           @repaint_all=true
+           repaint_all true
          end
        end
      end
@@ -904,7 +988,9 @@ module RubyCurses
         #c += @ext_col_offset unless c.nil?
         if @form
           @form.setrowcol r, c
+        #elsif @parent_component
         else
+          raise "Parent component not defined for #{self}, #{self.class} " unless @parent_component
           @parent_component.setrowcol r, c
         end
         #setformrowcol r,c 
@@ -929,6 +1015,33 @@ module RubyCurses
        return @@events if defined? @@events
        nil
      end
+     # 2011-11-12 trying to make color setting a bit sane
+     # You may set as a color_pair using get_color which gives a fixnum
+     # or you may give 2 color symbols so i can update color, bgcolor and colorpair in one shot
+     # if one of them is nil, i just use the existing value
+     def color_pair(*val)
+       if val.empty?
+         return @color_pair
+       end
+
+       oldvalue = @color_pair
+       case val.size
+       when 1
+         raise ArgumentError, "Expecting fixnum for color_pair." unless val[0].is_a? Fixnum
+         @color_pair = val[0]
+         @color, @bgcolor = ColorMap.get_colors_for_pair @color_pair
+       when 2
+         @color = val.first if val.first
+         @bgcolor = val.last if val.last
+         @color_pair = get_color $datacolor, @color, @bgcolor
+       end
+       if oldvalue != @color_pair
+         fire_property_change(:color_pair, oldvalue, @color_pair)
+         @property_changed = true
+         repaint_all true
+       end
+       self
+     end
      ##
     ## ADD HERE WIDGET
   end
@@ -978,6 +1091,7 @@ module RubyCurses
     attr_accessor :cols_panned  # HACK added 2009-12-30 16:01 BUFFERED  USED ??? CLEANUP XXX
 
     ## next 2 added since tabbedpanes offset needs to be accounted by form inside it.
+    # NOTE: if you set a form inside another set parent_form in addition to these 2.
     attr_accessor :add_cols # 2010-01-26 20:23 additional columns due to being placed in some container
     attr_accessor :add_rows # 2010-01-26 20:23 additional columns due to being placed in some container
 
@@ -1071,6 +1185,8 @@ module RubyCurses
       $log.debug " form repaint:#{self}, #{@name} , r #{@row} c #{@col} " if $log.debug? 
       @widgets.each do |f|
         next if f.visible == false # added 2008-12-09 12:17 
+        #$log.debug "XXX: FORM CALLING REPAINT OF WIDGET #{f} IN LOOP"
+        #raise "Row or col nil #{f.row} #{f.col} for #{f}, #{f.name} " if f.row.nil? || f.col.nil?
         f.repaint
         f._object_created = true # added 2010-09-16 13:02 now prop handlers can be fired
       end
@@ -1098,7 +1214,7 @@ module RubyCurses
     # move cursor to where the fields row and col are
     # private
     def setpos r=@row, c=@col
-      $log.debug "setpos : (#{self}) #{r} #{c}"
+      $log.debug "setpos : (#{self.name}) #{r} #{c} XXX"
       ## adding just in case things are going out of bounds of a parent and no cursor to be shown
       return if r.nil? or c.nil?  # added 2009-12-29 23:28 BUFFERED
       return if r<0 or c<0  # added 2010-01-02 18:49 stack too deep coming if goes above screen
@@ -1180,7 +1296,14 @@ module RubyCurses
     # not be triggered. The highlighted part
     def on_enter f
       return if f.nil? || !f.focusable # added focusable, else label was firing 2010-09
+
       f.state = :HIGHLIGHTED
+      # If the widget has a color defined for focussed, set repaint
+      #  otherwise it will not be repainted unless user edits !
+      if f.highlight_background || f.highlight_foreground
+        f.repaint_required true
+      end
+
       f.modified false
       #f.set_modified false
       f.on_enter if f.respond_to? :on_enter
@@ -1206,9 +1329,9 @@ module RubyCurses
         @window.wmove @row, @col # added RK FFI 2011-09-7 = setpos
 
         f.set_form_row # added 2011-10-5 so when embedded in another form it can get the cursor
-        f.set_form_col
+        f.set_form_col # this can wreak havoc in containers, unless overridden
 
-        f.curpos = 0
+        f.curpos = 0 # why was this, okay is it because of prev obj's cursor ?
         repaint
         @window.refresh
       else
@@ -1342,7 +1465,7 @@ module RubyCurses
     ##
     # move cursor by num columns. Form
     def addcol num
-      return if @col.nil? or @col == -1
+      return if @col.nil? || @col == -1
       @col += num
       @window.wmove @row, @col
       ## 2010-01-30 23:45 exchange calling parent with calling this forms setrow
@@ -1373,7 +1496,7 @@ module RubyCurses
       @col = c unless c.nil?
       r +=  @add_rows unless r.nil? # 2010-01-26 20:31 
       c +=  @add_cols unless c.nil? # 2010-01-26 20:31 
-      $log.debug " addcols #{@add_cols} addrow #{@add_rows} : #{self} r = #{r} , c = #{c}  "
+      $log.debug " addcols #{@add_cols} addrow #{@add_rows} : #{self} r = #{r} , c = #{c}, parent: #{@parent_form}  "
       if !@parent_form.nil? and @parent_form != self
         $log.debug " (#{@name}) addrow calling parents setrowcol #{r}, #{c} : pare: #{@parent_form}; self:  #{self}, #{self.class}  "
         #r += @parent_form.window.top unless  r.nil?
@@ -1462,6 +1585,16 @@ module RubyCurses
     end
     return 0
   end
+  #
+  # These mappings will only trigger if the current field
+  #  does not use them.
+  #
+  def map_keys
+    return if @keys_mapped
+    bind_keys([?\M-?,?\?]) { alert(get_current_field.help_text, 'title' => 'Help Text', :bgcolor => 'green', :color => :white) if get_current_field.help_text }
+    #bind_key(?\?) { alert(get_current_field.help_text.split(",")) if get_current_field.help_text }
+    @keys_mapped = true
+  end
   
   ## forms handle keys
   # mainly traps tab and backtab to navigate between widgets.
@@ -1471,6 +1604,7 @@ module RubyCurses
   # NOTE : please rescue exceptions when you use this in your main loop and alert() user
   #
   def handle_key(ch)
+    map_keys unless @keys_mapped
     handled = :UNHANDLED # 2011-10-4 
         if ch ==  ?\C-u.getbyte(0)
           ret = universal_argument
@@ -1504,7 +1638,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}  "
+            $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
@@ -1538,6 +1672,7 @@ module RubyCurses
        $log.debug " form before repaint #{self} , #{@name}, ret #{ret}"
        repaint
        $last_key = ch
+       ret || 0  # 2011-10-17 
   end
   ##
   # test program to dump data onto log
@@ -1640,16 +1775,22 @@ module RubyCurses
   class Field < Widget
     dsl_accessor :maxlen             # maximum length allowed into field
     attr_reader :buffer              # actual buffer being used for storage
-    dsl_accessor :label              # label of field
-    dsl_accessor :default            # TODO use set_buffer for now
+    #
+    # this was unused earlier. Unlike set_label which creates a separate label
+    # object, this stores a label and prints it before the string. This is less
+    # customizable, however, in some cases when a field is attached to some container
+    # the label gets left out. This labels is gauranteed to print to the left of the field
+    # 
+    dsl_accessor :label              # label of field  Unused earlier, now will print 
+    dsl_property :label_color_pair   # label of field  Unused earlier, now will print 
+    dsl_property :label_attr   # label of field  Unused earlier, now will print 
+    #dsl_accessor :default            # now alias of text 2011-11-5 
     dsl_accessor :values             # validate against provided list
     dsl_accessor :valid_regex        # validate against regular expression
     dsl_accessor :valid_range        # validate against numeric range # 2011-09-29 V1.3.1 
 
     dsl_accessor :chars_allowed           # regex, what characters to allow, will ignore all else
     dsl_accessor :display_length          # how much to display
-    #dsl_property :bgcolor                # background color 'red' 'black' 'cyan' etc # 2011-09-29 IN WIDGET
-    #dsl_property :color                  # foreground colors from Ncurses COLOR_xxxx
     dsl_accessor :show                    # what charactr to show for each char entered (password field)
     dsl_accessor :null_allowed            # allow nulls, don't validate if null # added 2008-12-22 12:38 
 
@@ -1664,7 +1805,11 @@ module RubyCurses
     attr_reader :original_value                # value on entering field
     attr_accessor :overwrite_mode              # true or false INSERT OVERWRITE MODE
 
-    def initialize form, config={}, &block
+    # For consistency, now width equates to display_length
+    alias :width :display_length
+    alias :width= :display_length=
+
+    def initialize form=nil, config={}, &block
       @form = form
       @buffer = String.new
       #@type=config.fetch("type", :varchar)
@@ -1672,8 +1817,8 @@ module RubyCurses
       @maxlen = @display_length
       @row = 0
       @col = 0
-      @bgcolor = $def_bg_color
-      @color = $def_fg_color
+      #@bgcolor = $def_bg_color
+      #@color = $def_fg_color
       @editable = true
       @focusable = true
       @event_args = {}             # arguments passed at time of binding, to use when firing event
@@ -1702,10 +1847,10 @@ module RubyCurses
     ##
     # define a datatype, currently only influences chars allowed
     # integer and float. what about allowing a minus sign? 
-    #  2010-09-10 20:59 changed string to symbol
     def type dtype
-      return if !@chars_allowed.nil?
-      case dtype.to_s.downcase.to_sym # missing to_sym would have always failed due to to_s 2011-09-30 1.3.1
+      return if @chars_allowed # disallow changing
+      dtype = dtype.to_s.downcase.to_sym if dtype.is_a? String
+      case dtype # missing to_sym would have always failed due to to_s 2011-09-30 1.3.1
       when :integer
         @chars_allowed = /\d/
       when :numeric, :float
@@ -1715,7 +1860,7 @@ module RubyCurses
       when :alnum
         @chars_allowed = /[a-zA-Z0-9]/ 
       else
-        raise "type: invalid datatype specified. Use :integer, :numeric, :float, :alpha, :alnum "
+        raise ArgumentError, "Field type: invalid datatype specified. Use :integer, :numeric, :float, :alpha, :alnum "
       end
     end
 
@@ -1821,20 +1966,36 @@ module RubyCurses
     # create a label linked to this field
     # Typically one passes a Label, but now we can pass just a String, a label 
     # is created
+    # NOTE: 2011-10-20 when field attached to some container, label won't be attached
     # @param [Label, String] label object to be associated with this field
+    # FIXME this may not work since i have disabled -1, now i do not set row and col 2011-11-5 
     def set_label label
       # added case for user just using a string
       case label
       when String
         # what if no form at this point
+        @label_unattached = true unless @form
         label = Label.new @form, {:text => label}
       end
       @label = label
-      label.row  @row if label.row == -1
-      label.col  @col-(label.name.length+1) if label.col == -1
-      label.label_for(self)
+      # in the case of app it won't be set yet FIXME
+      # So app sets label to 0 and t his won't trigger
+      # can this be delayed to when paint happens XXX
+      if @row
+        position_label
+      else
+        @label_unplaced = true
+      end
       label
     end
+    # FIXME this may not work since i have disabled -1, now i do not set row and col
+    def position_label
+      $log.debug "XXX: LABEL row #{@label.row}, #{@label.col} "
+      @label.row  @row unless @label.row #if @label.row == -1
+      @label.col  @col-(@label.name.length+1) unless @label.col #if @label.col == -1
+      @label.label_for(self) # this line got deleted when we redid stuff !
+      $log.debug "   XXX: LABEL row #{@label.row}, #{@label.col} "
+    end
 
   ## Note that some older widgets like Field repaint every time the form.repaint
   ##+ is called, whether updated or not. I can't remember why this is, but
@@ -1842,7 +2003,17 @@ module RubyCurses
 
   def repaint
     return unless @repaint_required  # 2010-11-20 13:13 its writing over a window i think TESTING
-    #$log.debug("repaint FIELD: #{id}, #{name},  #{focusable}")
+    if @label_unattached
+      alert "came here unattachd"
+      @label.set_form(@form)
+    end
+    if @label_unplaced
+      alert "came here unplaced"
+      position_label
+    end
+    @bgcolor ||= $def_bg_color
+    @color   ||= $def_fg_color
+    $log.debug("repaint FIELD: #{id}, #{name}, #{row} #{col},  #{focusable} st: #{@state} ")
     #return if display_length <= 0 # added 2009-02-17 00:17 sometimes editor comp has 0 and that
     # becomes negative below, no because editing still happens
     @display_length = 1 if display_length == 0
@@ -1855,11 +2026,25 @@ module RubyCurses
         printval = printval[@pcol..-1]
       end
     end
-    #printval = printval[0..display_length-1] if printval.length > display_length
+  
     acolor = @color_pair || get_color($datacolor, @color, @bgcolor)
+    if @state == :HIGHLIGHTED
+      _bgcolor = @highlight_background || @bgcolor
+      _color = @highlight_foreground || @color
+      acolor = get_color(acolor, _color, _bgcolor)
+    end
     @graphic = @form.window if @graphic.nil? ## cell editor listbox hack 
-    #$log.debug " Field g:#{@graphic}. r,c,displen:#{@row}, #{@col}, #{@display_length} "
-    @graphic.printstring  row, col, sprintf("%-*s", display_length, printval), acolor, @attr
+    #$log.debug " Field g:#{@graphic}. r,c,displen:#{@row}, #{@col}, #{@display_length} c:#{@color} bg:#{@bgcolor} a:#{@attr} :#{@name} "
+    r = row
+    c = col
+    if label.is_a? String
+      lcolor = @label_color_pair || $datacolor # this should be the same color as window bg XXX
+      lattr = @label_attr || NORMAL
+      @graphic.printstring row, col, label, lcolor, lattr
+      c += label.length + 2
+      @col_offset = c-@col            # required so cursor lands in right place
+    end
+    @graphic.printstring r, c, sprintf("%-*s", display_length, printval), acolor, @attr
     @repaint_required = false
   end
   def set_focusable(tf)
@@ -2038,7 +2223,9 @@ module RubyCurses
     def modified?
       getvalue() != @original_value
     end
-    # field, a convenience method, since set_buffer sucks, it was "inspired" by ncurses itself
+    #
+    # Use this to set a default text to the field. This does not imply that if the field is left
+    # blank, this value will be used. It only provides this value for editing when field is shown.
     # @since 1.2.0
     def text(*val)
       if val.empty?
@@ -2049,6 +2236,7 @@ module RubyCurses
         set_buffer(s)
       end
     end
+    alias :default :text
     def text=(val)
       return unless val # added 2010-11-17 20:11, dup will fail on nil
       set_buffer(val.dup)
@@ -2160,25 +2348,31 @@ module RubyCurses
     end
   end
   ##
-  # the preferred way of printing text on screen, esp if you want to modify it at run time.
+  # The preferred way of printing text on screen, esp if you want to modify it at run time.
   # Use display_length to ensure no spillage.
   # This can use text or text_variable for setting and getting data (inh from Widget).
+  # 2011-11-12 making it simpler, and single line only. The original multiline label
+  #    has moved to extras/multilinelabel.rb
+  #
   class Label < Widget
-    #dsl_accessor :label_for   # related field or buddy
-    dsl_accessor :mnemonic    # keyboard focus is passed to buddy based on this key (ALT mask)
+    dsl_accessor :mnemonic       # keyboard focus is passed to buddy based on this key (ALT mask)
+
     # justify required a display length, esp if center.
-    #dsl_accessor :justify     # :right, :left, :center  # added 2008-12-22 19:02 
-    dsl_property :justify     # :right, :left, :center  # added 2008-12-22 19:02 
-    dsl_property :display_length     #  please give this to ensure the we only print this much
-    dsl_property :height    # if you want a multiline label.
+    dsl_property :justify        #:right, :left, :center
+    dsl_property :display_length #please give this to ensure the we only print this much
+    #dsl_property :height         #if you want a multiline label. already added to widget
+    # for consistency with others 2011-11-5 
+    alias :width :display_length
+    alias :width= :display_length=
 
     def initialize form, config={}, &block
   
-      @row = config.fetch("row",-1) 
-      @col = config.fetch("col",-1) 
-      @bgcolor = config.fetch("bgcolor", $def_bg_color)
-      @color = config.fetch("color", $def_fg_color)
-      @text = config.fetch("text", "NOTFOUND")
+      # this crap was used in position_label, find another way. where is it used ?
+      #@row = config.fetch("row",-1)  # why on earth this monstrosity ? 2011-11-5 
+      #@col = config.fetch("col",-1) 
+      #@bgcolor = config.fetch("bgcolor", $def_bg_color)
+      #@color = config.fetch("color", $def_fg_color)
+      @text = config.fetch(:text, "NOTFOUND")
       @editable = false
       @focusable = false
       super
@@ -2194,18 +2388,23 @@ module RubyCurses
     def label_for field
       @label_for = field
       #$log.debug " label for: #{@label_for}"
-      bind_hotkey unless @form.nil?   # GRRR!
+      if @form
+        bind_hotkey 
+      else
+        @when_form ||= []
+        @when_form << lambda { bind_hotkey }
+      end
     end
 
     ##
     # for a button, fire it when label invoked without changing focus
     # for other widgets, attempt to change focus to that field
     def bind_hotkey
-      if !@mnemonic.nil?
+      if @mnemonic
         ch = @mnemonic.downcase()[0].ord   ##  1.9 DONE 
         # meta key 
         mch = ?\M-a.getbyte(0) + (ch - ?a.getbyte(0))  ## 1.9
-        if @label_for.is_a? RubyCurses::Button and @label_for.respond_to? :fire
+        if (@label_for.is_a? RubyCurses::Button ) && (@label_for.respond_to? :fire)
           @form.bind_key(mch, @label_for) { |_form, _butt| _butt.fire }
         else
           $log.debug " bind_hotkey label for: #{@label_for}"
@@ -2215,53 +2414,56 @@ module RubyCurses
     end
 
     ##
-    # XXX need to move wrapping etc up and done once. 
+    # label's repaint - I am removing wrapping and Array stuff and making it simple 2011-11-12 
     def repaint
       return unless @repaint_required
+      raise "Label row or col nil #{@row} , #{@col}, #{@text} " if @row.nil? || @col.nil?
       r,c = rowcol
+
+      @bgcolor ||= $def_bg_color
+      @color   ||= $def_fg_color
       # value often nil so putting blank, but usually some application error
       value = getvalue_for_paint || ""
-      lablist = []
-      if @height && @height > 1
-        lablist = wrap_text(value, @display_length).split("\n")
-      else
-        # ensure we do not exceed
-        if !@display_length.nil?
-          if value.length > @display_length
-            value = value[0..@display_length-1]
-          end
+
+      if value.is_a? Array
+        value = value.join " "
+      end
+      # ensure we do not exceed
+      if @display_length
+        if value.length > @display_length
+          value = value[0..@display_length-1]
         end
-        lablist << value
       end
       len = @display_length || value.length
-      acolor = get_color $datacolor
-      #$log.debug "label :#{@text}, #{value}, #{r}, #{c} col= #{@color}, #{@bgcolor} acolor  #{acolor} j:#{@justify} dlL: #{@display_length} "
-      firstrow = r
-      _height = @height || 1
+      #acolor = get_color $datacolor
+      # the user could have set color_pair, use that, else determine color
+      # This implies that if he sets cp, then changing col and bg won't have an effect !
+      # A general routine that only changes color will not work here.
+      acolor = @color_pair || get_color($datacolor, @color, @bgcolor)
+      #$log.debug "label :#{@text}, #{value}, r #{r}, c #{c} col= #{@color}, #{@bgcolor} acolor  #{acolor} j:#{@justify} dlL: #{@display_length} "
       str = @justify.to_sym == :right ? "%*s" : "%-*s"  # added 2008-12-22 19:05 
-      # loop added for labels that are wrapped.
-      # TODO clear separately since value can change in status like labels
     
-      @graphic = @form.window if @graphic.nil? ## HACK messagebox givig this in repaint, 423 not working ??
-      0.upto(_height-1) { |i| 
-        @graphic.printstring r+i, c, " " * len , acolor,@attr
-      }
-      lablist.each_with_index do |_value, ix|
-        break if ix >= _height
-        if @justify.to_sym == :center
-          padding = (@display_length - _value.length)/2
-          _value = " "*padding + _value + " "*padding # so its cleared if we change it midway
-        end
-        @graphic.printstring r, c, str % [len, _value], acolor,@attr
-        r += 1
-      end
-      if !@mnemonic.nil?
+      @graphic ||= @form.window
+      # clear the area
+      @graphic.printstring r, c, " " * len , acolor, @attr
+      if @justify.to_sym == :center
+        padding = (@display_length - value.length)/2
+        value = " "*padding + value + " "*padding # so its cleared if we change it midway
+      end
+      @graphic.printstring r, c, str % [len, value], acolor, @attr
+      if @mnemonic
         ulindex = value.index(@mnemonic) || value.index(@mnemonic.swapcase)
-        @graphic.mvchgat(y=firstrow, x=c+ulindex, max=1, Ncurses::A_BOLD|Ncurses::A_UNDERLINE, acolor, nil)
+        @graphic.mvchgat(y=r, x=c+ulindex, max=1, Ncurses::A_BOLD|Ncurses::A_UNDERLINE, acolor, nil)
       end
-      #@form.window.mvchgat(y=r, x=c, max=len, Ncurses::A_NORMAL, color, nil)
       @repaint_required = false
     end
+    # Added 2011-10-22 to prevent some naive components from putting focus here.
+    def on_enter
+      raise "Cannot enter Label"
+    end
+    def on_leave
+      raise "Cannot leave Label"
+    end
   # ADD HERE LABEL
   end
   ##
@@ -2282,10 +2484,11 @@ module RubyCurses
       @_events ||= []
       @_events.push :PRESS
       super
-      @bgcolor ||= $datacolor 
-      @color ||= $datacolor 
+
+
       @surround_chars ||= ['[ ', ' ]'] 
       @col_offset = @surround_chars[0].length 
+      @text_offset = 0
     end
     ##
     # set button based on Action
@@ -2305,7 +2508,8 @@ module RubyCurses
         s = s.to_s if !s.is_a? String  # 2009-01-15 17:32 
         if (( ix = s.index('&')) != nil)
           s.slice!(ix,1)
-          @underline = ix unless @form.nil? # this setting a fake underline in messageboxes
+          # 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
           mnemonic s[ix,1]
         end
         @text = s
@@ -2315,10 +2519,17 @@ module RubyCurses
     ## 
     # FIXME this will not work in messageboxes since no form available
     # if already set mnemonic, then unbind_key, ??
+    # NOTE: Some buttons like checkbox directly call mnemonic, so if they have no form
+    # then this processing does not happen
 
     def mnemonic char
-      $log.error " #{self} COULD NOT SET MNEMONIC since form NIL" if @form.nil?
-      return if @form.nil?
+      $log.error "ERROR WARN #{self} COULD NOT SET MNEMONIC since form NIL" if @form.nil?
+      unless @form
+        @when_form ||= []
+        @when_form << lambda { mnemonic char }
+        return
+      end
+      #return if @form.nil?
       @mnemonic = char
       ch = char.downcase()[0].ord ##  1.9 
       # meta key 
@@ -2331,7 +2542,13 @@ module RubyCurses
     # bind hotkey to form keys. added 2008-12-15 20:19 
     # use ampersand in name or underline
     def bind_hotkey
-      return if @underline.nil? or @form.nil?
+      if @form.nil? 
+        if @underline
+          @when_form ||= []
+          @when_form << lambda { bind_hotkey }
+        end
+        return
+      end
       _value = @text || getvalue # hack for Togglebutton FIXME
       #_value = getvalue
       $log.debug " bind hot #{_value} #{@underline}"
@@ -2353,37 +2570,60 @@ module RubyCurses
       @surround_chars[0] + ret + @surround_chars[1]
     end
     def repaint  # button
-        #$log.debug("BUTTon repaint : #{self}  r:#{@row} c:#{@col} #{getvalue_for_paint}" )
+      if @form
+        if @when_form
+          $log.debug "XXX:WHEN  calling when_forms commands"
+          @when_form.each { |c| c.call()  }
+          @when_form = nil
+        end
+      end
+
+      @bgcolor ||= $def_bg_color
+      @color   ||= $def_fg_color
+        $log.debug("BUTTON repaint : #{self}  r:#{@row} c:#{@col} , #{@color} , #{@bgcolor} , #{getvalue_for_paint}" )
         r,c = @row, @col #rowcol include offset for putting cursor
         # NOTE: please override both (if using a string), or else it won't work 
         @highlight_foreground ||= $reversecolor
         @highlight_background ||= 0
-        bgcolor = @state==:HIGHLIGHTED ? @highlight_background : @bgcolor
-        color = @state==:HIGHLIGHTED ? @highlight_foreground : @color
-        if bgcolor.is_a? String and color.is_a? String
-          color = ColorMap.get_color(color, bgcolor)
+        _bgcolor = @bgcolor
+        _color = @color
+        if @state == :HIGHLIGHTED
+          _bgcolor = @state==:HIGHLIGHTED ? @highlight_background : @bgcolor
+          _color = @state==:HIGHLIGHTED ? @highlight_foreground : @color
+        elsif selected? # only for certain buttons lie toggle and radio
+          _bgcolor = @selected_background || @bgcolor
+          _color   = @selected_foreground || @color
+        end
+        $log.debug "XXX: button #{text}   STATE is #{@state} color #{_color} , bg: #{_bgcolor} "
+        if _bgcolor.is_a?( Fixnum) && _color.is_a?( Fixnum)
+        else
+          _color = get_color($datacolor, _color, _bgcolor)
         end
         value = getvalue_for_paint
-        #$log.debug("button repaint :#{self} r:#{r} c:#{c} col:#{color} bg #{bgcolor} v: #{value} ul #{@underline} mnem #{@mnemonic}")
+        $log.debug("button repaint :#{self} r:#{r} c:#{c} col:#{_color} bg #{_bgcolor} v: #{value} ul #{@underline} mnem #{@mnemonic} datacolor #{$datacolor} ")
         len = @display_length || value.length
         @graphic = @form.window if @graphic.nil? ## cell editor listbox hack 
-        @graphic.printstring r, c, "%-*s" % [len, value], color, @attr
+        @graphic.printstring r, c, "%-*s" % [len, value], _color, @attr
 #       @form.window.mvchgat(y=r, x=c, max=len, Ncurses::A_NORMAL, bgcolor, nil)
         # in toggle buttons the underline can change as the text toggles
         if @underline || @mnemonic
-          uline = @underline && (@underline + @text_offset) ||  value.index(@mnemonic) || value.index(@mnemonic.swapcase)
-          #$log.debug " mvchgat UNDERLI r= #{r} - #{@graphic.top} c #{c} c+x #{c+uline}- #{@graphic.left} #{@graphic} "
-          #$log.debug "  HACK in next line related to UNDERLINES -graphic.top"
+          uline = @underline && (@underline + @text_offset) ||  value.index(@mnemonic) || 
+            value.index(@mnemonic.swapcase)
           # if the char is not found don't print it
           if uline
             y=r #-@graphic.top
             x=c+uline #-@graphic.left
             if @graphic.window_type == :PAD
-              x -= @graphic.left
+              x -= @graphic.left 
               y -= @graphic.top
             end
-            raise "button underline location error #{x} , #{y} " if x < 0 or c < 0
-            @graphic.mvchgat(y, x, max=1, Ncurses::A_BOLD|Ncurses::A_UNDERLINE, color, nil)
+            #
+            # NOTE: often values go below zero since root windows are defined 
+            # with 0 w and h, and then i might use that value for calcaluting
+            #
+            $log.error "XXX button underline location error #{x} , #{y} " if x < 0 or c < 0
+            raise " #{r} #{c}  #{uline} button underline location error x:#{x} , y:#{y}. left #{@graphic.left} top:#{@graphic.top} " if x < 0 or c < 0
+            @graphic.mvchgat(y, x, max=1, Ncurses::A_BOLD|Ncurses::A_UNDERLINE, _color, nil)
           end
         end
     end
@@ -2401,6 +2641,8 @@ module RubyCurses
       #fire_handler :PRESS, @form  changed on 2010-09-12 19:22 
       fire_handler :PRESS, ActionEvent.new(self, :PRESS, text)
     end
+    # for campatibility with all buttons, will apply to radio buttons mostly
+    def selected?; false; end
 
     # Button
     def handle_key ch
@@ -2483,11 +2725,18 @@ module RubyCurses
     dsl_accessor :surround_chars 
     dsl_accessor :variable    # value linked to this variable which is a boolean
     dsl_accessor :display_length    #  2009-01-06 00:10 
+    # background to use when selected, if not set then default
+    dsl_accessor :selected_background 
+    dsl_accessor :selected_foreground 
+
+    # For consistency, now width equates to display_length
+    alias :width :display_length
+    alias :width= :display_length=
 
     # item_event
     def initialize form, config={}, &block
       super
-      # no longer linked to text_variable, that was a misunderstanding
+      
       @value ||= (@variable.nil? ? false : @variable.get_value(@name)==true)
     end
     def getvalue
@@ -2603,6 +2852,10 @@ module RubyCurses
     def initialize form, config={}, &block
       @surround_chars = ['(', ')'] if @surround_chars.nil?
       super
+      $log.warn "XXX: FIXME Please set 'value' for radiobutton. If you don't know, try setting it to 'text'" unless @value
+      # I am setting value of value here if not set 2011-10-21 
+      @value ||= @text
+      raise "A single Variable must be set for a group of Radio Buttons for this to work." unless @variable
     end
 
     # all radio buttons will return the value of the selected value, not the offered value
@@ -2659,3 +2912,4 @@ module RubyCurses
   end
 
 end # module
+include RubyCurses::Utils