arcadia 0.1.0 → 0.1.1

data/ext/ae-complete-code/ae-complete-code.conf

@@ -0,0 +1,6 @@
+name=complete_code
+label=Complete code
+frame=1.0
+active=yes
+require=ext/ae-complete-code/ae-complete-code
+class=CompleteCode

data/ext/ae-complete-code/ae-complete-code.rb

@@ -0,0 +1,79 @@
+#
+#   ae-complete-code.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+require "base/a-ext"
+
+
+class CompleteCode < ArcadiaExt
+
+	def before_build
+	end
+
+  def build
+	end
+	
+	def after_build 
+	  
+	  
+	  @rct_complete=complete_command
+	  
+	  if @rct_complete !=nil #system(@rct_complete+" "+__FILE__)
+    		ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
+    else
+   		 MsgContract.instance.out_error(self, "Extension ae-complete-code depend upon rct-complete(rcodetools) command (install it or update system path!)")
+    end
+	end
+	
+	def complete_command
+		_ret = nil
+		RUBY_PLATFORM.include?('win32') ? _sep = ';':_sep=':'
+		ENV['PATH'].split(_sep).each{|_path|
+			_file = File.join(_path, 'rct-complete')
+			if FileTest.exist?(_file)
+	  			_ret = _file
+			end
+		}
+		_ret
+	end
+		
+	def do_editor_event(_event)
+     case _event.signature 
+     		when EditorContract::COMPLETE_CODE
+     		  if _event.context.file     		
+     		    _event.context.candidates = candidates(_event.context.file, _event.context.line, _event.context.col)
+     		    _event.handled(self)
+     				end
+     end
+	end
+
+  def candidates(_file, _line, _col)
+		begin
+		  #_options = "--completion-class-info --line="+_line+" --column="+_col
+		  _options = "--line="+_line+" --column="+_col
+      _cmp_s = "|ruby "+@rct_complete+" "+_options+" "+_file
+      _ret = nil
+      open(_cmp_s,"r") do
+        |f|
+        _ret = f.readlines.collect!{| line | line.chomp}
+      end
+      if _ret.length == 0
+        _cmp_s_d = _cmp_s+" 2>&1"
+	      _error = nil
+	      open(_cmp_s_d,"r") do
+ 		       |f|
+ 		       _error = f.readlines.collect!{| line | line.chomp}
+     		 end
+     		 if _error != nil && _error.length > 0
+	     			MsgContract.instance.out_error(self, "Syntax error in current source")
+        end
+      end
+      _ret
+  		rescue Exception => e
+  			 MsgContract.instance.out_error(self, e.to_s)
+ 	  end
+  end
+  
+end
+

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

@@ -8,7 +8,7 @@ require "observer"
 class ArcadiaDebugWrapper
   include Observable
   attr_reader :last_command
-
+	attr_reader :debugging
   def initialize
     (RUBY_PLATFORM == 'i386-mswin32')?_cmd="cmd":_cmd='sh'
     @io = IO.popen(_cmd,'w')
@@ -16,6 +16,7 @@ class ArcadiaDebugWrapper
     @stop = false
     @transfer_file=ArcadiaDebugWrapper.transfer_file
     @threads = Array.new
+    @debugging = false
   end
 
   def ArcadiaDebugWrapper.transfer_file
@@ -122,6 +123,7 @@ class ArcadiaDebugWrapper
 
   def command(_command)
     begin
+      @debugging = true
       @io.puts(_command)
       @last_command = _command
     rescue Exception => e
@@ -134,6 +136,16 @@ class ArcadiaDebugWrapper
   end
 
   def read
+#    t_i = 0
+#    t_out = 5
+#    while !File.exist?(@transfer_file) && t_i < t_out
+#      sleep(t_i)
+#      t_i = t_i + 1
+#    end
+#    if !File.exist?(@transfer_file)
+#      return
+#    end
+
     begin
       while !File.exist?(@transfer_file)
       end
@@ -143,81 +155,22 @@ class ArcadiaDebugWrapper
         File.open(@transfer_file) do |f|
           $ppp = Marshal.load(f)
         end
-        while !File.stat(@transfer_file).writable?
+        while !File.stat(@transfer_file).writable? 
         end
         File.delete(@transfer_file) if File.exist?(@transfer_file)
         changed
         notify_observers($ppp)
       end
     rescue Exception => e
-      MsgContract.instance.out_debug(self, "\n"+'Error on : '+" read >>> "+@transfer_file+" : "+e.to_s )
-      #$arcadia.outln("\n read >>> "+@transfer_file+" � andato in errore :"+e.to_s ) if $arcadia
+      MsgContract.instance.out_debug(self, "\n"+'Error on : '+" reading >>> "+@transfer_file+" : "+e.to_s )
+    ensure
+      @debugging = false
     end
   end
 end
 
 class ArcadiaDebug < ArcadiaExt
 
-  def before_build
-    ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
-  		@breakpoints = Hash.new
-  		@static_breakpoints = Array.new
-  end
-  
-  def build
-  end
-  
-  def debug_state
-  end
-  
-  def breakpoint_suf(_file,_line)
-    return _line.to_s + "-" + _file.to_s
-  end
-  
-	def breakpoint_add(_file,_line)
-    if @adw
-      @breakpoints[breakpoint_suf(_file,_line)] = @adw.breakpoint_set(_line, _file)
-		else
-	   	@static_breakpoints << {:file=>_file,:line=>_line}
-		end
-	end
-
-	def breakpoint_del(_file,_line)
-   		if @adw
-   			 @adw.breakpoint_del(@breakpoints.delete(breakpoint_suf(_file,_line)))
-   		end
-     @static_breakpoints.delete_if{|b| (b[:file]==_file && b[:line]==_line)}
-	end
-
-	def do_editor_event(_event)
-     #@arcadia.outln('in debug  _sender ----> '+_sender.to_s)	  
-     #@arcadia.outln('in debug  _event.signature ----> '+_event.signature)
-     case _event.signature 
-     		when EditorContract::BREAKPOINT_AFTER_CREATE
-     		  self.breakpoint_add(_event.context.file, _event.context.line)
-     		when EditorContract::BREAKPOINT_AFTER_DELETE
-     		  self.breakpoint_del(_event.context.file, _event.context.line)
-     		when EditorContract::BUFFER_AFTER_RAISE
-     		  @raised_file=_event.context.file
-     end
-	end
-
-  def can_exit_query
-    if @adw
-      query = (Tk.messageBox('icon' => 'question', 'type' => 'yesno',
-      'title' => '(Arcadia) Debug',
-      'message' => "Debug in course, do you want to exit?")=='yes')
-      if query
-        debug_quit
-        return true
-      else
-        return false
-      end
-    else
-      return true
-    end
-  end
-
   class VariablesViewText < TkTitledFrame
     attr_reader :text
 
@@ -384,6 +337,68 @@ class ArcadiaDebug < ArcadiaExt
   end
 
 
+  def before_build
+    ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
+  		@breakpoints = Hash.new
+  		@static_breakpoints = Array.new
+  end
+  
+  def build
+  end
+  
+  def debug_state
+  end
+  
+  def breakpoint_suf(_file,_line)
+    return _line.to_s + "-" + _file.to_s
+  end
+  
+	def breakpoint_add(_file,_line)
+    if @adw
+      @breakpoints[breakpoint_suf(_file,_line)] = @adw.breakpoint_set(_line, _file)
+		else
+	   	@static_breakpoints << {:file=>_file,:line=>_line}
+		end
+	end
+
+	def breakpoint_del(_file,_line)
+   		if @adw
+   			 @adw.breakpoint_del(@breakpoints.delete(breakpoint_suf(_file,_line)))
+   		end
+     @static_breakpoints.delete_if{|b| (b[:file]==_file && b[:line]==_line)}
+	end
+
+	def do_editor_event(_event)
+     #@arcadia.outln('in debug  _sender ----> '+_sender.to_s)	  
+     #@arcadia.outln('in debug  _event.signature ----> '+_event.signature)
+     case _event.signature 
+     		when EditorContract::BREAKPOINT_AFTER_CREATE
+     		  self.breakpoint_add(_event.context.file, _event.context.line)
+     		when EditorContract::BREAKPOINT_AFTER_DELETE
+     		  self.breakpoint_del(_event.context.file, _event.context.line)
+     		when EditorContract::BUFFER_AFTER_RAISE
+     		  @raised_file=_event.context.file
+     end
+	end
+
+  def can_exit_query
+    if @adw
+      query = (Tk.messageBox('icon' => 'question', 'type' => 'yesno',
+      'title' => '(Arcadia) Debug',
+      'message' => "Debug in course, do you want to exit?")=='yes')
+      if query
+        debug_quit
+        return true
+      else
+        return false
+      end
+    else
+      return true
+    end
+  end
+
+
+
   def debug_begin
     @breakpoints.clear
     DebugContract.instance.debug_begin(DebugContract::TDebugObj.new(self))
@@ -500,20 +515,28 @@ class ArcadiaDebug < ArcadiaExt
   end
 
   def debug_quit
-
-    if @adw
-      begin
-        self.frame_free
-        #self.debug_end
-        @adw.quit_debug
-        @adw = nil
-        #$arcadia['editor'].debug_end
-        MsgContract.instance.out_debug(self, "\n<end debug>")
-
-        #@arcadia['shell'].outln("\n<end debug>")
-      rescue Exception => e
-        MsgContract.instance.out_debug(self, "debug_quit:---> "+e.to_s)
-        #@arcadia['shell'].outln("debug_quit:---> "+e.to_s )
+    if @adw 
+      if @adw.debugging
+        Thread.new{
+          Tk.messageBox('icon' => 'info', 
+          						'type' => 'ok',
+        						 'title' => '(Arcadia) Debug',
+        						 'message' => "Debug in course, wait next step to exit")
+        }
+      else
+        begin
+          self.frame_free
+          #self.debug_end
+          @adw.quit_debug
+          @adw = nil
+          #$arcadia['editor'].debug_end
+          MsgContract.instance.out_debug(self, "\n<end debug>")
+  
+          #@arcadia['shell'].outln("\n<end debug>")
+        rescue Exception => e
+          MsgContract.instance.out_debug(self, "debug_quit:---> "+e.to_s)
+          #@arcadia['shell'].outln("debug_quit:---> "+e.to_s )
+        end
       end
     end
   end

data/ext/ae-editor/ae-editor.conf

@@ -10,17 +10,17 @@ tab-replace-width-space=2
 find.frame=0.0
 #tabs
 tabs.font=courier 9
-i386-freebsd6:tabs.font=courier 12
-i386-mswin32:tabs.font={Courier New} 9
+i386-freebsd6::tabs.font=courier 12
+i386-mswin32::tabs.font={Courier New} 9
 #tabs.side=bottom
 tabs.side=top
 # editor
 font=courier 9
 font.bold=courier 9 bold
-i386-freebsd6:font=courier 12
-i386-freebsd6:font.bold=courier 12 bold
-i386-mswin32:font={Courier New} 9
-i386-mswin32:font.bold={Courier New} 9 bold 
+i386-freebsd6::font=courier 12
+i386-freebsd6::font.bold=courier 12 bold
+i386-mswin32::font={Courier New} 9
+i386-mswin32::font.bold={Courier New} 9 bold 
 #+--------------------------------------------------
 #color.background=#000040
 #color.foreground=white
@@ -77,16 +77,16 @@ line_number_panel.color.foreground=#333333
 explorer_panel.tree.color.background=#ffffff
 explorer_panel.tree.color.foreground=white
 explorer_panel.tree.font=courier 9
-i386-freebsd6:explorer_panel.tree.font=courier 12
-i386-mswin32:explorer_panel.tree.font={Courier New} 9
+i386-freebsd6::explorer_panel.tree.font=courier 12
+i386-mswin32::explorer_panel.tree.font={Courier New} 9
 explorer_panel.tree.class.color.foreground=#a42019
 explorer_panel.tree.class.font=times 10 bold
-i386-mswin32:explorer_panel.tree.class.font=times 10 bold
+i386-mswin32::explorer_panel.tree.class.font=times 10 bold
 explorer_panel.tree.def.color.foreground=blue
 explorer_panel.tree.def.font=times 10
-i386-mswin32:explorer_panel.tree.def.font=times 10
+i386-mswin32::explorer_panel.tree.def.font=times 10
 explorer_panel.tree.module.color.foreground=#1b691e
 explorer_panel.tree.module.font=times 8 bold
-i386-mswin32:explorer_panel.tree.module.font={Courier New} 9 bold
+i386-mswin32::explorer_panel.tree.module.font={Courier New} 9 bold
 
 #:::::::::::::::: Editor group    ::::::::::::::::::::::<end>

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

@@ -65,7 +65,7 @@ class AgEditor
       font $arcadia['conf']['editor.tabs.font']
       pack('fill'=>'both', :padx=>0, :pady=>0, :expand => 'yes')
     }
-    @nb_tab_exp = @nb.insert('end','exp' ,'text'=>'Class Tree' )
+    @nb_tab_exp = @nb.insert('end','exp' ,'text'=>'Source Tree' )
     @nb.raise('exp')
     _tree_goto = proc{|_self|
       _line = _self.selection_get[0]
@@ -161,6 +161,21 @@ class AgEditor
 
     @text.bind("Control-KeyPress"){|e|
       case e.keysym
+      when 'space'
+        line, col = @text.index('insert').split('.')
+        _file = @file+'~~'
+        f = File.new(@file+'~~', "w")
+        begin
+          if f
+            f.syswrite(text_value)
+          end
+        ensure
+          f.close unless f.nil?
+        end
+          
+          
+
+        EditorContract.instance.complete_code(EditorContract::TEditorObj.new(self, 'file'=>_file, 'line'=>line.to_s, 'col'=>col.to_s))
       when 'z'
         _b = @text.index('insert').split('.')[0].to_i
         @text.edit_undo
@@ -247,6 +262,7 @@ class AgEditor
     }
     @text.bind("KeyPress"){|e|
       case e.keysym
+      when 'Return'
       when 'BackSpace'
         _index = @text.index('insert')
         _row, _col = _index.split('.')
@@ -657,22 +673,22 @@ class AgEditor
     for inode in 0.._sorted_sons.length - 1
       _son = _sorted_sons[inode]
       if _son.kind == 'KClass'
-        _window = TkLabel.new(@tree_exp){
+        _window = TkLabel.new(@fm.left_frame){
           image  TkPhotoImage.new('dat' => TREE_NODE_CLASS_GIF)
           background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
         }
       elsif _son.kind == 'KModule'
-        _window = TkLabel.new(@tree_exp){
+        _window = TkLabel.new(@fm.left_frame){
           image  TkPhotoImage.new('dat' => TREE_NODE_MODULE_GIF)
           background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
         }
       elsif _son.kind == 'KDef'
-        _window = TkLabel.new(@tree_exp){
+        _window = TkLabel.new(@fm.left_frame){
           image  TkPhotoImage.new('dat' => TREE_NODE_DEF_GIF)
           background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
         }
       elsif _son.kind == 'KDefClass'
-        _window = TkLabel.new(@tree_exp){
+        _window = TkLabel.new(@fm.left_frame){
           image  TkPhotoImage.new('dat' => TREE_NODE_DEFCLASS_GIF)
           background($arcadia['conf']['editor.explorer_panel.tree.color.background'])
         }
@@ -1027,9 +1043,17 @@ class AgEditor
         @text.insert('end',file.readlines.collect!{| line | line.chomp+"\n" }.to_s)
       }
     end
+    reset
+    refresh
+  end
+  
+  def reset
     @buffer = text_value
     reset_modify
     @text.edit_reset
+  end
+  
+  def refresh
     build_tree if @classbrowsing
   end
 end
@@ -1058,6 +1082,7 @@ class AgMultiEditor < ArcadiaExt
 	def before_build
     ArcadiaContractListener.new(self, DebugContract, :do_debug_event)
     ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
+    ArcadiaContractListener.new(self, MainContract, :do_main_event)
 	end
 
   def build
@@ -1118,14 +1143,20 @@ class AgMultiEditor < ArcadiaExt
     )
 		
     @main_frame.enb.tabbind("Button-3",
-      proc{|x|
-      #p x
+      proc{|*x|
         _x = TkWinfo.pointerx(@main_frame.enb)
         _y = TkWinfo.pointery(@main_frame.enb)
-        @selected_tab_name_from_popup = 'ff'+x[0].split(':')[0]
-        _file =  @main_frame.enb.itemcget(@selected_tab_name_from_popup, 'text')
-        @pop_up.entryconfigure(0, 'label'=>_file)
-        @pop_up.popup(_x,_y)
+        @selected_tab_name_from_popup = x[0].split(':')[0]
+        _index = @main_frame.enb.index(@selected_tab_name_from_popup)
+        if _index == -1 
+          @selected_tab_name_from_popup = 'ff'+@selected_tab_name_from_popup
+          _index = @main_frame.enb.index(@selected_tab_name_from_popup)
+        end
+        if _index != -1 
+        		_file =  @main_frame.enb.itemcget(@selected_tab_name_from_popup, 'text')
+        		@pop_up.entryconfigure(0, 'label'=>_file)
+        		@pop_up.popup(_x,_y)
+        end
       })
   end
 
@@ -1157,9 +1188,12 @@ class AgMultiEditor < ArcadiaExt
      				end
      		when EditorContract::OPEN_TEXT
      		  if _event.context.title 
-     				  self.open_buffer(_event.context.title)
-     				  _e = @tabs_editor[_event.context.title]
+     				  _tab_name = self.tab_name(_event.context.title)
+     				  self.open_buffer(_tab_name, _event.context.title)
+     				  _e = @tabs_editor[_tab_name]
      				  _e.text_insert('end',_event.context.text) if _event.context.text
+     				  _e.reset
+     				  _e.refresh
      				  add_reverse_item(_e)
      				  _event.handled(self)
      				end
@@ -1170,12 +1204,119 @@ class AgMultiEditor < ArcadiaExt
      				end
      end
 	end
+	
+	def do_main_event(_event)
+     case _event.signature 
+     		when MainContract::EVENT_HANDLED
+     				_cause = _event.context.caused_by
+     				if _cause.signature == EditorContract::COMPLETE_CODE &&
+     					 _cause.context.sender == self.raised
+     					 # delete the file used for completion 
+			     if File.exist?(_cause.context.file) && _cause.context.file.include?('~~')
+				      File.delete(_cause.context.file)
+    					 end
+
+     					 _text = self.raised.text
+     					 _index_call = _cause.context.line+'.'+_cause.context.col
+     					 _index_now = _text.index('insert')
+     					 if _index_call == _index_now 
+ 	            _target = _text.get('insert - 1 chars wordstart','insert')
+						 if _target.length > 0 && _target != '.'
+						 		extra_len = _target.length.+@
+						 		_begin_index = _index_now<<' - '<<extra_len.to_s<<' chars'
+						 		_text.tag_add('sel', _begin_index, _index_now)
+						 else
+						    _begin_index = _index_now
+						    extra_len = 0
+						 end
+     					 	 if _cause.context.candidates.length > 1 
+		     					 _rx, _ry, _widht, heigth = _text.bbox(_begin_index);
+					     _menu = TkMenu.new(
+				      		 :parent=>_text,
+				      		 :tearoff=>0,
+				      		 :relief=>'solid',
+				      		 :borderwidth=>1,
+				      		 :background=>conf('color.background'),
+				      		 :foreground=>conf('color.foreground'),
+				      		 :font => conf('font')
+   	 						 )
+	   	 					 _cause.context.candidates.each{|item|
+	   	 					 _value, _hint = item.split
+    							 if _hint
+    							 _menu.insert('end',
+    							 		:command,
+    							 		:accelerator=>_hint.split('#')[0],
+      									:command=> proc{_text.delete(_begin_index,'insert'); _text.insert('insert',_value)},
+      									:label=>_value,
+      									:activebackground=>'yellow',
+      									:hidemargin => true
+    								)
+    								else
+        							 _menu.insert('end',
+        							 		:command,
+          									:command=> proc{_text.delete(_begin_index,'insert'); _text.insert('insert',_value)},
+          									:label=>_value,
+          									:activebackground=>'yellow',
+          									:hidemargin => true
+        								)
+    								end
+            	  }
+            	  
+             	 _x = _rx + TkWinfo.rootx(_text)  
+              	_y = _ry + TkWinfo.rooty(_text)  + TkFont.new(conf('font')).metrics[2][1]
+    						 	_menu.popup(_x,_y)
+
+              _old_g = TkWinfo.geometry(_menu)
+              _w,_h = _old_g.split('+')[0].split('x')
+              _yy = TkWinfo.screenheight(_menu) - _y - 5
+ 	             if _h.to_i > _yy
+                _h = _yy.to_s
+	              _w = (_w.to_i+5).to_s
+	              _new_g =  _w+'x'+_h+'+'+_x.to_s+'+'+_y.to_s
+ 		            Tk.tk_call('wm', 'geometry', _menu, _new_g )
+ 		            _listbox = TkListbox.new(_menu, 
+           					  		'takefocus'=>true, 
+      			      		 		:background=>conf('color.background'),
+      				     	 		 :foreground=>conf('color.foreground'),
+								 	 :selectbackground=>'yellow',
+								 	 :activestyle=>'none',
+      				        	 :font => conf('font'),
+      			        		 :borderwidth=>1
+           					 ).place('x'=>0,'y'=>0, 'relwidth'=>1, 'relheight'=>1)
+		      						_listbox.focus
+          						 _listbox.bind_append('KeyPress'){|e|
+           							 case e.keysym
+            								when 'Escape'
+            									 _listbox.destroy
+            									 _menu.destroy
+            									 Tk.callback_break
+      		             when 'Return'
+        			             _value = _listbox.get('active')
+           				          _text.delete(_begin_index,'insert')
+               				      _text.insert('insert',_value)
+            											 _listbox.destroy
+            									    _menu.destroy
+            									    Tk.callback_break
+            							end
+          						  }
+          						  _cause.context.candidates.each{|value|
+                     _listbox.insert('end', value)
+                  }
+	              end
+	     					 elsif _cause.context.candidates.length == 1 && _cause.context.candidates[0].length>0
+	     					   _text.delete(_begin_index,'insert');
+  	   					   _text.insert('insert',_cause.context.candidates[0].split[0])
+ 	    					 end
+     					 end
+     				end
+		 end		  
+	end
 
   def add_reverse_item(_editor)
     code2form = proc{
       Revparsel.new(_editor.text_value)
       self.close_editor(_editor, false)
-#      $arcadia['objic'].active.select_last
+      InspectorContract.instance.raise_last_widget(InspectorContract::TInspectorObj.new(self))
     }
     _editor.insert_popup_menu_item('end',
       :command,
@@ -1415,14 +1556,20 @@ class AgMultiEditor < ArcadiaExt
     return _index != -1
   end
   
-  def tab_name(_filename="")
-    'ff'+File.expand_path(_filename).gsub("/","_").gsub(".","_")
+  def tab_name(_str="")
+    'ff'+_str.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 open_file(_filename = nil, _text_index='1.0')
     return if _filename == nil || !File.exist?(_filename)
     _basefilename = File.basename(_filename)
-    _tab_name = self.tab_name(_filename)
+    _tab_name = self.tab_file_name(_filename)
     _index = @main_frame.enb.index(_tab_name)
     _exist_buffer = _index != -1
     
@@ -1444,7 +1591,7 @@ class AgMultiEditor < ArcadiaExt
     
     if _text_index != nil && _text_index != '1.0'
       @tabs_editor[_tab_name].text_see(_text_index)
-      #@tabs_editor[_tab_name].mark_selected(_text_index)
+      @tabs_editor[_tab_name].mark_selected(_text_index)
     end
 
     return @tabs_editor[_tab_name]
@@ -1453,18 +1600,23 @@ class AgMultiEditor < ArcadiaExt
 
   def open_buffer(_buffer_name = nil, _title = nil)
     _index = @main_frame.enb.index(_buffer_name)
-    _buffer_name = 'new' if _buffer_name == nil
+    if _buffer_name == nil
+    		_buffer_name = tab_name('new')
+    		_title_new = '*new'
+    end
+    
     if _index != -1
       _tab = @main_frame.enb.get_frame(_buffer_name)
       @main_frame.enb.raise(_buffer_name)
     else
       _n = 1
       while @main_frame.enb.index(_buffer_name) != -1
-        _buffer_name = 'new'+_n.to_s
+        _title_new = '*new'+_n.to_s
+        _buffer_name = tab_name('new')+_n.to_s
         _n =_n+1
       end
       if _title == nil
-        _title =  '*'+_buffer_name
+        _title =  _title_new
       end
       _tab = @main_frame.enb.insert('end', _buffer_name ,
         'text'=> _title,
@@ -1619,7 +1771,7 @@ class Find < Findview
       case e.keysym
       when 'Return'
         @find_action.call
-        break
+        Tk.callback_break
       end
     }
     @last_index='insert'
@@ -1737,8 +1889,5 @@ class KetTest
   end
 end
 
-class AgTkEditor < AgEditor
-end
-
-class AgTkMultiEditor < AgMultiEditor
+class CodeInsight
 end