bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix input

Browse Source
This commit is contained in:
otya128
2016-12-30 21:12:46 +09:00
parent ff19e614c4
commit 17b5ba0f49
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SMILEBASIC/VM.d
View File

@@ -1873,7 +1873,7 @@ class InputCode : Code
{
vm.petitcomputer.console.printString("?Redo from start \n");
}
wstring input = vm.petitcomputer.input("", false);
wstring input = vm.petitcomputer.input("", false, true);
wstring[] split = input.split(",");
error = false;
if(split.length == 0)
@@ -2558,6 +2558,6 @@ class Linput : Code
{
Value guide;
vm.pop(guide);
vm.push(Value(vm.petitcomputer.input(guide.castDString, false)));
vm.push(Value(vm.petitcomputer.input(guide.castDString, false, true)));
}
}

8
SMILEBASIC/petitcomputer.d
View File

@@ -1113,7 +1113,7 @@ class PetitComputer
{
printPrompt();
}
auto prg = input("", true);
auto prg = input("", true, false);
if (!prg.empty && (inputHistory.length == 0 || inputHistory[inputHistory.length - 1] != prg))
{
inputHistory.put(prg);
@@ -1322,7 +1322,7 @@ class PetitComputer
keybufferlen = 0;
}
RingBuffer!wstring inputHistory = new RingBuffer!wstring(32/*ダイレクトモードでの履歴の数は32*/);
wstring input(wstring prompt, bool useClipBoard)
wstring input(wstring prompt, bool useClipBoard, bool isVM/*if this flag is true, enable start/select interrupt*/)
{
auto olddisplay = displaynum;
//displaynum = 0;
@@ -1383,10 +1383,10 @@ class PetitComputer
console.CSRX = 0;
}
}
while(!quit)
while(!quit && (!isVM || running))
{
auto oldpos = keybufferpos;
while(oldpos == keybufferpos && !quit)
while(oldpos == keybufferpos && !quit && (!isVM || running))
{
Button old;
synchronized(buttonLock)