starlight-apk/tiny_computer
1
0
Fork 0
mirror of https://github.com/Cateners/tiny_computer.git synced 2026-05-20 16:35:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix enter and sticky key

Browse Source
This commit is contained in:
Caten
2023-10-02 19:06:41 +08:00
parent 27a5073551
commit f15899be95
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/workflow.dart
View File

@@ -138,6 +138,7 @@ class Util {
} }
//来自xterms关于操作ctrl, shift, alt键的示例 //来自xterms关于操作ctrl, shift, alt键的示例
//这个类应该只能有一个实例G.keyboard
class VirtualKeyboard extends TerminalInputHandler with ChangeNotifier { class VirtualKeyboard extends TerminalInputHandler with ChangeNotifier {
final TerminalInputHandler _inputHandler; final TerminalInputHandler _inputHandler;
@@ -183,10 +184,12 @@ class VirtualKeyboard extends TerminalInputHandler with ChangeNotifier {
shift: event.shift || _shift, shift: event.shift || _shift,
alt: event.alt || _alt, alt: event.alt || _alt,
)); ));
G.maybeCtrlJ = event.key.name == "keyJ";
print(G.maybeCtrlJ);
if (!G.prefs.getBool("isStickyKey")!) { if (!G.prefs.getBool("isStickyKey")!) {
_ctrl = false; G.keyboard.ctrl = false;
_shift = false; G.keyboard.shift = false;
_alt = false; G.keyboard.alt = false;
} }
return ret; return ret;
} }
@@ -249,12 +252,13 @@ class TermPty {
if (!G.prefs.getBool("isTerminalWriteEnabled")!) { if (!G.prefs.getBool("isTerminalWriteEnabled")!) {
return; return;
} }
//由于pty对回车的处理似乎存在问题，所以拿出来单独处理 //由于对回车的处理似乎存在问题，所以拿出来单独处理
data.split("").forEach((element) { data.split("").forEach((element) {
if (element == "\n") { if (element == "\n" && !G.maybeCtrlJ) {
terminal.keyInput(TerminalKey.enter); terminal.keyInput(TerminalKey.enter);
return; return;
} }
G.maybeCtrlJ = false;
pty.write(const Utf8Encoder().convert(element)); pty.write(const Utf8Encoder().convert(element));
}); });
}; };
@@ -274,9 +278,9 @@ class G {
static late int currentContainer; //目前运行第几个容器 static late int currentContainer; //目前运行第几个容器
static late Map<int, TermPty> termPtys; //为容器<int>存放TermPty数据 static late Map<int, TermPty> termPtys; //为容器<int>存放TermPty数据
static late AdManager ads; //广告实例 static late AdManager ads; //广告实例
static late VirtualKeyboard keyboard; static late VirtualKeyboard keyboard; //存储ctrl, shift, alt状态
//终端字体大小，存储为G.prefs的termFontScale static bool maybeCtrlJ = false; //为了区分按下的ctrl+J和enter而准备的变量
static double termFontScale = 1; static double termFontScale = 1; //终端字体大小，存储为G.prefs的termFontScale
//看广告可以获得的奖励。 //看广告可以获得的奖励。