Merge remote-tracking branch 'tsoding/master'

IRooc · IRooc · commit 0d12fad5dba7 · 2023-02-18T10:24:11.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build-linux-gcc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v1
       - name: install dependencies
@@ -19,7 +19,7 @@ jobs:
         env:
           CC: gcc
   build-linux-clang:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v1
       - name: install dependencies
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+I have very limited resources in terms of handling feedback on my projects, sorry. So here are the limitations to keep in mind:
+
+- I don't look into reported Issues.
+- I only look into small PRs that suggest
+  - bug fixes,
+  - documentation fixes.
+- I do not look into PRs that
+  - implement new features,
+  - refactor/cleanup the code.
+- What qualifies as a bug, a feature, or refactoring is entirely upon my interpretation.
+
+Sorry for any inconveniences. If you want to stir the project in a particular direction in terms of features feel free to fork it, I don't mind. Just make sure you have fun while developing it! This is like the whole point!
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Dramatic EDitor
 
-**THIS SOFTWARE IS UNFINISHED!!!**
+**THIS SOFTWARE IS UNFINISHED!!! Don't have any high expectations.**
 
 # Quick Start
 
@@ -14,7 +14,7 @@
 
 ```console
 $ ./build.sh
-$ ./ded src\main.c
+$ ./ded src/main.c
 ```
 
 ## Windows MSVC
@@ -25,6 +25,7 @@ $ ./ded src\main.c
 > .\ded.exe src\main.c
 ```
 
-# Font
+# Fonts
 
-Victor Mono: https://rubjo.github.io/victor-mono/
+- Victor Mono: https://rubjo.github.io/victor-mono/
+- Iosevka: https://github.com/be5invis/Iosevka
diff --git a/build_msys2_mingw64.sh b/build_msys2_mingw64.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -xe
+
+PKGS="--static sdl2 glew freetype2"
+CFLAGS="-Wall -Wextra -pedantic -ggdb -DGLEW_STATIC `pkg-config --cflags $PKGS` -Isrc -Dassert(expression)=((void)0) "
+LIBS="-lm -lopengl32 `pkg-config --libs $PKGS`"
+SRC="src/main.c src/la.c src/editor.c src/file_browser.c src/free_glyph.c src/simple_renderer.c src/common.c"
+OBJ=$(echo "$SRC" | sed "s/\.c/\.o/g")
+OBJ=$(echo "$OBJ" | sed "s/src\// /g")
+
+# wget "https://raw.githubusercontent.com/tsoding/minirent/master/minirent.h" -P /src
+gcc -std=c11 $CFLAGS -c $SRC
+# some libs linked with c++ stuff
+g++ -o life.exe $OBJ $LIBS $LIBS -static
+
diff --git a/fonts/VictorMono-Regular.ttf b/fonts/VictorMono-Regular.ttf
diff --git a/fonts/iosevka-regular.ttf b/fonts/iosevka-regular.ttf
diff --git a/src/common.c b/src/common.c
@@ -17,6 +17,8 @@
 #include "common.h"
 #define ARENA_IMPLEMENTATION
 #include "./arena.h"
+#define SV_IMPLEMENTATION
+#include "sv.h"
 
 static Arena temporary_arena = {0};
 
diff --git a/src/common.h b/src/common.h
@@ -10,6 +10,7 @@
 #define SCREEN_HEIGHT 600
 #define FPS 60
 #define DELTA_TIME (1.0f / FPS)
+#define CURSOR_OFFSET 0.13f
 
 typedef int Errno;
 
@@ -31,6 +32,16 @@ typedef int Errno;
 
 #define DA_INIT_CAP 256
 
+#define da_last(da) (assert((da)->count > 0), (da)->items[(da)->count - 1])
+
+#define da_move(dst, src)                \
+    do {                                 \
+       free((dst)->items);               \
+       (dst)->items = (src).items;       \
+       (dst)->count = (src).count;       \
+       (dst)->capacity = (src).capacity; \
+    } while (0)
+
 #define da_append(da, item)                                                          \
     do {                                                                             \
         if ((da)->count >= (da)->capacity) {                                         \
@@ -67,6 +78,9 @@ typedef struct {
     size_t capacity;
 } String_Builder;
 
+#define SB_Fmt "%.*s"
+#define SB_Arg(sb) (int) (sb).count, (sb).items
+
 #define sb_append_buf da_append_many
 #define sb_append_cstr(sb, cstr)  \
     do {                          \
@@ -76,6 +90,8 @@ typedef struct {
     } while (0)
 #define sb_append_null(sb) da_append_many(sb, "", 1)
 
+#define sb_to_sv(sb) sv_from_parts((sb).items, (sb).count)
+
 typedef struct {
     const char **items;
     size_t count;
diff --git a/src/editor.c b/src/editor.c
@@ -35,6 +35,9 @@ void editor_delete(Editor *e)
     editor_retokenize(e);
 }
 
+// TODO: make sure that you always have new line at the end of the file while saving
+// https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
+
 Errno editor_save_as(Editor *e, const char *file_path)
 {
     printf("Saving as %s...\n", file_path);
@@ -118,6 +121,26 @@ void editor_move_char_right(Editor *e)
     if (e->cursor < e->data.count) e->cursor += 1;
 }
 
+void editor_move_word_left(Editor *e)
+{
+    while (e->cursor > 0 && !isalnum(e->data.items[e->cursor - 1])) {
+        e->cursor -= 1;
+    }
+    while (e->cursor > 0 && isalnum(e->data.items[e->cursor - 1])) {
+        e->cursor -= 1;
+    }
+}
+
+void editor_move_word_right(Editor *e)
+{
+    while (e->cursor < e->data.count && !isalnum(e->data.items[e->cursor])) {
+        e->cursor += 1;
+    }
+    while (e->cursor < e->data.count && isalnum(e->data.items[e->cursor])) {
+        e->cursor += 1;
+    }
+}
+
 void editor_insert_char(Editor *e, char x)
 {
     editor_insert_buf(e, &x, 1);
@@ -235,7 +258,7 @@ void editor_render(SDL_Window *window, Free_Glyph_Atlas *atlas, Simple_Renderer
                 }
 
                 if (select_begin_chr <= select_end_chr) {
-                    Vec2f select_begin_scr = vec2f(0, -(float)row * FREE_GLYPH_FONT_SIZE);
+                    Vec2f select_begin_scr = vec2f(0, -((float)row + CURSOR_OFFSET) * FREE_GLYPH_FONT_SIZE);
                     free_glyph_atlas_measure_line_sized(
                         atlas, editor->data.items + line_chr.begin, select_begin_chr - line_chr.begin,
                         &select_begin_scr);
@@ -288,7 +311,7 @@ void editor_render(SDL_Window *window, Free_Glyph_Atlas *atlas, Simple_Renderer
         size_t cursor_row = editor_cursor_row(editor);
         Line line = editor->lines.items[cursor_row];
         size_t cursor_col = editor->cursor - line.begin;
-        cursor_pos.y = -(float) cursor_row * FREE_GLYPH_FONT_SIZE;
+        cursor_pos.y = -((float)cursor_row + CURSOR_OFFSET) * FREE_GLYPH_FONT_SIZE;
         cursor_pos.x = free_glyph_atlas_cursor_pos(
                            atlas,
                            editor->data.items + line.begin, line.end - line.begin,
diff --git a/src/editor.h b/src/editor.h
@@ -54,6 +54,8 @@ void editor_move_line_up(Editor *e);
 void editor_move_line_down(Editor *e);
 void editor_move_char_left(Editor *e);
 void editor_move_char_right(Editor *e);
+void editor_move_word_left(Editor *e);
+void editor_move_word_right(Editor *e);
 void editor_insert_char(Editor *e, char x);
 void editor_insert_buf(Editor *e, char *buf, size_t buf_len);
 void editor_retokenize(Editor *e);
diff --git a/src/file_browser.c b/src/file_browser.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include "file_browser.h"
+#include "sv.h"
 
 static int file_cmp(const void *ap, const void *bp)
 {
@@ -25,6 +26,76 @@ Errno fb_open_dir(File_Browser *fb, const char *dir_path)
     return 0;
 }
 
+#define PATH_SEP "/"
+#define PATH_EMPTY ""
+#define PATH_DOT "."
+#define PATH_DOTDOT ".."
+
+typedef struct {
+    String_View *items;
+    size_t count;
+    size_t capacity;
+} Comps;
+
+void normpath(String_View path, String_Builder *result)
+{
+    size_t original_sb_size = result->count;
+
+    if (path.count == 0) {
+        sb_append_cstr(result, PATH_DOT);
+        return;
+    }
+
+    int initial_slashes = 0;
+    while (path.count > 0 && *path.data == *PATH_SEP) {
+        initial_slashes += 1;
+        sv_chop_left(&path, 1);
+    }
+    if (initial_slashes > 2) {
+        initial_slashes = 1;
+    }
+
+    Comps new_comps = {0};
+
+    while (path.count > 0) {
+        String_View comp = sv_chop_by_delim(&path, '/');
+        if (comp.count == 0 || sv_eq(comp, SV(PATH_DOT))) {
+            continue;
+        }
+        if (!sv_eq(comp, SV(PATH_DOTDOT))) {
+            da_append(&new_comps, comp);
+            continue;
+        }
+        if (initial_slashes == 0 && new_comps.count == 0) {
+            da_append(&new_comps, comp);
+            continue;
+        }
+        if (new_comps.count > 0 && sv_eq(da_last(&new_comps), SV(PATH_DOTDOT))) {
+            da_append(&new_comps, comp);
+            continue;
+        }
+        if (new_comps.count > 0) {
+            new_comps.count -= 1;
+            continue;
+        }
+    }
+
+    for (int i = 0; i < initial_slashes; ++i) {
+        sb_append_cstr(result, PATH_SEP);
+    }
+
+    for (size_t i = 0; i < new_comps.count; ++i) {
+        if (i > 0) sb_append_cstr(result, PATH_SEP);
+        sb_append_buf(result, new_comps.items[i].data, new_comps.items[i].count);
+    }
+
+    if (original_sb_size == result->count) {
+        sb_append_cstr(result, PATH_DOT);
+    }
+
+    free(new_comps.items);
+}
+
 Errno fb_change_dir(File_Browser *fb)
 {
     assert(fb->dir_path.count > 0 && "You need to call fb_open_dir() before fb_change_dir()");
@@ -36,11 +107,17 @@ Errno fb_change_dir(File_Browser *fb)
 
     fb->dir_path.count -= 1;
 
-    // TODO: fb_change_dir() does not support .. and . properly
+    // TODO: fb->dir_path grows indefinitely if we hit the root
     sb_append_cstr(&fb->dir_path, "/");
     sb_append_cstr(&fb->dir_path, dir_name);
+
+    String_Builder result = {0};
+    normpath(sb_to_sv(fb->dir_path), &result);
+    da_move(&fb->dir_path, result);
     sb_append_null(&fb->dir_path);
 
+    printf("Changed dir to %s\n", fb->dir_path.items);
+
     fb->files.count = 0;
     fb->cursor = 0;
     Errno err = read_entire_dir(fb->dir_path.items, &fb->files);
@@ -67,7 +144,7 @@ void fb_render(const File_Browser *fb, SDL_Window *window, Free_Glyph_Atlas *atl
 
     simple_renderer_set_shader(sr, SHADER_FOR_COLOR);
     if (fb->cursor < fb->files.count) {
-        const Vec2f begin = vec2f(0, -(float)fb->cursor * FREE_GLYPH_FONT_SIZE);
+        const Vec2f begin = vec2f(0, -((float)fb->cursor + CURSOR_OFFSET) * FREE_GLYPH_FONT_SIZE);
         Vec2f end = begin;
         free_glyph_atlas_measure_line_sized(
             atlas, fb->files.items[fb->cursor], strlen(fb->files.items[fb->cursor]),
diff --git a/src/free_glyph.c b/src/free_glyph.c
@@ -4,6 +4,8 @@
 
 void free_glyph_atlas_init(Free_Glyph_Atlas *atlas, FT_Face face)
 {
+    // TODO: Introduction of SDF font slowed down the start up time
+    // We need to investigate what's up with that
     FT_Int32 load_flags = FT_LOAD_RENDER | FT_LOAD_TARGET_(FT_RENDER_MODE_SDF);
     for (int i = 32; i < 128; ++i) {
         if (FT_Load_Char(face, i, load_flags)) {
diff --git a/src/main.c b/src/main.c
diff --git a/src/simple_renderer.c b/src/simple_renderer.c
diff --git a/src/sv.h b/src/sv.h
