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 (pty) key, add broken stick key support

Browse Source
This commit is contained in:
Caten
2023-10-02 15:44:52 +08:00
parent b4ca9ae4f7
commit 27a5073551
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/main.dart
View File

@@ -24,7 +24,7 @@ import 'dart:math';
//import 'package:flutter/services.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/services.dart';
//import 'package:flutter/services.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:flutter/material.dart';
import 'package:xterm/xterm.dart';
@@ -832,7 +832,7 @@ class _MyHomePageState extends State<MyHomePage> {
});
}, onScaleEnd: (details) async {
await G.prefs.setDouble("termFontScale", G.termFontScale);
}, child: TerminalView(G.termPtys[G.currentContainer]!.terminal, textScaleFactor: G.termFontScale))),
}, child: TerminalView(G.termPtys[G.currentContainer]!.terminal, textScaleFactor: G.termFontScale, keyboardType: TextInputType.multiline,))),
G.prefs.getBool("isTerminalCommandsEnabled")!?Padding(padding: const EdgeInsets.all(8), child:
SingleChildScrollView(scrollDirection: Axis.horizontal, child: Row(children: [AnimatedBuilder(
animation: G.keyboard,
@@ -1088,6 +1088,11 @@ class _MyHomePageState extends State<MyHomePage> {
setState(() {});
},),
SizedBox.fromSize(size: const Size.square(8)),
SwitchListTile(title: const Text("终端粘滞键"), value: G.prefs.getBool("isStickyKey")!, onChanged:(value) {
G.prefs.setBool("isStickyKey", value);
setState(() {});
},),
SizedBox.fromSize(size: const Size.square(8)),
SwitchListTile(title: const Text("开启时启动图形界面"), value: G.prefs.getBool("autoLaunchVnc")!, onChanged:(value) {
G.prefs.setBool("autoLaunchVnc", value);
setState(() {});

22
lib/workflow.dart
View File

@@ -178,11 +178,17 @@ class VirtualKeyboard extends TerminalInputHandler with ChangeNotifier {
@override
String? call(TerminalKeyboardEvent event) {
return _inputHandler.call(event.copyWith(
final ret = _inputHandler.call(event.copyWith(
ctrl: event.ctrl || _ctrl,
shift: event.shift || _shift,
alt: event.alt || _alt,
));
if (!G.prefs.getBool("isStickyKey")!) {
_ctrl = false;
_shift = false;
_alt = false;
}
return ret;
}
}
@@ -240,9 +246,17 @@ class TermPty {
}
});
terminal.onOutput = (data) {
if (G.prefs.getBool("isTerminalWriteEnabled")!) {
pty.write(const Utf8Encoder().convert(data));
if (!G.prefs.getBool("isTerminalWriteEnabled")!) {
return;
}
//由于pty对回车的处理似乎存在问题，所以拿出来单独处理
data.split("").forEach((element) {
if (element == "\n") {
terminal.keyInput(TerminalKey.enter);
return;
}
pty.write(const Utf8Encoder().convert(element));
});
};
terminal.onResize = (w, h, pw, ph) {
pty.resize(h, w);
@@ -293,6 +307,7 @@ class G {
//int termMaxLines = 4095 终端最大行数
//double termFontScale = 1 终端字体大小
//int vip = 0 用户等级，vip免广告，你要改吗？(ToT)
//bool isStickyKey = true 终端ctrl, shift, alt键是否粘滞
//? int bootstrapVersion: 启动包版本
//String[] containersInfo: 所有容器信息(json)
//{name, boot:"\$DATA_DIR/bin/proot ...", vnc:"startnovnc", vncUrl:"...", commands:[{name:"更新和升级", command:"apt update -y && apt upgrade -y"}, ...]}
@@ -491,6 +506,7 @@ done
await G.prefs.setInt("termMaxLines", 4095);
await G.prefs.setDouble("termFontScale", 1);
await G.prefs.setInt("vip", 0);
await G.prefs.setBool("isStickyKey", true);
}
static Future<void> initData() async {