convenience update

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "dependencies/minirent"]
+	path = dependencies/minirent
+	url = https://github.com/alex-s168/minirent.git
+[submodule "dependencies/freetype"]
+	path = dependencies/freetype
+	url = https://github.com/ubawurinna/freetype-windows-binaries.git
+[submodule "dependencies/minilibs"]
+	path = dependencies/minilibs
+	url = https://github.com/alex-s168/minilibs.git

README.md

@@ -5,6 +5,7 @@
 # Quick Start
 
 ## Dependencies
+(Automatically downloaded on Windows)
 
 - [SDL2 2.0.9+](https://www.libsdl.org/)
 - [FreeType 2.13.0+](https://freetype.org/)
@@ -18,10 +19,20 @@ $ ./ded src/main.c
 ```
 
 ## Windows MSVC
-
+In any PowerShell or CMD console
 ```console
 > .\setup_dependencies.bat
+```
+In a bash console
+```console
+$ ./setup_other.sh
+```
+In a MSVC console (VS developer x64 prompt)
+```console
 > .\build_msvc.bat
+```
+Then
+```console
 > .\ded.exe src\main.c
 ```
 

build.sh

@@ -4,12 +4,12 @@ set -xe
 
 CC="${CXX:-cc}"
 PKGS="sdl2 glew freetype2"
-CFLAGS="-Wall -Wextra -std=c11 -pedantic -ggdb"
+CFLAGS="-std=c11 -pedantic -ggdb -Idependencies/minilibs -Idependencies/minirent"
 LIBS=-lm
 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 src/lexer.c"
 
 if [ `uname` = "Darwin" ]; then
     CFLAGS+=" -framework OpenGL"
 fi
 
-$CC $CFLAGS `pkg-config --cflags $PKGS` -o ded $SRC $LIBS `pkg-config --libs $PKGS`
+$CC $CFLAGS `pkg-config --cflags $PKGS` -g -o ded $SRC $LIBS `pkg-config --libs $PKGS`

build_msvc.bat

@@ -1,12 +1,14 @@
 @echo off
 rem launch this from msvc-enabled console
 
-set CFLAGS=/W4 /WX /std:c11 /wd4996 /wd5105 /FC /TC /Zi /nologo
-set INCLUDES=/I dependencies\SDL2\include /I dependencies\GLFW\include /I dependencies\GLEW\include
+set CFLAGS=/W4 /std:c11 /wd4996 /wd5105 /FC /TC /Zi /nologo
+set INCLUDES=/I dependencies\SDL2\include /I dependencies\freetype\include /I dependencies\minirent /I dependencies\GLFW\include /I dependencies\GLEW\include /I dependencies\minilibs
+
 set LIBS=dependencies\SDL2\lib\x64\SDL2.lib ^
          dependencies\SDL2\lib\x64\SDL2main.lib ^
          dependencies\GLFW\lib\glfw3.lib ^
          dependencies\GLEW\lib\glew32s.lib ^
+         "dependencies\freetype\release static\vs2015-2022\win64\freetype.lib" ^
          opengl32.lib User32.lib Gdi32.lib Shell32.lib
 
-cl.exe %CFLAGS% %INCLUDES% /Feded src\main.c src\la.c src\editor.c src\file_browser.c src\free_glyph.c src\simple_renderer.c src\common.c /link %LIBS% -SUBSYSTEM:windows
+cl.exe %CFLAGS% %INCLUDES% /Feded src\main.c src\la.c src\editor.c src\file_browser.c src\free_glyph.c src\simple_renderer.c src\common.c src\lexer.c /link %LIBS% -SUBSYSTEM:windows

build_msys2_mingw64.sh

@@ -3,9 +3,9 @@
 set -xe
 
 PKGS="--static sdl2 glew freetype2"
-CFLAGS="-Wall -Wextra -pedantic -ggdb -DGLEW_STATIC `pkg-config --cflags $PKGS` -Isrc -Dassert(expression)=((void)0) "
+CFLAGS="-Wall -Wextra -pedantic -ggdb -DGLEW_STATIC `pkg-config --cflags $PKGS` -Isrc -Idependencies/minilibs -Idependencies/minirent -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"
+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 src/lexer.c"
 OBJ=$(echo "$SRC" | sed "s/\.c/\.o/g")
 OBJ=$(echo "$OBJ" | sed "s/src\// /g")
 

ded.miniconf

@@ -0,0 +1,72 @@
+window:
+    font:  "./fonts/iosevka-regular.ttf
+    title: "ded
+    x: 100
+    y: 100
+    w: 800
+    h: 600
+
+pop up:
+    scale:   0.6
+    fade in: 300
+
+pop ups:
+    save ok:
+        str:   "Saved file!
+        color: x009966FF
+        last:  1000
+    invalid goto:
+        str:   "Invalid line(:col)
+        color: xFF2400FF
+        last:  2000
+    can not cd:
+        str:   "Can't change directory to "{path}"!
+        color: xFF2400FF
+        last:  2000
+    can not open:
+        str:   "Can't open file "{path}"!
+        color: xFF2400FF
+        last:  2000
+    can not save:
+        str:   "Can't save file: {err}!
+        color: xFF2400FF
+        last:  2000
+
+input hints:
+    find:    "find
+    save as: "path
+    save:    "path
+    goto:    "line
+
+editor:
+    background: x181818FF
+    color:      xFFFFFFFF
+    bottom bar:
+        scale: 0.6
+        background: xE7E7E7FF
+        input:
+            hint:
+                color:   x5B5B5BFF
+                fmt:     "({hint})
+                spacing: 20.0
+            content:
+                color: x181818FF
+        stats:
+            enabled: true
+            fmt: "{lang} {row}:{col} / {max-row}
+            color: x181818FF
+    tokens:
+        preprocessor directive: x95A99FFF
+        keyword: xFFDD33FF
+        comment: xCC8C3CFF
+        string:  x73C936FF
+    cursor:
+        blink:
+            treshold: 500
+            period:   1000
+        color: xFFFFFFFF
+        width: 5.0
+    selection:
+        color: x434343FF
+    search selection:
+        color: x191943FF

default.miniconf

@@ -0,0 +1,72 @@
+window:
+    font:  "./fonts/iosevka-regular.ttf
+    title: "ded
+    x: 100
+    y: 100
+    w: 800
+    h: 600
+
+pop up:
+    scale:   0.6
+    fade in: 300
+
+pop ups:
+    save ok:
+        str:   "Saved file!
+        color: x009966FF
+        last:  1000
+    invalid goto:
+        str:   "Invalid line(:col)
+        color: xFF2400FF
+        last:  2000
+    can not cd:
+        str:   "Can't change directory to "{path}"!
+        color: xFF2400FF
+        last:  2000
+    can not open:
+        str:   "Can't open file "{path}"!
+        color: xFF2400FF
+        last:  2000
+    can not save:
+        str:   "Can't save file: {err}!
+        color: xFF2400FF
+        last:  2000
+
+input hints:
+    find:    "find
+    save as: "path
+    save:    "path
+    goto:    "line
+
+editor:
+    background: x181818FF
+    color:      xFFFFFFFF
+    bottom bar:
+        scale: 0.6
+        background: xE7E7E7FF
+        input:
+            hint:
+                color:   x5B5B5BFF
+                fmt:     "({hint})
+                spacing: 20.0
+            content:
+                color: x181818FF
+        stats:
+            enabled: true
+            fmt: "{lang} {row}:{col} / {max-row}
+            color: x181818FF
+    tokens:
+        preprocessor directive: x95A99FFF
+        keyword: xFFDD33FF
+        comment: xCC8C3CFF
+        string:  x73C936FF
+    cursor:
+        blink:
+            treshold: 500
+            period:   1000
+        color: xFFFFFFFF
+        width: 5.0
+    selection:
+        color: x434343FF
+    search selection:
+        color: x191943FF

setup_other.sh

@@ -0,0 +1,2 @@
+cp dependencies/SDL2/lib/x64/SDL2.dll .
+dos2unix shaders/*

src/common.c

@@ -18,6 +18,12 @@
 #include "./arena.h"
 #define SV_IMPLEMENTATION
 #include "sv.h"
+#define FILELIB_IMPL
+#include <filelib.h>
+#define MINICONF_IMPL
+#include <miniconf.h>
+#define MINIFMT_IMPL
+#include <minifmt.h>
 
 static Arena temporary_arena = {0};
 
@@ -64,56 +70,50 @@ Errno read_entire_dir(const char *dir_path, Files *files)
 Errno write_entire_file(const char *file_path, const char *buf, size_t buf_size)
 {
     Errno result = 0;
-    FILE *f = NULL;
+    if (buf == NULL)
+        return result;
 
-    f = fopen(file_path, "wb");
+    FILE *f = fopen(file_path, "wb");
     if (f == NULL) return_defer(errno);
 
-    fwrite(buf, 1, buf_size, f);
+    // TODO: why are there extra nulls at the end of the buf (buf_size)??
+    // that's why we strlen it here to get the size without these nulls
+    size_t real_buf_size = strlen(buf);
+    if (buf_size < real_buf_size)
+        real_buf_size = buf_size;
+    fwrite(buf, 1, real_buf_size, f);
+    if (get_last(buf, real_buf_size) != '\n') {
+        fputc('\n', f);
+    }
     if (ferror(f)) return_defer(errno);
 
 defer:
     if (f) fclose(f);
     return result;
 }
 
-static Errno file_size(FILE *file, size_t *size)
-{
-    long saved = ftell(file);
-    if (saved < 0) return errno;
-    if (fseek(file, 0, SEEK_END) < 0) return errno;
-    long result = ftell(file);
-    if (result < 0) return errno;
-    if (fseek(file, saved, SEEK_SET) < 0) return errno;
-    *size = (size_t) result;
-    return 0;
-}
-
 Errno read_entire_file(const char *file_path, String_Builder *sb)
 {
-    Errno result = 0;
-    FILE *f = NULL;
-
-    f = fopen(file_path, "r");
-    if (f == NULL) return_defer(errno);
-
-    size_t size;
-    Errno err = file_size(f, &size);
-    if (err != 0) return_defer(err);
-
-    if (sb->capacity < size) {
-        sb->capacity = size;
-        sb->items = realloc(sb->items, sb->capacity*sizeof(*sb->items));
-        assert(sb->items != NULL && "Buy more RAM lol");
+    FILE *f = fopen(file_path, "r+");
+    if (f == NULL)
+         return 1;
+
+    int c;
+    while ((c = fgetc(f)) != EOF && c != '\0') {
+        if (c == '\t') {
+            da_append(sb, ' ');
+            da_append(sb, ' ');
+            da_append(sb, ' ');
+            da_append(sb, ' ');
+        } else if (c == '\r') {
+            continue;
+        } else {
+            da_append(sb, (char) c);
+        }
     }
 
-    fread(sb->items, size, 1, f);
-    if (ferror(f)) return_defer(errno);
-    sb->count = size;
-
-defer:
-    if (f) fclose(f);
-    return result;
+    fclose(f);
+    return 0;
 }
 
 Vec4f hex_to_vec4f(uint32_t color)
@@ -133,7 +133,17 @@ Vec4f hex_to_vec4f(uint32_t color)
 Errno type_of_file(const char *file_path, File_Type *ft)
 {
 #ifdef _WIN32
-#error "TODO: type_of_file() is not implemented for Windows"
+    DWORD file_obj_type = GetFileAttributesA(file_path);
+    if (file_obj_type & FILE_ATTRIBUTE_DIRECTORY) {
+        *ft = FT_DIRECTORY;
+    }
+    // I have no idea why, but a 'normal' file is considered an archive file?
+    else if (file_obj_type & FILE_ATTRIBUTE_ARCHIVE) {
+        *ft = FT_REGULAR;
+    }
+    else {
+        *ft = FT_OTHER;
+    }
 #else
     struct stat sb = {0};
     if (stat(file_path, &sb) < 0) return errno;

src/common.h

@@ -6,8 +6,6 @@
 #include <stdint.h>
 #include "./la.h"
 
-#define SCREEN_WIDTH 800
-#define SCREEN_HEIGHT 600
 #define FPS 60
 #define DELTA_TIME (1.0f / FPS)
 #define CURSOR_OFFSET 0.13f
@@ -88,7 +86,9 @@ typedef struct {
         size_t n = strlen(s);     \
         da_append_many(sb, s, n); \
     } while (0)
-#define sb_append_null(sb) da_append_many(sb, "", 1)
+#define get_last(items, count) ((count) > 0 ? (items)[(count) - 1] : '\0')
+#define sb_get_last(sb) get_last((sb).items, (sb).count)
+#define sb_append_null(sb) da_append_many((sb), "", 1)
 
 #define sb_to_sv(sb) sv_from_parts((sb).items, (sb).count)