extras
/
Lite
mirror of https://github.com/Sam1301/Lite.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enter key functionality. 

And do a rebase to correct mistake in "Insert
ordinary characters" commit
This commit is contained in:
Saumya Bhatnagar 2018-05-31 06:34:38 +05:30
parent 846f22ccd7
commit 9bd50320d4
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
editor
View File

Binary file not shown.

48
editor.c
View File

@ -237,17 +237,21 @@ void editorUpdateRow(editorrow * row) {
row->rsize = idx;
}
void editorAppendRow(char *s, size_t len) {
E.erow = realloc(E.erow, sizeof(editorrow) * (E.numrows + 1));
int pos = E.numrows;
E.erow[pos].length = len; // excluding '\0' at the end of string
E.erow[pos].text = malloc(len + 1);
memcpy(E.erow[pos].text, s, len+1);
void editorInsertRow(int at, char *s, size_t len) {
if (at < 0 || at > E.numrows) {
return ;
}
E.erow[pos].render = NULL;
E.erow[pos].rsize = 0;
editorUpdateRow(&E.erow[pos]);
E.erow = realloc(E.erow, sizeof(editorrow) * (E.numrows + 1));
memmove(&E.erow[at+1], &E.erow[at], sizeof(editorrow) * (E.numrows - at));
E.erow[at].length = len; // excluding '\0' at the end of string
E.erow[at].text = malloc(len + 1);
memcpy(E.erow[at].text, s, len+1);
E.erow[at].render = NULL;
E.erow[at].rsize = 0;
editorUpdateRow(&E.erow[at]);
E.numrows++;
E.dirty++;
@ -318,9 +322,9 @@ void editorRowAppendString(editorrow * row, char* s, size_t len) {
void editorInsertChar(int c) {
if (E.cursorY == E.numrows) {
editorAppendRow("", 0); // add a new row after end of file
editorInsertRow(E.numrows, "", 0); // add a new row after end of file
}
editorRowInsertChar(&E.erow[E.cursorY], E.cursorX, c);
E.cursorX++;
}
@ -342,6 +346,22 @@ void editorDelChar() {
}
}
void editorInsertNewLine() {
if (E.cursorX == 0) {
editorInsertRow(E.cursorY, "", 0);
} else {
editorrow *row = &E.erow[E.cursorY];
editorInsertRow(E.cursorY+1, &row->text[E.cursorX], row->length - E.cursorX);
row = &E.erow[E.cursorY]; // reassign as editorInsertRow reallocates E.erow pointer
row->length = E.cursorX;
row->text[row->length] = '\0';
editorUpdateRow(row);
}
E.cursorX = 0;
E.cursorY++;
}
/*** file I/O ***/
void editorOpen(char * file) {
@ -362,7 +382,7 @@ void editorOpen(char * file) {
linelen--;
}
editorAppendRow(line, linelen);
editorInsertRow(E.numrows, line, linelen);
}
free(line);
@ -637,7 +657,7 @@ void editorProcessKey() {
}
break;
case '\r':
/* TODO */
editorInsertNewLine();
break;
case BACKSPACE:
case DEL_KEY: