Update clang-format

.clang-format

@@ -1,11 +1,12 @@
-BasedOnStyle: google
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortBlocksOnASingleLine: false
 AlwaysBreakBeforeMultilineStrings: false
+BasedOnStyle: google
+ColumnLimit: 0
 IndentWidth: 4
+InsertBraces: true
 PointerBindsToType: false
-ColumnLimit: 0
-SpaceBeforeParens: ControlStatements
 SortIncludes: false
+SpaceBeforeParens: ControlStatements

.github/workflows/main.yml

@@ -20,15 +20,15 @@ jobs:
     - run: git fetch --prune --unshallow
     - name: fetch or build Docker container
       run: |
-        docker build --pull --no-cache --rm -t=i3lock -f travis/Dockerfile .
+        docker build --pull --no-cache --rm -t=i3lock -f ci/Dockerfile .
         docker run -e CC -v $PWD:/usr/src:rw i3lock /bin/sh -c 'git config --global --add safe.directory /usr/src && mkdir build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror" meson .. && ninja'
   formatting:
     name: Check formatting
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
       run: |
-        sudo apt-get install -y clang-format-11
+        sudo apt-get install -y clang-format-15
     - name: Check formatting
-      run: clang-format-11 --dry-run --Werror $(git ls-files '*.c' 'include/*.h')
+      run: clang-format-15 --dry-run --Werror $(git ls-files '*.c' 'include/*.h')

travis/Dockerfile → ci/Dockerfile

@@ -11,7 +11,7 @@ RUN echo 'APT::Acquire::Retries "5";' > /etc/apt/apt.conf.d/80retry
 # (3608 kB/s)). Hence, let’s stick with httpredir.debian.org (default) for now.
 
 # Install mk-build-deps (for installing the i3 build dependencies),
-# clang and clang-format-9 (for checking formatting and building with clang),
+# clang (for building),
 # lintian (for checking spelling errors),
 # test suite dependencies (for running tests)
 RUN apt-get update && \

dpi.c

@@ -103,7 +103,8 @@ int logical_px(const int logical) {
      * systems to 96 dpi in order to get the behavior they expect/are used to,
      * but since we can easily detect this case in code, let’s do it for them.
      */
-    if ((dpi / 96.0) < 1.25)
+    if ((dpi / 96.0) < 1.25) {
         return logical;
+    }
     return ceil((dpi / 96.0) * logical);
 }