feat: add kde wayland support

.github/workflows/tests.yml

@@ -13,6 +13,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
+
+    env:
+      # Needed so we don't get errors in CI
+      XDG_SESSION_TYPE: "x11"
+      XDG_CURRENT_DESKTOP: "KDE"
+
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
@@ -38,7 +44,7 @@ jobs:
         run: flutter gen-l10n
 
       - name: Run lint
-        run: flutter analyze
+        run: flutter analyze --no-fatal-infos
 
       - name: Run tests
         run: flutter test

assets/lib/linux/list_windows_kde.js

@@ -0,0 +1,94 @@
+// https://unix.stackexchange.com/a/706478/379240
+
+function print(str) {
+    console.info('Nyrna: ' + str);
+}
+
+let windows = workspace.windowList();
+print('Found ' + windows.length + ' windows');
+
+function updateWindowsOnDBus(windows) {
+    let windowsList = [];
+
+    for (let window of windows) {
+        windowsList.push({
+            caption: window.caption,
+            pid: window.pid,
+            internalId: window.internalId,
+            onCurrentDesktop: isWindowOnCurrentDesktop(window),
+        });
+    }
+
+    callDBus(
+        'codes.merritt.Nyrna',
+        '/',
+        'codes.merritt.Nyrna',
+        'updateWindows',
+        JSON.stringify(windowsList),
+        (result) => {
+            if (result) {
+                print('Successfully updated windows on DBus');
+            } else {
+                print('Failed to update windows on DBus');
+            }
+        }
+    );
+}
+
+function isWindowOnCurrentDesktop(window) {
+    let windowDesktops = Object.values(window.desktops);
+    let windowIsOnCurrentDesktop = window.onAllDesktops;
+
+    if (!windowIsOnCurrentDesktop) {
+        for (let windowDesktop of windowDesktops) {
+            if (windowDesktop.id === workspace.currentDesktop.id) {
+                windowIsOnCurrentDesktop = true;
+                break;
+            } else {
+                windowIsOnCurrentDesktop = false;
+            }
+        }
+    }
+
+    return windowIsOnCurrentDesktop;
+}
+
+function updateCurrentDesktopOnDBus() {
+    print('Current desktop id: ' + workspace.currentDesktop.id);
+
+    callDBus(
+        'codes.merritt.Nyrna',
+        '/',
+        'codes.merritt.Nyrna',
+        'updateCurrentDesktop',
+        workspace.currentDesktop,
+        (result) => {
+            if (result) {
+                print('Successfully updated current desktop on DBus');
+            } else {
+                print('Failed to update current desktop on DBus');
+            }
+        }
+    );
+}
+
+updateCurrentDesktopOnDBus();
+updateWindowsOnDBus(windows);
+
+workspace.currentDesktopChanged.connect(() => {
+    print('Current desktop changed');
+    updateCurrentDesktopOnDBus();
+    updateWindowsOnDBus(windows);
+});
+
+workspace.windowAdded.connect(window => {
+    print('Window added: ' + window.caption);
+    windows.push(window);
+    updateWindowsOnDBus(windows);
+});
+
+workspace.windowRemoved.connect(window => {
+    print('Window removed: ' + window.caption);
+    windows = windows.filter(w => w.internalId !== window.internalId);
+    updateWindowsOnDBus(windows);
+});

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

lib/active_window/src/active_window.dart

@@ -141,7 +141,7 @@ class ActiveWindow {
     return false;
   }
 
-  Future<void> _minimize(int windowId) async {
+  Future<void> _minimize(String windowId) async {
     final shouldMinimize = await _getShouldMinimize();
     if (!shouldMinimize) return;
 
@@ -150,7 +150,7 @@ class ActiveWindow {
     if (!minimized) log.e('Failed to minimize window.');
   }
 
-  Future<void> _restore(int windowId) async {
+  Future<void> _restore(String windowId) async {
     final shouldRestore = await _getShouldMinimize();
     if (!shouldRestore) return;
 

lib/app/cubit/app_cubit.dart

@@ -84,9 +84,9 @@ Unable to determine session type. The XDG_SESSION_TYPE environment variable is s
 Please note that Wayland is not currently supported.''';
 
     const waylandNotSupportedMsg = '''
-Wayland is not currently supported.
+Wayland is currently supported only on KDE Plasma.
 
-Only xwayland apps will be detected.
+For other desktop environments, only xwayland apps will be detected.
 
 If Wayland support is important to you, consider voting on the issue:
 
@@ -106,12 +106,19 @@ env QT_QPA_PLATFORM=xcb <app>
 
 Otherwise, [consider signing in using X11 instead](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/).''';
 
-    switch (sessionType) {
-      case 'wayland':
-        log.w(waylandNotSupportedMsg);
-        emit(state.copyWith(linuxSessionMessage: waylandNotSupportedMsg));
-        return;
-      case 'x11':
+    emit(state.copyWith(sessionType: sessionType));
+
+    log.i('Session type: $sessionType');
+
+    switch (sessionType.displayProtocol) {
+      case DisplayProtocol.wayland:
+        if (sessionType.environment == DesktopEnvironment.kde) {
+          log.i('KDE Wayland session detected and is supported, proceeding.');
+        } else {
+          log.w(waylandNotSupportedMsg);
+          emit(state.copyWith(linuxSessionMessage: waylandNotSupportedMsg));
+        }
+      case DisplayProtocol.x11:
         break;
       default:
         log.w(unknownSessionMsg);
@@ -202,4 +209,10 @@ Otherwise, [consider signing in using X11 instead](https://docs.fedoraproject.or
       return false;
     }
   }
+
+  @override
+  Future<void> close() async {
+    await _nativePlatform.dispose();
+    await super.close();
+  }
 }

lib/app/cubit/app_state.dart

@@ -7,6 +7,11 @@ class AppState with _$AppState {
     /// session type is unknown.
     String? linuxSessionMessage,
 
+    /// The type of desktop session the user is running.
+    ///
+    /// Currently only used on Linux.
+    SessionType? sessionType,
+
     /// True if this is the first run of the app.
     required bool firstRun,
     required String runningVersion,

lib/apps_list/models/interaction_error.dart

@@ -5,7 +5,7 @@ import '../enums.dart';
 class InteractionError {
   final InteractionType interactionType;
   final ProcessStatus statusAfterInteraction;
-  final int windowId;
+  final String windowId;
 
   const InteractionError({
     required this.interactionType,

lib/loading/cubit/loading_cubit.dart

@@ -10,9 +10,7 @@ part 'loading_cubit.freezed.dart';
 class LoadingCubit extends Cubit<LoadingState> {
   final NativePlatform nativePlatform;
 
-  LoadingCubit()
-      : nativePlatform = NativePlatform(),
-        super(const LoadingInitial()) {
+  LoadingCubit(this.nativePlatform) : super(const LoadingInitial()) {
     checkDependencies();
   }
 

lib/loading/loading_page.dart

@@ -16,44 +16,40 @@ class LoadingPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => LoadingCubit(),
-      lazy: false,
-      child: Scaffold(
-        body: Center(
-          child: BlocConsumer<LoadingCubit, LoadingState>(
-            listener: (context, state) {
-              if (state is LoadingSuccess) {
-                Navigator.pushReplacementNamed(context, AppsListPage.id);
-              }
-            },
-            builder: (context, state) {
-              switch (state) {
-                case LoadingError():
-                  return Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Card(
-                      child: Container(
-                        padding: const EdgeInsets.all(20.0),
-                        child: MarkdownBody(
-                          data: state.errorMsg,
-                          onTapLink: (text, href, title) {
-                            if (href == null) {
-                              log.e('Broken link: $href');
-                              return;
-                            }
+    return Scaffold(
+      body: Center(
+        child: BlocConsumer<LoadingCubit, LoadingState>(
+          listener: (context, state) {
+            if (state is LoadingSuccess) {
+              Navigator.pushReplacementNamed(context, AppsListPage.id);
+            }
+          },
+          builder: (context, state) {
+            switch (state) {
+              case LoadingError():
+                return Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Card(
+                    child: Container(
+                      padding: const EdgeInsets.all(20.0),
+                      child: MarkdownBody(
+                        data: state.errorMsg,
+                        onTapLink: (text, href, title) {
+                          if (href == null) {
+                            log.e('Broken link: $href');
+                            return;
+                          }
 
-                            AppCubit.instance.launchURL(href);
-                          },
-                        ),
+                          AppCubit.instance.launchURL(href);
+                        },
                       ),
                     ),
-                  );
-                default:
-                  return const CircularProgressIndicator();
-              }
-            },
-          ),
+                  ),
+                );
+              default:
+                return const CircularProgressIndicator();
+            }
+          },
         ),
       ),
     );

lib/main.dart

@@ -16,6 +16,7 @@ import 'apps_list/apps_list.dart';
 import 'argument_parser/argument_parser.dart';
 import 'autostart/autostart_service.dart';
 import 'hotkey/global/hotkey_service.dart';
+import 'loading/loading.dart';
 import 'logs/logs.dart';
 import 'native_platform/native_platform.dart';
 import 'settings/cubit/settings_cubit.dart';
@@ -33,7 +34,6 @@ Future<void> main(List<String> args) async {
     ..parseArgs(args);
 
   final storage = await StorageRepository.initialize(Hive);
-  final nativePlatform = NativePlatform();
 
   bool verbose = argParser.verbose;
   if (!verbose) {
@@ -52,6 +52,7 @@ Future<void> main(List<String> args) async {
   final packageInfo = await PackageInfo.fromPlatform();
   log.i('Starting Nyrna v${packageInfo.version}');
 
+  final nativePlatform = await NativePlatform.initialize();
   final processRepository = ProcessRepository.init();
 
   final appWindow = AppWindow(storage);
@@ -119,6 +120,8 @@ Future<void> main(List<String> args) async {
     appVersion: AppVersion(packageInfo),
   );
 
+  final loadingCubit = LoadingCubit(nativePlatform);
+
   runApp(
     MultiRepositoryProvider(
       providers: [
@@ -128,6 +131,7 @@ Future<void> main(List<String> args) async {
         providers: [
           BlocProvider.value(value: appCubit),
           BlocProvider.value(value: appsListCubit),
+          BlocProvider.value(value: loadingCubit),
           BlocProvider.value(value: settingsCubit),
           BlocProvider.value(value: themeCubit),
         ],

lib/native_platform/src/linux/dbus/codes.merritt.Nyrna.xml

@@ -0,0 +1,10 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<node>
+    <interface name="codes.merritt.Nyrna">
+        <method name="updateWindows">
+            <arg type="b" direction="out" />
+            <arg name="windows" type="s" direction="in" />
+        </method>
+    </interface>
+</node>