[mousetrap/gnome3-wip] Replace entry script with python script; fixes 708302 and 708298.

[Heidi Ellis <heidiellis src gnome org>]

commit 10219fd4ff29f6a9a336770ec72526156334e8c1
Author: Stoney Jackson <dr stoney gmail com>
Date:   Wed Oct 16 10:15:48 2013 -0400

    Replace entry script with python script; fixes 708302 and 708298.

 configure.in                   |   13 ++-
 src/mousetrap/app/Makefile.am  |   26 +++++
 src/mousetrap/app/mousetrap.in |  228 ++--------------------------------------
 3 files changed, 46 insertions(+), 221 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7d4cb61..45ac32f 100644
--- a/configure.in
+++ b/configure.in
@@ -84,7 +84,6 @@ images/Makefile
 src/Makefile
 src/mousetrap/Makefile
 src/mousetrap/app/Makefile
-src/mousetrap/app/mousetrap
 src/mousetrap/app/environment.py
 src/mousetrap/app/lib/Makefile
 src/mousetrap/app/ui/Makefile
@@ -96,3 +95,15 @@ src/mousetrap/ocvfw/dev/Makefile
 src/mousetrap/ocvfw/idm/Makefile
 src/mousetrap/ocvfw/haars/Makefile
 ],[chmod +x run_pylint.sh])
+
+###############################################################################
+# Don't include src/mousetrap/app/mousetrap.in in AC_OUTPUT.  It will be
+# processed by make (see src/mousetrap/app/Makefile.am), not by autoconf or
+# automake. For more information read
+# http://www.gnu.org/software/autoconf/manual/autoconf.html#Installation-Directory-Variables
+#
+# Other files may require this same "fix" (e.g., i18n.py, environment.py,
+# mousetrap.desktop).
+#
+#   - Stoney Jackson, dr stoney gmail com, 10/10/2013
+###############################################################################
diff --git a/src/mousetrap/app/Makefile.am b/src/mousetrap/app/Makefile.am
index 452dda0..03d93a1 100644
--- a/src/mousetrap/app/Makefile.am
+++ b/src/mousetrap/app/Makefile.am
@@ -19,3 +19,29 @@ mousetrap_pythondir=$(pyexecdir)/mousetrap/app
 
 install-exec-hook:
        chmod a+rx $(DESTDIR)$(mousetrap_pythondir) -R
+
+
+##### START DIRECTORY VARIABLE SUBSTITUTIONS ##################################
+# Substitution of autotool's directory vars (outside of Makefiles) must be done
+# by make.
+
+edit = sed \
+               -e 's|@PYTHON[ ]|$(PYTHON)|g' \
+               -e 's|@pythondir[ ]|$(pythondir)|g' \
+               -e 's|@pyexecdir[ ]|$(pyexecdir)|g' \
+               -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
+               -e 's|@prefix[ ]|$(prefix)|g'
+
+
+mousetrap: Makefile
+       rm -f $@ $  tmp
+       srcdir=''; \
+               test -f ./$  in || srcdir=$(srcdir)/; \
+               $(edit) $${srcdir}$  in >$  tmp
+
+       chmod +x $  tmp
+       chmod a-w $  tmp
+       mv $  tmp $@
+
+mousetrap: $(srcdir)/mousetrap.in
+##### END DIRECTORY VARIABLE SUBSTITUTIONS ####################################
diff --git a/src/mousetrap/app/mousetrap.in b/src/mousetrap/app/mousetrap.in
index 271bb00..52c8dd8 100644
--- a/src/mousetrap/app/mousetrap.in
+++ b/src/mousetrap/app/mousetrap.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! PYTHON@
 
 # MouseTrap
 #
@@ -28,223 +28,11 @@
 #__copyright__ = "Copyright (c) 2008 Flavio Percoco Premoli"
 #__license__   = "GPLv2"
 
-ARGS="$*"
-# If you set RUNONCE to "true", then this will just run Orca once and quit.
-#
-RUNONCE="false"
-
-# A value of 1 means to run Orca.  A value of 0 means quit.
-#
-RUN=1
-
-# Initially there will be no watchdog process id.
-#
-watchdog_pid=0
-
-# The watchdog will periodically ping mousetrap to see if it is responding.
-# If mousetrap isn't responding, the watchdog will kill the mousetrap process.
-# The watchdog logic requires 'dbus-send', so we won't do it if we can't
-# find dbus-send in the path.  Note also that you can force MTP_WATCHDOG=0 if you
-# do not want a background process that periodically pings mousetrap to see
-# if it is responding.  We only do this if we can get to the DBus Session
-# bus.  Otherwise, we have no hope of being able to monitor mousetrap.
-#
-IFS=:
-DBUSSENDCMD=
-MTP_WATCHDOG=0
-if [ "x$DBUS_SESSION_BUS_ADDRESS" != "x" ]
-then
-    for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do
-        test -x "$dir/dbus-send" && {
-            DBUSSENDCMD="$dir/dbus-send"
-            MTP_WATCHDOG=1
-            break
-        }
-    done
-fi
-
-# [[WDW - disabled the watchdog by default since it is problematic.]]
-MTP_WATCHDOG=0
-
-# Cleans up any mousetrap-related processes that might be running,
-# restricting it to those processes owned by the user. These include
-# mousetrap itself
-
-cleanup()
-{
-    USERID=`id | cut -f2 -d= | cut -f1 -d\(`
-    PIDS=`ps -eo pid,ruid,args | grep $USERID | egrep "mousetrap[.]mousetrap" | grep -v grep | awk '{print 
$1}'`
-
-    IFS='
-    '
-    PIDS=`echo $PIDS`
-
-    if [ "x$PIDS" != "x" ]
-    then
-        kill -9 $PIDS > /dev/null 2>&1
-    fi
-}
-
-# Runs a watchdog process in the background.  It merely attempts to
-# get to mousetrap via some other means than the AT-SPI.  Here we use
-# a Ping on the mousetrap DBus service.  If it doesn't respond, then
-# we assume mousetrap is dead.
-#
-watchdog()
-{
-    (
-        sleep 15 # Give mousetrap a chance to start.
-        while [ "$MTP_WATCHDOG" -gt 0 ]
-        do
-            sleep 5
-            USERID=`id | cut -f2 -d= | cut -f1 -d\(`
-            PIDS=`ps -eo pid,ruid,args | egrep mousetrap | grep -v grep | awk '{print $1}'`
-
-            if [ "x$PIDS" = "x" ]
-            then
-                exit
-            else
-                $DBUSSENDCMD --reply-timeout=30000 --print-reply --dest=org.gnome.mousetrap / 
org.freedesktop.DBus.Peer.Ping > /dev/null 2>&1
-                if [ "$?" -ne 0 ]
-                then
-                    echo mousetrap watchdog detected something bad.  Cleaning up.
-                    cleanup
-                fi
-            fi
-        done
-    ) &
-}
-
-kill_watchdog()
-{
-    if [ "x$watchdog_pid" != x0 ]
-    then
-        kill -9 $watchdog_pid > /dev/null 2>&1
-    fi
-}
-
-kill_mousetrap()
-{
-    kill_watchdog
-    cleanup
-    exit
-}
-
-hup_mousetrap()
-{
-    cleanup
-}
-
-
-mousetrap() {
-
-    if [ -z "$1" ]
-    then
-        cleanup
-    fi
-
-    exec_prefix= prefix@
-    default_python=`ls -l /usr/bin/ | grep -e "python ->" | sed 's/.*> //'`
-    PYTHONPATH=${PYTHONPATH}:${exec_prefix}/lib/${default_python}/site-packages:$PWD/mousetrap
-    export PYTHONPATH
-
-    getDesktop
-
-        /usr/bin/python -c "import mousetrap.app.main as mousetrap; mousetrap.Controller().start();" "$ARGS"
-}
-
-getDesktop() {
-
-    if [ "x$DESKTOP_SESSION" = "default" -o "x$DESKTOP_SESSION" = "x" ]
-    then
-        user=`whoami`
-        desktop=`ps -eo pid,ruser,ruid,args | egrep gnome-session | grep -v grep | grep $user`
-
-        if [ "x$desktop" = "x" ]
-        then
-            export DESKTOP_MANAGER=other
-        else
-            export DESKTOP_MANAGER=gnome
-        fi
-
-    else
-        export DESKTOP_MANAGER=$DESKTOP_SESSION
-    fi
-
-}
-
-main()
-{
-    if [ "$MTP_WATCHDOG" -gt 0 ]
-    then
-        watchdog
-        watchdog_pid=$!
-    fi
-    while [ "$RUN" -gt 0 ]
-    do
-        mousetrap &
-        mousetrap_pid=$!
-        wait $mousetrap_pid
-
-        RUN=$?  # quit on a normal exit status from mousetrap
-
-        # We will stop re-running mousetrap on SEGV's (139 = SEGV + 128).
-        # The reason for this is that there are cases where Python
-        # will SEGV when mousetrap attempts to exit normally.  This happens
-        # because of something going on in pyorbit.  This should be
-        # fixed in pyorbit 2.14.1, but not everyone has that.
-        # So...we'll check for it.
-        #
-        if [ "$RUN" -eq 139 ]
-        then
-            RUN=0
-        fi
-
-        # We will also stop re-running mousetrap on KILL's (137 = KILL + 128).
-        # The reason for this is that if someone has done a "kill -KILL"
-        # on the Python process, it was probably on purpose and they want
-        # everything to die.
-        #
-        if [ "$RUN" -eq 137 ]
-        then
-            RUN=0
-        fi
-    done
-    kill_watchdog
-}
-
-
-trap kill_mousetrap QUIT TERM INT ABRT
-trap hup_mousetrap HUP
+# Amend search path to include the "site-package" directory where mousetrap is
+# installed.
+import sys
+sys.path.append('@pyexecdir@')
 
-if [ "x$RUNONCE" = "xfalse" -a "x$ARGS" = "x" ]
-then
-    main
-else
-    if [ `grep -c "\-q" <<< $ARGS` -gt 0 ]
-    then
-        cleanup
-    else
-        # If the user passed in a flag that results in mousetrap only
-        # outputting data to the console, don't kill any other mousetrap
-        # process.  We do this by looking for flags that *should*
-        # result in a cleanup (i.e., every legal command except
-        # -?, --help, -v, and --version).  This way, if the user
-        # erroneously types an illegal command line argument, the
-        # help text is emitted and the other mousetrap is not killed.
-        #
-        if [ `egrep -c "\-h|\-d|\-e|\-t" <<< $ARGS` -eq 0 ]
-        then
-            if [ `egrep -c "\-h" <<< $ARGS` -eq 0 ]
-            then
-                mousetrap "NO_CLEANUP"
-            else
-                mousetrap
-            fi
-        else
-            mousetrap &
-            mousetrap_pid=$!
-            wait $mousetrap_pid
-        fi
-    fi
-fi
+# Load and start the mousetrap controller.
+import mousetrap.app.main as mousetrap
+mousetrap.Controller().start()