Wayland multimonitor management

Author: sblantipodi

src/main/java/org/dpsoftware/FireflyLuciferin.java

@@ -224,10 +224,6 @@ public void start(Stage stage) throws Exception {
         if (!NativeExecutor.isLinux()) {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         }
-        // If this instance spawns new instances, don't launch grabbers here.
-        if (!(MainSingleton.getInstance().spawnInstances && MainSingleton.getInstance().config.getMultiMonitor() > 1)) {
-            launchGrabberAndConsumers();
-        }
         scheduleCheckForNightMode();
         StorageManager storageManager = new StorageManager();
         storageManager.updateConfigFile(MainSingleton.getInstance().config);
@@ -252,6 +248,10 @@ public void start(Stage stage) throws Exception {
         }
         grabberManager.getFPS();
         imageProcessor.calculateBorders();
+        // If this instance spawns new instances, don't launch grabbers here.
+        if (!(MainSingleton.getInstance().spawnInstances && MainSingleton.getInstance().config.getMultiMonitor() > 1)) {
+            launchGrabberAndConsumers();
+        }
         // If multi monitor, first instance, single instance, start message server
         if (CommonUtility.isSingleDeviceMainInstance()) {
             MessageServer messageServer = new MessageServer();

src/main/java/org/dpsoftware/NativeExecutor.java

@@ -204,6 +204,15 @@ public static boolean isLinux() {
         return com.sun.jna.Platform.isLinux();
     }
 
+    /**
+     * Check if Wayland
+     *
+     * @return if it's Wayland
+     */
+    public static boolean isWayland() {
+        return isLinux() && System.getenv(Constants.DISPLAY_MANAGER_CHK).equalsIgnoreCase(Constants.WAYLAND);
+    }
+
     /**
      * Single point to fake the OS if needed
      *

src/main/java/org/dpsoftware/config/Constants.java

@@ -290,6 +290,8 @@ public class Constants {
     public static final String CUDA_ERROR_TITLE = "cuda.error.title";
     public static final String CUDA_ERROR_HEADER = "cuda.error.header";
     public static final String CUDA_ERROR_CONTEXT = "cuda.error.context";
+    public static final String WAYLAND_SCREEN_REC_PERMISSION = "wayland.screen.rec.permission";
+    public static final String WAYLAND_SCREEN_REC_PERMISSION_CONTEXT = "wayland.screen.rec.permission.context";
     public static final String START = "tray.icon.start";
     public static final String STOP = "tray.icon.stop";
     public static final String STOP_STR = "STOP";

src/main/java/org/dpsoftware/gui/controllers/ModeTabController.java

@@ -181,7 +181,7 @@ void initDefaultValues() {
             } else if (NativeExecutor.isMac()) {
                 captureMethod.setValue(Configuration.CaptureMethod.AVFVIDEOSRC);
             } else {
-                if (System.getenv(Constants.DISPLAY_MANAGER_CHK).equalsIgnoreCase(Constants.WAYLAND)) {
+                if (NativeExecutor.isWayland()) {
                     captureMethod.setValue(Configuration.CaptureMethod.PIPEWIREXDG);
                 } else {
                     captureMethod.setValue(Configuration.CaptureMethod.XIMAGESRC);

src/main/java/org/dpsoftware/managers/PipelineManager.java

@@ -21,9 +21,11 @@
 */
 package org.dpsoftware.managers;
 
+import javafx.scene.control.Alert;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.dpsoftware.MainSingleton;
+import org.dpsoftware.NativeExecutor;
 import org.dpsoftware.audio.*;
 import org.dpsoftware.config.Configuration;
 import org.dpsoftware.config.Constants;
@@ -87,12 +89,9 @@ record XdgStreamDetails(Integer streamId, FileDescriptor fileDescriptor) {
     public static XdgStreamDetails getXdgStreamDetails() {
         CompletableFuture<String> sessionHandleMaybe = new CompletableFuture<>();
         CompletableFuture<Integer> streamIdMaybe = new CompletableFuture<>();
-
         DBusConnection dBusConnection = DBusConnectionBuilder.forSessionBus().build(); // cannot free/close this for the duration of the capture
-
         DbusScreenCast screenCastIface = dBusConnection.getRemoteObject("org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop", DbusScreenCast.class);
         String handleToken = UUID.randomUUID().toString().replaceAll("-", "");
-
         DBusMatchRule matchRule = new DBusMatchRule("signal", "org.freedesktop.portal.Request", "Response");
         dBusConnection.addGenericSigHandler(matchRule, signal -> {
             try {
@@ -136,6 +135,12 @@ public static XdgStreamDetails getXdgStreamDetails() {
             selectSourcesMap.put("restore_token", new Variant<>(restoreToken));
         }
         screenCastIface.SelectSources(receivedSessionHandle, selectSourcesMap);
+        if (NativeExecutor.isWayland() && (MainSingleton.getInstance().config.getScreenCastRestoreToken() == null || MainSingleton.getInstance().config.getScreenCastRestoreToken().isEmpty())) {
+            DisplayManager displayManager = new DisplayManager();
+            String displayName = displayManager.getDisplayName(MainSingleton.getInstance().whoAmI - 1);
+            MainSingleton.getInstance().guiManager.showAlert(Constants.FIREFLY_LUCIFERIN, CommonUtility.getWord(Constants.WAYLAND_SCREEN_REC_PERMISSION).replace("{0}", displayName),
+                    CommonUtility.getWord(Constants.WAYLAND_SCREEN_REC_PERMISSION_CONTEXT).replace("{0}", displayName), Alert.AlertType.INFORMATION);
+        }
         screenCastIface.Start(receivedSessionHandle, "", Collections.emptyMap());
         var c = streamIdMaybe.thenApply(streamId -> {
             FileDescriptor fileDescriptor = screenCastIface.OpenPipeWireRemote(receivedSessionHandle, Collections.emptyMap()); // block until stream started before calling OpenPipeWireRemote

src/main/resources/messagebundle_de.properties

@@ -265,6 +265,8 @@ mqtt.error.context=Luciferin kann keine Verbindung zum MQTT-Server herstellen, b
 cuda.error.title=Plugin-Fehler
 cuda.error.header=GStreamer-Plugins nicht gefunden.
 cuda.error.context=Ihr System verfügt nicht über alle erforderlichen Plugins zum Ausführen von NVIDIA CUDA.\nBitte überprüfen Sie das WIKI des Projekts, um zu erfahren, wie Sie alle erforderlichen Abhängigkeiten installieren.
+wayland.screen.rec.permission=Luciferin benötigt die Erlaubnis, Ihre\n{0}
+wayland.screen.rec.permission.context=In einem Popup werden Sie um Erlaubnis zum Aufzeichnen Ihres Bildschirms gebeten.\nBitte wählen Sie „{0}“\nund klicken Sie dann auf die Schaltfläche „Teilen“.
 click.ok.download=\nKlicke auf “OK”, um die neue Version herunterzuladen und zu installieren.
 click.ok.download.linux=\nKlicke auf “OK”, um die neue Version in \n~/Documents/FireflyLuciferin herunterzuladen.\n
 once.download.finished=Sobald der Download abgeschlossen ist,\nwechsle bitte zu diesem Ordner und installiere das Programm manuell.

src/main/resources/messagebundle_en.properties

@@ -265,6 +265,8 @@ mqtt.error.context=Luciferin is unable to connect to the MQTT server, please cor
 cuda.error.title=Plugins error
 cuda.error.header=GStreamer plugins not found.
 cuda.error.context=Your system does not have all the required plugins to run NVIDIA CUDA.\nPlease check the project's WIKI to learn how to install all the required dependencies.
+wayland.screen.rec.permission=Luciferin needs the permission to record your\n{0}
+wayland.screen.rec.permission.context=A popup will ask you for the permission to record your screen,\nplease select the "{0}"\nand then click the "Share" button.
 click.ok.download=\nClick Ok to download and install the new version.
 click.ok.download.linux=\nClick Ok to download new version in your\n~/Documents/FireflyLuciferin folder.\n
 once.download.finished=Once the download is finished,\nplease go to that folder and install it manually.

src/main/resources/messagebundle_es.properties

@@ -264,6 +264,8 @@ mqtt.error.context=Luciferin no puede conectarse al servidor MQTT, por favor, co
 cuda.error.title=Error de plugins
 cuda.error.header=Complementos de GStreamer no encontrados.
 cuda.error.context=Su sistema no tiene todos los complementos necesarios para ejecutar NVIDIA CUDA.\nConsulte el WIKI del proyecto para saber cómo instalar todas las dependencias necesarias.
+wayland.screen.rec.permission=Luciferin necesita permiso para grabar tu\n{0}
+wayland.screen.rec.permission.context=Una ventana emergente le pedirá permiso para grabar su pantalla.\nSeleccione "{0}"\ny luego haga clic en el botón "Compartir".
 click.ok.download=\nPulse OK para descatgar e instalar la nueva versión.
 click.ok.download.linux=\nPulse OK para descargar la nueva versión en su carpeta\n~/Documents/FireflyLuciferin.\n
 once.download.finished=Cuando haya terminado la descarga,\npor favor, vaya a dicha carpeta e instálelo manualmente.

src/main/resources/messagebundle_fr.properties

@@ -265,6 +265,8 @@ mqtt.error.context=Luciferin n'arrive pas à se connecter au serveur MQTT, merci
 cuda.error.title=Erreur de plugin
 cuda.error.header=Plugins GStreamer introuvables.
 cuda.error.context=Votre système ne dispose pas de tous les plugins requis pour exécuter NVIDIA CUDA.\nVeuillez consulter le WIKI du projet pour savoir comment installer toutes les dépendances requises.
+wayland.screen.rec.permission=Luciferin a besoin de l'autorisation pour enregistrer votre\n{0}
+wayland.screen.rec.permission.context=Une fenêtre contextuelle vous demandera l'autorisation d'enregistrer votre écran.\nVeuillez sélectionner "{0}"\npuis cliquez sur le bouton "Partager".
 click.ok.download=\nCliquer sur Ok pour télécharger et installer la nouvelle version.
 click.ok.download.linux=\nCliquez sur OK pour télécharger la nouvelle version dans votre répertoire\n~/Documents/FireflyLuciferin\n
 once.download.finished=Une fois le téléchargement terminé,\nveuillez accéder à ce dossier et l'installer manuellement.

src/main/resources/messagebundle_hu.properties

@@ -265,6 +265,8 @@ mqtt.error.context=Luciferin nem tud csatlakozni az MQTT szerverhez, ellenőrizd
 cuda.error.title=Plugin hiba
 cuda.error.header=A GStreamer bővítmények nem találhatók.
 cuda.error.context=Rendszere nem rendelkezik az NVIDIA CUDA futtatásához szükséges összes beépülő modullal.\nKérjük, ellenőrizze a projekt WIKI-jét, hogy megtudja, hogyan telepítheti az összes szükséges függőséget.
+wayland.screen.rec.permission=A Luciferinnek engedélyre van szüksége az Ön\n{0}
+wayland.screen.rec.permission.context=Egy felugró ablak engedélyt kér a képernyő rögzítésére,\nkérjük, válassza ki a(z) "{0}" lehetőséget\n, majd kattintson a "Megosztás" gombra.
 click.ok.download=\nAz új verzió telepítéséhez klikkelj az OK-ra.
 click.ok.download.linux=\nAz új verziójú \n~/Documents/FireflyLuciferin mappában taláható firmware telepítéséhez klikkelj az OK-ra.\n
 once.download.finished=A letöltés végeztével,\n kérlek telepítsed manuálisan a letöltési mappából.

src/main/resources/messagebundle_it.properties

@@ -265,6 +265,8 @@ mqtt.error.context=Luciferin non riesce a connettersi al server MQTT. Per favore
 cuda.error.title=Errore dei plugin
 cuda.error.header=Plugin GStreamer non trovati.
 cuda.error.context=Il tuo sistema non dispone di tutti i plugin necessari per eseguire NVIDIA CUDA.\nControlla il WIKI del progetto per sapere come installare tutte le dipendenze richieste.
+wayland.screen.rec.permission=Luciferin ha bisogno del permesso per registrare il tuo\n{0}
+wayland.screen.rec.permission.context=Un popup ti chiederà l'autorizzazione per registrare il tuo schermo,\nseleziona "{0}"\n quindi fai clic sul pulsante "Condividi".
 click.ok.download=\nClicca Ok per scaricare e installare la nuova versione.
 click.ok.download.linux=\nClicca Ok per scaricare la nuova versione nella seguente\n~/Documents/FireflyLuciferin cartella.\n
 once.download.finished=Quando il download sarà terminato,\nvai in quella cartella e installa manualmente.

src/main/resources/messagebundle_ru.properties

@@ -265,6 +265,8 @@ mqtt.error.context=Luciferin не удается подключиться к с
 cuda.error.title=Ошибка плагинов
 cuda.error.header=Плагины GStreamer не найдены.
 cuda.error.context=В вашей системе нет всех необходимых плагинов для запуска NVIDIA CUDA.\nПожалуйста, проверьте WIKI проекта, чтобы узнать, как установить все необходимые зависимости.
+wayland.screen.rec.permission=Люциферину необходимо разрешение на запись вашего\n{0}
+wayland.screen.rec.permission.context=Всплывающее окно запросит разрешение на запись вашего экрана.\nвыберите «{0}»\nи нажмите кнопку «Поделиться».
 click.ok.download=\nНажмите «ОК», чтобы загрузить и установить новую версию.
 click.ok.download.linux=\nНажмите «ОК», чтобы загрузить новую версию в папку \n~/Documents/FireflyLuciferin.\n
 once.download.finished=Когда загрузка будет завершена,\nперейдите в эту папку и установите программу вручную.