Skip to content

Commit

Permalink
Merge branch 'fixes_2861_kOSPropMonitor_backporting' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Dunbaratu committed Mar 10, 2021
2 parents 4b5ff82 + 966a587 commit 81e0d93
Showing 1 changed file with 33 additions and 1 deletion.
34 changes: 33 additions & 1 deletion src/kOS/Screen/TermWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ private void ProcessTelnetInput()
/// doesn't get the order mixed up. (I.e. use it for paste buffer dumps or telnet input, but not
/// live GUI typed stuff.)</param>
/// <returns>True if the input got consuemed or enqueued. If the input was blocked and not ignored, it returns false.</returns>
public bool ProcessOneInputChar(char ch, TelnetSingletonServer whichTelnet, bool allowQueue = true, bool forceQueue = true)
public bool ProcessOneInputChar(char ch, TelnetSingletonServer whichTelnet, bool allowQueue, bool forceQueue)
{
// Weird exceptions for multi-char data combos that would have been begun on previous calls to this method:
switch (inputExpected)
Expand Down Expand Up @@ -707,6 +707,38 @@ public bool ProcessOneInputChar(char ch, TelnetSingletonServer whichTelnet, bool
// else ignore it - unimplemented char.
}

/// <summary>
/// This is identical to calling ProcessOneInputChar with forceQueue defaulted to true,
/// and it returns void instead of bool.
/// <para>This is being done this way because it has to match exactly to how the
/// signature of the method used to look, to keep it compatible with the DLL for
/// kOSPropMonitor without kOSPropMonitor being recompiled.</para>
/// </summary>
/// <param name="ch"></param>
/// <param name="whichTelnet"></param>
/// <param name="allowQueue"></param>
/// <returns></returns>
public void ProcessOneInputChar(char ch, TelnetSingletonServer whichTelnet, bool allowQueue)
{
ProcessOneInputChar(ch, whichTelnet, allowQueue, true);
}

/// <summary>
/// This is identical to calling ProcessOneInputChar with allowQueu and forceQueue both defaulted to true,
/// and it reutrns void instead of bool.
/// <para>This is being done this way because it has to match exactly to how the
/// signature of the method used to look, to keep it compatible with the DLL for
/// kOSPropMonitor without kOSPropMonitor being recompiled.</para>
/// </summary>
/// <param name="ch"></param>
/// <param name="whichTelnet"></param>
/// <param name="allowQueue"></param>
/// <returns></returns>
public void ProcessOneInputChar(char ch, TelnetSingletonServer whichTelnet)
{
ProcessOneInputChar(ch, whichTelnet, true, true);
}

/// <summary>
/// Type a normal unicode char (not a magic control char) to the terminal,
/// or if the interpreter is busy queue it for later if flags allow.
Expand Down

0 comments on commit 81e0d93

Please sign in to comment.