diff --git a/AvaloniaCommon/Assets/error.ico b/AvaloniaCommon/Assets/error.ico
deleted file mode 100644
index 529371fe..00000000
Binary files a/AvaloniaCommon/Assets/error.ico and /dev/null differ
diff --git a/AvaloniaCommon/Assets/information.ico b/AvaloniaCommon/Assets/information.ico
deleted file mode 100644
index 3a7f9bdd..00000000
Binary files a/AvaloniaCommon/Assets/information.ico and /dev/null differ
diff --git a/AvaloniaCommon/Assets/question.ico b/AvaloniaCommon/Assets/question.ico
deleted file mode 100644
index db04d421..00000000
Binary files a/AvaloniaCommon/Assets/question.ico and /dev/null differ
diff --git a/AvaloniaCommon/Assets/warning.ico b/AvaloniaCommon/Assets/warning.ico
deleted file mode 100644
index d4bd0f53..00000000
Binary files a/AvaloniaCommon/Assets/warning.ico and /dev/null differ
diff --git a/AvaloniaCommon/AvaloniaCommon.csproj b/AvaloniaCommon/AvaloniaCommon.csproj
deleted file mode 100644
index d66957be..00000000
--- a/AvaloniaCommon/AvaloniaCommon.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- $(CommonNetVersion)
- enable
- enable
- true
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AvaloniaCommon/Enums/MessageBoxButton.cs b/AvaloniaCommon/Enums/MessageBoxButton.cs
deleted file mode 100644
index 9dbd3571..00000000
--- a/AvaloniaCommon/Enums/MessageBoxButton.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace AvaloniaCommon.Enums;
-
-[Flags]
-public enum MessageBoxButton
-{
- No = 1,
- Yes = 2,
- Ok = 4,
- Cancel = 8
-}
\ No newline at end of file
diff --git a/AvaloniaCommon/Enums/MessageBoxIcon.cs b/AvaloniaCommon/Enums/MessageBoxIcon.cs
deleted file mode 100644
index 7d35f0fc..00000000
--- a/AvaloniaCommon/Enums/MessageBoxIcon.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace AvaloniaCommon.Enums;
-
-[Flags]
-public enum MessageBoxIcon
-{
- QUESTION = 1,
- INFORMATION = 2,
- WARNING = 4,
- ERROR = 8
-}
\ No newline at end of file
diff --git a/AvaloniaCommon/MessageBox.cs b/AvaloniaCommon/MessageBox.cs
deleted file mode 100644
index f88d7b51..00000000
--- a/AvaloniaCommon/MessageBox.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-namespace AvaloniaCommon;
-
-using Avalonia.Controls;
-using Avalonia.Threading;
-using AvaloniaCommon.Enums;
-using AvaloniaCommon.ViewModels;
-
-public static class MessageBox
-{
- public static MessageBoxButton? Show(string title, string message)
- {
- return Show(title, "", message);
- }
-
- public static MessageBoxButton? Error(string title, string message)
- {
- return Error(title, "", message);
- }
-
- public static MessageBoxButton? Error(Exception e)
- {
- return Error(string.IsNullOrEmpty(e.Message) ? "Unknown error" : e.Message, e.Message, e.ToString());
- }
- public static MessageBoxButton? QuestionYesNo(string title, string header, string message)
- {
- return Show(title, header, message, MessageBoxIcon.QUESTION, MessageBoxButton.No | MessageBoxButton.Yes);
- }
- public static MessageBoxButton? QuestionYesNoCancel(string title, string header, string message)
- {
- return Show(title, header, message, MessageBoxIcon.QUESTION, MessageBoxButton.No | MessageBoxButton.Yes | MessageBoxButton.Cancel);
- }
- public static MessageBoxButton? Info(string title, string header, string message)
- {
- return Show(title, header, message, MessageBoxIcon.INFORMATION);
- }
- public static MessageBoxButton? Warning(string title, string header, string message)
- {
- return Show(title, header, message, MessageBoxIcon.WARNING);
- }
- public static MessageBoxButton? Error(string title, string header, string message)
- {
- return Show(title, header, message, MessageBoxIcon.ERROR);
- }
-
- public static MessageBoxButton? Show(string title, string header, string message)
- {
- return Show(title, header, message, MessageBoxIcon.INFORMATION);
- }
-
- public static MessageBoxButton? Show(string title, string header, string message, MessageBoxIcon icon = MessageBoxIcon.INFORMATION, MessageBoxButton buttons = MessageBoxButton.Ok)
- {
- if (!Dispatcher.UIThread.CheckAccess())
- {
- return Dispatcher.UIThread.Invoke(() => ShowInternal(title, header, message, icon, buttons));
- }
- else
- {
- return ShowInternal(title, header, message, icon, buttons);
- }
- }
-
- internal static MessageBoxButton? ShowInternal(string title, string header, string message, MessageBoxIcon icon, MessageBoxButton buttons)
- {
- var messageBoxViewModel = new MessageBoxViewModel(icon, buttons)
- {
- Title = title,
- Header = header,
- Content = message
- };
-
- var messageBox = new Views.MessageBox();
- messageBoxViewModel.SetMessageBox(messageBox);
- messageBox.DataContext = messageBoxViewModel;
-
- using (var source = new CancellationTokenSource())
- {
- var tcs = new TaskCompletionSource();
- messageBox.Closing += (object? sender, WindowClosingEventArgs args) =>
- {
- tcs.TrySetResult(messageBoxViewModel.ButtonClicked);
- args.Cancel = false;
- };
-
- messageBox.Show();
-
- tcs.Task.ContinueWith(t => source.Cancel(), TaskScheduler.FromCurrentSynchronizationContext());
- Dispatcher.UIThread.MainLoop(source.Token);
- return tcs.Task.Result;
- }
- }
-}
diff --git a/AvaloniaCommon/Theme.cs b/AvaloniaCommon/Theme.cs
deleted file mode 100644
index 8583c3f4..00000000
--- a/AvaloniaCommon/Theme.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using Avalonia;
-using Avalonia.Media;
-using Avalonia.Styling;
-
-namespace AvaloniaCommon;
-
-public class Theme
-{
- public IBrush AccentButtonBackground
- {
- get
- {
- return (IBrush)GetResource("AccentButtonBackground");
- }
- }
-
- public IBrush AccentButtonForeground
- {
- get
- {
- return (IBrush)GetResource("AccentButtonForeground");
- }
- }
-
- public IBrush ButtonBackground
- {
- get
- {
- return (IBrush)GetResource("ButtonBackground");
- }
- }
-
- public IBrush ButtonForeground
- {
- get
- {
- return (IBrush)GetResource("ButtonForeground");
- }
- }
-
- private object GetResource(string key)
- {
- app.TryGetResource(key, ThemeVariant.Default, out object? val);
- ThrowIfNull(val);
- return val;
- }
-
- private void ThrowIfNull([NotNull] object? val)
- {
- if (val == null)
- {
- throw new Exception("No styles where there should be");
- }
- }
-
- private Application app;
- public Theme(Application app)
- {
- this.app = app;
- }
-}
\ No newline at end of file
diff --git a/AvaloniaCommon/ViewModelBase.cs b/AvaloniaCommon/ViewModelBase.cs
deleted file mode 100644
index 31430754..00000000
--- a/AvaloniaCommon/ViewModelBase.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Diagnostics;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace AvaloniaCommon;
-
-public partial class ViewModelBase : ObservableObject
-{
-
-}
diff --git a/AvaloniaCommon/ViewModels/MessageBoxViewModel.cs b/AvaloniaCommon/ViewModels/MessageBoxViewModel.cs
deleted file mode 100644
index 356eb700..00000000
--- a/AvaloniaCommon/ViewModels/MessageBoxViewModel.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using AvaloniaCommon.Enums;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace AvaloniaCommon.ViewModels;
-
-public partial class MessageBoxViewModel : ViewModelBase
-{
- [ObservableProperty]
- private string title = "";
-
- [ObservableProperty]
- [NotifyPropertyChangedFor("HasHeader")]
- private string header = "";
- public bool HasHeader => !string.IsNullOrEmpty(this.Header);
-
- [ObservableProperty]
- private string content = "";
-
- [ObservableProperty]
- private string iconPath;
-
- [ObservableProperty]
- private Bitmap icon;
-
- [ObservableProperty]
- private WindowIcon windowIcon;
-
- [NotifyPropertyChangedFor("IsOkShowed")]
- [NotifyPropertyChangedFor("IsYesShowed")]
- [NotifyPropertyChangedFor("IsNoShowed")]
- [NotifyPropertyChangedFor("IsCancelShowed")]
-
- [ObservableProperty]
- private MessageBoxButton enabledButtons;
- public MessageBoxButton? ButtonClicked { get; private set; }
- public bool IsOkShowed => EnabledButtons.HasFlag(MessageBoxButton.Ok);
- public bool IsYesShowed => EnabledButtons.HasFlag(MessageBoxButton.Yes);
- public bool IsNoShowed => EnabledButtons.HasFlag(MessageBoxButton.No);
- public bool IsCancelShowed => EnabledButtons.HasFlag(MessageBoxButton.Cancel);
- public Action? Copy { get; set; }
- public Action? EnterPressed { get; set; }
- public Action? EscPressed { get; set; }
- private AvaloniaCommon.Views.MessageBox? messageBox;
- public MessageBoxViewModel(MessageBoxIcon icon, MessageBoxButton enabledButtons)
- {
-
- this.enabledButtons = enabledButtons;
- this.EnterPressed = PressDefaultIfPossible;
- this.IconPath = $"avares://AvaloniaCommon/Assets/{icon.ToString().ToLowerInvariant()}.ico";
- this.Icon = new Bitmap(AssetLoader.Open(new Uri(this.iconPath)));
- this.WindowIcon = new WindowIcon(this.Icon);
- }
-
- // Clipboard isn't accessible from App, instead it's available from every Control, so do this hack which is totally against mvvm principles
- public void SetMessageBox(AvaloniaCommon.Views.MessageBox messageBox)
- {
- this.messageBox = messageBox;
- this.Copy = messageBox.Copy;
- this.EscPressed = messageBox.Close;
- }
-
- public void PressDefaultIfPossible()
- {
- // If there's only one button enabled, then click it
- switch (EnabledButtons)
- {
- case MessageBoxButton.No:
- NoClicked();
- break;
- case MessageBoxButton.Yes:
- YesClicked();
- break;
- case MessageBoxButton.Cancel:
- CancelClicked();
- break;
- case MessageBoxButton.Ok:
- OkClicked();
- break;
- }
- // If there's multiple, try to cancel, never take a yes action automatically
- if (EnabledButtons.HasFlag(MessageBoxButton.Cancel))
- {
- CancelClicked();
- }
- }
- public void OkClicked()
- {
- ButtonClicked = MessageBoxButton.Ok;
- messageBox?.QueueClose();
- }
- public void YesClicked()
- {
- ButtonClicked = MessageBoxButton.Yes;
- messageBox?.QueueClose();
- }
- public void NoClicked()
- {
- ButtonClicked = MessageBoxButton.No;
- messageBox?.QueueClose();
- }
- public void CancelClicked()
- {
- ButtonClicked = MessageBoxButton.Cancel;
- messageBox?.QueueClose();
- }
-
-}
\ No newline at end of file
diff --git a/AvaloniaCommon/Views/MessageBox.axaml b/AvaloniaCommon/Views/MessageBox.axaml
deleted file mode 100644
index 6e2eefb1..00000000
--- a/AvaloniaCommon/Views/MessageBox.axaml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/AvaloniaCommon/Views/MessageBox.axaml.cs b/AvaloniaCommon/Views/MessageBox.axaml.cs
deleted file mode 100644
index e47129bd..00000000
--- a/AvaloniaCommon/Views/MessageBox.axaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Threading;
-using AvaloniaCommon.Enums;
-using AvaloniaCommon.ViewModels;
-
-namespace AvaloniaCommon.Views;
-
-public partial class MessageBox : Window
-{
- public MessageBox()
- {
- InitializeComponent();
- }
-
- public void Copy()
- {
- MessageBoxViewModel? viewModel = (this.DataContext as MessageBoxViewModel);
- if (viewModel == null)
- {
- Console.WriteLine("DataContext failed to cast to MessageBoxViewModel! Copy failed!");
- return;
- }
-
- string fullTextToCopy = "";
- fullTextToCopy += viewModel.Title + "\n";
- fullTextToCopy += viewModel.Header + "\n";
- fullTextToCopy += viewModel.Content + "\n";
- fullTextToCopy += viewModel.EnabledButtons.ToString();
-
- if (this.Clipboard == null)
- {
- Console.WriteLine("this.Clipboard is null! Copy failed!");
- return;
- }
-
- this.Clipboard.SetTextAsync(fullTextToCopy);
- }
-
- public void QueueClose()
- {
- Dispatcher.UIThread.InvokeAsync(base.Close);
- }
-}
\ No newline at end of file
diff --git a/AvaloniaCommon/nuget.config b/AvaloniaCommon/nuget.config
deleted file mode 100644
index 42c6aa46..00000000
--- a/AvaloniaCommon/nuget.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/ChromeTestClient/ChromeIPCClient.cs b/ChromeTestClient/ChromeIPCClient.cs
deleted file mode 100644
index 2b2966cb..00000000
--- a/ChromeTestClient/ChromeIPCClient.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-using System.Text;
-using Google.Protobuf;
-using ipctest.Platform;
-using OpenSteamworks.Protobuf;
-using OpenSteamworks.Utils;
-
-namespace ipctest;
-
-public unsafe class ChromeIPCClient {
- private struct ChromeConnectionHelloResponse {
- public int m_eCmd;
- public int m_iServerPID;
- public fixed byte ResponseStreamName[64];
- }
-
- private struct ChromeConnectionHello {
- public int unk;
- public int unk1;
- public int m_iClientPID;
- public fixed byte ResponseStreamName[64];
- }
-
-
-
- private readonly IEvent managerEvent;
- public ChromeIPCClient() {
- using var masterStream = new SharedMemStream($"SteamChrome_MasterStream_uid{Platform.Linux.LinuxConsts.getuid()}_spid{GetSteamPID()}", out bool bCreated);
- if (bCreated) {
- throw new Exception("Failed to connect to master html process, created shared memory");
- }
-
- Console.WriteLine("created: " + bCreated);
- Console.WriteLine("capacity: " + masterStream.Capacity);
- Console.WriteLine("AvailableToRead: " + masterStream.AvailableToRead);
-
- var randomNumber = Random.Shared.NextInt64(0, 65535);
- string newClientName = $"SteamChrome_MasterStream_{GetSteamPID()}_{randomNumber}";
- using var childStream = new SharedMemStream(newClientName, out bool bChildCreated);
- if (bChildCreated == false) {
- throw new Exception("Collided with existing master response stream");
- }
-
- byte[] buf = new byte[sizeof(ChromeConnectionHello)];
- var hello = new ChromeConnectionHello();
- hello.unk = 1;
- hello.unk1 = 1;
- hello.m_iClientPID = Environment.ProcessId;
- Encoding.UTF8.GetBytes(newClientName).CopyTo(new Span(hello.ResponseStreamName, 64));
-
- new ReadOnlySpan(&hello, sizeof(ChromeConnectionHello)).CopyTo(buf);
-
- masterStream.Write(buf, 0, sizeof(ChromeConnectionHello));
-
- managerEvent = Globals.IPCImpl.CreateEvent($"SteamChrome_MasterStream_Event_uid{Platform.Linux.LinuxConsts.getuid()}_spid{GetSteamPID()}", out bool bEventCreated);
- Console.WriteLine("Signaling event");
- managerEvent.Signal();
-
- Console.WriteLine("Waiting for response");
- var gotData = childStream.BWaitForDataToGet();
-
- Console.WriteLine("HDR: " + childStream.HeaderPtr->ToString());
- Console.WriteLine("gotData: " + gotData);
-
- ChromeConnectionHelloResponse resp;
- if (gotData) {
- buf = new byte[sizeof(ChromeConnectionHelloResponse)];
- var actual = buf[0..childStream.Read(buf, 0, buf.Length)];
- if (actual.Length < sizeof(ChromeConnectionHelloResponse)) {
- throw new Exception($"not enough data, got {actual.Length}, but expected {sizeof(ChromeConnectionHelloResponse)}, exiting");
- }
-
- Console.WriteLine("actual: " + string.Join(" ", actual) + ", read: " + actual.Length);
- fixed (byte* bptr = actual) {
- resp = *(ChromeConnectionHelloResponse*)bptr;
- }
- } else {
- throw new Exception("got no data, exiting");
- }
-
- string? responseStreamName = Marshal.PtrToStringUTF8((nint)resp.ResponseStreamName);
- if (string.IsNullOrEmpty(responseStreamName)) {
- throw new Exception("got no response stream, exiting");
- }
-
- Console.WriteLine("CMD: " + resp.m_eCmd);
- Console.WriteLine("Server PID: " + resp.m_iServerPID);
- Console.WriteLine("ResponseStreamName: " + responseStreamName);
- CreateStreams(responseStreamName);
-
- CMsgBrowserCreate proto = new();
- proto.RequestId = 50;
- proto.BrowserType = 1;
- proto.InitialUrl = "https://google.com";
- proto.Useragent = "Valve Steam Client";
- PushCommand(10, 0, proto.ToByteArray());
- }
-
- private SharedMemStream sendStream;
- private SharedMemStream recvStream;
-
- [MemberNotNull(nameof(sendStream))]
- [MemberNotNull(nameof(recvStream))]
- private void CreateStreams(string responseStreamName, bool bIsServer = false) {
- string sendStreamName = responseStreamName + (bIsServer ? "_server" : "_client");
- string recvStreamName = responseStreamName + (bIsServer ? "_client" : "_server");
-
- sendStream = new SharedMemStream(sendStreamName, out _);
- sendStream.WriteTimeout = sendStream.ReadTimeout = 1000;
-
- recvStream = new SharedMemStream(recvStreamName, out _);
- recvStream.WriteTimeout = recvStream.ReadTimeout = 1000;
- }
-
- private int GetSteamPID() {
- var homevar = Environment.GetEnvironmentVariable("HOME");
- if (string.IsNullOrEmpty(homevar)) {
- throw new NullReferenceException("HOME not set, please set it");
- }
-
- return int.Parse(File.ReadAllText(Path.Combine(homevar, ".steam/steam.pid")));
- }
-
- public void PushCommand(int eMsg, int iBrowser, byte[] msg) {
- // Wire format is not known
- using var stream = new MemoryStream();
- using var writer = new EndianAwareBinaryWriter(stream, OpenSteamworks.Utils.Enum.Endianness.Little);
- // writer.WriteInt32(eMsg);
- // writer.WriteInt32(iBrowser);
- writer.WriteInt32(msg.Length);
- writer.Write(msg);
-
- var msgSerialized = stream.ToArray();
- sendStream.Write(msgSerialized, 0, msgSerialized.Length);
-
- Thread.Sleep(50);
- managerEvent.Signal();
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/ChromeTestClient.csproj b/ChromeTestClient/ChromeTestClient.csproj
deleted file mode 100644
index 3e6f91c1..00000000
--- a/ChromeTestClient/ChromeTestClient.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Exe
- net8.0
- enable
- enable
- true
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ChromeTestClient/EHTMLCommands.cs b/ChromeTestClient/EHTMLCommands.cs
deleted file mode 100644
index 9e8efad6..00000000
--- a/ChromeTestClient/EHTMLCommands.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace ipctest;
-
-public enum EHTMLCommands
-{
- Hello = 2,
- None = 165,
-}
\ No newline at end of file
diff --git a/ChromeTestClient/HTMLProtoMsg.cs b/ChromeTestClient/HTMLProtoMsg.cs
deleted file mode 100644
index 9813d4f7..00000000
--- a/ChromeTestClient/HTMLProtoMsg.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-namespace ipctest;
-
diff --git a/ChromeTestClient/LiteHTMLHost.cs b/ChromeTestClient/LiteHTMLHost.cs
deleted file mode 100644
index 078fc795..00000000
--- a/ChromeTestClient/LiteHTMLHost.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.Versioning;
-
-namespace ipctest;
-
-public static class LiteHTMLHost {
- private static readonly object CurrentHTMLHostLock = new();
- private static Process? CurrentHTMLHost;
- private static string InstallDir => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "OpenSteam");
- private static Thread? WatcherThread;
-
- [SupportedOSPlatform("windows")]
- private static string GetWindowsCEFPath() {
- string baseDir = Path.Combine(InstallDir, "bin", "cef");
-
- bool TryVersion(string ver, [NotNullWhen(true)] out string? path) {
- path = Path.Combine(baseDir, ver);
- bool isValid = Directory.Exists(path) && File.Exists(Path.Combine(path, "steamwebhelper.exe"));
- if (!isValid) {
- Console.WriteLine($"Wanted CEF version {ver}, but it doesn't exist.");
- }
-
- return isValid;
- }
-
-
- if (OperatingSystem.IsWindowsVersionAtLeast(10) && TryVersion("cef.win10x64", out string? path)) {
- return path;
- } else {
- if (TryVersion("cef.win7x64", out path)) {
- return path;
- } else if (TryVersion("cef.win7", out path)) {
- return path;
- } else {
- throw new Exception("No CEF available");
- }
- }
- }
-
- private static bool expectedToStop = false;
-
- [SupportedOSPlatform("linux")]
- [SupportedOSPlatform("windows")]
- public static void StartHTMLHost()
- {
- lock (CurrentHTMLHostLock)
- {
- Console.WriteLine("Creating steamwebhelper process");
-
- CurrentHTMLHost = new Process();
- if (OperatingSystem.IsLinux()) {
- CurrentHTMLHost.StartInfo.WorkingDirectory = Path.Combine(InstallDir, "ubuntu12_64");
-
- // Strace
- // CurrentHTMLHost.StartInfo.FileName = "/usr/bin/strace";
- // CurrentHTMLHost.StartInfo.ArgumentList.Add("-efutex");
- // CurrentHTMLHost.StartInfo.ArgumentList.Add("--detach-on=execve");
- // CurrentHTMLHost.StartInfo.ArgumentList.Add("--interruptible=never");
- // CurrentHTMLHost.StartInfo.ArgumentList.Add(Path.Combine(InstallDir, "ubuntu12_64", "steamwebhelper"));
-
- CurrentHTMLHost.StartInfo.FileName = Path.Combine(InstallDir, "ubuntu12_64", "steamwebhelper");
- CurrentHTMLHost.StartInfo.EnvironmentVariables["LD_LIBRARY_PATH"] = $".:{Environment.GetEnvironmentVariable("LD_LIBRARY_PATH")}";
- CurrentHTMLHost.StartInfo.ArgumentList.Add("--disable-seccomp-filter-sandbox");
- } else if (OperatingSystem.IsWindows()) {
- string basePath = GetWindowsCEFPath();
- CurrentHTMLHost.StartInfo.WorkingDirectory = basePath;
- CurrentHTMLHost.StartInfo.FileName = Path.Combine(basePath, "steamwebhelper.exe");
- }
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-lang=en-US");
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-cachedir={Path.Combine(InstallDir, "appcache", "htmlcache")}");
-
- // This could technically be improved by reading from the steam.pid file, but no need since this code always assumes we're the master
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-steampid={Environment.ProcessId}");
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-buildid={1716242052}");
-
- // Don't know our SteamID at this point.
- CurrentHTMLHost.StartInfo.ArgumentList.Add("-steamid=0");
- var logsDir = Path.Combine(InstallDir, "logs");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-logdir={logsDir}");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-uimode=7");
-
- // We don't track this.
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-startcount=0");
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-steamuniverse=1");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-realm=1");
-
- // Doesn't exist, but we pass it anyway.
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-clientui={Path.Combine(InstallDir, "clientui")}");
-
- string steampath;
- if (OperatingSystem.IsLinux())
- {
- steampath = Directory.ResolveLinkTarget("/proc/self/exe", false)!.FullName;
- }
- else
- {
- steampath = Environment.ProcessPath!;
- }
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-steampath={steampath}");
-
- // No idea what this means or does.
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-launcher=0");
-
- // This should only be passed if we're in debug mode, but that info isn't really passed through to us in any way.
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-dev");
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"-no-restart-on-ui-mode-change");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--enable-media-stream");
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--enable-smooth-scrolling");
-
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--password-store=basic");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--log-file={Path.Combine(logsDir, "cef_log.txt")}");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--disable-quick-menu");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--disable-features=SameSiteByDefaultCookies");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--enable-blink-features=ResizeObserver,Worklet,AudioWorklet");
- CurrentHTMLHost.StartInfo.ArgumentList.Add($"--disable-blink-features=Badging");
-
- Console.WriteLine("Starting steamwebhelper process");
- CurrentHTMLHost.Start();
-
- if (WatcherThread == null)
- {
- Console.WriteLine("Creating watcher thread");
- WatcherThread = new Thread(() =>
- {
- do
- {
- if (CurrentHTMLHost.HasExited && !expectedToStop)
- {
- Console.WriteLine($"steamwebhelper crashed (exit code {CurrentHTMLHost.ExitCode})! Restarting in 1s.");
- Thread.Sleep(1000);
- StartHTMLHost();
- }
- Thread.Sleep(50);
- } while (true);
- });
-
- Console.WriteLine("Starting watcher thread");
- WatcherThread.Start();
- }
- }
- }
-
- public static void KillHTMLHost()
- {
- expectedToStop = true;
-
- var procs = Process.GetProcessesByName("steamwebhelper");
- for (int i = 0; i < procs.Length; i++)
- {
- procs[i].Kill();
- }
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Globals.cs b/ChromeTestClient/Platform/Globals.cs
deleted file mode 100644
index 2f12a444..00000000
--- a/ChromeTestClient/Platform/Globals.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace ipctest.Platform;
-
-public static class Globals {
- public static IIPCImpl IPCImpl { get; }
- static Globals() {
- if (OperatingSystem.IsLinux()) {
- IPCImpl = new Linux.IPCImpl();
- return;
- }
-
- if (OperatingSystem.IsWindows()) {
- //IPCImpl = new Windows.IPCImpl();
- //return;
- }
-
- throw new NotImplementedException("unsupported os");
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/IIPCImpl.cs b/ChromeTestClient/Platform/IIPCImpl.cs
deleted file mode 100644
index d80b4fa8..00000000
--- a/ChromeTestClient/Platform/IIPCImpl.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace ipctest.Platform;
-
-public unsafe interface IIPCImpl {
- public ISharedMemory CreateSharedMemory(string name, uint size, out bool bCreated);
- public IEvent CreateEvent(string name, out bool bCreated, bool isManualReset = false, bool initiallySignaled = false);
- public IMutex CreateMutex(string name, out bool bCreated);
-}
-
-public unsafe interface ISharedMemory : IDisposable {
- public void* Data { get; }
- public uint Length { get; }
-}
-
-public unsafe interface IEvent : IDisposable {
- public void Signal();
- public void Reset();
-
- ///
- ///
- ///
- ///
- /// True if the state has changed, false if an error occurred.
- public bool WaitForStateChange(uint timeoutMS);
-}
-
-public unsafe interface IMutex : IDisposable {
- public IDisposable Lock(uint timeoutMS = 5000);
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/ErrnoException.cs b/ChromeTestClient/Platform/Linux/ErrnoException.cs
deleted file mode 100644
index 1abc5b99..00000000
--- a/ChromeTestClient/Platform/Linux/ErrnoException.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace ipctest.Platform.Linux;
-
-[System.Serializable]
-public class ErrnoException : System.Exception
-{
- public ErrnoException() { }
- public ErrnoException(int errno) : base($"Linux system call failed with {errno}") { }
- public ErrnoException(int errno, System.Exception inner) : base($"Linux system call failed with {errno}", inner) { }
-
- public static void ThrowIfNonZero(int value) {
- if (value != 0) {
- throw new ErrnoException(value);
- }
- }
-
- public static void ThrowCurrentMarshaledIfNegative(int value) {
- if (value < 0) {
- throw new ErrnoException(Marshal.GetLastWin32Error());
- }
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/IPCImpl.cs b/ChromeTestClient/Platform/Linux/IPCImpl.cs
deleted file mode 100644
index 3c6e2125..00000000
--- a/ChromeTestClient/Platform/Linux/IPCImpl.cs
+++ /dev/null
@@ -1,364 +0,0 @@
-namespace ipctest.Platform.Linux;
-
-using System.IO.Hashing;
-using System.IO.MemoryMappedFiles;
-using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics.X86;
-using System.Text;
-
-public unsafe class IPCImpl : IIPCImpl
-{
- public enum EntryType : int
- {
- None,
- Mutex,
- Event,
- SharedMemory,
- };
-
- [StructLayout(LayoutKind.Sequential)]
- public struct Entry_Mutex {
- public Entry Header;
- public SteamLinuxMutex Mutex;
-
- public override string ToString()
- {
- return $"{Header}: {Mutex}";
- }
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct Entry_Event {
- public Entry Header;
- public uint unk;
- public uint isSignaled;
- public uint sequence;
- public uint isManualReset;
-
- public override string ToString()
- {
- return $"{Header}: {unk} {isSignaled} {sequence} {isManualReset}";
- }
-
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct Entry {
- public EntryType Type;
- public uint NameCRC;
- public int RefCount;
-
- public const int PID_ARR_SIZE = 16;
- public fixed int ReferencingPIDS[PID_ARR_SIZE];
-
- public static void Init(Entry* pThis, EntryType type, uint nameCRC, bool AddReference = true) {
- pThis->NameCRC = nameCRC;
- if (AddReference) {
- Entry.AddReference(pThis);
- }
-
- pThis->Type = type;
- }
-
- public static void AddReference(Entry* pThis) {
- AddReferenceCore(pThis);
- }
-
- private static void AddReferenceCore(Entry* pThis, bool didCleanup = false) {
- var pid = Environment.ProcessId;
- for (int i = 0; i < PID_ARR_SIZE; i++)
- {
- if (pThis->ReferencingPIDS[i] == 0) {
- pThis->ReferencingPIDS[i] = pid;
- pThis->RefCount++;
- return;
- }
- }
-
- // No problem, try clearing out unused references and try again
- if (!didCleanup) {
- CleanupDeadReferences(pThis);
- AddReferenceCore(pThis, true);
- return;
- }
-
- throw new Exception("PID array ran out");
- }
-
- public static bool RemoveReference(Entry* pThis, int pid) {
- for (int i = 0; i < PID_ARR_SIZE; i++)
- {
- var elem = pThis->ReferencingPIDS[i];
- if (elem == pid) {
- elem = pid;
- pThis->RefCount--;
- return true;
- }
- }
-
- return false;
- }
-
- public static bool AreAnyReferencesAlive(Entry* pThis) {
- for (int i = 0; i < PID_ARR_SIZE; i++)
- {
- var elem = pThis->ReferencingPIDS[i];
- if (elem != 0) {
- if (LinuxConsts.kill(elem, 0) == 0) {
- return true;
- } else {
- // Clear it from the list if not alive
- pThis->ReferencingPIDS[i] = 0;
- pThis->RefCount--;
- }
- }
- }
-
- return false;
- }
-
- public static void CleanupDeadReferences(Entry* pThis) {
- for (int i = 0; i < PID_ARR_SIZE; i++)
- {
- var elem = pThis->ReferencingPIDS[i];
- if (elem != 0) {
- if (LinuxConsts.kill(elem, 0) != 0) {
- // Clear it from the list if not alive
- pThis->ReferencingPIDS[i] = 0;
- pThis->RefCount--;
- }
- }
- }
- }
-
- public static void Destruct(Entry* pThis)
- {
- //TODO: Get this info from the SharedObjectManagerHeader
- NativeMemory.Clear(pThis, MGR_ELEM_SIZE);
- }
-
- public static bool HasAnyReferences(Entry* pThis)
- {
- return pThis->RefCount != 0;
- }
-
- public override string ToString()
- {
- return $"T: {Type}, CRC: {NameCRC}, C: {RefCount}";
- }
- }
-
- [StructLayout(LayoutKind.Sequential, Pack = 1)]
- public struct SharedObjectManagerHeader
- {
- public int version;
- public int elemSize;
- public int length;
- public int mgrMutexOwner;
- public int unused;
- public int unused2;
- public SteamLinuxMutex sysMgrMutex;
-
-
- public override string ToString()
- {
- return $"v: {version} elemSize: {elemSize} totalSize: {length} currentOwner: {mgrMutexOwner} {unused} {unused2} currentLockingThreadID: {sysMgrMutex.threadID}";
- }
- }
-
- public const int MGR_SHM_SIZE = 0x200000;
- public const int MGR_ELEM_SIZE = 256;
- public const int MGR_VERSION = 4;
-
- private void* mmapTarget;
- private SharedObjectManagerHeader* header => (SharedObjectManagerHeader*)mmapTarget;
-
- public IPCImpl()
- {
- int shm_fd = -1;
- bool isHoldingSysMgrMutex = false;
-
- try {
- var ipcName = GetIPCObjName();
- var shmFilepath = $"/dev/shm{ipcName}";
- Console.WriteLine("IPC obj at " + shmFilepath);
-
- shm_fd = LinuxConsts.shm_open(ipcName, 66, 511);
- Console.WriteLine("open result: " + shm_fd);
-
- if (shm_fd < 0) {
- throw new Exception($"Process {Environment.ProcessId} failed to shm_open {ipcName}");
- }
-
- if (LinuxConsts.flock(shm_fd, 2) != 0) {
- throw new Exception($"Error {Marshal.GetLastWin32Error()} locking shared memory file");
- }
-
- var allocated = new FileInfo(shmFilepath).Length;
- Console.WriteLine("Bytes Allocated: " + allocated);
- if (allocated < MGR_SHM_SIZE)
- {
- Console.WriteLine("ftruncate: " + LinuxConsts.ftruncate(shm_fd, MGR_SHM_SIZE));
- var newsize = new FileInfo(shmFilepath).Length;
- Console.WriteLine("New Size: " + newsize);
- }
-
- mmapTarget = LinuxConsts.mmap((void*)0x0, MGR_SHM_SIZE, 3, 1, shm_fd, 0);
- Console.WriteLine("mmap result: " + (nint)mmapTarget);
- Console.WriteLine(header->ToString());
-
- if (header->version == 0) {
- // Need to initialize
- header->length = MGR_SHM_SIZE;
- header->elemSize = MGR_ELEM_SIZE;
- header->version = MGR_VERSION;
- }
-
- if (header->version != MGR_VERSION && header->version != 0) {
- throw new NotImplementedException("version upgrade detected, new version is " + header->version);
- }
-
- if (header->elemSize != MGR_ELEM_SIZE) {
- throw new NotImplementedException($"element size change detected, expected {MGR_ELEM_SIZE}, got {header->elemSize}");
- }
- }
- finally
- {
- if (isHoldingSysMgrMutex && header != null)
- {
- SteamLinuxMutex.IPCMutexUnlock(&header->sysMgrMutex);
- }
-
- if (shm_fd != -1) {
- LinuxConsts.flock(shm_fd, 8);
- }
-
- }
- }
-
- public ISharedMemory CreateSharedMemory(string name, uint size, out bool bCreated) {
- Console.WriteLine("CreateSharedMemory: " + name);
-
- using var l = Lock();
- return new LinuxSharedMemory(name, size, out bCreated);
- }
-
- public IEvent CreateEvent(string name, out bool bCreated, bool isManualReset, bool initiallySignaled) {
- Console.WriteLine("CreateEvent: " + name);
-
- using var l = Lock();
- return new LinuxEvent(name, isManualReset, initiallySignaled, out bCreated);
- }
-
- public IMutex CreateMutex(string name, out bool bCreated) {
- Console.WriteLine("CreateMutex: " + name);
-
- SteamLinuxMutex.IPCMutexUnlock(&header->sysMgrMutex);
- using var l = Lock();
- return new LinuxMutex(name, out bCreated);
- }
-
- private MutexDisposable Lock() {
- return new MutexDisposable(&header->sysMgrMutex, 5000, () => { header->mgrMutexOwner = Environment.ProcessId; }, () => {header->mgrMutexOwner = 0; });
- }
-
- public static string HashName(string name) {
- return Convert.ToHexString(BitConverter.GetBytes(HashNameUInt32(name)).Reverse().ToArray());
- }
-
- public static uint HashNameUInt32(string name) {
- return Crc32.HashToUInt32(Encoding.UTF8.GetBytes(name));
- }
-
- public void* DynamicStart => (void*)((nint)mmapTarget + sizeof(SharedObjectManagerHeader) + 32);
- public Entry* FindEntry(EntryType type, string name) {
- uint nameCRC = HashNameUInt32(name);
- int sizeOfEntry = header->elemSize;
- void* current = DynamicStart;
- void* last = (void*)((nint)header + header->length);
- int entryCount = 0;
- while (current < last)
- {
- Entry* pEntry = (Entry*)current;
-
- if (pEntry->Type == 0) {
- goto loopEnd;
- }
-
- if (pEntry->Type == type && pEntry->NameCRC == nameCRC) {
- Console.WriteLine($"Match, found '{name}'");
- return pEntry;
- } else {
- Console.WriteLine("Not a match: a: " + pEntry->Type + ", w: " + type);
- Console.WriteLine("Not a match: a: " + pEntry->NameCRC + ", w: " + nameCRC);
- }
-
- loopEnd:
- entryCount++;
- current = (void*)((nint)current + sizeOfEntry);
- }
-
- //throw new Exception("Did not find entry, searched " + entryCount);
-
- return null;
- }
-
- public Entry* CreateEntry(EntryType type, string name) {
- uint nameCRC = HashNameUInt32(name);
- int sizeOfEntry = header->elemSize;
- void* current = DynamicStart;
- void* last = header + header->length;
- int entryCount = 0;
- while (current < last)
- {
- Entry* pEntry = (Entry*)current;
- if (pEntry->Type == 0) {
- // Non initialized entry, mark this as ours and return it
- Console.WriteLine("Init entry at pos " + entryCount);
- Entry.Init(pEntry, type, nameCRC);
- return pEntry;
- }
-
- current = (void*)((nint)current + sizeOfEntry);
- entryCount++;
- }
-
- throw new Exception("Ran out of IPC SharedObjectManager entries!");
- }
-
- private static string GetIPCObjName()
- {
- return $"/u{LinuxConsts.getuid()}-ValveIPCSharedObj-Steam";
- }
-
- ///
- /// LOCK BEFORE USING!
- ///
- public Entry* FindOrCreateEntry(EntryType type, string name, out bool bCreated)
- {
- Entry* entry = FindEntry(type, name);
- if (entry != null) {
- bCreated = false;
- IPCImpl.Entry.AddReference(entry);
- } else {
- bCreated = true;
- entry = CreateEntry(type, name);
- }
-
- return entry;
- }
-
- public void Deref(void* entry)
- {
- using var l = Lock();
-
- ArgumentNullException.ThrowIfNull(entry);
- if (!IPCImpl.Entry.RemoveReference((Entry*)entry, Environment.ProcessId)) {
- throw new Exception("Dereferencing failed");
- }
-
- if (!IPCImpl.Entry.HasAnyReferences((Entry*)entry)) {
- Entry.Destruct((Entry*)entry);
- }
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/LinuxData.cs b/ChromeTestClient/Platform/Linux/LinuxData.cs
deleted file mode 100644
index c0870716..00000000
--- a/ChromeTestClient/Platform/Linux/LinuxData.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace ipctest.Platform.Linux;
-
-public unsafe static class LinuxConsts {
- public const int SYS_gettid = 186;
- public const int SYS_futex = 202;
- public const int SYS_set_robust_list = 273;
- public const int SYS_get_robust_list = 274;
- public const int FUTEX_WAIT = 0;
- public const int FUTEX_WAKE = 1;
- public const int FUTEX_CMP_REQUEUE = 4;
- public const int O_RDWR = 2;
- public const int O_CREAT = 100;
- public const int PROT_READ = 1;
- public const int PROT_WRITE = 2;
- public const int PROT_EXEC = 4;
- public const int MAP_SHARED = 1;
- public const int MAP_PRIVATE = 2;
- public const int MAP_SHARED_VALIDATE = 3;
- public const int MAP_TYPE = 0x0f;
-
- // This can't be const due to a dumb C# moment
- public static void* MAP_FAILED => (void*)-1;
-
-
-
- [DllImport("c", EntryPoint = "syscall", SetLastError = true)]
- public static extern long syscall_futex(long num, uint* uaddr, int futex_op, uint val, timespec* timeout, uint* uaddr2, uint val3);
-
- [DllImport("c", EntryPoint = "syscall", SetLastError = true)]
- public static extern long syscall_get_robust_list(long num, int pid, robust_list_head** head_ptr, UIntPtr* len_ptr);
-
- [DllImport("c", EntryPoint = "syscall", SetLastError = true)]
- public static extern long syscall_set_robust_list(long num, robust_list_head* head, UIntPtr len);
-
- [DllImport("c", EntryPoint = "syscall", SetLastError = true)]
- public static extern long syscall_gettid(long num);
-
- [DllImport("c", EntryPoint = "kill", SetLastError = true)]
- public static extern int kill(int pid, int op);
-
- [DllImport("c")]
- public static extern int getuid();
-
- [DllImport("c", SetLastError = true)]
- public static extern void* mmap(void* addr, uint length, int prot, int flags, int fd, uint offset);
-
- [DllImport("c", SetLastError = true)]
- public static extern int munmap(void* addr, uint length);
-
- [DllImport("c", SetLastError = true)]
- public static extern int ftruncate(int fd, uint length);
-
- [DllImport("c", SetLastError = true)]
- public static extern int shm_open([MarshalAs(UnmanagedType.LPUTF8Str)] string name, int oflag, int mode);
-
- [DllImport("c", SetLastError = true)]
- public static extern int shm_unlink([MarshalAs(UnmanagedType.LPUTF8Str)] string name);
-
- [DllImport("c", SetLastError = true)]
- public static extern int flock(int fd, int op);
-}
-
-public unsafe static class Errno {
- public const int EWOULDBLOCK = 11;
- public const int EINTR = 4;
- public const int ENOLCK = 37;
- public const int EPERM = 1;
- public const int EOWNERDEAD = 130;
- public const int EEXIST = 17;
- public const int EAGAIN = 11;
- public const int ETIMEDOUT = 110;
-}
-
-public struct timespec {
- public long tv_sec; /* seconds */
- public long tv_nsec; /* nanoseconds */
-}
-
-public unsafe struct robust_list {
- public robust_list* next;
-}
-
-public unsafe struct robust_list_head {
- public robust_list list;
- public long futex_offset;
- public robust_list* list_op_pending;
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/LinuxEvent.cs b/ChromeTestClient/Platform/Linux/LinuxEvent.cs
deleted file mode 100644
index 45912563..00000000
--- a/ChromeTestClient/Platform/Linux/LinuxEvent.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.Runtime.InteropServices;
-using ipctest.Platform;
-
-namespace ipctest.Platform.Linux;
-
-public unsafe sealed class LinuxEvent : IEvent
-{
- private readonly IPCImpl.Entry_Event* entry;
-
- private IPCImpl ipcImpl => (Globals.IPCImpl as IPCImpl)!;
- public LinuxEvent(string name, bool isManualReset, bool initiallySignaled, out bool bCreated) {
- entry = (IPCImpl.Entry_Event*)ipcImpl.FindOrCreateEntry(IPCImpl.EntryType.Event, name, out bCreated);
- if (bCreated) {
- entry->isManualReset = isManualReset ? 1u : 0u;
- entry->isSignaled = initiallySignaled ? 1u : 0u;
- }
- }
-
- public void Dispose() {
- ipcImpl.Deref(entry);
- }
-
- public bool WaitForStateChange(uint timeoutMS)
- {
- bool isSet = Interlocked.CompareExchange(ref entry->isSignaled, entry->isManualReset, 1) == 1;
- if (!isSet) {
- timespec* timeoutPtr = null;
- timespec timeout;
- if (timeoutMS > 0) {
- timeout = new timespec() { tv_sec = timeoutMS / 1000 };
- timeoutPtr = &timeout;
- }
-
- while (!isSet)
- {
- var ret = LinuxConsts.syscall_futex(LinuxConsts.SYS_futex, &entry->isSignaled, LinuxConsts.FUTEX_WAIT, 0, timeoutPtr, null, 0);
- Console.WriteLine("ret: " + ret + ", val: " + entry->ToString());
-
- if (ret == -1) {
- var err = Marshal.GetLastWin32Error();
- if (err == Errno.ETIMEDOUT) {
- return isSet;
- }
-
- if ((err != Errno.EAGAIN) && (err != Errno.EINTR)) {
- return isSet;
- }
- }
-
- isSet = Interlocked.CompareExchange(ref entry->isSignaled, entry->isManualReset, 1) == 1;
- }
- }
-
- return true;
- }
-
- public void Signal() {
- Interlocked.Increment(ref entry->sequence);
- var isSignaled = Interlocked.CompareExchange(ref entry->isSignaled, 1, 0) == 0;
- if (isSignaled) {
- // It's not safe to release all waiters if it's a manual reset signal
- uint numToWake = entry->isManualReset == 0 ? int.MaxValue : 1u;
-
- LinuxConsts.syscall_futex(LinuxConsts.SYS_futex, &entry->isSignaled, LinuxConsts.FUTEX_WAKE, numToWake, null, null, 0);
- }
- }
-
- public void Reset()
- {
- Interlocked.Exchange(ref entry->isSignaled, 0);
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/LinuxMutex.cs b/ChromeTestClient/Platform/Linux/LinuxMutex.cs
deleted file mode 100644
index 25011a74..00000000
--- a/ChromeTestClient/Platform/Linux/LinuxMutex.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-
-namespace ipctest.Platform.Linux;
-
-public sealed unsafe class LinuxMutex : IMutex {
- private readonly IPCImpl.Entry_Mutex* entry;
-
- private IPCImpl ipcImpl => (Globals.IPCImpl as IPCImpl)!;
- public LinuxMutex(string name, out bool bCreated) {
- entry = (IPCImpl.Entry_Mutex*)ipcImpl.FindOrCreateEntry(IPCImpl.EntryType.Mutex, name, out bCreated);
- }
-
- public void Dispose() {
- ipcImpl.Deref(entry);
- }
-
- public IDisposable Lock(uint timeoutMS)
- {
- return new MutexDisposable(&entry->Mutex, timeoutMS);
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/LinuxSharedMemory.cs b/ChromeTestClient/Platform/Linux/LinuxSharedMemory.cs
deleted file mode 100644
index 044be28e..00000000
--- a/ChromeTestClient/Platform/Linux/LinuxSharedMemory.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.IO.Hashing;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace ipctest.Platform.Linux;
-
-public unsafe sealed class LinuxSharedMemory : ISharedMemory
-{
- public void* Data { get; private set; }
- public uint Length { get; private set; }
-
- public void Dispose()
- {
- (Globals.IPCImpl as IPCImpl)!.Deref(entry);
- LinuxConsts.munmap(Data, Length);
- }
-
- private readonly IPCImpl.Entry* entry;
-
- public LinuxSharedMemory(string name, uint size, out bool bCreated) {
- bCreated = false;
- Length = size;
-
- var hash = IPCImpl.HashName(name);
- string memname = $"/u{LinuxConsts.getuid()}-Shm_{hash.ToLowerInvariant()}";
- string filename = $"/dev/shm{memname}";
-
- entry = (Globals.IPCImpl as IPCImpl)!.FindEntry(IPCImpl.EntryType.SharedMemory, name);
-
- int fd;
- if (entry != null) {
- bCreated = false;
- IPCImpl.Entry.AddReference(entry);
- Console.WriteLine("LinuxSharedMemory, opening: " + filename);
- fd = LinuxConsts.shm_open(memname, LinuxConsts.O_RDWR, 511);
- } else {
- Console.WriteLine("LinuxSharedMemory, creating: " + filename);
- bCreated = true;
- fd = LinuxConsts.shm_open(memname, LinuxConsts.O_RDWR | LinuxConsts.O_CREAT, 511);
- entry = (Globals.IPCImpl as IPCImpl)!.CreateEntry(IPCImpl.EntryType.SharedMemory, name);
- }
-
- try
- {
- if (fd < 0) {
- throw new Exception("Opening shared memory failed with " + Marshal.GetLastWin32Error());
- }
-
- var allocated = new FileInfo(filename).Length;
- Console.WriteLine("Bytes Allocated: " + allocated);
- if (allocated < size)
- {
- Console.WriteLine("ftruncate: " + LinuxConsts.ftruncate(fd, size));
- var newsize = new FileInfo(filename).Length;
- Console.WriteLine("New Size: " + newsize);
- }
-
- var ret = LinuxConsts.mmap(null, size, LinuxConsts.PROT_READ | LinuxConsts.PROT_WRITE, LinuxConsts.MAP_SHARED, fd, 0);
- if (ret == LinuxConsts.MAP_FAILED) {
- throw new Exception("mmap failed with " + Marshal.GetLastWin32Error());
- }
-
- Data = ret;
- }
- catch (System.Exception)
- {
- if (entry != null) {
- IPCImpl.Entry.RemoveReference(entry, Environment.ProcessId);
- }
-
- throw;
- }
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/MutexDisposable.cs b/ChromeTestClient/Platform/Linux/MutexDisposable.cs
deleted file mode 100644
index c277d90a..00000000
--- a/ChromeTestClient/Platform/Linux/MutexDisposable.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace ipctest.Platform.Linux;
-
-public unsafe sealed class MutexDisposable : IDisposable
-{
- private SteamLinuxMutex* mutex;
- private Action? destructExtraFunc;
- public MutexDisposable(SteamLinuxMutex* mutex, uint timeoutMS = 5000, Action? acquireExtraFunc = null, Action? destructExtraFunc = null) {
- this.destructExtraFunc = destructExtraFunc;
- this.mutex = mutex;
- if (timeoutMS != 0) {
- // Wait a specified timeout
- timespec timeout = new()
- {
- tv_sec = timeoutMS / 1000
- };
-
- ErrnoException.ThrowIfNonZero(SteamLinuxMutex.IPCMutexLock(mutex, &timeout));
- acquireExtraFunc?.Invoke();
- } else {
- // Wait forever
- ErrnoException.ThrowIfNonZero(SteamLinuxMutex.IPCMutexLock(mutex, null));
- acquireExtraFunc?.Invoke();
- }
- }
-
- public void Dispose()
- {
- destructExtraFunc?.Invoke();
- SteamLinuxMutex.IPCMutexUnlock(mutex);
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Platform/Linux/SteamLinuxMutex.cs b/ChromeTestClient/Platform/Linux/SteamLinuxMutex.cs
deleted file mode 100644
index 5cf8ac76..00000000
--- a/ChromeTestClient/Platform/Linux/SteamLinuxMutex.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace ipctest.Platform.Linux;
-
-//TODO: We could use managed thread ID's instead of native thread id's, however I'm pretty sure the code-executing thread may switch around every now and then when running managed code, so it may cause problems
-[StructLayout(LayoutKind.Sequential)]
-public unsafe struct SteamLinuxMutex
-{
- public int threadID;
- public uint unk1;
- public uint unk2;
- public uint unk3;
- public uint unk4;
- //public uint unk5;
- //public uint** anotherField;
- public robust_list robust_list;
-
- // This function is almost directly copied from Ghidra. It needs cleanup.
- public static int IPCMutexLock(SteamLinuxMutex* mutex, timespec* timeout)
- {
- int iVar1 = 0;
- uint actualThreadHolder = 0;
- long lVar2 = 0;
- uint ourThreadID = 0;
- uint expectedThreadID = 0;
- uint ownerThread = 0;
- uint fastAcquireRun = 0;
- uint uVar4 = 0;
- bool bVar5 = false;
- uint someLocal = 0;
- robust_list_head* robust_list = null;
- nuint len = 0;
- robust_list* ppuVar1 = null;
-
- var ret = LinuxConsts.syscall_get_robust_list(LinuxConsts.SYS_get_robust_list, 0, &robust_list, &len);
- if (robust_list == null || len != 24)
- {
- throw new Exception("Fatal error: futex robust_list not initialized by pthreads");
- }
-
- if (robust_list->futex_offset != -32)
- {
- throw new Exception("Fatal error: futex robust_list not pthreads-compatible");
- }
-
- robust_list->list_op_pending = (robust_list*)&mutex->robust_list;
-
- if (ourThreadID == 0)
- {
- ourThreadID = (uint)LinuxConsts.syscall_gettid(LinuxConsts.SYS_gettid);
- }
-
- ourThreadID = ourThreadID & 0x1fffffff;
- ownerThread = (uint)Interlocked.CompareExchange(ref mutex->threadID, (int)ourThreadID, 0);
- if (ownerThread != 0)
- {
- bool anyConditionMatches = false;
- if ((ourThreadID != (ownerThread & 0x1fffffff)))
- {
- anyConditionMatches = true;
- }
- else if ((ownerThread & 0x40000000) != 0)
- {
- anyConditionMatches = true;
- iVar1 = 0x23;
- }
-
- if (anyConditionMatches)
- {
- if ((timeout == (timespec*)0x0) || ((timeout->tv_sec != 0 || (timeout->tv_nsec != 0))))
- {
- fastAcquireRun = 0;
- someLocal = ownerThread & 0x40000000;
- expectedThreadID = ownerThread;
- uVar4 = ourThreadID;
- if (someLocal == 0) {
- do
- {
- bool doubleJump = false;
-
- uVar4 = ourThreadID;
- if (ownerThread == 0)
- {
- expectedThreadID = 0;
- someLocal = 0;
- }
- else if (fastAcquireRun < 100)
- {
- ownerThread = 0;
- fastAcquireRun = fastAcquireRun + 1;
- expectedThreadID = 0;
- }
- else
- {
- ourThreadID = ourThreadID | 0x80000000;
- expectedThreadID = ownerThread;
- uVar4 = ourThreadID;
- if (-1 < (int)ownerThread)
- {
- expectedThreadID = ownerThread | 0x80000000;
- actualThreadHolder = (uint)Interlocked.CompareExchange(ref mutex->threadID, (int)expectedThreadID, (int)ownerThread);
- if (((ownerThread ^ actualThreadHolder) & 0x7fffffff) != 0)
- {
- fastAcquireRun = fastAcquireRun + 1;
- doubleJump = true;
- goto breakOutOfIf;
- //goto LAB_010438bb;
- }
- }
- lVar2 = LinuxConsts.syscall_futex(LinuxConsts.SYS_futex, (uint*)&mutex->threadID, 0, expectedThreadID, timeout, null, 0);
- if (lVar2 < 0)
- {
- iVar1 = Marshal.GetLastWin32Error();
- if ((iVar1 != 0xb) && (iVar1 != 4))
- {
- if (iVar1 == 0) goto uncontestedLock;
- goto endOfFunction;
- }
- }
- fastAcquireRun = fastAcquireRun + 1;
- expectedThreadID = 0;
- ownerThread = 0;
- }
-
- breakOutOfIf:
-
- while (true)
- {
- if (doubleJump) {
- doubleJump = false;
- goto LAB_010438bb;
- }
-
- actualThreadHolder = (uint)Interlocked.CompareExchange(ref mutex->threadID, (int)ourThreadID, (int)expectedThreadID);
- if (actualThreadHolder == ownerThread)
- {
- if (someLocal == 0) goto uncontestedLock;
- iVar1 = 130;
- goto endOfFunction;
- }
- LAB_010438bb:
- someLocal = actualThreadHolder & 0x40000000;
- ownerThread = actualThreadHolder;
- expectedThreadID = actualThreadHolder;
- ourThreadID = uVar4;
- if (someLocal == 0) break;
- goto LAB_010438cd;
- }
- } while (true);
- }
-
- // someLocal != 0
- LAB_010438cd:
- ourThreadID = expectedThreadID & 0x80000000 | uVar4;
- ownerThread = expectedThreadID;
-
- }
-
- if ((ownerThread & 0x40000000) != 0)
- {
- bVar5 = Interlocked.CompareExchange(ref mutex->threadID, (int)(ourThreadID | ownerThread & 0x80000000), (int)ownerThread) == ownerThread;
- if (bVar5)
- {
- iVar1 = 130;
- goto endOfFunction;
- }
- }
-
- iVar1 = 110;
- }
-
- goto endOfFunction;
- }
-
- uncontestedLock:
- // ownerThread == 0
- ppuVar1 = &robust_list->list;
- (mutex->robust_list).next = ppuVar1->next;
- ppuVar1->next = &mutex->robust_list;
-
- endOfFunction:
- robust_list->list_op_pending = (robust_list*)0x0;
- return iVar1;
- }
-
- ///
- /// Unlocks the mutex. Make sure you actually own it before freeing, as there are no checks done.
- ///
- ///
- ///
- public static int IPCMutexUnlock(SteamLinuxMutex* mutex)
- {
- //Console.WriteLine("Unlocking mutex: " + (nint)mutex);
- var xchgResult = Interlocked.Exchange(ref mutex->threadID, 0);
- if (xchgResult < 0) {
- LinuxConsts.syscall_futex(LinuxConsts.SYS_futex, (uint*)&mutex->threadID, LinuxConsts.FUTEX_WAKE, 1, null, null, 0);
- }
-
- return xchgResult;
- }
-
- public override string ToString()
- {
- return $"{threadID} {unk1} {unk2} {unk3} {unk4}";
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/Program.cs b/ChromeTestClient/Program.cs
deleted file mode 100644
index ad319034..00000000
--- a/ChromeTestClient/Program.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO.MemoryMappedFiles;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace ipctest;
-
-public unsafe class Program
-{
- private static void Main(string[] args)
- {
- // PrintInfo();
-
- // var thread = new Thread(() =>
- // {
- // PrintInfo();
- // });
-
- // thread.Start();
- // Thread.Sleep(50);
-
- // thread = new Thread(() =>
- // {
- // PrintInfo();
- // });
-
- // thread.Start();
- // Thread.Sleep(50);
-
- // thread = new Thread(() =>
- // {
- // PrintInfo();
- // });
-
- // thread.Start();
- // Thread.Sleep(50);
- bool hasSteam = Process.GetProcessesByName("steam").FirstOrDefault() != null;
- if (OperatingSystem.IsLinux() && !hasSteam) {
- var homevar = Environment.GetEnvironmentVariable("HOME");
- if (string.IsNullOrEmpty(homevar)) {
- throw new NullReferenceException("HOME not set, please set it");
- }
-
- File.WriteAllText(Path.Combine(homevar, ".steam/steam.pid"), Environment.ProcessId.ToString());
- Console.WriteLine("Set steam PID to " + Environment.ProcessId.ToString());
- }
-
- if (!hasSteam) {
- Console.CancelKeyPress += (object? sender, ConsoleCancelEventArgs e) =>
- {
- LiteHTMLHost.KillHTMLHost();
- };
-
- LiteHTMLHost.StartHTMLHost();
- Thread.Sleep(1000);
- }
-
- var chromeIPCClient = new ChromeIPCClient();
-
- while (true)
- {
- Thread.Sleep(10);
- }
-
- // sharedMemoryIPC.CreateSharedMemory($"SteamChrome_MasterStream_uid{SharedMemoryIPC.getuid()}_spid{GetSteamPID()}_mem");
- // sharedMemoryIPC.CreateSharedMemory($"SteamChrome_MasterStream_3137_28054_mem");
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/README.md b/ChromeTestClient/README.md
deleted file mode 100644
index a2e0ce80..00000000
--- a/ChromeTestClient/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ipctest
-this is a terrible effort to reverse Steam's shared memory IPC on linux
-tread carefully. Pain is imminent.
\ No newline at end of file
diff --git a/ChromeTestClient/SharedMemStream.cs b/ChromeTestClient/SharedMemStream.cs
deleted file mode 100644
index 48084a96..00000000
--- a/ChromeTestClient/SharedMemStream.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System.IO;
-using System.Runtime.InteropServices;
-using ipctest.Platform;
-
-namespace ipctest;
-
-public unsafe sealed class SharedMemStream : IDisposable
-{
- public struct SharedMemHeader {
- public uint totalRead;
- public uint totalWritten;
- public uint connSize;
- public uint availableBytes;
-
- public override string ToString()
- {
- return $"{totalRead} {totalWritten} {connSize} {availableBytes}";
- }
- }
-
- private readonly ISharedMemory sharedMemory;
- private readonly IEvent writtenEvent;
- private readonly IEvent availEvent;
- private readonly IMutex mutex;
- private bool isDisposed = false;
- public SharedMemHeader* HeaderPtr => (SharedMemHeader*)sharedMemory.Data;
- private byte* DataPtr => (byte*)((nint)sharedMemory.Data + sizeof(SharedMemHeader));
- private byte* EndPtr => (byte*)((nint)sharedMemory.Data + HeaderPtr->connSize);
-
- // Stream compat
- public int WriteTimeout { get; set; }
- public int ReadTimeout { get; set; }
-
-
- public SharedMemStream(string name, out bool bCreated, uint wantedSize = 0x1900000, int timeoutMS = 1000) {
- this.WriteTimeout = timeoutMS;
- this.ReadTimeout = timeoutMS;
-
- mutex = Globals.IPCImpl.CreateMutex($"{name}_mutex", out bool bCreatedMutex);
- IDisposable? constructLock = null;
- if (bCreatedMutex) {
- constructLock = mutex.Lock();
- }
-
- try
- {
- writtenEvent = Globals.IPCImpl.CreateEvent($"{name}_written", out _);
- availEvent = Globals.IPCImpl.CreateEvent($"{name}_avail", out _);
- var allocatedSize = (uint)(wantedSize + sizeof(SharedMemHeader));
- sharedMemory = Globals.IPCImpl.CreateSharedMemory($"{name}_mem", allocatedSize, out bCreated);
- Console.WriteLine($"Got ptr {(nint)sharedMemory.Data}");
- if (!bCreated) {
- // Check validity of existing stream
- if (HeaderPtr->connSize != wantedSize) {
- throw new Exception($"Size on connection to existing SharedMemStream doesn't match actual: {name}, {allocatedSize}, {HeaderPtr->connSize}");
- }
- } else {
- NativeMemory.Clear(sharedMemory.Data, allocatedSize);
- HeaderPtr->connSize = wantedSize;
- }
-
- ReadPosition = HeaderPtr->totalRead;
-
- }
- finally
- {
- constructLock?.Dispose();
- }
- }
-
- public void Dispose() {
- if (isDisposed) {
- return;
- }
-
- isDisposed = true;
- mutex.Dispose();
- sharedMemory.Dispose();
- writtenEvent.Dispose();
- availEvent.Dispose();
- }
-
- public bool BWaitForDataToGet(uint timeoutMS = 0) {
- ObjectDisposedException.ThrowIf(this.isDisposed, this);
- if (WritePosition > ReadPosition) {
- return true;
- }
-
- writtenEvent.WaitForStateChange(timeoutMS);
- Console.WriteLine("HDR: " + HeaderPtr->ToString());
- Console.WriteLine("AvailableToRead: " + AvailableToRead);
- return AvailableToRead > 0;
- }
-
- public long Capacity => HeaderPtr->connSize;
- public long ReadPosition { get; set; }
-
- public long WritePosition {
- get => HeaderPtr->totalWritten;
- set => HeaderPtr->totalWritten = (uint)value;
- }
-
- public long AvailableToRead
- => HeaderPtr->totalWritten - ReadPosition;
-
- public long RemainingCapacity
- => this.EndPtr - (this.DataPtr + HeaderPtr->availableBytes);
-
- public long GetOffsetReadPosition(int offset) {
- return ReadPosition + offset;
- }
-
- public long GetOffsetWritePosition(int offset) {
- return WritePosition + offset;
- }
-
- public int Read(byte[] buffer, int offset, int count)
- {
- ObjectDisposedException.ThrowIf(this.isDisposed, this);
- ThrowIfArrayDoesntMatchSize(buffer, count, nameof(count));
-
- Console.WriteLine("LockR");
- using var l = mutex.Lock((uint)this.ReadTimeout);
- Console.WriteLine("LockedR");
-
- long toRead = long.Clamp(count, 0, Capacity);
- toRead = long.Clamp(toRead, 0, buffer.Length);
- toRead = long.Clamp(toRead, 0, HeaderPtr->totalWritten - GetOffsetReadPosition(offset));
-
- Console.WriteLine("HDR: " + HeaderPtr->ToString());
- fixed (byte* ptr = buffer) {
- NativeMemory.Copy(DataPtr + GetOffsetReadPosition(offset), ptr, (nuint)toRead);
- }
-
- if (HeaderPtr->totalRead > ReadPosition) {
- // Only update the read count and available bytes if we're reading at the head
- HeaderPtr->totalRead += (uint)toRead;
-
- if (toRead >= HeaderPtr->availableBytes) {
- // Only update available bytes if we're reading at the top
- HeaderPtr->availableBytes -= (uint)toRead;
- availEvent.Signal();
- }
- }
-
- ReadPosition += (uint)toRead;
-
- // This API is terrible. Why do we need so many conversions?
- return (int)toRead;
- }
-
- public void Write(byte[] buffer, int offset, int count)
- {
- ObjectDisposedException.ThrowIf(this.isDisposed, this);
- ThrowIfArrayDoesntMatchSize(buffer, count, nameof(count));
-
- Console.WriteLine("LockW");
- using var l = mutex.Lock((uint)this.WriteTimeout);
- Console.WriteLine("LockedW");
-
- long maxWritable = long.Clamp(count, 0, Capacity - HeaderPtr->totalWritten - offset);
- if (maxWritable < count) {
- throw new ArgumentOutOfRangeException(nameof(count));
- }
-
- fixed (byte* ptr = buffer) {
- NativeMemory.Copy(ptr, DataPtr + GetOffsetWritePosition(offset), (nuint)maxWritable);
- HeaderPtr->availableBytes += (uint)maxWritable;
- HeaderPtr->totalWritten += (uint)maxWritable;
- }
-
- this.writtenEvent.Signal();
- }
-
- private static void ThrowIfArrayDoesntMatchSize(byte[] arr, long size, string argumentName) {
- if (size > arr.LongLength) {
- throw new ArgumentOutOfRangeException(argumentName);
- }
- }
-}
\ No newline at end of file
diff --git a/ChromeTestClient/nuget.config b/ChromeTestClient/nuget.config
deleted file mode 100644
index 42c6aa46..00000000
--- a/ChromeTestClient/nuget.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/GameOverlayDebugTarget/App.axaml b/GameOverlayDebugTarget/App.axaml
deleted file mode 100644
index 9a2f2deb..00000000
--- a/GameOverlayDebugTarget/App.axaml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/GameOverlayDebugTarget/App.axaml.cs b/GameOverlayDebugTarget/App.axaml.cs
deleted file mode 100644
index ed1bc57f..00000000
--- a/GameOverlayDebugTarget/App.axaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-
-namespace GameOverlayDebugTarget;
-
-public partial class App : Application
-{
- public override void Initialize()
- {
- AvaloniaXamlLoader.Load(this);
- }
-
- public override void OnFrameworkInitializationCompleted()
- {
- if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
- {
- desktop.MainWindow = new MainWindow();
- }
-
- base.OnFrameworkInitializationCompleted();
- }
-}
\ No newline at end of file
diff --git a/GameOverlayDebugTarget/GameOverlayDebugTarget.csproj b/GameOverlayDebugTarget/GameOverlayDebugTarget.csproj
deleted file mode 100644
index 1dd981ae..00000000
--- a/GameOverlayDebugTarget/GameOverlayDebugTarget.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- WinExe
- net8.0
- enable
- true
- app.manifest
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/GameOverlayDebugTarget/MainWindow.axaml b/GameOverlayDebugTarget/MainWindow.axaml
deleted file mode 100644
index 27d4b87f..00000000
--- a/GameOverlayDebugTarget/MainWindow.axaml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
diff --git a/GameOverlayDebugTarget/MainWindow.axaml.cs b/GameOverlayDebugTarget/MainWindow.axaml.cs
deleted file mode 100644
index 0ba4b576..00000000
--- a/GameOverlayDebugTarget/MainWindow.axaml.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using GameOverlayUI.IPC;
-
-namespace GameOverlayDebugTarget;
-
-public partial class MainWindow : Window
-{
- private Thread? thread;
- private readonly object inputsLock = new();
- private readonly List inputs = new();
-
- public MainWindow()
- {
- InitializeComponent();
- this.thread = new Thread(MainThread);
- this.thread.Start();
- this.SystemDecorations = SystemDecorations.None;
- this.WindowState = WindowState.FullScreen;
- }
-
- private static RawInputModifiers KeyModifiersToRawInputModifiers(KeyModifiers keyModifiers) {
- var raw = RawInputModifiers.None;
- if (keyModifiers.HasFlag(KeyModifiers.Alt)) {
- raw |= RawInputModifiers.Alt;
- }
-
- if (keyModifiers.HasFlag(KeyModifiers.Control)) {
- raw |= RawInputModifiers.Control;
- }
-
- if (keyModifiers.HasFlag(KeyModifiers.Meta)) {
- raw |= RawInputModifiers.Meta;
- }
-
- if (keyModifiers.HasFlag(KeyModifiers.Shift)) {
- raw |= RawInputModifiers.Shift;
- }
-
- return raw;
- }
-
- private static MouseButton PointerUpdateKindToMouseButton(PointerUpdateKind pointerUpdateKind) {
- return pointerUpdateKind switch
- {
- PointerUpdateKind.LeftButtonPressed => MouseButton.Left,
- PointerUpdateKind.LeftButtonReleased => MouseButton.Left,
- PointerUpdateKind.MiddleButtonPressed => MouseButton.Middle,
- PointerUpdateKind.MiddleButtonReleased => MouseButton.Middle,
- PointerUpdateKind.RightButtonPressed => MouseButton.Right,
- PointerUpdateKind.RightButtonReleased => MouseButton.Right,
- PointerUpdateKind.XButton1Pressed => MouseButton.XButton1,
- PointerUpdateKind.XButton1Released => MouseButton.XButton1,
- PointerUpdateKind.XButton2Pressed => MouseButton.XButton2,
- PointerUpdateKind.XButton2Released => MouseButton.XButton2,
- _ => MouseButton.None
- };
- }
-
- private void OnPointerReleased(object? sender, Avalonia.Input.PointerReleasedEventArgs e) {
- var pos = PixelPoint.FromPoint(e.GetPosition(RenderedImage), this.RenderScaling);
- Console.WriteLine("RELEASED at " + pos);
-
- lock (inputsLock)
- {
- inputs.Add(new InputData(KeyModifiersToRawInputModifiers(e.KeyModifiers), (uint)pos.X, (uint)pos.Y, PointerUpdateKindToMouseButton(e.GetCurrentPoint(null).Properties.PointerUpdateKind), false));
- }
- }
-
- private void OnPointerPressed(object? sender, Avalonia.Input.PointerPressedEventArgs e) {
- var pos = PixelPoint.FromPoint(e.GetPosition(RenderedImage), this.RenderScaling);
- Console.WriteLine("PRESSED at " + pos);
-
- lock (inputsLock)
- {
- inputs.Add(new InputData(KeyModifiersToRawInputModifiers(e.KeyModifiers), (uint)pos.X, (uint)pos.Y, PointerUpdateKindToMouseButton(e.GetCurrentPoint(null).Properties.PointerUpdateKind), true));
- }
- }
-
- private void OnPointerMoved(object? sender, Avalonia.Input.PointerEventArgs e) {
- var pos = e.GetPosition(RenderedImage);
- Console.WriteLine("MOVED at " + pos);
-
- lock (inputsLock)
- {
- inputs.Add(new InputData(KeyModifiersToRawInputModifiers(e.KeyModifiers), (uint)pos.X, (uint)pos.Y));
- }
- }
-
- private void OnKeyDown(object? sender, Avalonia.Input.KeyEventArgs e) {
- Console.WriteLine("key down");
- lock (inputsLock)
- {
- inputs.Add(new InputData(KeyModifiersToRawInputModifiers(e.KeyModifiers), e.Key, e.PhysicalKey, true));
- }
- }
-
- private void OnKeyUp(object? sender, Avalonia.Input.KeyEventArgs e) {
- Console.WriteLine("key up");
- lock (inputsLock)
- {
- inputs.Add(new InputData(KeyModifiersToRawInputModifiers(e.KeyModifiers), e.Key, e.PhysicalKey, false));
- }
- }
-
- private EOverlayState State {
- get {
- unsafe {
- return Program.Container.Get().ControlData.Data->State;
- }
- }
-
- set {
- unsafe {
- Program.Container.Get().ControlData.Data->State = value;
- }
- }
- }
-
- private unsafe void MainThread() {
- var sharedMemoryManager = Program.Container.Get();
- int fpsLimit = 0;
- double averageElapsed = 0;
- double averageFPS = 0;
- Stopwatch stopwatch = new();
- Stopwatch clientStopwatch = new();
- Stopwatch serverStopwatch = new();
- stopwatch.Start();
- while (true)
- {
- stopwatch.Reset();
- stopwatch.Start();
- serverStopwatch.Reset();
- clientStopwatch.Reset();
- clientStopwatch.Start();
-
- bool isChecked = false;
-
- Dispatcher.UIThread.Invoke(() =>
- {
- isChecked = ShouldRender.IsChecked != null && ShouldRender.IsChecked.Value;
- if (FPSLimitCheck.IsChecked != null && FPSLimitCheck.IsChecked.Value) {
- if (int.TryParse(FPSLimitBox.Text, out int fpsLimit2)) {
- fpsLimit = fpsLimit2;
- }
- } else {
- fpsLimit = 0;
- }
- });
-
- if (!isChecked) {
- Console.WriteLine("Render blocked");
- Thread.Sleep(1000);
- continue;
- }
-
-
- State = EOverlayState.ClientRequestLoopStart;
-
- clientStopwatch.Stop();
- serverStopwatch.Start();
- while (State != EOverlayState.ResponseAvailable)
- {
- if (State == EOverlayState.ServerRequestInputData) {
- goto inputDataAnswer;
- }
- }
-
- while (State != EOverlayState.ServerRequestInputData)
- {
-
- }
-
-inputDataAnswer:
- serverStopwatch.Stop();
- clientStopwatch.Start();
-
- List inputsCopy;
- lock (inputsLock)
- {
- inputsCopy = inputs.ToList();
- inputs.Clear();
- }
-
- uint newLength = (uint)(DynInputData.CalculateDataLength((uint)inputsCopy.Count) + sizeof(DynInputData));
- if (sharedMemoryManager.InputData.Length < newLength) {
- sharedMemoryManager.InputData.Resize(newLength);
- sharedMemoryManager.ControlData.Data->MemoryResized = newLength;
- } else {
- sharedMemoryManager.ControlData.Data->MemoryResized = 0;
- }
-
-
- DynInputData.EnqueueAll(sharedMemoryManager.InputData.Data, inputsCopy);
-
- serverStopwatch.Start();
- clientStopwatch.Stop();
- State = EOverlayState.ResponseAvailable;
- while (State != EOverlayState.ServerRequestDisplayAllocation)
- {
-
- }
-
- serverStopwatch.Stop();
- clientStopwatch.Start();
-
- newLength = (uint)(DynDisplayData.CalculateDataLength(sharedMemoryManager.DisplayData.Data) + sizeof(DynDisplayData));
- sharedMemoryManager.DisplayData.Resize(newLength);
- sharedMemoryManager.ControlData.Data->MemoryResized = newLength;
-
- serverStopwatch.Start();
- clientStopwatch.Stop();
- State = EOverlayState.ResponseAvailable;
-
- while (State != EOverlayState.RenderDataAvailable)
- {
-
- }
-
- serverStopwatch.Stop();
- clientStopwatch.Start();
-
- Dispatcher.UIThread.Invoke(() =>
- {
- WriteableBitmap bitmap;
-
- if (RenderedImage.Source is WriteableBitmap mp)
- {
- bitmap = mp;
- }
- else
- {
- Vector dpi = new Vector(96, 96);
-
- bitmap = new WriteableBitmap(
- new PixelSize((int)sharedMemoryManager.DisplayData.Data->Width, (int)sharedMemoryManager.DisplayData.Data->Height),
- dpi,
- PixelFormat.Bgra8888,
- AlphaFormat.Premul);
-
- RenderedImage.Source = bitmap;
- }
-
- using (var frameBuffer = bitmap.Lock())
- {
- NativeMemory.Copy(&sharedMemoryManager.DisplayData.Data->DynamicData, (void*)frameBuffer.Address, (nuint)DynDisplayData.CalculateDataLength(sharedMemoryManager.DisplayData.Data));
- }
-
- RenderedImage.InvalidateVisual();
- }, DispatcherPriority.Render);
-
- clientStopwatch.Stop();
-
- if (fpsLimit > 0) {
- double calculated = 1 / (double)fpsLimit * 1000;
- int sleepMS = (int)(calculated - stopwatch.Elapsed.TotalMilliseconds);
- if (sleepMS > 0) {
- Thread.Sleep(sleepMS);
- }
- }
-
- var totalElapsed = stopwatch.Elapsed.TotalMilliseconds;
- averageElapsed = (averageElapsed + totalElapsed) / 2;
- averageFPS = (averageFPS + (1 / totalElapsed * 1000)) / 2;
- string debugStrFPS = $"FPS: {TruncateDouble(averageFPS)}";
- string debugStrFTAvg = $"Avg ft: {TruncateDouble(averageElapsed)}ms";
- string debugStrFTLast = $"Last ft: {TruncateDouble(totalElapsed)}ms";
- string debugStrProcessServer = $"Server process {TruncateDouble(serverStopwatch.Elapsed.TotalMilliseconds)}ms";
- string debugStrProcessClient = $"Client process: {TruncateDouble(clientStopwatch.Elapsed.TotalMilliseconds)}ms";
-
- Dispatcher.UIThread.Post(() =>
- {
- FramerateDebugText.Text = debugStrFPS;
- FrametimeAvgDebugText.Text = debugStrFTAvg;
- FrametimeLastDebugText.Text = debugStrFTLast;
- ProcessServerDebugText.Text = debugStrProcessServer;
- ProcessClientDebugText.Text = debugStrProcessClient;
- });
- }
- }
-
- private static string TruncateDouble(double val) {
- return (Math.Truncate(val * 100) / 100).ToString();
- }
-}
\ No newline at end of file
diff --git a/GameOverlayDebugTarget/Program.cs b/GameOverlayDebugTarget/Program.cs
deleted file mode 100644
index d3d5f02c..00000000
--- a/GameOverlayDebugTarget/Program.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Avalonia;
-using GameOverlayUI.IPC;
-using OpenSteamClient.DI;
-using OpenSteamworks.Data.Structs;
-using System;
-
-namespace GameOverlayDebugTarget;
-
-public static class Program
-{
- public static Container Container { get; private set; } = new();
-
- // Initialization code. Don't use any Avalonia, third-party APIs or any
- // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
- // yet and stuff might break.
- [STAThread]
- public static void Main(string[] args)
- {
- Console.CancelKeyPress += HandleCtrlC;
- AppDomain.CurrentDomain.UnhandledException += HandleUnhandledException;
-
- if (args.Length < 1 || !uint.TryParse(args[0], out uint gamepid))
- {
- Console.WriteLine("Not enough args, required [GamePID]");
- return;
- }
-
- Console.WriteLine("Game PID: " + gamepid);
-
- var gameidstr = Environment.GetEnvironmentVariable("SteamOverlayGameId");
- CGameID gameid;
- if (string.IsNullOrEmpty(gameidstr) || !ulong.TryParse(gameidstr, out ulong ugameid) || !(gameid = new CGameID(ugameid)).IsValid()) {
- Console.WriteLine("Invalid SteamOverlayGameId");
- return;
- }
-
- Console.WriteLine("GameID: " + gameid);
- Container.RegisterInstance(new SharedMemoryManager(gamepid, true));
-
- try
- {
- BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, Avalonia.Controls.ShutdownMode.OnExplicitShutdown);
- }
- finally
- {
- DisposeAll();
- }
- }
-
- private static void HandleUnhandledException(object sender, UnhandledExceptionEventArgs e)
- {
- DisposeAll();
- }
-
- private static void HandleCtrlC(object? sender, ConsoleCancelEventArgs e) {
- DisposeAll();
- }
-
- private static bool canDispose = true;
- private static void DisposeAll() {
- if (!canDispose) {
- return;
- }
-
- canDispose = false;
- Container?.Get().Dispose();
- }
-
- // Avalonia configuration, don't remove; also used by visual designer.
- public static AppBuilder BuildAvaloniaApp()
- {
- var builder = AppBuilder.Configure();
- return builder
- .UseSkia()
- .UsePlatformDetect()
- .WithInterFont()
- .LogToTrace();
-
- }
-}
diff --git a/GameOverlayDebugTarget/app.manifest b/GameOverlayDebugTarget/app.manifest
deleted file mode 100644
index 7121aab9..00000000
--- a/GameOverlayDebugTarget/app.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/GameOverlayDebugTarget/nuget.config b/GameOverlayDebugTarget/nuget.config
deleted file mode 100644
index 42c6aa46..00000000
--- a/GameOverlayDebugTarget/nuget.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/GameOverlayUI/AvaloniaApp.axaml b/GameOverlayUI/AvaloniaApp.axaml
deleted file mode 100644
index 184e3052..00000000
--- a/GameOverlayUI/AvaloniaApp.axaml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/GameOverlayUI/AvaloniaApp.axaml.cs b/GameOverlayUI/AvaloniaApp.axaml.cs
deleted file mode 100644
index 2f734d10..00000000
--- a/GameOverlayUI/AvaloniaApp.axaml.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-using OpenSteamworks.Client.Managers;
-using Avalonia.Controls;
-using OpenSteamClient.DI;
-using Avalonia.Threading;
-using AvaloniaCommon;
-using System.Diagnostics;
-using GameOverlayUI.ViewModels;
-using GameOverlayUI.IPC;
-using GameOverlayUI.Views;
-using Avalonia.Headless;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using System.Runtime.InteropServices;
-using Avalonia.Input;
-using GameOverlayUI.Impl;
-using Avalonia.Platform.Storage;
-
-namespace GameOverlayUI;
-
-public class AvaloniaApp : Application
-{
- public new static AvaloniaApp? Current;
- public static Theme? Theme;
- public new IClassicDesktopStyleApplicationLifetime ApplicationLifetime => (base.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)!;
-
- public override void Initialize()
- {
- AvaloniaXamlLoader.Load(this);
- }
-
- private static void InvokeOnUIThread(Action callback)
- {
- if (!Program.Container.IsShuttingDown)
- {
- Avalonia.Threading.Dispatcher.UIThread.Invoke(callback);
- }
- }
-
- public override void OnFrameworkInitializationCompleted()
- {
- Theme = new Theme(this);
-
- var mainViewViewModel = new MainViewViewModel();
- Program.Container.RegisterInstance(mainViewViewModel);
-
- var mainView = new MainView
- {
- DataContext = mainViewViewModel,
- TransparencyLevelHint = new List() { WindowTransparencyLevel.Transparent }
- };
-
- Program.Container.RegisterInstance(mainView);
-
- ForceWindow(mainView);
-
- base.OnFrameworkInitializationCompleted();
-
- serverThread = new(ServerThreadMain);
- serverThread.Start();
- }
-
- // #define LOGSPAM
- private Thread? serverThread;
- private readonly ManualResetEventSlim threadMainMre = new();
- private unsafe void ServerThreadMain() {
- var sharedMemoryManager = Program.Container.Get();
- var mainView = Program.Container.Get();
- RenderTargetBitmap? renderTarget = null;
-
- while (!threadMainMre.IsSet) {
- OverlayControlData.WaitForLoopStart(sharedMemoryManager.ControlData.Data);
- #if LOGSPAM
- Console.WriteLine("Client started loop");
- #endif
-
- sharedMemoryManager.ControlData.Data->State = EOverlayState.ResponseAvailable;
-
- // First resize the display and then run the inputs
- #if LOGSPAM
- Console.WriteLine("Input data requested");
- #endif
-
- OverlayControlData.RequestInputData(sharedMemoryManager.ControlData.Data, out uint newAllocation);
- if (newAllocation != 0) {
- sharedMemoryManager.InputData.Resize(newAllocation + sizeof(DynInputData));
- }
-
- #if LOGSPAM
- Console.WriteLine("Input data received");
- #endif
-
-
- var inputDataIn = sharedMemoryManager.GetInputData();
- List inputData = new();
- int numMouseMoves = inputDataIn.Count(e => e.Type == EInputType.MouseMove);
- foreach (var item in inputDataIn)
- {
- if (item.Type == EInputType.MouseMove) {
- numMouseMoves--;
-
- // Allow 5 or so mouse moves per frame, anything extra will slow down everything to a halt
- if (numMouseMoves > 5) {
- continue;
- }
- }
-
- inputData.Add(item);
- }
-
- Dispatcher.UIThread.Invoke(() => {
- for (int i = 0; i < inputData.Count; i++)
- {
- var input = inputData[i];
- // Avalonia headless input system is seriously slow (it wasn't intended to be used like this)
- Console.WriteLine("Processing input type " + input.Type);
- Console.WriteLine("Mod: " + input.Modifiers);
- var pos = new Point(input.X, input.Y);
- input.Modifiers = RawInputModifiers.None;
-
- switch (input.Type)
- {
- case EInputType.MouseMove:
- mainView.MouseMove(pos, input.Modifiers);
- break;
-
- case EInputType.MouseDown:
- mainView.MouseDown(pos, input.MouseButton, input.Modifiers);
- //mainView.MouseUp(clickPos, input.MouseButton, input.Modifiers);
- break;
-
- case EInputType.MouseUp:
- mainView.MouseUp(pos, input.MouseButton, input.Modifiers);
- break;
-
- case EInputType.KeyDown:
- mainView.KeyPress(input.Key, input.Modifiers, input.PhysicalKey, null);
- break;
-
- case EInputType.KeyUp:
- mainView.KeyRelease(input.Key, input.Modifiers, input.PhysicalKey, null);
- break;
-
- case EInputType.MouseScrollDown:
- mainView.MouseWheel(pos, new Vector(0, -1.0), input.Modifiers);
- break;
-
- case EInputType.MouseScrollUp:
- mainView.MouseWheel(pos, new Vector(0, 1.0), input.Modifiers);
- break;
- }
- }
-
- }, DispatcherPriority.MaxValue);
-
- #if LOGSPAM
- Console.WriteLine("Display allocation requested");
- #endif
-
- OverlayControlData.RequestDisplayAllocation(sharedMemoryManager.ControlData.Data, out newAllocation);
- if (newAllocation != 0) {
- sharedMemoryManager.DisplayData.Resize(newAllocation + sizeof(DynDisplayData));
- }
-
- #if LOGSPAM
- Console.WriteLine("Display allocated");
- #endif
-
- if (renderTarget == null || sharedMemoryManager.DisplayData.Data->Width != renderTarget.PixelSize.Width || sharedMemoryManager.DisplayData.Data->Height != renderTarget.PixelSize.Height) {
- Dispatcher.UIThread.Invoke(() =>
- {
- // Update the resolution of the window itself
- Trace.Assert(mainView.PlatformImpl != null);
-
- #if LOGSPAM
- Console.WriteLine("Target W: " + sharedMemoryManager.DisplayData.Data->Width + ", H: " + sharedMemoryManager.DisplayData.Data->Height);
- #endif
-
- mainView.PlatformImpl.Resize(new Size(sharedMemoryManager.DisplayData.Data->Width, sharedMemoryManager.DisplayData.Data->Height), WindowResizeReason.User);
- }, DispatcherPriority.Render);
-
- renderTarget?.Dispose();
-
- renderTarget = new RenderTargetBitmap(PixelSize.FromSize(new Size(sharedMemoryManager.DisplayData.Data->Width, sharedMemoryManager.DisplayData.Data->Height), 1));
- }
-
- Dispatcher.UIThread.Invoke(() =>
- {
- renderTarget.Render(mainView);
- }, DispatcherPriority.MaxValue);
-
-
- // Console.WriteLine("ClientSize is now " + mainView.ClientSize);
- // Console.WriteLine("PixelSize is now " + );
-
- // AvaloniaHeadlessPlatform.ForceRenderTimerTick(1);
- // var frame = mainView.GetLastRenderedFrame();
-
- // if (frame != null) {
- sharedMemoryManager.SetPixels(renderTarget);
- // }
-
- #if LOGSPAM
- Console.WriteLine("rendered");
- #endif
- sharedMemoryManager.ControlData.Data->State = EOverlayState.RenderDataAvailable;
- }
-
- renderTarget?.Dispose();
-
- serverThread = null;
- }
-
- public void ActivateMainWindow() {
- ApplicationLifetime.MainWindow?.Show();
- ApplicationLifetime.MainWindow?.Activate();
- }
-
- ///
- /// Tries to show the window as a dialog
- ///
- ///
- public void TryShowDialog(Window dialog) {
- dialog.Show();
- }
-
- ///
- /// Tries to show the window as a dialog. If the window is already open, it focus on it.
- ///
- ///
- public void TryShowDialogSingle(Func dialogFactory) where T: Window {
- RunOnUIThread(DispatcherPriority.Send, () =>
- {
- var existingDialog = TryGetDialogSingle();
- if (existingDialog != null) {
- existingDialog.Show();
- existingDialog.Activate();
- return;
- }
-
- dialogFactory().Show();
- });
- }
-
- ///
- /// Runs the given action on the UI thread.
- /// If we're already on the UI thread, executes the function inline.
- /// Blocks until the function has been executed.
- ///
- ///
- public void RunOnUIThread(DispatcherPriority priority, Action func) {
- if (Dispatcher.UIThread.CheckAccess()) {
- func();
- return;
- }
-
- Dispatcher.UIThread.Invoke(func, priority);
- }
-
- public T? TryGetDialogSingle() where T: Window {
- var existingDialogs = ApplicationLifetime.Windows.Where(w => w.GetType() == typeof(T));
- if (existingDialogs.Any()) {
- return (T)existingDialogs.First();
- }
-
- return null;
- }
-
- ///
- /// Closes the current MainWindow (if exists) and replaces it with a user specified window
- ///
- public T ForceWindow(T window) where T : Window
- {
- if (!Program.Container.IsShuttingDown)
- {
- ApplicationLifetime.MainWindow?.Close();
- ApplicationLifetime.MainWindow = window;
- ApplicationLifetime.MainWindow.Show();
- }
-
- return window;
- }
-
- public AvaloniaApp()
- {
- Current = this;
- Name = "OpenSteamClient";
- DataContext = new AvaloniaAppViewModel();
- }
-
- ///
- /// Async exit function. Will hang in certain cases for some unknown reason.
- ///
- public async Task Exit(int exitCode = 0)
- {
- Progress operation = new();
- Progress subOperation = new();
- await Program.Container.RunClientShutdown(operation, subOperation);
- Console.WriteLine("Shutting down Avalonia");
- }
-
- ///
- /// A synchronous exit function. Simply calls Task.Run.
- ///
- public void ExitEventually(int exitCode = 0)
- {
- Dispatcher.UIThread.InvokeAsync(async () => await this.Exit(exitCode));
- }
-}
diff --git a/GameOverlayUI/GameOverlayUI.csproj b/GameOverlayUI/GameOverlayUI.csproj
deleted file mode 100644
index 801c559c..00000000
--- a/GameOverlayUI/GameOverlayUI.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- Exe
- net8.0
- enable
- enable
- true
- true
-
-
-
-
-
-
-
-
-
-
diff --git a/GameOverlayUI/IPC/DynDisplayData.cs b/GameOverlayUI/IPC/DynDisplayData.cs
deleted file mode 100644
index 2c0cfded..00000000
--- a/GameOverlayUI/IPC/DynDisplayData.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Diagnostics;
-using Avalonia.Media.Imaging;
-
-namespace GameOverlayUI.IPC;
-
-public unsafe struct DynDisplayData {
- public uint Width;
- public uint Height;
-
- ///
- /// Start of dynamic data
- ///
- public byte DynamicData;
-
- public static long CalculateDataLength(DynDisplayData* ptr) {
- return ptr->Width * ptr->Height * 4;
- }
-
- public static void SetPixels(DynDisplayData* ptr, Bitmap frame)
- {
- //TODO: This code needs additional sanity checks (such as resolution check)
- //TODO: Resize support (currently game window resizing won't work, need to re-mmap)
-
- #if LOGSPAM
- Console.WriteLine("c: " + CalculateDataLength(ptr) + ", a: " + data.Length);
- Console.WriteLine("W: " + ptr->Width + ", H: " + ptr->Height);
- #endif
-
- const int BPP = 4;
- frame.CopyPixels(new Avalonia.PixelRect(0, 0, frame.PixelSize.Width, frame.PixelSize.Height), (nint)(&ptr->DynamicData), (int)CalculateDataLength(ptr), frame.PixelSize.Width * BPP);
- }
-
- public DynDisplayData()
- {
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/IPC/DynInputData.cs b/GameOverlayUI/IPC/DynInputData.cs
deleted file mode 100644
index 80251da7..00000000
--- a/GameOverlayUI/IPC/DynInputData.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace GameOverlayUI.IPC;
-
-public unsafe struct DynInputData {
- public uint NumQueued;
- public byte DynamicStart;
-
- public static bool TryDequeueAll(DynInputData* ptr, out List inputData)
- {
- inputData = new();
- if (ptr->NumQueued < 1) {
- return false;
- }
-
- Span span = new(&ptr->DynamicStart, (int)CalculateDataLength(ptr));
- for (int i = 0; i < ptr->NumQueued; i++)
- {
- var data = Marshal.PtrToStructure((nint)(&ptr->DynamicStart + (i * Marshal.SizeOf())));
- inputData.Add(data);
- }
-
- ptr->NumQueued = 0;
- return true;
- }
-
- public static void EnqueueAll(DynInputData* ptr, List inputData)
- {
- for (int i = 0; i < inputData.Count; i++)
- {
- nint bufPtr = (nint)(&ptr->DynamicStart) + (i * Marshal.SizeOf());
- Marshal.StructureToPtr(inputData[i], bufPtr, false);
- }
-
- ptr->NumQueued = (uint)inputData.Count;
- }
-
- public static long CalculateDataLength(DynInputData* ptr) {
- return CalculateDataLength(ptr->NumQueued);
- }
-
- public static long CalculateDataLength(uint numInputs) {
- return numInputs * Marshal.SizeOf();
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/IPC/EInputType.cs b/GameOverlayUI/IPC/EInputType.cs
deleted file mode 100644
index 9ae77ef3..00000000
--- a/GameOverlayUI/IPC/EInputType.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace GameOverlayUI.IPC;
-
-public enum EInputType : uint {
- KeyDown,
- KeyUp,
- MouseDown,
- MouseUp,
- MouseMove,
-
- //TODO: Cannot support smooth scrolling
- MouseScrollDown,
- MouseScrollUp,
-}
\ No newline at end of file
diff --git a/GameOverlayUI/IPC/EOverlayState.cs b/GameOverlayUI/IPC/EOverlayState.cs
deleted file mode 100644
index 67bee34d..00000000
--- a/GameOverlayUI/IPC/EOverlayState.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace GameOverlayUI.IPC;
-
-public enum EOverlayState : int {
- NotRunning = 0,
-
- ///
- /// Phase 1 of the overlay loop.
- ///
- ClientRequestLoopStart,
-
- ///
- /// Phase 2 of the overlay loop. The client will re-allocate the display's shared memory segment if the resolution has changed
- ///
- ServerRequestDisplayAllocation,
-
- ///
- /// Phase 3 of the overlay loop. The client will tell the server how big the input buffer is in MemoryResized or 0 if it is unchanged.
- ///
- ServerRequestInputData,
-
- ///
- /// Phase 4 of the overlay loop. Set by the server once rendering is done and the results are ready in memory to be displayed by the client.
- /// After the client finishes rendering, the client will reset the state to NotRunning or ClientRequestLoopStart
- ///
- RenderDataAvailable,
-
-
- ResponseAvailable,
-}
diff --git a/GameOverlayUI/IPC/InputData.cs b/GameOverlayUI/IPC/InputData.cs
deleted file mode 100644
index ece59fb3..00000000
--- a/GameOverlayUI/IPC/InputData.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Runtime.InteropServices;
-using Avalonia.Input;
-
-namespace GameOverlayUI.IPC;
-
-[StructLayout(LayoutKind.Explicit)]
-public unsafe struct InputData {
- [FieldOffset(0)]
- public EInputType Type;
-
- [FieldOffset(4)]
- public RawInputModifiers Modifiers;
-
- // Mouse specific
-
- [FieldOffset(8)]
- public MouseButton MouseButton;
-
- [FieldOffset(12)]
- public uint X;
-
- [FieldOffset(16)]
- public uint Y;
-
- // Keyboard specific
-
- [FieldOffset(8)]
- public Key Key;
-
- [FieldOffset(12)]
- public PhysicalKey PhysicalKey;
-
- public InputData(EInputType type, RawInputModifiers modifiers) {
- this.Type = type;
- this.Modifiers = modifiers;
- }
-
- public InputData(RawInputModifiers modifiers, uint x, uint y) : this(EInputType.MouseMove, modifiers) {
- this.X = x;
- this.Y = y;
- }
-
- public InputData(RawInputModifiers modifiers, uint x, uint y, MouseButton button, bool down = true) : this(modifiers, x, y) {
- this.Type = down ? EInputType.MouseDown : EInputType.MouseUp;
- this.MouseButton = button;
- }
-
- public InputData(RawInputModifiers modifiers, Key key, PhysicalKey physicalKey, bool down = true) : this(EInputType.KeyDown, modifiers) {
- this.Type = down ? EInputType.KeyDown : EInputType.KeyUp;
- this.Key = key;
- this.PhysicalKey = physicalKey;
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/IPC/OverlayControlData.cs b/GameOverlayUI/IPC/OverlayControlData.cs
deleted file mode 100644
index f2d7a179..00000000
--- a/GameOverlayUI/IPC/OverlayControlData.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace GameOverlayUI.IPC;
-
-public struct OverlayControlData {
- public EOverlayState State = EOverlayState.NotRunning;
- public uint MemoryResized = 0;
-
-
- public static unsafe void WaitForLoopStart(OverlayControlData* data) {
- while (data->State != EOverlayState.ClientRequestLoopStart)
- {
- // This is terible, but it will have to do unless we start using linux mutexes and that's complex (and even more not-cross platform).
- Thread.Sleep(1);
- }
- }
-
- public static unsafe void RequestInputData(OverlayControlData* data, out uint newAllocation) {
- data->State = EOverlayState.ServerRequestInputData;
- while (data->State != EOverlayState.ResponseAvailable)
- {
- //Thread.Sleep(1);
- }
-
- newAllocation = data->MemoryResized;
- data->MemoryResized = 0;
- }
-
- public static unsafe void RequestDisplayAllocation(OverlayControlData* data, out uint newAllocation) {
- data->State = EOverlayState.ServerRequestDisplayAllocation;
- while (data->State != EOverlayState.ResponseAvailable)
- {
- //Thread.Sleep(1);
- }
-
- newAllocation = data->MemoryResized;
- data->MemoryResized = 0;
- }
-
- public OverlayControlData() { }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/IPC/SharedMemoryManager.cs b/GameOverlayUI/IPC/SharedMemoryManager.cs
deleted file mode 100644
index 922fb67f..00000000
--- a/GameOverlayUI/IPC/SharedMemoryManager.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System.IO.MemoryMappedFiles;
-using System.Runtime.InteropServices;
-using Avalonia.Headless;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using Avalonia.Threading;
-using SkiaSharp;
-
-namespace GameOverlayUI.IPC;
-
-public unsafe class SharedMemoryManager : IDisposable {
- public class SharedMemorySegment : IDisposable where TData : unmanaged
- {
- public string IPCFilePath => $"/dev/shm{IPCName}";
- public string IPCName { get; }
- public long Length { get; private set; }
- public TData* Data { get; private set; }
- public int FD { get; private set; }
-
- public SharedMemorySegment(string ipcName, long initialSize) {
- IPCName = ipcName;
- Resize(initialSize, true);
- }
-
- public void Resize(long newLength)
- => Resize(newLength, false);
-
- private void Resize(long newLength, bool isInit) {
- if (newLength == Length && !isInit) {
- #if LOGSPAM
- Console.WriteLine("No need to resize");
- #endif
-
- return;
- }
-
- if (Data != null) {
- munmap(Data, (uint)Length);
- }
-
- FD = shm_open(IPCName, 66, 511);
- Console.WriteLine("open result: " + FD);
-
- Console.WriteLine("ftruncate: " + ftruncate(FD, (uint)newLength));
- Length = new FileInfo(IPCFilePath).Length;
- Console.WriteLine("New Size: " + Length);
-
- Data = (TData*)mmap((void*)0x0, (uint)newLength, 3, 1, FD, 0);
- Console.WriteLine("mmap result: " + (nint)Data);
-
- var closeResult = close(FD);
- Console.WriteLine("close result: " + closeResult);
-
- Length = newLength;
- }
-
- public void Dispose()
- {
- if (Data == null) {
- throw new ObjectDisposedException(nameof(Data));
- }
-
- ReleaseSharedMemory();
- Data = null;
- Length = 0;
- }
-
- private void ReleaseSharedMemory() {
- var result = munmap(Data, (uint)Length);
- Console.WriteLine("munmap result: " + result);
-
- if (!isClient) {
- result = shm_unlink(IPCName);
- Console.WriteLine("unlink result: " + result);
- }
- }
- }
-
- [DllImport("c")]
- private static extern int getuid();
-
- [DllImport("c")]
- private static extern void* mmap(void* addr, uint length, int prot, int flags, int fd, uint offset);
-
- [DllImport("c")]
- private static extern int munmap(void* addr, uint length);
-
- [DllImport("c", SetLastError = true)]
- private static extern int ftruncate(int fd, uint length);
-
- [DllImport("c")]
- private static extern int shm_open([MarshalAs(UnmanagedType.LPUTF8Str)] string name, int oflag, int mode);
-
- [DllImport("c")]
- private static extern int shm_unlink([MarshalAs(UnmanagedType.LPUTF8Str)] string name);
-
- [DllImport("c")]
- private static extern int close(int fd);
-
- public SharedMemorySegment InputData { get; private set; }
- public SharedMemorySegment DisplayData { get; private set; }
- public SharedMemorySegment ControlData { get; private set; }
-
-
- public uint GamePID { get; init; }
- public string IPCNameInput => $"/u{getuid()}_OpenSteamClientIPC-GameOverlay_{GamePID}_Input";
- public string IPCNameDisplay => $"/u{getuid()}_OpenSteamClientIPC-GameOverlay_{GamePID}_Display";
- public string IPCNameControl => $"/u{getuid()}_OpenSteamClientIPC-GameOverlay_{GamePID}_Control";
-
- private static bool isClient = false;
- public SharedMemoryManager(uint gamePID, bool client = false) {
- isClient = client;
-
- if (!OperatingSystem.IsLinux()) {
- throw new NotSupportedException();
- }
-
- this.GamePID = gamePID;
-
- InputData = new(IPCNameInput, 1024);
- DisplayData = new(IPCNameDisplay, 1920 * 1080 * 4);
- ControlData = new(IPCNameControl, sizeof(OverlayControlData));
-
- if (!client) {
- // The server setups the initial screen allocation
- DisplayData.Data->Width = 1920;
- DisplayData.Data->Height = 1080;
- DisplayData.Resize(DynDisplayData.CalculateDataLength(DisplayData.Data) + sizeof(DynDisplayData));
- }
- }
-
- public List GetInputData() {
- if (DynInputData.TryDequeueAll(InputData.Data, out List inputData)) {
- Console.WriteLine("Got input data, count: " + inputData.Count);
- }
-
- return inputData;
- }
-
- public void SetPixels(Bitmap frame) {
- if (frame.Format != PixelFormat.Bgra8888) {
- throw new Exception("Invalid format for image");
- }
-
- DynDisplayData.SetPixels(DisplayData.Data, frame);
- }
-
- public void Dispose()
- {
- InputData.Dispose();
- DisplayData.Dispose();
- ControlData.Dispose();
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/Impl/OverlayLauncher.cs b/GameOverlayUI/Impl/OverlayLauncher.cs
deleted file mode 100644
index 467b52db..00000000
--- a/GameOverlayUI/Impl/OverlayLauncher.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-using Avalonia.Input.Platform;
-using Avalonia.Platform.Storage;
-
-namespace GameOverlayUI.Impl;
-
-///
-/// Mostly copied from Avalonia BclLauncher
-///
-public class OverlayLauncher : ILauncher
-{
- public virtual Task LaunchUriAsync(Uri uri)
- {
- _ = uri ?? throw new ArgumentNullException(nameof(uri));
- if (uri.IsAbsoluteUri)
- {
- return Task.FromResult(Exec(uri.AbsoluteUri));
- }
-
- return Task.FromResult(false);
- }
-
- ///
- /// This Process based implementation doesn't handle the case, when there is no app to handle link.
- /// It will still return true in this case.
- ///
- public virtual Task LaunchFileAsync(IStorageItem storageItem)
- {
- _ = storageItem ?? throw new ArgumentNullException(nameof(storageItem));
- if (storageItem.TryGetLocalPath() is { } localPath
- && CanOpenFileOrDirectory(localPath))
- {
- return Task.FromResult(Exec(localPath));
- }
-
- return Task.FromResult(false);
- }
-
- protected virtual bool CanOpenFileOrDirectory(string localPath) => true;
-
- private static bool Exec(string urlOrFile)
- {
- if (OperatingSystem.IsLinux())
- {
- // If no associated application/json MimeType is found xdg-open opens return error
- // but it tries to open it anyway using the console editor (nano, vim, other..)
- ShellExec($"xdg-open {urlOrFile}", waitForExit: false);
- return true;
- }
- else if (OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
- {
- using var process = Process.Start(new ProcessStartInfo
- {
- FileName = OperatingSystem.IsWindows() ? urlOrFile : "open",
- Arguments = OperatingSystem.IsMacOS() ? $"{urlOrFile}" : "",
- CreateNoWindow = true,
- UseShellExecute = OperatingSystem.IsWindows()
- });
- return true;
- }
- else
- {
- return false;
- }
- }
-
- private static void ShellExec(string cmd, bool waitForExit = true)
- {
- var escapedArgs = Regex.Replace(cmd, "(?=[`~!#&*()|;'<>])", "\\")
- .Replace("\"", "\\\\\\\"");
-
- using (var process = Process.Start(
- new ProcessStartInfo
- {
- FileName = "/bin/sh",
- Arguments = $"-c \"{escapedArgs}\"",
- RedirectStandardOutput = true,
- UseShellExecute = false,
- CreateNoWindow = true,
- WindowStyle = ProcessWindowStyle.Hidden
- }
- ))
- {
- if (waitForExit)
- {
- process?.WaitForExit();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/Impl/OverlayLauncherFactory.cs b/GameOverlayUI/Impl/OverlayLauncherFactory.cs
deleted file mode 100644
index 7764e1ee..00000000
--- a/GameOverlayUI/Impl/OverlayLauncherFactory.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#if AVALONIA_ILAUNCHER_API
-
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
-using Avalonia.Platform.Storage;
-
-namespace GameOverlayUI.Impl;
-
-public class OverlayLauncherFactory : ILauncherFactory
-{
- public ILauncher CreateLauncher(TopLevel topLevel)
- {
- return new OverlayLauncher();
- }
-}
-
-#endif
\ No newline at end of file
diff --git a/GameOverlayUI/Program.cs b/GameOverlayUI/Program.cs
deleted file mode 100644
index 9fdfb00e..00000000
--- a/GameOverlayUI/Program.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using Avalonia;
-using OpenSteamworks.Data.Structs;
-using Avalonia.Headless;
-using OpenSteamClient.DI;
-using GameOverlayUI.IPC;
-using Avalonia.Platform;
-using Avalonia.Platform.Storage;
-using Avalonia.Controls.Platform;
-using GameOverlayUI.Impl;
-
-namespace GameOverlayUI;
-
-public static class Program
-{
- public static Container Container { get; private set; } = new();
- public static bool IsUITestMode { get; private set; } = false;
-
- // Initialization code. Don't use any Avalonia, third-party APIs or any
- // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
- // yet and stuff might break.
- [STAThread]
- public static void Main(string[] args)
- {
- Console.CancelKeyPress += HandleCtrlC;
- AppDomain.CurrentDomain.UnhandledException += HandleUnhandledException;
-
- if (args.Length < 1 || !uint.TryParse(args[0], out uint gamepid))
- {
- Console.WriteLine("Not enough args, required [GamePID]");
- return;
- }
-
- Console.WriteLine("Game PID: " + gamepid);
-
- var gameidstr = Environment.GetEnvironmentVariable("SteamOverlayGameId");
- CGameID gameid;
- if (string.IsNullOrEmpty(gameidstr) || !ulong.TryParse(gameidstr, out ulong ugameid) || !(gameid = new CGameID(ugameid)).IsValid()) {
- Console.WriteLine("Invalid SteamOverlayGameId");
- return;
- }
-
- Console.WriteLine("GameID: " + gameid);
- Container.RegisterInstance(new SharedMemoryManager(gamepid));
-
- if (args.Length > 1) {
- Console.WriteLine("UI test mode enabled");
- IsUITestMode = args[1] == "testmode";
- }
-
- try
- {
- BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, Avalonia.Controls.ShutdownMode.OnExplicitShutdown);
- }
- finally
- {
- DisposeAll();
- }
- }
-
- private static void HandleUnhandledException(object sender, UnhandledExceptionEventArgs e)
- {
- DisposeAll();
- }
-
- private static void HandleCtrlC(object? sender, ConsoleCancelEventArgs e) {
- DisposeAll();
- }
-
- private static bool canDispose = true;
- private static void DisposeAll() {
- if (!canDispose) {
- return;
- }
-
- canDispose = false;
- Container?.Get().Dispose();
- }
-
- // Avalonia configuration, don't remove; also used by visual designer.
- public static AppBuilder BuildAvaloniaApp()
- {
- var builder = AppBuilder.Configure();
- if (IsUITestMode) {
- return builder
- .UseSkia()
-#if AVALONIA_ILAUNCHER_API
- .With(new OverlayLauncherFactory())
-#endif
- .UsePlatformDetect()
- .WithInterFont()
- .LogToTrace();
-
- } else {
- return builder
- .UseSkia()
-#if AVALONIA_ILAUNCHER_API
- .With(new OverlayLauncherFactory())
-#endif
- .UseHeadless(new AvaloniaHeadlessPlatformOptions
- {
- UseHeadlessDrawing = false,
- FrameBufferFormat = PixelFormat.Bgra8888
- })
- .WithInterFont()
- .LogToTrace();
- }
- }
-}
diff --git a/GameOverlayUI/ViewModels/AvaloniaAppViewModel.cs b/GameOverlayUI/ViewModels/AvaloniaAppViewModel.cs
deleted file mode 100644
index 3469b786..00000000
--- a/GameOverlayUI/ViewModels/AvaloniaAppViewModel.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using AvaloniaCommon;
-
-namespace GameOverlayUI.ViewModels;
-
-public class AvaloniaAppViewModel : ViewModelBase {
-
-}
\ No newline at end of file
diff --git a/GameOverlayUI/ViewModels/CustomWindowViewModel.cs b/GameOverlayUI/ViewModels/CustomWindowViewModel.cs
deleted file mode 100644
index 9358e597..00000000
--- a/GameOverlayUI/ViewModels/CustomWindowViewModel.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Dialogs;
-using Avalonia.Input;
-using Avalonia.Media.Imaging;
-using Avalonia.Reactive;
-using AvaloniaCommon;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace GameOverlayUI.ViewModels;
-
-public partial class CustomWindowViewModel : ViewModelBase {
- [ObservableProperty]
- private object? content;
-
- [ObservableProperty]
- private double x;
-
- [ObservableProperty]
- private double y;
-
- [ObservableProperty]
- private int z = 0;
-
- [ObservableProperty]
- private string title = string.Empty;
-
- [ObservableProperty]
- [NotifyPropertyChangedFor(nameof(IconVisible))]
- private Bitmap? icon = null;
- public bool IconVisible => Icon != null;
-
- private readonly Window underlyingWindow;
-
- public void Close() {
- var mainViewViewModel = Program.Container.Get();
- Console.WriteLine("Close");
- mainViewViewModel.RemoveWindow(this);
- underlyingWindow.Close();
- }
-
- public void LostFocus() {
- Z = 0;
- }
-
- public void GotFocus() {
- Z = 1;
- }
-
- public CustomWindowViewModel(Window underlyingWindow) {
- this.underlyingWindow = underlyingWindow;
-
- underlyingWindow.GetObservable(Window.TitleProperty).Subscribe(new AnonymousObserver(TitleChange));
- underlyingWindow.GetObservable(Window.IconProperty).Subscribe(new AnonymousObserver(IconChange));
- underlyingWindow.GetObservable(ContentControl.ContentProperty).Subscribe(new AnonymousObserver(ContentChange));
- TitleChange(underlyingWindow.Title);
- ContentChange(underlyingWindow.Content);
- IconChange(underlyingWindow.Icon);
- }
-
- private void ContentChange(object? obj)
- {
- Content = underlyingWindow.Content;
- }
-
- private void IconChange(WindowIcon? icon)
- {
- if (icon != null) {
- using var stream = new MemoryStream();
- icon.Save(stream);
- Icon = new Bitmap(stream);
- } else {
- Console.WriteLine("No icon");
- }
- }
-
- private void TitleChange(string? newTitle)
- {
- Title = underlyingWindow.Title ?? string.Empty;
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/ViewModels/MainViewViewModel.cs b/GameOverlayUI/ViewModels/MainViewViewModel.cs
deleted file mode 100644
index 1e4311ae..00000000
--- a/GameOverlayUI/ViewModels/MainViewViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Collections.ObjectModel;
-using Avalonia.Dialogs;
-using Avalonia.Platform.Storage;
-using AvaloniaCommon;
-using GameOverlayUI.Views;
-
-namespace GameOverlayUI.ViewModels;
-
-public partial class MainViewViewModel : ViewModelBase {
- public ObservableCollection Windows { get; } = new();
-
- public MainViewViewModel() {
- Windows.Add(new CustomWindowView() { DataContext = new CustomWindowViewModel(new AboutAvaloniaDialog()) });
- Windows.Add(new CustomWindowView() { DataContext = new CustomWindowViewModel(new AboutAvaloniaDialog()) });
- Windows.Add(new CustomWindowView() { DataContext = new CustomWindowViewModel(new AboutAvaloniaDialog()) });
- }
-
- public void RemoveWindow(CustomWindowViewModel window) {
- var windowsCopy = Windows.ToList();
- foreach (var item in windowsCopy)
- {
- if (item.DataContext == window) {
- Windows.Remove(item);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/Views/CustomWindowView.axaml b/GameOverlayUI/Views/CustomWindowView.axaml
deleted file mode 100644
index fe0b58eb..00000000
--- a/GameOverlayUI/Views/CustomWindowView.axaml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Example text
-
-
-
-
-
-
-
-
diff --git a/GameOverlayUI/Views/CustomWindowView.axaml.cs b/GameOverlayUI/Views/CustomWindowView.axaml.cs
deleted file mode 100644
index 5532e098..00000000
--- a/GameOverlayUI/Views/CustomWindowView.axaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace GameOverlayUI.Views;
-
-public partial class CustomWindowView : UserControl
-{
- public CustomWindowView()
- {
- InitializeComponent();
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/Views/MainView.axaml b/GameOverlayUI/Views/MainView.axaml
deleted file mode 100644
index e1a78e21..00000000
--- a/GameOverlayUI/Views/MainView.axaml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
- OSC Overlay Test
-
-
-
-
-
-
-
-
-
-
diff --git a/GameOverlayUI/Views/MainView.axaml.cs b/GameOverlayUI/Views/MainView.axaml.cs
deleted file mode 100644
index 09d8c369..00000000
--- a/GameOverlayUI/Views/MainView.axaml.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
-using GameOverlayUI.ViewModels;
-
-namespace GameOverlayUI.Views;
-
-public partial class MainView : Window {
- private MainViewViewModel vm => (DataContext as MainViewViewModel)!;
- public MainView() {
- InitializeComponent();
- }
-
- [MemberNotNull(nameof(draggingWindowViewModel))]
- private CustomWindowView? draggingWindow { get; set; }
-
- // The corner point where the dragging was initiated
- private Point dragPoint;
- private CustomWindowViewModel? draggingWindowViewModel => draggingWindow?.DataContext as CustomWindowViewModel;
-
- private void OnPointerPressed(object? sender, Avalonia.Input.PointerPressedEventArgs e) {
- if (!e.GetCurrentPoint(null).Properties.IsLeftButtonPressed) {
- return;
- }
-
- var pos = e.GetPosition(Desktop);
- Visual? vis = Desktop.GetVisualAt(pos);
- Console.WriteLine("PRESSED at " + pos);
- Console.WriteLine("Element is " + vis);
- CustomWindowView? window = null;
- bool isDrag = false;
- while (window == null && vis != null)
- {
- Console.WriteLine("DC: " + vis.DataContext?.GetType());
- if (vis.DataContext is CustomWindowViewModel) {
- isDrag = vis.Classes.Contains("draggable");
- window = vis.FindAncestorOfType();
- break;
- }
-
- vis = vis?.Parent as Visual;
- }
-
- var vm = window?.DataContext as CustomWindowViewModel;
-
- Console.WriteLine("Window is " + vm?.Title);
-
- if (window != null) {
- ChangeFocusedWindow(vm);
- }
-
- if (isDrag) {
- draggingWindow = window;
-
- // This stops the window "teleporting" when it's being moved, and allows it to move wherever from a draggable area
- dragPoint = e.GetPosition(Desktop) - new Point(draggingWindowViewModel.X, draggingWindowViewModel.Y);
- }
- }
-
- private void OnPointerMoved(object? sender, Avalonia.Input.PointerEventArgs e) {
- var pos = e.GetPosition(Desktop);
- if (draggingWindow != null) {
- Console.WriteLine("MOVED to " + pos);
- Console.WriteLine("W: " + draggingWindow.Bounds.Width);
- Console.WriteLine("H: " + draggingWindow.Bounds.Height);
-
- Console.WriteLine("MW: " + Desktop.Bounds.Width);
- Console.WriteLine("MH: " + Desktop.Bounds.Height);
-
- Console.WriteLine("DPX: " + dragPoint.X + ", DPY: " + dragPoint.Y);
-
- // This function does some advanced math to:
- // 1. Ensure the window doesn't clip out of bounds at all
- // 2. Move the window to the correct location upon dragging
- // 3. Some other things I can't decipher from this code
- // Don't ask me about this math, I wrote it half asleep at 3:30am, but work it does! Improve if needed.
- double targetX = pos.X + draggingWindow.Bounds.Width - dragPoint.X;
- double targetY = pos.Y + draggingWindow.Bounds.Height - dragPoint.Y;
-
- double X = Math.Clamp(targetX, 0.0 + draggingWindow.Bounds.Width, Desktop.Bounds.Width) - draggingWindow.Bounds.Width;
- double Y = Math.Clamp(targetY, 0.0 + draggingWindow.Bounds.Height, Desktop.Bounds.Height) - draggingWindow.Bounds.Height;
- draggingWindowViewModel.X = X;
- draggingWindowViewModel.Y = Y;
-
- Console.WriteLine("CX: " + draggingWindowViewModel.X);
- Console.WriteLine("CY: " + draggingWindowViewModel.Y);
- }
- }
-
- private CustomWindowViewModel? focusedWindow;
- private void ChangeFocusedWindow(CustomWindowViewModel? newWindow) {
- if (newWindow == focusedWindow) {
- return;
- }
-
- if (newWindow != null) {
- newWindow.GotFocus();
- focusedWindow?.LostFocus();
-
- focusedWindow = newWindow;
- }
- }
-
- private void OnPointerReleased(object? sender, Avalonia.Input.PointerReleasedEventArgs e) {
- var pos = e.GetPosition(Desktop);
- Console.WriteLine("RELEASED at " + pos);
- draggingWindow = null;
- dragPoint = new Point(0, 0);
- }
-}
\ No newline at end of file
diff --git a/GameOverlayUI/nuget.config b/GameOverlayUI/nuget.config
deleted file mode 100644
index 42c6aa46..00000000
--- a/GameOverlayUI/nuget.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/Installer/Assets/opensteam-logo.ico b/Installer/Assets/opensteam-logo.ico
deleted file mode 100644
index 4b4c1546..00000000
Binary files a/Installer/Assets/opensteam-logo.ico and /dev/null differ
diff --git a/Installer/AvaloniaApp.axaml b/Installer/AvaloniaApp.axaml
deleted file mode 100644
index a8ffd692..00000000
--- a/Installer/AvaloniaApp.axaml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- M18.25,3 C18.6296958,3 18.943491,3.28215388 18.9931534,3.64822944 L19,3.75 L19,20.25 C19,20.6642136 18.6642136,21 18.25,21 C17.8703042,21 17.556509,20.7178461 17.5068466,20.3517706 L17.5,20.25 L17.5,3.75 C17.5,3.33578644 17.8357864,3 18.25,3 Z M5.21966991,3.21966991 C5.48593648,2.95340335 5.90260016,2.9291973 6.19621165,3.14705176 L6.28033009,3.21966991 L14.5303301,11.4696699 C14.7965966,11.7359365 14.8208027,12.1526002 14.6029482,12.4462117 L14.5303301,12.5303301 L6.28033009,20.7803301 C5.98743687,21.0732233 5.51256313,21.0732233 5.21966991,20.7803301 C4.95340335,20.5140635 4.9291973,20.0973998 5.14705176,19.8037883 L5.21966991,19.7196699 L12.9393398,12 L5.21966991,4.28033009 C4.9267767,3.98743687 4.9267767,3.51256313 5.21966991,3.21966991 Z
- M5.75,3 C5.37030423,3 5.05650904,3.28215388 5.00684662,3.64822944 L5,3.75 L5,20.25 C5,20.6642136 5.33578644,21 5.75,21 C6.12969577,21 6.44349096,20.7178461 6.49315338,20.3517706 L6.5,20.25 L6.5,3.75 C6.5,3.33578644 6.16421356,3 5.75,3 Z M18.7803301,3.21966991 C18.5140635,2.95340335 18.0973998,2.9291973 17.8037883,3.14705176 L17.7196699,3.21966991 L9.46966991,11.4696699 C9.20340335,11.7359365 9.1791973,12.1526002 9.39705176,12.4462117 L9.46966991,12.5303301 L17.7196699,20.7803301 C18.0125631,21.0732233 18.4874369,21.0732233 18.7803301,20.7803301 C19.0465966,20.5140635 19.0708027,20.0973998 18.8529482,19.8037883 L18.7803301,19.7196699 L11.0606602,12 L18.7803301,4.28033009 C19.0732233,3.98743687 19.0732233,3.51256313 18.7803301,3.21966991 Z
- M12,2 C17.5228,2 22,6.47715 22,12 C22,17.5228 17.5228,22 12,22 C6.47715,22 2,17.5228 2,12 C2,6.47715 6.47715,2 12,2 Z M12,3.5 C7.30558,3.5 3.5,7.30558 3.5,12 C3.5,16.6944 7.30558,20.5 12,20.5 C16.6944,20.5 20.5,16.6944 20.5,12 C20.5,7.30558 16.6944,3.5 12,3.5 Z M16.75,12 C17.1296833,12 17.4434889,12.2821653 17.4931531,12.6482323 L17.5,12.75 L17.5,15.75 C17.5,16.1642 17.1642,16.5 16.75,16.5 C16.3703167,16.5 16.0565111,16.2178347 16.0068469,15.8517677 L16,15.75 L16,15 C15.0881,16.2143 13.6362,17 11.9999,17 C10.4748,17 9.09587,16.316 8.17857,15.237 C7.91028,14.9214 7.94862,14.4481 8.2642,14.1798 C8.57979,13.9115 9.05311,13.9499 9.3214,14.2655 C9.96322,15.0204 10.9293,15.5 11.9999,15.5 C13.32553,15.5 14.4803167,14.7625672 15.0742404,13.6746351 L15.1633,13.5 L14,13.5 C13.5858,13.5 13.25,13.1642 13.25,12.75 C13.25,12.3703167 13.5321653,12.0565111 13.8982323,12.0068469 L14,12 L16.75,12 Z M11.9999,7 C13.5368,7 14.9041,7.66036 15.8268,8.77062 C16.0915,9.08918 16.0479,9.56205 15.7294,9.8268 C15.4108,10.0916 14.9379,10.0479 14.6732,9.72938 C14.0368,8.96361 13.093,8.5 11.9999,8.5 C10.5754318,8.5 9.34895806,9.35140335 8.80281957,10.5730172 L8.72948,10.75 L10,10.75 C10.4142,10.75 10.75,11.0858 10.75,11.5 C10.75,11.8796833 10.4678347,12.1934889 10.1017677,12.2431531 L10,12.25 L7.25,12.25 C6.8703075,12.25 6.55650958,11.9678347 6.50684668,11.6017677 L6.5,11.5 L6.5,8.25 C6.5,7.83579 6.83579,7.5 7.25,7.5 C7.6296925,7.5 7.94349042,7.78215688 7.99315332,8.14823019 L8,8.25 L8,8.99955 C8.9121,7.78531 10.364,7 11.9999,7 Z
- M10.5001 7.7514C10.5001 4.57577 13.0745 2.0014 16.2501 2.0014C17.196 2.0014 18.0906 2.23039 18.8794 2.6366C19.0924 2.74625 19.2401 2.95101 19.2771 3.18765C19.314 3.42429 19.2358 3.66435 19.0664 3.83371L16.3006 6.59949L17.3613 7.66015L20.1398 4.8816C20.3081 4.71337 20.5461 4.63494 20.7814 4.67023C21.0167 4.70551 21.2213 4.85033 21.3327 5.06051C21.759 5.86417 22.0001 6.78074 22.0001 7.7514C22.0001 10.927 19.4258 13.5014 16.2501 13.5014C15.7895 13.5014 15.3408 13.4471 14.9104 13.3443L7.54552 20.9632C6.42372 22.1237 4.59212 22.2096 3.36665 21.1592C2.03293 20.016 1.93771 17.9855 3.15859 16.7225L10.6339 8.98943C10.5462 8.59014 10.5001 8.17579 10.5001 7.7514ZM16.2501 3.5014C13.9029 3.5014 12.0001 5.40419 12.0001 7.7514C12.0001 8.18337 12.0643 8.59897 12.1832 8.98991C12.2624 9.25049 12.1942 9.53355 12.0049 9.72937L4.23708 17.765C3.61648 18.407 3.66488 19.4392 4.34283 20.0203C4.96577 20.5542 5.8968 20.5106 6.46704 19.9207L14.1435 11.9795C14.3435 11.7726 14.6443 11.6984 14.9176 11.7885C15.3358 11.9265 15.7834 12.0014 16.2501 12.0014C18.5973 12.0014 20.5001 10.0986 20.5001 7.7514C20.5001 7.40926 20.4598 7.07703 20.3838 6.75896L17.8916 9.25114C17.5987 9.54403 17.1238 9.54403 16.831 9.25114L14.7096 7.12982C14.4167 6.83692 14.4167 6.36205 14.7096 6.06916L17.1763 3.60246C16.8785 3.53632 16.5686 3.5014 16.2501 3.5014Z
- M24,7.25 C27.1017853,7.25 29.629937,9.70601719 29.7458479,12.7794443 L29.75,13 L37,13 C37.6903559,13 38.25,13.5596441 38.25,14.25 C38.25,14.8972087 37.7581253,15.4295339 37.1278052,15.4935464 L37,15.5 L35.909,15.5 L34.2058308,38.0698451 C34.0385226,40.2866784 32.1910211,42 29.9678833,42 L18.0321167,42 C15.8089789,42 13.9614774,40.2866784 13.7941692,38.0698451 L12.09,15.5 L11,15.5 C10.3527913,15.5 9.8204661,15.0081253 9.75645361,14.3778052 L9.75,14.25 C9.75,13.6027913 10.2418747,13.0704661 10.8721948,13.0064536 L11,13 L18.25,13 C18.25,9.82436269 20.8243627,7.25 24,7.25 Z M33.4021054,15.5 L14.5978946,15.5 L16.2870795,37.8817009 C16.3559711,38.7945146 17.116707,39.5 18.0321167,39.5 L29.9678833,39.5 C30.883293,39.5 31.6440289,38.7945146 31.7129205,37.8817009 L33.4021054,15.5 Z M27.25,20.75 C27.8972087,20.75 28.4295339,21.2418747 28.4935464,21.8721948 L28.5,22 L28.5,33 C28.5,33.6903559 27.9403559,34.25 27.25,34.25 C26.6027913,34.25 26.0704661,33.7581253 26.0064536,33.1278052 L26,33 L26,22 C26,21.3096441 26.5596441,20.75 27.25,20.75 Z M20.75,20.75 C21.3972087,20.75 21.9295339,21.2418747 21.9935464,21.8721948 L22,22 L22,33 C22,33.6903559 21.4403559,34.25 20.75,34.25 C20.1027913,34.25 19.5704661,33.7581253 19.5064536,33.1278052 L19.5,33 L19.5,22 C19.5,21.3096441 20.0596441,20.75 20.75,20.75 Z M24,9.75 C22.2669685,9.75 20.8507541,11.1064548 20.7551448,12.8155761 L20.75,13 L27.25,13 C27.25,11.2050746 25.7949254,9.75 24,9.75 Z
-
-
\ No newline at end of file
diff --git a/Installer/AvaloniaApp.axaml.cs b/Installer/AvaloniaApp.axaml.cs
deleted file mode 100644
index 965db194..00000000
--- a/Installer/AvaloniaApp.axaml.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Input.Platform;
-using Avalonia.Markup.Xaml;
-using Installer.Translation;
-using Installer.ViewModels;
-using Installer.Views;
-using System.Threading.Tasks;
-using System;
-using Avalonia.Controls;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Avalonia.Input;
-using Avalonia.Styling;
-using System.Text;
-using Avalonia.Threading;
-
-namespace Installer;
-
-public class AvaloniaApp : Application
-{
- public static TranslationManager TranslationManager { get; } = new();
- public new static AvaloniaApp? Current;
- public new IClassicDesktopStyleApplicationLifetime ApplicationLifetime => (base.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)!;
- public static bool DebugEnabled = false;
- public static bool InLinuxDevelopment = false;
- public Window? MainWindow => ApplicationLifetime.MainWindow;
-
- public override void Initialize()
- {
- AvaloniaXamlLoader.Load(this);
- }
-
- public override void OnFrameworkInitializationCompleted()
- {
- TranslationManager.LoadCurrentSystemTranslation();
- base.OnFrameworkInitializationCompleted();
- OpenMainWindow();
- }
-
- public void OpenMainWindow()
- {
- if (ApplicationLifetime.MainWindow != null)
- {
- if (ApplicationLifetime.MainWindow.IsActive)
- {
- // Not closed but maybe hidden, maybe shown in background
- ApplicationLifetime.MainWindow.Show();
- ApplicationLifetime.MainWindow.Activate();
- return;
- }
- } else {
- var wnd = new MainWindow();
- wnd.DataContext = new MainWindowViewModel(wnd);
- ApplicationLifetime.MainWindow = wnd;
- ApplicationLifetime.MainWindow.Show();
- }
- }
-
- public AvaloniaApp()
- {
- Current = this;
- Name = "Installer";
- DataContext = new AvaloniaAppViewModel();
- }
-}
diff --git a/Installer/Controls/Translatable.cs b/Installer/Controls/Translatable.cs
deleted file mode 100644
index f7965218..00000000
--- a/Installer/Controls/Translatable.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Windows.Input;
-using Avalonia;
-using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-
-namespace Installer.Controls;
-
-public class Translatable : AvaloniaObject
-{
- public static readonly AttachedProperty TranslationKeyProperty =
- AvaloniaProperty.RegisterAttached("TranslationKey", "", false, Avalonia.Data.BindingMode.OneWay);
-
- public static readonly AttachedProperty DefaultTextProperty =
- AvaloniaProperty.RegisterAttached("DefaultText", "", false, Avalonia.Data.BindingMode.OneWay);
-
- public static void SetTranslationKey(AvaloniaObject element, string val)
- {
- element.SetValue(TranslationKeyProperty, val);
- }
-
- public static string GetTranslationKey(AvaloniaObject element)
- {
- return element.GetValue(TranslationKeyProperty);
- }
-
- public static void SetDefaultText(AvaloniaObject element, string val)
- {
- element.SetValue(DefaultTextProperty, val);
- }
-
- public static string GetDefaultText(AvaloniaObject element)
- {
- return element.GetValue(DefaultTextProperty);
- }
-}
\ No newline at end of file
diff --git a/Installer/Core/InstallationManager.cs b/Installer/Core/InstallationManager.cs
deleted file mode 100644
index 92f034b8..00000000
--- a/Installer/Core/InstallationManager.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net.Http;
-using System.Security.AccessControl;
-using System.Security.Principal;
-using System.ServiceProcess;
-using System.Threading.Tasks;
-using Installer.Extensions;
-using Installer.Translation;
-using Microsoft.Win32;
-
-namespace Installer.Core;
-
-public static class InstallationManager {
- public const string CommonFilesPath = "C:\\Program Files (x86)\\Common Files\\Steam";
- public static string InstallDir {
- get {
- if (AvaloniaApp.InLinuxDevelopment) {
- return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "OpenSteamClient_Installer_TargetDir_Dev");
- }
-
- var val = (string?)Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\OpenSteamClient", "InstallPath", "");
- if (string.IsNullOrEmpty(val)) {
- return "";
- }
-
- return val;
- }
-
- set {
- if (AvaloniaApp.InLinuxDevelopment) {
- // Don't save it anywhere on linux
- return;
- }
-
- Registry.SetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\OpenSteamClient", "InstallPath", value);
- }
- }
-
- public static void CreateRegKeys(string installPath) {
- if (AvaloniaApp.InLinuxDevelopment) {
- return;
- }
-
- var node = Registry.LocalMachine.OpenSubKey("SOFTWARE")!;
- var steamSecurity = new RegistrySecurity();
- RegistryAccessRule rule = new("Users",
- RegistryRights.ReadKey | RegistryRights.SetValue | RegistryRights.QueryValues | RegistryRights.ReadPermissions
- | RegistryRights.Delete | RegistryRights.FullControl | RegistryRights.CreateSubKey | RegistryRights.EnumerateSubKeys | RegistryRights.Notify | RegistryRights.CreateLink | RegistryRights.WriteKey | RegistryRights.ExecuteKey,
- InheritanceFlags.ContainerInherit,
- PropagationFlags.None,
- AccessControlType.Allow
- );
-
- steamSecurity.AddAccessRule(rule);
- var opensteamnode = node.CreateOrOpen("OpenSteamClient", RegistryKeyPermissionCheck.Default, RegistryOptions.None, out bool _, steamSecurity);
- var valvenode = node.OpenSubKey("WOW6432Node")!.CreateOrOpen("Valve", RegistryKeyPermissionCheck.Default, RegistryOptions.None, out bool _);
- CreateSteamRegKeys(valvenode, steamSecurity, "Steam", "SteamService", "");
- CreateSteamRegKeys(opensteamnode, steamSecurity, "thiskey", serviceSubkey: "", installPath);
- }
-
- private static void CreateSteamRegKeys(RegistryKey key, RegistrySecurity steamSecurity, string clientSubkey, string serviceSubkey, string installPath) {
- if (!string.IsNullOrEmpty(serviceSubkey)) {
- var serviceKey = key.CreateOrOpen(serviceSubkey, RegistryKeyPermissionCheck.Default, RegistryOptions.None, out bool createdService);
- if (createdService) {
- serviceKey.SetValue("installpath_default", installPath, RegistryValueKind.String);
- }
- }
-
- if (!string.IsNullOrEmpty(clientSubkey)) {
- bool createdClient = true;
- RegistryKey? clientKey;
- if (clientSubkey == "thiskey") {
- clientKey = key;
- } else {
- clientKey = key.CreateOrOpen(clientSubkey, RegistryKeyPermissionCheck.Default, RegistryOptions.None, out createdClient, steamSecurity);
- }
-
- if (createdClient) {
- clientKey.SetValue("InstallPath", installPath, RegistryValueKind.String);
- clientKey.SetValue("language", ELanguageConversion.APINameFromELanguage(AvaloniaApp.TranslationManager.CurrentTranslation.Language), RegistryValueKind.String);
- // This is the important one, this allows the service to start up
- clientKey.SetValue("SteamPID", 0, RegistryValueKind.DWord);
- clientKey.SetValue("TempAppCmdLine", "", RegistryValueKind.String);
- clientKey.SetValue("ReLaunchCmdLine", "", RegistryValueKind.String);
- clientKey.SetValue("ClientLauncherType", 0, RegistryValueKind.DWord);
- clientKey.SetValue("Universe", "Public", RegistryValueKind.String);
- clientKey.SetValue("BetaName", "", RegistryValueKind.String);
- }
- }
-
-
- }
-
- ///
- /// Install the Steam Service.
- ///
- /// The path to the extracted/existing Program Files (x86)/Common Files/Steam/steamservice.exe
- public static async Task InstallSteamService(string steamServiceExePath) {
- if (AvaloniaApp.InLinuxDevelopment) {
- return;
- }
-
- if (DoesServiceExist()) {
- return;
- }
-
- if (!File.Exists(steamServiceExePath)) {
- throw new LocalizedException("#InstallError_ServiceInstallFailed");
- }
-
- var installproc = Process.Start(steamServiceExePath, "/install");
- await installproc.WaitForExitAsync();
- if (installproc.ExitCode != 0) {
- // Uninstall and reinstall to fix permission issues
- var uninstallproc = Process.Start(steamServiceExePath, "/uninstall");
- await uninstallproc.WaitForExitAsync();
-
- // Try to install a second time
- installproc = Process.Start(steamServiceExePath, "/install");
- await installproc.WaitForExitAsync();
- if (installproc.ExitCode != 0) {
- // Give up after the second error
- throw new LocalizedException("#InstallError_ServiceInstallFailed");
- }
- }
- }
-
- public static bool DoesServiceExist()
- {
- ServiceController[] services = ServiceController.GetServices();
- var service = services.FirstOrDefault(s => s.ServiceName == "Steam Client Service");
- return service != null;
- }
-
-
- public static void CreateUninstallRegs(string uninstallExe) {
- if (AvaloniaApp.InLinuxDevelopment) {
- return;
- }
-
- var node = Registry.LocalMachine.OpenSubKey("SOFTWARE")!.OpenSubKey("Microsoft")!.OpenSubKey("Windows")!.OpenSubKey("CurrentVersion")!.OpenSubKey("Uninstall")!;
- node.SetValue("DisplayName", "OpenSteamClient", RegistryValueKind.String);
- node.SetValue("DisplayVersion", "", RegistryValueKind.String);
- node.SetValue("Publisher", "Rosentti", RegistryValueKind.String);
- node.SetValue("URLInfoAbout", "https://github.com/OpenSteamClient/OpenSteamClient", RegistryValueKind.String);
- node.SetValue("HelpLink", "https://github.com/OpenSteamClient/OpenSteamClient/issues", RegistryValueKind.String);
- node.SetValue("DisplayIcon", uninstallExe, RegistryValueKind.String);
- node.SetValue("UninstallString", uninstallExe, RegistryValueKind.String);
- node.SetValue("NoModify", 1, RegistryValueKind.DWord);
- }
-
- public static async Task ExtractOpenSteamClientToPath(string path, IProgress progress) {
-
- }
-
- // If other files ever start mattering, copy them over too, but for now this seems to be enough
- // drivers.exe, steamservice.dll and others just magically appear after Steam starts
- public static readonly ReadOnlyCollection CommonFiles = new(new List()
- {
- "steamservice.exe",
- });
-
- public static bool CommonFilesNeedsSetup() {
- if (Directory.Exists(CommonFilesPath)) {
- foreach (var item in CommonFiles)
- {
- if (!File.Exists(Path.Combine(CommonFilesPath, item))) {
- return true;
- }
- }
- } else {
- return true;
- }
-
- return false;
- }
-
- public static async Task SetupCommonFiles(IProgress progress, IProgress currentOperationLocToken) {
- currentOperationLocToken.Report("#InstallProgress_DownloadingService");
- using var stream = new MemoryStream();
- await HttpClient.DownloadAsync(SteamManifest.bins_win32, stream, progress);
- Directory.CreateDirectory(CommonFilesPath);
-
- currentOperationLocToken.Report("#InstallProgress_ExtractingService");
- progress.Report(0);
- using var archive = new ZipArchive(stream, ZipArchiveMode.Read, true);
- await archive.ExtractToDirectory(CommonFilesPath, progress);
- }
-
- public static readonly HttpClient HttpClient = new();
-
- static InstallationManager() {
- HttpClient.DefaultRequestHeaders.Add("User-Agent", "opensteamclient-installer/1.0");
- }
-
- public static async Task RunAllInstallSteps(string targetPath, IProgress progress, IProgress currentOperationLocToken) {
- // Do the things that are more likely to fail first
- if (CommonFilesNeedsSetup()) {
- await SetupCommonFiles(progress, currentOperationLocToken);
- }
-
- if (!DoesServiceExist()) {
- currentOperationLocToken.Report("#InstallProgress_InstallingService");
- await InstallSteamService(Path.Combine(CommonFilesPath, "steamservice.exe"));
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/Installer/Core/LocalizedException.cs b/Installer/Core/LocalizedException.cs
deleted file mode 100644
index 0efba394..00000000
--- a/Installer/Core/LocalizedException.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Installer.Core;
-
-//TODO: copy this to OpenSteamworks?
-[System.Serializable]
-public class LocalizedException : System.Exception
-{
- public LocalizedException() { }
- public LocalizedException(string loctoken) : base(AvaloniaApp.TranslationManager.GetTranslationForKey(loctoken)) { }
- public LocalizedException(string loctoken, System.Exception inner) : base(AvaloniaApp.TranslationManager.GetTranslationForKey(loctoken), inner) { }
- protected LocalizedException(
- System.Runtime.Serialization.SerializationInfo info,
- System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
-}
\ No newline at end of file
diff --git a/Installer/Core/SteamManifest.cs b/Installer/Core/SteamManifest.cs
deleted file mode 100644
index 9d9d80cb..00000000
--- a/Installer/Core/SteamManifest.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Installer.Core;
-
-//TODO: auto update this with OSWUpdater
-public static class SteamManifest {
- public const string bins_win32 = "bins_win32.zip.91ea83c7794514f93f01180f9a07d2edf1589ab6";
- public const int bins_win32_size = 51784912;
-}
\ No newline at end of file
diff --git a/Installer/Enums/InstallAction.cs b/Installer/Enums/InstallAction.cs
deleted file mode 100644
index 24065377..00000000
--- a/Installer/Enums/InstallAction.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Installer.Enums;
-
-[Flags]
-public enum InstallAction {
- None = 0,
- Install = 1 << 1,
- Repair = 1 << 2,
- Uninstall = 1 << 3
-}
\ No newline at end of file
diff --git a/Installer/Extensions/ControlExtensions.cs b/Installer/Extensions/ControlExtensions.cs
deleted file mode 100644
index bb992559..00000000
--- a/Installer/Extensions/ControlExtensions.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
-using Installer.Translation;
-
-namespace Installer.Extensions;
-
-public static class ControlExtensions
-{
- //
- // Summary:
- // Finds the named control under all of this Control's children
- //
- // Parameters:
- // control:
- // The control to look in.
- //
- // name:
- // The name of the control to find.
- //
- // Type parameters:
- // T:
- // The type of the control to find.
- //
- // Returns:
- // The control or null if not found.
- public static T? FindControlNested(this Control control, string name) where T : Control
- {
- foreach (var item in control.GetVisualChildren())
- {
- if (item is Control c) {
- var ctrl = FindControlNested(c, name);
- if (ctrl != null) {
- return ctrl;
- }
- }
- }
-
- return control.FindControl(name);
- }
-
- public static bool TryTranslateSelf(this Control control, bool dueToLayoutChange = false)
- {
- if (AvaloniaApp.TranslationManager.CurrentTranslation.Language == ELanguage.None)
- {
- return false;
- }
-
- Console.WriteLine($"Translating control {control.GetType().Name}{(dueToLayoutChange ? " (due to layout change)" : "")}");
- AvaloniaApp.TranslationManager.TranslateVisual(control);
- return true;
- }
-
- public static void TranslatableInit(this Control control)
- {
- control.TryTranslateSelf();
- // Disable this for now, until I can find a way to filter out mouseover etc events from affecting this
- // Ideally we should never need to re-update translations during runtime except on language change, but if objects get added to the visual tree, they might not be translated yet (such as in ItemsControl cases, where you can't translate the fundamental template object since it gets removed at compile time)
- //control.LayoutUpdated += (object? sender, EventArgs e) => { control.TryTranslateSelf(true); };
- control.Initialized += (object? sender, EventArgs e) => { control.TryTranslateSelf(true); };
-
- // Register some events for auto-retranslate
- if (control is TopLevel)
- {
- (control as TopLevel)!.Opened += (object? sender, System.EventArgs e) => control.TryTranslateSelf();
- }
- }
-}
\ No newline at end of file
diff --git a/Installer/Extensions/HttpClientExtensions.cs b/Installer/Extensions/HttpClientExtensions.cs
deleted file mode 100644
index a6a37037..00000000
--- a/Installer/Extensions/HttpClientExtensions.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.IO;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Timers;
-
-namespace Installer.Extensions;
-
-public static class HttpClientExtensions
-{
- public static async Task DownloadAsync(this HttpClient client, string requestUri, Stream destination, IProgress progress, long knownLength = 0, CancellationToken cancellationToken = default)
- {
- // Get the http headers first to examine the content length
- using (var response = await client.GetAsync(requestUri, HttpCompletionOption.ResponseHeadersRead))
- {
- long contentLength = 0;
- if (knownLength > 0) {
- contentLength = knownLength;
- } else if (response.Content.Headers.ContentLength != null) {
- contentLength = (long)response.Content.Headers.ContentLength;
- }
-
- using (var download = await response.Content.ReadAsStreamAsync())
- {
- // Ignore progress reporting when no progress reporter was
- // passed or when the content length is unknown
- if (progress == null || contentLength == 0)
- {
- await download.CopyToAsync(destination);
- return;
- }
-
- bool cancelledDueToTimeout = false;
-
- using (CancellationTokenSource source = new CancellationTokenSource())
- {
- System.Timers.Timer timer = new System.Timers.Timer(15000);
- timer.AutoReset = false;
- timer.Start();
- timer.Elapsed += (object? sender, ElapsedEventArgs args) => {
- cancelledDueToTimeout = true;
- source.Cancel();
- };
-
- // Convert absolute progress (bytes downloaded) into relative progress (0% - 100%)
- // Also reset the timer by setting it's interval
- var relativeProgress = new Progress((long totalBytes) => {
- progress.Report((int)(((float)totalBytes / contentLength)*100));
- timer.Interval = 20000;
- });
-
- CancellationToken token = source.Token;
- cancellationToken.Register(() => {
- cancelledDueToTimeout = false;
- source.Cancel();
- });
-
- try
- {
- // Use extension method to report progress while downloading
- await download.CopyToAsync(destination, 81920, relativeProgress, token);
- // If download finished, stop the timer
- timer.Stop();
- }
- catch (OperationCanceledException)
- {
- if (!cancelledDueToTimeout) {
- throw;
- }
- throw new Exception("Lost connection to server");
- }
- }
-
- progress.Report(100);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Installer/Extensions/RegistryKeyExtensions.cs b/Installer/Extensions/RegistryKeyExtensions.cs
deleted file mode 100644
index 11235bf7..00000000
--- a/Installer/Extensions/RegistryKeyExtensions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Security.AccessControl;
-using Microsoft.Win32;
-
-namespace Installer.Extensions;
-
-public static class RegistryKeyExtensions {
- public static RegistryKey CreateOrOpen(this RegistryKey regkey, string subkey, RegistryKeyPermissionCheck permissionCheck, RegistryOptions registryOptions, out bool created, RegistrySecurity? security = null) {
- var key = regkey.OpenSubKey(subkey, permissionCheck);
-
- created = key == null;
- if (key == null) {
- key = regkey.CreateSubKey(subkey, permissionCheck, registryOptions, security);
- }
-
- return key;
- }
-}
\ No newline at end of file
diff --git a/Installer/Extensions/StreamExtensions.cs b/Installer/Extensions/StreamExtensions.cs
deleted file mode 100644
index 401a8890..00000000
--- a/Installer/Extensions/StreamExtensions.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Installer;
-
-public static class StreamExtensions
-{
- public static async Task CopyToAsync(this Stream source, Stream destination, int bufferSize, IProgress progress, CancellationToken cancellationToken = default) {
- if (source == null)
- throw new ArgumentNullException(nameof(source));
- if (!source.CanRead)
- throw new ArgumentException("Has to be readable", nameof(source));
- if (destination == null)
- throw new ArgumentNullException(nameof(destination));
- if (!destination.CanWrite)
- throw new ArgumentException("Has to be writable", nameof(destination));
- if (bufferSize < 0)
- throw new ArgumentOutOfRangeException(nameof(bufferSize));
-
- var buffer = new byte[bufferSize];
- long totalBytesRead = 0;
- int bytesRead;
- while ((bytesRead = await source.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false)) != 0) {
- await destination.WriteAsync(buffer, 0, bytesRead, cancellationToken).ConfigureAwait(false);
- totalBytesRead += bytesRead;
- progress.Report(totalBytesRead);
- }
- }
-
- public static bool AreEqual(this MemoryStream first, MemoryStream second) {
- if (first.Length != second.Length) {
- return false;
- }
-
- first.Position = 0;
- second.Position = 0;
-
- return first.ToArray().SequenceEqual(second.ToArray());
- }
-}
diff --git a/Installer/Extensions/VisualExtensions.cs b/Installer/Extensions/VisualExtensions.cs
deleted file mode 100644
index 96b7a0f4..00000000
--- a/Installer/Extensions/VisualExtensions.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using Avalonia;
-using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
-
-namespace Installer.Extensions;
-
-public static class VisualExtensions
-{
- public static IEnumerable GetAllVisualChildrenTree(this Visual visual)
- {
- List allVisuals = new()
- {
- visual
- };
-
- // First get all logical children
- foreach (var item in visual.GetLogicalChildren())
- {
- // Then try to cast them to Visual (most of the time should be valid)
- if (item is Visual)
- {
- allVisuals.AddRange(GetAllVisualChildrenTree((Visual)item!));
- }
- }
-
- return allVisuals;
- }
-}
\ No newline at end of file
diff --git a/Installer/Extensions/ZipArchiveExtensions.cs b/Installer/Extensions/ZipArchiveExtensions.cs
deleted file mode 100644
index e451d542..00000000
--- a/Installer/Extensions/ZipArchiveExtensions.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.IO;
-using System.IO.Compression;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Installer;
-
-public static class ZipArchiveExtensions
-{
- public static async Task ExtractToDirectory(this ZipArchive source, string destinationDirectoryName, IProgress prog, Action? afterExtractHook = null)
- {
- foreach (ZipArchiveEntry entry in source.Entries)
- {
- var FullNameFixed = entry.FullName;
-
- // Fixup slashes for Non-Windows platforms
- if (!OperatingSystem.IsWindows())
- {
- FullNameFixed = FullNameFixed.Replace('\\', '/');
- }
-
- var FullPath = Path.Combine(destinationDirectoryName, FullNameFixed);
-
- if (entry.Length == 0 && (FullNameFixed.EndsWith('/') || FullNameFixed.EndsWith('\\')))
- {
- Directory.CreateDirectory(FullPath);
- continue;
- }
-
- Directory.CreateDirectory(Path.GetDirectoryName(FullPath)!);
-
- using (Stream zipstream = entry.Open())
- {
- using (var file = new FileStream(FullPath, FileMode.Create, FileAccess.Write, FileShare.None))
- {
- // Convert absolute progress (bytes unzipped) into relative progress (0% - 100%)
- var relativeProgress = new Progress(totalBytes => prog.Report((int)(((float)totalBytes / entry.Length) * 100)));
-
- // Use extension method to report progress while downloading
- await zipstream.CopyToAsync(file, 81920, relativeProgress, default);
- afterExtractHook?.Invoke(entry, FullNameFixed);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Installer/Installer.csproj b/Installer/Installer.csproj
deleted file mode 100644
index fb531602..00000000
--- a/Installer/Installer.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
- WinExe
- $(CommonNetVersion)-windows
- enable
- true
- full
- app.manifest
- true
-
-
- en
- true
- false
-
-
-
-
-
- win-x64
- false
- None
- true
- true
-
-
-
- win-x64;linux-x64;osx-x64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Installer/Program.cs b/Installer/Program.cs
deleted file mode 100644
index b2cd3e2d..00000000
--- a/Installer/Program.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Avalonia;
-using System;
-using System.Linq;
-using System.Security.Principal;
-
-namespace Installer;
-
-public static class Program
-{
- // Initialization code. Don't use any Avalonia, third-party APIs or any
- // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
- // yet and stuff might break.
- [STAThread]
- public static void Main(string[] args)
- {
-#if DEBUG
- if (!OperatingSystem.IsWindows()) {
- AvaloniaApp.InLinuxDevelopment = true;
- }
-#endif
-
- if (args.Contains("-debug"))
- {
- AvaloniaApp.DebugEnabled = true;
- }
-#if DEBUG
- Console.WriteLine("Running DEBUG build, debug mode forced on");
- AvaloniaApp.DebugEnabled = true;
-#endif
-
- if (!AvaloniaApp.InLinuxDevelopment) {
- if (!IsAdministrator()) {
- return;
- }
- }
-
- BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, Avalonia.Controls.ShutdownMode.OnMainWindowClose);
- }
-
- public static bool IsAdministrator()
- {
- var identity = WindowsIdentity.GetCurrent();
- var principal = new WindowsPrincipal(identity);
- return principal.IsInRole(WindowsBuiltInRole.Administrator);
- }
-
- // Avalonia configuration, don't remove; also used by visual designer.
- public static AppBuilder BuildAvaloniaApp()
- => AppBuilder.Configure()
- .UsePlatformDetect()
- .WithInterFont()
- .UseSkia()
- .LogToTrace();
-}
diff --git a/Installer/Translation/ELanguage.cs b/Installer/Translation/ELanguage.cs
deleted file mode 100644
index dec8a4fb..00000000
--- a/Installer/Translation/ELanguage.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Installer.Translation;
-
-public enum ELanguage
-{
- None = -1,
- English = 0,
- German = 1,
- French = 2,
- Italian = 3,
- Korean = 4,
- Spanish = 5,
- Simplified_Chinese = 6,
- Traditional_Chinese = 7,
- Russian = 8,
- Thai = 9,
- Japanese = 10,
- Portuguese = 11,
- Polish = 12,
- Danish = 13,
- Dutch = 14,
- Finnish = 15,
- Norwegian = 16,
- Swedish = 17,
- Hungarian = 18,
- Czech = 19,
- Romanian = 20,
- Turkish = 21,
- Brazilian = 22,
- Bulgarian = 23,
- Greek = 24,
- Arabic = 25,
- Ukrainian = 26,
- Latam_Spanish = 27,
- Vietnamese = 28,
-}
-
-public static class ELanguageConversion {
- private static readonly Dictionary ELanguageToAPINameMap = new() {
- {ELanguage.None, ""},
- {ELanguage.English, "english"},
- {ELanguage.German, "german"},
- {ELanguage.French, "french"},
- {ELanguage.Italian, "italian"},
- {ELanguage.Korean, "korean"},
- {ELanguage.Spanish, "spanish"},
- {ELanguage.Simplified_Chinese, "schinese"}, // Is this correct?
- {ELanguage.Traditional_Chinese, "tchinese"}, // Is this correct?
- {ELanguage.Russian, "russian"},
- {ELanguage.Thai, "thai"},
- {ELanguage.Japanese, "japanese"},
- {ELanguage.Portuguese, "portuguese"},
- {ELanguage.Polish, "polish"},
- {ELanguage.Danish, "danish"},
- {ELanguage.Dutch, "dutch"},
- {ELanguage.Finnish, "finnish"},
- {ELanguage.Norwegian, "norwegian"},
- {ELanguage.Swedish, "swedish"},
- {ELanguage.Hungarian, "hungarian"},
- {ELanguage.Czech, "czech"},
- {ELanguage.Romanian, "romanian"},
- {ELanguage.Turkish, "turkish"},
- {ELanguage.Brazilian, "brazilian"},
- {ELanguage.Bulgarian, "bulgarian"},
- {ELanguage.Greek, "greek"},
- {ELanguage.Arabic, "arabic"},
- {ELanguage.Ukrainian, "ukrainian"},
- {ELanguage.Latam_Spanish, "latam_spanish"},
- {ELanguage.Vietnamese, "vietnamese"},
- };
-
- // Add language here when making a translation
- public static Dictionary TwoLetterISOCodesToLanguages = new() {
- {"iv", ELanguage.None},
- {"en", ELanguage.English},
- {"fi", ELanguage.Finnish},
- };
-
- public readonly static Dictionary APINameToELanguageMap = ELanguageToAPINameMap.ToDictionary(x => x.Value, x => x.Key);
-
- public static ELanguage ELanguageFromAPIName(string apiName) {
- return APINameToELanguageMap[apiName];
- }
-
- public static string APINameFromELanguage(ELanguage eLanguage) {
- return ELanguageToAPINameMap[eLanguage];
- }
-}
\ No newline at end of file
diff --git a/Installer/Translation/TranslationManager.cs b/Installer/Translation/TranslationManager.cs
deleted file mode 100644
index 0db1ffb0..00000000
--- a/Installer/Translation/TranslationManager.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-using Installer.Extensions;
-using Microsoft.Extensions.FileProviders;
-
-namespace Installer.Translation;
-
-[JsonSourceGenerationOptions(WriteIndented = true)]
-[JsonSerializable(typeof(Translation))]
-internal partial class SourceGenerationContext : JsonSerializerContext
-{
-}
-
-public class Translation
-{
- public ELanguage Language { get; set; } = ELanguage.None;
- public string LanguageFriendlyName { get; set; } = "";
- public string ISOCode { get; set; } = "";
- public Dictionary TranslationKeys { get; set; } = new();
-}
-
-public class TranslationManager
-{
- public Translation CurrentTranslation = new();
- private readonly List RefreshableObjects = new();
- public static IEnumerable ValidUILanguages => new ELanguage[] { ELanguage.English, ELanguage.Finnish };
-
- public event EventHandler? TranslationChanged;
-
- public TranslationManager()
- {
-
- }
-
- public void SetLanguage(ELanguage language)
- {
- var lang = ELanguageToString(language);
- if (lang == null)
- {
- throw new ArgumentException($"Language {language} was not valid.");
- }
-
- if (!ValidUILanguages.Contains(language)) {
- throw new InvalidOperationException("No translation for " + language);
- }
-
- CurrentTranslation = GetForLanguage(language);
-
- Dispatcher.UIThread.Invoke(() =>
- {
- foreach (var obj in RefreshableObjects)
- {
- TranslateAvaloniaObject(obj);
- }
- });
-
- TranslationChanged?.Invoke(this, EventArgs.Empty);
- }
-
- public string GetTranslationForKey(string key)
- {
- this.CurrentTranslation.TranslationKeys.TryGetValue(key, out string? val);
- if (val == null)
- {
- val = $"TRANSLATION FAILED (key '{key}')";
- }
-
- return val;
- }
-
- private Translation GetForLanguage(ELanguage language)
- {
- string? langname = ELanguageToString(language);
- if (langname == null)
- {
- throw new ArgumentOutOfRangeException("Invalid ELanguage " + language + " specified.");
- }
-
- // Fetch the translations from this assembly. The translations are embedded in the installer
- var embeddedProvider = new EmbeddedFileProvider(Assembly.GetExecutingAssembly());
- string filename = "Translations/" + langname + ".json";
- IFileInfo fileInfo = embeddedProvider.GetFileInfo(filename);
- if (!fileInfo.Exists) {
- if (language == ELanguage.English)
- {
- throw new Exception("Base language not found!");
- }
-
- throw new Exception("Language " + language + " not found");
- }
-
- string text;
- using (var stream = fileInfo.CreateReadStream())
- {
- using (var reader = new StreamReader(stream))
- {
- text = reader.ReadToEnd();
- }
- }
-
- var newTranslation = JsonSerializer.Deserialize(text, SourceGenerationContext.Default.Translation);
- ArgumentNullException.ThrowIfNull(newTranslation);
- return newTranslation;
- }
-
- ///
- /// This function is for creating and translating elements in code behind
- ///
- public T CreateTranslated(T visualCreated, string translationKey, string? defaultStr = null) where T : Visual
- {
- visualCreated[Controls.Translatable.TranslationKeyProperty] = translationKey;
- visualCreated[Controls.Translatable.DefaultTextProperty] = defaultStr;
- TranslateVisual(visualCreated);
- return visualCreated;
- }
-
- public void TranslateVisual(Visual visual)
- {
- foreach (var vis in visual.GetAllVisualChildrenTree())
- {
- Console.WriteLine("vis " + vis.Name);
- TranslateAvaloniaObject(vis);
- }
- }
-
- public void TranslateTrayIcon(TrayIcon icon)
- {
- List objs = new()
- {
- icon
- };
-
- if (icon.Menu != null)
- {
- objs.Add(icon.Menu);
- foreach (var item in icon.Menu.Items)
- {
- objs.Add(item);
- }
- }
-
- foreach (var item in objs)
- {
- TranslateAvaloniaObject(item);
- }
- }
- public void TranslateAvaloniaObject(AvaloniaObject obj)
- {
- if (!RefreshableObjects.Contains(obj))
- {
- RefreshableObjects.Add(obj);
- }
-
- string? translationKey = (string?)obj[Controls.Translatable.TranslationKeyProperty];
- string? defaultStr = (string?)obj[Controls.Translatable.DefaultTextProperty];
- if (!string.IsNullOrEmpty(translationKey))
- {
- bool translationFailed = false;
- string translatedText = $"TRANSLATION FAILED (key '{translationKey}')";
- if (!this.CurrentTranslation.TranslationKeys.ContainsKey(translationKey))
- {
- translationFailed = true;
- Console.WriteLine("Cannot translate " + translationKey + ", no key!");
- }
- else
- {
- translatedText = this.CurrentTranslation.TranslationKeys[translationKey];
- Console.WriteLine("Got translation " + translatedText);
- }
-
- void TranslateTextInternal(StyledProperty property)
- {
- bool isEmptyOrNull = false;
- T val = obj.GetValue(property);
- if (val == null)
- {
- isEmptyOrNull = true;
- }
- else if (val is string str)
- {
- isEmptyOrNull = string.IsNullOrEmpty(str);
- }
-
- if (!translationKey.StartsWith('#'))
- {
- // User probably meant to set the text directly.
- obj.SetValue(property, translationKey);
- return;
- }
-
- // Don't replace text with TRANSLATION FAILED if there's pre-existing text in the control
- if (translationFailed && !isEmptyOrNull)
- {
- return;
- }
- else
- {
- // And if there's no pre existing text, but the translation failed, show the default string if it is not empty
- if (!string.IsNullOrEmpty(defaultStr))
- {
- obj.SetValue(property, defaultStr);
- return;
- }
- }
-
- Console.WriteLine("Set property " + property + " to " + translatedText + " for " + obj.GetType());
- if (obj is Control c) {
- Console.WriteLine("with name " + c.Name);
- }
-
- obj.SetValue(property, translatedText);
- }
-
- // Window eventually inherits from ContentControl, as do lots of other controls. We don't want to override a window's content...
- if (obj is Window)
- {
- TranslateTextInternal(Window.TitleProperty);
- }
- else if (obj is MenuItem)
- {
- TranslateTextInternal(MenuItem.HeaderProperty);
- }
- else if (obj is TextBox)
- {
- TranslateTextInternal(TextBox.WatermarkProperty);
- }
- else if (obj is ContentControl)
- {
- TranslateTextInternal(ContentControl.ContentProperty);
- }
- else if (obj is TextBlock)
- {
- TranslateTextInternal(TextBlock.TextProperty);
- }
- else if (obj is NativeMenuItem)
- {
- TranslateTextInternal(NativeMenuItem.HeaderProperty);
- }
- else if (obj is TrayIcon)
- {
- TranslateTextInternal(TrayIcon.ToolTipTextProperty);
- }
- }
- }
-
- public static string? ELanguageToString(ELanguage lang)
- {
- try
- {
- return ELanguageConversion.APINameFromELanguage(lang);
- }
- catch (System.Exception)
- {
- return null;
- }
- }
-
- public string GetPrettyNameForLanguage(ELanguage lang)
- {
- return GetForLanguage(lang).LanguageFriendlyName;
- }
-
- //TODO: we should copy this over to OpenSteamClient as well
- public void LoadCurrentSystemTranslation()
- {
- if (ELanguageConversion.TwoLetterISOCodesToLanguages.TryGetValue(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, out ELanguage lang)) {
- SetLanguage(lang);
- } else {
- SetLanguage(ELanguage.English);
- }
- }
-}
\ No newline at end of file
diff --git a/Installer/Translations/english.json b/Installer/Translations/english.json
deleted file mode 100644
index 4ce1bd37..00000000
--- a/Installer/Translations/english.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "Language": 0,
- "LanguageFriendlyName": "English",
- "ISOCode": "en",
- "TranslationKeys": {
- "#LanguageNameTranslated": "English",
- "#Dialog_Cancel": "Cancel",
- "#Dialog_OK": "OK",
- "#Dialog_Yes": "Yes",
- "#Dialog_No": "No",
- "#Dialog_Next": "Next",
- "#Dialog_Previous": "Previous",
- "#Dialog_Finish": "Finish",
- "#Dialog_Install": "Install",
- "#MainWindow_Title": "OpenSteamClient Installer",
- "#LocalizedSteamSSALink": "https://store.steampowered.com/subscriber_agreement/",
- "#Welcome_WindowTitle": "Welcome",
- "#Welcome_Title": "Welcome to the OpenSteamClient setup",
- "#Welcome_FeatureText": "OpenSteamClient is a community alternative to the official Steam Client. Here are some of it's features: ",
- "#Welcome_Features": " - Lightweight\n - Not browser based\n - Extensive customization\n - Community support\n - 64-bit",
- "#Welcome_AgreeText": "Please agree to the below terms to use OpenSteamClient.",
- "#Welcome_ViewSSAButton": "View Steam Subscriber Agreement",
- "#Welcome_AgreeSSACheckbox": "I agree to the Steam Subscriber Agreement",
- "#Welcome_AgreeOSCDevelopersCheckbox": "I agree to not hold OpenSteamClient's developers responsible if my Steam account gets terminated for any reason",
- "#ChooseActionPage_Install": "Install",
- "#ChooseActionPage_InstallSubtext": "Install OpenSteamClient",
- "#ChooseActionPage_Repair": "Repair",
- "#ChooseActionPage_RepairSubtext": "Repair OpenSteamClient",
- "#ChooseActionPage_Uninstall": "Uninstall",
- "#ChooseActionPage_UninstallSubtext": "Uninstall OpenSteamClient",
- "#PickInstallDirectory_WindowTitle": "Choose install directory",
- "#PickInstallDirectory_ButtonText": "Browse",
- "#PickInstallDirectory_Title": "Choose an install directory to install OpenSteamClient",
- "#PickInstallDirectory_FolderPickerTitle": "Select an install directory to install OpenSteamClient",
- "#PickInstallDirectory_Text": "Games and apps may be installed in this directory, but you can also add alternative directories and drives later.",
- "#InstallError_NoSpaceError": "Selected drive does not have enough space. At least 1GB is required.",
- "#InstallError_DirectoryNotFoundError": "Install folder does not exist",
- "#InstallError_ContainsFilesError": "Install folder contains files",
- "#InstallError_PathNotAbsoluteError": "Provided path is not absolute",
- "#InstallError_ServiceInstallFailed": "Service installation failed with code {0}, error: {1}",
- "#InstallError_GenericErrorCode": "Got error code {0} while installing",
- "#InstallError_GenericError": "Got error {0} while installing",
- "#InstallProgress_DownloadingService": "Downloading Steam Client Service",
- "#InstallProgress_InstallingService": "Installing Steam Client Service",
- "#InstallProgress_UnzippingOSC": "Unzipping OpenSteamClient",
- "#InstallProgress_WritingRegistryKeys": "Writing registry keys"
- }
-}
\ No newline at end of file
diff --git a/Installer/Translations/finnish.json b/Installer/Translations/finnish.json
deleted file mode 100644
index 8bd500c8..00000000
--- a/Installer/Translations/finnish.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "Language": 15,
- "LanguageFriendlyName": "Finnish",
- "ISOCode": "fi",
- "TranslationKeys": {
- "#SettingsWindow_YourCurrentLanguage": "Tämänhetkinen kielesi on {0} ({1})",
- "#LanguageNameTranslated": "Suomi",
- "#Dialog_Cancel": "Peruuta",
- "#Dialog_OK": "OK",
- "#Dialog_Yes": "Kyllä",
- "#Dialog_No": "Ei",
- "#Dialog_Next": "Seuraava",
- "#Dialog_Previous": "Edellinen",
- "#Dialog_Finish": "Lopeta",
- "#Dialog_Install": "Asenna",
- "#LocalizedSteamSSALink": "https://store.steampowered.com/subscriber_agreement/?l=finnish",
- "#MainWindow_Title": "OpenSteamClient -asennusohjelma",
- "#Welcome_WindowTitle": "Tervetuloa",
- "#Welcome_Title": "Tervetuloa OpenSteamClient -asennusohjelmaan",
- "#Welcome_FeatureText": "OpenSteamClient on vaihtoehtoinen yhteisön rakentama Steam-ohjelma. Sen ominaisuuksiin kuuluu: ",
- "#Welcome_Features": " - Kevyt\n - Ei selainpohjainen\n - Laajat kustomointivaihtoehdot\n - Yhteisön tuki\n - 64-bittinen",
- "#Welcome_AgreeText": "Hyväksy alla olevat ehdot käyttääksesi OpenSteamClient:ia",
- "#Welcome_ViewSSAButton": "Katso Steam-tilaussopimus",
- "#Welcome_AgreeSSACheckbox": "Hyväksyn Steam-tilaussopimuksen ehdot",
- "#Welcome_AgreeOSCDevelopersCheckbox": "Hyväksyn, etten pidä OpenSteamClient:in kehittäjiä vastuullisena, jos Steam-tilini lakkautetaan mistään syystä",
- "#ChooseActionPage_Install": "Asenna",
- "#ChooseActionPage_InstallSubtext": "Asenna OpenSteamClient",
- "#ChooseActionPage_Repair": "Korjaa",
- "#ChooseActionPage_RepairSubtext": "Korjaa OpenSteamClient",
- "#ChooseActionPage_Uninstall": "Poista asennus",
- "#ChooseActionPage_UninstallSubtext": "Poista OpenSteamClient:in asennus",
- "#PickInstallDirectory_WindowTitle": "Valitse asennuskansio",
- "#PickInstallDirectory_ButtonText": "Selaa",
- "#PickInstallDirectory_Title": "Valitse kansio minne OpenSteamClient asennetaan",
- "#PickInstallDirectory_FolderPickerTitle": "Valitse kansio minne OpenSteamClient asennetaan",
- "#PickInstallDirectory_Text": "Pelit ja sovellukset voidaan asennetaan tähänkin kansioon, mutta voit myös lisätä muita kansioita ja asemia myöhemmin. ",
- "#InstallError_NoSpaceError": "Valitulla levyllä ei ole tarpeeksi tilaa asentaa OpenSteamClient:iä. Vaaditaan ainakin 1GB.",
- "#InstallError_DirectoryNotFoundError": "Asennuskansioa ei ole olemassa.",
- "#InstallError_ContainsFilesError": "Asennuskansio sisältää tiedostoja",
- "#InstallError_PathNotAbsoluteError": "Polku ei ole absoluutti",
- "#InstallError_GenericErrorCode": "Tapahtui virhekoodi {0}",
- "#InstallError_GenericError": "Tapahtui virhe {0}",
- "#InstallError_ServiceInstallFailed": "Palvelun asennus epäonnistui virhekoodilla {0}, virhe: {1}",
- "#InstallProgress_DownloadingService": "Ladataan Steam-palvelua",
- "#InstallProgress_InstallingService": "Asennetaan Steam-palvelua",
- "#InstallProgress_UnzippingOSC": "Puretaan OpenSteamClient:ia",
- "#InstallProgress_WritingRegistryKeys": "Kirjoitetaan rekisteriarvoja"
- }
-}
\ No newline at end of file
diff --git a/Installer/ViewModels/AvaloniaAppViewModel.cs b/Installer/ViewModels/AvaloniaAppViewModel.cs
deleted file mode 100644
index 14887a41..00000000
--- a/Installer/ViewModels/AvaloniaAppViewModel.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Installer.ViewModels;
-
-public partial class AvaloniaAppViewModel : AvaloniaCommon.ViewModelBase {
-
-}
\ No newline at end of file
diff --git a/Installer/ViewModels/LanguageViewModel.cs b/Installer/ViewModels/LanguageViewModel.cs
deleted file mode 100644
index ae305a41..00000000
--- a/Installer/ViewModels/LanguageViewModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Installer.Translation;
-
-namespace Installer.ViewModels;
-
-public partial class LanguageViewModel : AvaloniaCommon.ViewModelBase {
- public string Name { get; init; }
- public ELanguage ELang { get; init; }
- public LanguageViewModel(ELanguage lang) {
- this.ELang = lang;
- this.Name = AvaloniaApp.TranslationManager.GetPrettyNameForLanguage(lang);
- }
-}
\ No newline at end of file
diff --git a/Installer/ViewModels/MainWindowViewModel.cs b/Installer/ViewModels/MainWindowViewModel.cs
deleted file mode 100644
index f82dbcca..00000000
--- a/Installer/ViewModels/MainWindowViewModel.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Windows.Input;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using Installer.Enums;
-using Installer.Extensions;
-using Installer.Translation;
-using Installer.ViewModels.Pages;
-using Installer.Views;
-
-namespace Installer.ViewModels;
-
-public partial class MainWindowViewModel : AvaloniaCommon.ViewModelBase {
- [ObservableProperty]
- private UserControl currentPage;
-
- [ObservableProperty]
- private Bitmap openSteamLogo;
-
- public bool CanClose => OnCancel != null;
- public bool PreviousEnabled => CanClose && OnPrevious != null;
- public bool NextEnabled => CanClose && OnNext != null;
-
- [NotifyPropertyChangedFor(nameof(CanClose))]
- [NotifyPropertyChangedFor(nameof(PreviousEnabled))]
- [NotifyPropertyChangedFor(nameof(NextEnabled))]
- [ObservableProperty]
- private ICommand? onCancel;
-
- [NotifyPropertyChangedFor(nameof(PreviousEnabled))]
- [ObservableProperty]
- private ICommand? onPrevious;
-
- [NotifyPropertyChangedFor(nameof(NextEnabled))]
- [ObservableProperty]
- private ICommand? onNext;
-
- [ObservableProperty]
- private LanguageViewModel selectedLanguage;
-
- public LinearGradientBrush PanelBackground { get; init; }
- public ObservableCollection Languages { get; init; } = new();
-
- private readonly MainWindow window;
- private readonly List Pages = new();
-
- private bool canGoBack = true;
- public bool CanGoBack {
- get => canGoBack;
- set {
- canGoBack = value;
- UpdateActions();
- }
- }
-
- public InstallAction AvailableActions { get; set; }
- private InstallAction selectedAction = InstallAction.None;
- public InstallAction SelectedAction {
- get => selectedAction;
- set {
- selectedAction = value;
- UpdateActions();
- }
- }
-
- private bool canGoNext = false;
- public bool CanGoNext {
- get => canGoNext;
- set {
- canGoNext = value;
- UpdateActions();
- }
- }
-
- private bool HasPrevious => CanGoBack && Pages.IndexOf(CurrentPage) > 0;
- private bool HasNext => CanGoNext && Pages.IndexOf(CurrentPage) + 1 < Pages.Count;
- private readonly UserControl chooseActionPage;
- private readonly UserControl placeholderPage;
- private readonly PlaceholderPageViewModel placeholderPageViewModel;
-
- public MainWindowViewModel(MainWindow window) {
- this.PanelBackground = new LinearGradientBrush();
- PanelBackground.StartPoint = new Avalonia.RelativePoint(0, 0, Avalonia.RelativeUnit.Relative);
- PanelBackground.EndPoint = new Avalonia.RelativePoint(1, 1, Avalonia.RelativeUnit.Relative);
- PanelBackground.GradientStops.Add(new GradientStop() {
- Offset = 0,
- Color = Color.Parse("#ff0000"),
- });
-
- PanelBackground.GradientStops.Add(new GradientStop() {
- Offset = 1,
- Color = Color.Parse("#7b0000"),
- });
-
- foreach (var item in TranslationManager.ValidUILanguages)
- {
- Languages.Add(new LanguageViewModel(item));
- }
-
- SelectedLanguage = Languages.First(l => AvaloniaApp.TranslationManager.CurrentTranslation.Language == l.ELang);
-
- this.window = window;
-
- //TODO: check install status here and determine the available actions
- AvailableActions = InstallAction.Install | InstallAction.Repair | InstallAction.Uninstall;
-
- {
- var page = new WelcomePage();
- page.DataContext = new WelcomePageViewModel(this);
- Pages.Add(page);
- }
-
- {
- chooseActionPage = new ChooseActionPage();
- chooseActionPage.DataContext = new ChooseActionPageViewModel(this);
- Pages.Add(chooseActionPage);
- }
-
- {
- placeholderPage = new PlaceholderPage();
- placeholderPageViewModel = new PlaceholderPageViewModel();
- placeholderPage.DataContext = placeholderPageViewModel;
- Pages.Add(placeholderPage);
- }
-
- {
- var page = new InstallingPage();
- page.DataContext = new InstallingPageViewModel();
- Pages.Add(page);
- }
-
- this.CurrentPage = Pages.First();
-
- this.OpenSteamLogo = new Bitmap(AssetLoader.Open(new Uri("avares://Installer/Assets/opensteam-logo.ico")));
- this.PropertyChanged += InternalOnPropertyChanged;
- this.OnCancel = new RelayCommand(Cancel);
- this.OnNext = new RelayCommand(Next);
-
- window.Closing += OnClosing;
-
- UpdateActions();
- }
-
- private void OnClosing(object? sender, WindowClosingEventArgs e)
- {
- e.Cancel = !CanClose;
- }
-
- private void InternalOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
- {
- if (e.PropertyName == nameof(CanClose)) {
- if (CanClose) {
- WindowToolbar.EnableCloseButton(window);
- } else {
- WindowToolbar.DisableCloseButton(window);
- }
- }
-
- if (e.PropertyName == nameof(SelectedLanguage)) {
- AvaloniaApp.TranslationManager.SetLanguage(SelectedLanguage.ELang);
- }
- }
-
- private void Cancel() {
- AvaloniaApp.Current?.MainWindow?.Close();
- }
-
- private void Previous() {
- if (HasPrevious) {
- CurrentPage = Pages.ElementAt(Pages.IndexOf(CurrentPage) - 1);
- }
-
- UpdateActions();
- }
-
- private void Next() {
- if (HasNext) {
- var nextPage = Pages.ElementAt(Pages.IndexOf(CurrentPage) + 1);
- if (nextPage is PlaceholderPage) {
- switch (SelectedAction)
- {
- case InstallAction.None:
- placeholderPageViewModel.InternalControl = new TextBlock() {
- Text = "No install action selected! (You should not be able to see this screen)"
- };
- break;
- case InstallAction.Install:
- var page = new ChooseInstallDirectoryPage();
- page.DataContext = new ChooseInstallDirectoryPageViewModel(page, this);
- placeholderPageViewModel.InternalControl = page;
- break;
- case InstallAction.Repair:
- placeholderPageViewModel.InternalControl = new TextBlock() {
- Text = "Repair page"
- };
- break;
- case InstallAction.Uninstall:
- placeholderPageViewModel.InternalControl = new TextBlock() {
- Text = "Uninstall page"
- };
- break;
- }
- }
-
- if (nextPage is InstallingPage) {
- OnCancel = null;
- }
-
- CurrentPage = nextPage;
- }
-
- UpdateActions();
- }
-
- private void UpdateActions() {
- if (HasPrevious) {
- OnPrevious = new RelayCommand(Previous);
- } else {
- OnPrevious = null;
- }
-
- if (CurrentPage is ChooseActionPage) {
- if (SelectedAction == InstallAction.None) {
- OnNext = null;
- return;
- }
- }
-
- if (!CanGoNext) {
- OnNext = null;
- return;
- }
-
- Console.WriteLine("CurrentPage is " + (CurrentPage == null ? "null" : CurrentPage.GetType().Name));
- Console.WriteLine("InternalControl is " + (placeholderPageViewModel.InternalControl == null ? "null" : placeholderPageViewModel.InternalControl!.GetType().Name));
-
- if (HasNext) {
- OnNext = new RelayCommand(Next);
-
- var nextBtn = window.FindControlNested