sway detection altered

nwg_panel/common.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
+import os
 sway = False
 
-if sway:
+if os.getenv('SWAYSOCK') is not None:
     from i3ipc import Connection
     i3 = Connection()
+
 ipc_data = None
 
 outputs = {}

nwg_panel/config.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 
+import os
 import sys
 import gi
 
@@ -8,11 +9,13 @@ from gi.repository import Gtk, Gdk, GLib
 
 from nwg_panel.tools import get_config_dir, load_json, list_outputs, check_key, is_command, list_configs
 
+sway = os.getenv('SWAYSOCK') is not None
+
 config_dir = get_config_dir()
 configs = {}
 editor = None
 selector_window = None
-outputs = list_outputs()
+outputs = list_outputs(sway=sway, silent=True)
 
 
 def handle_keyboard(window, event):

nwg_panel/main.py

@@ -36,8 +36,8 @@ dir_name = os.path.dirname(__file__)
 
 from nwg_panel import common
 
-common.sway = os.getenv('SWAYSOCK') is not None
-if common.sway:
+sway = os.getenv('SWAYSOCK') is not None
+if sway:
     from i3ipc import Connection
 
     common.i3 = Connection()
@@ -58,13 +58,13 @@ def restart():
 
 def check_tree():
     old = len(common.outputs)
-    common.outputs = list_outputs(silent=True)
+    common.outputs = list_outputs(sway=sway, silent=True)
     new = len(common.outputs)
     if old != 0 and old != new:
         print("Number of outputs changed")
         restart()
 
-    if common.sway:
+    if sway:
         # Do if tree changed
         tree = common.i3.get_tree()
         if tree.ipc_data != common.ipc_data:
@@ -92,7 +92,7 @@ def instantiate_content(panel, container, content_list):
     for item in content_list:
         if item == "sway-taskbar":
             if "sway-taskbar" in panel:
-                if common.sway:
+                if sway:
                     check_key(panel["sway-taskbar"], "all-outputs", False)
                     if panel["sway-taskbar"]["all-outputs"] or "output" not in panel:
                         taskbar = SwayTaskbar(panel["sway-taskbar"], common.i3, panel["position"])
@@ -108,7 +108,7 @@ def instantiate_content(panel, container, content_list):
                 print("'sway-taskbar' not defined in this panel instance")
 
         if item == "sway-workspaces":
-            if common.sway:
+            if sway:
                 if "sway-workspaces" in panel:
                     workspaces = SwayWorkspaces(panel["sway-workspaces"])
                     container.pack_start(workspaces, False, False, panel["items-padding"])
@@ -215,7 +215,7 @@ def main():
     copy_executors(os.path.join(dir_name, "executors"), os.path.join(common.config_dir, "executors"))
     copy_files(os.path.join(dir_name, "config"), common.config_dir, args.restore)
 
-    common.outputs = list_outputs()
+    common.outputs = list_outputs(sway=sway)
 
     panels = load_json(config_file)
 

nwg_panel/tools.py

@@ -171,13 +171,13 @@ def save_string(string, file):
         print("Error writing file '{}'".format(file))
 
 
-def list_outputs(silent=False):
+def list_outputs(sway=False, silent=False):
     """
     Get output names and geometry from i3 tree, assign to Gdk.Display monitors.
     :return: {"name": str, "x": int, "y": int, "width": int, "height": int, "monitor": Gkd.Monitor}
     """
     outputs_dict = {}
-    if nwg_panel.common.sway:
+    if sway:
         if not silent:
             print("Running on sway")
         for item in nwg_panel.common.i3.get_tree():