i3bar: work around weird clang compiler behavior

clang used to not warn (= error, with -Werror) about this line. Oh well.

.github/workflows/main.yml

@@ -53,7 +53,7 @@ jobs:
       run: |
         docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} ./travis/run-tests.sh
     - name: Archive test logs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: test-logs
         path: build/testsuite-*

RELEASE-NOTES-4.23

@@ -1,53 +0,0 @@
-
- ┌──────────────────────────────┐
- │ Release notes for i3 v4.23   │
- └──────────────────────────────┘
-
-This is i3 v4.23. This version is considered stable. All users of i3 are
-strongly encouraged to upgrade.
-
-The biggest feature of this release is i3bar’s workspace button protocol,
-which allows the workspace_command program or script to filter, re-arrange,
-or otherwise customize the displayed workspaces:
-https://i3wm.org/docs/i3bar-workspace-protocol.html
-
- ┌────────────────────────────┐
- │ Changes in i3 v4.23        │
- └────────────────────────────┘
-
-  • docs/userguide: add an example for negative lookaheads
-  • docs/userguide: fix default binding mistake
-  • docs/userguide: add link to tiling drag
-  • docs/hacking-howto: update build instructions, startup
-  • docs/debugging: add note about ptrace
-  • man/i3: remove outdated I3SOCK description
-  • all: build with -D_FORTIFY_SOURCE=3
-  • i3bar: fix configuring bars on “output nonprimary”
-  • i3bar: implement workspace button protocol
-  • add “focus workspace” command
-  • allow switching workspaces when in global fullscreen mode
-  • exec: single-fork instead of double-forking
-  • share X11 graphics context (GC) globally
-
- ┌────────────────────────────┐
- │ Bugfixes                   │
- └────────────────────────────┘
-
-  • fix regression with i3bar's output nonprimary
-  • fix top border resizing on tiling windows
-  • fix workspace not being focused on title bar scroll
-  • fix mouse bindings in modes
-  • fix crashes when using machine criterion
-  • fix for_window not working with urgency flags
-  • motif hints: respect maximum border style in append_layout
-
- ┌────────────────────────────┐
- │ Thanks!                    │
- └────────────────────────────┘
-
-Thanks for testing, bugfixes, discussions and everything I forgot go out to:
-
-  Harm te Hennepe, Nikita Bobko, Nikolay Nechaev, Orestis Floros, Sergey
-  Zhmylove, slyshot, Uli Schlachter, Wesley Schwengle
-
--- Michael Stapelberg, 2023-10-29

RELEASE-NOTES-4.24

@@ -0,0 +1,62 @@
+
+ ┌──────────────────────────────┐
+ │ Release notes for i3 v4.24   │
+ └──────────────────────────────┘
+
+This is i3 v4.24. This version is considered stable. All users of i3 are
+strongly encouraged to upgrade.
+
+Aside from a number of bug fixes and detail improvements, the tiling drag
+feature has been extended to allow swapping containers with the mouse.
+See the swap_modifier in the userguide: 
+https://i3wm.org/docs/userguide.html
+
+ ┌────────────────────────────┐
+ │ Changes in i3 v4.24        │
+ └────────────────────────────┘
+
+  • docs/userguide: add note to default_border about title bar in stacked/tabbed
+  • docs/userguide: fix focus output next example
+  • docs/hacking-howto: update build instructions
+  • docs/testsuite: update instructions
+  • docs/ipc: update section on IPC socket location
+  • docs/ipc: describe workspace events in more detail
+  • i3-sensible-terminal: add rio
+  • i3bar: use short-form text on a per-block basis
+  • reap zombie children when starting
+  • do not grab mouse pointer when executing bindings
+  • tiling drag: swap containers with the mouse
+  • disable automatic v3-to-v4 migration script
+  • pass _NET_WM_STATE_MAXIMIZED_{HORZ, VERT} (fixes tab bar in Google Chrome)
+  • avoid creating redundant containers when switching between layouts
+  • deprecate smart_borders in favour of hide_edge_borders smart/smart_no_gaps
+  • float windows of type _NET_WM_WINDOW_TYPE_NOTIFICATION by default
+  • add “popup_during_fullscreen all”
+  • mark fullscreen windows as maximized
+  • support multiple _NET_WM_STATE changes in one ClientMessage
+  • fix size_t format specifiers on 32-bit systems
+
+ ┌────────────────────────────┐
+ │ Bugfixes                   │
+ └────────────────────────────┘
+
+  • i3bar: fix clicks when horizontal padding is used
+  • consider workspace_auto_back_and_forth in focus workspace
+  • workspace next/prev: do not skip identically numbered workspaces
+  • make order of numbered workspace consistent with non-numbered
+  • fix crash with focus output and command criteria matching scratchpad window
+  • fix crash when reloading config with invalid criteria
+  • fix error log related crash
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  a-kenji, Alessandro Vinciguerra, Bimba Laszlo, colona_, Eddie Lebow, Harimbola
+  Santatra, Junicchi, Malix, Nikolay Nechaev, Orestis Floros, rsgowman,
+  sethpollen, Seth Pollen, systec-awe, Tasos Sahanidis, Theo Buehler, Wesley
+  Schwengle, Yonas Yanfa, yuvallangerontheroad
+
+-- Michael Stapelberg, 2024-11-06

debian/changelog

@@ -1,3 +1,9 @@
+i3-wm (4.24-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Wed, 06 Nov 2024 18:34:06 +0100
+
 i3-wm (4.23-1) unstable; urgency=medium
 
   * New upstream release.

i3bar/src/xcb.c

@@ -1515,7 +1515,9 @@ static void send_tray_clientmessage(void) {
 static void init_tray(void) {
     DLOG("Initializing system tray functionality\n");
     /* request the tray manager atom for the X11 display we are running on */
-    char atomname[strlen("_NET_SYSTEM_TRAY_S") + 11];
+    /* The following line cannot use strlen as that makes compilation fail with
+     * some versions of clang (-Wgnu-folding-constant): */
+    char atomname[18 /* strlen("_NET_SYSTEM_TRAY_S") */ + 11];
     snprintf(atomname, strlen("_NET_SYSTEM_TRAY_S") + 11, "_NET_SYSTEM_TRAY_S%d", screen);
     xcb_intern_atom_cookie_t tray_cookie;
     if (tray_reply == NULL) {

meson.build

@@ -6,7 +6,7 @@
 project(
   'i3',
   'c',
-  version: '4.23',
+  version: '4.24',
   default_options: [
     'c_std=c11',
     'warning_level=1',  # enable all warnings (-Wall)