Merge pull request #39 from michaellee8/feat/resize-full

Update resize() to receive terminal size in pixels

example/lib/isolate.dart

@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:xterm/flutter.dart';
-import 'package:xterm/xterm.dart';
 import 'package:xterm/isolate.dart';
+import 'package:xterm/xterm.dart';
 
 void main() {
   runApp(MyApp());
@@ -30,7 +30,7 @@ class MyHomePage extends StatefulWidget {
   _MyHomePageState createState() => _MyHomePageState();
 }
 
-class FakeTerminalBackend implements TerminalBackend {
+class FakeTerminalBackend extends TerminalBackend {
   Completer<int> _exitCodeCompleter;
   // ignore: close_sinks
   StreamController<String> _outStream;
@@ -53,7 +53,7 @@ class FakeTerminalBackend implements TerminalBackend {
   Stream<String> get out => _outStream.stream;
 
   @override
-  void resize(int width, int height) {
+  void resize(int width, int height, int pixelWidth, int pixelHeight) {
     // NOOP
   }
 

example/lib/main.dart

@@ -29,7 +29,7 @@ class MyHomePage extends StatefulWidget {
   _MyHomePageState createState() => _MyHomePageState();
 }
 
-class FakeTerminalBackend implements TerminalBackend {
+class FakeTerminalBackend extends TerminalBackend {
   Completer<int> _exitCodeCompleter;
   // ignore: close_sinks
   StreamController<String> _outStream;
@@ -52,7 +52,7 @@ class FakeTerminalBackend implements TerminalBackend {
   Stream<String> get out => _outStream.stream;
 
   @override
-  void resize(int width, int height) {
+  void resize(int width, int height, int pixelWidth, int pixelHeight) {
     // NOOP
   }
 

example/lib/ssh.dart

@@ -35,7 +35,7 @@ class MyHomePage extends StatefulWidget {
   _MyHomePageState createState() => _MyHomePageState();
 }
 
-class SSHTerminalBackend implements TerminalBackend {
+class SSHTerminalBackend extends TerminalBackend {
   SSHClient client;
 
   String _host;

lib/frontend/terminal_view.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'dart:math' as math;
 import 'dart:ui';
 
@@ -7,15 +6,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
-import 'package:xterm/buffer/line/line.dart';
 import 'package:xterm/buffer/cell_flags.dart';
+import 'package:xterm/buffer/line/line.dart';
+import 'package:xterm/frontend/cache.dart';
 import 'package:xterm/frontend/char_size.dart';
 import 'package:xterm/frontend/helpers.dart';
 import 'package:xterm/frontend/input_behavior.dart';
 import 'package:xterm/frontend/input_behaviors.dart';
 import 'package:xterm/frontend/input_listener.dart';
 import 'package:xterm/frontend/oscillator.dart';
-import 'package:xterm/frontend/cache.dart';
 import 'package:xterm/mouse/position.dart';
 import 'package:xterm/terminal/terminal_ui_interaction.dart';
 import 'package:xterm/theme/terminal_style.dart';
@@ -311,7 +310,12 @@ class _TerminalViewState extends State<TerminalView> {
     _lastTerminalWidth = termWidth;
     _lastTerminalHeight = termHeight;
 
-    widget.terminal.resize(termWidth, termHeight);
+    widget.terminal.resize(
+      termWidth,
+      termHeight,
+      (termWidth * _cellSize.cellWidth).floor(),
+      (termHeight * _cellSize.cellHeight).floor(),
+    );
   }
 
   TextEditingValue? onInput(TextEditingValue value) {

lib/terminal/terminal.dart

@@ -4,13 +4,13 @@ import 'dart:math' show max, min;
 
 import 'package:xterm/buffer/buffer.dart';
 import 'package:xterm/buffer/line/line.dart';
-import 'package:xterm/mouse/position.dart';
-import 'package:xterm/mouse/selection.dart';
 import 'package:xterm/input/keys.dart';
 import 'package:xterm/input/keytab/keytab.dart';
 import 'package:xterm/input/keytab/keytab_escape.dart';
 import 'package:xterm/input/keytab/keytab_record.dart';
 import 'package:xterm/mouse/mouse_mode.dart';
+import 'package:xterm/mouse/position.dart';
+import 'package:xterm/mouse/selection.dart';
 import 'package:xterm/terminal/ansi.dart';
 import 'package:xterm/terminal/cursor.dart';
 import 'package:xterm/terminal/platform.dart';
@@ -357,8 +357,9 @@ class Terminal with Observable implements TerminalUiInteraction {
   /// Resize the terminal screen. [newWidth] and [newHeight] should be greater
   /// than 0. Text reflow is currently not implemented and will be avaliable in
   /// the future.
-  void resize(int newWidth, int newHeight) {
-    backend?.resize(newWidth, newHeight);
+  void resize(
+      int newWidth, int newHeight, int newPixelWidth, int newPixelHeight) {
+    backend?.resize(newWidth, newHeight, newPixelWidth, newPixelHeight);
     newWidth = max(newWidth, 1);
     newHeight = max(newHeight, 1);
 

lib/terminal/terminal_backend.dart

@@ -19,7 +19,7 @@ abstract class TerminalBackend {
   void write(String input);
 
   /// notifies the backend about a view port resize that happened
-  void resize(int width, int height);
+  void resize(int width, int height, int pixelWidth, int pixelHeight);
 
   /// terminates this backend
   void terminate();

lib/terminal/terminal_isolate.dart

@@ -104,7 +104,7 @@ void terminalMain(SendPort port) async {
         _terminal?.setScrollOffsetFromBottom(msg[1]);
         break;
       case _IsolateCommand.resize:
-        _terminal?.resize(msg[1], msg[2]);
+        _terminal?.resize(msg[1], msg[2], msg[3], msg[4]);
         break;
       case _IsolateCommand.onInput:
         _terminal?.backend?.write(msg[1]);
@@ -155,6 +155,7 @@ class TerminalInitData {
   TerminalTheme theme;
   int maxLines;
   TerminalBackend? backend;
+
   TerminalInitData(this.backend, this.platform, this.theme, this.maxLines);
 }
 
@@ -204,7 +205,9 @@ class TerminalState {
 }
 
 void _defaultBellHandler() {}
+
 void _defaultTitleHandler(String _) {}
+
 void _defaultIconHandler(String _) {}
 
 /// The TerminalIsolate class hosts an Isolate that runs a Terminal.
@@ -434,8 +437,15 @@ class TerminalIsolate with Observable implements TerminalUiInteraction {
     _sendPort?.send([_IsolateCommand.paste, data]);
   }
 
-  void resize(int newWidth, int newHeight) {
-    _sendPort?.send([_IsolateCommand.resize, newWidth, newHeight]);
+  void resize(
+      int newWidth, int newHeight, int newPixelWidth, int newPixelHeight) {
+    _sendPort?.send([
+      _IsolateCommand.resize,
+      newWidth,
+      newHeight,
+      newPixelWidth,
+      newPixelHeight
+    ]);
   }
 
   void raiseOnInput(String text) {
@@ -456,6 +466,7 @@ class TerminalIsolate with Observable implements TerminalUiInteraction {
   var _isTerminated = false;
 
   final _backendExited = Completer<int>();
+
   @override
   Future<int> get backendExited => _backendExited.future;
 

lib/terminal/terminal_ui_interaction.dart

@@ -95,7 +95,8 @@ abstract class TerminalUiInteraction with Observable {
 
   /// notifies the Terminal about a resize that happened. The Terminal will
   /// do any resize / reflow logic and notify the backend about the resize
-  void resize(int newWidth, int newHeight);
+  void resize(
+      int newWidth, int newHeight, int newPixelWidth, int newPixelHeight);
 
   /// notifies the Terminal about key input
   void keyInput(