From c65384e160d011617bcb7b3c77d3d65b299698b0 Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Fri, 6 May 2022 17:45:42 +0200 Subject: [PATCH 1/8] Update line.dart --- lib/next/core/line.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/next/core/line.dart b/lib/next/core/line.dart index 8e3f2444..b7a4b457 100644 --- a/lib/next/core/line.dart +++ b/lib/next/core/line.dart @@ -76,7 +76,7 @@ class BufferLine { void setCell(int index, int char, int witdh, CursorStyle style) { final offset = index * _cellSize; - _data[offset + _cellForeground] = style.foreground; + _data[offset + _cellForeground -1] = style.foreground; _data[offset + _cellBackground] = style.background; _data[offset + _cellAttributes] = style.attrs; _data[offset + _cellContent] = char | (witdh << CellContent.widthShift); From da572ef252058c4985fa046355bb0189eaeedcfe Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Fri, 6 May 2022 17:55:32 +0200 Subject: [PATCH 2/8] Update line.dart --- lib/next/core/line.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/next/core/line.dart b/lib/next/core/line.dart index b7a4b457..8e3f2444 100644 --- a/lib/next/core/line.dart +++ b/lib/next/core/line.dart @@ -76,7 +76,7 @@ class BufferLine { void setCell(int index, int char, int witdh, CursorStyle style) { final offset = index * _cellSize; - _data[offset + _cellForeground -1] = style.foreground; + _data[offset + _cellForeground] = style.foreground; _data[offset + _cellBackground] = style.background; _data[offset + _cellAttributes] = style.attrs; _data[offset + _cellContent] = char | (witdh << CellContent.widthShift); From d0efd7bb795b5a69c6bf5542ce5028f4d45ba7b2 Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Fri, 6 May 2022 17:57:53 +0200 Subject: [PATCH 3/8] Update line.dart --- lib/next/core/line.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/next/core/line.dart b/lib/next/core/line.dart index 8e3f2444..0b0b130b 100644 --- a/lib/next/core/line.dart +++ b/lib/next/core/line.dart @@ -75,7 +75,7 @@ class BufferLine { } void setCell(int index, int char, int witdh, CursorStyle style) { - final offset = index * _cellSize; + final offset = index * _cellSize-1; _data[offset + _cellForeground] = style.foreground; _data[offset + _cellBackground] = style.background; _data[offset + _cellAttributes] = style.attrs; @@ -83,7 +83,7 @@ class BufferLine { } void setCellData(int index, CellData cellData) { - final offset = index * _cellSize; + final offset = index * _cellSize -1; _data[offset + _cellForeground] = cellData.foreground; _data[offset + _cellBackground] = cellData.background; _data[offset + _cellAttributes] = cellData.flags; @@ -91,7 +91,7 @@ class BufferLine { } void eraseCell(int index, CursorStyle style) { - final offset = index * _cellSize; + final offset = index * _cellSize -1 ; _data[offset + _cellForeground] = style.foreground; _data[offset + _cellBackground] = style.background; _data[offset + _cellAttributes] = style.attrs; From bfd8efe622ffe2ba2a6390a312f9be44b31896bc Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Mon, 13 Jun 2022 12:12:41 +0200 Subject: [PATCH 4/8] Fix Flutter 3 issues --- lib/next/terminal_view.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/next/terminal_view.dart b/lib/next/terminal_view.dart index d38f8d71..6abf33b7 100644 --- a/lib/next/terminal_view.dart +++ b/lib/next/terminal_view.dart @@ -86,6 +86,8 @@ class TerminalViewState extends State { final scrollableKey = GlobalKey(); String? composingText; + + T? _nonNullableWrap(T? value) => value; @override void initState() { @@ -142,7 +144,7 @@ class TerminalViewState extends State { void _onKeyboardShow() { if (focusNode.hasFocus) { - WidgetsBinding.instance?.addPostFrameCallback((_) { + _nonNullableWrap(WidgetsBinding.instance)!.addPostFrameCallback((_) { _scrollToBottom(); }); } @@ -504,7 +506,7 @@ class _RenderTerminalViewport extends RenderBox { } } - SchedulerBinding.instance! + _nonNullableWrap(WidgetsBinding.instance)! .addPostFrameCallback((_) => _notifyEditableRect()); } @@ -654,6 +656,8 @@ class _RenderTerminalViewport extends RenderBox { ); } } + + void _paintComposingText(Canvas canvas, Offset offset) { final composingText = _composingText; From f93b108c2989304f94a0c1d6d5429e7db7073690 Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Mon, 13 Jun 2022 12:16:46 +0200 Subject: [PATCH 5/8] Fixing flutter v3 issues --- lib/next/ui/keyboard_visibility.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/next/ui/keyboard_visibility.dart b/lib/next/ui/keyboard_visibility.dart index 2bef57f9..abf927bb 100644 --- a/lib/next/ui/keyboard_visibility.dart +++ b/lib/next/ui/keyboard_visibility.dart @@ -22,15 +22,18 @@ class KeyboardVisibilty extends StatefulWidget { class _KeyboardVisibiltyState extends State with WidgetsBindingObserver { + + T? _nonNullableWrap(T? value) => value; + @override void initState() { super.initState(); - WidgetsBinding.instance!.addObserver(this); + _nonNullableWrap(WidgetsBinding.instance)!.addObserver(this); } @override void dispose() { - WidgetsBinding.instance!.removeObserver(this); + _nonNullableWrap(WidgetsBinding.instance)!.removeObserver(this); super.dispose(); } From 708ea21968eafb6fc946dd6c628ae690a107bddb Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Mon, 13 Jun 2022 12:29:36 +0200 Subject: [PATCH 6/8] Update terminal_view.dart --- lib/next/terminal_view.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/next/terminal_view.dart b/lib/next/terminal_view.dart index 6abf33b7..a959f115 100644 --- a/lib/next/terminal_view.dart +++ b/lib/next/terminal_view.dart @@ -505,6 +505,8 @@ class _RenderTerminalViewport extends RenderBox { ); } } + + T? _nonNullableWrap(T? value) => value; _nonNullableWrap(WidgetsBinding.instance)! .addPostFrameCallback((_) => _notifyEditableRect()); From 892b361fc65a5fd5f495b0a32391d3d82bbac2d7 Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Mon, 13 Jun 2022 13:05:36 +0200 Subject: [PATCH 7/8] Update custom_text_edit.dart --- lib/next/ui/custom_text_edit.dart | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/next/ui/custom_text_edit.dart b/lib/next/ui/custom_text_edit.dart index d9f0943b..2db40864 100644 --- a/lib/next/ui/custom_text_edit.dart +++ b/lib/next/ui/custom_text_edit.dart @@ -257,4 +257,13 @@ class CustomTextEditState extends State void performPrivateCommand(String action, Map data) { // print('performPrivateCommand $action'); } + + @override + void showToolbar() {} + + @override + void insertTextPlaceholder(Size size) {} + + @override + void removeTextPlaceholder() {} } From cc32f8fb539f52b5ba0c3d475199b53f5a69347a Mon Sep 17 00:00:00 2001 From: Pasquale Lodise Date: Mon, 13 Jun 2022 15:05:17 +0200 Subject: [PATCH 8/8] Update line.dart --- lib/next/core/line.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/next/core/line.dart b/lib/next/core/line.dart index 0b0b130b..8e3f2444 100644 --- a/lib/next/core/line.dart +++ b/lib/next/core/line.dart @@ -75,7 +75,7 @@ class BufferLine { } void setCell(int index, int char, int witdh, CursorStyle style) { - final offset = index * _cellSize-1; + final offset = index * _cellSize; _data[offset + _cellForeground] = style.foreground; _data[offset + _cellBackground] = style.background; _data[offset + _cellAttributes] = style.attrs; @@ -83,7 +83,7 @@ class BufferLine { } void setCellData(int index, CellData cellData) { - final offset = index * _cellSize -1; + final offset = index * _cellSize; _data[offset + _cellForeground] = cellData.foreground; _data[offset + _cellBackground] = cellData.background; _data[offset + _cellAttributes] = cellData.flags; @@ -91,7 +91,7 @@ class BufferLine { } void eraseCell(int index, CursorStyle style) { - final offset = index * _cellSize -1 ; + final offset = index * _cellSize; _data[offset + _cellForeground] = style.foreground; _data[offset + _cellBackground] = style.background; _data[offset + _cellAttributes] = style.attrs;