arcadia 0.9.3 → 0.10.0

data/conf/theme-dark.conf

@@ -3,6 +3,7 @@ background=#33302e
 foreground=gray
 activebackground=#334b56
 activeforeground=yellow
+inactiveforeground=#3ae13ae13ae1
 relief=flat
 borderwidth=0
 
@@ -14,6 +15,7 @@ borderwidth=0
 
 
 edit.background=#232323
+#edit.background=#0000000030a4
 edit.foreground=white
 edit.relief=flat
 edit.borderwidth=0
@@ -22,7 +24,9 @@ text.insertbackground=#ffffff
 
 
 textline.background=#334b56
-titlelabel.background=#334b56
+#textline.background=#0000ff
+#titlelabel.background=#334b56
+titlelabel.background=#6a3d6a3d6a3d
 
 titlemenu.relief=flat
 splitter.relief=flat
@@ -33,17 +37,16 @@ treepanel.selectforeground=yellow
 treepanel.selectbackground=#133e5e
 
 
-#scrollbar.troughcolor=#1c366e
-#scrollbar.background=#211834
 scrollbar.troughcolor=#383838
-scrollbar.background=#212121
-scrollbar.highlightbackground=blue 
+#scrollbar.background=#212121
+scrollbar.background=#6a3d6a3d6a3d
+scrollbar.highlightbackground=#333333
 
 scrollbar.borderwidth=0
 scrollbar.elementborderwidth=1
 
 #scrollbar.activebackground=#33305b
-scrollbar.activerelief=raised
+scrollbar.activerelief=flat
 
 
 #scrollbar.highlightbackground=black
@@ -66,8 +69,8 @@ progress.relief=groove
 #:::::::::::::::::::::::::::::::::::::::::::::::::
 
 hightlight.reserved.foreground=#60f856
-#hightlight.comment.foreground=#007F00
-hightlight.comment.foreground=#21a648
+#hightlight.comment.foreground=#21a648
+hightlight.comment.foreground=#000058520000
 hightlight.string.foreground=#ec6bfc
 hightlight.symbol.foreground=#bdc175
 hightlight.operator.foreground=#d9feff

data/conf/theme-dark.res.rb

@@ -115,7 +115,7 @@ QYcNPHwk8BAmjQ4kewChgdKFxD8GJj5ccBDkD582TXb0KEMFCxkMAheE0EBD
 iQsIHCJEFphBSJYaFQxsJngDBoDRBQOgXi0wIAA7
 EOS
 
-TREE_NODE_DEF_GIF[0..-1]=<<EOS
+TREE_NODE_METHOD_GIF[0..-1]=<<EOS
 R0lGODlhEAAQAIcAAHMhc3spe3sxe3sxhAD/AIwxjJQ5lJw5nIxCjJRKlJRS
 lKVKraVSpa1Srb1rvb1zvc5jztZr1oycrZylra21rbW9rc6Mzt6c3uec5++U
 7++c7/+c/+et5++l7++97/+t/8bGrc7OrdbWrefnre/nrff3rQAAAAAAAAAA
@@ -145,17 +145,25 @@ EOS
 #WrLG2q6y+85zbNPHSS76UgAAOw==
 #EOS
 
-SYNCICON20_GIF[0..-1]=<<EOS
-R0lGODlhEAAQAKUoACBuDSBvDiBwDiRyEACAACmLEEGGMkWHNUqKPEikJk2j
-Kl2zM4PKXX3YR37ZR4rfV43tR5LuUJXuVZrvXKPwa6bxca3yfLzroLHzgrjz
-jbn0jsj2p8z3rc73ss/3s976y+L60OL60eX71eX71u/85fL96vT97vf+8v//
-////////////////////////////////////////////////////////////
-/////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1Q
-ACH5BAEKAD8ALAAAAAAQABAAAAZvwJ9wSCwOC8ikkVgglUynwpL5CY2kQmSx
-cNlwPNgCSIQVJiwYgCbM6TAMQsBjAvgB6tlMRhCHQPBMFBV4AH6ARxEShA5/
-R1IFEA14BwqGQgQQkBALCEMBDY0/mH4NA0V3Q6OhU6INrpKsdnezsVNBADs=
+#SYNCICON20_GIF[0..-1]=<<EOS
+#R0lGODlhEAAQAKUoACBuDSBvDiBwDiRyEACAACmLEEGGMkWHNUqKPEikJk2j
+#Kl2zM4PKXX3YR37ZR4rfV43tR5LuUJXuVZrvXKPwa6bxca3yfLzroLHzgrjz
+#jbn0jsj2p8z3rc73ss/3s976y+L60OL60eX71eX71u/85fL96vT97vf+8v//
+#////////////////////////////////////////////////////////////
+#/////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1Q
+#ACH5BAEKAD8ALAAAAAAQABAAAAZvwJ9wSCwOC8ikkVgglUynwpL5CY2kQmSx
+#cNlwPNgCSIQVJiwYgCbM6TAMQsBjAvgB6tlMRhCHQPBMFBV4AH6ARxEShA5/
+#R1IFEA14BwqGQgQQkBALCEMBDY0/mH4NA0V3Q6OhU6INrpKsdnezsVNBADs=
+#EOS
+
+SYNC_GIF[0..-1]=<<EOS
+R0lGODlhEAAQALMPAL2EFqpvEKZrEPzssfvll/zxw/3xw/797/zqqf321bqX
+Jv743v743f343fvssf///yH5BAEAAA8ALAAAAAAQABAAAARN8MkHwLyYHpsx
+OFt3AUyzVGg1FobBFi8cXAFiB3g+YwFB7KJJD0hRiHAjgDE4+ag8qUpiypEA
+Bo6BdrutPgTgsMBHEDC/PvN5rF63HxEAOw==
 EOS
 
+
 CLEAR_GIF[0..-1]=<<EOS
 R0lGODlhEAAQALMAAAAAAAD/AIQAAISEAISEhNbWzv8AAP//AP//////////
 /////////////////////yH5BAEAAAEALAAAAAAQABAAAAQ+MMhJq53AmLzF
@@ -163,6 +171,69 @@ R0lGODlhEAAQALMAAAAAAAD/AIQAAISEAISEhNbWzv8AAP//AP//////////
 WsOrdsulRAAAOw==
 EOS
 
+SAVE_GIF[0..-1]=<<EOS
+R0lGODlhEAAQAPUzADNmmTVomzZpnDlsnztuoTxvokF0p0J1qEV4q0d6rUp9
+sE+CtVSHuleKvViLvl2Qw2CTxmSXymaZzGibzmmcz22g03Kl2Heq3X2w44CA
+gIyMjJmZmaKiooK16Ii77o3A85LF+JbJ/JnM/6HQ/6zW/7/Z8rnc/8zMzNPT
+093d3dDd6sTi/8zm/93u/+fn5+7u7uTx/+72//j8/////wAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADQALAAAAAAQABAAAAad
+QJpwSCwKJZQRybRisVYm0ogiEUZEs6x2K4oIISGZeEwOQYQPUGzNboMeQscH
+Rq/bPw4hw1Nq+f9+JR4MQgsdFRKJiokVHQtCChiSk5SSCkIIFxcqL52eKpoI
+QgYWEy4AAC6qqhMWBkIFFQ0pBwcpt7cNFQVCAxQJKA0NKMTECRQDQwEEJ4kn
+z88EEgFEBBkaGxwcGxoZBAIARuJEQQA7
+EOS
+
+SEARCH_GIF[0..-1]=<<EOS
+R0lGODlhEAAQAOZBAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5
+ToPV/5TW/cyZAAyf/7Dp/yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH
+/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x/73w/8Xv/1+//wmc/1jA
+/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+/6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAEEA
+LAAAAAAQABAAAAeYgEGCg4IBhgGEiUGGERETE4aKiwwxFyYtEDMQiIkBOCAC
+LCcfDg6cgwEMKiE0MDoIPAgIp5M7LjYoHgs9Cwu0ABIyGSI1OQ8kDz4AhMAc
+GjcpKwYdBgbLzBUVP0AYBhQU14IEBAACAiUWIy/m4QQKGwUA5eYC8oPuCQUH
+A0Hy9vcK8h1owE9SEAICCRoUNECfwoUMBxSEGAgAOw==
+EOS
+
+EXIT_GIF[0..-1]=<<EOS
+R0lGODlhEAAQAOepAAADDS8AAA4NGBQQHBkQEhISHRoRExsRFAAaJQsYIhsf
+MCAfI8YNDf8AANkUFglKgPMUDglPhghPjwdQnrkoHwtTig5TjvklG+gqHegs
+I+suIkVWifQuFSpcpERabhtgsO8wJB1krOc3Lv8yIAZvqiBopPQ3IfI4IyFp
+sO86J/Q6IvI8HxduwSVts/88IfBAOxh0vP8+L/8/KylytxN4zSh2qix3uy97
+rzp5qC98vz+AshuJzByJyxyJzDSDwxuKzTeEthyKzR2KzR2Kzh2LzzWGyB+M
+zrRnhh+Mz/NcQh+NzyKOzxmP4/FfSSKP0COP0O9fWCCS2EmJuSeR0huU2ByU
+1h2U1huV1ieS0iST1mOGnimS0z2OwiuT1CCW1/dlRfZnSu9pXCKZ3SWZ2PZp
+TiGa5C6Y1h+c3z6VzESTzyCc4/FtYyKe5i2c2jaa1fFvZUWYzT2a0vBwZjGf
+20qZ01eZxPR3Zk+f1yqo9Uii5DCp9Uul2kmn20un3f9/Xkuo6lWn3E6q4Uuu
+4U6t5lau3nynu1iv3/+KY12w4GCv4l6y4GGy4ly152K04k268Gi34mm442q4
+5HO/5nO/53TA523E8nfD6ozB3YHF6oHG6nfK9YDL7HPS+oTS+I/Q8JnT8ZXU
+85HZ/Zrb+KPe9Z3g/6Dk/7rr/q/y//Hq5P//////////////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+/////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAP8A
+LAAAAAAQABAAAAjkAP8JHDhoDxwuQG6g6cMo0MCBfxQs8KCl0KVPphI9FJhH
+QJ1TpEqJAjUK0MZ/egpICZUJk0tPdx42+IdngI5OkihRmrSJzsMXMZgkwKHp
+ESRIkSylgfJmjZwmh44AqFEJkaJGiwQVsfMFDJkkK/xQKOGIkCE+bub4CMNB
+hYkTKVzI2MApjpktXdrkEIEhgwYQIy4EIIEKRhYsU8bYeOgAQgcEFqIgeeJk
+iZcZDxn8o3GgAhsjSpQYsdLiJAsDEcoIIUJkCBUUJz8QeKCGR5AgPaqEOClQ
+wpkdP37suMJb4AQxJwMCADs=
+EOS
+
+PARENTFOLDER_GIF[0..-1]=<<EOS
+R0lGODlhEAAQAPMIAE1NTWZmZv9ma/+Fi/9wdf+6vP9eYf+FhwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAACH5BAEAAAgALAAAAAAQABAAAARAEMlJq53h3lCA
+ppwheF8oCARphcEoHCpWGAEw2nDVZrbX6wJeCvHTSQBD4oeYXDJjFYBUOoBS
+AINs1jqZTp3gCAA7
+EOS
+
+
 D_STEP_INTO_GIF[0..-1]=<<EOS
 R0lGODlhEAAQAIQSAE9ZXzpDX1aJtGd8laJtFfzjn/zlp6t4Gfzos7OAG/3s
 wP3wz/7129bAff745/7679K6d9nFj///////////////////////////////

data/ext/ae-breakpoints/ae-breakpoints.rb

@@ -15,7 +15,7 @@ class Breakpoints < ArcadiaExt
 #    load_persistent_breakpoints
   end
   
-  def on_after_build(_event)
+  def on_initialize(_event)
     load_persistent_breakpoints
   end  
   

data/ext/ae-dir-projects/ae-dir-projects.conf

@@ -14,5 +14,5 @@ color.background=#ffffff
 color.foreground=#000000
 freebsd::font=courier 12 italic
 freebsd::font.bold=courier 12 bold
-win::font={Courier New} 9
-win::font.bold={Courier New} 9 bold
+win|mingw::font={Courier New} 9
+win|mingw::font.bold={Courier New} 9 bold

data/ext/ae-dir-projects/ae-dir-projects.rb

@@ -51,14 +51,15 @@ class DirProjects < ArcadiaExt
       padx 0
       pady 0
       background Arcadia.conf('panel.background')
-    }.place('x'=>32,'height'=> 28)
-
+    }.place('x'=>0)
+    TkWinfo.parent(@button_box).configure(:background => Arcadia.conf('panel.background'))
+    
     @button_box.add(Arcadia.style('toolbarbutton').update({
       'name'=>'new_proj',
       'anchor' => 'nw',
       'command'=>proc{self.do_new_project},
       'helptext'=>'New dir Project',
-      'image'=> TkPhotoImage.new('dat' => NEW_GIF)})
+      'image'=> Arcadia.image_res(NEW_GIF)})
     )
 
     @button_box.add(Arcadia.style('toolbarbutton').update({
@@ -66,7 +67,7 @@ class DirProjects < ArcadiaExt
       'anchor' => 'nw',
       'command'=>proc{self.do_open_project},
       'helptext'=>'Open dir as Project',
-      'image'=> TkPhotoImage.new('dat' => OPEN_GIF)})
+      'image'=> Arcadia.image_res(OPEN_PROJECT_GIF)})
     )
 
     @button_box.add(Arcadia.style('toolbarbutton').update({
@@ -74,18 +75,26 @@ class DirProjects < ArcadiaExt
       'anchor' => 'nw',
       'command'=>proc{self.do_goto_parent_folder},
       'helptext'=>'Go to parent folder',
-      'image'=> TkPhotoImage.new('dat' => PARENTFOLDER_GIF)})
+      'image'=> Arcadia.image_res(PARENTFOLDER_GIF)})
     )
-    #--- button_box
     
-    @cb_sync = TkCheckButton.new(self.frame.hinner_frame, Arcadia.style('checkbox')){
+    @button_box.add(Arcadia.style('toolbarbutton').update({
+      'name'=>'parent_folder',
+      'anchor' => 'nw',
+      'command'=>proc{self.do_search_files},
+      'helptext'=>'Search in files from current folder',
+      'image'=> Arcadia.image_res(SEARCH_FILES_GIF)})
+    )
+
+    #--- button_box
+    @panel = self.frame.root.add_panel(self.frame.name, "sync");
+    @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
       text  'Sync'
       justify  'left'
       indicatoron 0
-      offrelief 'raised'
-      image TkPhotoImage.new('dat' => SYNCICON20_GIF)
-      #pack('anchor'=>'n')
-      place('x' => 0,'y' => 0,'height' => 26, 'width' => 26)
+      offrelief 'flat'
+      image Arcadia.image_res(SYNC_GIF)
+      pack
     }
 
     Tk::BWidget::DynamicHelp::add(@cb_sync, 
@@ -126,19 +135,19 @@ class DirProjects < ArcadiaExt
     
     do_open_folder_cmd = proc{|_node| do_open_folder(_node)}
     do_close_folder_cmd = proc{|_node| do_close_folder(_node)}
-    
-#	  @htree = Tk::BWidget::Tree.new(self.frame.hinner_frame, Arcadia.style('treepanel')){
-	  @htree = BWidgetTreePatched.new(self.frame.hinner_frame, Arcadia.style('treepanel')){
+    @htree = BWidgetTreePatched.new(self.frame.hinner_frame, Arcadia.style('treepanel')){
       showlines false
       deltay 18
       opencmd do_open_folder_cmd
       closecmd do_close_folder_cmd
       selectcommand do_select_item
+      crosscloseimage  Arcadia.image_res(PLUS_GIF)
+      crossopenimage  Arcadia.image_res(MINUS_GIF)
     }
-    @htree.extend(TkScrollableWidget).show(0,26)
+    @htree.extend(TkScrollableWidget).show(0,22)
     self.pop_up_menu_tree
-    @image_kdir = TkPhotoImage.new('dat' => ICON_FOLDER_OPEN_GIF)
-    @image_kdir_closed = TkPhotoImage.new('dat' => FOLDER_GIF)
+    @image_kdir = Arcadia.image_res(ICON_FOLDER_OPEN_GIF)
+    @image_kdir_closed = Arcadia.image_res(FOLDER_GIF)
 	  self.load_projects
     @htree.areabind_append('KeyPress',proc{|k| 
         key_press(k)
@@ -146,7 +155,7 @@ class DirProjects < ArcadiaExt
 
     do_double_click = proc{
         _selected = @htree.selected
-        if File.ftype(node2file(_selected)) == 'directory'
+        if _selected &&  File.ftype(node2file(_selected)) == 'directory'
           if !_selected.nil? && @htree.open?(node2file(_selected))
             @htree.close_tree(node2file(_selected))
           elsif !_selected.nil?
@@ -189,7 +198,7 @@ class DirProjects < ArcadiaExt
 	end
 
   def node2file(_node)
-    if _node[0..0]=='{' && _node[-1..-1]=='}'
+    if !_node.nil? &&  _node[0..0]=='{' && _node[-1..-1]=='}'
       return _node[1..-2]
     else
       return _node
@@ -377,13 +386,7 @@ class DirProjects < ArcadiaExt
       :command,
       :label=>'Find in files...',
       :hidemargin => false,
-      :command=> proc{
-        _target = @htree.selected
-        if _target
-          _target = File.dirname(_target) if File.ftype(_target) == 'file'
-          Arcadia.process_event(SearchInFilesEvent.new(self,'dir'=>_target))
-        end
-      }
+      :command=> proc{ do_search_files }
     )
     
     sub_ref_search.insert('end',
@@ -456,6 +459,14 @@ class DirProjects < ArcadiaExt
     "%x %y")
   end
 
+  def do_search_files
+    _target = @htree.selected
+    if _target
+      _target = File.dirname(_target) if File.ftype(_target) == 'file'
+      Arcadia.process_event(SearchInFilesEvent.new(self,'dir'=>_target))
+    end
+  end
+
   def do_goto_parent_folder
     if @current_opened_folder && @current_opened_folder != @last_current_opened_folder 
       shure_select_node(@current_opened_folder)
@@ -738,28 +749,53 @@ class DirProjects < ArcadiaExt
   end
 
   def add_node(_parent, _node, _kind)
-    return if @htree.exist?(_node)
-    @node_parent[_node] = _parent
-#    _name = _node.split(File::SEPARATOR)[-1]
-    _name = File.basename(_node)
-    _drawcross = 'auto'
-    if _kind == "project" || _kind == "directory"
-      num = Dir.entries(_node).length-2
-      if num > 0
-        _drawcross = 'always'
+    if @htree.exist?(_node)
+      if ['project','directory'].include?(_kind) && @node_parent[_node]!=_parent && !_node.include?('phantom_')
+        _phantom_node =  "phantom_#{_node}"
+        j = 0
+        while @htree.exist?(_phantom_node)
+          _phantom_node= "phantom_#{j}_#{_node}"
+          j = j +1
+        end
+        _name = File.basename(_node)
+        selectable = _kind == 'project'
+        _drawcross = 'auto'
+          @htree.insert('end', _parent ,_phantom_node, {
+            'text' =>  _name ,
+            'helptext' => _node,
+            'drawcross'=>_drawcross,
+            'selectable'=>selectable,
+            'deltax'=>-1,
+            'image'=> image(_kind, _node)
+          }.update(Arcadia.style('treeitem').update({'fill'=>Arcadia.conf('inactiveforeground')}))
+        )
       end
-    end
-    @htree.insert('end', _parent ,_node, {
-      'text' =>  _name ,
-      'helptext' => _node,
-      'drawcross'=>_drawcross,
-      'deltax'=>-1,
-      'image'=> image(_kind, _node)
-    }.update(Arcadia.style('treeitem'))
-    )
-    if _kind == "project" || _kind == "directory"
-      if @opened_folder.include?(_node)
-        do_open_folder(_node, true)
+    else
+      @node_parent[_node] = _parent
+  #    _name = _node.split(File::SEPARATOR)[-1]
+      _name = File.basename(_node)
+      _drawcross = 'auto'
+      if _kind == "project" || _kind == "directory"
+        begin
+          num = Dir.entries(_node).length-2
+          if num > 0
+            _drawcross = 'always'
+          end
+        rescue  Errno::EACCES
+        end
+      end
+      @htree.insert('end', _parent ,_node, {
+        'text' =>  _name ,
+        'helptext' => _node,
+        'drawcross'=>_drawcross,
+        'deltax'=>-1,
+        'image'=> image(_kind, _node)
+      }.update(Arcadia.style('treeitem'))
+      )
+      if _kind == "project" || _kind == "directory"
+        if @opened_folder.include?(_node)
+          do_open_folder(_node, true)
+        end
       end
     end
   end
@@ -812,6 +848,7 @@ class DirProjects < ArcadiaExt
       @htree.configure('selectcommand'=>_proc)
       @selecting_node = false
     end
+    @htree.call_after_next_show_h_scroll(proc{Tk.update;@htree.see(_node)})
   end
 
   def del_project(_dir)

data/ext/ae-editor/ae-editor.rb

@@ -3,7 +3,7 @@
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
 #   &require_dir_ref=../..
-#   &require_omissis=conf/arcadia.init
+#   &require_omissis=#{Dir.pwd}/conf/arcadia.init
 
 require 'tk'
 require 'tktext'
@@ -12,16 +12,16 @@ require "#{Dir.pwd}/lib/a-tkcommons"
 require "#{Dir.pwd}/lib/a-core"
 require "#{Dir.pwd}/ext/ae-editor/lib/rbeautify"
 
-class TreeNode
+class SourceTreeNode
   attr_reader :sons
   attr_reader :parent
   attr_reader :kind
-  attr_reader :rif, :rif_end, :label, :helptext
-  attr_writer :rif, :rif_end, :label, :helptext
-  def initialize(parent=nil, kind='KClass')
+  attr_accessor :rif, :rif_end, :label, :helptext, :sortable
+  def initialize(parent=nil, kind='class', sortable=true)
     @sons = Array.new
     @parent = parent
     @kind = kind
+    @sortable = sortable
     if @parent !=nil
       @parent.sons << self
     end
@@ -29,15 +29,23 @@ class TreeNode
   end
 
   def <=> (other)
-    self.label.strip <=> other.label.strip
+    if self.sortable && other.sortable
+      self.label.strip <=> other.label.strip
+    elsif !self.sortable
+      -1
+    elsif !other.sortable
+      1
+    end
   end
+
 end
 
+
 class SourceStructure
   attr_reader :root
   
   def initialize
-    @root = TreeNode.new(nil, 'KRoot'){|_node|
+    @root = SourceTreeNode.new(nil, 'root'){|_node|
       _node.rif= 'root'
       _node.label=''
     }
@@ -77,7 +85,7 @@ class SourceStructure
   def class_node_by_line(_line)
     line_node = node_by_line(@root, _line)
     class_node = line_node
-    while class_node != nil && class_node.kind != "KClass"
+    while class_node != nil && class_node.kind != "class"
       class_node = class_node.parent
     end
     return class_node
@@ -86,30 +94,116 @@ class SourceStructure
 end
 
 class CtagsSourceStructure < SourceStructure
-  def initialize(_file)
+  SUPPORTED_LANG = ['Ant','Asm','Asp','Awk','Basic','BETA','C','C++','C#','Cobol','DosBatch','Eiffel','Erlang','Flex','Fortran','HTML','Java','JavaScript','Lisp','Lua','Make','MatLab','OCaml','Pascal','Perl','PHP','Python','REXX','Ruby','Scheme','Sh','SLang','SML','SQL','Tcl','Tex','Vera','Verilog','VHDL','Vim','YACC']
+  def initialize(_file, _ctags_string='ctags', _language=nil)
     super()
     @file = _file
+    @ctags_string = _ctags_string
+    @language = (_language.nil?)?nil:_language.capitalize
+    @classes = Hash.new
+    @last_root = @root
+    @last_class_node = @root
+    @last_node = @root    
     build_structure
   end
 
   def build_structure
     output = ctags
     output.each {|line|
-      p line.split("\t")
-    }
+      b1,brest =  line.split("/^")
+      b2,b3 = brest.split('$/;"')
+      name,file = b1.strip.split("\t")
+      definition = b2.strip
+      fields_raw = b3.strip.split("\t")
+      fields = Hash.new
+      fields_raw.each{|item|
+        k,v=item.split(":")
+        fields[k.strip]=v.strip if !k.nil? && !v.nil?
+      }      
+      if fields['class'] != nil
+        parent = @classes[fields['class']]
+      elsif fields['interface'] != nil
+        parent = @classes[fields['interface']]
+      elsif ['method','singleton method'].include?(fields['kind'])
+        parent = @last_class_node
+      else
+        parent = @last_root
+      end
+      
+      node = SourceTreeNode.new(parent, fields['kind'])
+      node.label = name
+      node.helptext = definition
+      node.rif = fields['line']
+      @last_node.rif_end = (node.rif.to_i-1).to_s
+      
+      if ['class','module','interface','package'].include?(fields['kind'])
+        if fields['class'] != nil
+          @classes["#{fields['class']}.#{name}"]=node
+        else
+          @classes[name]=node          
+        end
+        @last_class_node = node
+      end
+      node.sortable =  !['package','field'].include?(fields['kind'])
+      @last_node = node
+    }   
+      
+    
   end
   
   def ctags
-    _cmd_ = "|ctags -x -u #{@file}"
+    if @language != nil && SUPPORTED_LANG.include?(@language)
+      @ctags_string = "#{@ctags_string} --language-force=#{@language}"
+    end
+    _cmd_ = "|#{@ctags_string} --fields=+a+f+m+i+k+K+n+s+S+t+z -uf - #{@file}"
     to_ret = ''
-    open(_cmd_, "r"){|f| 
-      to_ret = f.readlines
-    }
+    begin
+      open(_cmd_, "r"){|f| 
+        to_ret = f.readlines
+      }
+    rescue RuntimeError => e
+      Arcadia.runtime_error(e)
+    end
     to_ret
   end
 end
 
 
+class RubyCtagsSourceStructure < CtagsSourceStructure
+  attr_reader :injected_row
+  
+  def initialize(_file, _ctags_string='ctags')
+    super(_file, _ctags_string, 'Ruby')
+  end
+  
+  def scheletor_from_node(_node, _source='', _injected_source='', _injected_class='')
+    _hinner_source = ''
+    #_sons = _node.sons.sort
+    _sons = _node.sons
+    for inode in 0.._sons.length - 1
+      _son = _sons[inode]
+      if _son.kind == 'class'
+         _hinner_source = "#{_hinner_source}#{_son.helptext}\n"
+      elsif _son.kind == 'module'
+         _hinner_source = "#{_hinner_source}#{_son.helptext}\n"
+      elsif _son.kind == 'method' && _son.label != 'initialize'         
+         _hinner_source = "#{_hinner_source}  def #{_son.label}\n"
+         _hinner_source = "#{_hinner_source}  end\n"
+      elsif _son.kind == 'singleton method'
+         _hinner_source = "#{_hinner_source}  def #{_son.label}\n"
+         _hinner_source = "#{_hinner_source}  end\n"
+      end
+      _hinner_source= scheletor_from_node(_son, _hinner_source, _injected_source, _injected_class)
+    end
+    _source = "#{_source}#{_hinner_source}" if _hinner_source.strip.length>0
+    if _node.kind == 'class' && _node.label == _injected_class
+      _source = "#{_source}  def initialize\n  #{_injected_source}  end\n"
+      @injected_row = _source.split("\n").length-2
+    end
+    _source = "#{_source}end\n" if _node.kind == 'class' || _node.kind == 'module'
+    _source
+  end
+end
 
 class RubySourceStructure < SourceStructure
   attr_reader :injected_row
@@ -124,10 +218,6 @@ class RubySourceStructure < SourceStructure
     _row = 1
     _liv = 0
     _livs = Array.new
-#    @root = TreeNode.new(nil, 'KRoot'){|_node|
-#      _node.rif= 'root'
-#      _node.label=''
-#    }
     _livs[_liv]=@root
     _source.each_line{|line|
       line = "\s"+line.split("#")[0]+"\s"
@@ -152,7 +242,7 @@ class RubySourceStructure < SourceStructure
             _label = _helptext
           end
           if (m[0].strip[0..4] == "class" && m.pre_match.strip.length==0)
-            _kind = 'KClass'
+            _kind = 'class'
             if m.post_match.strip[0..1]=='<<'
               hinner_class = true
             else
@@ -163,7 +253,7 @@ class RubySourceStructure < SourceStructure
             _liv = _liv - 1
             next
           elsif (m[0].strip[0..5] == "module" && m.pre_match.strip.length==0)
-            _kind = 'KModule'
+            _kind = 'module'
           elsif (m[0].strip[0..5] == "module" && m.pre_match.strip.length>0)
             _row = _row +1
             _liv = _liv - 1
@@ -176,9 +266,9 @@ class RubySourceStructure < SourceStructure
             _liv = _liv - 1
             next
           elsif (m[0].strip[0..2] == "def" && m.pre_match.strip.length==0)
-            _kind = 'KDef'
+            _kind = 'method'
             if _label.include?(_parent.label + '.')
-              _kind = 'KDefClass'
+              _kind = 'singleton method'
             end
 #          elsif (m[0].strip[0..10] == "attr_reader" && m.pre_match.strip.length==0)
 #            _kind = 'KAttr_reader'
@@ -186,15 +276,15 @@ class RubySourceStructure < SourceStructure
 #            _row = _row +1
           end
           
-          if  _livs[_liv-1] && (_livs[_liv-1].kind != 'KDef' || (_livs[_liv-1].kind == 'KDef' && _kind == 'KClass' && hinner_class))
-            TreeNode.new(_parent, _kind){|_node|
+          if  _livs[_liv-1] && (_livs[_liv-1].kind != 'method' || (_livs[_liv-1].kind == 'method' && _kind == 'class' && hinner_class))
+            SourceTreeNode.new(_parent, _kind){|_node|
               _node.label = _label
               _node.helptext = _helptext
               _node.rif = _row.to_s
               _livs[_pliv + 1]=_node
             }
           else
-            TreeNode.new(_livs[_liv-3], _kind){|_node|
+            SourceTreeNode.new(_livs[_liv-3], _kind){|_node|
               _node.label = _label
               _node.helptext = _helptext
               _node.rif = _row.to_s
@@ -227,26 +317,26 @@ class RubySourceStructure < SourceStructure
     _sons = _node.sons
     for inode in 0.._sons.length - 1
       _son = _sons[inode]
-      if _son.kind == 'KClass'
+      if _son.kind == 'class'
          _hinner_source = "#{_hinner_source}class #{_son.helptext}\n"
-      elsif _son.kind == 'KModule'
+      elsif _son.kind == 'module'
          _hinner_source = "#{_hinner_source}module #{_son.helptext}\n"
-      elsif _son.kind == 'KDef' && _son.helptext != 'initialize'
+      elsif _son.kind == 'method' && _son.helptext != 'initialize'
          
          _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
          _hinner_source = "#{_hinner_source}  end\n"
-      elsif _son.kind == 'KDefClass'
+      elsif _son.kind == 'singleton method'
          _hinner_source = "#{_hinner_source}  def #{_son.helptext}\n"
          _hinner_source = "#{_hinner_source}  end\n"
       end
       _hinner_source= scheletor_from_node(_son, _hinner_source, _injected_source, _injected_class)
     end
     _source = "#{_source}#{_hinner_source}" if _hinner_source.strip.length>0
-    if _node.kind == 'KClass' && _node.label == _injected_class
+    if _node.kind == 'class' && _node.label == _injected_class
       _source = "#{_source}  def initialize\n  #{_injected_source}  end\n"
       @injected_row = _source.split("\n").length-2
     end
-    _source = "#{_source}end\n" if _node.kind == 'KClass' || _node.kind == 'KModule'
+    _source = "#{_source}end\n" if _node.kind == 'class' || _node.kind == 'module'
     _source
   end
 
@@ -263,12 +353,22 @@ end
 class SafeCompleteCode
   attr_reader :modified_row, :modified_col
   attr_reader :filter
-  def initialize(_source, _row, _col, _file=nil)
-    @source = _source
-    @file = _file
+  def initialize(_editor, _row, _col)
+    @editor = _editor
+    @source = _editor.text_value
+    #@file = _file
     @row = _row.to_i
     @col = _col.to_i
-    @ss = RubySourceStructure.new(_source)
+    if _editor && _editor.has_ctags?
+      tmp_file = _editor.create_temp_file
+      begin
+        @ss = RubyCtagsSourceStructure.new(tmp_file, _editor.ctags_string)
+      ensure
+        File.delete(tmp_file)
+      end
+    else
+      @ss = RubySourceStructure.new(_source)
+    end
     @filter=''
     @words = Array.new
     process_source
@@ -390,6 +490,7 @@ class SafeCompleteCode
     source_array = @source.split("\n")
     #---------------------------------
     focus_line = source_array[@row-1]
+    focus_line = focus_line[0..@col] if focus_line
     focus_line = '' if focus_line.nil?
     focus_world = ''
     if focus_line && focus_line.strip.length > 0
@@ -415,7 +516,7 @@ class SafeCompleteCode
     end
     @class_node = @ss.class_node_by_line(@row)
     #---------------------------------
-    @modified_source = "#{@modified_source}Dir.chdir('#{File.dirname(@file)}')\n" if @file
+    @modified_source = "#{@modified_source}Dir.chdir('#{File.dirname(@editor.file)}')\n" if @editor.file
     @modified_row = @modified_row+1
     source_array.each_with_index{|line,j|
       # 0) if a comment I do not consider it
@@ -430,7 +531,7 @@ class SafeCompleteCode
         m = /&require_omissis=[\s]*(.)*/.match(line)
         if m 
           require_omissis=line.split('&require_omissis=')[1].strip
-          @modified_source = "#{@modified_source}require '#{require_omissis}'\n"
+          @modified_source = "#{@modified_source}require \"#{require_omissis}\"\n"
           @modified_row = @modified_row+1
         end   
         
@@ -460,12 +561,15 @@ class SafeCompleteCode
             re = Regexp::new('[\s\n\t\;]('+focus_world.strip+')[\s\t]*=(.)*')
             source_array.each_with_index  do |line,j|
               #m = /[\s\n\t\;](#{focus_world})[\s\t]*=(.)*/.match(line)
-              
-              m = re.match("\s#{line}")
-              if m
-                @dec_line = line
-                @class_dec_line_node = @ss.class_node_by_line(j+1)
+              if j >= @row-1
                 break
+              else
+                m = re.match("\s#{line}")
+                if m
+                  @dec_line = line
+                  @class_dec_line_node = @ss.class_node_by_line(j+1)
+                  break
+                end
               end
             end
         		rescue Exception => e
@@ -508,8 +612,6 @@ class SafeCompleteCode
         else
           @modified_source = "#{@modified_source}$SAFE = 3\n"
           if @dec_line
-            
-            
             @modified_source = "#{@modified_source}#{declaration(@dec_line)}\n"
             @modified_row = @modified_row+1
           end
@@ -557,9 +659,9 @@ class SafeCompleteCode
   end
   
   def candidates(_show_error = false)
-    temp_file = create_modified_temp_file(@file)
+    temp_file = create_modified_temp_file(@editor.file)
     begin
-      Arcadia.is_windows??ruby='rubyw':ruby='ruby'
+      Arcadia.is_windows??ruby='rubyw':ruby=Arcadia.ruby
       _cmp_s = "|#{ruby} '#{temp_file}'"
       _ret = nil
       open(_cmp_s,"r") do  |f|
@@ -577,6 +679,7 @@ class SafeCompleteCode
       end
       _ret.sort
     rescue Exception => e
+      Arcadia.runtime_error(e)
       #Arcadia.console(self, 'msg'=>e.to_s, 'level'=>'error')
     ensure
       File.delete(temp_file) if File.exist?(temp_file)
@@ -585,9 +688,10 @@ class SafeCompleteCode
 
   def create_modified_temp_file(_base_file=nil)
     if _base_file
-      _file = _base_file+'~~'
+    File.basename(_base_file)
+      _file = File.join(File.dirname(_base_file),'~~'+File.basename(_base_file))
     else
-      _file = File.join(Arcadia.instance.local_dir,'buffer~~')
+      _file = File.join(Arcadia.instance.local_dir,'~~buffer')
     end
     f = File.new(_file, "w")
     begin
@@ -697,16 +801,17 @@ end
 
 class AgEditorOutlineToolbar
   attr_accessor :sync
-  def initialize(_frame, _controller)
+  def initialize(_controller)
     @controller = _controller
-    @cb_sync = TkCheckButton.new(_frame, Arcadia.style('checkbox')){
+    @panel = @controller.frame(1).root.add_panel(@controller.frame(1).name, "sync");
+    @cb_sync = TkCheckButton.new(@panel, Arcadia.style('checkbox').update('background'=>@panel.background)){
       text  'Sync'
       justify  'left'
       indicatoron 0
-      offrelief 'raised'
-      image TkPhotoImage.new('dat' => SYNCICON20_GIF)
-      place('x' => 0,'y' => 0,'height' => 26, 'width' => 26)
-    }
+      offrelief 'flat'
+      image Arcadia.image_res(SYNC_GIF)
+      pack
+    }        
     Tk::BWidget::DynamicHelp::add(@cb_sync, 
       'text'=>'Link open editors with content in the Navigator')
 
@@ -742,10 +847,12 @@ end
 class AgEditorOutline
   attr_reader :last_row
   attr_reader :tree_exp
-  def initialize(_editor, _frame, _bar)
+  attr_reader :ss
+  def initialize(_editor, _frame, _bar, _lang=nil)
     @editor = _editor
     @frame = _frame
     @bar = _bar
+    @lang = _lang
     initialize_tree(_frame)
   end
 
@@ -779,10 +886,12 @@ class AgEditorOutline
       @tree_exp.close_tree(to_open) if to_open && !@opened
 
       @tree_exp.see(_node.rif)
+      
     ensure
       @tree_exp.selectcommand(_proc)
       @selecting_node = false
     end
+    @tree_exp.call_after_next_show_h_scroll(proc{Tk.update;@tree_exp.see(_node.rif)})    
   end
 
   def select_without_event(_line)
@@ -830,6 +939,8 @@ class AgEditorOutline
       deltay 18
       dragenabled true
       selectcommand proc{ _tree_goto.call(self) } 
+      crosscloseimage  Arcadia.image_res(ARROWRIGHT_GIF)      
+      crossopenimage  Arcadia.image_res(ARROWDOWN_GIF)
     }
     @tree_exp.extend(TkScrollableWidget)
     self.show
@@ -843,7 +954,7 @@ class AgEditorOutline
   
   def show
     #@tree_scroll_wrapper.show(0,26)
-    @tree_exp.show(0,26)
+    @tree_exp.show(0,0)
     Tk.update
   end
 
@@ -853,22 +964,22 @@ class AgEditorOutline
   end
 
   def build_tree_from_node(_node, _label_match=nil)
-    @image_kclass = TkPhotoImage.new('dat' => TREE_NODE_CLASS_GIF)
-    @image_kmodule =  TkPhotoImage.new('dat' => TREE_NODE_MODULE_GIF)
-    @image_kdef =  TkPhotoImage.new('dat' => TREE_NODE_DEF_GIF)
-    @image_kdefclass =  TkPhotoImage.new('dat' => TREE_NODE_DEFCLASS_GIF)
+    @image_class = Arcadia.image_res(TREE_NODE_CLASS_GIF)
+    @image_module =  Arcadia.image_res(TREE_NODE_MODULE_GIF)
+    @image_method =  Arcadia.image_res(TREE_NODE_METHOD_GIF)
+    @image_singleton_method =  Arcadia.image_res(TREE_NODE_SINGLETON_METHOD_GIF)
     
-    _sorted_sons = _node.sons.sort
+    _sorted_sons = _node.sons.sort 
     for inode in 0.._sorted_sons.length - 1
       _son = _sorted_sons[inode]
-      if _son.kind == 'KClass'
-          _image = @image_kclass
-      elsif _son.kind == 'KModule'
-          _image = @image_kmodule
-      elsif _son.kind == 'KDef'
-          _image = @image_kdef
-      elsif _son.kind == 'KDefClass'
-          _image = @image_kdefclass
+      if _son.kind == 'class'
+          _image = @image_class
+      elsif _son.kind == 'module'
+          _image = @image_module
+      elsif _son.kind == 'method' || _son.kind == 'procedure'
+          _image = @image_method
+      elsif _son.kind == 'singleton method'
+          _image = @image_singleton_method
       end
       @tree_exp.insert('end', _son.parent.rif ,_son.rif, {
         'text' =>  _son.label ,
@@ -899,12 +1010,21 @@ class AgEditorOutline
     end
     
     
-    #(re)build tree
     _txt = @editor.text.get('1.0','end')
-    #@root = build_tree_from_source(_txt)
-    #CtagsSourceStructure.new(@editor.file)
-    @ss = RubySourceStructure.new(_txt)
-    #@root = @ss.root
+    if @editor.has_ctags?
+      if @editor.file
+        @ss = CtagsSourceStructure.new(@editor.file, @editor.ctags_string)
+      else
+        tmp_file = @editor.create_temp_file
+        begin
+          @ss = CtagsSourceStructure.new(tmp_file, @editor.ctags_string, @lang)
+        ensure 
+          File.delete(tmp_file)
+        end
+      end
+    else
+      @ss = RubySourceStructure.new(_txt)
+    end
     @selected = nil
     build_tree_from_node(@ss.root, _label_sel)
     if @selected
@@ -950,6 +1070,8 @@ class AgEditor
   attr_reader :outline
   attr_reader :highlighting
   attr_reader :last_tmp_file
+  attr_reader :lang
+  attr_reader :file_info  
   def initialize(_controller, _page_frame)
     @controller = _controller
     @page_frame = _page_frame
@@ -961,6 +1083,7 @@ class AgEditor
     @font_metrics_bold = TkFont.new(@font_bold).metrics
     @highlighting = false
     @classbrowsing = false
+    @codeinsight = false
     @find = @controller.get_find
     @read_only=false
     @loading=false
@@ -968,6 +1091,7 @@ class AgEditor
     @spaces_show = false
     @line_numbers_visible = @controller.conf('line-numbers') == 'yes'
     @id = -1
+    @file_info = Hash.new
   end
   
   def modified_from_opening?
@@ -1022,6 +1146,7 @@ class AgEditor
       padx 0
       tabs $arcadia['conf']['editor.tabs']
     }
+    
     _self_editor = self
     class << @text
       attr_accessor :editor
@@ -1047,26 +1172,47 @@ class AgEditor
     @buffer = text_value
     pop_up_menu
     @text.extend(TkScrollableWidget).show
+    @text.extend(TkInputThrow)
     begin
       @text_cursor = @text.cget('cursor')
     rescue RuntimeError => e
-      p "RuntimeError : #{e.message}"
+      Arcadia.runtime_error(e)
+      #p "RuntimeError : #{e.message}"
     end
   end
 
   def create_temp_file
     if @file
       n=0
-      while File.exist?("#{@file}#{n*'_'}~~")
+      while File.exist?("#{File.join(File.dirname(@file),'~~'+File.basename(@file))}#{'_'*n}")
         n+=1
       end
-      _file = "#{@file}#{n*'_'}~~"
+      _file = "#{File.join(File.dirname(@file),'~~'+File.basename(@file))}#{'_'*n}"
+#      while File.exist?("~~#{@file}#{n*'_'}")
+#        n+=1
+#      end
+#      _file = "~~#{@file}#{n*'_'}"
     else
-      n=0
-      while File.exist?(File.join(Arcadia.instance.local_dir,"buffer#{n}~~"))
-        n+=1
+      if @lang == 'java'
+        m = Regexp::new(/(class[\s][\s]*)[A-Za-z0-9_]*[\s]*/).match(text_value)
+        if m && m.length > 0
+          a = m[0].split
+          if a && a.length > 1            
+            tmp_dir = "~~#{a[1].strip.downcase}"
+            full_tmp_dir = File.join(Arcadia.instance.local_dir,tmp_dir) 
+            Dir.mkdir(full_tmp_dir) if !File.exist?(full_tmp_dir)
+            basename = File.join(tmp_dir,"#{a[1].strip}.java")            
+          end
+        end
+        basename = "~~buffer.java" if basename.nil?        
+      else
+        n=0
+        while File.exist?(File.join(Arcadia.instance.local_dir,"~~buffer#{n}"))
+          n+=1
+        end
+        basename = "~~buffer#{n}"
       end
-      _file = File.join(Arcadia.instance.local_dir,"buffer#{n}~~")
+      _file = File.join(Arcadia.instance.local_dir, basename)
     end
     f = File.new(_file, "w")
     begin
@@ -1100,9 +1246,9 @@ class AgEditor
     Arcadia.console(self, 'msg'=>_custom_text)
 
     if @file
-      _file = @file+'~~'
+      _file = "#{File.join(File.dirname(@file),'~~'+File.basename(@file))}"
     else
-      _file = 'buffer~~'
+      _file = File.join(Arcadia.instance.local_dir,'~~buffer')
     end
     f = File.new(_file, "w")
     begin
@@ -1132,7 +1278,7 @@ class AgEditor
     @do_complete = @do_complete && @controller.accept_complete_code
     if @do_complete
       line, col = @text.index('insert').split('.')
-      mss = SafeCompleteCode.new(text_value, line.to_i, col.to_i, @file)
+      mss = SafeCompleteCode.new(self, line.to_i, col.to_i)
       candidates = mss.candidates
       raise_complete_code(candidates, line.to_s, col.to_s, mss.filter) if candidates && candidates.length > 0 
     end
@@ -1170,6 +1316,18 @@ class AgEditor
       _target = @text.get('insert - 1 chars wordstart','insert')
       if _target.strip == '('
         _target = @text.get('insert - 2 chars wordstart','insert')
+      else
+        _line = @text.get("insert linestart",'insert lineend')
+        ei = _line.index(_target)
+        if !ei.nil?
+          j=1
+          pre_target = ''
+          while ei-j>=0 && _line[ei-j..ei-j]!="\s"
+            pre_target = _line[ei-j..ei-j] + pre_target
+            j+=1
+          end
+          _target= pre_target + _target
+        end       
       end
       if _target.strip.length > 0 && _target != '.'
         extra_len = _target.length.+@
@@ -1508,7 +1666,7 @@ class AgEditor
       when 'g'
         Arcadia.process_event(GoToLineBufferEvent.new(self))
       when 'n'
-        $arcadia['main.action.new_file'] # necessary? Is there an event for this?
+        Arcadia.process_event(NewBufferEvent.new(self))
       when 'w'
         Arcadia.process_event(CloseCurrentTabEvent.new(self))
       end
@@ -1643,8 +1801,7 @@ class AgEditor
         if ['Control_L', 'Control_V', 'BackSpace', 'Delete'].include?(e.keysym)
           do_line_update
         end
-        if @highlighting && /\w/.match(e.keysym)
-    #      rehighlightline(@text.index('insert').split('.')[0].to_i)
+        if @highlighting
           row = @text.index('insert').split('.')[0].to_i
           rehighlightlines(row, row)
         end
@@ -1729,14 +1886,14 @@ class AgEditor
     
     @text.tag_bind('selected', 'Enter', proc{@text.tag_remove('selected','1.0','end')})
 
-    @text.bind("Enter", proc{do_enter})
+    @text.bind_append("Enter", proc{do_enter})
 
     @text.bind("<Modified>"){|e|
       check_modify
     }
     activate_key_binding
     @text.bind_append("1"){
-      Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@text))
+      #Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@text))
       refresh_outline
     }
   end
@@ -1748,11 +1905,12 @@ class AgEditor
   end
 
   def run_buffer
-    if !@file
-      Arcadia.process_event(RunCmdEvent.new(self, {'file'=>'*CURR', 'runner_name'=>'ruby_file', 'persistent'=>false}))
+    if !@file      
+      @lang='ruby' if !@lang
+      RunCmdEvent.new(self, {'file'=>'*CURR', 'persistent'=>false, 'lang'=>@lang}).go!
     else
-      save if !@read_only
-      Arcadia.process_event(RunCmdEvent.new(self, {'file'=>@file}))
+      save if !@read_only && modified?
+      RunCmdEvent.new(self, {'file'=>@file, 'lang'=>@lang}).go!
     end
   end
   
@@ -1776,7 +1934,12 @@ class AgEditor
         'bordermode'=>'outside'
       )
     }
-    delta = (@font_metrics_bold[2][1]-@font_metrics[2][1])
+    if Arcadia.conf("textline.spacing3")
+      @text_line_spacing3 = Arcadia.conf("textline.spacing3").to_i
+    else
+      @text_line_spacing3 = 0
+    end
+    delta = (@font_metrics_bold[2][1]-@font_metrics[2][1]) + @text_line_spacing3
     @text_line_num.tag_configure('normal_case', 'justify'=>'right')
     @text_line_num.tag_configure('bold_case', 'spacing3'=>delta, 'justify'=>'right')
     @text_line_num.tag_configure('breakpoint', 'background'=>'red','foreground'=>'yellow','borderwidth'=>1, 'relief'=>'raised')
@@ -2003,7 +2166,8 @@ class AgEditor
     begin
       @text.tag_configure(_name, h)
     rescue RuntimeError => e
-      p "RuntimeError : #{e.message}"
+      Arcadia.runtime_error(e)
+      #p "RuntimeError : #{e.message}"
     end
   end
 
@@ -2047,7 +2211,8 @@ class AgEditor
     begin
       @text.tag_configure(_name, h)
     rescue RuntimeError => e
-      p "RuntimeError : #{e.message}"
+      Arcadia.runtime_error(e)
+      #p "RuntimeError : #{e.message}"
     end
   end
 
@@ -2219,7 +2384,7 @@ class AgEditor
           if _data.length > 0
             _b = TkButton.new(@text, 
               'command'=>proc{_b.destroy},
-              'image'=> TkPhotoImage.new('data' => _data),
+              'image'=> Arcadia.image_res(_data),
               'relief'=>'groove')
             TkTextWindow.new(@text, _r[0][1], 'window'=> _b)
           end
@@ -2687,7 +2852,10 @@ class AgEditor
   def reset_modify(_reset_tab=true)
     @controller.change_tab_reset_modify(@page_frame) if _reset_tab
     @set_mod = false
-    @file_last_access_time = File.mtime(@file) if @file
+    @file_info['mtime'] = File.mtime(@file) if @file
+    #@file_last_access_time = File.mtime(@file) if @file
+    @controller.refresh_status
+    update_toolbar
   end
 
   def pos_to_index(_txt, _pos)
@@ -2776,7 +2944,7 @@ class AgEditor
                 delta = w_ry_e - w_ry_b
                 if delta > 1   
                   _tag = "wrap_case_#{j}"
-                  @text_line_num.tag_configure(_tag, 'spacing3'=>delta)  
+                  @text_line_num.tag_configure(_tag, 'spacing3'=>delta + @text_line_spacing3)  
                   _tags << _tag
                 end
               end
@@ -2803,25 +2971,24 @@ class AgEditor
       end
       _line_end=row('end')
       line_end_chars  = _line_end.to_s.length  
-      if @last_line_end_chars != line_end_chars
-        if @line_num_rx_e.nil?
+      if @last_line_end_chars != line_end_chars || @need_recalc
+        if @line_num_rx_e.nil? || @need_recalc
           @line_num_rx_e, @line_num_ry_e, @line_num_width_e, @line_num_heigth_e = @text_line_num.bbox("0.1 lineend - 1 chars");
-          if @line_num_rx_e.nil?
-            @line_num_rx_e = 0
-          end
           if @line_num_width_e.nil?
-            linfo_x, linfo_y, linfo_w, linfo_h, linfo_b  = @text_line_num.dlineinfo('0.1')
-            if linfo_w
-              @line_num_width_e = linfo_w.to_f/(line_end_chars+1.5)
-            end
+            @line_num_width_e = @font.split()[-1].strip.to_i
+            @need_recalc = true            
+#            linfo_x, linfo_y, linfo_w, linfo_h, linfo_b  = @text_line_num.dlineinfo('0.1')            
+#            if linfo_w
+#              @line_num_width_e = linfo_w.to_f/(line_end_chars+1.5)
+#            end
+          else
+            @need_recalc = false   
           end
         end
         
         
-        if @line_num_rx_e && @line_num_width_e && line_end_chars >0 
-          actual_width = @line_num_rx_e + @line_num_width_e
+        if @line_num_width_e && line_end_chars >0 
           need_width = (line_end_chars+1)*@line_num_width_e
-          delta = actual_width - need_width
           @fm1.resize_left(need_width)
           @last_line_end_chars = line_end_chars
         else
@@ -2986,21 +3153,27 @@ class AgEditor
     end
   end
 
+  def update_toolbar
+    save = Arcadia.toolbar_item('save')
+    save.enable=@set_mod if save    
+  end
+
   def check_modify
     return  if @loading
-    if modified? 
+    if modified?
       set_modify if !@set_mod
     else
       reset_modify
     end
+    update_toolbar
   end
 
   def modified_by_others?
     ret = false 
-    if @file_last_access_time && @file 
+    if @file_info['mtime'] && @file 
       if File.exist?(@file)
         ftime = File.mtime(@file)
-        ret = @file_last_access_time != ftime
+        ret = @file_info['mtime'] != ftime
       else
         ret = true
       end
@@ -3011,9 +3184,9 @@ class AgEditor
   def reset_file_last_access_time
     if @file
       if File.exist?(@file)
-        @file_last_access_time = File.mtime(@file)
+        @file_info['mtime'] = File.mtime(@file)
       else
-        @file_last_access_time = nil
+        @file_info['mtime'] = nil
         @file = nil
       end
     end
@@ -3022,9 +3195,9 @@ class AgEditor
   def check_file_last_access_time
     if @file
       file_exist = File.exist?(@file)
-      if @file_last_access_time && file_exist
+      if @file_info['mtime'] && file_exist
         ftime = File.mtime(@file)
-        if @file_last_access_time != ftime
+        if @file_info['mtime'] != ftime
           msg = 'File "'+@file+'" is changed! Reload?'
           ans = Tk.messageBox('icon' => 'error', 'type' => 'yesno',
             'title' => '(Arcadia) Libs', 'parent' => @text,
@@ -3032,7 +3205,7 @@ class AgEditor
           if ans == 'yes'
             reload
           else
-            @file_last_access_time = ftime
+            @file_info['mtime'] = ftime
           end
         end
       elsif !file_exist
@@ -3058,11 +3231,33 @@ class AgEditor
     @text.see(pos_index)
     @text.set_insert(pos_index)
   end
+  
+  def has_ctags?
+    @controller.has_ctags
+  end
+  
+  def ctags_string
+    @controller.ctags_string
+  end
 
-  def init_editing(_ext='rb')
-    @is_ruby = _ext=='rb'|| _ext=='rbw'
-    @classbrowsing = @is_ruby
-    @lang_hash = @controller.languages_hash(_ext)
+  def initialize_editing(_ext=nil, _lang=nil)
+    if _lang 
+      @is_ruby = _lang=='ruby'
+    else
+      @is_ruby = _ext=='rb' || _ext=='rbw'
+    end
+    @classbrowsing = @is_ruby || has_ctags?
+    @codeinsight = @is_ruby
+    if _lang
+      @lang_hash = @controller.language_hash_by_lang(_lang)
+    else
+      @lang_hash = @controller.language_hash_by_ext(_ext)
+    end
+    if @lang_hash
+      @lang = @lang_hash['language']
+    else
+      @lang = 'ruby'
+    end
 #    @highlight_scanner = @controller.highlight_scanner(_ext)
 #    if !_ext.nil? && @is_ruby
 #      @fm = AGTkVSplittedFrames.new(@page_frame,_w1)
@@ -3084,7 +3279,7 @@ class AgEditor
     if @outline
       @outline.show
     else
-      @outline=AgEditorOutline.new(self,@controller.frame(1).hinner_frame,@controller.outline_bar)
+      @outline=AgEditorOutline.new(self, @controller.frame(1).hinner_frame, @controller.outline_bar, @lang)
       refresh
     end
   end
@@ -3105,7 +3300,6 @@ class AgEditor
     begin
       @file = _filename
       if _filename
-        #init_editing(file_extension(_filename))
         File::open(_filename,'rb'){ |file|
           @text.insert('end',file.readlines.collect!{| line | line.chomp}.join("\n"))
           #@text.insert('end',file.read)
@@ -3207,19 +3401,44 @@ class ReHighlightScanner < HighlightScanner
   end
 
 
-  def find_tag(_tag, _row, _txt)
+  def find_tag(_tag, _row, _line_txt)
+    _txt = _line_txt
     to_ret = []
     _re = @h_re[_tag]
     m = _re.match(_txt)
     _end = 0
+#    index = _line_txt.index("oldaccel1")
+#    stampa = index && index >0
+#    stampa=true
+#    p "_line_txt=#{_line_txt}" if stampa
+#    p "_tag=#{_tag}" if stampa
     while m && (_txt=m.post_match)
       if !defined?(_old_txt) || _txt != _old_txt
-        _old_txt = _txt 
-        _ibegin = _row.to_s+'.'+(m.begin(0)+_end).to_s
-        _end = m.end(0) + _end
-        _iend = _row.to_s+'.'+(_end.to_s)
-        to_ret << [_ibegin, _iend]
-        if @op_only_first.include?(_tag)
+        b1 = _line_txt[m.begin(0)+_end-1..m.begin(0)+_end-1]
+        b2 = _line_txt[m.begin(0)+_end..m.begin(0)+_end]
+        e1 = _line_txt[m.end(0)+_end..m.end(0)+_end]        
+        e2 = _line_txt[m.end(0)-1+_end..m.end(0)+_end-1]
+        achar = ["\s","\t","\n",nil,')',']','}','',':','=',">","<"]
+        
+        ok = (achar.include?(b1)||achar.include?(b2)) && (achar.include?(e1)||achar.include?(e2))
+        ok = ok || _line_txt[m.begin(0)+_end..m.end(0)+_end-1].strip.length==1
+        
+        
+
+#        p "" if stampa
+#        p "_line_txt[m.begin(0)+_end..m.begin(0)+_end]=#{_line_txt[m.begin(0)+_end..m.begin(0)+_end]}"   if stampa
+#        p "_line_txt[m.end(0)+_end..m.end(0)+_end]=#{_line_txt[m.end(0)+_end..m.end(0)+_end]}"   if stampa
+#        p "_line_txt[m.begin(0)+_end..m.end(0)+_end]=#{_line_txt[m.begin(0)+_end..m.end(0)+_end]}"   if stampa
+#        p "ok=#{ok}"  if stampa
+        
+        if ok
+          _old_txt = _txt
+          _ibegin = _row.to_s+'.'+(m.begin(0)+_end).to_s
+          _end = m.end(0) + _end  
+          _iend = _row.to_s+'.'+(_end.to_s)
+          to_ret << [_ibegin, _iend]
+        end
+        if @op_only_first.include?(_tag) && ok
           m = nil
         else
           m = _re.match(_txt)
@@ -3331,13 +3550,22 @@ class AgMultiEditor < ArcadiaExt
 #  attr_reader :breakpoints
   attr_reader :splitted_frame
   attr_reader :outline_bar
+  attr_reader :has_ctags, :ctags_string
   def on_before_build(_event)
+    Arcadia.is_windows? ? @ctags_string="lib/ctags.exe" : @ctags_string='ctags'
+    @has_ctags = !Arcadia.which(@ctags_string).nil?
+    if !@has_ctags
+      msg = "\"ctags\" package is required by class browsing, without it only ruby language is supported!" 
+      ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::DEPENDENCE_MISSING_TYPE,"title"=>"Ctags missing!", "detail"=>msg).go!
+    end
     @breakpoints =Array.new
     @tabs_file =Hash.new
     @tabs_editor =Hash.new
     @raw_buffer_name = Hash.new 
     @editor_seq=-1
     @editors =Array.new
+    initialize_status
+    #@statusbar_item.pack('side'=>'left','anchor'=>'e','expand'=>'yes')
     Arcadia.attach_listener(self, BufferEvent)
     Arcadia.attach_listener(self, DebugEvent)
   #  Arcadia.attach_listener(self, RunRubyFileEvent)
@@ -3346,7 +3574,6 @@ class AgMultiEditor < ArcadiaExt
     Arcadia.attach_listener(self, FocusEvent)
   end
   
-  
 #  def on_before_run_ruby_file(_event)
 #    _filename = _event.file
 #    if _filename.nil?
@@ -3423,6 +3650,8 @@ class AgMultiEditor < ArcadiaExt
       if _event.cmd.nil?
         if _event.runner_name
           runner = Arcadia.runner(_event.runner_name)
+        elsif _event.lang && Arcadia.runner_for_lang(_event.lang)
+          runner = Arcadia.runner_for_lang(_event.lang)
         else
           runner = Arcadia.runner_for_file(_event.file)
         end
@@ -3432,6 +3661,9 @@ class AgMultiEditor < ArcadiaExt
           _event.cmd = _event.file
         end        
       end
+      if _event.file && _event.cmd.include?('<<RUBY>>')
+        _event.cmd = _event.cmd.gsub('<<RUBY>>',Arcadia.ruby)
+      end
       if _event.file && _event.cmd.include?('<<FILE>>')
         _event.cmd = _event.cmd.gsub('<<FILE>>',_event.file)
       end
@@ -3458,16 +3690,17 @@ class AgMultiEditor < ArcadiaExt
 
   def on_build(_event)
     @main_frame = AgMultiEditorView.new(self.frame.hinner_frame)
-    @outline_bar = AgEditorOutlineToolbar.new(self.frame(1).hinner_frame, self)
+    @outline_bar = AgEditorOutlineToolbar.new(self)
     create_find # this is the "find within current file" one
     pop_up_menu
-    @buffer_menu = frame.root.add_menu_button(self.name, 'files', DOCUMENT_COMBO_GIF, 'right', {'relief'=>:raised, 'borderwidth'=>1}).cget('menu')
-    frame.root.add_sep(self.name, 1)
     frame.root.add_button(
       self.name,
       'close current',
       proc{Arcadia.process_event(CloseCurrentTabEvent.new(self))}, 
       CLOSE_DOCUMENT_GIF)
+    frame.root.add_sep(self.name, 1)
+    @buffer_menu = frame.root.add_menu_button(self.name, 'files', DOCUMENT_COMBO_GIF, 'right', {'relief'=>:raised, 'borderwidth'=>1}).cget('menu')
+    load_languages_hash
   end
 
   def add_buffer_menu_item(_filename, is_file=true)
@@ -3479,7 +3712,7 @@ class AgMultiEditor < ArcadiaExt
         if type != 'separator'
           #label = @buffer_menu.entrycget(j,'label')
           #if label > _filename
-          value = @buffer_menu.entrycget(j,'value')
+          value = @buffer_menu.entrycget(j,'value').to_s
           if value > _filename
             index=j
             break
@@ -3487,7 +3720,7 @@ class AgMultiEditor < ArcadiaExt
         end
       }
     end
-
+    
     @buffer_menu.insert(index,:radio,
       :label=>File.basename(_filename),
      # :variable=>TkVariable.new(_filename),
@@ -3523,8 +3756,9 @@ class AgMultiEditor < ArcadiaExt
     @buffer_menu.delete(to_del) if to_del != -1
   end
 
-  def on_after_build(_event)
+  def on_initialize(_event)
     self.open_last_files
+    reset_status if @main_frame.enb.pages.empty?
   end
 
   def on_exit_query(_event)
@@ -3558,7 +3792,7 @@ class AgMultiEditor < ArcadiaExt
     return nil if _ext.nil?
     scanner = nil
     @highlight_scanner_hash = Hash.new if !defined?(@highlight_scanner_hash)
-    lh = languages_hash(_ext)
+    lh = language_hash_by_ext(_ext)
     if lh && lh['language'] && lh['scanner']  
       if @highlight_scanner_hash[lh['language']].nil?
         case lh['scanner']
@@ -3573,40 +3807,78 @@ class AgMultiEditor < ArcadiaExt
     scanner
   end
 
-  def languages_hash(_ext=nil)
-    @@langs_hash = Hash.new if !defined?(@@langs_hash)
-    return nil if _ext.nil?
-    if @@langs_hash[_ext].nil?
-      #_ext='' if _ext.nil?
-      lang_file = File.dirname(__FILE__)+'/langs/'+_ext+'.lang'
-      if File.exist?(lang_file)
-        @@langs_hash[_ext] = properties_file2hash(lang_file)
-      elsif File.exist?(lang_file+'.bind')
-        b= properties_file2hash(lang_file+'.bind')
-        if b 
-          if @@langs_hash[b['bind']].nil?
-            lang_file_bind = File.dirname(__FILE__)+'/langs/'+b['bind']+".lang"
-            if File.exist?(lang_file_bind)
-              @@langs_hash[b['bind']]=properties_file2hash(lang_file_bind)
-              @@langs_hash[_ext]=@@langs_hash[b['bind']]
-            end
-          else
-            @@langs_hash[_ext]=@@langs_hash[b['bind']]
+  def load_languages_hash
+    @langs_hash_by_ext = Hash.new
+    @langs_hash_by_lang = Hash.new
+    lang_files_dir = "#{File.dirname(__FILE__)}/langs"
+    files = Dir["#{lang_files_dir}/*"].sort
+  	 files.each{|lang_file|
+      af = lang_file.split('.')
+      if af[-1] == 'lang'
+    	   lang_props = properties_file2hash(lang_file)
+        if lang_props && lang_props['@include'] != nil
+          include_file = "#{lang_files_dir}/#{lang_props['@include']}"
+          if File.exist?(include_file)
+            include_hash = properties_file2hash(include_file)
+            lang_props = include_hash.merge(lang_props)
           end
-        end
+        end 
+        self.resolve_properties_link(lang_props, Arcadia.instance['conf']) if lang_props
+        lang = lang_props['language']
+        lang_exts = lang_props['exts'].split(',').collect{|x| x.strip} if lang_props['exts']
+        @langs_hash_by_lang[lang] = lang_props if lang
+        lang_exts.each{|ext|
+          @langs_hash_by_ext[ext] = lang_props
+        } if lang_exts
+      
+      
+      
       end
-      if @@langs_hash[_ext] && @@langs_hash[_ext]['@include'] != nil
-        include_file = "#{File.dirname(__FILE__)}/langs/#{@@langs_hash[_ext]['@include']}"
-        if File.exist?(include_file)
-          include_hash = properties_file2hash(include_file)
-          @@langs_hash[_ext] = include_hash.merge(@@langs_hash[_ext])
-        end
-      end 
-      self.resolve_properties_link(@@langs_hash[_ext], Arcadia.instance['conf']) if @@langs_hash[_ext]
-    end
-    @@langs_hash[_ext]
+    }
   end
 
+  def language_hash_by_ext(_ext=nil)
+    @langs_hash_by_ext[_ext]
+  end
+
+  def language_hash_by_lang(_lang=nil)
+    @langs_hash_by_lang[_lang]
+  end
+
+#  def languages_hash(_ext=nil)
+#    @langs_hash = Hash.new if !defined?(@langs_hash)
+#    return nil if _ext.nil?
+#    if @langs_hash[_ext].nil?
+#      #_ext='' if _ext.nil?
+#      lang_file = File.dirname(__FILE__)+'/langs/'+_ext+'.lang'
+#      if File.exist?(lang_file)
+#        @langs_hash[_ext] = properties_file2hash(lang_file)
+#      elsif File.exist?(lang_file+'.bind')
+#        b= properties_file2hash(lang_file+'.bind')
+#        if b 
+#          if @langs_hash[b['bind']].nil?
+#            lang_file_bind = File.dirname(__FILE__)+'/langs/'+b['bind']+".lang"
+#            if File.exist?(lang_file_bind)
+#              @langs_hash[b['bind']]=properties_file2hash(lang_file_bind)
+#              @langs_hash[_ext]=@langs_hash[b['bind']]
+#            end
+#          else
+#            @langs_hash[_ext]=@langs_hash[b['bind']]
+#          end
+#        end
+#      end
+#      if @langs_hash[_ext] && @langs_hash[_ext]['@include'] != nil
+#        include_file = "#{File.dirname(__FILE__)}/langs/#{@langs_hash[_ext]['@include']}"
+#        if File.exist?(include_file)
+#          include_hash = properties_file2hash(include_file)
+#          @langs_hash[_ext] = include_hash.merge(@langs_hash[_ext])
+#        end
+#      end 
+#      self.resolve_properties_link(@langs_hash[_ext], Arcadia.instance['conf']) if @langs_hash[_ext]
+#    end
+#    @langs_hash[_ext]
+#  end
+
 
   def pop_up_menu
     @pop_up = TkMenu.new(
@@ -3792,7 +4064,7 @@ class AgMultiEditor < ArcadiaExt
     #Arcadia.new_error_msg(self, "on_buffer #{_event.class}")
     case _event
       when NewBufferEvent
-        self.open_buffer
+        self.open_buffer(nil, nil, nil, _event.lang)
       when OpenBufferEvent
         if _event.file
           if _event.row
@@ -3811,7 +4083,20 @@ class AgMultiEditor < ArcadiaExt
               @last_transient_file = nil
             end
           end
-          self.open_file(_event.file, _index)
+          if _event.select_index.nil?
+            select_index = true
+          else
+            select_index = _event.select_index
+          end
+          if _event.file == '*CURR'
+            er = raised
+            if er && _index != nil
+              er.text_see(_index)
+              er.mark_selected(_index) if select_index
+            end   
+          else
+            self.open_file(_event.file, _index, select_index)
+          end
         elsif _event.text
           if _event.title 
             _tab_name = self.tab_name(_event.title)
@@ -3827,7 +4112,7 @@ class AgMultiEditor < ArcadiaExt
           self.open_file(_event.file)
         end
       when CloseBufferEvent
-        if _event.file 
+        if _event.file
           self.close_file(_event.file)
         end
       when SaveAsBufferEvent
@@ -3934,8 +4219,13 @@ class AgMultiEditor < ArcadiaExt
   def clear_temp_files
     files = Dir[File.join(Arcadia.instance.local_dir,"*")]
     files.each{|f|
-      if File.stat(f).file? && f[-2..-1] == '~~'
+      if File.stat(f).file? && File.basename(f)[0..1] == '~~'
         File.delete(f)
+      elsif File.stat(f).directory? && File.basename(f)[0..1] == '~~'
+        Dir[File.join(f,"*")].each{|file|
+          File.delete(file)
+        }
+        Dir.delete(f)        
       end
     }
   end
@@ -4249,13 +4539,49 @@ class AgMultiEditor < ArcadiaExt
       else
         _new_caption = _title
       end
+      _lang = _e.lang
+      _e.update_toolbar
     end
     change_frame_caption(_new_caption)
+    refresh_status
     _title = @tabs_file[_name] != nil ? File.basename(@tabs_file[_name]) :_name
-    Arcadia.broadcast_event(BufferRaisedEvent.new(self,'title'=>_title, 'file'=>@tabs_file[_name]))
+    Arcadia.broadcast_event(BufferRaisedEvent.new(self, 'title'=>_title, 'file'=>@tabs_file[_name], 'lang'=>_lang ))
+    Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>_e.text)) if _e
+
     #EditorContract.instance.buffer_raised(self, 'title'=>_title, 'file'=>@tabs_file[_name])
   end
   
+  def initialize_status
+    @statusbar_items = Hash.new
+    @statusbar_items['file_size'] = Arcadia.new_statusbar_item("File size")
+    @statusbar_items['file_mtime'] = Arcadia.new_statusbar_item("File modification time")
+    @statusbar_items['file_name'] = Arcadia.new_statusbar_item("File name")
+#    @statusbar_item = Arcadia.new_statusbar_item
+#    @statusbar_item.relief('flat')
+  end
+
+  def reset_status
+    @statusbar_items['file_name'].text = '?'
+    @statusbar_items['file_mtime'].text =  '?'
+    @statusbar_items['file_size'].text = '?' 
+  end
+  
+  def refresh_status
+    #@statusbar_item.text("#{_title} | #{_e.file_info['mtime'].strftime("%d/%m/%Y %H:%m:%S") if _e}")
+    if raised && raised.file
+      size = File.size(raised.file)
+      if size > 1024
+        size_str = "#{size/1024} kb"
+      else
+        size_str = "#{size} b"      
+      end
+      @statusbar_items['file_name'].text(File.basename(raised.file))
+      @statusbar_items['file_mtime'].text =  raised.file_info['mtime'].localtime
+      @statusbar_items['file_size'].text = size_str 
+      #@statusbar_item.text("#{File.basename(raised.file)} | #{raised.file_info['mtime'].localtime} | #{size_str}")
+    end
+  end
+  
   def editor_of(_filename)
     _ret = nil
     @editors.each{|e|
@@ -4326,9 +4652,10 @@ class AgMultiEditor < ArcadiaExt
       begin
         @tabs_editor[_tab_name].load_file(_filename)
       rescue RuntimeError => e
-        Arcadia.dialog(self,'type'=>'ok', 'level'=>'error','title' => 'RuntimeError', 'msg'=>"RuntimeError : #{e.message}")
+        #Arcadia.dialog(self,'type'=>'ok', 'level'=>'error','title' => 'RuntimeError', 'msg'=>"RuntimeError : #{e.message}")
         #p "RuntimeError : #{e.message}"
         close_editor(@tabs_editor[_tab_name], true)
+        Arcadia.runtime_error(e)
       end
     end
     editor = @tabs_editor[_tab_name]
@@ -4341,7 +4668,7 @@ class AgMultiEditor < ArcadiaExt
   end
 
 
-  def open_buffer(_buffer_name = nil, _title = nil, _filename=nil)
+  def open_buffer(_buffer_name = nil, _title = nil, _filename=nil, _lang=nil)
     _index = @main_frame.enb.index(resolve_tab_name(_buffer_name))
     if _buffer_name == nil
     		_title_new = '*new'
@@ -4364,10 +4691,19 @@ class AgMultiEditor < ArcadiaExt
       end
       if _title == nil
         _title =  _title_new
+        if _lang
+          _image = Arcadia.lang_icon(_lang)
+        else
+          _image = Arcadia.lang_icon('Ruby')
+        end  
+        _ext = language_hash_by_lang(_lang)
+      else
+        _image = Arcadia.file_icon(_title)
       end
       _tab = @main_frame.enb.insert('end', _buffer_name ,
         'text'=> _title,
-        'image'=> Arcadia.file_icon(_title),
+        'image'=> _image,
+ #       'image'=> Arcadia.file_icon(lang_sign),
         'background'=> Arcadia.style("tabpanel")["background"],
         'foreground'=> Arcadia.style("tabpanel")["foreground"],
         'raisecmd'=>proc{do_buffer_raise(_buffer_name, _title)}
@@ -4384,15 +4720,21 @@ class AgMultiEditor < ArcadiaExt
       @editors[@editor_seq]=_e
       ext = Arcadia.file_extension(_title)
       ext='rb' if ext.nil?
-      _e.init_editing(ext)
+      _e.initialize_editing(ext, _lang)
       _e.text.set_focus
       #@tabs_file[_buffer_name]= nil
       @tabs_editor[_buffer_name]=_e
     end
-    if raised != @tabs_editor[resolve_tab_name(_buffer_name)]
-      @main_frame.enb.move(resolve_tab_name(_buffer_name), 1)
-      @main_frame.enb.raise(resolve_tab_name(_buffer_name)) if frame_visible?
-      @main_frame.enb.see(resolve_tab_name(_buffer_name))
+    begin
+      if raised != @tabs_editor[resolve_tab_name(_buffer_name)]
+        @main_frame.enb.move(resolve_tab_name(_buffer_name), 0)
+        @main_frame.enb.raise(resolve_tab_name(_buffer_name)) if frame_visible?
+        @main_frame.enb.see(resolve_tab_name(_buffer_name))
+      else
+        @main_frame.enb.move(resolve_tab_name(_buffer_name), 0)
+      end
+    rescue Exception => e
+      Arcadia.runtime_error(e)
     end
     return _tab
   end
@@ -4461,6 +4803,7 @@ class AgMultiEditor < ArcadiaExt
           'msg'=>message)
       if r=="yes"
         _editor.reset_file_last_access_time
+        refresh_status
         ret = !_editor.modified_by_others?
       else
         ret = false
@@ -4472,8 +4815,12 @@ class AgMultiEditor < ArcadiaExt
 
   def close_editor(_editor, _force=false)
     if _force || can_close_editor?(_editor)
+      file = _editor.file
+      index = _editor.text.index("@0,0")
+      r,c = index.split('.')
       _editor.destroy_outline
       close_buffer(_editor.page_frame)
+      BufferClosedEvent.new(self,'file'=>file,'row'=>r.to_i, 'col'=>c.to_i).shot!
     else
       return
     end
@@ -4496,6 +4843,7 @@ class AgMultiEditor < ArcadiaExt
       @main_frame.enb.raise(@main_frame.enb.pages[_index-1]) if TkWinfo.mapped?(@main_frame.enb)
     else
       frame.root.top_text('') if TkWinfo.mapped?(frame.hinner_frame)
+      reset_status
     end
   end
 
@@ -4558,7 +4906,9 @@ class Findview < TkFloatTitledFrame
     }
     @e_what_entry = TkWinfo.children(@e_what)[0]
 
-    @e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
+    #@e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
+    @e_what_entry.extend(TkInputThrow)
+
 
     y0 = y0 + d
     TkLabel.new(self.frame, Arcadia.style('label')){
@@ -4577,9 +4927,8 @@ class Findview < TkFloatTitledFrame
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
     @e_with_entry = TkWinfo.children(@e_with)[0]
-
-    @e_with_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_with_entry))})
-    
+    #@e_with_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_with_entry))})
+    @e_with_entry.extend(TkInputThrow)
     y0 = y0 + d
     @cb_reg = TkCheckButton.new(self.frame, Arcadia.style('checkbox')){|_cb_reg|
       text  'Use Regular Expression'
@@ -4776,7 +5125,8 @@ class Finder < Findview
     if (_editor != @editor_caller)
       @last_index='insert'
       @editor_caller = _editor
-      _title = File.basename(_editor.file) 
+      _title = '?'
+      _title = File.basename(_editor.file) if _editor.file  
       title(_title)
       @goto_line_dialog.title(_title) if @goto_line_dialog
     end
@@ -4880,7 +5230,8 @@ class GoToLine < TkFloatTitledFrame
       #relief  'ridge'
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
    	}
-    @e_line.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_line))})
+    #@e_line.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_line))})
+    @e_line.extend(TkInputThrow)
     
    	y0 = y0 + d
    	y0 = y0 + d