Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
yshui committed Jan 14, 2024
2 parents 037c72f + 3390494 commit b7b3bf0
Show file tree
Hide file tree
Showing 62 changed files with 4,179 additions and 1,770 deletions.
19 changes: 5 additions & 14 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,21 @@ jobs:

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' }}
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

# Install dependencies
- run: sudo apt update && 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
- run: sudo apt update && sudo apt install libconfig-dev libdbus-1-dev libegl-dev libev-dev libgl-dev libpcre2-dev libpixman-1-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-damage0-dev libxcb-dpms0-dev libxcb-glx0-dev libxcb-image0-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-util-dev libxcb-xfixes0-dev libxext-dev meson ninja-build uthash-dev
if: ${{ matrix.language == 'cpp' }}

# Autobuild
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
4 changes: 2 additions & 2 deletions .github/workflows/coding-style-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: git fetch --depth=1 origin ${{ github.event.pull_request.base.sha }}
- uses: yshui/git-clang-format-lint@v1.13
- uses: yshui/git-clang-format-lint@v1.14
with:
base: ${{ github.event.pull_request.base.sha }}
4 changes: 2 additions & 2 deletions .github/workflows/coding-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: yshui/git-clang-format-lint@v1.13
- uses: yshui/git-clang-format-lint@v1.14
with:
base: ${{ github.event.ref }}~1
Empty file removed .gitmodules
Empty file.
164 changes: 87 additions & 77 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,85 +1,95 @@
Sorted in alphabetical order
Open an issue or pull request if you don't want your name listed here.
Sorted in alphabetical order. Feel free to open an issue or create a
pull request if you want to change or remove your mention.

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>
Adam Jackson <ajax at nwnk.net>
adelin-b <berard.adelin at gmail.com>
Alexander Kapshuna <kapsh at kap.sh>
Antonin Décimo <antonin.decimo at gmail.com>
Antonio Vivace <dev at avivace.com>
Avi ד <avi.the.coder at gmail.com>
Ben Friesen <bfriesen95 at gmail.com>
Bernd Busse <bernd at busse-net.de>
Bert Gijsbers <gijsbers at science.uva.nl>
bhagwan <bhagwan at disroot.org>
Bodhi <craig.langman at gmail.com>
Brottweiler <tibell.christoffer at gmail.com>
Carl Worth <cworth at cworth.org>
Christopher Jeffrey <chjjeffrey at gmail.com>
Corax26 <cor.ax26 at gmail.com>
Dan Elkouby <streetwalkermc at gmail.com>
Dana Jansens <danakj at orodu.net>
Daniel Kwan <daniel.w.t.kwan at outlook.com>
Dave Airlie <airlied at linux.ie>
David Schlachter
dolio
Duncan <duncan.britton@outlook.com>
Dylan Araps <dylan.araps@gmail.com>
Einar Lielmanis <einars@gmail.com>
Eric Anholt <anholt@freebsd.org> <eric@anholt.net>
Duncan <duncan.britton at outlook.com>
Dylan Araps <dylan.araps at gmail.com>
Einar Lielmanis <einars at gmail.com>
Eric Anholt <anholt at freebsd.org> <eric at anholt.net>
Evgeniy Baskov <j-basevgser at yandex.ru>
Greg Flynn
Harish Rajagopal <harish.rajagopals@gmail.com>
hasufell <julian.ospald@googlemail.com>
Ignacio Taranto <ignacio.taranto@eclypsium.com>
h7x4 <h7x4 at nani.wtf>
Harish Rajagopal <harish.rajagopals at gmail.com>
hasufell <julian.ospald at googlemail.com>
i-c-u-p
Ignacio Taranto <ignacio.taranto at 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>
Maxim Solovyov <visleaf@protonmail.com>
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
Jake <jakeroggenbuck2 at gmail.com>
James Cloos <cloos at jhcloos.com>
Jamey Sharp <jamey at minilop.net>
Jan Beich <jbeich at freebsd.org>
Jarrad <jarrad.whitaker at gmail.com>
Javeed Shaikh <syscrash2k at gmail.com>
Jerónimo Navarro <jnavarro at ancasrl.com.ar>
jialeens <jialeadmin at 163.com>
Johnny Pribyl <pribylsnbits at gmail.com>
Keith Packard <keithp at keithp.com>
Kevin Kelley <kelleyk at kelleyk.net>
ktprograms <ktprograms at gmail.com>
Kurenshe Nurdaulet
Lukas Schmelzeisen <l.schmelzeisen at gmx.de>
Mark Tiefenbruck <mark at fluxbox.org>
Matthew Allum <breakfast at 10.am>
Maxim Solovyov <msolovyov at protonmail.com>
Michael Reed <supertron421 at gmail.com>
Michele Lambertucci <michele.lambertucci at mail.polimi.it>
mæp <m.aep at live.com>
Namkhai Bourquin <namkhai.n3 at protonmail.com>
Nate Hart <nejthan at gmail.com>
nia <nia at netbsd.org>
Nikolay Borodin <monsterovich at gmail.com>
notfoss <static.vortex at gmx.com>
Omar Polo <op at omarpolo.com>
oofsauce <alanpanayotov at gmail.com>
orbea <orbea at riseup.net>
Paradigm0001
Patrick Collins
Peter Mattern <matternp@arcor.de>
Phil Blundell <pb@reciva.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>
Peter Mattern <matternp at arcor.de>
Phil Blundell <pb at reciva.com>
Que Quotion <quequotion at bugmenot.com>
Rafael Kitover <rkitover at gmail.com>
Richard Grenville <pyxlcy at gmail.com>
Rytis Karpuska <rytis.karpuska at gmail.com>
Samuel Hand <samuel.d.hand at gmail.com>
Scott Leggett <scott at sl.id.au>
scrouthtv <lennivh24 at gmail.com>
Sebastien Waegeneire <sebastien at waegeneire.com>
Stefan Radziuk <stefan.radziuk19 at imperial.ac.uk>
Subhaditya Nath <sn03.general at gmail.com>
Tasos Sahanidis <tasos at tasossah.com>
Thiago Kenji Okada <thiagokokada at gmail.com>
Tilman Sauerbeck <tilman at code-monkey.de>
Tim Siegel <siegeltr at gmail.com>
Tim van Dalen <tim at timvdalen.nl>
tokyoneon78 <mockcoder at protonmail.ch>
Tom Dörr <tomdoerr96 at gmail.com>
Tomas Janousek <tomi at nomi.cz>
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>
Tuomas Kinnunen <tuomas.kinnunen at aalto.fi>
Uli Schlachter <psychon at znc.in>
Walter Lapchynski <wxl at ubuntu.com>
Will Dietz <w at wdtz.org>
XeCycle <xecycle at gmail.com>
Yuxuan Shui <yshuiv7 at gmail.com>
zilrich
ಠ_ಠ <easteregg@verfriemelt.org>
ಠ_ಠ <easteregg at verfriemelt.org>
39 changes: 24 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
picom
=====

[![circleci](https://circleci.com/gh/yshui/picom.svg?style=shield)](https://circleci.com/gh/yshui/picom)
[![codecov](https://codecov.io/gh/yshui/picom/branch/next/graph/badge.svg?token=NRSegi0Gze)](https://codecov.io/gh/yshui/picom)
[![chat on discord](https://img.shields.io/discord/1106224720833159198?logo=discord)](https://discord.gg/SY5JJzPgME)

__picom__ is a compositor for X, and a [fork of Compton](History.md).

You can leave your feedback or thoughts in the [discussion tab](https://github.com/yshui/picom/discussions).
You can leave your feedback or thoughts in the [discussion tab](https://github.com/yshui/picom/discussions), or chat with other users on [discord](https://discord.gg/SY5JJzPgME)!

## Change Log

Expand All @@ -20,7 +24,9 @@ Assuming you already have all the usual building tools installed (e.g. gcc, pyth
* libXext
* xproto
* xcb
* xcb-util
* xcb-damage
* xcb-dpms
* xcb-xfixes
* xcb-shape
* xcb-renderutil
Expand All @@ -29,35 +35,33 @@ Assuming you already have all the usual building tools installed (e.g. gcc, pyth
* xcb-composite
* xcb-image
* xcb-present
* xcb-xinerama
* xcb-glx
* pixman
* libdbus (optional, disable with the `-Ddbus=false` meson configure flag)
* libconfig (optional, disable with the `-Dconfig_file=false` meson configure flag)
* libGL, libEGL (optional, disable with the `-Dopengl=false` meson configure flag)
* libpcre (optional, disable with the `-Dregex=false` meson configure flag)
* libpcre2 (optional, disable with the `-Dregex=false` meson configure flag)
* libev
* uthash

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 libgl-dev libegl-dev libpcre2-dev libpcre3-dev libevdev-dev uthash-dev libev-dev libx11-xcb-dev meson
libconfig-dev libdbus-1-dev libegl-dev libev-dev libgl-dev libpcre2-dev libpixman-1-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-damage0-dev libxcb-dpms0-dev libxcb-glx0-dev libxcb-image0-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-util-dev libxcb-xfixes0-dev libxext-dev meson ninja-build uthash-dev
```

On Fedora, the needed packages are

```
dbus-devel gcc git libconfig-devel libdrm-devel libev-devel libX11-devel libX11-xcb libXext-devel libxcb-devel libGL-devel libEGL-devel meson pcre-devel pixman-devel uthash-devel xcb-util-image-devel xcb-util-renderutil-devel xorg-x11-proto-devel
dbus-devel gcc git libconfig-devel libdrm-devel libev-devel libX11-devel libX11-xcb libXext-devel libxcb-devel libGL-devel libEGL-devel meson pcre2-devel pixman-devel uthash-devel xcb-util-image-devel xcb-util-renderutil-devel xorg-x11-proto-devel
```

To build the documents, you need `asciidoc`

### To build

```bash
$ git submodule update --init --recursive
$ meson --buildtype=release . build
$ meson setup --buildtype=release build
$ ninja -C build
```

Expand All @@ -68,13 +72,12 @@ If you have libraries and/or headers installed at non-default location (e.g. und
You can do that by setting the `CPPFLAGS` and `LDFLAGS` environment variables when running `meson`. Like this:

```bash
$ LDFLAGS="-L/path/to/libraries" CPPFLAGS="-I/path/to/headers" meson --buildtype=release . build

$ LDFLAGS="-L/path/to/libraries" CPPFLAGS="-I/path/to/headers" meson setup --buildtype=release build
```

As an example, on FreeBSD, you might have to run meson with:
```bash
$ LDFLAGS="-L/usr/local/lib" CPPFLAGS="-I/usr/local/include" meson --buildtype=release . build
$ LDFLAGS="-L/usr/local/lib" CPPFLAGS="-I/usr/local/include" meson setup --buildtype=release build
$ ninja -C build
```

Expand All @@ -88,15 +91,21 @@ Default install prefix is `/usr/local`, you can change it with `meson configure

## How to Contribute

### Code
All contributions are welcome!

New features you think should be included in picom, a fix for a bug you found - please open a PR!

You can take a look at the [Issues](https://github.com/yshui/picom/issues).

Contributions to the documents and wiki are also appreciated.

You can look at the [Projects](https://github.com/yshui/picom/projects) page, and see if there is anything that interests you. Or you can take a look at the [Issues](https://github.com/yshui/picom/issues).
Even if you don't want to add anything to picom, you are still helping by compiling and running this branch, and report any issue you can find.

### Non-code
### Become a Collaborator

Even if you don't want to contribute code, you can still contribute by compiling and running this branch, and report any issue you can find.
Becoming a collaborator of picom requires significant time commitment. You are expected to reply to issue reports, reviewing PRs, and sometimes fix bugs or implement new feature. You won't be able to push to the main branch directly, and all you code still has to go through code review.

Contributions to the documents and wiki will also be appreciated.
If this sounds good to you, feel free to contact me.

## Contributors

Expand Down
Loading

0 comments on commit b7b3bf0

Please sign in to comment.