Merge pull request #10 from bluesabre/wayland-support

Disable embedding for unsupported environments

Author: bluesabre

po/sgt-launcher.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 04:36-0700\n"
+"POT-Creation-Date: 2021-09-11 03:38-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../org.bluesabre.SgtLauncher.desktop.in.h:1 ../sgtlauncher/SgtLauncher.py:39
-#: ../sgtlauncher/SgtLauncher.py:73 ../sgtlauncher/SgtLauncher.py:348
+#: ../sgtlauncher/SgtLauncher.py:73 ../sgtlauncher/SgtLauncher.py:389
 msgid "SGT Puzzles Collection"
 msgstr ""
 
@@ -51,20 +51,20 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
-#: ../sgtlauncher/SgtLauncher.py:209
+#: ../sgtlauncher/SgtLauncher.py:215 ../sgtlauncher/SgtLauncher.py:235
 #, python-format
 msgid "Loading %s"
 msgstr ""
 
-#: ../sgtlauncher/SgtLauncher.py:403
+#: ../sgtlauncher/SgtLauncher.py:444
 msgid "About"
 msgstr ""
 
-#: ../sgtlauncher/SgtLauncher.py:404
+#: ../sgtlauncher/SgtLauncher.py:445
 msgid "Report a Bug..."
 msgstr ""
 
-#: ../sgtlauncher/SgtLauncher.py:405
+#: ../sgtlauncher/SgtLauncher.py:446
 msgid "Quit"
 msgstr ""
 

sgtlauncher/SgtLauncher.py

@@ -200,6 +200,12 @@ def set_subtitle(self, title):
 
     def launch(self, title, icon_name, path):
         """Launch the specified application"""
+        if self.launcher.embeddable:
+            self.embedded_launch(title, icon_name, path)
+        else:
+            self.unembedded_launch(title, icon_name, path)
+
+    def embedded_launch(self, title, icon_name, path):
         # Toggle GTK_CSD=0 to guarantee embedding
         csd_env = os.environ.copy()
         csd_env["GTK_CSD"] = "0"
@@ -218,10 +224,45 @@ def launch(self, title, icon_name, path):
 
         def on_success():
             self.set_view("game", icon_name, title)
+
+        def on_error():
+            return self.back_to_launcher()
+
         self.launcher.launch(self.socket, self.game_process,
-                             on_success, self.back_to_launcher)
+                             on_success, on_error)
+
+    def unembedded_launch(self, title, icon_name, path):
+        subtitle = _("Loading %s") % title
+
+        if os.path.isfile(icon_name):
+            self.launching_image.set_from_file(icon_name)
+        else:
+            self.launching_image.set_from_icon_name(icon_name,
+                                                    Gtk.IconSize.DIALOG)
+        self.launching_title.set_markup("<b>%s</b>" % title)
+        self.set_view("loading", icon_name, subtitle)
+
+        def poll_process():
+            res = GLib.SOURCE_CONTINUE
+            if self.game_process is None:
+                res = GLib.SOURCE_REMOVE
+            if self.game_process.poll() is not None:
+                res = GLib.SOURCE_REMOVE
+            if res == GLib.SOURCE_REMOVE:
+                self.back_to_launcher()
+            return res
+
+        def launch_game():
+            self.game_process = subprocess.Popen([path])
+            self.hide()
+            GLib.timeout_add(200, poll_process)
+            return GLib.SOURCE_REMOVE
+
+        GLib.timeout_add(500, launch_game)
 
     def back_to_launcher(self):
+        if not self.launcher.embeddable:
+            self.show()
         if self.game_process is not None:
             self.game_process.terminate()
             self.game_process = None

sgtlauncher/SgtSocketLauncher.py

@@ -13,6 +13,7 @@
 #   You should have received a copy of the GNU General Public License along
 #   with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import struct
 import time
 import typing
@@ -34,6 +35,31 @@ def __init__(self):
         self.retry_timer = 0.05
         self.process = None
         self.window_id = None
+        self.embeddable = self.get_embeddable()
+
+    def get_embeddable(self):
+        override = os.environ.get("SGT_ENABLE_EMBED")
+        if override is not None:
+            return override == "1"
+
+        # Windows are not socketable under Wayland
+        wayland = os.environ.get("WAYLAND_DISPLAY")
+        if wayland is not None:
+            return False
+
+        # Flatpak seems to block embedding (sgt-launcher#8)
+        container = os.environ.get("container")
+        if container is not None:
+            if container == "flatpak":
+                return False
+
+        # GNOME doesn't allow for embedded window focus (sgt-launcher#7)
+        desktop = os.environ.get("XDG_CURRENT_DESKTOP")
+        if desktop is not None:
+            if "gnome" in desktop.lower():
+                return False
+
+        return True
 
     def launch(self, socket: "Gtk.Socket", process: "subprocess.Popen",
                on_success: typing.Callable[[], None],