diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rwxr-xr-x | scripts/line_count.sh | 2 | ||||
| -rw-r--r-- | src/context.h | 4 | ||||
| -rw-r--r-- | subprojects/libalabaster.wrap | 4 | ||||
| -rw-r--r-- | subprojects/libnaunet.wrap | 4 | ||||
| -rw-r--r-- | subprojects/stela.wrap | 4 | ||||
| -rw-r--r-- | taro/daemon.c | 1 | ||||
| -rw-r--r-- | taro/ui.c | 3 |
10 files changed, 21 insertions, 17 deletions
@@ -4,6 +4,7 @@ attic/test_* compile_commands.json result +subprojects/.wraplock subprojects/c89atomic-*/ subprojects/c89atomic.wrap subprojects/glfw3-*/ @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -70,6 +70,7 @@ ninja meson cmake + wayland-scanner.bin makeWrapper ]; buildInputs = [ @@ -85,10 +86,10 @@ ] ++ lib.optionals (window == "wayland") [ wayland wayland-protocols - wayland-scanner wlr-protocols egl-wayland ] ++ lib.optionals (window == "x11") [ + xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXfixes @@ -119,7 +120,7 @@ devShells = forAllDevSystems (pkgs: { default = with pkgs; mkShell { NIX_HARDENING_ENABLE = ""; - nativeBuildInputs = packages.${system}.default.nativeBuildInputs ++ [ + nativeBuildInputs = packages.${stdenv.hostPlatform.system}.default.nativeBuildInputs ++ [ gdb clang-tools perf-tools @@ -129,7 +130,7 @@ python-pkgs.pygments ])) ]; - buildInputs = packages.${system}.default.buildInputs ++ [ + buildInputs = packages.${stdenv.hostPlatform.system}.default.buildInputs ++ [ # sway build json_c pcre2 @@ -141,7 +142,7 @@ libdrm gdk-pixbuf xwayland - xorg.xcbutilwm + libxcb-wm # wlroots build mesa vulkan-headers diff --git a/scripts/line_count.sh b/scripts/line_count.sh index 9bba4dd..a231da2 100755 --- a/scripts/line_count.sh +++ b/scripts/line_count.sh @@ -1,3 +1,3 @@ #! /usr/bin/env sh export LC_ALL="C" -find ./src ./taro -type f -exec loccount {} + +find ./src ./taro -type f -exec sloccount {} + diff --git a/src/context.h b/src/context.h index dce9d5e..2784cec 100644 --- a/src/context.h +++ b/src/context.h @@ -2,7 +2,7 @@ #define _CONTEXT_H extern "C" { -#include <nnwt/thread.h> +#include <nnwt/time.h> #include <stl/window.h> #include <stl/gl.h> } @@ -37,7 +37,7 @@ class Context this->window->userdata = this; s32 flags = STELA_WINDOW_VSYNC; if (!monitor.empty()) flags |= STELA_WINDOW_WALLPAPER; - if (!this->window->create_window(this->window, width, height, monitor.c_str(), name.c_str(), flags)) { + if (!this->window->create_window(this->window, width, height, flags, monitor.c_str(), name.c_str(), "mauri")) { return false; } this->window->gl_make_current(this->window); diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap index 4b277ec..7a55d18 100644 --- a/subprojects/libalabaster.wrap +++ b/subprojects/libalabaster.wrap @@ -1,5 +1,5 @@ [wrap-git] -directory = libalabaster-b5b7657 +directory = libalabaster-c633226 url = https://git.akon.city/libalabaster.git push-url = git@git.akon.city:libalabaster.git -revision = b5b765781482a7b3ff6026ea71b4eb35a0a155d0 +revision = c633226d2b615f46ef38cc99603775dccdf96ecd diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap index 531910f..25cdba2 100644 --- a/subprojects/libnaunet.wrap +++ b/subprojects/libnaunet.wrap @@ -1,5 +1,5 @@ [wrap-git] -directory = libnaunet-1e0f603 +directory = libnaunet-a389b8f url = https://git.akon.city/libnaunet.git push-url = git@git.akon.city:libnaunet.git -revision = 1e0f60341192c79bf49e84e6b187ffb7bfded252 +revision = a389b8f2f9c55b76fe5a28c3f1fea798ed37aa98 diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap index 65d9165..d2b9aeb 100644 --- a/subprojects/stela.wrap +++ b/subprojects/stela.wrap @@ -1,5 +1,5 @@ [wrap-git] -directory = stela-d13e921 +directory = stela-0d027c4 url = https://git.akon.city/stela.git push-url = git@git.akon.city:stela.git -revision = d13e92193d21e112f45f3c92cf159f27498a3a55 +revision = 0d027c466c199f9857b0872ed76ebab2ed501e43 diff --git a/taro/daemon.c b/taro/daemon.c index d701ae6..b6faf3f 100644 --- a/taro/daemon.c +++ b/taro/daemon.c @@ -6,6 +6,7 @@ #include <nnwt/event_loop.h> #include <nnwt/signal.h> #include <nnwt/fs_event.h> +#include <nnwt/error.h> #include <nnwt/socket.h> #include <stl/window.h> #include <jansson.h> @@ -1324,7 +1324,8 @@ s32 main(void) db_sort(&u.db); const char *term_env = getenv("TERM"); - if (strcmp(term_env, "xterm-kitty") == 0) { + if ((strncmp(term_env, "xterm-kitty", sizeof("xterm-kitty")) == 0) || + (strncmp(term_env, "foot", sizeof("foot")) == 0)) { u.use_pixel_blit = true; } else { u.use_pixel_blit = false; |