arcadia 0.13.1 → 1.0.0

data/ext/ae-subprocess-inspector/ae-subprocess-inspector.rb

@@ -51,10 +51,59 @@ class SubProcessInspector < ArcadiaExt
       
 end
 
-class SubProcessWidget < Tk::BWidget::Button
+#class SubProcessWidget < Tk::BWidget::Button
+#  attr_reader :event
+#  def initialize(_parent=nil, _event=nil, *args)
+#    super(Arcadia['toolbar'].frame, Arcadia.style('button').update("compound"=>'left', "background"=>Arcadia.conf("background"),"activebackground"=>'black', 'relief'=>'groove'))
+#    @parent = _parent
+#    @event = _event
+#    b_command = proc{
+#      message = Arcadia.text('ext.spi.d.kill.msg', [_event.pid, _event.name])
+#      r=Arcadia.hinner_dialog(self,
+#          'type'=>'yes_no', 
+#          'level'=>'warning',
+#          'title'=> Arcadia.text('ext.spi.d.kill.title'), 
+#          'msg'=>message)
+#      if r=="yes"
+#        _event.abort_action.call
+#      end
+#    }
+#    command b_command
+#    begin
+#      text File.basename(_event.name)
+#    rescue
+#      text _event.name
+#    end  
+#    helptext "#{_event.name} [pid #{_event.pid}]"
+#    pack('side' =>'left', :padx=>2, :pady=>0)
+#    Tk::Anigif.image(self, "#{Dir.pwd}/ext/ae-subprocess-inspector/process.res")
+#    start_check  
+#  end
+#  
+#  def start_check
+#    if @event.timecheck
+#      timecheck = @event.timecheck
+#    else
+#      timecheck = 1000
+#    end
+#    @timer = TkAfter.new
+#    proc_check = proc{
+#      alive = @event.alive_check.call
+#      #p "ALIVE=#{alive}"
+#      if !alive
+#        @timer.stop
+#        @parent.do_delete_process(self)
+#        self.destroy
+#      end
+#    }
+#    @timer.set_procs(timecheck,-1,proc_check)
+#    @timer.start
+#  end  
+#end
+
+class SubProcessWidget
   attr_reader :event
   def initialize(_parent=nil, _event=nil, *args)
-    super(Arcadia['toolbar'].frame, Arcadia.style('button').update("compound"=>'left', "background"=>'black',"activebackground"=>'black', 'relief'=>'groove'))
     @parent = _parent
     @event = _event
     b_command = proc{
@@ -68,17 +117,37 @@ class SubProcessWidget < Tk::BWidget::Button
         _event.abort_action.call
       end
     }
-    command b_command
+    #command b_command
     begin
-      text File.basename(_event.name)
+      l_text = File.basename(_event.name)
     rescue
-      text _event.name
+      l_text = _event.name
     end  
-    helptext "#{_event.name} [pid #{_event.pid}]"
-    pack('side' =>'left', :padx=>2, :pady=>0)
-    Tk::Anigif.image(self, "#{Dir.pwd}/ext/ae-subprocess-inspector/process.res")
+    helptext = "#{_event.name} [pid #{_event.pid}]"
+    
+
+    @label = TkLabel.new(Arcadia['toolbar'].frame, Arcadia.style('label')){
+      compound 'left'
+      text l_text
+      pack('side' =>'left', :padx=>2, :pady=>0)
+    }
+    Tk::Anigif.image(@label, "#{Dir.pwd}/ext/ae-subprocess-inspector/process.res")
+
+    @button = Arcadia.wf.toolbutton(Arcadia['toolbar'].frame){
+      command b_command
+      image Arcadia.image_res(CLOSE_FRAME_GIF)      
+      pack('side' =>'left', :padx=>2, :pady=>0)
+    }
+    @button.hint=helptext
+
     start_check  
   end
+
+  def destroy
+   # @img.destroy
+    @label.destroy
+    @button.destroy
+  end
   
   def start_check
     if @event.timecheck
@@ -99,76 +168,4 @@ class SubProcessWidget < Tk::BWidget::Button
     @timer.set_procs(timecheck,-1,proc_check)
     @timer.start
   end  
-end
-
-
-#class SubProcessWidget < TkFrame
-#  attr_reader :event
-#  def initialize(_parent=nil, _event=nil, *args)
-#    super(_parent.frame.hinner_frame, Arcadia.style('panel'))
-#    @parent = _parent
-#    @event = _event
-#    @progress  = TkVariable.new
-#    @pb = Tk::BWidget::ProgressBar.new(
-#      self, Arcadia.style('progress').update({
-#        :variable=>@progress, 
-#        :type=>'infinite', 
-#        :maximum=>500})).place('width'=>-30,'relwidth' => '1','x' => 0,'y' => 2,'height' => 18)
-#      #.pack('side' =>'left','fill'=>'x')
-#
-#      icon_button = TkButton.new(@pb){
-#        background Arcadia.style('panel')['background']
-#        relief 'flat'
-#        image Arcadia.file_icon(_event.name)
-#      }.pack
-#      
-#      b_command = proc{
-#        message = "Really kill pid #{_event.pid} #{_event.name} ?"
-#        r=Arcadia.dialog(self,
-#            'type'=>'yes_no', 
-#            'level'=>'warning',
-#            'title'=> 'Confirm kill', 
-#            'msg'=>message)
-#        if r=="yes"
-#          _event.abort_action.call
-#        end
-#      }
-#      
-#      
-#    _b = Tk::BWidget::Button.new(self, 
-#    #_b = TkButton.new(self, 
-#         'command'=>b_command,
-#         'borderwidth'=>0,
-#         'background'=>Arcadia.conf('background'),
-#         'helptext'=>"#{_event.name} [pid #{_event.pid}]",
-#         'image'=> TkPhotoImage.new('data' => PROCESS_KILL_GIF),
-#         'relief'=>'flat').pack('side' =>'right','padx'=>0)
-#         #.pack('side' =>'left','padx'=>5)
-#         #.place('x' => 2, 'width'=>20)
-#    pack('side' =>'top','anchor'=>'nw','fill'=>'x','padx'=>5, 'pady'=>5)
-#      #place('relwidth' => '1')
-#    start_check  
-#  end
-#  
-#  def start_check
-#    @progress.numeric=0
-#    if @event.timecheck
-#      timecheck = @event.timecheck
-#    else
-#      timecheck = 1000
-#    end
-#    @timer = TkAfter.new
-#    proc_check = proc{
-#      alive = @event.alive_check.call
-#      #p "ALIVE=#{alive}"
-#      if !alive
-#        @timer.stop
-#        @parent.do_delete_process(self)
-#        self.destroy
-#      end
-#      @progress.numeric += 1
-#    }
-#    @timer.set_procs(timecheck,-1,proc_check)
-#    @timer.start
-#  end  
-#end
+end

data/ext/ae-term/ae-term.rb

@@ -10,8 +10,8 @@ class Term < ArcadiaExtPlus
   def on_before_build(_event)
     @has_xterm = !Arcadia.which("xterm").nil?
     @has_xdotool = !Arcadia.which("xdotool").nil?
-    @can_run = @has_xterm || Arcadia.is_windows? 
-    if !Arcadia.is_windows?
+    @can_run = @has_xterm || OS.windows? || OS.mac?
+    if !(OS.windows? || OS.mac?)
       if !@has_xterm
         msg = Arcadia.text("ext.term.dependences_missing.xterm.msg")
         ArcadiaProblemEvent.new(self, "type"=>ArcadiaProblemEvent::DEPENDENCE_MISSING_TYPE,"title"=>Arcadia.text("ext.term.dependences_missing.xterm.title"), "detail"=>msg).go!
@@ -32,7 +32,7 @@ class Term < ArcadiaExtPlus
   
   def on_initialize(_event)
     # called at startup
-    return if Arcadia.is_windows?
+    return if OS.windows? || OS.mac?
     @xterm_pid = -1
     @finalizing = false
     @bind_after_run = false
@@ -46,7 +46,7 @@ class Term < ArcadiaExtPlus
   end
   
   def on_finalize(_event)
-    return if Arcadia.is_windows?
+    return if OS.windows? || OS.mac?
     @finalizing = true
     killall_xterm if @has_xterm && @has_xdotool
   end  
@@ -88,7 +88,7 @@ class Term < ArcadiaExtPlus
     id_int = eval(frame.hinner_frame.winfo_id).to_i
     
     #Arcadia.runtime_error_msg("CREO XTERM #{xterm_class} con id #{id_int}")
-    cmd = "cd #{_dir} ; xterm -into #{id_int} -bg '#{conf('color.bg')}' -fg #{conf('color.fg')} -fa '#{conf('font')}' -class #{xterm_class}  +sb  +hold"
+    cmd = "cd #{_dir} ; xterm -into #{id_int} -bg '#{conf('color.bg')}' -fg '#{conf('color.fg')}' -fa '#{conf('font')}' -class #{xterm_class}  +sb  +hold"
     fi_pid=-1
     Thread.new do
       #open("|#{cmd}"){|f|  @xterm_pid = f.read.strip if f }
@@ -138,15 +138,17 @@ class Term < ArcadiaExtPlus
   end
   
   def do_run_external_term(_dir)
-    if Arcadia.is_windows?
+    if OS.windows?
       system("cd #{_dir} & start cmd")
+    elsif OS.mac?
+      system("open -a Terminal '#{_dir}'")
     else
       system("cd #{_dir}; xterm &")
     end
   end
   
   def on_term(_event)
-    if !@has_xdotool || Arcadia.is_windows?
+    if !@has_xdotool || OS.windows? || OS.mac?
       do_run_external_term(_event.dir)
     else 
       if xterm_running?

data/lib/a-commons.rb

@@ -121,7 +121,7 @@ class FixedFrameWrapper < AbstractFrameWrapper
   end
 
   def hide
-    Arcadia.layout.hide_panel(@domain, @name)
+
   end
 
   def raised?
@@ -224,6 +224,7 @@ class ArcadiaExt
     @float_frames = Array.new
     @float_geometries = conf_array("float_frames")
     @float_labels = conf_array("float_labels")
+    @hinner_dialogs = []
     Arcadia.attach_listener(self, BuildEvent)
     Arcadia.attach_listener(self, InitializeEvent)
     Arcadia.attach_listener(self, ExitQueryEvent)
@@ -287,6 +288,10 @@ class ArcadiaExt
   def frame_visible?(_n=0)
     @frames != nil && @frames[_n] != nil && @frames[_n].hinner_frame && TkWinfo.mapped?(@frames[_n].hinner_frame)
   end
+  
+  def frame_raised?(_n=0)
+    @arcadia.layout.raised?(frame_domain(_n), @name)
+  end
 
   def frame(_n=0,create_if_not_exist=true)
     if @frames_points[_n].nil?
@@ -297,10 +302,34 @@ class ArcadiaExt
       (@frames_labels[_n].nil?)? _label = @name : _label = @frames_labels[_n]
       (@frames_names[_n].nil?)? _name = @name : _name = @frames_names[_n]
       @frames[_n] = FixedFrameWrapper.new(self, @frames_points[_n], _name, _label, _n)
+      @frames[_n].hinner_frame.bind_append("Enter", proc{self.frame.root.shift_on if self.frame_visible?})
     end
     return @frames[_n]
   end
 
+  def hinner_dialog(_n=0, side='top', args=nil)
+    if @hinner_dialogs[0].nil?
+      @hinner_dialogs[_n] = @arcadia.layout.add_hinner_dialog(side, args)
+      @hinner_dialogs[_n].pack('side' =>side,'padx'=>0, 'pady'=>0, 'fill'=>'x', 'expand'=>'1')
+    end
+    @hinner_dialogs[_n]
+  end
+  
+  def hinner_splitted_dialog(_n=0, _side='top', _height=100, _args=nil)
+    if @hinner_dialogs[0].nil?
+      @hinner_dialogs[_n] = @arcadia.layout.add_hinner_splitted_dialog(_side, _height, _args)
+    end
+    @hinner_dialogs[_n]
+  end
+  
+  def hinner_splitted_dialog_titled(_title=nil, _n=0, _side='top', _height=100, _args=nil)
+    if @hinner_dialogs[0].nil?
+      @hinner_dialogs[_n] = @arcadia.layout.add_hinner_splitted_dialog_titled(_title, _side, _height, _args)
+    end
+    @hinner_dialogs[_n]
+  end
+  
+
   def frame_domain(_n=0, _value=nil)
     if conf('frames')
       frs = conf('frames').split(',')
@@ -454,15 +483,15 @@ class ArcadiaExtPlus < ArcadiaExt
 
   def activate(_obj=self, _raise_event=true)
     return if @@active_instance[_obj.class] == _obj
-    if _obj.frame_visible?
-      @@active_instance[_obj.class] = nil
-    else
-      @@active_instance[_obj.class] = _obj
-    end
-    #@@active_instance[self.class].frame.root.shift_on if @@active_instance[self.class].frame != nil
+    @@active_instance[_obj.class] = _obj #if @arcadia.initialized?
+#    if _obj.frame_visible?
+#      @@active_instance[_obj.class] = nil
+#    else
+#      @@active_instance[_obj.class] = _obj
+#    end
     _obj.frame.root.shift_on if _obj.frame_visible?
     instances.each{|i|
-      i.frame.root.shift_off if i != _obj  && i.frame != nil && i.frame.root != _obj.frame.root
+      i.frame.root.shift_off if i != _obj  && i.frame != nil && i.frame.root != _obj.frame.root && i.frame_raised?
     }
     ActivateInstanceEvent.new(Arcadia.instance, 'name'=>_obj.name).go! if _raise_event
   end
@@ -547,7 +576,10 @@ class ArcadiaExtPlus < ArcadiaExt
 
   def clean_instance
     if main_instance?
-      @frames.each_index{|i| destroy_frame(i)}
+      @frames.each_index{|i| 
+        LayoutChangedDomainEvent.new(self, 'old_domain'=>self.frame_domain(i), 'new_domain'=>nil).go!
+        destroy_frame(i)
+      }
       @frames.clear
       instances.each{|i| 
         if i != self
@@ -661,43 +693,44 @@ module EventBus #(or SourceEvent)
   def process_event(_event, _listeners=nil)
     # _listener rapresent a filter on @@listeners if != nil
     return _event if !defined?(@@listeners)
+    @@listeners_listeners = {} unless defined? @@listeners_listeners
     event_classes = _event_class_stack(_event.class)
     #before fase
     event_classes.each do |_c|
       if _listeners.nil?
-        _process_fase(_c, _event, @@listeners[_c], 'before')
+        _process_fase(_c, _event, @@listeners[_c], @@listeners_listeners[_c], 'before')
       else
         listeners_to_process = []
         _listeners.each{|lis|
           listeners_to_process << lis if @@listeners[_c] && @@listeners[_c].include?(lis)
         }
-        _process_fase(_c, _event, listeners_to_process, 'before')
+        _process_fase(_c, _event, listeners_to_process, @@listeners_listeners[_c], 'before')
       end
       break if _event.is_breaked? # not responding to this means "you need to pass in an instance, not a class name
     end unless _event.is_breaked?
     # fase
     event_classes.each do |_c|
       if _listeners.nil?
-        _process_fase(_c, _event, @@listeners[_c])
+        _process_fase(_c, _event, @@listeners[_c], @@listeners_listeners[_c])
       else
         listeners_to_process = []
         _listeners.each{|lis|
           listeners_to_process << lis if @@listeners[_c] && @@listeners[_c].include?(lis)
         }
-        _process_fase(_c, _event, listeners_to_process)
+        _process_fase(_c, _event, listeners_to_process, @@listeners_listeners[_c])
       end
       break if _event.is_breaked?
     end unless _event.is_breaked?
     #after fase
     event_classes.each do |_c|
       if _listeners.nil?
-        _process_fase(_c, _event, @@listeners[_c], 'after')
+        _process_fase(_c, _event, @@listeners[_c], @@listeners_listeners[_c], 'after')
       else
         listeners_to_process = []
         _listeners.each{|lis|
           listeners_to_process << lis if @@listeners[_c] && @@listeners[_c].include?(lis)
         }
-        _process_fase(_c, _event, listeners_to_process, 'after')
+        _process_fase(_c, _event, listeners_to_process, @@listeners_listeners[_c], 'after')
       end
       break if _event.is_breaked?
     end unless _event.is_breaked?
@@ -725,7 +758,7 @@ module EventBus #(or SourceEvent)
   end
   private :_event_class_stack
 
-  def _process_fase(_class, _event, _listeners=nil, _fase_name = nil)
+  def _process_fase(_class, _event, _listeners=nil, _listeners_listeners=nil, _fase_name = nil)
     return if _listeners.nil?
     _fase_name.nil?? suf = '':suf = _fase_name
     method_name = _method_name(_class, suf)
@@ -738,12 +771,26 @@ module EventBus #(or SourceEvent)
         elsif _listener.respond_to?(method_name)
           _listener.send(method_name, _event)
         end
+        if _listeners_listeners
+          _listeners_listeners.each do |ll|
+            if ll.respond_to?(sub_method_name)
+              ll.send(sub_method_name, _event, _listener)
+            elsif ll.respond_to?(method_name)
+              ll.send(method_name, _event, _listener)
+            end
+          end
+        end
         break if _event.is_breaked?
       end
     else
       _listeners.each do|_listener|
         next if _listener.kind_of?(ArcadiaExtPlus) && !(_listener.active? || (_event.kind_of?(ArcadiaSysEvent)))
         _listener.send(method_name, _event) if _listener.respond_to?(method_name)
+        if _listeners_listeners
+          _listeners_listeners.each do |ll|
+            ll.send(method_name, _event, _listener) if ll.respond_to?(method_name)
+          end
+        end
         break if _event.is_breaked?
       end
     end
@@ -758,6 +805,7 @@ module EventBus #(or SourceEvent)
     return 'on_'+(_suf+_pre+_in.gsub(/[A-Z]/){|s| '_'+s.to_s}).downcase.gsub('_event','')
   end
   private :_method_name
+
   def _broadcast_fase(_class, _event)
     return if @@listeners[_class].nil?
     method_name = _method_name(_class)
@@ -799,6 +847,25 @@ module EventBus #(or SourceEvent)
     @@listeners[_class_event] << _listener
   end
 
+  def attach_listeners_listener(_listener, _class_event)
+    @@listeners_listeners = {} unless defined? @@listeners_listeners
+    @@listeners_listeners[_class_event] = []   unless @@listeners_listeners.has_key?(_class_event)
+    @@listeners_listeners[_class_event] << _listener
+  end
+  
+  def detach_listeners_listener(_listener, _class_event=nil)
+    if _class_event != nil
+      if @@listeners_listeners[_class_event]
+        @@listeners_listeners[_class_event].delete(_listener)
+      end
+    else
+      #delete all the issues of listenere
+      @@listeners_listeners.each{|klass, header|
+        header.delete(_listener)
+      }
+    end
+  end
+  
 end
 
 
@@ -844,7 +911,21 @@ module Configurable
           if (_strip_line.length > 0)&&(_strip_line[0,1]!='#')
             var_plat = _line.split('::')
             if var_plat.length > 1
-              if (RUBY_PLATFORM =~ Regexp::new(var_plat[0]))
+              case var_plat[0]
+              when 'WINDOWS'
+                plat_enabled =  OS.windows?
+              when 'MAC'
+                plat_enabled =  OS.mac?
+              when 'LINUX'
+                plat_enabled =  OS.linux?
+              when 'FREEBSD'
+                plat_enabled =  OS.freebsd?
+              when 'UNIX'
+                plat_enabled =  OS.unix?
+              when 'ARM'
+                plat_enabled =  OS.arm?
+              end
+              if plat_enabled
                 _line = var_plat[1]
                 var_plat[2..-1].collect{|x| _line=_line+'::'+x} if var_plat.length > 2
               else
@@ -1289,4 +1370,31 @@ class Application
 
   def run
   end
+end
+
+module OS
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.mac?
+   (/darwin/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.unix?
+    !OS.windows?
+  end
+
+  def OS.linux?
+    OS.unix? and not OS.mac?
+  end
+  
+  def OS.freebsd?
+   (/freebsd/ =~ RUBY_PLATFORM) != nil
+  end  
+
+  def OS.arm?
+   (/arm/ =~ RUBY_PLATFORM) != nil
+  end  
+  
 end