Bläddra i källkod

Merge pull request #120 from jpnurmi/scroll-shortcuts

Allow scroll shortcuts
xuty 3 år sedan
förälder
incheckning
b1cea8aa51
2 ändrade filer med 5 tillägg och 3 borttagningar
  1. 3 1
      lib/frontend/terminal_view.dart
  2. 2 2
      lib/terminal/terminal.dart

+ 3 - 1
lib/frontend/terminal_view.dart

@@ -415,7 +415,9 @@ class _TerminalViewState extends State<TerminalView> {
     blinkOscillator.restart();
     // TODO: find a way to stop scrolling immediately after key stroke.
     widget.inputBehavior.onKeyStroke(event, widget.terminal);
-    widget.terminal.setScrollOffsetFromBottom(0);
+    if (event.character?.isNotEmpty == true) {
+      widget.terminal.setScrollOffsetFromBottom(0);
+    }
   }
 
   void onFocus(bool focused) {

+ 2 - 2
lib/terminal/terminal.dart

@@ -484,7 +484,7 @@ class Terminal
       }
     }
 
-    if (ctrl) {
+    if (ctrl && !shift && !alt) {
       if (key.index >= TerminalKey.keyA.index &&
           key.index <= TerminalKey.keyZ.index) {
         final input = key.index - TerminalKey.keyA.index + 1;
@@ -493,7 +493,7 @@ class Terminal
       }
     }
 
-    if (alt) {
+    if (alt && !shift && !ctrl) {
       if (key.index >= TerminalKey.keyA.index &&
           key.index <= TerminalKey.keyZ.index) {
         final charCode = key.index - TerminalKey.keyA.index + 65;