Changeset 1108:0d45f3dff91b

Timestamp:

09/21/23 10:32:56 (14 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

On Linux the CEF message loop is run

Location:

src/mlx/gui

Files:

• cef.py (modified) (3 diffs)
• gui.py (modified) (3 diffs)

src/mlx/gui/cef.py

@@ -215 +215 @@
 def _initializeCEF(args, initializedCallback):
     """Perform the actual initialization of CEF using the given arguments."""
-    if os.name=="nt":
-        _initializeCEF1(args, initializedCallback)
-    else:
-        GObject.timeout_add(100, _initializeCEF1, args, initializedCallback)
-
-#------------------------------------------------------------------------------
-
-def _initializeCEF1(args, initializedCallback):
-    """Perform the actual initialization of CEF using the given arguments."""
     print("Initializing CEF with args:", args)
 
@@ -261 +252 @@
     initializedCallback()
     return False
+
+#------------------------------------------------------------------------------
+
+def messageLoop():
+    """Run the CEF message loop"""
+    cefpython.MessageLoop()
 
 #------------------------------------------------------------------------------
@@ -383 +380 @@
 #------------------------------------------------------------------------------
 
+def quitMessageLoop():
+    """Quit the CEF message loop"""
+    cefpython.QuitMessageLoop()
+
+#------------------------------------------------------------------------------
+
 def finalize():
     """Finalize the Chrome Embedded Framework."""

src/mlx/gui/gui.py

@@ -485 +485 @@
 
         singleton.raiseCallback = self.raiseCallback
-        Gtk.main()
+        if os.name=="nt":
+            Gtk.main()
+        else:
+            cef.initialize(self._cefInitialized)
+            cef.messageLoop()
+
         singleton.raiseCallback = None
 
@@ -1323 +1328 @@
         if result==Gtk.ResponseType.YES:
             self._statusIcon.destroy()
-            return Gtk.main_quit()
+            if os.name=="nt":
+                return Gtk.main_quit()
+            else:
+                cef.quitMessageLoop()
+                return True
 
     def _notebookPageSwitch(self, notebook, page, page_num):
@@ -1972 +1981 @@
         It checks if we already know the PID, and if not, asks the user whether
         to register."""
-        cef.initialize(self._cefInitialized)
+        if os.name=="nt":
+            cef.initialize(self._cefInitialized)
 
         if not self.config.pilotID and not self.config.password: