feat, input source, win->win

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-11-29 11:24:03 +08:00
parent f11104fcb5
commit 4cbbb5b64f
8 changed files with 89 additions and 99 deletions

View File

@@ -735,16 +735,9 @@ class FfiModel with ChangeNotifier {
}
checkDesktopKeyboardMode() async {
final curMode = await bind.sessionGetKeyboardMode(sessionId: sessionId);
if (curMode != null) {
if (bind.sessionIsKeyboardModeSupported(
sessionId: sessionId, mode: curMode)) {
return;
}
}
// If current keyboard mode is not supported, change to another one.
if (isInputSourceFlutter) {
// Local side, flutter keyboard input source
// Currently only map mode is supported, legacy mode is used for compatibility.
for (final mode in [kKeyMapMode, kKeyLegacyMode]) {
if (bind.sessionIsKeyboardModeSupported(
sessionId: sessionId, mode: mode)) {
@@ -753,6 +746,15 @@ class FfiModel with ChangeNotifier {
}
}
} else {
final curMode = await bind.sessionGetKeyboardMode(sessionId: sessionId);
if (curMode != null) {
if (bind.sessionIsKeyboardModeSupported(
sessionId: sessionId, mode: curMode)) {
return;
}
}
// If current keyboard mode is not supported, change to another one.
for (final mode in [kKeyMapMode, kKeyTranslateMode, kKeyLegacyMode]) {
if (bind.sessionIsKeyboardModeSupported(
sessionId: sessionId, mode: mode)) {

View File

@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:desktop_multi_window/desktop_multi_window.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart';
import 'package:get/get.dart';
import '../consts.dart';
@@ -98,14 +99,14 @@ class StateGlobal {
String getInputSource({bool force = false}) {
if (force || _inputSource.isEmpty) {
_inputSource = bind.mainGetLocalOption(key: kOptionInputSource);
_inputSource = bind.mainGetInputSource();
}
return _inputSource;
}
void setInputSource(String v) async {
await bind.mainSetLocalOption(key: kOptionInputSource, value: v);
_inputSource = bind.mainGetLocalOption(key: kOptionInputSource);
setInputSource(SessionID sessionId, String v) async {
await bind.mainSetInputSource(sessionId: sessionId, value: v);
_inputSource = bind.mainGetInputSource();
}
StateGlobal._();