diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 546df097..47b33354 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -20,7 +20,7 @@ sources: tasks: - setup: | cd picom - CPPFLAGS="-I/usr/local/include" meson -Dunittest=true build + CPPFLAGS="-I/usr/local/include" meson setup -Dunittest=true build - build: | cd picom ninja -C build diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index d73c5769..c8e667e1 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -14,7 +14,7 @@ sources: tasks: - setup: | cd picom - CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" meson -Dunittest=true build + CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" meson setup -Dunittest=true build - build: | cd picom ninja -C build diff --git a/.circleci/config.yml b/.circleci/config.yml index bed676bf..36ecc504 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ commands: - ".git" - run: name: config - command: CC=<< parameters.cc >> meson << parameters.build-config >> -Dunittest=true --werror . build + command: CC=<< parameters.cc >> meson setup << parameters.build-config >> -Dunittest=true --werror . build - run: name: build command: ninja -vC build diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b1d5987d..29ccf790 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,11 +18,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} @@ -32,7 +32,7 @@ jobs: # Autobuild - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/coding-style-pr.yml b/.github/workflows/coding-style-pr.yml index 5de4c67f..48afce38 100644 --- a/.github/workflows/coding-style-pr.yml +++ b/.github/workflows/coding-style-pr.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: git fetch --depth=1 origin ${{ github.event.pull_request.base.sha }} - uses: yshui/git-clang-format-lint@v1.14 with: diff --git a/.github/workflows/coding-style.yml b/.github/workflows/coding-style.yml index 49f5379a..4eceb944 100644 --- a/.github/workflows/coding-style.yml +++ b/.github/workflows/coding-style.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 2 - uses: yshui/git-clang-format-lint@v1.14 diff --git a/src/backend/backend.c b/src/backend/backend.c index 5120672b..f154c915 100644 --- a/src/backend/backend.c +++ b/src/backend/backend.c @@ -194,7 +194,7 @@ bool paint_all_new(session_t *ps, struct managed_win *const t) { auto after_damage_us = (uint64_t)now.tv_sec * 1000000UL + (uint64_t)now.tv_nsec / 1000; log_trace("Getting damage took %" PRIu64 " us", after_damage_us - after_sync_fence_us); if (ps->next_render > 0) { - log_verbose("Render schedule deviation: %ld us (%s) %" PRIu64 " %ld", + log_verbose("Render schedule deviation: %ld us (%s) %" PRIu64 " %" PRIu64, labs((long)after_damage_us - (long)ps->next_render), after_damage_us < ps->next_render ? "early" : "late", after_damage_us, ps->next_render); diff --git a/src/config.c b/src/config.c index 08d9f628..63b8fb0c 100644 --- a/src/config.c +++ b/src/config.c @@ -43,10 +43,7 @@ const char *xdg_config_home(void) { return NULL; } - xdgh = cvalloc(strlen(home) + strlen(default_dir) + 1); - - strcpy(xdgh, home); - strcat(xdgh, default_dir); + xdgh = mstrjoin(home, default_dir); } else { xdgh = strdup(xdgh); } diff --git a/src/picom.c b/src/picom.c index 55c65d2c..841c6f32 100644 --- a/src/picom.c +++ b/src/picom.c @@ -210,11 +210,13 @@ collect_vblank_interval_statistics(struct vblank_event *e, void *ud) { if (frame_count == 1) { render_statistics_add_vblank_time_sample( &ps->render_stats, frame_time); - log_trace("Frame count %lu, frame time: %d us, ust: " - "%" PRIu64 "", + log_trace("Frame count %" PRIu64 ", frame time: %d us, " + "ust: " + "%" PRIu64, frame_count, frame_time, e->ust); } else { - log_trace("Frame count %lu, frame time: %d us, msc: " + log_trace("Frame count %" PRIu64 ", frame time: %d us, " + "msc: " "%" PRIu64 ", not adding sample.", frame_count, frame_time, e->ust); } diff --git a/src/vblank.c b/src/vblank.c index b9070881..81a6cb9e 100644 --- a/src/vblank.c +++ b/src/vblank.c @@ -327,7 +327,7 @@ sgi_video_sync_scheduler_callback(EV_P attr_unused, ev_async *w, int attr_unused }; sched->base.vblank_event_requested = false; sched->last_msc = msc; - log_verbose("Received vblank event for msc %lu", event.msc); + log_verbose("Received vblank event for msc %" PRIu64, event.msc); vblank_scheduler_invoke_callbacks(&sched->base, &event); } #endif @@ -411,7 +411,7 @@ static void handle_present_complete_notify(struct present_vblank_scheduler *self auto now_us = (unsigned long)(now.tv_sec * 1000000L + now.tv_nsec / 1000); double delay_sec = 0.0; if (now_us < cne->ust) { - log_trace("The end of this vblank is %lu us into the " + log_trace("The end of this vblank is %" PRIu64 " us into the " "future", cne->ust - now_us); delay_sec = (double)(cne->ust - now_us) / 1000000.0; @@ -566,4 +566,4 @@ bool vblank_handle_x_events(struct vblank_scheduler *self) { return fn(self); } return true; -} \ No newline at end of file +} diff --git a/src/win.c b/src/win.c index c5690b61..81660c81 100644 --- a/src/win.c +++ b/src/win.c @@ -470,7 +470,8 @@ void win_process_update_flags(session_t *ps, struct managed_win *w) { // Whether the window was visible before we process the mapped flag. i.e. // is the window just mapped. bool was_visible = win_is_real_visible(w); - log_trace("Processing flags for window %#010x (%s), was visible: %d, flags: %#lx", + log_trace("Processing flags for window %#010x (%s), was visible: %d, flags: " + "%#" PRIx64, w->base.id, w->name, was_visible, w->flags); if (win_check_flags_all(w, WIN_FLAGS_MAPPED)) {