arcadia 0.1.3 → 0.2.0

data/{lib → ext/ae-rad/lib}/tkext/al-iwidgets.rb

@@ -1,25 +1,25 @@
-#
-#   al-iwidgets.rb - Arcadia Ruby ide
-#   by Antonio Galeone <antonio-galeone@rubyforge.org>
-#
-
-require 'lib/tk/arcadia-tk'
-require 'tkextlib/iwidgets'
-
-
-
-class AGTkIWidgets < AGTkBase
-  def newobject
-    @obj = Tk::Iwidgets::Calendar.new(@ag_parent.obj)
-  end
-  def properties
-    super()
-  end
-end
-
-
-class ArcadiaLibTkBWidget < ArcadiaLib
-  def register_classes
-    self.add_class(AGTkIWidgets)
-  end
-end
+#
+#   al-iwidgets.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+require 'ext/ae-rad/lib/tk/arcadia-tk'
+require 'tkextlib/iwidgets'
+
+
+
+class AGTkIWidgets < AGTkBase
+  def newobject
+    @obj = Tk::Iwidgets::Calendar.new(@ag_parent.obj)
+  end
+  def properties
+    super()
+  end
+end
+
+
+class ArcadiaLibTkBWidget < ArcadiaLib
+  def register_classes
+    self.add_class(AGTkIWidgets)
+  end
+end

data/{lib → ext/ae-rad/lib}/tkext/al-tile.rb

@@ -1,173 +1,173 @@
-#
-#   al-tile.rb - Arcadia Ruby ide
-#   by Antonio Galeone <antonio-galeone@rubyforge.org>
-#
-
-require 'lib/wrappers/tk/w-arcadia-tk'
-require 'tkextlib/tile'
-require "lib/arcadia/arcadia-ext"
-
-class AGTkCommonTile < AGTkLayoutManaged
-  def properties
-    super
-    publish('property','name'=>'style',
-    'get'=> proc{@obj.cget('style')},
-    'set'=> proc{|j| @obj.configure('style'=>j)},
-    'def'=> ""
-    )
-    publish('property','name'=>'theme_use',
-    'get'=> proc{},
-    'set'=> proc{|j| Tk::Tile::Style.theme_use(j)},
-    'def'=> ""
-    )
-
-  end
-
-end
-
-class ATKTileLabel < AGTkCommonTile
-  def ATKTileLabel.class_wrapped
-    Tk::Tile::TLabel
-  end
-  def properties
-    super
-    publish('property','name'=>'text',
-    'default'=> @i_name,
-    'get'=> proc{@obj.cget('text')},
-    'set'=> proc{|t| @obj.configure('text'=>t)},
-    'def'=> ""
-    )
-    publish('property','name'=>'state',
-    'get'=> proc{@obj.cget('state')},
-    'set'=> proc{|j| @obj.configure('state'=>j)},
-    'def'=> "",
-    'type'=>TkType::TkagState
-    )
-  end
-end
-
-
-
-class ATKTileButton < AGTkCommonTile
-  def ATKTileButton.class_wrapped
-    Tk::Tile::TButton
-  end
-  def properties
-    super
-    publish('property','name'=>'text',
-    'default'=> @i_name,
-    'get'=> proc{@obj.cget('text')},
-    'set'=> proc{|t| @obj.configure('text'=>t)},
-    'def'=> ""
-    )
-    publish('property','name'=>'state',
-    'get'=> proc{@obj.cget('state')},
-    'set'=> proc{|j| @obj.configure('state'=>j)},
-    'def'=> "",
-    'type'=>TkType::TkagState
-    )
-  end
-end
-
-
-class ATKTileScrollbar < AGTkCommonTile
-  def ATKTileScrollbar.class_wrapped
-    Tk::Tile::TScrollbar
-  end
-  def properties
-    super
-  end
-end
-
-class ATKTileCombobox < AGTkCommonTile
-  def ATKTileCombobox.class_wrapped
-    Tk::Tile::TCombobox
-  end
-  def properties
-    super
-    publish('property','name'=>'values',
-    'get'=> proc{@obj.cget('values')},
-    'set'=> proc{|t| @obj.configure('values'=>t)},
-    'def'=> ""
-    )
-  end
-end
-
-class ATKTileSeparator < AGTkCommonTile
-  def ATKTileSeparator.class_wrapped
-    Tk::Tile::TSeparator
-  end
-  def properties
-    super
-  end
-end
-
-
-class ATKTileFrame < AGTkLayoutManagedContainer
-  include Tk::Tile
-  def ATKTileFrame.class_wrapped
-    TFrame
-  end
-end
-
-class ATKTileLabelframe < ATKTileFrame
-  def ATKTileLabelframe.class_wrapped
-    Tk::Tile::TLabelframe
-  end
-  def properties
-    super
-    publish('property','name'=>'text',
-    'default'=> @i_name,
-    'get'=> proc{@obj.cget('text')},
-    'set'=> proc{|t| @obj.configure('text'=>t)},
-    'def'=> ""
-    )
-  end
-end
-
-
-class ATkTileStyle < AGINTk
-  class TkTileStyle
-    include Tk::Tile::Style
-    def style
-      Tk::Tile::Style
-    end
-  end
-  def ATkTileStyle.class_wrapped
-    TkTileStyle
-  end
-  def properties
-    super
-    publish('property','name'=>'theme',
-    'get'=> proc{},
-    'set'=> proc{|j| @obj.style.theme_use(j)},
-    'def'=> "",
-    'type'=> EnumType.new(@obj.style.theme_names)
-    )
-
-    publish('property','name'=>'foreground',
-    'get'=> proc{},
-    'set'=> proc{|foreground| @obj.style.configure('foreground'=>foreground)},
-    'def'=> '',
-    'type'=> TkType::TkagColor
-    )
-
-
-  end
-end
-
-class ArcadiaLibTkTile < ArcadiaLib
-  def register_classes
-    self.add_class(ATkTileStyle)
-    self.add_class(ATKTileLabel)
-    self.add_class(ATKTileLabelframe)
-    self.add_class(ATKTileButton)
-    self.add_class(ATKTileFrame)
-    self.add_class(ATKTileScrollbar)
-    self.add_class(ATKTileCombobox)
-    self.add_class(ATKTileSeparator)
-  end
-end
-
-
-
+#
+#   al-tile.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+require 'lib/wrappers/tk/w-arcadia-tk'
+require 'tkextlib/tile'
+require "lib/arcadia/arcadia-ext"
+
+class AGTkCommonTile < AGTkLayoutManaged
+  def properties
+    super
+    publish('property','name'=>'style',
+    'get'=> proc{@obj.cget('style')},
+    'set'=> proc{|j| @obj.configure('style'=>j)},
+    'def'=> ""
+    )
+    publish('property','name'=>'theme_use',
+    'get'=> proc{},
+    'set'=> proc{|j| Tk::Tile::Style.theme_use(j)},
+    'def'=> ""
+    )
+
+  end
+
+end
+
+class ATKTileLabel < AGTkCommonTile
+  def ATKTileLabel.class_wrapped
+    Tk::Tile::TLabel
+  end
+  def properties
+    super
+    publish('property','name'=>'text',
+    'default'=> @i_name,
+    'get'=> proc{@obj.cget('text')},
+    'set'=> proc{|t| @obj.configure('text'=>t)},
+    'def'=> ""
+    )
+    publish('property','name'=>'state',
+    'get'=> proc{@obj.cget('state')},
+    'set'=> proc{|j| @obj.configure('state'=>j)},
+    'def'=> "",
+    'type'=>TkType::TkagState
+    )
+  end
+end
+
+
+
+class ATKTileButton < AGTkCommonTile
+  def ATKTileButton.class_wrapped
+    Tk::Tile::TButton
+  end
+  def properties
+    super
+    publish('property','name'=>'text',
+    'default'=> @i_name,
+    'get'=> proc{@obj.cget('text')},
+    'set'=> proc{|t| @obj.configure('text'=>t)},
+    'def'=> ""
+    )
+    publish('property','name'=>'state',
+    'get'=> proc{@obj.cget('state')},
+    'set'=> proc{|j| @obj.configure('state'=>j)},
+    'def'=> "",
+    'type'=>TkType::TkagState
+    )
+  end
+end
+
+
+class ATKTileScrollbar < AGTkCommonTile
+  def ATKTileScrollbar.class_wrapped
+    Tk::Tile::TScrollbar
+  end
+  def properties
+    super
+  end
+end
+
+class ATKTileCombobox < AGTkCommonTile
+  def ATKTileCombobox.class_wrapped
+    Tk::Tile::TCombobox
+  end
+  def properties
+    super
+    publish('property','name'=>'values',
+    'get'=> proc{@obj.cget('values')},
+    'set'=> proc{|t| @obj.configure('values'=>t)},
+    'def'=> ""
+    )
+  end
+end
+
+class ATKTileSeparator < AGTkCommonTile
+  def ATKTileSeparator.class_wrapped
+    Tk::Tile::TSeparator
+  end
+  def properties
+    super
+  end
+end
+
+
+class ATKTileFrame < AGTkLayoutManagedContainer
+  include Tk::Tile
+  def ATKTileFrame.class_wrapped
+    TFrame
+  end
+end
+
+class ATKTileLabelframe < ATKTileFrame
+  def ATKTileLabelframe.class_wrapped
+    Tk::Tile::TLabelframe
+  end
+  def properties
+    super
+    publish('property','name'=>'text',
+    'default'=> @i_name,
+    'get'=> proc{@obj.cget('text')},
+    'set'=> proc{|t| @obj.configure('text'=>t)},
+    'def'=> ""
+    )
+  end
+end
+
+
+class ATkTileStyle < AGINTk
+  class TkTileStyle
+    include Tk::Tile::Style
+    def style
+      Tk::Tile::Style
+    end
+  end
+  def ATkTileStyle.class_wrapped
+    TkTileStyle
+  end
+  def properties
+    super
+    publish('property','name'=>'theme',
+    'get'=> proc{},
+    'set'=> proc{|j| @obj.style.theme_use(j)},
+    'def'=> "",
+    'type'=> EnumType.new(@obj.style.theme_names)
+    )
+
+    publish('property','name'=>'foreground',
+    'get'=> proc{},
+    'set'=> proc{|foreground| @obj.style.configure('foreground'=>foreground)},
+    'def'=> '',
+    'type'=> TkType::TkagColor
+    )
+
+
+  end
+end
+
+class ArcadiaLibTkTile < ArcadiaLib
+  def register_classes
+    self.add_class(ATkTileStyle)
+    self.add_class(ATKTileLabel)
+    self.add_class(ATKTileLabelframe)
+    self.add_class(ATKTileButton)
+    self.add_class(ATKTileFrame)
+    self.add_class(ATKTileScrollbar)
+    self.add_class(ATKTileCombobox)
+    self.add_class(ATKTileSeparator)
+  end
+end
+
+
+

data/ext/ae-ruby-debug/ae-ruby-debug.conf

@@ -1,11 +1,13 @@
-#==============================================================
+#========================================
+#========================================
 name=ruby-debug
-label=Ruby Debug
-frame=1.0
+labels=Ruby Debug
+frames=0.0
 active=yes
 require=ext/ae-ruby-debug/ae-ruby-debug
 class=RubyDebug
-#==============================================================
+#========================================
+#========================================
 server.host=localhost
 server.port=8989
 server.timeout=10
@@ -17,4 +19,5 @@ freebsd::font=courier 10
 freebsd::font.bold=courier 10 bold
 win::font={Courier New} 8
 win::font.bold={Courier New} 8 bold
+#========================================
 

data/ext/ae-ruby-debug/ae-ruby-debug.rb

@@ -3,7 +3,12 @@
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
 
+
 class RubyDebugView
+  include TkUtil
+  B_STATE_ON = '+'
+  B_STATE_OFF = '-'
+  B_STATE_FREEZE = '=' 
   def initialize(_frame, _controller)
     @frame = _frame
     @controller = _controller
@@ -136,7 +141,8 @@ class RubyDebugView
         _text = @tree_process.itemcget(_selected, 'text')
         pos = match_position_from_stack(_text)
         if pos.length >0 
-          EditorContract.instance.open_file(self, 'file'=>pos[0], 'line'=>pos[1])
+    	     Arcadia.process_event(OpenBufferEvent.new(self,'file'=>pos[0], 'row'=>pos[1]))
+          #EditorContract.instance.open_file(self, 'file'=>pos[0], 'line'=>pos[1])
         end
       end
     })
@@ -159,6 +165,7 @@ class RubyDebugView
     @tree_var.delete(@tree_var.nodes('local_var'))
     @tree_var.delete(@tree_var.nodes('instance_var'))
     @tree_var.delete(@tree_var.nodes('global_var'))
+    #@tree_var.delete(@tree_var.nodes('class_var'))
     @tree_var.delete(@tree_var.nodes('eval')) if @tree_var.exist?('eval')
   end
 
@@ -166,6 +173,15 @@ class RubyDebugView
     @tree_process.delete(@tree_process.nodes('root'))
   end
 
+  def bnext_state(_state)
+    if _state == B_STATE_ON
+      return B_STATE_FREEZE
+    elsif _state == B_STATE_FREEZE
+      return B_STATE_OFF
+    elsif _state == B_STATE_OFF
+      return B_STATE_ON
+    end   
+  end
 
   def build_var_panel(_frame)
     _open_proc = proc do |_arg|
@@ -189,12 +205,14 @@ class RubyDebugView
     }.pack('side'=>'right', 'fill'=>'y')
     @tree_var.yscrollcommand proc{|first,last| _scrollbar.set(first,last)}
     
-    @local_on = true
-    @instance_on = true
-    @global_on = false
+    @local_state = B_STATE_ON
+    @instance_state = B_STATE_ON
+    #@class_state = B_STATE_ON
+    @global_state = B_STATE_OFF
     
     _i_on = TkPhotoImage.new('dat' => ON_GIF)
     _i_off = TkPhotoImage.new('dat' => OFF_GIF)
+    _i_freeze = TkPhotoImage.new('dat' => FREEZE_GIF)
 
     _b_relief = 'groove'
     @b_local_onoff = TkButton.new(@tree_var){
@@ -203,15 +221,17 @@ class RubyDebugView
         state 'disabled'
         anchor 'nw'
     }.bind("1",proc{
-      @local_on = !@local_on
-      if @local_on
+      @local_state = bnext_state(@local_state)
+      if @local_state == B_STATE_ON
         @b_local_onoff.image(_i_on)
         command_enabled(false)
         Thread.new{
           update_variables('local_var', @controller.rdc.variables('local_variables')) #if @tree_var.open?('local_var')
           command_enabled(true)
         }
-      else
+      elsif @local_state == B_STATE_FREEZE
+        @b_local_onoff.image(_i_freeze)
+      elsif @local_state == B_STATE_OFF
         @b_local_onoff.image(_i_off)
         @tree_var.delete(@tree_var.nodes('local_var'))
       end
@@ -234,22 +254,22 @@ class RubyDebugView
         state 'disabled'
         anchor 'nw'
     }.bind("1",proc{
-      @instance_on = !@instance_on
-      if @instance_on
+      @instance_state = bnext_state(@instance_state)
+      if @instance_state == B_STATE_ON
         @b_instance_onoff.image(_i_on)
         command_enabled(false)
         Thread.new{
           update_variables('instance_var', @controller.rdc.variables('instance_variables')) #if @tree_var.open?('local_var')
           command_enabled(true)
         }
-      else
+      elsif @instance_state == B_STATE_FREEZE
+        @b_instance_onoff.image(_i_freeze)
+      elsif @instance_state == B_STATE_OFF
         @b_instance_onoff.image(_i_off)
         @tree_var.delete(@tree_var.nodes('instance_var'))
       end
     })
     @tree_var.insert('end', 'root' ,'instance_var', {
-#      'deltax' => 0,
-#      'padx'=>2,
       'fill'=>'#892541',
       'open'=>true,
       'anchor'=>'w',
@@ -258,21 +278,52 @@ class RubyDebugView
       'window' => @b_instance_onoff
     })
 
+#    @b_class_onoff = TkButton.new(@tree_var){
+#        image  _i_on
+#        relief _b_relief
+#        state 'disabled'
+#        anchor 'nw'
+#    }.bind("1",proc{
+#      @class_on = !@class_on
+#      if @class_on
+#        @b_class_onoff.image(_i_on)
+#        command_enabled(false)
+#        Thread.new{
+#          update_variables('class_var', @controller.rdc.variables('class_variables')) #if @tree_var.open?('local_var')
+#          command_enabled(true)
+#        }
+#      else
+#        @b_class_onoff.image(_i_off)
+#        @tree_var.delete(@tree_var.nodes('class_var'))
+#      end
+#    })
+#    @tree_var.insert('end', 'root' ,'class_var', {
+#      'fill'=>'#230bd7',
+#      'open'=>true,
+#      'anchor'=>'w',
+#      'font' => @controller.conf('font.bold'),
+#      'text' =>  "Class variables",
+#      'window' => @b_class_onoff
+#    })
+
+
     @b_global_onoff = TkButton.new(@tree_var){
         image  _i_off
         relief _b_relief
         state 'disabled'
         anchor 'nw'
     }.bind("1",proc{
-      @global_on = !@global_on
-      if @global_on
+      @global_state = bnext_state(@global_state)
+      if @global_state == B_STATE_ON
         @b_global_onoff.image(_i_on)
         command_enabled(false)
         Thread.new{
           update_variables('global_var', @controller.rdc.variables('global_variables')) #if @tree_var.open?('local_var')
           command_enabled(true)
         }
-      else
+      elsif @global_state == B_STATE_FREEZE
+        @b_global_onoff.image(_i_freeze)
+      elsif @global_state == B_STATE_OFF
         @b_global_onoff.image(_i_off)
         @tree_var.delete(@tree_var.nodes('global_var'))
       end
@@ -368,8 +419,8 @@ class RubyDebugView
 
   
   def rdebug_client_update(_command, _result)
-  #MsgContract.instance.out_debug(self,"on command #{_command}")
-    return if !@controller.rdc.is_debugging_ready?
+  #Arcadia.new_debug_msg(self,"on command #{_command}")
+    return if @controller.rdc.nil? || !@controller.rdc.is_debugging_ready?
     begin
       if _command == 'quit'
         msg = "Really quit debug ? (y/n)"
@@ -388,16 +439,17 @@ class RubyDebugView
       elsif _command != 'where' && _command != 'quit_yes'
         begin
           update_position
-          update_variables('local_var', @controller.rdc.variables('local_variables')) if @local_on
-          update_variables('instance_var', @controller.rdc.variables('instance_variables')) if @instance_on
-          #MsgContract.instance.out_debug(self,"on command #{_command}:global_variables")
-          update_variables('global_var', @controller.rdc.variables('global_variables')) if @global_on
+          update_variables('local_var', @controller.rdc.variables('local_variables')) if @local_state == B_STATE_ON
+          update_variables('instance_var', @controller.rdc.variables('instance_variables')) if @instance_state == B_STATE_ON
+          #update_variables('class_var', @controller.rdc.variables('class_variables')) if @instance_on
+          #Arcadia.new_debug_msg(self,"on command #{_command}:global_variables")
+          update_variables('global_var', @controller.rdc.variables('global_variables')) if @global_state == B_STATE_ON
         ensure
-          command_enabled(true) if @controller.rdc.is_debugging_ready? && (!_command.include?('quit') || _command.include?('quit_no')) 
+          command_enabled(true) if !@controller.rdc.nil? && @controller.rdc.is_debugging_ready? && (!_command.include?('quit') || _command.include?('quit_no')) 
         end
       end
     rescue Exception => e
-      MsgContract.instance.out_debug(self,"on command #{_command}:#{e.inspect}")
+      Arcadia.new_debug_msg(self,"on command #{_command}:#{e.inspect}")
     end
   end
   
@@ -416,25 +468,17 @@ class RubyDebugView
   
   def update_position
     stack = @controller.rdc.where
-    #MsgContract.instance.out_debug(self,stack)
+    #Arcadia.new_debug_msg(self,stack)
     if !stack.nil?
       stack = stack.split(/\n/)
       line_no = -1
       if !stack[0].nil?
         pos = match_position_from_stack(stack[0])
-        #matchline = stack[0].match(/-->.#[0-9]*.*:([0-9]*)/)
-        ##matchline = stack[0].match(/.*:([0-9]*)/)
-        #line_no = matchline[1].to_i if !matchline.nil? && matchline.length==2
-
-        #matchfile = stack[0].match(/-->.#[0-9]*.(.*):[0-9]*/)
-        ##matchfile = stack[0].match(/.(.*):[0-9]*/)
-
-        #filename = matchfile[1].to_s if !matchfile.nil? && matchfile.length==2
       end
       if pos.length > 0
-      #MsgContract.instance.out_debug(self,"'file'=> #{pos[0]}, 'line'=>#{pos[1]}")
         _file = File.expand_path(pos[0])
-        DebugContract.instance.debug_step(self, 'file'=> _file, 'line'=>pos[1])
+        Arcadia.broadcast_event(DebugStepInfoEvent.new(self,'file'=> _file, 'row'=>pos[1]))
+        #DebugContract.instance.debug_step(self, 'file'=> _file, 'line'=>pos[1])
         break_list_select(_file, pos[1].to_s)
       end
       i = 0
@@ -454,13 +498,8 @@ class RubyDebugView
     end
   end
 
-  def is_simple_class?(_class)
-    ['Numeric','Fixnum','String','FalseClass','TrueClass','NilClass'].include?(_class)
-#    _class == Numeric || _class.superclass == Numeric ||
-#    _class == String || _class.superclass == String ||
-#    _class == FalseClass || _class.superclass == FalseClass||
-#    _class == TrueClass || _class.superclass == TrueClass||
-#    _class == NilClass || _class.superclass == NilClass   
+  def is_simple_class?(_var)
+    ['Numeric','Fixnum','String','FalseClass','TrueClass','NilClass'].include?(_var.value_class) && !_var.value.to_s.strip.include?("\n")
   end
   
   def show_expression(_exp, _hash)
@@ -481,8 +520,11 @@ class RubyDebugView
     begin
       _var = var_name(_node)
       _o = @controller.rdc.debug_dump(_var)
-      #@tree_var.delete(@tree_var.nodes(_node))
-      var_deep(_node, _o)
+      if _o.class == Hash
+        var_deep(_node, _o)
+      else 
+        var_deep_string(_node, _o)
+      end
     ensure
       command_enabled(true)
     end
@@ -494,14 +536,20 @@ class RubyDebugView
 #    @tree_var.itemconfigure(_var, 'text' =>  "#{_var_cla}:#{_var_len}")
     return nil if _hash.nil? 
     return _hash.to_s if _hash.class != Hash
-    _hash.keys.sort.each{|k|
+    if _hash['__CLASS__']=='Array'
+     _sorted_keys = _hash.keys.collect!{|x| x.to_i}.sort.collect!{|x| x.to_s}
+    else
+     _sorted_keys = _hash.keys.sort
+    end
+    _sorted_keys.each{|k|
+    #_hash.keys.sort.each{|k|
       v = _hash[k]
       next if k=='__CLASS__'
       _complex = v.class == Hash
       if _complex
         _text = var_format(k,v['__CLASS__'])
       elsif (k=='__LENGTH__') && v=='0'
-        _text = '{...}'
+        _text = '{}'
       elsif (k=='__LENGTH__') && v!='0'
         next
       else
@@ -521,6 +569,23 @@ class RubyDebugView
       var_deep(_node,v) if _complex
     }
   end
+
+  def var_deep_string(_var, _str)
+    @tree_var.delete(@tree_var.nodes(_var))
+    return nil if _str.nil? 
+    _str = _str.to_s if !_str.kind_of?(String)
+    a_str = _str.split("\n")
+    a_str.each_with_index{|v,i|
+      _node = node_name(i.to_s, _var)
+      @tree_var.insert('end', _var ,_node, {
+        'font' => @controller.conf('font'),
+        'text' =>  v,
+        'fill' => '#79ca77',
+        'anchor'=>'w'
+      })
+    }
+  end
+
   
   def var_format(_name, _class, _value=nil)
     if !_value.nil? && !_class.nil?
@@ -530,7 +595,7 @@ class RubyDebugView
     elsif !_value.nil? && _class.nil?
       return "#{_name.to_s.strip} => #{_value.to_s.strip}"
     elsif _value.nil? && _class.nil?
-      return "#{_name.to_s.strip} => {...}"
+      return "#{_name.to_s.strip} => {}"
     end
   end
   
@@ -545,13 +610,13 @@ class RubyDebugView
   end
   
   def command_enabled(_value)
-    #MsgContract.instance.out_debug(self,"command_enabled= #{_value.to_s}")
-    
+    #Arcadia.new_debug_msg(self,"command_enabled= #{_value.to_s}")
     @c_on = _value
     _value ? _state = 'normal':_state = 'disabled'
     @debug_button_box.configure(:state=>_state) 
     @b_local_onoff.configure(:state=>_state) 
     @b_instance_onoff.configure(:state=>_state) 
+    #@b_class_onoff.configure(:state=>_state) 
     @b_global_onoff.configure(:state=>_state) 
     Tk.update
   end
@@ -560,25 +625,32 @@ class RubyDebugView
     if _var.keys.sort == @tree_var.nodes(_parent_node).collect! {|x| var_name(x).to_s}.sort
       _var.each{|k,v|
         _n = node_name(k, _parent_node)
-        if is_simple_class?(v.value_class)
+        if is_simple_class?(v)
           _text = var_format(k,v.value_class,v.value)
+          _drawcross = 'auto'
         else
           _text = var_format(k,v.value_class)
+          _drawcross = 'always'
+          @nodes_to_open << _n if !@nodes_to_open.include?(_n)
+          inspect_node(_n) if bool(@tree_var.itemcget(@tree_var.tagid(_n), 'open'))
         end
-        _node = @tree_var.itemconfigure(_n, 'text' =>  _text)
+        _node = @tree_var.itemconfigure(_n, 
+          'text' =>  _text, 
+          'helptext' => v.value,
+          'drawcross' => _drawcross
+        )
       }          
     else 
       @nodes_to_open.clear
       @tree_var.delete(@tree_var.nodes(_parent_node))
       #@nodes[_parent_node].clear
-      _var.each{|k,v|
+      _var.keys.sort.each{|k|
+          v = _var[k]
           _n = node_name(k, _parent_node)
-          if is_simple_class?(v.value_class)
-            #MsgContract.instance.out_simple(self,"#{k} : simple")
+          if is_simple_class?(v)
             _text = var_format(k,v.value_class,v.value)
             _drawcross = 'auto'
           else
-            #MsgContract.instance.out_simple(self,"#{k} : complex")
             _text = var_format(k,v.value_class)
             _drawcross = 'always'
             @nodes_to_open << _n
@@ -589,9 +661,7 @@ class RubyDebugView
             'helptext' => v.value,
             'drawcross' => _drawcross,
             'anchor'=>'w'
-        #    'deltax' => 1
           })
-          #@nodes[_parent_node] << k
       }
     end
     Tk.update
@@ -602,10 +672,13 @@ class RubyDebugView
       begin
         command_enabled(false)
         #@debug_button_box.configure(:state=>'disabled')
-        Thread.new{@controller.rdc.send(_command)}
+        Thread.new do
+          Arcadia.process_event(StepDebugEvent.new(self, 'command'=>_command))
+          #@controller.rdc.send(_command)
+        end
         #@controller.rdc.send(_command)
       rescue Exception => e
-        MsgContract.instance.out_debug(self,"---> "+e.to_s)
+        Arcadia.new_debug_msg(self,"---> "+e.to_s)
       end
     end
   end
@@ -616,11 +689,23 @@ end
 
 class RubyDebugServer
   include Observable
+  attr_accessor :quit_confirm_request
   RDS_QUIET = 'RDS_QUIET'
-  def initialize(_caller)
+  def initialize(_caller, _arcadia=nil)
     if _caller.respond_to? :rdebug_server_update
       ObserverCallback.new(self,_caller,:rdebug_server_update)
     end
+    @arcadia = _arcadia
+    @quit_confirm_request = false
+  end
+
+  def start_session_new(_filename, _host='localhost', _remote_port='8989')
+    if is_windows?
+       commandLine = "rdebug.cmd --host #{_host} --port #{_remote_port} -sw #{_filename}"
+    else
+       commandLine = "rdebug --host #{_host} --port #{_remote_port} -sw #{_filename}"
+    end
+    Arcadia.process_event(SystemExecEvent.new(self, 'command'=>commandLine))
   end
   
   def start_session(_filename, _host='localhost', _remote_port='8989')
@@ -629,23 +714,35 @@ class RubyDebugServer
     else
       commandLine = "rdebug --host #{_host} --port #{_remote_port} -sw #{_filename}"
     end
-    #MsgContract.instance.out_debug(self,commandLine)    
     begin
       if is_windows?
         @tid = Thread.new {
-          Kernel.system(commandLine)
-          Kernel.system('y')
+          if Kernel.system(commandLine)
+              Kernel.system('y')
+          else
+            if @quit_confirm_request
+              Arcadia.new_msg(self,"#{$?.inspect}")    
+            else
+              _event = Arcadia.process_event(RunRubyFileEvent.new(self, 'file'=>_filename))
+              Arcadia.new_debug_msg(self,"#{_event.results[0].output}")    
+            end
+          end
           notify(RDS_QUIET)
         }
       else
         @pid = Process.fork {
-          Kernel.system(commandLine)
-          Kernel.exit!
+          if Kernel.system(commandLine)
+            Kernel.system('y')
+          else
+            Kernel.exit!
+            Arcadia.new_debug_msg(self,"#{$?.inspect}")    
+          end
+          Process.wait
           notify(RDS_QUIET)
         }
       end
     rescue Exception => e
-      MsgContract.instance.out_debug(self,"Error on start_server : #{e.class}:#{e.message}")    
+      Arcadia.new_debug_msg(self,"Error on start_server : #{e.class}:#{e.message}")    
     end
   end
   
@@ -659,13 +756,12 @@ class RubyDebugServer
       end
       notify(RDS_QUIET)
     rescue Exception => e
-      MsgContract.instance.out_debug(self,"Error on start_server : #{e.class}:#{e.message}")    
+      Arcadia.new_debug_msg(self,"Error on start_server : #{e.class}:#{e.message}")    
     end
   end
   
   def is_windows?
     !(RUBY_PLATFORM =~ /(win|w)32$/).nil?
-    #RUBY_PLATFORM.include?('win')
   end
 
   def notify(_state)
@@ -772,7 +868,7 @@ class RubyDebugClient
   end
   
   def notify(_command, _result=nil)
-   #MsgContract.instance.out_debug(self,"notify=>#{_command}")    
+   #Arcadia.new_debug_msg(self,"notify=>#{_command}")    
     @busy = false
     changed
     notify_observers(_command, _result)
@@ -792,6 +888,7 @@ class RubyDebugClient
   end
 
   def socket_session
+      #Arcadia.new_debug_msg(self,"socket_session : passo")    
       if @session.nil?
         begin
           #sleep(2)
@@ -803,11 +900,11 @@ class RubyDebugClient
           if @t > 0
             socket_session
           else
-            MsgContract.instance.out_debug(self,"socket_session : #{e.inspect}")    
+            Arcadia.new_debug_msg(self,"socket_session : #{e.inspect}")    
           end
         end
       end
-      #MsgContract.instance.out_debug(self,"session : #{@session.inspect}")    
+      #Arcadia.new_debug_msg(self,"session : #{@session.inspect}")    
       return @session 
   end
   
@@ -816,7 +913,7 @@ class RubyDebugClient
       @session.close if is_alive?
       @session = nil
     rescue Exception => e
-      MsgContract.instance.out_debug(self,"Error on close session : #{e.class}:#{e.message}")    
+      Arcadia.new_debug_msg(self,"Error on close session : #{e.class}:#{e.message}")    
     end
   end
   
@@ -824,13 +921,13 @@ class RubyDebugClient
     begin
       @t = @timeout 
       if socket_session
-        #MsgContract.instance.out_debug(self,"session : #{@session.inspect}")    
+        #Arcadia.new_debug_msg(self,"session : #{@session.inspect}")    
         notify('start', read)
         read("eval require 'yaml'")
       end
       return @session
     rescue Exception => e
-      MsgContract.instance.out_debug(self,"Error on start_session : #{e.class}:#{e.message}")    
+      Arcadia.new_debug_msg(self,"Error on start_session : #{e.class}:#{e.message}")    
     end
   end
   
@@ -839,13 +936,13 @@ class RubyDebugClient
       quit if is_debugging_ready?
       @session.close if is_alive?
     rescue Exception => e
-      MsgContract.instance.out_debug(self,"Error on stop_session : #{e.class}:#{e.inspect}")    
+      Arcadia.new_debug_msg(self,"Error on stop_session : #{e.class}:#{e.inspect}")    
     end
   end
   
   # send a command to the debugger via socket
   def command(_command)
-   #MsgContract.instance.out_debug(self,"command=>#{_command}")    
+   #Arcadia.new_debug_msg(self,"command=>#{_command}")    
     begin
       return false if @busy
       if is_alive?
@@ -856,16 +953,15 @@ class RubyDebugClient
       end
       true
     rescue Errno::ECONNABORTED => e
-      #kill
       notify("quit_yes")
-      DebugContract.instance.debug_end(self)
-      MsgContract.instance.out_debug(self,"Debugged has finished executing")      
+      #DebugContract.instance.debug_end(self)
+      Arcadia.new_debug_msg(self,"Debugger has finished executing:\n #{e.class}:#{e.inspect}")      
       @session = nil
       @pend = true
       false
       #raise RubyDebugException.new("Debugged has finished executing")
     rescue Exception => e
-      MsgContract.instance.out_debug(self,"Error on command #{_command}: #{e.class}:#{e.inspect}")
+      Arcadia.new_debug_msg(self,"Error on command #{_command}: #{e.class}:#{e.inspect}")
       false
     end
   end
@@ -876,12 +972,11 @@ class RubyDebugClient
     socket_session.flush
     result = ""
     while _command !='y' && is_alive? && line = socket_session.gets
-      #MsgContract.instance.out_debug(self, "read: letta riga => #{line}")
+      #Arcadia.new_debug_msg(self, "read: letta riga => #{line}")
       break if line =~ /^PROMPT (.*)$/ || line =~ /.(y\/n)./ 
       result << line
       #break if _command =~ /^eval./
     end
-    #MsgContract.instance.out_simple(self,  "read(#{_command}): result => #{result}")
     @busy = false
     result
   
@@ -921,7 +1016,7 @@ class RubyDebugClient
 
   def quit_yes
     notify("quit_yes", read("y"))
-    DebugContract.instance.debug_end(self)
+    #DebugContract.instance.debug_end(self)
     kill
   end
 
@@ -936,11 +1031,9 @@ class RubyDebugClient
   
 
   def yaml_pseudo_load(_obj)
-    #MsgContract.instance.out_simple(self,"_obj="+_obj.inspect)
     just_present =  @valuobjs.include?(_obj)
     @valuobjs << _obj  
     if _obj.class == YAML::DomainType
-    #MsgContract.instance.out_simple(self,"_obj DomainType="+_obj.inspect)
       return _obj.type_id if just_present
       ret = Hash.new
       ret['__CLASS__']=_obj.type_id
@@ -953,7 +1046,7 @@ class RubyDebugClient
       end
       ret
     elsif _obj.class == Hash
-    #MsgContract.instance.out_simple(self,"_obj Hash="+_obj.inspect)
+    #Arcadia.new_msg(self,"_obj Hash="+_obj.inspect)
       return 'Hash' if just_present
       ret = Hash.new
       ret['__CLASS__']= 'Hash'
@@ -966,7 +1059,7 @@ class RubyDebugClient
       end
       ret
     elsif _obj.class == Array
-    #MsgContract.instance.out_simple(self,"_obj Array="+_obj.inspect)
+    #Arcadia.new_msg(self,"_obj Array="+_obj.inspect)
       return 'Array' if just_present
       ret = Hash.new
       ret['__CLASS__']= 'Array'
@@ -979,7 +1072,7 @@ class RubyDebugClient
       end
       ret
     elsif _obj.class == Struct
-    #MsgContract.instance.out_simple(self,"_obj Array="+_obj.inspect)
+    #Arcadia.new_msg(self,"_obj Array="+_obj.inspect)
       return 'Struct' if just_present
       ret = Hash.new
       ret['__CLASS__']= 'Struct'
@@ -993,7 +1086,7 @@ class RubyDebugClient
       end
       ret
     else  
-    #MsgContract.instance.out_simple(self,"_obj ="+_obj.inspect)
+    #Arcadia.new_msg(self,"_obj ="+_obj.inspect)
     
       _obj
     end
@@ -1009,14 +1102,20 @@ class RubyDebugClient
       @valuobjs.clear
     end
     begin
-      _str = eval(read("eval YAML::dump(#{_exp})"))
-      #MsgContract.instance.out_simple(self,"value passato 1 ="+_str.to_s)
-      _str.gsub!('!ruby/object:', '!')
-      #MsgContract.instance.out_simple(self,"value passato 2 ="+_str.to_s)
-      _obj = YAML::load(_str)
-      var = yaml_pseudo_load(_obj)
+      _to_eval = read("eval YAML::dump(#{_exp})")
+      if _to_eval.include?('Exception:')
+        _to_eval = read("eval require 'pp';eval #{_exp}.pretty_inspect")
+        var = eval(_to_eval)
+        #var = "?"
+      else
+        _str = eval(_to_eval)
+        _str.gsub!('!ruby/object:', '!')
+        _obj = YAML::load(_str)
+        var = yaml_pseudo_load(_obj)
+      end  
     rescue Exception => e
-      MsgContract.instance.out_simple(self,"exception on eval #{_exp} :#{e.inspect}")
+      Arcadia.new_msg(self,"exception on eval #{_exp} :#{e.inspect}")
+      #Arcadia.new_msg(self,"exception on eval #{_exp} :#{e.inspect}")
       var = nil
     end
     return var
@@ -1039,11 +1138,11 @@ class RubyDebugClient
 #      command("eval require 'pp';  #{var}.pretty_inspect() + '|||' + #{var}.class.to_s")
       command("eval YAML::dump(#{var})")
       _str = eval read
-      #MsgContract.instance.out_simple(self,"value passato 1 ="+_str)
+      #Arcadia.new_msg(self,"value passato 1 ="+_str)
 
       _str.gsub!('!ruby/object:', '!')
 
-      #MsgContract.instance.out_simple(self,"value passato 2 ="+_str)
+      #Arcadia.new_msg(self,"value passato 2 ="+_str)
 
       _obj = YAML::load(_str)
       
@@ -1055,10 +1154,10 @@ class RubyDebugClient
       end
       #_vvv = eval(_value)
       
-      #MsgContract.instance.out_simple(self,"vvv class="+_vvv.class.to_s)
+      #Arcadia.new_msg(self,"vvv class="+_vvv.class.to_s)
       
-      #MsgContract.instance.out_simple(self,"value="+_xvalue.inspect)
-      #MsgContract.instance.out_simple(self,"class="+_xclass)
+      #Arcadia.new_msg(self,"value="+_xvalue.inspect)
+      #Arcadia.new_msg(self,"class="+_xclass)
       variable_values[var] = Var.new(_xvalue, _xclass)
     end
     return variable_values
@@ -1069,13 +1168,13 @@ class RubyDebugClient
     begin
       #variables = read[1..-2].split(', ').collect!{|x| x[1..-2]}
       to_eval = read("eval #{_type}")
-      #MsgContract.instance.out_simple(self,"to_eval="+to_eval.to_s)
+      #Arcadia.new_msg(self,"to_eval="+to_eval.to_s)
       variables = eval(to_eval)
-      #MsgContract.instance.out_simple(self,"variables="+variables.to_s)
+      #Arcadia.new_msg(self,"variables="+variables.to_s)
     rescue Exception => e
       variables = []
       #p "on command eval #{_type}:#{e.inspect}"
-      #MsgContract.instance.out_debug(self,"on command eval #{_type}:#{e.inspect}")
+      #Arcadia.new_debug_msg(self,"on command eval #{_type}:#{e.inspect}")
     end
     variables = [] if variables.nil?
     variable_values = Hash.new
@@ -1150,30 +1249,67 @@ class RubyDebugClient
 end
 
 class RubyDebug < ArcadiaExt
+  include Autils
   attr_reader :rds
   attr_reader :rdc
-  def before_build
-    ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
-    @breakpoints = Hash.new
-    @static_breakpoints = Array.new
+  def on_before_build(_event)
+    if !full_in_path_command('rdebug').nil?
+      #ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
+      Arcadia.add_listener(self, BufferEvent)
+      @breakpoints = Hash.new
+      @static_breakpoints = Array.new
+    else
+      Arcadia.new_error_msg(self, "Warning: Extension ae-ruby-debug depend upon rdebug command (install it or update system path!)")
+    end
   end
-  
-  def build
-  end
-
-  def do_editor_event(_event)
-    case _event.signature 
-      when EditorContract::BREAKPOINT_AFTER_CREATE
-        self.breakpoint_add(File.expand_path(_event.context.file), _event.context.line)
-      when EditorContract::BREAKPOINT_AFTER_DELETE
-        self.breakpoint_del(File.expand_path(_event.context.file), _event.context.line)
-      when EditorContract::BUFFER_AFTER_RAISE
-        @raised_file=_event.context.file
-      when EditorContract::EVAL_EXPRESSION
-        eval_expression(_event.context.text)
+
+  def on_build(_event)
+    Arcadia.add_listener(self, DebugEvent)
+  end
+
+  def on_buffer(_event)
+    case _event
+      when BufferRaisedEvent
+        @raised_file=_event.file
     end
   end
 
+  def on_debug(_event)
+    case _event
+      when StartDebugEvent
+        _filename = _event.file
+        _filename = @arcadia['pers']['run.file.last'] if _filename == "*LAST"
+        debug(_filename)
+      when StepDebugEvent
+        if (_event.command == :quit_yes)
+          @rds.quit_confirm_request = true
+        end
+        @rdc.send(_event.command) if @rdc.is_alive?
+      when SetBreakpointEvent
+        self.breakpoint_add(File.expand_path(_event.file), _event.row)
+      when UnsetBreakpointEvent
+        self.breakpoint_del(File.expand_path(_event.file), _event.row)
+      when EvalExpressionEvent
+        eval_expression(_event.expression)
+      when StopDebugEvent
+        self.debug_quit
+    end
+  end
+
+  
+#  def do_editor_event(_event)
+#    case _event.signature 
+#      when EditorContract::BREAKPOINT_AFTER_CREATE
+#        self.breakpoint_add(File.expand_path(_event.context.file), _event.context.line)
+#      when EditorContract::BREAKPOINT_AFTER_DELETE
+#        self.breakpoint_del(File.expand_path(_event.context.file), _event.context.line)
+#      when EditorContract::BUFFER_AFTER_RAISE
+#        @raised_file=_event.context.file
+#      when EditorContract::EVAL_EXPRESSION
+#        eval_expression(_event.context.text)
+#    end
+#  end
+
   def eval_expression(_exp)
     res = @rdc.debug_eval(_exp) if @rdc && @rdc.is_debugging_ready?
     hash = Hash.new
@@ -1200,14 +1336,14 @@ class RubyDebug < ArcadiaExt
   end
   
   def breakpoint_add_live(_file,_line)
-    if @rdc
+    if @rdc && @rdc.is_alive?
       @breakpoints[breakpoint_suf(_file,_line)] = @rdc.set_breakpoint(_file, _line.to_i)
       @rdv.break_list_add(_file,_line) if @rdv
     end
   end
 
   def breakpoint_del_live(_file,_line)
-    if @rdc
+    if @rdc && @rdc.is_alive?
       @rdc.unset_breakpoint(@breakpoints.delete(breakpoint_suf(_file,_line)))
       @rdv.break_list_del(_file,_line) if @rdv
     end
@@ -1247,55 +1383,55 @@ class RubyDebug < ArcadiaExt
     end
   end
 
-
-
-  def debug_begin
-    breakpoint_free_live
-    DebugContract.instance.debug_begin(self)
-  end
-  
   def debug_last
-    debug($arcadia['pers']['run.file.last'])
+    Arcadia.process_event(StartDebugEvent.new(self, 'file'=>$arcadia['pers']['run.file.last']))
+    #debug($arcadia['pers']['run.file.last'])
   end
 
   def debug_current
-    debug(@raised_file) if @raised_file!=nil
+    Arcadia.process_event(StartDebugEvent.new(self, 'file'=>@raised_file)) if @raised_file!=nil
+    #debug(@raised_file) if @raised_file!=nil
   end
   def debugging?
     !@rdc.nil? && @rdc.is_alive?
   end
+
+  def debug_begin
+    breakpoint_free_live
+    #DebugContract.instance.debug_begin(self)
+  end
+
   def debug(_filename=nil)
     if _filename && !debugging?
       begin
         self.debug_begin
         @arcadia['pers']['run.file.last']=_filename
-        @rds = RubyDebugServer.new(self) if @rds.nil?
+        @rds = RubyDebugServer.new(self,@arcadia) if @rds.nil?
         @rds.start_session(_filename, conf('server.host'), conf('server.port'))
-        #MsgContract.instance.out_simple(self,@rds.to_s)
+        #Arcadia.new_msg(self,@rds.to_s)
         @rdc = RubyDebugClient.new(conf('server.host'), conf('server.port'), conf('server.timeout')) if @rdc.nil?
         @rdv = RubyDebugView.new(self.frame, self) if @rdv.nil?
         @rdv.start_process(_filename)
         if @rdc.start_session
           @static_breakpoints.each{|_b|
-            #MsgContract.instance.out_simple(self," breakpoint_add #{_b[:file]}:#{_b[:line]}")
+            #Arcadia.new_msg(self," breakpoint_add #{_b[:file]}:#{_b[:line]}")
             breakpoint_add_live(_b[:file], _b[:line])
           } 
         end
-        #MsgContract.instance.out_simple(self,"\n<begin debug>")
+        #Arcadia.new_msg(self,"\n<begin debug>")
 
       rescue Exception => e
-        MsgContract.instance.out_debug(self,"---> "+e.to_s)
+        Arcadia.new_debug_msg(self,"---> "+e.to_s)
       end
     end
   end
 
-
   def rdebug_server_update(_state)
     case _state
-      when RubyDebugServer::_RDS_QUIT_
-        debug_quit
+      when RubyDebugServer::RDS_QUIET
+        #debug_free
     end
-    p _state
+    #p _state
   end
 
   def debug_free
@@ -1317,7 +1453,7 @@ class RubyDebug < ArcadiaExt
         begin
           debug_free
         rescue Exception => e
-          MsgContract.instance.out_debug(self, "debug_quit:---> "+e.to_s)
+          Arcadia.new_debug_msg(self, "debug_quit:---> "+e.to_s)
           #@arcadia['shell'].outln("debug_quit:---> "+e.to_s )
         end
       end