Skip to content

Commit 62a48b4

Browse files
authored
Merge pull request #160 from Emik03/fix-wayland-clipboard
Fix wayland clipboard
2 parents 6b50c2b + 2412ca7 commit 62a48b4

File tree

3 files changed

+19
-30
lines changed

3 files changed

+19
-30
lines changed

Wobble/Platform/Clipboard.cs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,29 @@ namespace Wobble.Platform
88
{
99
public abstract class Clipboard
1010
{
11-
public static Clipboard NativeClipboard { get; } = GetClipboard();
12-
13-
public abstract string GetText();
14-
15-
public abstract void SetText(string selectedText);
16-
17-
static Clipboard GetClipboard()
11+
public static Clipboard NativeClipboard
1812
{
19-
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
20-
return new WindowsClipboard();
13+
get
14+
{
15+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
16+
{
17+
return new WindowsClipboard();
18+
}
19+
20+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
21+
{
22+
if (GameBase.Game.Window.GetType().Name == "SdlGameWindow")
23+
{
24+
return new SdlClipboard();
25+
}
26+
}
2127

22-
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux) &&
23-
!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
2428
return null;
29+
}
30+
}
2531

26-
var xdg = Environment.GetEnvironmentVariable("XDG_SESSION_TYPE");
27-
var display = Environment.GetEnvironmentVariable("WAYLAND_DISPLAY");
28-
var isWayland = StringComparer.OrdinalIgnoreCase.Equals(xdg, "wayland") || display is object;
32+
public abstract string GetText();
2933

30-
return RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && isWayland ?
31-
(Clipboard)new WaylandClipboard() :
32-
GameBase.Game.Window.GetType().Name is "SdlGameWindow" ? new SdlClipboard() : null;
33-
}
34+
public abstract void SetText(string selectedText);
3435
}
3536
}

Wobble/Platform/Linux/WaylandClipboard.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

Wobble/Wobble.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1919
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
2020
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
21-
<PackageReference Include="TextCopy" Version="6.2.1" />
2221
</ItemGroup>
2322
<ItemGroup>
2423
<ProjectReference Include="../MonoGame/MonoGame.Framework/MonoGame.Framework.DesktopGL.csproj" />

0 commit comments

Comments
 (0)