Merge branch '2.2' into 3.0

# Conflicts:
#	setup.py

Author: grossmj

gns3/graphics_view.py

@@ -664,7 +664,7 @@ def mouseDoubleClickEvent(self, event):
                     self.configureSlot()
                     return
                 else:
-                    if sys.platform.startswith("win") and item.node().bringToFront():
+                    if item.node().bringToFront():
                         return
                     self.consoleFromItems(self.scene().selectedItems())
                     return
@@ -870,8 +870,8 @@ def populateDeviceContextualMenu(self, menu):
             show_in_file_manager_action.triggered.connect(self.showInFileManagerSlot)
             menu.addAction(show_in_file_manager_action)
 
-        if sys.platform.startswith("win") and True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "bringToFront"), items)):
-            # Action: bring console or window to front (Windows only)
+        if not sys.platform.startswith("darwin") and True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "bringToFront"), items)):
+            # Action: bring console or window to front (Windows and Linux only)
             bring_to_front_action = QtWidgets.QAction("Bring to front", menu)
             bring_to_front_action.setIcon(get_icon("front.svg"))
             bring_to_front_action.triggered.connect(self.bringToFrontSlot)

gns3/modules/virtualbox/virtualbox_vm.py

@@ -18,6 +18,7 @@
 """
 VirtualBox VM implementation.
 """
+import sys
 
 from gns3.node import Node
 from gns3.utils.bring_to_front import bring_window_to_front_from_process_name
@@ -100,7 +101,7 @@ def bringToFront(self):
         Bring the VM window to front.
         """
 
-        if self.status() == Node.started:
+        if self.status() == Node.started and sys.platform.startswith("win"):
             # try 2 different window title formats
             bring_window_to_front_from_process_name("VirtualBox.exe", title="{} [".format(self._settings["vmname"]))
             bring_window_to_front_from_process_name("VirtualBox.exe", title="{} (".format(self._settings["vmname"]))

gns3/modules/vmware/vmware_vm.py

@@ -19,6 +19,8 @@
 VMware VM implementation.
 """
 
+import sys
+
 from gns3.qt import QtCore
 from gns3.node import Node
 from gns3.utils.bring_to_front import bring_window_to_front_from_process_name
@@ -124,7 +126,7 @@ def bringToFront(self):
         Bring the VM window to front.
         """
 
-        if self.status() == Node.started:
+        if self.status() == Node.started and sys.platform.startswith("win"):
             try:
                 vmx_pairs = self.module().parseVMwareFile(self.settings()["vmx_path"])
             except OSError as e:

gns3/node.py

@@ -16,8 +16,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import sys
 import pathlib
 import re
+import shutil
+import subprocess
 
 from gns3.controller import Controller
 from gns3.ports.ethernet_port import EthernetPort
@@ -803,18 +806,30 @@ def bringToFront(self):
         """
 
         if self.status() == Node.started:
-            console_command = self.consoleCommand()
-            if console_command:
-                process_name = console_command.split()[0]
-                if bring_window_to_front_from_process_name(process_name, self.name()):
+            if sys.platform.startswith("linux"):
+                wmctrl_path = shutil.which("wmctrl")
+                if wmctrl_path:
+                    try:
+                        # use wmctrl to raise the window based on the node name (this doesn't work well with window having multiple tabs)
+                        subprocess.run([wmctrl_path, "-a", self.name()], check=True, env=os.environ)
+                        return True
+                    except subprocess.CalledProcessError:
+                        log.debug("Could not find window title '{}' to bring it to front".format(self.name()))
+                    except OSError as e:
+                        log.warning("Count not focus on terminal window: '{}'".format(e))
+            elif sys.platform.startswith("win"):
+                console_command = self.consoleCommand()
+                if console_command:
+                    process_name = console_command.split()[0]
+                    if bring_window_to_front_from_process_name(process_name, self.name()):
+                        return True
+                    else:
+                        log.debug("Could not find process name '' and window title '{}' to bring it to front".format(process_name, self.name()))
+
+                if bring_window_to_front_from_title(self.name()):
                     return True
                 else:
-                    log.debug("Could not find process name '' and window title '{}' to bring it to front".format(process_name, self.name()))
-
-            if bring_window_to_front_from_title(self.name()):
-                return True
-            else:
-                log.debug("Could not find window title '{}' to bring it to front".format(self.name()))
+                    log.debug("Could not find window title '{}' to bring it to front".format(self.name()))
         return False
 
     def importFile(self, path, source_path):

gns3/telnet_console.py

@@ -26,6 +26,7 @@
 import shlex
 import subprocess
 import psutil
+import shutil
 
 from .main_window import MainWindow
 from .controller import Controller
@@ -102,7 +103,16 @@ def exec_command(self, command):
                 # inject gnome-terminal environment variables
                 if "GNOME_TERMINAL_SERVICE" not in env or "GNOME_TERMINAL_SCREEN" not in env:
                     env.update(gnome_terminal_env())
-            subprocess.Popen(args, env=env)
+            proc = subprocess.Popen(args, env=env)
+            if sys.platform.startswith("linux"):
+                wmctrl_path = shutil.which("wmctrl")
+                if wmctrl_path:
+                    proc.wait() # wait for the terminal to open
+                    try:
+                        # use wmctrl to raise the window based on the node name
+                        subprocess.run([wmctrl_path, "-a", self._name], env=os.environ)
+                    except OSError as e:
+                        self.consoleError.emit("Count not focus on terminal window: '{}'".format(e))
 
     def run(self):