development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-09-19 08:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Terminal: Add support for (and "fix") backspace.

Browse source 
Also:
* Fix consecutive spaces (don't collapse them).
* Add support for ^L.

Still doesn't work:
* Totally blank lines. (I know why, but I don't know why I can't seem to
  fix it.)

R=erg@chromium.org

Review URL: https://codereview.chromium.org/997873004
This commit is contained in:
Viet-Trung Luu 2015-03-11 16:54:17 -07:00
parent d34e0e4e7c
commit 0beafd3555
2 changed files with 65 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
examples/terminal/terminal.sky
View file

@ -14,8 +14,8 @@
color: rgb(255, 191, 0);
font-family: 'Courier', 'monospace';
}
span {
white-space: nowrap;
.line {
white-space: pre;
}
</style>
<sky-scrollable id="control" contenteditable />
@ -54,6 +54,7 @@ class TerminalDisplayImpl extends SkyElement implements TerminalDisplay {
void shadowRootReady() {
_control = shadowRoot.getElementById('control');
_control.addEventListener('keydown', _handleKeyDown);
_control.addEventListener('keypress', _handleKeyPress);
// Initialize with the first line.
@ -62,20 +63,52 @@ class TerminalDisplayImpl extends SkyElement implements TerminalDisplay {
_connect(getAttribute('url'));
}
void _handleKeyPress(KeyboardEvent event) {
// TODO(vtl): Add "echo" mode; do |putChar(event.charCode);| if echo is on.
if (_readerQueue.isEmpty) {
_inputQueue.add(event.charCode);
} else {
_readerQueue.removeAt(0).complete(event.charCode);
void _handleKeyDown(KeyboardEvent event) {
// TODO(vtl): In general, our key handling is a total hack (due in part to
// sky's keyboard support being incomplete) -- e.g., we shouldn't have to
// make our div contenteditable. We have to intercept backspace (^H) here,
// since we won't actually get a keypress event for it. (Possibly, we should
// only handle keydown instead of keypress, but then we'd have to handle
// shift, etc. ourselves.)
if (event.key == 8) {
_enqueueChar(8);
event.preventDefault();
}
}
void _handleKeyPress(KeyboardEvent event) {
_enqueueChar(event.charCode);
event.preventDefault();
}
void _enqueueChar(int charCode) {
// TODO(vtl): Add "echo" mode; do |putChar(event.charCode);| if echo is on.
if (_readerQueue.isEmpty) {
_inputQueue.add(charCode);
} else {
_readerQueue.removeAt(0).complete(charCode);
}
}
void _backspace() {
var oldText = _control.lastChild.textContent;
if (oldText.length > 0) {
_control.lastChild.textContent = oldText.substring(0, oldText.length - 1);
}
}
void _newLine() {
_control.appendChild(document.createElement('span'));
var line = document.createElement('div');
line.setAttribute('class', 'line');
_control.appendChild(line);
}
void _clear() {
while (_control.firstChild != null) {
_control.firstChild.remove();
}
_newLine();
}
// TODO(vtl): Should we always auto-connect? Should there be facilities for
@ -91,11 +124,29 @@ class TerminalDisplayImpl extends SkyElement implements TerminalDisplay {
@override
void putChar(int byte) {
if (byte == 10 || byte == 13) {
_newLine();
// Fast-path for printable chars.
if (byte >= 32) {
_control.lastChild.textContent += new String.fromCharCode(byte);
return;
}
_control.lastChild.textContent += new String.fromCharCode(byte);
switch (byte) {
case 8: // BS (^H).
_backspace();
break;
case 10: // LF ('\n').
_newLine(); // TODO(vtl): LF and CR should be separated.
break;
case 12: // FF (^L).
_clear();
break;
case 13: // CR ('\r').
_newLine(); // TODO(vtl): LF and CR should be separated.
break;
default:
// Should beep or something.
break;
}
}
@override

2
examples/terminal/terminal_file_impl.dart
View file

@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:core';
import 'mojo:core';
import 'dart:mojo.core';
import 'package:services/files/file.mojom.dart' as files;
import 'package:services/files/types.mojom.dart' as files;