feat(client): add subscribe_with_options

This commit adds a new method, subscribe_with_options to
komorebi-client.

The first option introduced is to tell komorebi to only send
notifications when the window manager state has been changed during the
processing of an event.

This new subscription option is now used with komorebi-bar to improve
rendering and update performance.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,16 +1,7 @@
 name: Bug report
 description: File a bug report
-labels: [bug]
-title: "[BUG]: "
+labels: [ bug ]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Please **do not** open an issue for applications with invisible windows leaving ghost tiles.
-
-        You can run `komorebic visible-windows` when the ghost tile is present on your workspace to retrieve the invisible window's exe, class name and title, and then use that to [ignore the window](https://lgug2z.github.io/komorebi/common-workflows/ignore-windows.html) responsible for the ghost tile.
-
-        If it is not possible to uniquely identify the invisible window resulting in a ghost tile through a mixture of exe, title and class identifiers , then this is not a bug with komorebi but a bug with the application you are using, and should open an issue with the developer(s) of that application.
   - type: textarea
     validations:
       required: true
@@ -19,7 +10,7 @@ body:
       description: >
         Please provide a short summary of the bug, along with any information
         you feel is relevant to replicating the bug.
-
+        
         You may include screenshots and videos in this section.
   - type: textarea
     validations:
@@ -29,10 +20,10 @@ body:
       description: >
         Please provide information about the versions of Windows and komorebi
         running on your machine.
-
+        
         Do not submit a bug if you are not using an official version of Windows
         such as AtlasOS; only official versions of Windows are supported.
-
+        
         ```
         systeminfo | findstr /B /C:"OS Name" /B /C:"OS Version"
         ```

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: Komorebi Documentation
     url: https://lgug2z.github.io/komorebi/
-    about: Please search the documentation website before opening an issue
-  - name: Komorebi Quickstart Tutorial Video
-    url: https://www.youtube.com/watch?v=MMZUAtHbTYY
-    about: If you are new, please make sure you watch the quickstart tutorial video
+    about: Please search the documentation website before opening an issue

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,24 +1,7 @@
 name: Feature request
-description: Suggest a new feature (Sponsors only)
-labels: [enhancement]
-title: "[FEAT]: "
+description: Suggest an improvement
+labels: [ enhancement ]
 body:
-  - type: dropdown
-    id: Sponsors
-    attributes:
-      label: Sponsorship Information
-      description: >
-        Feature requests are considered from individuals who are $5+ monthly sponsors to the project.
-
-        Please specify the platform you use to sponsor the project.
-      options:
-        - GitHub Sponsors
-        - Ko-fi
-        - Discord
-        - YouTube
-      default: 0
-    validations:
-      required: true
   - type: textarea
     validations:
       required: true
@@ -26,8 +9,6 @@ body:
       label: Suggestion
       description: >
         Please share your suggestion here. Be sure to include all necessary context.
-
-        If you sponsor on a platform where you use a different username, please specify the username here.
   - type: textarea
     validations:
       required: true

.github/pull_request_template.md

@@ -1,7 +0,0 @@
-<!--
-  Please follow the Conventional Commits specification.
-
-  If you need to update your PR with changes from `master`, please run `git rebase master`.
-
-  By opening this PR, you confirm that you have read and understood this project's `CONTRIBUTING.md`.
--->

.github/workflows/sponsor-check.yaml

@@ -1,125 +0,0 @@
-name: Feature Request Sponsor Check
-
-on:
-  issues:
-    types: [opened]
-  workflow_dispatch:
-    inputs:
-      test_username:
-        description: "Test username to check sponsorship for"
-        required: true
-        default: "octocat"
-      test_title:
-        description: "Test issue title"
-        required: true
-        default: "[FEAT] Test Feature Request"
-      test_sponsor_platform:
-        description: "Selected sponsor platform"
-        required: true
-        type: choice
-        options:
-          - "GitHub Sponsors"
-          - "Ko-fi"
-          - "Discord"
-          - "YouTube"
-
-jobs:
-  check-sponsor:
-    runs-on: ubuntu-latest
-    if: |
-      (github.event_name == 'workflow_dispatch') || (github.event_name == 'issues' &&
-       startsWith(github.event.issue.title, '[FEAT]') &&
-       github.event.issue.user.login != 'LGUG2Z' &&
-       fromJSON(github.event.issue.body).Sponsors == 'GitHub Sponsors')
-
-    steps:
-      - name: Get Issue Details
-        id: issue-details
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "username=${{ github.event.inputs.test_username }}" >> $GITHUB_OUTPUT
-            echo "title=${{ github.event.inputs.test_title }}" >> $GITHUB_OUTPUT
-            echo "sponsor_platform=${{ github.event.inputs.test_sponsor_platform }}" >> $GITHUB_OUTPUT
-          else
-            echo "username=${{ github.event.issue.user.login }}" >> $GITHUB_OUTPUT
-            echo "title=${{ github.event.issue.title }}" >> $GITHUB_OUTPUT
-            echo "sponsor_platform=$(jq -r '.Sponsors' <<< '${{ github.event.issue.body }}')" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Get Sponsorship Status
-        id: sponsorship
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.PAT }}
-          script: |
-            const username = '${{ steps.issue-details.outputs.username }}';
-            const sponsorPlatform = '${{ steps.issue-details.outputs.sponsor_platform }}';
-
-            if (sponsorPlatform !== 'GitHub Sponsors') {
-              console.log('Sponsor platform is not GitHub Sponsors, skipping check');
-              return true;
-            }
-
-            const sponsorshipQuery = `query($user: String!) {
-              user(login: $user) {
-                ... on Sponsorable {
-                  sponsorshipForViewerAsSponsorable {
-                    tier {
-                      name
-                      monthlyPriceInDollars
-                    }
-                  }
-                }
-              }
-            }`;
-
-            try {
-              const result = await github.graphql(sponsorshipQuery, {
-                user: username
-              });
-
-              console.log(result);
-              const sponsorship = result.user.sponsorshipForViewerAsSponsorable;
-              console.log(sponsorship);
-              const amount = sponsorship?.tier?.monthlyPriceInDollars || 0;
-
-              console.log(`Sponsorship amount for ${username}: $${amount}/month`);
-              return amount >= 5;
-            } catch (error) {
-              console.log(`Error checking sponsorship: ${error.message}`);
-              return false;
-            }
-
-      - name: Print Test Results
-        if: github.event_name == 'workflow_dispatch'
-        run: |
-          echo "Test Results for ${{ steps.issue-details.outputs.username }}:"
-          echo "Title: ${{ steps.issue-details.outputs.title }}"
-          echo "Platform: ${{ steps.issue-details.outputs.sponsor_platform }}"
-          echo "Would close issue: ${{ steps.sponsorship.outputs.result == 'false' }}"
-
-      - name: Close Issue If Not Sponsor
-        if: |
-          github.event_name == 'issues' && 
-          steps.sponsorship.outputs.result == 'false'
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const issueNumber = context.issue.number;
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: issueNumber,
-              body: 'Thank you for your feature request! This repository requires a GitHub sponsorship of at least $5/month to submit feature requests. Please consider becoming a sponsor at https://github.com/sponsors/LGUG2Z'
-            });
-
-            await github.rest.issues.update({
-              owner,
-              repo,
-              issue_number: issueNumber,
-              state: 'closed'
-            });

.github/workflows/windows.yaml

@@ -15,88 +15,109 @@ on:
       - v*
   schedule:
     - cron: "30 0 * * 0" # Every day at 00:30 UTC
-  workflow_dispatch:
 
 jobs:
   build:
-    strategy:
-      fail-fast: true
-      matrix:
-        platform:
-          - os-name: Windows-x86_64
-            runs-on: windows-latest
-            target: x86_64-pc-windows-msvc
-          - os-name: Windows-aarch64
-            runs-on: windows-latest
-            target: aarch64-pc-windows-msvc
-    runs-on: ${{ matrix.platform.runs-on }}
-    permissions: write-all
-    env:
-      RUSTFLAGS: -Ctarget-feature=+crt-static -Dwarnings
-      GH_TOKEN: ${{ github.token }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - run: rustup toolchain install stable --profile minimal
-      - run: rustup toolchain install nightly --allow-downgrade -c rustfmt
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: "true"
-          cache-all-crates: "true"
-          key: ${{ matrix.platform.target }}
-      - run: cargo +nightly fmt --check
-      - run: cargo clippy
-      - uses: houseabsolute/actions-rust-cross@v1
-        with:
-          command: "build"
-          target: ${{ matrix.platform.target }}
-          args: "--locked --release"
-      - run: |
-          cargo install cargo-wix
-          cargo wix --no-build -p komorebi --nocapture -I .\wix\main.wxs --target ${{ matrix.platform.target }}
-      - uses: actions/upload-artifact@v4
-        with:
-          name: komorebi-${{ matrix.platform.target }}-${{ github.sha }}
-          path: |
-            target/${{ matrix.platform.target }}/release/*.exe
-            target/${{ matrix.platform.target }}/release/*.pdb
-            target/wix/komorebi-*.msi
-          retention-days: 14
-
-  nightly:
-    needs: build
+    name: Build
     runs-on: windows-latest
     permissions: write-all
-    if: ${{ github.ref == 'refs/heads/master' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' ) }}
     env:
+      RUSTFLAGS: -Ctarget-feature=+crt-static
       GH_TOKEN: ${{ github.token }}
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - x86_64-pc-windows-msvc
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - shell: bash
-        run: echo "VERSION=nightly" >> $GITHUB_ENV
-      - uses: actions/download-artifact@v4
-      - run: |
-          Compress-Archive -Force ./komorebi-x86_64-pc-windows-msvc-${{ github.sha }}/x86_64-pc-windows-msvc/release/*.exe komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip
-          Copy-Item ./komorebi-x86_64-pc-windows-msvc-${{ github.sha }}/wix/*x86_64.msi -Destination ./komorebi-$Env:VERSION-x86_64.msi
-          echo "$((Get-FileHash komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip" >checksums.txt
-
-          Compress-Archive -Force ./komorebi-aarch64-pc-windows-msvc-${{ github.sha }}/aarch64-pc-windows-msvc/release/*.exe komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip
-          Copy-Item ./komorebi-aarch64-pc-windows-msvc-${{ github.sha }}/wix/*aarch64.msi -Destination ./komorebi-$Env:VERSION-aarch64.msi
-          echo "$((Get-FileHash komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip" >>checksums.txt
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: "true"
-          cache-all-crates: "true"
-      - shell: bash
+      - name: Prep cargo dirs
         run: |
-          if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
-          git tag -d nightly || true
-          git tag nightly
-          kokai release --no-emoji --add-links github:commits,issues --ref nightly >"CHANGELOG.md"
-      - shell: bash
+          New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
+          New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
+        shell: powershell
+      - name: Set environment variables appropriately for the build
+        run: |
+          echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+          echo "TARGET=${{ matrix.target }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
+          echo "SKIP_TESTS=" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
+      - name: Cache cargo registry, git trees and binaries
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Get rustc commit hash
+        id: cargo-target-cache
+        run: |
+          echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
+        shell: bash
+      - name: Cache cargo build
+        uses: actions/cache@v4
+        with:
+          path: target
+          key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ github.base_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install Rustup using win.rustup.rs
+        run: |
+          # Disable the download progress bar which can cause perf issues
+          $ProgressPreference = "SilentlyContinue"
+          Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
+          .\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --profile=minimal
+        shell: powershell
+      - name: Ensure stable toolchain is up to date
+        run: rustup update stable
+        shell: bash
+      - name: Install the target
+        run: |
+          rustup target install ${{ matrix.target }}
+      - name: Run Cargo checks
+        run: |
+          cargo fmt --check
+          cargo check
+          cargo clippy
+      - name: Run a full build
+        run: |
+          cargo build --locked --release --target ${{ matrix.target }}
+      - name: Create MSI installer
+        run: |
+          cargo install cargo-wix
+          cargo wix -p komorebi --nocapture -I .\wix\main.wxs --target x86_64-pc-windows-msvc
+      - name: Upload the built artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: komorebi-${{ matrix.target }}
+          path: |
+            target/${{ matrix.target }}/release/komorebi.exe
+            target/${{ matrix.target }}/release/komorebic.exe
+            target/${{ matrix.target }}/release/komorebic-no-console.exe
+            target/${{ matrix.target }}/release/komorebi-bar.exe
+            target/${{ matrix.target }}/release/komorebi-gui.exe
+            target/${{ matrix.target }}/release/komorebi.pdb
+            target/${{ matrix.target }}/release/komorebic.pdb
+            target/${{ matrix.target }}/release/komorebi_gui.pdb
+            target/wix/komorebi-*.msi
+          retention-days: 7
+      - name: Check GoReleaser
+        uses: goreleaser/goreleaser-action@v3
+        env:
+          GORELEASER_CURRENT_TAG: v0.1.29
+        with:
+          version: latest
+          args: build --skip=validate --clean
+      - name: Prepare nightly artifacts
+        if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'schedule' }}
+        run: |
+          Compress-Archive .\target\${{ matrix.target }}\release\*.exe komorebi-nightly-x86_64-pc-windows-msvc.zip
+          Copy-Item ./target/wix/*.msi -Destination ./komorebi-nightly-x86_64.msi
+          echo "$((Get-FileHash komorebi-nightly-x86_64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-nightly-x86_64-pc-windows-msvc.zip" >checksums.txt
+      - name: Update nightly
+        if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'schedule' }}
+        shell: bash
         run: |
           gh release delete nightly --yes || true
           git push origin :nightly || true
@@ -104,102 +125,41 @@ jobs:
             --target $GITHUB_SHA \
             --prerelease \
             --title "komorebi nightly (${GITHUB_SHA})" \
-            --notes-file CHANGELOG.md \
+            --notes "This nightly release of komorebi corresponds to [this commit](https://github.com/LGUG2Z/komorebi/commit/${GITHUB_SHA})." \
             komorebi-nightly-x86_64-pc-windows-msvc.zip \
             komorebi-nightly-x86_64.msi \
-            komorebi-nightly-aarch64-pc-windows-msvc.zip \
-            komorebi-nightly-aarch64.msi \
             checksums.txt
-
-  release-dry-run:
-    needs: build
-    runs-on: windows-latest
-    permissions: write-all
-    if: ${{ github.ref == 'refs/heads/master' }}
-    env:
-      GH_TOKEN: ${{ github.token }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - shell: bash
-        run: |
-          TAG=${{ github.event.release.tag_name }}
-          echo "VERSION=${TAG#v}" >> $GITHUB_ENV
-      - uses: actions/download-artifact@v4
-      - run: |
-          Compress-Archive -Force ./komorebi-x86_64-pc-windows-msvc-${{ github.sha }}/x86_64-pc-windows-msvc/release/*.exe komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip
-          Copy-Item ./komorebi-x86_64-pc-windows-msvc-${{ github.sha }}/wix/*x86_64.msi -Destination ./komorebi-$Env:VERSION-x86_64.msi
-          echo "$((Get-FileHash komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip" >checksums.txt
-
-          Compress-Archive -Force ./komorebi-aarch64-pc-windows-msvc-${{ github.sha }}/aarch64-pc-windows-msvc/release/*.exe komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip
-          Copy-Item ./komorebi-aarch64-pc-windows-msvc-${{ github.sha }}/wix/*aarch64.msi -Destination ./komorebi-$Env:VERSION-aarch64.msi
-          echo "$((Get-FileHash komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip" >>checksums.txt
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: "true"
-          cache-all-crates: "true"
-      - shell: bash
+      # Release
+      - name: Generate changelog
+        if: startsWith(github.ref, 'refs/tags/v')
+        shell: bash
         run: |
           if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
-          git tag -d nightly || true
-          kokai release --no-emoji --add-links github:commits,issues --ref "${{ github.ref_name }}" >"CHANGELOG.md"
-      - uses: softprops/action-gh-release@v2
-        with:
-          draft: true
-          body_path: "CHANGELOG.md"
-          files: |
-            checksums.txt
-            *.zip
-            *.msi
-
-  release:
-    needs: build
-    runs-on: windows-latest
-    permissions: write-all
-    if: startsWith(github.ref, 'refs/tags/v')
-    env:
-      GH_TOKEN: ${{ github.token }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - shell: bash
-        run: |
-          TAG=${{ github.ref_name }}
-          echo "VERSION=${TAG#v}" >> $GITHUB_ENV
-      - uses: actions/download-artifact@v4
-      - run: |
-          Compress-Archive -Force ./komorebi-x86_64-pc-windows-msvc-${{ github.sha }}/x86_64-pc-windows-msvc/release/*.exe komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip
-          Copy-Item ./komorebi-x86_64-pc-windows-msvc-${{ github.sha }}/wix/*x86_64.msi -Destination ./komorebi-$Env:VERSION-x86_64.msi
-          echo "$((Get-FileHash komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-$Env:VERSION-x86_64-pc-windows-msvc.zip" >checksums.txt
-
-          Compress-Archive -Force ./komorebi-aarch64-pc-windows-msvc-${{ github.sha }}/aarch64-pc-windows-msvc/release/*.exe komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip
-          Copy-Item ./komorebi-aarch64-pc-windows-msvc-${{ github.sha }}/wix/*aarch64.msi -Destination ./komorebi-$Env:VERSION-aarch64.msi
-          echo "$((Get-FileHash komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-$Env:VERSION-aarch64-pc-windows-msvc.zip" >>checksums.txt
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: "true"
-          cache-all-crates: "true"
-      - shell: bash
-        run: |
-          if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
-          git tag -d nightly || true
+          git tag -d nightly
           kokai release --no-emoji --add-links github:commits,issues --ref "$(git tag --points-at HEAD)" >"CHANGELOG.md"
-      - uses: softprops/action-gh-release@v2
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v3
+        if: startsWith(github.ref, 'refs/tags/v')
         with:
-          body_path: "CHANGELOG.md"
-          files: |
-            checksums.txt
-            *.zip
-            *.msi
+          version: latest
+          args: release --skip=validate --clean --release-notes=CHANGELOG.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SCOOP_TOKEN: ${{ secrets.SCOOP_TOKEN }}
+      - name: Add MSI to release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/v')
+        with:
+          files: "target/wix/komorebi-*.msi"
 
   winget:
+    name: Publish to WinGet
     runs-on: ubuntu-latest
-    needs: release
+    needs: build
     if: startsWith(github.ref, 'refs/tags/v')
+
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@main
+      - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: LGUG2Z.komorebi
           token: ${{ secrets.WINGET_TOKEN }}

.gitignore

@@ -4,5 +4,4 @@
 CHANGELOG.md
 dummy.go
 komorebic/applications.yaml
-komorebic/applications.json
 /.vs

.goreleaser.yml

@@ -0,0 +1,68 @@
+# Adapted from https://jondot.medium.com/shipping-rust-binaries-with-goreleaser-d5aa42a46be0
+project_name: komorebi
+
+before:
+  hooks:
+    - powershell.exe -Command "New-Item -Path . -Name dummy.go -ItemType file -Force"
+    - powershell.exe -Command "Add-Content -Path .\dummy.go -Value 'package main'"
+    - powershell.exe -Command "Add-Content -Path .\dummy.go -Value 'func main() {}'"
+
+builds:
+  - id: komorebi
+    main: dummy.go
+    goos: [ "windows" ]
+    goarch: [ "amd64" ]
+    binary: komorebi
+    hooks:
+      post:
+        - mkdir -p dist/windows_amd64
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebi.exe" ".\dist\komorebi_windows_amd64_v1\komorebi.exe"
+  - id: komorebic
+    main: dummy.go
+    goos: [ "windows" ]
+    goarch: [ "amd64" ]
+    binary: komorebic
+    hooks:
+      post:
+        - mkdir -p dist/windows_amd64
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebic.exe" ".\dist\komorebic_windows_amd64_v1\komorebic.exe"
+  - id: komorebic-no-console
+    main: dummy.go
+    goos: [ "windows" ]
+    goarch: [ "amd64" ]
+    binary: komorebic-no-console
+    hooks:
+      post:
+        - mkdir -p dist/windows_amd64
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebic-no-console.exe" ".\dist\komorebic-no-console_windows_amd64_v1\komorebic-no-console.exe"
+  - id: komorebi-gui
+    main: dummy.go
+    goos: [ "windows" ]
+    goarch: [ "amd64" ]
+    binary: komorebi-gui
+    hooks:
+      post:
+        - mkdir -p dist/windows_amd64
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebi-gui.exe" ".\dist\komorebi-gui_windows_amd64_v1\komorebi-gui.exe"
+  - id: komorebi-bar
+    main: dummy.go
+    goos: [ "windows" ]
+    goarch: [ "amd64" ]
+    binary: komorebi-bar
+    hooks:
+      post:
+        - mkdir -p dist/windows_amd64
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebi-bar.exe" ".\dist\komorebi-bar_windows_amd64_v1\komorebi-bar.exe"
+
+archives:
+  - name_template: "{{ .ProjectName }}-{{ .Version }}-x86_64-pc-windows-msvc"
+    format: zip
+    files:
+      - LICENSE.md
+      - CHANGELOG.md
+
+checksum:
+  name_template: checksums.txt
+
+changelog:
+  sort: asc

Cargo.toml

@@ -17,8 +17,8 @@ chrono = "0.4"
 crossbeam-channel = "0.5"
 crossbeam-utils = "0.8"
 color-eyre = "0.6"
-eframe = "0.30"
-egui_extras = "0.30"
+eframe = "0.29"
+egui_extras = "0.29"
 dirs = "5"
 dunce = "1"
 hotwatch = "0.5"
@@ -31,28 +31,24 @@ tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 paste = "1"
-sysinfo = "0.33"
+sysinfo = "0.31"
 uds_windows = "1"
 win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data", rev = "dd65e3f22d0521b78fcddde11abc2a3e9dcc32a8" }
 windows-implement = { version = "0.58" }
 windows-interface = { version = "0.58" }
 windows-core = { version = "0.58" }
-shadow-rs = "0.37"
-which = "7"
+shadow-rs = "0.35"
+which = "6"
 
 [workspace.dependencies.windows]
 version = "0.58"
 features = [
     "implement",
-    "Foundation_Numerics",
     "Win32_System_Com",
     "Win32_UI_Shell_Common", # for IObjectArray
     "Win32_Foundation",
     "Win32_Graphics_Dwm",
     "Win32_Graphics_Gdi",
-    "Win32_Graphics_Direct2D",
-    "Win32_Graphics_Direct2D_Common",
-    "Win32_Graphics_Dxgi_Common",
     "Win32_System_LibraryLoader",
     "Win32_System_RemoteDesktop",
     "Win32_System_Threading",
@@ -67,3 +63,6 @@ features = [
     "Media",
     "Media_Control"
 ]
+
+[profile.release]
+lto = true

README.md

@@ -29,8 +29,6 @@ Tiling Window Management for Windows.
 
 ![screenshot](https://user-images.githubusercontent.com/13164844/184027064-f5a6cec2-2865-4d65-a549-a1f1da589abf.png)
 
-## Overview
-
 _komorebi_ is a tiling window manager that works as an extension to Microsoft's
 [Desktop Window
 Manager](https://docs.microsoft.com/en-us/windows/win32/dwm/dwm-overview) in
@@ -52,8 +50,6 @@ _komorebi_, [common workflows](https://lgug2z.github.io/komorebi/common-workflow
 [configuration schema reference](https://komorebi.lgug2z.com/schema) and a
 complete [CLI reference](https://lgug2z.github.io/komorebi/cli/quickstart.html).
 
-## Community
-
 There is a [Discord server](https://discord.gg/mGkn66PHkx) available for
 _komorebi_-related discussion, help, troubleshooting etc. If you have any
 specific feature requests or bugs to report, please create an issue in this
@@ -61,62 +57,24 @@ repository.
 
 There is a [YouTube
 channel](https://www.youtube.com/channel/UCeai3-do-9O4MNy9_xjO6mg) where I post
-_komorebi_ development videos, feature previews and release overviews. Subscribing
-to the channel (which is monetized as part of the YouTube Partner Program) and
-watching videos is a really simple and passive way to contribute financially to
-the development and maintenance of _komorebi_.
+_komorebi_ development videos. If you would like to be notified of upcoming
+videos please subscribe and turn on notifications.
 
-There is an [Awesome List](https://github.com/LGUG2Z/awesome-komorebi) which
-showcases the many awesome projects that exist in the _komorebi_ ecosystem.
-
-## Licensing for Personal Use
-
-`komorebi` is licensed under the [Komorebi 1.0.0
-license](https://github.com/LGUG2Z/komorebi-license), which is a fork of the
-[PolyForm Strict 1.0.0
-license](https://polyformproject.org/licenses/strict/1.0.0). On a high level
-this means that you are free to do whatever you want with `komorebi` for
-personal use other than redistribution, or distribution of new works (i.e.
-hard-forks) based on the software.
-
-Anyone is free to make their own fork of `komorebi` with changes intended either
-for personal use or for integration back upstream via pull requests.
-
-The [Komorebi 1.0.0 License](https://github.com/LGUG2Z/komorebi-license) does
-not permit any kind of commercial use (i.e. using `komorebi` at work).
-
-## Sponsorship for Personal Use
-
-_komorebi_ is a free and educational source project, and one that encourages you
-to make charitable donations if you find the software to be useful and have the
+_komorebi_ is a free and source-available project, and one that encourages you to
+make charitable donations if you find the software to be useful and have the
 financial means.
 
 I encourage you to make a charitable donation to the [Palestine Children's
-Relief Fund](https://pcrf1.app.neoncrm.com/forms/gaza-recovery) or to contribute
-to a [Gaza Funds campaign](https://gazafunds.com) before you consider sponsoring
-me on GitHub.
+Relief Fund](https://pcrf1.app.neoncrm.com/forms/gaza-recovery) before you
+consider sponsoring me on GitHub.
 
 [GitHub Sponsors is enabled for this
-project](https://github.com/sponsors/LGUG2Z). Sponsors can claim custom roles on
-the Discord server, get shout outs at the end of _komorebi_-related videos on
-YouTube, and gain the ability to submit feature requests on the issue tracker.
+project](https://github.com/sponsors/LGUG2Z). Unfortunately I don't have
+anything specific to offer besides my gratitude and shout outs at the end of
+_komorebi_ live development videos and tutorials.
 
 If you would like to tip or sponsor the project but are unable to use GitHub
-Sponsors, you may also sponsor through [Ko-fi](https://ko-fi.com/lgug2z), or
-make an anonymous Bitcoin donation to `bc1qv73wzspc77k46uty4vp85x8sdp24mphvm58f6q`.
-
-## Licensing for Commercial Use
-
-A dedicated Individual Commercial Use License is available for those who want to
-use `komorebi` at work.
-
-The Individual Commerical Use License adds “Commercial Use” as a “Permitted Use”
-for the licensed individual only, for the duration of a valid paid license
-subscription only. All provisions and restrictions enumerated in the [Komorebi
-License](https://github.com/LGUG2Z/komorebi-license) continue to apply.
-
-More information, pricing and purchase links for Individual Commercial Use
-Licenses [can be found here](https://lgug2z.com/software/komorebi).
+Sponsors, you may also sponsor through [Ko-fi](https://ko-fi.com/lgug2z).
 
 # Installation
 
@@ -138,6 +96,7 @@ video will answer the majority of your questions.
 
 [![Watch the comparison video](https://img.youtube.com/vi/0LCbS_gm0RA/hqdefault.jpg)](https://www.youtube.com/watch?v=0LCbS_gm0RA)
 
+
 # Demonstrations
 
 [@amnweb](https://github.com/amnweb) showing _komorebi_ `v0.1.28` running on Windows 11 with window borders,
@@ -146,6 +105,7 @@ _komorebi_'s [Window Manager Event Subscriptions](https://github.com/LGUG2Z/komo
 
 https://github.com/LGUG2Z/komorebi/assets/13164844/21be8dc4-fa76-4f70-9b37-1d316f4b40c2
 
+
 [@haxibami](https://github.com/haxibami) showing _komorebi_ running on Windows
 11 with a terminal emulator, a web browser and a code editor. The original
 video can be viewed
@@ -163,11 +123,7 @@ https://user-images.githubusercontent.com/13164844/163496414-a9cde3d1-b8a7-4a7a-
 
 # Contribution Guidelines
 
-If you would like to contribute to `komorebi` please take the time to carefully
-read the guidelines below.
-
-Please see [CONTRIBUTING.md](./CONTRIBUTING.md) for more information about how
-code contributions to `komorebi` are licensed.
+If you would like to contribute to `komorebi` please take the time to carefully read the guidelines below.
 
 ## Commit hygiene
 
@@ -177,8 +133,8 @@ code contributions to `komorebi` are licensed.
 - Use `git cz` with
   the [Commitizen CLI](https://github.com/commitizen/cz-cli#conventional-commit-messages-as-a-global-utility) to prepare
   commit messages
-- Provide **at least** one short sentence or paragraph in your commit message body to describe your thought process for
-  the changes being committed
+- Provide **at least** one short sentence or paragraph in your commit message body to describe your thought process for the
+  changes being committed
 
 ## PRs should contain only a single feature or bug fix
 
@@ -217,8 +173,7 @@ This includes but is not limited to:
 
 - All `komorebic` commands
 - The `komorebi.json` schema
-- The [
-  `komorebi-application-specific-configuration`](https://github.com/LGUG2Z/komorebi-application-specific-configuration)
+- The [`komorebi-application-specific-configuration`](https://github.com/LGUG2Z/komorebi-application-specific-configuration)
   schema
 
 No user should ever find that their configuration file has stopped working after upgrading to a new version
@@ -234,6 +189,21 @@ ability for users to specify colours in `komorebi.json` in Hex format alongside
 There is also a process in place for graceful, non-breaking, deprecation of configuration options that are no longer
 required.
 
+## License
+
+`komorebi` is licensed under the [Komorebi 1.0.0 license](./LICENSE.md), which
+is a fork of the [PolyForm Strict 1.0.0
+license](https://polyformproject.org/licenses/strict/1.0.0). On a high level
+this means that you are free to do whatever you want with `komorebi` other than
+redistribution, or distribution of new works (ie. hard-forks) based on the
+software.
+
+Anyone is free to make their own fork of `komorebi` with changes intended
+either for personal use or for integration back upstream via pull requests.
+
+Please see [CONTRIBUTING.md](./CONTRIBUTING.md) for more information about how
+code contributions to `komorebi` are licensed.
+
 # Development
 
 If you use IntelliJ, you should enable the following settings to ensure that code generated by macros is recognised by
@@ -242,13 +212,13 @@ the IDE for completions and navigation:
 - Set `Expand declarative macros`
   to `Use new engine` under "Settings > Langauges & Frameworks > Rust"
 - Enable the following experimental features:
-    - `org.rust.cargo.evaluate.build.scripts`
-    - `org.rust.macros.proc`
+  - `org.rust.cargo.evaluate.build.scripts`
+  - `org.rust.macros.proc`
 
 # Logs and Debugging
 
-Logs from `komorebi` will be appended to `%LOCALAPPDATA%/komorebi/komorebi.log`; this file is never rotated or
-overwritten, so it will keep growing until it is deleted by the user.
+Logs from `komorebi` will be appended to `%LOCALAPPDATA%/komorebi/komorebi.log`; this file is never rotated or overwritten, so it will keep
+growing until it is deleted by the user.
 
 Whenever running the `komorebic stop` command or sending a Ctrl-C signal to `komorebi` directly, the `komorebi` process
 ensures that all hidden windows are restored before termination.
@@ -389,7 +359,7 @@ every `WindowManagerEvent` and `SocketMessage` handled by `komorebi` in a Rust c
 Below is a simple example of how to use `komorebi-client` in a basic Rust application.
 
 ```rust
-// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.32"}
+// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.29"}
 
 use anyhow::Result;
 use komorebi_client::Notification;
@@ -464,17 +434,12 @@ programming languages.
 
 # Appreciations
 
-- First and foremost, thank you to my wife, both for naming this project and for her patience throughout its
-  never-ending development
+- First and foremost, thank you to my wife, both for naming this project and for her patience throughout its never-ending development
 
-- Thank you to [@sitiom](https://github.com/sitiom) for
-  being [an exemplary open source community leader](https://jeezy.substack.com/p/the-open-source-contributions-i-appreciate)
+- Thank you to [@sitiom](https://github.com/sitiom) for being [an exemplary open source community leader](https://jeezy.substack.com/p/the-open-source-contributions-i-appreciate)
 
-- Thank you to the developers of [nog](https://github.com/TimUntersberger/nog) who came before me and whose work taught
-  me more than I can ever hope to repay
+- Thank you to the developers of [nog](https://github.com/TimUntersberger/nog) who came before me and whose work taught me more than I can ever hope to repay
 
-- Thank you to the developers of [GlazeWM](https://github.com/lars-berger/GlazeWM) for pushing the boundaries of tiling
-  window management on Windows with me and having an excellent spirit of collaboration
+- Thank you to the developers of [GlazeWM](https://github.com/lars-berger/GlazeWM) for pushing the boundaries of tiling window management on Windows with me and having an excellent spirit of collaboration
 
-- Thank you to [@Ciantic](https://github.com/Ciantic) for helping me bring
-  the [hidden Virtual Desktops cloaking function](https://github.com/Ciantic/AltTabAccessor/issues/1) to `komorebi`
+- Thank you to [@Ciantic](https://github.com/Ciantic) for helping me bring the [hidden Virtual Desktops cloaking function](https://github.com/Ciantic/AltTabAccessor/issues/1) to `komorebi`

docs/cli/animation-duration.md

@@ -3,18 +3,13 @@
 ```
 Set the duration for movement animations in ms
 
-Usage: komorebic.exe animation-duration [OPTIONS] <DURATION>
+Usage: komorebic.exe animation-duration <DURATION>
 
 Arguments:
   <DURATION>
           Desired animation durations in ms
 
 Options:
-  -a, --animation-type <ANIMATION_TYPE>
-          Animation type to apply the duration to. If not specified, sets global duration
-          
-          [possible values: movement, transparency]
-
   -h, --help
           Print help
 

docs/cli/animation-style.md

@@ -10,14 +10,9 @@ Options:
           Desired ease function for animation
           
           [default: linear]
-          [possible values: linear, ease-in-sine, ease-out-sine, ease-in-out-sine, ease-in-quad, ease-out-quad, ease-in-out-quad, ease-in-cubic, ease-in-out-cubic, ease-in-quart, ease-out-quart,
-          ease-in-out-quart, ease-in-quint, ease-out-quint, ease-in-out-quint, ease-in-expo, ease-out-expo, ease-in-out-expo, ease-in-circ, ease-out-circ, ease-in-out-circ, ease-in-back, ease-out-back,
-          ease-in-out-back, ease-in-elastic, ease-out-elastic, ease-in-out-elastic, ease-in-bounce, ease-out-bounce, ease-in-out-bounce]
-
-  -a, --animation-type <ANIMATION_TYPE>
-          Animation type to apply the style to. If not specified, sets global style
-          
-          [possible values: movement, transparency]
+          [possible values: linear, ease-in-sine, ease-out-sine, ease-in-out-sine, ease-in-quad, ease-out-quad, ease-in-out-quad, ease-in-cubic, ease-in-out-cubic, ease-in-quart,
+          ease-out-quart, ease-in-out-quart, ease-in-quint, ease-out-quint, ease-in-out-quint, ease-in-expo, ease-out-expo, ease-in-out-expo, ease-in-circ, ease-out-circ, ease-in-out-circ,
+          ease-in-back, ease-out-back, ease-in-out-back, ease-in-elastic, ease-out-elastic, ease-in-out-elastic, ease-in-bounce, ease-out-bounce, ease-in-out-bounce]
 
   -h, --help
           Print help

docs/cli/animation.md

@@ -3,18 +3,13 @@
 ```
 Enable or disable movement animations
 
-Usage: komorebic.exe animation [OPTIONS] <BOOLEAN_STATE>
+Usage: komorebic.exe animation <BOOLEAN_STATE>
 
 Arguments:
   <BOOLEAN_STATE>
           [possible values: enable, disable]
 
 Options:
-  -a, --animation-type <ANIMATION_TYPE>
-          Animation type to apply the state to. If not specified, sets global state
-          
-          [possible values: movement, transparency]
-
   -h, --help
           Print help
 

docs/cli/application-specific-configuration-schema.md

@@ -1,7 +1,7 @@
 # application-specific-configuration-schema
 
 ```
-Generate a JSON Schema for applications.json
+Generate a JSON Schema for applications.yaml
 
 Usage: komorebic.exe application-specific-configuration-schema
 

docs/cli/border-colour.md

@@ -18,7 +18,7 @@ Arguments:
 Options:
   -w, --window-kind <WINDOW_KIND>
           [default: single]
-          [possible values: single, stack, monocle, unfocused, floating]
+          [possible values: single, stack, monocle, unfocused]
 
   -h, --help
           Print help

docs/cli/check.md

@@ -3,12 +3,9 @@
 ```
 Check komorebi configuration and related files for common errors
 
-Usage: komorebic.exe check [OPTIONS]
+Usage: komorebic.exe check
 
 Options:
-  -k, --komorebi-config <KOMOREBI_CONFIG>
-          Path to a static configuration JSON file
-
   -h, --help
           Print help
 

docs/cli/close-workspace.md

@@ -1,12 +0,0 @@
-# close-workspace
-
-```
-Close the focused workspace (must be empty and unnamed)
-
-Usage: komorebic.exe close-workspace
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/convert-app-specific-configuration.md

@@ -1,16 +0,0 @@
-# convert-app-specific-configuration
-
-```
-Convert a v1 ASC YAML file to a v2 ASC JSON file
-
-Usage: komorebic.exe convert-app-specific-configuration <PATH>
-
-Arguments:
-  <PATH>
-          YAML file from which the application-specific configurations should be loaded
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/cycle-stack-index.md

@@ -1,16 +0,0 @@
-# cycle-stack-index
-
-```
-Cycle the index of the focused window in the focused stack in the specified cycle direction
-
-Usage: komorebic.exe cycle-stack-index <CYCLE_DIRECTION>
-
-Arguments:
-  <CYCLE_DIRECTION>
-          [possible values: previous, next]
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/eager-focus.md

@@ -1,16 +0,0 @@
-# eager-focus
-
-```
-Focus the first managed window matching the given exe
-
-Usage: komorebic.exe eager-focus <EXE>
-
-Arguments:
-  <EXE>
-          Case-sensitive exe identifier
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/enable-autostart.md

@@ -9,6 +9,9 @@ Options:
   -c, --config <CONFIG>
           Path to a static configuration JSON file
 
+  -f, --ffm
+          Enable komorebi's custom focus-follows-mouse implementation
+
       --whkd
           Enable autostart of whkd
 
@@ -18,9 +21,6 @@ Options:
       --bar
           Enable autostart of komorebi-bar
 
-      --masir
-          Enable autostart of masir
-
   -h, --help
           Print help
 

docs/cli/enforce-workspace-rules.md

@@ -1,12 +0,0 @@
-# enforce-workspace-rules
-
-```
-Enforce all workspace rules, including initial workspace rules that have already been applied
-
-Usage: komorebic.exe enforce-workspace-rules
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/fetch-app-specific-configuration.md

@@ -1,7 +1,7 @@
 # fetch-app-specific-configuration
 
 ```
-Fetch the latest version of applications.json from komorebi-application-specific-configuration
+Fetch the latest version of applications.yaml from komorebi-application-specific-configuration
 
 Usage: komorebic.exe fetch-app-specific-configuration
 

docs/cli/float-rule.md

@@ -1,9 +1,9 @@
-# ignore-rule
+# float-rule
 
 ```
-Add a rule to ignore the specified application
+Add a rule to always float the specified application
 
-Usage: komorebic.exe ignore-rule <IDENTIFIER> <ID>
+Usage: komorebic.exe float-rule <IDENTIFIER> <ID>
 
 Arguments:
   <IDENTIFIER>

docs/cli/focus-follows-mouse.md

@@ -0,0 +1,23 @@
+# focus-follows-mouse
+
+```
+Enable or disable focus follows mouse for the operating system
+
+Usage: komorebic.exe focus-follows-mouse [OPTIONS] <BOOLEAN_STATE>
+
+Arguments:
+  <BOOLEAN_STATE>
+          [possible values: enable, disable]
+
+Options:
+  -i, --implementation <IMPLEMENTATION>
+          [default: windows]
+
+          Possible values:
+          - komorebi: A custom FFM implementation (slightly more CPU-intensive)
+          - windows:  The native (legacy) Windows FFM implementation
+
+  -h, --help
+          Print help (see a summary with '-h')
+
+```

docs/cli/format-app-specific-configuration.md

@@ -0,0 +1,16 @@
+# format-app-specific-configuration
+
+```
+Format a YAML file for use with the 'ahk-app-specific-configuration' command
+
+Usage: komorebic.exe format-app-specific-configuration <PATH>
+
+Arguments:
+  <PATH>
+          YAML file from which the application-specific configurations should be loaded
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/kill.md

@@ -1,24 +0,0 @@
-# kill
-
-```
-Kill background processes started by komorebic
-
-Usage: komorebic.exe kill [OPTIONS]
-
-Options:
-      --whkd
-          Kill whkd if it is running as a background process
-
-      --ahk
-          Kill ahk if it is running as a background process
-
-      --bar
-          Kill komorebi-bar if it is running as a background process
-
-      --masir
-          Kill masir if it is running as a background process
-
-  -h, --help
-          Print help
-
-```

docs/cli/load-custom-layout.md

@@ -0,0 +1,16 @@
+# load-custom-layout
+
+```
+Load a custom layout from file for the focused workspace
+
+Usage: komorebic.exe load-custom-layout <PATH>
+
+Arguments:
+  <PATH>
+          JSON or YAML file from which the custom layout definition should be loaded
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/named-workspace-custom-layout-rule.md

@@ -0,0 +1,22 @@
+# named-workspace-custom-layout-rule
+
+```
+Add a dynamic custom layout for the specified workspace
+
+Usage: komorebic.exe named-workspace-custom-layout-rule <WORKSPACE> <AT_CONTAINER_COUNT> <PATH>
+
+Arguments:
+  <WORKSPACE>
+          Target workspace name
+
+  <AT_CONTAINER_COUNT>
+          The number of window containers on-screen required to trigger this layout rule
+
+  <PATH>
+          JSON or YAML file from which the custom layout definition should be loaded
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/named-workspace-custom-layout.md

@@ -0,0 +1,19 @@
+# named-workspace-custom-layout
+
+```
+Set a custom layout for the specified workspace
+
+Usage: komorebic.exe named-workspace-custom-layout <WORKSPACE> <PATH>
+
+Arguments:
+  <WORKSPACE>
+          Target workspace name
+
+  <PATH>
+          JSON or YAML file from which the custom layout definition should be loaded
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/stackbar-mode.md

@@ -1,18 +0,0 @@
-# stackbar-mode
-
-```
-Set the stackbar mode
-
-Usage: komorebic.exe stackbar-mode <MODE>
-
-Arguments:
-  <MODE>
-          Desired stackbar mode
-          
-          [possible values: always, never, on-stack]
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/start.md

@@ -6,6 +6,9 @@ Start komorebi.exe as a background process
 Usage: komorebic.exe start [OPTIONS]
 
 Options:
+  -f, --ffm
+          Allow the use of komorebi's custom focus-follows-mouse implementation
+
   -c, --config <CONFIG>
           Path to a static configuration JSON file
 
@@ -24,12 +27,6 @@ Options:
       --bar
           Start komorebi-bar in a background process
 
-      --masir
-          Start masir in a background process for focus-follows-mouse
-
-      --clean-state
-          Do not attempt to auto-apply a dumped state temp file from a previously running instance of komorebi
-
   -h, --help
           Print help
 

docs/cli/stop.md

@@ -9,15 +9,9 @@ Options:
       --whkd
           Stop whkd if it is running as a background process
 
-      --ahk
-          Stop ahk if it is running as a background process
-
       --bar
           Stop komorebi-bar if it is running as a background process
 
-      --masir
-          Stop masir if it is running as a background process
-
   -h, --help
           Print help
 

docs/cli/toggle-float-override.md

@@ -1,12 +0,0 @@
-# toggle-float-override
-
-```
-Enable or disable float override, which makes it so every new window opens in floating mode
-
-Usage: komorebic.exe toggle-float-override
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/toggle-focus-follows-mouse.md

@@ -0,0 +1,19 @@
+# toggle-focus-follows-mouse
+
+```
+Toggle focus follows mouse for the operating system
+
+Usage: komorebic.exe toggle-focus-follows-mouse [OPTIONS]
+
+Options:
+  -i, --implementation <IMPLEMENTATION>
+          [default: windows]
+
+          Possible values:
+          - komorebi: A custom FFM implementation (slightly more CPU-intensive)
+          - windows:  The native (legacy) Windows FFM implementation
+
+  -h, --help
+          Print help (see a summary with '-h')
+
+```

docs/cli/toggle-workspace-float-override.md

@@ -1,13 +0,0 @@
-# toggle-workspace-float-override
-
-```
-Enable or disable float override, which makes it so every new window opens in floating mode, for the currently focused workspace. If there was no override value set for the workspace previously it takes
-the opposite of the global value
-
-Usage: komorebic.exe toggle-workspace-float-override
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/toggle-workspace-window-container-behaviour.md

@@ -1,12 +0,0 @@
-# toggle-workspace-window-container-behaviour
-
-```
-Toggle the behaviour for new windows (stacking or dynamic tiling) for currently focused workspace. If there was no behaviour set for the workspace previously it takes the opposite of the global value
-
-Usage: komorebic.exe toggle-workspace-window-container-behaviour
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/workspace-custom-layout-rule.md

@@ -0,0 +1,25 @@
+# workspace-custom-layout-rule
+
+```
+Add a dynamic custom layout for the specified workspace
+
+Usage: komorebic.exe workspace-custom-layout-rule <MONITOR> <WORKSPACE> <AT_CONTAINER_COUNT> <PATH>
+
+Arguments:
+  <MONITOR>
+          Monitor index (zero-indexed)
+
+  <WORKSPACE>
+          Workspace index on the specified monitor (zero-indexed)
+
+  <AT_CONTAINER_COUNT>
+          The number of window containers on-screen required to trigger this layout rule
+
+  <PATH>
+          JSON or YAML file from which the custom layout definition should be loaded
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/workspace-custom-layout.md

@@ -0,0 +1,22 @@
+# workspace-custom-layout
+
+```
+Set a custom layout for the specified workspace
+
+Usage: komorebic.exe workspace-custom-layout <MONITOR> <WORKSPACE> <PATH>
+
+Arguments:
+  <MONITOR>
+          Monitor index (zero-indexed)
+
+  <WORKSPACE>
+          Workspace index on the specified monitor (zero-indexed)
+
+  <PATH>
+          JSON or YAML file from which the custom layout definition should be loaded
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/common-workflows/autostart.md

@@ -1,29 +0,0 @@
-# Autostart
-
-If you would like to autostart `komorebi`, you can use the `komorebic enable-autostart` command to generate a shortcut
-in the `shell:startup` folder.
-
-```
-Generates the komorebi.lnk shortcut in shell:startup to autostart komorebi
-
-Usage: komorebic.exe enable-autostart [OPTIONS]
-
-Options:
-  -c, --config <CONFIG>
-          Path to a static configuration JSON file
-
-  -f, --ffm
-          Enable komorebi's custom focus-follows-mouse implementation
-
-      --whkd
-          Enable autostart of whkd
-
-      --ahk
-          Enable autostart of ahk
-
-      --bar
-          Enable autostart of komorebi-bar
-
-  -h, --help
-          Print help
-```

docs/common-workflows/custom-layouts.md

@@ -0,0 +1,70 @@
+# Custom Layouts
+
+Particularly for users of ultrawide monitors, traditional tiling layouts may
+not seem like the most efficient use of screen space. If you feel this is the
+case with any of the default layouts, you are also welcome to create your own
+custom layouts and save them as JSON or YAML.
+
+If you're not comfortable writing the layouts directly in JSON or YAML, you can
+use the [komorebi Custom Layout
+Generator](https://lgug2z.github.io/komorebi-custom-layout-generator/) to
+interactively define a custom layout, and then copy the generated JSON content.
+
+Custom layouts can be loaded on the current workspace or configured for a
+specific workspace in the `komorebi.json` configuration file.
+
+```json
+{
+  "monitors": [
+    {
+      "workspaces": [
+        {
+          "name": "personal",
+          "custom_layout": "C:/Users/LGUG2Z/my-custom-layout.json"
+        },
+      ]
+    }
+  ]
+}
+```
+
+The fundamental building block of a custom _komorebi_ layout is the Column.
+
+Columns come in three variants:
+
+- **Primary**: This is where your primary focus will be on the screen most of
+  the time. There must be exactly one Primary Column in any custom layout.
+  Optionally, you can specify the percentage of the screen width that you want
+  the Primary Column to occupy.
+- **Secondary**: This is an optional column that can either be full height of
+  split horizontally into a fixed number of maximum rows. There can be any
+  number of Secondary Columns in a custom layout.
+- **Tertiary**: This is the final column where any remaining windows will be
+  split horizontally into rows as they get added.
+
+If there is only one window on the screen when a custom layout is selected,
+that window will take up the full work area of the screen.
+
+If the number of windows is equal to or less than the total number of columns
+defined in a custom layout, the windows will be arranged in an equal-width
+columns.
+
+When the number of windows is greater than the number of columns defined in the
+custom layout, the windows will begin to be arranged according to the
+constraints set on the Primary and Secondary columns of the layout.
+
+Here is an example custom layout that can be used as a starting point for your
+own:
+
+```yaml
+- column: Secondary
+  configuration: !Horizontal 2 # max number of rows
+- column: Primary
+  configuration: !WidthPercentage 50 # percentage of screen
+- column: Tertiary
+  configuration: Horizontal
+```
+
+<!-- TODO: Record a new video -->
+
+[![Watch the tutorial video](https://img.youtube.com/vi/SgmBHKEOcQ4/hqdefault.jpg)](https://www.youtube.com/watch?v=SgmBHKEOcQ4)

docs/common-workflows/floating-applications.md

@@ -1,16 +0,0 @@
-# Floating Windows
-
-Sometimes you will want a specific application to be managed as a floating window.
-You can add rules to enforce this behaviour in the `komorebi.json` configuration file.
-
-```json
-{
-  "floating_applications": [
-    {
-      "kind": "Title",
-      "id": "Media Player",
-      "matching_strategy": "Equals"
-    }
-  ]
-}
-```

docs/common-workflows/focus-follows-mouse.md

@@ -0,0 +1,34 @@
+# Focus Follows Mouse
+
+`komorebi` supports two focus-follows-mouse implementations; the native Windows
+Xmouse implementation, which treats the desktop, the task bar, and the system
+tray as windows and switches focus to them eagerly, and a custom `komorebi`
+implementation, which only considers windows managed by `komorebi` as valid
+targets to switch focus to when moving the mouse.
+
+To enable the `komorebi` implementation you must start the process with the
+`--ffm` flag to explicitly enable the feature. This is because the mouse
+tracking required for this feature significantly increases the CPU usage of the
+process (on my machine, it jumps from <1% to ~4~), and this CPU increase
+persists regardless of whether focus-follows-mouse is enabled or disabled at
+any given time via `komorebic`'s configuration commands.
+
+If the `komorebi` process has been started with the `--ffm` flag, you can
+enable focus follows mouse behaviour in the `komorebi.json` configuration file.
+
+```json
+{
+  "focus_follows_mouse": "Komorebi"
+}
+```
+
+When calling any of the `komorebic` commands related to focus-follows-mouse
+functionality, the `windows` implementation will be chosen as the default
+implementation. You can optionally specify the `komorebi` implementation by
+passing it as an argument to the `--implementation` flag:
+
+```powershell
+komorebic.exe toggle-focus-follows-mouse --implementation komorebi
+```
+
+

docs/common-workflows/ignore-windows.md

@@ -5,12 +5,12 @@ applications are [already generated for
 you](https://github.com/LGUG2Z/komorebi-application-specific-configuration)
 
 Sometimes you will want a specific application to never be tiled, and instead
-be completely ignored. You can add rules to enforce this behaviour in the
+float all the time. You can add rules to enforce this behaviour in the
 `komorebi.json` configuration file.
 
 ```json
 {
-  "ignore_rules": [
+  "float_rules": [
     {
       "kind": "Title",
       "id": "Media Player",

docs/common-workflows/multiple-bar-instances.md

@@ -1,19 +0,0 @@
-# Multiple Bar Instances
-
-If you would like to run multiple instances of `komorebi-bar` to target different monitors, it is possible to do so
-by maintaining multiple `komorebi.bar.json` configuration files and specifying their paths in the `bar_configurations`
-array in your `komorebi.json` configuration file.
-
-```json
-{
-  "bar_configurations": [
-    "C:/Users/LGUG2Z/komorebi.bar.monitor1.json",
-    "C:/Users/LGUG2Z/komorebi.bar.monitor2.json"
-  ]
-}
-```
-
-You may also use `$Env:USERPROFILE` or `$Env:KOMOREBI_CONFIG_HOME` when specifying the paths.
-
-The main difference between different `komorebi.bar.json` files will be the value of `monitor.index` which is used to
-target the monitor for each instance of `komorebi-bar`.

docs/example-configurations.md

@@ -62,7 +62,7 @@ using `default_workspace_padding` and `default_container_padding`.
 
 You may have seen videos and screenshots of people using `komorebi` with a
 thick, colourful active window border. You can also enable this by setting
-`border` to `true`. However, please be warned that this feature
+`active_window_border` to `true`. However, please be warned that this feature
 is a crude hack trying to compensate for the insistence of Microsoft Windows
 design teams to make custom borders with widths that are actually visible to
 the user a thing of the past and removing this capability from the Win32 API.
@@ -162,8 +162,6 @@ If you have an ultrawide monitor, I recommend using this layout.
 
 If you like the `grid` layout in [LeftWM](https://github.com/leftwm/leftwm-layouts) this is almost exactly the same!
 
-The `grid` layout does not support resizing windows tiles.
-
 ```
 +-----+-----+   +---+---+---+   +---+---+---+   +---+---+---+
 |     |     |   |   |   |   |   |   |   |   |   |   |   |   |
@@ -179,36 +177,17 @@ The `grid` layout does not support resizing windows tiles.
 
 `whkd` is a fairly basic piece of software with a simple configuration format:
 key bindings go to the left of the colon, and shell commands go to the right of the
-colon.
+colon. By default, the `whkdrc` file should be located in the `$Env:USERPROFILE/.config/` directory.
 
-As of [`v0.2.4`](https://github.com/LGUG2Z/whkd/releases/tag/v0.2.4), `whkd` can override most of Microsoft's
-limitations on hotkey bindings that include the `win` key. However, you will still need
-to [modify the registry](https://superuser.com/questions/1059511/how-to-disable-winl-in-windows-10) to prevent
-`win + l` from locking the operating system.
+Please remember that `whkd` does not support overriding Microsoft's limitations
+on hotkey bindings that include the `Windows` key. If this is important to you,
+I recommend using [AutoHotKey](https://autohotkey.com) to set up your key
+bindings for `komorebic` commands instead.
 
 ```
 {% include "./whkdrc.sample" %}
 ```
 
-### Configuration
-
-`whkd` searches for a `whkdrc` configuration file in the following locations:
-
-* `$Env:WHKD_CONFIG_HOME`
-* `$Env:USERPROFILE/.config`
-
-It is also possible to change a hotkey behavior depending on which application has focus:
-
-```
-alt + n [
-    # ProcessName as shown by `Get-Process`
-    Firefox       : echo "hello firefox"
-
-    # Spaces are fine, no quotes required
-    Google Chrome : echo "hello chrome"
-]
-```
-
 ### Setting .shell
 
 There is one special directive at the top of the file, `.shell` which can be

docs/index.md

@@ -1,7 +1,5 @@
 ![screenshot](https://user-images.githubusercontent.com/13164844/184027064-f5a6cec2-2865-4d65-a549-a1f1da589abf.png)
 
-## Overview
-
 `komorebi` is a tiling window manager that works as an extension to Microsoft's
 [Desktop Window
 Manager](https://docs.microsoft.com/en-us/windows/win32/dwm/dwm-overview) in
@@ -17,63 +15,12 @@ system and desktop environment by default. Users are free to make such
 modifications in their own configuration files for `komorebi`, but these will
 always remain opt-in and off-by-default.
 
-## Community
-
 There is a [Discord server](https://discord.gg/mGkn66PHkx) available for
-`komorebi`-related discussion, help, troubleshooting etc.
+`komorebi`-related discussion, help, troubleshooting etc. If you have any
+specific feature requests or bugs to report, please create an issue on
+[GitHub](https://github.com/LGUG2Z/komorebi).
 
-There is a [YouTube
-channel](https://www.youtube.com/channel/UCeai3-do-9O4MNy9_xjO6mg) where I post
-`komorebi` development videos, feature previews and release overviews. Subscribing
-to the channel (which is monetized as part of the YouTube Partner Program) and
-watching videos is a really simple and passive way to contribute financially to
-the development and maintenance of `komorebi`.
 
-There is an [Awesome List](https://github.com/LGUG2Z/awesome-komorebi) which
-showcases the many awesome projects that exist in the `komorebi` ecosystem.
-
-## Licensing for Personal Use
-
-`komorebi` is licensed under the [Komorebi 1.0.0 license](https://github.com/LGUG2Z/komorebi-license), which is a fork
-of the [PolyForm Strict 1.0.0 license](https://polyformproject.org/licenses/strict/1.0.0). On a high level this means
-that you are free to do whatever you want with `komorebi` for personal use other than redistribution, or distribution of
-new works (i.e. hard-forks) based on the software.
-
-Anyone is free to make their own fork of `komorebi` with changes intended either for personal use or for integration
-back upstream via pull requests.
-
-The [Komorebi 1.0.0 License](https://github.com/LGUG2Z/komorebi-license) does not permit any kind of commercial use (
-i.e. using `komorebi` at work).
-
-## Sponsorship for Personal Use
-
-`komorebi` is a free and educational source project, and one that encourages you
-to make charitable donations if you find the software to be useful and have the
-financial means.
-
-I encourage you to make a charitable donation to the [Palestine Children's
-Relief Fund](https://pcrf1.app.neoncrm.com/forms/gaza-recovery) or to contribute
-to a [Gaza Funds campaign](https://gazafunds.com) before you consider sponsoring
-me on GitHub.
-
-[GitHub Sponsors is enabled for this
-project](https://github.com/sponsors/LGUG2Z). Sponsors can claim custom roles on
-the Discord server, get shout-outs at the end of _komorebi_-related videos on
-YouTube, and gain the ability to submit feature requests on the issue tracker.
-
-If you would like to tip or sponsor the project but are unable to use GitHub
-Sponsors, you may also sponsor through [Ko-fi](https://ko-fi.com/lgug2z), or
-make an anonymous Bitcoin donation to `bc1qv73wzspc77k46uty4vp85x8sdp24mphvm58f6q`.
-
-## Licensing for Commercial Use
-
-A dedicated Individual Commercial Use License is available for those who want to
-use `komorebi` at work.
-
-The Individual Commerical Use License adds “Commercial Use” as a “Permitted Use”
-for the licensed individual only, for the duration of a valid paid license
-subscription only. All provisions and restrictions enumerated in the [Komorebi
-License](https://github.com/LGUG2Z/komorebi-license) continue to apply.
-
-More information, pricing and purchase links for Individual Commercial Use
-Licenses [can be found here](https://lgug2z.com/software/komorebi).
+There is also a [YouTube
+channel](https://www.youtube.com/channel/UCeai3-do-9O4MNy9_xjO6mg?sub_confirmation=1)
+where I share `komorebi` live programming videos and tutorial videos.

docs/installation.md

@@ -134,26 +134,6 @@ an offline machine to install.
 Once installed, proceed to get the [example configurations](example-configurations.md) (none of the commands for
 first-time set up and running komorebi require an internet connection).
 
-## Upgrades
-
-Before upgrading, make sure to run `komorebic stop --whkd --bar`. This is to ensure that all the current
-komorebi-related exe files can be replaced without issue.
-
-Then, depending on whether you installed via `scoop` or `winget`, you can run the appropriate command:
-
-```powershell
-# for winget
-winget upgrade LGUG2Z.komorebi
-```
-
-```powershell
-# for scoop
-scoop update komorebi
-```
-
-Once the upgrade is completed you can confirm that you have the latest version by running `komorebic --version`, and
-then start it with `komorebic start --whkd --bar`.
-
 ## Uninstallation
 
 Before uninstalling, first run `komorebic stop --whkd --bar` to make sure that
@@ -167,7 +147,7 @@ files created by the `quickstart` command and any other runtime files:
 
 ```powershell
 rm $Env:USERPROFILE\komorebi.json
-rm $Env:USERPROFILE\applications.json
+rm $Env:USERPROFILE\applications.yaml
 rm $Env:USERPROFILE\.config\whkdrc
 rm -r -Force $Env:LOCALAPPDATA\komorebi
 ```

docs/komorebi.bar.example.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.32/schema.bar.json",
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.29/schema.bar.json",
   "monitor": {
     "index": 0,
     "work_area_offset": {
@@ -33,11 +33,6 @@
     }
   ],
   "right_widgets": [
-    {
-      "Update": {
-        "enable": true
-      }
-    },
     {
       "Media": {
         "enable": true
@@ -78,4 +73,4 @@
       }
     }
   ]
-}
+}

docs/komorebi.example.json

@@ -1,6 +1,6 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.32/schema.json",
-  "app_specific_configuration_path": "$Env:USERPROFILE/applications.json",
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.29/schema.json",
+  "app_specific_configuration_path": "$Env:USERPROFILE/applications.yaml",
   "window_hiding_behaviour": "Cloak",
   "cross_monitor_move_behaviour": "Insert",
   "default_workspace_padding": 20,

docs/release/v0-1-22.md

@@ -0,0 +1,58 @@
+# v0.1.22
+
+In addition to the [changelog](https://github.com/LGUG2Z/komorebi/releases/tag/v0.1.22) of new features and fixes,
+please note the following changes from `v0.1.21` to adjust your configuration files accordingly.
+
+## tl;dr
+
+The way windows are sized and drawn has been improved to remove the need to manually specify and remove invisible
+borders for applications that overflow them. If you use the active window border, the first time you launch `v0.1.22`
+you may end up with a _huge_ border due to these changes.
+
+`active_window_border_width` and `active_window_border_offset` have been renamed to `border_width` and `border_offset`
+as they now also apply outside the context of the active window border.
+
+```json
+{
+  "active_window_border": true,
+  "border_width": 8,
+  "border_offset": -1
+}
+```
+
+Users of the active window border should start from these settings and read the notes below before making further
+adjustments.
+
+## Changes to `active_window_border`, and window sizing:
+
+- The border no longer creates a second drop-shadow around the active window
+- Windows are now sized to fill the layout region entirely, ignoring window decorations such as drop shadows
+- Border offset now starts exactly at the paint edge of the window on all sides
+- Windows are sized such that the border offset and border width are taken into account
+
+## Recommended patterns
+
+### Gapless
+
+- Disable "transparency effects" Personalization > Colors
+- Set the following settings in `komorebi.json`:
+```json
+{
+  "default_workspace_padding": 0,
+  "default_container_padding": 0,
+  "border_offset": -1,
+  "border_width": 0
+}
+```
+
+### 1px border
+
+A 1px border is drawn around the window edge. Users may see a gap for a single pixel, if the system theme has a
+transparent edge - this is the windows themed edge, and is not present for all applications.
+
+```json
+{
+  "border_offset": 0,
+  "border_width": 1
+}
+```

docs/troubleshooting.md

@@ -1,15 +1,5 @@
 # Troubleshooting
 
-## Phantom Tiles
-
-Sometimes you may experience an application which leaves "ghost tiles" on a workspace, where there is space reserved for
-a window but no window visible.
-
-You can ignore these windows by following these steps:
-
-* Run `komorebic visible-windows` to find details about the invisible window
-* Using that information, [create a rule to ignore that window](common-workflows/ignore-windows.md)
-
 ## AutoHotKey executable not found
 
 If you try to start komorebi with AHK using `komorebic start --ahk`, and you have
@@ -95,10 +85,10 @@ running `komorebic stop` and `komorebic start`.
 
    To avoid waiting an eternity:
 
-    - _Control Panel_ -> _Hardware and Sound_ -> _Power Options_ -> _Edit Plan
-      Settings_
+   - _Control Panel_ -> _Hardware and Sound_ -> _Power Options_ -> _Edit Plan
+     Settings_
 
-      _Turn off the display: 1 minute_
+     _Turn off the display: 1 minute_
 
    Allow a minute for the display to reset, then once it actually shuts off
    allow for any additional time as prompted by your monitor for the cycle to

justfile

@@ -1,5 +1,4 @@
 set windows-shell := ["pwsh.exe", "-NoLogo", "-Command"]
-
 export RUST_BACKTRACE := "full"
 
 clean:
@@ -8,36 +7,36 @@ clean:
 fmt:
     cargo +nightly fmt
     cargo +stable clippy
-    prettier --write .github/ISSUE_TEMPLATE/bug_report.yml
-    prettier --write .github/ISSUE_TEMPLATE/config.yml
-    prettier --write .github/ISSUE_TEMPLATE/feature_request.yml
+    prettier --write README.md
+    prettier --write .goreleaser.yml
     prettier --write .github/dependabot.yml
     prettier --write .github/FUNDING.yml
     prettier --write .github/workflows/windows.yaml
 
-install-targets *targets:
-    "{{ targets }}" -split ' ' | ForEach-Object { just install-target $_ }
-
 install-target target:
     cargo +stable install --path {{ target }} --locked
 
 install:
-    just install-targets komorebic komorebic-no-console komorebi komorebi-bar komorebi-gui
+    just install-target komorebic
+    just install-target komorebic-no-console
+    just install-target komorebi-gui
+    just install-target komorebi-bar
+    just install-target komorebi
 
-run target:
-    cargo +stable run --bin {{ target }} --locked
+run:
+    cargo +stable run --bin komorebi --locked
 
-warn target $RUST_LOG="warn":
-    just run {{ target }}
+warn $RUST_LOG="warn":
+    just run
 
-info target $RUST_LOG="info":
-    just run {{ target }}
+info $RUST_LOG="info":
+    just run
 
-debug target $RUST_LOG="debug":
-    just run {{ target }}
+debug $RUST_LOG="debug":
+    just run
 
-trace target $RUST_LOG="trace":
-    just run {{ target }}
+trace $RUST_LOG="trace":
+    just run
 
 deadlock $RUST_LOG="trace":
     cargo +stable run --bin komorebi --locked --features deadlock_detection
@@ -46,15 +45,13 @@ docgen:
     cargo run --package komorebic -- docgen
     Get-ChildItem -Path "docs/cli" -Recurse -File | ForEach-Object { (Get-Content $_.FullName) -replace 'Usage: ', 'Usage: komorebic.exe ' | Set-Content $_.FullName }
 
-jsonschema:
+schemagen:
     cargo run --package komorebic -- static-config-schema > schema.json
     cargo run --package komorebic -- application-specific-configuration-schema > schema.asc.json
     cargo run --package komorebi-bar -- --schema > schema.bar.json
+    generate-schema-doc .\schema.json --config template_name=js_offline --config minify=false .\static-config-docs\
 
-# this part is run in a nix shell because python is a nightmare
-schemagen:
-    rm -rf static-config-docs bar-config-docs
-    mkdir -p static-config-docs bar-config-docs
-    generate-schema-doc ./schema.json --config template_name=js_offline --config minify=false ./static-config-docs/
-    generate-schema-doc ./schema.bar.json --config template_name=js_offline --config minify=false ./bar-config-docs/
-    mv ./bar-config-docs/schema.bar.html ./bar-config-docs/schema.html
+    generate-schema-doc .\schema.bar.json --config template_name=js_offline --config minify=false .\bar-config-docs\
+
+    rm -Force .\bar-config-docs\schema.html
+    mv .\bar-config-docs\schema.bar.html .\bar-config-docs\schema.html

komorebi-bar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-bar"
-version = "0.1.33"
+version = "0.1.30"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -16,22 +16,22 @@ crossbeam-channel = { workspace = true }
 dirs = { workspace = true }
 dunce = { workspace = true }
 eframe = { workspace = true }
-egui-phosphor = "0.8"
+egui-phosphor = "0.7"
 font-loader = "0.11"
 hotwatch = { workspace = true }
 image = "0.25"
-netdev = "0.32"
+netdev = "0.31"
 num = "0.4"
 num-derive = "0.4"
 num-traits = "0.2"
 random_word = { version = "0.4", features = ["en"] }
-reqwest = { version = "0.12", features = ["blocking"] }
 schemars = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 starship-battery = "0.10"
 sysinfo = { workspace = true }
 tracing = { workspace = true }
+tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true }
 windows = { workspace = true }
 windows-icons = { git = "https://github.com/LGUG2Z/windows-icons", rev = "d67cc9920aa9b4883393e411fb4fa2ddd4c498b5" }

komorebi-bar/src/bar.rs

@@ -5,10 +5,6 @@ use crate::config::PositionConfig;
 use crate::komorebi::Komorebi;
 use crate::komorebi::KomorebiNotificationState;
 use crate::process_hwnd;
-use crate::render::Color32Ext;
-use crate::render::Grouping;
-use crate::render::RenderConfig;
-use crate::render::RenderExt;
 use crate::widget::BarWidget;
 use crate::widget::WidgetConfig;
 use crate::BAR_HEIGHT;
@@ -18,8 +14,6 @@ use crate::MONITOR_RIGHT;
 use crate::MONITOR_TOP;
 use crossbeam_channel::Receiver;
 use eframe::egui::Align;
-use eframe::egui::Align2;
-use eframe::egui::Area;
 use eframe::egui::CentralPanel;
 use eframe::egui::Color32;
 use eframe::egui::Context;
@@ -28,17 +22,13 @@ use eframe::egui::FontDefinitions;
 use eframe::egui::FontFamily;
 use eframe::egui::FontId;
 use eframe::egui::Frame;
-use eframe::egui::Id;
 use eframe::egui::Layout;
 use eframe::egui::Margin;
-use eframe::egui::Rgba;
 use eframe::egui::Style;
 use eframe::egui::TextStyle;
-use eframe::egui::Visuals;
 use font_loader::system_fonts;
 use font_loader::system_fonts::FontPropertyBuilder;
 use komorebi_client::KomorebiTheme;
-use komorebi_client::SocketMessage;
 use komorebi_themes::catppuccin_egui;
 use komorebi_themes::Base16Value;
 use komorebi_themes::Catppuccin;
@@ -50,31 +40,17 @@ use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
 pub struct Komobar {
-    pub hwnd: Option<isize>,
     pub config: Arc<KomobarConfig>,
-    pub render_config: Rc<RefCell<RenderConfig>>,
     pub komorebi_notification_state: Option<Rc<RefCell<KomorebiNotificationState>>>,
     pub left_widgets: Vec<Box<dyn BarWidget>>,
-    pub center_widgets: Vec<Box<dyn BarWidget>>,
     pub right_widgets: Vec<Box<dyn BarWidget>>,
     pub rx_gui: Receiver<komorebi_client::Notification>,
     pub rx_config: Receiver<KomobarConfig>,
     pub bg_color: Rc<RefCell<Color32>>,
-    pub bg_color_with_alpha: Rc<RefCell<Color32>>,
     pub scale_factor: f32,
-    pub size_rect: komorebi_client::Rect,
-    applied_theme_on_first_frame: bool,
 }
 
-pub fn apply_theme(
-    ctx: &Context,
-    theme: KomobarTheme,
-    bg_color: Rc<RefCell<Color32>>,
-    bg_color_with_alpha: Rc<RefCell<Color32>>,
-    transparency_alpha: Option<u8>,
-    grouping: Option<Grouping>,
-    render_config: Rc<RefCell<RenderConfig>>,
-) {
+pub fn apply_theme(ctx: &Context, theme: KomobarTheme, bg_color: Rc<RefCell<Color32>>) {
     match theme {
         KomobarTheme::Catppuccin {
             name: catppuccin,
@@ -154,29 +130,6 @@ pub fn apply_theme(
             bg_color.replace(base16.background());
         }
     }
-
-    // Apply transparency_alpha
-    let theme_color = *bg_color.borrow();
-
-    bg_color_with_alpha.replace(theme_color.try_apply_alpha(transparency_alpha));
-
-    // apply rounding to the widgets
-    if let Some(Grouping::Bar(config) | Grouping::Alignment(config) | Grouping::Widget(config)) =
-        &grouping
-    {
-        if let Some(rounding) = config.rounding {
-            ctx.style_mut(|style| {
-                style.visuals.widgets.noninteractive.rounding = rounding.into();
-                style.visuals.widgets.inactive.rounding = rounding.into();
-                style.visuals.widgets.hovered.rounding = rounding.into();
-                style.visuals.widgets.active.rounding = rounding.into();
-                style.visuals.widgets.open.rounding = rounding.into();
-            });
-        }
-    }
-
-    // Update RenderConfig's background_color so that widgets will have the new color
-    render_config.borrow_mut().background_color = *bg_color.borrow();
 }
 
 impl Komobar {
@@ -196,136 +149,7 @@ impl Komobar {
             Self::add_custom_font(ctx, font_family);
         }
 
-        // Update the `size_rect` so that the bar position can be changed on the EGUI update
-        // function
-        self.update_size_rect(config.position.clone());
-
-        self.try_apply_theme(config, ctx);
-
-        if let Some(font_size) = &config.font_size {
-            tracing::info!("attempting to set custom font size: {font_size}");
-            Self::set_font_size(ctx, *font_size);
-        }
-
-        self.render_config.replace(config.new_renderconfig(
-            ctx,
-            *self.bg_color.borrow(),
-            config.icon_scale,
-        ));
-
-        let mut komorebi_notification_state = previous_notification_state;
-        let mut komorebi_widgets = Vec::new();
-
-        for (idx, widget_config) in config.left_widgets.iter().enumerate() {
-            if let WidgetConfig::Komorebi(config) = widget_config {
-                komorebi_widgets.push((Komorebi::from(config), idx, Alignment::Left));
-            }
-        }
-
-        if let Some(center_widgets) = &config.center_widgets {
-            for (idx, widget_config) in center_widgets.iter().enumerate() {
-                if let WidgetConfig::Komorebi(config) = widget_config {
-                    komorebi_widgets.push((Komorebi::from(config), idx, Alignment::Center));
-                }
-            }
-        }
-
-        for (idx, widget_config) in config.right_widgets.iter().enumerate() {
-            if let WidgetConfig::Komorebi(config) = widget_config {
-                komorebi_widgets.push((Komorebi::from(config), idx, Alignment::Right));
-            }
-        }
-
-        let mut left_widgets = config
-            .left_widgets
-            .iter()
-            .filter(|config| config.enabled())
-            .map(|config| config.as_boxed_bar_widget())
-            .collect::<Vec<Box<dyn BarWidget>>>();
-
-        let mut center_widgets = match &config.center_widgets {
-            Some(center_widgets) => center_widgets
-                .iter()
-                .filter(|config| config.enabled())
-                .map(|config| config.as_boxed_bar_widget())
-                .collect::<Vec<Box<dyn BarWidget>>>(),
-            None => vec![],
-        };
-
-        let mut right_widgets = config
-            .right_widgets
-            .iter()
-            .filter(|config| config.enabled())
-            .map(|config| config.as_boxed_bar_widget())
-            .collect::<Vec<Box<dyn BarWidget>>>();
-
-        if !komorebi_widgets.is_empty() {
-            komorebi_widgets
-                .into_iter()
-                .for_each(|(mut widget, idx, side)| {
-                    match komorebi_notification_state {
-                        None => {
-                            komorebi_notification_state =
-                                Some(widget.komorebi_notification_state.clone());
-                        }
-                        Some(ref previous) => {
-                            if widget.workspaces.map_or(false, |w| w.enable) {
-                                previous.borrow_mut().update_from_config(
-                                    &widget.komorebi_notification_state.borrow(),
-                                );
-                            }
-
-                            widget.komorebi_notification_state = previous.clone();
-                        }
-                    }
-
-                    let boxed: Box<dyn BarWidget> = Box::new(widget);
-                    match side {
-                        Alignment::Left => left_widgets[idx] = boxed,
-                        Alignment::Center => center_widgets[idx] = boxed,
-                        Alignment::Right => right_widgets[idx] = boxed,
-                    }
-                });
-        }
-
-        right_widgets.reverse();
-
-        self.left_widgets = left_widgets;
-        self.center_widgets = center_widgets;
-        self.right_widgets = right_widgets;
-
-        if let (Some(prev_rect), Some(new_rect)) = (
-            &self.config.monitor.work_area_offset,
-            &config.monitor.work_area_offset,
-        ) {
-            if new_rect != prev_rect {
-                if let Err(error) = komorebi_client::send_message(
-                    &SocketMessage::MonitorWorkAreaOffset(config.monitor.index, *new_rect),
-                ) {
-                    tracing::error!(
-                        "error applying work area offset to monitor '{}': {}",
-                        config.monitor.index,
-                        error,
-                    );
-                } else {
-                    tracing::info!(
-                        "work area offset applied to monitor: {}",
-                        config.monitor.index
-                    );
-                }
-            }
-        }
-
-        tracing::info!("widget configuration options applied");
-
-        self.komorebi_notification_state = komorebi_notification_state;
-
-        self.config = config.clone().into();
-    }
-
-    /// Updates the `size_rect` field. Returns a bool indicating if the field was changed or not
-    fn update_size_rect(&mut self, position: Option<PositionConfig>) {
-        let position = position.unwrap_or(PositionConfig {
+        let position = config.position.clone().unwrap_or(PositionConfig {
             start: Some(Position {
                 x: MONITOR_LEFT.load(Ordering::SeqCst) as f32,
                 y: MONITOR_TOP.load(Ordering::SeqCst) as f32,
@@ -336,40 +160,38 @@ impl Komobar {
             }),
         });
 
-        let start = position.start.unwrap_or(Position {
-            x: MONITOR_LEFT.load(Ordering::SeqCst) as f32,
-            y: MONITOR_TOP.load(Ordering::SeqCst) as f32,
-        });
+        if let Some(hwnd) = process_hwnd() {
+            let start = position.start.unwrap_or(Position {
+                x: MONITOR_LEFT.load(Ordering::SeqCst) as f32,
+                y: MONITOR_TOP.load(Ordering::SeqCst) as f32,
+            });
 
-        let end = position.end.unwrap_or(Position {
-            x: MONITOR_RIGHT.load(Ordering::SeqCst) as f32,
-            y: BAR_HEIGHT,
-        });
+            let end = position.end.unwrap_or(Position {
+                x: MONITOR_RIGHT.load(Ordering::SeqCst) as f32,
+                y: BAR_HEIGHT,
+            });
 
-        if end.y == 0.0 {
-            tracing::warn!("position.end.y is set to 0.0 which will make your bar invisible on a config reload - this is usually set to 50.0 by default")
+            let rect = komorebi_client::Rect {
+                left: start.x as i32,
+                top: start.y as i32,
+                right: end.x as i32,
+                bottom: end.y as i32,
+            };
+
+            let window = komorebi_client::Window::from(hwnd);
+            match window.set_position(&rect, false) {
+                Ok(_) => {
+                    tracing::info!("updated bar position");
+                }
+                Err(error) => {
+                    tracing::error!("{}", error.to_string())
+                }
+            }
         }
 
-        self.size_rect = komorebi_client::Rect {
-            left: start.x as i32,
-            top: start.y as i32,
-            right: end.x as i32,
-            bottom: end.y as i32,
-        };
-    }
-
-    fn try_apply_theme(&mut self, config: &KomobarConfig, ctx: &Context) {
         match config.theme {
             Some(theme) => {
-                apply_theme(
-                    ctx,
-                    theme,
-                    self.bg_color.clone(),
-                    self.bg_color_with_alpha.clone(),
-                    config.transparency_alpha,
-                    config.grouping,
-                    self.render_config.clone(),
-                );
+                apply_theme(ctx, theme, self.bg_color.clone());
             }
             None => {
                 let home_dir: PathBuf = std::env::var("KOMOREBI_CONFIG_HOME").map_or_else(
@@ -385,21 +207,11 @@ impl Komobar {
                     },
                 );
 
-                let bar_transparency_alpha = config.transparency_alpha;
-                let bar_grouping = config.grouping;
                 let config = home_dir.join("komorebi.json");
                 match komorebi_client::StaticConfig::read(&config) {
                     Ok(config) => {
                         if let Some(theme) = config.theme {
-                            apply_theme(
-                                ctx,
-                                KomobarTheme::from(theme),
-                                self.bg_color.clone(),
-                                self.bg_color_with_alpha.clone(),
-                                bar_transparency_alpha,
-                                bar_grouping,
-                                self.render_config.clone(),
-                            );
+                            apply_theme(ctx, KomobarTheme::from(theme), self.bg_color.clone());
 
                             let stack_accent = match theme {
                                 KomorebiTheme::Catppuccin {
@@ -420,30 +232,81 @@ impl Komobar {
                     Err(_) => {
                         ctx.set_style(Style::default());
                         self.bg_color.replace(Style::default().visuals.panel_fill);
-
-                        // apply rounding to the widgets since we didn't call `apply_theme`
-                        if let Some(
-                            Grouping::Bar(config)
-                            | Grouping::Alignment(config)
-                            | Grouping::Widget(config),
-                        ) = &bar_grouping
-                        {
-                            if let Some(rounding) = config.rounding {
-                                ctx.style_mut(|style| {
-                                    style.visuals.widgets.noninteractive.rounding = rounding.into();
-                                    style.visuals.widgets.inactive.rounding = rounding.into();
-                                    style.visuals.widgets.hovered.rounding = rounding.into();
-                                    style.visuals.widgets.active.rounding = rounding.into();
-                                    style.visuals.widgets.open.rounding = rounding.into();
-                                });
-                            }
-                        }
                     }
                 }
             }
         }
-    }
 
+        if let Some(font_size) = &config.font_size {
+            tracing::info!("attempting to set custom font size: {font_size}");
+            Self::set_font_size(ctx, *font_size);
+        }
+
+        let mut komorebi_widget = None;
+        let mut komorebi_widget_idx = None;
+        let mut komorebi_notification_state = previous_notification_state;
+        let mut side = None;
+
+        for (idx, widget_config) in config.left_widgets.iter().enumerate() {
+            if let WidgetConfig::Komorebi(config) = widget_config {
+                komorebi_widget = Some(Komorebi::from(config));
+                komorebi_widget_idx = Some(idx);
+                side = Some(Side::Left);
+            }
+        }
+
+        for (idx, widget_config) in config.right_widgets.iter().enumerate() {
+            if let WidgetConfig::Komorebi(config) = widget_config {
+                komorebi_widget = Some(Komorebi::from(config));
+                komorebi_widget_idx = Some(idx);
+                side = Some(Side::Right);
+            }
+        }
+
+        let mut left_widgets = config
+            .left_widgets
+            .iter()
+            .map(|config| config.as_boxed_bar_widget())
+            .collect::<Vec<Box<dyn BarWidget>>>();
+
+        let mut right_widgets = config
+            .right_widgets
+            .iter()
+            .map(|config| config.as_boxed_bar_widget())
+            .collect::<Vec<Box<dyn BarWidget>>>();
+
+        if let (Some(idx), Some(mut widget), Some(side)) =
+            (komorebi_widget_idx, komorebi_widget, side)
+        {
+            match komorebi_notification_state {
+                None => {
+                    komorebi_notification_state = Some(widget.komorebi_notification_state.clone());
+                }
+                Some(ref previous) => {
+                    previous
+                        .borrow_mut()
+                        .update_from_config(&widget.komorebi_notification_state.borrow());
+
+                    widget.komorebi_notification_state = previous.clone();
+                }
+            }
+
+            let boxed: Box<dyn BarWidget> = Box::new(widget);
+            match side {
+                Side::Left => left_widgets[idx] = boxed,
+                Side::Right => right_widgets[idx] = boxed,
+            }
+        }
+
+        right_widgets.reverse();
+
+        self.left_widgets = left_widgets;
+        self.right_widgets = right_widgets;
+
+        tracing::info!("widget configuration options applied");
+
+        self.komorebi_notification_state = komorebi_notification_state;
+    }
     pub fn new(
         cc: &eframe::CreationContext<'_>,
         rx_gui: Receiver<komorebi_client::Notification>,
@@ -451,20 +314,14 @@ impl Komobar {
         config: Arc<KomobarConfig>,
     ) -> Self {
         let mut komobar = Self {
-            hwnd: process_hwnd(),
             config: config.clone(),
-            render_config: Rc::new(RefCell::new(RenderConfig::new())),
             komorebi_notification_state: None,
             left_widgets: vec![],
-            center_widgets: vec![],
             right_widgets: vec![],
             rx_gui,
             rx_config,
             bg_color: Rc::new(RefCell::new(Style::default().visuals.panel_fill)),
-            bg_color_with_alpha: Rc::new(RefCell::new(Style::default().visuals.panel_fill)),
             scale_factor: cc.egui_ctx.native_pixels_per_point().unwrap_or(1.0),
-            size_rect: komorebi_client::Rect::default(),
-            applied_theme_on_first_frame: false,
         };
 
         komobar.apply_config(&cc.egui_ctx, &config, None);
@@ -508,7 +365,7 @@ impl Komobar {
         if let Some((font, _)) = system_fonts::get(&property) {
             fonts
                 .font_data
-                .insert(name.to_owned(), Arc::new(FontData::from_owned(font)));
+                .insert(name.to_owned(), FontData::from_owned(font));
 
             fonts
                 .families
@@ -528,16 +385,15 @@ impl Komobar {
     }
 }
 impl eframe::App for Komobar {
-    // Needed for transparency
-    fn clear_color(&self, _visuals: &Visuals) -> [f32; 4] {
-        Rgba::TRANSPARENT.to_array()
-    }
+    // TODO: I think this is needed for transparency??
+    // fn clear_color(&self, _visuals: &Visuals) -> [f32; 4] {
+    // egui::Rgba::TRANSPARENT.to_array()
+    // let mut background = Color32::from_gray(18).to_normalized_gamma_f32();
+    // background[3] = 0.9;
+    // background
+    // }
 
     fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) {
-        if self.hwnd.is_none() {
-            self.hwnd = process_hwnd();
-        }
-
         if self.scale_factor != ctx.native_pixels_per_point().unwrap_or(1.0) {
             self.scale_factor = ctx.native_pixels_per_point().unwrap_or(1.0);
             self.apply_config(
@@ -563,142 +419,40 @@ impl eframe::App for Komobar {
                     self.config.monitor.index,
                     self.rx_gui.clone(),
                     self.bg_color.clone(),
-                    self.bg_color_with_alpha.clone(),
-                    self.config.transparency_alpha,
-                    self.config.grouping,
-                    self.config.theme,
-                    self.render_config.clone(),
                 );
         }
 
-        if !self.applied_theme_on_first_frame {
-            self.try_apply_theme(&self.config.clone(), ctx);
-            self.applied_theme_on_first_frame = true;
-        }
-
-        // Check if egui's Window size is the expected one, if not, update it
-        if let Some(current_rect) = ctx.input(|i| i.viewport().outer_rect) {
-            // Get the correct size according to scale factor
-            let current_rect = komorebi_client::Rect {
-                left: (current_rect.min.x * self.scale_factor) as i32,
-                top: (current_rect.min.y * self.scale_factor) as i32,
-                right: ((current_rect.max.x - current_rect.min.x) * self.scale_factor) as i32,
-                bottom: ((current_rect.max.y - current_rect.min.y) * self.scale_factor) as i32,
-            };
-
-            if self.size_rect != current_rect {
-                if let Some(hwnd) = self.hwnd {
-                    let window = komorebi_client::Window::from(hwnd);
-                    match window.set_position(&self.size_rect, false) {
-                        Ok(_) => {
-                            tracing::info!("updated bar position");
-                        }
-                        Err(error) => {
-                            tracing::error!("{}", error.to_string())
-                        }
-                    }
-                }
-            }
-        }
-
         let frame = if let Some(frame) = &self.config.frame {
             Frame::none()
                 .inner_margin(Margin::symmetric(
                     frame.inner_margin.x,
                     frame.inner_margin.y,
                 ))
-                .fill(*self.bg_color_with_alpha.borrow())
+                .fill(*self.bg_color.borrow())
         } else {
-            Frame::none().fill(*self.bg_color_with_alpha.borrow())
+            Frame::none().fill(*self.bg_color.borrow())
         };
 
-        let mut render_config = self.render_config.borrow_mut();
+        CentralPanel::default().frame(frame).show(ctx, |ui| {
+            ui.horizontal_centered(|ui| {
+                ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
+                    for w in &mut self.left_widgets {
+                        w.render(ctx, ui);
+                    }
+                });
 
-        let frame = render_config.change_frame_on_bar(frame, &ctx.style());
-
-        CentralPanel::default().frame(frame).show(ctx, |_| {
-            // Apply grouping logic for the bar as a whole
-            let area_frame = if let Some(frame) = &self.config.frame {
-                Frame::none().inner_margin(Margin::symmetric(0.0, frame.inner_margin.y))
-            } else {
-                Frame::none()
-            };
-
-            if !self.left_widgets.is_empty() {
-                // Left-aligned widgets layout
-                Area::new(Id::new("left_panel"))
-                    .anchor(Align2::LEFT_CENTER, [0.0, 0.0]) // Align in the left center of the window
-                    .show(ctx, |ui| {
-                        let mut left_area_frame = area_frame;
-                        if let Some(frame) = &self.config.frame {
-                            left_area_frame.inner_margin.left = frame.inner_margin.x;
-                        }
-                        left_area_frame.show(ui, |ui| {
-                            ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
-                                let mut render_conf = render_config.clone();
-                                render_conf.alignment = Some(Alignment::Left);
-
-                                render_config.apply_on_alignment(ui, |ui| {
-                                    for w in &mut self.left_widgets {
-                                        w.render(ctx, ui, &mut render_conf);
-                                    }
-                                });
-                            });
-                        });
-                    });
-            }
-
-            if !self.right_widgets.is_empty() {
-                // Right-aligned widgets layout
-                Area::new(Id::new("right_panel"))
-                    .anchor(Align2::RIGHT_CENTER, [0.0, 0.0]) // Align in the right center of the window
-                    .show(ctx, |ui| {
-                        let mut right_area_frame = area_frame;
-                        if let Some(frame) = &self.config.frame {
-                            right_area_frame.inner_margin.right = frame.inner_margin.x;
-                        }
-                        right_area_frame.show(ui, |ui| {
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                let mut render_conf = render_config.clone();
-                                render_conf.alignment = Some(Alignment::Right);
-
-                                render_config.apply_on_alignment(ui, |ui| {
-                                    for w in &mut self.right_widgets {
-                                        w.render(ctx, ui, &mut render_conf);
-                                    }
-                                });
-                            });
-                        });
-                    });
-            }
-
-            if !self.center_widgets.is_empty() {
-                // Floating center widgets
-                Area::new(Id::new("center_panel"))
-                    .anchor(Align2::CENTER_CENTER, [0.0, 0.0]) // Align in the center of the window
-                    .show(ctx, |ui| {
-                        let center_area_frame = area_frame;
-                        center_area_frame.show(ui, |ui| {
-                            ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
-                                let mut render_conf = render_config.clone();
-                                render_conf.alignment = Some(Alignment::Center);
-
-                                render_config.apply_on_alignment(ui, |ui| {
-                                    for w in &mut self.center_widgets {
-                                        w.render(ctx, ui, &mut render_conf);
-                                    }
-                                });
-                            });
-                        });
-                    });
-            }
+                ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                    for w in &mut self.right_widgets {
+                        w.render(ctx, ui);
+                    }
+                })
+            })
         });
     }
 }
 
 #[derive(Copy, Clone)]
-pub enum Alignment {
+enum Side {
     Left,
-    Center,
     Right,
 }

komorebi-bar/src/battery.rs

@@ -1,12 +1,13 @@
 use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
 use crate::widget::BarWidget;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
 use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -29,18 +30,37 @@ pub struct BatteryConfig {
 
 impl From<BatteryConfig> for Battery {
     fn from(value: BatteryConfig) -> Self {
-        let data_refresh_interval = value.data_refresh_interval.unwrap_or(10);
+        let manager = Manager::new().unwrap();
+        let mut last_state = String::new();
+        let mut state = None;
+        let prefix = value.label_prefix.unwrap_or(LabelPrefix::Icon);
+
+        if let Ok(mut batteries) = manager.batteries() {
+            if let Some(Ok(first)) = batteries.nth(0) {
+                let percentage = first.state_of_charge().get::<percent>();
+                match first.state() {
+                    State::Charging => state = Some(BatteryState::Charging),
+                    State::Discharging => state = Some(BatteryState::Discharging),
+                    _ => {}
+                }
+
+                last_state = match prefix {
+                    LabelPrefix::Text | LabelPrefix::IconAndText => {
+                        format!("BAT: {percentage:.0}%")
+                    }
+                    LabelPrefix::None | LabelPrefix::Icon => format!("{percentage:.0}%"),
+                }
+            }
+        }
 
         Self {
             enable: value.enable,
-            manager: Manager::new().unwrap(),
-            last_state: String::new(),
-            data_refresh_interval,
-            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::Icon),
-            state: BatteryState::Discharging,
-            last_updated: Instant::now()
-                .checked_sub(Duration::from_secs(data_refresh_interval))
-                .unwrap(),
+            manager,
+            last_state,
+            data_refresh_interval: value.data_refresh_interval.unwrap_or(10),
+            label_prefix: prefix,
+            state: state.unwrap_or(BatteryState::Discharging),
+            last_updated: Instant::now(),
         }
     }
 }
@@ -95,7 +115,7 @@ impl Battery {
 }
 
 impl BarWidget for Battery {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         if self.enable {
             let output = self.output();
             if !output.is_empty() {
@@ -104,12 +124,19 @@ impl BarWidget for Battery {
                     BatteryState::Discharging => egui_phosphor::regular::BATTERY_FULL,
                 };
 
+                let font_id = ctx
+                    .style()
+                    .text_styles
+                    .get(&TextStyle::Body)
+                    .cloned()
+                    .unwrap_or_else(FontId::default);
+
                 let mut layout_job = LayoutJob::simple(
                     match self.label_prefix {
                         LabelPrefix::Icon | LabelPrefix::IconAndText => emoji.to_string(),
                         LabelPrefix::None | LabelPrefix::Text => String::new(),
                     },
-                    config.icon_font_id.clone(),
+                    font_id.clone(),
                     ctx.style().visuals.selection.stroke.color,
                     100.0,
                 );
@@ -117,22 +144,17 @@ impl BarWidget for Battery {
                 layout_job.append(
                     &output,
                     10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
+                    TextFormat::simple(font_id, ctx.style().visuals.text_color()),
                 );
 
-                config.apply_on_widget(true, ui, |ui| {
-                    ui.add(
-                        Label::new(layout_job)
-                            .selectable(false)
-                            .sense(Sense::click()),
-                    );
-                });
+                ui.add(
+                    Label::new(layout_job)
+                        .selectable(false)
+                        .sense(Sense::click()),
+                );
             }
+
+            ui.add_space(WIDGET_SPACING);
         }
     }
 }

komorebi-bar/src/config.rs

@@ -1,4 +1,3 @@
-use crate::render::Grouping;
 use crate::widget::WidgetConfig;
 use eframe::egui::Pos2;
 use eframe::egui::TextBuffer;
@@ -12,12 +11,12 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-/// The `komorebi.bar.json` configuration file reference for `v0.1.33`
+/// The `komorebi.bar.json` configuration file reference for `v0.1.30`
 pub struct KomobarConfig {
     /// Bar positioning options
     #[serde(alias = "viewport")]
     pub position: Option<PositionConfig>,
-    /// Frame options (see: https://docs.rs/egui/latest/egui/containers/frame/struct.Frame.html)
+    /// Frame options (see: https://docs.rs/egui/latest/egui/containers/struct.Frame.html)
     pub frame: Option<FrameConfig>,
     /// Monitor options
     pub monitor: MonitorConfig,
@@ -25,22 +24,12 @@ pub struct KomobarConfig {
     pub font_family: Option<String>,
     /// Font size (default: 12.5)
     pub font_size: Option<f32>,
-    /// Scale of the icons relative to the font_size [[1.0-2.0]]. (default: 1.4)
-    pub icon_scale: Option<f32>,
     /// Max label width before text truncation (default: 400.0)
     pub max_label_width: Option<f32>,
     /// Theme
     pub theme: Option<KomobarTheme>,
-    /// Alpha value for the color transparency [[0-255]] (default: 200)
-    pub transparency_alpha: Option<u8>,
-    /// Spacing between widgets (default: 10.0)
-    pub widget_spacing: Option<f32>,
-    /// Visual grouping for widgets
-    pub grouping: Option<Grouping>,
     /// Left side widgets (ordered left-to-right)
     pub left_widgets: Vec<WidgetConfig>,
-    /// Center widgets (ordered left-to-right)
-    pub center_widgets: Option<Vec<WidgetConfig>>,
     /// Right side widgets (ordered left-to-right)
     pub right_widgets: Vec<WidgetConfig>,
 }
@@ -147,13 +136,11 @@ impl From<Position> for Pos2 {
 pub enum KomobarTheme {
     /// A theme from catppuccin-egui
     Catppuccin {
-        /// Name of the Catppuccin theme (theme previews: https://github.com/catppuccin/catppuccin)
         name: komorebi_themes::Catppuccin,
         accent: Option<komorebi_themes::CatppuccinValue>,
     },
     /// A theme from base16-egui-themes
     Base16 {
-        /// Name of the Base16 theme (theme previews: https://tinted-theming.github.io/base16-gallery)
         name: komorebi_themes::Base16,
         accent: Option<komorebi_themes::Base16Value>,
     },
@@ -189,17 +176,3 @@ pub enum LabelPrefix {
     /// Show an icon and text
     IconAndText,
 }
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
-pub enum DisplayFormat {
-    /// Show only icon
-    Icon,
-    /// Show only text
-    Text,
-    /// Show an icon and text for the selected element, and text on the rest
-    TextAndIconOnSelected,
-    /// Show both icon and text
-    IconAndText,
-    /// Show an icon and text for the selected element, and icons on the rest
-    IconAndTextOnSelected,
-}

komorebi-bar/src/cpu.rs

@@ -1,12 +1,13 @@
 use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::widget::BarWidget;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
+use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -29,18 +30,17 @@ pub struct CpuConfig {
 
 impl From<CpuConfig> for Cpu {
     fn from(value: CpuConfig) -> Self {
-        let data_refresh_interval = value.data_refresh_interval.unwrap_or(10);
+        let mut system =
+            System::new_with_specifics(RefreshKind::default().without_memory().without_processes());
+
+        system.refresh_cpu_usage();
 
         Self {
             enable: value.enable,
-            system: System::new_with_specifics(
-                RefreshKind::default().without_memory().without_processes(),
-            ),
-            data_refresh_interval,
+            system,
+            data_refresh_interval: value.data_refresh_interval.unwrap_or(10),
             label_prefix: value.label_prefix.unwrap_or(LabelPrefix::IconAndText),
-            last_updated: Instant::now()
-                .checked_sub(Duration::from_secs(data_refresh_interval))
-                .unwrap(),
+            last_updated: Instant::now(),
         }
     }
 }
@@ -70,10 +70,17 @@ impl Cpu {
 }
 
 impl BarWidget for Cpu {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         if self.enable {
             let output = self.output();
             if !output.is_empty() {
+                let font_id = ctx
+                    .style()
+                    .text_styles
+                    .get(&TextStyle::Body)
+                    .cloned()
+                    .unwrap_or_else(FontId::default);
+
                 let mut layout_job = LayoutJob::simple(
                     match self.label_prefix {
                         LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -81,7 +88,7 @@ impl BarWidget for Cpu {
                         }
                         LabelPrefix::None | LabelPrefix::Text => String::new(),
                     },
-                    config.icon_font_id.clone(),
+                    font_id.clone(),
                     ctx.style().visuals.selection.stroke.color,
                     100.0,
                 );
@@ -89,27 +96,25 @@ impl BarWidget for Cpu {
                 layout_job.append(
                     &output,
                     10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
+                    TextFormat::simple(font_id, ctx.style().visuals.text_color()),
                 );
 
-                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
-                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
-                        .clicked()
+                if ui
+                    .add(
+                        Label::new(layout_job)
+                            .selectable(false)
+                            .sense(Sense::click()),
+                    )
+                    .clicked()
+                {
+                    if let Err(error) = Command::new("cmd.exe").args(["/C", "taskmgr.exe"]).spawn()
                     {
-                        if let Err(error) =
-                            Command::new("cmd.exe").args(["/C", "taskmgr.exe"]).spawn()
-                        {
-                            eprintln!("{}", error)
-                        }
+                        eprintln!("{}", error)
                     }
-                });
+                }
             }
+
+            ui.add_space(WIDGET_SPACING);
         }
     }
 }

komorebi-bar/src/date.rs

@@ -1,12 +1,13 @@
 use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::widget::BarWidget;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
+use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use eframe::egui::WidgetText;
 use schemars::JsonSchema;
@@ -85,10 +86,17 @@ impl Date {
 }
 
 impl BarWidget for Date {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         if self.enable {
             let mut output = self.output();
             if !output.is_empty() {
+                let font_id = ctx
+                    .style()
+                    .text_styles
+                    .get(&TextStyle::Body)
+                    .cloned()
+                    .unwrap_or_else(FontId::default);
+
                 let mut layout_job = LayoutJob::simple(
                     match self.label_prefix {
                         LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -96,7 +104,7 @@ impl BarWidget for Date {
                         }
                         LabelPrefix::None | LabelPrefix::Text => String::new(),
                     },
-                    config.icon_font_id.clone(),
+                    font_id.clone(),
                     ctx.style().visuals.selection.stroke.color,
                     100.0,
                 );
@@ -108,28 +116,22 @@ impl BarWidget for Date {
                 layout_job.append(
                     &output,
                     10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
+                    TextFormat::simple(font_id, ctx.style().visuals.text_color()),
                 );
 
-                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
-                        .show(ui, |ui| {
-                            ui.add(
-                                Label::new(WidgetText::LayoutJob(layout_job.clone()))
-                                    .selectable(false),
-                            )
-                        })
-                        .clicked()
-                    {
-                        self.format.next()
-                    }
-                });
+                if ui
+                    .add(
+                        Label::new(WidgetText::LayoutJob(layout_job.clone()))
+                            .selectable(false)
+                            .sense(Sense::click()),
+                    )
+                    .clicked()
+                {
+                    self.format.next()
+                }
             }
+
+            ui.add_space(WIDGET_SPACING);
         }
     }
 }

komorebi-bar/src/komorebi.rs

@@ -1,44 +1,37 @@
 use crate::bar::apply_theme;
-use crate::config::DisplayFormat;
 use crate::config::KomobarTheme;
-use crate::komorebi_layout::KomorebiLayout;
-use crate::render::Grouping;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::ui::CustomUi;
 use crate::widget::BarWidget;
-use crate::ICON_CACHE;
 use crate::MAX_LABEL_WIDTH;
-use crate::MONITOR_INDEX;
+use crate::WIDGET_SPACING;
 use crossbeam_channel::Receiver;
 use crossbeam_channel::TryRecvError;
-use eframe::egui::vec2;
+use eframe::egui::text::LayoutJob;
 use eframe::egui::Color32;
 use eframe::egui::ColorImage;
 use eframe::egui::Context;
-use eframe::egui::Frame;
+use eframe::egui::FontId;
 use eframe::egui::Image;
 use eframe::egui::Label;
-use eframe::egui::Margin;
-use eframe::egui::Rounding;
+use eframe::egui::SelectableLabel;
 use eframe::egui::Sense;
-use eframe::egui::Stroke;
+use eframe::egui::TextStyle;
 use eframe::egui::TextureHandle;
 use eframe::egui::TextureOptions;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
 use image::RgbaImage;
-use komorebi_client::Container;
+use komorebi_client::CycleDirection;
 use komorebi_client::NotificationEvent;
 use komorebi_client::Rect;
 use komorebi_client::SocketMessage;
-use komorebi_client::Window;
-use komorebi_client::Workspace;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use std::cell::RefCell;
 use std::collections::BTreeMap;
+use std::fmt::Display;
+use std::fmt::Formatter;
 use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::atomic::Ordering;
@@ -46,7 +39,7 @@ use std::sync::atomic::Ordering;
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiConfig {
     /// Configure the Workspaces widget
-    pub workspaces: Option<KomorebiWorkspacesConfig>,
+    pub workspaces: KomorebiWorkspacesConfig,
     /// Configure the Layout widget
     pub layout: Option<KomorebiLayoutConfig>,
     /// Configure the Focused Window widget
@@ -61,28 +54,20 @@ pub struct KomorebiWorkspacesConfig {
     pub enable: bool,
     /// Hide workspaces without any windows
     pub hide_empty_workspaces: bool,
-    /// Display format of the workspace
-    pub display: Option<DisplayFormat>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiLayoutConfig {
     /// Enable the Komorebi Layout widget
     pub enable: bool,
-    /// List of layout options
-    pub options: Option<Vec<KomorebiLayout>>,
-    /// Display format of the current layout
-    pub display: Option<DisplayFormat>,
 }
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct KomorebiFocusedWindowConfig {
     /// Enable the Komorebi Focused Window widget
     pub enable: bool,
-    /// DEPRECATED: use 'display' instead (Show the icon of the currently focused window)
-    pub show_icon: Option<bool>,
-    /// Display format of the currently focused window
-    pub display: Option<DisplayFormat>,
+    /// Show the icon of the currently focused window
+    pub show_icon: bool,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
@@ -113,18 +98,14 @@ impl From<&KomorebiConfig> for Komorebi {
                 selected_workspace: String::new(),
                 layout: KomorebiLayout::Default(komorebi_client::DefaultLayout::BSP),
                 workspaces: vec![],
-                hide_empty_workspaces: value
-                    .workspaces
-                    .map(|w| w.hide_empty_workspaces)
-                    .unwrap_or_default(),
+                hide_empty_workspaces: value.workspaces.hide_empty_workspaces,
                 mouse_follows_focus: true,
                 work_area_offset: None,
-                focused_container_information: KomorebiNotificationStateContainerInformation::EMPTY,
+                focused_container_information: (vec![], vec![], 0),
                 stack_accent: None,
-                monitor_index: MONITOR_INDEX.load(Ordering::SeqCst),
             })),
             workspaces: value.workspaces,
-            layout: value.layout.clone(),
+            layout: value.layout,
             focused_window: value.focused_window,
             configuration_switcher,
         }
@@ -134,166 +115,104 @@ impl From<&KomorebiConfig> for Komorebi {
 #[derive(Clone, Debug)]
 pub struct Komorebi {
     pub komorebi_notification_state: Rc<RefCell<KomorebiNotificationState>>,
-    pub workspaces: Option<KomorebiWorkspacesConfig>,
+    pub workspaces: KomorebiWorkspacesConfig,
     pub layout: Option<KomorebiLayoutConfig>,
     pub focused_window: Option<KomorebiFocusedWindowConfig>,
     pub configuration_switcher: Option<KomorebiConfigurationSwitcherConfig>,
 }
 
 impl BarWidget for Komorebi {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         let mut komorebi_notification_state = self.komorebi_notification_state.borrow_mut();
-        let icon_size = Vec2::splat(config.icon_font_id.size);
 
-        if let Some(workspaces) = self.workspaces {
-            if workspaces.enable {
-                let mut update = None;
+        if self.workspaces.enable {
+            let mut update = None;
 
-                if !komorebi_notification_state.workspaces.is_empty() {
-                    let format = workspaces.display.unwrap_or(DisplayFormat::Text);
+            for (i, ws) in komorebi_notification_state.workspaces.iter().enumerate() {
+                if ui
+                    .add(SelectableLabel::new(
+                        komorebi_notification_state.selected_workspace.eq(ws),
+                        ws.to_string(),
+                    ))
+                    .clicked()
+                {
+                    update = Some(ws.to_string());
+                    let mut proceed = true;
 
-                    config.apply_on_widget(false, ui, |ui| {
-                        for (i, (ws, container_information)) in
-                            komorebi_notification_state.workspaces.iter().enumerate()
-                        {
-                            if SelectableFrame::new(
-                                komorebi_notification_state.selected_workspace.eq(ws),
-                            )
-                            .show(ui, |ui| {
-                                let mut has_icon = false;
+                    if komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(false))
+                        .is_err()
+                    {
+                        tracing::error!("could not send message to komorebi: MouseFollowsFocus");
+                        proceed = false;
+                    }
 
-                                if format == DisplayFormat::Icon
-                                    || format == DisplayFormat::IconAndText
-                                    || format == DisplayFormat::IconAndTextOnSelected
-                                    || (format == DisplayFormat::TextAndIconOnSelected
-                                        && komorebi_notification_state.selected_workspace.eq(ws))
-                                {
-                                    let icons: Vec<_> =
-                                        container_information.icons.iter().flatten().collect();
+                    if proceed
+                        && komorebi_client::send_message(&SocketMessage::FocusWorkspaceNumber(i))
+                            .is_err()
+                    {
+                        tracing::error!("could not send message to komorebi: FocusWorkspaceNumber");
+                        proceed = false;
+                    }
 
-                                    if !icons.is_empty() {
-                                        Frame::none()
-                                            .inner_margin(Margin::same(
-                                                ui.style().spacing.button_padding.y,
-                                            ))
-                                            .show(ui, |ui| {
-                                                for icon in icons {
-                                                    ui.add(
-                                                        Image::from(&img_to_texture(ctx, icon))
-                                                            .maintain_aspect_ratio(true)
-                                                            .fit_to_exact_size(icon_size),
-                                                    );
+                    if proceed
+                        && komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(
+                            komorebi_notification_state.mouse_follows_focus,
+                        ))
+                        .is_err()
+                    {
+                        tracing::error!("could not send message to komorebi: MouseFollowsFocus");
+                        proceed = false;
+                    }
 
-                                                    if !has_icon {
-                                                        has_icon = true;
-                                                    }
-                                                }
-                                            });
-                                    }
-                                }
-
-                                // draw a custom icon when there is no app icon
-                                if match format {
-                                    DisplayFormat::Icon => !has_icon,
-                                    _ => false,
-                                } {
-                                    let (response, painter) =
-                                        ui.allocate_painter(icon_size, Sense::hover());
-                                    let stroke = Stroke::new(
-                                        1.0,
-                                        ctx.style().visuals.selection.stroke.color,
-                                    );
-                                    let mut rect = response.rect;
-                                    let rounding = Rounding::same(rect.width() * 0.1);
-                                    rect = rect.shrink(stroke.width);
-                                    let c = rect.center();
-                                    let r = rect.width() / 2.0;
-                                    painter.rect_stroke(rect, rounding, stroke);
-                                    painter.line_segment([c - vec2(r, r), c + vec2(r, r)], stroke);
-
-                                    response.on_hover_text(ws.to_string())
-                                } else if match format {
-                                    DisplayFormat::Icon => has_icon,
-                                    _ => false,
-                                } {
-                                    ui.response().on_hover_text(ws.to_string())
-                                } else if format != DisplayFormat::IconAndTextOnSelected
-                                    || (format == DisplayFormat::IconAndTextOnSelected
-                                        && komorebi_notification_state.selected_workspace.eq(ws))
-                                {
-                                    ui.add(Label::new(ws.to_string()).selectable(false))
-                                } else {
-                                    ui.response()
-                                }
-                            })
-                            .clicked()
-                            {
-                                update = Some(ws.to_string());
-
-                                if komorebi_notification_state.mouse_follows_focus {
-                                    if komorebi_client::send_batch([
-                                        SocketMessage::MouseFollowsFocus(false),
-                                        SocketMessage::FocusMonitorWorkspaceNumber(
-                                            komorebi_notification_state.monitor_index,
-                                            i,
-                                        ),
-                                        SocketMessage::RetileWithResizeDimensions,
-                                        SocketMessage::MouseFollowsFocus(true),
-                                    ])
-                                        .is_err()
-                                    {
-                                        tracing::error!(
-                                            "could not send the following batch of messages to komorebi:\n
-                                            MouseFollowsFocus(false)\n
-                                            FocusMonitorWorkspaceNumber({}, {})\n
-                                            RetileWithResizeDimensions
-                                            MouseFollowsFocus(true)\n",
-                                            komorebi_notification_state.monitor_index,
-                                            i,
-                                        );
-                                    }
-                                } else if komorebi_client::send_batch([
-                                    SocketMessage::FocusMonitorWorkspaceNumber(
-                                        komorebi_notification_state.monitor_index,
-                                        i,
-                                    ),
-                                    SocketMessage::RetileWithResizeDimensions,
-                                ])
-                                    .is_err()
-                                {
-                                    tracing::error!(
-                                        "could not send the following batch of messages to komorebi:\n
-                                        FocusMonitorWorkspaceNumber({}, {})\n
-                                        RetileWithResizeDimensions",
-                                        komorebi_notification_state.monitor_index,
-                                        i,
-                                    );
-                                }
-                            }
-                        }
-                    });
-                }
-
-                if let Some(update) = update {
-                    komorebi_notification_state.selected_workspace = update;
+                    if proceed && komorebi_client::send_message(&SocketMessage::Retile).is_err() {
+                        tracing::error!("could not send message to komorebi: Retile");
+                    }
                 }
             }
+
+            if let Some(update) = update {
+                komorebi_notification_state.selected_workspace = update;
+            }
+
+            ui.add_space(WIDGET_SPACING);
         }
 
-        if let Some(layout_config) = &self.layout {
-            if layout_config.enable {
-                let workspace_idx: Option<usize> = komorebi_notification_state
-                    .workspaces
-                    .iter()
-                    .position(|o| komorebi_notification_state.selected_workspace.eq(&o.0));
+        if let Some(layout) = self.layout {
+            if layout.enable {
+                if ui
+                    .add(
+                        Label::new(komorebi_notification_state.layout.to_string())
+                            .selectable(false)
+                            .sense(Sense::click()),
+                    )
+                    .clicked()
+                {
+                    match komorebi_notification_state.layout {
+                        KomorebiLayout::Default(_) => {
+                            if komorebi_client::send_message(&SocketMessage::CycleLayout(
+                                CycleDirection::Next,
+                            ))
+                            .is_err()
+                            {
+                                tracing::error!("could not send message to komorebi: CycleLayout");
+                            }
+                        }
+                        KomorebiLayout::Floating => {
+                            if komorebi_client::send_message(&SocketMessage::ToggleTiling).is_err()
+                            {
+                                tracing::error!("could not send message to komorebi: ToggleTiling");
+                            }
+                        }
+                        KomorebiLayout::Paused => {
+                            if komorebi_client::send_message(&SocketMessage::TogglePause).is_err() {
+                                tracing::error!("could not send message to komorebi: TogglePause");
+                            }
+                        }
+                        KomorebiLayout::Custom => {}
+                    }
+                }
 
-                komorebi_notification_state.layout.show(
-                    ctx,
-                    ui,
-                    config,
-                    layout_config,
-                    workspace_idx,
-                );
+                ui.add_space(WIDGET_SPACING);
             }
         }
 
@@ -301,167 +220,170 @@ impl BarWidget for Komorebi {
             if configuration_switcher.enable {
                 for (name, location) in configuration_switcher.configurations.iter() {
                     let path = PathBuf::from(location);
-                    if path.is_file() {
-                        config.apply_on_widget(false, ui,|ui|{
-                    if SelectableFrame::new(false).show(ui, |ui|{
-                          ui.add(Label::new(name).selectable(false))
-                            })
+                    if path.is_file()
+                        && ui
+                            .add(Label::new(name).selectable(false).sense(Sense::click()))
                             .clicked()
+                    {
+                        let canonicalized = dunce::canonicalize(path.clone()).unwrap_or(path);
+                        let mut proceed = true;
+                        if komorebi_client::send_message(&SocketMessage::ReplaceConfiguration(
+                            canonicalized,
+                        ))
+                        .is_err()
                         {
-                            let canonicalized = dunce::canonicalize(path.clone()).unwrap_or(path);
-                            let mut proceed = true;
-                            if komorebi_client::send_message(&SocketMessage::ReplaceConfiguration(
-                                canonicalized,
-                            ))
-                            .is_err()
-                            {
-                                tracing::error!(
-                                    "could not send message to komorebi: ReplaceConfiguration"
-                                );
-                                proceed = false;
-                            }
+                            tracing::error!(
+                                "could not send message to komorebi: ReplaceConfiguration"
+                            );
+                            proceed = false;
+                        }
 
-                            if let Some(rect) = komorebi_notification_state.work_area_offset {
-                                if proceed {
-                                    match komorebi_client::send_query(&SocketMessage::Query(
-                                        komorebi_client::StateQuery::FocusedMonitorIndex,
-                                    )) {
-                                        Ok(idx) => {
-                                            if let Ok(monitor_idx) = idx.parse::<usize>() {
-                                                if komorebi_client::send_message(
-                                                    &SocketMessage::MonitorWorkAreaOffset(
-                                                        monitor_idx,
-                                                        rect,
-                                                    ),
-                                                )
-                                                .is_err()
-                                                {
-                                                    tracing::error!(
+                        if let Some(rect) = komorebi_notification_state.work_area_offset {
+                            if proceed {
+                                match komorebi_client::send_query(&SocketMessage::Query(
+                                    komorebi_client::StateQuery::FocusedMonitorIndex,
+                                )) {
+                                    Ok(idx) => {
+                                        if let Ok(monitor_idx) = idx.parse::<usize>() {
+                                            if komorebi_client::send_message(
+                                                &SocketMessage::MonitorWorkAreaOffset(
+                                                    monitor_idx,
+                                                    rect,
+                                                ),
+                                            )
+                                            .is_err()
+                                            {
+                                                tracing::error!(
                                                     "could not send message to komorebi: MonitorWorkAreaOffset"
                                                 );
-                                                }
                                             }
                                         }
-                                        Err(_) => {
-                                            tracing::error!(
-                                                "could not send message to komorebi: Query"
-                                            );
-                                        }
+                                    }
+                                    Err(_) => {
+                                        tracing::error!(
+                                            "could not send message to komorebi: Query"
+                                        );
                                     }
                                 }
                             }
-                        }});
+                        }
                     }
                 }
+
+                ui.add_space(WIDGET_SPACING);
             }
         }
 
         if let Some(focused_window) = self.focused_window {
             if focused_window.enable {
-                let titles = &komorebi_notification_state
-                    .focused_container_information
-                    .titles;
-                if !titles.is_empty() {
-                    config.apply_on_widget(false, ui, |ui| {
-                        let icons = &komorebi_notification_state
-                            .focused_container_information
-                            .icons;
-                        let focused_window_idx = komorebi_notification_state
-                            .focused_container_information
-                            .focused_window_idx;
+                let titles = &komorebi_notification_state.focused_container_information.0;
+                let icons = &komorebi_notification_state.focused_container_information.1;
+                let focused_window_idx =
+                    komorebi_notification_state.focused_container_information.2;
 
-                        let iter = titles.iter().zip(icons.iter());
-                        let len = iter.len();
+                let iter = titles.iter().zip(icons.iter());
 
-                        for (i, (title, icon)) in iter.enumerate() {
-                            let selected = i == focused_window_idx && len != 1;
+                for (i, (title, icon)) in iter.enumerate() {
+                    if focused_window.show_icon {
+                        if let Some(img) = icon {
+                            ui.add(
+                                Image::from(&img_to_texture(ctx, img))
+                                    .maintain_aspect_ratio(true)
+                                    .max_height(15.0),
+                            );
+                        }
+                    }
 
-                            if SelectableFrame::new(selected)
-                                .show(ui, |ui| {
-                                    // handle legacy setting
-                                    let format = focused_window.display.unwrap_or(
-                                        if focused_window.show_icon.unwrap_or(false) {
-                                            DisplayFormat::IconAndText
-                                        } else {
-                                            DisplayFormat::Text
-                                        },
-                                    );
+                    if i == focused_window_idx {
+                        let font_id = ctx
+                            .style()
+                            .text_styles
+                            .get(&TextStyle::Body)
+                            .cloned()
+                            .unwrap_or_else(FontId::default);
 
-                                    if format == DisplayFormat::Icon
-                                        || format == DisplayFormat::IconAndText
-                                        || format == DisplayFormat::IconAndTextOnSelected
-                                        || (format == DisplayFormat::TextAndIconOnSelected
-                                            && i == focused_window_idx)
-                                    {
-                                        if let Some(img) = icon {
-                                            Frame::none()
-                                                .inner_margin(Margin::same(
-                                                    ui.style().spacing.button_padding.y,
-                                                ))
-                                                .show(ui, |ui| {
-                                                    let response = ui.add(
-                                                        Image::from(&img_to_texture(ctx, img))
-                                                            .maintain_aspect_ratio(true)
-                                                            .fit_to_exact_size(icon_size),
-                                                    );
+                        let layout_job = LayoutJob::simple(
+                            title.to_string(),
+                            font_id.clone(),
+                            komorebi_notification_state
+                                .stack_accent
+                                .unwrap_or(ctx.style().visuals.selection.stroke.color),
+                            100.0,
+                        );
 
-                                                    if let DisplayFormat::Icon = format {
-                                                        response.on_hover_text(title);
-                                                    }
-                                                });
-                                        }
-                                    }
+                        if titles.len() > 1 {
+                            let available_height = ui.available_height();
+                            let mut custom_ui = CustomUi(ui);
+                            custom_ui.add_sized_left_to_right(
+                                Vec2::new(
+                                    MAX_LABEL_WIDTH.load(Ordering::SeqCst) as f32,
+                                    available_height,
+                                ),
+                                Label::new(layout_job).selectable(false).truncate(),
+                            );
+                        } else {
+                            let available_height = ui.available_height();
+                            let mut custom_ui = CustomUi(ui);
+                            custom_ui.add_sized_left_to_right(
+                                Vec2::new(
+                                    MAX_LABEL_WIDTH.load(Ordering::SeqCst) as f32,
+                                    available_height,
+                                ),
+                                Label::new(title).selectable(false).truncate(),
+                            );
+                        }
+                    } else {
+                        let available_height = ui.available_height();
+                        let mut custom_ui = CustomUi(ui);
 
-                                    if format == DisplayFormat::Text
-                                        || format == DisplayFormat::IconAndText
-                                        || format == DisplayFormat::TextAndIconOnSelected
-                                        || (format == DisplayFormat::IconAndTextOnSelected
-                                            && i == focused_window_idx)
-                                    {
-                                        let available_height = ui.available_height();
-                                        let mut custom_ui = CustomUi(ui);
-
-                                        custom_ui.add_sized_left_to_right(
-                                            Vec2::new(
-                                                MAX_LABEL_WIDTH.load(Ordering::SeqCst) as f32,
-                                                available_height,
-                                            ),
-                                            Label::new(title).selectable(false).truncate(),
-                                        );
-                                    }
-                                })
-                                .clicked()
+                        if custom_ui
+                            .add_sized_left_to_right(
+                                Vec2::new(
+                                    MAX_LABEL_WIDTH.load(Ordering::SeqCst) as f32,
+                                    available_height,
+                                ),
+                                Label::new(title)
+                                    .selectable(false)
+                                    .sense(Sense::click())
+                                    .truncate(),
+                            )
+                            .clicked()
+                        {
+                            if komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(
+                                false,
+                            ))
+                            .is_err()
                             {
-                                if selected {
-                                    return;
-                                }
+                                tracing::error!(
+                                    "could not send message to komorebi: MouseFollowsFocus"
+                                );
+                            }
 
-                                if komorebi_notification_state.mouse_follows_focus {
-                                    if komorebi_client::send_batch([
-                                        SocketMessage::MouseFollowsFocus(false),
-                                        SocketMessage::FocusStackWindow(i),
-                                        SocketMessage::MouseFollowsFocus(true),
-                                    ]).is_err() {
-                                        tracing::error!(
-                                            "could not send the following batch of messages to komorebi:\n
-                                            MouseFollowsFocus(false)\n
-                                            FocusStackWindow({})\n
-                                            MouseFollowsFocus(true)\n",
-                                            i,
-                                        );
-                                    }
-                                } else if komorebi_client::send_message(
-                                    &SocketMessage::FocusStackWindow(i)
-                                ).is_err() {
-                                    tracing::error!(
-                                        "could not send message to komorebi: FocusStackWindow"
-                                    );
-                                }
+                            if komorebi_client::send_message(&SocketMessage::FocusStackWindow(i))
+                                .is_err()
+                            {
+                                tracing::error!(
+                                    "could not send message to komorebi: FocusStackWindow"
+                                );
+                            }
+
+                            if komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(
+                                komorebi_notification_state.mouse_follows_focus,
+                            ))
+                            .is_err()
+                            {
+                                tracing::error!(
+                                    "could not send message to komorebi: MouseFollowsFocus"
+                                );
                             }
                         }
-                    });
+                    }
+
+                    ui.add_space(WIDGET_SPACING);
                 }
             }
+
+            ui.add_space(WIDGET_SPACING);
         }
     }
 }
@@ -475,15 +397,33 @@ fn img_to_texture(ctx: &Context, rgba_image: &RgbaImage) -> TextureHandle {
 
 #[derive(Clone, Debug)]
 pub struct KomorebiNotificationState {
-    pub workspaces: Vec<(String, KomorebiNotificationStateContainerInformation)>,
+    pub workspaces: Vec<String>,
     pub selected_workspace: String,
-    pub focused_container_information: KomorebiNotificationStateContainerInformation,
+    pub focused_container_information: (Vec<String>, Vec<Option<RgbaImage>>, usize),
     pub layout: KomorebiLayout,
     pub hide_empty_workspaces: bool,
     pub mouse_follows_focus: bool,
     pub work_area_offset: Option<Rect>,
     pub stack_accent: Option<Color32>,
-    pub monitor_index: usize,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum KomorebiLayout {
+    Default(komorebi_client::DefaultLayout),
+    Floating,
+    Paused,
+    Custom,
+}
+
+impl Display for KomorebiLayout {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            KomorebiLayout::Default(layout) => write!(f, "{layout}"),
+            KomorebiLayout::Floating => write!(f, "Floating"),
+            KomorebiLayout::Paused => write!(f, "Paused"),
+            KomorebiLayout::Custom => write!(f, "Custom"),
+        }
+    }
 }
 
 impl KomorebiNotificationState {
@@ -491,18 +431,12 @@ impl KomorebiNotificationState {
         self.hide_empty_workspaces = config.hide_empty_workspaces;
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub fn handle_notification(
         &mut self,
         ctx: &Context,
         monitor_index: usize,
         rx_gui: Receiver<komorebi_client::Notification>,
         bg_color: Rc<RefCell<Color32>>,
-        bg_color_with_alpha: Rc<RefCell<Color32>>,
-        transparency_alpha: Option<u8>,
-        grouping: Option<Grouping>,
-        default_theme: Option<KomobarTheme>,
-        render_config: Rc<RefCell<RenderConfig>>,
     ) {
         match rx_gui.try_recv() {
             Err(error) => match error {
@@ -514,56 +448,17 @@ impl KomorebiNotificationState {
                 }
             },
             Ok(notification) => {
-                match notification.event {
-                    NotificationEvent::WindowManager(_) => {}
-                    NotificationEvent::Socket(message) => match message {
-                        SocketMessage::ReloadStaticConfiguration(path) => {
-                            if let Ok(config) = komorebi_client::StaticConfig::read(&path) {
-                                if let Some(theme) = config.theme {
-                                    apply_theme(
-                                        ctx,
-                                        KomobarTheme::from(theme),
-                                        bg_color.clone(),
-                                        bg_color_with_alpha.clone(),
-                                        transparency_alpha,
-                                        grouping,
-                                        render_config,
-                                    );
-                                    tracing::info!("applied theme from updated komorebi.json");
-                                } else if let Some(default_theme) = default_theme {
-                                    apply_theme(
-                                        ctx,
-                                        default_theme,
-                                        bg_color.clone(),
-                                        bg_color_with_alpha.clone(),
-                                        transparency_alpha,
-                                        grouping,
-                                        render_config,
-                                    );
-                                    tracing::info!("removed theme from updated komorebi.json and applied default theme");
-                                } else {
-                                    tracing::warn!("theme was removed from updated komorebi.json but there was no default theme to apply");
-                                }
-                            }
+                if let NotificationEvent::Socket(SocketMessage::ReloadStaticConfiguration(path)) =
+                    notification.event
+                {
+                    if let Ok(config) = komorebi_client::StaticConfig::read(&path) {
+                        if let Some(theme) = config.theme {
+                            apply_theme(ctx, KomobarTheme::from(theme), bg_color);
+                            tracing::info!("applied theme from updated komorebi.json");
                         }
-                        SocketMessage::Theme(theme) => {
-                            apply_theme(
-                                ctx,
-                                KomobarTheme::from(theme),
-                                bg_color,
-                                bg_color_with_alpha.clone(),
-                                transparency_alpha,
-                                grouping,
-                                render_config,
-                            );
-                            tracing::info!("applied theme from komorebi socket message");
-                        }
-                        _ => {}
-                    },
+                    }
                 }
 
-                self.monitor_index = monitor_index;
-
                 self.mouse_follows_focus = notification.state.mouse_follows_focus;
 
                 let monitor = &notification.state.monitors.elements()[monitor_index];
@@ -579,148 +474,70 @@ impl KomorebiNotificationState {
                     .unwrap_or_else(|| format!("{}", focused_workspace_idx + 1));
 
                 for (i, ws) in monitor.workspaces().iter().enumerate() {
-                    let should_show = if self.hide_empty_workspaces {
+                    let should_add = if self.hide_empty_workspaces {
                         focused_workspace_idx == i || !ws.containers().is_empty()
                     } else {
                         true
                     };
 
-                    if should_show {
-                        workspaces.push((
-                            ws.name().to_owned().unwrap_or_else(|| format!("{}", i + 1)),
-                            ws.into(),
-                        ));
+                    if should_add {
+                        workspaces
+                            .push(ws.name().to_owned().unwrap_or_else(|| format!("{}", i + 1)));
                     }
                 }
 
                 self.workspaces = workspaces;
+                self.layout = match monitor.workspaces()[focused_workspace_idx].layout() {
+                    komorebi_client::Layout::Default(layout) => KomorebiLayout::Default(*layout),
+                    komorebi_client::Layout::Custom(_) => KomorebiLayout::Custom,
+                };
 
-                if monitor.workspaces()[focused_workspace_idx]
-                    .monocle_container()
-                    .is_some()
-                {
-                    self.layout = KomorebiLayout::Monocle;
-                } else if !*monitor.workspaces()[focused_workspace_idx].tile() {
+                if !*monitor.workspaces()[focused_workspace_idx].tile() {
                     self.layout = KomorebiLayout::Floating;
-                } else if notification.state.is_paused {
+                }
+
+                if notification.state.is_paused {
                     self.layout = KomorebiLayout::Paused;
+                }
+
+                if let Some(container) =
+                    monitor.workspaces()[focused_workspace_idx].monocle_container()
+                {
+                    self.focused_container_information = (
+                        container
+                            .windows()
+                            .iter()
+                            .map(|w| w.title().unwrap_or_default())
+                            .collect::<Vec<_>>(),
+                        container
+                            .windows()
+                            .iter()
+                            .map(|w| windows_icons::get_icon_by_process_id(w.process_id()))
+                            .collect::<Vec<_>>(),
+                        container.focused_window_idx(),
+                    );
+                } else if let Some(container) =
+                    monitor.workspaces()[focused_workspace_idx].focused_container()
+                {
+                    self.focused_container_information = (
+                        container
+                            .windows()
+                            .iter()
+                            .map(|w| w.title().unwrap_or_default())
+                            .collect::<Vec<_>>(),
+                        container
+                            .windows()
+                            .iter()
+                            .map(|w| windows_icons::get_icon_by_process_id(w.process_id()))
+                            .collect::<Vec<_>>(),
+                        container.focused_window_idx(),
+                    );
                 } else {
-                    self.layout = match monitor.workspaces()[focused_workspace_idx].layout() {
-                        komorebi_client::Layout::Default(layout) => {
-                            KomorebiLayout::Default(*layout)
-                        }
-                        komorebi_client::Layout::Custom(_) => KomorebiLayout::Custom,
-                    };
+                    self.focused_container_information.0.clear();
+                    self.focused_container_information.1.clear();
+                    self.focused_container_information.2 = 0;
                 }
-
-                self.focused_container_information =
-                    (&monitor.workspaces()[focused_workspace_idx]).into();
             }
         }
     }
 }
-
-#[derive(Clone, Debug)]
-pub struct KomorebiNotificationStateContainerInformation {
-    pub titles: Vec<String>,
-    pub icons: Vec<Option<RgbaImage>>,
-    pub focused_window_idx: usize,
-}
-
-impl From<&Workspace> for KomorebiNotificationStateContainerInformation {
-    fn from(value: &Workspace) -> Self {
-        let mut container_info = Self::EMPTY;
-
-        if let Some(container) = value.monocle_container() {
-            container_info = container.into();
-        } else if let Some(container) = value.focused_container() {
-            container_info = container.into();
-        }
-
-        for floating_window in value.floating_windows() {
-            if floating_window.is_focused() {
-                container_info = floating_window.into();
-            }
-        }
-
-        container_info
-    }
-}
-
-impl From<&Container> for KomorebiNotificationStateContainerInformation {
-    fn from(value: &Container) -> Self {
-        let windows = value.windows().iter().collect::<Vec<_>>();
-        let mut icons = vec![];
-
-        for window in windows {
-            let mut icon_cache = ICON_CACHE.lock().unwrap();
-            let mut update_cache = false;
-            let exe = window.exe().unwrap_or_default();
-
-            match icon_cache.get(&exe) {
-                None => {
-                    icons.push(windows_icons::get_icon_by_process_id(window.process_id()));
-                    update_cache = true;
-                }
-                Some(icon) => {
-                    icons.push(Some(icon.clone()));
-                }
-            }
-
-            if update_cache {
-                if let Some(Some(icon)) = icons.last() {
-                    icon_cache.insert(exe, icon.clone());
-                }
-            }
-        }
-
-        Self {
-            titles: value
-                .windows()
-                .iter()
-                .map(|w| w.title().unwrap_or_default())
-                .collect::<Vec<_>>(),
-            icons,
-            focused_window_idx: value.focused_window_idx(),
-        }
-    }
-}
-
-impl From<&Window> for KomorebiNotificationStateContainerInformation {
-    fn from(value: &Window) -> Self {
-        let mut icon_cache = ICON_CACHE.lock().unwrap();
-        let mut update_cache = false;
-        let mut icons = vec![];
-        let exe = value.exe().unwrap_or_default();
-
-        match icon_cache.get(&exe) {
-            None => {
-                icons.push(windows_icons::get_icon_by_process_id(value.process_id()));
-                update_cache = true;
-            }
-            Some(icon) => {
-                icons.push(Some(icon.clone()));
-            }
-        }
-
-        if update_cache {
-            if let Some(Some(icon)) = icons.last() {
-                icon_cache.insert(exe, icon.clone());
-            }
-        }
-
-        Self {
-            titles: vec![value.title().unwrap_or_default()],
-            icons,
-            focused_window_idx: 0,
-        }
-    }
-}
-
-impl KomorebiNotificationStateContainerInformation {
-    pub const EMPTY: Self = Self {
-        titles: vec![],
-        icons: vec![],
-        focused_window_idx: 0,
-    };
-}

komorebi-bar/src/komorebi_layout.rs

@@ -1,304 +0,0 @@
-use crate::config::DisplayFormat;
-use crate::komorebi::KomorebiLayoutConfig;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
-use eframe::egui::vec2;
-use eframe::egui::Context;
-use eframe::egui::FontId;
-use eframe::egui::Frame;
-use eframe::egui::Label;
-use eframe::egui::Rounding;
-use eframe::egui::Sense;
-use eframe::egui::Stroke;
-use eframe::egui::Ui;
-use eframe::egui::Vec2;
-use komorebi_client::SocketMessage;
-use schemars::JsonSchema;
-use serde::de::Error;
-use serde::Deserialize;
-use serde::Deserializer;
-use serde::Serialize;
-use serde_json::from_str;
-use std::fmt::Display;
-use std::fmt::Formatter;
-
-#[derive(Copy, Clone, Debug, Serialize, JsonSchema, PartialEq)]
-#[serde(untagged)]
-pub enum KomorebiLayout {
-    Default(komorebi_client::DefaultLayout),
-    Monocle,
-    Floating,
-    Paused,
-    Custom,
-}
-
-impl<'de> Deserialize<'de> for KomorebiLayout {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let s: String = String::deserialize(deserializer)?;
-
-        // Attempt to deserialize the string as a DefaultLayout
-        if let Ok(default_layout) =
-            from_str::<komorebi_client::DefaultLayout>(&format!("\"{}\"", s))
-        {
-            return Ok(KomorebiLayout::Default(default_layout));
-        }
-
-        // Handle other cases
-        match s.as_str() {
-            "Monocle" => Ok(KomorebiLayout::Monocle),
-            "Floating" => Ok(KomorebiLayout::Floating),
-            "Paused" => Ok(KomorebiLayout::Paused),
-            "Custom" => Ok(KomorebiLayout::Custom),
-            _ => Err(Error::custom(format!("Invalid layout: {}", s))),
-        }
-    }
-}
-
-impl Display for KomorebiLayout {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            KomorebiLayout::Default(layout) => write!(f, "{layout}"),
-            KomorebiLayout::Monocle => write!(f, "Monocle"),
-            KomorebiLayout::Floating => write!(f, "Floating"),
-            KomorebiLayout::Paused => write!(f, "Paused"),
-            KomorebiLayout::Custom => write!(f, "Custom"),
-        }
-    }
-}
-
-impl KomorebiLayout {
-    fn is_default(&mut self) -> bool {
-        matches!(self, KomorebiLayout::Default(_))
-    }
-
-    fn on_click(
-        &mut self,
-        show_options: &bool,
-        monitor_idx: usize,
-        workspace_idx: Option<usize>,
-    ) -> bool {
-        if self.is_default() {
-            !show_options
-        } else {
-            self.on_click_option(monitor_idx, workspace_idx);
-            false
-        }
-    }
-
-    fn on_click_option(&mut self, monitor_idx: usize, workspace_idx: Option<usize>) {
-        match self {
-            KomorebiLayout::Default(option) => {
-                if let Some(ws_idx) = workspace_idx {
-                    if komorebi_client::send_message(&SocketMessage::WorkspaceLayout(
-                        monitor_idx,
-                        ws_idx,
-                        *option,
-                    ))
-                    .is_err()
-                    {
-                        tracing::error!("could not send message to komorebi: WorkspaceLayout");
-                    }
-                }
-            }
-            KomorebiLayout::Monocle => {
-                if komorebi_client::send_message(&SocketMessage::ToggleMonocle).is_err() {
-                    tracing::error!("could not send message to komorebi: ToggleMonocle");
-                }
-            }
-            KomorebiLayout::Floating => {
-                if komorebi_client::send_message(&SocketMessage::ToggleTiling).is_err() {
-                    tracing::error!("could not send message to komorebi: ToggleTiling");
-                }
-            }
-            KomorebiLayout::Paused => {
-                if komorebi_client::send_message(&SocketMessage::TogglePause).is_err() {
-                    tracing::error!("could not send message to komorebi: TogglePause");
-                }
-            }
-            KomorebiLayout::Custom => {}
-        }
-    }
-
-    fn show_icon(&mut self, font_id: FontId, ctx: &Context, ui: &mut Ui) {
-        // paint custom icons for the layout
-        let size = Vec2::splat(font_id.size);
-        let (response, painter) = ui.allocate_painter(size, Sense::hover());
-        let color = ctx.style().visuals.selection.stroke.color;
-        let stroke = Stroke::new(1.0, color);
-        let mut rect = response.rect;
-        let rounding = Rounding::same(rect.width() * 0.1);
-        rect = rect.shrink(stroke.width);
-        let c = rect.center();
-        let r = rect.width() / 2.0;
-        painter.rect_stroke(rect, rounding, stroke);
-
-        match self {
-            KomorebiLayout::Default(layout) => match layout {
-                komorebi_client::DefaultLayout::BSP => {
-                    painter.line_segment([c - vec2(0.0, r), c + vec2(0.0, r)], stroke);
-                    painter.line_segment([c, c + vec2(r, 0.0)], stroke);
-                    painter.line_segment([c + vec2(r / 2.0, 0.0), c + vec2(r / 2.0, r)], stroke);
-                }
-                komorebi_client::DefaultLayout::Columns => {
-                    painter.line_segment([c - vec2(r / 2.0, r), c + vec2(-r / 2.0, r)], stroke);
-                    painter.line_segment([c - vec2(0.0, r), c + vec2(0.0, r)], stroke);
-                    painter.line_segment([c - vec2(-r / 2.0, r), c + vec2(r / 2.0, r)], stroke);
-                }
-                komorebi_client::DefaultLayout::Rows => {
-                    painter.line_segment([c - vec2(r, r / 2.0), c + vec2(r, -r / 2.0)], stroke);
-                    painter.line_segment([c - vec2(r, 0.0), c + vec2(r, 0.0)], stroke);
-                    painter.line_segment([c - vec2(r, -r / 2.0), c + vec2(r, r / 2.0)], stroke);
-                }
-                komorebi_client::DefaultLayout::VerticalStack => {
-                    painter.line_segment([c - vec2(0.0, r), c + vec2(0.0, r)], stroke);
-                    painter.line_segment([c, c + vec2(r, 0.0)], stroke);
-                }
-                komorebi_client::DefaultLayout::RightMainVerticalStack => {
-                    painter.line_segment([c - vec2(0.0, r), c + vec2(0.0, r)], stroke);
-                    painter.line_segment([c - vec2(r, 0.0), c], stroke);
-                }
-                komorebi_client::DefaultLayout::HorizontalStack => {
-                    painter.line_segment([c - vec2(r, 0.0), c + vec2(r, 0.0)], stroke);
-                    painter.line_segment([c, c + vec2(0.0, r)], stroke);
-                }
-                komorebi_client::DefaultLayout::UltrawideVerticalStack => {
-                    painter.line_segment([c - vec2(r / 2.0, r), c + vec2(-r / 2.0, r)], stroke);
-                    painter.line_segment([c + vec2(r / 2.0, 0.0), c + vec2(r, 0.0)], stroke);
-                    painter.line_segment([c - vec2(-r / 2.0, r), c + vec2(r / 2.0, r)], stroke);
-                }
-                komorebi_client::DefaultLayout::Grid => {
-                    painter.line_segment([c - vec2(r, 0.0), c + vec2(r, 0.0)], stroke);
-                    painter.line_segment([c - vec2(0.0, r), c + vec2(0.0, r)], stroke);
-                }
-            },
-            KomorebiLayout::Monocle => {}
-            KomorebiLayout::Floating => {
-                let mut rect_left = response.rect;
-                rect_left.set_width(rect.width() * 0.5);
-                rect_left.set_height(rect.height() * 0.5);
-                let mut rect_right = rect_left;
-                rect_left = rect_left.translate(Vec2::new(
-                    rect.width() * 0.1 + stroke.width,
-                    rect.width() * 0.1 + stroke.width,
-                ));
-                rect_right = rect_right.translate(Vec2::new(
-                    rect.width() * 0.35 + stroke.width,
-                    rect.width() * 0.35 + stroke.width,
-                ));
-                painter.rect_filled(rect_left, rounding, color);
-                painter.rect_stroke(rect_right, rounding, stroke);
-            }
-            KomorebiLayout::Paused => {
-                let mut rect_left = response.rect;
-                rect_left.set_width(rect.width() * 0.25);
-                rect_left.set_height(rect.height() * 0.8);
-                let mut rect_right = rect_left;
-                rect_left = rect_left.translate(Vec2::new(
-                    rect.width() * 0.2 + stroke.width,
-                    rect.width() * 0.1 + stroke.width,
-                ));
-                rect_right = rect_right.translate(Vec2::new(
-                    rect.width() * 0.55 + stroke.width,
-                    rect.width() * 0.1 + stroke.width,
-                ));
-                painter.rect_filled(rect_left, rounding, color);
-                painter.rect_filled(rect_right, rounding, color);
-            }
-            KomorebiLayout::Custom => {
-                painter.line_segment([c - vec2(0.0, r), c + vec2(0.0, r)], stroke);
-                painter.line_segment([c + vec2(0.0, r / 2.0), c + vec2(r, r / 2.0)], stroke);
-                painter.line_segment([c - vec2(0.0, r / 3.0), c - vec2(r, r / 3.0)], stroke);
-            }
-        }
-    }
-
-    pub fn show(
-        &mut self,
-        ctx: &Context,
-        ui: &mut Ui,
-        render_config: &mut RenderConfig,
-        layout_config: &KomorebiLayoutConfig,
-        workspace_idx: Option<usize>,
-    ) {
-        let monitor_idx = render_config.monitor_idx;
-        let font_id = render_config.icon_font_id.clone();
-        let mut show_options = RenderConfig::load_show_komorebi_layout_options();
-        let format = layout_config.display.unwrap_or(DisplayFormat::IconAndText);
-
-        if !self.is_default() {
-            show_options = false;
-        }
-
-        render_config.apply_on_widget(false, ui, |ui| {
-            let layout_frame = SelectableFrame::new(false)
-                .show(ui, |ui| {
-                    if let DisplayFormat::Icon | DisplayFormat::IconAndText = format {
-                        self.show_icon(font_id.clone(), ctx, ui);
-                    }
-
-                    if let DisplayFormat::Text | DisplayFormat::IconAndText = format {
-                        ui.add(Label::new(self.to_string()).selectable(false));
-                    }
-                })
-                .on_hover_text(self.to_string());
-
-            if layout_frame.clicked() {
-                show_options = self.on_click(&show_options, monitor_idx, workspace_idx);
-            }
-
-            if show_options {
-                if let Some(workspace_idx) = workspace_idx {
-                    Frame::none().show(ui, |ui| {
-                        ui.add(
-                            Label::new(egui_phosphor::regular::ARROW_FAT_LINES_RIGHT.to_string())
-                                .selectable(false),
-                        );
-
-                        let mut layout_options = layout_config.options.clone().unwrap_or(vec![
-                            KomorebiLayout::Default(komorebi_client::DefaultLayout::BSP),
-                            KomorebiLayout::Default(komorebi_client::DefaultLayout::Columns),
-                            KomorebiLayout::Default(komorebi_client::DefaultLayout::Rows),
-                            KomorebiLayout::Default(komorebi_client::DefaultLayout::VerticalStack),
-                            KomorebiLayout::Default(
-                                komorebi_client::DefaultLayout::RightMainVerticalStack,
-                            ),
-                            KomorebiLayout::Default(
-                                komorebi_client::DefaultLayout::HorizontalStack,
-                            ),
-                            KomorebiLayout::Default(
-                                komorebi_client::DefaultLayout::UltrawideVerticalStack,
-                            ),
-                            KomorebiLayout::Default(komorebi_client::DefaultLayout::Grid),
-                            //KomorebiLayout::Custom,
-                            KomorebiLayout::Monocle,
-                            KomorebiLayout::Floating,
-                            KomorebiLayout::Paused,
-                        ]);
-
-                        for layout_option in &mut layout_options {
-                            if SelectableFrame::new(self == layout_option)
-                                .show(ui, |ui| layout_option.show_icon(font_id.clone(), ctx, ui))
-                                .on_hover_text(match layout_option {
-                                    KomorebiLayout::Default(layout) => layout.to_string(),
-                                    KomorebiLayout::Monocle => "Toggle monocle".to_string(),
-                                    KomorebiLayout::Floating => "Toggle tiling".to_string(),
-                                    KomorebiLayout::Paused => "Toggle pause".to_string(),
-                                    KomorebiLayout::Custom => "Custom".to_string(),
-                                })
-                                .clicked()
-                            {
-                                layout_option.on_click_option(monitor_idx, Some(workspace_idx));
-                                show_options = false;
-                            };
-                        }
-                    });
-                }
-            }
-        });
-
-        RenderConfig::store_show_komorebi_layout_options(show_options);
-    }
-}

komorebi-bar/src/main.rs

@@ -4,16 +4,12 @@ mod config;
 mod cpu;
 mod date;
 mod komorebi;
-mod komorebi_layout;
 mod media;
 mod memory;
 mod network;
-mod render;
-mod selected_frame;
 mod storage;
 mod time;
 mod ui;
-mod update;
 mod widget;
 
 use crate::bar::Komobar;
@@ -25,20 +21,15 @@ use eframe::egui::ViewportBuilder;
 use font_loader::system_fonts;
 use hotwatch::EventKind;
 use hotwatch::Hotwatch;
-use image::RgbaImage;
 use komorebi_client::SocketMessage;
 use komorebi_client::SubscribeOptions;
 use schemars::gen::SchemaSettings;
-use std::collections::HashMap;
 use std::io::BufReader;
 use std::io::Read;
 use std::path::PathBuf;
 use std::sync::atomic::AtomicI32;
-use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
-use std::sync::LazyLock;
-use std::sync::Mutex;
 use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 use windows::Win32::Foundation::BOOL;
@@ -51,16 +42,14 @@ use windows::Win32::UI::HiDpi::DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
 use windows::Win32::UI::WindowsAndMessaging::EnumThreadWindows;
 use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
 
+pub static WIDGET_SPACING: f32 = 10.0;
+
 pub static MAX_LABEL_WIDTH: AtomicI32 = AtomicI32::new(400);
 pub static MONITOR_LEFT: AtomicI32 = AtomicI32::new(0);
 pub static MONITOR_TOP: AtomicI32 = AtomicI32::new(0);
 pub static MONITOR_RIGHT: AtomicI32 = AtomicI32::new(0);
-pub static MONITOR_INDEX: AtomicUsize = AtomicUsize::new(0);
 pub static BAR_HEIGHT: f32 = 50.0;
 
-pub static ICON_CACHE: LazyLock<Mutex<HashMap<String, RgbaImage>>> =
-    LazyLock::new(|| Mutex::new(HashMap::new()));
-
 #[derive(Parser)]
 #[clap(author, about, version)]
 struct Opts {
@@ -245,8 +234,6 @@ fn main() -> color_eyre::Result<()> {
         Ordering::SeqCst,
     );
 
-    MONITOR_INDEX.store(config.monitor.index, Ordering::SeqCst);
-
     match config.position {
         None => {
             config.position = Some(PositionConfig {
@@ -279,7 +266,7 @@ fn main() -> color_eyre::Result<()> {
 
     let viewport_builder = ViewportBuilder::default()
         .with_decorations(false)
-        .with_transparent(true)
+        // .with_transparent(config.transparent)
         .with_taskbar(false);
 
     let native_options = eframe::NativeOptions {
@@ -352,10 +339,6 @@ fn main() -> color_eyre::Result<()> {
                 for client in listener.incoming() {
                     match client {
                         Ok(subscription) => {
-                            match subscription.set_read_timeout(Some(Duration::from_secs(1))) {
-                                Ok(()) => {}
-                                Err(error) => tracing::error!("{}", error),
-                            }
                             let mut buffer = Vec::new();
                             let mut reader = BufReader::new(subscription);
 

komorebi-bar/src/media.rs

@@ -1,13 +1,14 @@
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::ui::CustomUi;
 use crate::widget::BarWidget;
 use crate::MAX_LABEL_WIDTH;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
+use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use eframe::egui::Vec2;
 use schemars::JsonSchema;
@@ -77,13 +78,20 @@ impl Media {
 }
 
 impl BarWidget for Media {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         if self.enable {
             let output = self.output();
             if !output.is_empty() {
+                let font_id = ctx
+                    .style()
+                    .text_styles
+                    .get(&TextStyle::Body)
+                    .cloned()
+                    .unwrap_or_else(FontId::default);
+
                 let mut layout_job = LayoutJob::simple(
                     egui_phosphor::regular::HEADPHONES.to_string(),
-                    config.icon_font_id.clone(),
+                    font_id.clone(),
                     ctx.style().visuals.selection.stroke.color,
                     100.0,
                 );
@@ -91,33 +99,29 @@ impl BarWidget for Media {
                 layout_job.append(
                     &output,
                     10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
+                    TextFormat::simple(font_id, ctx.style().visuals.text_color()),
                 );
 
-                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
-                        .show(ui, |ui| {
-                            let available_height = ui.available_height();
-                            let mut custom_ui = CustomUi(ui);
+                let available_height = ui.available_height();
+                let mut custom_ui = CustomUi(ui);
 
-                            custom_ui.add_sized_left_to_right(
-                                Vec2::new(
-                                    MAX_LABEL_WIDTH.load(Ordering::SeqCst) as f32,
-                                    available_height,
-                                ),
-                                Label::new(layout_job).selectable(false).truncate(),
-                            )
-                        })
-                        .clicked()
-                    {
-                        self.toggle();
-                    }
-                });
+                if custom_ui
+                    .add_sized_left_to_right(
+                        Vec2::new(
+                            MAX_LABEL_WIDTH.load(Ordering::SeqCst) as f32,
+                            available_height,
+                        ),
+                        Label::new(layout_job)
+                            .selectable(false)
+                            .sense(Sense::click())
+                            .truncate(),
+                    )
+                    .clicked()
+                {
+                    self.toggle();
+                }
+
+                ui.add_space(WIDGET_SPACING);
             }
         }
     }

komorebi-bar/src/memory.rs

@@ -1,12 +1,13 @@
 use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::widget::BarWidget;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
+use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -29,18 +30,17 @@ pub struct MemoryConfig {
 
 impl From<MemoryConfig> for Memory {
     fn from(value: MemoryConfig) -> Self {
-        let data_refresh_interval = value.data_refresh_interval.unwrap_or(10);
+        let mut system =
+            System::new_with_specifics(RefreshKind::default().without_cpu().without_processes());
+
+        system.refresh_memory();
 
         Self {
             enable: value.enable,
-            system: System::new_with_specifics(
-                RefreshKind::default().without_cpu().without_processes(),
-            ),
-            data_refresh_interval,
+            system,
+            data_refresh_interval: value.data_refresh_interval.unwrap_or(10),
             label_prefix: value.label_prefix.unwrap_or(LabelPrefix::IconAndText),
-            last_updated: Instant::now()
-                .checked_sub(Duration::from_secs(data_refresh_interval))
-                .unwrap(),
+            last_updated: Instant::now(),
         }
     }
 }
@@ -73,10 +73,17 @@ impl Memory {
 }
 
 impl BarWidget for Memory {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         if self.enable {
             let output = self.output();
             if !output.is_empty() {
+                let font_id = ctx
+                    .style()
+                    .text_styles
+                    .get(&TextStyle::Body)
+                    .cloned()
+                    .unwrap_or_else(FontId::default);
+
                 let mut layout_job = LayoutJob::simple(
                     match self.label_prefix {
                         LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -84,7 +91,7 @@ impl BarWidget for Memory {
                         }
                         LabelPrefix::None | LabelPrefix::Text => String::new(),
                     },
-                    config.icon_font_id.clone(),
+                    font_id.clone(),
                     ctx.style().visuals.selection.stroke.color,
                     100.0,
                 );
@@ -92,27 +99,25 @@ impl BarWidget for Memory {
                 layout_job.append(
                     &output,
                     10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
+                    TextFormat::simple(font_id, ctx.style().visuals.text_color()),
                 );
 
-                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
-                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
-                        .clicked()
+                if ui
+                    .add(
+                        Label::new(layout_job)
+                            .selectable(false)
+                            .sense(Sense::click()),
+                    )
+                    .clicked()
+                {
+                    if let Err(error) = Command::new("cmd.exe").args(["/C", "taskmgr.exe"]).spawn()
                     {
-                        if let Err(error) =
-                            Command::new("cmd.exe").args(["/C", "taskmgr.exe"]).spawn()
-                        {
-                            eprintln!("{}", error)
-                        }
+                        eprintln!("{}", error)
                     }
-                });
+                }
             }
+
+            ui.add_space(WIDGET_SPACING);
         }
     }
 }

komorebi-bar/src/network.rs

@@ -1,12 +1,13 @@
 use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::widget::BarWidget;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
+use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use num_derive::FromPrimitive;
 use schemars::JsonSchema;
@@ -26,8 +27,6 @@ pub struct NetworkConfig {
     pub show_total_data_transmitted: bool,
     /// Show network activity
     pub show_network_activity: bool,
-    /// Show default interface
-    pub show_default_interface: Option<bool>,
     /// Characters to reserve for network activity data
     pub network_activity_fill_characters: Option<usize>,
     /// Data refresh interval (default: 10 seconds)
@@ -38,40 +37,130 @@ pub struct NetworkConfig {
 
 impl From<NetworkConfig> for Network {
     fn from(value: NetworkConfig) -> Self {
-        let data_refresh_interval = value.data_refresh_interval.unwrap_or(10);
+        let mut last_state_data = vec![];
+        let mut last_state_transmitted = vec![];
+
+        let mut networks_total_data_transmitted = Networks::new_with_refreshed_list();
+        let mut networks_network_activity = Networks::new_with_refreshed_list();
+
+        let mut default_interface = String::new();
+
+        let prefix = value.label_prefix.unwrap_or(LabelPrefix::Icon);
+
+        if let Ok(interface) = netdev::get_default_interface() {
+            if let Some(friendly_name) = interface.friendly_name {
+                default_interface.clone_from(&friendly_name);
+
+                if value.show_total_data_transmitted {
+                    networks_total_data_transmitted.refresh();
+                    for (interface_name, data) in &networks_total_data_transmitted {
+                        if friendly_name.eq(interface_name) {
+                            last_state_data.push(match prefix {
+                                LabelPrefix::None => format!(
+                                    "{} | {}",
+                                    to_pretty_bytes(data.total_received(), 1),
+                                    to_pretty_bytes(data.total_transmitted(), 1),
+                                ),
+                                LabelPrefix::Icon => format!(
+                                    "{} {} | {} {}",
+                                    egui_phosphor::regular::ARROW_FAT_DOWN,
+                                    to_pretty_bytes(data.total_received(), 1),
+                                    egui_phosphor::regular::ARROW_FAT_UP,
+                                    to_pretty_bytes(data.total_transmitted(), 1),
+                                ),
+                                LabelPrefix::Text => format!(
+                                    "\u{2211}DOWN: {} | \u{2211}UP: {}",
+                                    to_pretty_bytes(data.total_received(), 1),
+                                    to_pretty_bytes(data.total_transmitted(), 1),
+                                ),
+                                LabelPrefix::IconAndText => format!(
+                                    "{} \u{2211}DOWN: {} | {} \u{2211}UP: {}",
+                                    egui_phosphor::regular::ARROW_FAT_DOWN,
+                                    to_pretty_bytes(data.total_received(), 1),
+                                    egui_phosphor::regular::ARROW_FAT_UP,
+                                    to_pretty_bytes(data.total_transmitted(), 1),
+                                ),
+                            })
+                        }
+                    }
+                }
+
+                if value.show_network_activity {
+                    networks_network_activity.refresh();
+                    for (interface_name, data) in &networks_network_activity {
+                        if friendly_name.eq(interface_name) {
+                            last_state_transmitted.push(match prefix {
+                                LabelPrefix::None => format!(
+                                    "{: >width$}/s | {: >width$}/s",
+                                    to_pretty_bytes(data.received(), 1),
+                                    to_pretty_bytes(data.transmitted(), 1),
+                                    width =
+                                        value.network_activity_fill_characters.unwrap_or_default(),
+                                ),
+                                LabelPrefix::Icon => format!(
+                                    "{} {: >width$}/s | {} {: >width$}/s",
+                                    egui_phosphor::regular::ARROW_FAT_DOWN,
+                                    to_pretty_bytes(data.received(), 1),
+                                    egui_phosphor::regular::ARROW_FAT_UP,
+                                    to_pretty_bytes(data.transmitted(), 1),
+                                    width =
+                                        value.network_activity_fill_characters.unwrap_or_default(),
+                                ),
+                                LabelPrefix::Text => format!(
+                                    "DOWN: {: >width$}/s | UP: {: >width$}/s",
+                                    to_pretty_bytes(data.received(), 1),
+                                    to_pretty_bytes(data.transmitted(), 1),
+                                    width =
+                                        value.network_activity_fill_characters.unwrap_or_default(),
+                                ),
+                                LabelPrefix::IconAndText => format!(
+                                    "{} DOWN: {: >width$}/s | {} UP: {: >width$}/s",
+                                    egui_phosphor::regular::ARROW_FAT_DOWN,
+                                    to_pretty_bytes(data.received(), 1),
+                                    egui_phosphor::regular::ARROW_FAT_UP,
+                                    to_pretty_bytes(data.transmitted(), 1),
+                                    width =
+                                        value.network_activity_fill_characters.unwrap_or_default(),
+                                ),
+                            })
+                        }
+                    }
+                }
+            }
+        }
 
         Self {
             enable: value.enable,
-            show_total_activity: value.show_total_data_transmitted,
-            show_activity: value.show_network_activity,
-            show_default_interface: value.show_default_interface.unwrap_or(true),
-            networks_network_activity: Networks::new_with_refreshed_list(),
-            default_interface: String::new(),
-            data_refresh_interval,
-            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::Icon),
+            networks_total_data_transmitted,
+            networks_network_activity,
+            default_interface,
+            data_refresh_interval: value.data_refresh_interval.unwrap_or(10),
+            label_prefix: prefix,
+            show_total_data_transmitted: value.show_total_data_transmitted,
+            show_network_activity: value.show_network_activity,
             network_activity_fill_characters: value
                 .network_activity_fill_characters
                 .unwrap_or_default(),
-            last_state_total_activity: vec![],
-            last_state_activity: vec![],
-            last_updated_network_activity: Instant::now()
-                .checked_sub(Duration::from_secs(data_refresh_interval))
-                .unwrap(),
+            last_state_total_data_transmitted: last_state_data,
+            last_state_network_activity: last_state_transmitted,
+            last_updated_total_data_transmitted: Instant::now(),
+            last_updated_network_activity: Instant::now(),
         }
     }
 }
 
 pub struct Network {
     pub enable: bool,
-    pub show_total_activity: bool,
-    pub show_activity: bool,
-    pub show_default_interface: bool,
+    pub show_total_data_transmitted: bool,
+    pub show_network_activity: bool,
+    networks_total_data_transmitted: Networks,
     networks_network_activity: Networks,
     data_refresh_interval: u64,
     label_prefix: LabelPrefix,
     default_interface: String,
-    last_state_total_activity: Vec<NetworkReading>,
-    last_state_activity: Vec<NetworkReading>,
+    last_state_total_data_transmitted: Vec<String>,
+    last_state_network_activity: Vec<String>,
+    last_updated_total_data_transmitted: Instant,
     last_updated_network_activity: Instant,
     network_activity_fill_characters: usize,
 }
@@ -85,273 +174,214 @@ impl Network {
         }
     }
 
-    fn network_activity(&mut self) -> (Vec<NetworkReading>, Vec<NetworkReading>) {
-        let mut activity = self.last_state_activity.clone();
-        let mut total_activity = self.last_state_total_activity.clone();
+    fn network_activity(&mut self) -> Vec<String> {
+        let mut outputs = self.last_state_network_activity.clone();
         let now = Instant::now();
 
-        if now.duration_since(self.last_updated_network_activity)
-            > Duration::from_secs(self.data_refresh_interval)
+        if self.show_network_activity
+            && now.duration_since(self.last_updated_network_activity)
+                > Duration::from_secs(self.data_refresh_interval)
         {
-            activity.clear();
-            total_activity.clear();
+            outputs.clear();
 
             if let Ok(interface) = netdev::get_default_interface() {
                 if let Some(friendly_name) = &interface.friendly_name {
-                    self.default_interface.clone_from(friendly_name);
-
-                    self.networks_network_activity.refresh(true);
-
-                    for (interface_name, data) in &self.networks_network_activity {
-                        if friendly_name.eq(interface_name) {
-                            if self.show_activity {
-                                activity.push(NetworkReading::new(
-                                    NetworkReadingFormat::Speed,
-                                    Self::to_pretty_bytes(
-                                        data.received(),
-                                        self.data_refresh_interval,
+                    if self.show_network_activity {
+                        self.networks_network_activity.refresh();
+                        for (interface_name, data) in &self.networks_network_activity {
+                            if friendly_name.eq(interface_name) {
+                                outputs.push(match self.label_prefix {
+                                    LabelPrefix::None => format!(
+                                        "{: >width$}/s | {: >width$}/s",
+                                        to_pretty_bytes(
+                                            data.received(),
+                                            self.data_refresh_interval
+                                        ),
+                                        to_pretty_bytes(
+                                            data.transmitted(),
+                                            self.data_refresh_interval
+                                        ),
+                                        width = self.network_activity_fill_characters,
                                     ),
-                                    Self::to_pretty_bytes(
-                                        data.transmitted(),
-                                        self.data_refresh_interval,
+                                    LabelPrefix::Icon => format!(
+                                        "{} {: >width$}/s | {} {: >width$}/s",
+                                        egui_phosphor::regular::ARROW_FAT_DOWN,
+                                        to_pretty_bytes(
+                                            data.received(),
+                                            self.data_refresh_interval
+                                        ),
+                                        egui_phosphor::regular::ARROW_FAT_UP,
+                                        to_pretty_bytes(
+                                            data.transmitted(),
+                                            self.data_refresh_interval
+                                        ),
+                                        width = self.network_activity_fill_characters,
                                     ),
-                                ));
-                            }
-
-                            if self.show_total_activity {
-                                total_activity.push(NetworkReading::new(
-                                    NetworkReadingFormat::Total,
-                                    Self::to_pretty_bytes(data.total_received(), 1),
-                                    Self::to_pretty_bytes(data.total_transmitted(), 1),
-                                ))
+                                    LabelPrefix::Text => format!(
+                                        "DOWN: {: >width$}/s | UP: {: >width$}/s",
+                                        to_pretty_bytes(
+                                            data.received(),
+                                            self.data_refresh_interval
+                                        ),
+                                        to_pretty_bytes(
+                                            data.transmitted(),
+                                            self.data_refresh_interval
+                                        ),
+                                        width = self.network_activity_fill_characters,
+                                    ),
+                                    LabelPrefix::IconAndText => {
+                                        format!(
+                                            "{} DOWN: {: >width$}/s | {} UP: {: >width$}/s",
+                                            egui_phosphor::regular::ARROW_FAT_DOWN,
+                                            to_pretty_bytes(
+                                                data.received(),
+                                                self.data_refresh_interval
+                                            ),
+                                            egui_phosphor::regular::ARROW_FAT_UP,
+                                            to_pretty_bytes(
+                                                data.transmitted(),
+                                                self.data_refresh_interval
+                                            ),
+                                            width = self.network_activity_fill_characters,
+                                        )
+                                    }
+                                })
                             }
                         }
                     }
                 }
             }
 
-            self.last_state_activity.clone_from(&activity);
-            self.last_state_total_activity.clone_from(&total_activity);
+            self.last_state_network_activity.clone_from(&outputs);
             self.last_updated_network_activity = now;
         }
 
-        (activity, total_activity)
+        outputs
     }
 
-    fn reading_to_label(
-        &self,
-        ctx: &Context,
-        reading: NetworkReading,
-        config: RenderConfig,
-    ) -> Label {
-        let (text_down, text_up) = match self.label_prefix {
-            LabelPrefix::None | LabelPrefix::Icon => match reading.format {
-                NetworkReadingFormat::Speed => (
-                    format!(
-                        "{: >width$}/s | ",
-                        reading.received_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                    format!(
-                        "{: >width$}/s",
-                        reading.transmitted_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                ),
-                NetworkReadingFormat::Total => (
-                    format!("{} | ", reading.received_text),
-                    reading.transmitted_text,
-                ),
-            },
-            LabelPrefix::Text | LabelPrefix::IconAndText => match reading.format {
-                NetworkReadingFormat::Speed => (
-                    format!(
-                        "DOWN: {: >width$}/s | ",
-                        reading.received_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                    format!(
-                        "UP: {: >width$}/s",
-                        reading.transmitted_text,
-                        width = self.network_activity_fill_characters
-                    ),
-                ),
-                NetworkReadingFormat::Total => (
-                    format!("\u{2211}DOWN: {}/s | ", reading.received_text),
-                    format!("\u{2211}UP: {}/s", reading.transmitted_text),
-                ),
-            },
-        };
+    fn total_data_transmitted(&mut self) -> Vec<String> {
+        let mut outputs = self.last_state_total_data_transmitted.clone();
+        let now = Instant::now();
 
-        let icon_format = TextFormat::simple(
-            config.icon_font_id.clone(),
-            ctx.style().visuals.selection.stroke.color,
-        );
-        let text_format = TextFormat {
-            font_id: config.text_font_id.clone(),
-            color: ctx.style().visuals.text_color(),
-            valign: Align::Center,
-            ..Default::default()
-        };
+        if self.show_total_data_transmitted
+            && now.duration_since(self.last_updated_total_data_transmitted)
+                > Duration::from_secs(self.data_refresh_interval)
+        {
+            outputs.clear();
 
-        // icon
-        let mut layout_job = LayoutJob::simple(
-            match self.label_prefix {
-                LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                    egui_phosphor::regular::ARROW_FAT_DOWN.to_string()
+            if let Ok(interface) = netdev::get_default_interface() {
+                if let Some(friendly_name) = &interface.friendly_name {
+                    if self.show_total_data_transmitted {
+                        self.networks_total_data_transmitted.refresh();
+
+                        for (interface_name, data) in &self.networks_total_data_transmitted {
+                            if friendly_name.eq(interface_name) {
+                                outputs.push(match self.label_prefix {
+                                    LabelPrefix::None => format!(
+                                        "{} | {}",
+                                        to_pretty_bytes(data.total_received(), 1),
+                                        to_pretty_bytes(data.total_transmitted(), 1),
+                                    ),
+                                    LabelPrefix::Icon => format!(
+                                        "{} {} | {} {}",
+                                        egui_phosphor::regular::ARROW_FAT_DOWN,
+                                        to_pretty_bytes(data.total_received(), 1),
+                                        egui_phosphor::regular::ARROW_FAT_UP,
+                                        to_pretty_bytes(data.total_transmitted(), 1),
+                                    ),
+                                    LabelPrefix::Text => format!(
+                                        "\u{2211}DOWN: {} | \u{2211}UP: {}",
+                                        to_pretty_bytes(data.total_received(), 1),
+                                        to_pretty_bytes(data.total_transmitted(), 1),
+                                    ),
+                                    LabelPrefix::IconAndText => format!(
+                                        "{} \u{2211}DOWN: {} | {} \u{2211}UP: {}",
+                                        egui_phosphor::regular::ARROW_FAT_DOWN,
+                                        to_pretty_bytes(data.total_received(), 1),
+                                        egui_phosphor::regular::ARROW_FAT_UP,
+                                        to_pretty_bytes(data.total_transmitted(), 1),
+                                    ),
+                                })
+                            }
+                        }
+                    }
                 }
-                LabelPrefix::None | LabelPrefix::Text => String::new(),
-            },
-            icon_format.font_id.clone(),
-            icon_format.color,
-            100.0,
-        );
+            }
 
-        // text
-        layout_job.append(
-            &text_down,
-            ctx.style().spacing.item_spacing.x,
-            text_format.clone(),
-        );
-
-        // icon
-        layout_job.append(
-            &match self.label_prefix {
-                LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                    egui_phosphor::regular::ARROW_FAT_UP.to_string()
-                }
-                LabelPrefix::None | LabelPrefix::Text => String::new(),
-            },
-            0.0,
-            icon_format.clone(),
-        );
-
-        // text
-        layout_job.append(
-            &text_up,
-            ctx.style().spacing.item_spacing.x,
-            text_format.clone(),
-        );
-
-        Label::new(layout_job).selectable(false)
-    }
-
-    fn to_pretty_bytes(input_in_bytes: u64, timespan_in_s: u64) -> String {
-        let input = input_in_bytes as f32 / timespan_in_s as f32;
-        let mut magnitude = input.log(1024f32) as u32;
-
-        // let the base unit be KiB
-        if magnitude < 1 {
-            magnitude = 1;
+            self.last_state_total_data_transmitted.clone_from(&outputs);
+            self.last_updated_total_data_transmitted = now;
         }
 
-        let base: Option<DataUnit> = num::FromPrimitive::from_u32(magnitude);
-        let result = input / ((1u64) << (magnitude * 10)) as f32;
-
-        match base {
-            Some(DataUnit::B) => format!("{result:.1} B"),
-            Some(unit) => format!("{result:.1} {unit}iB"),
-            None => String::from("Unknown data unit"),
-        }
+        outputs
     }
 }
 
 impl BarWidget for Network {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
-        if self.enable {
-            // widget spacing: make sure to use the same config to call the apply_on_widget function
-            let mut render_config = config.clone();
-
-            if self.show_total_activity || self.show_activity {
-                let (activity, total_activity) = self.network_activity();
-
-                if self.show_total_activity {
-                    for reading in total_activity {
-                        render_config.apply_on_widget(true, ui, |ui| {
-                            ui.add(self.reading_to_label(ctx, reading, config.clone()));
-                        });
-                    }
-                }
-
-                if self.show_activity {
-                    for reading in activity {
-                        render_config.apply_on_widget(true, ui, |ui| {
-                            ui.add(self.reading_to_label(ctx, reading, config.clone()));
-                        });
-                    }
-                }
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
+        if self.show_total_data_transmitted {
+            for output in self.total_data_transmitted() {
+                ui.add(Label::new(output).selectable(false));
             }
 
-            if self.show_default_interface {
-                self.default_interface();
-
-                if !self.default_interface.is_empty() {
-                    let mut layout_job = LayoutJob::simple(
-                        match self.label_prefix {
-                            LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                                egui_phosphor::regular::WIFI_HIGH.to_string()
-                            }
-                            LabelPrefix::None | LabelPrefix::Text => String::new(),
-                        },
-                        config.icon_font_id.clone(),
-                        ctx.style().visuals.selection.stroke.color,
-                        100.0,
-                    );
-
-                    if let LabelPrefix::Text | LabelPrefix::IconAndText = self.label_prefix {
-                        self.default_interface.insert_str(0, "NET: ");
-                    }
-
-                    layout_job.append(
-                        &self.default_interface,
-                        10.0,
-                        TextFormat {
-                            font_id: config.text_font_id.clone(),
-                            color: ctx.style().visuals.text_color(),
-                            valign: Align::Center,
-                            ..Default::default()
-                        },
-                    );
-
-                    render_config.apply_on_widget(false, ui, |ui| {
-                        if SelectableFrame::new(false)
-                            .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
-                            .clicked()
-                        {
-                            if let Err(error) = Command::new("cmd.exe").args(["/C", "ncpa"]).spawn()
-                            {
-                                eprintln!("{}", error)
-                            }
-                        }
-                    });
-                }
-            }
-
-            // widget spacing: pass on the config that was use for calling the apply_on_widget function
-            *config = render_config.clone();
+            ui.add_space(WIDGET_SPACING);
         }
-    }
-}
 
-#[derive(Clone)]
-enum NetworkReadingFormat {
-    Speed = 0,
-    Total = 1,
-}
+        if self.show_network_activity {
+            for output in self.network_activity() {
+                ui.add(Label::new(output).selectable(false));
+            }
 
-#[derive(Clone)]
-struct NetworkReading {
-    pub format: NetworkReadingFormat,
-    pub received_text: String,
-    pub transmitted_text: String,
-}
+            ui.add_space(WIDGET_SPACING);
+        }
 
-impl NetworkReading {
-    pub fn new(format: NetworkReadingFormat, received: String, transmitted: String) -> Self {
-        NetworkReading {
-            format,
-            received_text: received,
-            transmitted_text: transmitted,
+        if self.enable {
+            self.default_interface();
+
+            if !self.default_interface.is_empty() {
+                let font_id = ctx
+                    .style()
+                    .text_styles
+                    .get(&TextStyle::Body)
+                    .cloned()
+                    .unwrap_or_else(FontId::default);
+
+                let mut layout_job = LayoutJob::simple(
+                    match self.label_prefix {
+                        LabelPrefix::Icon | LabelPrefix::IconAndText => {
+                            egui_phosphor::regular::WIFI_HIGH.to_string()
+                        }
+                        LabelPrefix::None | LabelPrefix::Text => String::new(),
+                    },
+                    font_id.clone(),
+                    ctx.style().visuals.selection.stroke.color,
+                    100.0,
+                );
+
+                if let LabelPrefix::Text | LabelPrefix::IconAndText = self.label_prefix {
+                    self.default_interface.insert_str(0, "NET: ");
+                }
+
+                layout_job.append(
+                    &self.default_interface,
+                    10.0,
+                    TextFormat::simple(font_id, ctx.style().visuals.text_color()),
+                );
+
+                if ui
+                    .add(
+                        Label::new(layout_job)
+                            .selectable(false)
+                            .sense(Sense::click()),
+                    )
+                    .clicked()
+                {
+                    if let Err(error) = Command::new("cmd.exe").args(["/C", "ncpa"]).spawn() {
+                        eprintln!("{}", error)
+                    }
+                }
+            }
+
+            ui.add_space(WIDGET_SPACING);
         }
     }
 }
@@ -374,3 +404,22 @@ impl fmt::Display for DataUnit {
         write!(f, "{:?}", self)
     }
 }
+
+fn to_pretty_bytes(input_in_bytes: u64, timespan_in_s: u64) -> String {
+    let input = input_in_bytes as f32 / timespan_in_s as f32;
+    let mut magnitude = input.log(1024f32) as u32;
+
+    // let the base unit be KiB
+    if magnitude < 1 {
+        magnitude = 1;
+    }
+
+    let base: Option<DataUnit> = num::FromPrimitive::from_u32(magnitude);
+    let result = input / ((1u64) << (magnitude * 10)) as f32;
+
+    match base {
+        Some(DataUnit::B) => format!("{result:.1} B"),
+        Some(unit) => format!("{result:.1} {unit}iB"),
+        None => String::from("Unknown data unit"),
+    }
+}

komorebi-bar/src/render.rs

@@ -1,390 +0,0 @@
-use crate::bar::Alignment;
-use crate::config::KomobarConfig;
-use eframe::egui::Color32;
-use eframe::egui::Context;
-use eframe::egui::FontId;
-use eframe::egui::Frame;
-use eframe::egui::InnerResponse;
-use eframe::egui::Margin;
-use eframe::egui::Rounding;
-use eframe::egui::Shadow;
-use eframe::egui::TextStyle;
-use eframe::egui::Ui;
-use eframe::egui::Vec2;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
-
-static SHOW_KOMOREBI_LAYOUT_OPTIONS: AtomicUsize = AtomicUsize::new(0);
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(tag = "kind")]
-pub enum Grouping {
-    /// No grouping is applied
-    None,
-    /// Widgets are grouped as a whole
-    Bar(GroupingConfig),
-    /// Widgets are grouped by alignment
-    Alignment(GroupingConfig),
-    /// Widgets are grouped individually
-    Widget(GroupingConfig),
-}
-
-#[derive(Clone)]
-pub struct RenderConfig {
-    /// Komorebi monitor index of the monitor on which to render the bar
-    pub monitor_idx: usize,
-    /// Spacing between widgets
-    pub spacing: f32,
-    /// Sets how widgets are grouped
-    pub grouping: Grouping,
-    /// Background color
-    pub background_color: Color32,
-    /// Alignment of the widgets
-    pub alignment: Option<Alignment>,
-    /// Add more inner margin when adding a widget group
-    pub more_inner_margin: bool,
-    /// Set to true after the first time the apply_on_widget was called on an alignment
-    pub applied_on_widget: bool,
-    /// FontId for text
-    pub text_font_id: FontId,
-    /// FontId for icon (based on scaling the text font id)
-    pub icon_font_id: FontId,
-}
-
-pub trait RenderExt {
-    fn new_renderconfig(
-        &self,
-        ctx: &Context,
-        background_color: Color32,
-        icon_scale: Option<f32>,
-    ) -> RenderConfig;
-}
-
-impl RenderExt for &KomobarConfig {
-    fn new_renderconfig(
-        &self,
-        ctx: &Context,
-        background_color: Color32,
-        icon_scale: Option<f32>,
-    ) -> RenderConfig {
-        let text_font_id = ctx
-            .style()
-            .text_styles
-            .get(&TextStyle::Body)
-            .cloned()
-            .unwrap_or_else(FontId::default);
-
-        let mut icon_font_id = text_font_id.clone();
-        icon_font_id.size *= icon_scale.unwrap_or(1.4).clamp(1.0, 2.0);
-
-        RenderConfig {
-            monitor_idx: self.monitor.index,
-            spacing: self.widget_spacing.unwrap_or(10.0),
-            grouping: self.grouping.unwrap_or(Grouping::None),
-            background_color,
-            alignment: None,
-            more_inner_margin: false,
-            applied_on_widget: false,
-            text_font_id,
-            icon_font_id,
-        }
-    }
-}
-
-impl RenderConfig {
-    pub fn load_show_komorebi_layout_options() -> bool {
-        SHOW_KOMOREBI_LAYOUT_OPTIONS.load(Ordering::SeqCst) != 0
-    }
-
-    pub fn store_show_komorebi_layout_options(show: bool) {
-        SHOW_KOMOREBI_LAYOUT_OPTIONS.store(show as usize, Ordering::SeqCst);
-    }
-
-    pub fn new() -> Self {
-        Self {
-            monitor_idx: 0,
-            spacing: 0.0,
-            grouping: Grouping::None,
-            background_color: Color32::BLACK,
-            alignment: None,
-            more_inner_margin: false,
-            applied_on_widget: false,
-            text_font_id: FontId::default(),
-            icon_font_id: FontId::default(),
-        }
-    }
-
-    pub fn change_frame_on_bar(
-        &mut self,
-        frame: Frame,
-        ui_style: &Arc<eframe::egui::Style>,
-    ) -> Frame {
-        self.alignment = None;
-
-        if let Grouping::Bar(config) = self.grouping {
-            return self.define_group_frame(
-                //TODO: this outer margin can be a config
-                Some(Margin {
-                    left: 10.0,
-                    right: 10.0,
-                    top: 6.0,
-                    bottom: 6.0,
-                }),
-                config,
-                ui_style,
-            );
-        }
-
-        frame
-    }
-
-    pub fn apply_on_alignment<R>(
-        &mut self,
-        ui: &mut Ui,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        self.alignment = None;
-
-        if let Grouping::Alignment(config) = self.grouping {
-            return self.define_group(None, config, ui, add_contents);
-        }
-
-        Self::fallback_group(ui, add_contents)
-    }
-
-    pub fn apply_on_widget<R>(
-        &mut self,
-        more_inner_margin: bool,
-        ui: &mut Ui,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        self.more_inner_margin = more_inner_margin;
-        let outer_margin = self.widget_outer_margin(ui);
-
-        if let Grouping::Widget(config) = self.grouping {
-            return self.define_group(Some(outer_margin), config, ui, add_contents);
-        }
-
-        self.fallback_widget_group(Some(outer_margin), ui, add_contents)
-    }
-
-    fn fallback_group<R>(ui: &mut Ui, add_contents: impl FnOnce(&mut Ui) -> R) -> InnerResponse<R> {
-        InnerResponse {
-            inner: add_contents(ui),
-            response: ui.response().clone(),
-        }
-    }
-
-    fn fallback_widget_group<R>(
-        &mut self,
-        outer_margin: Option<Margin>,
-        ui: &mut Ui,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        Frame::none()
-            .outer_margin(outer_margin.unwrap_or(Margin::ZERO))
-            .inner_margin(match self.more_inner_margin {
-                true => Margin::symmetric(5.0, 0.0),
-                false => Margin::same(0.0),
-            })
-            .show(ui, add_contents)
-    }
-
-    fn define_group<R>(
-        &mut self,
-        outer_margin: Option<Margin>,
-        config: GroupingConfig,
-        ui: &mut Ui,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        self.define_group_frame(outer_margin, config, ui.style())
-            .show(ui, add_contents)
-    }
-
-    pub fn define_group_frame(
-        &mut self,
-        outer_margin: Option<Margin>,
-        config: GroupingConfig,
-        ui_style: &Arc<eframe::egui::Style>,
-    ) -> Frame {
-        Frame::group(ui_style)
-            .outer_margin(outer_margin.unwrap_or(Margin::ZERO))
-            .inner_margin(match self.more_inner_margin {
-                true => Margin::symmetric(6.0, 1.0),
-                false => Margin::symmetric(1.0, 1.0),
-            })
-            .stroke(ui_style.visuals.widgets.noninteractive.bg_stroke)
-            .rounding(match config.rounding {
-                Some(rounding) => rounding.into(),
-                None => ui_style.visuals.widgets.noninteractive.rounding,
-            })
-            .fill(
-                self.background_color
-                    .try_apply_alpha(config.transparency_alpha),
-            )
-            .shadow(match config.style {
-                Some(style) => match style {
-                    // new styles can be added if needed here
-                    GroupingStyle::Default => Shadow::NONE,
-                    GroupingStyle::DefaultWithShadowB4O1S3 => Shadow {
-                        blur: 4.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 3.0,
-                        color: Color32::BLACK.try_apply_alpha(config.transparency_alpha),
-                    },
-                    GroupingStyle::DefaultWithShadowB4O0S3 => Shadow {
-                        blur: 4.0,
-                        offset: Vec2::new(0.0, 0.0),
-                        spread: 3.0,
-                        color: Color32::BLACK.try_apply_alpha(config.transparency_alpha),
-                    },
-                    GroupingStyle::DefaultWithShadowB0O1S3 => Shadow {
-                        blur: 0.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 3.0,
-                        color: Color32::BLACK.try_apply_alpha(config.transparency_alpha),
-                    },
-                    GroupingStyle::DefaultWithGlowB3O1S2 => Shadow {
-                        blur: 3.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 2.0,
-                        color: ui_style
-                            .visuals
-                            .selection
-                            .stroke
-                            .color
-                            .try_apply_alpha(config.transparency_alpha),
-                    },
-                    GroupingStyle::DefaultWithGlowB3O0S2 => Shadow {
-                        blur: 3.0,
-                        offset: Vec2::new(0.0, 0.0),
-                        spread: 2.0,
-                        color: ui_style
-                            .visuals
-                            .selection
-                            .stroke
-                            .color
-                            .try_apply_alpha(config.transparency_alpha),
-                    },
-                    GroupingStyle::DefaultWithGlowB0O1S2 => Shadow {
-                        blur: 0.0,
-                        offset: Vec2::new(1.0, 1.0),
-                        spread: 2.0,
-                        color: ui_style
-                            .visuals
-                            .selection
-                            .stroke
-                            .color
-                            .try_apply_alpha(config.transparency_alpha),
-                    },
-                },
-                None => Shadow::NONE,
-            })
-    }
-
-    fn widget_outer_margin(&mut self, ui: &mut Ui) -> Margin {
-        let spacing = if self.applied_on_widget {
-            // Remove the default item spacing from the margin
-            self.spacing - ui.spacing().item_spacing.x
-        } else {
-            0.0
-        };
-
-        if !self.applied_on_widget {
-            self.applied_on_widget = true;
-        }
-
-        Margin {
-            left: match self.alignment {
-                Some(align) => match align {
-                    Alignment::Left => spacing,
-                    Alignment::Center => spacing,
-                    Alignment::Right => 0.0,
-                },
-                None => 0.0,
-            },
-            right: match self.alignment {
-                Some(align) => match align {
-                    Alignment::Left => 0.0,
-                    Alignment::Center => 0.0,
-                    Alignment::Right => spacing,
-                },
-                None => 0.0,
-            },
-            top: 0.0,
-            bottom: 0.0,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct GroupingConfig {
-    /// Styles for the grouping
-    pub style: Option<GroupingStyle>,
-    /// Alpha value for the color transparency [[0-255]] (default: 200)
-    pub transparency_alpha: Option<u8>,
-    /// Rounding values for the 4 corners. Can be a single or 4 values.
-    pub rounding: Option<RoundingConfig>,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub enum GroupingStyle {
-    #[serde(alias = "CtByte")]
-    Default,
-    /// A shadow is added under the default group. (blur: 4, offset: x-1 y-1, spread: 3)
-    #[serde(alias = "CtByteWithShadow")]
-    #[serde(alias = "DefaultWithShadow")]
-    DefaultWithShadowB4O1S3,
-    /// A shadow is added under the default group. (blur: 4, offset: x-0 y-0, spread: 3)
-    DefaultWithShadowB4O0S3,
-    /// A shadow is added under the default group. (blur: 0, offset: x-1 y-1, spread: 3)
-    DefaultWithShadowB0O1S3,
-    /// A glow is added under the default group. (blur: 3, offset: x-1 y-1, spread: 2)
-    DefaultWithGlowB3O1S2,
-    /// A glow is added under the default group. (blur: 3, offset: x-0 y-0, spread: 2)
-    DefaultWithGlowB3O0S2,
-    /// A glow is added under the default group. (blur: 0, offset: x-1 y-1, spread: 2)
-    DefaultWithGlowB0O1S2,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum RoundingConfig {
-    /// All 4 corners are the same    
-    Same(f32),
-    /// All 4 corners are custom. Order: NW, NE, SW, SE
-    Individual([f32; 4]),
-}
-
-impl From<RoundingConfig> for Rounding {
-    fn from(value: RoundingConfig) -> Self {
-        match value {
-            RoundingConfig::Same(value) => Rounding::same(value),
-            RoundingConfig::Individual(values) => Self {
-                nw: values[0],
-                ne: values[1],
-                sw: values[2],
-                se: values[3],
-            },
-        }
-    }
-}
-
-pub trait Color32Ext {
-    fn try_apply_alpha(self, transparency_alpha: Option<u8>) -> Self;
-}
-
-impl Color32Ext for Color32 {
-    /// Tries to apply the alpha value to the Color32
-    fn try_apply_alpha(self, transparency_alpha: Option<u8>) -> Self {
-        if let Some(alpha) = transparency_alpha {
-            return Color32::from_rgba_unmultiplied(self.r(), self.g(), self.b(), alpha);
-        }
-
-        self
-    }
-}

komorebi-bar/src/selected_frame.rs

@@ -1,56 +0,0 @@
-use eframe::egui::CursorIcon;
-use eframe::egui::Frame;
-use eframe::egui::Margin;
-use eframe::egui::Response;
-use eframe::egui::Sense;
-use eframe::egui::Ui;
-
-/// Same as SelectableLabel, but supports all content
-pub struct SelectableFrame {
-    selected: bool,
-}
-
-impl SelectableFrame {
-    pub fn new(selected: bool) -> Self {
-        Self { selected }
-    }
-
-    pub fn show<R>(self, ui: &mut Ui, add_contents: impl FnOnce(&mut Ui) -> R) -> Response {
-        let Self { selected } = self;
-
-        Frame::none()
-            .show(ui, |ui| {
-                let response = ui.interact(ui.max_rect(), ui.unique_id(), Sense::click());
-
-                if ui.is_rect_visible(response.rect) {
-                    let inner_margin = Margin::symmetric(
-                        ui.style().spacing.button_padding.x,
-                        ui.style().spacing.button_padding.y,
-                    );
-
-                    if selected
-                        || response.hovered()
-                        || response.highlighted()
-                        || response.has_focus()
-                    {
-                        let visuals = ui.style().interact_selectable(&response, selected);
-
-                        Frame::none()
-                            .stroke(visuals.bg_stroke)
-                            .rounding(visuals.rounding)
-                            .fill(visuals.bg_fill)
-                            .inner_margin(inner_margin)
-                            .show(ui, add_contents);
-                    } else {
-                        Frame::none()
-                            .inner_margin(inner_margin)
-                            .show(ui, add_contents);
-                    }
-                }
-
-                response
-            })
-            .inner
-            .on_hover_cursor(CursorIcon::PointingHand)
-    }
-}

komorebi-bar/src/storage.rs

@@ -1,12 +1,13 @@
 use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::widget::BarWidget;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
+use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -50,7 +51,7 @@ impl Storage {
     fn output(&mut self) -> Vec<String> {
         let now = Instant::now();
         if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) {
-            self.disks.refresh(true);
+            self.disks.refresh();
             self.last_updated = now;
         }
 
@@ -78,8 +79,15 @@ impl Storage {
 }
 
 impl BarWidget for Storage {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         if self.enable {
+            let font_id = ctx
+                .style()
+                .text_styles
+                .get(&TextStyle::Body)
+                .cloned()
+                .unwrap_or_else(FontId::default);
+
             for output in self.output() {
                 let mut layout_job = LayoutJob::simple(
                     match self.label_prefix {
@@ -88,7 +96,7 @@ impl BarWidget for Storage {
                         }
                         LabelPrefix::None | LabelPrefix::Text => String::new(),
                     },
-                    config.icon_font_id.clone(),
+                    font_id.clone(),
                     ctx.style().visuals.selection.stroke.color,
                     100.0,
                 );
@@ -96,31 +104,30 @@ impl BarWidget for Storage {
                 layout_job.append(
                     &output,
                     10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
+                    TextFormat::simple(font_id.clone(), ctx.style().visuals.text_color()),
                 );
 
-                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
-                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
-                        .clicked()
+                if ui
+                    .add(
+                        Label::new(layout_job)
+                            .selectable(false)
+                            .sense(Sense::click()),
+                    )
+                    .clicked()
+                {
+                    if let Err(error) = Command::new("cmd.exe")
+                        .args([
+                            "/C",
+                            "explorer.exe",
+                            output.split(' ').collect::<Vec<&str>>()[0],
+                        ])
+                        .spawn()
                     {
-                        if let Err(error) = Command::new("cmd.exe")
-                            .args([
-                                "/C",
-                                "explorer.exe",
-                                output.split(' ').collect::<Vec<&str>>()[0],
-                            ])
-                            .spawn()
-                        {
-                            eprintln!("{}", error)
-                        }
+                        eprintln!("{}", error)
                     }
-                });
+                }
+
+                ui.add_space(WIDGET_SPACING);
             }
         }
     }

komorebi-bar/src/time.rs

@@ -1,12 +1,13 @@
 use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
 use crate::widget::BarWidget;
+use crate::WIDGET_SPACING;
 use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
 use eframe::egui::Context;
+use eframe::egui::FontId;
 use eframe::egui::Label;
+use eframe::egui::Sense;
 use eframe::egui::TextFormat;
+use eframe::egui::TextStyle;
 use eframe::egui::Ui;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -76,10 +77,17 @@ impl Time {
 }
 
 impl BarWidget for Time {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
+    fn render(&mut self, ctx: &Context, ui: &mut Ui) {
         if self.enable {
             let mut output = self.output();
             if !output.is_empty() {
+                let font_id = ctx
+                    .style()
+                    .text_styles
+                    .get(&TextStyle::Body)
+                    .cloned()
+                    .unwrap_or_else(FontId::default);
+
                 let mut layout_job = LayoutJob::simple(
                     match self.label_prefix {
                         LabelPrefix::Icon | LabelPrefix::IconAndText => {
@@ -87,7 +95,7 @@ impl BarWidget for Time {
                         }
                         LabelPrefix::None | LabelPrefix::Text => String::new(),
                     },
-                    config.icon_font_id.clone(),
+                    font_id.clone(),
                     ctx.style().visuals.selection.stroke.color,
                     100.0,
                 );
@@ -99,23 +107,22 @@ impl BarWidget for Time {
                 layout_job.append(
                     &output,
                     10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
+                    TextFormat::simple(font_id, ctx.style().visuals.text_color()),
                 );
 
-                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
-                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
-                        .clicked()
-                    {
-                        self.format.toggle()
-                    }
-                });
+                if ui
+                    .add(
+                        Label::new(layout_job)
+                            .selectable(false)
+                            .sense(Sense::click()),
+                    )
+                    .clicked()
+                {
+                    self.format.toggle()
+                }
             }
+
+            ui.add_space(WIDGET_SPACING);
         }
     }
 }

komorebi-bar/src/update.rs

@@ -1,158 +0,0 @@
-use crate::config::LabelPrefix;
-use crate::render::RenderConfig;
-use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
-use eframe::egui::text::LayoutJob;
-use eframe::egui::Align;
-use eframe::egui::Context;
-use eframe::egui::Label;
-use eframe::egui::TextFormat;
-use eframe::egui::Ui;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::process::Command;
-use std::time::Duration;
-use std::time::Instant;
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct UpdateConfig {
-    /// Enable the Update widget
-    pub enable: bool,
-    /// Data refresh interval (default: 12 hours)
-    pub data_refresh_interval: Option<u64>,
-    /// Display label prefix
-    pub label_prefix: Option<LabelPrefix>,
-}
-
-impl From<UpdateConfig> for Update {
-    fn from(value: UpdateConfig) -> Self {
-        let data_refresh_interval = value.data_refresh_interval.unwrap_or(12);
-
-        let mut latest_version = String::new();
-
-        let client = reqwest::blocking::Client::new();
-        if let Ok(response) = client
-            .get("https://api.github.com/repos/LGUG2Z/komorebi/releases/latest")
-            .header("User-Agent", "komorebi-bar-version-checker")
-            .send()
-        {
-            #[derive(Deserialize)]
-            struct Release {
-                tag_name: String,
-            }
-
-            if let Ok(release) =
-                serde_json::from_str::<Release>(&response.text().unwrap_or_default())
-            {
-                let trimmed = release.tag_name.trim_start_matches("v");
-                latest_version = trimmed.to_string();
-            }
-        }
-
-        Self {
-            enable: value.enable,
-            data_refresh_interval,
-            installed_version: env!("CARGO_PKG_VERSION").to_string(),
-            latest_version,
-            label_prefix: value.label_prefix.unwrap_or(LabelPrefix::IconAndText),
-            last_updated: Instant::now()
-                .checked_sub(Duration::from_secs(data_refresh_interval))
-                .unwrap(),
-        }
-    }
-}
-
-pub struct Update {
-    pub enable: bool,
-    data_refresh_interval: u64,
-    installed_version: String,
-    latest_version: String,
-    label_prefix: LabelPrefix,
-    last_updated: Instant,
-}
-
-impl Update {
-    fn output(&mut self) -> String {
-        let now = Instant::now();
-        if now.duration_since(self.last_updated)
-            > Duration::from_secs((self.data_refresh_interval * 60) * 60)
-        {
-            let client = reqwest::blocking::Client::new();
-            if let Ok(response) = client
-                .get("https://api.github.com/repos/LGUG2Z/komorebi/releases/latest")
-                .header("User-Agent", "komorebi-bar-version-checker")
-                .send()
-            {
-                #[derive(Deserialize)]
-                struct Release {
-                    tag_name: String,
-                }
-
-                if let Ok(release) =
-                    serde_json::from_str::<Release>(&response.text().unwrap_or_default())
-                {
-                    let trimmed = release.tag_name.trim_start_matches("v");
-                    self.latest_version = trimmed.to_string();
-                }
-            }
-
-            self.last_updated = now;
-        }
-
-        if self.latest_version > self.installed_version {
-            format!("Update available! v{}", self.latest_version)
-        } else {
-            String::new()
-        }
-    }
-}
-
-impl BarWidget for Update {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig) {
-        if self.enable {
-            let output = self.output();
-            if !output.is_empty() {
-                let mut layout_job = LayoutJob::simple(
-                    match self.label_prefix {
-                        LabelPrefix::Icon | LabelPrefix::IconAndText => {
-                            egui_phosphor::regular::ROCKET_LAUNCH.to_string()
-                        }
-                        LabelPrefix::None | LabelPrefix::Text => String::new(),
-                    },
-                    config.icon_font_id.clone(),
-                    ctx.style().visuals.selection.stroke.color,
-                    100.0,
-                );
-
-                layout_job.append(
-                    &output,
-                    10.0,
-                    TextFormat {
-                        font_id: config.text_font_id.clone(),
-                        color: ctx.style().visuals.text_color(),
-                        valign: Align::Center,
-                        ..Default::default()
-                    },
-                );
-
-                config.apply_on_widget(false, ui, |ui| {
-                    if SelectableFrame::new(false)
-                        .show(ui, |ui| ui.add(Label::new(layout_job).selectable(false)))
-                        .clicked()
-                    {
-                        if let Err(error) = Command::new("explorer.exe")
-                            .args([format!(
-                                "https://github.com/LGUG2Z/komorebi/releases/v{}",
-                                self.latest_version
-                            )])
-                            .spawn()
-                        {
-                            eprintln!("{}", error)
-                        }
-                    }
-                });
-            }
-        }
-    }
-}

komorebi-bar/src/widget.rs

@@ -12,13 +12,10 @@ use crate::memory::Memory;
 use crate::memory::MemoryConfig;
 use crate::network::Network;
 use crate::network::NetworkConfig;
-use crate::render::RenderConfig;
 use crate::storage::Storage;
 use crate::storage::StorageConfig;
 use crate::time::Time;
 use crate::time::TimeConfig;
-use crate::update::Update;
-use crate::update::UpdateConfig;
 use eframe::egui::Context;
 use eframe::egui::Ui;
 use schemars::JsonSchema;
@@ -26,7 +23,7 @@ use serde::Deserialize;
 use serde::Serialize;
 
 pub trait BarWidget {
-    fn render(&mut self, ctx: &Context, ui: &mut Ui, config: &mut RenderConfig);
+    fn render(&mut self, ctx: &Context, ui: &mut Ui);
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
@@ -40,7 +37,6 @@ pub enum WidgetConfig {
     Network(NetworkConfig),
     Storage(StorageConfig),
     Time(TimeConfig),
-    Update(UpdateConfig),
 }
 
 impl WidgetConfig {
@@ -55,30 +51,6 @@ impl WidgetConfig {
             WidgetConfig::Network(config) => Box::new(Network::from(*config)),
             WidgetConfig::Storage(config) => Box::new(Storage::from(*config)),
             WidgetConfig::Time(config) => Box::new(Time::from(config.clone())),
-            WidgetConfig::Update(config) => Box::new(Update::from(*config)),
-        }
-    }
-
-    pub fn enabled(&self) -> bool {
-        match self {
-            WidgetConfig::Battery(config) => config.enable,
-            WidgetConfig::Cpu(config) => config.enable,
-            WidgetConfig::Date(config) => config.enable,
-            WidgetConfig::Komorebi(config) => {
-                config.workspaces.as_ref().map_or(false, |w| w.enable)
-                    || config.layout.as_ref().map_or(false, |w| w.enable)
-                    || config.focused_window.as_ref().map_or(false, |w| w.enable)
-                    || config
-                        .configuration_switcher
-                        .as_ref()
-                        .map_or(false, |w| w.enable)
-            }
-            WidgetConfig::Media(config) => config.enable,
-            WidgetConfig::Memory(config) => config.enable,
-            WidgetConfig::Network(config) => config.enable,
-            WidgetConfig::Storage(config) => config.enable,
-            WidgetConfig::Time(config) => config.enable,
-            WidgetConfig::Update(config) => config.enable,
         }
     }
 }

komorebi-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-client"
-version = "0.1.33"
+version = "0.1.30"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

komorebi-client/src/lib.rs

@@ -1,8 +1,6 @@
 #![warn(clippy::all)]
 #![allow(clippy::missing_errors_doc)]
 
-pub use komorebi::animation::prefix::AnimationPrefix;
-pub use komorebi::asc::ApplicationSpecificConfiguration;
 pub use komorebi::colour::Colour;
 pub use komorebi::colour::Rgb;
 pub use komorebi::config_generation::ApplicationConfiguration;
@@ -55,7 +53,6 @@ use std::io::BufReader;
 use std::io::Read;
 use std::io::Write;
 use std::net::Shutdown;
-use std::time::Duration;
 pub use uds_windows::UnixListener;
 use uds_windows::UnixStream;
 
@@ -64,30 +61,13 @@ const KOMOREBI: &str = "komorebi.sock";
 pub fn send_message(message: &SocketMessage) -> std::io::Result<()> {
     let socket = DATA_DIR.join(KOMOREBI);
     let mut stream = UnixStream::connect(socket)?;
-    stream.set_write_timeout(Some(Duration::from_secs(1)))?;
     stream.write_all(serde_json::to_string(message)?.as_bytes())
 }
 
-pub fn send_batch(messages: impl IntoIterator<Item = SocketMessage>) -> std::io::Result<()> {
-    let socket = DATA_DIR.join(KOMOREBI);
-    let mut stream = UnixStream::connect(socket)?;
-    stream.set_write_timeout(Some(Duration::from_secs(1)))?;
-    let msgs = messages.into_iter().fold(String::new(), |mut s, m| {
-        if let Ok(m_str) = serde_json::to_string(&m) {
-            s.push_str(&m_str);
-            s.push('\n');
-        }
-        s
-    });
-    stream.write_all(msgs.as_bytes())
-}
-
 pub fn send_query(message: &SocketMessage) -> std::io::Result<String> {
     let socket = DATA_DIR.join(KOMOREBI);
 
     let mut stream = UnixStream::connect(socket)?;
-    stream.set_read_timeout(Some(Duration::from_secs(1)))?;
-    stream.set_write_timeout(Some(Duration::from_secs(1)))?;
     stream.write_all(serde_json::to_string(message)?.as_bytes())?;
     stream.shutdown(Shutdown::Write)?;
 

komorebi-gui/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-gui"
-version = "0.1.33"
+version = "0.1.30"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

komorebi-themes/Cargo.toml

@@ -1,14 +1,12 @@
 [package]
 name = "komorebi-themes"
-version = "0.1.33"
+version = "0.1.30"
 edition = "2021"
 
 [dependencies]
-base16-egui-themes = { git = "https://github.com/LGUG2Z/base16-egui-themes", rev = "24362c4" }
-catppuccin-egui = { git = "https://github.com/LGUG2Z/catppuccin-egui", rev = "f85cc3c", default-features = false, features = ["egui30"] }
-#catppuccin-egui = { version = "5", default-features = false, features = ["egui30"] }
+base16-egui-themes = { git = "https://github.com/LGUG2Z/base16-egui-themes", rev = "57c38257cb0c6434321320d3746049bd58c34674" }
+catppuccin-egui = { git = "https://github.com/LGUG2Z/catppuccin-egui", rev = "f579847bf2f552b144361d5a78ed8cf360b55cbb" }
+#catppuccin-egui = { version = "5", default-features = false, features = ["egui28"] }
 eframe = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
-serde_variant = "0.1"
-strum = "0.26"

komorebi-themes/src/lib.rs

@@ -4,12 +4,10 @@
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
-use strum::IntoEnumIterator;
 
 pub use base16_egui_themes::Base16;
 pub use catppuccin_egui;
 pub use eframe::egui::Color32;
-use serde_variant::to_variant_name;
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "type")]
@@ -26,28 +24,6 @@ pub enum Theme {
     },
 }
 
-impl Theme {
-    pub fn variant_names(&self) -> Vec<String> {
-        match self {
-            Theme::Catppuccin { .. } => {
-                vec![
-                    "Frappe".to_string(),
-                    "Latte".to_string(),
-                    "Macchiato".to_string(),
-                    "Mocha".to_string(),
-                ]
-            }
-            Theme::Base16 { .. } => Base16::iter()
-                .map(|variant| {
-                    to_variant_name(&variant)
-                        .expect("could not convert to variant name")
-                        .to_string()
-                })
-                .collect(),
-        }
-    }
-}
-
 #[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
 pub enum Base16Value {
     Base00,

komorebi/Cargo.toml

@@ -1,8 +1,11 @@
 [package]
 name = "komorebi"
-version = "0.1.33"
+version = "0.1.30"
+authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
+categories = ["tiling-window-manager", "windows"]
 repository = "https://github.com/LGUG2Z/komorebi"
+license = "MIT"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -41,13 +44,14 @@ tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true }
 uds_windows = { workspace = true }
 which = { workspace = true }
+widestring = "1"
 win32-display-data = { workspace = true }
 windows = { workspace = true }
 windows-core = { workspace = true }
 windows-implement = { workspace = true }
 windows-interface = { workspace = true }
 winput = "0.2"
-winreg = "0.53"
+winreg = "0.52"
 
 [build-dependencies]
 shadow-rs = { workspace = true }

komorebi/build.rs

@@ -1,5 +1,3 @@
-use shadow_rs::ShadowBuilder;
-
 fn main() {
-    ShadowBuilder::builder().build().unwrap();
+    shadow_rs::new().unwrap();
 }

komorebi/src/animation.rs

@@ -1,6 +1,22 @@
 use crate::core::AnimationStyle;
+use crate::core::Rect;
+use color_eyre::Result;
 
+use schemars::JsonSchema;
+
+use serde::Deserialize;
+use serde::Serialize;
 use std::f64::consts::PI;
+use std::sync::atomic::AtomicU64;
+use std::sync::atomic::Ordering;
+use std::time::Duration;
+use std::time::Instant;
+
+use crate::ANIMATION_DURATION;
+use crate::ANIMATION_MANAGER;
+use crate::ANIMATION_STYLE;
+
+pub static ANIMATION_FPS: AtomicU64 = AtomicU64::new(60);
 
 pub trait Ease {
     fn evaluate(t: f64) -> f64;
@@ -354,8 +370,9 @@ impl Ease for EaseInOutBounce {
         }
     }
 }
+fn apply_ease_func(t: f64) -> f64 {
+    let style = *ANIMATION_STYLE.lock();
 
-pub fn apply_ease_func(t: f64, style: AnimationStyle) -> f64 {
     match style {
         AnimationStyle::Linear => Linear::evaluate(t),
         AnimationStyle::EaseInSine => EaseInSine::evaluate(t),
@@ -389,3 +406,112 @@ pub fn apply_ease_func(t: f64, style: AnimationStyle) -> f64 {
         AnimationStyle::EaseInOutBounce => EaseInOutBounce::evaluate(t),
     }
 }
+
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, JsonSchema, PartialEq)]
+pub struct Animation {
+    pub hwnd: isize,
+}
+
+impl Animation {
+    pub fn new(hwnd: isize) -> Self {
+        Self { hwnd }
+    }
+
+    /// Returns true if the animation needs to continue
+    pub fn cancel(&mut self) -> bool {
+        if !ANIMATION_MANAGER.lock().in_progress(self.hwnd) {
+            return true;
+        }
+
+        // should be more than 0
+        let cancel_idx = ANIMATION_MANAGER.lock().init_cancel(self.hwnd);
+        let max_duration = Duration::from_secs(1);
+        let spent_duration = Instant::now();
+
+        while ANIMATION_MANAGER.lock().in_progress(self.hwnd) {
+            if spent_duration.elapsed() >= max_duration {
+                ANIMATION_MANAGER.lock().end(self.hwnd);
+            }
+
+            std::thread::sleep(Duration::from_millis(
+                ANIMATION_DURATION.load(Ordering::SeqCst) / 2,
+            ));
+        }
+
+        let latest_cancel_idx = ANIMATION_MANAGER.lock().latest_cancel_idx(self.hwnd);
+
+        ANIMATION_MANAGER.lock().end_cancel(self.hwnd);
+
+        latest_cancel_idx == cancel_idx
+    }
+
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn lerp(start: i32, end: i32, t: f64) -> i32 {
+        let time = apply_ease_func(t);
+        f64::from(end - start)
+            .mul_add(time, f64::from(start))
+            .round() as i32
+    }
+
+    pub fn lerp_rect(start_rect: &Rect, end_rect: &Rect, t: f64) -> Rect {
+        Rect {
+            left: Self::lerp(start_rect.left, end_rect.left, t),
+            top: Self::lerp(start_rect.top, end_rect.top, t),
+            right: Self::lerp(start_rect.right, end_rect.right, t),
+            bottom: Self::lerp(start_rect.bottom, end_rect.bottom, t),
+        }
+    }
+
+    #[allow(clippy::cast_precision_loss)]
+    pub fn animate(
+        &mut self,
+        duration: Duration,
+        mut render_callback: impl FnMut(f64) -> Result<()>,
+    ) -> Result<()> {
+        if ANIMATION_MANAGER.lock().in_progress(self.hwnd) {
+            let should_animate = self.cancel();
+
+            if !should_animate {
+                return Ok(());
+            }
+        }
+
+        ANIMATION_MANAGER.lock().start(self.hwnd);
+
+        let target_frame_time = Duration::from_millis(1000 / ANIMATION_FPS.load(Ordering::Relaxed));
+        let mut progress = 0.0;
+        let animation_start = Instant::now();
+
+        // start animation
+        while progress < 1.0 {
+            // check if animation is cancelled
+            if ANIMATION_MANAGER.lock().is_cancelled(self.hwnd) {
+                // cancel animation
+                ANIMATION_MANAGER.lock().cancel(self.hwnd);
+                return Ok(());
+            }
+
+            let frame_start = Instant::now();
+            // calculate progress
+            progress = animation_start.elapsed().as_millis() as f64 / duration.as_millis() as f64;
+            render_callback(progress).ok();
+
+            // sleep until next frame
+            let frame_time_elapsed = frame_start.elapsed();
+
+            if frame_time_elapsed < target_frame_time {
+                std::thread::sleep(target_frame_time - frame_time_elapsed);
+            }
+        }
+
+        ANIMATION_MANAGER.lock().end(self.hwnd);
+
+        // limit progress to 1.0 if animation took longer
+        if progress > 1.0 {
+            progress = 1.0;
+        }
+
+        // process animation for 1.0 to set target position
+        render_callback(progress)
+    }
+}

komorebi/src/animation/animation_manager.rs

@@ -1,115 +0,0 @@
-use std::collections::hash_map::Entry;
-use std::collections::HashMap;
-
-use super::prefix::AnimationPrefix;
-
-#[derive(Debug, Clone, Copy)]
-struct AnimationState {
-    pub in_progress: bool,
-    pub cancel_idx_counter: usize,
-    pub pending_cancel_count: usize,
-}
-
-#[derive(Debug)]
-pub struct AnimationManager {
-    animations: HashMap<String, AnimationState>,
-}
-
-impl Default for AnimationManager {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl AnimationManager {
-    pub fn new() -> Self {
-        Self {
-            animations: HashMap::new(),
-        }
-    }
-
-    pub fn is_cancelled(&self, animation_key: &str) -> bool {
-        if let Some(animation_state) = self.animations.get(animation_key) {
-            animation_state.pending_cancel_count > 0
-        } else {
-            false
-        }
-    }
-
-    pub fn in_progress(&self, animation_key: &str) -> bool {
-        if let Some(animation_state) = self.animations.get(animation_key) {
-            animation_state.in_progress
-        } else {
-            false
-        }
-    }
-
-    pub fn init_cancel(&mut self, animation_key: &str) -> usize {
-        if let Some(animation_state) = self.animations.get_mut(animation_key) {
-            animation_state.pending_cancel_count += 1;
-            animation_state.cancel_idx_counter += 1;
-
-            // return cancel idx
-            animation_state.cancel_idx_counter
-        } else {
-            0
-        }
-    }
-
-    pub fn latest_cancel_idx(&mut self, animation_key: &str) -> usize {
-        if let Some(animation_state) = self.animations.get_mut(animation_key) {
-            animation_state.cancel_idx_counter
-        } else {
-            0
-        }
-    }
-
-    pub fn end_cancel(&mut self, animation_key: &str) {
-        if let Some(animation_state) = self.animations.get_mut(animation_key) {
-            animation_state.pending_cancel_count -= 1;
-        }
-    }
-
-    pub fn cancel(&mut self, animation_key: &str) {
-        if let Some(animation_state) = self.animations.get_mut(animation_key) {
-            animation_state.in_progress = false;
-        }
-    }
-
-    pub fn start(&mut self, animation_key: &str) {
-        if let Entry::Vacant(e) = self.animations.entry(animation_key.to_string()) {
-            e.insert(AnimationState {
-                in_progress: true,
-                cancel_idx_counter: 0,
-                pending_cancel_count: 0,
-            });
-
-            return;
-        }
-
-        if let Some(animation_state) = self.animations.get_mut(animation_key) {
-            animation_state.in_progress = true;
-        }
-    }
-
-    pub fn end(&mut self, animation_key: &str) {
-        if let Some(animation_state) = self.animations.get_mut(animation_key) {
-            animation_state.in_progress = false;
-
-            if animation_state.pending_cancel_count == 0 {
-                self.animations.remove(animation_key);
-            }
-        }
-    }
-
-    pub fn count_in_progress(&self, animation_key_prefix: AnimationPrefix) -> usize {
-        self.animations
-            .keys()
-            .filter(|key| key.starts_with(animation_key_prefix.to_string().as_str()))
-            .count()
-    }
-
-    pub fn count(&self) -> usize {
-        self.animations.len()
-    }
-}

komorebi/src/animation/engine.rs

@@ -1,122 +0,0 @@
-use color_eyre::Result;
-
-use schemars::JsonSchema;
-
-use serde::Deserialize;
-use serde::Serialize;
-use std::sync::atomic::Ordering;
-use std::time::Duration;
-use std::time::Instant;
-
-use super::RenderDispatcher;
-use super::ANIMATION_DURATION_GLOBAL;
-use super::ANIMATION_FPS;
-use super::ANIMATION_MANAGER;
-
-#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, JsonSchema, PartialEq)]
-pub struct AnimationEngine;
-
-impl AnimationEngine {
-    pub fn wait_for_all_animations() {
-        let max_duration = Duration::from_secs(20);
-        let spent_duration = Instant::now();
-
-        while ANIMATION_MANAGER.lock().count() > 0 {
-            if spent_duration.elapsed() >= max_duration {
-                break;
-            }
-
-            std::thread::sleep(Duration::from_millis(
-                ANIMATION_DURATION_GLOBAL.load(Ordering::SeqCst),
-            ));
-        }
-    }
-
-    /// Returns true if the animation needs to continue
-    pub fn cancel(animation_key: &str) -> bool {
-        // should be more than 0
-        let cancel_idx = ANIMATION_MANAGER.lock().init_cancel(animation_key);
-        let max_duration = Duration::from_secs(5);
-        let spent_duration = Instant::now();
-
-        while ANIMATION_MANAGER.lock().in_progress(animation_key) {
-            if spent_duration.elapsed() >= max_duration {
-                ANIMATION_MANAGER.lock().end(animation_key);
-            }
-
-            std::thread::sleep(Duration::from_millis(250 / 2));
-        }
-
-        let latest_cancel_idx = ANIMATION_MANAGER.lock().latest_cancel_idx(animation_key);
-
-        ANIMATION_MANAGER.lock().end_cancel(animation_key);
-
-        latest_cancel_idx == cancel_idx
-    }
-
-    #[allow(clippy::cast_precision_loss)]
-    pub fn animate(
-        render_dispatcher: (impl RenderDispatcher + Send + 'static),
-        duration: Duration,
-    ) -> Result<()> {
-        std::thread::spawn(move || {
-            let animation_key = render_dispatcher.get_animation_key();
-            if ANIMATION_MANAGER.lock().in_progress(animation_key.as_str()) {
-                let should_animate = Self::cancel(animation_key.as_str());
-
-                if !should_animate {
-                    return Ok(());
-                }
-            }
-
-            render_dispatcher.pre_render()?;
-
-            ANIMATION_MANAGER.lock().start(animation_key.as_str());
-
-            let target_frame_time =
-                Duration::from_millis(1000 / ANIMATION_FPS.load(Ordering::Relaxed));
-            let mut progress = 0.0;
-            let animation_start = Instant::now();
-
-            // start animation
-            while progress < 1.0 {
-                // check if animation is cancelled
-                if ANIMATION_MANAGER
-                    .lock()
-                    .is_cancelled(animation_key.as_str())
-                {
-                    // cancel animation
-                    ANIMATION_MANAGER.lock().cancel(animation_key.as_str());
-                    return Ok(());
-                }
-
-                let frame_start = Instant::now();
-                // calculate progress
-                progress =
-                    animation_start.elapsed().as_millis() as f64 / duration.as_millis() as f64;
-                render_dispatcher.render(progress).ok();
-
-                // sleep until next frame
-                let frame_time_elapsed = frame_start.elapsed();
-
-                if frame_time_elapsed < target_frame_time {
-                    std::thread::sleep(target_frame_time - frame_time_elapsed);
-                }
-            }
-
-            ANIMATION_MANAGER.lock().end(animation_key.as_str());
-
-            // limit progress to 1.0 if animation took longer
-            if progress != 1.0 {
-                progress = 1.0;
-
-                // process animation for 1.0 to set target position
-                render_dispatcher.render(progress).ok();
-            }
-
-            render_dispatcher.post_render()
-        });
-
-        Ok(())
-    }
-}

komorebi/src/animation/lerp.rs

@@ -1,42 +0,0 @@
-use crate::core::Rect;
-use crate::AnimationStyle;
-
-use super::style::apply_ease_func;
-
-pub trait Lerp<T = Self> {
-    fn lerp(self, end: T, time: f64, style: AnimationStyle) -> T;
-}
-
-impl Lerp for i32 {
-    #[allow(clippy::cast_possible_truncation)]
-    fn lerp(self, end: i32, time: f64, style: AnimationStyle) -> i32 {
-        let time = apply_ease_func(time, style);
-
-        f64::from(end - self).mul_add(time, f64::from(self)).round() as i32
-    }
-}
-
-impl Lerp for f64 {
-    fn lerp(self, end: f64, time: f64, style: AnimationStyle) -> f64 {
-        let time = apply_ease_func(time, style);
-
-        (end - self).mul_add(time, self)
-    }
-}
-
-impl Lerp for u8 {
-    fn lerp(self, end: u8, time: f64, style: AnimationStyle) -> u8 {
-        (self as f64).lerp(end as f64, time, style) as u8
-    }
-}
-
-impl Lerp for Rect {
-    fn lerp(self, end: Rect, time: f64, style: AnimationStyle) -> Rect {
-        Rect {
-            left: self.left.lerp(end.left, time, style),
-            top: self.top.lerp(end.top, time, style),
-            right: self.right.lerp(end.right, time, style),
-            bottom: self.bottom.lerp(end.bottom, time, style),
-        }
-    }
-}

komorebi/src/animation/mod.rs

@@ -1,54 +0,0 @@
-use crate::animation::animation_manager::AnimationManager;
-use crate::core::animation::AnimationStyle;
-
-use lazy_static::lazy_static;
-use prefix::AnimationPrefix;
-use std::collections::HashMap;
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::AtomicU64;
-use std::sync::Arc;
-
-use parking_lot::Mutex;
-
-pub use engine::AnimationEngine;
-pub mod animation_manager;
-pub mod engine;
-pub mod lerp;
-pub mod prefix;
-pub mod render_dispatcher;
-pub use render_dispatcher::RenderDispatcher;
-pub mod style;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum PerAnimationPrefixConfig<T> {
-    Prefix(HashMap<AnimationPrefix, T>),
-    Global(T),
-}
-
-pub const DEFAULT_ANIMATION_ENABLED: bool = false;
-pub const DEFAULT_ANIMATION_STYLE: AnimationStyle = AnimationStyle::Linear;
-pub const DEFAULT_ANIMATION_DURATION: u64 = 250;
-pub const DEFAULT_ANIMATION_FPS: u64 = 60;
-
-lazy_static! {
-    pub static ref ANIMATION_MANAGER: Arc<Mutex<AnimationManager>> =
-        Arc::new(Mutex::new(AnimationManager::new()));
-    pub static ref ANIMATION_STYLE_GLOBAL: Arc<Mutex<AnimationStyle>> =
-        Arc::new(Mutex::new(DEFAULT_ANIMATION_STYLE));
-    pub static ref ANIMATION_ENABLED_GLOBAL: Arc<AtomicBool> =
-        Arc::new(AtomicBool::new(DEFAULT_ANIMATION_ENABLED));
-    pub static ref ANIMATION_DURATION_GLOBAL: Arc<AtomicU64> =
-        Arc::new(AtomicU64::new(DEFAULT_ANIMATION_DURATION));
-    pub static ref ANIMATION_STYLE_PER_ANIMATION: Arc<Mutex<HashMap<AnimationPrefix, AnimationStyle>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    pub static ref ANIMATION_ENABLED_PER_ANIMATION: Arc<Mutex<HashMap<AnimationPrefix, bool>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    pub static ref ANIMATION_DURATION_PER_ANIMATION: Arc<Mutex<HashMap<AnimationPrefix, u64>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-}
-
-pub static ANIMATION_FPS: AtomicU64 = AtomicU64::new(DEFAULT_ANIMATION_FPS);

komorebi/src/animation/prefix.rs

@@ -1,31 +0,0 @@
-use clap::ValueEnum;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use strum::Display;
-use strum::EnumString;
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Hash,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    Display,
-    EnumString,
-    ValueEnum,
-    JsonSchema,
-)]
-#[strum(serialize_all = "snake_case")]
-#[serde(rename_all = "snake_case")]
-pub enum AnimationPrefix {
-    Movement,
-    Transparency,
-}
-
-pub fn new_animation_key(prefix: AnimationPrefix, key: String) -> String {
-    format!("{}:{}", prefix, key)
-}

komorebi/src/animation/render_dispatcher.rs

@@ -1,8 +0,0 @@
-use color_eyre::Result;
-
-pub trait RenderDispatcher {
-    fn get_animation_key(&self) -> String;
-    fn pre_render(&self) -> Result<()>;
-    fn render(&self, delta: f64) -> Result<()>;
-    fn post_render(&self) -> Result<()>;
-}

komorebi/src/animation_manager.rs

@@ -0,0 +1,108 @@
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+
+pub static ANIMATIONS_IN_PROGRESS: AtomicUsize = AtomicUsize::new(0);
+
+#[derive(Debug, Clone, Copy)]
+struct AnimationState {
+    pub in_progress: bool,
+    pub cancel_idx_counter: usize,
+    pub pending_cancel_count: usize,
+}
+
+#[derive(Debug)]
+pub struct AnimationManager {
+    animations: HashMap<isize, AnimationState>,
+}
+
+impl Default for AnimationManager {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl AnimationManager {
+    pub fn new() -> Self {
+        Self {
+            animations: HashMap::new(),
+        }
+    }
+
+    pub fn is_cancelled(&self, hwnd: isize) -> bool {
+        if let Some(animation_state) = self.animations.get(&hwnd) {
+            animation_state.pending_cancel_count > 0
+        } else {
+            false
+        }
+    }
+
+    pub fn in_progress(&self, hwnd: isize) -> bool {
+        if let Some(animation_state) = self.animations.get(&hwnd) {
+            animation_state.in_progress
+        } else {
+            false
+        }
+    }
+
+    pub fn init_cancel(&mut self, hwnd: isize) -> usize {
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.pending_cancel_count += 1;
+            animation_state.cancel_idx_counter += 1;
+
+            // return cancel idx
+            animation_state.cancel_idx_counter
+        } else {
+            0
+        }
+    }
+
+    pub fn latest_cancel_idx(&mut self, hwnd: isize) -> usize {
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.cancel_idx_counter
+        } else {
+            0
+        }
+    }
+
+    pub fn end_cancel(&mut self, hwnd: isize) {
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.pending_cancel_count -= 1;
+        }
+    }
+
+    pub fn cancel(&mut self, hwnd: isize) {
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.in_progress = false;
+        }
+    }
+
+    pub fn start(&mut self, hwnd: isize) {
+        if let Entry::Vacant(e) = self.animations.entry(hwnd) {
+            e.insert(AnimationState {
+                in_progress: true,
+                cancel_idx_counter: 0,
+                pending_cancel_count: 0,
+            });
+
+            ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release);
+            return;
+        }
+
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.in_progress = true;
+        }
+    }
+
+    pub fn end(&mut self, hwnd: isize) {
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.in_progress = false;
+
+            if animation_state.pending_cancel_count == 0 {
+                self.animations.remove(&hwnd);
+                ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release);
+            }
+        }
+    }
+}

komorebi/src/border_manager/border.rs

@@ -3,86 +3,47 @@ use crate::border_manager::WindowKind;
 use crate::border_manager::BORDER_OFFSET;
 use crate::border_manager::BORDER_WIDTH;
 use crate::border_manager::FOCUS_STATE;
-use crate::border_manager::RENDER_TARGETS;
 use crate::border_manager::STYLE;
-use crate::core::BorderStyle;
-use crate::core::Rect;
+use crate::border_manager::Z_ORDER;
 use crate::windows_api;
 use crate::WindowsApi;
 use crate::WINDOWS_11;
-use color_eyre::eyre::anyhow;
-use std::collections::HashMap;
-use std::ops::Deref;
+
+use crate::core::BorderStyle;
+use crate::core::Rect;
+
 use std::sync::atomic::Ordering;
 use std::sync::mpsc;
-use std::sync::LazyLock;
-use std::sync::OnceLock;
-use windows::Foundation::Numerics::Matrix3x2;
+use std::time::Duration;
+use windows::core::PCWSTR;
 use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::FALSE;
+use windows::Win32::Foundation::COLORREF;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::Foundation::LRESULT;
-use windows::Win32::Foundation::TRUE;
 use windows::Win32::Foundation::WPARAM;
-use windows::Win32::Graphics::Direct2D::Common::D2D1_ALPHA_MODE_PREMULTIPLIED;
-use windows::Win32::Graphics::Direct2D::Common::D2D1_COLOR_F;
-use windows::Win32::Graphics::Direct2D::Common::D2D1_PIXEL_FORMAT;
-use windows::Win32::Graphics::Direct2D::Common::D2D_RECT_F;
-use windows::Win32::Graphics::Direct2D::Common::D2D_SIZE_U;
-use windows::Win32::Graphics::Direct2D::D2D1CreateFactory;
-use windows::Win32::Graphics::Direct2D::ID2D1Factory;
-use windows::Win32::Graphics::Direct2D::ID2D1HwndRenderTarget;
-use windows::Win32::Graphics::Direct2D::ID2D1SolidColorBrush;
-use windows::Win32::Graphics::Direct2D::D2D1_ANTIALIAS_MODE_PER_PRIMITIVE;
-use windows::Win32::Graphics::Direct2D::D2D1_BRUSH_PROPERTIES;
-use windows::Win32::Graphics::Direct2D::D2D1_FACTORY_TYPE_MULTI_THREADED;
-use windows::Win32::Graphics::Direct2D::D2D1_HWND_RENDER_TARGET_PROPERTIES;
-use windows::Win32::Graphics::Direct2D::D2D1_PRESENT_OPTIONS_IMMEDIATELY;
-use windows::Win32::Graphics::Direct2D::D2D1_RENDER_TARGET_PROPERTIES;
-use windows::Win32::Graphics::Direct2D::D2D1_RENDER_TARGET_TYPE_DEFAULT;
-use windows::Win32::Graphics::Direct2D::D2D1_ROUNDED_RECT;
-use windows::Win32::Graphics::Dwm::DwmEnableBlurBehindWindow;
-use windows::Win32::Graphics::Dwm::DWM_BB_BLURREGION;
-use windows::Win32::Graphics::Dwm::DWM_BB_ENABLE;
-use windows::Win32::Graphics::Dwm::DWM_BLURBEHIND;
-use windows::Win32::Graphics::Dxgi::Common::DXGI_FORMAT_UNKNOWN;
-use windows::Win32::Graphics::Gdi::CreateRectRgn;
+use windows::Win32::Graphics::Gdi::BeginPaint;
+use windows::Win32::Graphics::Gdi::CreatePen;
+use windows::Win32::Graphics::Gdi::DeleteObject;
+use windows::Win32::Graphics::Gdi::EndPaint;
 use windows::Win32::Graphics::Gdi::InvalidateRect;
-use windows::Win32::Graphics::Gdi::ValidateRect;
+use windows::Win32::Graphics::Gdi::Rectangle;
+use windows::Win32::Graphics::Gdi::RoundRect;
+use windows::Win32::Graphics::Gdi::SelectObject;
+use windows::Win32::Graphics::Gdi::PAINTSTRUCT;
+use windows::Win32::Graphics::Gdi::PS_INSIDEFRAME;
+use windows::Win32::Graphics::Gdi::PS_SOLID;
 use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
 use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
 use windows::Win32::UI::WindowsAndMessaging::GetMessageW;
-use windows::Win32::UI::WindowsAndMessaging::GetSystemMetrics;
-use windows::Win32::UI::WindowsAndMessaging::GetWindowLongPtrW;
 use windows::Win32::UI::WindowsAndMessaging::PostQuitMessage;
-use windows::Win32::UI::WindowsAndMessaging::SetWindowLongPtrW;
 use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
-use windows::Win32::UI::WindowsAndMessaging::CREATESTRUCTW;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DESTROY;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_LOCATIONCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::GWLP_USERDATA;
+use windows::Win32::UI::WindowsAndMessaging::CS_HREDRAW;
+use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
 use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::SM_CXVIRTUALSCREEN;
-use windows::Win32::UI::WindowsAndMessaging::WM_CREATE;
 use windows::Win32::UI::WindowsAndMessaging::WM_DESTROY;
 use windows::Win32::UI::WindowsAndMessaging::WM_PAINT;
 use windows::Win32::UI::WindowsAndMessaging::WNDCLASSW;
-use windows_core::PCWSTR;
-
-#[allow(clippy::expect_used)]
-static RENDER_FACTORY: LazyLock<ID2D1Factory> = unsafe {
-    LazyLock::new(|| {
-        D2D1CreateFactory::<ID2D1Factory>(D2D1_FACTORY_TYPE_MULTI_THREADED, None)
-            .expect("creating RENDER_FACTORY failed")
-    })
-};
-
-static BRUSH_PROPERTIES: LazyLock<D2D1_BRUSH_PROPERTIES> =
-    LazyLock::new(|| D2D1_BRUSH_PROPERTIES {
-        opacity: 1.0,
-        transform: Matrix3x2::identity(),
-    });
 
 pub extern "system" fn border_hwnds(hwnd: HWND, lparam: LPARAM) -> BOOL {
     let hwnds = unsafe { &mut *(lparam.0 as *mut Vec<isize>) };
@@ -97,36 +58,14 @@ pub extern "system" fn border_hwnds(hwnd: HWND, lparam: LPARAM) -> BOOL {
     true.into()
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct Border {
     pub hwnd: isize,
-    pub render_target: OnceLock<ID2D1HwndRenderTarget>,
-    pub tracking_hwnd: isize,
-    pub window_rect: Rect,
-    pub window_kind: WindowKind,
-    pub style: BorderStyle,
-    pub width: i32,
-    pub offset: i32,
-    pub brush_properties: D2D1_BRUSH_PROPERTIES,
-    pub rounded_rect: D2D1_ROUNDED_RECT,
-    pub brushes: HashMap<WindowKind, ID2D1SolidColorBrush>,
 }
 
 impl From<isize> for Border {
     fn from(value: isize) -> Self {
-        Self {
-            hwnd: value,
-            render_target: OnceLock::new(),
-            tracking_hwnd: 0,
-            window_rect: Rect::default(),
-            window_kind: WindowKind::Unfocused,
-            style: STYLE.load(),
-            width: BORDER_WIDTH.load(Ordering::Relaxed),
-            offset: BORDER_OFFSET.load(Ordering::Relaxed),
-            brush_properties: D2D1_BRUSH_PROPERTIES::default(),
-            rounded_rect: D2D1_ROUNDED_RECT::default(),
-            brushes: HashMap::new(),
-        }
+        Self { hwnd: value }
     }
 }
 
@@ -135,7 +74,7 @@ impl Border {
         HWND(windows_api::as_ptr!(self.hwnd))
     }
 
-    pub fn create(id: &str, tracking_hwnd: isize) -> color_eyre::Result<Self> {
+    pub fn create(id: &str) -> color_eyre::Result<Self> {
         let name: Vec<u16> = format!("komoborder-{id}\0").encode_utf16().collect();
         let class_name = PCWSTR(name.as_ptr());
 
@@ -144,6 +83,7 @@ impl Border {
         let window_class = WNDCLASSW {
             hInstance: h_module.into(),
             lpszClassName: class_name,
+            style: CS_HREDRAW | CS_VREDRAW,
             lpfnWndProc: Some(Self::callback),
             hbrBackground: WindowsApi::create_solid_brush(0),
             ..Default::default()
@@ -151,30 +91,12 @@ impl Border {
 
         let _ = WindowsApi::register_class_w(&window_class);
 
-        let (border_sender, border_receiver) = mpsc::channel();
+        let (hwnd_sender, hwnd_receiver) = mpsc::channel();
 
         let instance = h_module.0 as isize;
         std::thread::spawn(move || -> color_eyre::Result<()> {
-            let mut border = Self {
-                hwnd: 0,
-                render_target: OnceLock::new(),
-                tracking_hwnd,
-                window_rect: WindowsApi::window_rect(tracking_hwnd).unwrap_or_default(),
-                window_kind: WindowKind::Unfocused,
-                style: STYLE.load(),
-                width: BORDER_WIDTH.load(Ordering::Relaxed),
-                offset: BORDER_OFFSET.load(Ordering::Relaxed),
-                brush_properties: Default::default(),
-                rounded_rect: Default::default(),
-                brushes: HashMap::new(),
-            };
-
-            let border_pointer = std::ptr::addr_of!(border);
-            let hwnd =
-                WindowsApi::create_border_window(PCWSTR(name.as_ptr()), instance, border_pointer)?;
-
-            border.hwnd = hwnd;
-            border_sender.send(border_pointer as isize)?;
+            let hwnd = WindowsApi::create_border_window(PCWSTR(name.as_ptr()), instance)?;
+            hwnd_sender.send(hwnd)?;
 
             let mut msg: MSG = MSG::default();
 
@@ -188,117 +110,42 @@ impl Border {
                     let _ = TranslateMessage(&msg);
                     DispatchMessageW(&msg);
                 }
+
+                std::thread::sleep(Duration::from_millis(10))
             }
 
             Ok(())
         });
 
-        let border_ref = border_receiver.recv()?;
-        let border = unsafe { &mut *(border_ref as *mut Border) };
-
-        // I have literally no idea, apparently this is to get rid of the black pixels
-        // around the edges of rounded corners? @lukeyou05 borrowed this from PowerToys
-        unsafe {
-            let pos: i32 = -GetSystemMetrics(SM_CXVIRTUALSCREEN) - 8;
-            let hrgn = CreateRectRgn(pos, 0, pos + 1, 1);
-            let mut bh: DWM_BLURBEHIND = Default::default();
-            if !hrgn.is_invalid() {
-                bh = DWM_BLURBEHIND {
-                    dwFlags: DWM_BB_ENABLE | DWM_BB_BLURREGION,
-                    fEnable: TRUE,
-                    hRgnBlur: hrgn,
-                    fTransitionOnMaximized: FALSE,
-                };
-            }
-
-            let _ = DwmEnableBlurBehindWindow(border.hwnd(), &bh);
-        }
-
-        let hwnd_render_target_properties = D2D1_HWND_RENDER_TARGET_PROPERTIES {
-            hwnd: HWND(windows_api::as_ptr!(border.hwnd)),
-            pixelSize: Default::default(),
-            presentOptions: D2D1_PRESENT_OPTIONS_IMMEDIATELY,
-        };
-
-        let render_target_properties = D2D1_RENDER_TARGET_PROPERTIES {
-            r#type: D2D1_RENDER_TARGET_TYPE_DEFAULT,
-            pixelFormat: D2D1_PIXEL_FORMAT {
-                format: DXGI_FORMAT_UNKNOWN,
-                alphaMode: D2D1_ALPHA_MODE_PREMULTIPLIED,
-            },
-            dpiX: 96.0,
-            dpiY: 96.0,
-            ..Default::default()
-        };
-
-        match unsafe {
-            RENDER_FACTORY
-                .CreateHwndRenderTarget(&render_target_properties, &hwnd_render_target_properties)
-        } {
-            Ok(render_target) => unsafe {
-                border.brush_properties = *BRUSH_PROPERTIES.deref();
-                for window_kind in [
-                    WindowKind::Single,
-                    WindowKind::Stack,
-                    WindowKind::Monocle,
-                    WindowKind::Unfocused,
-                    WindowKind::Floating,
-                ] {
-                    let color = window_kind_colour(window_kind);
-                    let color = D2D1_COLOR_F {
-                        r: ((color & 0xFF) as f32) / 255.0,
-                        g: (((color >> 8) & 0xFF) as f32) / 255.0,
-                        b: (((color >> 16) & 0xFF) as f32) / 255.0,
-                        a: 1.0,
-                    };
-
-                    if let Ok(brush) =
-                        render_target.CreateSolidColorBrush(&color, Some(&border.brush_properties))
-                    {
-                        border.brushes.insert(window_kind, brush);
-                    }
-                }
-
-                render_target.SetAntialiasMode(D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
-
-                if border.render_target.set(render_target.clone()).is_err() {
-                    return Err(anyhow!("could not store border render target"));
-                }
-
-                border.rounded_rect = {
-                    let radius = 8.0 + border.width as f32 / 2.0;
-                    D2D1_ROUNDED_RECT {
-                        rect: Default::default(),
-                        radiusX: radius,
-                        radiusY: radius,
-                    }
-                };
-
-                let mut render_targets = RENDER_TARGETS.lock();
-                render_targets.insert(border.hwnd, render_target);
-                Ok(border.clone())
-            },
-            Err(error) => Err(error.into()),
-        }
+        Ok(Self {
+            hwnd: hwnd_receiver.recv()?,
+        })
     }
 
     pub fn destroy(&self) -> color_eyre::Result<()> {
-        let mut render_targets = RENDER_TARGETS.lock();
-        render_targets.remove(&self.hwnd);
         WindowsApi::close_window(self.hwnd)
     }
 
-    pub fn set_position(&self, rect: &Rect, reference_hwnd: isize) -> color_eyre::Result<()> {
+    pub fn update(&self, rect: &Rect, mut should_invalidate: bool) -> color_eyre::Result<()> {
+        // Make adjustments to the border
         let mut rect = *rect;
-        rect.add_margin(self.width);
-        rect.add_padding(-self.offset);
+        rect.add_margin(BORDER_WIDTH.load(Ordering::SeqCst));
+        rect.add_padding(-BORDER_OFFSET.load(Ordering::SeqCst));
 
-        WindowsApi::set_border_pos(self.hwnd, &rect, reference_hwnd)?;
+        // Update the position of the border if required
+        if !WindowsApi::window_rect(self.hwnd)?.eq(&rect) {
+            WindowsApi::set_border_pos(self.hwnd, &rect, Z_ORDER.load().into())?;
+            should_invalidate = true;
+        }
+
+        // Invalidate the rect to trigger the callback to update colours etc.
+        if should_invalidate {
+            self.invalidate();
+        }
 
         Ok(())
     }
 
-    // this triggers WM_PAINT in the callback below
     pub fn invalidate(&self) {
         let _ = unsafe { InvalidateRect(self.hwnd(), None, false) };
     }
@@ -311,208 +158,75 @@ impl Border {
     ) -> LRESULT {
         unsafe {
             match message {
-                WM_CREATE => {
-                    let mut border_pointer: *mut Border =
-                        GetWindowLongPtrW(window, GWLP_USERDATA) as _;
-
-                    if border_pointer.is_null() {
-                        let create_struct: *mut CREATESTRUCTW = lparam.0 as *mut _;
-                        border_pointer = (*create_struct).lpCreateParams as *mut _;
-                        SetWindowLongPtrW(window, GWLP_USERDATA, border_pointer as _);
-                    }
-
-                    LRESULT(0)
-                }
-                EVENT_OBJECT_DESTROY => {
-                    let border_pointer: *mut Border = GetWindowLongPtrW(window, GWLP_USERDATA) as _;
-
-                    if border_pointer.is_null() {
-                        return LRESULT(0);
-                    }
-
-                    // we don't actually want to destroy the window here, just hide it for quicker
-                    // visual feedback to the user; the actual destruction will be handled by the
-                    // core border manager loop
-                    WindowsApi::hide_window(window.0 as isize);
-                    LRESULT(0)
-                }
-                EVENT_OBJECT_LOCATIONCHANGE => {
-                    let border_pointer: *mut Border = GetWindowLongPtrW(window, GWLP_USERDATA) as _;
-
-                    if border_pointer.is_null() {
-                        return LRESULT(0);
-                    }
-
-                    let reference_hwnd = lparam.0;
-
-                    let old_rect = (*border_pointer).window_rect;
-                    let rect = WindowsApi::window_rect(reference_hwnd).unwrap_or_default();
-
-                    (*border_pointer).window_rect = rect;
-
-                    if let Err(error) = (*border_pointer).set_position(&rect, reference_hwnd) {
-                        tracing::error!("failed to update border position {error}");
-                    }
-
-                    if !rect.is_same_size_as(&old_rect) {
-                        if let Some(render_target) = (*border_pointer).render_target.get() {
-                            let border_width = (*border_pointer).width;
-                            let border_offset = (*border_pointer).offset;
-
-                            (*border_pointer).rounded_rect.rect = D2D_RECT_F {
-                                left: (border_width / 2 - border_offset) as f32,
-                                top: (border_width / 2 - border_offset) as f32,
-                                right: (rect.right - border_width / 2 + border_offset) as f32,
-                                bottom: (rect.bottom - border_width / 2 + border_offset) as f32,
-                            };
-
-                            let _ = render_target.Resize(&D2D_SIZE_U {
-                                width: rect.right as u32,
-                                height: rect.bottom as u32,
-                            });
-
-                            let window_kind = (*border_pointer).window_kind;
-                            if let Some(brush) = (*border_pointer).brushes.get(&window_kind) {
-                                render_target.BeginDraw();
-                                render_target.Clear(None);
-
-                                // Calculate border radius based on style
-                                let style = match (*border_pointer).style {
-                                    BorderStyle::System => {
-                                        if *WINDOWS_11 {
-                                            BorderStyle::Rounded
-                                        } else {
-                                            BorderStyle::Square
-                                        }
-                                    }
-                                    BorderStyle::Rounded => BorderStyle::Rounded,
-                                    BorderStyle::Square => BorderStyle::Square,
-                                };
-
-                                match style {
-                                    BorderStyle::Rounded => {
-                                        render_target.DrawRoundedRectangle(
-                                            &(*border_pointer).rounded_rect,
-                                            brush,
-                                            border_width as f32,
-                                            None,
-                                        );
-                                    }
-                                    BorderStyle::Square => {
-                                        render_target.DrawRectangle(
-                                            &(*border_pointer).rounded_rect.rect,
-                                            brush,
-                                            border_width as f32,
-                                            None,
-                                        );
-                                    }
-                                    _ => {}
-                                }
-
-                                let _ = render_target.EndDraw(None, None);
-                            }
-                        }
-                    }
-
-                    LRESULT(0)
-                }
                 WM_PAINT => {
-                    if let Ok(rect) = WindowsApi::window_rect(window.0 as isize) {
-                        let border_pointer: *mut Border =
-                            GetWindowLongPtrW(window, GWLP_USERDATA) as _;
+                    let mut ps = PAINTSTRUCT::default();
+                    let hdc = BeginPaint(window, &mut ps);
 
-                        if border_pointer.is_null() {
-                            return LRESULT(0);
-                        }
-
-                        let reference_hwnd = (*border_pointer).tracking_hwnd;
-
-                        // Update position to update the ZOrder
-                        let border_window_rect = (*border_pointer).window_rect;
-
-                        tracing::trace!("updating border position");
-                        if let Err(error) =
-                            (*border_pointer).set_position(&border_window_rect, reference_hwnd)
-                        {
-                            tracing::error!("failed to update border position {error}");
-                        }
-
-                        if let Some(render_target) = (*border_pointer).render_target.get() {
-                            (*border_pointer).width = BORDER_WIDTH.load(Ordering::Relaxed);
-                            (*border_pointer).offset = BORDER_OFFSET.load(Ordering::Relaxed);
-
-                            let border_width = (*border_pointer).width;
-                            let border_offset = (*border_pointer).offset;
-
-                            (*border_pointer).rounded_rect.rect = D2D_RECT_F {
-                                left: (border_width / 2 - border_offset) as f32,
-                                top: (border_width / 2 - border_offset) as f32,
-                                right: (rect.right - border_width / 2 + border_offset) as f32,
-                                bottom: (rect.bottom - border_width / 2 + border_offset) as f32,
+                    // With the rect that we set in Self::update
+                    match WindowsApi::window_rect(window.0 as isize) {
+                        Ok(rect) => {
+                            // Grab the focus kind for this border
+                            let window_kind = {
+                                FOCUS_STATE
+                                    .lock()
+                                    .get(&(window.0 as isize))
+                                    .copied()
+                                    .unwrap_or(WindowKind::Unfocused)
                             };
 
-                            let _ = render_target.Resize(&D2D_SIZE_U {
-                                width: rect.right as u32,
-                                height: rect.bottom as u32,
-                            });
+                            // Set up the brush to draw the border
+                            let hpen = CreatePen(
+                                PS_SOLID | PS_INSIDEFRAME,
+                                BORDER_WIDTH.load(Ordering::SeqCst),
+                                COLORREF(window_kind_colour(window_kind)),
+                            );
 
-                            // Get window kind and color
+                            let hbrush = WindowsApi::create_solid_brush(0);
 
-                            (*border_pointer).window_kind = FOCUS_STATE
-                                .lock()
-                                .get(&(window.0 as isize))
-                                .copied()
-                                .unwrap_or(WindowKind::Unfocused);
-
-                            let window_kind = (*border_pointer).window_kind;
-                            if let Some(brush) = (*border_pointer).brushes.get(&window_kind) {
-                                render_target.BeginDraw();
-                                render_target.Clear(None);
-
-                                (*border_pointer).style = STYLE.load();
-
-                                // Calculate border radius based on style
-                                let style = match (*border_pointer).style {
-                                    BorderStyle::System => {
-                                        if *WINDOWS_11 {
-                                            BorderStyle::Rounded
-                                        } else {
-                                            BorderStyle::Square
-                                        }
+                            // Draw the border
+                            SelectObject(hdc, hpen);
+                            SelectObject(hdc, hbrush);
+                            // TODO(raggi): this is approximately the correct curvature for
+                            // the top left of a Windows 11 window (DWMWCP_DEFAULT), but
+                            // often the bottom right has a different shape. Furthermore if
+                            // the window was made with DWMWCP_ROUNDSMALL then this is the
+                            // wrong size.  In the future we should read the DWM properties
+                            // of windows and attempt to match appropriately.
+                            match STYLE.load() {
+                                BorderStyle::System => {
+                                    if *WINDOWS_11 {
+                                        // TODO: error handling
+                                        let _ =
+                                            RoundRect(hdc, 0, 0, rect.right, rect.bottom, 20, 20);
+                                    } else {
+                                        // TODO: error handling
+                                        let _ = Rectangle(hdc, 0, 0, rect.right, rect.bottom);
                                     }
-                                    BorderStyle::Rounded => BorderStyle::Rounded,
-                                    BorderStyle::Square => BorderStyle::Square,
-                                };
-
-                                match style {
-                                    BorderStyle::Rounded => {
-                                        render_target.DrawRoundedRectangle(
-                                            &(*border_pointer).rounded_rect,
-                                            brush,
-                                            border_width as f32,
-                                            None,
-                                        );
-                                    }
-                                    BorderStyle::Square => {
-                                        render_target.DrawRectangle(
-                                            &(*border_pointer).rounded_rect.rect,
-                                            brush,
-                                            border_width as f32,
-                                            None,
-                                        );
-                                    }
-                                    _ => {}
                                 }
-
-                                let _ = render_target.EndDraw(None, None);
+                                BorderStyle::Rounded => {
+                                    // TODO: error handling
+                                    let _ = RoundRect(hdc, 0, 0, rect.right, rect.bottom, 20, 20);
+                                }
+                                BorderStyle::Square => {
+                                    // TODO: error handling
+                                    let _ = Rectangle(hdc, 0, 0, rect.right, rect.bottom);
+                                }
                             }
+                            // TODO: error handling
+                            let _ = DeleteObject(hpen);
+                            // TODO: error handling
+                            let _ = DeleteObject(hbrush);
+                        }
+                        Err(error) => {
+                            tracing::error!("could not get border rect: {}", error.to_string())
                         }
                     }
-                    let _ = ValidateRect(window, None);
+
+                    // TODO: error handling
+                    let _ = EndPaint(window, &ps);
                     LRESULT(0)
                 }
                 WM_DESTROY => {
-                    SetWindowLongPtrW(window, GWLP_USERDATA, 0);
                     PostQuitMessage(0);
                     LRESULT(0)
                 }

komorebi/src/border_manager/mod.rs

@@ -1,6 +1,7 @@
 #![deny(clippy::unwrap_used, clippy::expect_used)]
 
 mod border;
+
 use crate::core::BorderImplementation;
 use crate::core::BorderStyle;
 use crate::core::WindowKind;
@@ -11,7 +12,7 @@ use crate::Rgb;
 use crate::WindowManager;
 use crate::WindowsApi;
 use border::border_hwnds;
-pub use border::Border;
+use border::Border;
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
 use crossbeam_utils::atomic::AtomicCell;
@@ -29,14 +30,15 @@ use std::sync::atomic::AtomicU32;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::OnceLock;
-use windows::Win32::Graphics::Direct2D::ID2D1HwndRenderTarget;
 
 pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(8);
 pub static BORDER_OFFSET: AtomicI32 = AtomicI32::new(-1);
 
 pub static BORDER_ENABLED: AtomicBool = AtomicBool::new(true);
+pub static BORDER_TEMPORARILY_DISABLED: AtomicBool = AtomicBool::new(false);
 
 lazy_static! {
+    pub static ref Z_ORDER: AtomicCell<ZOrder> = AtomicCell::new(ZOrder::Bottom);
     pub static ref STYLE: AtomicCell<BorderStyle> = AtomicCell::new(BorderStyle::System);
     pub static ref IMPLEMENTATION: AtomicCell<BorderImplementation> =
         AtomicCell::new(BorderImplementation::Komorebi);
@@ -54,10 +56,7 @@ lazy_static! {
 lazy_static! {
     static ref BORDERS_MONITORS: Mutex<HashMap<String, usize>> = Mutex::new(HashMap::new());
     static ref BORDER_STATE: Mutex<HashMap<String, Border>> = Mutex::new(HashMap::new());
-    static ref WINDOWS_BORDERS: Mutex<HashMap<isize, Border>> = Mutex::new(HashMap::new());
     static ref FOCUS_STATE: Mutex<HashMap<isize, WindowKind>> = Mutex::new(HashMap::new());
-    static ref RENDER_TARGETS: Mutex<HashMap<isize, ID2D1HwndRenderTarget>> =
-        Mutex::new(HashMap::new());
 }
 
 pub struct Notification(pub Option<isize>);
@@ -76,10 +75,6 @@ fn event_rx() -> Receiver<Notification> {
     channel().1.clone()
 }
 
-pub fn window_border(hwnd: isize) -> Option<Border> {
-    WINDOWS_BORDERS.lock().get(&hwnd).cloned()
-}
-
 pub fn send_notification(hwnd: Option<isize>) {
     if event_tx().try_send(Notification(hwnd)).is_err() {
         tracing::warn!("channel is full; dropping notification")
@@ -94,13 +89,12 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
     );
 
     for (_, border) in borders.iter() {
-        let _ = border.destroy();
+        border.destroy()?;
     }
 
     borders.clear();
     BORDERS_MONITORS.lock().clear();
     FOCUS_STATE.lock().clear();
-    RENDER_TARGETS.lock().clear();
 
     let mut remaining_hwnds = vec![];
 
@@ -113,7 +107,7 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
         tracing::info!("purging unknown borders: {:?}", remaining_hwnds);
 
         for hwnd in remaining_hwnds {
-            let _ = Border::from(hwnd).destroy();
+            Border::from(hwnd).destroy()?;
         }
     }
 
@@ -122,11 +116,11 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
 
 fn window_kind_colour(focus_kind: WindowKind) -> u32 {
     match focus_kind {
-        WindowKind::Unfocused => UNFOCUSED.load(Ordering::Relaxed),
-        WindowKind::Single => FOCUSED.load(Ordering::Relaxed),
-        WindowKind::Stack => STACK.load(Ordering::Relaxed),
-        WindowKind::Monocle => MONOCLE.load(Ordering::Relaxed),
-        WindowKind::Floating => FLOATING.load(Ordering::Relaxed),
+        WindowKind::Unfocused => UNFOCUSED.load(Ordering::SeqCst),
+        WindowKind::Single => FOCUSED.load(Ordering::SeqCst),
+        WindowKind::Stack => STACK.load(Ordering::SeqCst),
+        WindowKind::Monocle => MONOCLE.load(Ordering::SeqCst),
+        WindowKind::Floating => FLOATING.load(Ordering::SeqCst),
     }
 }
 
@@ -146,6 +140,7 @@ pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
 pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
     tracing::info!("listening");
 
+    BORDER_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
     let receiver = event_rx();
     event_tx().send(Notification(None))?;
 
@@ -162,14 +157,13 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
         let focused_workspace_idx =
             state.monitors.elements()[focused_monitor_idx].focused_workspace_idx();
         let monitors = state.monitors.clone();
-        let pending_move_op = *state.pending_move_op;
+        let pending_move_op = state.pending_move_op;
         let floating_window_hwnds = state.monitors.elements()[focused_monitor_idx].workspaces()
             [focused_workspace_idx]
             .floating_windows()
             .iter()
             .map(|w| w.hwnd)
             .collect::<Vec<_>>();
-        let foreground_window = WindowsApi::foreground_window().unwrap_or_default();
 
         drop(state);
 
@@ -239,19 +233,10 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                     should_process_notification = true;
                 }
 
-                // when we switch focus to/from a floating window
-                let switch_focus_to_from_floating_window = floating_window_hwnds.iter().any(|fw| {
-                    // if we switch focus to a floating window
-                    fw == &notification.0.unwrap_or_default() ||
-                    // if there is any floating window with a `WindowKind::Floating` border
-                    // that no longer is the foreground window then we need to update that
-                    // border.
-                    (fw != &foreground_window
-                        && window_border(*fw)
-                        .map(|b| b.window_kind == WindowKind::Floating)
-                        .unwrap_or_default())
-                });
-                if !should_process_notification && switch_focus_to_from_floating_window {
+                // when we switch focus to a floating window
+                if !should_process_notification
+                    && floating_window_hwnds.contains(&notification.0.unwrap_or_default())
+                {
                     should_process_notification = true;
                 }
 
@@ -270,10 +255,11 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
 
                 let mut borders = BORDER_STATE.lock();
                 let mut borders_monitors = BORDERS_MONITORS.lock();
-                let mut windows_borders = WINDOWS_BORDERS.lock();
 
                 // If borders are disabled
                 if !BORDER_ENABLED.load_consume()
+                    // Or if they are temporarily disabled
+                    || BORDER_TEMPORARILY_DISABLED.load(Ordering::SeqCst)
                     // Or if the wm is paused
                     || is_paused
                     // Or if we are handling an alt-tab across workspaces
@@ -285,7 +271,6 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                     }
 
                     borders.clear();
-                    windows_borders.clear();
 
                     previous_is_paused = is_paused;
                     continue 'receiver;
@@ -315,15 +300,10 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
 
                         // Handle the monocle container separately
                         if let Some(monocle) = ws.monocle_container() {
-                            let mut new_border = false;
                             let border = match borders.entry(monocle.id().clone()) {
                                 Entry::Occupied(entry) => entry.into_mut(),
                                 Entry::Vacant(entry) => {
-                                    if let Ok(border) = Border::create(
-                                        monocle.id(),
-                                        monocle.focused_window().copied().unwrap_or_default().hwnd,
-                                    ) {
-                                        new_border = true;
+                                    if let Ok(border) = Border::create(monocle.id()) {
                                         entry.insert(border)
                                     } else {
                                         continue 'monitors;
@@ -331,33 +311,25 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                 }
                             };
 
-                            let new_focus_state = if monitor_idx != focused_monitor_idx {
-                                WindowKind::Unfocused
-                            } else {
-                                WindowKind::Monocle
-                            };
-                            border.window_kind = new_focus_state;
+                            borders_monitors.insert(monocle.id().clone(), monitor_idx);
+
                             {
                                 let mut focus_state = FOCUS_STATE.lock();
-                                focus_state.insert(border.hwnd, new_focus_state);
+                                focus_state.insert(
+                                    border.hwnd,
+                                    if monitor_idx != focused_monitor_idx {
+                                        WindowKind::Unfocused
+                                    } else {
+                                        WindowKind::Monocle
+                                    },
+                                );
                             }
 
-                            let reference_hwnd =
-                                monocle.focused_window().copied().unwrap_or_default().hwnd;
+                            let rect = WindowsApi::window_rect(
+                                monocle.focused_window().copied().unwrap_or_default().hwnd,
+                            )?;
 
-                            let rect = WindowsApi::window_rect(reference_hwnd)?;
-
-                            if new_border {
-                                border.set_position(&rect, reference_hwnd)?;
-                            }
-
-                            border.invalidate();
-
-                            borders_monitors.insert(monocle.id().clone(), monitor_idx);
-                            windows_borders.insert(
-                                monocle.focused_window().cloned().unwrap_or_default().hwnd,
-                                border.clone(),
-                            );
+                            border.update(&rect, true)?;
 
                             let border_hwnd = border.hwnd;
                             let mut to_remove = vec![];
@@ -378,11 +350,9 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                             continue 'monitors;
                         }
 
-                        let foreground_hwnd = WindowsApi::foreground_window().unwrap_or_default();
-                        let foreground_monitor_id =
-                            WindowsApi::monitor_from_window(foreground_hwnd);
-                        let is_maximized = foreground_monitor_id == m.id()
-                            && WindowsApi::is_zoomed(foreground_hwnd);
+                        let is_maximized = WindowsApi::is_zoomed(
+                            WindowsApi::foreground_window().unwrap_or_default(),
+                        );
 
                         if is_maximized {
                             let mut to_remove = vec![];
@@ -427,17 +397,54 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                             borders.remove(id);
                         }
 
-                        'containers: for (idx, c) in ws.containers().iter().enumerate() {
+                        for (idx, c) in ws.containers().iter().enumerate() {
+                            let hwnd = c.focused_window().copied().unwrap_or_default().hwnd;
+                            let notification_hwnd = notification.0.unwrap_or_default();
+
+                            // Update border when moving or resizing with mouse
+                            if pending_move_op.is_some()
+                                && idx == ws.focused_container_idx()
+                                && hwnd == notification_hwnd
+                            {
+                                let restore_z_order = Z_ORDER.load();
+                                Z_ORDER.store(ZOrder::TopMost);
+
+                                let mut rect = WindowsApi::window_rect(
+                                    c.focused_window().copied().unwrap_or_default().hwnd,
+                                )?;
+
+                                while WindowsApi::lbutton_is_pressed() {
+                                    let border = match borders.entry(c.id().clone()) {
+                                        Entry::Occupied(entry) => entry.into_mut(),
+                                        Entry::Vacant(entry) => {
+                                            if let Ok(border) = Border::create(c.id()) {
+                                                entry.insert(border)
+                                            } else {
+                                                continue 'monitors;
+                                            }
+                                        }
+                                    };
+
+                                    let new_rect = WindowsApi::window_rect(
+                                        c.focused_window().copied().unwrap_or_default().hwnd,
+                                    )?;
+
+                                    if rect != new_rect {
+                                        rect = new_rect;
+                                        border.update(&rect, true)?;
+                                    }
+                                }
+
+                                Z_ORDER.store(restore_z_order);
+
+                                continue 'monitors;
+                            }
+
                             // Get the border entry for this container from the map or create one
-                            let mut new_border = false;
                             let border = match borders.entry(c.id().clone()) {
                                 Entry::Occupied(entry) => entry.into_mut(),
                                 Entry::Vacant(entry) => {
-                                    if let Ok(border) = Border::create(
-                                        c.id(),
-                                        c.focused_window().copied().unwrap_or_default().hwnd,
-                                    ) {
-                                        new_border = true;
+                                    if let Ok(border) = Border::create(c.id()) {
                                         entry.insert(border)
                                     } else {
                                         continue 'monitors;
@@ -445,14 +452,13 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                 }
                             };
 
+                            borders_monitors.insert(c.id().clone(), monitor_idx);
+
                             #[allow(unused_assignments)]
                             let mut last_focus_state = None;
 
                             let new_focus_state = if idx != ws.focused_container_idx()
                                 || monitor_idx != focused_monitor_idx
-                                || c.focused_window()
-                                    .map(|w| w.hwnd != foreground_window)
-                                    .unwrap_or_default()
                             {
                                 WindowKind::Unfocused
                             } else if c.windows().len() > 1 {
@@ -460,7 +466,6 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                             } else {
                                 WindowKind::Single
                             };
-                            border.window_kind = new_focus_state;
 
                             // Update the focused state for all containers on this workspace
                             {
@@ -468,51 +473,61 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                 last_focus_state = focus_state.insert(border.hwnd, new_focus_state);
                             }
 
-                            let reference_hwnd =
-                                c.focused_window().copied().unwrap_or_default().hwnd;
-
-                            // avoid getting into a thread restart loop if we try to look up
-                            // rect info for a window that has been destroyed by the time
-                            // we get here
-                            let rect = match WindowsApi::window_rect(reference_hwnd) {
-                                Ok(rect) => rect,
-                                Err(_) => {
-                                    let _ = border.destroy();
-                                    borders.remove(c.id());
-                                    continue 'containers;
-                                }
-                            };
+                            let rect = WindowsApi::window_rect(
+                                c.focused_window().copied().unwrap_or_default().hwnd,
+                            )?;
 
                             let should_invalidate = match last_focus_state {
                                 None => true,
                                 Some(last_focus_state) => last_focus_state != new_focus_state,
                             };
 
-                            if new_border {
-                                border.set_position(&rect, reference_hwnd)?;
-                            }
-
-                            if should_invalidate {
-                                border.invalidate();
-                            }
-
-                            borders_monitors.insert(c.id().clone(), monitor_idx);
-                            windows_borders.insert(
-                                c.focused_window().cloned().unwrap_or_default().hwnd,
-                                border.clone(),
-                            );
+                            border.update(&rect, should_invalidate)?;
                         }
 
                         {
-                            for window in ws.floating_windows() {
-                                let mut new_border = false;
+                            let restore_z_order = Z_ORDER.load();
+                            Z_ORDER.store(ZOrder::TopMost);
+
+                            'windows: for window in ws.floating_windows() {
+                                let hwnd = window.hwnd;
+                                let notification_hwnd = notification.0.unwrap_or_default();
+
+                                if pending_move_op.is_some() && hwnd == notification_hwnd {
+                                    let mut rect = WindowsApi::window_rect(hwnd)?;
+
+                                    while WindowsApi::lbutton_is_pressed() {
+                                        let border = match borders.entry(hwnd.to_string()) {
+                                            Entry::Occupied(entry) => entry.into_mut(),
+                                            Entry::Vacant(entry) => {
+                                                if let Ok(border) =
+                                                    Border::create(&hwnd.to_string())
+                                                {
+                                                    entry.insert(border)
+                                                } else {
+                                                    continue 'monitors;
+                                                }
+                                            }
+                                        };
+
+                                        let new_rect = WindowsApi::window_rect(hwnd)?;
+
+                                        if rect != new_rect {
+                                            rect = new_rect;
+                                            border.update(&rect, true)?;
+                                        }
+                                    }
+
+                                    Z_ORDER.store(restore_z_order);
+
+                                    continue 'monitors;
+                                }
+
                                 let border = match borders.entry(window.hwnd.to_string()) {
                                     Entry::Occupied(entry) => entry.into_mut(),
                                     Entry::Vacant(entry) => {
-                                        if let Ok(border) =
-                                            Border::create(&window.hwnd.to_string(), window.hwnd)
+                                        if let Ok(border) = Border::create(&window.hwnd.to_string())
                                         {
-                                            new_border = true;
                                             entry.insert(border)
                                         } else {
                                             continue 'monitors;
@@ -520,15 +535,32 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                     }
                                 };
 
-                                #[allow(unused_assignments)]
-                                let mut last_focus_state = None;
-                                let mut new_focus_state = WindowKind::Unfocused;
+                                borders_monitors.insert(window.hwnd.to_string(), monitor_idx);
 
-                                if foreground_window == window.hwnd {
-                                    new_focus_state = WindowKind::Floating;
+                                let mut should_destroy = false;
+
+                                if let Some(notification_hwnd) = notification.0 {
+                                    if notification_hwnd != window.hwnd {
+                                        should_destroy = true;
+                                    }
                                 }
 
-                                border.window_kind = new_focus_state;
+                                if WindowsApi::foreground_window().unwrap_or_default()
+                                    != window.hwnd
+                                {
+                                    should_destroy = true;
+                                }
+
+                                if should_destroy {
+                                    border.destroy()?;
+                                    borders.remove(&window.hwnd.to_string());
+                                    borders_monitors.remove(&window.hwnd.to_string());
+                                    continue 'windows;
+                                }
+
+                                #[allow(unused_assignments)]
+                                let mut last_focus_state = None;
+                                let new_focus_state = WindowKind::Floating;
                                 {
                                     let mut focus_state = FOCUS_STATE.lock();
                                     last_focus_state =
@@ -542,17 +574,10 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                     Some(last_focus_state) => last_focus_state != new_focus_state,
                                 };
 
-                                if new_border {
-                                    border.set_position(&rect, window.hwnd)?;
-                                }
-
-                                if should_invalidate {
-                                    border.invalidate();
-                                }
-
-                                borders_monitors.insert(window.hwnd.to_string(), monitor_idx);
-                                windows_borders.insert(window.hwnd, border.clone());
+                                border.update(&rect, should_invalidate)?;
                             }
+
+                            Z_ORDER.store(restore_z_order);
                         }
                     }
                 }

komorebi/src/colour.rs

@@ -39,18 +39,6 @@ impl From<Color32> for Colour {
     }
 }
 
-impl From<Colour> for Color32 {
-    fn from(value: Colour) -> Self {
-        match value {
-            Colour::Rgb(rgb) => Color32::from_rgb(rgb.r as u8, rgb.g as u8, rgb.b as u8),
-            Colour::Hex(hex) => {
-                let rgb = Rgb::from(hex);
-                Color32::from_rgb(rgb.r as u8, rgb.g as u8, rgb.b as u8)
-            }
-        }
-    }
-}
-
 #[derive(Debug, Copy, Clone, Serialize, Deserialize)]
 pub struct Hex(HexColor);
 

komorebi/src/com/interfaces.rs

@@ -44,7 +44,7 @@ impl<'a, T: Clone> ComIn<'a, T> {
     }
 }
 
-impl<T> Deref for ComIn<'_, T> {
+impl<'a, T> Deref for ComIn<'a, T> {
     type Target = T;
     fn deref(&self) -> &Self::Target {
         &self.data

komorebi/src/container.rs

@@ -75,18 +75,6 @@ impl Container {
         None
     }
 
-    pub fn idx_from_exe(&self, exe: &str) -> Option<usize> {
-        for (idx, window) in self.windows().iter().enumerate() {
-            if let Ok(window_exe) = window.exe() {
-                if exe == window_exe {
-                    return Option::from(idx);
-                }
-            }
-        }
-
-        None
-    }
-
     pub fn contains_window(&self, hwnd: isize) -> bool {
         for window in self.windows() {
             if window.hwnd == hwnd {

komorebi/src/core/asc.rs

@@ -1,135 +0,0 @@
-use crate::config_generation::ApplicationConfiguration;
-use crate::config_generation::ApplicationOptions;
-use crate::config_generation::MatchingRule;
-use color_eyre::Result;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::collections::BTreeMap;
-use std::ops::Deref;
-use std::ops::DerefMut;
-use std::path::PathBuf;
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ApplicationSpecificConfiguration(pub BTreeMap<String, AscApplicationRulesOrSchema>);
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum AscApplicationRulesOrSchema {
-    AscApplicationRules(AscApplicationRules),
-    Schema(String),
-}
-
-impl Deref for ApplicationSpecificConfiguration {
-    type Target = BTreeMap<String, AscApplicationRulesOrSchema>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for ApplicationSpecificConfiguration {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl ApplicationSpecificConfiguration {
-    pub fn load(pathbuf: &PathBuf) -> Result<Self> {
-        let content = std::fs::read_to_string(pathbuf)?;
-        Ok(serde_json::from_str(&content)?)
-    }
-
-    pub fn format(pathbuf: &PathBuf) -> Result<String> {
-        Ok(serde_json::to_string_pretty(&Self::load(pathbuf)?)?)
-    }
-}
-
-/// Rules that determine how an application is handled
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct AscApplicationRules {
-    /// Rules to ignore specific windows
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ignore: Option<Vec<MatchingRule>>,
-    /// Rules to forcibly manage specific windows
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub manage: Option<Vec<MatchingRule>>,
-    /// Rules to manage specific windows as floating windows
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub floating: Option<Vec<MatchingRule>>,
-    /// Rules to ignore specific windows from the transparency feature
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub transparency_ignore: Option<Vec<MatchingRule>>,
-    /// Rules to identify applications which minimize to the tray or have multiple windows
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tray_and_multi_window: Option<Vec<MatchingRule>>,
-    /// Rules to identify applications which have the `WS_EX_LAYERED` Extended Window Style
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layered: Option<Vec<MatchingRule>>,
-    /// Rules to identify applications which send the `EVENT_OBJECT_NAMECHANGE` event on launch
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub object_name_change: Option<Vec<MatchingRule>>,
-    /// Rules to identify applications which are slow to send initial event notifications
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub slow_application: Option<Vec<MatchingRule>>,
-}
-
-impl From<Vec<ApplicationConfiguration>> for ApplicationSpecificConfiguration {
-    fn from(value: Vec<ApplicationConfiguration>) -> Self {
-        let mut map = BTreeMap::new();
-
-        for entry in &value {
-            let key = entry.name.clone();
-            let mut rules = AscApplicationRules {
-                ignore: None,
-                manage: None,
-                floating: None,
-                transparency_ignore: None,
-                tray_and_multi_window: None,
-                layered: None,
-                object_name_change: None,
-                slow_application: None,
-            };
-
-            rules.ignore = entry.ignore_identifiers.clone();
-
-            if let Some(options) = &entry.options {
-                for opt in options {
-                    match opt {
-                        ApplicationOptions::ObjectNameChange => {
-                            rules.object_name_change =
-                                Some(vec![MatchingRule::Simple(entry.identifier.clone())]);
-                        }
-                        ApplicationOptions::Layered => {
-                            rules.layered =
-                                Some(vec![MatchingRule::Simple(entry.identifier.clone())]);
-                        }
-                        ApplicationOptions::TrayAndMultiWindow => {
-                            rules.tray_and_multi_window =
-                                Some(vec![MatchingRule::Simple(entry.identifier.clone())]);
-                        }
-                        ApplicationOptions::Force => {
-                            rules.manage =
-                                Some(vec![MatchingRule::Simple(entry.identifier.clone())]);
-                        }
-                        ApplicationOptions::BorderOverflow => {}
-                    }
-                }
-            }
-
-            if rules.ignore.is_some()
-                || rules.manage.is_some()
-                || rules.floating.is_some()
-                || rules.transparency_ignore.is_some()
-                || rules.tray_and_multi_window.is_some()
-                || rules.layered.is_some()
-                || rules.object_name_change.is_some()
-                || rules.slow_application.is_some()
-            {
-                map.insert(key, AscApplicationRulesOrSchema::AscApplicationRules(rules));
-            }
-        }
-
-        Self(map)
-    }
-}

komorebi/src/core/mod.rs

@@ -14,8 +14,6 @@ use serde::Serialize;
 use strum::Display;
 use strum::EnumString;
 
-use crate::animation::prefix::AnimationPrefix;
-use crate::KomorebiTheme;
 pub use animation::AnimationStyle;
 pub use arrangement::Arrangement;
 pub use arrangement::Axis;
@@ -29,7 +27,6 @@ pub use rect::Rect;
 
 pub mod animation;
 pub mod arrangement;
-pub mod asc;
 pub mod config_generation;
 pub mod custom_layout;
 pub mod cycle_direction;
@@ -50,7 +47,6 @@ pub enum SocketMessage {
     StackWindow(OperationDirection),
     UnstackWindow,
     CycleStack(CycleDirection),
-    CycleStackIndex(CycleDirection),
     FocusStackWindow(usize),
     StackAll,
     UnstackAll,
@@ -77,7 +73,6 @@ pub enum SocketMessage {
     Promote,
     PromoteFocus,
     PromoteWindow(OperationDirection),
-    EagerFocus(String),
     ToggleFloat,
     ToggleMonocle,
     ToggleMaximize,
@@ -106,10 +101,8 @@ pub enum SocketMessage {
     NewWorkspace,
     ToggleTiling,
     Stop,
-    StopIgnoreRestore,
     TogglePause,
     Retile,
-    RetileWithResizeDimensions,
     QuickSave,
     QuickLoad,
     Save(PathBuf),
@@ -118,7 +111,6 @@ pub enum SocketMessage {
     CycleFocusWorkspace(CycleDirection),
     FocusMonitorNumber(usize),
     FocusLastWorkspace,
-    CloseWorkspace,
     FocusWorkspaceNumber(usize),
     FocusWorkspaceNumbers(usize),
     FocusMonitorWorkspaceNumber(usize, usize),
@@ -149,11 +141,10 @@ pub enum SocketMessage {
     WatchConfiguration(bool),
     CompleteConfiguration,
     AltFocusHack(bool),
-    Theme(KomorebiTheme),
-    Animation(bool, Option<AnimationPrefix>),
-    AnimationDuration(u64, Option<AnimationPrefix>),
+    Animation(bool),
+    AnimationDuration(u64),
     AnimationFps(u64),
-    AnimationStyle(AnimationStyle, Option<AnimationPrefix>),
+    AnimationStyle(AnimationStyle),
     #[serde(alias = "ActiveWindowBorder")]
     Border(bool),
     #[serde(alias = "ActiveWindowBorderColour")]
@@ -186,7 +177,6 @@ pub enum SocketMessage {
     ClearWorkspaceRules(usize, usize),
     ClearNamedWorkspaceRules(String),
     ClearAllWorkspaceRules,
-    EnforceWorkspaceRules,
     #[serde(alias = "FloatRule")]
     IgnoreRule(ApplicationIdentifier, String),
     ManageRule(ApplicationIdentifier, String),
@@ -238,9 +228,7 @@ pub struct SubscribeOptions {
     pub filter_state_changes: bool,
 }
 
-#[derive(
-    Debug, Copy, Clone, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema, ValueEnum,
-)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema)]
 pub enum StackbarMode {
     Always,
     Never,
@@ -311,8 +299,6 @@ pub enum BorderImplementation {
     ValueEnum,
     JsonSchema,
     PartialEq,
-    Eq,
-    Hash,
 )]
 pub enum WindowKind {
     Single,

komorebi/src/core/rect.rs

@@ -37,12 +37,6 @@ impl From<Rect> for RECT {
     }
 }
 
-impl Rect {
-    pub fn is_same_size_as(&self, rhs: &Self) -> bool {
-        self.right == rhs.right && self.bottom == rhs.bottom
-    }
-}
-
 impl Rect {
     /// decrease the size of self by the padding amount.
     pub fn add_padding<T>(&mut self, padding: T)

komorebi/src/lib.rs

@@ -1,6 +1,7 @@
 #![warn(clippy::all)]
 
 pub mod animation;
+pub mod animation_manager;
 pub mod border_manager;
 pub mod com;
 #[macro_use]
@@ -19,7 +20,6 @@ pub mod set_window_position;
 pub mod stackbar_manager;
 pub mod static_config;
 pub mod styles;
-pub mod theme_manager;
 pub mod transparency_manager;
 pub mod window;
 pub mod window_manager;
@@ -46,6 +46,8 @@ use std::sync::atomic::AtomicU64;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
+pub use animation::*;
+pub use animation_manager::*;
 pub use colour::*;
 pub use core::*;
 pub use process_command::*;
@@ -213,9 +215,15 @@ lazy_static! {
         )
     };
 
+    static ref ANIMATION_STYLE: Arc<Mutex<AnimationStyle >> =
+        Arc::new(Mutex::new(AnimationStyle::Linear));
+
+    static ref ANIMATION_MANAGER: Arc<Mutex<AnimationManager>> =
+        Arc::new(Mutex::new(AnimationManager::new()));
+
     // Use app-specific titlebar removal options where possible
     // eg. Windows Terminal, IntelliJ IDEA, Firefox
-    static ref NO_TITLEBAR: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(vec![]));
+    static ref NO_TITLEBAR: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
 
     static ref WINDOWS_BY_BAR_HWNDS: Arc<Mutex<HashMap<isize, VecDeque<isize>>>> =
         Arc::new(Mutex::new(HashMap::new()));
@@ -229,6 +237,8 @@ pub static CUSTOM_FFM: AtomicBool = AtomicBool::new(false);
 pub static SESSION_ID: AtomicU32 = AtomicU32::new(0);
 
 pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);
+pub static ANIMATION_ENABLED: AtomicBool = AtomicBool::new(false);
+pub static ANIMATION_DURATION: AtomicU64 = AtomicU64::new(250);
 
 pub static SLOW_APPLICATION_COMPENSATION_TIME: AtomicU64 = AtomicU64::new(20);
 
@@ -290,15 +300,10 @@ pub struct Notification {
 }
 
 pub fn notify_subscribers(notification: Notification, state_has_been_modified: bool) -> Result<()> {
-    let is_override_event = matches!(
+    let is_subscription_event = matches!(
         notification.event,
         NotificationEvent::Socket(SocketMessage::AddSubscriberSocket(_))
             | NotificationEvent::Socket(SocketMessage::AddSubscriberSocketWithOptions(_, _))
-            | NotificationEvent::Socket(SocketMessage::Theme(_))
-            | NotificationEvent::Socket(SocketMessage::ReloadStaticConfiguration(_))
-            | NotificationEvent::WindowManager(WindowManagerEvent::TitleUpdate(_, _))
-            | NotificationEvent::WindowManager(WindowManagerEvent::Show(_, _))
-            | NotificationEvent::WindowManager(WindowManagerEvent::Uncloak(_, _))
     );
 
     let notification = &serde_json::to_string(&notification)?;
@@ -313,7 +318,7 @@ pub fn notify_subscribers(notification: Notification, state_has_been_modified: b
             .unwrap_or_default()
             .filter_state_changes;
 
-        if !apply_state_filter || state_has_been_modified || is_override_event {
+        if !apply_state_filter || state_has_been_modified || is_subscription_event {
             match UnixStream::connect(path) {
                 Ok(mut stream) => {
                     tracing::debug!("pushed notification to subscriber: {socket}");

komorebi/src/main.rs

@@ -7,7 +7,6 @@
     clippy::doc_markdown
 )]
 
-use std::env::temp_dir;
 use std::net::Shutdown;
 use std::path::PathBuf;
 use std::sync::atomic::Ordering;
@@ -18,9 +17,6 @@ use std::time::Duration;
 use clap::Parser;
 use color_eyre::Result;
 use crossbeam_utils::Backoff;
-use komorebi::animation::AnimationEngine;
-use komorebi::animation::ANIMATION_ENABLED_GLOBAL;
-use komorebi::animation::ANIMATION_ENABLED_PER_ANIMATION;
 #[cfg(feature = "deadlock_detection")]
 use parking_lot::deadlock;
 use parking_lot::Mutex;
@@ -42,9 +38,7 @@ use komorebi::process_movement::listen_for_movements;
 use komorebi::reaper;
 use komorebi::stackbar_manager;
 use komorebi::static_config::StaticConfig;
-use komorebi::theme_manager;
 use komorebi::transparency_manager;
-use komorebi::window_manager::State;
 use komorebi::window_manager::WindowManager;
 use komorebi::windows_api::WindowsApi;
 use komorebi::winevent_listener;
@@ -158,9 +152,6 @@ struct Opts {
     /// Path to a static configuration JSON file
     #[clap(short, long)]
     config: Option<PathBuf>,
-    /// Do not attempt to auto-apply a dumped state temp file from a previously running instance of komorebi
-    #[clap(long)]
-    clean_state: bool,
 }
 
 #[tracing::instrument]
@@ -177,7 +168,7 @@ fn main() -> Result<()> {
     SESSION_ID.store(session_id, Ordering::SeqCst);
 
     let mut system = sysinfo::System::new_all();
-    system.refresh_processes(ProcessesToUpdate::All, true);
+    system.refresh_processes(ProcessesToUpdate::All);
 
     let matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe".as_ref()).collect();
 
@@ -265,13 +256,6 @@ fn main() -> Result<()> {
         }
     }
 
-    let dumped_state = temp_dir().join("komorebi.state.json");
-
-    if !opts.clean_state && dumped_state.is_file() {
-        let state: State = serde_json::from_str(&std::fs::read_to_string(&dumped_state)?)?;
-        wm.lock().apply_state(state);
-    }
-
     wm.lock().retile_all(false)?;
 
     listen_for_events(wm.clone());
@@ -287,7 +271,6 @@ fn main() -> Result<()> {
     monitor_reconciliator::listen_for_notifications(wm.clone())?;
     reaper::watch_for_orphans(wm.clone());
     focus_manager::listen_for_notifications(wm.clone());
-    theme_manager::listen_for_notifications();
 
     let (ctrlc_sender, ctrlc_receiver) = crossbeam_channel::bounded(1);
     ctrlc::set_handler(move || {
@@ -302,13 +285,7 @@ fn main() -> Result<()> {
 
     tracing::error!("received ctrl-c, restoring all hidden windows and terminating process");
 
-    let state = State::from(&*wm.lock());
-    std::fs::write(dumped_state, serde_json::to_string_pretty(&state)?)?;
-
-    ANIMATION_ENABLED_PER_ANIMATION.lock().clear();
-    ANIMATION_ENABLED_GLOBAL.store(false, Ordering::SeqCst);
-    wm.lock().restore_all_windows(false)?;
-    AnimationEngine::wait_for_all_animations();
+    wm.lock().restore_all_windows()?;
 
     if WindowsApi::focus_follows_mouse()? {
         WindowsApi::disable_focus_follows_mouse()?;

komorebi/src/monitor.rs

@@ -139,86 +139,6 @@ impl Monitor {
         Ok(())
     }
 
-    /// Adds a container to this `Monitor` using the move direction to calculate if the container
-    /// should be added in front of all containers, in the back or in place of the focused
-    /// container, moving the rest along. The move direction should be from the origin monitor
-    /// towards the target monitor or from the origin workspace towards the target workspace.
-    pub fn add_container_with_direction(
-        &mut self,
-        container: Container,
-        workspace_idx: Option<usize>,
-        direction: OperationDirection,
-    ) -> Result<()> {
-        let workspace = if let Some(idx) = workspace_idx {
-            self.workspaces_mut()
-                .get_mut(idx)
-                .ok_or_else(|| anyhow!("there is no workspace at index {}", idx))?
-        } else {
-            self.focused_workspace_mut()
-                .ok_or_else(|| anyhow!("there is no workspace"))?
-        };
-
-        match direction {
-            OperationDirection::Left => {
-                // insert the container into the workspace on the monitor at the back (or rightmost position)
-                // if we are moving across a boundary to the left (back = right side of the target)
-                match workspace.layout() {
-                    Layout::Default(layout) => match layout {
-                        DefaultLayout::RightMainVerticalStack => {
-                            workspace.add_container_to_front(container);
-                        }
-                        DefaultLayout::UltrawideVerticalStack => {
-                            if workspace.containers().len() == 1 {
-                                workspace.insert_container_at_idx(0, container);
-                            } else {
-                                workspace.add_container_to_back(container);
-                            }
-                        }
-                        _ => {
-                            workspace.add_container_to_back(container);
-                        }
-                    },
-                    Layout::Custom(_) => {
-                        workspace.add_container_to_back(container);
-                    }
-                }
-            }
-            OperationDirection::Right => {
-                // insert the container into the workspace on the monitor at the front (or leftmost position)
-                // if we are moving across a boundary to the right (front = left side of the target)
-                match workspace.layout() {
-                    Layout::Default(layout) => {
-                        let target_index = layout.leftmost_index(workspace.containers().len());
-
-                        match layout {
-                            DefaultLayout::RightMainVerticalStack
-                            | DefaultLayout::UltrawideVerticalStack => {
-                                if workspace.containers().len() == 1 {
-                                    workspace.add_container_to_back(container);
-                                } else {
-                                    workspace.insert_container_at_idx(target_index, container);
-                                }
-                            }
-                            _ => {
-                                workspace.insert_container_at_idx(target_index, container);
-                            }
-                        }
-                    }
-                    Layout::Custom(_) => {
-                        workspace.add_container_to_front(container);
-                    }
-                }
-            }
-            OperationDirection::Up | OperationDirection::Down => {
-                // insert the container into the workspace on the monitor at the position
-                // where the currently focused container on that workspace is
-                workspace.insert_container_at_idx(workspace.focused_container_idx(), container);
-            }
-        };
-
-        Ok(())
-    }
-
     pub fn remove_workspace_by_idx(&mut self, idx: usize) -> Option<Workspace> {
         if idx < self.workspaces().len() {
             return self.workspaces_mut().remove(idx);
@@ -295,14 +215,54 @@ impl Monitor {
                 Some(workspace) => workspace,
             };
 
-            if let Some(direction) = direction {
-                self.add_container_with_direction(
-                    container,
-                    Some(target_workspace_idx),
-                    direction,
-                )?;
-            } else {
-                target_workspace.add_container_to_back(container);
+            match direction {
+                Some(OperationDirection::Left) => match target_workspace.layout() {
+                    Layout::Default(layout) => match layout {
+                        DefaultLayout::RightMainVerticalStack => {
+                            target_workspace.add_container_to_front(container);
+                        }
+                        DefaultLayout::UltrawideVerticalStack => {
+                            if target_workspace.containers().len() == 1 {
+                                target_workspace.insert_container_at_idx(0, container);
+                            } else {
+                                target_workspace.add_container_to_back(container);
+                            }
+                        }
+                        _ => {
+                            target_workspace.add_container_to_back(container);
+                        }
+                    },
+                    Layout::Custom(_) => {
+                        target_workspace.add_container_to_back(container);
+                    }
+                },
+                Some(OperationDirection::Right) => match target_workspace.layout() {
+                    Layout::Default(layout) => {
+                        let target_index =
+                            layout.leftmost_index(target_workspace.containers().len());
+
+                        match layout {
+                            DefaultLayout::RightMainVerticalStack
+                            | DefaultLayout::UltrawideVerticalStack => {
+                                if target_workspace.containers().len() == 1 {
+                                    target_workspace.add_container_to_back(container);
+                                } else {
+                                    target_workspace
+                                        .insert_container_at_idx(target_index, container);
+                                }
+                            }
+                            _ => {
+                                target_workspace.insert_container_at_idx(target_index, container);
+                            }
+                        }
+                    }
+                    Layout::Custom(_) => {
+                        target_workspace.add_container_to_front(container);
+                    }
+                },
+                _ => {
+                    target_workspace.add_container_to_back(container);
+                }
             }
         }
 

komorebi/src/monitor_reconciliator/mod.rs

@@ -132,7 +132,6 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                 );
 
                 ACTIVE.store(true, Ordering::SeqCst);
-                border_manager::send_notification(None);
             }
 
             continue 'receiver;

komorebi/src/process_command.rs

@@ -4,6 +4,7 @@ use std::fs::OpenOptions;
 use std::io::BufRead;
 use std::io::BufReader;
 use std::io::Read;
+use std::net::Shutdown;
 use std::net::TcpListener;
 use std::net::TcpStream;
 use std::num::NonZeroUsize;
@@ -21,9 +22,6 @@ use schemars::gen::SchemaSettings;
 use schemars::schema_for;
 use uds_windows::UnixStream;
 
-use crate::animation::ANIMATION_DURATION_PER_ANIMATION;
-use crate::animation::ANIMATION_ENABLED_PER_ANIMATION;
-use crate::animation::ANIMATION_STYLE_PER_ANIMATION;
 use crate::core::config_generation::ApplicationConfiguration;
 use crate::core::config_generation::IdWithIdentifier;
 use crate::core::config_generation::MatchingRule;
@@ -42,10 +40,6 @@ use crate::core::StateQuery;
 use crate::core::WindowContainerBehaviour;
 use crate::core::WindowKind;
 
-use crate::animation::ANIMATION_DURATION_GLOBAL;
-use crate::animation::ANIMATION_ENABLED_GLOBAL;
-use crate::animation::ANIMATION_FPS;
-use crate::animation::ANIMATION_STYLE_GLOBAL;
 use crate::border_manager;
 use crate::border_manager::IMPLEMENTATION;
 use crate::border_manager::STYLE;
@@ -57,7 +51,6 @@ use crate::stackbar_manager;
 use crate::stackbar_manager::STACKBAR_FONT_FAMILY;
 use crate::stackbar_manager::STACKBAR_FONT_SIZE;
 use crate::static_config::StaticConfig;
-use crate::theme_manager;
 use crate::transparency_manager;
 use crate::window::RuleDebug;
 use crate::window::Window;
@@ -65,11 +58,14 @@ use crate::window_manager;
 use crate::window_manager::WindowManager;
 use crate::windows_api::WindowsApi;
 use crate::winevent_listener;
-use crate::workspace::WorkspaceWindowLocation;
 use crate::GlobalState;
 use crate::Notification;
 use crate::NotificationEvent;
 use crate::State;
+use crate::ANIMATION_DURATION;
+use crate::ANIMATION_ENABLED;
+use crate::ANIMATION_FPS;
+use crate::ANIMATION_STYLE;
 use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
@@ -112,19 +108,10 @@ pub fn listen_for_commands(wm: Arc<Mutex<WindowManager>>) {
             tracing::info!("listening on komorebi.sock");
             for client in listener.incoming() {
                 match client {
-                    Ok(stream) => {
-                        let wm_clone = wm.clone();
-                        std::thread::spawn(move || {
-                            match stream.set_read_timeout(Some(Duration::from_secs(1))) {
-                                Ok(()) => {}
-                                Err(error) => tracing::error!("{}", error),
-                            }
-                            match read_commands_uds(&wm_clone, stream) {
-                                Ok(()) => {}
-                                Err(error) => tracing::error!("{}", error),
-                            }
-                        });
-                    }
+                    Ok(stream) => match read_commands_uds(&wm, stream) {
+                        Ok(()) => {}
+                        Err(error) => tracing::error!("{}", error),
+                    },
                     Err(error) => {
                         tracing::error!("{}", error);
                         break;
@@ -230,65 +217,6 @@ impl WindowManager {
                 self.focus_container_in_direction(direction)?;
                 self.promote_container_to_front()?
             }
-            SocketMessage::EagerFocus(ref exe) => {
-                let focused_monitor_idx = self.focused_monitor_idx();
-                let focused_workspace_idx = self.focused_workspace_idx()?;
-
-                let mut window_location = None;
-                let mut monitor_workspace_indices = None;
-
-                'search: for (monitor_idx, monitor) in self.monitors().iter().enumerate() {
-                    for (workspace_idx, workspace) in monitor.workspaces().iter().enumerate() {
-                        if let Some(location) = workspace.location_from_exe(exe) {
-                            window_location = Some(location);
-                            monitor_workspace_indices = Some((monitor_idx, workspace_idx));
-                            break 'search;
-                        }
-                    }
-                }
-
-                if let Some((monitor_idx, workspace_idx)) = monitor_workspace_indices {
-                    if monitor_idx != focused_monitor_idx {
-                        self.focus_monitor(monitor_idx)?;
-                    }
-
-                    if workspace_idx != focused_workspace_idx {
-                        self.focus_workspace(workspace_idx)?;
-                    }
-                }
-
-                if let Some(location) = window_location {
-                    match location {
-                        WorkspaceWindowLocation::Monocle(window_idx) => {
-                            self.focus_container_window(window_idx)?;
-                        }
-                        WorkspaceWindowLocation::Maximized => {
-                            if let Some(window) =
-                                self.focused_workspace_mut()?.maximized_window_mut()
-                            {
-                                window.focus(self.mouse_follows_focus)?;
-                            }
-                        }
-                        WorkspaceWindowLocation::Container(container_idx, window_idx) => {
-                            let focused_container_idx = self.focused_container_idx()?;
-                            if container_idx != focused_container_idx {
-                                self.focused_workspace_mut()?.focus_container(container_idx);
-                            }
-
-                            self.focus_container_window(window_idx)?;
-                        }
-                        WorkspaceWindowLocation::Floating(window_idx) => {
-                            if let Some(window) = self
-                                .focused_workspace_mut()?
-                                .floating_windows_mut()
-                                .get_mut(window_idx)
-                            {
-                                window.focus(self.mouse_follows_focus)?;
-                            }
-                        }
-                    }
-                }
-            }
             SocketMessage::FocusWindow(direction) => {
                 self.focus_container_in_direction(direction)?;
             }
@@ -309,10 +237,6 @@ impl WindowManager {
                 self.cycle_container_window_in_direction(direction)?;
                 self.focused_window()?.focus(self.mouse_follows_focus)?;
             }
-            SocketMessage::CycleStackIndex(direction) => {
-                self.cycle_container_window_index_in_direction(direction)?;
-                self.focused_window()?.focus(self.mouse_follows_focus)?;
-            }
             SocketMessage::FocusStackWindow(idx) => {
                 // In case you are using this command on a bar on a monitor
                 // different from the currently focused one, you'd want that
@@ -456,13 +380,6 @@ impl WindowManager {
                 let mut workspace_rules = WORKSPACE_MATCHING_RULES.lock();
                 workspace_rules.clear();
             }
-            SocketMessage::EnforceWorkspaceRules => {
-                {
-                    let mut already_moved = self.already_moved_window_handles.lock();
-                    already_moved.clear();
-                }
-                self.enforce_workspace_rules()?;
-            }
             SocketMessage::ManageRule(identifier, ref id) => {
                 let mut manage_identifiers = MANAGE_IDENTIFIERS.lock();
 
@@ -601,8 +518,7 @@ impl WindowManager {
                 self.move_container_to_workspace(workspace_idx, true, None)?;
             }
             SocketMessage::MoveContainerToMonitorNumber(monitor_idx) => {
-                let direction = self.direction_from_monitor_idx(monitor_idx);
-                self.move_container_to_monitor(monitor_idx, None, true, direction)?;
+                self.move_container_to_monitor(monitor_idx, None, true)?;
             }
             SocketMessage::SwapWorkspacesToMonitorNumber(monitor_idx) => {
                 self.swap_focused_monitor(monitor_idx)?;
@@ -614,8 +530,7 @@ impl WindowManager {
                         .ok_or_else(|| anyhow!("there must be at least one monitor"))?,
                 );
 
-                let direction = self.direction_from_monitor_idx(monitor_idx);
-                self.move_container_to_monitor(monitor_idx, None, true, direction)?;
+                self.move_container_to_monitor(monitor_idx, None, true)?;
             }
             SocketMessage::SendContainerToWorkspaceNumber(workspace_idx) => {
                 self.move_container_to_workspace(workspace_idx, false, None)?;
@@ -637,8 +552,7 @@ impl WindowManager {
                 self.move_container_to_workspace(workspace_idx, false, None)?;
             }
             SocketMessage::SendContainerToMonitorNumber(monitor_idx) => {
-                let direction = self.direction_from_monitor_idx(monitor_idx);
-                self.move_container_to_monitor(monitor_idx, None, false, direction)?;
+                self.move_container_to_monitor(monitor_idx, None, false)?;
             }
             SocketMessage::CycleSendContainerToMonitor(direction) => {
                 let monitor_idx = direction.next_idx(
@@ -647,37 +561,22 @@ impl WindowManager {
                         .ok_or_else(|| anyhow!("there must be at least one monitor"))?,
                 );
 
-                let direction = self.direction_from_monitor_idx(monitor_idx);
-                self.move_container_to_monitor(monitor_idx, None, false, direction)?;
+                self.move_container_to_monitor(monitor_idx, None, false)?;
             }
             SocketMessage::SendContainerToMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
-                let direction = self.direction_from_monitor_idx(monitor_idx);
-                self.move_container_to_monitor(
-                    monitor_idx,
-                    Option::from(workspace_idx),
-                    false,
-                    direction,
-                )?;
+                self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), false)?;
             }
             SocketMessage::MoveContainerToMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
-                let direction = self.direction_from_monitor_idx(monitor_idx);
-                self.move_container_to_monitor(
-                    monitor_idx,
-                    Option::from(workspace_idx),
-                    true,
-                    direction,
-                )?;
+                self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), true)?;
             }
             SocketMessage::SendContainerToNamedWorkspace(ref workspace) => {
                 if let Some((monitor_idx, workspace_idx)) =
                     self.monitor_workspace_index_by_name(workspace)
                 {
-                    let direction = self.direction_from_monitor_idx(monitor_idx);
                     self.move_container_to_monitor(
                         monitor_idx,
                         Option::from(workspace_idx),
                         false,
-                        direction,
                     )?;
                 }
             }
@@ -685,13 +584,7 @@ impl WindowManager {
                 if let Some((monitor_idx, workspace_idx)) =
                     self.monitor_workspace_index_by_name(workspace)
                 {
-                    let direction = self.direction_from_monitor_idx(monitor_idx);
-                    self.move_container_to_monitor(
-                        monitor_idx,
-                        Option::from(workspace_idx),
-                        true,
-                        direction,
-                    )?;
+                    self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), true)?;
                 }
             }
 
@@ -735,13 +628,10 @@ impl WindowManager {
                 self.update_focused_workspace(self.mouse_follows_focus, true)?;
             }
             SocketMessage::Retile => {
+                border_manager::BORDER_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
                 border_manager::destroy_all_borders()?;
                 self.retile_all(false)?
             }
-            SocketMessage::RetileWithResizeDimensions => {
-                border_manager::destroy_all_borders()?;
-                self.retile_all(true)?
-            }
             SocketMessage::FlipLayout(layout_flip) => self.flip_layout(layout_flip)?,
             SocketMessage::ChangeLayout(layout) => self.change_workspace_layout_default(layout)?,
             SocketMessage::CycleLayout(direction) => self.cycle_layout(direction)?,
@@ -865,42 +755,6 @@ impl WindowManager {
 
                 self.focus_workspace(workspace_idx)?;
             }
-            SocketMessage::CloseWorkspace => {
-                // This is to ensure that even on an empty workspace on a secondary monitor, the
-                // secondary monitor where the cursor is focused will be used as the target for
-                // the workspace switch op
-                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
-                    self.focus_monitor(monitor_idx)?;
-                }
-
-                let mut can_close = false;
-
-                if let Some(monitor) = self.focused_monitor_mut() {
-                    let focused_workspace_idx = monitor.focused_workspace_idx();
-                    let next_focused_workspace_idx = focused_workspace_idx.saturating_sub(1);
-
-                    if let Some(workspace) = monitor.focused_workspace() {
-                        if monitor.workspaces().len() > 1
-                            && workspace.containers().is_empty()
-                            && workspace.floating_windows().is_empty()
-                            && workspace.monocle_container().is_none()
-                            && workspace.maximized_window().is_none()
-                            && workspace.name().is_none()
-                        {
-                            can_close = true;
-                        }
-                    }
-
-                    if can_close
-                        && monitor
-                            .workspaces_mut()
-                            .remove(focused_workspace_idx)
-                            .is_some()
-                    {
-                        self.focus_workspace(next_focused_workspace_idx)?;
-                    }
-                }
-            }
             SocketMessage::FocusLastWorkspace => {
                 // This is to ensure that even on an empty workspace on a secondary monitor, the
                 // secondary monitor where the cursor is focused will be used as the target for
@@ -975,10 +829,26 @@ impl WindowManager {
                 }
             }
             SocketMessage::Stop => {
-                self.stop(false)?;
-            }
-            SocketMessage::StopIgnoreRestore => {
-                self.stop(true)?;
+                tracing::info!(
+                    "received stop command, restoring all hidden windows and terminating process"
+                );
+                self.restore_all_windows()?;
+
+                if WindowsApi::focus_follows_mouse()? {
+                    WindowsApi::disable_focus_follows_mouse()?;
+                }
+
+                let sockets = SUBSCRIPTION_SOCKETS.lock();
+                for path in (*sockets).values() {
+                    if let Ok(stream) = UnixStream::connect(path) {
+                        stream.shutdown(Shutdown::Both)?;
+                    }
+                }
+
+                let socket = DATA_DIR.join("komorebi.sock");
+                let _ = std::fs::remove_file(socket);
+
+                std::process::exit(0)
             }
             SocketMessage::MonitorIndexPreference(index_preference, left, top, right, bottom) => {
                 let mut monitor_index_preferences = MONITOR_INDEX_PREFERENCES.lock();
@@ -1293,7 +1163,7 @@ impl WindowManager {
                     // Pause so that restored windows come to the foreground from all workspaces
                     self.is_paused = true;
                     // Bring all windows to the foreground
-                    self.restore_all_windows(false)?;
+                    self.restore_all_windows()?;
 
                     // Create a new wm from the config path
                     let mut wm = StaticConfig::preload(
@@ -1559,16 +1429,6 @@ impl WindowManager {
             }
             SocketMessage::Border(enable) => {
                 border_manager::BORDER_ENABLED.store(enable, Ordering::SeqCst);
-                if !enable {
-                    match IMPLEMENTATION.load() {
-                        BorderImplementation::Komorebi => {
-                            border_manager::destroy_all_borders()?;
-                        }
-                        BorderImplementation::Windows => {
-                            self.remove_all_accents()?;
-                        }
-                    }
-                }
             }
             SocketMessage::BorderImplementation(implementation) => {
                 if !*WINDOWS_11 && matches!(implementation, BorderImplementation::Windows) {
@@ -1615,41 +1475,18 @@ impl WindowManager {
             SocketMessage::BorderOffset(offset) => {
                 border_manager::BORDER_OFFSET.store(offset, Ordering::SeqCst);
             }
-            SocketMessage::Animation(enable, prefix) => match prefix {
-                Some(prefix) => {
-                    ANIMATION_ENABLED_PER_ANIMATION
-                        .lock()
-                        .insert(prefix, enable);
-                }
-                None => {
-                    ANIMATION_ENABLED_GLOBAL.store(enable, Ordering::SeqCst);
-                    ANIMATION_ENABLED_PER_ANIMATION.lock().clear();
-                }
-            },
-            SocketMessage::AnimationDuration(duration, prefix) => match prefix {
-                Some(prefix) => {
-                    ANIMATION_DURATION_PER_ANIMATION
-                        .lock()
-                        .insert(prefix, duration);
-                }
-                None => {
-                    ANIMATION_DURATION_GLOBAL.store(duration, Ordering::SeqCst);
-                    ANIMATION_DURATION_PER_ANIMATION.lock().clear();
-                }
-            },
+            SocketMessage::Animation(enable) => {
+                ANIMATION_ENABLED.store(enable, Ordering::SeqCst);
+            }
+            SocketMessage::AnimationDuration(duration) => {
+                ANIMATION_DURATION.store(duration, Ordering::SeqCst);
+            }
             SocketMessage::AnimationFps(fps) => {
                 ANIMATION_FPS.store(fps, Ordering::SeqCst);
             }
-            SocketMessage::AnimationStyle(style, prefix) => match prefix {
-                Some(prefix) => {
-                    ANIMATION_STYLE_PER_ANIMATION.lock().insert(prefix, style);
-                }
-                None => {
-                    let mut animation_style = ANIMATION_STYLE_GLOBAL.lock();
-                    *animation_style = style;
-                    ANIMATION_STYLE_PER_ANIMATION.lock().clear();
-                }
-            },
+            SocketMessage::AnimationStyle(style) => {
+                *ANIMATION_STYLE.lock() = style;
+            }
             SocketMessage::ToggleTransparency => {
                 let current = transparency_manager::TRANSPARENCY_ENABLED.load(Ordering::SeqCst);
                 transparency_manager::TRANSPARENCY_ENABLED.store(!current, Ordering::SeqCst);
@@ -1662,7 +1499,6 @@ impl WindowManager {
             }
             SocketMessage::StackbarMode(mode) => {
                 STACKBAR_MODE.store(mode);
-                self.retile_all(true)?;
             }
             SocketMessage::StackbarLabel(label) => {
                 STACKBAR_LABEL.store(label);
@@ -1728,24 +1564,10 @@ impl WindowManager {
 
                 reply.write_all(config.as_bytes())?;
             }
-            SocketMessage::RemoveTitleBar(identifier, ref id) => {
+            SocketMessage::RemoveTitleBar(_, ref id) => {
                 let mut identifiers = NO_TITLEBAR.lock();
-
-                let mut should_push = true;
-                for i in &*identifiers {
-                    if let MatchingRule::Simple(i) = i {
-                        if i.id.eq(id) {
-                            should_push = false;
-                        }
-                    }
-                }
-
-                if should_push {
-                    identifiers.push(MatchingRule::Simple(IdWithIdentifier {
-                        kind: identifier,
-                        id: id.clone(),
-                        matching_strategy: Option::from(MatchingStrategy::Legacy),
-                    }));
+                if !identifiers.contains(id) {
+                    identifiers.push(id.clone());
                 }
             }
             SocketMessage::ToggleTitleBars => {
@@ -1761,9 +1583,6 @@ impl WindowManager {
 
                 reply.write_all(schema.as_bytes())?;
             }
-            SocketMessage::Theme(theme) => {
-                theme_manager::send_notification(theme);
-            }
             // Deprecated commands
             SocketMessage::AltFocusHack(_)
             | SocketMessage::IdentifyBorderOverflowApplication(_, _) => {}
@@ -1795,29 +1614,22 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, mut stream: UnixStream)
     for line in reader.lines() {
         let message = SocketMessage::from_str(&line?)?;
 
-        match wm.try_lock_for(Duration::from_secs(1)) {
-            None => {
-                tracing::warn!(
-                    "could not acquire window manager lock, not processing message: {message}"
-                );
-            }
-            Some(mut wm) => {
-                if wm.is_paused {
-                    return match message {
-                        SocketMessage::TogglePause
-                        | SocketMessage::State
-                        | SocketMessage::GlobalState
-                        | SocketMessage::Stop => Ok(wm.process_command(message, &mut stream)?),
-                        _ => {
-                            tracing::trace!("ignoring while paused");
-                            Ok(())
-                        }
-                    };
-                }
+        let mut wm = wm.lock();
 
-                wm.process_command(message.clone(), &mut stream)?;
-            }
+        if wm.is_paused {
+            return match message {
+                SocketMessage::TogglePause
+                | SocketMessage::State
+                | SocketMessage::GlobalState
+                | SocketMessage::Stop => Ok(wm.process_command(message, &mut stream)?),
+                _ => {
+                    tracing::trace!("ignoring while paused");
+                    Ok(())
+                }
+            };
         }
+
+        wm.process_command(message.clone(), &mut stream)?;
     }
 
     Ok(())