forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better line getter controls

This commit is contained in:
Adam D. Ruppe 2015-11-23 17:31:10 -05:00
parent 55915e4611
commit 32672c94cb
1 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
terminal.d
View File

@ -2845,6 +2845,12 @@ class LineGetter {
line.assumeSafeAppend(); line.assumeSafeAppend();
} }
///
void deleteToEndOfLine() {
while(cursorPosition < line.length)
deleteChar();
}
int availableLineLength() { int availableLineLength() {
return terminal.width - startOfLineX - cast(int) prompt.length - 1; return terminal.width - startOfLineX - cast(int) prompt.length - 1;
} }
@ -2989,11 +2995,12 @@ class LineGetter {
// FIXME: this should be distinct from an empty line when hit at the beginning // FIXME: this should be distinct from an empty line when hit at the beginning
return false; return false;
//break; //break;
case InputEvent.Type.CharacterEvent: case InputEvent.Type.KeyboardEvent:
if(e.characterEvent.eventType == CharacterEvent.Type.Released) auto ev = e.keyboardEvent;
if(ev.pressed == false)
return true; return true;
/* Insert the character (unless it is backspace, tab, or some other control char) */ /* Insert the character (unless it is backspace, tab, or some other control char) */
auto ch = e.characterEvent.character; auto ch = ev.which;
switch(ch) { switch(ch) {
case 4: // ctrl+d will also send a newline-equivalent case 4: // ctrl+d will also send a newline-equivalent
case '\r': case '\r':
@ -3046,20 +3053,8 @@ class LineGetter {
redraw(); redraw();
} }
break; break;
default: case KeyboardEvent.Key.LeftArrow:
justHitTab = false; justHitTab = false;
addChar(ch);
redraw();
}
break;
case InputEvent.Type.NonCharacterKeyEvent:
if(e.nonCharacterKeyEvent.eventType == NonCharacterKeyEvent.Type.Released)
return true;
justHitTab = false;
/* Navigation */
auto key = e.nonCharacterKeyEvent.key;
switch(key) {
case NonCharacterKeyEvent.Key.LeftArrow:
if(cursorPosition) if(cursorPosition)
cursorPosition--; cursorPosition--;
if(!multiLineMode) { if(!multiLineMode) {
@ -3069,7 +3064,8 @@ class LineGetter {
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.RightArrow: case KeyboardEvent.Key.RightArrow:
justHitTab = false;
if(cursorPosition < line.length) if(cursorPosition < line.length)
cursorPosition++; cursorPosition++;
if(!multiLineMode) { if(!multiLineMode) {
@ -3079,43 +3075,64 @@ class LineGetter {
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.UpArrow: case KeyboardEvent.Key.UpArrow:
justHitTab = false;
loadFromHistory(currentHistoryViewPosition + 1); loadFromHistory(currentHistoryViewPosition + 1);
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.DownArrow: case KeyboardEvent.Key.DownArrow:
justHitTab = false;
loadFromHistory(currentHistoryViewPosition - 1); loadFromHistory(currentHistoryViewPosition - 1);
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.PageUp: case KeyboardEvent.Key.PageUp:
justHitTab = false;
loadFromHistory(cast(int) history.length); loadFromHistory(cast(int) history.length);
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.PageDown: case KeyboardEvent.Key.PageDown:
justHitTab = false;
loadFromHistory(0); loadFromHistory(0);
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.Home: case 1: // ctrl+a does home too in the emacs keybindings
case KeyboardEvent.Key.Home:
justHitTab = false;
cursorPosition = 0; cursorPosition = 0;
horizontalScrollPosition = 0; horizontalScrollPosition = 0;
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.End: case 5: // ctrl+e from emacs
case KeyboardEvent.Key.End:
justHitTab = false;
cursorPosition = cast(int) line.length; cursorPosition = cast(int) line.length;
scrollToEnd(); scrollToEnd();
redraw(); redraw();
break; break;
case NonCharacterKeyEvent.Key.Insert: case KeyboardEvent.Key.Insert:
justHitTab = false;
insertMode = !insertMode; insertMode = !insertMode;
// FIXME: indicate this on the UI somehow // FIXME: indicate this on the UI somehow
// like change the cursor or something // like change the cursor or something
break; break;
case NonCharacterKeyEvent.Key.Delete: case KeyboardEvent.Key.Delete:
justHitTab = false;
if(ev.modifierState & ModifierState.control)
deleteToEndOfLine();
else
deleteChar(); deleteChar();
redraw(); redraw();
break; break;
case 11: // ctrl+k is delete to end of line from emacs
justHitTab = false;
deleteToEndOfLine();
redraw();
break;
default: default:
/* ignore */ justHitTab = false;
if(e.keyboardEvent.isCharacter)
addChar(ch);
redraw();
} }
break; break;
case InputEvent.Type.PasteEvent: case InputEvent.Type.PasteEvent: