zev/zed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lots

Browse Source
This commit is contained in:
Zev Averbach
2023-01-16 10:17:00 +01:00
parent ce40695e1d
commit bddcddc9b8
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -1,3 +1,6 @@
This is me coding along with Mr. [Tsoding](https://www.twitch.tv/tsoding)'s stream about creating a text editor from scratch using C. This is me coding along with Mr. [Tsoding](https://www.twitch.tv/tsoding)'s stream about creating a text editor from scratch using C.
Left off at https://www.twitch.tv/videos/1685122716?t=02h25m02s on Jan 11, 2023 Left off at https://www.twitch.tv/videos/1685122716?t=02h25m02s on Jan 11, 2023
# Differences
I've decided to go with vim-like key bindings, and I've also modernized some of the code, for example when initializing the `term` instance.

1
input.txt
View File

@@ -1,4 +1,3 @@
Hello, Zed! Hello, Zed!
Foo, Bar! Foo, Bar!
Test, test Test, test

23
main.c
View File

@@ -23,7 +23,7 @@ typedef struct {
size_t cursor; size_t cursor;
} Editor; } Editor;
void editor_recompute_lines(Editor *e) { void editor_compute_lines(Editor *e) {
size_t begin = 0; size_t begin = 0;
for (size_t i = 0; i < e->data_count; ++i) { for (size_t i = 0; i < e->data_count; ++i) {
if (e->data[i] == '\n') { if (e->data[i] == '\n') {
@@ -40,11 +40,13 @@ void editor_recompute_lines(Editor *e) {
size_t editor_current_line(const Editor *e) { size_t editor_current_line(const Editor *e) {
assert(e->cursor <= e->data_count); assert(e->cursor <= e->data_count);
Line line;
for (size_t i = 0; i < e->lines_count; ++i) { for (size_t i = 0; i < e->lines_count; ++i) {
line = e->lines[i];
if ( if (
e->lines[i].begin <= e->cursor line.begin <= e->cursor
&& &&
e->cursor <= e->lines[i].end e->cursor <= line.end
) return i; ) return i;
} }
return 0; return 0;
@@ -62,8 +64,6 @@ void editor_rerender(const Editor *e) {
); );
} }
static Editor editor = {0};
int editor_start_interactive(Editor *e) { int editor_start_interactive(Editor *e) {
if (!isatty(0)) { if (!isatty(0)) {
fprintf(stderr, "Please run in the terminal!\n"); fprintf(stderr, "Please run in the terminal!\n");
@@ -111,7 +111,7 @@ int editor_start_interactive(Editor *e) {
} }
} break; } break;
case 'l': { case 'l': {
if (e->cursor < EDITOR_CAPACITY) { if (e->cursor < e->data_count - 1) {
e->cursor += 1; e->cursor += 1;
} }
} break; } break;
@@ -127,8 +127,9 @@ int editor_start_interactive(Editor *e) {
} }
int main(int argc, char **argv) static Editor editor;
{
int main(int argc, char **argv) {
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "Usage: zed <input.txt>\n"); fprintf(stderr, "Usage: zed <input.txt>\n");
fprintf(stderr, "ERROR: no input file was provided\n"); fprintf(stderr, "ERROR: no input file was provided\n");
@@ -147,11 +148,13 @@ int main(int argc, char **argv)
return 1; return 1;
} }
// load contents of file into `editor.data`
// assign length of file to `editor.data_count`
editor.data_count = fread(editor.data, 1, EDITOR_CAPACITY, f); editor.data_count = fread(editor.data, 1, EDITOR_CAPACITY, f);
fclose(f); fclose(f);
editor_compute_lines(&editor);
editor_recompute_lines(&editor);
return editor_start_interactive(&editor); return editor_start_interactive(&editor);
return 0;
} }