Merge pull request #526 from fastfetch-cli/dev

Release v2.0.1 (stable)

.editorconfig

@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
 [*.{md,fflogo}]
 trim_trailing_whitespace = false
 
-[*.{txt,fflogo}]
+[*.{fflogo}]
 insert_final_newline = false
 
 [*.yml]

.github/FUNDING.yml

@@ -1 +1 @@
-custom: paypal.me/linusdierheimer
+github: [LinusDierheimer, CarterLi]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,24 +7,31 @@ assignees: ''
 
 ---
 
+<!-- We will try hard to solve the issue. However since platforms and hardwares vary greatly, it can be hard to find the root cause is. Providing following information may help us greatly. Thanks in advance -->
+
 # General description of bug:
 
+* What happened:
+* What should happen:
+* Did it work in an older version: <!-- if yes, which version -->
+* Where did you get the binary: <!-- Github Release / Github Actions / Installed with a package manager (What package manager) / Built from source yourself -->
+* Does this issue still occurs in [the latest dev build](https://github.com/fastfetch-cli/fastfetch/actions/)?
 
-# Often helpful questions:
-* Does the issue occur across multiple terminal emulators? [Y/N]
-* Does the issue occur across multiple shells? (bash, zsh, fish, etc) [Y/N]
+# Often helpful information:
 
-Output of `fastfetch --version`:
+The content of the configuration file you use (if any)
 ```
 //paste here
 ```
 
-Output of `fastfetch --load-config devinfo`:
-```
-//paste here
-```
+Output of `env NO_CONFIG=1 fastfetch --load-config all --show-errors --stat --multithreading false --disable-linewrap false --hide-cursor false`:
+<!--
+Note that this output will contain you public IP. If it is not relevant for the issue, feel free to remove it before uploading.
+
+If you get the following error: `Error: couldn't find config: [...]`, copy the files in [presets](../../presets/) to `/usr/share/fastfetch/presets/` or `~/.local/share/fastfetch/presets/`.
+If this isn't possible (or too much work) for you, post the output of `env NO_CONFIG=1 fastfetch --show-errors --stat --multithreading false --disable-linewrap false --hide-cursor false && fastfetch --version`. 
+-->
 
-Output of `fastfetch --load-config devinfo-verbose`:
 ```
 //paste here
 ```
@@ -34,8 +41,39 @@ Output of `fastfetch --list-features`:
 //paste here
 ```
 
-<!--
-If you get the following error: `Error: couldn't find config: [...]`, copy the files in [presets](../../presets/) to `/usr/share/fastfetch/presets/` or `~/.local/share/fastfetch/presets/`.
-If this isn't possible (or too much work) for you, post the output of `fastfetch --show-errors --recache --multithreading false --disable-linewrap false`. 
--->
+## If fastfatch crashed
 
+Paste the stacktrace here. You may get it with:
+
+```
+$ gdb /path/to/fastfetch
+$ run
+$ bt
+```
+
+If you are able to identify which module crashed, the strace can be helpful too
+
+```
+$ strace /path/to/fastfetch --multithreading false --structure {MODULE} --pipe
+```
+
+If you cannot do the instructions above, please upload the core dump file:
+
+## If my image logo didn't show / work
+
+<!-- Please make sure the terminal does support the image protocol you used. Note Gnome terminal doesn't support any image protocols -->
+
+* The image protocol you used: 
+* The terminal you used: 
+* Upload the image file here, or paste the image URL: 
+* Does it work with `--logo-width {WIDTH} --logo-height {HEIGHT}`? 
+
+## If fastfetch behaves incorrectly on shell starting
+
+<!-- NOTE for zsh / p10k users:
+There are known incompatibility between fastfetch and p10k instant prompt.
+The p10k doc clearly states that you should NOT print anything to stdout after p10k-instant-prompt is initialized.
+You should either put `fastfetch` before initialization of p10k-instant-prompt (recommended), remove it or use `fastfetch --pipe false` -->
+
+* The bug is reproduceable with fresh / clean shell configuration (i.e. `fastfetch` is the single line of `.zshrc` or `~/.config/fish/config.fish`): 
+* Does `sleep 1` before running `fastfetch` work? 

.github/ISSUE_TEMPLATE/logo_request.md

@@ -0,0 +1,18 @@
+---
+name: Logo request
+about: Request a new logo
+title: ''
+labels: logo request
+assignees: ''
+
+---
+
+# OS
+```
+paste content of /etc/os-release here. If this file doesn't exist, describe a way to identify the distro.
+```
+
+# Ascii
+```
+paste ascii art here. If you leave this empty, i will try to find the logo myself.
+```

.github/workflows/ci.yml

@@ -0,0 +1,320 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  linux-buildtest:
+    name: Linux build test
+    permissions:
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-22.04, ubuntu-20.04]
+        compiler: [gcc, clang, "musl-gcc"]
+        enableFeatures: [ON, OFF]
+        exclude:
+          # The feature libraries are all build against glibc, so they can't be used with musl
+          - compiler: "musl-gcc"
+            enableFeatures: ON
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: install required packages
+        run: sudo apt-get update && sudo apt-get install -y musl-dev musl-tools linux-headers-generic libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev
+
+      - name: configure project
+        env:
+          CC: ${{ matrix.compiler }}
+        run: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_LIBPCI=${{ matrix.enableFeatures }} -DENABLE_VULKAN=${{ matrix.enableFeatures }} -DENABLE_WAYLAND=${{ matrix.enableFeatures }} -DENABLE_XCB_RANDR=${{ matrix.enableFeatures }} -DENABLE_XCB=${{ matrix.enableFeatures }} -DENABLE_XRANDR=${{ matrix.enableFeatures }} -DENABLE_X11=${{ matrix.enableFeatures }} -DENABLE_GIO=${{ matrix.enableFeatures }} -DENABLE_DCONF=${{ matrix.enableFeatures }} -DENABLE_DBUS=${{ matrix.enableFeatures }} -DENABLE_XFCONF=${{ matrix.enableFeatures }} -DENABLE_SQLITE3=${{ matrix.enableFeatures }} -DENABLE_RPM=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK7=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK6=${{ matrix.enableFeatures }} -DENABLE_CHAFA=${{ matrix.enableFeatures }} -DENABLE_ZLIB=${{ matrix.enableFeatures }} -DENABLE_EGL=${{ matrix.enableFeatures }} -DENABLE_GLX=${{ matrix.enableFeatures }} -DENABLE_OSMESA=${{ matrix.enableFeatures }} -DENABLE_OPENCL=${{ matrix.enableFeatures }} -DENABLE_LIBNM=${{ matrix.enableFeatures }} -DENABLE_PULSE=${{ matrix.enableFeatures }} -DENABLE_JSONC=${{ matrix.enableFeatures }} .
+
+      - name: build project
+        run: cmake --build .
+
+      - name: run tests
+        run: ctest
+
+      - name: run fastfetch
+        run: ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+
+      - name: run flashfetch
+        run: ./flashfetch
+
+  linux:
+    name: Linux
+    runs-on: ubuntu-20.04 # 22.04 ships a newer version of glibc than debian stable, allow those people to use the debian package
+    permissions:
+      security-events: write
+      contents: read
+    outputs:
+      ffversion: ${{ steps.ffversion.outputs.ffversion }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: install required packages
+        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: c
+
+      - name: configure project
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+
+      - name: build project
+        run: cmake --build . --target package
+
+      - name: perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: run tests
+        run: ctest
+
+      - name: get fastfetch version
+        id: ffversion
+        run: echo "ffversion=$(./fastfetch --version-raw)" >> $GITHUB_OUTPUT
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastfetch-linux
+          path: ./fastfetch-*.*
+
+  macos:
+    name: MacOS
+    runs-on: macos-latest
+    permissions:
+      security-events: write
+      contents: read
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: install required packages
+        run: brew install vulkan-loader molten-vk imagemagick chafa
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: c
+
+      - name: configure project
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' .
+
+      - name: build project
+        run: cmake --build . --target package
+
+      - name: perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: run tests
+        run: ctest
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastfetch-macos
+          path: ./fastfetch-*.*
+
+  freebsd:
+    name: FreeBSD
+    runs-on: macos-12
+    permissions:
+      security-events: write
+      contents: read
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: run VM
+        uses: vmactions/freebsd-vm@v0
+        with:
+          prepare: |
+            pkg install -y cmake git pkgconf pciutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd pulseaudio
+          run: |
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+            cmake --build . --target package
+            ./fastfetch --list-features
+            time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+            time ./flashfetch
+            ctest
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastfetch-freebsd
+          path: ./fastfetch-*.*
+
+  win64:
+    name: Win64
+    runs-on: windows-latest
+    permissions:
+      security-events: write
+      contents: read
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: setup-msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANG64
+          update: true
+          install: git zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-opencl-icd
+
+      - name: print msys version
+        run: uname -a
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: c, cpp
+
+      - name: configure project
+        run: env PKG_CONFIG_PATH=/clang64/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+
+      - name: build project
+        run: cmake --build .
+
+      - name: perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+
+      - name: copy necessary dlls
+        run: cp /clang64/bin/{OpenCL,vulkan-1}.dll .
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: run tests
+        run: ctest
+
+      - name: create zip archive
+        run: zip fastfetch-$(./fastfetch --version-raw)-Win64.zip *.dll fastfetch.exe flashfetch.exe
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastfetch-win64
+          path: ./fastfetch-*-Win64.zip
+
+  win32:
+    name: Win32
+    runs-on: windows-latest
+    permissions:
+      security-events: write
+      contents: read
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: setup-msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANG32
+          update: true
+          install: git zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-opencl-icd
+
+      - name: print msys version
+        run: uname -a
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: c, cpp
+
+      - name: configure project
+        run: env PKG_CONFIG_PATH=/clang32/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+
+      - name: build project
+        run: cmake --build .
+
+      - name: perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+
+      - name: copy necessary dlls
+        run: cp /clang32/bin/{OpenCL,vulkan-1}.dll .
+
+      - name: run fastfetch
+        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: run tests
+        run: ctest
+
+      - name: create zip archive
+        run: zip fastfetch-$(./fastfetch --version-raw)-Win32.zip *.dll fastfetch.exe flashfetch.exe
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastfetch-win32
+          path: ./fastfetch-*-Win32.zip
+
+  release:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'fastfetch-cli/fastfetch'
+    name: Release
+    runs-on: ubuntu-latest
+    needs:
+      - linux
+      - macos
+      - freebsd
+      - win64
+      - win32
+    permissions:
+      contents: write
+    steps:
+      - name: download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: get latest release version
+        id: get_version_release
+        uses: pozetroninc/github-action-get-latest-release@master
+        with:
+          repository: ${{ github.repository }}
+
+      - name: create release
+        if: needs.linux.outputs.ffversion != steps.get_version_release.outputs.release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ needs.linux.outputs.ffversion }}
+          commit: ${{ github.sha }}
+          artifactErrorsFailBuild: true
+          artifacts: fastfetch-linux/*,fastfetch-macos/*,fastfetch-freebsd/*,fastfetch-win64/*,fastfetch-win32/*

.github/workflows/pull_request.yml

@@ -1,37 +0,0 @@
-name: manage pull requests
-
-on: pull_request
-
-jobs:
-  check:
-    name: manage pull request
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v2
-
-      - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-
-      - name: configure project
-        run: cmake -DBUILD_TESTS=On .
-
-      - name: build project
-        run: cmake --build . -j$(nproc) --target package
-
-      - name: run fastfetch
-        run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true
-
-      - name: run flashfetch
-        run: ./flashfetch
-
-      - name: run tests
-        run: ctest
-
-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v1

.github/workflows/push.yml

@@ -1,60 +0,0 @@
-name: manage pushes
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  manage:
-    name: manage push
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      security-events: write
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v2
-
-      - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-
-      - name: configure project
-        # We reuse the build binary only for the releases.
-        # We set tweak version to off, because it is wrong, as git tag will happen after this step. Releases don't have a tweak, so this is ok.
-        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-
-      - name: build project
-        run: cmake --build . -j$(nproc) --target package
-
-      - name: run fastfetch
-        run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true
-
-      - name: run flashfetch
-        run: ./flashfetch
-
-      - name: run tests
-        run: ctest
-
-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v1
-
-      - name: get fastfetch version
-        id: get_version_fastfetch
-        run: echo "::set-output name=release::$(./fastfetch --version-raw)"
-
-      - name: get latest release version
-        id: get_version_release
-        uses: pozetroninc/github-action-get-latest-release@master
-        with:
-          repository: ${{ github.repository }}
-
-      - name: create release
-        if: steps.get_version_fastfetch.outputs.release != steps.get_version_release.outputs.release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.get_version_fastfetch.outputs.release }}
-          commit: ${{ github.sha }}
-          artifacts: ./fastfetch-*.*

.gitignore

@@ -2,8 +2,8 @@
 **/.vscode/
 **/.cache/
 **/.kdev4/
+**/.DS_Store
+/.vs
 cscope.*
 tags
 fastfetch.kdev4
-**/*.deb
-packaging/deb/fastfetch

CHANGELOG.md

@@ -0,0 +1,540 @@
+# 2.0.1
+
+First stable release of Fastfetch V2
+
+Changes:
+* Unescape strings only when parsing `.conf` files
+    * Previously: `$ NO_CONFIG=1 fastfetch --os-key \\\\ -s os -l none` prints `\: *`. Note the backslashs are unescaped twice (once by shell and once by fastfetch).
+    * Now: `$ NO_CONFIG=1 fastfetch --os-key \\\\ -s os -l none` prints `\\: *`
+* Remove option shortcut `-c` (alias of `--color`), which is more commonly used as alias of `--config`
+* Rename `--recache` to `--logo-recache` (which is used for regenerate image logo cache). Remove option shortcut `-r` (alias of `--recache`).
+* Detecting brightness of external displays with DDC/CI is no longer guarded behind `--allow-slow-operations` (Brightness)
+
+Features:
+* Add `--key-width` for aligning the left edge of values, supported both for global `--key-width` and specific module `--module-key-width`
+* Add `--bar-char-elapsed`, `--bar-char-total`, `--bar-width` and `--bar-border` options
+* Add CMake option `ENABLE_SYSTEM_YYJSON`, which allow building fastfetch with system-provided yyjson (for package managers)
+* Add new module `Version`, which prints fastfetch version (like `fastfetch --version`)
+
+Bugfixes:
+* Fix label detection. Use `--disk-key 'Disk ({2})'` to display it (Disk, Linux)
+* Fix some module options were not inited
+* Fix terminal version and font detection on NixOS (Terminal, Linux)
+
+# 2.0.0-beta
+
+Fastfetch v2 introduces a new configuration file format: JSON config. Please refer to <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration> for details.
+
+Changes:
+* Drop the dependency of cJSON. We now use [yyjson](https://ibireme.github.io/yyjson/doc/doxygen/html/index.html) to parse JSON documents.
+* Remove `--shell-version` and `--terminal-version`. They are always enabled (Terminal / Shell)
+* Remove `--*-error-format`, which seems to be useless
+* Remove `--display-detect-name`. Display name is always detected, and will be printed if multiple displays are detected
+* Deprecate `--set` and `--set-keyless`; they may be removed in future releases. Use JSON config with Custom module instead
+* Remove the special handling of Command module (it can be set once in the triditional `config.conf`). Use JSON config with Command module instead
+* Change `--wm-theme-*` to `--wmtheme-*`. Affect `key` and `format` (WMTheme)
+* Change `--terminal-font-*` to `--terminalfont-*`. Affect `key` and `format` (TerminalFont)
+* Module `Command` uses `/bin/sh` as the default shell on systems other than Windows (Command)
+* Fix M2 CPU temperature detection (CPU, macOS)
+* Detect monitor name when available, instead of using DRM connector name (Display / Brightness, Linux)
+
+Features:
+* FreeBSD support is improved greatly, and actually tested in a physical machine
+* Add `--no-buffer` option for easier debugging. CMake option `ENABLE_BUFFER` is removed and always enabled.
+* Support `--*-key-color` option to change the key color of specified module
+* Support `--colors-symbol` and `--colors-padding-left` (Colors)
+* Add LM (Login Manager) module. Currently requires systemd installed (thus Linux only)
+* Add `--wmi-timeout` option (Windows)
+* Add `--logo-type small` to search for small logos
+* Support detecting brightness of external displays with DDC/CI (guard behind `--allow-slow-operations`) (Brightness)
+* Add option `--size-ndigits` and `--size-max-prefix` (#494)
+* Add option `--processing-timeout` to the timeout when waiting for child processes.
+* Public IP module prints the IP location if `--publicip-url` is not set (PublicIP)
+* Add option `--localip-default-route-only` (LocalIP)
+* Add option `--weather-location` (Weather)
+* Support iTerm non-ascii font detection (Terminal, macOS)
+* Add option `--title-color-user`, `--title-color-at` and `--title-color-host` (Title)
+* Add Exherbo logo and package manager count (Packages, Linux, #503)
+* Add module `Terminal Size` which prints the number of terminal width and height in characters and pixels
+* Add new option `--temperature-unit`
+* Better CPU and Host detection for Android (Android)
+* Support yakuake terminal version & font detection (Terminal, Linux)
+* Add new option `--bright-color` which can be used to disable the default bright color of keys, title and ASCII logo.
+* Add module `Monitor` which prints physical parameters (native resolutions and demensions) of connected monitors
+* Support path with environment variables for `--logo-source` and `--load-config`.
+
+Bugfixes:
+* Fix possible hanging (TerminalFont, #493)
+* Fix heap-buffer-overflow reading (DisplayServer, Linux)
+* Fix false errors when built without libnm support (Wifi, Linux)
+* Properly detect CPU on POWER (CPU, Linux)
+* Fix compatibility with Fig (Terminal, macOS)
+* Fix option `--title-fqdn` doesn't work (Title)
+* Fix used spaces calculation (Disk, Linux / BSD / macOS, #508)
+* Fix `--brightness-format` (Brightness)
+* Fix specifying `--set-keyless` with the same key second time won't override the value set before (#517)
+* Fix specifying `--color` second time won't clear the value set before (#517)
+
+Logo:
+* Change the special handling of `kitty` protocol with `.png` image file to a new image protocol `kitty-direct`. This is the fastest image protocol because fastfetch doesn't need to pre-encode the image to base64 or something and the image content doesn't need to be transmitted via tty. Note:
+    1. Although konsole was said to support `kitty` image protocol, it doesn't support `kitty-direct`
+    2. wezterm support more image formats other than `.png` (tested with `.jpg` and `.webp`)
+* Port all logos supported by neo(wo)fetch. Fastfetch now has 350 builtin logos in total.
+
+# 1.12.2
+
+Features:
+* Support terminator terminal version detection (Linux, Terminal)
+* Support `pkgtool` package manager detection (Linux, Packages)
+* Support `Far` shell version detection (Windows, Shell)
+
+Bugfixes:
+* Fix ConEmu terminal detection in some special cases (Windows, Terminal, #488)
+* Fix incorrect Host on M2 Mac Studio with M2 Max CPU (macOS, Host, #490)
+
+# 1.12.1
+
+Bugfixes:
+* Fix compiling error on Apple Slicon (Bios, macOS)
+
+# 1.12.0
+
+This release backports some changes from dev branch, and fixes 2 crashing issues
+
+Features:
+* Support KDE / LXQT / MATE / Cinnamon wallpaper detection (Wallpaper, Linux)
+* Support QTerminal version & terminal font detection
+* Support MATE Terminal version & terminal font detection
+* Set `--pipe true` automatically if stdout is not a tty
+* Detect new macs released on WWDC 2023 (macOS, Host)
+* Count cached memory as free memory (FreeBSD, Memory)
+* Support sound detection (FreeBSD, Sound)
+
+Bugfixes:
+* Fix DE detection on Windows 8.1 (Windows, DE)
+* Fix `--logo-padding-left` doesn't work when `--logo-padding-top` is set (Logo)
+* Fix KDE version detection on Fedora (DE)
+* Include limits.h when needed (Linux, #472)
+* Fix Windows drives detection in WSL (Linux, Disk)
+* Fix CPU temp detection (FreeBSD, CPU)
+* Fix disk detection (Android, Disk)
+* Fix Gnome Terminal version and font detection (FreeBSD, TerminalFont)
+* Fix crash on newer wayland desktops (Linux, Display, #477)
+* Fix vendor detection for Intel GPU (macOS, GPU)
+* Fix possible crashes on Windows Server (Windows, GPU, #484)
+
+Logo:
+* Add bsd, freebsd_small, ghostbsd
+* Make Windows 11 logo colorable
+
+# 1.11.3
+
+Bugfixes:
+* Fix a segfault bug, regression of `1.11.1` (Linux, wmtheme, #467)
+
+# 1.11.2
+
+This release should be the last version of fastfetch 1.x (if no serious bugs found, hopefully)
+
+Features:
+* Support display name, type, rotation detection on Wayland (Linux, Display)
+* Print more useful display name instead of intel_backlight (Linux, Brightness)
+* Icons module supports Windows (Windows, Icons)
+* Add Wallpaper module which shows the current wallpaper image path
+* Add mac address detection `--localip-show-mac` (LocalIP, #451)
+
+Bugfixes:
+* Fix Gnome version detection on Fedora (DE)
+* Fix Windows drives detection in WSL (Disk)
+
+Changes:
+* In order to make Icons module consistant between different platforms, `--icons-format` no longer supports individual GTK / QT icon params.
+* `--theme-format` no longer supports individual GTK / plasma theme params.
+* `--local-ip-*` and `--public-ip-*` have been changed to `--localip-*` and `--publicip-*`
+* `--localip-compact-type` is no longer supported. Fastfetch now display IPs as `--localip-compat-type multiline` by default, with `--local-compact true` can be set as an alias of `--localip-compact-type oneline`
+* `--localip-v6first` is no longer supported.
+
+# 1.11.1
+
+Features:
+* Support xonsh detection (TerminalShell)
+* Support Tabby version / terminal font detection (TerminalFont)
+
+Bugfixes:
+* Fix name of Pro Controller (Gamepad, Windows)
+* Fix compile error with imagemagick enabled (Windows)
+* Fix copy-and-paste errors (Gamepad)
+* Flatpak: Fix user package count
+* Flatpak: Count runtime packages too (#441)
+* Fix flatpak package count (#441)
+* Don't print white color blocks with `--pipe` (#450)
+* Fix iTerm being detected as iTermServer-* sometimes
+* Fix sound device volume being incorrectly detected as muted sometimes (Sound)
+* Fix memleaks reported by LeakSanitizer (Linux)
+* Fix potential memory curruption bug in unicode.c (Windows)
+
+Logo:
+* Update Windows 11 ASCII logo to look more visually consistent (#445)
+* Add another font color index to arch icon (#446)
+* Add SteamOS
+* Add macOS small / small2
+
+# 1.11.0
+
+Features:
+* Support linuxbrew (Packages, Linux)
+* Support foot terminal (#431, Linux)
+* Support cursor size detection on Windows (Cursor, Windows)
+* Support cursor detection on macOS (Cursor, macOS)
+* Support display name, display type and decimal refresh rate detection (Display, macOS / Windows)
+* Support `--display-compact-type` to display multiple resolutions in one line (Display)
+* Support flatpak-user (Packages, Linux, #436)
+* Support `--gpu-force-vulkan` to force using vulkan to detect GPUs, which support video memory usage detection with `--allow-slow-operations` (GPU)
+
+Bugfixes:
+* Fix date time format
+* Fix compiling with musl (Wifi, Linux, #429)
+* Don't exit if libpci is failed to init (GPU, Linux, #433)
+* Names of most well-known gamepads are correctly printed instead of `Wireless Controller` on Windows
+
+Logo:
+* Small update for nobara logo (#435, @regulargvy13)
+
+# 1.10.3
+
+Bugfixes:
+* Fix uninitialized variables (GPU, Windows)
+* Fix compiling errors (Windows)
+
+Improvements:
+* Improve preformance (WmTheme amd Font, Windows and macOS)
+* Enable nonblocking public-ip / weather detection (Android)
+
+# 1.10.2
+
+Bugfixes:
+* Handle `kAudioObjectPropertyElementMain` for macOS **SDK** < 12 (#425, @nandahkrishna)
+* Add missing `NULL` for `ffProcessAppendStdOut` (#421)
+
+# 1.10.1
+
+New release for debugging #421
+
+# 1.10.0
+
+Notable Changes:
+
+* With the support of Win32 platform, original Windows 64bit artifact file is renamed to Win64 to avoid possible confusion
+
+Features:
+* Bluetooth module
+* Sound module
+* Gamepad module
+* Support colored percentage numbers output (#409)
+* Support `--localip-compact-type` option (#408)
+* Terminator terminal font detection (@Zerogiven, #415)
+* Windows 32bit compatibility
+* Support global configuration in MSYS2 environment (Windows)
+* Support GPU driver version detection on Windows 11
+* Support scaled resolution detection for wayland (Linux)
+
+Bugfixes:
+
+* Fix build with older libnm versions
+* Fix a rare case that fails to detect terminal
+* Fix Muffin detection (@Zerogiven, #411)
+* Fix IPv6 detection (Windows)
+* Fix scoop package count detection when scoop is installed in non-default path (Windows, #417)
+* Fix UB reported by clang
+* Honor $SCOOP when detecting scoop packages (#417)
+
+Other:
+
+* Simplified wmtheme output format (Windows)
+* Improved GPU detection performance on Windows 11
+* Lastest Mac model identifier support (macOS)
+
+# 1.9.1
+
+Bugfixes:
+
+* Fix builds on s390x (@jonathanspw, #402)
+* Fix zero refresh rate on some monitors (macOS)
+* Fix default formatting of Wifi module
+
+# 1.9.0
+
+Notable Changes:
+* fastfetch no longer creates a sample config file silently. Use `--gen-config` to generate one.
+* fastfetch now search for user config file in the order of `fastfetch --list-config-paths`
+* Unknown disks are hidden by default.
+* `Resolution` module is renamed to `Display`. (#393)
+
+Features:
+* `--logo-padding-top` option (@CarterLi, #372)
+* Raw image file as logo support (@CarterLi)
+* Look for config files in `$APPDATA` ([RoamingAppData](https://superuser.com/questions/21458/why-are-there-directories-called-local-locallow-and-roaming-under-users-user#answer-21462)) (Windows)
+* Look for config files in `~/Library/Preferences` (macOS)
+* Add `--list-config-paths` option which list search paths of config files
+* Add `--list-data-paths` option which list search paths for presets and logos
+* Add `Brightness` module support
+* Add `Battery` module support for FreeBSD
+* Add `--disk-show-unknown` option for Disk module
+* Add `--disk-show-subvolumes` option for Disk module
+* Add `--gpu-hide-integrated` option (#379)
+* Add `--gpu-hide-discrete` option (#379)
+* Detect terminal version when available
+* Support `WezTerm` terminal font detection (requires [`wezterm` executable](https://wezfurlong.org/wezterm/cli/general.html) being available)
+* Add `--shell-version` and `--terminal-version` options to disable shell / terminal version detection
+* Enhance `--percent-type` to allow hiding other texts (#387)
+* Add Wifi module support for Linux
+* Detect scaled resolutions (Windows, macOS)
+* Optimise font module printing (Windows)
+* Detect pacman package count inside MSYS2 environment (Windows)
+* Add Wifi / Battery module support for Android
+* Disk name support for Linux
+
+Logos:
+* Raspbian (@IamNoRobot, #373)
+
+Bugfixes:
+* `--logo-type` now does accept `iterm` too (@CarterLi, #374)
+* Fix mintty terminal font detection (Windows)
+* Fix bug that line buffering doesn't work properly (Windows)
+* Fix rpm package count detection (Linux)
+* Fix cpu temp detection (Linux)
+
+Other:
+* Fixed a Typo in iterm error message (@jessebot, #376)
+* Don't try to load config file in `/etc` (Windows)
+
+# 1.8.2
+
+Bugfixes:
+
+* Fix memleaks Users module (Windows)
+* Fix shell detection when installed with scoop (Windows)
+* Don't use libcJSON as wlanapi's dll name (Windows)
+* Align artifact names to other platforms (Windows)
+
+# 1.8.1
+
+Notable Changes:
+
+* `Song` was used as an alias to `Media` module. It's removed to avoid confusion. All song related flags (`--song-key`, etc) should change to media (`--media-key`, etc). (@CarterLi)
+
+Bugfixes:
+
+* Mountpoint paths on linux get decoded correctly (#364)
+* Color parsing once again works (@IanManske, #365)
+* Using a custom key with a placeholder for the local ip module now does work correctly if multiple interfaces are present (#368)
+
+# 1.8.0
+
+This release introduces Windows support! Fastfetch now fully support all major desktop OSes (Linux, macOS, Windows and FreeBSD)
+
+Notable Changes:
+* Bios / Board / Chassis modules are splitted against Host module for performance reasons
+* Caching is removed. Option `--nocache` is removed accordingly
+
+Features:
+* Windows (7 and newer) is officially and fully supported
+* FreeBSD support is improved greatly (Bios, Cpu Temp, Cpu Usage, Disk, Host, Processes, Swap, Terminal / Shell, Uptime)
+* Adds a new flag `--stat`, which prints time usage for individual modules
+* Adds Wifi module which supports Windows and macOS
+* Adds data source option for logo printing
+* Detects Homebrew Cellar and Cask seperately
+* Detects WSL version
+* Detects disk based on mount point
+* Exposes more chafa configs
+* Improves performance for Cpu Usage, Public IP, Weather modules
+* Improves performance for Kitty image protocol when both image width / height specified
+* Improves performance for large file loading
+* Improves performance for macOS WM and Host detection
+* Improves shell and terminal detection on macOS
+* Supports Deepin Terminal terminal font
+* Supports GPU detection on Android
+* Supports Kitty Terminal terminal font
+* Supports bar output for percentage values
+* Supports Bios module on macOS
+* Supports eopkg package manager detection
+* Supports iTerm image logo protocol
+* Supports image logo printing on macOS
+* Supports tcsh version detection
+* Vulkan module on macOS no longer requires vulkan-loader to work
+
+Logos:
+* Alpine
+* CRUX
+* EndeavourOS
+* Enso
+* Garuda small
+* Nobara
+* OpenMandriva
+* Parabola GNU/Linux-libre
+* Rocky
+* Rosa
+* Solus
+* Univalent
+* Vanilla OS
+
+Bugfixes:
+* Fixes disk size detection on 32bit Linux (#337)
+* Fixes cpu freq detection in WSL
+* Fixes internal bug of FFstrbuf
+* Fixes some memory leaks
+* Fixes segfault if 0 is given as argument index
+* Lots of code refactors
+
+# 1.7.5
+
+Fixes a crash on linux that could happen when getting zsh version (#285)
+
+# 1.7.4
+
+The last element in the default structure (currently the color blocks) is now printed again (#283)
+
+# 1.7.3
+
+A lot of small improvements for MacOS & BSD platforms.
+
+Features:
+* BSD is now officially supported (#228)
+* MacPorts package manager support (@SladeGetz, #234)
+* Battery support for MacOS (@CarterLi, #235)
+* Processes, swap & terminal font support for MacOS(@CarterLi, #237)
+* Media support for MacOS (@CarterLi, #242)
+* Player support for MacOS (@CarterLi, #245)
+* WM theme support for MacOS (@CarterLi, #246)
+* CPU usage support for MacOS (@CarterLi, #247)
+* Power Adapter module (@CarterLi, #249)
+* Windows terminal font for WSL (@CarterLi, #254)
+* Temps & Font support for MacOS (@CarterLi, #258)
+* Terminal font support for Termux (@CarterLi, #263)
+* Weather module (@CarterLi, #266)
+
+Logos
+* Crystal linux (@AloneER0, #239)
+* FreeBSD (@draumaz, #244)
+* New Ubuntu (@AloneER0, #259)
+
+Bugfixes:
+* Don't segfault in GPU code on Intel Macs (@CarterLi, #236)
+* Don't use hardcoded size units in presets (@dr460nf1r3, #255)
+* Don't crash with some format strings (#252)
+* --logo none keeps key color now (#264)
+
+# 1.7.2
+
+Fixes the bash completions
+
+# 1.7.1
+
+This release brings a lot of bug fixes and improvements for MacOS. Big thanks to @CarterLi for the help on this!
+
+Features:
+* The color of the title and the keys can now be configured individually, using `--color-keys` and `--color-title` respectively. Some distros have different defaults now, similar to neofetch
+* Swap module, similar to the Memory module, but for swap. Add `Swap` to your structure to enable it (#225)
+
+Logos:
+* Slackware (#227)
+
+Bugfixes:
+* Used disk space is now calculated much more accurately
+* On Linux, GPU names are no longer truncated, if they are longer than 32 characters (#224)
+* On Linux, NVIDIA GPUs once again have a proper name
+
+* On M1 platforms, showing the GPU name no longer crashes the program (#222)
+* Brew package count does now work on M1 platforms too
+* The Vulkan module now does work on MacOS too
+* The OpenGL and OpenCL modules now work on MacOS too (@CarterLi, #226)
+* The LocalIp module now works on MacOS too (@CarterLi, #232)
+* Detecting custom WMs on MacOS does now work
+
+Other:
+* GitHub actions now builds a dmg file for MacOS, as you can see in the release page
+
+# 1.7.0
+
+This release brings support for MacOS!
+The basics things are working, but it is far from feature parity with Linux.
+I developed this in a VM, so bugs on real hardware are likely.
+If you have a Mac and no idea what to do with your free time, i am very happy to accept pull requests / work on issues.
+
+A lot of things were changed under the hood to make this possible, which should bring better performance and stability on all platforms.
+
+Besides that, the following things have changed:
+
+Features:
+* The binary prefix used can now be configured, and is used consistently across all modules. Set `--binary-prefix` to `iec` (default), `si` or `jedec`.
+* AMD GPUs now have a much better name, if the file `/usr/share/libdrm/amdgpu.ids` exists. For example my dedicated GPU, which was displayed as `AMD/ATI Radeon RX 5600 OEM/5600 XT / 5700/5700 XT`, is now `AMD Radeon RX 5600M`.
+
+Logos:
+* MacOS
+* CachyOS small (@sirlucjan, #220)
+* MSYS2 (#219)
+
+Bugfixes:
+* the `--file` option, which can be used to display the contents of a file as the logo, is now working again.
+
+# 1.6.5
+
+Fixes parsing quoted values in config files
+
+# 1.6.4
+
+Releasing this, so fedora can package fastfetch. Thanks to @jonathanspw for doing that!
+
+Features:
+* --set-keyless option (#215)
+* Replace `\n`, `\t`, `\e` and `\\` in user provided strings, just like c would do it (#215)
+* APK (Alpine Package Keeper) support (@mxkrsv, #216)
+
+Logos:
+* Alma Linux (@jonathanspw, #214)
+
+Bugfixes:
+* replace deprecated gethostbyname call with getaddrinfo (#217)
+
+# 1.6.3
+
+Fixes installing presets in their own directory (@ceamac, #212)
+
+# 1.6.2
+
+Releasing this, so void linux can package fastfetch.
+
+Logos:
+* Rosa linux (#206)
+* KISS linux (@draumaz, #207)
+* LangitKetujuh (@hervyqa, #208)
+
+Bugfixes:
+* Using musl as libc does work now (#210)
+* XBPS packages are once again printed (#209)
+* configured target dirs are applied to install directories too
+* empty XDG_* env vars don't cause a crash anymore
+
+# 1.6.1
+
+Fixes build on android (#205)
+
+# 1.6.0
+
+Features:
+* Detect QT on more DEs than just KDE Plasma. The [Plasma] category was therefore renamed to [QT]
+* Alacritty font detection
+* Load `/etc/fastfetch/config.conf` before user config
+* Disk: print one decimal point if size < 100GB
+* `--title-fqdn` option, to print fully qualified domain name instead of host name in title
+
+Logos:
+* updated old NixOS logo
+
+Bugfixes:
+* Correctly detect GTK on DEs that store their settings in dconf
+* Correctly detect NixOS packages
+* Mutter WM detected once again
+* Show full NixOS version in OS output
+* Don't segfault if an invalid structure is given
+* WSL doesn't output GPU anymore, as the name is always meaningless

DEVELOPMENT.md

@@ -11,11 +11,6 @@ Here i just add things that are easy to forget.
   - `libffdetect`: contains all the detection stuff. To be used by anything that needs system information
   - `libffprint`: contains the printing functions, logos, format etc
   - `fastfetch` and `flashfetch`: Executables, that initialize the config of libffprint. Fist one at runtime, second one at compile time
-- [ ] Better OS output for all possible combinations of /etc/os-release variables.
-- [ ] Expose temperatures to CPU format string
-- [ ] Expose temperatures to GPU format string
-- [ ] Fallback GPU detection using GL (multi GPU suport somehow possible?)
-- [ ] Find wayland compositor by looking at \${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}
 - [ ] Make LocalIP module more configurable
 - [ ] Automatic migrate old config files to newer versions
 - [ ] ZSH completions

README.md

@@ -1,105 +1,173 @@
-# fastfetch
+# Fastfetch
 
-fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying them in a pretty way. It is written in c to achieve much better performance, in return only Linux and Android are supported. It also uses mechanisms like multithreading and caching to finish as fast as possible.  
-  
-The output on my personal machine with default configurations looks like this:
-<img src="screenshots/example.png" alt="example output" width="100%"/>  
+[![CI](https://github.com/fastfetch-cli/fastfetch/actions/workflows/ci.yml/badge.svg)](https://github.com/fastfetch-cli/fastfetch/actions/workflows/ci.yml)
+
+Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying them in a pretty way. It is written mainly in C, with performance and customizability in mind. Currently, Linux, Android, FreeBSD, MacOS and Windows 7+ are supported.
+
+<img src="screenshots/example1.png" width="49%" align="left" />
+<img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="49%" height="16px" align="left" />
+<img src="screenshots/example4.png" width="49%" align="left" />
+<img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="49%" height="16px" align="left" />
+<img src="screenshots/example2.png" width="48%" align="top" />
+<img src="screenshots/example3.png" width="48%" align="top" />
+<img src="screenshots/example5.png" height="15%" align="top" />
+
+There are [screenshots on different platforms](https://github.com/fastfetch-cli/fastfetch/wiki)
 
 ## Customization
 
-With customization and speed being two competing goals, this project actually builds two executables.  
-The main one being `fastfetch`, which can be very greatly configured via flags. These flags can be made persistent in `~/.config/fastfetch/config.conf`. To view the available options run `fastfetch --help`.  
-The second executable being built is called `flashfetch`, which is configured at compile time to eliminate any possible overhead. Configuration of it can be very easily done in [`src/flashfetch.c`](src/flashfetch.c).  
-At the moment the performance difference is measurable, but too small to be human recognizable. But the leap will get bigger with more and more options coming, and on slow machines this might actually make a difference.  
-  
-There are some presets defined for fastfech in [`presets`](presets), you can can load them with `--load-config`. They may also serve as a good example for format arguments.
+With customization and speed being two competing goals, this project actually builds two executables:
+
+* The main one is `fastfetch`, which can be very greatly configured via flags. These flags can be made persistent by modifying `$XDG_CONFIG_HOME/fastfetch/config.conf`. Use `fastfetch --gen-config conf` to generate one. To view the available options, run `fastfetch --help`.
+* The second executable is called `flashfetch`, which is configured at compile time to eliminate any possible overhead. Configuration of it can be very easily done in [`src/flashfetch.c`](src/flashfetch.c).
+
+Currently, the performance difference is measurable, but too small to be recognizable by humans. But with more options planned, the leap will get bigger over time and on slow machines this might actually make a difference.
+
+There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `--load-config <filename>`. They may also serve as a good example for format arguments.
+
+Logos can be heavily customized too; see the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for more information.
+
+### Customization with new JSONC format
+
+A new, structure based, and user-friendly config file format was introduced in v2.0.0. This format is based on [JSONC](https://jsonc.org/). [See more details in Wiki](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration)
 
 ## Dependencies
 
-Fastfetch dynamically loads needed libraries if they are available. Therefore its only hard dependencies are `libc` (any implementation of the c standard library), `libdl` and `libpthread`. They are all shipped with [`glibc`](https://www.gnu.org/software/libc/), which is already installed on most linux distributions, so you probably don't have to worry about it.  
+Fastfetch dynamically loads needed libraries if they are available. On Linux, its only hard dependencies are `libc` (any implementation of the c standard library), `libdl`, `libm` and [`libpthread`](https://man7.org/linux/man-pages/man7/pthreads.7.html) (if built with multithreading support). They are all shipped with [`glibc`](https://www.gnu.org/software/libc/), which is already installed on most Linux distributions.
 
 The following libraries are used if present at runtime:
-*  [`libpci`](https://github.com/pciutils/pciutils): GPU output.
-*  [`libvulkan`](https://www.vulkan.org/): Fallback for GPU output.
-*  [`libxcb-randr`](https://xcb.freedesktop.org/),
-   [`libXrandr`](https://gitlab.freedesktop.org/xorg/lib/libxrandr),
-   [`libxcb`](https://xcb.freedesktop.org/),
-   [`libX11`](https://gitlab.freedesktop.org/xorg/lib/libx11): At least one of them sould be present in X11 sessions for better resolution detection and faster WM detection. The `*randr` ones provide multi monitor support. The `libxcb*` ones usually have better performance.
-*  [`libwayland-client`](https://wayland.freedesktop.org/): Better resolution performance and output in wayland sessions. Supports different refresh rates per monitor.
-*  [`libGIO`](https://developer.gnome.org/gio/unstable/): Needed for values that are only stored GSettings.
-*  [`libDConf`](https://developer.gnome.org/dconf/unstable/): Needed for values that are only stored in DConf + Fallback for GSettings.
-*  [`libmagickcore` (ImageMagick)](https://www.imagemagick.org/): Images in terminal using sixel or kitty graphics protocol.
-*  [`libchafa`](https://github.com/hpjansson/chafa): Image output as ascii art.
-*  [`libZ`](https://www.zlib.net/): Faster image output when using kitty graphics protocol.
-*  [`libDBus`](https://www.freedesktop.org/wiki/Software/dbus): Needed for detecting current media player and song.
-*  [`libXFConf`](https://gitlab.xfce.org/xfce/xfconf): Needed for XFWM theme and XFCE Terminal font.
-*  [`libsqlite3`](https://www.sqlite.org/index.html): Needed for rpm package count.
-*  [`librpm`](http://rpm.org/): Slower fallback for rpm package count. Needed on openSUSE.
+
+### Linux and FreeBSD
+
+* [`libpci`](https://github.com/pciutils/pciutils): GPU output.
+* [`libvulkan`](https://www.vulkan.org/): Vulkan module & fallback for GPU output.
+* [`libxcb-randr`](https://xcb.freedesktop.org/),
+    [`libXrandr`](https://gitlab.freedesktop.org/xorg/lib/libxrandr),
+    [`libxcb`](https://xcb.freedesktop.org/),
+    [`libX11`](https://gitlab.freedesktop.org/xorg/lib/libx11): At least one of them sould be present in X11 sessions for better display detection and faster WM detection. The `*randr` ones provide multi monitor support The `libxcb*` ones usually have better performance.
+* [`libwayland-client`](https://wayland.freedesktop.org/): Better display performance and output in wayland sessions. Supports different refresh rates per monitor.
+* [`libGIO`](https://developer.gnome.org/gio/unstable/): Needed for values that are only stored GSettings.
+* [`libDConf`](https://developer.gnome.org/dconf/unstable/): Needed for values that are only stored in DConf + Fallback for GSettings.
+* [`libmagickcore` (ImageMagick)](https://www.imagemagick.org/): Images in terminal using sixel or kitty graphics protocol.
+* [`libchafa`](https://github.com/hpjansson/chafa): Image output as ascii art.
+* [`libZ`](https://www.zlib.net/): Faster image output when using kitty graphics protocol.
+* [`libDBus`](https://www.freedesktop.org/wiki/Software/dbus): Bluetooth, Player & Media detection.
+* [`libEGL`](https://www.khronos.org/registry/EGL/),
+    [`libGLX`](https://dri.freedesktop.org/wiki/GLX/),
+    [`libOSMesa`](https://docs.mesa3d.org/osmesa.html): At least one of them is needed by the OpenGL module for gl context creation.
+* [`libOpenCL`](https://www.khronos.org/opencl/): OpenCL module
+* [`libXFConf`](https://gitlab.xfce.org/xfce/xfconf): Needed for XFWM theme and XFCE Terminal font.
+* [`libsqlite3`](https://www.sqlite.org/index.html): Needed for pkg & rpm package count.
+* [`librpm`](http://rpm.org/): Slower fallback for rpm package count. Needed on openSUSE.
+* [`libnm`](https://networkmanager.dev/docs/libnm/latest/): Used for Wifi detection.
+* [`libpulse`](https://freedesktop.org/software/pulseaudio/doxygen/): Used for Sound detection.
+* [`libddcutil`](https://github.com/rockowitz/ddcutil): Used for brightness detection of external displays
+
+### macOS
+
+* [`MediaRemote`](https://iphonedev.wiki/index.php/MediaRemote.framework): Need for Media detection. It's a private framework provided by newer macOS system.
+* [`DisplayServices`](https://developer.apple.com/forums/thread/666383#663154022): Need for screen brightness detection. It's a private framework provided by newer macOS system.
+* [`MoltenVK`](https://github.com/KhronosGroup/MoltenVK): Vulkan driver for macOS. [`molten-vk`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/molten-vk.rb)
+* [`libmagickcore` (ImageMagick)](https://www.imagemagick.org/): Images in terminal using sixel graphics protocol. [`imagemagick`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/imagemagick.rb)
+* [`libchafa`](https://github.com/hpjansson/chafa): Image output as ascii art. [`chafa`](https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/chafa.rb)
+* [`libsqlite3`](https://www.sqlite.org/index.html): Used for fast wallpaper detection ( fallback to AppleScript )
+
+For the image logo, iTerm with iterm image protocol should work. Apple Terminal is not supported.
+
+### Windows
+
+* [`wlanapi`](https://learn.microsoft.com/en-us/windows/win32/api/wlanapi/): A system dll which isn't supported by Windows Server by default. Used for Wifi info detection.
+* [`libvulkan`](https://www.vulkan.org/): Vulkan module. Usually has been provided by GPU drivers. [`vulkan-loader`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-loader) [`vulkan-headers`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-headers)
+* [`libOpenCL`](https://www.khronos.org/opencl/): OpenCL module. [`opencl-icd`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-opencl-icd)
+
+Note: In Windows 7, 8 and 8.1, [ConEmu](https://conemu.github.io/en/AnsiEscapeCodes.html) is required to run fastfetch due to [the lack of ASCII escape code native support](https://en.wikipedia.org/wiki/ANSI_escape_code#DOS,_OS/2,_and_Windows). In addition, as fastfetch for Windows targets [UCRT](https://learn.microsoft.com/en-us/cpp/windows/universal-crt-deployment) C runtime library, [it must be installed manually](https://support.microsoft.com/en-us/topic/update-for-universal-c-runtime-in-windows-c0514201-7fe6-95a3-b0a5-287930f3560c) as UCRT is only pre-installed in Windows 10 and later.
+
+For the image logo, only chafa is supported due to [a design flaw of ConPTY](https://github.com/microsoft/terminal/issues/1173). In addition, chafa support is not included by default due to the massive dependencies of imagemagick. You must built it yourself.
+
+### Android
+
+* [`freetype`](https://www.freetype.org/): Used for Termux font detection. [`freetype`](https://github.com/termux/termux-packages/tree/master/packages/freetype)
+* [`libvulkan`](https://www.vulkan.org/): Vulkan module, also used for GPU detection. Usually has been provided by Android system. [`vulkan-loader-android`](https://github.com/termux/termux-packages/tree/master/packages/vulkan-loader-android) [`vulkan-headers`](https://github.com/termux/termux-packages/tree/master/packages/vulkan-headers)
+* [`termux-api`](https://github.com/termux/termux-api-package): Used for Wifi / Battery detection. Read [the official doc](https://wiki.termux.com/wiki/Termux:API) for detail or if you hang on these modules (IMPORTANT). [`termux-api`](https://github.com/termux/termux-packages/tree/master/packages/termux-api)
+* [`libandroid-wordexp-static`](https://github.com/termux/termux-packages/tree/master/packages/libandroid-wordexp): `wordexp.h` support for Android.
 
 ## Support status
 All categories not listed here should work without needing a specific implementation.
 
 ##### Available Modules
 ```
-Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resolution, DE, WM, WMTheme, Theme, Icons, Font, Cursor, Terminal, Terminal Font, CPU, CPUUsage, GPU, Memory, Disk, Battery, Player, Song, LocalIP, PublicIP, DateTime, Date, Time, Locale, Colors, Break, Custom
+Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsage, Cursor, Custom, Date, DateTime, DE, Disk, Display, Font, Gamepad, GPU, Host, Icons, Kernel, LM, Locale, LocalIP, Media, Memory, Monitor, OpenCL, OpenGL, OS, Packages, Player, Power Adapter, Processes, PublicIP, Separator, Shell, Sound, Swap, Terminal, Terminal Font, Terminal Size, Theme, Time, Title, Uptime, Version, Vulkan, Wallpaper, Weather, Wifi, WM, WMTheme
 ```
 
-##### Logos
+##### Builtin logos
+
+<!-- `Content of src/logo/builtin.c`.split('\n').map(x => x.trim()).filter(x => x.startsWith('// ')).map(x => x.slice(3)).sort((a,b)=>a.toUpperCase().localeCompare(b.toUpperCase())).join(', ') -->
 ```
-Android, Arch, Arco, Artix, CachyOS, CentOS, Debian, Devuan, Deepin, Endeavour, Fedora, Garuda, Gentoo, KDE Neon, Kubuntu, Linux, Manjaro, Mint, NixOS, OpenSUSE, OpenSUSE Tumbleweed, OpenSUSE LEAP, Pop!_OS, RebornOS, RedstarOS, Rocky, Ubuntu, Void, Zorin
+AerOS, AIX, AlmaLinux, Alpine, Alpine2Small, AlpineSmall, Alter, Amazon, AmogOS, Anarchy, Android, AndroidSmall, Antergos, Antix, AoscOS, AoscOsRetro, AoscOsRetro_small, Aperture, Apple, AppleSmall, Apricity, Arch, Arch2, ArchBox, Archcraft, Archcraft2, Archlabs, ArchSmall, ArchStrike, ArcoLinux, ArcoLinuxSmall, ArseLinux, Artix, Artix2Small, ArtixSmall, Arya, Asahi, Aster, AsteroidOS, AstOS, Astra, Ataraxia, Athena, Bedrock, BigLinux, Bitrig, BlackArch, BlackPanther, BLAG, BlankOn, BlueLight, Bodhi, Bonsai, BSD, BunsenLabs, CachyOS, CachyOSSmall, Calculate, CalinixOS, CalinixOSSmall, Carbs, CBL-Mariner, CelOS, Center, CentOS, CentOSSmall, Chakra, ChaletOS, Chapeau, ChonkySealOS, Chrom, Cleanjaro, CleanjaroSmall, ClearLinux, ClearOS, Clover, Cobalt, Condres, ContainerLinux, CRUX, CRUXSmall, CrystalLinux, Cucumber, CutefishOS, CuteOS, CyberOS, Dahlia, DarkOS, Debian, DebianSmall, Deepin, DesaOS, Devuan, DevuanSmall, DietPi, DracOS, DragonFly, DragonFlyOld, DragonFlySmall, Drauger, Droidian, Elementary, ElementarySmall, Elive, EncryptOS, Endeavour, Endless, Enso, EuroLinux, EvolutionOS, Exherbo, ExodiaPredator, Fedora, FedoraOld, FedoraSmall, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeBSDSmall, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, GarudaDragon, GarudaSmall, Gentoo, GentooSmall, GhostBSD, Glaucus, GNewSense, Gnome, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, GuixSmall, Haiku, HaikuSmall, HamoniKR, HarDClanZ, HardenedBSD, Hash, Huayra, Hybrid, HydroOS, Hyperbola, HyperbolaSmall, Iglunix, InstantOS, IRIX, Itc, Januslinux, Kaisen, Kali, KaliSmall, KaOS, KDENeon, Kibojoe, KISSLinux, Kogaion, Korora, KrassOS, KSLinux, Kubuntu, LangitKetujuh, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, LAST, Laxeros, LEDE, LibreELEC, Linspire, Linux, LinuxLight, LinuxLightSmall, LinuxMint, LinuxMintOld, LinuxMintSmall, LinuxSmall, Live_Raizo, LMDE, Lunar, MacOS, MacOS2, MacOS2Small, MacOSSmall, Mageia, MageiaSmall, MagpieOS, Mandriva, Manjaro, ManjaroSmall, MassOS, MatuusOS, MaUI, Meowix, Mer, Minix, Mint, MintOld, MintSmall, MiracleLinux, MOS, Msys2, MX, MXSmall, Namib, Nekos, Neptune, NetBSD, NetRunner, Nitrux, NixOS, NixOS_small, NixOsOld, NixOsSmall, Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, OpenBSD, OpenBSDSmall, OpenEuler, OpenIndiana, OpenKylin, OpenMamba, OpenMandriva, OpenStage, OpenSuse, OpenSuseLeap, OpenSuseSmall, OpenSuseTumbleweed, OpenWrt, OPNsense, Oracle, Orchid, OrchidSmall, OS_Elbrus, OSMC, OSX, OSXSmall, PacBSD, Panwah, Parabola, ParabolaSmall, Parch, Pardus, Parrot, Parsix, PCBSD, PCLinuxOS, PearOS, Pengwin, Pentoo, Peppermint, PhyOS, Pisi, PNMLinux, Pop, PopSmall, Porteus, PostMarketOS, PostMarketOSSmall, Proxmox, PuffOS, Puppy, PureOS, PureOSSmall, Q4OS, Qubes, Qubyt, Quibian, Radix, Raspbian, RaspbianSmall, RavynOS, Reborn, RebornSmall, RedCore, RedHatEnterpriseLinux, RedHatEnterpriseLinux_old, RedstarOS, Refracted Devuan, Regata, Regolith, RhaymOS, RockyLinux, RockyLinuxSmall, RosaLinux, Sabayon, Sabotage, Sailfish, SalentOS, SalientOS, Salix, SambaBOX, Sasanqua, Scientific, Semc, Septor, Serene, SharkLinux, ShastraOS, Siduction, SkiffOS, Slackel, Slackware, SlackwareSmall, Slitaz, SmartOS, Soda, Solaris, SolarisSmall, Solus, SourceMage, Sparky, Star, SteamOS, StockLinux, Sulin, Suse, SuseSmall, Swagarch, T2, Tails, TeArch, TorizonCore, Trisquel, Twister, Ubuntu, Ubuntu2Old, Ubuntu2Small, UbuntuBudgie, UbuntuCinnamon, UbuntuGnome, UbuntuKde, UbuntuKylin, UbuntuMate, UbuntuOld, UbuntuSmall, UbuntuStudio, UbuntuSway, UbuntuTouch, UbuntuUnity, Ultramarine, Univalent, Univention, UOS, UrukOS, Uwuntu, Vanilla, Venom, Vnux, Void, VoidSmall, Vzlinux, WiiLinuxNgx, Windows, Windows11, Windows11Small, Windows8, Windows95, Xferience, YiffOS, Zorin
 ```
-* Most of the logos have a small variant. Access it by appending _small to the logo name.
-* Some logos have an old variant. Access it by appending _old to the logo name.
-* Unknown/unsupported logos will be replaced with a generic linux logo when running fastfetch.
-* Get a list of all available logos with `fastfetch --print-logos`.
-* Printing images as logo is supported using Sixel or Kitty graphics protocol.
+
+Run `fastfetch --print-logos` to print them
 
 ##### Package managers
 ```
-Pacman, dpkg, rpm, emerge, xbps, nix, Flatpak, Snap
+apk, brew, Chocolatey, dpkg, emerge, eopkg, Flatpak, MacPorts, nix, Pacman, paludis, pkg, pkgtool, rpm, scoop, Snap, xbps
 ```
 
 ##### WM themes
 ```
-KWin, Mutter, Muffin, Marco, XFWM, Openbox (LXDE, LXQT & without DE)
+DWM (Windows), KWin, Marco, Muffin, Mutter, Openbox (LXDE, LXQT & without DE), Quartz Compositor (macOS), XFWM
 ```
 
 ##### DE versions
 ```
-KDE Plasma, Gnome, Cinnamon, Mate, XFCE4, LXQt
+Budgie, Cinnamon, Gnome, KDE Plasma, LXQt, Mate, XFCE4
 ```
 
 ##### Terminal fonts
 ```
-konsole, gnome-terminal-server, tilix, xfce4-terminal, lxterminal, TTY
+Alacritty, Apple Terminal, ConEmu, Deepin Terminal, foot, Gnome Terminal, iTerm2, Kitty, Konsole, LXTerminal, MATE Terminal, mintty, QTerminal, Tabby, Terminator, Termux, Tilix, TTY, Warp, WezTerm, Windows Terminal, XFCE4 Terminal, Yakuake
 ```
 
 ## Building
 
-fastfetch uses [`cmake`](https://cmake.org/) and [`pkg-config`](https://www.freedesktop.org/wiki/Software/pkg-config/) for building. The simplest steps to build the fastfetch and flashfetch binaries are:  
+fastfetch uses [`cmake`](https://cmake.org/) for building. [`pkg-config`](https://www.freedesktop.org/wiki/Software/pkg-config/) is recommended for better library detection. The simplest steps to build the fastfetch and flashfetch binaries are:
 ```bash
 mkdir -p build
 cd build
 cmake ..
-cmake --build . -j$(nproc) --target fastfetch --target flashfetch
+cmake --build . --target fastfetch --target flashfetch
 ```
 
-If pkg-config fails to find the headers for a library listed in [dependencies](#dependencies), fastfetch will simply build without support for that specific feature. This means, it won't look for it at runtime and just act like it isn't available.
+If the build process fails to find the headers for a library listed in [dependencies](#dependencies), fastfetch will simply build without support for that specific feature. This means, it won't look for it at runtime and just act like it isn't available.
+
+### Building on Windows
+
+Currently GCC or clang is required (MSVC is not supported). MSYS2 with CLANG64 subsystem (or CLANGARM64 if needed) is suggested (and tested) to build fastfetch. If you need Windows 7 / 8.x support, using MINGW64 is suggested.
+
+1. Install [MSYS2](https://www.msys2.org/#installation)
+1. Open `MSYS2 / CLANG64` (not `MSYS2 / MSYS`, which targets cygwin C runtime)
+1. Install dependencies
+```bash
+pacman -Syu mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-pkgconf mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-opencl-icd
+```
+
+Follow the building instructions of Linux next.
 
 ## Packaging
 
-* [AUR](https://aur.archlinux.org/packages/fastfetch-git/): Packaged by me. Will install the fastfetch binary, bash completion and the presets. Git version
-* [Manjaro Repositories](https://gitlab.manjaro.org/packages/community/fastfetch): Packaged by a manjaro maintainer. Usually a bit outdated.
-* [Gentoo (Guru)](https://github.com/gentoo/guru/tree/master/app-misc/fastfetch): Packed by some other guy. May be out of date some times.
-* DEB / RPM: Run `cmake -B build && cmake --build build --target package` to build the packages in build.
-* Manually:
-    * Build: Follow the [build instructions](#building).
-    * Install: `sudo cmake --install build --prefix /usr/local`
+### Repositories
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/fastfetch.svg?header=)](https://repology.org/project/fastfetch/versions)
+
+### Manual
+
+* DEB / RPM package: `cmake --build . --target package`
+* Install directly: `cmake --install . --prefix /usr/local`
 
 ## FAQ
 
 Q: Why do you need a very performant version of neofetch?
-> I like putting neofetch in my ~/.bashrc to have a system overwiew whenever i use the terminal, but the slow speed annoyed me, so i created this. Also neofetch didn't output everything correctly (e.g Font is displayed as "[Plasma], Noto Sans, 10 [GTK2/3]") and writing my own tool gave me the possibility to fine tune it to run perfectly on at least my configuration.
+> I like putting neofetch in my ~/.bashrc to have a system overwiew whenever I use the terminal, but the slow speed annoyed me, so I created this. Also neofetch didn't output everything correctly (e.g Font is displayed as "[Plasma], Noto Sans, 10 [GTK2/3]") and writing my own tool gave me the possibility to fine tune it to run perfectly on at least my configuration.
 
-Q: It does not display [*] correctly for me, what can i do?
-> This is most likely because your system is not implemented (yet). At the moment i am focusing more on making the core app better, than adding more configurations. Feel free to open a pull request if you want to add support for your configuration
+Q: It does not display [*] correctly for me, what can I do?
+> This is most likely because your system is not implemented (yet). At the moment I am focusing more on making the core app better, than adding more configurations. Feel free to open a pull request if you want to add support for your configuration

completions/bash

@@ -9,28 +9,40 @@ __fastfetch_complete_help()
         "os-format"
         "host-format"
         "kernel-format"
+        "uptime-format"
+        "processes-format"
         "packages-format"
         "shell-format"
-        "resolution-format"
+        "display-format"
         "de-format"
         "wm-format"
+        "wmtheme-format"
         "theme-format"
         "icons-format"
         "font-format"
+        "cursor-format"
         "terminal-format"
-        "terminal-font-format"
+        "terminalfont-format"
         "cpu-format"
         "cpu-usage-format"
         "gpu-format"
         "memory-format"
+        "swap-format"
         "disk-format"
         "battery-format"
+        "poweradapter-format"
         "locale-format"
-        "local-ip-format"
-        "public-ip-format"
+        "localip-format"
+        "publicip-format"
+        "player-format"
+        "media-format"
         "datetime-format"
         "date-format"
         "time-format"
+        "vulkan-format"
+        "opengl-format"
+        "opencl-format"
+        "bluetooth-format"
     )
     COMPREPLY=($(compgen -W "${__ff_helps[*]}" -- "$CURRENT_WORD"))
 }
@@ -57,6 +69,41 @@ __fastfetch_complete_logo()
     COMPREPLY=($(compgen -W "$(fastfetch --list-logos-autocompletion)" -- "$CURRENT_WORD"))
 }
 
+__fastfetch_complete_logo_type()
+{
+    local __ff_logo_types=(
+        "auto"
+        "builtin"
+        "file"
+        "raw"
+        "sixel"
+        "kitty"
+        "chafa"
+    )
+    COMPREPLY=($(compgen -W "${__ff_logo_types[*]}" -- "$CURRENT_WORD"))
+}
+
+__fastfetch_complete_binary_prefix()
+{
+    local __ff_binary_prefixes=(
+        "iec"
+        "si"
+        "jedec"
+    )
+    COMPREPLY=($(compgen -W "${__ff_binary_prefixes[*]}" -- "$CURRENT_WORD"))
+}
+
+__fastfetch_complete_gl()
+{
+    local __ff_gl_types=(
+        "auto"
+        "egl"
+        "glx"
+        "osmesa"
+    )
+    COMPREPLY=($(compgen -W "${__ff_gl_types[*]}" -- "$CURRENT_WORD"))
+}
+
 __fastfetch_complete_option()
 {
     local FF_OPTIONS_ALL=(
@@ -64,6 +111,9 @@ __fastfetch_complete_option()
         "${FF_OPTIONS_STRING[@]}"
         "${FF_OPTIONS_PATH[@]}"
         "${FF_OPTIONS_LOGO[@]}"
+        "${FF_OPTIONS_LOGO_TYPE[@]}"
+        "${FF_OPTIONS_BINARY_PREFIX[@]}"
+        "${FF_OPTIONS_OPENGL[@]}"
     )
 
     if [[ $WORD_COUND -lt 3 ]]; then
@@ -108,8 +158,11 @@ __fastfetch_completion()
         "--list-presets"
         "--list-features"
         "--print-logos"
-        "--print-config"
+        "--print-config-system"
+        "--print-config-user"
         "--print-structure"
+        "--gen-config"
+        "--gen-config-force"
     )
 
     local FF_OPTIONS_HELP=(
@@ -119,17 +172,36 @@ __fastfetch_completion()
 
     local FF_OPTIONS_BOOL=(
         "-r"
-        "--recache"
-        "--nocache"
         "--show-errors"
         "--logo-print-remaining"
         "--multithreading"
+        "--stat"
         "--allow-slow-operations"
         "--disable-linewrap"
         "--hide-cursor"
+        "--cpu-temp"
+        "--gpu-temp"
+        "--battery-temp"
+        "--display-detect-name"
+        "--display-precise-refresh-rate"
         "--localip-show-ipv4"
         "--localip-show-ipv6"
         "--localip-show-loop"
+        "--localip-name-prefix"
+        "--localip-compact-type"
+        "--escape-bedrock"
+        "--pipe"
+        "--title-fqdn"
+        "--escape-bedrock"
+        "--disk-folders"
+        "--disk-show-external"
+        "--disk-show-hidden"
+        "--disk-show-subvolumes"
+        "--gpu-hide-integrated"
+        "--gpu-hide-discrete"
+        "--gpu-force-vulkan"
+        "--disk-show-unknown"
+        "--bluetooth-show-disconnected"
     )
 
     local FF_OPTIONS_STRING=(
@@ -137,6 +209,7 @@ __fastfetch_completion()
         "--logo-padding"
         "--logo-padding-left"
         "--logo-padding-right"
+        "--logo-padding-top"
         "--logo-color-1"
         "--logo-color-2"
         "--logo-color-3"
@@ -145,99 +218,174 @@ __fastfetch_completion()
         "--logo-color-6"
         "--logo-color-7"
         "--logo-color-8"
+        "--logo-width"
+        "--logo-height"
         "--logo-color-9"
         "-c"
         "--color"
+        "--color-keys"
+        "--color-title"
+        "--display-compact-type"
         "--separator"
         "-s"
         "--structure"
         "--set"
-        "--os-format"
+        "--set-keyless"
+        "--player-name"
+        "--percent-type"
+        "--publicip-url"
+        "--publicip-timeout"
+        "--weather-output-format"
+        "--weather-timeout"
         "--os-key"
-        "--host-format"
+        "--os-format"
+        "--os-key-color"
         "--host-key"
-        "--kernel-format"
+        "--host-format"
+        "--host-key-color"
         "--kernel-key"
-        "--uptime-format"
+        "--kernel-format"
+        "--kernel-key-color"
         "--uptime-key"
-        "--processes-format"
+        "--uptime-format"
+        "--uptime-key-color"
         "--processes-key"
-        "--packages-format"
+        "--processes-format"
+        "--processes-key-color"
         "--packages-key"
-        "--shell-format"
+        "--packages-format"
+        "--packages-key-color"
         "--shell-key"
-        "--resolution-format"
-        "--resolution-key"
-        "--de-format"
+        "--shell-format"
+        "--shell-key-color"
+        "--display-key"
+        "--display-format"
+        "--display-key-color"
         "--de-key"
-        "--wm-format"
+        "--de-format"
+        "--de-key-color"
         "--wm-key"
-        "--wm-theme-format"
-        "--wm-theme-key"
-        "--theme-format"
+        "--wm-format"
+        "--wm-key-color"
+        "--wmtheme-key"
+        "--wmtheme-format"
+        "--wmtheme-key-color"
         "--theme-key"
-        "--icons-format"
+        "--theme-format"
+        "--theme-key-color"
         "--icons-key"
-        "--font-format"
+        "--icons-format"
+        "--icons-key-color"
         "--font-key"
-        "--cursor-format"
+        "--font-format"
+        "--font-key-color"
         "--cursor-key"
-        "--terminal-format"
+        "--cursor-format"
+        "--cursor-key-color"
         "--terminal-key"
-        "--terminal-font-format"
-        "--terminal-font-key"
-        "--cpu-format"
+        "--terminal-format"
+        "--terminal-key-color"
+        "--terminalfont-key"
+        "--terminalfont-format"
+        "--terminalfont-key-color"
         "--cpu-key"
-        "--cpu-usage-format"
-        "--cpu-usage-key"
-        "--gpu-format"
+        "--cpu-format"
+        "--cpu-key-color"
+        "--cpu-useage-key"
+        "--cpu-useage-format"
+        "--cpu-useage-key-color"
         "--gpu-key"
-        "--memory-format"
+        "--gpu-format"
+        "--gpu-key-color"
         "--memory-key"
+        "--memory-format"
+        "--memory-key-color"
+        "--swap-key"
+        "--swap-format"
+        "--swap-key-color"
+        "--disk-key"
         "--disk-format"
-        "--disk-key"
-        "--battery-format"
+        "--disk-key-color"
         "--battery-key"
-        "--locale-format"
+        "--battery-format"
+        "--battery-key-color"
+        "--poweradapter-key"
+        "--poweradapter-format"
+        "--poweradapter-key-color"
         "--locale-key"
-        "--disk-folders"
-        "--disk-key"
-        "--local-ip-format"
-        "--local-ip-key"
-        "--public-ip-format"
-        "--public-ip-key"
-        "--player-format"
+        "--locale-format"
+        "--locale-key-color"
+        "--localip-key"
+        "--localip-format"
+        "--localip-key-color"
+        "--publicip-key"
+        "--publicip-format"
+        "--publicip-key-color"
+        "--wifi-key"
+        "--wifi-format"
+        "--wifi-key-color"
+        "--weather-key"
+        "--weather-format"
+        "--weather-key-color"
         "--player-key"
-        "--song-format"
-        "--song-key"
+        "--player-format"
+        "--player-key-color"
+        "--media-key"
+        "--media-format"
+        "--media-key-color"
         "--datetime-key"
         "--datetime-format"
-        "--date-format"
+        "--datetime-key-color"
         "--date-key"
-        "--time-format"
+        "--date-format"
+        "--date-key-color"
         "--time-key"
+        "--time-format"
+        "--time-key-color"
+        "--vulkan-key"
+        "--vulkan-format"
+        "--vulkan-key-color"
+        "--opengl-key"
+        "--opengl-format"
+        "--opengl-key-color"
+        "--opencl-key"
+        "--opencl-format"
+        "--opencl-key-color"
+        "--users-key"
+        "--users-format"
+        "--users-key-color"
+        "--bluetooth-key"
+        "--bluetooth-format"
+        "--bluetooth-key-color"
     )
 
     local FF_OPTIONS_PATH=(
+        "--load-config"
         "--os-file"
-        "--lib-PCI"
+        "--lib-pci"
         "--lib-vulkan"
         "--lib-wayland"
         "--lib-xcb-randr"
         "--lib-xcb"
-        "--lib-Xrandr"
+        "--lib-xrandr"
         "--lib-X11"
         "--lib-gio"
-        "--lib-DConf"
-        "--lib-DBus"
-        "--lib-XFConf"
+        "--lib-dconf"
+        "--lib-dbus"
+        "--lib-xfconf"
         "--lib-sqlite3"
         "--lib-rpm"
         "--lib-imagemagick"
         "--lib-z"
         "--lib-chafa"
+        "--lib-egl"
+        "--lib-glx"
+        "--lib-osmesa"
+        "--lib-opencl"
+        "--lib-pulse"
+        "--lib-ddcutil"
+        "--lib-nm"
         "--battery-dir"
-        "--load-config"
     )
 
     local FF_OPTIONS_LOGO=(
@@ -245,6 +393,18 @@ __fastfetch_completion()
         "--logo"
     )
 
+    local FF_OPTIONS_LOGO_TYPE=(
+        "--logo-type"
+    )
+
+    local FF_OPTIONS_BINARY_PREFIX=(
+        "--binary-prefix"
+    )
+
+    local FF_OPTIONS_OPENGL=(
+        "--opengl-type"
+    )
+
     if __fastfetch_previous_matches "${FF_OPTIONS_SINGLE[@]}"; then
         return
     elif [[ $WORD_COUND -gt 3 && ( ${COMP_WORDS[$COMP_CWORD - 2]} == "--help" || ${COMP_WORDS[$COMP_CWORD - 2]} == "-h" ) ]]; then
@@ -261,6 +421,12 @@ __fastfetch_completion()
         __fastfetch_complete_path
     elif __fastfetch_previous_matches "${FF_OPTIONS_LOGO[@]}"; then
         __fastfetch_complete_logo
+    elif __fastfetch_previous_matches "${FF_OPTIONS_LOGO_TYPE[@]}"; then
+        __fastfetch_complete_logo_type
+    elif __fastfetch_previous_matches "${FF_OPTIONS_BINARY_PREFIX[@]}"; then
+        __fastfetch_complete_binary_prefix
+    elif __fastfetch_previous_matches "${FF_OPTIONS_OPENGL[@]}"; then
+        __fastfetch_complete_gl
     else
         __fastfetch_complete_option
     fi

presets/all

@@ -1 +1 @@
---structure Title:Separator:OS:Host:Kernel:Uptime:Processes:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Disk:Battery:Player:Song:PublicIP:LocalIP:DateTime:Locale:Break:Colors
+--structure Title:Separator:OS:Host:Bios:Board:Chassis:Kernel:Uptime:Processes:Packages:Shell:Display:Brightness:Monitor:LM:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Wallpaper:Terminal:TerminalFont:TerminalSize:CPU:CPUUsage:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Media:PublicIP:LocalIP:Wifi:DateTime:Locale:Vulkan:OpenGL:OpenCL:Users:Bluetooth:Sound:Gamepad:Weather:Version:Break:Colors

presets/all.jsonc

@@ -0,0 +1,58 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "modules": [
+        "title",
+        "separator",
+        "os",
+        "host",
+        "bios",
+        "board",
+        "chassis",
+        "kernel",
+        "uptime",
+        "processes",
+        "packages",
+        "shell",
+        "display",
+        "brightness",
+        "monitor",
+        "lm",
+        "de",
+        "wm",
+        "wmtheme",
+        "theme",
+        "icons",
+        "font",
+        "cursor",
+        "wallpaper",
+        "terminal",
+        "terminalfont",
+        "terminalsize",
+        "cpu",
+        "cpuusage",
+        "gpu",
+        "memory",
+        "swap",
+        "disk",
+        "battery",
+        "poweradapter",
+        "player",
+        "media",
+        "publicip",
+        "localip",
+        "wifi",
+        "datetime",
+        "locale",
+        "vulkan",
+        "opengl",
+        "opencl",
+        "users",
+        "bluetooth",
+        "sound",
+        "gamepad",
+        "weather",
+        "version",
+        "break",
+        "colors"
+    ]
+}

presets/btw.jsonc

@@ -0,0 +1,42 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "builtin",
+        "source": "arch"
+    },
+    "modules": [
+        "title",
+        "separator",
+        {
+            "type": "os",
+            "format": "Arch Linux ({12})"
+        },
+        "host",
+        "kernel",
+        "uptime",
+        {
+            "type": "packages",
+            "format": "{} (pacman)"
+        },
+        "shell",
+        "display",
+        "de",
+        "wm",
+        "wmtheme",
+        "theme",
+        "icons",
+        "font",
+        "cursor",
+        "terminal",
+        "terminalfont",
+        "cpu",
+        "gpu",
+        "memory",
+        "disk",
+        "battery",
+        "poweradapter",
+        "locale",
+        "break",
+        "colors"
+    ]
+}

presets/devinfo

@@ -1,4 +1,3 @@
 --disable-linewrap false
 --multithreading false
---show-errors true
---recache
+--show-errors

presets/devinfo-verbose

@@ -1,2 +1,3 @@
---load-config verbose
 --load-config devinfo
+--load-config all
+--load-config verbose

presets/devinfo.jsonc

@@ -0,0 +1,49 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "builtin",
+        "source": "arch"
+    },
+    "display": {
+        "disableLinewrap": false,
+        "showErrors": true
+    },
+    "general": {
+        "multithreading": false
+    },
+    "modules": [
+        "title",
+        "separator",
+        {
+            "type": "os",
+            "format": "Arch Linux ({12})"
+        },
+        "host",
+        "kernel",
+        "uptime",
+        {
+            "type": "packages",
+            "format": "{} (pacman)"
+        },
+        "shell",
+        "display",
+        "de",
+        "wm",
+        "wmtheme",
+        "theme",
+        "icons",
+        "font",
+        "cursor",
+        "terminal",
+        "terminalfont",
+        "cpu",
+        "gpu",
+        "memory",
+        "disk",
+        "battery",
+        "poweradapter",
+        "locale",
+        "break",
+        "colors"
+    ]
+}

presets/examples/1

@@ -0,0 +1 @@
+# Load with --load-config examples/1

presets/examples/2

@@ -0,0 +1,24 @@
+# Load with --load-config examples/2
+# Note that you must replace the image path to an existing image to display it.
+
+--kitty /home/linus/Bilder/Gentoo.png
+--logo-width 28
+
+--separator "  "
+
+--set-keyless HardwareStart=┌───────── \e[1mHardware Information\e[0m ─────────┐
+--set-keyless SoftwareStart=├───────── \e[1mSoftware Information\e[0m ─────────┤
+--set-keyless InformationEnd=└────────────────────────────────────────┘
+--set-keyless Colors=    \e[38m \e[37m \e[36m \e[35m \e[34m \e[33m \e[32m \e[31m
+--structure HardwareStart:Host:CPU:GPU:SoftwareStart:OS:Kernel:WM:Shell:Terminal:TerminalFont:Packages:InformationEnd:Colors
+
+--host-key "  "
+--cpu-key "  "
+--gpu-key "  ﬙"
+--os-key "  "
+--kernel-key "  "
+--wm-key "  "
+--shell-key "  "
+--terminal-key "  "
+--terminalfont-key "  "
+--packages-key "  "

presets/examples/2.jsonc

@@ -0,0 +1,166 @@
+// Load with --load-config examples/2.jsonc
+// Note that you must replace the image path to an existing image to display it.
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    // "logo": {
+    //     "type": "iterm",
+    //     "source": "/Users/carter/Desktop/apple1.png",
+    //     "width": 28,
+    //     "height": 12
+    // },
+    "display": {
+        "separator": "  "
+    },
+    "modules": [
+        {
+            "type": "custom", // HardwareStart
+            "format": "┌─────────── \u001b[1mHardware Information\u001b[0m ───────────┐" // `\u001b` is `\033`, or `\e`
+        },
+        {
+            "type": "host",
+            "key": "  "
+        },
+        {
+            "type": "cpu",
+            "key": "  "
+        },
+        {
+            "type": "gpu",
+            "key": "  ﬙"
+        },
+        {
+            "type": "disk",
+            "key": "  "
+        },
+        {
+            "type": "memory",
+            "key": "  󰑭"
+        },
+        {
+            "type": "swap",
+            "key": "  󰓡"
+        },
+        {
+            "type": "display",
+            "key": "  󰍹"
+        },
+        {
+            "type": "brightness",
+            "key": "  󰃞"
+        },
+        {
+            "type": "battery",
+            "key": "  "
+        },
+        {
+            "type": "poweradapter",
+            "key": "  "
+        },
+        {
+            "type": "bluetooth",
+            "key": "  "
+        },
+        {
+            "type": "sound",
+            "key": "  "
+        },
+        {
+            "type": "gamepad",
+            "key": "  "
+        },
+        {
+            "type": "custom", // SoftwareStart
+            "format": "├─────────── \u001b[1mSoftware Information\u001b[0m ───────────┤"
+        },
+        {
+            "type": "title",
+            "key": "  ",
+            "format": "{1}@{2}"
+        },
+        {
+            "type": "os",
+            "key": "  " // Just get your distro's logo off nerdfonts.com
+        },
+        {
+            "type": "kernel",
+            "key": "  ",
+            "format": "{1} {2}"
+        },
+        {
+            "type": "lm",
+            "key": "  󰧨"
+        },
+        {
+            "type": "de",
+            "key": "  "
+        },
+        {
+            "type": "wm",
+            "key": "  "
+        },
+        {
+            "type": "shell",
+            "key": "  "
+        },
+        {
+            "type": "terminal",
+            "key": "  "
+        },
+        {
+            "type": "terminalfont",
+            "key": "  "
+        },
+        {
+            "type": "theme",
+            "key": "  󰉼"
+        },
+        {
+            "type": "icons",
+            "key": "  󰀻"
+        },
+        {
+            "type": "wallpaper",
+            "key": "  󰸉"
+        },
+        {
+            "type": "packages",
+            "key": "  󰏖"
+        },
+        {
+            "type": "uptime",
+            "key": "  󰅐"
+        },
+        {
+            "type": "media",
+            "key": "  󰝚"
+        },
+        {
+            "type": "localip",
+            "key": "  󰩟",
+            "compact": true
+        },
+        {
+            "type": "publicip",
+            "key": "  󰩠"
+        },
+        {
+            "type": "wifi",
+            "key": "  ",
+            "format": "{4}" // ssid
+        },
+        {
+            "type": "locale",
+            "key": "  "
+        },
+        {
+            "type": "custom", // InformationEnd
+            "format": "└────────────────────────────────────────────┘"
+        },
+        {
+            "type": "colors",
+            "paddingLeft": 2,
+            "symbol": "circle"
+        }
+    ]
+}

presets/examples/3

@@ -0,0 +1,7 @@
+# Load with --load-config example/3
+
+--logo debian_small
+--structure Vulkan:OpenGL:OpenCL:Memory:Disk:LocalIP
+--binary-prefix si
+--localip-show-loop false
+--disk-folders /:/home:/boot:/efi

presets/examples/3.jsonc

@@ -0,0 +1,20 @@
+// Load with --load-config examples/3.jsonc
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": "debian_small",
+    "display": {
+        "binaryPrefix": "si"
+    },
+    "modules": [
+        "vulkan",
+        "opengl",
+        "opencl",
+        "memory",
+        {
+            "type": "disk",
+            "folders": "/:/home:/boot:/efi"
+        },
+        "localip"
+    ]
+}

presets/examples/4

@@ -0,0 +1,7 @@
+# Load with --load-config examples/4
+
+--color blue
+--logo arch_small
+--logo-padding-right 1
+--separator "  "
+--structure DateTime:Break:Player:Media

presets/examples/4.jsonc

@@ -0,0 +1,31 @@
+// Load with --load-config examples/4.jsonc
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "source": "arch_small",
+        "padding": {
+            "right": 1
+        }
+    },
+    "display": {
+        "binaryPrefix": "si",
+        "color": "blue",
+        "separator": "  "
+    },
+    "modules": [
+        {
+            "type": "datetime",
+            "key": "Date",
+            "format": "{1}-{3}-{11}"
+        },
+        {
+            "type": "datetime",
+            "key": "Time",
+            "format": "{14}:{17}:{20}"
+        },
+        "break",
+        "player",
+        "media"
+    ]
+}

presets/examples/5

@@ -0,0 +1,11 @@
+# Load with --load-config examples/5
+
+--logo none
+--color reset_magenta
+--structure Theme:Icons:Font:Cursor
+--theme-key T
+--theme-format {7}
+--icons-key I
+--icons-format {5}
+--font-key F
+--cursor-key C

presets/examples/5.jsonc

@@ -0,0 +1,29 @@
+// Load with --load-config examples/5.jsonc
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": null,
+    "display": {
+        "color": "reset_magenta"
+    },
+    "modules": [
+        {
+            "type": "theme",
+            "key": "T",
+            "format": "{7}"
+        },
+        {
+            "type": "icons",
+            "key": "I",
+            "format": "{5}"
+        },
+        {
+            "type": "font",
+            "key": "F"
+        },
+        {
+            "type": "cursor",
+            "key": "C"
+        }
+    ]
+}

presets/examples/6.jsonc

@@ -0,0 +1,185 @@
+// Load with --load-config examples/2.jsonc
+// Note that you must replace the image path to an existing image to display it.
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    // "logo": {
+    //     "type": "iterm",
+    //     "source": "/Users/carter/Desktop/apple1.png",
+    //     "width": 28,
+    //     "height": 12
+    // },
+    "display": {
+        "separator": " "
+    },
+    "modules": [
+        {
+            "type": "host",
+            "key": "╭─",
+            "keyColor": "green"
+        },
+        {
+            "type": "cpu",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "gpu",
+            "key": "├─﬙",
+            "keyColor": "green"
+        },
+        {
+            "type": "disk",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "memory",
+            "key": "├─󰑭",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "├─󰓡",
+            "keyColor": "green"
+        },
+        {
+            "type": "display",
+            "key": "├─󰍹",
+            "keyColor": "green"
+        },
+        {
+            "type": "brightness",
+            "key": "├─󰃞",
+            "keyColor": "green"
+        },
+        {
+            "type": "battery",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "poweradapter",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "gamepad",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "bluetooth",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "sound",
+            "key": "╰─",
+            "keyColor": "green"
+        },
+        "break",
+
+        {
+            "type": "shell",
+            "key": "╭─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "terminal",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "terminalfont",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "lm",
+            "key": "├─󰧨",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "de",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "wm",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "theme",
+            "key": "├─󰉼",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "icons",
+            "key": "├─󰀻",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "wallpaper",
+            "key": "╰─󰸉",
+            "keyColor": "yellow"
+        },
+
+        "break",
+        {
+            "type": "title",
+            "key": "╭─",
+            "format": "{1}@{2}",
+            "keyColor": "blue"
+        },
+        {
+            "type": "os",
+            "key": "├─", // Just get your distro's logo off nerdfonts.com
+            "keyColor": "blue"
+        },
+        {
+            "type": "kernel",
+            "key": "├─",
+            "format": "{1} {2}",
+            "keyColor": "blue"
+        },
+        {
+            "type": "packages",
+            "key": "├─󰏖",
+            "keyColor": "blue"
+        },
+        {
+            "type": "uptime",
+            "key": "├─󰅐",
+            "keyColor": "blue"
+        },
+        {
+            "type": "media",
+            "key": "├─󰝚",
+            "keyColor": "blue"
+        },
+        {
+            "type": "localip",
+            "key": "├─󰩟",
+            "compact": true,
+            "keyColor": "blue"
+        },
+        {
+            "type": "publicip",
+            "key": "├─󰩠",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wifi",
+            "key": "├─",
+            "format": "{4}", // ssid
+            "keyColor": "blue"
+        },
+        {
+            "type": "locale",
+            "key": "╰─",
+            "keyColor": "blue"
+        }
+    ]
+}

presets/examples/7.jsonc

@@ -0,0 +1,139 @@
+// Load with --load-config examples/2.jsonc
+// Note that you must replace the image path to an existing image to display it.
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 2
+        }
+    },
+    "display": {
+        "separator": " -> "
+    },
+    "modules": [
+        "title",
+        "separator",
+        {
+            "type": "os",
+            "key": " OS",
+            "keyColor": "yellow",
+            "format": "{2}"
+        },
+        {
+            "type": "os",
+            "key": "├", // Just get your distro's logo off nerdfonts.com
+            "keyColor": "yellow",
+            "format": "{6}{?6} {?}{10} {8}"
+        },
+        {
+            "type": "kernel",
+            "key": "├",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "packages",
+            "key": "├󰏖",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "shell",
+            "key": "└",
+            "keyColor": "yellow"
+        },
+        "break",
+
+        {
+            "type": "wm",
+            "key": " DE/WM",
+            "keyColor": "blue"
+        },
+        {
+            "type": "lm",
+            "key": "├󰧨",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wmtheme",
+            "key": "├󰉼",
+            "keyColor": "blue"
+        },
+        {
+            "type": "icons",
+            "key": "├󰀻",
+            "keyColor": "blue"
+        },
+        {
+            "type": "terminal",
+            "key": "├",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wallpaper",
+            "key": "└󰸉",
+            "keyColor": "blue"
+        },
+
+        "break",
+        {
+            "type": "host",
+            "key": " PC",
+            "keyColor": "green"
+        },
+        {
+            "type": "cpu",
+            "key": "├",
+            "keyColor": "green"
+        },
+        {
+            "type": "gpu",
+            "key": "├﬙",
+            "keyColor": "green"
+        },
+        {
+            "type": "disk",
+            "key": "├",
+            "keyColor": "green"
+        },
+        {
+            "type": "memory",
+            "key": "├󰑭",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "├󰓡",
+            "keyColor": "green"
+        },
+        {
+            "type": "uptime",
+            "key": "├󰅐",
+            "keyColor": "green"
+        },
+        {
+            "type": "display",
+            "key": "└󰍹",
+            "keyColor": "green"
+        },
+
+        "break",
+        {
+            "type": "sound",
+            "key": " SOUND",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "player",
+            "key": "├󰥠",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "media",
+            "key": "└󰝚",
+            "keyColor": "cyan"
+        },
+
+        "break",
+        "colors"
+    ]
+}

presets/examples/8.jsonc

@@ -0,0 +1,51 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "separator": "  ",
+        "color": {
+            "keys": "magenta"
+        },
+        "sizeNdigits": 0,
+        "sizeMaxPrefix": "MB",
+        "percentType": 9
+    },
+    "modules": [
+        {
+            "type": "title",
+            "color": {
+                "user": "green",
+                "at": "red",
+                "host": "blue"
+            }
+        },
+        {
+            "type": "os",
+            "key": "",
+            "format": "{2} {8}"
+        },
+        {
+            "type": "kernel",
+            "key": ""
+        },
+        {
+            "type": "memory",
+            "key": ""
+        },
+        {
+            "type": "packages",
+            "key": ""
+        },
+        {
+            "type": "uptime",
+            "key": ""
+        },
+        {
+            "type": "custom",
+            "key": "",
+            "format": "\u001b[31m███\u001b[32m███\u001b[33m███\u001b[34m███\u001b[35m███\u001b[36m███"
+        }
+    ]
+}

presets/examples/9.jsonc

@@ -0,0 +1,28 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "percentType": 6,
+        "keyWidth": 11,
+        "bar": {
+            "charElapsed": "=",
+            "charTotal": "-",
+            "width": 13
+        }
+    },
+    "modules": [
+        "title",
+        "separator",
+        "memory",
+        "swap",
+        "disk",
+        "battery",
+        {
+            "type": "colors",
+            "paddingLeft": 11,
+            "symbol": "circle"
+        }
+    ]
+}

presets/hardware

@@ -1,4 +1,4 @@
---structure Host:Resolution:CPU:GPU:Memory:Disk:Battery
---memory-format "{?2}{2}MiB{?}"
---disk-format "{?2}{2}GB{?}"
+--structure Host:Display:CPU:GPU:Memory:Disk:Battery
+--memory-format "{?2}{2}{?}"
+--disk-format "{?2}{2}{?}"
 --battery-format "{?1}{1} {?}{?2}{2} {?}{?3}({3}){?}"

presets/hardware.jsonc

@@ -0,0 +1,25 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "builtin",
+        "source": "arch"
+    },
+    "modules": [
+        "host",
+        "display",
+        "cpu",
+        "gpu",
+        {
+            "type": "memory",
+            "format": "{?2}{2}{?}"
+        },
+        {
+            "type": "disk",
+            "format": "{?2}{2}{?}"
+        },
+        {
+            "type": "battery",
+            "format": "{?1}{1} {?}{?2}{2} {?}{?3}({3}){?}"
+        }
+    ]
+}

presets/neofetch

@@ -1,10 +1,9 @@
---structure "Title:Separator:OS:Host:Kernel:Uptime:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Terminal:TerminalFont:CPU:GPU:Memory:Break:Colors"
+--structure "Title:Separator:OS:Host:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Terminal:TerminalFont:CPU:GPU:Memory:Break:Colors"
 --host-format "{/2}{-}{/}{2}{?3} {3}{?}"
 --os-format "{3} {12}"
---resolution-format "{}x{}"
+--display-key Resolution
+--display-compact-type original
 --de-format "{2} {3}"
 --theme-format "{?1}{1}{?3} {3}{?} [Plasma], {?}{7}"
---terminal-font-format "{/2}{-}{/}{2}{?3} {3}{?}"
---memory-format "{/1}{-}{/}{/2}{-}{/}{}MiB / {}MiB"
---gpu-key "GPU"
---resolution-key "Resolution"
+--terminalfont-format "{/2}{-}{/}{2}{?3} {3}{?}"
+--memory-format "{/1}{-}{/}{/2}{-}{/}{} / {}"

presets/neofetch.jsonc

@@ -0,0 +1,48 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "modules": [
+        "title",
+        "separator",
+        {
+            "type": "os",
+            "format": "{3} {12}"
+        },
+        {
+            "type": "host",
+            "format": "{/2}{-}{/}{2}{?3} {3}{?}"
+        },
+        "kernel",
+        "uptime",
+        "packages",
+        "shell",
+        {
+            "type": "display",
+            "compactType": "original",
+            "key": "Resolution"
+        },
+        "de",
+        "wm",
+        "wmtheme",
+        {
+            "type": "theme",
+            "format": "{?1}{1}{?3} {3}{?} [Plasma], {?}{7}"
+        },
+        "icons",
+        "terminal",
+        {
+            "type": "terminalfont",
+            "format": "{/2}{-}{/}{2}{?3} {3}{?}"
+        },
+        "cpu",
+        {
+            "type": "gpu",
+            "key": "GPU"
+        },
+        {
+            "type": "memory",
+            "format": "{/1}{-}{/}{/2}{-}{/}{} / {}"
+        },
+        "break",
+        "colors"
+    ]
+}

presets/paleofetch

@@ -1,5 +1,5 @@
---structure Title:Separator:OS:Host:Kernel:Uptime:Battery:Break:Packages:Shell:Resolution:Terminal:Break:CPU:GPU:Memory:Break:Colors
+--structure Title:Separator:OS:Host:Kernel:Uptime:Battery:Break:Packages:Shell:Display:Terminal:Break:CPU:GPU:Memory:Break:Colors
 --host-format "{/2}{-}{/}{2}{?3} {3}{?}"
 --battery-format "{/4}{-}{/}{4}%{?5} [{5}]{?}"
---resolution-key "Resolution"
+--display-key "Display"
 --gpu-key "GPU"

presets/paleofetch.jsonc

@@ -0,0 +1,35 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "modules": [
+        "title",
+        "separator",
+        "os",
+        {
+            "type": "host",
+            "format": "{/2}{-}{/}{2}{?3} {3}{?}"
+        },
+        "kernel",
+        "uptime",
+        {
+            "type": "battery",
+            "format": "{/4}{-}{/}{4}%{?5} [{5}]{?}"
+        },
+        "break",
+        "packages",
+        "shell",
+        {
+            "type": "display",
+            "key": "Display"
+        },
+        "terminal",
+        "break",
+        "cpu",
+        {
+            "type": "gpu",
+            "key": "GPU"
+        },
+        "memory",
+        "break",
+        "colors"
+    ]
+}

presets/software.jsonc

@@ -0,0 +1,17 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "modules": [
+        "os",
+        "kernel",
+        "shell",
+        "de",
+        "wm",
+        "wmtheme",
+        "theme",
+        "icons",
+        "font",
+        "cursor",
+        "terminal",
+        "terminalfont"
+    ]
+}

presets/verbose

@@ -1,28 +1,31 @@
---load-config all
-
---os-format "System: {}; Name: {}; Pretty name: {}; ID: {}; ID like: {}; Variant: {}; Variant ID: {}; Version: {}; Version ID: {}; Version codename: {}; Build ID: {}; Architecture: {}"
---host-format "Family: {}; Name: {}; Version: {}"
---kernel-format "Sysname: {}; Release: {}; Version: {}"
---uptime-format "Days: {}; Hours: {}; Minutes: {}; Seconds: {}"
---processes-format "Count: {}"
---packages-format "All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; xbps: {}; flatpak: {}; snap: {}"
---shell-format "Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}"
---resolution-format "Width: {}; Height: {}; Refresh rate: {}"
---de-format "Process name: {}; Pretty name: {}; Version: {}"
---wm-format "Process name: {}; Pretty name: {}; Protocol: {}"
---wm-theme-format "Name: {}"
---theme-format "Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}"
---icons-format "Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}"
---font-format "Plasma raw: {}; Plasma name: {}; Plasma size: {}; Plasma styles: {}; Plasma pretty: {}; GTK2 raw: {}; GTK2 name: {}; GTK2 size: {}; GTK2 styles: {}; GTK2 pretty: {}; GTK3 raw: {}; GTK3 name: {}; GTK3 size: {}; GTK3 styles: {}; GTK3 pretty: {}; GTK4 raw: {}; GTK4 name: {}; GTK4 size: {}; GTK4 styles: {}; GTK4 pretty: {}; GTK: {}"
---cursor-format "Theme: {}; Size: {}"
---terminal-format "Process: {}; Path: {}; Exe: {}"
---terminal-font-format "Raw: {}; Name: {}; Size: {}; Styles: {}; Pretty: {}"
---cpu-format "Name: {}; Pretty: {}; Vendor: {}; Logical online: {}; Logical configured: {}; Physical: {}; Cores: {}; bios: {}; scaling max: {}; scaling min: {}; info max: {}; info min: {}; cpuinfo: {}; frequency: {}"
---cpu-usage-format "Percentage: {}"
---gpu-format "Vendor: {}; Vendor pretty: {}; Name: {}; Name pretty: {}; Driver: {}"
---memory-format "Used: {}; Total: {}; Percentage: {}"
---disk-format "Used: {}; Total: {}; Files: {}; Percentage: {}"
---battery-format "Manufactor: {}; Model: {}; Technology: {}; Capacaty: {}; Status: {}"
---player-format "Name: {}"
---song-format "Song: {}; Artist: {}; Album: {}"
---datetime-format "year: {}; yearShort: {}; month: {}; monthPretty: {}; monthName: {}; monthNameShort: {}; weekNumber: {}; weekday: {}; weekdayShort: {}; dayInYear: {}; dayInMonth: {}; dayInWeek: {}; hour: {}; hourPretty: {}; hour12: {}; hour12Pretty: {}; minute: {}; minutePretty: {}; second: {}; secondPretty: {}"
+--os-format System: {}; Name: {}; Pretty name: {}; ID: {}; ID like: {}; Variant: {}; Variant ID: {}; Version: {}; Version ID: {}; Version codename: {}; Build ID: {}; Architecture: {}
+--host-format Family: product_family: {}; product_name: {}; product_version: {}; product_sku: {}; sys_vendor: {}
+--kernel-format Sysname: {}; Release: {}; Version: {}
+--uptime-format Days: {}; Hours: {}; Minutes: {}; Seconds: {}
+--processes-format Count: {}
+--packages-format All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; eopkg: {}; xbps: {}; apk: {}; flatpak-system: {}; flatpak-user: {}; snap: {}; brew: {}; brew-cask: {}; port: {}; scoop: {}; choco: {}; pkgtool: {}; paludis {}
+--shell-format Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}
+--display-format Width: {}; Height: {}; Refresh rate: {}; ScaledWith: {}; ScaledHeight: {}
+--de-format Process name: {}; Pretty name: {}; Version: {}
+--wm-format Process name: {}; Pretty name: {}; Protocol: {}
+--wmtheme-format Name: {}
+--theme-format Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
+--icons-format Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
+--font-format Font1: {}; Font2: {}; Font3: {}; Font4: {}
+--cursor-format Theme: {}; Size: {}
+--terminal-format Process: {}; Path: {}; Exe: {}
+--terminalfont-format Pretty: {}; Name: {}; Size: {}; Styles: {}
+--cpu-format Name: {}, Vendor: {}, CoresPhysical: {}, CoresLogical: {}, CoresOnline: {}, FrequencyMin: {}, FrequencyMax: {}, Temperature: {}
+--cpu-usage-format Percentage: {}
+--gpu-format Vendor: {}; Name: {}; Driver: {}; Temperature: {}; CoreCount: {}; Type: {}
+--memory-format Used: {}; Total: {}; Percentage: {}
+--disk-format SizeUsed: {}; SizeTotal: {}; SizePercentage: {}; FilesUsed: {}; FilesTotal: {}; FilesPercentage: {}; External: {}; Hidden: {}; Filesystem: {}; Name: {}
+--battery-format Manufactor: {}; Model: {}; Technology: {}; Capacity: {}; Status: {}
+--poweradapter-format Watts: {}; Name: {}; Manufactor: {}; Model: {}; Description: {}
+--player-format Pretty: {}; Name: {}; Bus: {}; Url: {}
+--media-format Pretty: {}; Name: {};  Artist: {}; Album: {}
+--datetime-format year: {}; yearShort: {}; month: {}; monthPretty: {}; monthName: {}; monthNameShort: {}; weekNumber: {}; weekday: {}; weekdayShort: {}; dayInYear: {}; dayInMonth: {}; dayInWeek: {}; hour: {}; hourPretty: {}; hour12: {}; hour12Pretty: {}; minute: {}; minutePretty: {}; second: {}; secondPretty: {}
+--vulkan-format driver: {}; Api Version: {}; Conformance Version: {}
+--opengl-format version: {}; renderer: {}; vendor: {}
+--opencl-format version: {}; device: {}; vendor: {}
+--bluetooth-format Name: {}; Address: {}; Type: {}; Battery: {}

run.sh

@@ -1,6 +1,22 @@
-#!/bin/env sh
+#!/usr/bin/env sh
+
+set -e
+
 mkdir -p build/
 cd build/
-cmake ..
-cmake --build . --target fastfetch -j$(nproc)
+
+if [ -z "${CMAKE_BUILD_TYPE}" ]; then
+    CMAKE_BUILD_TYPE=Release
+fi
+cmake "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" ..
+
+if [ -z "$OSTYPE" ] || [ "$OSTYPE" = "linux-gnu" ]; then
+    cmake_build_args="-j$(nproc)"
+elif [ "$OSTYPE" = "darwin" ]; then
+    cmake_build_args="-j$(sysctl -n hw.ncpu)"
+else
+    cmake_build_args=""
+fi
+cmake --build . --target fastfetch ${cmake_build_args}
+
 ./fastfetch "$@"

src/3rdparty/mk_wcwidch/repo.json

@@ -0,0 +1,7 @@
+{
+    "home": "https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c",
+    "license": "Embed in source",
+    "version": "2007-05-26 (Unicode 5.0)",
+    "author": "Markus Kuhn",
+    "modified": "CarterLi"
+}

src/3rdparty/mk_wcwidch/wcwidth.c

@@ -0,0 +1,314 @@
+/*
+ * This is an implementation of wcwidth() and wcswidth() (defined in
+ * IEEE Std 1002.1-2001) for Unicode.
+ *
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
+ *
+ * In fixed-width output devices, Latin characters all occupy a single
+ * "cell" position of equal width, whereas ideographic CJK characters
+ * occupy two such cells. Interoperability between terminal-line
+ * applications and (teletype-style) character terminals using the
+ * UTF-8 encoding requires agreement on which character should advance
+ * the cursor by how many cell positions. No established formal
+ * standards exist at present on which Unicode character shall occupy
+ * how many cell positions on character terminals. These routines are
+ * a first attempt of defining such behavior based on simple rules
+ * applied to data provided by the Unicode Consortium.
+ *
+ * For some graphical characters, the Unicode standard explicitly
+ * defines a character-cell width via the definition of the East Asian
+ * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
+ * In all these cases, there is no ambiguity about which width a
+ * terminal shall use. For characters in the East Asian Ambiguous (A)
+ * class, the width choice depends purely on a preference of backward
+ * compatibility with either historic CJK or Western practice.
+ * Choosing single-width for these characters is easy to justify as
+ * the appropriate long-term solution, as the CJK practice of
+ * displaying these characters as double-width comes from historic
+ * implementation simplicity (8-bit encoded characters were displayed
+ * single-width and 16-bit ones double-width, even for Greek,
+ * Cyrillic, etc.) and not any typographic considerations.
+ *
+ * Much less clear is the choice of width for the Not East Asian
+ * (Neutral) class. Existing practice does not dictate a width for any
+ * of these characters. It would nevertheless make sense
+ * typographically to allocate two character cells to characters such
+ * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
+ * represented adequately with a single-width glyph. The following
+ * routines at present merely assign a single-cell width to all
+ * neutral characters, in the interest of simplicity. This is not
+ * entirely satisfactory and should be reconsidered before
+ * establishing a formal standard in this area. At the moment, the
+ * decision which Not East Asian (Neutral) characters should be
+ * represented by double-width glyphs cannot yet be answered by
+ * applying a simple rule from the Unicode database content. Setting
+ * up a proper standard for the behavior of UTF-8 character terminals
+ * will require a careful analysis not only of each Unicode character,
+ * but also of each presentation form, something the author of these
+ * routines has avoided to do so far.
+ *
+ * http://www.unicode.org/unicode/reports/tr11/
+ *
+ * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted. The author
+ * disclaims all warranties with regard to this software.
+ *
+ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+ */
+
+#include <wchar.h>
+
+struct interval {
+  int first;
+  int last;
+};
+
+/* auxiliary function for binary search in interval table */
+static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+  int min = 0;
+  int mid;
+
+  if (ucs < table[0].first || ucs > table[max].last)
+    return 0;
+  while (max >= min) {
+    mid = (min + max) / 2;
+    if (ucs > table[mid].last)
+      min = mid + 1;
+    else if (ucs < table[mid].first)
+      max = mid - 1;
+    else
+      return 1;
+  }
+
+  return 0;
+}
+
+
+/* The following two functions define the column width of an ISO 10646
+ * character as follows:
+ *
+ *    - The null character (U+0000) has a column width of 0.
+ *
+ *    - Other C0/C1 control characters and DEL will lead to a return
+ *      value of -1.
+ *
+ *    - Non-spacing and enclosing combining characters (general
+ *      category code Mn or Me in the Unicode database) have a
+ *      column width of 0.
+ *
+ *    - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *
+ *    - Other format characters (general category code Cf in the Unicode
+ *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
+ *
+ *    - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ *      have a column width of 0.
+ *
+ *    - Spacing characters in the East Asian Wide (W) or East Asian
+ *      Full-width (F) category as defined in Unicode Technical
+ *      Report #11 have a column width of 2.
+ *
+ *    - All remaining characters (including all printable
+ *      ISO 8859-1 and WGL4 characters, Unicode control characters,
+ *      etc.) have a column width of 1.
+ *
+ * This implementation assumes that wchar_t characters are encoded
+ * in ISO 10646.
+ */
+
+int mk_wcwidth(wchar_t ucs)
+{
+  /* sorted list of non-overlapping intervals of non-spacing characters */
+  /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
+  static const struct interval combining[] = {
+    { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
+    { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
+    { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
+    { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+    { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
+    { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
+    { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
+    { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
+    { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
+    { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
+    { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
+    { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
+    { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
+    { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+    { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
+    { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+    { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+    { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
+    { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
+    { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
+    { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
+    { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
+    { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
+    { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
+    { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
+    { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
+    { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
+    { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
+    { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
+    { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
+    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
+    { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
+    { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
+    { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+    { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
+    { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
+    { 0xE0100, 0xE01EF }
+  };
+
+  /* test for 8-bit control characters */
+  if (ucs == 0)
+    return 0;
+  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+    return -1;
+
+  /* binary search in table of non-spacing characters */
+  if (bisearch(ucs, combining,
+	       sizeof(combining) / sizeof(struct interval) - 1))
+    return 0;
+
+  /* if we arrive here, ucs is not a combining or C0/C1 control character */
+
+  return 1 +
+    (ucs >= 0x1100 &&
+     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
+      ucs == 0x2329 || ucs == 0x232a ||
+      (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+       ucs != 0x303f) ||                  /* CJK ... Yi */
+      (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+      (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+      (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
+      (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+      (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
+      (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+
+#ifndef _WIN32 // sizeof(wchar_t) == 2
+      (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+      (ucs >= 0x30000 && ucs <= 0x3fffd) ||
+#endif
+      0
+    ));
+}
+
+
+int mk_wcswidth(const wchar_t *pwcs, size_t n)
+{
+  int w, width = 0;
+
+  for (;*pwcs && n-- > 0; pwcs++)
+    if ((w = mk_wcwidth(*pwcs)) < 0)
+      return -1;
+    else
+      width += w;
+
+  return width;
+}
+
+
+/*
+ * The following functions are the same as mk_wcwidth() and
+ * mk_wcswidth(), except that spacing characters in the East Asian
+ * Ambiguous (A) category as defined in Unicode Technical Report #11
+ * have a column width of 2. This variant might be useful for users of
+ * CJK legacy encodings who want to migrate to UCS without changing
+ * the traditional terminal character-width behaviour. It is not
+ * otherwise recommended for general use.
+ */
+int mk_wcwidth_cjk(wchar_t ucs)
+{
+  /* sorted list of non-overlapping intervals of East Asian Ambiguous
+   * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
+  static const struct interval ambiguous[] = {
+    { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
+    { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
+    { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
+    { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
+    { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
+    { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
+    { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
+    { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
+    { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
+    { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
+    { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
+    { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
+    { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
+    { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
+    { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
+    { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
+    { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
+    { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
+    { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
+    { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
+    { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
+    { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
+    { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
+    { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
+    { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
+    { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
+    { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
+    { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
+    { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
+    { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
+    { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
+    { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
+    { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
+    { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
+    { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
+    { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
+    { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
+    { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
+    { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
+    { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
+    { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
+    { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
+    { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
+    { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
+    { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
+    { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
+    { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
+    { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
+    { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
+    { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
+    { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
+    { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
+  };
+
+  /* binary search in table of non-spacing characters */
+  if (bisearch(ucs, ambiguous,
+	       sizeof(ambiguous) / sizeof(struct interval) - 1))
+    return 2;
+
+  return mk_wcwidth(ucs);
+}
+
+
+int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
+{
+  int w, width = 0;
+
+  for (;*pwcs && n-- > 0; pwcs++)
+    if ((w = mk_wcwidth_cjk(*pwcs)) < 0)
+      return -1;
+    else
+      width += w;
+
+  return width;
+}

src/3rdparty/yyjson/repo.json

@@ -0,0 +1,6 @@
+{
+    "home": "https://github.com/ibireme/yyjson",
+    "license": "MIT ( embed in source )",
+    "version": "5e3b26d2659287d31e2f8e10f95f95feb7e5ab3a",
+    "author": "ibireme"
+}

src/common/bar.c

@@ -0,0 +1,105 @@
+#include "common/bar.h"
+#include "common/color.h"
+#include "util/textModifier.h"
+
+void ffAppendPercentBar(FFstrbuf* buffer, double percent, uint8_t green, uint8_t yellow, uint8_t red)
+{
+    assert(green <= 100 && yellow <= 100 && red <= 100);
+
+    uint32_t blocksPercent = (uint32_t) (percent / 100.0 * instance.config.barWidth + 0.5);
+    uint32_t blocksGreen = (uint32_t) (green / 100.0 * instance.config.barWidth + 0.5);
+    uint32_t blocksYellow = (uint32_t) (yellow / 100.0 * instance.config.barWidth + 0.5);
+    uint32_t blocksRed = (uint32_t) (red / 100.0 * instance.config.barWidth + 0.5);
+    assert(blocksPercent <= instance.config.barWidth);
+
+    if(instance.config.barBorder)
+    {
+        if(!instance.config.pipe)
+            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m[ ");
+        else
+            ffStrbufAppendS(buffer, "[ ");
+    }
+
+    for (uint32_t i = 0; i < blocksPercent; ++i)
+    {
+        if(!instance.config.pipe)
+        {
+            if (i == blocksGreen)
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_GREEN "m");
+            else if (i == blocksYellow)
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_YELLOW "m");
+            else if (i == blocksRed)
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_RED "m");
+        }
+        ffStrbufAppend(buffer, &instance.config.barCharElapsed);
+    }
+
+    if (blocksPercent < instance.config.barWidth)
+    {
+        if(!instance.config.pipe)
+            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m");
+        for (uint32_t i = blocksPercent; i < instance.config.barWidth; ++i)
+            ffStrbufAppend(buffer, &instance.config.barCharTotal);
+    }
+
+    if(instance.config.barBorder)
+    {
+        if(!instance.config.pipe)
+            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m ]");
+        else
+            ffStrbufAppendS(buffer, " ]");
+    }
+
+    if(!instance.config.pipe)
+        ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
+}
+
+// if (green < yellow)
+// [0, green]: print green
+// (green, yellow]: print yellow
+// (yellow, 100]: print red
+//
+// if (green > yellow)
+// [green, 100]: print green
+// [yellow, green): print yellow
+// [0, yellow): PRINT RED
+void ffAppendPercentNum(FFstrbuf* buffer, double percent, uint8_t green, uint8_t yellow, bool parentheses)
+{
+    assert(green <= 100 && yellow <= 100);
+
+    bool colored = !!(instance.config.percentType & FF_PERCENTAGE_TYPE_NUM_COLOR_BIT);
+
+    if (parentheses)
+        ffStrbufAppendC(buffer, '(');
+
+    if (colored && !instance.config.pipe)
+    {
+        if(green < yellow)
+        {
+            if (percent <= green)
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_GREEN "m");
+            else if (percent <= yellow)
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_YELLOW "m");
+            else
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_RED "m");
+        }
+        else
+        {
+            if (percent >= green)
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_GREEN "m");
+            else if (percent >= yellow)
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_YELLOW "m");
+            else
+                ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_RED "m");
+        }
+    }
+    ffStrbufAppendF(buffer, "%u%%", (unsigned) (percent + 0.5));
+
+    if (colored && !instance.config.pipe)
+    {
+        ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
+    }
+
+    if (parentheses)
+        ffStrbufAppendC(buffer, ')');
+}

src/common/bar.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_bar
+#define FF_INCLUDED_common_bar
+
+#include "fastfetch.h"
+
+enum
+{
+    FF_PERCENTAGE_TYPE_NUM_BIT = 1 << 0,
+    FF_PERCENTAGE_TYPE_BAR_BIT = 1 << 1,
+    FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT = 1 << 2,
+    FF_PERCENTAGE_TYPE_NUM_COLOR_BIT = 1 << 3,
+};
+
+void ffAppendPercentBar(FFstrbuf* buffer, double percent, uint8_t green, uint8_t yellow, uint8_t red);
+void ffAppendPercentNum(FFstrbuf* buffer, double percent, uint8_t green, uint8_t yellow, bool parentheses);
+
+#endif

src/common/caching.c

@@ -1,203 +0,0 @@
-#include "fastfetch.h"
-
-#define FF_CACHE_VALUE_EXTENSION "ffcv"
-#define FF_CACHE_SPLIT_EXTENSION "ffcs"
-
-static void getCacheFilePath(FFinstance* instance, const char* moduleName, const char* extension, FFstrbuf* buffer)
-{
-    ffStrbufAppend(buffer, &instance->state.cacheDir);
-    ffStrbufAppendS(buffer, moduleName);
-
-    if(extension != NULL)
-    {
-        ffStrbufAppendC(buffer, '.');
-        ffStrbufAppendS(buffer, extension);
-    }
-}
-
-static void readCacheFile(FFinstance* instance, const char* moduleName, const char* extension, FFstrbuf* buffer)
-{
-    FFstrbuf path;
-    ffStrbufInitA(&path, 64);
-    getCacheFilePath(instance, moduleName, extension, &path);
-    ffAppendFileContent(path.chars, buffer);
-    ffStrbufDestroy(&path);
-}
-
-static void writeCacheFile(FFinstance* instance, const char* moduleName, const char* extension, FFstrbuf* content)
-{
-    FFstrbuf path;
-    ffStrbufInitA(&path, 64);
-    getCacheFilePath(instance, moduleName, extension, &path);
-    ffWriteFileContent(path.chars, content);
-    ffStrbufDestroy(&path);
-}
-
-void ffCacheValidate(FFinstance* instance)
-{
-    if(instance->config.recache)
-        return;
-
-    FFstrbuf content;
-    ffStrbufInit(&content);
-    readCacheFile(instance, "cacheversion", "ffv", &content);
-
-    bool isSameVersion = ffStrbufCompS(&content, FASTFETCH_PROJECT_VERSION) == 0;
-    ffStrbufDestroy(&content);
-    if(isSameVersion)
-        return;
-
-    instance->config.recache = true;
-
-    FFstrbuf version;
-    ffStrbufInitA(&version, sizeof(FASTFETCH_PROJECT_VERSION));
-    ffStrbufAppendS(&version, FASTFETCH_PROJECT_VERSION);
-    writeCacheFile(instance, "cacheversion", "ffv", &version);
-    ffStrbufDestroy(&version);
-}
-
-void ffCacheOpenWrite(FFinstance* instance, const char* moduleName, FFcache* cache)
-{
-    FFstrbuf cacheFileValue;
-    ffStrbufInitA(&cacheFileValue, 64);
-    getCacheFilePath(instance, moduleName, FF_CACHE_VALUE_EXTENSION, &cacheFileValue);
-    cache->value = fopen(cacheFileValue.chars, "w");
-    ffStrbufDestroy(&cacheFileValue);
-
-    FFstrbuf cacheFileSplit;
-    ffStrbufInitA(&cacheFileSplit, 64);
-    getCacheFilePath(instance, moduleName, FF_CACHE_SPLIT_EXTENSION, &cacheFileSplit);
-    cache->split = fopen(cacheFileSplit.chars, "w");
-    ffStrbufDestroy(&cacheFileSplit);
-}
-
-void ffCacheClose(FFcache* cache)
-{
-    if(cache->value != NULL)
-        fclose(cache->value);
-
-    if(cache->split != NULL)
-        fclose(cache->split);
-}
-
-static bool printCachedValue(FFinstance* instance, const char* moduleName, const FFstrbuf* customKeyFormat)
-{
-    FFstrbuf content;
-    ffStrbufInitA(&content, 512);
-    readCacheFile(instance, moduleName, FF_CACHE_VALUE_EXTENSION, &content);
-
-    ffStrbufTrimRight(&content, '\0'); //Strbuf always appends a '\0' at the end. We want the last null byte to be at the position of the length
-
-    if(content.length == 0)
-        return false;
-
-    uint8_t moduleCounter = 1;
-
-    uint32_t startIndex = 0;
-    while(startIndex < content.length)
-    {
-        uint32_t nullByteIndex = ffStrbufNextIndexC(&content, startIndex, '\0');
-        uint8_t moduleIndex = (moduleCounter == 1 && nullByteIndex == content.length) ? 0 : moduleCounter;
-        ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat);
-        puts(content.chars + startIndex);
-        startIndex = nullByteIndex + 1;
-        ++moduleCounter;
-    }
-
-    ffStrbufDestroy(&content);
-
-    return moduleCounter > 1;
-}
-
-static bool printCachedFormat(FFinstance* instance, const char* moduleName, const FFstrbuf* customKeyFormat, const FFstrbuf* formatString, uint32_t numArgs)
-{
-    FFstrbuf content;
-    ffStrbufInitA(&content, 512);
-    readCacheFile(instance, moduleName, FF_CACHE_SPLIT_EXTENSION, &content);
-
-    ffStrbufTrimRight(&content, '\0'); //Strbuf always appends a '\0' at the end. We want the last null byte to be at the position of the length
-
-    if(content.length == 0)
-        return false;
-
-    uint8_t moduleCounter = 1;
-
-    FFformatarg* arguments = calloc(numArgs, sizeof(FFformatarg));
-    uint32_t argumentCounter = 0;
-
-    uint32_t startIndex = 0;
-    while(startIndex < content.length)
-    {
-        arguments[argumentCounter].type = FF_FORMAT_ARG_TYPE_STRING;
-        arguments[argumentCounter].value = &content.chars[startIndex];
-        ++argumentCounter;
-
-        uint32_t nullByteIndex = ffStrbufNextIndexC(&content, startIndex, '\0');
-
-        if(argumentCounter == numArgs)
-        {
-            uint8_t moduleIndex = (moduleCounter == 1 && nullByteIndex == content.length) ? 0 : moduleCounter;
-            ffPrintFormatString(instance, moduleName, moduleIndex, customKeyFormat, formatString, NULL, numArgs, arguments);
-            ++moduleCounter;
-            argumentCounter = 0;
-        }
-
-        startIndex = nullByteIndex + 1;
-    }
-
-    free(arguments);
-    ffStrbufDestroy(&content);
-
-    return moduleCounter > 1;
-}
-
-bool ffPrintFromCache(FFinstance* instance, const char* moduleName, const FFstrbuf* customKeyFormat, const FFstrbuf* formatString, uint32_t numArgs)
-{
-    if(instance->config.recache)
-        return false;
-
-    if(formatString == NULL || formatString->length == 0)
-        return printCachedValue(instance, moduleName, customKeyFormat);
-    else
-        return printCachedFormat(instance, moduleName, customKeyFormat, formatString, numArgs);
-}
-
-void ffPrintAndAppendToCache(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, FFcache* cache, const FFstrbuf* value, const FFstrbuf* formatString, uint32_t numArgs, const FFformatarg* arguments)
-{
-    if(formatString == NULL || formatString->length == 0)
-    {
-        ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat);
-        ffStrbufPutTo(value, stdout);
-    }
-    else
-    {
-        ffPrintFormatString(instance, moduleName, moduleIndex, customKeyFormat, formatString, NULL, numArgs, arguments);
-    }
-
-    if(cache->value != NULL)
-    {
-        ffStrbufWriteTo(value, cache->value);
-        fputc('\0', cache->value);
-    }
-
-    if(cache->split == NULL)
-        return;
-
-    for(uint32_t i = 0; i < numArgs; i++)
-    {
-        FFstrbuf buffer;
-        ffStrbufInitA(&buffer, 64);
-        ffFormatAppendFormatArg(&buffer, &arguments[i]);
-        ffStrbufWriteTo(&buffer, cache->split);
-        ffStrbufDestroy(&buffer);
-        fputc('\0', cache->split);
-    }
-}
-
-void ffPrintAndWriteToCache(FFinstance* instance, const char* moduleName, const FFstrbuf* customKeyFormat, const FFstrbuf* value, const FFstrbuf* formatString, uint32_t numArgs, const FFformatarg* arguments)
-{
-    FFcache cache;
-    ffCacheOpenWrite(instance, moduleName, &cache);
-    ffPrintAndAppendToCache(instance, moduleName, 0, customKeyFormat, &cache, value, formatString, numArgs, arguments);
-    ffCacheClose(&cache);
-}

src/common/color.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#define FF_COLOR_MODE_RESET "0;"
+#define FF_COLOR_MODE_BOLD "1;"
+#define FF_COLOR_MODE_DIM "2;"
+#define FF_COLOR_MODE_ITALIC "3;"
+#define FF_COLOR_MODE_UNDERLINE "4;"
+#define FF_COLOR_MODE_BLINK "5;"
+#define FF_COLOR_MODE_INVERSE "7;"
+#define FF_COLOR_MODE_HIDDEN "8;"
+#define FF_COLOR_MODE_STRIKETHROUGH "9;"
+
+#define FF_COLOR_FG_BLACK "30"
+#define FF_COLOR_FG_RED "31"
+#define FF_COLOR_FG_GREEN "32"
+#define FF_COLOR_FG_YELLOW "33"
+#define FF_COLOR_FG_BLUE "34"
+#define FF_COLOR_FG_MAGENTA "35"
+#define FF_COLOR_FG_CYAN "36"
+#define FF_COLOR_FG_WHITE "37"
+#define FF_COLOR_FG_DEFAULT "39"
+
+#define FF_COLOR_FG_LIGHT_BLACK "90"
+#define FF_COLOR_FG_LIGHT_RED "91"
+#define FF_COLOR_FG_LIGHT_GREEN "92"
+#define FF_COLOR_FG_LIGHT_YELLOW "93"
+#define FF_COLOR_FG_LIGHT_BLUE "94"
+#define FF_COLOR_FG_LIGHT_MAGENTA "95"
+#define FF_COLOR_FG_LIGHT_CYAN "96"
+#define FF_COLOR_FG_LIGHT_WHITE "97"
+
+#define FF_COLOR_BG_BLACK "40"
+#define FF_COLOR_BG_RED "41"
+#define FF_COLOR_BG_GREEN "42"
+#define FF_COLOR_BG_YELLOW "43"
+#define FF_COLOR_BG_BLUE "44"
+#define FF_COLOR_BG_MAGENTA "45"
+#define FF_COLOR_BG_CYAN "46"
+#define FF_COLOR_BG_WHITE "47"
+#define FF_COLOR_BG_DEFAULT "49"
+
+#define FF_COLOR_BG_LIGHT_BLACK "100"
+#define FF_COLOR_BG_LIGHT_RED "101"
+#define FF_COLOR_BG_LIGHT_GREEN "102"
+#define FF_COLOR_BG_LIGHT_YELLOW "103"
+#define FF_COLOR_BG_LIGHT_BLUE "104"
+#define FF_COLOR_BG_LIGHT_MAGENTA "105"
+#define FF_COLOR_BG_LIGHT_CYAN "106"
+#define FF_COLOR_BG_LIGHT_WHITE "107"
+
+#define FF_COLOR_FG_256 "38;5;"
+#define FF_COLOR_BG_256 "48;5;"
+
+#define FF_COLOR_FG_RGB "38;2;"
+#define FF_COLOR_BG_RGB "48;2;"

src/common/commandoption.c

@@ -0,0 +1,32 @@
+#include "commandoption.h"
+#include "util/stringUtils.h"
+
+#include <ctype.h>
+
+bool ffParseModuleCommand(const char* type)
+{
+    if(!isalpha(type[0])) return false;
+
+    for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(type[0]) - 'A']; *modules; ++modules)
+    {
+        FFModuleBaseInfo* baseInfo = *modules;
+        if (ffStrEqualsIgnCase(type, baseInfo->name))
+        {
+            baseInfo->printModule(baseInfo);
+            return true;
+        }
+    }
+    return false;
+}
+
+bool ffParseModuleOptions(const char* key, const char* value)
+{
+    if (!ffStrStartsWith(key, "--") || !isalpha(key[2])) return false;
+
+    for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(key[2]) - 'A']; *modules; ++modules)
+    {
+        FFModuleBaseInfo* baseInfo = *modules;
+        if (baseInfo->parseCommandOptions(baseInfo, key, value)) return true;
+    }
+    return false;
+}

src/common/commandoption.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_commandoption
+#define FF_INCLUDED_common_commandoption
+
+#include "fastfetch.h"
+
+bool ffParseModuleCommand(const char* type);
+bool ffParseModuleOptions(const char* key, const char* value);
+
+#endif

src/common/dbus.c

@@ -0,0 +1,206 @@
+#include "dbus.h"
+
+#ifdef FF_HAVE_DBUS
+
+#include "common/thread.h"
+#include "util/stringUtils.h"
+
+static bool loadLibSymbols(FFDBusLibrary* lib)
+{
+    FF_LIBRARY_LOAD(dbus, &instance.config.libDBus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_bus_get, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_new_method_call, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init_append, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_append_basic, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_arg_type, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_basic, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_recurse, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_has_next, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_next, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_unref, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_send_with_reply_and_block, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_flush, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_block, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_steal_reply, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_unref, false)
+    dbus = NULL; // don't auto dlclose
+    return true;
+}
+
+static const FFDBusLibrary* loadLib(void)
+{
+    static FFDBusLibrary lib;
+    static bool loaded = false;
+    static bool loadSuccess = false;
+    static FFThreadMutex mutex = FF_THREAD_MUTEX_INITIALIZER;
+
+    ffThreadMutexLock(&mutex);
+
+    if(!loaded)
+    {
+        loaded = true;
+        loadSuccess = loadLibSymbols(&lib);
+    }
+
+    ffThreadMutexUnlock(&mutex);
+    return loadSuccess ? &lib : NULL;
+}
+
+const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data)
+{
+    data->lib = loadLib();
+    if(data->lib == NULL)
+        return "Failed to load DBus library";
+
+    data->connection = data->lib->ffdbus_bus_get(busType, NULL);
+    if(data->connection == NULL)
+        return "Failed to connect to DBus";
+
+    return NULL;
+}
+
+bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
+{
+    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
+
+    if(argType == DBUS_TYPE_STRING)
+    {
+        const char* value = NULL;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+
+        if(!ffStrSet(value))
+            return false;
+
+        ffStrbufAppendS(result, value);
+        return true;
+    }
+
+    if(argType != DBUS_TYPE_VARIANT && argType != DBUS_TYPE_ARRAY)
+        return false;
+
+    DBusMessageIter subIter;
+    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
+
+    if(argType == DBUS_TYPE_VARIANT)
+        return ffDBusGetValue(dbus, &subIter, result);
+
+    //At this point we have an array
+
+    bool foundAValue = false;
+
+    while(true)
+    {
+        if(ffDBusGetValue(dbus, &subIter, result))
+        {
+            foundAValue = true;
+            ffStrbufAppendS(result, ", ");
+        }
+
+        FF_DBUS_ITER_CONTINUE(dbus, &subIter);
+    }
+
+    if(foundAValue)
+        ffStrbufSubstrBefore(result, result->length - 2);
+
+    return foundAValue;
+}
+
+bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result)
+{
+    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
+
+    if(argType == DBUS_TYPE_BOOLEAN)
+    {
+        dbus_bool_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value != 0;
+        return true;
+    }
+
+    if(argType != DBUS_TYPE_VARIANT)
+        return false;
+
+    DBusMessageIter subIter;
+    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
+    return ffDBusGetBool(dbus, &subIter, result);
+}
+
+bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result)
+{
+    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
+
+    if(argType == DBUS_TYPE_BYTE)
+    {
+        dbus->lib->ffdbus_message_iter_get_basic(iter, result);
+        return true;
+    }
+
+    if(argType != DBUS_TYPE_VARIANT)
+        return false;
+
+    DBusMessageIter subIter;
+    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
+    return ffDBusGetByte(dbus, &subIter, result);
+}
+
+DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method)
+{
+    DBusMessage* message = dbus->lib->ffdbus_message_new_method_call(busName, objectPath, interface, method);
+    if(message == NULL)
+        return NULL;
+
+    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
+
+    dbus->lib->ffdbus_message_unref(message);
+
+    return reply;
+}
+
+DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property)
+{
+    DBusMessage* message = dbus->lib->ffdbus_message_new_method_call(busName, objectPath, "org.freedesktop.DBus.Properties", "Get");
+    if(message == NULL)
+        return NULL;
+
+    DBusMessageIter requestIterator;
+    dbus->lib->ffdbus_message_iter_init_append(message, &requestIterator);
+
+    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &interface))
+    {
+        dbus->lib->ffdbus_message_unref(message);
+        return NULL;
+    }
+
+    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &property))
+    {
+        dbus->lib->ffdbus_message_unref(message);
+        return NULL;
+    }
+
+    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
+
+    dbus->lib->ffdbus_message_unref(message);
+
+    return reply;
+}
+
+void ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result)
+{
+    DBusMessage* reply = ffDBusGetProperty(dbus, busName, objectPath, interface, property);
+    if(reply == NULL)
+        return;
+
+    DBusMessageIter rootIterator;
+    if(!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator))
+    {
+        dbus->lib->ffdbus_message_unref(reply);
+        return;
+    }
+
+    ffDBusGetValue(dbus, &rootIterator, result);
+
+    dbus->lib->ffdbus_message_unref(reply);
+}
+
+#endif //FF_HAVE_DBUS

src/common/dbus.h

@@ -0,0 +1,57 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_dbus
+#define FF_INCLUDED_common_dbus
+
+#ifdef FF_HAVE_DBUS
+#include <dbus/dbus.h>
+
+#include "util/FFstrbuf.h"
+#include "common/library.h"
+
+#define FF_DBUS_TIMEOUT_MILLISECONDS 35
+
+#define FF_DBUS_ITER_CONTINUE(dbus, iterator) \
+    { \
+        if(!(dbus)->lib->ffdbus_message_iter_has_next(iterator)) \
+            break; \
+        (dbus)->lib->ffdbus_message_iter_next(iterator); \
+        continue; \
+    }
+
+typedef struct FFDBusLibrary
+{
+    FF_LIBRARY_SYMBOL(dbus_bus_get)
+    FF_LIBRARY_SYMBOL(dbus_message_new_method_call)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_init)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_init_append)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_append_basic)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_get_arg_type)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_get_basic)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_recurse)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_has_next)
+    FF_LIBRARY_SYMBOL(dbus_message_iter_next)
+    FF_LIBRARY_SYMBOL(dbus_message_unref)
+    FF_LIBRARY_SYMBOL(dbus_connection_send_with_reply_and_block)
+    FF_LIBRARY_SYMBOL(dbus_connection_flush)
+    FF_LIBRARY_SYMBOL(dbus_pending_call_block)
+    FF_LIBRARY_SYMBOL(dbus_pending_call_steal_reply)
+    FF_LIBRARY_SYMBOL(dbus_pending_call_unref)
+} FFDBusLibrary;
+
+typedef struct FFDBusData
+{
+    const FFDBusLibrary* lib;
+    DBusConnection* connection;
+} FFDBusData;
+
+const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data); //Returns an error message or NULL on success
+bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result);
+bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result);
+bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result);
+DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method);
+DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property);
+void ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result);
+
+#endif // FF_HAVE_DBUS
+#endif // FF_INCLUDED_common_dbus

src/common/font.c

@@ -1,13 +1,15 @@
 #include "fastfetch.h"
+#include "common/font.h"
 
 #include <string.h>
 
-static void fontInit(FFfont* font)
+void ffFontInit(FFfont* font)
 {
+    // Ensure no memory allocates
     ffStrbufInit(&font->pretty);
     ffStrbufInit(&font->name);
-    ffStrbufInitA(&font->size, 4);
-    ffListInitA(&font->styles, sizeof(FFstrbuf), 4);
+    ffStrbufInit(&font->size);
+    ffListInit(&font->styles, sizeof(FFstrbuf));
 }
 
 static void fontInitPretty(FFfont* font)
@@ -43,7 +45,7 @@ static void fontInitPretty(FFfont* font)
 
 void ffFontInitQt(FFfont* font, const char* data)
 {
-    fontInit(font);
+    ffFontInit(font);
 
     //See https://doc.qt.io/qt-5/qfont.html#toString
 
@@ -180,7 +182,7 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern
 
 void ffFontInitPango(FFfont* font, const char* data)
 {
-    fontInit(font);
+    ffFontInit(font);
 
     while(*data != '\0' && *data != '`' && *data != '\\')
         fontPangoParseWord(&data, font, NULL);
@@ -188,10 +190,35 @@ void ffFontInitPango(FFfont* font, const char* data)
     fontInitPretty(font);
 }
 
+void ffFontInitValues(FFfont* font, const char* name, const char* size)
+{
+    ffFontInit(font);
+
+    ffStrbufAppendS(&font->name, name);
+    ffStrbufAppendS(&font->size, size);
+
+    fontInitPretty(font);
+}
+
 void ffFontInitCopy(FFfont* font, const char* name)
 {
-    fontInit(font);
-    ffStrbufAppendS(&font->name, name);
+    ffFontInitValues(font, name, NULL);
+}
+
+void ffFontInitWithSpace(FFfont* font, const char* rawName)
+{
+    const char* pspace = strrchr(rawName, ' ');
+    if(pspace == NULL)
+    {
+        ffFontInitCopy(font, rawName);
+        return;
+    }
+
+    ffFontInit(font);
+
+    ffStrbufAppendNS(&font->name, (uint32_t)(pspace - rawName), rawName);
+    ffStrbufAppendS(&font->size, pspace + 1);
+
     fontInitPretty(font);
 }
 

src/common/font.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_font
+#define FF_INCLUDED_common_font
+
+#include "util/FFstrbuf.h"
+#include "util/FFlist.h"
+
+typedef struct FFfont
+{
+    FFstrbuf pretty;
+    FFstrbuf name;
+    FFstrbuf size;
+    FFlist styles;
+} FFfont;
+
+void ffFontInit(FFfont* font);
+void ffFontInitQt(FFfont* font, const char* data);
+void ffFontInitPango(FFfont* font, const char* data);
+void ffFontInitCopy(FFfont* font, const char* name);
+void ffFontInitValues(FFfont* font, const char* name, const char* size);
+void ffFontInitWithSpace(FFfont* font, const char* rawName);
+void ffFontDestroy(FFfont* font);
+
+#endif

src/common/format.c

@@ -1,21 +1,31 @@
 #include "fastfetch.h"
+#include "common/format.h"
+#include "common/parsing.h"
+#include "util/textModifier.h"
+#include "util/stringUtils.h"
+
+#include <inttypes.h>
 
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
 {
     if(formatarg->type == FF_FORMAT_ARG_TYPE_INT)
         ffStrbufAppendF(buffer, "%i", *(int*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT)
-        ffStrbufAppendF(buffer, "%u", *(uint32_t*)formatarg->value);
+        ffStrbufAppendF(buffer, "%" PRIu32, *(uint32_t*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT16)
-        ffStrbufAppendF(buffer, "%hu", *(uint16_t*)formatarg->value);
+        ffStrbufAppendF(buffer, "%" PRIu16, *(uint16_t*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT8)
-        ffStrbufAppendF(buffer, "%hhu", *(uint8_t*)formatarg->value);
+        ffStrbufAppendF(buffer, "%" PRIu8, *(uint8_t*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_STRING)
         ffStrbufAppendS(buffer, (const char*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_STRBUF)
         ffStrbufAppend(buffer, (FFstrbuf*)formatarg->value);
+    else if(formatarg->type == FF_FORMAT_ARG_TYPE_FLOAT)
+        ffStrbufAppendF(buffer, "%f", *(float*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_DOUBLE)
         ffStrbufAppendF(buffer, "%g", *(double*)formatarg->value);
+    else if(formatarg->type == FF_FORMAT_ARG_TYPE_BOOL)
+        ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false");
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_LIST)
     {
         const FFlist* list = formatarg->value;
@@ -32,15 +42,14 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
     }
 }
 
-static inline bool placeholderValueIsForError(const FFstrbuf* placeholderValue)
-{
-    return
-        ffStrbufIgnCaseCompS(placeholderValue, "e") == 0 ||
-        ffStrbufIgnCaseCompS(placeholderValue, "error") == 0 ||
-        ffStrbufIgnCaseCompS(placeholderValue, "0") == 0
-    ;
-}
-
+/**
+ * @brief parses a string to a uint32_t
+ *
+ * If the string can't be parsed, or is < 1, uint32_t max is returned.
+ *
+ * @param placeholderValue the string to parse
+ * @return uint32_t the parsed value
+ */
 static inline uint32_t getArgumentIndex(const FFstrbuf* placeholderValue)
 {
     uint32_t result = UINT32_MAX;
@@ -48,7 +57,7 @@ static inline uint32_t getArgumentIndex(const FFstrbuf* placeholderValue)
     if(placeholderValue->chars[0] != '-')
         sscanf(placeholderValue->chars, "%u", &result);
 
-    return result;
+    return result == 0 ? UINT32_MAX : result;
 }
 
 static inline void appendInvalidPlaceholder(FFstrbuf* buffer, const char* start, const FFstrbuf* placeholderValue, uint32_t index, uint32_t formatStringLength)
@@ -62,26 +71,29 @@ static inline void appendInvalidPlaceholder(FFstrbuf* buffer, const char* start,
 
 static inline void appendEmptyPlaceholder(FFstrbuf* buffer, const char* placeholder, uint32_t* argCounter, uint32_t numArgs, const FFformatarg* arguments)
 {
-    if(*argCounter > numArgs)
+    if(*argCounter >= numArgs)
         ffStrbufAppendS(buffer, placeholder);
     else
-        ffFormatAppendFormatArg(buffer, &arguments[(*argCounter)++]);
+        ffFormatAppendFormatArg(buffer, arguments + *argCounter);
+
+    (*argCounter)++;
 }
 
 static inline bool formatArgSet(const FFformatarg* arg)
 {
     return arg->value != NULL && (
-        (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0) ||
+        (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0.0) || //Also is false for NaN
         (arg->type == FF_FORMAT_ARG_TYPE_INT && *(int*)arg->value > 0) ||
         (arg->type == FF_FORMAT_ARG_TYPE_STRBUF && ((FFstrbuf*)arg->value)->length > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_STRING && *(const char*)arg->value != '\0') ||
+        (arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet(arg->value)) ||
         (arg->type == FF_FORMAT_ARG_TYPE_UINT8 && *(uint8_t*)arg->value > 0) ||
         (arg->type == FF_FORMAT_ARG_TYPE_UINT16 && *(uint16_t*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0)
+        (arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0) ||
+        (arg->type == FF_FORMAT_ARG_TYPE_BOOL && arg->value != NULL)
     );
 }
 
-void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFstrbuf* error, uint32_t numArgs, const FFformatarg* arguments)
+void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments)
 {
     uint32_t argCounter = 0;
 
@@ -122,25 +134,14 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
             continue;
         }
 
-        FFstrbuf placeholderValue;
-        ffStrbufInit(&placeholderValue);
+        FF_STRBUF_AUTO_DESTROY placeholderValue = ffStrbufCreate();
 
         while(i < formatstr->length && formatstr->chars[i] != '}')
             ffStrbufAppendC(&placeholderValue, formatstr->chars[i++]);
 
-        // test for error, if so print it
-        if(placeholderValueIsForError(&placeholderValue)) {
-            ffStrbufAppend(buffer, error);
-            ffStrbufDestroy(&placeholderValue);
-            continue;
-        }
-
          // test if for stop, if so break the loop
         if(placeholderValue.length == 1 && placeholderValue.chars[0] == '-')
-        {
-            ffStrbufDestroy(&placeholderValue);
             break;
-        }
 
         // test for end of an if, if so do nothing
         if(placeholderValue.length == 1 && placeholderValue.chars[0] == '?')
@@ -150,7 +151,6 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
             else
                 --numOpenIfs;
 
-            ffStrbufDestroy(&placeholderValue);
             continue;
         }
 
@@ -162,7 +162,6 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
             else
                 --numOpenNotIfs;
 
-            ffStrbufDestroy(&placeholderValue);
             continue;
         }
 
@@ -177,7 +176,6 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
                 --numOpenColors;
             }
 
-            ffStrbufDestroy(&placeholderValue);
             continue;
         }
 
@@ -186,21 +184,12 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
         {
             ffStrbufSubstrAfter(&placeholderValue, 0);
 
-            // continue if an error is set
-            if(placeholderValueIsForError(&placeholderValue) && error != NULL && error->length > 0)
-            {
-                ++numOpenIfs;
-                ffStrbufDestroy(&placeholderValue);
-                continue;
-            }
-
             uint32_t index = getArgumentIndex(&placeholderValue);
 
             // testing for an invalid index
             if(index > numArgs)
             {
                 appendInvalidPlaceholder(buffer, "{?", &placeholderValue, i, formatstr->length);
-                ffStrbufDestroy(&placeholderValue);
                 continue;
             }
 
@@ -208,13 +197,11 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
             if(formatArgSet(&arguments[index - 1]))
             {
                 ++numOpenIfs;
-                ffStrbufDestroy(&placeholderValue);
                 continue;
             }
 
             // fastforward to the end of the if without printing the in between
             i = ffStrbufNextIndexS(formatstr, i, "{?}") + 2; // 2 is the length of "{?}" - 1 because the loop will increament it again directly after continue
-            ffStrbufDestroy(&placeholderValue);
             continue;
         }
 
@@ -223,21 +210,12 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
         {
             ffStrbufSubstrAfter(&placeholderValue, 0);
 
-            //continue if an error os not set
-            if(placeholderValueIsForError(&placeholderValue) && (error == NULL || error->length == 0))
-            {
-                ++numOpenNotIfs;
-                ffStrbufDestroy(&placeholderValue);
-                continue;
-            }
-
             uint32_t index = getArgumentIndex(&placeholderValue);
 
             // testing for an invalid index
             if(index > numArgs)
             {
                 appendInvalidPlaceholder(buffer, "{/", &placeholderValue, i, formatstr->length);
-                ffStrbufDestroy(&placeholderValue);
                 continue;
             }
 
@@ -245,13 +223,11 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
             if(!formatArgSet(&arguments[index - 1]))
             {
                 ++numOpenNotIfs;
-                ffStrbufDestroy(&placeholderValue);
                 continue;
             }
 
             // fastforward to the end of the if without printing the in between
             i = ffStrbufNextIndexS(formatstr, i, "{/}") + 2; // 2 is the length of "{/}" - 1 because the loop will increament it again directly after continue
-            ffStrbufDestroy(&placeholderValue);
             continue;
         }
 
@@ -263,7 +239,6 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
             ffStrbufAppendS(buffer, "\033[");
             ffStrbufAppend(buffer, &placeholderValue);
             ffStrbufAppendC(buffer, 'm');
-            ffStrbufDestroy(&placeholderValue);
             continue;
         }
 
@@ -273,13 +248,10 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, const FFst
         if(index > numArgs)
         {
             appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-            ffStrbufDestroy(&placeholderValue);
             continue;
         }
 
         ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
-
-        ffStrbufDestroy(&placeholderValue);
     }
 
     ffStrbufTrimRight(buffer, ' ');

src/common/format.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_format
+#define FF_INCLUDED_common_format
+
+typedef enum FFformatargtype
+{
+    FF_FORMAT_ARG_TYPE_NULL = 0,
+    FF_FORMAT_ARG_TYPE_UINT,
+    FF_FORMAT_ARG_TYPE_UINT16,
+    FF_FORMAT_ARG_TYPE_UINT8,
+    FF_FORMAT_ARG_TYPE_INT,
+    FF_FORMAT_ARG_TYPE_STRING,
+    FF_FORMAT_ARG_TYPE_STRBUF,
+    FF_FORMAT_ARG_TYPE_FLOAT,
+    FF_FORMAT_ARG_TYPE_DOUBLE,
+    FF_FORMAT_ARG_TYPE_LIST,
+    FF_FORMAT_ARG_TYPE_BOOL
+} FFformatargtype;
+
+typedef struct FFformatarg
+{
+    FFformatargtype type;
+    const void* value;
+} FFformatarg;
+
+void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
+void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
+
+#endif

src/common/init.c

@@ -1,289 +1,394 @@
 #include "fastfetch.h"
+#include "common/parsing.h"
+#include "common/thread.h"
+#include "detection/displayserver/displayserver.h"
+#include "util/textModifier.h"
+#include "logo/logo.h"
 
+#include <stdlib.h>
 #include <unistd.h>
-#include <sys/stat.h>
-#include <signal.h>
+#include <locale.h>
+#ifdef _WIN32
+    #include <windows.h>
+    #include "util/windows/unicode.h"
+#else
+    #include <signal.h>
+#endif
 
-static bool strbufEqualsAdapter(const void* first, const void* second)
-{
-    return ffStrbufComp(second, first) == 0;
-}
+#include "modules/modules.h"
 
-static void initConfigDirs(FFstate* state)
-{
-    ffListInit(&state->configDirs, sizeof(FFstrbuf));
-
-    const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
-    if(xdgConfigHome != NULL)
-    {
-        FFstrbuf* buffer = (FFstrbuf*) ffListAdd(&state->configDirs);
-        ffStrbufInitA(buffer, 64);
-        ffStrbufAppendS(buffer, xdgConfigHome);
-        ffStrbufTrimRight(buffer, '/');
-    }
-
-    FFstrbuf xdgConfigDirs;
-    ffStrbufInitA(&xdgConfigDirs, 64);
-    ffStrbufAppendS(&xdgConfigDirs, getenv("XDG_CONFIG_DIRS"));
-
-    #define FF_ENSURE_ONLY_ONCE_IN_LIST(element) \
-        if(ffListFirstIndexComp(&state->configDirs, element, strbufEqualsAdapter) < state->configDirs.length - 1) \
-            --state->configDirs.length;
-
-    FFstrbuf* userConfigHome = ffListAdd(&state->configDirs);
-    ffStrbufInitA(userConfigHome, 64);
-    ffStrbufAppendS(userConfigHome, state->passwd->pw_dir);
-    ffStrbufAppendS(userConfigHome, "/.config");
-    FF_ENSURE_ONLY_ONCE_IN_LIST(userConfigHome)
-
-    FFstrbuf* userHome = ffListAdd(&state->configDirs);
-    ffStrbufInitA(userHome, 64);
-    ffStrbufAppendS(userHome, state->passwd->pw_dir);
-    FF_ENSURE_ONLY_ONCE_IN_LIST(userHome)
-
-    uint32_t startIndex = 0;
-    while (startIndex < xdgConfigDirs.length)
-    {
-        uint32_t colonIndex = ffStrbufNextIndexC(&xdgConfigDirs, startIndex, ':');
-        xdgConfigDirs.chars[colonIndex] = '\0';
-
-        FFstrbuf* buffer = (FFstrbuf*) ffListAdd(&state->configDirs);
-        ffStrbufInitA(buffer, 64);
-        ffStrbufAppendS(buffer, xdgConfigDirs.chars + startIndex);
-        ffStrbufTrimRight(buffer, '/');
-        FF_ENSURE_ONLY_ONCE_IN_LIST(buffer);
-
-        startIndex = colonIndex + 1;
-    }
-
-    FFstrbuf* systemConfigHome = ffListAdd(&state->configDirs);
-    ffStrbufInitA(systemConfigHome, 64);
-    ffStrbufAppendS(systemConfigHome, FASTFETCH_TARGET_DIR_ROOT"/etc/xdg");
-    FF_ENSURE_ONLY_ONCE_IN_LIST(systemConfigHome)
-
-    FFstrbuf* systemConfig = ffListAdd(&state->configDirs);
-    ffStrbufInitA(systemConfig, 64);
-    ffStrbufAppendS(systemConfig, FASTFETCH_TARGET_DIR_ROOT"/etc");
-    FF_ENSURE_ONLY_ONCE_IN_LIST(systemConfig)
-
-    #undef FF_ENSURE_ONLY_ONCE_IN_LIST
-}
-
-static void initCacheDir(FFstate* state)
-{
-    ffStrbufInitA(&state->cacheDir, 64);
-
-    ffStrbufAppendS(&state->cacheDir, getenv("XDG_CACHE_HOME"));
-
-    if(state->cacheDir.length == 0)
-    {
-        ffStrbufAppendS(&state->cacheDir, state->passwd->pw_dir);
-        ffStrbufAppendS(&state->cacheDir, "/.cache/");
-    }
-    else if(!ffStrbufEndsWithC(&state->cacheDir, '/'))
-        ffStrbufAppendC(&state->cacheDir, '/');
-
-    mkdir(state->cacheDir.chars, S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH); //I hope everybody has a cache folder, but who knows
-
-    ffStrbufAppendS(&state->cacheDir, "fastfetch/");
-    mkdir(state->cacheDir.chars, S_IRWXU | S_IRGRP | S_IROTH);
-}
+FFinstance instance; // Global singleton
 
 static void initState(FFstate* state)
 {
     state->logoWidth = 0;
     state->logoHeight = 0;
     state->keysHeight = 0;
-    state->passwd = getpwuid(getuid());
-    uname(&state->utsname);
-    sysinfo(&state->sysinfo);
 
-    initConfigDirs(state);
-    initCacheDir(state);
+    ffPlatformInit(&state->platform);
+    state->configDoc = NULL;
 }
 
-static void defaultConfig(FFinstance* instance)
+static void defaultConfig(void)
 {
-    ffStrbufInit(&instance->config.logoSource);
-    instance->config.logoType = FF_LOGO_TYPE_AUTO;
-    for(uint8_t i = 0; i < (uint8_t) FASTFETCH_LOGO_MAX_COLORS; ++i)
-        ffStrbufInit(&instance->config.logoColors[i]);
-    instance->config.logoWidth = 0;
-    instance->config.logoHeight = 0; //preserve aspect ratio
-    instance->config.logoPaddingLeft = 0;
-    instance->config.logoPaddingRight = 4;
-    instance->config.logoPrintRemaining = true;
+    ffInitLogoOptions(&instance.config.logo);
 
-    ffStrbufInit(&instance->config.mainColor);
-    ffStrbufInit(&instance->config.separator);
-    ffStrbufAppendS(&instance->config.separator, ": ");
+    ffStrbufInit(&instance.config.colorKeys);
+    ffStrbufInit(&instance.config.colorTitle);
+    instance.config.brightColor = true;
+    ffStrbufInitStatic(&instance.config.keyValueSeparator, ": ");
+    instance.config.processingTimeout = 1000;
 
-    instance->config.showErrors = false;
-    instance->config.recache = false;
-    instance->config.cacheSave = true;
-    instance->config.allowSlowOperations = false;
-    instance->config.disableLinewrap = true;
-    instance->config.hideCursor = true;
+    #if defined(__linux__) || defined(__FreeBSD__)
+    ffStrbufInit(&instance.config.playerName);
+    ffStrbufInit(&instance.config.osFile);
+    instance.config.dsForceDrm = false;
+    #elif defined(_WIN32)
+    instance.config.wmiTimeout = 5000;
+    #endif
 
-    ffStrbufInitA(&instance->config.osFormat, 0);
-    ffStrbufInitA(&instance->config.osKey, 0);
-    ffStrbufInitA(&instance->config.hostFormat, 0);
-    ffStrbufInitA(&instance->config.hostKey, 0);
-    ffStrbufInitA(&instance->config.kernelFormat, 0);
-    ffStrbufInitA(&instance->config.kernelKey, 0);
-    ffStrbufInitA(&instance->config.uptimeFormat, 0);
-    ffStrbufInitA(&instance->config.uptimeKey, 0);
-    ffStrbufInitA(&instance->config.processesFormat, 0);
-    ffStrbufInitA(&instance->config.processesKey, 0);
-    ffStrbufInitA(&instance->config.packagesFormat, 0);
-    ffStrbufInitA(&instance->config.packagesKey, 0);
-    ffStrbufInitA(&instance->config.shellFormat, 0);
-    ffStrbufInitA(&instance->config.shellKey, 0);
-    ffStrbufInitA(&instance->config.resolutionFormat, 0);
-    ffStrbufInitA(&instance->config.resolutionKey, 0);
-    ffStrbufInitA(&instance->config.deFormat, 0);
-    ffStrbufInitA(&instance->config.deKey, 0);
-    ffStrbufInitA(&instance->config.wmFormat, 0);
-    ffStrbufInitA(&instance->config.wmKey, 0);
-    ffStrbufInitA(&instance->config.wmThemeFormat, 0);
-    ffStrbufInitA(&instance->config.wmThemeKey, 0);
-    ffStrbufInitA(&instance->config.themeFormat, 0);
-    ffStrbufInitA(&instance->config.themeKey, 0);
-    ffStrbufInitA(&instance->config.iconsFormat, 0);
-    ffStrbufInitA(&instance->config.iconsKey, 0);
-    ffStrbufInitA(&instance->config.fontFormat, 0);
-    ffStrbufInitA(&instance->config.fontKey, 0);
-    ffStrbufInitA(&instance->config.cursorKey, 0);
-    ffStrbufInitA(&instance->config.cursorFormat, 0);
-    ffStrbufInitA(&instance->config.terminalFormat, 0);
-    ffStrbufInitA(&instance->config.terminalKey, 0);
-    ffStrbufInitA(&instance->config.termFontFormat, 0);
-    ffStrbufInitA(&instance->config.termFontKey, 0);
-    ffStrbufInitA(&instance->config.cpuFormat, 0);
-    ffStrbufInitA(&instance->config.cpuKey, 0);
-    ffStrbufInitA(&instance->config.cpuUsageFormat, 0);
-    ffStrbufInitA(&instance->config.cpuUsageKey, 0);
-    ffStrbufInitA(&instance->config.gpuFormat, 0);
-    ffStrbufInitA(&instance->config.gpuKey, 0);
-    ffStrbufInitA(&instance->config.memoryFormat, 0);
-    ffStrbufInitA(&instance->config.memoryKey, 0);
-    ffStrbufInitA(&instance->config.diskFormat, 0);
-    ffStrbufInitA(&instance->config.diskKey, 0);
-    ffStrbufInitA(&instance->config.batteryFormat, 0);
-    ffStrbufInitA(&instance->config.batteryKey, 0);
-    ffStrbufInitA(&instance->config.localeFormat, 0);
-    ffStrbufInitA(&instance->config.localeKey, 0);
-    ffStrbufInitA(&instance->config.localIpKey, 0);
-    ffStrbufInitA(&instance->config.localIpFormat, 0);
-    ffStrbufInitA(&instance->config.publicIpKey, 0);
-    ffStrbufInitA(&instance->config.publicIpFormat, 0);
-    ffStrbufInitA(&instance->config.playerKey, 0);
-    ffStrbufInitA(&instance->config.playerFormat, 0);
-    ffStrbufInitA(&instance->config.songKey, 0);
-    ffStrbufInitA(&instance->config.songFormat, 0);
-    ffStrbufInitA(&instance->config.dateTimeKey, 0);
-    ffStrbufInitA(&instance->config.dateTimeFormat, 0);
-    ffStrbufInitA(&instance->config.dateKey, 0);
-    ffStrbufInitA(&instance->config.dateFormat, 0);
-    ffStrbufInitA(&instance->config.timeKey, 0);
-    ffStrbufInitA(&instance->config.timeFormat, 0);
+    instance.config.showErrors = false;
+    instance.config.allowSlowOperations = false;
+    instance.config.pipe = !isatty(STDOUT_FILENO);
 
-    ffStrbufInitA(&instance->config.libPCI, 0);
-    ffStrbufInitA(&instance->config.libVulkan, 0);
-    ffStrbufInitA(&instance->config.libWayland, 0);
-    ffStrbufInitA(&instance->config.libXcbRandr, 0);
-    ffStrbufInitA(&instance->config.libXcb, 0);
-    ffStrbufInitA(&instance->config.libXrandr, 0);
-    ffStrbufInitA(&instance->config.libX11, 0);
-    ffStrbufInitA(&instance->config.libGIO, 0);
-    ffStrbufInitA(&instance->config.libDConf, 0);
-    ffStrbufInitA(&instance->config.libDBus, 0);
-    ffStrbufInitA(&instance->config.libXFConf, 0);
-    ffStrbufInitA(&instance->config.libSQLite3, 0);
-    ffStrbufInitA(&instance->config.librpm, 0);
-    ffStrbufInitA(&instance->config.libImageMagick, 0);
-    ffStrbufInitA(&instance->config.libZ, 0);
-    ffStrbufInitA(&instance->config.libChafa, 0);
+    #ifdef NDEBUG
+    instance.config.disableLinewrap = !instance.config.pipe;
+    instance.config.hideCursor = !instance.config.pipe;
+    #else
+    instance.config.disableLinewrap = false;
+    instance.config.hideCursor = false;
+    #endif
 
-    ffStrbufInitA(&instance->config.diskFolders, 0);
+    instance.config.escapeBedrock = true;
+    instance.config.binaryPrefixType = FF_BINARY_PREFIX_TYPE_IEC;
+    instance.config.sizeNdigits = 2;
+    instance.config.sizeMaxPrefix = UINT8_MAX;
+    instance.config.temperatureUnit = FF_TEMPERATURE_UNIT_CELSIUS;
+    instance.config.multithreading = true;
+    instance.config.stat = false;
+    instance.config.noBuffer = false;
+    instance.config.keyWidth = 0;
 
-    ffStrbufInitA(&instance->config.batteryDir, 0);
+    ffStrbufInitStatic(&instance.config.barCharElapsed, "■");
+    ffStrbufInitStatic(&instance.config.barCharTotal, "-");
+    instance.config.barWidth = 10;
+    instance.config.barBorder = true;
+    instance.config.percentType = 1;
 
-    ffStrbufInitA(&instance->config.separatorString, 0);
+    ffInitBatteryOptions(&instance.config.battery);
+    ffInitBiosOptions(&instance.config.bios);
+    ffInitBluetoothOptions(&instance.config.bluetooth);
+    ffInitBoardOptions(&instance.config.board);
+    ffInitBreakOptions(&instance.config.break_);
+    ffInitBrightnessOptions(&instance.config.brightness);
+    ffInitCPUOptions(&instance.config.cpu);
+    ffInitCPUUsageOptions(&instance.config.cpuUsage);
+    ffInitChassisOptions(&instance.config.chassis);
+    ffInitColorsOptions(&instance.config.colors);
+    ffInitCommandOptions(&instance.config.command);
+    ffInitCursorOptions(&instance.config.cursor);
+    ffInitCustomOptions(&instance.config.custom);
+    ffInitDEOptions(&instance.config.de);
+    ffInitDateTimeOptions(&instance.config.dateTime);
+    ffInitDiskOptions(&instance.config.disk);
+    ffInitDisplayOptions(&instance.config.display);
+    ffInitFontOptions(&instance.config.font);
+    ffInitGPUOptions(&instance.config.gpu);
+    ffInitGamepadOptions(&instance.config.gamepad);
+    ffInitHostOptions(&instance.config.host);
+    ffInitIconsOptions(&instance.config.icons);
+    ffInitKernelOptions(&instance.config.kernel);
+    ffInitLMOptions(&instance.config.lm);
+    ffInitLocalIpOptions(&instance.config.localIP);
+    ffInitLocaleOptions(&instance.config.locale);
+    ffInitMediaOptions(&instance.config.media);
+    ffInitMemoryOptions(&instance.config.memory);
+    ffInitMonitorOptions(&instance.config.monitor);
+    ffInitOSOptions(&instance.config.os);
+    ffInitOpenCLOptions(&instance.config.openCL);
+    ffInitOpenGLOptions(&instance.config.openGL);
+    ffInitPackagesOptions(&instance.config.packages);
+    ffInitPlayerOptions(&instance.config.player);
+    ffInitPowerAdapterOptions(&instance.config.powerAdapter);
+    ffInitProcessesOptions(&instance.config.processes);
+    ffInitPublicIpOptions(&instance.config.publicIP);
+    ffInitSeparatorOptions(&instance.config.separator);
+    ffInitShellOptions(&instance.config.shell);
+    ffInitSoundOptions(&instance.config.sound);
+    ffInitSwapOptions(&instance.config.swap);
+    ffInitTerminalFontOptions(&instance.config.terminalFont);
+    ffInitTerminalOptions(&instance.config.terminal);
+    ffInitTerminalSizeOptions(&instance.config.terminalSize);
+    ffInitThemeOptions(&instance.config.theme);
+    ffInitTitleOptions(&instance.config.title);
+    ffInitUptimeOptions(&instance.config.uptime);
+    ffInitUsersOptions(&instance.config.users);
+    ffInitVersionOptions(&instance.config.version);
+    ffInitVulkanOptions(&instance.config.vulkan);
+    ffInitWMOptions(&instance.config.wm);
+    ffInitWMThemeOptions(&instance.config.wmTheme);
+    ffInitWallpaperOptions(&instance.config.wallpaper);
+    ffInitWeatherOptions(&instance.config.weather);
+    ffInitWifiOptions(&instance.config.wifi);
 
-    instance->config.localIpShowIpV4 = true;
-    instance->config.localIpShowIpV6 = false;
-    instance->config.localIpShowLoop = false;
-
-    instance->config.publicIpTimeout = 0;
-
-    ffStrbufInitA(&instance->config.osFile, 0);
-
-    ffStrbufInitA(&instance->config.playerName, 0);
+    ffStrbufInit(&instance.config.libPCI);
+    ffStrbufInit(&instance.config.libVulkan);
+    ffStrbufInit(&instance.config.libWayland);
+    ffStrbufInit(&instance.config.libXcbRandr);
+    ffStrbufInit(&instance.config.libXcb);
+    ffStrbufInit(&instance.config.libXrandr);
+    ffStrbufInit(&instance.config.libX11);
+    ffStrbufInit(&instance.config.libGIO);
+    ffStrbufInit(&instance.config.libDConf);
+    ffStrbufInit(&instance.config.libDBus);
+    ffStrbufInit(&instance.config.libXFConf);
+    ffStrbufInit(&instance.config.libSQLite3);
+    ffStrbufInit(&instance.config.librpm);
+    ffStrbufInit(&instance.config.libImageMagick);
+    ffStrbufInit(&instance.config.libZ);
+    ffStrbufInit(&instance.config.libChafa);
+    ffStrbufInit(&instance.config.libEGL);
+    ffStrbufInit(&instance.config.libGLX);
+    ffStrbufInit(&instance.config.libOSMesa);
+    ffStrbufInit(&instance.config.libOpenCL);
+    ffStrbufInit(&instance.config.libfreetype);
+    ffStrbufInit(&instance.config.libPulse);
+    ffStrbufInit(&instance.config.libnm);
+    ffStrbufInit(&instance.config.libDdcutil);
 }
 
-void ffInitInstance(FFinstance* instance)
+void ffInitInstance(void)
 {
-    initState(&instance->state);
-    defaultConfig(instance);
+    #ifdef WIN32
+        //https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/setlocale-wsetlocale?source=recommendations&view=msvc-170#utf-8-support
+        setlocale(LC_ALL, ".UTF8");
+    #else
+        // used for mbsrtowcs in Module `separator`
+        setlocale(LC_ALL, "");
+    #endif
+
+    initState(&instance.state);
+    defaultConfig();
 }
 
-static void resetConsole(bool disableLinewrap, bool hideCursor)
+#if defined(FF_HAVE_THREADS) && !(defined(__APPLE__) || defined(_WIN32) || defined(__ANDROID__))
+
+#include "detection/gtk_qt/gtk_qt.h"
+
+#define FF_START_DETECTION_THREADS
+
+FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(ffConnectDisplayServer)
+FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(ffDetectQt)
+FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(ffDetectGTK2)
+FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(ffDetectGTK3)
+FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(ffDetectGTK4)
+
+void startDetectionThreads(void)
 {
-    if(disableLinewrap)
-        fputs("\033[?7h", stdout);
-
-    if(hideCursor)
-        fputs("\033[?25h", stdout);
+    ffThreadDetach(ffThreadCreate(ffConnectDisplayServerThreadMain, NULL));
+    ffThreadDetach(ffThreadCreate(ffDetectQtThreadMain, NULL));
+    ffThreadDetach(ffThreadCreate(ffDetectGTK2ThreadMain, NULL));
+    ffThreadDetach(ffThreadCreate(ffDetectGTK3ThreadMain, NULL));
+    ffThreadDetach(ffThreadCreate(ffDetectGTK4ThreadMain, NULL));
 }
 
+#endif //FF_HAVE_THREADS
+
 static volatile bool ffDisableLinewrap = true;
 static volatile bool ffHideCursor = true;
 
+static void resetConsole(void)
+{
+    if(ffDisableLinewrap)
+        fputs("\033[?7h", stdout);
+
+    if(ffHideCursor)
+        fputs("\033[?25h", stdout);
+
+    #if defined(_WIN32)
+        fflush(stdout);
+    #endif
+}
+
+#ifdef _WIN32
+BOOL WINAPI consoleHandler(DWORD signal)
+{
+    FF_UNUSED(signal);
+    resetConsole();
+    exit(0);
+}
+#else
 static void exitSignalHandler(int signal)
 {
     FF_UNUSED(signal);
-    resetConsole(ffDisableLinewrap, ffHideCursor);
+    resetConsole();
     exit(0);
 }
+#endif
 
-void ffStart(FFinstance* instance)
+void ffStart(void)
 {
-    ffDisableLinewrap = instance->config.disableLinewrap;
-    ffHideCursor = instance->config.hideCursor;
+    #ifdef FF_START_DETECTION_THREADS
+        if(instance.config.multithreading)
+            startDetectionThreads();
+    #endif
 
-    struct sigaction action = {};
-    action.sa_handler = exitSignalHandler;
+    ffDisableLinewrap = instance.config.disableLinewrap && !instance.config.pipe;
+    ffHideCursor = instance.config.hideCursor && !instance.config.pipe;
 
+    #ifdef _WIN32
+    if (!instance.config.noBuffer) setvbuf(stdout, NULL, _IOFBF, 4096);
+    SetConsoleCtrlHandler(consoleHandler, TRUE);
+    HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
+    DWORD mode = 0;
+    GetConsoleMode(hStdout, &mode);
+    SetConsoleMode(hStdout, mode | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+    SetConsoleOutputCP(CP_UTF8);
+    #else
+    if (instance.config.noBuffer) setvbuf(stdout, NULL, _IONBF, 0);
+    struct sigaction action = { .sa_handler = exitSignalHandler };
     sigaction(SIGINT, &action, NULL);
     sigaction(SIGTERM, &action, NULL);
     sigaction(SIGQUIT, &action, NULL);
-
-    //We do the cache validation here, so we can skip it if --recache is given
-    ffCacheValidate(instance);
+    #endif
 
     //reset everything to default before we start printing
-    fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+    if(!instance.config.pipe)
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
 
-    if(instance->config.hideCursor)
+    if(ffHideCursor)
         fputs("\033[?25l", stdout);
 
-    if(instance->config.disableLinewrap)
+    if(ffDisableLinewrap)
         fputs("\033[?7l", stdout);
 
-    ffPrintLogo(instance);
+    ffLogoPrint();
 }
 
-void ffFinish(FFinstance* instance)
+void ffFinish(void)
 {
-    ffPrintRemainingLogo(instance);
-    resetConsole(instance->config.disableLinewrap, instance->config.hideCursor);
+    if(instance.config.logo.printRemaining)
+        ffLogoPrintRemaining();
+
+    resetConsole();
+}
+
+static void destroyConfig(void)
+{
+    ffDestroyLogoOptions(&instance.config.logo);
+
+    ffStrbufDestroy(&instance.config.colorKeys);
+    ffStrbufDestroy(&instance.config.colorTitle);
+    ffStrbufDestroy(&instance.config.keyValueSeparator);
+    ffStrbufDestroy(&instance.config.barCharElapsed);
+    ffStrbufDestroy(&instance.config.barCharTotal);
+
+    #if defined(__linux__) || defined(__FreeBSD__)
+    ffStrbufDestroy(&instance.config.playerName);
+    ffStrbufDestroy(&instance.config.osFile);
+    #endif
+
+    ffDestroyBatteryOptions(&instance.config.battery);
+    ffDestroyBiosOptions(&instance.config.bios);
+    ffDestroyBluetoothOptions(&instance.config.bluetooth);
+    ffDestroyBoardOptions(&instance.config.board);
+    ffDestroyBreakOptions(&instance.config.break_);
+    ffDestroyBrightnessOptions(&instance.config.brightness);
+    ffDestroyCPUOptions(&instance.config.cpu);
+    ffDestroyCPUUsageOptions(&instance.config.cpuUsage);
+    ffDestroyChassisOptions(&instance.config.chassis);
+    ffDestroyColorsOptions(&instance.config.colors);
+    ffDestroyCommandOptions(&instance.config.command);
+    ffDestroyCursorOptions(&instance.config.cursor);
+    ffDestroyCustomOptions(&instance.config.custom);
+    ffDestroyDEOptions(&instance.config.de);
+    ffDestroyDateTimeOptions(&instance.config.dateTime);
+    ffDestroyDiskOptions(&instance.config.disk);
+    ffDestroyDisplayOptions(&instance.config.display);
+    ffDestroyFontOptions(&instance.config.font);
+    ffDestroyGPUOptions(&instance.config.gpu);
+    ffDestroyGamepadOptions(&instance.config.gamepad);
+    ffDestroyHostOptions(&instance.config.host);
+    ffDestroyIconsOptions(&instance.config.icons);
+    ffDestroyKernelOptions(&instance.config.kernel);
+    ffDestroyLMOptions(&instance.config.lm);
+    ffDestroyLocalIpOptions(&instance.config.localIP);
+    ffDestroyLocaleOptions(&instance.config.locale);
+    ffDestroyMediaOptions(&instance.config.media);
+    ffDestroyMemoryOptions(&instance.config.memory);
+    ffDestroyMonitorOptions(&instance.config.monitor);
+    ffDestroyOSOptions(&instance.config.os);
+    ffDestroyOpenCLOptions(&instance.config.openCL);
+    ffDestroyOpenGLOptions(&instance.config.openGL);
+    ffDestroyPackagesOptions(&instance.config.packages);
+    ffDestroyPlayerOptions(&instance.config.player);
+    ffDestroyPowerAdapterOptions(&instance.config.powerAdapter);
+    ffDestroyProcessesOptions(&instance.config.processes);
+    ffDestroyPublicIpOptions(&instance.config.publicIP);
+    ffDestroySeparatorOptions(&instance.config.separator);
+    ffDestroyShellOptions(&instance.config.shell);
+    ffDestroySoundOptions(&instance.config.sound);
+    ffDestroySwapOptions(&instance.config.swap);
+    ffDestroyTerminalFontOptions(&instance.config.terminalFont);
+    ffDestroyTerminalOptions(&instance.config.terminal);
+    ffDestroyTerminalSizeOptions(&instance.config.terminalSize);
+    ffDestroyThemeOptions(&instance.config.theme);
+    ffDestroyTitleOptions(&instance.config.title);
+    ffDestroyUptimeOptions(&instance.config.uptime);
+    ffDestroyUsersOptions(&instance.config.users);
+    ffDestroyVersionOptions(&instance.config.version);
+    ffDestroyVulkanOptions(&instance.config.vulkan);
+    ffDestroyWMOptions(&instance.config.wm);
+    ffDestroyWMThemeOptions(&instance.config.wmTheme);
+    ffDestroyWallpaperOptions(&instance.config.wallpaper);
+    ffDestroyWeatherOptions(&instance.config.weather);
+    ffDestroyWifiOptions(&instance.config.wifi);
+
+    ffStrbufDestroy(&instance.config.libPCI);
+    ffStrbufDestroy(&instance.config.libVulkan);
+    ffStrbufDestroy(&instance.config.libWayland);
+    ffStrbufDestroy(&instance.config.libXcbRandr);
+    ffStrbufDestroy(&instance.config.libXcb);
+    ffStrbufDestroy(&instance.config.libXrandr);
+    ffStrbufDestroy(&instance.config.libX11);
+    ffStrbufDestroy(&instance.config.libGIO);
+    ffStrbufDestroy(&instance.config.libDConf);
+    ffStrbufDestroy(&instance.config.libDBus);
+    ffStrbufDestroy(&instance.config.libXFConf);
+    ffStrbufDestroy(&instance.config.libSQLite3);
+    ffStrbufDestroy(&instance.config.librpm);
+    ffStrbufDestroy(&instance.config.libImageMagick);
+    ffStrbufDestroy(&instance.config.libZ);
+    ffStrbufDestroy(&instance.config.libChafa);
+    ffStrbufDestroy(&instance.config.libEGL);
+    ffStrbufDestroy(&instance.config.libGLX);
+    ffStrbufDestroy(&instance.config.libOSMesa);
+    ffStrbufDestroy(&instance.config.libOpenCL);
+    ffStrbufDestroy(&instance.config.libfreetype);
+    ffStrbufDestroy(&instance.config.libPulse);
+    ffStrbufDestroy(&instance.config.libnm);
+    ffStrbufDestroy(&instance.config.libDdcutil);
+}
+
+static void destroyState(void)
+{
+    ffPlatformDestroy(&instance.state.platform);
+    yyjson_doc_free(instance.state.configDoc);
+}
+
+void ffDestroyInstance(void)
+{
+    destroyConfig();
+    destroyState();
 }
 
 //Must be in a file compiled with the libfastfetch target, because the FF_HAVE* macros are not defined for the executable targets
-void ffListFeatures()
+void ffListFeatures(void)
 {
     fputs(
+        #ifdef FF_HAVE_THREADS
+            "threads\n"
+        #endif
         #ifdef FF_HAVE_LIBPCI
             "libpci\n"
         #endif
@@ -335,6 +440,30 @@ void ffListFeatures()
         #ifdef FF_HAVE_RPM
             "rpm\n"
         #endif
+        #ifdef FF_HAVE_EGL
+            "egl\n"
+        #endif
+        #ifdef FF_HAVE_GLX
+            "glx\n"
+        #endif
+        #ifdef FF_HAVE_OSMESA
+            "osmesa\n"
+        #endif
+        #ifdef FF_HAVE_OPENCL
+            "opencl\n"
+        #endif
+        #ifdef FF_HAVE_FREETYPE
+            "freetype\n"
+        #endif
+        #ifdef FF_HAVE_PULSE
+            "libpulse\n"
+        #endif
+        #ifdef FF_HAVE_LIBNM
+            "libnm\n"
+        #endif
+        #ifdef FF_HAVE_DDCUTIL
+            "libddcutil\n"
+        #endif
         ""
     , stdout);
 }

src/common/io.c

@@ -1,171 +0,0 @@
-#include "fastfetch.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <termios.h>
-#include <poll.h>
-
-bool ffWriteFDContent(int fd, const FFstrbuf* content)
-{
-    return write(fd, content->chars, content->length) != -1;
-}
-
-static void createSubfolders(const char* fileName)
-{
-    FFstrbuf path;
-    ffStrbufInit(&path);
-
-    while(*fileName != '\0')
-    {
-        ffStrbufAppendC(&path, *fileName);
-        if(*fileName == '/')
-            mkdir(path.chars, S_IRWXU | S_IRGRP | S_IROTH);
-        ++fileName;
-    }
-
-    ffStrbufDestroy(&path);
-}
-
-bool ffWriteFileContent(const char* fileName, const FFstrbuf* content)
-{
-    int openFlagsModes = O_WRONLY | O_CREAT | O_TRUNC;
-    int openFlagsRights = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
-
-    int fd = open(fileName, openFlagsModes, openFlagsRights);
-    if(fd == -1)
-    {
-        createSubfolders(fileName);
-        fd = open(fileName, openFlagsModes, openFlagsRights);
-        if(fd == -1)
-            return false;
-    }
-
-    bool ret = ffWriteFDContent(fd, content);
-
-    close(fd);
-
-    return ret;
-}
-
-void ffAppendFDContent(int fd, FFstrbuf* buffer)
-{
-    ssize_t readed = 0;
-
-    ffStrbufEnsureFree(buffer, 31); // 32 - 1 for the null terminator
-    uint32_t free = ffStrbufGetFree(buffer);
-
-    while(
-        (readed = read(fd, buffer->chars + buffer->length, free)) > 0 &&
-        (uint32_t) readed == free
-    ) {
-        buffer->length += (uint32_t) readed;
-        ffStrbufEnsureCapacity(buffer, (buffer->allocated * 2) - 1); // -1 for null terminator
-        free = ffStrbufGetFree(buffer);
-    }
-
-    // In case of failure, read returns -1. We don't want to substract the length of the buffer.
-    if(readed > 0)
-        buffer->length += (uint32_t) readed;
-
-    buffer->chars[buffer->length] = '\0';
-
-    ffStrbufTrimRight(buffer, '\n');
-    ffStrbufTrimRight(buffer, ' ');
-}
-
-bool ffAppendFileContent(const char* fileName, FFstrbuf* buffer)
-{
-    int fd = open(fileName, O_RDONLY);
-    if(fd == -1)
-        return false;
-
-    ffAppendFDContent(fd, buffer);
-
-    close(fd);
-    return true;
-}
-
-bool ffGetFileContent(const char* fileName, FFstrbuf* buffer)
-{
-    ffStrbufClear(buffer);
-    return ffAppendFileContent(fileName, buffer);
-}
-
-// Not thread safe!
-void ffSuppressIO(bool suppress)
-{
-    static bool init = false;
-    static int origOut = -1;
-    static int origErr = -1;
-    static int nullFile = -1;
-
-    if(!init)
-    {
-        if(!suppress)
-            return;
-
-        origOut = dup(STDOUT_FILENO);
-        origErr = dup(STDERR_FILENO);
-        nullFile = open("/dev/null", O_WRONLY);
-        init = true;
-    }
-
-    if(nullFile == -1)
-        return;
-
-    fflush(stdout);
-    fflush(stderr);
-
-    dup2(suppress ? nullFile : origOut, STDOUT_FILENO);
-    dup2(suppress ? nullFile : origErr, STDERR_FILENO);
-}
-
-bool ffFileExists(const char* fileName, mode_t mode)
-{
-    struct stat fileStat;
-    return stat(fileName, &fileStat) == 0 && ((fileStat.st_mode & S_IFMT) == mode);
-}
-
-void ffGetTerminalResponse(const char* request, const char* format, ...)
-{
-    struct termios oldTerm, newTerm;
-    if(tcgetattr(STDIN_FILENO, &oldTerm) == -1)
-        return;
-
-    newTerm = oldTerm;
-    newTerm.c_lflag &= (tcflag_t) ~(ICANON | ECHO);
-    if(tcsetattr(STDIN_FILENO, TCSANOW, &newTerm) == -1)
-        return;
-
-    fputs(request, stdout);
-    fflush(stdout);
-
-    struct pollfd pfd;
-    pfd.fd = STDIN_FILENO;
-    pfd.events = POLLIN;
-    pfd.revents = 0;
-
-    //Give the terminal 35ms to respond
-    if(poll(&pfd, 1, 35) <= 0)
-    {
-        tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
-        return;
-    }
-
-    char buffer[512];
-    ssize_t readed = read(STDIN_FILENO, buffer, sizeof(buffer) - 1);
-
-    tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
-
-    if(readed <= 0)
-        return;
-
-    buffer[readed] = '\0';
-
-    va_list args;
-    va_start(args, format);
-    vsscanf(buffer, format, args);
-    va_end(args);
-}

src/common/io/io.h

@@ -0,0 +1,133 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_io_io
+#define FF_INCLUDED_common_io_io
+
+#include "util/FFstrbuf.h"
+
+#ifdef _WIN32
+    #include <fileapi.h>
+    #include <handleapi.h>
+    #include <io.h>
+    typedef HANDLE FFNativeFD;
+#else
+    #include <unistd.h>
+    typedef int FFNativeFD;
+#endif
+
+static inline FFNativeFD FFUnixFD2NativeFD(int unixfd)
+{
+    #ifndef _WIN32
+        return unixfd;
+    #else
+        return (FFNativeFD) _get_osfhandle(unixfd);
+    #endif
+}
+
+static inline bool ffWriteFDData(FFNativeFD fd, size_t dataSize, const void* data)
+{
+    #ifndef _WIN32
+        return write(fd, data, dataSize) != -1;
+    #else
+        DWORD written;
+        return WriteFile(fd, data, (DWORD) dataSize, &written, NULL) && written == dataSize;
+    #endif
+}
+
+static inline bool ffWriteFDBuffer(FFNativeFD fd, const FFstrbuf* content)
+{
+    return ffWriteFDData(fd, content->length, content->chars);
+}
+
+bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data);
+
+static inline bool ffWriteFileBuffer(const char* fileName, const FFstrbuf* buffer)
+{
+    return ffWriteFileData(fileName, buffer->length, buffer->chars);
+}
+
+static inline ssize_t ffReadFDData(FFNativeFD fd, size_t dataSize, void* data)
+{
+    #ifndef _WIN32
+        return read(fd, data, dataSize);
+    #else
+        DWORD readed;
+        if(!ReadFile(fd, data, (DWORD)dataSize, &readed, NULL))
+            return -1;
+
+        return (ssize_t)readed;
+    #endif
+}
+
+ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data);
+
+bool ffAppendFDBuffer(FFNativeFD fd, FFstrbuf* buffer);
+bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer);
+
+static inline bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer)
+{
+    ffStrbufClear(buffer);
+    return ffAppendFileBuffer(fileName, buffer);
+}
+
+//Bit flags, combine with |
+typedef enum FFPathType
+{
+    FF_PATHTYPE_REGULAR = 1,
+    FF_PATHTYPE_LINK = 2,
+    FF_PATHTYPE_DIRECTORY = 4
+} FFPathType;
+
+#define FF_PATHTYPE_FILE (FF_PATHTYPE_REGULAR | FF_PATHTYPE_LINK)
+#define FF_PATHTYPE_ANY (FF_PATHTYPE_FILE | FF_PATHTYPE_DIRECTORY)
+
+bool ffPathExists(const char* path, FFPathType pathType);
+bool ffPathExpandEnv(const char* in, FFstrbuf* out);
+
+FF_C_SCANF(2, 3)
+const char* ffGetTerminalResponse(const char* request, const char* format, ...);
+
+// Not thread safe!
+bool ffSuppressIO(bool suppress);
+
+static inline void ffUnsuppressIO(bool* suppressed)
+{
+    if (!*suppressed) return;
+    ffSuppressIO(false);
+    *suppressed = false;
+}
+
+#define FF_SUPPRESS_IO() bool __attribute__((__cleanup__(ffUnsuppressIO), __unused__)) io_suppressed__ = ffSuppressIO(true)
+
+void ffListFilesRecursively(const char* path);
+
+static inline bool wrapClose(FFNativeFD* pfd)
+{
+    assert(pfd);
+
+    #ifndef WIN32
+        if (*pfd < 0)
+            return false;
+        close(*pfd);
+    #else
+        // https://devblogs.microsoft.com/oldnewthing/20040302-00/?p=40443
+        if (*pfd == NULL || *pfd == INVALID_HANDLE_VALUE)
+            return false;
+        CloseHandle(*pfd);
+    #endif
+
+    return true;
+}
+#define FF_AUTO_CLOSE_FD __attribute__((__cleanup__(wrapClose)))
+
+static inline bool wrapFclose(FILE** pfile)
+{
+    assert(pfile);
+    if (!*pfile)
+        return false;
+    fclose(*pfile);
+    return true;
+}
+#define FF_AUTO_CLOSE_FILE __attribute__((__cleanup__(wrapFclose)))
+
+#endif // FF_INCLUDED_common_io_io

src/common/io/io_unix.c

@@ -0,0 +1,247 @@
+#include "io.h"
+#include "util/stringUtils.h"
+#include "util/unused.h"
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <termios.h>
+#include <poll.h>
+#include <dirent.h>
+
+#if __has_include(<wordexp.h>)
+#include <wordexp.h>
+#endif
+
+static void createSubfolders(const char* fileName)
+{
+    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
+
+    while(*fileName != '\0')
+    {
+        ffStrbufAppendC(&path, *fileName);
+        if(*fileName == '/')
+            mkdir(path.chars, S_IRWXU | S_IRGRP | S_IROTH);
+        ++fileName;
+    }
+}
+
+bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
+{
+    int openFlagsModes = O_WRONLY | O_CREAT | O_TRUNC;
+    int openFlagsRights = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+
+    int FF_AUTO_CLOSE_FD fd = open(fileName, openFlagsModes, openFlagsRights);
+    if(fd == -1)
+    {
+        createSubfolders(fileName);
+        fd = open(fileName, openFlagsModes, openFlagsRights);
+        if(fd == -1)
+            return false;
+    }
+
+    return write(fd, data, dataSize) > 0;
+}
+
+bool ffAppendFDBuffer(int fd, FFstrbuf* buffer)
+{
+    ssize_t readed = 0;
+
+    struct stat fileInfo;
+    if(fstat(fd, &fileInfo) != 0)
+        return false;
+
+    ffStrbufEnsureFree(buffer, fileInfo.st_size > 0 ? (uint32_t)fileInfo.st_size : 31);
+    uint32_t free = ffStrbufGetFree(buffer);
+
+    while(
+        (readed = read(fd, buffer->chars + buffer->length, free)) > 0 &&
+        (uint32_t) readed == free
+    ) {
+        buffer->length += (uint32_t) readed;
+        ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
+        free = ffStrbufGetFree(buffer);
+    }
+
+    // In case of failure, read returns -1. We don't want to substract the length of the buffer.
+    if(readed > 0)
+        buffer->length += (uint32_t) readed;
+
+    buffer->chars[buffer->length] = '\0';
+
+    ffStrbufTrimRight(buffer, '\n');
+    ffStrbufTrimRight(buffer, ' ');
+
+    return readed >= 0;
+}
+
+ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
+{
+    int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY);
+    if(fd == -1)
+        return -1;
+
+    return ffReadFDData(fd, dataSize, data);
+}
+
+bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
+{
+    int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY);
+    if(fd == -1)
+        return false;
+
+    return ffAppendFDBuffer(fd, buffer);
+}
+
+bool ffPathExists(const char* path, FFPathType type)
+{
+    struct stat fileStat;
+    if(stat(path, &fileStat) != 0)
+        return false;
+
+    int mode = fileStat.st_mode & S_IFMT;
+
+    if(type & FF_PATHTYPE_REGULAR && mode == S_IFREG)
+        return true;
+
+    if(type & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
+        return true;
+
+    if(type & FF_PATHTYPE_LINK && mode == S_IFLNK)
+        return true;
+
+    return false;
+}
+
+bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* out)
+{
+    bool result = false;
+
+    #if __has_include(<wordexp.h>) // https://github.com/termux/termux-packages/pull/7056
+
+    wordexp_t exp;
+    if(wordexp(in, &exp, WRDE_NOCMD) != 0)
+        return false;
+
+    if (exp.we_wordc == 1)
+    {
+        result = true;
+        ffStrbufSetS(out, exp.we_wordv[0]);
+    }
+
+    wordfree(&exp);
+
+    #endif
+
+    return result;
+}
+
+const char* ffGetTerminalResponse(const char* request, const char* format, ...)
+{
+    struct termios oldTerm, newTerm;
+    if(tcgetattr(STDIN_FILENO, &oldTerm) == -1)
+        return "tcgetattr(STDIN_FILENO, &oldTerm) failed";
+
+    newTerm = oldTerm;
+    newTerm.c_lflag &= (tcflag_t) ~(ICANON | ECHO);
+    if(tcsetattr(STDIN_FILENO, TCSANOW, &newTerm) == -1)
+        return "tcsetattr(STDIN_FILENO, TCSANOW, &newTerm)";
+
+    fputs(request, stdout);
+    fflush(stdout);
+
+    //Give the terminal 35ms to respond
+    if(poll(&(struct pollfd) { .fd = STDIN_FILENO, .events = POLLIN }, 1, 35) <= 0)
+    {
+        tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
+        return "poll() timeout or failed";
+    }
+
+    char buffer[512];
+    ssize_t readed = read(STDIN_FILENO, buffer, sizeof(buffer) - 1);
+
+    tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
+
+    if(readed <= 0)
+        return "read(STDIN_FILENO, buffer, sizeof(buffer) - 1) failed";
+
+    buffer[readed] = '\0';
+
+    va_list args;
+    va_start(args, format);
+    vsscanf(buffer, format, args);
+    va_end(args);
+
+    return NULL;
+}
+
+bool ffSuppressIO(bool suppress)
+{
+    static bool init = false;
+    static int origOut = -1;
+    static int origErr = -1;
+    static int nullFile = -1;
+
+    if(!init)
+    {
+        if(!suppress)
+            return true;
+
+        origOut = dup(STDOUT_FILENO);
+        origErr = dup(STDERR_FILENO);
+        nullFile = open("/dev/null", O_WRONLY);
+        init = true;
+    }
+
+    if(nullFile == -1)
+        return false;
+
+    fflush(stdout);
+    fflush(stderr);
+
+    dup2(suppress ? nullFile : origOut, STDOUT_FILENO);
+    dup2(suppress ? nullFile : origErr, STDERR_FILENO);
+    return true;
+}
+
+void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* folderName)
+{
+    DIR* dir = opendir(folder->chars);
+    if(dir == NULL)
+        return;
+
+    uint32_t folderLength = folder->length;
+
+    if(folderName != NULL)
+        printf("%s/\n", folderName);
+
+    struct dirent* entry;
+
+    while((entry = readdir(dir)) != NULL)
+    {
+        if(entry->d_type == DT_DIR)
+        {
+            if(ffStrEquals(entry->d_name, ".") || ffStrEquals(entry->d_name, ".."))
+                continue;
+
+            ffStrbufAppendS(folder, entry->d_name);
+            ffStrbufAppendC(folder, '/');
+            listFilesRecursively(folder, (uint8_t) (indentation + 1), entry->d_name);
+            ffStrbufSubstrBefore(folder, folderLength);
+            continue;
+        }
+
+        for(uint8_t i = 0; i < indentation; i++)
+            fputs("  | ", stdout);
+
+        puts(entry->d_name);
+    }
+
+    closedir(dir);
+}
+
+void ffListFilesRecursively(const char* path)
+{
+    FF_STRBUF_AUTO_DESTROY folder = ffStrbufCreateS(path);
+    ffStrbufEnsureEndsWithC(&folder, '/');
+    listFilesRecursively(&folder, 0, NULL);
+}

src/common/io/io_windows.c

@@ -0,0 +1,215 @@
+#include "io.h"
+#include "util/stringUtils.h"
+
+#include <windows.h>
+
+static void createSubfolders(const char* fileName)
+{
+    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
+    while(*fileName != '\0')
+    {
+        ffStrbufAppendC(&path, *fileName);
+        if(*fileName == '/')
+            CreateDirectoryA(path.chars, NULL);
+        ++fileName;
+    }
+}
+
+bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
+{
+    HANDLE FF_AUTO_CLOSE_FD handle = CreateFileA(fileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if(handle == INVALID_HANDLE_VALUE)
+    {
+        createSubfolders(fileName);
+        handle = CreateFileA(fileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+        if(handle == INVALID_HANDLE_VALUE)
+            return false;
+    }
+
+    DWORD written;
+    return !!WriteFile(handle, data, (DWORD)dataSize, &written, NULL);
+}
+
+bool ffAppendFDBuffer(HANDLE handle, FFstrbuf* buffer)
+{
+    DWORD readed = 0;
+
+    LARGE_INTEGER fileSize;
+    if(!GetFileSizeEx(handle, &fileSize))
+        fileSize.QuadPart = 0;
+
+    ffStrbufEnsureFree(buffer, fileSize.QuadPart > 0 ? (uint32_t)fileSize.QuadPart : 31);
+    uint32_t free = ffStrbufGetFree(buffer);
+
+    bool success;
+    while(
+        (success = !!ReadFile(handle, buffer->chars + buffer->length, free, &readed, NULL)) &&
+        (uint32_t) readed == free
+    ) {
+        buffer->length += (uint32_t) readed;
+        ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
+        free = ffStrbufGetFree(buffer);
+    }
+
+    if(readed > 0)
+        buffer->length += (uint32_t) readed;
+
+    buffer->chars[buffer->length] = '\0';
+
+    ffStrbufTrimRight(buffer, '\n');
+    ffStrbufTrimRight(buffer, ' ');
+
+    return success;
+}
+
+ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
+{
+    HANDLE FF_AUTO_CLOSE_FD handle = CreateFileA(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if(handle == INVALID_HANDLE_VALUE)
+        return -1;
+
+    return ffReadFDData(handle, dataSize, data);
+}
+
+bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
+{
+    HANDLE FF_AUTO_CLOSE_FD handle = CreateFileA(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if(handle == INVALID_HANDLE_VALUE)
+        return false;
+
+    return ffAppendFDBuffer(handle, buffer);
+}
+
+bool ffPathExists(const char* path, FFPathType type)
+{
+    DWORD attr = GetFileAttributesA(path);
+    if(attr == INVALID_FILE_ATTRIBUTES)
+        return false;
+
+    if(type & FF_PATHTYPE_REGULAR && !(attr & FILE_ATTRIBUTE_DIRECTORY))
+        return true;
+
+    if(type & FF_PATHTYPE_DIRECTORY && (attr & FILE_ATTRIBUTE_DIRECTORY))
+        return true;
+
+    if(type & FF_PATHTYPE_LINK && (attr & FILE_ATTRIBUTE_REPARSE_POINT))
+        return true;
+
+    return false;
+}
+
+bool ffPathExpandEnv(const char* in, FFstrbuf* out)
+{
+    DWORD length = ExpandEnvironmentStringsA(in, NULL, 0);
+    if (length <= 1) return false;
+
+    ffStrbufClear(out);
+    ffStrbufEnsureFree(out, (uint32_t)length);
+    ExpandEnvironmentStringsA(in, out->chars, length);
+    out->length = (uint32_t)length - 1;
+    return true;
+}
+
+bool ffSuppressIO(bool suppress)
+{
+    (void) suppress; //Not implemented.
+    return false;
+}
+
+void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* folderName)
+{
+    uint32_t folderLength = folder->length;
+
+    if(folderName != NULL)
+        printf("%s/\n", folderName);
+
+    ffStrbufAppendC(folder, '*');
+    WIN32_FIND_DATAA entry;
+    HANDLE hFind = FindFirstFileA(folder->chars, &entry);
+    if(hFind == INVALID_HANDLE_VALUE)
+        return;
+
+    do
+    {
+        if (entry.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+        {
+            if(ffStrEquals(entry.cFileName, ".") || ffStrEquals(entry.cFileName, ".."))
+                continue;
+
+            ffStrbufSubstrBefore(folder, folderLength);
+            ffStrbufAppendS(folder, entry.cFileName);
+            ffStrbufAppendC(folder, '/');
+            listFilesRecursively(folder, (uint8_t) (indentation + 1), entry.cFileName);
+            ffStrbufSubstrBefore(folder, folderLength);
+            continue;
+        }
+
+        for(uint8_t i = 0; i < indentation; i++)
+            fputs("  | ", stdout);
+
+        puts(entry.cFileName);
+    } while (FindNextFileA(hFind, &entry));
+    FindClose(hFind);
+}
+
+void ffListFilesRecursively(const char* path)
+{
+    FF_STRBUF_AUTO_DESTROY folder = ffStrbufCreateS(path);
+    ffStrbufEnsureEndsWithC(&folder, '/');
+    listFilesRecursively(&folder, 0, NULL);
+}
+
+const char* ffGetTerminalResponse(const char* request, const char* format, ...)
+{
+    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
+    DWORD prev_mode;
+    GetConsoleMode(hInput, &prev_mode);
+    SetConsoleMode(hInput, 0);
+
+    FlushConsoleInputBuffer(hInput);
+
+    DWORD bytes = 0;
+    WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), request, (DWORD) strlen(request), &bytes, NULL);
+
+    while (true)
+    {
+        if (WaitForSingleObjectEx(hInput, 35, TRUE) != WAIT_OBJECT_0)
+        {
+            SetConsoleMode(hInput, prev_mode);
+            return "WaitForSingleObject() failed or timeout";
+        }
+
+        // Ignore all unexpected input events
+        INPUT_RECORD record;
+        DWORD len = 0;
+        if (!PeekConsoleInputW(hInput, &record, 1, &len))
+            break;
+
+        if (
+            record.EventType == KEY_EVENT &&
+            record.Event.KeyEvent.uChar.UnicodeChar != L'\r' &&
+            record.Event.KeyEvent.uChar.UnicodeChar != L'\n'
+        )
+            break;
+        else
+            ReadConsoleInputW(hInput, &record, 1, &len);
+    }
+
+    char buffer[512];
+    bytes = 0;
+    ReadFile(hInput, buffer, sizeof(buffer) - 1, &bytes, NULL);
+
+    SetConsoleMode(hInput, prev_mode);
+
+    if(bytes <= 0)
+        return "ReadFile() failed";
+
+    buffer[bytes] = '\0';
+
+    va_list args;
+    va_start(args, format);
+    vsscanf(buffer, format, args);
+    va_end(args);
+
+    return NULL;
+}

src/common/jsonconfig.c

@@ -0,0 +1,443 @@
+#include "fastfetch.h"
+#include "common/jsonconfig.h"
+#include "common/printing.h"
+#include "common/io/io.h"
+#include "common/time.h"
+#include "modules/modules.h"
+#include "util/stringUtils.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <inttypes.h>
+
+bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs* moduleArgs)
+{
+    if(ffStrEqualsIgnCase(key, "key"))
+    {
+        ffStrbufSetNS(&moduleArgs->key, (uint32_t) yyjson_get_len(val), yyjson_get_str(val));
+        return true;
+    }
+    else if(ffStrEqualsIgnCase(key, "format"))
+    {
+        ffStrbufSetNS(&moduleArgs->outputFormat, (uint32_t) yyjson_get_len(val), yyjson_get_str(val));
+        return true;
+    }
+    else if(ffStrEqualsIgnCase(key, "keyColor"))
+    {
+        ffOptionParseColor(yyjson_get_str(val), &moduleArgs->keyColor);
+        return true;
+    }
+    else if(ffStrEqualsIgnCase(key, "keyWidth"))
+    {
+        moduleArgs->keyWidth = (uint32_t) yyjson_get_uint(val);
+        return true;
+    }
+    return false;
+}
+
+const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[])
+{
+    if (yyjson_is_int(val))
+    {
+        int intVal = yyjson_get_int(val);
+
+        for (const FFKeyValuePair* pPair = pairs; pPair->key; ++pPair)
+        {
+            if (intVal == pPair->value)
+            {
+                *result = pPair->value;
+                return NULL;
+            }
+        }
+
+        return "Invalid enum integer";
+    }
+    else if (yyjson_is_str(val))
+    {
+        const char* strVal = yyjson_get_str(val);
+        for (const FFKeyValuePair* pPair = pairs; pPair->key; ++pPair)
+        {
+            if (ffStrEqualsIgnCase(strVal, pPair->key))
+            {
+                *result = pPair->value;
+                return NULL;
+            }
+        }
+
+        return "Invalid enum string";
+    }
+    else
+        return "Invalid enum value type; must be a string or integer";
+}
+
+static bool parseModuleJsonObject(const char* type, yyjson_val* jsonVal)
+{
+    if(!isalpha(type[0])) return false;
+
+    for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(type[0]) - 'A']; *modules; ++modules)
+    {
+        FFModuleBaseInfo* baseInfo = *modules;
+        if (ffStrEqualsIgnCase(type, baseInfo->name))
+        {
+            if (jsonVal) baseInfo->parseJsonObject(baseInfo, jsonVal);
+            baseInfo->printModule(baseInfo);
+            return true;
+        }
+    }
+    return false;
+}
+
+static void prepareModuleJsonObject(const char* type, yyjson_val* module)
+{
+    FFconfig* cfg = &instance.config;
+    switch (type[0])
+    {
+        case 'b': case 'B': {
+            if (ffStrEqualsIgnCase(type, FF_CPUUSAGE_MODULE_NAME))
+                ffPrepareCPUUsage();
+            break;
+        }
+        case 'p': case 'P': {
+            if (ffStrEqualsIgnCase(type, FF_PUBLICIP_MODULE_NAME))
+            {
+                if (module) ffParsePublicIpJsonObject(&cfg->publicIP, module);
+                ffPreparePublicIp(&cfg->publicIP);
+            }
+            break;
+        }
+        case 'w': case 'W': {
+            if (ffStrEqualsIgnCase(type, FF_WEATHER_MODULE_NAME))
+            {
+                if (module) ffParseWeatherJsonObject(&cfg->weather, module);
+                ffPrepareWeather(&cfg->weather);
+            }
+            break;
+        }
+    }
+}
+
+static const char* printJsonConfig(bool prepare)
+{
+    yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
+    assert(root);
+
+    if (!yyjson_is_obj(root))
+        return "Invalid JSON config format. Root value must be an object";
+
+    yyjson_val* modules = yyjson_obj_get(root, "modules");
+    if (!modules) return NULL;
+    if (!yyjson_is_arr(modules)) return "Property 'modules' must be an array of strings or objects";
+
+    yyjson_val* item;
+    size_t idx, max;
+    yyjson_arr_foreach(modules, idx, max, item)
+    {
+        uint64_t ms = 0;
+        if(!prepare && instance.config.stat)
+            ms = ffTimeGetTick();
+
+        yyjson_val* module = item;
+        const char* type = yyjson_get_str(module);
+        if (type)
+            module = NULL;
+        else if (yyjson_is_obj(module))
+        {
+            type = yyjson_get_str(yyjson_obj_get(module, "type"));
+            if (!type) return "module object must contain a \"type\" key ( case sensitive )";
+            if (yyjson_obj_size(module) == 1) // contains only Property type
+                module = NULL;
+        }
+        else
+            return "modules must be an array of strings or objects";
+
+        if(prepare)
+            prepareModuleJsonObject(type, module);
+        else if(!parseModuleJsonObject(type, module))
+            return "Unknown module type";
+
+        if(!prepare && instance.config.stat)
+        {
+            char str[32];
+            int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ffTimeGetTick() - ms);
+            if(instance.config.pipe)
+                puts(str);
+            else
+                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+        }
+
+        #if defined(_WIN32)
+        if (!instance.config.noBuffer) fflush(stdout);
+        #endif
+    }
+
+    return NULL;
+}
+
+const char* ffParseGeneralJsonConfig(void)
+{
+    FFconfig* config = &instance.config;
+
+    yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
+    assert(root);
+
+    if (!yyjson_is_obj(root))
+        return "Invalid JSON config format. Root value must be an object";
+
+    yyjson_val* object = yyjson_obj_get(root, "general");
+    if (!object) return NULL;
+    if (!yyjson_is_obj(object)) return "Property 'general' must be an object";
+
+    yyjson_val *key_, *val;
+    size_t idx, max;
+    yyjson_obj_foreach(object, idx, max, key_, val)
+    {
+        const char* key = yyjson_get_str(key_);
+
+        if (ffStrEqualsIgnCase(key, "allowSlowOperations"))
+            config->allowSlowOperations = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "thread") || ffStrEqualsIgnCase(key, "multithreading"))
+            config->multithreading = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "stat"))
+        {
+            if ((config->stat = yyjson_get_bool(val)))
+                config->showErrors = true;
+        }
+        else if (ffStrEqualsIgnCase(key, "escapeBedrock"))
+            config->escapeBedrock = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "pipe"))
+            config->pipe = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "processingTimeout"))
+            config->processingTimeout = (int32_t) yyjson_get_int(val);
+
+        #if defined(__linux__) || defined(__FreeBSD__)
+        else if (ffStrEqualsIgnCase(key, "playerName"))
+            ffStrbufSetS(&config->playerName, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "osFile"))
+            ffStrbufSetS(&config->osFile, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "dsForceDrm"))
+            config->dsForceDrm = yyjson_get_bool(val);
+        #elif defined(_WIN32)
+        else if (ffStrEqualsIgnCase(key, "wmiTimeout"))
+            config->wmiTimeout = (int32_t) yyjson_get_int(val);
+        #endif
+
+        else
+            return "Unknown general property";
+    }
+
+    return NULL;
+}
+
+const char* ffParseDisplayJsonConfig(void)
+{
+    FFconfig* config = &instance.config;
+
+    yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
+    assert(root);
+
+    if (!yyjson_is_obj(root))
+        return "Invalid JSON config format. Root value must be an object";
+
+    yyjson_val* object = yyjson_obj_get(root, "display");
+    if (!object) return NULL;
+    if (!yyjson_is_obj(object)) return "Property 'display' must be an object";
+
+    yyjson_val *key_, *val;
+    size_t idx, max;
+    yyjson_obj_foreach(object, idx, max, key_, val)
+    {
+        const char* key = yyjson_get_str(key_);
+
+        if (ffStrEqualsIgnCase(key, "showErrors"))
+            config->showErrors = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "disableLinewrap"))
+            config->disableLinewrap = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "hideCursor"))
+            config->hideCursor = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "separator"))
+            ffStrbufSetS(&config->keyValueSeparator, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "color"))
+        {
+            if (yyjson_is_str(val))
+            {
+                ffOptionParseColor(yyjson_get_str(val), &config->colorKeys);
+                ffStrbufSet(&config->colorTitle, &config->colorKeys);
+            }
+            else if (yyjson_is_obj(val))
+            {
+                const char* colorKeys = yyjson_get_str(yyjson_obj_get(val, "keys"));
+                if (colorKeys)
+                    ffOptionParseColor(colorKeys, &config->colorKeys);
+                const char* colorTitle = yyjson_get_str(yyjson_obj_get(val, "title"));
+                if (colorTitle)
+                    ffOptionParseColor(colorTitle, &config->colorTitle);
+            }
+            else
+                return "display.color must be either a string or an object";
+        }
+        else if (ffStrEqualsIgnCase(key, "brightColor"))
+            config->brightColor = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "binaryPrefix"))
+        {
+            int value;
+            const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
+                { "iec", FF_BINARY_PREFIX_TYPE_IEC },
+                { "si", FF_BINARY_PREFIX_TYPE_SI },
+                { "jedec", FF_BINARY_PREFIX_TYPE_JEDEC },
+                {},
+            });
+            if (error) return error;
+            config->binaryPrefixType = (FFBinaryPrefixType) value;
+        }
+        else if (ffStrEqualsIgnCase(key, "sizeNdigits"))
+            config->sizeNdigits = (uint8_t) yyjson_get_uint(val);
+        else if (ffStrEqualsIgnCase(key, "sizeMaxPrefix"))
+        {
+            int value;
+            const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
+                { "B", 0 },
+                { "kB", 1 },
+                { "MB", 2 },
+                { "GB", 3 },
+                { "TB", 4 },
+                { "PB", 5 },
+                { "EB", 6 },
+                { "ZB", 7 },
+                { "YB", 8 },
+                {}
+            });
+            if (error) return error;
+            config->sizeMaxPrefix = (uint8_t) value;
+        }
+        else if (ffStrEqualsIgnCase(key, "temperatureUnit"))
+        {
+            int value;
+            const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
+                { "CELSIUS", FF_TEMPERATURE_UNIT_CELSIUS },
+                { "C", FF_TEMPERATURE_UNIT_CELSIUS },
+                { "FAHRENHEIT", FF_TEMPERATURE_UNIT_FAHRENHEIT },
+                { "F", FF_TEMPERATURE_UNIT_FAHRENHEIT },
+                { "KELVIN", FF_TEMPERATURE_UNIT_KELVIN },
+                { "K", FF_TEMPERATURE_UNIT_KELVIN },
+                {},
+            });
+            if (error) return error;
+            config->temperatureUnit = (FFTemperatureUnit) value;
+        }
+        else if (ffStrEqualsIgnCase(key, "percentType"))
+            config->percentType = (uint32_t) yyjson_get_uint(val);
+        else if (ffStrEqualsIgnCase(key, "bar"))
+        {
+            if (yyjson_is_obj(val))
+            {
+                const char* charElapsed = yyjson_get_str(yyjson_obj_get(val, "charElapsed"));
+                if (charElapsed)
+                    ffStrbufSetS(&config->barCharElapsed, charElapsed);
+
+                const char* charTotal = yyjson_get_str(yyjson_obj_get(val, "charTotal"));
+                if (charTotal)
+                    ffStrbufSetS(&config->barCharTotal, charTotal);
+
+                yyjson_val* border = yyjson_obj_get(val, "border");
+                if (border)
+                    config->barBorder = yyjson_get_bool(border);
+
+                yyjson_val* width = yyjson_obj_get(val, "width");
+                if (width)
+                    config->barWidth = (uint8_t) yyjson_get_uint(width);
+            }
+            else
+                return "display.bar must be an object";
+        }
+        else if (ffStrEqualsIgnCase(key, "noBuffer"))
+            config->noBuffer = yyjson_get_bool(val);
+        else if (ffStrEqualsIgnCase(key, "keyWidth"))
+            config->keyWidth = (uint32_t) yyjson_get_uint(val);
+        else
+            return "Unknown display property";
+    }
+
+    return NULL;
+}
+
+const char* ffParseLibraryJsonConfig(void)
+{
+    FFconfig* config = &instance.config;
+
+    yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
+    assert(root);
+
+    if (!yyjson_is_obj(root))
+        return "Invalid JSON config format. Root value must be an object";
+
+    yyjson_val* object = yyjson_obj_get(root, "library");
+    if (!object) return NULL;
+    if (!yyjson_is_obj(object)) return "Property 'library' must be an object";
+
+    yyjson_val *key_, *val;
+    size_t idx, max;
+    yyjson_obj_foreach(object, idx, max, key_, val)
+    {
+        const char* key = yyjson_get_str(key_);
+
+        if (ffStrEqualsIgnCase(key, "pci"))
+            ffStrbufSetS(&config->libPCI, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "vulkan"))
+            ffStrbufSetS(&config->libVulkan, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "freetype"))
+            ffStrbufSetS(&config->libfreetype, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "wayland"))
+            ffStrbufSetS(&config->libWayland, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "xcbRandr"))
+            ffStrbufSetS(&config->libXcbRandr, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "xcb"))
+            ffStrbufSetS(&config->libXcb, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "Xrandr"))
+            ffStrbufSetS(&config->libXrandr, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "X11"))
+            ffStrbufSetS(&config->libX11, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "gio"))
+            ffStrbufSetS(&config->libGIO, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "DConf"))
+            ffStrbufSetS(&config->libDConf, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "dbus"))
+            ffStrbufSetS(&config->libDBus, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "XFConf"))
+            ffStrbufSetS(&config->libXFConf, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "sqlite") || ffStrEqualsIgnCase(key, "sqlite3"))
+            ffStrbufSetS(&config->libSQLite3, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "rpm"))
+            ffStrbufSetS(&config->librpm, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "imagemagick"))
+            ffStrbufSetS(&config->libImageMagick, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "z"))
+            ffStrbufSetS(&config->libZ, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "chafa"))
+            ffStrbufSetS(&config->libChafa, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "egl"))
+            ffStrbufSetS(&config->libEGL, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "glx"))
+            ffStrbufSetS(&config->libGLX, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "osmesa"))
+            ffStrbufSetS(&config->libOSMesa, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "opencl"))
+            ffStrbufSetS(&config->libOpenCL, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "pulse"))
+            ffStrbufSetS(&config->libPulse, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "nm"))
+            ffStrbufSetS(&config->libnm, yyjson_get_str(val));
+        else if (ffStrEqualsIgnCase(key, "ddcutil"))
+            ffStrbufSetS(&config->libDdcutil, yyjson_get_str(val));
+        else
+            return "Unknown library property";
+    }
+
+    return NULL;
+}
+
+void ffPrintJsonConfig(bool prepare)
+{
+    const char* error = printJsonConfig(prepare);
+    if (error)
+        ffPrintErrorString("JsonConfig", 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);
+}

src/common/jsonconfig.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "fastfetch.h"
+
+bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs* moduleArgs);
+const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[]);
+void ffPrintJsonConfig(bool prepare);
+const char* ffParseGeneralJsonConfig(void);
+const char* ffParseDisplayJsonConfig(void);
+const char* ffParseLibraryJsonConfig(void);

src/common/library.c

@@ -1,15 +1,38 @@
 #include "fastfetch.h"
+#include "common/library.h"
 
 #include <stdarg.h>
 
+//Clang doesn't define __SANITIZE_ADDRESS__ but defines __has_feature(address_sanitizer)
+#if defined(__has_feature)
+    #if __has_feature(address_sanitizer)
+        #define __SANITIZE_ADDRESS__
+    #endif
+#endif
+
+#ifndef FF_DLOPEN_FLAGS
+    #ifdef __SANITIZE_ADDRESS__
+        #define FF_DLOPEN_FLAGS RTLD_LAZY | RTLD_NODELETE
+    #else
+        #define FF_DLOPEN_FLAGS RTLD_LAZY
+    #endif
+#endif
+
 static void* libraryLoad(const char* path, int maxVersion)
 {
-    void* result = dlopen(path, RTLD_LAZY);
-    if(result != NULL)
+    void* result = dlopen(path, FF_DLOPEN_FLAGS);
+
+    #ifdef _WIN32
+
+    // libX.dll.1 never exists on Windows, while libX-1.dll may exist
+    FF_UNUSED(maxVersion)
+
+    #else
+
+    if(result != NULL || maxVersion < 0)
         return result;
 
-    FFstrbuf pathbuf;
-    ffStrbufInitA(&pathbuf, 64);
+    FF_STRBUF_AUTO_DESTROY pathbuf = ffStrbufCreateA(64);
     ffStrbufAppendS(&pathbuf, path);
     ffStrbufAppendC(&pathbuf, '.');
 
@@ -18,21 +41,22 @@ static void* libraryLoad(const char* path, int maxVersion)
         uint32_t originalLength = pathbuf.length;
         ffStrbufAppendF(&pathbuf, "%i", i);
 
-        result = dlopen(pathbuf.chars, RTLD_LAZY);
+        result = dlopen(pathbuf.chars, FF_DLOPEN_FLAGS);
         if(result != NULL)
             break;
 
         ffStrbufSubstrBefore(&pathbuf, originalLength);
     }
 
-    ffStrbufDestroy(&pathbuf);
+    #endif
+
     return result;
 }
 
 void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...)
 {
-    if(userProvidedName->length > 0)
-        return dlopen(userProvidedName->chars, RTLD_LAZY);
+    if(userProvidedName != NULL && userProvidedName->length > 0)
+        return dlopen(userProvidedName->chars, FF_DLOPEN_FLAGS);
 
     va_list defaultNames;
     va_start(defaultNames, userProvidedName);

src/common/library.h

@@ -0,0 +1,78 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_library
+#define FF_INCLUDED_common_library
+
+#include "fastfetch.h"
+#include "util/FFcheckmacros.h"
+
+#if defined(_WIN32)
+    #include <libloaderapi.h>
+    #define FF_DLOPEN_FLAGS 0
+    FF_C_NODISCARD static inline void* dlopen(const char* path, int mode) { FF_UNUSED(mode); return LoadLibraryA(path); }
+    FF_C_NODISCARD static inline void* dlsym(void* handle, const char* symbol) { return (void*) GetProcAddress((HMODULE)handle, symbol); }
+    static inline int dlclose(void* handle) { return !FreeLibrary((HMODULE)handle); }
+#else
+    #include <dlfcn.h>
+#endif
+
+#ifdef _WIN32
+    #define FF_LIBRARY_EXTENSION ".dll"
+#elif defined(__APPLE__)
+    #define FF_LIBRARY_EXTENSION ".dylib"
+#else
+    #define FF_LIBRARY_EXTENSION ".so"
+#endif
+
+static inline void ffLibraryUnload(void** handle)
+{
+    assert(handle);
+    if (*handle)
+        dlclose(*handle);
+}
+
+#define FF_LIBRARY_SYMBOL(symbolName) \
+    __typeof__(&symbolName) ff ## symbolName;
+
+#define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \
+    void* __attribute__((__cleanup__(ffLibraryUnload))) libraryObjectName = ffLibraryLoad(userLibraryName, __VA_ARGS__, NULL);\
+    if(libraryObjectName == NULL) \
+        return returnValue;
+
+#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \
+    symbolMapping = (__typeof__(&symbolName)) dlsym(library, #symbolName); \
+    if(symbolMapping == NULL) \
+        return returnValue;
+
+#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, symbolMapping, symbolName, alternateName, returnValue) \
+    symbolMapping = dlsym(library, #symbolName); \
+    if(symbolMapping == NULL && !(symbolMapping = (__typeof__(&symbolName)) dlsym(library, #alternateName))) \
+        return returnValue;
+
+#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
+    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
+
+#define FF_LIBRARY_LOAD_SYMBOL_LAZY(library, symbolName) \
+    __typeof__(&symbolName) ff ## symbolName = (__typeof__(&symbolName)) dlsym(library, #symbolName);
+
+#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
+    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE2(library, symbolName, alternateName) \
+    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);
+
+#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(library, varName, symbolName) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE2(library, varName, symbolName, alternateName) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, (varName).ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_PTR(library, varName, symbolName, returnValue) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
+
+void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
+
+#endif

src/common/modules.c

@@ -0,0 +1,164 @@
+#include "fastfetch.h"
+
+static FFModuleBaseInfo* A[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* B[] = {
+    (void*) &instance.config.battery,
+    (void*) &instance.config.bios,
+    (void*) &instance.config.bluetooth,
+    (void*) &instance.config.board,
+    (void*) &instance.config.break_,
+    (void*) &instance.config.brightness,
+    NULL,
+};
+
+static FFModuleBaseInfo* C[] = {
+    (void*) &instance.config.chassis,
+    (void*) &instance.config.command,
+    (void*) &instance.config.colors,
+    (void*) &instance.config.cpu,
+    (void*) &instance.config.cpuUsage,
+    (void*) &instance.config.cursor,
+    (void*) &instance.config.custom,
+    NULL,
+};
+
+static FFModuleBaseInfo* D[] = {
+    (void*) &instance.config.dateTime,
+    (void*) &instance.config.de,
+    (void*) &instance.config.display,
+    (void*) &instance.config.disk,
+    NULL,
+};
+
+static FFModuleBaseInfo* E[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* F[] = {
+    (void*) &instance.config.font,
+    NULL,
+};
+
+static FFModuleBaseInfo* G[] = {
+    (void*) &instance.config.gamepad,
+    (void*) &instance.config.gpu,
+    NULL,
+};
+
+static FFModuleBaseInfo* H[] = {
+    (void*) &instance.config.host,
+    NULL,
+};
+
+static FFModuleBaseInfo* I[] = {
+    (void*) &instance.config.icons,
+    NULL,
+};
+
+static FFModuleBaseInfo* J[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* K[] = {
+    (void*) &instance.config.kernel,
+    NULL,
+};
+
+static FFModuleBaseInfo* L[] = {
+    (void*) &instance.config.lm,
+    (void*) &instance.config.locale,
+    (void*) &instance.config.localIP,
+    NULL,
+};
+
+static FFModuleBaseInfo* M[] = {
+    (void*) &instance.config.media,
+    (void*) &instance.config.memory,
+    (void*) &instance.config.monitor,
+    NULL,
+};
+
+static FFModuleBaseInfo* N[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* O[] = {
+    (void*) &instance.config.openCL,
+    (void*) &instance.config.openGL,
+    (void*) &instance.config.os,
+    NULL,
+};
+
+static FFModuleBaseInfo* P[] = {
+    (void*) &instance.config.packages,
+    (void*) &instance.config.player,
+    (void*) &instance.config.powerAdapter,
+    (void*) &instance.config.processes,
+    (void*) &instance.config.publicIP,
+    NULL,
+};
+
+static FFModuleBaseInfo* Q[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* R[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* S[] = {
+    (void*) &instance.config.separator,
+    (void*) &instance.config.shell,
+    (void*) &instance.config.sound,
+    (void*) &instance.config.swap,
+    NULL,
+};
+
+static FFModuleBaseInfo* T[] = {
+    (void*) &instance.config.terminal,
+    (void*) &instance.config.terminalFont,
+    (void*) &instance.config.terminalSize,
+    (void*) &instance.config.title,
+    (void*) &instance.config.theme,
+    NULL,
+};
+
+static FFModuleBaseInfo* U[] = {
+    (void*) &instance.config.uptime,
+    (void*) &instance.config.users,
+    NULL,
+};
+
+static FFModuleBaseInfo* V[] = {
+    (void*) &instance.config.version,
+    (void*) &instance.config.vulkan,
+    NULL,
+};
+
+static FFModuleBaseInfo* W[] = {
+    (void*) &instance.config.wallpaper,
+    (void*) &instance.config.weather,
+    (void*) &instance.config.wm,
+    (void*) &instance.config.wifi,
+    (void*) &instance.config.wmTheme,
+    NULL,
+};
+
+static FFModuleBaseInfo* X[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* Y[] = {
+    NULL,
+};
+
+static FFModuleBaseInfo* Z[] = {
+    NULL,
+};
+
+FFModuleBaseInfo** ffModuleInfos[] = {
+    A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,
+};

src/common/networking.c

@@ -1,69 +0,0 @@
-#include "fastfetch.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-void ffNetworkingGetHttp(const char* host, const char* path, uint32_t timeout, FFstrbuf* buffer)
-{
-    struct addrinfo hints = {0};
-    hints.ai_family = AF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = 0;
-
-    struct addrinfo* addr;
-
-    if(getaddrinfo(host, "80", &hints, &addr) != 0)
-        return;
-
-    int sock = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
-    if(sock == -1)
-    {
-        freeaddrinfo(addr);
-        return;
-    }
-
-    if(timeout > 0)
-    {
-        struct timeval timev;
-        timev.tv_sec = 0;
-        timev.tv_usec = timeout * 1000; //milliseconds to microseconds
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &timev, sizeof(timev));
-    }
-
-    if(connect(sock, addr->ai_addr, addr->ai_addrlen) == -1)
-    {
-        close(sock);
-        freeaddrinfo(addr);
-        return;
-    }
-
-    freeaddrinfo(addr);
-
-    FFstrbuf command;
-    ffStrbufInitA(&command, 64);
-    ffStrbufAppendS(&command, "GET ");
-    ffStrbufAppendS(&command, path);
-    ffStrbufAppendS(&command, " HTTP/1.1\nHost: ");
-    ffStrbufAppendS(&command, host);
-    ffStrbufAppendS(&command, "\r\n\r\n");
-
-    if(send(sock, command.chars, command.length, 0) == -1)
-    {
-        ffStrbufDestroy(&command);
-        close(sock);
-        return;
-    }
-
-    ssize_t received = recv(sock, buffer->chars + buffer->length, ffStrbufGetFree(buffer), 0);
-
-    if(received > 0)
-    {
-        buffer->length += (uint32_t) received;
-        buffer->chars[buffer->length] = '\0';
-    }
-
-    ffStrbufDestroy(&command);
-    close(sock);
-}

src/common/networking.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_networking
+#define FF_INCLUDED_common_networking
+
+#include "common/thread.h"
+#include "util/FFstrbuf.h"
+
+#ifdef _WIN32
+    #include <minwindef.h>
+#endif
+
+typedef struct FFNetworkingState {
+    #ifdef _WIN32
+        uintptr_t sockfd;
+        OVERLAPPED overlapped;
+    #else
+        int sockfd;
+        FFstrbuf host;
+        FFstrbuf command;
+
+        #ifdef FF_HAVE_THREADS
+            FFThreadType thread;
+        #endif
+    #endif
+} FFNetworkingState;
+
+bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers);
+bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, uint32_t timeout);
+
+static inline bool ffNetworkingGetHttp(const char* host, const char* path, uint32_t timeout, const char* headers, FFstrbuf* buffer)
+{
+    FFNetworkingState state;
+    if(ffNetworkingSendHttpRequest(&state, host, path, headers))
+        return ffNetworkingRecvHttpResponse(&state, buffer, timeout);
+    return false;
+}
+
+#endif

src/common/networking_linux.c

@@ -0,0 +1,103 @@
+#include "fastfetch.h"
+#include "common/networking.h"
+
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+static void connectAndSend(FFNetworkingState* state)
+{
+    struct addrinfo hints = {
+        .ai_family = AF_INET,
+        .ai_socktype = SOCK_STREAM,
+    };
+
+    struct addrinfo* addr;
+
+    if(getaddrinfo(state->host.chars, "80", &hints, &addr) != 0)
+        goto error;
+
+    state->sockfd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+    if(state->sockfd == -1)
+    {
+        freeaddrinfo(addr);
+        goto error;
+    }
+
+    if(connect(state->sockfd, addr->ai_addr, addr->ai_addrlen) == -1)
+    {
+        close(state->sockfd);
+        freeaddrinfo(addr);
+        goto error;
+    }
+
+    freeaddrinfo(addr);
+
+    if(send(state->sockfd, state->command.chars, state->command.length, 0) < 0)
+    {
+        close(state->sockfd);
+        goto error;
+    }
+
+    goto exit;
+
+error:
+    state->sockfd = -1;
+
+exit:
+    ffStrbufDestroy(&state->host);
+    ffStrbufDestroy(&state->command);
+}
+
+FF_THREAD_ENTRY_DECL_WRAPPER(connectAndSend, FFNetworkingState*);
+
+bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers)
+{
+    ffStrbufInitS(&state->host, host);
+
+    ffStrbufInitA(&state->command, 64);
+    ffStrbufAppendS(&state->command, "GET ");
+    ffStrbufAppendS(&state->command, path);
+    ffStrbufAppendS(&state->command, " HTTP/1.1\nHost: ");
+    ffStrbufAppendS(&state->command, host);
+    ffStrbufAppendS(&state->command, "\r\n");
+    ffStrbufAppendS(&state->command, headers);
+    ffStrbufAppendS(&state->command, "\r\n");
+
+    #ifdef FF_HAVE_THREADS
+        state->thread = ffThreadCreate(connectAndSendThreadMain, state);
+        return !!state->thread;
+    #else
+        connectAndSend(state);
+        return state->sockfd != -1;
+    #endif
+}
+
+bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, uint32_t timeout)
+{
+    #ifdef FF_HAVE_THREADS
+        ffThreadJoin(state->thread);
+    #endif
+    if(state->sockfd == -1)
+        return false;
+
+    if(timeout > 0)
+    {
+        struct timeval timev;
+        timev.tv_sec = 0;
+        timev.tv_usec = (__typeof__(timev.tv_usec)) (timeout * 1000); //milliseconds to microseconds
+        setsockopt(state->sockfd, SOL_SOCKET, SO_RCVTIMEO, &timev, sizeof(timev));
+    }
+
+    ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, ffStrbufGetFree(buffer), 0);
+
+    if(received > 0)
+    {
+        buffer->length += (uint32_t) received;
+        buffer->chars[buffer->length] = '\0';
+    }
+
+    close(state->sockfd);
+    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n");
+}

src/common/networking_windows.c

@@ -0,0 +1,124 @@
+#include <mswsock.h>
+#include <ws2tcpip.h>
+
+//Must be included after <mswsock.h>
+#include "fastfetch.h"
+#include "common/networking.h"
+
+static LPFN_CONNECTEX ConnectEx;
+
+static BOOL WINAPI initWsaData(PINIT_ONCE once, PVOID param, PVOID* context)
+{
+    (void)once;
+    (void)param;
+    static WSADATA wsaData;
+    *context = &wsaData;
+    if(WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
+        return FALSE;
+
+    if(LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2)
+        return FALSE;
+
+    //Dummy socket needed for WSAIoctl
+    SOCKET sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    if(sockfd == INVALID_SOCKET)
+        return FALSE;
+
+    DWORD dwBytes;
+    GUID guid = WSAID_CONNECTEX;
+    if(WSAIoctl(sockfd, SIO_GET_EXTENSION_FUNCTION_POINTER,
+                    &guid, sizeof(guid),
+                    &ConnectEx, sizeof(ConnectEx),
+                    &dwBytes, NULL, NULL) != 0)
+        return FALSE;
+
+    return closesocket(sockfd) == 0;
+}
+
+bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers)
+{
+    static INIT_ONCE once = INIT_ONCE_STATIC_INIT;
+    WSADATA* pData;
+    if(!InitOnceExecuteOnce(&once, initWsaData, NULL, (LPVOID*) &pData))
+        return false;
+
+    memset(state, 0, sizeof(*state));
+
+    struct addrinfo hints = {
+        .ai_family = AF_INET,
+        .ai_socktype = SOCK_STREAM,
+    };
+
+    struct addrinfo* addr;
+
+    if(getaddrinfo(host, "80", &hints, &addr) != 0)
+        return false;
+
+    state->sockfd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+    if(state->sockfd == INVALID_SOCKET)
+    {
+        freeaddrinfo(addr);
+        return false;
+    }
+
+    {
+        //ConnectEx requires the socket to be initially bound
+        struct sockaddr_in addr = {
+            .sin_family = AF_INET,
+            .sin_addr.s_addr = INADDR_ANY,
+            .sin_port = 0,
+        };
+        if(bind(state->sockfd, (SOCKADDR *)&addr, sizeof(addr)) != 0)
+        {
+            printf("bind %d\n", WSAGetLastError());
+            return false;
+        }
+    }
+
+    FF_STRBUF_AUTO_DESTROY command = ffStrbufCreateA(64);
+    ffStrbufAppendS(&command, "GET ");
+    ffStrbufAppendS(&command, path);
+    ffStrbufAppendS(&command, " HTTP/1.1\nHost: ");
+    ffStrbufAppendS(&command, host);
+    ffStrbufAppendS(&command, "\r\n");
+    ffStrbufAppendS(&command, headers);
+    ffStrbufAppendS(&command, "\r\n");
+
+    BOOL result = ConnectEx(state->sockfd, addr->ai_addr, (int)addr->ai_addrlen, command.chars, command.length, NULL, &state->overlapped);
+    freeaddrinfo(addr);
+
+    if(!result && WSAGetLastError() != WSA_IO_PENDING)
+    {
+        closesocket(state->sockfd);
+        return false;
+    }
+
+    return true;
+}
+
+bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, uint32_t timeout)
+{
+    DWORD transfer, flags;
+    if (!WSAGetOverlappedResult(state->sockfd, &state->overlapped, &transfer, TRUE, &flags))
+    {
+        closesocket(state->sockfd);
+        return false;
+    }
+
+    if(timeout > 0)
+    {
+        //https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-setsockopt
+        setsockopt(state->sockfd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof(timeout));
+    }
+
+    ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, (int)ffStrbufGetFree(buffer), 0);
+
+    if(received > 0)
+    {
+        buffer->length += (uint32_t) received;
+        buffer->chars[buffer->length] = '\0';
+    }
+
+    closesocket(state->sockfd);
+    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n");
+}

src/common/option.c

@@ -0,0 +1,191 @@
+#include "common/option.h"
+#include "common/color.h"
+#include "util/stringUtils.h"
+
+// Return start position of the inner key if the argument key belongs to the module specified, NULL otherwise
+const char* ffOptionTestPrefix(const char* argumentKey, const char* moduleName)
+{
+    const char* subKey = argumentKey;
+    if(!(subKey[0] == '-' && subKey[1] == '-'))
+        return NULL;
+
+    subKey += 2;
+    uint32_t moduleNameLen = (uint32_t)strlen(moduleName);
+    if(strncasecmp(subKey, moduleName, moduleNameLen) != 0)
+        return NULL;
+
+    subKey += moduleNameLen;
+
+    if(subKey[0] == '\0')
+        return subKey;
+
+    if(subKey[0] != '-')
+        return NULL;
+
+    subKey += 1;
+
+    return subKey;
+}
+
+bool ffOptionParseModuleArgs(const char* argumentKey, const char* subKey, const char* value, FFModuleArgs* result)
+{
+    if(ffStrEqualsIgnCase(subKey, "key"))
+    {
+        ffOptionParseString(argumentKey, value, &result->key);
+        return true;
+    }
+    else if(ffStrEqualsIgnCase(subKey, "format"))
+    {
+        ffOptionParseString(argumentKey, value, &result->outputFormat);
+        return true;
+    }
+    else if(ffStrEqualsIgnCase(subKey, "key-color"))
+    {
+        if(value == NULL)
+        {
+            fprintf(stderr, "Error: usage: %s <str>\n", argumentKey);
+            exit(477);
+        }
+        ffOptionParseColor(value, &result->keyColor);
+        return true;
+    }
+    else if(ffStrEqualsIgnCase(subKey, "key-width"))
+    {
+        result->keyWidth = ffOptionParseUInt32(argumentKey, value);
+        return true;
+    }
+    return false;
+}
+
+void ffOptionParseString(const char* argumentKey, const char* value, FFstrbuf* buffer)
+{
+    if(value == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <str>\n", argumentKey);
+        exit(477);
+    }
+
+    ffStrbufSetS(buffer, value);
+}
+
+uint32_t ffOptionParseUInt32(const char* argumentKey, const char* value)
+{
+    if(value == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <num>\n", argumentKey);
+        exit(480);
+    }
+
+    char* end;
+    uint32_t num = (uint32_t) strtoul(value, &end, 10);
+    if(*end != '\0')
+    {
+        fprintf(stderr, "Error: usage: %s <num>\n", argumentKey);
+        exit(479);
+    }
+
+    return num;
+}
+
+int32_t ffOptionParseInt32(const char* argumentKey, const char* value)
+{
+    if(value == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <num>\n", argumentKey);
+        exit(480);
+    }
+
+    char* end;
+    int32_t num = (int32_t) strtol(value, &end, 10);
+    if(*end != '\0')
+    {
+        fprintf(stderr, "Error: usage: %s <num>\n", argumentKey);
+        exit(479);
+    }
+
+    return num;
+}
+
+int ffOptionParseEnum(const char* argumentKey, const char* requestedKey, FFKeyValuePair pairs[])
+{
+    if(requestedKey == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <value>\n", argumentKey);
+        exit(476);
+    }
+
+    for (const FFKeyValuePair* pPair = pairs; pPair->key; ++pPair)
+    {
+        if(ffStrEqualsIgnCase(requestedKey, pPair->key))
+            return pPair->value;
+    }
+
+    fprintf(stderr, "Error: unknown %s value: %s\n", argumentKey, requestedKey);
+    exit(478);
+}
+
+bool ffOptionParseBoolean(const char* str)
+{
+    return (
+        !ffStrSet(str) ||
+        ffStrEqualsIgnCase(str, "true") ||
+        ffStrEqualsIgnCase(str, "yes")  ||
+        ffStrEqualsIgnCase(str, "on")   ||
+        ffStrEqualsIgnCase(str, "1")
+    );
+}
+
+void ffOptionParseColor(const char* value, FFstrbuf* buffer)
+{
+    ffStrbufClear(buffer);
+    ffStrbufEnsureFree(buffer, 63);
+
+    while(*value != '\0')
+    {
+        #define FF_APPEND_COLOR_CODE_COND(prefix, code) \
+            if(strncasecmp(value, #prefix, strlen(#prefix)) == 0) { ffStrbufAppendS(buffer, code); value += strlen(#prefix); }
+
+        FF_APPEND_COLOR_CODE_COND(reset_, FF_COLOR_MODE_RESET)
+        else FF_APPEND_COLOR_CODE_COND(bright_, FF_COLOR_MODE_BOLD)
+        else FF_APPEND_COLOR_CODE_COND(dim_, FF_COLOR_MODE_DIM)
+        else FF_APPEND_COLOR_CODE_COND(black, FF_COLOR_FG_BLACK)
+        else FF_APPEND_COLOR_CODE_COND(red, FF_COLOR_FG_RED)
+        else FF_APPEND_COLOR_CODE_COND(green, FF_COLOR_FG_GREEN)
+        else FF_APPEND_COLOR_CODE_COND(yellow, FF_COLOR_FG_YELLOW)
+        else FF_APPEND_COLOR_CODE_COND(blue, FF_COLOR_FG_BLUE)
+        else FF_APPEND_COLOR_CODE_COND(magenta, FF_COLOR_FG_MAGENTA)
+        else FF_APPEND_COLOR_CODE_COND(cyan, FF_COLOR_FG_CYAN)
+        else FF_APPEND_COLOR_CODE_COND(white, FF_COLOR_FG_WHITE)
+        else FF_APPEND_COLOR_CODE_COND(default, FF_COLOR_FG_DEFAULT)
+        else FF_APPEND_COLOR_CODE_COND(light_black, FF_COLOR_FG_LIGHT_BLACK)
+        else FF_APPEND_COLOR_CODE_COND(light_red, FF_COLOR_FG_LIGHT_RED)
+        else FF_APPEND_COLOR_CODE_COND(light_green, FF_COLOR_FG_LIGHT_GREEN)
+        else FF_APPEND_COLOR_CODE_COND(light_yellow, FF_COLOR_FG_LIGHT_YELLOW)
+        else FF_APPEND_COLOR_CODE_COND(light_blue, FF_COLOR_FG_LIGHT_BLUE)
+        else FF_APPEND_COLOR_CODE_COND(light_magenta, FF_COLOR_FG_LIGHT_MAGENTA)
+        else FF_APPEND_COLOR_CODE_COND(light_cyan, FF_COLOR_FG_LIGHT_CYAN)
+        else FF_APPEND_COLOR_CODE_COND(light_white, FF_COLOR_FG_LIGHT_WHITE)
+        else
+        {
+            ffStrbufAppendC(buffer, *value);
+            ++value;
+        }
+
+        #undef FF_APPEND_COLOR_CODE_COND
+    }
+}
+
+void ffOptionInitModuleArg(FFModuleArgs* args)
+{
+    ffStrbufInit(&args->key);
+    ffStrbufInit(&args->keyColor);
+    ffStrbufInit(&args->outputFormat);
+    args->keyWidth = 0;
+}
+
+void ffOptionDestroyModuleArg(FFModuleArgs* args)
+{
+    ffStrbufDestroy(&args->key);
+    ffStrbufDestroy(&args->keyColor);
+    ffStrbufDestroy(&args->outputFormat);
+}

src/common/option.h

@@ -0,0 +1,53 @@
+#pragma once
+
+#include "util/FFstrbuf.h"
+
+struct yyjson_val;
+
+// Must be the first field of FFModuleOptions
+typedef struct FFModuleBaseInfo
+{
+    const char* name;
+    bool (*parseCommandOptions)(void* options, const char* key, const char* value);
+    void (*parseJsonObject)(void* options, struct yyjson_val *module);
+    void (*printModule)(void* options);
+} FFModuleBaseInfo;
+
+static inline void ffOptionInitModuleBaseInfo(
+    FFModuleBaseInfo* baseInfo,
+    const char* name,
+    void* parseCommandOptions, // bool (*const parseCommandOptions)(void* options, const char* key, const char* value)
+    void* parseJsonObject, // void (*const parseJsonObject)(void* options, yyjson_val *module)
+    void* printModule // void (*const printModule)(void* options)
+)
+{
+    baseInfo->name = name;
+    baseInfo->parseCommandOptions = (__typeof__(baseInfo->parseCommandOptions)) parseCommandOptions;
+    baseInfo->parseJsonObject = (__typeof__(baseInfo->parseJsonObject)) parseJsonObject;
+    baseInfo->printModule = (__typeof__(baseInfo->printModule)) printModule;
+}
+
+typedef struct FFModuleArgs
+{
+    FFstrbuf key;
+    FFstrbuf keyColor;
+    FFstrbuf outputFormat;
+    uint32_t keyWidth;
+} FFModuleArgs;
+
+typedef struct FFKeyValuePair
+{
+    const char* key;
+    int value;
+} FFKeyValuePair;
+
+const char* ffOptionTestPrefix(const char* argumentKey, const char* moduleName);
+bool ffOptionParseModuleArgs(const char* argumentKey, const char* pkey, const char* value, FFModuleArgs* result);
+void ffOptionParseString(const char* argumentKey, const char* value, FFstrbuf* buffer);
+FF_C_NODISCARD uint32_t ffOptionParseUInt32(const char* argumentKey, const char* value);
+FF_C_NODISCARD int32_t ffOptionParseInt32(const char* argumentKey, const char* value);
+FF_C_NODISCARD int ffOptionParseEnum(const char* argumentKey, const char* requestedKey, FFKeyValuePair pairs[]);
+FF_C_NODISCARD bool ffOptionParseBoolean(const char* str);
+void ffOptionParseColor(const char* value, FFstrbuf* buffer);
+void ffOptionInitModuleArg(FFModuleArgs* args);
+void ffOptionDestroyModuleArg(FFModuleArgs* args);

src/common/parsing.c

@@ -1,18 +1,13 @@
 #include "fastfetch.h"
+#include "common/parsing.h"
 
-bool ffStrSet(const char* str)
-{
-    if(str == NULL)
-        return false;
+#include <ctype.h>
+#include <inttypes.h>
 
-    while(*str != '\0')
-    {
-        if(*str != ' ' && *str != '\t' && *str != '\n' && *str != '\r')
-            return true;
-    }
-
-    return false;
-}
+#ifdef _WIN32
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wformat"
+#endif
 
 void ffParseSemver(FFstrbuf* buffer, const FFstrbuf* major, const FFstrbuf* minor, const FFstrbuf* patch)
 {
@@ -39,6 +34,84 @@ void ffParseSemver(FFstrbuf* buffer, const FFstrbuf* major, const FFstrbuf* mino
     ffStrbufAppend(buffer, patch);
 }
 
+int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2)
+{
+    if(version1->major != version2->major)
+        return version1->major > version2->major ? 1 : -1;
+
+    if(version1->minor != version2->minor)
+        return version1->minor > version2->minor ? 1 : -1;
+
+    if(version1->patch != version2->patch)
+        return version1->patch > version2->patch ? 1 : -1;
+
+    return 0;
+}
+
+void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty)
+{
+    if(version->major > 0 || version->minor > 0 || version->patch > 0)
+        ffStrbufAppendF(pretty, "%u", version->major);
+
+    if(version->minor > 0 || version->patch > 0)
+        ffStrbufAppendF(pretty, ".%u", version->minor);
+
+    if(version->patch > 0)
+        ffStrbufAppendF(pretty, ".%u", version->patch);
+}
+
+static void parseSize(FFstrbuf* result, uint64_t bytes, uint32_t base, const char** prefixes)
+{
+    double size = (double) bytes;
+    uint8_t counter = 0;
+
+    while(size >= base && counter < instance.config.sizeMaxPrefix && prefixes[counter + 1])
+    {
+        size /= base;
+        counter++;
+    }
+
+    if(counter == 0)
+        ffStrbufAppendF(result, "%"PRIu64" %s", bytes, prefixes[0]);
+    else
+        ffStrbufAppendF(result, "%.*f %s", instance.config.sizeNdigits, size, prefixes[counter]);
+}
+
+void ffParseSize(uint64_t bytes, FFstrbuf* result)
+{
+    switch (instance.config.binaryPrefixType)
+    {
+        case FF_BINARY_PREFIX_TYPE_IEC:
+            parseSize(result, bytes, 1024, (const char*[]) {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", NULL});
+            break;
+        case FF_BINARY_PREFIX_TYPE_SI:
+            parseSize(result, bytes, 1000, (const char*[]) {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL});
+            break;
+        case FF_BINARY_PREFIX_TYPE_JEDEC:
+            parseSize(result, bytes, 1024, (const char*[]) {"B", "KB", "MB", "GB", "TB", NULL});
+            break;
+        default:
+            parseSize(result, bytes, 1024, (const char*[]) {"B", NULL});
+            break;
+    }
+}
+
+void ffParseTemperature(double celsius, FFstrbuf* buffer)
+{
+    switch (instance.config.temperatureUnit)
+    {
+        case FF_TEMPERATURE_UNIT_CELSIUS:
+            ffStrbufAppendF(buffer, "%.1f°C", celsius);
+            break;
+        case FF_TEMPERATURE_UNIT_FAHRENHEIT:
+            ffStrbufAppendF(buffer, "%.1f°F", celsius * 1.8 + 32);
+            break;
+        case FF_TEMPERATURE_UNIT_KELVIN:
+            ffStrbufAppendF(buffer, "%.1f K", celsius + 273.15);
+            break;
+    }
+}
+
 void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4)
 {
     if(gtk2->length > 0 && gtk3->length > 0 && gtk4->length > 0)
@@ -118,3 +191,7 @@ void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, co
         ffStrbufAppendS(buffer, " [GTK4]");
     }
 }
+
+#ifdef _WIN32
+    #pragma GCC diagnostic pop
+#endif

src/common/parsing.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#ifndef FF_INCLUDED_parsing_h
+#define FF_INCLUDED_parsing_h
+
+#include "fastfetch.h"
+
+#include <stdint.h>
+
+typedef struct FFVersion
+{
+    uint32_t major;
+    uint32_t minor;
+    uint32_t patch;
+} FFVersion;
+
+#define FF_VERSION_INIT ((FFVersion) {0})
+
+void ffParseSemver(FFstrbuf* buffer, const FFstrbuf* major, const FFstrbuf* minor, const FFstrbuf* patch);
+void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4);
+
+void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty);
+int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2);
+
+void ffParseSize(uint64_t bytes, FFstrbuf* result);
+void ffParseTemperature(double celsius, FFstrbuf* buffer);
+
+#endif

src/common/printing.c

@@ -1,55 +1,117 @@
 #include "fastfetch.h"
+#include "common/printing.h"
+#include "util/textModifier.h"
 
-void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* formatString, uint32_t numFormatArgs, const char* message, ...)
+void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType)
 {
-    if(!instance->config.showErrors)
+    ffLogoPrintLine();
+
+    //This is used by --set-keyless, in this case we wan't neither the module name nor the separator
+    if(moduleName == NULL)
         return;
 
-    va_list arguments;
-    va_start(arguments, message);
-
-    if(formatString == NULL || formatString->length == 0)
+    if(!instance.config.pipe)
     {
-        ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat);
-        fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stdout);
-        vprintf(message, arguments);
-        puts(FASTFETCH_TEXT_MODIFIER_RESET);
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+        if (instance.config.brightColor)
+            fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
+
+        if(moduleArgs && !(printType & FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR) && moduleArgs->keyColor.length > 0)
+            ffPrintColor(&moduleArgs->keyColor);
+        else
+            ffPrintColor(&instance.config.colorKeys);
+    }
+
+    //NULL check is required for modules with custom keys, e.g. disk with the folder path
+    if((printType & FF_PRINT_TYPE_NO_CUSTOM_KEY) || !moduleArgs || moduleArgs->key.length == 0)
+    {
+        fputs(moduleName, stdout);
+
+        if(moduleIndex > 0)
+            printf(" %hhu", moduleIndex);
     }
     else
     {
-        FF_STRBUF_CREATE(error);
-        ffStrbufAppendVF(&error, message, arguments);
-
-        // calloc sets all to 0 and FF_FORMAT_ARG_TYPE_NULL also has value 0 so we don't need to explictly set it
-        FFformatarg* nullArgs = calloc(numFormatArgs, sizeof(FFformatarg));
-
-        ffPrintFormatString(instance, moduleName, moduleIndex, customKeyFormat, formatString, &error, numFormatArgs, nullArgs);
-
-        free(nullArgs);
-        ffStrbufDestroy(&error);
+        FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
+        ffParseFormatString(&key, &moduleArgs->key, 1, (FFformatarg[]){
+            {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex}
+        });
+        ffStrbufWriteTo(&key, stdout);
     }
 
-    va_end(arguments);
+    if(!instance.config.pipe)
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+
+    ffStrbufWriteTo(&instance.config.keyValueSeparator, stdout);
+
+    if(!instance.config.pipe)
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+
+
+    if (!instance.config.pipe && !(printType & FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH))
+    {
+        uint32_t keyWidth = moduleArgs && moduleArgs->keyWidth > 0 ? moduleArgs->keyWidth : instance.config.keyWidth;
+        if (keyWidth > 0)
+            printf("\e[%uG", (unsigned) (keyWidth + instance.state.logoWidth));
+    }
 }
 
-void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* formatString, const FFstrbuf* error, uint32_t numArgs, const FFformatarg* arguments)
+void ffPrintFormatString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments)
 {
-    FFstrbuf buffer;
-    ffStrbufInitA(&buffer, 256);
-
-    ffParseFormatString(&buffer, formatString, error, numArgs, arguments);
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+    if (moduleArgs)
+        ffParseFormatString(&buffer, &moduleArgs->outputFormat, numArgs, arguments);
+    else
+        ffStrbufAppendS(&buffer, "unknown");
 
     if(buffer.length > 0)
     {
-        ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat);
+        ffPrintLogoAndKey(moduleName, moduleIndex, moduleArgs, printType);
         ffStrbufPutTo(&buffer, stdout);
     }
+}
 
-    ffStrbufDestroy(&buffer);
+static void printError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, va_list arguments)
+{
+    if(!instance.config.showErrors)
+        return;
+
+    ffPrintLogoAndKey(moduleName, moduleIndex, moduleArgs, printType);
+
+    if(!instance.config.pipe)
+        fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stdout);
+
+    vprintf(message, arguments);
+
+    if(!instance.config.pipe)
+        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+
+    putchar('\n');
+}
+
+void ffPrintErrorString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...)
+{
+    va_list arguments;
+    va_start(arguments, message);
+    printError(moduleName, moduleIndex, moduleArgs, printType, message, arguments);
+    va_end(arguments);
+}
+
+void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...)
+{
+    va_list arguments;
+    va_start(arguments, message);
+    printError(moduleName, moduleIndex, moduleArgs, FF_PRINT_TYPE_DEFAULT, message, arguments);
+    va_end(arguments);
 }
 
 void ffPrintColor(const FFstrbuf* colorValue)
 {
+    //If the color is not set, this would reset in \033[m, which resets everything.
+    //So we only print it, if the main color is at least one char.
+    if(colorValue->length == 0)
+        return;
+
     fputs("\033[", stdout);
     ffStrbufWriteTo(colorValue, stdout);
     fputc('m', stdout);
@@ -57,6 +119,14 @@ void ffPrintColor(const FFstrbuf* colorValue)
 
 void ffPrintCharTimes(char c, uint32_t times)
 {
-    for(uint32_t i = 0; i < times; i++)
-        putchar(c);
+    if(times == 0)
+        return;
+
+    char str[32];
+    memset(str, c, sizeof(str)); //2 instructions when compiling with AVX2 enabled
+    for(uint32_t i = sizeof(str); i <= times; i += (uint32_t)sizeof(str))
+        fwrite(str, 1, sizeof(str), stdout);
+    uint32_t remaining = times % sizeof(str);
+    if(remaining > 0)
+        fwrite(str, 1, remaining, stdout);
 }

src/common/printing.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_printing
+#define FF_INCLUDED_common_printing
+
+#include "fastfetch.h"
+#include "common/format.h"
+
+typedef enum FFPrintType {
+    FF_PRINT_TYPE_DEFAULT = 0,
+    FF_PRINT_TYPE_NO_CUSTOM_KEY = 1 << 0,
+    FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR = 1 << 1,
+    FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH = 1 << 2,
+    FF_PRINT_TYPE_NO_CUSTOM_OUTPUT_FORMAT = 1 << 3, // reserved
+} FFPrintType;
+
+void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType);
+void ffPrintFormatString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments);
+static inline void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, uint32_t numArgs, const FFformatarg* arguments)
+{
+    ffPrintFormatString(moduleName, moduleIndex, moduleArgs, FF_PRINT_TYPE_DEFAULT, numArgs, arguments);
+}
+FF_C_PRINTF(5, 6) void ffPrintErrorString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...);
+FF_C_PRINTF(4, 5) void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...);
+void ffPrintColor(const FFstrbuf* colorValue);
+void ffPrintCharTimes(char c, uint32_t times);
+
+#endif

src/common/processing.c

@@ -1,34 +0,0 @@
-#include "fastfetch.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-void ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
-{
-    int pipes[2];
-
-    if(pipe(pipes) == -1)
-        return;
-
-    pid_t childPid = fork();
-    if(childPid == -1)
-        return;
-
-    //Child
-    if(childPid == 0)
-    {
-        dup2(pipes[1], STDOUT_FILENO);
-        close(pipes[0]);
-        close(pipes[1]);
-        close(STDERR_FILENO);
-        execvp(argv[0], argv);
-        exit(901);
-    }
-
-    //Parent
-    close(pipes[1]);
-    waitpid(childPid, NULL, 0);
-    ffAppendFDContent(pipes[0], buffer);
-    close(pipes[0]);
-}

src/common/processing.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_processing
+#define FF_INCLUDED_common_processing
+
+#include "util/FFstrbuf.h"
+
+const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr);
+
+static inline const char* ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
+{
+    const char* error = ffProcessAppendOutput(buffer, argv, false);
+    if (!error)
+    {
+        ffStrbufTrimRight(buffer, '\n');
+        ffStrbufTrimRight(buffer, ' ');
+    }
+    return error;
+}
+
+static inline const char* ffProcessAppendStdErr(FFstrbuf* buffer, char* const argv[])
+{
+    const char* error = ffProcessAppendOutput(buffer, argv, true);
+    if (!error)
+    {
+        ffStrbufTrimRight(buffer, '\n');
+        ffStrbufTrimRight(buffer, ' ');
+    }
+    return error;
+}
+
+#endif

src/common/processing_linux.c

@@ -0,0 +1,85 @@
+#include "fastfetch.h"
+#include "common/processing.h"
+#include "common/io/io.h"
+#include "common/time.h"
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <poll.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/wait.h>
+
+enum { FF_PIPE_BUFSIZ = 4096 };
+
+static inline void waitpid_wrapper(pid_t* pid)
+{
+    // remove zombie processes
+    if (*pid > 0)
+        waitpid(*pid, NULL, 0);
+}
+
+const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr)
+{
+    int pipes[2];
+
+    if(pipe(pipes) == -1)
+        return "pipe() failed";
+
+    __attribute__((__cleanup__(waitpid_wrapper))) pid_t childPid = fork();
+    if(childPid == -1)
+        return "fork() failed";
+
+    //Child
+    if(childPid == 0)
+    {
+        dup2(pipes[1], useStdErr ? STDERR_FILENO : STDOUT_FILENO);
+        close(pipes[0]);
+        close(pipes[1]);
+        close(useStdErr ? STDOUT_FILENO : STDERR_FILENO);
+        execvp(argv[0], argv);
+        exit(901);
+    }
+
+    //Parent
+    close(pipes[1]);
+
+    int FF_AUTO_CLOSE_FD childPipeFd = pipes[0];
+
+    int timeout = instance.config.processingTimeout;
+    if (timeout >= 0)
+        fcntl(childPipeFd, F_SETFL, fcntl(childPipeFd, F_GETFL) | O_NONBLOCK);
+
+    do
+    {
+        if (timeout >= 0)
+        {
+            struct pollfd pollfd = { childPipeFd, POLLIN, 0 };
+            if (poll(&pollfd, 1, timeout) == 0)
+            {
+                kill(childPid, SIGTERM);
+                return "poll(&pollfd, 1, timeout) timeout";
+            }
+            else if (pollfd.revents & POLLERR)
+            {
+                kill(childPid, SIGTERM);
+                return "poll(&pollfd, 1, timeout) error";
+            }
+        }
+
+        char str[FF_PIPE_BUFSIZ];
+        while (true)
+        {
+            ssize_t nRead = read(childPipeFd, str, FF_PIPE_BUFSIZ);
+            if (nRead > 0)
+                ffStrbufAppendNS(buffer, (uint32_t) nRead, str);
+            else if (nRead == 0)
+                return NULL;
+            else if (nRead < 0)
+                break;
+        }
+    } while (errno == EAGAIN);
+
+    return NULL;
+}

src/common/processing_windows.c

@@ -0,0 +1,127 @@
+#include "fastfetch.h"
+#include "common/processing.h"
+#include "common/io/io.h"
+
+#include <Windows.h>
+
+enum { FF_PIPE_BUFSIZ = 4096 };
+
+const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr)
+{
+    int timeout = instance.config.processingTimeout;
+
+    FF_AUTO_CLOSE_FD HANDLE hChildPipeRead = CreateNamedPipeW(
+        L"\\\\.\\pipe\\LOCAL\\",
+        PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE | (timeout < 0 ? 0 : FILE_FLAG_OVERLAPPED),
+        0,
+        1,
+        FF_PIPE_BUFSIZ,
+        FF_PIPE_BUFSIZ,
+        0,
+        NULL
+    );
+    if (hChildPipeRead == INVALID_HANDLE_VALUE)
+        return "CreateNamedPipeW(L\"\\\\.\\pipe\\LOCAL\\\") failed";
+
+    HANDLE hChildPipeWrite = CreateFileW(
+        L"\\\\.\\pipe\\LOCAL\\",
+        GENERIC_WRITE,
+        0,
+        &(SECURITY_ATTRIBUTES){
+            .nLength = sizeof(SECURITY_ATTRIBUTES),
+            .lpSecurityDescriptor = NULL,
+            .bInheritHandle = TRUE,
+        },
+        OPEN_EXISTING,
+        0,
+        NULL
+    );
+    if (hChildPipeWrite == INVALID_HANDLE_VALUE)
+        return "CreateFileW(L\"\\\\.\\pipe\\LOCAL\\\") failed";
+
+    PROCESS_INFORMATION piProcInfo = {0};
+
+    BOOL success;
+
+    {
+        STARTUPINFOA siStartInfo = {
+            .cb = sizeof(siStartInfo),
+            .dwFlags = STARTF_USESTDHANDLES,
+        };
+        if (useStdErr)
+            siStartInfo.hStdError = hChildPipeWrite;
+        else
+            siStartInfo.hStdOutput = hChildPipeWrite;
+
+        FF_STRBUF_AUTO_DESTROY cmdline = ffStrbufCreateF("\"%s\"", argv[0]);
+        for(char* const* parg = &argv[1]; *parg; ++parg)
+        {
+            ffStrbufAppendC(&cmdline, ' ');
+            ffStrbufAppendS(&cmdline, *parg);
+        }
+
+        success = CreateProcessA(
+            NULL,          // application name
+            cmdline.chars, // command line
+            NULL,          // process security attributes
+            NULL,          // primary thread security attributes
+            TRUE,          // handles are inherited
+            0,             // creation flags
+            NULL,          // use parent's environment
+            NULL,          // use parent's current directory
+            &siStartInfo,  // STARTUPINFO pointer
+            &piProcInfo    // receives PROCESS_INFORMATION
+        );
+    }
+
+    CloseHandle(hChildPipeWrite);
+    if(!success)
+        return "CreateProcessA() failed";
+
+    FF_AUTO_CLOSE_FD HANDLE hProcess = piProcInfo.hProcess;
+    FF_MAYBE_UNUSED FF_AUTO_CLOSE_FD HANDLE hThread = piProcInfo.hThread;
+
+    char str[FF_PIPE_BUFSIZ];
+    DWORD nRead = 0;
+    FF_AUTO_CLOSE_FD HANDLE hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
+    OVERLAPPED overlapped = { .hEvent = hEvent };
+    // ReadFile always completes synchronously if the pipe is not created with FILE_FLAG_OVERLAPPED
+    do
+    {
+        if (!ReadFile(hChildPipeRead, str, sizeof(str), &nRead, &overlapped))
+        {
+            switch (GetLastError())
+            {
+            case ERROR_IO_PENDING:
+                if (!timeout || WaitForSingleObject(hEvent, (DWORD) timeout) != WAIT_OBJECT_0)
+                {
+                    CancelIo(hChildPipeRead);
+                    TerminateProcess(hProcess, 1);
+                    return "WaitForSingleObject(hEvent) failed or timeout";
+                }
+
+                if (!GetOverlappedResult(hChildPipeRead, &overlapped, &nRead, FALSE))
+                {
+                    if (GetLastError() == ERROR_BROKEN_PIPE)
+                        return NULL;
+
+                    CancelIo(hChildPipeRead);
+                    TerminateProcess(hProcess, 1);
+                    return "GetOverlappedResult(hChildPipeRead) failed";
+                }
+                break;
+
+            case ERROR_BROKEN_PIPE:
+                return NULL;
+
+            default:
+                CancelIo(hChildPipeRead);
+                TerminateProcess(hProcess, 1);
+                return "ReadFile(hChildPipeRead) failed";
+            }
+        }
+        ffStrbufAppendNS(buffer, nRead, str);
+    } while (nRead > 0);
+
+    return NULL;
+}

src/common/properties.c

@@ -1,4 +1,10 @@
 #include "fastfetch.h"
+#include "common/properties.h"
+
+#include <stdlib.h>
+#ifdef _WIN32
+    #include "util/windows/getline.h"
+#endif
 
 static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)
 {
@@ -86,27 +92,30 @@ bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer)
 // The following functions return true if the file was found, independently if start was found
 // Buffers which already contain content are not overwritten
 // The last occurence of start in the first file will be the one used
-// The *Values methods always return true, if all properties were already found before, without testing if the file exists
 
 bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquery* queries)
 {
-    bool* searchedValues = malloc(sizeof(bool) * numQueries);
+    FILE* file = fopen(filename, "r");
+    if(file == NULL)
+        return false;
+
+    bool valueStorage[4];
+    bool* unsetValues;
+
+    if(numQueries > sizeof(valueStorage) / sizeof(valueStorage[0]))
+        unsetValues = malloc(sizeof(bool) * numQueries);
+    else
+        unsetValues = valueStorage;
+
     bool allSet = true;
     for(uint32_t i = 0; i < numQueries; i++)
     {
-        if((searchedValues[i] = queries[i].buffer->length == 0))
+        if((unsetValues[i] = queries[i].buffer->length == 0))
             allSet = false;
     }
 
     if(allSet)
-    {
-        free(searchedValues);
-        return true;
-    }
-
-    FILE* file = fopen(filename, "r");
-    if(file == NULL)
-        return false;
+        goto done;
 
     char* line = NULL;
     size_t len = 0;
@@ -115,7 +124,7 @@ bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquer
     {
         for(uint32_t i = 0; i < numQueries; i++)
         {
-            if(!searchedValues[i])
+            if(!unsetValues[i])
                 continue;
 
             uint32_t currentLength = queries[i].buffer->length;
@@ -125,60 +134,37 @@ bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquer
         }
     }
 
-    free(searchedValues);
-
     if(line != NULL)
         free(line);
 
+done:
     fclose(file);
-
+    if(unsetValues != valueStorage)
+        free(unsetValues);
     return true;
 }
 
-bool ffParsePropFile(const char* filename, const char* start, FFstrbuf* buffer)
+bool ffParsePropFileHomeValues(const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
 {
-    return ffParsePropFileValues(filename, 1, (FFpropquery[]){{start, buffer}});
+    FF_STRBUF_AUTO_DESTROY absolutePath = ffStrbufCreateF("%s/%s", instance.state.platform.homeDir.chars, relativeFile);
+    return ffParsePropFileValues(absolutePath.chars, numQueries, queries);
 }
 
-bool ffParsePropFileHomeValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
-{
-    FFstrbuf absolutePath;
-    ffStrbufInitA(&absolutePath, 64);
-    ffStrbufAppendS(&absolutePath, instance->state.passwd->pw_dir);
-    ffStrbufAppendC(&absolutePath, '/');
-    ffStrbufAppendS(&absolutePath, relativeFile);
-
-    bool result = ffParsePropFileValues(absolutePath.chars, numQueries, queries);
-
-    ffStrbufDestroy(&absolutePath);
-
-    return result;
-}
-
-bool ffParsePropFileHome(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer)
-{
-    return ffParsePropFileHomeValues(instance, relativeFile, 1, (FFpropquery[]){{start, buffer}});
-}
-
-bool ffParsePropFileConfigValues(const FFinstance* instance, const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
+bool ffParsePropFileListValues(const FFlist* list, const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
 {
     bool foundAFile = false;
 
-    for(uint32_t i = 0; i < instance->state.configDirs.length; i++)
+    FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
+
+    FF_LIST_FOR_EACH(FFstrbuf, dirPrefix, *list)
     {
-        FFstrbuf* baseDir = (FFstrbuf*) ffListGet(&instance->state.configDirs, i);
-        uint32_t baseDirLength = baseDir->length;
+        //We need to copy the dir each time, because it used by multiple threads, so we can't directly write to it.
+        ffStrbufSet(&baseDir, dirPrefix);
+        ffStrbufAppendS(&baseDir, relativeFile);
 
-        if(*relativeFile != '/')
-            ffStrbufAppendC(baseDir, '/');
-
-        ffStrbufAppendS(baseDir, relativeFile);
-
-        if(ffParsePropFileValues(baseDir->chars, numQueries, queries))
+        if(ffParsePropFileValues(baseDir.chars, numQueries, queries))
             foundAFile = true;
 
-        ffStrbufSubstrBefore(baseDir, baseDirLength);
-
         bool allSet = true;
         for(uint32_t k = 0; k < numQueries; k++)
         {
@@ -195,8 +181,3 @@ bool ffParsePropFileConfigValues(const FFinstance* instance, const char* relativ
 
     return foundAFile;
 }
-
-bool ffParsePropFileConfig(const FFinstance* instance, const char* relativeFile, const char* start, FFstrbuf* buffer)
-{
-    return ffParsePropFileConfigValues(instance, relativeFile, 1, (FFpropquery[]){{start, buffer}});
-}

src/common/properties.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_properties
+#define FF_INCLUDED_common_properties
+
+#include "fastfetch.h"
+
+typedef struct FFpropquery
+{
+    const char* start;
+    FFstrbuf* buffer;
+} FFpropquery;
+
+bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer);
+bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer);
+bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquery* queries);
+bool ffParsePropFileHomeValues(const char* relativeFile, uint32_t numQueries, FFpropquery* queries);
+bool ffParsePropFileListValues(const FFlist* list, const char* relativeFile, uint32_t numQueries, FFpropquery* queries);
+
+static inline bool ffParsePropFile(const char* filename, const char* start, FFstrbuf* buffer)
+{
+    return ffParsePropFileValues(filename, 1, (FFpropquery[]){{start, buffer}});
+}
+
+static inline bool ffParsePropFileHome(const char* relativeFile, const char* start, FFstrbuf* buffer)
+{
+    return ffParsePropFileHomeValues(relativeFile, 1, (FFpropquery[]){{start, buffer}});
+}
+
+static inline bool ffParsePropFileList(const FFlist* list, const char* relativeFile, const char* start, FFstrbuf* buffer)
+{
+    return ffParsePropFileListValues(list, relativeFile, 1, (FFpropquery[]){{start, buffer}});
+}
+
+static inline bool ffParsePropFileConfigValues(const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
+{
+    return ffParsePropFileListValues(&instance.state.platform.configDirs, relativeFile, numQueries, queries);
+}
+
+static inline bool ffParsePropFileConfig(const char* relativeFile, const char* start, FFstrbuf* buffer)
+{
+    return ffParsePropFileConfigValues(relativeFile, 1, (FFpropquery[]){{start, buffer}});
+}
+
+static inline bool ffParsePropFileDataValues(const char* relativeFile, uint32_t numQueries, FFpropquery* queries)
+{
+    return ffParsePropFileListValues(&instance.state.platform.dataDirs, relativeFile, numQueries, queries);
+}
+
+static inline bool ffParsePropFileData(const char* relativeFile, const char* start, FFstrbuf* buffer)
+{
+    return ffParsePropFileDataValues(relativeFile, 1, (FFpropquery[]){{start, buffer}});
+}
+
+#endif

src/common/settings.c

@@ -1,22 +1,32 @@
 #include "fastfetch.h"
+#include "common/settings.h"
+#include "common/library.h"
+#include "common/thread.h"
+#include "common/io/io.h"
 
-#include <pthread.h>
 #include <string.h>
 
+typedef enum FFInitState
+{
+    FF_INITSTATE_UNINITIALIZED = 0,
+    FF_INITSTATE_SUCCESSFUL = 1,
+    FF_INITSTATE_FAILED = 2
+} FFInitState;
+
 #define FF_LIBRARY_DATA_LOAD_INIT(dataObject, userLibraryName, ...) \
     static dataObject data; \
-    static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; \
+    static FFThreadMutex mutex = FF_THREAD_MUTEX_INITIALIZER; \
     static FFInitState initState = FF_INITSTATE_UNINITIALIZED; \
-    pthread_mutex_lock(&mutex); \
+    ffThreadMutexLock(&mutex); \
     if(initState != FF_INITSTATE_UNINITIALIZED) {\
-        pthread_mutex_unlock(&mutex); \
+        ffThreadMutexUnlock(&mutex); \
         return initState == FF_INITSTATE_SUCCESSFUL ? &data : NULL; \
     } \
     initState = FF_INITSTATE_SUCCESSFUL; \
     void* libraryHandle = ffLibraryLoad(&userLibraryName, __VA_ARGS__, NULL); \
     if(libraryHandle == NULL) { \
         initState = FF_INITSTATE_FAILED; \
-        pthread_mutex_unlock(&mutex); \
+        ffThreadMutexUnlock(&mutex); \
         return NULL; \
     } \
 
@@ -25,20 +35,20 @@
     if(data.ff ## symbolName == NULL) { \
         dlclose(libraryHandle); \
         initState = FF_INITSTATE_FAILED; \
-        pthread_mutex_unlock(&mutex); \
+        ffThreadMutexUnlock(&mutex); \
         return NULL; \
     }
 
 #define FF_LIBRARY_DATA_LOAD_RETURN \
     initState = FF_INITSTATE_SUCCESSFUL; \
-    pthread_mutex_unlock(&mutex); \
+    ffThreadMutexUnlock(&mutex); \
     return &data;
 
 #define FF_LIBRARY_DATA_LOAD_ERROR \
     { \
         dlclose(libraryHandle); \
         initState = FF_INITSTATE_FAILED; \
-        pthread_mutex_unlock(&mutex); \
+        ffThreadMutexUnlock(&mutex); \
         return NULL; \
     }
 
@@ -47,23 +57,31 @@
 
 typedef struct GVariantGetters
 {
-    FF_LIBRARY_SYMBOL(g_variant_get_string)
+    FF_LIBRARY_SYMBOL(g_variant_dup_string)
     FF_LIBRARY_SYMBOL(g_variant_get_boolean)
     FF_LIBRARY_SYMBOL(g_variant_get_int32)
+    FF_LIBRARY_SYMBOL(g_variant_unref)
 } GVariantGetters;
 
 static FFvariant getGVariantValue(GVariant* variant, FFvarianttype type, const GVariantGetters* variantGetters)
 {
+    FFvariant result;
+
     if(variant == NULL)
-        return FF_VARIANT_NULL;
+        result = FF_VARIANT_NULL;
     else if(type == FF_VARIANT_TYPE_STRING)
-        return (FFvariant) {.strValue = variantGetters->ffg_variant_get_string(variant, NULL)};
+        result = (FFvariant) {.strValue = variantGetters->ffg_variant_dup_string(variant, NULL)}; // Dup string, so that variant itself can be freed
     else if(type == FF_VARIANT_TYPE_BOOL)
-        return (FFvariant) {.boolValue = (bool) variantGetters->ffg_variant_get_boolean(variant), .boolValueSet = true};
+        result = (FFvariant) {.boolValue = (bool) variantGetters->ffg_variant_get_boolean(variant), .boolValueSet = true};
     else if(type == FF_VARIANT_TYPE_INT)
-        return (FFvariant) {.intValue = variantGetters->ffg_variant_get_int32(variant)};
+        result = (FFvariant) {.intValue = variantGetters->ffg_variant_get_int32(variant)};
     else
-        return FF_VARIANT_NULL;
+        result = FF_VARIANT_NULL;
+
+    if(variant)
+        variantGetters->ffg_variant_unref(variant);
+
+    return result;
 }
 
 typedef struct GSettingsData
@@ -79,9 +97,9 @@ typedef struct GSettingsData
     GVariantGetters variantGetters;
 } GSettingsData;
 
-static const GSettingsData* getGSettingsData(FFinstance* instance)
+static const GSettingsData* getGSettingsData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(GSettingsData, instance->config.libGIO, "libgio-2.0.so", 1);
+    FF_LIBRARY_DATA_LOAD_INIT(GSettingsData, instance.config.libGIO, "libgio-2.0" FF_LIBRARY_EXTENSION, 1);
 
     FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_schema_source_lookup)
     FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_schema_has_key)
@@ -92,9 +110,10 @@ static const GSettingsData* getGSettingsData(FFinstance* instance)
     FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_schema_source_get_default)
 
     #define data data.variantGetters
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_string)
+    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_dup_string)
     FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_boolean)
     FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_int32)
+    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_unref);
     #undef data
 
     data.schemaSource = data.ffg_settings_schema_source_get_default();
@@ -104,9 +123,9 @@ static const GSettingsData* getGSettingsData(FFinstance* instance)
     FF_LIBRARY_DATA_LOAD_RETURN
 }
 
-FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, const char* path, const char* key, FFvarianttype type)
+FFvariant ffSettingsGetGSettings(const char* schemaName, const char* path, const char* key, FFvarianttype type)
 {
-    const GSettingsData* data = getGSettingsData(instance);
+    const GSettingsData* data = getGSettingsData();
     if(data == NULL)
         return FF_VARIANT_NULL;
 
@@ -133,9 +152,9 @@ FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, c
     return getGVariantValue(variant, type, &data->variantGetters);
 }
 #else //FF_HAVE_GIO
-FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, const char* path, const char* key, FFvarianttype type)
+FFvariant ffSettingsGetGSettings(const char* schemaName, const char* path, const char* key, FFvarianttype type)
 {
-    FF_UNUSED(instance, schemaName, path, key, type)
+    FF_UNUSED(schemaName, path, key, type)
     return FF_VARIANT_NULL;
 }
 #endif //FF_HAVE_GIO
@@ -151,17 +170,18 @@ typedef struct DConfData
     DConfClient* client;
 } DConfData;
 
-static const DConfData* getDConfData(FFinstance* instance)
+static const DConfData* getDConfData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(DConfData, instance->config.libDConf, "libdconf.so", 2);
+    FF_LIBRARY_DATA_LOAD_INIT(DConfData, instance.config.libDConf, "libdconf" FF_LIBRARY_EXTENSION, 2);
 
     FF_LIBRARY_DATA_LOAD_SYMBOL(dconf_client_read_full)
     FF_LIBRARY_DATA_LOAD_SYMBOL(dconf_client_new)
 
     #define data data.variantGetters
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_string)
+    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_dup_string)
     FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_boolean)
     FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_int32)
+    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_unref)
     #undef data
 
     data.client = data.ffdconf_client_new();
@@ -171,9 +191,9 @@ static const DConfData* getDConfData(FFinstance* instance)
     FF_LIBRARY_DATA_LOAD_RETURN
 }
 
-FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type)
+FFvariant ffSettingsGetDConf(const char* key, FFvarianttype type)
 {
-    const DConfData* data = getDConfData(instance);
+    const DConfData* data = getDConfData();
     if(data == NULL)
         return FF_VARIANT_NULL;
 
@@ -189,23 +209,23 @@ FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttyp
     return getGVariantValue(variant, type, &data->variantGetters);
 }
 #else //FF_HAVE_DCONF
-FFvariant ffSettingsGetDConf(FFinstance* instance, const char* key, FFvarianttype type)
+FFvariant ffSettingsGetDConf(const char* key, FFvarianttype type)
 {
-    FF_UNUSED(instance, key, type)
+    FF_UNUSED(key, type)
     return FF_VARIANT_NULL;
 }
 #endif //FF_HAVE_DCONF
 
-FFvariant ffSettingsGet(FFinstance* instance, const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type)
+FFvariant ffSettingsGet(const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type)
 {
-    FFvariant gsettings = ffSettingsGetGSettings(instance, gsettingsSchemaName, gsettingsPath, gsettingsKey, type);
+    FFvariant gsettings = ffSettingsGetGSettings(gsettingsSchemaName, gsettingsPath, gsettingsKey, type);
 
     if(
         (type == FF_VARIANT_TYPE_BOOL && gsettings.boolValueSet) ||
         (type != FF_VARIANT_TYPE_BOOL && gsettings.strValue != NULL)
     ) return gsettings;
 
-    return ffSettingsGetDConf(instance, dconfKey, type);
+    return ffSettingsGetDConf(dconfKey, type);
 }
 
 #ifdef FF_HAVE_XFCONF
@@ -221,9 +241,9 @@ typedef struct XFConfData
     FF_LIBRARY_SYMBOL(xfconf_init)
 } XFConfData;
 
-static const XFConfData* getXFConfData(FFinstance* instance)
+static const XFConfData* getXFConfData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(XFConfData, instance->config.libXFConf, "libxfconf-0.so", 4);
+    FF_LIBRARY_DATA_LOAD_INIT(XFConfData, instance.config.libXFConf, "libxfconf-0" FF_LIBRARY_EXTENSION, 4);
 
     FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_get)
     FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_has_property)
@@ -238,9 +258,9 @@ static const XFConfData* getXFConfData(FFinstance* instance)
     FF_LIBRARY_DATA_LOAD_RETURN
 }
 
-FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, const char* propertyName, FFvarianttype type)
+FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type)
 {
-    const XFConfData* data = getXFConfData(instance);
+    const XFConfData* data = getXFConfData();
     if(data == NULL)
         return FF_VARIANT_NULL;
 
@@ -261,9 +281,9 @@ FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, con
     return FF_VARIANT_NULL;
 }
 #else //FF_HAVE_XFCONF
-FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, const char* propertyName, FFvarianttype type)
+FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type)
 {
-    FF_UNUSED(instance, channelName, propertyName, type)
+    FF_UNUSED(channelName, propertyName, type)
     return FF_VARIANT_NULL;
 }
 #endif //FF_HAVE_XFCONF
@@ -278,28 +298,33 @@ typedef struct SQLiteData
     FF_LIBRARY_SYMBOL(sqlite3_step)
     FF_LIBRARY_SYMBOL(sqlite3_data_count)
     FF_LIBRARY_SYMBOL(sqlite3_column_int)
+    FF_LIBRARY_SYMBOL(sqlite3_column_text)
     FF_LIBRARY_SYMBOL(sqlite3_finalize)
     FF_LIBRARY_SYMBOL(sqlite3_close)
 } SQLiteData;
 
-static const SQLiteData* getSQLiteData(const FFinstance* instance)
+static const SQLiteData* getSQLiteData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(SQLiteData, instance->config.libSQLite3, "libsqlite3.so", 1);
+    FF_LIBRARY_DATA_LOAD_INIT(SQLiteData, instance.config.libSQLite3, "libsqlite3" FF_LIBRARY_EXTENSION, 1);
 
     FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_open_v2)
     FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_prepare_v2)
     FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_step)
     FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_data_count)
     FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_column_int)
+    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_column_text)
     FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_finalize)
     FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_close)
 
     FF_LIBRARY_DATA_LOAD_RETURN
 }
 
-int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query)
+int ffSettingsGetSQLite3Int(const char* dbPath, const char* query)
 {
-    const SQLiteData* data = getSQLiteData(instance);
+    if(!ffPathExists(dbPath, FF_PATHTYPE_FILE))
+        return 0;
+
+    const SQLiteData* data = getSQLiteData();
     if(data == NULL)
         return 0;
 
@@ -328,20 +353,74 @@ int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, cons
 
     return result;
 }
-#else //FF_HAVE_SQLITE3
-int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query)
+
+bool ffSettingsGetSQLite3String(const char* dbPath, const char* query, FFstrbuf* result)
 {
-    FF_UNUSED(instance, dbPath, query)
+    if(!ffPathExists(dbPath, FF_PATHTYPE_FILE))
+        return false;
+
+    const SQLiteData* data = getSQLiteData();
+    if(data == NULL)
+        return false;
+
+    sqlite3* db;
+    if(data->ffsqlite3_open_v2(dbPath, &db, SQLITE_OPEN_READONLY, NULL) != SQLITE_OK)
+        return false;
+
+    sqlite3_stmt* stmt;
+    if(data->ffsqlite3_prepare_v2(db, query, (int) strlen(query), &stmt, NULL) != SQLITE_OK)
+    {
+        data->ffsqlite3_close(db);
+        return false;
+    }
+
+    if(data->ffsqlite3_step(stmt) != SQLITE_ROW || data->ffsqlite3_data_count(stmt) < 1)
+    {
+        data->ffsqlite3_finalize(stmt);
+        data->ffsqlite3_close(db);
+        return false;
+    }
+
+    ffStrbufSetS(result, (const char *) data->ffsqlite3_column_text(stmt, 0));
+
+    data->ffsqlite3_finalize(stmt);
+    data->ffsqlite3_close(db);
+
+    return true;
+}
+#else //FF_HAVE_SQLITE3
+int ffSettingsGetSQLite3Int(const char* dbPath, const char* query)
+{
+    FF_UNUSED(dbPath, query)
     return 0;
 }
+bool ffSettingsGetSQLite3String(const char* dbPath, const char* query, FFstrbuf* result)
+{
+    FF_UNUSED(dbPath, query, result)
+    return false;
+}
 #endif //FF_HAVE_SQLITE3
 
 #ifdef __ANDROID__
 #include <sys/system_properties.h>
 bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result) {
-    uint32_t originalLength = result->length;
     ffStrbufEnsureFree(result, PROP_VALUE_MAX);
-    result->length += (uint32_t) __system_property_get(propName, result->chars + result->length);
-    return result->length > originalLength;
+    int len = __system_property_get(propName, result->chars + result->length);
+    if (len <= 0) return false;
+    result->length += (uint32_t) len;
+    result->chars[result->length] = '\0';
+    return true;
+}
+#elif defined(__FreeBSD__)
+#include <kenv.h>
+bool ffSettingsGetFreeBSDKenv(const char* propName, FFstrbuf* result)
+{
+    //https://wiki.ghostbsd.org/index.php/Kenv
+    ffStrbufEnsureFree(result, KENV_MVALLEN);
+    int len = kenv(KENV_GET, propName, result->chars + result->length, KENV_MVALLEN);
+    if (len <= 0) return false;
+    result->length += (uint32_t) len;
+    result->chars[result->length] = '\0';
+    return true;
 }
 #endif

src/common/settings.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_settings
+#define FF_INCLUDED_common_settings
+
+#include "fastfetch.h"
+
+typedef enum FFvarianttype
+{
+    FF_VARIANT_TYPE_STRING,
+    FF_VARIANT_TYPE_BOOL,
+    FF_VARIANT_TYPE_INT
+} FFvarianttype;
+
+typedef union FFvariant
+{
+    const char* strValue;
+    int32_t intValue;
+    struct
+    {
+        bool boolValueSet;
+        bool boolValue;
+    };
+} FFvariant;
+
+#define FF_VARIANT_NULL ((FFvariant){.strValue = NULL})
+
+FFvariant ffSettingsGetDConf(const char* key, FFvarianttype type);
+FFvariant ffSettingsGetGSettings(const char* schemaName, const char* path, const char* key, FFvarianttype type);
+FFvariant ffSettingsGet(const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type);
+FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type);
+
+int ffSettingsGetSQLite3Int(const char* dbPath, const char* query);
+bool ffSettingsGetSQLite3String(const char* dbPath, const char* query, FFstrbuf* result);
+
+#ifdef __ANDROID__
+bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result);
+#elif defined(__FreeBSD__)
+bool ffSettingsGetFreeBSDKenv(const char* propName, FFstrbuf* result);
+#endif
+
+#endif

src/common/sysctl.c

@@ -0,0 +1,55 @@
+#include "sysctl.h"
+
+#include <stdlib.h>
+
+const char* ffSysctlGetString(const char* propName, FFstrbuf* result)
+{
+    size_t neededLength;
+    if(sysctlbyname(propName, NULL, &neededLength, NULL, 0) != 0 || neededLength == 1) //neededLength is 1 for empty strings, because of the null terminator
+        return "sysctlbyname() failed";
+
+    ffStrbufEnsureFree(result, (uint32_t) neededLength - 1);
+
+    if(sysctlbyname(propName, result->chars + result->length, &neededLength, NULL, 0) == 0)
+        result->length += (uint32_t) neededLength - 1;
+
+    result->chars[result->length] = '\0';
+
+    return NULL;
+}
+
+int ffSysctlGetInt(const char* propName, int defaultValue)
+{
+    int result;
+    size_t neededLength = sizeof(result);
+    if(sysctlbyname(propName, &result, &neededLength, NULL, 0) != 0)
+        return defaultValue;
+    return result;
+}
+
+int64_t ffSysctlGetInt64(const char* propName, int64_t defaultValue)
+{
+    int64_t result;
+    size_t neededLength = sizeof(result);
+    if(sysctlbyname(propName, &result, &neededLength, NULL, 0) != 0)
+        return defaultValue;
+    return result;
+}
+
+void* ffSysctlGetData(int* request, u_int requestLength, size_t* resultLength)
+{
+    if(sysctl(request, requestLength, NULL, resultLength, NULL, 0) != 0)
+        return NULL;
+
+    void* data = malloc(*resultLength);
+    if(data == NULL)
+        return NULL;
+
+    if(sysctl(request, requestLength, data, resultLength, NULL, 0) != 0)
+    {
+        free(data);
+        return NULL;
+    }
+
+    return data;
+}

src/common/sysctl.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_sysctl
+#define FF_INCLUDED_common_sysctl
+
+#include "fastfetch.h"
+#include "util/FFcheckmacros.h"
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+const char* ffSysctlGetString(const char* propName, FFstrbuf* result);
+FF_C_NODISCARD int ffSysctlGetInt(const char* propName, int defaultValue);
+FF_C_NODISCARD int64_t ffSysctlGetInt64(const char* propName, int64_t defaultValue);
+FF_C_NODISCARD void* ffSysctlGetData(int* request, u_int requestLength, size_t* resultLength);
+
+#endif

src/common/thread.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_thread
+#define FF_INCLUDED_common_thread
+
+#include "fastfetch.h"
+
+#ifdef FF_HAVE_THREADS
+    #if defined(_WIN32)
+        #include <handleapi.h>
+        #include <synchapi.h>
+        #include <process.h>
+        #define FF_THREAD_MUTEX_INITIALIZER SRWLOCK_INIT
+        typedef SRWLOCK FFThreadMutex;
+        typedef HANDLE FFThreadType;
+        static inline void ffThreadMutexLock(FFThreadMutex* mutex) { AcquireSRWLockExclusive(mutex); }
+        static inline void ffThreadMutexUnlock(FFThreadMutex* mutex) { ReleaseSRWLockExclusive(mutex); }
+        static inline FFThreadType ffThreadCreate(unsigned (__stdcall* func)(void*), void* data) {
+            return (FFThreadType)_beginthreadex(NULL, 0, func, data, 0, NULL);
+        }
+        #define FF_THREAD_ENTRY_DECL_WRAPPER(fn, paramType) static __stdcall unsigned fn ## ThreadMain (void* data) { fn((paramType)data); return 0; }
+        #define FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(fn) static __stdcall unsigned fn ## ThreadMain () { fn(); return 0; }
+        static inline void ffThreadDetach(FFThreadType thread) { CloseHandle(thread); }
+        static inline void ffThreadJoin(FFThreadType thread) { WaitForSingleObject(thread, 0xffffffff /*INFINITE*/); }
+    #else
+        #include <pthread.h>
+        #define FF_THREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
+        typedef pthread_mutex_t FFThreadMutex;
+        typedef pthread_t FFThreadType;
+        static inline void ffThreadMutexLock(FFThreadMutex* mutex) { pthread_mutex_lock(mutex); }
+        static inline void ffThreadMutexUnlock(FFThreadMutex* mutex) { pthread_mutex_unlock(mutex); }
+        static inline FFThreadType ffThreadCreate(void* (* func)(void*), void* data) {
+            FFThreadType newThread = 0;
+            pthread_create(&newThread, NULL, func, data);
+            return newThread;
+        }
+        #define FF_THREAD_ENTRY_DECL_WRAPPER(fn, paramType) static void* fn ## ThreadMain (void* data) { fn((paramType)data); return NULL; }
+        #define FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(fn) static void* fn ## ThreadMain () { fn(); return NULL; }
+        static inline void ffThreadDetach(FFThreadType thread) { pthread_detach(thread); }
+        static inline void ffThreadJoin(FFThreadType thread) { pthread_join(thread, NULL); }
+    #endif
+#else //FF_HAVE_THREADS
+    #define FF_THREAD_MUTEX_INITIALIZER 0
+    typedef char FFThreadMutex;
+    static inline void ffThreadMutexLock(FFThreadMutex* mutex) { FF_UNUSED(mutex) }
+    static inline void ffThreadMutexUnlock(FFThreadMutex* mutex) { FF_UNUSED(mutex) }
+    #define FF_THREAD_ENTRY_DECL_WRAPPER(fn, paramType)
+#endif //FF_HAVE_THREADS
+
+#endif

src/common/threading.c

@@ -1,72 +0,0 @@
-#include "fastfetch.h"
-
-#include <pthread.h>
-
-static inline void* detectPlasmaThreadMain(void* instance)
-{
-    ffDetectPlasma((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK2ThreadMain(void* instance)
-{
-    ffDetectGTK2((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK3ThreadMain(void* instance)
-{
-    ffDetectGTK3((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK4ThreadMain(void* instance)
-{
-    ffDetectGTK4((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* connectDisplayServerThreadMain(void* instance)
-{
-    ffConnectDisplayServer((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* startThreadsThreadMain(void* instance)
-{
-    pthread_t dsThread;
-    pthread_create(&dsThread, NULL, connectDisplayServerThreadMain, instance);
-    pthread_detach(dsThread);
-
-    pthread_t gtk2Thread;
-    pthread_create(&gtk2Thread, NULL, detectGTK2ThreadMain, instance);
-    pthread_detach(gtk2Thread);
-
-    pthread_t gtk3Thread;
-    pthread_create(&gtk3Thread, NULL, detectGTK3ThreadMain, instance);
-    pthread_detach(gtk3Thread);
-
-    pthread_t gtk4Thread;
-    pthread_create(&gtk4Thread, NULL, detectGTK4ThreadMain, instance);
-    pthread_detach(gtk4Thread);
-
-    pthread_t plasmaThread;
-    pthread_create(&plasmaThread, NULL, detectPlasmaThreadMain, instance);
-    pthread_detach(plasmaThread);
-
-    return NULL;
-}
-
-void ffStartDetectionThreads(FFinstance* instance)
-{
-    //Android needs none of the things that are detected here
-    //And using gsettings sometimes hangs the program in android for some unknown reason,
-    //and since we don't need it we just never call it.
-    #ifdef __ANDROID__
-        return;
-    #endif
-
-    pthread_t startThreadsThread;
-    pthread_create(&startThreadsThread, NULL, startThreadsThreadMain, instance);
-    pthread_detach(startThreadsThread);
-}

src/common/time.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_time
+#define FF_INCLUDED_common_time
+
+#include <stdint.h>
+#ifdef _WIN32
+    #include <synchapi.h>
+    #include <profileapi.h>
+#else
+    #include <time.h>
+#endif
+
+static inline uint64_t ffTimeGetTick() //In msec
+{
+    #ifdef _WIN32
+        LARGE_INTEGER frequency;
+        QueryPerformanceFrequency(&frequency);
+        LARGE_INTEGER start;
+        QueryPerformanceCounter(&start);
+        return (uint64_t)(start.QuadPart * 1000 / frequency.QuadPart);
+    #else
+        struct timespec timeNow;
+        clock_gettime(CLOCK_MONOTONIC, &timeNow);
+        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+    #endif
+}
+
+static inline void ffTimeSleep(uint32_t msec)
+{
+    #ifdef _WIN32
+        SleepEx(msec, TRUE);
+    #else
+        nanosleep(&(struct timespec){ msec / 1000, (msec % 1000) * 1000000 }, NULL);
+    #endif
+}
+
+#endif