arcadia 0.9.2 → 0.9.3

data/README

@@ -1,8 +1,8 @@
 = Arcadia Ide
-version 0.9.2
+version 0.9.3
 
 by Antonio Galeone
-on Nov 21, 2010
+on Feb 12, 2011
 
 
 == About
@@ -16,11 +16,10 @@ Some of Arcadia ide project features include:
 * Working on any platform where ruby and tcl-tk work.
 * Highly extensibility architecture.
 
-== In this release 0.9.2
+== In this release 0.9.3
     
 [Improvements]
-  - bugs fixed in case of ruby 1.8 enviroment
-  - supported the maximized state saving of the main window
+  - bugs fixed
 
 == Dependencies
   - rubygems
@@ -29,7 +28,6 @@ Some of Arcadia ide project features include:
   - ack (optional)
   - gem coderay
   - gem ruby-debug (ruby-debug19 on ruby 1.9)
-  - gem whichr
   - gem win32-process (only on windows)
   - gem ruby-wmi (only on windows)
   
@@ -42,7 +40,7 @@ There are two way:
    b. unzip (on windows) arcadia-<version>.zip
 
 == How to run
-* exec on command line "ruby <path/>arcadia"
+* exec on command line "arcadia" or "ruby <path/>arcadia"
 
 
 == Short User guide
@@ -54,13 +52,11 @@ for the dynamic layout functions.
 
 ==== Main Toolbar
 The toolbar button are in order:
-- new, open, save
-  (relatively to edit operation)
+- new, open, save, find
+  (relatively to edit/find operation)
 - run current, run last 
   (for execute the raised file in the editor or the last runned file)  
   after "run current" there is a menubutton to choose a configurated runner to apply at current file
-- show rad palette
-  (for tk rad need)  
 - debug current, debug last, quit debug panel
   (for debug need)
 - quit (to exit from arcadia)
@@ -102,21 +98,6 @@ It is a navigational tree:
 The last used files are organizing in tree so you can reopen them or there  
 directory by clicking on the tree node.
 
-==== Rad Palette (instable)
-It contain the wrapper components for the tk gui building. 
-It is in very unstabled and incomplete state. 
-The first component is a TkTopLevel wrapper, when you click on it a new form is created and a 
-Object inspector appears.
-The other components must be first selected and then created by clicking on container widget.
-The so created widgets has a popup menu for deleting them or in the toplevel case to switch
-to a code view.
-On the palette there are also two button, one for deselect and other for copy from the selected 
-created widget. The copy action copy also the code into the clipboard, so you can copy the
-code rapresenting the gui into the embedded editor or into external editor.
-
-==== Rad Object Inspector  (instable)
-It is for modify the widget property at runtime
-
 ==== Debug
 Require ruby-debug gem.
 It is created when a debug session init. 
@@ -133,10 +114,11 @@ under ~/.arcadia  directory. The format of property definition are:
 I have tested arcadia with ruby 1.8.4, 1.8.5, 1.8.6, 1.8.7, 1.9.1, 1.9.2 on 
 
 * Archlinux
+* Fedora
 * Ubuntu
 * FreeBsd6.x, FreeBsd7.x, 
 * Vector linux 5.*,
-* Windows 2000/XP, 
+* Windows 2000/XP/7, 
 * Cygwin (note: same page fault error on dll under cygwin may be solved in this way:
   by ash.exe exec "/bin/rebaseall"). 
 If you will test arcadia on other operating system sends me an e-mail.
@@ -154,6 +136,7 @@ For all questions:
 antonio-galeone@rubyforge.org
 
 For bugs, support request, features request:
-http://groups.google.it/group/arcadia-ruby-ide
+http://github.com/angal/arcadia/issues
+
 Repository at:
 http://github.com/angal/arcadia/tree/master

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

@@ -70,7 +70,7 @@ class Breakpoints < ArcadiaExt
 #      end
 #    }
 
-    @tree_break = Tk::BWidget::Tree.new(self.frame.hinner_frame, Arcadia.style('treepanel')){
+    @tree_break = BWidgetTreePatched.new(self.frame.hinner_frame, Arcadia.style('treepanel')){
       #showlines true
       deltay 18
       padx 25
@@ -91,18 +91,15 @@ class Breakpoints < ArcadiaExt
   end
   
   def goto_select_item
-    _file, _line = get_tree_selection(@tree_break)
+    _file, _line = get_tree_selection
     if _file && _line
       Arcadia.process_event(OpenBufferEvent.new(self,'file'=>_file, 'row'=>_line))
     elsif _file
       Arcadia.process_event(OpenBufferEvent.new(self,'file'=>_file, 'row'=>0))
     end
   end
-  
-  
-  
-  def raise_clear_selected(_delete=false)
-    _file, _line = get_tree_selection(@tree_break)
+
+  def clear_node(_file=nil, _line=nil, _delete=false)
     if _file && _line
        Arcadia.process_event(UnsetBreakpointEvent.new(self, 'file'=>_file, 'row'=>_line, 'delete'=>_delete))
     elsif _file
@@ -117,6 +114,19 @@ class Breakpoints < ArcadiaExt
     end
   end
   
+  def raise_clear_selected(_delete=false)
+    _file, _line = get_tree_selection
+    clear_node(_file, _line, _delete)
+  end
+
+  def clear_all(_delete=false)
+    nodes = @tree_break.nodes('root')
+    nodes.each{|n|
+      _file, _line = node2file_line(n)
+      clear_node(_file, _line, _delete)
+    }
+  end
+  
   def build_popup
     _pop_up = TkMenu.new(
       :parent=>@tree_break,
@@ -135,21 +145,28 @@ class Breakpoints < ArcadiaExt
 
     _pop_up.insert('end',
       :command,
-      :label=>'Clear breakpoint',
+      :label=>'Clear selected breakpoint',
       :hidemargin => false,
       :command=> proc{raise_clear_selected}
     )
 
     _pop_up.insert('end',
       :command,
-      :label=>'Delete breakpoint',
+      :label=>'Delete selected breakpoint',
       :hidemargin => false,
       :command=> proc{raise_clear_selected(true)}
     )
 
     _pop_up.insert('end',
       :command,
-      :label=>'Goto breakpoint',
+      :label=>'Delete all breakpoints',
+      :hidemargin => false,
+      :command=> proc{clear_all(true)}
+    )
+
+    _pop_up.insert('end',
+      :command,
+      :label=>'Goto selected breakpoint',
       :hidemargin => false,
       :command=> proc{goto_select_item}
     )
@@ -159,8 +176,9 @@ class Breakpoints < ArcadiaExt
       proc{|*x|
         _x = TkWinfo.pointerx(@tree_break)
         _y = TkWinfo.pointery(@tree_break)
-        _selected = @tree_break.selection_get[0]
-        _file, _line = get_tree_selection(@tree_break)
+        #_selected = @tree_break.selection_get[0]
+        _selected = @tree_break.selected
+        _file, _line = get_tree_selection
         _label = _file
         if _line
           _label << " line: #{_line}"
@@ -171,19 +189,26 @@ class Breakpoints < ArcadiaExt
       })
   end
   
-  def get_tree_selection(_tree)
-    _ret = Array.new
-    _selected = _tree.selection_get[0]
+  def get_tree_selection
+    #_selected = @tree_break.selection_get[0]
+    _selected = @tree_break.selected
     if _selected
-      _node_name, _line = _selected.split('_')
-      _ret << _tree.itemcget(_node_name, 'text')
-      _ret << _line if _line
+      return node2file_line(_selected)
+    else
+      return Array.new
     end
-    _ret
   end
 
+  def node2file_line(_node)
+    _ret = Array.new
+    _node_name, _line = _node.split('_')
+    _ret << @tree_break.itemcget(_node_name, 'text')
+    _ret << _line if _line
+    _ret
+  end
 
   def on_debug(_event)
+    return if _event.file.nil?
     case _event
       when SetBreakpointEvent
         ensure_build_ui

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

@@ -22,7 +22,6 @@ class Project
 end
 
 class DirProjects < ArcadiaExt
-  include Autils
   attr_reader :htree
 
   def sync_on
@@ -146,7 +145,7 @@ class DirProjects < ArcadiaExt
     },"%K")
 
     do_double_click = proc{
-        _selected = @htree.selection_get[0]
+        _selected = @htree.selected
         if File.ftype(node2file(_selected)) == 'directory'
           if !_selected.nil? && @htree.open?(node2file(_selected))
             @htree.close_tree(node2file(_selected))
@@ -167,9 +166,9 @@ class DirProjects < ArcadiaExt
           @sync = false
           begin
     	         Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>node2file(_selected)))
-    	       ensure
+    	     ensure
             @sync = _sync_val
-    	       end
+    	     end
         end
       else
         shure_delete_node(_selected)
@@ -180,7 +179,7 @@ class DirProjects < ArcadiaExt
 	def key_press(_keysym)
       case _keysym
         when 'F5'
-        _selected = self.selected
+        _selected = @htree.selected
         do_refresh(_selected)
       end
 	end
@@ -300,7 +299,7 @@ class DirProjects < ArcadiaExt
       :label=>'New folder',
       :hidemargin => false,
       :command=> proc{
-        _selected = self.selected
+        _selected = @htree.selected
         if _selected
           do_new_folder(_selected)
         end
@@ -312,7 +311,7 @@ class DirProjects < ArcadiaExt
       :label=>'New file',
       :hidemargin => false,
       :command=> proc{
-        _selected = self.selected
+        _selected = @htree.selected
         if _selected
           do_new_file(_selected)
         end
@@ -339,7 +338,7 @@ class DirProjects < ArcadiaExt
       :label=>'Rename',
       :hidemargin => false,
       :command=> proc{
-        _selected = self.selected
+        _selected = @htree.selected
         if _selected
           do_rename(_selected)
         end
@@ -350,7 +349,7 @@ class DirProjects < ArcadiaExt
       :label=>'Move',
       :hidemargin => false,
       :command=> proc{
-        _selected = self.selected
+        _selected = @htree.selected
         if _selected
           _idir = File.split(_selected)[0]
           _dir=Tk.chooseDirectory('initialdir'=>_idir,'mustexist'=>true) 
@@ -379,7 +378,7 @@ class DirProjects < ArcadiaExt
       :label=>'Find in files...',
       :hidemargin => false,
       :command=> proc{
-        _target = self.selected
+        _target = @htree.selected
         if _target
           _target = File.dirname(_target) if File.ftype(_target) == 'file'
           Arcadia.process_event(SearchInFilesEvent.new(self,'dir'=>_target))
@@ -392,7 +391,7 @@ class DirProjects < ArcadiaExt
       :label=>'Act in files...',
       :hidemargin => false,
       :command=> proc{
-        _target = self.selected
+        _target = @htree.selected
         if _target
           _target = File.dirname(_target) if File.ftype(_target) == 'file'
           Arcadia.process_event(AckInFilesEvent.new(self,'dir'=>_target))
@@ -420,7 +419,7 @@ class DirProjects < ArcadiaExt
       :label=>'Close Project',
       :hidemargin => false,
       :command=> proc{
-        _selected = self.selected
+        _selected = @htree.selected
         if _selected
           #p _selected
           do_close_project(_selected)
@@ -432,7 +431,7 @@ class DirProjects < ArcadiaExt
       :label=>'Refresh',
       :hidemargin => false,
       :command=> proc{
-        _selected = self.selected
+        _selected = @htree.selected
         do_refresh(_selected)
       }
     )
@@ -441,7 +440,7 @@ class DirProjects < ArcadiaExt
       :label=>'Delete',
       :hidemargin => false,
       :command=> proc{
-        _selected = self.selected
+        _selected = @htree.selected
         if _selected
           do_delete(_selected)
         end
@@ -462,7 +461,7 @@ class DirProjects < ArcadiaExt
       shure_select_node(@current_opened_folder)
       @last_current_opened_folder = @current_opened_folder
     else
-      _selected = self.selected
+      _selected = @htree.selected
       if _selected && @htree.exist?(_selected)
         _parent = @htree.parent(_selected)
         if _parent && _parent != 'root'
@@ -474,25 +473,29 @@ class DirProjects < ArcadiaExt
     end 
   end
 
-  def selected
-    if @htree.selection_get[0]
-      if @htree.selection_get[0].length >0
-       	_selected = ""
-        if String.method_defined?(:lines)
-      	   selection_lines = @htree.selection_get[0].lines
-        else
-      	   selection_lines = @htree.selection_get[0].split("\n")
-        end
-        selection_lines.each{|_block|
-          _selected = _selected + _block.to_s + "\s" 
-        }
-        _selected = _selected.strip
-      else
-        _selected = @htree.selection_get[0]
-      end
-    end
-    return _selected
-  end
+#  def selected
+#    if @htree.selection_get[0]
+#      if @htree.selection_get[0].length >0
+#       	_selected = ""
+#        if @htree.selection_get[0].instance_of?(Array)
+#          selection_lines = @htree.selection_get[0]
+#        else
+#          if String.method_defined?(:lines)
+#        	   selection_lines = @htree.selection_get[0].lines
+#          else
+#        	   selection_lines = @htree.selection_get[0].split("\n")
+#          end
+#        end
+#        selection_lines.each{|_block|
+#          _selected = _selected + _block.to_s + "\s" 
+#        }
+#        _selected = _selected.strip
+#      else
+#        _selected = @htree.selection_get[0]
+#      end
+#    end
+#    return _selected
+#  end
 
   def do_new_project(_parent_folder_node=nil)
     if _parent_folder_node.nil?
@@ -929,7 +932,7 @@ class DirProjects < ArcadiaExt
   end
   
   def on_before_save_as_buffer(_event)
-    _selected = self.selected
+    _selected = @htree.selected
     if _selected
       tpy =  File.ftype(node2file(_selected))
       if tpy == 'directory'

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

@@ -799,7 +799,8 @@ class AgEditorOutline
       sync_val = @bar.sync
       @bar.sync=false
       begin
-        _line = _self.selection_get[0]
+        #_line = _self.selection_get[0]
+        _line = _self.selected
         _index =_line.to_s+'.0'
         _hinner_text = @tree_exp.itemcget(_line,'text').strip
         _editor_line = @editor.text.get(_index, _index+ '  lineend')
@@ -812,7 +813,8 @@ class AgEditorOutline
             build_tree(_line)
             Tk.update
           }
-          _line = _self.selection_get[0]
+          #_line = _self.selection_get[0]
+          _line = _self.selected
           _index =_line.to_s+'.0'
         end
         @editor.text.set_focus
@@ -940,11 +942,14 @@ end
 
 class AgEditor
   attr_accessor :file
+  attr_accessor :line_numbers_visible
+  attr_accessor :id
   attr_reader :read_only 
   attr_reader :page_frame
   attr_reader :text, :root
   attr_reader :outline
   attr_reader :highlighting
+  attr_reader :last_tmp_file
   def initialize(_controller, _page_frame)
     @controller = _controller
     @page_frame = _page_frame
@@ -962,6 +967,7 @@ class AgEditor
     @tabs_show = false
     @spaces_show = false
     @line_numbers_visible = @controller.conf('line-numbers') == 'yes'
+    @id = -1
   end
   
   def modified_from_opening?
@@ -1050,7 +1056,11 @@ class AgEditor
 
   def create_temp_file
     if @file
-      _file = @file+'~~'
+      n=0
+      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}~~"))
@@ -1066,6 +1076,7 @@ class AgEditor
     ensure
       f.close unless f.nil?
     end
+    @last_tmp_file = _file
     _file
   end
 
@@ -1889,13 +1900,16 @@ class AgEditor
       _i1 = _index+' linestart'
       _i2 = _i1+' + 2 chars'
       
-      if @controller.breakpoint_lines_on_file(@file).include?(_line)
+      if @file && @controller.breakpoint_lines_on_file(@file).include?(_line)
         #remove_tag_breakpoint(_index)
-        @controller.breakpoint_del(@file, _line)
+        @controller.breakpoint_del(@file, _line, @id)
+      elsif @file.nil? && @controller.breakpoint_lines_on_file("__TMP__#{@id}").include?(_line)
+        #remove_tag_breakpoint(_index)
+        @controller.breakpoint_del(@file, _line, @id)
       else
         @text_line_num.tag_remove('current',_i1,_i2)
         #add_tag_breakpoint(_index)
-        @controller.breakpoint_add(@file, _line)
+        @controller.breakpoint_add(@file, _line, @id)
       end
     end
   end
@@ -1993,7 +2007,6 @@ class AgEditor
     end
   end
 
-
   def do_tag_configure_global(_name)
     h = Hash.new
 
@@ -2038,7 +2051,6 @@ class AgEditor
     end
   end
 
-
   def pop_up_menu
     @pop_up = TkMenu.new(
       :parent=>@text,
@@ -2055,7 +2067,6 @@ class AgEditor
       :font => "#{Arcadia.conf('menu.font')} bold",
       :hidemargin => true
     )
-    
     #Arcadia.instance.main_menu.update_style(@pop_up)
     @pop_up.insert('end',
       :command,
@@ -2794,8 +2805,19 @@ class AgEditor
       line_end_chars  = _line_end.to_s.length  
       if @last_line_end_chars != line_end_chars
         if @line_num_rx_e.nil?
-          @line_num_rx_e, @line_num_ry_e, @line_num_width_e, @line_num_heigth_e = @text_line_num.bbox("0.1 lineend - 1chars");
+          @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
+          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
           need_width = (line_end_chars+1)*@line_num_width_e
@@ -2947,13 +2969,17 @@ class AgEditor
     if file
       new_file_name(file)
       save
-      @controller.change_file_name(@page_frame, file)
+      #@controller.change_file_name(@page_frame, file)
+      @last_tmp_file = nil if @last_tmp_file != nil
+      Arcadia.process_event(OpenBufferEvent.new(self,'file'=>file))
+      @controller.do_buffer_raise(@controller.page_name(@page_frame))
       #EditorContract.instance.file_created(self, 'file'=>@file)
     end
   end
 
   def new_file_name(_new_file)
     @file =_new_file
+    @controller.change_file_name(@page_frame, file)
     base_name= File.basename(_new_file)
     if base_name.include?('.')
       self.change_highlight(base_name.split('.')[-1])
@@ -3143,7 +3169,6 @@ class AgMultiEditorView
       end
     }
     @enb.bind_append("Map",refresh_after_map)
-
   end
   
 end
@@ -3302,15 +3327,17 @@ end
 
 
 class AgMultiEditor < ArcadiaExt
-  include Autils
   include Configurable
-  attr_reader :breakpoints
+#  attr_reader :breakpoints
   attr_reader :splitted_frame
   attr_reader :outline_bar
   def on_before_build(_event)
     @breakpoints =Array.new
     @tabs_file =Hash.new
     @tabs_editor =Hash.new
+    @raw_buffer_name = Hash.new 
+    @editor_seq=-1
+    @editors =Array.new
     Arcadia.attach_listener(self, BufferEvent)
     Arcadia.attach_listener(self, DebugEvent)
   #  Arcadia.attach_listener(self, RunRubyFileEvent)
@@ -3450,8 +3477,10 @@ class AgMultiEditor < ArcadiaExt
       0.upto(i_end){|j|
         type = @buffer_menu.menutype(j)
         if type != 'separator'
-          label = @buffer_menu.entrycget(j,'label')
-          if label > _filename
+          #label = @buffer_menu.entrycget(j,'label')
+          #if label > _filename
+          value = @buffer_menu.entrycget(j,'value')
+          if value > _filename
             index=j
             break
           end
@@ -3459,18 +3488,20 @@ class AgMultiEditor < ArcadiaExt
       }
     end
 
-    @buffer_menu.insert(index,:command,
-          :label=>_filename,
-          :image=> Arcadia.file_icon(_filename),
-          :compound=>'left',
-          :command=>proc{
-            if is_file
-              open_file(_filename)
-            else
-              open_buffer(tab_name(_filename))             
-            end
-          },
-          :hidemargin => true
+    @buffer_menu.insert(index,:radio,
+      :label=>File.basename(_filename),
+     # :variable=>TkVariable.new(_filename),
+      :value=>_filename,
+      :image=> Arcadia.file_icon(_filename),
+      :compound=>'left',
+      :command=>proc{
+        if is_file
+          open_file(_filename)
+        else
+          open_buffer(tab_name(_filename))             
+        end
+      },
+      :hidemargin => true
     )
   end
 
@@ -3480,8 +3511,10 @@ class AgMultiEditor < ArcadiaExt
     0.upto(i_end){|j|
       type = @buffer_menu.menutype(j)
       if type != 'separator'
-        label = @buffer_menu.entrycget(j,'label')
-        if label == _file
+        #label = @buffer_menu.entrycget(j,'label')
+        #if label == _file
+        value = @buffer_menu.entrycget(j,'value')
+        if value == _file
           to_del=j
           break
         end
@@ -3672,19 +3705,34 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def on_before_debug(_event)
-    "on_before_debug #{_event}"
     case _event
       when StartDebugEvent
+        _event.persistent=true
         _filename = _event.file
-        if _filename.nil?
+        if _filename  == "*LAST"
+          _event.file = Arcadia.persistent('run.file.last')
+        elsif _filename.nil? || _filename == "*CURR"
           current_editor = self.raised
-          _event.file=current_editor.file if current_editor
+          if current_editor
+            if current_editor.file
+              _event.file=current_editor.file
+            else
+              _event.file=current_editor.create_temp_file
+              _event.id=current_editor.id
+              _event.persistent=false
+            end
+          end
         end
         self.debug_begin
       when SetBreakpointEvent
         if _event.active == 1
-          @breakpoints << {:file=>_event.file,:line=>_event.row}
-          _e = @tabs_editor[tab_file_name(_event.file)]
+          if _event.file
+            @breakpoints << {:file=>_event.file,:line=>_event.row}
+            _e = @tabs_editor[tab_file_name(_event.file)]
+          elsif _event.id
+            @breakpoints << {:file=>"__TMP__#{_event.id}",:line=>_event.row}
+            _e = @editors[_event.id]
+          end
           if _e
             _index =_event.row+'.0'
             _line = _e.text.get(_index, _index+ '  lineend')
@@ -3700,7 +3748,6 @@ class AgMultiEditor < ArcadiaExt
   end
   
   def on_after_debug(_event)
-    "on_after_debug #{_event}"
     case _event
       when StepDebugEvent
         if _event.command == :quit_yes 
@@ -3717,8 +3764,13 @@ class AgMultiEditor < ArcadiaExt
       when UnsetBreakpointEvent
         #p "ae-editor : UnsetBreakpointEvent file : #{_event.file}"
         #p "ae-editor : UnsetBreakpointEvent _event.row : #{_event.row}"
-        @breakpoints.delete_if{|b| (b[:file]==_event.file && b[:line]==_event.row)}
-        _e = @tabs_editor[tab_file_name(_event.file)]
+        if _event.file
+          @breakpoints.delete_if{|b| (b[:file]==_event.file && b[:line]==_event.row)}
+          _e = @tabs_editor[tab_file_name(_event.file)]
+        elsif _event.id
+          @breakpoints.delete_if{|b| (b[:file]=="__TMP__#{_event.id}" && b[:line]==_event.row)}
+          _e = @editors[_event.id]
+        end
         _e.remove_tag_breakpoint(_event.row) if _e
     end
   end
@@ -3860,12 +3912,13 @@ class AgMultiEditor < ArcadiaExt
         #_insert_index = editor.text.index('insert')
         _insert_index = editor.text.index('@0,0')
         _files=_files+'|' if _files.strip.length > 0
-        _files=_files + "#{editor.file};#{_insert_index}"
+        _files=_files + "#{editor.file};#{_insert_index};#{editor.line_numbers_visible.to_s}"
       end
       #p editor.text.dump_tag('0.1',editor.text.index('end'))
       close_editor(editor,true)
     }
     Arcadia.persistent('editor.files.open', _files)
+    clear_temp_files
 #    _breakpoints = '';
 #    @breakpoints.each{|point|
 #      if point[:file] != nil
@@ -3877,22 +3930,32 @@ class AgMultiEditor < ArcadiaExt
     @batch_files = true
   end
 
+
+  def clear_temp_files
+    files = Dir[File.join(Arcadia.instance.local_dir,"*")]
+    files.each{|f|
+      if File.stat(f).file? && f[-2..-1] == '~~'
+        File.delete(f)
+      end
+    }
+  end
+
   def raised
     _page = @main_frame.enb.raise
-    return @tabs_editor[_page]
+    return @tabs_editor[resolve_tab_name(_page)]
   end
 
   def close_raised
-    _e = @tabs_editor[@main_frame.enb.raise]
+    _e = @tabs_editor[resolve_tab_name(@main_frame.enb.raise)]
     close_editor(_e) if _e
   end
 
-  def breakpoint_add(_file,_line)
-    Arcadia.process_event(SetBreakpointEvent.new(self, 'file'=>_file, 'row'=>_line, 'active'=>1))
+  def breakpoint_add(_file,_line,_id=-1)
+    Arcadia.process_event(SetBreakpointEvent.new(self, 'id'=>_id, 'file'=>_file, 'row'=>_line, 'active'=>1))
   end
 
-  def breakpoint_del(_file,_line)
-    Arcadia.process_event(UnsetBreakpointEvent.new(self, 'file'=>_file, 'row'=>_line))
+  def breakpoint_del(_file,_line,_id=-1)
+    Arcadia.process_event(UnsetBreakpointEvent.new(self, 'id'=>_id, 'file'=>_file, 'row'=>_line))
   end
 
   def breakpoint_lines_on_file(_file)
@@ -3924,11 +3987,14 @@ class AgMultiEditor < ArcadiaExt
     if Arcadia.persistent('editor.files.open')
       _files_index =Arcadia.persistent('editor.files.open').split("|")
       _files_index.each do |value| 
-        _file,_index = value.split(';')
+        _file,_index,_line_numbers_visible_as_string = value.split(';')
         if _file && _index
-          open_file(_file,_index,false)
+          ed = open_file(_file,_index,false)
         else
-          open_file(_file)
+          ed = open_file(_file)
+        end
+        if ed && _line_numbers_visible_as_string && ed.line_numbers_visible
+          ed.line_numbers_visible = _line_numbers_visible_as_string == 'true'
         end
       end
     end
@@ -4036,13 +4102,33 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def tab_title_by_tab_name(_tab_name)
-    @main_frame.enb.itemcget(_tab_name, 'text')
+    @main_frame.enb.itemcget(resolve_tab_name(_tab_name), 'text')
   end
 
+  def tab_name(_str="")
+    tn = 'ff'+_str.downcase.gsub("/","_").gsub(".","__").gsub(":","___").gsub("\\","____").gsub("*","_____")
+    resolve_tab_name(tn)
+  end
+  
+  def tab_file_name(_filename="")
+    _fstr = File.expand_path(_filename)
+    _fstr =  _filename if _fstr == nil
+    tab_name(_fstr)
+  end
+  
   def page_name(_page_frame)
-    TkWinfo.appname(_page_frame).sub('f','')
+    pn = TkWinfo.appname(_page_frame).sub('f','')
+    resolve_tab_name(pn)
   end
-
+  
+  def resolve_tab_name(_tab_name)
+    if @raw_buffer_name[_tab_name]
+      return @raw_buffer_name[_tab_name]
+    else
+      return _tab_name
+    end 
+  end
+  
   def change_tab_reset_modify(_tab)
     #_new_name = @main_frame.enb.itemcget(@tabs_name[_tab], 'text').gsub!("(...)",'')
     if @main_frame.enb.index(page_name(_tab))
@@ -4052,6 +4138,15 @@ class AgMultiEditor < ArcadiaExt
      	end
     end
   end
+  
+  def change_frame_caption(_new_caption)
+    if @arcadia.layout.headed?
+      if frame.root.title == frame.title
+        frame.root.top_text(_new_caption)
+      end  
+      frame.root.save_caption(frame.name, _new_caption)
+    end
+  end
 
   def change_tab_title(_tab, _new_text)
     @main_frame.enb.itemconfigure(page_name(_tab), 'text'=> _new_text)
@@ -4070,10 +4165,16 @@ class AgMultiEditor < ArcadiaExt
   end
 
   def change_file_name(_tab, _new_file)
+    @tabs_file[page_name(_tab)] = _new_file
+    @raw_buffer_name[tab_file_name(_new_file)]=page_name(_tab)
     _new_label = File.basename(_new_file)
     change_tab_title(_tab, _new_label)
     change_tab_icon(_tab, _new_label)
-    @tabs_file[page_name(_tab)] = _new_file
+    #change_frame_caption(_new_file)
+    #@tabs_editor[tab_file_name(_new_file)]=@tabs_editor[page_name(_tab)]
+
+    #@tabs_file[tab_file_name(_new_file)] = _new_file
+    #@tabs_editor[tab_file_name(_new_file)] = editor_of(_new_file)
   end
 
   def debug_begin
@@ -4102,11 +4203,17 @@ class AgMultiEditor < ArcadiaExt
     #debug_reset
     if _filename && _line && File.exists?(_filename)
       @last_index = _line.to_s+'.0'
-      _editor_exist = editor_exist?(_filename)
-      @last_e = open_file(_filename, @last_index, false, false)
+      #_editor_exist = editor_exist?(_filename)
+      _editor = editor_of(_filename)
+      if _editor
+        @last_e = raise_editor(_editor, @last_index, false, false)
+      else
+        @last_e = open_file(_filename, @last_index, false, false)
+      end
       #@last_e.hide_exp
       @last_e.mark_debug(@last_index) if @last_e
-      if !_editor_exist
+      #if !_editor_exist
+      if _editor.nil?
         @editors_in_debug <<  @last_e
         # workaround for hightlight
         #p "add editor for close #{_filename}"
@@ -4127,13 +4234,13 @@ class AgMultiEditor < ArcadiaExt
   end
   
   def do_buffer_raise(_name, _title='...')
-    _index = @main_frame.enb.index(_name)
+    _index = @main_frame.enb.index(resolve_tab_name(_name))
     _new_caption = '...'
     if _index != -1
       #_name = @main_frame.enb.pages(_index)
       #_tab = get_tab_from_name(_name)
       #@main_frame.enb.raise(_name)
-      _e = @tabs_editor[_name]
+      _e = @tabs_editor[resolve_tab_name(_name)]
       change_outline(_e) if _e
       if _e && _e.file != nil
         _new_caption = _e.file
@@ -4143,48 +4250,62 @@ class AgMultiEditor < ArcadiaExt
         _new_caption = _title
       end
     end
-    if @arcadia.layout.headed?
-      if frame.root.title == frame.title
-        frame.root.top_text(_new_caption)
-      end  
-      frame.root.save_caption(frame.name, _new_caption)
-      #@arcadia.layout.domain(@arcadia['conf'][@name+'.frame'])['root'].top_text(_new_caption)
-    end
+    change_frame_caption(_new_caption)
     _title = @tabs_file[_name] != nil ? File.basename(@tabs_file[_name]) :_name
     Arcadia.broadcast_event(BufferRaisedEvent.new(self,'title'=>_title, 'file'=>@tabs_file[_name]))
     #EditorContract.instance.buffer_raised(self, 'title'=>_title, 'file'=>@tabs_file[_name])
   end
   
+  def editor_of(_filename)
+    _ret = nil
+    @editors.each{|e|
+      if e.file == _filename || e.last_tmp_file == _filename
+        _ret = e
+        break
+      end
+    } 
+    if _ret.nil?
+      _basefilename = File.basename(_filename)
+      _name = self.tab_file_name(_filename)
+      _index = @main_frame.enb.index(resolve_tab_name(_name))
+      if _index == -1
+        _name = name_read_only(_name)
+        _index = @main_frame.enb.index(resolve_tab_name(_name))
+      end
+      if _index != -1
+        _ret = @tabs_editor[resolve_tab_name(_name)]
+      end
+    end
+    _ret
+  end
+  
   def editor_exist?(_filename)
     _basefilename = File.basename(_filename)
     #_basename = _basefilename.split('.')[0]+'_'+_basefilename.split('.')[1]
     
     _name = self.tab_file_name(_filename)
-    _index = @main_frame.enb.index(_name)
+    _index = @main_frame.enb.index(resolve_tab_name(_name))
     if _index == -1
-      _index = @main_frame.enb.index(name_read_only(_name))
+      _index = @main_frame.enb.index(resolve_tab_name(name_read_only(_name)))
+    end
+    if _index == -1
+      @editors.each{|e|
+        if e.last_tmp_file == _filename
+          _index = 0
+          break
+        end
+      } 
     end
     return _index != -1
   end
   
-  def tab_name(_str="")
-    #_str = _str.downcase if is_windows?
-    'ff'+_str.downcase.gsub("/","_").gsub(".","__").gsub(":","___").gsub("\\","____").gsub("*","_____")
-  end
-  
-  def tab_file_name(_filename="")
-    _fstr = File.expand_path(_filename)
-    _fstr =  _filename if _fstr == nil
-    tab_name(_fstr)
-  end
-  
   def raise_file(_filename=nil, _pos=nil)
     if _filename && frame_def_visible?
       tab_name=self.tab_file_name(_filename)
       if  @main_frame.enb.index(tab_name) != -1
-	@main_frame.enb.move(tab_name,_pos) if _pos
-	@main_frame.enb.raise(tab_name)
-	@main_frame.enb.see(tab_name)
+          @main_frame.enb.move(tab_name,_pos) if _pos
+          @main_frame.enb.raise(tab_name)
+          @main_frame.enb.see(tab_name)
       end
     end    
   end
@@ -4193,9 +4314,9 @@ class AgMultiEditor < ArcadiaExt
     return if _filename == nil || !File.exist?(_filename) || File.ftype(_filename) != 'file'
     _basefilename = File.basename(_filename)
     _tab_name = self.tab_file_name(_filename)
-    _index = @main_frame.enb.index(_tab_name)
-    _exist_buffer = _index != -1
-    
+    #_index = @main_frame.enb.index(_tab_name)
+    #_exist_buffer = _index != -1
+    _exist_buffer = @tabs_file[_tab_name] != nil
     if _exist_buffer
       open_buffer(_tab_name)
     else
@@ -4205,35 +4326,38 @@ class AgMultiEditor < ArcadiaExt
       begin
         @tabs_editor[_tab_name].load_file(_filename)
       rescue RuntimeError => e
-        p "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)
       end
     end
-    
-    if _text_index != nil && _text_index != '1.0' && @tabs_editor[_tab_name]
-      @tabs_editor[_tab_name].text_see(_text_index)
-      @tabs_editor[_tab_name].mark_selected(_text_index) if _mark_selected 
+    editor = @tabs_editor[_tab_name]
+    if _text_index != nil && _text_index != '1.0' && editor
+      editor.text_see(_text_index)
+      editor.mark_selected(_text_index) if _mark_selected 
     end
 
-    return @tabs_editor[_tab_name]
+    return editor
   end
 
 
   def open_buffer(_buffer_name = nil, _title = nil, _filename=nil)
-    _index = @main_frame.enb.index(_buffer_name)
+    _index = @main_frame.enb.index(resolve_tab_name(_buffer_name))
     if _buffer_name == nil
     		_title_new = '*new'
+    		tmp_buffer_num = 0
     		_buffer_name = tab_name(_title_new)
     		#_buffer_name = tab_name('new')
     end
     
     if _index != -1
-      _tab = @main_frame.enb.get_frame(_buffer_name)
-      @main_frame.enb.raise(_buffer_name) if frame_visible?
+      _tab = @main_frame.enb.get_frame(resolve_tab_name(_buffer_name))
+      @main_frame.enb.raise(resolve_tab_name(_buffer_name)) if frame_visible?
     else
       _n = 1
       while @main_frame.enb.index(_buffer_name) != -1
         _title_new = '*new'+_n.to_s
+        tmp_buffer_num = _n
         _buffer_name = tab_name(_title_new)
         #_buffer_name = tab_name('new')+_n.to_s
         _n =_n+1
@@ -4244,16 +4368,20 @@ class AgMultiEditor < ArcadiaExt
       _tab = @main_frame.enb.insert('end', _buffer_name ,
         'text'=> _title,
         'image'=> Arcadia.file_icon(_title),
-        'background'=> Arcadia.style("tabpanel.background"),
-        'foreground'=> Arcadia.style("tabpanel.foreground"),
+        'background'=> Arcadia.style("tabpanel")["background"],
+        'foreground'=> Arcadia.style("tabpanel")["foreground"],
         'raisecmd'=>proc{do_buffer_raise(_buffer_name, _title)}
       )
+      @raw_buffer_name[_buffer_name]=_buffer_name
       if _filename
         add_buffer_menu_item(_filename)
       else
         add_buffer_menu_item(_title, false)
       end
       _e = AgEditor.new(self, _tab)
+      @editor_seq=@editor_seq+1
+      _e.id=@editor_seq
+      @editors[@editor_seq]=_e
       ext = Arcadia.file_extension(_title)
       ext='rb' if ext.nil?
       _e.init_editing(ext)
@@ -4261,12 +4389,36 @@ class AgMultiEditor < ArcadiaExt
       #@tabs_file[_buffer_name]= nil
       @tabs_editor[_buffer_name]=_e
     end
-    @main_frame.enb.move(_buffer_name, 1)
-    @main_frame.enb.raise(_buffer_name) if frame_visible?
-    @main_frame.enb.see(_buffer_name)
+    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))
+    end
     return _tab
   end
 
+  def raise_editor(_editor = nil, _text_index='0.0', _mark_selected=true, _exp=true)
+    return if _editor == nil
+    _tab_name = nil
+    @tabs_editor.each{|tn,e|
+      if e == _editor
+        _tab_name = tn
+      end
+    }
+    if _tab_name
+      _index = @main_frame.enb.index(resolve_tab_name(_tab_name))
+      _exist_buffer = _index != -1
+      if _exist_buffer
+        open_buffer(_tab_name)
+        if _text_index != nil && _text_index != '0.0'
+          _editor.text_see(_text_index)
+          _editor.mark_selected(_text_index) if _mark_selected 
+        end
+      end
+    end
+    return _editor
+  end
+
   def close_others_editor(_editor, _mod=true)
     @batch_files = true
   		@tabs_editor.values.each do |_e|
@@ -4335,6 +4487,9 @@ class AgMultiEditor < ArcadiaExt
       del_buffer_menu_item(tab_title_by_tab_name(_name))
     end
     @tabs_editor.delete(_name)
+    @tabs_file.delete(_name)
+    @raw_buffer_name.delete_if {|key, value| value == _name }  
+   
     _index = @main_frame.enb.index(_name)
     @main_frame.enb.delete(_name)
     if !@main_frame.enb.pages.empty?