Skip to content

Input buffering in console mode added #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tarvlad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Input buffering in console mode added #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/rars/util/SystemIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ public class SystemIO {
private static final int STDOUT = 1;
private static final int STDERR = 2;

private static String inputBuffer = "";

/**
* Implements syscall to read an integer value.
* Client is responsible for catching NumberFormatException.
Expand All @@ -94,7 +96,13 @@ private static String readStringInternal(String init, String prompt, int maxleng
String input = init;
if (Globals.getGui() == null) {
try {
input = getInputReader().readLine();
if (!inputBuffer.isEmpty()) {
input = String.valueOf(inputBuffer);
inputBuffer = "";
} else {
input = getInputReader().readLine();
}

if (input == null)
input = "";
} catch (IOException e) {
Expand Down Expand Up @@ -182,12 +190,23 @@ public static String readString(int serviceNumber, int maxLength) {
public static int readChar(int serviceNumber) {
int returnValue = 0;

String input = readStringInternal("0", "Enter a character value (syscall " + serviceNumber + ")", 1);
String input;
if (Globals.getGui() == null) {
input = readStringInternal("0", "Enter a character value (syscall " + serviceNumber + ")", -1);
} else {
input = readStringInternal("0", "Enter a character value (syscall " + serviceNumber + ")", 1);
}
// The whole try-catch is not really necessary in this case since I'm
// just propagating the runtime exception (the default behavior), but
// I want to make it explicit. The client needs to catch it.

try {
returnValue = (int) (input.charAt(0)); // first character input
if (input.length() > 1) {
inputBuffer = input.substring(1);
} else {
inputBuffer = "";
}
} catch (IndexOutOfBoundsException e) // no chars present
{
throw e; // was: returnValue = 0;
Expand Down