[WIP] Just to look at diff.

.gitattributes

@@ -0,0 +1,18 @@
+.build.yml export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.mailmap export-ignore
+.github export-ignore
+.gitlab-ci.yml export-ignore
+.gitmodules export-ignore
+.travis.yml export-ignore
+releasenotes export-ignore
+doc/*.png export-ignore
+doc/help-output.txt export-ignore
+doc/sizing.svg export-ignore
+doc/Notes export-ignore
+doc/old-theme-convert-output.rasi export-ignore
+doc/test_xr.txt export-ignore
+doc/create_screenshot.sh export-ignore
+mkdocs export-ignore
+script/*.jpg export-ignore

.github/CONTRIBUTING.md

@@ -79,6 +79,6 @@ For example, should it be a configuration option or a hot-key.
 
 Requesting a feature is no guarantee it will be added.
 
-**Please do not submit reports related to wayland, see
-[here](https://github.com/DaveDavenport/rofi/wiki/Wayland) for more
-information.**
+**Please check that you are using this fork when reporting Wayland bugs
+and do not report them to upstream Rofi,
+[here](https://github.com/DaveDavenport/rofi/wiki/Wayland) for more information.**

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,10 @@ body:
   - type: markdown
     attributes:
       value: |
-        First read the [guidelines](https://github.com/DaveDavenport/rofi/blob/next/.github/CONTRIBUTING.md)! This is not optional for any report. People must be able to understand the full context of the report when reading it, at any time.
+        This fork follows the bug report template from upstream rofi with the obvious exception for Wayland-related issues.
+        Please do NOT report such issues to [upstream rofi](https://github.com/davatorium/rofi/discussions).
+
+        First read the [guidelines](https://github.com/lbonn/rofi/blob/next/.github/CONTRIBUTING.md)! This is not optional for any report. People must be able to understand the full context of the report when reading it, at any time.
 
         If you feel like you “it is simple and requires no explanation”, please
         consider you’re wrong and still fill the full report. Any report
@@ -24,13 +27,10 @@ body:
         If you report problems with speed in rofi, attach a [timing
         trace](https://github.com/davatorium/rofi/blob/next/doc/rofi-debugging.5.markdown#timing-traces).
 
-        **Please do not submit reports related to wayland, see
-        [here](https://github.com/DaveDavenport/rofi/wiki/Wayland) for more
-        information.**
 
   - type: input
     attributes:
-      label: "Rofi version (rofi -v)"
+      label: "Rofi version (rofi -v or git commit in case of build issue)"
       placeholder: "Version: 1.7.5"
     validations:
       required: true
@@ -97,9 +97,9 @@ body:
     id: wayland
     attributes:
       label: Using wayland display server protocol
-      description: I have checked and confirm that I am not using wayland as display server protocol. See [here](https://github.com/DaveDavenport/rofi/wiki/Wayland) for more        information.
+      description: I have checked and confirm that I am using [rofi with wayland support enabled](https://github.com/lbonn/rofi)
       options:
-        - label: "No, I don't use the wayland display server protocol"
+        - label: "Yes, I use rofi with wayland support"
           required: true
   - type: checkboxes
     id: latestversion
@@ -109,6 +109,3 @@ body:
       options:
         - label: "Yes, I have checked the problem exists in the latest stable version"
           required: false
-
-
-

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: discussion forum
-    url: https://github.com/davatorium/rofi/discussions
-    about: Please ask and answer questions here.
-  - name: Rofi IRC channel
-    url: https://web.libera.chat/?channels=#rofi
-    about: Please ask and answer question in real time here.

.github/actions/meson/action.yml

@@ -5,31 +5,27 @@ inputs:
   cc:
     description: Compiler to use
     required: true
+  xcb:
+    description: Enable xcb backend
+    default: enabled
+  wayland:
+    description: Enable wayland backend
+    default: enabled
 
 runs:
   using: composite
   steps:
     - id: pip
-      run: pip install meson ninja
+      run: pip install git+https://github.com/mesonbuild/meson@e58b3adc7044980bbddca1ad9674ac7b0c5bac0a ninja
       shell: bash
     - id: setup
-      run: meson setup builddir -Db_coverage=true
+      run: meson setup builddir -Dxcb=${{ inputs.xcb }} -Dwayland=${{ inputs.wayland }}
       shell: bash
       env:
         CC: ${{ inputs.cc }}
     - id: build
       run: ninja -C builddir
       shell: bash
-    - id: dist
-      run: ninja -C builddir dist
-      shell: bash
     - id: test
       run: ninja -C builddir test
       shell: bash
-    - id: doxy
-      run: ninja -C builddir doc/html > doxygen.log 2>&1 
-      shell: bash
-    - id: doxycheck
-      uses: ./.github/actions/doxycheck
-      with:
-        logfile: doxygen.log

.github/actions/release/action.yml

@@ -0,0 +1,23 @@
+name: Upload dist
+description: Create distribution file and upload to release
+
+runs:
+  using: composite
+  steps:
+    - id: dist
+      run: meson dist -C builddir --include-subprojects --formats xztar,gztar --no-tests
+      shell: bash
+    - id: upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: release_tarballs-${{ github.ref_name }}
+        path: |
+          builddir/meson-dist/*.tar.xz
+          builddir/meson-dist/*.tar.gz
+    - id: create_release
+      uses: softprops/action-gh-release@v2
+      with:
+        draft: true
+        files: |
+          builddir/meson-dist/*.tar.xz
+          builddir/meson-dist/*.tar.gz

.github/actions/setup/action.yml

@@ -1,6 +1,14 @@
 name: CI Build Setup
 description: Sets up build dependencies
 
+inputs:
+  xcb:
+    description: Install xcb dependencies
+    default: 'true'
+  wayland:
+    description: Install wayland dependencies
+    default: 'true'
+
 runs:
   using: composite
   steps:
@@ -16,20 +24,11 @@ runs:
           doxygen \
           fluxbox \
           gdb \
+          go-md2man \
           graphviz \
           jq \
           lcov \
           libpango1.0-dev \
-          libstartup-notification0-dev \
-          libxcb-ewmh-dev \
-          libxcb-icccm4-dev \
-          libxcb-randr0-dev \
-          libxcb-util0-dev \
-          libxcb-xinerama0-dev \
-          libxcb-xkb-dev \
-          libxcb-xrm-dev \
-          libxcb-cursor-dev \
-          libxcb-imdkit-dev \
           libxkbcommon-dev \
           libxkbcommon-dev \
           libxkbcommon-x11-dev \
@@ -46,8 +45,27 @@ runs:
           xterm \
           xutils-dev
       shell: bash
-    - id: doxy
-      run: git clone https://github.com/davatorium/doxy-coverage
+    - id: apt-wayland
+      if: ${{ inputs.wayland  == 'true' }}
+      run: |
+        sudo apt-get install -y \
+          libwayland-dev \
+          wayland-protocols
+      shell: bash
+    - id: apt-xcb
+      if: ${{ inputs.xcb  == 'true' }}
+      run: |
+        sudo apt-get install -y \
+          libstartup-notification0-dev \
+          libxcb-ewmh-dev \
+          libxcb-icccm4-dev \
+          libxcb-randr0-dev \
+          libxcb-util0-dev \
+          libxcb-xinerama0-dev \
+          libxcb-xkb-dev \
+          libxcb-xrm-dev \
+          libxcb-cursor-dev \
+          libxcb-imdkit-dev
       shell: bash
     - id: check
       run: |

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 > Please follow these steps before submitting your PR:
 >
-> - [ ] This PR targets the `next` branch and not `master`
+> - [ ] This PR targets the `wayland` branch and not `master`
 > - [ ] If your PR is a work in progress, include [WIP] in its title
 > - [ ] Its commits' summaries are reasonably descriptive
 > - [ ] You've described what this PR addresses below

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: CI Build
 on:
   push:
     branches:
-      - next
+      - wayland
     paths-ignore:
       - "**.md"
       - "**.markdown"
@@ -35,39 +35,29 @@ jobs:
       - uses: ./.github/actions/meson
         with:
           cc: clang
-  build-autotools-gcc:
+  build-meson-gcc-wayland:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
       - uses: ./.github/actions/setup
-      - uses: ./.github/actions/autotools
+        with:
+          xcb: false
+      - uses: ./.github/actions/meson
         with:
           cc: gcc
-          windowmode: enable
-          do-release: true
-  build-autotools-gcc-no-window:
+          xcb: disabled
+  build-meson-gcc-xcb:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: ./.github/actions/setup
-      - uses: ./.github/actions/autotools
-        with:
-          cc: gcc
-          windowmode: disable
-          do-release: false
-  build-autotools-clang:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
         with:
-          submodules: recursive
-      - uses: ./.github/actions/setup
-      - uses: ./.github/actions/autotools
+          wayland: false
+      - uses: ./.github/actions/meson
         with:
-          cc: clang
-          windowmode: enable
-          do-release: false
+          cc: gcc
+          wayland: disabled

.github/workflows/publish-release.yml

@@ -0,0 +1,19 @@
+name: Publish release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish-tarball:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - uses: ./.github/actions/setup
+      - uses: ./.github/actions/meson
+        with:
+          cc: gcc
+      - uses: ./.github/actions/release