diff --git a/build.sh b/build.sh index 816aaaf..2377531 100644 --- a/build.sh +++ b/build.sh @@ -41,6 +41,7 @@ if [ ! -f "lbaselib.o" ]; then -c fi +cp ../data/*.ttf . clang ../src/text_editor/text_editor.cpp ../src/basic/unix.cpp \ -o te_linux.exe \ -nostdlib++ -fno-exceptions -fdiagnostics-absolute-paths -g \ diff --git a/data/CascadiaMono.ttf b/data/CascadiaMono.ttf new file mode 100644 index 0000000..d15637e Binary files /dev/null and b/data/CascadiaMono.ttf differ diff --git a/src/text_editor/commands_bindings.cpp b/src/text_editor/commands_bindings.cpp index 3c8a4ee..46274f1 100644 --- a/src/text_editor/commands_bindings.cpp +++ b/src/text_editor/commands_bindings.cpp @@ -300,10 +300,6 @@ void OnCommand(Event event) { ToggleVisibility(DebugWindowID); } - // if (Press(SDLK_F11)) { - // Command_ToggleFullscreen(); - // } - if (CtrlPress(SDLK_GRAVE)) { if (ActiveWindow != NullWindowID) { ActiveWindow = NullWindowID; @@ -585,9 +581,9 @@ void OnCommand(Event event) { } } - if (CtrlPress(SDLK_N)) { - Command_New(); - } + // if (CtrlPress(SDLK_N)) { + // Command_New(); + // } if (CtrlPress(SDLK_S)) { SaveBuffer(active.buffer); diff --git a/src/text_editor/generated.cpp b/src/text_editor/generated.cpp index 25f4910..88dd43f 100644 --- a/src/text_editor/generated.cpp +++ b/src/text_editor/generated.cpp @@ -66,12 +66,16 @@ Style.DrawScrollbar = 1 Style.IndentSize = 4 Style.FontSize = 15 Style.FontFilter = 0 -Style.Font = "/home/krz/text_editor/package/CascadiaMono.ttf" +Style.Font = GetExeDir().."CascadiaMono.ttf" Style.VCVarsall = "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvars64.bat" Style.TrimWhitespaceOnSave = true Style.ClangFormatOnSave = false -INTERNET_BROWSER = 'C:/Program Files/BraveSoftware/Brave-Browser/Application/brave.exe' +if OS_WINDOWS then + INTERNET_BROWSER = '"C:/Program Files/BraveSoftware/Brave-Browser/Application/brave.exe"' +else + INTERNET_BROWSER = "firefox" +end OS_WINDOWS = 0 OS_UNIX = 1 @@ -301,7 +305,7 @@ end function MatchURL(s, meta) local i, j = string.find(s, "^https://") if i then - return {kind = "exec_console", cmd = '"'..INTERNET_BROWSER..'" '..s, working_dir = GetMainDir()} + return {kind = "exec_console", cmd = INTERNET_BROWSER.." "..s, working_dir = GetMainDir()} end return nil end diff --git a/src/text_editor/lua_api.cpp b/src/text_editor/lua_api.cpp index 21fd1e4..d8c80ca 100644 --- a/src/text_editor/lua_api.cpp +++ b/src/text_editor/lua_api.cpp @@ -92,6 +92,13 @@ int Lua_GetWorkDir(lua_State *L) { return 1; } +int Lua_GetExeDir(lua_State *L) { + Scratch scratch; + String exe_dir = GetExeDir(scratch); + lua_pushlstring(L, exe_dir.data, exe_dir.len); + return 1; +} + int Lua_GetMainDir(lua_State *L) { String name = Command_GetMainDir(); lua_pushlstring(L, name.data, name.len); diff --git a/src/text_editor/lua_api_generated.cpp b/src/text_editor/lua_api_generated.cpp index 38ba0de..c5fe027 100644 --- a/src/text_editor/lua_api_generated.cpp +++ b/src/text_editor/lua_api_generated.cpp @@ -10,6 +10,7 @@ luaL_Reg LuaFunctions[] = { {"GetLine", Lua_GetLine}, {"FileExists", Lua_FileExists}, {"GetWorkDir", Lua_GetWorkDir}, + {"GetExeDir", Lua_GetExeDir}, {"GetMainDir", Lua_GetMainDir}, {"SplitSize", Lua_SplitSize}, {"KillWindow", Lua_KillWindow}, diff --git a/src/text_editor/todo.txt b/src/text_editor/todo.txt index 3217e76..7d22104 100644 --- a/src/text_editor/todo.txt +++ b/src/text_editor/todo.txt @@ -1,4 +1,3 @@ -- Add GetExeDir to lua, point at font automatically - Rework PollStdout and stuff there to match both Unix and Windows properly - Add metaprogram? - Fix windows build