Merge lp:~turl/specto/raise-window-if-running into lp:specto

[Emilio]

[lp:~turl/specto/raise-window-if-running]

142. By Emilio on 2009-12-17

Some cosmetic fixes.

[Jeff Fortin Tam (kiddo)]

Sadly, it doesn't work. My test method:
1) ./launch.sh in specto's main branch, or the PPA version, or any branch
2) ./launch.sh in the raise-window-if-running branch

Results:
- it never raises the window (even if it's on the same workspace). At least not with Compiz, haven't tested with Mutter or Metacity.
- it seems to "think" for a few seconds, and then ends up showing the "already running" dialog
- it sometimes exists/kills the existing window!

So, needs further testing and fixing before this can be merged!

review: Needs Fixing

[lp:~turl/specto/raise-window-if-running]

143. By Emilio on 2009-12-26

Really raise the window if it was already opened but hidden by another window when launching another instance of specto.

=== modified file 'spectlib/main.py'
--- spectlib/main.py	2009-12-16 18:47:16 +0000
+++ spectlib/main.py	2009-12-26 20:16:12 +0000
@@ -29,6 +29,7 @@
 
 import os
 import sys
+import signal
 import gobject
 import gettext
 
@@ -136,7 +137,24 @@
             if self.GTK:
                 for watch in self.watch_db:
                     self.notifier.add_notifier_entry(watch.id)
-
+                
+                # Listen for USR1. If received, answer and show the window
+                def listen_for_USR1(signum, frame):
+                    f = open(self.SPECTO_DIR + "/" + "specto.pid.boot")
+                    pid = int(f.readline())
+                    f.close()
+                    os.kill(pid, signal.SIGUSR1)
+                    # If window was not shown, make it appear
+                    if not self.notifier.get_state():
+                        self.logger.log("Showing window, the user ran another instance of specto", "debug", "specto")
+                        self.toggle_notifier()
+                    else:
+                        # Based on http://www.pygtk.org/docs/pygtk/class-gtkwindow.html#method-gtkwindow--present
+                        self.logger.log("Window is already visible! Raising it to the front.", "debug", "specto")
+                        self.notifier.notifier.present()
+                
+                signal.signal(signal.SIGUSR1, listen_for_USR1)
+                
                 self.notifier.refresh_all_watches()
             else:
                 self.console.start_watches()
@@ -213,7 +231,34 @@
             p_name = os.popen("ps -f --pid " + pid).read()
             if p == 0 and "specto" in p_name:
                 if self.GTK:
-                    self.already_running_dialog()
+                    # Save our pid and prepare a 'pong' system
+                    f = open(pidfile + ".boot", "w")
+                    f.write(str(os.getpid()))
+                    f.close()
+                    
+                    def not_responding(signum, frame):
+                        """ Launch the already running dialog if the
+                            other instance doesn't respond """
+                        os.unlink(pidfile + ".boot")
+                        self.already_running_dialog()
+                        
+                    def response_received(signum, frame):
+                        """ Kill this specto if the other one answers """
+                        signal.alarm(0)
+                        os.unlink(pidfile + ".boot")
+                        self.logger.log("Specto is already running! The old instance will be brought to front.", "debug", "specto")
+                        sys.exit(0)
+                        
+                    signal.signal(signal.SIGALRM, not_responding)
+                    signal.signal(signal.SIGUSR1, response_received)
+                    signal.alarm(5)
+                    
+                    # Send signal to raise window
+                    os.kill(int(pid), signal.SIGUSR1)
+                    
+                    # Wait for signals
+                    signal.pause()
+                    
                     return True
                 elif DEBUG:
                     self.logger.log(_("Specto is already running!"), "critical", "specto")