Initial Linux support (#781)

Part of #143.
LostArtefacts · Oct 27, 2024 · 3b5f218 · 3b5f218
1 parent 63b97a6
commit 3b5f218
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.3...master) - xxxx-xx-xx
+- added (experimental) support for Linux (#143)
 - changed the number of secrets in TR3R Coastal Village to four to match the statistics (#775)
 - fixed unreachable item locations in Coastal Village (#774)
 

diff --git a/Deps/TRGE.Coord.dll b/Deps/TRGE.Coord.dll
diff --git a/Deps/TRGE.Core.dll b/Deps/TRGE.Core.dll
diff --git a/TRRandomizerView/Controls/FolderLoadControl.xaml b/TRRandomizerView/Controls/FolderLoadControl.xaml
@@ -47,7 +47,7 @@
         <StackPanel HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Orientation="Horizontal">
-            <Image Source="..\Resources\rando_sm.png"/>
+            <Image Source="../Resources/rando_sm.png"/>
             <TextBlock Text="{Binding AppTitle}"
                        VerticalAlignment="Center"
                        FontSize="40"
@@ -88,12 +88,13 @@
             Visibility="{Binding RecentFoldersVisibility}">
             <GroupBox.Header>
                 <StackPanel Orientation="Horizontal">
-                    <Image x:Name="_historyIcon" 
-                           Width="18" 
-                           Height="18"/>
-
-                    <TextBlock Margin="5,0,0,0" 
-                               Text="Recent Folders"/>
+                    <Image
+                        Source="../Resources/folder.png"
+                        Height="18"/>
+                    <TextBlock
+                        Margin="3,0,0,0" 
+                        FontWeight="Bold"
+                        Text="Recent Folders"/>
                 </StackPanel>
             </GroupBox.Header>
 

diff --git a/TRRandomizerView/Controls/FolderLoadControl.xaml.cs b/TRRandomizerView/Controls/FolderLoadControl.xaml.cs
@@ -62,7 +62,6 @@ public FolderLoadControl()
             AppTitle = app.Title;
         }
         _content.DataContext = this;
-        _historyIcon.Source = ControlUtils.DefaultIcons.FolderSmall.ToImageSource();
     }
 
     private void HistoryListView_SelectionChanged(object sender, SelectionChangedEventArgs e)

diff --git a/TRRandomizerView/Resources/folder.png b/TRRandomizerView/Resources/folder.png
diff --git a/TRRandomizerView/TRRandomizerView.csproj b/TRRandomizerView/TRRandomizerView.csproj
@@ -49,6 +49,7 @@
     <None Remove="Resources\Darkness\TR2\8.jpg" />
     <None Remove="Resources\Darkness\TR2\9.jpg" />
     <None Remove="Resources\down.png" />
+    <None Remove="Resources\folder.png" />
     <None Remove="Resources\loading.png" />
     <None Remove="Resources\rando.ico" />
     <None Remove="Resources\rando.png" />
@@ -88,6 +89,7 @@
     <Resource Include="Resources\Darkness\TR2\8.jpg" />
     <Resource Include="Resources\Darkness\TR2\9.jpg" />
     <Resource Include="Resources\down.png" />
+    <Resource Include="Resources\folder.png" />
     <Resource Include="Resources\loading.png" />
     <Resource Include="Resources\rando.ico" />
     <Resource Include="Resources\rando.png" />

diff --git a/TRRandomizerView/Utilities/ControlUtils.cs b/TRRandomizerView/Utilities/ControlUtils.cs
@@ -1,21 +1,12 @@
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interop;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 
 namespace TRRandomizerView.Utilities;
 
 public static class ControlUtils
 {
-    [DllImport("gdi32.dll", SetLastError = true)]
-    private static extern bool DeleteObject(IntPtr hObject);
-
-    public static ListViewItem GetItemAt(this ListView listView, System.Windows.Point clientRelativePosition)
+    public static ListViewItem GetItemAt(this ListView listView, Point clientRelativePosition)
     {
         HitTestResult hitTestResult = VisualTreeHelper.HitTest(listView, clientRelativePosition);
         DependencyObject selectedItem = null;
@@ -33,68 +24,4 @@ public static ListViewItem GetItemAt(this ListView listView, System.Windows.Poin
         }
         return selectedItem == null ? null : selectedItem as ListViewItem;
     }
-
-    public static ImageSource ToImageSource(this Icon icon)
-    {
-        Bitmap bitmap = icon.ToBitmap();
-        IntPtr hBitmap = bitmap.GetHbitmap();
-
-        ImageSource wpfBitmap = Imaging.CreateBitmapSourceFromHBitmap
-        (
-            hBitmap,
-            IntPtr.Zero,
-            Int32Rect.Empty,
-            BitmapSizeOptions.FromEmptyOptions()
-        );
-
-        if (!DeleteObject(hBitmap))
-        {
-            throw new Win32Exception();
-        }
-
-        return wpfBitmap;
-    }
-
-    public static class DefaultIcons
-    {
-        private static Icon _largeFolderIcon, _smallFolderIcon;
-
-        public static Icon FolderLarge => _largeFolderIcon ??= GetStockIcon(SHSIID_FOLDER, SHGSI_LARGEICON);
-        public static Icon FolderSmall => _smallFolderIcon ??= GetStockIcon(SHSIID_FOLDER, SHGSI_SMALLICON);
-
-        [DllImport("shell32.dll")]
-        private static extern int SHGetStockIconInfo(uint siid, uint uFlags, ref SHSTOCKICONINFO psii);
-
-        [DllImport("user32.dll")]
-        private static extern bool DestroyIcon(IntPtr handle);
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        private struct SHSTOCKICONINFO
-        {
-            public uint cbSize;
-            public IntPtr hIcon;
-            public int iSysIconIndex;
-            public int iIcon;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
-            public string szPath;
-        }
-
-        private const uint SHSIID_FOLDER = 0x3;
-        private const uint SHGSI_ICON = 0x100;
-        private const uint SHGSI_LARGEICON = 0x0;
-        private const uint SHGSI_SMALLICON = 0x1;
-
-        private static Icon GetStockIcon(uint type, uint size)
-        {
-            SHSTOCKICONINFO info = new();
-            info.cbSize = (uint)Marshal.SizeOf(info);
-
-            _ = SHGetStockIconInfo(type, SHGSI_ICON | size, ref info);
-
-            Icon icon = (Icon)Icon.FromHandle(info.hIcon).Clone();
-            DestroyIcon(info.hIcon);
-
-            return icon;
-        }
-    }
 }
diff --git a/TRRandomizerView/Utilities/ProcessUtils.cs b/TRRandomizerView/Utilities/ProcessUtils.cs
@@ -19,11 +19,16 @@ public static void OpenFile(string fileName, string arguments = null)
 
     public static void OpenFolder(string folder)
     {
+        folder = Path.GetFullPath(folder);
+        if (!Path.EndsInDirectorySeparator(folder))
+        {
+            folder += Path.DirectorySeparatorChar;
+        }
         Process.Start(new ProcessStartInfo
         {
-            FileName = "explorer.exe",
-            Arguments = Path.GetFullPath(folder),
-            UseShellExecute = true
+            FileName = folder,
+            UseShellExecute = true,
+            Verb = "open",
         });
     }
 

diff --git a/TRRandomizerView/Windows/AboutWindow.xaml b/TRRandomizerView/Windows/AboutWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         ResizeMode="NoResize"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         FontFamily="Segoe UI"
         FontSize="13"
         WindowStartupLocation="CenterOwner"
@@ -29,7 +29,7 @@
                Width="120"
                Margin="0,5,10,0"
                HorizontalAlignment="Center"
-               Source="..\Resources\rando.png"/>
+               Source="../Resources/rando.png"/>
 
         <StackPanel Grid.Column="1">
             <TextBlock FontSize="16"

diff --git a/TRRandomizerView/Windows/AdvancedWindow.xaml b/TRRandomizerView/Windows/AdvancedWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:ctrl="clr-namespace:TRRandomizerView.Controls"
         xmlns:cvt="clr-namespace:TRRandomizerView.Converters"
         mc:Ignorable="d"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterOwner"
         ShowInTaskbar="False"
@@ -999,7 +999,7 @@
                         <Image Width="186"
                                x:Name="_darknessPreview"
                                HorizontalAlignment="Left"
-                               Source="..\Resources\Darkness\0.jpg"/>
+                               Source="../Resources/Darkness/0.jpg"/>
                     </Border>
                 </Grid>
             </StackPanel>

diff --git a/TRRandomizerView/Windows/EnemyWindow.xaml b/TRRandomizerView/Windows/EnemyWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         ResizeMode="CanResizeWithGrip"
         WindowStartupLocation="CenterOwner"
         ShowInTaskbar="False"

diff --git a/TRRandomizerView/Windows/GlobalSeedWindow.xaml b/TRRandomizerView/Windows/GlobalSeedWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ctrl="clr-namespace:TRRandomizerView.Controls"
         mc:Ignorable="d"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterOwner"
         ShowInTaskbar="False"

diff --git a/TRRandomizerView/Windows/GlobalSettingsWindow.xaml b/TRRandomizerView/Windows/GlobalSettingsWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:cvt="clr-namespace:TRRandomizerView.Converters"
     mc:Ignorable="d"
-    Icon="..\Resources\rando.ico"
+    Icon="../Resources/rando.ico"
     ResizeMode="NoResize"
     WindowStartupLocation="CenterOwner"
     ShowInTaskbar="False"

diff --git a/TRRandomizerView/Windows/MainWindow.xaml b/TRRandomizerView/Windows/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:ctrl="clr-namespace:TRRandomizerView.Controls"
         xmlns:vm="clr-namespace:TRRandomizerView.Model"
         mc:Ignorable="d"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         ResizeMode="CanResizeWithGrip"
         WindowStartupLocation="CenterScreen"
         Closing="Window_Closing"

diff --git a/TRRandomizerView/Windows/MessageWindow.xaml b/TRRandomizerView/Windows/MessageWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         ResizeMode="NoResize"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         WindowStartupLocation="CenterOwner"
         ShowInTaskbar="False"
         Loaded="Window_Loaded"

diff --git a/TRRandomizerView/Windows/OpenProgressWindow.xaml b/TRRandomizerView/Windows/OpenProgressWindow.xaml
@@ -9,7 +9,7 @@
         ResizeMode="NoResize"
         Loaded="Window_Loaded"
         Closing="Window_Closing"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         Title="Opening Data Folder" Height="100" Width="400">
 
     <Grid Margin="10,10,10,15">
@@ -29,7 +29,7 @@
 
         <Image
             Grid.Column="1"
-            Source="..\Resources\loading.png"
+            Source="../Resources/loading.png"
             Width="16"
             Height="16"
             VerticalAlignment="Bottom"

diff --git a/TRRandomizerView/Windows/RandomizeProgressWindow.xaml b/TRRandomizerView/Windows/RandomizeProgressWindow.xaml
@@ -9,7 +9,7 @@
         ResizeMode="NoResize"
         Loaded="Window_Loaded"
         Closing="Window_Closing"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         SizeToContent="Height"
         Title="Randomization In Progress" Width="440">
     <Grid>
@@ -36,7 +36,7 @@
             <!-- https://stackoverflow.com/a/56477427 -->
             <Image
                 Grid.Column="1"
-                Source="..\Resources\loading.png"
+                Source="../Resources/loading.png"
                 Width="16"
                 Height="16"
                 VerticalAlignment="Bottom"

diff --git a/TRRandomizerView/Windows/RestoreProgressWindow.xaml b/TRRandomizerView/Windows/RestoreProgressWindow.xaml
@@ -9,7 +9,7 @@
         ResizeMode="NoResize"
         Loaded="Window_Loaded"
         Closing="Window_Closing"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         Title="Restoring Data Folder" Height="100" Width="400">
 
     <Grid Margin="10,10,10,15">
@@ -29,7 +29,7 @@
 
         <Image
             Grid.Column="1"
-            Source="..\Resources\loading.png"
+            Source="../Resources/loading.png"
             Width="16"
             Height="16"
             VerticalAlignment="Bottom"

diff --git a/TRRandomizerView/Windows/TR1XWindow.xaml b/TRRandomizerView/Windows/TR1XWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ctrl="clr-namespace:TRRandomizerView.Controls"
         mc:Ignorable="d"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterOwner"
         ShowInTaskbar="False"

diff --git a/TRRandomizerView/Windows/UpdateAvailableWindow.xaml b/TRRandomizerView/Windows/UpdateAvailableWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         ShowInTaskbar="False"
-        Icon="..\Resources\rando.ico"
+        Icon="../Resources/rando.ico"
         ResizeMode="CanResizeWithGrip"
         WindowStartupLocation="CenterOwner"
         Loaded="Window_Loaded"

diff --git a/USING.md b/USING.md
@@ -157,6 +157,10 @@ If you continue to experience issues, we have a friendly community [Discord serv
   - For Steam, you can right-click on the game in your library and select `Manage` | `Browse Local Files`. This will open the folder where the game files are located in Explorer and you can then copy the address as necessary.
   - For GoG, you can find the general installation folder under `Settings` | `Installing, updating` | `Game installation folder`. Browse to this folder in Explorer and then locate your game folder there.
 
+- _Can I run TR-Rando on Linux?_
+
+  The core libraries used in the randomizer work fully in Linux; the sticking point is the user interface itself, which is Windows-only. However, there is at least one method available to make this work - refer to the steps [here](https://github.com/LostArtefacts/TR-Rando/issues/143#issuecomment-2439741066) for details.
+
 - _I have installed TR1X but when I open the folder in the randomizer, it can't find the data files. What should I do?_
 
   When you install TR1X using its installer and, for example, target your Steam copy of the game, TR1X will be installed by default into your Documents folder as opposed to the original Steam folder. You can change this folder when running the installer. So all you need to do is point the randomizer to this folder instead of your Steam/GOG/original folder.