Merge branch 'next' into stable/9

Bumped version number in meson.build

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>

Author: yshui

.builds/freebsd.yml

@@ -0,0 +1,28 @@
+image: freebsd/latest
+packages:
+  - libev
+  - libXext
+  - libxcb
+  - meson
+  - pkgconf
+  - cmake
+  - xcb-util-renderutil
+  - xcb-util-image
+  - pixman
+  - uthash
+  - libconfig
+  - libglvnd
+  - dbus
+  - pcre
+sources:
+  - https://github.com/yshui/picom
+tasks:
+  - setup: |
+      cd picom
+      CPPFLAGS="-I/usr/local/include" meson -Dunittest=true build
+  - build: |
+      cd picom
+      ninja -C build
+  - unittest: |
+      cd picom
+      ninja -C build test

.circleci/config.yml

@@ -39,7 +39,7 @@ jobs:
     executor: e
     steps:
       - build:
-          build-config: -Dbuild_docs=true -Db_coverage=true
+          build-config: -Dwith_docs=true -Db_coverage=true
       - persist_to_workspace:
           root: .
           paths:

.clang-tidy

@@ -0,0 +1,21 @@
+Checks: >
+  readability-*,
+  performance-*,
+  modernize-*,
+  google-readability-todo,
+  cert-err34-c,
+  cert-flp30-c,
+  bugprone-*,
+  misc-misplaced-const,
+  misc-redundant-expression,
+  misc-static-assert,
+  -clang-analyzer-*,
+  -readability-isolate-declaration,
+  -readability-magic-numbers
+AnalyzeTemporaryDtors: false
+FormatStyle:     file
+CheckOptions:
+  - key: readability-magic-numbers.IgnoredIntegerValues
+    value: 4;8;16;24;32;1;2;3;4096;65536;
+  - key: readability-magic-numbers.IgnoredFloatingPointValues
+    value: 255.0;1.0;

.github/issue_template.md

@@ -14,14 +14,22 @@
 <!-- Tell us something about the desktop environment you are using, for example: i3-gaps, Gnome Shell, etc. -->
 
 ### picom version
-<!-- Put the output of `compton --version` or `picom --version` here. -->
-<!-- If you are running compton v4 or later, please also include the output of `compton --diagnostics` or `picom --diagnostics` -->
-<!-- Example: v1 -->
+<!-- Put the output of `picom --version` here. -->
+<!-- Example: v8.2 -->
+<details>
+<summary>Diagnostics</summary>
+
+<!-- Please also include the output of `picom --diagnostics` -->
+</details>
 
 ### Configuration:
+<details>
+    <summary>Configuration file</summary>
+
 ```
 // Paste your configuration here
 ```
+</details>
 
 ### Steps of reproduction
 <!--

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,47 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [next]
+  pull_request:
+    branches: [next]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['cpp', 'python']
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    # Install dependencies
+    - run: sudo apt install libxext-dev libxcb1-dev libxcb-damage0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-randr0-dev libxcb-composite0-dev libxcb-image0-dev libxcb-present-dev libxcb-xinerama0-dev libxcb-glx0-dev libpixman-1-dev libdbus-1-dev libconfig-dev libgl1-mesa-dev  libpcre2-dev  libevdev-dev uthash-dev libev-dev libx11-xcb-dev meson ninja-build
+      if: ${{ matrix.language == 'cpp' }}
+
+    # Autobuild
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/coding-style-pr.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: git fetch --depth=1 origin ${{ github.event.pull_request.base.sha }}
-    - uses: yshui/git-clang-format-lint@v1.10
+    - uses: yshui/git-clang-format-lint@v1.11
       with:
         base: ${{ github.event.pull_request.base.sha }}

.github/workflows/coding-style.yml

@@ -9,6 +9,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 2
-    - uses: yshui/git-clang-format-lint@v1.10
+    - uses: yshui/git-clang-format-lint@v1.12
       with:
         base: ${{ github.event.ref }}~1

.gitignore

@@ -16,8 +16,10 @@ build/
 compile_commands.json
 build.ninja
 
-# ccls
+# language servers
 .ccls-cache
+.clangd
+.cache
 
 # CMake files
 compton-*.deb

CONTRIBUTORS

@@ -2,18 +2,23 @@ Sorted in alphabetical order
 Open an issue or pull request if you don't want your name listed here.
 
 Adam Jackson <ajax@nwnk.net>
+adelin-b <berard.adelin@gmail.com>
 Alexander Kapshuna <kapsh@kap.sh>
 Antonin Décimo <antonin.decimo@gmail.com>
 Antonio Vivace <dev@avivace.com>
 Avi-D-coder <avi.the.coder@gmail.com>
 Ben Friesen <bfriesen95@gmail.com>
 Bernd Busse <bernd@busse-net.de>
+Bert Gijsbers <gijsbers@science.uva.nl>
+bhagwan <bhagwan@disroot.org>
+Bodhi <craig.langman@gmail.com>
 Brottweiler <tibell.christoffer@gmail.com>
 Carl Worth <cworth@cworth.org>
 Christopher Jeffrey <chjjeffrey@gmail.com>
 Corax26 <cor.ax26@gmail.com>
 Dan Elkouby <streetwalkermc@gmail.com>
 Dana Jansens <danakj@orodu.net>
+Daniel Kwan <daniel.w.t.kwan@outlook.com>
 Dave Airlie <airlied@linux.ie>
 David Schlachter
 dolio
@@ -22,15 +27,22 @@ Dylan Araps <dylan.araps@gmail.com>
 Einar Lielmanis <einars@gmail.com>
 Eric Anholt <anholt@freebsd.org> <eric@anholt.net>
 Greg Flynn
+Harish Rajagopal <harish.rajagopals@gmail.com>
 hasufell <julian.ospald@googlemail.com>
+Ignacio Taranto <ignacio.taranto@eclypsium.com>
+Istvan Petres
 James Cloos <cloos@jhcloos.com>
 Jamey Sharp <jamey@minilop.net>
 Jan Beich <jbeich@FreeBSD.org>
 Jarrad <jarrad.whitaker@gmail.com>
 Javeed Shaikh <syscrash2k@gmail.com>
 Jerónimo Navarro <jnavarro@ancasrl.com.ar>
+jialeens <jialeadmin@163.com>
+Johnny Pribyl <pribylsnbits@gmail.com>
 Keith Packard <keithp@keithp.com>
 Kevin Kelley <kelleyk@kelleyk.net>
+ktprograms <ktprograms@gmail.com>
+Lukas Schmelzeisen <l.schmelzeisen@gmx.de>
 mæp <m.aep@live.com>
 Mark Tiefenbruck <mark@fluxbox.org>
 Matthew Allum <breakfast@10.am>
@@ -39,22 +51,35 @@ Michael Reed <supertron421@gmail.com>
 Michele Lambertucci <michele.lambertucci@mail.polimi.it>
 Namkhai Bourquin <namkhai.n3@protonmail.com>
 Nate Hart <nejthan@gmail.com>
+nia <nia@netbsd.org>
 notfoss <static.vortex@gmx.com>
+Omar Polo <op@omarpolo.com>
+orbea <orbea@riseup.net>
 @Paradigm0001
-Patrick Collins <Patricol@users.noreply.github.com>
+Patrick Collins
 Peter Mattern <matternp@arcor.de>
 Phil Blundell <pb@reciva.com>
-Que Quotion <quequotion@bugmenot.com>
+Que Quotion <quequotion@bugmenot.com> <the_q123@hotmail.com>
+Rafael Kitover <rkitover@gmail.com>
 Richard Grenville <pyxlcy@gmail.com>
 Rytis Karpuska <rytis.karpuska@gmail.com>
+Samuel Hand <samuel.d.hand@gmail.com>
 Scott Leggett <scott@sl.id.au>
+scrouthtv <lennivh24@gmail.com>
+Sebastien Waegeneire <sebastien@waegeneire.com>
+Subhaditya Nath <sn03.general@gmail.com>
 Tasos Sahanidis <tasos@tasossah.com>
+Thiago Kenji Okada <thiagokokada@gmail.com>
 Tilman Sauerbeck <tilman@code-monkey.de>
 Tim van Dalen <Tim@timvdalen.nl>
 Tomas Janousek <tomi@nomi.cz>
+Tom Dörr <tomdoerr96@gmail.com>
+Toni Jarjour
+Tuomas Kinnunen <tuomas.kinnunen@aalto.fi>
 Uli Schlachter <psychon@znc.in>
 Walter Lapchynski <wxl@ubuntu.com>
 Will Dietz <w@wdtz.org>
 XeCycle <XeCycle@Gmail.com>
 Yuxuan Shui <yshuiv7@gmail.com>
+zilrich
 ಠ_ಠ <easteregg@verfriemelt.org>

README.md

@@ -7,6 +7,8 @@ The current battle plan of this fork is to refactor it to make the code _possibl
 
 We also try to fix bugs.
 
+You can leave your feedbacks or thoughts in the [discussion tab](https://github.com/yshui/picom/discussions).
+
 The original README can be found [here](README_orig.md)
 
 ## Call for testers
@@ -87,10 +89,16 @@ Assuming you already have all the usual building tools installed (e.g. gcc, pyth
 * libev
 * uthash
 
-On Debian based distributions (e.g. Ubuntu), the list of needed packages are
+On Debian based distributions (e.g. Ubuntu), the needed packages are
+
+```
+libxext-dev libxcb1-dev libxcb-damage0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-randr0-dev libxcb-composite0-dev libxcb-image0-dev libxcb-present-dev libxcb-xinerama0-dev libxcb-glx0-dev libpixman-1-dev libdbus-1-dev libconfig-dev libgl1-mesa-dev libpcre2-dev libpcre3-dev libevdev-dev uthash-dev libev-dev libx11-xcb-dev meson
+```
+
+On Fedora, the needed packages are
 
 ```
-libxext-dev libxcb1-dev libxcb-damage0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-randr0-dev libxcb-composite0-dev libxcb-image0-dev libxcb-present-dev libxcb-xinerama0-dev libxcb-glx0-dev libpixman-1-dev libdbus-1-dev libconfig-dev libgl1-mesa-dev  libpcre2-dev  libevdev-dev uthash-dev libev-dev libx11-xcb-dev
+dbus-devel gcc git libconfig-devel libdrm-devel libev-devel libX11-devel libX11-xcb libXext-devel libxcb-devel mesa-libGL-devel meson pcre-devel pixman-devel uthash-devel xcb-util-image-devel xcb-util-renderutil-devel xorg-x11-proto-devel
 ```
 
 To build the documents, you need `asciidoc`
@@ -116,7 +124,7 @@ $ LDFLAGS="-L/path/to/libraries" CPPFLAGS="-I/path/to/headers" meson --buildtype
 
 As an example, on FreeBSD, you might have to run meson with:
 ```bash
-$ LDFLAGS="-L/usr/local/include" CPPFLAGS="-I/usr/local/include" meson --buildtype=release . build
+$ LDFLAGS="-L/usr/local/lib" CPPFLAGS="-I/usr/local/include" meson --buildtype=release . build
 $ ninja -C build
 ```