hsmodule: prioritise focused window when searching for Live

Author: kwvg

extensions/les/LESmain.lua

@@ -1858,14 +1858,21 @@ appwatcher = hs.application.watcher.new(function(name, event, app)
 end):start() -- terminates hotkeys when ableton is unfocussed
 i = 1
 function appwatch(name, event, app)
+    -- If something other than Live got caught by the application watcher, just
+    -- silently pretend it doesn't exist and hope the next event nets us a Live
+    -- instance
+    if isHsAppObjLive(app) == false then
+        return
+    end
+
     if hs.window.focusedWindow() == nil then
         goto epicend
         return
     end
 
-    if event == hs.application.watcher.activated or hs.application.watcher.deactivated then
+    if event == hs.application.watcher.activated or event == hs.application.watcher.deactivated then
         if hs.window.focusedWindow() then
-            if isHsAppObjLive(hs.window.focusedWindow():application()) then
+            if hs.window.focusedWindow():application() == app then
                 if threadsenabled == false then
                     print("live is in window focus")
                     enablemacros()

extensions/les/proccom.lua

@@ -39,19 +39,6 @@ function isLiveFocused()
   return false
 end
 
--- Search for a running instance of Live
---
--- Uses similar fallback to isHsAppObjLive() but doesn't rely on
--- it because APIs are slightly different. Like isHsAppObjLive(),
--- we're relying on exact matching.
-function getLiveHsAppObj()
-  local hsAppObj = hs.application.find(targetBundle)
-  if hsAppObj == nil then
-    hsAppObj = hs.application.find(targetName, true, true)
-  end
-  return hsAppObj
-end
-
 function getLiveVersion(str)
   local infoPlistPath = string.format("%s/Contents/Info.plist", str)
   if ioIsFilePresent(infoPlistPath) == true then
@@ -83,6 +70,27 @@ function getLiveVersion(str)
                  , 10)
 end
 
+-- Search for a running, preferably in-focus, instance of Live
+--
+-- Uses similar fallback to isHsAppObjLive() but doesn't rely on
+-- it because APIs are slightly different. Like isHsAppObjLive(),
+-- we're relying on exact matching.
+function getLiveHsAppObj()
+  local hsAppObj = hs.window.focusedWindow():application()
+  if isHsAppObjLive(hsAppObj) == false then
+    hsAppObj = hs.application.find(targetBundle)
+  end
+  if hsAppObj == nil then
+    hsAppObj = hs.application.find(targetName, true, true)
+  end
+  if hsAppObj ~= nil then
+    print(string.format("getLiveHsAppObj(): Found instance of Live %s", getLiveVersion(hsAppObj:path())))
+  else
+    print("getLiveHsAppObj(): Unable to find running Live instance")
+  end
+  return hsAppObj
+end
+
 -- Creates a table of strings consisting of valid Live menu entries
 -- (these include children, which findMenuItem may not necessarily
 -- include)