sloum
/
hermes
2
2
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Fixes numerical looping delete for w

This commit is contained in:
sloumdrone 2020-01-08 20:20:56 -08:00
parent feb92b21eb
commit 96d5cf4dc4
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hermes.c
View File

@ -947,7 +947,7 @@ void editorCopyRange(int sx, int sy, int ex, int ey) {
int totlen = 0;
char *buf;
if (ey - sy == 0) {
if (ey == sy) {
totlen = ex - sx + 1;
buf = malloc(totlen);
memcpy(buf, &E.row[sy].chars[sx], totlen);
@ -1314,25 +1314,28 @@ void editorCommandKp(int c) {
}
break;
case 'w':
while (counter > 0) {
if (deleting) {
int start_x = E.cx;
int start_y = E.cy;
editorNextWord();
int len = start_y == E.cy ? E.cx - start_x : E.row[start_y].size - start_x;
editorUpdatePaste(&E.row[start_y].chars[start_x], len);
if (E.cy != start_y) {
E.cy--;
E.cx = E.row[E.cy].size;
}
while (E.cx != start_x) {
editorDeleteChar();
}
if (E.cx > E.row[E.cy].size - 1) E.cx--;
} else {
{
int start_x = E.cx;
int start_y = E.cy;
while (counter > 0) {
editorNextWord();
counter--;
}
counter--;
if (!deleting) break;
int end_x, end_y;
if (E.cx == 0) {
if (E.cy == 0) break;
end_y = E.cy - 1;
end_x = E.row[E.cy].size - 1;
} else {
end_x = E.cx - 1;
end_y = E.cy;
}
editorCopyRange(start_x, start_y, end_x, end_y);
while (E.cx != start_x || E.cy != start_y) {
editorDeleteChar();
}
if (E.cx > E.row[E.cy].size - 1) E.cx = E.row[E.cy].size - 1;
}
break;
case 'P':