vim-compat: fix: Allow window to be raised under linux.

raghur · Oct 2, 2018 · 306d83c · 306d83c
1 parent 204916e
commit 306d83c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/plugin/ghost.vim b/plugin/ghost.vim
@@ -24,19 +24,15 @@ function! s:startGhost(tid)
 endfunction
 
 function! s:loadGhost()
-    if !has("nvim")
+    if executable("xdotool")
+        let g:ghost_nvim_window_id = system("xdotool getactivewindow")
         return
     endif
 
     if !has('timers')
         return
     endif
 
-    if executable("xdotool")
-        let g:ghost_nvim_window_id = system("xdotool getactivewindow")
-        return
-    endif
-
     if exists("g:ghost_autostart") && g:ghost_autostart
         let timer = timer_start(500, function("s:startGhost"))
     endif

diff --git a/rplugin/python3/ghost.py b/rplugin/python3/ghost.py
@@ -211,22 +211,27 @@ def _handle_on_message(self, req, websocket):
             self.nvim.command("echo '%s'" % ex)
 
     def _raise_window(self):
-        if self.linux_window_id:
-            subprocess.call(["xdotool", "windowactivate", self.linux_window_id])
-            logger.debug("activated window: %s", self.linux_window_id)
-        elif self.winapp:
-            logger.debug("WINDOWS: trying to raise window")
-            # dragons - this is the only thing that works.
-            try:
-                self.winapp.windows()[0].set_focus()
-                self.winapp.windows()[0].ShowInTaskbar()
-            except Exception as e:
-                logger.warning("Error during _raise_window, %s", e)
-        elif self.darwinapp:
-            logger.debug("Darwin: trying to raise window")
-            subprocess.call(["osascript", "-e",
-                             'tell application "' + self.darwinapp +
-                             '" to activate'])
+        try:
+            if self.linux_window_id:
+                subprocess.call(["xdotool", "windowactivate", self.linux_window_id])
+                logger.debug("activated window: %s", self.linux_window_id)
+            elif self.winapp:
+                logger.debug("WINDOWS: trying to raise window")
+                # dragons - this is the only thing that works.
+                try:
+                    self.winapp.windows()[0].set_focus()
+                    self.winapp.windows()[0].ShowInTaskbar()
+                except Exception as e:
+                    logger.warning("Error during _raise_window, %s", e)
+            elif self.darwinapp:
+                logger.debug("Darwin: trying to raise window")
+                subprocess.call(["osascript", "-e",
+                                 'tell application "' + self.darwinapp +
+                                 '" to activate'])
+        except Exception as e:
+            # with vim yarp etc - letting an exception escape messes
+            # with other plugins. so catch everything
+            logger.debug("error while activating window - %s" % e)
 
     def on_message(self, req, websocket):
         self.nvim.async_call(self._handle_on_message, req, websocket)