Revert "WIP on master: d6ab158
basic find"
This reverts commit 22e8e3e7dc4f1f83bbb3b8292205e0f73ddc85a8, reversing
changes made to d6ab1586ff
.
possible bug fixes
This commit is contained in:
parent
d6ab1586ff
commit
0430e878fa
16
ste.c
16
ste.c
@ -126,7 +126,7 @@ int main (int argc, char *argv[])
|
|||||||
snprintf(t.statusbar, STAT_SIZE, "%s %d lines %dx%d", argv[1], rows.rownum, t.dim.y, t.dim.x);
|
snprintf(t.statusbar, STAT_SIZE, "%s %d lines %dx%d", argv[1], rows.rownum, t.dim.y, t.dim.x);
|
||||||
|
|
||||||
/* remember the initial row number */
|
/* remember the initial row number */
|
||||||
int irow = decimalSize(rows.rownum);
|
// int irow = decimalSize(rows.rownum);
|
||||||
|
|
||||||
/* Main event loop */
|
/* Main event loop */
|
||||||
int c;
|
int c;
|
||||||
@ -140,18 +140,22 @@ int main (int argc, char *argv[])
|
|||||||
case (CTRL('q')):
|
case (CTRL('q')):
|
||||||
termExit();
|
termExit();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (KEY_LEFT):
|
case (KEY_LEFT):
|
||||||
case (KEY_RIGHT):
|
case (KEY_RIGHT):
|
||||||
case (KEY_UP):
|
case (KEY_UP):
|
||||||
case (KEY_DOWN):
|
case (KEY_DOWN):
|
||||||
cursorMove(c);
|
cursorMove(c);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (KEY_BACKSPACE):
|
case (KEY_BACKSPACE):
|
||||||
handleDel(0);
|
handleDel(0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (KEY_DC):
|
case (KEY_DC):
|
||||||
handleDel(1);
|
handleDel(1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (KEY_ENTER):
|
case (KEY_ENTER):
|
||||||
case (10):
|
case (10):
|
||||||
case ('\r'):
|
case ('\r'):
|
||||||
@ -159,25 +163,29 @@ int main (int argc, char *argv[])
|
|||||||
t.cur.y++;
|
t.cur.y++;
|
||||||
t.cur.x = 0;
|
t.cur.x = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (KEY_END):
|
case (KEY_END):
|
||||||
t.cur.y = rows.rownum - 1;
|
t.cur.y = rows.rownum - 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (KEY_HOME):
|
case (KEY_HOME):
|
||||||
t.cur.y = 0;
|
t.cur.y = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (CTRL('f')):
|
case (CTRL('f')):
|
||||||
if (!editorFind("for", &t.cur.y, &t.cur.x)) {
|
if (!editorFind("for", &t.cur.y, &t.cur.x)) {
|
||||||
t.cur.y = 0;
|
t.cur.y = 0;
|
||||||
editorFind("for", &t.cur.y, &t.cur.x);
|
editorFind("for", &t.cur.y, &t.cur.x);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if (c == KEY_STAB) c = '\t';
|
if (c == KEY_STAB) c = '\t';
|
||||||
rowAddChar(&rows.rw[t.cur.y], c, t.cur.x);
|
rowAddChar(&rows.rw[t.cur.y], c, t.cur.x);
|
||||||
t.cur.x++;
|
t.cur.x++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (decimalSize(rows.rownum) - irow) updateInfo();
|
//if (decimalSize(rows.rownum) - irow) updateInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If by chance i find myself here be sure
|
/* If by chance i find myself here be sure
|
||||||
@ -650,6 +658,10 @@ void curUpdateRender ()
|
|||||||
the right bound.
|
the right bound.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* Adjust x and y if they are out of bounds */
|
||||||
|
if (t.cur.y < 0 || t.cur.y >= rows.rownum) t.cur.y = 0;
|
||||||
|
if (t.cur.x < 0) t.cur.x = 0;
|
||||||
|
|
||||||
if (t.cur.y >= t.cur.off_y && t.cur.y < t.cur.off_y + t.dim.y) {
|
if (t.cur.y >= t.cur.off_y && t.cur.y < t.cur.off_y + t.dim.y) {
|
||||||
t.cur.r_y = t.cur.y - t.cur.off_y;
|
t.cur.r_y = t.cur.y - t.cur.off_y;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user