solvise/Ryujinx
1
1
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Fix regression with foreground software keyboard (#2732)

Browse source
This commit is contained in:
Caian Benedicto 2021-10-13 12:20:48 -03:00 committed by GitHub
parent 464a92d8a7
commit 1b81653478
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
View file

@ -18,9 +18,10 @@ namespace Ryujinx.HLE.HOS.Applets
{ {
private const string DefaultInputText = "Ryujinx"; private const string DefaultInputText = "Ryujinx";
private const int StandardBufferSize = 0x7D8; private const int StandardBufferSize = 0x7D8;
private const int MaxUserWords = 0x1388; private const int InteractiveBufferSize = 0x7D4;
private const int MaxUiTextSize = 100; private const int MaxUserWords = 0x1388;
private const int MaxUiTextSize = 100;
private const Key CycleInputModesKey = Key.F6; private const Key CycleInputModesKey = Key.F6;
@ -244,7 +245,7 @@ namespace Ryujinx.HLE.HOS.Applets
// back a validation status, which is handled in OnInteractiveDataPushIn. // back a validation status, which is handled in OnInteractiveDataPushIn.
_foregroundState = SoftwareKeyboardState.ValidationPending; _foregroundState = SoftwareKeyboardState.ValidationPending;
_interactiveSession.Push(BuildForegroundResponse()); PushForegroundResponse(true);
} }
else else
{ {
@ -253,7 +254,7 @@ namespace Ryujinx.HLE.HOS.Applets
// and poll it for completion. // and poll it for completion.
_foregroundState = SoftwareKeyboardState.Complete; _foregroundState = SoftwareKeyboardState.Complete;
_normalSession.Push(BuildForegroundResponse()); PushForegroundResponse(false);
AppletStateChanged?.Invoke(this, null); AppletStateChanged?.Invoke(this, null);
} }
@ -287,7 +288,7 @@ namespace Ryujinx.HLE.HOS.Applets
// For now we assume success, so we push the final result // For now we assume success, so we push the final result
// to the standard output buffer and carry on our merry way. // to the standard output buffer and carry on our merry way.
_normalSession.Push(BuildForegroundResponse()); PushForegroundResponse(false);
AppletStateChanged?.Invoke(this, null); AppletStateChanged?.Invoke(this, null);
@ -297,7 +298,7 @@ namespace Ryujinx.HLE.HOS.Applets
{ {
// If we have already completed, we push the result text // If we have already completed, we push the result text
// back on the output buffer and poll the application. // back on the output buffer and poll the application.
_normalSession.Push(BuildForegroundResponse()); PushForegroundResponse(false);
AppletStateChanged?.Invoke(this, null); AppletStateChanged?.Invoke(this, null);
} }
@ -728,20 +729,37 @@ namespace Ryujinx.HLE.HOS.Applets
_interactiveSession.Push(InlineResponses.DecidedCancel(state)); _interactiveSession.Push(InlineResponses.DecidedCancel(state));
} }
private byte[] BuildForegroundResponse() private void PushForegroundResponse(bool interactive)
{ {
int bufferSize = StandardBufferSize; int bufferSize = interactive ? InteractiveBufferSize : StandardBufferSize;
using (MemoryStream stream = new MemoryStream(new byte[bufferSize])) using (MemoryStream stream = new MemoryStream(new byte[bufferSize]))
using (BinaryWriter writer = new BinaryWriter(stream)) using (BinaryWriter writer = new BinaryWriter(stream))
{ {
byte[] output = _encoding.GetBytes(_textValue); byte[] output = _encoding.GetBytes(_textValue);
// Result Code. if (!interactive)
writer.Write(_lastResult == KeyboardResult.Accept ? 0U : 1U); {
// Result Code.
writer.Write(_lastResult == KeyboardResult.Accept ? 0U : 1U);
}
else
{
// In interactive mode, we write the length of the text as a long, rather than
// a result code. This field is inclusive of the 64-bit size.
writer.Write((long)output.Length + 8);
}
writer.Write(output); writer.Write(output);
return stream.ToArray(); if (!interactive)
{
_normalSession.Push(stream.ToArray());
}
else
{
_interactiveSession.Push(stream.ToArray());
}
} }
} }