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

more gnu readline controls

This commit is contained in:
Adam D. Ruppe 2021-01-15 13:36:42 -05:00
parent 5134e8c279
commit c09ffb90ce
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
terminal.d
View File

@ -2589,7 +2589,7 @@ struct RealTimeConsoleInput {
return true; return true;
} }
/// Check for input, waiting no longer than the number of milliseconds /// Check for input, waiting no longer than the number of milliseconds. Note that this doesn't necessarily mean [getch] will not block, use this AND [kbhit] for that case.
bool timedCheckForInput(int milliseconds) { bool timedCheckForInput(int milliseconds) {
if(inputQueue.length || timedCheckForInput_bypassingBuffer(milliseconds)) if(inputQueue.length || timedCheckForInput_bypassingBuffer(milliseconds))
return true; return true;
@ -5015,10 +5015,11 @@ class LineGetter {
//deleteChar(); //deleteChar();
} }
void wordForward() { private int wordForwardIdx() {
int cursorPosition = this.cursorPosition;
import std.uni : isWhite; import std.uni : isWhite;
if(cursorPosition == line.length) if(cursorPosition == line.length)
return; return cursorPosition;
while(cursorPosition + 1 < line.length && isWhite(line[cursorPosition])) while(cursorPosition + 1 < line.length && isWhite(line[cursorPosition]))
cursorPosition++; cursorPosition++;
while(cursorPosition + 1 < line.length && !isWhite(line[cursorPosition + 1])) while(cursorPosition + 1 < line.length && !isWhite(line[cursorPosition + 1]))
@ -5026,9 +5027,21 @@ class LineGetter {
cursorPosition += 2; cursorPosition += 2;
if(cursorPosition > line.length) if(cursorPosition > line.length)
cursorPosition = cast(int) line.length; cursorPosition = cast(int) line.length;
return cursorPosition;
}
void wordForward() {
cursorPosition = wordForwardIdx();
aligned(cursorPosition, 1); aligned(cursorPosition, 1);
maybePositionCursor(); maybePositionCursor();
} }
void killWordForward() {
int to = wordForwardIdx(), from = cursorPosition;
killText(line[from .. to]);
line = line[0 .. from] ~ line[to .. $];
cursorPosition = cast(int)from;
maybePositionCursor();
}
private int wordBackIdx() { private int wordBackIdx() {
import std.uni : isWhite; import std.uni : isWhite;
if(!line.length || !cursorPosition) if(!line.length || !cursorPosition)
@ -5583,6 +5596,15 @@ class LineGetter {
redraw(); redraw();
break; break;
case 'd', 4: // ctrl+d will also send a newline-equivalent case 'd', 4: // ctrl+d will also send a newline-equivalent
if(ev.modifierState & ModifierState.alt) {
// gnu alias for kill word (also on ctrl+backspace)
justHitTab = false;
lineChanged = true;
killWordForward();
justKilled = true;
redraw();
break;
}
if(!(ev.modifierState & ModifierState.control)) if(!(ev.modifierState & ModifierState.control))
goto default; goto default;
if(line.length == 0) if(line.length == 0)
@ -5647,7 +5669,8 @@ class LineGetter {
break; break;
case '\b': case '\b':
justHitTab = false; justHitTab = false;
if(ev.modifierState & ModifierState.control) { // i use control for delete word, but gnu uses alt. so this allows both
if(ev.modifierState & (ModifierState.control | ModifierState.alt)) {
lineChanged = true; lineChanged = true;
killWord(); killWord();
justKilled = true; justKilled = true;