piwalker/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx-NX/Ryujinx.git synced 2024-11-14 13:07:41 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

More migration

Browse Source
This commit is contained in:
Isaac Marovitz 2024-03-10 14:04:35 +00:00
parent b093a3fbf6
commit 565a40f854
No known key found for this signature in database
GPG Key ID: 97250B2B09A132E1
38 changed files with 43 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx.Gtk3/UI/Applet/GtkDynamicTextInputHandler.cs
View File

@ -1,5 +1,5 @@
using Gtk;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using Ryujinx.Input.GTK3;
using Ryujinx.UI.Widgets;
using System.Threading;

4
src/Ryujinx.Gtk3/UI/Applet/GtkHostUIHandler.cs
View File

@ -1,8 +1,8 @@
using Gtk;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.Applets.Controller;
using Ryujinx.Horizon.Applets.SoftwareKeyboard;
using Ryujinx.Horizon.Sdk.Am.Types;
using Ryujinx.Horizon.Sdk.Am;
using Ryujinx.Horizon.UI;
using Ryujinx.UI.Widgets;
using System;
using System.Threading;

2
src/Ryujinx.Gtk3/UI/Applet/GtkHostUITheme.cs
View File

@ -1,5 +1,5 @@
using Gtk;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using System.Diagnostics;
namespace Ryujinx.UI.Applet

2
src/Ryujinx.HLE/HLEConfiguration.cs
View File

@ -7,7 +7,7 @@ using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS;
using Ryujinx.HLE.HOS.Services.Account.Acc;
using Ryujinx.HLE.HOS.SystemState;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using System;
namespace Ryujinx.HLE

2
src/Ryujinx.HLE/HOS/Horizon.cs
View File

@ -28,7 +28,7 @@ using Ryujinx.HLE.HOS.SystemState;
using Ryujinx.HLE.Loaders.Executables;
using Ryujinx.HLE.Loaders.Processes;
using Ryujinx.Horizon;
using Ryujinx.Horizon.Sdk.Am.Types;
using Ryujinx.Horizon.Sdk.Am;
using System;
using System.Collections.Generic;
using System.IO;

27
src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletId.cs
View File

@ -1,27 +0,0 @@
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
{
enum AppletId
{
Application = 0x01,
OverlayDisplay = 0x02,
QLaunch = 0x03,
Starter = 0x04,
Auth = 0x0A,
Cabinet = 0x0B,
Controller = 0x0C,
DataErase = 0x0D,
Error = 0x0E,
NetConnect = 0x0F,
PlayerSelect = 0x10,
SoftwareKeyboard = 0x11,
MiiEdit = 0x12,
LibAppletWeb = 0x13,
LibAppletShop = 0x14,
PhotoViewer = 0x15,
Settings = 0x16,
LibAppletOff = 0x17,
LibAppletWhitelisted = 0x18,
LibAppletAuth = 0x19,
MyPage = 0x1A,
}
}

12
src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletProcessLaunchReason.cs
View File

@ -1,12 +0,0 @@
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
{
[StructLayout(LayoutKind.Sequential, Size = 0x4)]
struct AppletProcessLaunchReason
{
public byte Flag;
public ushort Unknown1;
public byte Unknown2;
}
}

11
src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletInfo.cs
View File

@ -1,11 +0,0 @@
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
{
[StructLayout(LayoutKind.Sequential, Size = 0x8)]
struct LibraryAppletInfo
{
public AppletId AppletId;
public LibraryAppletMode LibraryAppletMode;
}
}

14
src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletMode.cs
View File

@ -1,14 +0,0 @@
using System;
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
{
[Flags]
enum LibraryAppletMode : uint
{
AllForeground,
PartialForeground,
NoUi,
PartialForegroundWithIndirectDisplay,
AllForegroundInitiallyHidden,
}
}

1
src/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
View File

@ -7,7 +7,6 @@ using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService;
using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService.Types;
using Ryujinx.HLE.HOS.Services.Vi.Types;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.Common;
using System;
using System.Collections.Generic;

2
src/Ryujinx.HLE/HOS/SystemState/AppletStateMgr.cs
View File

@ -1,5 +1,5 @@
using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.Horizon.Sdk.Am.Types;
using Ryujinx.Horizon.Sdk.Am;
using System.Collections.Concurrent;
namespace Ryujinx.HLE.HOS.SystemState

1
src/Ryujinx.HLE/HOS/UserChannelPersistence.cs
View File

@ -1,5 +1,4 @@
using Ryujinx.Horizon.Sdk.Am;
using Ryujinx.Horizon.Sdk.Am.Types;
using System;
using System.Collections.Generic;

2
src/Ryujinx.HLE/Switch.cs
View File

@ -7,7 +7,7 @@ using Ryujinx.HLE.HOS;
using Ryujinx.HLE.HOS.Services.Apm;
using Ryujinx.HLE.HOS.Services.Hid;
using Ryujinx.HLE.Loaders.Processes;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using Ryujinx.Memory;
using System;

6
src/Ryujinx.HLE/UI/Input/NpadButtonHandler.cs
View File

@ -1,6 +0,0 @@
using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad;
namespace Ryujinx.HLE.UI.Input
{
delegate void NpadButtonHandler(int npadIndex, NpadButton button);
}

2
src/Ryujinx.Headless.SDL2/HeadlessDynamicTextInputHandler.cs
View File

@ -1,4 +1,4 @@
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using System.Threading;
using System.Threading.Tasks;

2
src/Ryujinx.Headless.SDL2/HeadlessHostUiTheme.cs
View File

@ -1,4 +1,4 @@
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
namespace Ryujinx.Headless.SDL2
{

4
src/Ryujinx.Headless.SDL2/WindowBase.cs
View File

@ -5,10 +5,10 @@ using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.GAL.Multithreading;
using Ryujinx.Graphics.Gpu;
using Ryujinx.Graphics.OpenGL;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.Applets.Controller;
using Ryujinx.Horizon.Applets.SoftwareKeyboard;
using Ryujinx.Horizon.Sdk.Am.Types;
using Ryujinx.Horizon.Sdk.Am;
using Ryujinx.Horizon.UI;
using Ryujinx.Input;
using Ryujinx.Input.HLE;
using Ryujinx.SDL2.Common;

10
src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Storage/StorageHelper.cs → src/Ryujinx.Horizon/Am/Ipc/Storage/StorageHelper.cs
View File

@ -1,14 +1,14 @@
using LibHac.Fs;
using Ryujinx.Common.Memory;
using Ryujinx.HLE.HOS.Services.Account.Acc;
using System.IO;
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.Storage
namespace Ryujinx.Horizon.Am.Ipc.Storage
{
class StorageHelper
public class StorageHelper
{
private const uint LaunchParamsMagic = 0xc79497ca;
public static byte[] MakeLaunchParams(UserProfile userProfile)
public static byte[] MakeLaunchParams(UserId userId)
{
// Size needs to be at least 0x88 bytes otherwise application errors.
using MemoryStream ms = MemoryStreamManager.Shared.GetStream();
@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.Storage
writer.Write(LaunchParamsMagic);
writer.Write(1); // IsAccountSelected? Only lower 8 bits actually used.
userProfile.UserId.Write(writer);
writer.Write(userId.AsBytes());
return ms.ToArray();
}

5
src/Ryujinx.Horizon/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
View File

@ -3,6 +3,7 @@ using Ryujinx.Common.Configuration.Hid;
using Ryujinx.Common.Logging;
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.Sdk.Am;
using Ryujinx.Horizon.UI.Input;
using Ryujinx.Memory;
using System;
using System.Diagnostics;
@ -107,7 +108,7 @@ namespace Ryujinx.Horizon.Applets.SoftwareKeyboard
_keyboardRenderer = new SoftwareKeyboardRenderer(_device.UIHandler.HostUITheme);
}
return ResultCode.Success;
return Result.Success;
}
else
{
@ -494,7 +495,7 @@ namespace Ryujinx.Horizon.Applets.SoftwareKeyboard
_npads.Update(true);
NpadButton buttons = _npads.GetCurrentButtonsOfAllNpads();
NpadReader buttons = _npads.GetCurrentButtonsOfAllNpads();
// Block the input if the current accept key is pressed so the applet won't be instantly closed.
_canAcceptController = (buttons & NpadButton.A) == 0;

2
src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletIdentityInfo.cs → src/Ryujinx.Horizon/Sdk/Am/AppletIdentifyInfo.cs
View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
namespace Ryujinx.Horizon.Sdk.Am
{
[StructLayout(LayoutKind.Sequential, Size = 0x10)]
struct AppletIdentifyInfo

2
src/Ryujinx.Horizon/Sdk/Am/Types/FocusState.cs → src/Ryujinx.Horizon/Sdk/Am/FocusState.cs
View File

@ -1,4 +1,4 @@
namespace Ryujinx.Horizon.Sdk.Am.Types
namespace Ryujinx.Horizon.Sdk.Am
{
public enum FocusState
{

2
src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/LaunchParameterKind.cs → src/Ryujinx.Horizon/Sdk/Am/LaunchParameterKind.cs
View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types
namespace Ryujinx.Horizon.Sdk.Am
{
public enum LaunchParameterKind : uint
{

2
src/Ryujinx.Horizon/Sdk/Am/Types/ProgramSpecifyKind.cs → src/Ryujinx.Horizon/Sdk/Am/ProgramSpecifyKind.cs
View File

@ -1,4 +1,4 @@
namespace Ryujinx.Horizon.Sdk.Am.Types
namespace Ryujinx.Horizon.Sdk.Am
{
public enum ProgramSpecifyKind : uint
{

37
src/Ryujinx.Horizon/Sdk/Am/Types/AppletMessage.cs
View File

@ -1,37 +0,0 @@
namespace Ryujinx.Horizon.Sdk.Am.Types
{
public enum AppletMessage
{
None = 0,
ChangeIntoForeground = 1,
ChangeIntoBackground = 2,
Exit = 4,
ApplicationExited = 6,
FocusStateChanged = 15,
Resume = 16,
DetectShortPressingHomeButton = 20,
DetectLongPressingHomeButton = 21,
DetectShortPressingPowerButton = 22,
DetectMiddlePressingPowerButton = 23,
DetectLongPressingPowerButton = 24,
RequestToPrepareSleep = 25,
FinishedSleepSequence = 26,
SleepRequiredByHighTemperature = 27,
SleepRequiredByLowBattery = 28,
AutoPowerDown = 29,
OperationModeChanged = 30,
PerformanceModeChanged = 31,
DetectReceivingCecSystemStandby = 32,
SdCardRemoved = 33,
LaunchApplicationRequested = 50,
RequestToDisplay = 51,
ShowApplicationLogo = 55,
HideApplicationLogo = 56,
ForceHideApplicationLogo = 57,
FloatingApplicationDetected = 60,
DetectShortPressingCaptureButton = 90,
AlbumScreenShotTaken = 92,
AlbumRecordingSaved = 93,
}
}

2
src/Ryujinx.HLE/UI/DynamicTextChangedHandler.cs → src/Ryujinx.Horizon/UI/DynamicTextChangedHandler.cs
View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
public delegate void DynamicTextChangedHandler(string text, int cursorBegin, int cursorEnd, bool overwriteMode);
}

2
src/Ryujinx.HLE/UI/IDynamicTextInputHandler.cs → src/Ryujinx.Horizon/UI/IDynamicTextInputHandler.cs
View File

@ -1,6 +1,6 @@
using System;
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
public interface IDynamicTextInputHandler : IDisposable
{

4
src/Ryujinx.HLE/UI/IHostUIHandler.cs → src/Ryujinx.Horizon/UI/IHostUIHandler.cs
View File

@ -1,8 +1,8 @@
using Ryujinx.Horizon.Applets.Controller;
using Ryujinx.Horizon.Applets.SoftwareKeyboard;
using Ryujinx.Horizon.Sdk.Am.Types;
using Ryujinx.Horizon.Sdk.Am;
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
public interface IHostUIHandler
{

2
src/Ryujinx.HLE/UI/IHostUITheme.cs → src/Ryujinx.Horizon/UI/IHostUITheme.cs
View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
public interface IHostUITheme
{

4
src/Ryujinx.Horizon/UI/Input/NpadButtonHandler.cs Normal file
View File

@ -0,0 +1,4 @@
namespace Ryujinx.Horizon.UI.Input
{
delegate void NpadButtonHandler(int npadIndex, NpadButton button);
}

5
src/Ryujinx.HLE/UI/Input/NpadReader.cs → src/Ryujinx.Horizon/UI/Input/NpadReader.cs
View File

@ -1,7 +1,4 @@
using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common;
using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad;
namespace Ryujinx.HLE.UI.Input
namespace Ryujinx.Horizon.UI.Input
{
/// <summary>
/// Class that converts Hid entries for the Npad into pressed / released events.

2
src/Ryujinx.HLE/UI/KeyPressedHandler.cs → src/Ryujinx.Horizon/UI/KeyPressedHandler.cs
View File

@ -1,6 +1,6 @@
using Ryujinx.Common.Configuration.Hid;
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
public delegate bool KeyPressedHandler(Key key);
}

2
src/Ryujinx.HLE/UI/KeyReleasedHandler.cs → src/Ryujinx.Horizon/UI/KeyReleasedHandler.cs
View File

@ -1,6 +1,6 @@
using Ryujinx.Common.Configuration.Hid;
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
public delegate bool KeyReleasedHandler(Key key);
}

3
src/Ryujinx.HLE/UI/RenderingSurfaceInfo.cs → src/Ryujinx.Horizon/UI/RenderingSurfaceInfo.cs
View File

@ -1,7 +1,6 @@
using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
using System;
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
/// <summary>
/// Information about the indirect layer that is being drawn to.

2
src/Ryujinx.HLE/UI/ThemeColor.cs → src/Ryujinx.Horizon/UI/ThemeColor.cs
View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.UI
namespace Ryujinx.Horizon.UI
{
public readonly struct ThemeColor
{

4
src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
View File

@ -6,10 +6,10 @@ using Ryujinx.Ava.UI.Controls;
using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.Windows;
using Ryujinx.HLE;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.Applets.Controller;
using Ryujinx.Horizon.Applets.SoftwareKeyboard;
using Ryujinx.Horizon.Sdk.Am.Types;
using Ryujinx.Horizon.Sdk.Am;
using Ryujinx.Horizon.UI;
using System;
using System.Threading;

2
src/Ryujinx/UI/Applet/AvaloniaDynamicTextInputHandler.cs
View File

@ -5,7 +5,7 @@ using Avalonia.Threading;
using Ryujinx.Ava.Input;
using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.Windows;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using System;
using System.Threading;
using HidKey = Ryujinx.Common.Configuration.Hid.Key;

2
src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
View File

@ -1,6 +1,6 @@
using Avalonia.Media;
using Ryujinx.Ava.UI.Windows;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using System;
namespace Ryujinx.Ava.UI.Applet

2
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View File

@ -25,7 +25,7 @@ using Ryujinx.HLE;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS;
using Ryujinx.HLE.HOS.Services.Account.Acc;
using Ryujinx.HLE.UI;
using Ryujinx.Horizon.UI;
using Ryujinx.Input.HLE;
using Ryujinx.Modules;
using Ryujinx.UI.App.Common;