arcadia 0.7.0 → 0.8.0

data/lib/a-contracts.rb

@@ -12,6 +12,7 @@
 # +------------------------------------------+
 
 class ArcadiaEvent < Event
+  # note--they all have attr_accessor :file, and :dir
 end
 
 class QuitEvent < ArcadiaEvent
@@ -20,12 +21,17 @@ end
 # +------------------------------------------+
 #     Extention Event (raised only by Arcadia)
 #     do not raise! 
+#     Every extensions listen on these events
 # +------------------------------------------+
 
 class BuildEvent < ArcadiaEvent
   attr_accessor :name
 end 
 
+# ExitQueryEvent is processed by arcadia-core 
+# before process FinalizeEvent during quiet face.
+# If listener(Extension) set can_exit property to false then 
+# arcadia abort the quiet face. 
 class ExitQueryEvent < ArcadiaEvent
   attr_accessor :can_exit
 end
@@ -33,6 +39,19 @@ end
 class FinalizeEvent < ArcadiaEvent
 end
 
+
+class NeedRubyGemWizardEvent < ArcadiaEvent
+  class Result < Result
+    attr_accessor :installed
+  end
+  attr_accessor :extension_name
+  attr_accessor :gem_name
+  attr_accessor :gem_repository
+  attr_accessor :gem_min_version
+  attr_accessor :gem_max_version
+  attr_accessor :gem_events
+end
+
 # +------------------------------------------+
 #     Generic Layout Event 
 #     
@@ -76,10 +95,17 @@ class MoveBufferEvent < BufferEvent
   attr_accessor :new_file	
 end
 
+class CloseCurrentTabEvent < BufferEvent
+end
+
 class GoToLineBufferEvent < BufferEvent
   attr_accessor :line
 end
 
+class PrettifyTextEvent < BufferEvent
+
+end
+
 class SearchBufferEvent < BufferEvent
   class Result < Result
     attr_accessor :row, :col
@@ -165,6 +191,17 @@ end
 #  +---------------------------------------------+
 
 class SearchInFilesEvent < ArcadiaEvent
+  # this message actually does before, on, after
+  # in the time it takes to open the dialog
+  # the dialog then receives its input [i.e. all the messages are done before the search is through]
+  class Result < SearchBufferEvent::Result
+    attr_accessor :file
+  end
+  attr_accessor :what, :files_filter, :dir
+end
+
+class AckInFilesEvent < ArcadiaEvent
+  # don't subclass SearchInFilesEvent or listeners for SearchInFiles will also get our messages
   class Result < SearchBufferEvent::Result
     attr_accessor :file
   end
@@ -197,6 +234,14 @@ class InputExitEvent < InputEvent
   attr_accessor :receiver
 end
 
+# FocusEvent
+# Events for executing operation on focused widget
+class FocusEvent < ArcadiaEvent
+  attr_accessor :focus_widget
+end
+class CutTextEvent < FocusEvent; end
+class CopyTextEvent < FocusEvent; end
+class PasteTextEvent < FocusEvent; end
 
 #class VirtualKeyboardEvent  < ArcadiaEvent
 #end
@@ -247,5 +292,4 @@ class ActionEvent < ArcadiaEvent
   attr_accessor :receiver
   attr_accessor :action
   attr_accessor :action_args
-end
-
+end

data/lib/a-core.rb

@@ -2,13 +2,11 @@
 #   a-core.rb - Arcadia Ruby ide
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
-#   §require_dir_ref=..
-#   §require_omissis=conf/arcadia.init
-#   §require_omissis=tk
-#   §require_omissis=tk/label
-#   §require_omissis=tk/toplevel
-
-
+#   &require_dir_ref=..
+#   &require_omissis=conf/arcadia.init
+#   &require_omissis=tk
+#   &require_omissis=tk/label
+#   &require_omissis=tk/toplevel
 
 require "conf/arcadia.res"
 require 'tkextlib/bwidget'
@@ -23,7 +21,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.7.0',
+        '0.8.0',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -32,11 +30,14 @@ class Arcadia < TkApplication
     set_sysdefaultproperty
     ArcadiaDialogManager.new(self)
     ArcadiaActionDispatcher.new(self)
+    ArcadiaGemsWizard.new(self)
+    MonitorLastUsedDir.new
+    FocusEventManager.new
     #self.load_local_config(false)
     ObjectSpace.define_finalizer($arcadia, self.class.method(:finalize).to_proc)
     publish('action.on_exit', proc{do_exit})
     #_title = "Arcadia Ruby ide :: [Platform = #{RUBY_PLATFORM}] [Ruby version = #{RUBY_VERSION}] [TclTk version = #{tcltk_info.level}]"
-    _title = "Arcadia Ruby ide :: #{sys_info}"
+    _title = "Arcadia ide "
     @root = TkRoot.new(
       'background'=> self['conf']['background']
       ){
@@ -52,7 +53,8 @@ class Arcadia < TkApplication
       'background'=> self['conf']['background']
     ).pack('fill'=>'x')
     @mf_root = Tk::BWidget::MainFrame.new(@root,
-     'background'=> self['conf']['background']
+     'background'=> self['conf']['background'],
+     'height'=> 0
       ){
       menu @main_menu_bar
     }.pack(
@@ -74,8 +76,17 @@ class Arcadia < TkApplication
     @splash.next_step('..prepare')  if @splash
     prepare
     @splash.last_step('..load finish')  if @splash
-    geometry = (TkWinfo.screenwidth(@root)-4).to_s+'x'+
-    (TkWinfo.screenheight(@root)-20).to_s+'+0+0'
+    if self['conf']['geometry']
+      geometry = self['conf']['geometry']
+    else
+      start_width = (TkWinfo.screenwidth(@root)-4)
+      start_height = (TkWinfo.screenheight(@root)-20)
+      if RUBY_PLATFORM =~ /mswin|mingw/ # on doze don't go below the start gar
+        start_height -= 50
+        start_width -= 20
+      end
+      geometry = start_width.to_s+'x'+start_height.to_s+'+0+0'
+    end
     @root.deiconify
     @root.raise
     @root.focus(true)
@@ -83,7 +94,7 @@ class Arcadia < TkApplication
     Tk.update_idletasks
     #sleep(1)
     @splash.destroy  if @splash
-    if @first_run
+    if @first_run # first ARCADIA ever
       Arcadia.process_event(OpenBufferEvent.new(self,'file'=>'README'))
     elsif ARGV.length > 0
       ARGV.each{|_f|
@@ -96,11 +107,15 @@ class Arcadia < TkApplication
     Arcadia.attach_listener(self, QuitEvent)
     Arcadia.persistent("version", self['applicationParams'].version)
   end
-  
+
   def on_quit(_event)
     self.do_exit
   end
   
+  def register(_ext)
+    @exts_i << _ext
+  end
+  
   def show_hide_toolbar
     if @is_toolbar_show
     		@mf_root.show_toolbar(0,false)
@@ -122,11 +137,31 @@ class Arcadia < TkApplication
 	 return (self['conf'][_name+'.active'] != nil && self['conf'][_name+'.active']=='yes')||
        	  (self['conf'][_name+'.active'] == nil)
   end
-	
+
+  def ext_source_must_be_loaded?(_name)
+    ret = ext_active?(_name)
+    if !ret
+    @exts_dip.each{|key,val|
+      if val == _name
+        ret = ret || ext_active?(key)
+      end
+      break if ret
+    }
+    end
+    ret
+  end
+  
   def load_exts_conf
   		@exts = Array.new
+  		@exts_i = Array.new
+  		@exts_dip = Hash.new
+  		@exts_loaded = Array.new
+  		load_exts_conf_from('ext')
+  end
+	
+  def load_exts_conf_from(_dir='',_ext_root=nil)
   		dirs = Array.new
-  		files = Dir['ext/*'].concat(Dir[ENV["HOME"]+'/.arcadia/ext/*']).sort
+  		files = Dir["#{_dir}/*"].concat(Dir[ENV["HOME"]+"/.arcadia/#{_dir}/*"]).sort
   		files.each{|f|
   			 dirs << f if File.stat(f).directory? && FileTest.exist?(f+'/'+File.basename(f)+'.conf')
   		}
@@ -139,44 +174,169 @@ class Arcadia < TkApplication
            if var_plat.length > 1
              new_key = var_plat[0] + ':' + name + '.' + var_plat[1]
            else
-             new_key = name+'.'+key
+             begin
+              new_key = name+'.'+key
+             rescue => e
+              puts 'is an extension missing a name?'
+              raise e
+             end
            end	
        	   conf_hash2[new_key]= value
        	 }
-       @exts << name	 	
+       @exts << name
+       if _ext_root
+         @exts_dip[name] = _ext_root
+       end	 	
     		 self['conf'].update(conf_hash2)	
+    		 self['origin_conf'].update(conf_hash2)	
+    		 load_exts_conf_from("#{ext_dir}/ext",name)
   		}
   end
 
+  def Arcadia.gem_available?(_gem)
+      if Gem.respond_to?(:available?)
+          return Gem.available?(_gem)
+      else
+          return !Gem.source_index.find_name(_gem).empty?
+      end
+  end
+
+  def check_gems_dependences(_ext)
+    ret = true
+    gems_property = self['conf']["#{_ext}.gems"]
+    if gems_property
+      gems = gems_property.split(',').collect{| g | g.strip }
+      if gems && gems.length > 0
+        gems.each{|gem|
+          # consider gem only if it is not installed
+          if !Arcadia.gem_available?(gem)
+            repository_property =  self['conf']["#{_ext}.gems.#{gem}.repository"]
+            events_property =  self['conf']["#{_ext}.gems.#{gem}.events"]
+            args = Hash.new
+            args['extension_name']=_ext
+            args['gem_name']=gem
+            args['gem_repository']=repository_property if repository_property
+            args['gem_events']=events_property if events_property
+            if events_property
+              #EventWatcher.new
+              events_str = events_property.split(',')
+              events_str.each{|event_str|
+                EventWatcherForGem.new(eval(event_str),args)
+              }
+            else
+              _event = Arcadia.process_event(NeedRubyGemWizardEvent.new(self, args))
+              ret = ret &&  Arcadia.gem_available?(gem)
+#              if _event && _event.results
+#                ret = ret && _event.results[0].installed
+#              end
+            end
+            break if !ret
+          end
+        } 
+      end 
+    end 
+    ret
+  end
+
   def do_build
-  
     # create extensions
-    @exts.each{|extension|
-      if extension && ext_active?(extension)
-        @splash.next_step('... creating '+extension)  if @splash
-        ext_create(extension)
+    Array.new.concat(@exts).each{|extension|
+      if extension && ext_source_must_be_loaded?(extension)
+        gems_installed = check_gems_dependences(extension)
+        if !gems_installed || !ext_load(extension)
+          @exts.delete(extension)
+        elsif !ext_active?(extension)
+          @exts.delete(extension)
+        elsif ext_active?(extension)
+          @splash.next_step('... creating '+extension)  if @splash
+          @exts.delete(extension) unless 
+            (((@exts_dip[extension] != nil && @exts_loaded.include?(@exts_dip[extension]))||@exts_dip[extension] == nil) && ext_create(extension)) 
+        end
       end
     }
-    _build_event = Arcadia.process_event(BuildEvent.new(self))
+    begin
+      _build_event = Arcadia.process_event(BuildEvent.new(self))
+    rescue Exception
+      ret = false
+      msg = "During build event processing(#{$!.class.to_s}) : #{$!} at : #{$@.to_s}"
+      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
+      'title' => "(Arcadia) Build face", 'parent' => @root,
+      'message' => msg)
+      if  ans == 'abort'
+        raise
+        exit
+      elsif ans == 'retry'
+        retry
+      else
+        Tk.update
+      end
+    end
   end
-
-  def ext_create(_extension)
+  
+  def load_maximised
+    lm = self['conf']['layout.maximized']
+    if lm    
+      ext,index=lm.split(',')
+      maxed = false
+      if ext && index
+        ext = ext.strip
+        i=index.strip.to_i
+        @exts_i.each{|e|
+          if e.conf('name')==ext && !maxed
+            e.maximize(i)
+            maxed=true
+            break
+          end
+        }    
+      end
+    end
+  end
+  
+  def ext_load(_extension)
+    ret = true
     begin
       source = self['conf'][_extension+'.require']
-      class_name = self['conf'][_extension+'.class']
       if source.strip.length > 0
-        #p source
-	eval("require '#{source}'") 
-        #eval('require ' + "'" + source + "'")
+	      require source 
+      end
+      @exts_loaded << _extension
+    rescue Exception,LoadError
+      ret = false
+      msg = "Loading \"#{_extension}\" (#{$!.class.to_s}) : #{$!} at : #{$@.to_s}"
+      ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
+      'title' => "(Arcadia) Extensions '#{_extension}'", 'parent' => @root,
+      'message' => msg)
+      if  ans == 'abort'
+        raise
+        exit
+      elsif ans == 'retry'
+        retry
+      else
+        Tk.update
       end
+    end
+    ret
+  end
+
+  def ext_create(_extension)
+    ret = true
+    begin
+      class_name = self['conf'][_extension+'.class']
       if class_name.strip.length > 0
-        publish(_extension, eval(class_name).new(self, _extension))
+        klass = nil
+        begin
+          klass = eval(class_name)
+        rescue => e
+          puts 'does an extension class have the wrong name associated with it, in its conf file?, or is not listing the right .rb file?'
+          raise e
+        end
+        publish(_extension, klass.new(self, _extension))
       end
-    rescue Exception
-      raise
-      msg = "Loading "+'"'+extension+'"'+" ("+$!.class.to_s+") "+" : "+$! + " at : "+$@.to_s
+    rescue Exception,LoadError
+      ret = false
+      msg = "Loading \"#{_extension}\" (#{$!.class.to_s}) : #{$!} at : #{$@.to_s}"
       ans = Tk.messageBox('icon' => 'error', 'type' => 'abortretryignore',
-      'title' => '(Arcadia) Extensions', 'parent' => @root,
+      'title' => "(Arcadia) Extensions '#{_extension}'", 'parent' => @root,
       'message' => msg)
       if  ans == 'abort'
         raise
@@ -187,6 +347,7 @@ class Arcadia < TkApplication
         Tk.update
       end
     end
+    ret
   end
 
   def ext_method(_extension, _method)
@@ -213,48 +374,51 @@ class Arcadia < TkApplication
     suf = "layout.split"
     elems = self['conf'][suf]
     return if elems.nil?
-    groups = elems.split(',')
-    groups.each{|group|
-      if group
-        suf1 = suf+'.'+group
-        begin
-          property = self['conf'][suf1]
-          c = property.split('c')
-          if c && c.length == 2
-            pt = c[0].split('.')
-            perc = c[1].include?('%')
-            w = c[1].sub('%','')
-            if perc 
-              @layout.add_cols_perc(pt[0].to_i, pt[1].to_i, w.to_i)
-            else
-              @layout.add_cols(pt[0].to_i, pt[1].to_i, w.to_i)
-            end
-          else
-            r = property.split('r')
-            if r && r.length == 2
-              pt = r[0].split('.')
-              perc = r[1].include?('%')
-              w = r[1].sub('%','')
+    if elems.strip.length > 0
+      groups = elems.split(',')
+      groups.each{|group|
+        if group
+          suf1 = suf+'.'+group
+          begin
+            property = self['conf'][suf1]
+            c = property.split('c')
+            if c && c.length == 2
+              pt = c[0].split('.')
+              perc = c[1].include?('%')
+              w = c[1].sub('%','')
               if perc 
-                @layout.add_rows_perc(pt[0].to_i, pt[1].to_i, w.to_i)
+                @layout.add_cols_perc(pt[0].to_i, pt[1].to_i, w.to_i)
               else
-                @layout.add_rows_perc(pt[0].to_i, pt[1].to_i, w.to_i)
+                @layout.add_cols(pt[0].to_i, pt[1].to_i, w.to_i)
+              end
+            else
+              r = property.split('r')
+              if r && r.length == 2
+                pt = r[0].split('.')
+                perc = r[1].include?('%')
+                w = r[1].sub('%','')
+                if perc 
+                  @layout.add_rows_perc(pt[0].to_i, pt[1].to_i, w.to_i)
+                else
+                  @layout.add_rows(pt[0].to_i, pt[1].to_i, w.to_i)
+                end
               end
             end
-          end
-          
-        rescue Exception
-          msg = "Loading layout: (#{$!.class.to_s} : #{$!.to_s} at : #{$@.to_s})"
-          if Arcadia.dialog(self, 'type'=>'ok_cancel', 'level'=>'error','title' => '(Arcadia) Layout', 'msg'=>msg)=='cancel'
-            raise
-            exit
-          else
-            Tk.update
+            
+          rescue Exception
+            msg = "Loading layout: (#{$!.class.to_s} : #{$!.to_s} at : #{$@.to_s})"
+            if Arcadia.dialog(self, 'type'=>'ok_cancel', 'level'=>'error','title' => '(Arcadia) Layout', 'msg'=>msg)=='cancel'
+              raise
+              exit
+            else
+              Tk.update
+            end
           end
         end
-      end
-    }
-
+      }
+    else
+      @layout.add_mono_panel
+    end
     @layout.add_headers
   end
 
@@ -265,6 +429,7 @@ class Arcadia < TkApplication
     self.load_local_config
     self.load_theme(self['conf']['theme'])
     self.resolve_properties_link(self['conf'],self['conf'])
+    self.resolve_properties_link(self['origin_conf'],self['origin_conf'])
   end
 
   def set_sysdefaultproperty
@@ -287,13 +452,10 @@ class Arcadia < TkApplication
     publish('buffers.code.in_memory',Hash.new)
     publish('action.load_code_from_buffers', proc{TkBuffersChoise.new})
     publish('output.action.run_last', proc{$arcadia['output'].run_last})
-    publish('main.action.open_file', proc{self['editor'].open_file(Tk.getOpenFile)})
+    publish('main.action.open_file', proc{self['editor'].open_file(Arcadia.open_file_dialog)})
     @splash.next_step('... load obj controller')  if @splash
     @splash.next_step('... load editor')  if @splash
     publish('main.action.new_file',proc{$arcadia['editor'].open_buffer()})
-    publish('main.action.edit_cut',proc{$arcadia['editor'].raised.text.text_cut()})
-    publish('main.action.edit_copy',proc{$arcadia['editor'].raised.text.text_copy()})
-    publish('main.action.edit_paste',proc{$arcadia['editor'].raised.text.text_paste()})
     @splash.next_step('... load actions')  if @splash
     #provvisorio 
     @keytest = KeyTest.new
@@ -355,45 +517,42 @@ class Arcadia < TkApplication
         suf1 = suf+'.'+group
         begin
           context_path = self['conf']["#{suf1}.context_path"]
-          property = proc{|_str, _suf| self['conf']["#{_suf}.#{_str}"]} 
-          property_to_eval = proc{|_str, _suf| 
-            p = self['conf']["#{_suf}.#{_str}"]
-            _self_on_eval.instance_eval(p) if p 
-          } 
+          context_underline = self['conf']["#{suf1}.context_underline"]
+#          property = proc{|_str, _suf| self['conf']["#{_suf}.#{_str}"]} 
+#          property_to_eval = proc{|_str, _suf| 
+#            p = self['conf']["#{_suf}.#{_str}"]
+#            _self_on_eval.instance_eval(p) if p 
+#          } 
           items = self['conf'][suf1].split(',')
           items.each{|item|
             suf2 = suf1+'.'+item
             disabled = !self['conf']["#{suf2}.disabled"].nil?
-#            property = proc{|_str| self['conf']["#{suf2}.#{_str}"]} 
-#            property_to_eval = proc{|_str| 
-#              p = self['conf']["#{suf2}.#{_str}"]
-#              _self_on_eval.instance_eval(p) if p 
-#            } 
-            name = property.call('name',suf2)
-            caption = property.call('caption',suf2)
-            hint = property.call('hint',suf2)
-            event_class = property_to_eval.call('event_class',suf2)
-            
-            event_args = property_to_eval.call('event_args',suf2)
-            image_data = property_to_eval.call('image_data',suf2)
-            item_args = {
-              'name'=>name,
-              'caption'=>caption,
-              'hint'=>hint,
-              'event_class' =>event_class,
-              'event_args' =>event_args,
-              'image_data' =>image_data,
-              'context'=>group,
-              'context_path'=>context_path
+            iprops=Arcadia.conf_group(suf2)
+            item_args = Hash.new
+            iprops.each{|k,v|
+              value = v.strip
+              if value[0..0]=='!'
+                item_args[k]=_self_on_eval.instance_eval(value[1..-1])  
+              else
+                item_args[k]=value
+              end
             }
+          #  item_args['caption'] = item if item_args['caption'].nil?
+            item_args['name'] = item if item_args['name'].nil?
+            item_args['context'] = group
+            item_args['context_path'] = context_path
             item_args['context_caption'] = groups_caption[gi] if groups_caption
+            item_args['context_underline'] = context_underline.strip.to_i if context_underline
             i = _user_control.new_item(self, item_args)
             i.enable=false if disabled
-
           }
         rescue Exception
           msg = "Loading #{groups} ->#{items} (#{$!.class.to_s} : #{$!.to_s} at : #{$@.to_s})"
-          if Arcadia.dialog(self, 'type'=>'ok_cancel', 'title' => '(Arcadia) Toolbar', 'msg'=>msg)=='cancel'
+          if Arcadia.dialog(self, 
+            'type'=>'ok_cancel', 
+            'title' => '(Arcadia) Toolbar', 
+            'msg'=>msg,
+            'level'=>'error')=='cancel'
             raise
             exit
           else
@@ -420,11 +579,89 @@ class Arcadia < TkApplication
 
   def can_exit?
     _event = Arcadia.process_event(ExitQueryEvent.new(self, 'can_exit'=>true))
-    return _event.can_exit
+    _event.can_exit
+  end
+
+  def save_layout
+    self['conf']['geometry']= TkWinfo.geometry(@root)
+    Arcadia.del_conf_group('layout')
+    # resizing
+    @exts_i.each{|e|
+      found = false
+      if e.conf('frames')
+        frs = e.conf('frames').split(',') 
+      else 
+        frs = Array.new
+      end
+      frs.each_index{|i|
+        if e.maximized?(i)
+          self['conf']['layout.maximized']="#{e.conf('name')},#{i}"
+          e.resize(i)
+          found=true
+          break
+        end
+      } 
+      break if found
+    }
+    # layouts
+    splits,doms,r,c = @layout.dump_geometry
+    header = ""
+    splits.each_index{|i|
+      header << i.to_s
+      header << ',' if i < splits.length-1
+    }
+    self['conf']['layout.split']= header
+    splits.each_with_index{|sp,i|
+      self['conf']["layout.split.#{i}"]=sp
+    }
+    # domains
+    @exts_i.each{|e|
+      if e.conf('frames')
+        frs = e.conf('frames').split(',') 
+      else 
+        frs = Array.new
+      end
+      str_frames=''
+      frs.each_index{|i|
+        f = e.frame(i,false)
+        if f
+          ff = f.hinner_frame
+          frame = ff.frame if ff
+          if frame && TkWinfo.parent(frame).instance_of?(Tk::BWidget::NoteBook)
+            frame=TkWinfo.parent(TkWinfo.parent(frame))
+          elsif frame.nil?
+            if str_frames.length > 0
+              str_frames << ','
+            end
+            str_frames << '-1.-1'
+          end
+          if doms[frame]
+            if str_frames.length > 0
+              str_frames << ','
+            end
+            str_frames << doms[frame]
+          end
+        else
+        end
+      }
+      if str_frames.length > 0
+        self['conf']["#{e.conf('name')}.frames"]=str_frames
+ #     p "#{e.conf('name')}.frames=#{str_frames}"
+      end
+    }
+    # toolbar
+    if @is_toolbar_show
+      self['conf']['user_toolbar_show']='yes'
+    else
+      self['conf']['user_toolbar_show']='no'
+    end
+    
   end
-
+  
   def do_finalize
+    self.save_layout
     _event = Arcadia.process_event(FinalizeEvent.new(self))
+    update_local_config
     self.override_persistent(self['applicationParams'].persistent_file, self['pers'])
   end
 
@@ -440,6 +677,10 @@ class Arcadia < TkApplication
   def Arcadia.style(_class)
     Configurable.properties_group(_class, Arcadia.instance['conf'])
   end
+
+  def Arcadia.conf_group(_path)
+    Configurable.properties_group(_path, Arcadia.instance['conf'])
+  end
   
   def Arcadia.persistent(_property, _value=nil, _immediate=false)
     if @@instance
@@ -459,6 +700,41 @@ class Arcadia < TkApplication
         return @@instance.layout
 	  end
   end
+  
+  def Arcadia.open_file_dialog
+     Tk.getOpenFile 'initialdir' => MonitorLastUsedDir.get_last_dir
+  end
+
+  def Arcadia.is_windows?
+    RUBY_PLATFORM =~ /mingw|mswin/
+  end
+
+  
+  def Arcadia.file_icon(_file_name)
+    if @@instance['file_icons'] == nil
+      @@instance['file_icons'] = Hash.new 
+      @@instance['file_icons']['default']= TkPhotoImage.new('dat' => FILE_ICON_DEFAULT)
+    end
+    _base_name= File.basename(_file_name)
+    if _base_name.include?('.')
+      file_dn = _base_name.split('.')[-1]
+    else
+      file_dn = "no_ext"
+    end
+    if @@instance['file_icons'][file_dn].nil?
+      file_icon_name="FILE_ICON_#{file_dn.upcase}"
+      begin
+        if eval("defined?(#{file_icon_name})")
+          @@instance['file_icons'][file_dn]= TkPhotoImage.new('dat' => eval(file_icon_name))
+        else
+          @@instance['file_icons'][file_dn]= @@instance['file_icons']['default']
+        end
+      rescue Exception
+        @@instance['file_icons'][file_dn]= @@instance['file_icons']['default']
+      end
+    end
+    @@instance['file_icons'][file_dn]
+  end
 
 #  def Arcadia.res(_res)
 #    theme = Arcadia.instance['conf']['theme']
@@ -677,18 +953,27 @@ class ArcadiaMainMenu < ArcadiaUserControl
   SUF='user_menu'
   class UserItem < UserItem
     attr_accessor :menu
+    attr_accessor :underline
+    attr_accessor :type
     def initialize(_sender, _args)
       super(_sender, _args)
-      _image = TkPhotoImage.new('data' => @image_data) if @image_data
       _command = proc{
         Arcadia.process_event(@event_class.new(_sender, @event_args))
       } if @event_class
       #_menu = @menu[@parent]
-      @item_obj = @menu.insert('end', :command, 
-        'image'=>_image,
-        'label'=>@caption, 
-        'compound'=>'left',
-        'command'=>_command )
+      item_args = Hash.new
+      item_args['image']=TkPhotoImage.new('data' => @image_data) if @image_data
+      item_args['label']=@caption
+      item_args['underline']=@underline.to_i if @underline != nil
+      item_args['compound']='left'
+      item_args['command']=_command
+      if @type.nil? && _commnad.nil? && @name == '-'
+        @type=:separator
+        item_args.clear
+      elsif @type.nil?
+        @type=:command
+      end
+      @item_obj = @menu.insert('end', @type ,item_args)  
       @index = @menu.index('last')
     end
 
@@ -713,7 +998,7 @@ class ArcadiaMainMenu < ArcadiaUserControl
 #    menu.font(Arcadia.conf('main.mainmenu.font'))
   end
 
-  def get_menu_context(_menubar, _context)
+  def get_menu_context(_menubar, _context, _underline=nil)
     menubuttons =  _menubar[0..-1]
     # cerchiamo il context
     m_i = -1
@@ -727,7 +1012,7 @@ class ArcadiaMainMenu < ArcadiaUserControl
     if m_i > -1
       _menubar[m_i][1]
     else
-      _menubar.add_menu([[_context],[]])[1].delete(0)
+      _menubar.add_menu([[_context,_underline],[]])[1].delete(0)
     end
   end
   
@@ -737,15 +1022,18 @@ class ArcadiaMainMenu < ArcadiaUserControl
       i_end = menu_context.index('end')
       if i_end
         0.upto(i_end){|j|
-          l = menu_context.entrycget(j,'label')
-          if l == folder
-           s_i = j
-           break
+          type = menu_context.menutype(j)
+          if type != 'separator'
+            l = menu_context.entrycget(j,'label')
+            if l == folder && type == 'cascade'
+             s_i = j
+             break
+            end
           end
         }
       end
     end
-    if s_i > -1 && menu_context.menutype(s_i) == 'cascade'
+    if s_i > -1 #&& menu_context.menutype(s_i) == 'cascade'
       sub = menu_context.entrycget(s_i, 'menu')
     else
       sub = TkMenu.new(
@@ -764,8 +1052,8 @@ class ArcadiaMainMenu < ArcadiaUserControl
     sub
   end
   
-  def get_menu(_menubar, _context, context_path)
-    context_menu = get_menu_context(_menubar, _context)
+  def get_menu(_menubar, _context, context_path, context_underline=nil)
+    context_menu = get_menu_context(_menubar, _context, context_underline)
     folders = context_path.split('/')
     sub = context_menu
     folders.each{|folder|
@@ -782,7 +1070,7 @@ class ArcadiaMainMenu < ArcadiaUserControl
     else
       conte = _args['context']
     end
-    _args['menu']=get_menu(@menu, conte, _args['context_path'])
+    _args['menu']=get_menu(@menu, conte, _args['context_path'], _args['context_underline'])
     super(_sender, _args)
   end
 
@@ -790,7 +1078,7 @@ class ArcadiaMainMenu < ArcadiaUserControl
   def build
     menu_spec_file = [
       ['File', 0],
-      ['Open', proc{Arcadia.process_event(OpenBufferEvent.new(self,'file'=>Tk.getOpenFile))}, 0],
+      ['Open', proc{Arcadia.process_event(OpenBufferEvent.new(self,'file'=>Arcadia.open_file_dialog))}, 0],
       ['New', $arcadia['main.action.new_file'], 0],
       #['Save', proc{EditorContract.instance.save_file_raised(self)},0],
       ['Save', proc{Arcadia.process_event(SaveBufferEvent.new(self))},0],
@@ -798,16 +1086,23 @@ class ArcadiaMainMenu < ArcadiaUserControl
       '---',
       ['Quit', $arcadia['action.on_exit'], 0]]
       menu_spec_edit = [['Edit', 0],
-      ['Cut', $arcadia['main.action.edit_cut'], 2],
-      ['Copy', $arcadia['main.action.edit_copy'], 0],
-      ['Paste', $arcadia['main.action.edit_paste'], 0]]
+      ['Cut', proc{Arcadia.process_event(CutTextEvent.new(self))}, 2],
+      ['Copy', proc{Arcadia.process_event(CopyTextEvent.new(self))}, 0],
+      ['Paste', proc{Arcadia.process_event(PasteTextEvent.new(self))}, 0],
+      ['Prettify Current', proc{Arcadia.process_event(PrettifyTextEvent.new(self))}, 0]]
+      
       menu_spec_search = [['Search', 0],
-      ['Find ...', proc{Arcadia.process_event(SearchBufferEvent.new(self))}, 2],
+      ['Find/Replace ...', proc{Arcadia.process_event(SearchBufferEvent.new(self))}, 2],
       ['Find in files...', proc{Arcadia.process_event(SearchInFilesEvent.new(self))}, 2],
+      ['Ack in files...', proc{Arcadia.process_event(AckInFilesEvent.new(self))}, 2],
       ['Go to line ...', proc{Arcadia.process_event(GoToLineBufferEvent.new(self))}, 2]]
-      menu_spec_view = [['View', 0],['Show/Hide Toolbar', proc{$arcadia.show_hide_toolbar}, 2]]
+      menu_spec_view = [['View', 0],['Show/Hide Toolbar', proc{$arcadia.show_hide_toolbar}, 2],
+      ['Close current tab', proc{Arcadia.process_event(CloseCurrentTabEvent.new(self))}, 0],
+      ]
       menu_spec_tools = [['Tools', 0],
-      ['Keys-test', $arcadia['action.test.keys'], 2]
+      ['Keys-test', $arcadia['action.test.keys'], 2],
+      ['Edit prefs', proc{Arcadia.process_event(OpenBufferEvent.new(self,'file'=>$arcadia.local_file_config))}, 0],
+      ['Load from edited prefs', proc{$arcadia.load_local_config}, 0]
     ]
     menu_spec_help = [['Help', 0],
     ['About', $arcadia['action.show_about'], 2],]
@@ -823,14 +1118,16 @@ class ArcadiaMainMenu < ArcadiaUserControl
 #      hh = 25
 #      @last_post = nil
 #      chs.each{|ch|
-#        ch.bind_append("Enter", proc{|x,y,rx,ry| 
-#          @last_post.unpost if @last_post
+#        ch.bind_append("Enter", proc{|x,y,rx,ry|
+#          @last_post.unpost if @last_post && @last_post != ch.menu
 #          ch.menu.post(x-rx,y-ry+hh)
 #          @last_post=ch.menu}, "%X %Y %x %y")
 #        ch.bind_append("Leave", proc{
 #          @last_post.unpost if @last_post
+#          @last_post=nil
 #        })
 #      }
+
     #})
   end
   
@@ -891,8 +1188,20 @@ class ArcadiaAboutSplash < TkToplevel
       foreground  '#ffffff'
       font Arcadia.instance['conf']['splash.credits.font']
       justify  'left'
-      place('width' => '210','x' => 100,'y' => 95,'height' => 19)
+      anchor 'w'
+      place('width' => '210','x' => 100,'y' => 95,'height' => 25)
+    }
+
+    @tkLabelCredits = TkLabel.new(self){
+      text  'Contributors: Roger D. Pack'
+      background  _bgcolor
+      foreground  '#ffffff'
+      font Arcadia.instance['conf']['splash.credits.font']
+      justify  'left'
+      anchor 'w'
+      place('width' => '210','x' => 100,'y' => 115,'height' => 25)
     }
+
     @tkLabelStep = TkLabel.new(self){
       text  ''
       background  _bgcolor
@@ -900,19 +1209,20 @@ class ArcadiaAboutSplash < TkToplevel
       font Arcadia.instance['conf']['splash.banner.font']
       justify  'left'
       anchor  'w'
-      place('width'=>-5,'relwidth' => 1,'x' => 5,'y' => 160,'height' => 19)
+      place('width'=>-5,'relwidth' => 1,'x' => 5,'y' => 160,'height' => 45)
     }
     @progress  = TkVariable.new
     reset
-    _width = 340
-    _height = 200
+    _width = 380
+    _height = 240
     #_width = 0;_height = 0
     _x = TkWinfo.screenwidth(self)/2 -  _width / 2
     _y = TkWinfo.screenheight(self)/2 -  _height / 2
     geometry = _width.to_s+'x'+_height.to_s+'+'+_x.to_s+'+'+_y.to_s
     Tk.tk_call('wm', 'geometry', self, geometry )
+    #bind("ButtonPress-1", proc{self.destroy})
     bind("Double-Button-1", proc{self.destroy})
-    info = "Ruby version = #{RUBY_VERSION} - TclTk version = #{Arcadia.instance.tcltk_info.level}"
+    info = TkApplication.sys_info
     set_sysinfo(info)
   end
 
@@ -972,6 +1282,204 @@ class ArcadiaActionDispatcher
 
 end
 
+class ArcadiaSh < TkToplevel
+  attr_reader :wait, :result
+  def initialize
+    super
+    title 'ArcadiaSh'
+    geometry = '800x200+10+10'
+    geometry(geometry)
+    @text = TkScrollText.new(self, Arcadia.style('text')){
+      wrap  'none'
+      undo true
+      insertofftime 200
+      insertontime 200
+      highlightthickness 0
+      insertbackground #000000
+      insertwidth 6
+    }
+    @text.set_focus
+    @text.tag_configure('error', 'foreground' => '#d93421')
+    @text.tag_configure('response', 'foreground' => '#2c51d9')
+    @text.show
+    @text.show_v_scroll
+    @text.show_h_scroll
+    #@input_buffer = ''
+    @wait = true
+    @result = false
+    prompt
+    @text.bind_append("KeyPress"){|e| input(e.keysym)}
+  end
+  
+  def exec_buffer
+    @text.set_insert("end")
+    input_buffer = @text.get(@index_cmd_begin,"insert")
+    out("\n")
+    exec(input_buffer)
+  end
+  
+  def input(_char)
+    case _char
+      when 'Return'
+        Thread.new{exec_buffer}
+        Tk.callback_break
+    end
+  end
+  
+  def prompt
+    @b_exit = TkButton.new(@text, 
+       'command'=>proc{@wait=false},
+       'text'=>'Exit',
+       'padx'=>0,
+       'pady'=>0,
+       'width'=>5,
+       'foreground' => 'white',
+       'background' => '#d92328',
+       'relief'=>'flat')
+    TkTextWindow.new(@text, "end", 'window'=> @b_exit)
+    @b_exec = TkButton.new(@text, 
+       'command'=>proc{Thread.new{exec_buffer}},
+       'text'=>'Exec',
+       'padx'=>0,
+       'pady'=>0,
+       'width'=>5,
+       'foreground' => 'white',
+       'background' => '#1ba626',
+       'relief'=>'flat')
+    TkTextWindow.new(@text, "end", 'window'=> @b_exec)
+    out("\n")
+    out(">>> ")
+    @index_cmd_begin = @text.index('insert')
+  end
+
+  def exec_prompt(_cmd)
+    out("#{_cmd}\n")
+    exec(_cmd)
+  end
+  
+  def prepare_exec(_cmd)
+    #@input_buffer=_cmd
+    out("#{_cmd}")
+  end
+  
+  def exec(_cmd)
+    return if _cmd.nil? || _cmd.length ==0
+    @b_exec.destroy if defined?(@b_exec)   
+    out("submitted...\n")
+    case _cmd
+      when 'clear'
+        @text.delete('0.0','end')
+    else
+      begin
+        if RUBY_PLATFORM =~ /mingw|mswin/
+         p = IO::popen("#{_cmd} 2>&1")
+         out(p.read, 'response')
+         @result = true
+        else
+         require "open3"
+         Open3.popen3("#{_cmd}"){|stdin, stdout, stderr|
+          stdout.each do |line|
+            out(line,'response')
+            @result = true
+          end 
+          stderr.each do |line|
+            out(line,'error')
+            @result = false
+          end 
+       
+         }
+        end
+      rescue Exception => e
+         out("#{e.message}\n",'error') 
+         @result = false
+      end
+    end
+    @b_exit.destroy if defined?(@b_exit)   
+    prompt
+    @text.see('end')
+  end
+  
+  def out(_str,*tags)
+    @text.insert('end',_str,*tags)
+  end
+  
+end
+
+class EventWatcherForGem
+  include EventBus
+  def initialize(_event, _details)
+    @event=_event
+    @details=_details
+    enhance
+    Arcadia.attach_listener(self, _event)
+  end
+  def enhance
+    implementation=%Q{
+      class << self
+        def #{_method_name(@event, 'before')}(_event)
+          _event.break
+          new_event = Arcadia.process_event(NeedRubyGemWizardEvent.new(self, @details))
+          if new_event && new_event.results
+            ok=new_event.results[0].installed
+            _event.break if !ok
+          end
+        end
+      end
+    }
+    eval(implementation)
+  end
+end
+
+class ArcadiaGemsWizard
+  include Autils
+  def initialize(_arcadia)
+    @arcadia = _arcadia
+    Arcadia.attach_listener(self, NeedRubyGemWizardEvent)
+  end
+  
+  def on_need_ruby_gem_wizard(_event)
+    # ... todo implamentation
+    msg = "Appears that gem : '#{_event.gem_name}' required by : '#{_event.extension_name}' is not installed!\n Do you want to try install it now?" 
+    ans = Tk.messageBox('icon' => 'error', 'type' => 'yesno',
+      'title' => "(Arcadia) Extensions '#{_event.extension_name}'",
+      'message' => msg)
+      if  ans == 'yes'
+        _event.add_result(self, 'installed'=>try_to_install_gem(_event.gem_name,_event.gem_repository))
+      else
+        _event.add_result(self, 'installed'=>false)
+      end
+  end
+  
+#  def try_to_install_gem(name, repository=nil, version = '>0')
+#    ret = false
+#    require 'rubygems/command.rb'
+#    require 'rubygems/dependency_installer.rb'
+#    
+#    inst.install name, version
+#    # TODO WIZARD
+#    # TODO accept repository, too
+#  end
+
+  def try_to_install_gem(name, repository=nil, version = '>0')
+    ret = false
+    
+    sh=ArcadiaSh.new
+    cmd = "gem install #{name}"
+    cmd="sudo #{cmd}" if !is_windows?
+    cmd+=" --source=#{repository}" if repository
+    sh.prepare_exec(cmd)    
+    while sh.wait
+      Tk.update
+      #sleep(1)
+    end
+    ret=sh.result
+    sh.destroy
+    Gem.clear_paths
+    ret
+  end
+
+end
+
 
 class ArcadiaDialogManager
   def initialize(_arcadia)
@@ -985,7 +1493,11 @@ class ArcadiaDialogManager
       type = 'ok'
     end
     res_array = type.split('_')
-    icon = _event.level
+    if _event.level.nil? || _event.level.length == 0
+      icon = 'info'
+    else
+      icon = _event.level
+    end
     tktype = type.gsub('_','').downcase
     
     tkdialog =  Tk::BWidget::MessageDlg.new(
@@ -1034,9 +1546,9 @@ class ArcadiaLayout
     @frames = Array.new
     @frames[0] = Array.new
     @frames[0][0] = _frame
-    @domains = Array.new
-    @domains[0] = Array.new
-    @domains[0][0] = '_domain_root_'
+   # @domains = Array.new
+   # @domains[0] = Array.new
+   # @domains[0][0] = '_domain_root_'
     @panels = Hash.new
     @panels['_domain_root_']= Hash.new
     @panels['_domain_root_']['root']= _frame
@@ -1044,6 +1556,7 @@ class ArcadiaLayout
     @autotab = _autotab
     @headed = false
     @wrappers=Hash.new
+    @splitters=Array.new
     #ArcadiaContractListener.new(self, MainContract, :do_main_event)
   end
 	
@@ -1087,16 +1600,17 @@ class ArcadiaLayout
       ret = @panels[_domain]['sons'].values[0]
     end
     ret
-	end
-	
+  end
+  
   def _prepare_rows(_row,_col, _height, _perc=false, _top_name=nil, _bottom_name=nil)
     if (@frames[_row][_col] !=  nil)
       #source_domains = all_domains(@frames[_row][_col])
       #source_domains = others_domains(@frames[_row][_col], false)
       _h = AGTkOSplittedFrames.new(self.root,@frames[_row][_col],_height, @arcadia['conf']['layout.splitter.length'].to_i,_perc)
+      @splitters << _h
       if @frames[_row + 1] == nil
       		@frames[_row + 1] = Array.new
-      		@domains[_row + 1] = Array.new
+      	#	@domains[_row + 1] = Array.new
       end
       @frames[_row][_col] = _h.top_frame
       
@@ -1108,7 +1622,7 @@ class ArcadiaLayout
         @panels[_top_name]['root_splitted_frames'] = _h 
       end
       @panels[_top_name]['splitted_frames'] = _h
-      @domains[_row][_col] = _top_name
+     # @domains[_row][_col] = _top_name
 
       _bottom_name = (_row+1).to_s+'.'+_col.to_s if _bottom_name == nil
       
@@ -1124,10 +1638,19 @@ class ArcadiaLayout
         @panels[_bottom_name]['root_splitted_frames'] = _h 
       end
       @panels[_bottom_name]['splitted_frames'] = _h
-    		@domains[_row + 1][_col] = _bottom_name
+    	#	@domains[_row + 1][_col] = _bottom_name
+    end
+  end
+  private :_prepare_rows
+
+  def add_mono_panel(_name=nil)
+    if (@frames[0][0] !=  nil)
+      _name = '0.0' if _name.nil?
+      @panels[_name] = Hash.new
+      @panels[_name]['root'] = @frames[0][0]
+      @panels[_name]['sons'] = 	Hash.new
     end
   end
- 	private :_prepare_rows
 
   def add_rows(_row,_col, _height, _top_name=nil, _bottom_name=nil)
   		_prepare_rows(_row,_col, _height, false, _top_name, _bottom_name)
@@ -1157,14 +1680,14 @@ class ArcadiaLayout
 #  end
 
   def all_domains(_frame)
-      splitted_adapter = find_splitted_frame(_frame)
-      consider_it = splitted_adapter.kind_of?(AGTkSplittedFrames)
-      if consider_it
-        ret = domains_on_frame(splitted_adapter.frame2).concat(domains_on_frame(splitted_adapter.frame1))
-      else
-        ret = Array.new
-      end
-      ret    
+    splitted_adapter = find_splitted_frame(_frame)
+    consider_it = splitted_adapter.kind_of?(AGTkSplittedFrames)
+    if consider_it
+      ret = domains_on_frame(splitted_adapter.frame2).concat(domains_on_frame(splitted_adapter.frame1))
+    else
+      ret = Array.new
+    end
+    ret    
   end
 
   def all_domains_cols(_frame)
@@ -1185,12 +1708,12 @@ class ArcadiaLayout
     ret
   end
 
-
   def _prepare_cols(_row,_col, _width, _perc=false, _left_name=nil, _right_name=nil)
     if (@frames[_row][_col] !=  nil)
       #source_domains = all_domains(@frames[_row][_col])
       #source_domains = others_domains(@frames[_row][_col])
       _w = AGTkVSplittedFrames.new(self.root,@frames[_row][_col],_width,@arcadia['conf']['layout.splitter.length'].to_i,_perc)
+      @splitters << _w
       @frames[_row][_col] = _w.left_frame
       #@frames[_row][_col + 1] = _w.right_frame
 
@@ -1202,7 +1725,7 @@ class ArcadiaLayout
         @panels[_left_name]['root_splitted_frames'] = _w 
       end
       @panels[_left_name]['splitted_frames'] = _w
-      @domains[_row][_col] = _left_name
+     # @domains[_row][_col] = _left_name
         
       _right_name = _row.to_s+'.'+(_col+1).to_s if _right_name == nil
       if !@panels[_right_name].nil?
@@ -1217,7 +1740,7 @@ class ArcadiaLayout
         @panels[_right_name]['root_splitted_frames'] = _w 
       end
       @panels[_right_name]['splitted_frames'] = _w
-      @domains[_row][_col + 1] = _right_name
+     # @domains[_row][_col + 1] = _right_name
     end
   end
  	private :_prepare_cols
@@ -1233,37 +1756,35 @@ class ArcadiaLayout
     if @panels[d] !=nil
       shift_right(_row,_col+1)
     end
-    Arcadia.console(self,'msg'=>"shifto a destra #{dj} (su #{d})")
     @panels[d] = @panels[dj]
     #-------------------------------
     #@panels[d]['root'].set_domain(d)
     #-------------------------------
     @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
     @frames[_row][_col+1] = @frames[_row][_col]
-    @domains[_row][_col+1] = @domains[_row][_col]
+   # @domains[_row][_col+1] = @domains[_row][_col]
     
     @panels.delete(dj)
     #@panels[dj] = nil
     @frames[_row][_col] = nil
-    @domains[_row][_col] = nil
+   # @domains[_row][_col] = nil
   end
 
   def shift_left(_row,_col)
     d = domain_name(_row, _col)
     dj = domain_name(_row, _col+1)
     if @panels[dj] !=nil
-      Arcadia.console(self,'msg'=>"shifto a sinista #{dj} (su #{d})")
       @panels[d] = @panels[dj]
       #-------------------------------
       #@panels[d]['root'].set_domain(d)
       #-------------------------------
       @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
       @frames[_row][_col] = @frames[_row][_col+1]
-      @domains[_row][_col] = @domains[_row][_col+1]
+     # @domains[_row][_col] = @domains[_row][_col+1]
       
       @panels.delete(dj) # = nil
       @frames[_row][_col+1] = nil
-      @domains[_row][_col+1] = nil
+     # @domains[_row][_col+1] = nil
       shift_left(_row,_col+1)
     end
   
@@ -1273,18 +1794,17 @@ class ArcadiaLayout
     d = domain_name(_row, _col)
     dj = domain_name(_row+1, _col)
     if @panels[dj] !=nil
-      Arcadia.console(self,'msg'=>"shifto su #{dj} (su #{d})")
       @panels[d] = @panels[dj]
       #-------------------------------
       #@panels[d]['root'].set_domain(d)
       #-------------------------------
       @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
       @frames[_row][_col] = @frames[_row+1][_col]
-      @domains[_row][_col] = @domains[_row+1][_col]
+     # @domains[_row][_col] = @domains[_row+1][_col]
       
       @panels.delete(dj) # = nil
       @frames[_row+1][_col] = nil
-      @domains[_row+1][_col] = nil
+     # @domains[_row+1][_col] = nil
 
       shift_top(_row+1,_col)
     end
@@ -1298,7 +1818,6 @@ class ArcadiaLayout
     if @panels[d] !=nil
       shift_bottom(_row+1,_col)
     end
-    Arcadia.console(self,'msg'=>"shifto giu #{dj} (su #{d})")
     @panels[d] = @panels[dj]
     #-------------------------------
     #@panels[d]['root'].set_domain(d)
@@ -1306,15 +1825,15 @@ class ArcadiaLayout
     @panels[d]['sons'].each{|name,ffw| ffw.domain=d}
     if @frames[_row + 1] == nil
     		@frames[_row + 1] = Array.new
-    		@domains[_row + 1] = Array.new
+    	#	@domains[_row + 1] = Array.new
     end
     @frames[_row+1][_col] = @frames[_row][_col]
-    @domains[_row+1][_col] = @domains[_row][_col]
+   # @domains[_row+1][_col] = @domains[_row][_col]
     
     @panels.delete(dj)
     #@panels[dj] = nil
     @frames[_row][_col] = nil
-    @domains[_row][_col] = nil
+   # @domains[_row][_col] = nil
   end
   
   def add_cols(_row,_col, _width, _left_name=nil, _right_name=nil)
@@ -1370,7 +1889,6 @@ class ArcadiaLayout
     if saved_root_splitted_frames
       @panels[_domain]['root_splitted_frames']=saved_root_splitted_frames
     end
-
     build_invert_menu(true)
   end
 
@@ -1495,7 +2013,7 @@ class ArcadiaLayout
         }
       end
     end
-    return ret_doms
+    ret_doms
   end
 
   def close_runtime_old(_domain)
@@ -1584,7 +2102,7 @@ class ArcadiaLayout
         else
           @panels.delete(_domain)
           @frames[_row.to_i][_col.to_i] = nil
-          @domains[_row.to_i][_col.to_i] = nil
+         # @domains[_row.to_i][_col.to_i] = nil
 #          ref_r,ref_c = ref_source_domain.split('.')
 #          real_r,real_c=source_domain.split('.')
 #          gap_r = ref_r.to_i - real_r.to_i
@@ -1614,10 +2132,10 @@ class ArcadiaLayout
         @panels.delete(source_domain)
         if vertical
           @frames[_row.to_i][_col.to_i+1] = nil
-          @domains[_row.to_i][_col.to_i+1] = nil
+         # @domains[_row.to_i][_col.to_i+1] = nil
         else
           @frames[_row.to_i+1][_col.to_i] = nil
-          @domains[_row.to_i+1][_col.to_i] = nil
+         # @domains[_row.to_i+1][_col.to_i] = nil
         end
       else
         p "secondo quadrante"
@@ -1630,15 +2148,15 @@ class ArcadiaLayout
         splitted_adapter.destroy
         @panels[destination_domain]['root']=splitted_adapter_frame
         @frames[_row.to_i][_col.to_i] = splitted_adapter_frame
-        @domains[_row.to_i][_col.to_i] = destination_domain
+       # @domains[_row.to_i][_col.to_i] = destination_domain
         build_titled_frame(destination_domain)
         @panels.delete(source_domain)
         if vertical
           @frames[_row.to_i][_col.to_i+1] = nil
-          @domains[_row.to_i][_col.to_i+1] = nil
+         # @domains[_row.to_i][_col.to_i+1] = nil
         else
           @frames[_row.to_i+1][_col.to_i] = nil
-          @domains[_row.to_i+1][_col.to_i] = nil
+         # @domains[_row.to_i+1][_col.to_i] = nil
         end
         source_save.each{|name,ffw|
           ffw.domain = destination_domain
@@ -1661,7 +2179,6 @@ class ArcadiaLayout
         end
       end
     else  # CLOSE OTHER
-      # verifichiamo se la contro parte è uno splitter_adapter
       other_ds = domains_on_frame(@panels[_domain]['splitted_frames'].frame1)
       if other_ds.length == 1
         other_dom = other_ds[0]
@@ -1688,7 +2205,7 @@ class ArcadiaLayout
         other_root_splitted_adapter.attach_frame(splitted_adapter_frame)
 
         @frames[_row.to_i][_col.to_i] = nil
-        @domains[_row.to_i][_col.to_i] = nil
+       # @domains[_row.to_i][_col.to_i] = nil
         @panels.delete(_domain)
       else
         p "quarto quadrante"
@@ -1702,7 +2219,7 @@ class ArcadiaLayout
         @panels[other_dom]['root']=splitted_adapter_frame 
 
         @frames[_row.to_i][_col.to_i] = nil
-        @domains[_row.to_i][_col.to_i] = nil
+       # @domains[_row.to_i][_col.to_i] = nil
         build_titled_frame(other_dom)
         @panels.delete(_domain)
   
@@ -1719,13 +2236,13 @@ class ArcadiaLayout
         end
         other_row,other_col = other_dom.split('.')
         @frames[other_row.to_i][other_col.to_i] = splitted_adapter_frame
-        @domains[other_row.to_i][other_col.to_i] = other_dom
+       # @domains[other_row.to_i][other_col.to_i] = other_dom
 #        if vertical
 #          @frames[_row.to_i][_col.to_i-1] = splitted_adapter_frame
-#          @domains[_row.to_i][_col.to_i-1] = other_dom
+#         # @domains[_row.to_i][_col.to_i-1] = other_dom
 #        else
 #          @frames[_row.to_i-1][_col.to_i] = splitted_adapter_frame
-#          @domains[_row.to_i-1][_col.to_i] = other_dom
+#         # @domains[_row.to_i-1][_col.to_i] = other_dom
 #        end
       end
 
@@ -1794,7 +2311,7 @@ class ArcadiaLayout
 
     @panels.delete(_domain)
     @frames[_row.to_i][_col.to_i] = nil
-    @domains[_row.to_i][_col.to_i] = nil
+   # @domains[_row.to_i][_col.to_i] = nil
 
     if other_root_splitted_adapter
       if other_root_splitted_adapter != @panels[other_domain]['splitted_frames']
@@ -1806,6 +2323,7 @@ class ArcadiaLayout
       end
       other_root_splitted_adapter.detach_frame
       splitted_adapter.detach_frame
+      @splitters.delete(splitted_adapter)
       splitted_adapter.destroy
       other_root_splitted_adapter.attach_frame(splitted_adapter_frame)
     else
@@ -1868,6 +2386,7 @@ class ArcadiaLayout
             :hidemargin => true
         )
       end
+
   end
   
   def build_titled_frame(domain)
@@ -1893,12 +2412,28 @@ class ArcadiaLayout
     end
   end
   
+  def domains
+    ret = Array.new
+    @panels.keys.each{|dom|
+        if dom != '_domain_root_' && @panels[dom] && @panels[dom]['root']
+          ret << dom
+        end
+    }
+    ret
+  end
+  
   def add_headers
-    @domains.each{|row|
-      row.each{|domain|
-        build_titled_frame(domain)
-      }
+    @panels.keys.each{|dom|
+        if dom != '_domain_root_' && @panels[dom] && @panels[dom]['root']
+          build_titled_frame(dom)
+        end
     }
+
+#    @domains.each{|row|
+#      row.each{|domain|
+#        build_titled_frame(domain)
+#      }
+#    }
     @headed = true
   end
 
@@ -1919,7 +2454,7 @@ class ArcadiaLayout
     source_domain = @wrappers[_source_name].domain
     source_has_domain = !source_domain.nil?
     tt2= @panels[source_domain]['root'].top_text if source_has_domain
-    if source_has_domain && @panels[source_domain]['sons'].length ==1 && @panels[_target_domain]['sons'].length > 0
+    if @arcadia.conf('layout.exchange_panel_if_no_tabbed')=='true' && source_has_domain && @panels[source_domain]['sons'].length ==1 && @panels[_target_domain]['sons'].length > 0
       # change ------
       ffw1 = raised_fixed_frame(_target_domain)
       ffw2 = @panels[source_domain]['sons'].values[0]
@@ -1981,36 +2516,68 @@ class ArcadiaLayout
     #domain_root = @panels[_domain_name]['sons'][_frame_name]
     @panels.keys.each{|dom|
       if  dom != '_domain_root_' && dom != _ffw.domain && @panels[dom] && @panels[dom]['root']
-        menu = @panels[dom]['root'].menu_button('ext').cget('menu')
-        menu.insert('0',:command,
-              :label=>_ffw.title,
-              :image=>TkPhotoImage.new('dat'=>ARROW_LEFT_GIF),
-              :compound=>'left',
-              :command=>proc{change_domain(dom, _ffw.name)},
-              :hidemargin => true
-        )
+        titledFrame = @panels[dom]['root']
+        if titledFrame.instance_of?(TkTitledFrame)
+          menu = @panels[dom]['root'].menu_button('ext').cget('menu')
+          menu.insert('0',:command,
+                :label=>_ffw.title,
+                :image=>TkPhotoImage.new('dat'=>ARROW_LEFT_GIF),
+                :compound=>'left',
+                :command=>proc{change_domain(dom, _ffw.name)},
+                :hidemargin => true
+          )
+        end
       end
     }
+    if @panels[_ffw.domain]
+      titledFrame = @panels[_ffw.domain]['root']
+      if titledFrame.instance_of?(TkTitledFrame)
+        mymenu = titledFrame.menu_button('ext').cget('menu')
+        index = mymenu.index('end').to_i
+        if @panels.keys.length > 2
+          i=index-3
+        else
+          i=index-2
+        end
+        if i >= 0
+          index = i.to_s
+        end
+        mymenu.insert(index,:command,
+           :label=>"close \"#{_ffw.title}\"",
+           :image=>TkPhotoImage.new('dat'=>CLOSE_FRAME_GIF),
+           :compound=>'left',
+           :command=>proc{unregister_panel(_ffw, false, true)},
+           :hidemargin => true
+        )
+      end
+    end
+    
   end
 
   
   def build_invert_menu(refresh_commons_items=false)
     @panels.keys.each{|dom|
       if dom != '_domain_root_' && @panels[dom] && @panels[dom]['root']
-        menu = @panels[dom]['root'].menu_button('ext').cget('menu')
-        if refresh_commons_items
-           @panels[dom]['root'].menu_button('ext').cget('menu').delete('0','end')
-           add_commons_menu_items(dom, menu)
-        else
-          if @panels.keys.length > 2
-            i=menu.index('end').to_i-4
+        titledFrame = @panels[dom]['root']
+        if titledFrame.instance_of?(TkTitledFrame)
+          menu = titledFrame.menu_button('ext').cget('menu')
+          if refresh_commons_items
+            @panels[dom]['root'].menu_button('ext').cget('menu').delete('0','end')
+            add_commons_menu_items(dom, menu)
           else
-            i=menu.index('end').to_i-3
-          end
-          if i >= 0
-            end_index = i.to_s
-            @panels[dom]['root'].menu_button('ext').cget('menu').delete('0',end_index)
+            index = menu.index('end').to_i
+            if @panels.keys.length > 2
+              i=index-4
+            else
+              i=index-3
+            end
+            if i >= 0
+              end_index = i.to_s
+              @panels[dom]['root'].menu_button('ext').cget('menu').delete('0',end_index)
+            end
           end
+#          index = menu.index('end').to_i
+#          @panels[dom]['root'].menu_button('ext').cget('menu').delete('2','end') if index > 1
         end
       end
     }
@@ -2018,79 +2585,8 @@ class ArcadiaLayout
     @wrappers.each{|name,ffw|
       process_frame(ffw) #if ffw.domain
     }
+
   end
-  
-#  def register_panel_old(_domain_name, _name, _title)
-#    p = @panels[_domain_name]
-#    if p!=nil
-#      num = p['sons'].length
-#      if @headed
-#        p['root'].title(_title)
-#        if !p['root'].frame.instance_of?(TkFrameAdapter)
-#          wrapper = TkFrameAdapter.new(self.root, Arcadia.style('frame'))
-#          wrapper.attach_frame(p['root'].frame)
-#          p['root'].frame=wrapper
-#        end
-#        root_frame = p['root'].frame
-#        process_register_panel(_domain_name)
-#      else
-#        root_frame = p['root']
-#      end
-#      if (num == 0 && @autotab)
-#        api = ArcadiaPanelInfo.new(_name,_title,nil)
-#        api.frame = TkFrame.new(root_frame, Arcadia.style('panel')).place('x'=>0, 'y'=>0, 'relwidth'=>1, 'relheight'=>1)
-#        p['sons'][_name] = api
-#        return api.frame
-#      else
-#        if num == 1 && @autotab &&  p['notebook'] == nil
-#          p['notebook'] = Tk::BWidget::NoteBook.new(root_frame, Arcadia.style('tabpanel')){
-#            tabbevelsize 0
-#            internalborderwidth 0
-#            pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
-#          }
-#          api = p['sons'].values[0]
-#          api_tab_frame = p['notebook'].insert('end',
-#            api.name,
-#            'text'=>api.title,
-#            'raisecmd'=>proc{
-#  					    p['root'].title(api.title)
-#  					    p['root'].top_text('')            
-#               changed
-#              notify_observers('RAISE', api.name)
-#            }
-#          )
-#          api.frame.place('in'=>api_tab_frame, 'x'=>0, 'y'=>0, 'relwidth'=>1, 'relheight'=>1)
-#          api.frame.raise
-#        elsif (num==0 && !@autotab)
-#          p['notebook'] = Tk::BWidget::NoteBook.new(root_frame){
-#            tabbevelsize 0
-#            internalborderwidth 0
-#            pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
-#          }
-#        end
-#        _panel = p['notebook'].insert('end',_name , 
-#        		'text'=>_title, 
-#          'raisecmd'=>proc{
-#					  p['root'].title(_title)            
-#            changed
-#            notify_observers('RAISE', _name)
-#          }
-#        		)
-#        p['sons'][_name] = ArcadiaPanelInfo.new(_name,_title,_panel)
-#        p['notebook'].raise(_name)
-#        return _panel
-#      end
-#    else
-#      Arcadia.dialog(self, 
-#        'type'=>'ok',
-#        'msg'=>"domain #{_domain_name} do not exist\nfor '#{_title}'!",
-#        'level'=>'warning' 
-#      )
-#      float_frame = new_float_frame
-#      float_frame.title(_title)
-#      return float_frame.frame
-#    end
-#  end
 
   def register_panel(_ffw, _adapter=nil)
     _domain_name = _ffw.domain
@@ -2135,8 +2631,7 @@ class ArcadiaLayout
             'raisecmd'=>proc{
   					    pan['root'].title(api.title)
   					    pan['root'].top_text('') 
-         	     Arcadia.process_event(LayoutRaisingFrameEvent.new(self,'extension_name'=>_ffw.extension, 'frame_name'=>_ffw.name))
-
+         	         Arcadia.process_event(LayoutRaisingFrameEvent.new(self,'extension_name'=>pan['sons'][api.name].extension, 'frame_name'=>pan['sons'][api.name].name))
 #               changed
 #               notify_observers('RAISE', api.name)
             }
@@ -2180,7 +2675,6 @@ class ArcadiaLayout
       _ffw.domain = nil
       process_frame(_ffw)
       return TkFrameAdapter.new(self.root, Arcadia.style('frame'))
-      
 #
 #      Arcadia.dialog(self, 
 #        'type'=>'ok',
@@ -2262,6 +2756,198 @@ class ArcadiaLayout
     _frame.place(_args)
     return _frame
   end
+  
+  def dump_splitter(_splitter)
+    ret = ''
+    if  _splitter.instance_of?(AGTkVSplittedFrames)
+      w = TkWinfo.width(_splitter.frame1) 
+      ret = "c#{w}"
+    elsif _splitter.instance_of?(AGTkOSplittedFrames)
+      h = TkWinfo.height(_splitter.frame1) 
+      ret = "r#{h}"
+    end
+    ret
+  end
+  
+  def splitter_frame_on_frame(_frame)
+    ret=nil
+    @splitters.each{|sp|
+       if sp.frame == _frame
+         ret = sp
+         break 
+       end
+    }
+    ret
+  end
+  
+  def get_hinner_frame(_frame)
+    ret = _frame
+#    child = TkWinfo.children(_frame)[0]
+    TkWinfo.children(_frame).each{|child|
+      if child.instance_of?(TkTitledFrame)
+        ret = child.frame
+        break
+      end
+    }
+#    if child.instance_of?(TkTitledFrame)
+#      ret = child.frame
+#    end
+    ret
+  end
+  
+  def shift_domain_column(_r,_c,_dom)
+    Hash.new.update(_dom).each{|k,d|
+      dr,dc=d.split('.')
+      if dc.to_i >= _c && dr.to_i == _r 
+        #shift_domain_column(_r,dc.to_i+1,_dom)
+        p "== #{d} --> #{domain_name(_r,dc.to_i+1)}"
+        _dom[k]= domain_name(_r,dc.to_i+1)
+      end
+    }
+  end
+
+  def shift_domain_row(_r,_c,_dom)
+    Hash.new.update(_dom).each{|k,d|
+      dr,dc=d.split('.')
+      if dr.to_i >= _r && dc.to_i == _c 
+         #shift_domain_row(dr.to_i+1,_c,_dom)
+        p "shift_domain_row == #{d} --> #{domain_name(dr.to_i+1,_c)}"
+        _dom[k]=domain_name(dr.to_i+1,_c)
+      end
+    }
+  end
+
+  def gap_domain_column(_r,_c,_dom)
+    ret = _c
+    Hash.new.update(_dom).each{|k,d|
+      dr,dc=d.split('.')
+      if dc.to_i == _c && dr.to_i == _r 
+        ret = gap_domain_column(_r,dc.to_i+1,_dom)
+      end
+    }
+    ret
+  end
+
+  def gap_domain_row(_r,_c,_dom)
+    ret = _r
+    Hash.new.update(_dom).each{|k,d|
+      dr,dc=d.split('.')
+      if dr.to_i == _r && dc.to_i == _c 
+         ret = gap_domain_row(dr.to_i+1,_c,_dom)
+      end
+    }
+    ret
+  end
+
+  
+  def dump_geometry(_r=0,_c=0,_frame=root)
+    spl = Array.new
+    dom = Hash.new
+    ret = [nil,nil,nil,nil]
+    sp = splitter_frame_on_frame(_frame)
+    if sp
+      spl << "#{domain_name(_r,_c)}#{dump_splitter(sp)}"
+      dom[get_hinner_frame(sp.frame1)]=domain_name(_r,_c)
+      sspl,ddom,rr,cc = dump_geometry(_r, _c, sp.frame1)
+      spl.concat(sspl)
+      dom.update(ddom)
+      if sp.instance_of?(AGTkVSplittedFrames)
+        _c=cc+1
+        _c=gap_domain_column(_r,_c,dom)
+      else
+        _r=rr+1
+        _r=gap_domain_row(_r,_c,dom)
+      end
+      dom[get_hinner_frame(sp.frame2)]=domain_name(_r,_c)
+      sspl,ddom,rr,cc = dump_geometry(_r, _c, sp.frame2)
+      spl.concat(sspl)
+      dom.update(ddom)
+    elsif _frame==root
+      dom[get_hinner_frame(root)]=domain_name(_r,_c) 
+    end
+    ret[0]=spl
+    ret[1]=dom
+    ret[2]=_r
+    ret[3]=_c
+    ret
+  end
+end
+
+# 
+# receives messages and tracks the
+# by Roger D. Pack
+class MonitorLastUsedDir
+
+  def initialize
+    for event in [SaveBufferEvent, AckInFilesEvent, SearchInFilesEvent, OpenBufferEvent] do
+     Arcadia.attach_listener(self, event)
+    end
+  end
+
+  def on_after_save_as_buffer(_event)
+   MonitorLastUsedDir.set_last _event.new_file
+  end
+
+  def on_after_ack_in_files _event
+    MonitorLastUsedDir.set_last _event.dir
+  end
+  
+  # we want this one...but...not at startup time...hmm.
+  def on_after_open_buffer _event
+    MonitorLastUsedDir.set_last _event.file
+  end
+  
+  alias :on_after_search_in_files :on_after_ack_in_files  
+
+  def self.get_last_dir
+    current = $arcadia['pers']['last.used.dir']
+    if current != nil && current != ''
+     current
+    else
+     $pwd # startup dir
+    end
+  end  
+
+  def MonitorLastUsedDir.set_last to_this # TODO set as private...
+    return if to_this.nil? or to_this == ''
+    if(File.directory?(to_this))
+      to_this_dir = to_this
+    elsif File.directory? File.dirname(to_this)
+      # filename,
+      to_this_dir = File.dirname(to_this)
+    end
+    $arcadia['pers']['last.used.dir'] = File.expand_path(to_this_dir)
+  end
+
 end
 
+class FocusEventManager
+  def initialize
+    Arcadia.attach_listener(self, FocusEvent)
+  end
+  
+  def on_focus(_event)
+    _event.focus_widget=Tk.focus
+    case _event
+      when CutTextEvent
+        do_cut(_event.focus_widget)
+      when CopyTextEvent
+        do_copy(_event.focus_widget)
+      when PasteTextEvent
+        do_paste(_event.focus_widget)
+    end
+  end
+  
+  def do_cut(_focused_widget)
+    _focused_widget.text_cut if _focused_widget.respond_to?(:text_cut)
+  end
+  
+  def do_copy(_focused_widget)
+    _focused_widget.text_copy if _focused_widget.respond_to?(:text_copy)
+  end
 
+  def do_paste(_focused_widget)
+    _focused_widget.text_paste if _focused_widget.respond_to?(:text_paste)
+  end
+  
+end