Electron support for Linux (#1074)

* init * SQLite changes * Move html folder, edit build scripts * AppApi interface * Build flags * AppApi inheritance * Finishing touches * Merge upstream changes * Test CI * Fix class inits * Rename AppApi * Merge upstream changes * Fix SQLiteLegacy on Linux, Add Linux interop, build tools * Linux specific localisation strings * Make it run * Bring back most of Linux functionality * Clean up * Fix TTS voices * Fix UI var * Changes * Electron minimise to tray * Remove separate toggle for WlxOverlay * Fixes * Touchups * Move csproj * Window zoom, Desktop Notifications, VR check on Linux * Fix desktop notifications, VR check spam * Fix building on Linux * Clean up * Fix WebApi headers * Rewrite VRCX updater * Clean up * Linux updater * Add Linux to build action * init * SQLite changes * Move html folder, edit build scripts * AppApi interface * Build flags * AppApi inheritance * Finishing touches * Merge upstream changes * Test CI * Fix class inits * Rename AppApi * Merge upstream changes * Fix SQLiteLegacy on Linux, Add Linux interop, build tools * Linux specific localisation strings * Make it run * Bring back most of Linux functionality * Clean up * Fix TTS voices * Changes * Electron minimise to tray * Remove separate toggle for WlxOverlay * Fixes * Touchups * Move csproj * Window zoom, Desktop Notifications, VR check on Linux * Fix desktop notifications, VR check spam * Fix building on Linux * Clean up * Fix WebApi headers * Rewrite VRCX updater * Clean up * Linux updater * Add Linux to build action * Test updater * Rebase and handle merge conflicts * Fix Linux updater * Fix Linux app restart * Fix friend order * Handle AppImageInstaller, show an install message on Linux * Updates to the AppImage installer * Fix Linux updater, fix set version, check for .NET, copy wine prefix * Handle random errors * Rotate tall prints * try fix Linux restart bug * Final --------- Co-authored-by: rs189 <35667100+rs189@users.noreply.github.com>
2026-04-19 14:53:50 +02:00 · 2025-01-11 13:09:44 +13:00
parent a39eb9d5ed
commit 938fff63d0
223 changed files with 15841 additions and 9562 deletions
--- a/Dotnet/StartupArgs.cs
+++ b/Dotnet/StartupArgs.cs
@@ -4,7 +4,6 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.

-using CefSharp.Internals;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -13,12 +12,17 @@ using System.Linq;
 using System.Management;
 using System.Text;
 using System.Threading;
+
+#if !LINUX
 using System.Windows.Forms;
+using CefSharp.Internals;
+#endif

 namespace VRCX
 {
    internal class StartupArgs
    {
+        private const string SubProcessTypeArgument = "--type";
        public static VrcxLaunchArguments LaunchArguments = new();

        public static void ArgsCheck()
@@ -37,13 +41,19 @@ namespace VRCX
            {
                if (File.Exists(LaunchArguments.ConfigDirectory))
                {
-                    MessageBox.Show("Move your \"VRCX.sqlite3\" into a folder then specify the folder in the launch parameter e.g.\n--config=\"C:\\VRCX\\\"", "--config is now a directory", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    var message =
+                        "Move your \"VRCX.sqlite3\" into a folder then specify the folder in the launch parameter e.g.\n--config=\"C:\\VRCX\\\"";
+#if !LINUX
+                    MessageBox.Show(message, "--config is now a directory", MessageBoxButtons.OK, MessageBoxIcon.Error);
+#endif
+                    Console.WriteLine(message);
                    Environment.Exit(0);
                }

                Program.AppDataDirectory = LaunchArguments.ConfigDirectory;
            }

+#if !LINUX
            var disableClosing = LaunchArguments.IsUpgrade || // we're upgrading, allow it
                                  !string.IsNullOrEmpty(CommandLineArgsParser.GetArgumentValue(args, CefSharpArguments.SubProcessTypeArgument)); // we're launching a subprocess, allow it

@@ -54,6 +64,7 @@ namespace VRCX
                Thread.Sleep(10);
                Environment.Exit(0);
            }
+#endif
        }

        private static VrcxLaunchArguments ParseArgs(string[] args)
@@ -119,7 +130,7 @@ namespace VRCX
                    // ignored
                }

-                if (commandLine.Contains(CefSharpArguments.SubProcessTypeArgument)) // ignore subprocesses
+                if (commandLine.Contains(SubProcessTypeArgument)) // ignore subprocesses
                    continue;

                var processArguments = ParseArgs(commandLine.Split(' '));