1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-16 04:02:15 +00:00
Commit Graph

4448 Commits

Author SHA1 Message Date
Fernando
6cf51b2800 Address feedback by brndnmtthws 2024-06-14 20:47:18 -04:00
Fernando
942ce12f59 Move comment above the function it belongs to. 2024-06-14 20:47:18 -04:00
Fernando
b6767b4310 Fix AC/battery logic on FreeBSD.
The logic for the detection of the battery/AC line was not completely correct
for FreeBSD. Launching conky on console shows the following:

Cannot read sysctl "hw.acpi.battery.time"
Cannot read sysctl "hw.acpi.battery.life"
Cannot read sysctl "hw.acpi.battery.state"
Cannot read sysctl "hw.acpi.acline"
Unknown battery state 8!

In a PC, the hw.acpi.battery MIB does not exist.
Also, the hw.acpi.acline is only present if supported by the hardware.
In addition, some variables were used uninitialized and that causes strange
behavior: in a PC it showed it worked on battery and the % of charge was an
ridiculous big number.

This patch addresses the issue. It fixes the problem in the PC. It has also
being tested in a laptop running FreeBSD current plugin and unplugging the AC
line and also snatching the battery mercilessly to see if something breaks.
2024-06-14 20:47:18 -04:00
Brenden Matthews
33903e7d6c Apply npm audit fix. 2024-06-11 08:52:58 -04:00
Brenden Matthews
24eae34436 Bump web deps 2024-06-11 07:53:40 -04:00
dependabot[bot]
5f6541331c build(deps): bump braces and readdirp in /web
Bumps [braces](https://github.com/micromatch/braces) and [readdirp](https://github.com/paulmillr/readdirp). These dependencies needed to be updated together.

Updates `braces` from 3.0.2 to 3.0.3
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

Updates `readdirp` from 2.2.1 to 3.6.0
- [Release notes](https://github.com/paulmillr/readdirp/releases)
- [Commits](https://github.com/paulmillr/readdirp/compare/2.2.1...3.6.0)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
- dependency-name: readdirp
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-10 22:19:33 -04:00
Brenden Matthews
ea7cf33f87 Add Ubuntu 24.04 to CI & release assets
Removed the complex compiler version build matrix. Instead, we'll just
use whatever is the latest for each Ubuntu release of clang and GCC.

Added a requirements-dev.txt and use a venv for build.
2024-06-10 21:54:05 -04:00
Brenden Matthews
31590ddafc Bump version 2024-06-10 18:56:07 -04:00
Marc Aldorasi
9f830224e5 Restore previous strut behavior 2024-06-10 15:41:05 -04:00
randomcoder67
f88b50d21a added comment 2024-06-06 07:44:16 -04:00
randomcoder67
ba9d84a347 set foreground colour to the first (lowest) colour before drawing the scale, to ensure it always stays the same colour 2024-06-06 07:44:16 -04:00
dependabot[bot]
12da795b77
build(deps): bump the actions group with 2 updates (#1955)
Bumps the actions group with 2 updates: [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) and [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action).


Updates `DeterminateSystems/nix-installer-action` from 11 to 12
- [Release notes](https://github.com/determinatesystems/nix-installer-action/releases)
- [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v11...v12)

Updates `DeterminateSystems/magic-nix-cache-action` from 6 to 7
- [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases)
- [Commits](https://github.com/determinatesystems/magic-nix-cache-action/compare/v6...v7)

---
updated-dependencies:
- dependency-name: DeterminateSystems/nix-installer-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: DeterminateSystems/magic-nix-cache-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-05 20:19:10 +00:00
Brenden Matthews
4636e817b9 Thought I fixed this 2024-06-04 14:14:40 -04:00
Brenden Matthews
e4af9bc180 Docker: username not secret; allow cache pulls 2024-06-04 14:03:10 -04:00
Brenden Matthews
7043b34abb Docker: only write to cache if creds available 2024-06-04 14:03:10 -04:00
Tin Švagelj
0bc625fdea
Revert changes from #1926 & #1877 (#1949)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-06-01 14:38:16 +00:00
Brenden Matthews
e99d9171de Docker: make sure image has sensible default name 2024-06-01 10:36:33 -04:00
Chris Sp
c8b127d148
Fix minimum height not being applied (#1952) 2024-06-01 14:23:56 +00:00
Tin Švagelj
9358f56622
Replace use of strncat in scroll.cc with strcat (#1950)
pwithcolors is allocated based on computed length so strncat produces a
warning.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-06-01 14:22:24 +00:00
Brenden Matthews
2f7a31c44a Bump version 2024-05-31 14:29:25 -04:00
David Eritsyan
8e36363405 Fix typo in conky.cc 2024-05-30 10:36:45 -04:00
Brenden Matthews
572b004cee Docker: don't login without creds 2024-05-30 10:36:32 -04:00
Brenden Matthews
b80209cb2c Don't test colour names without map
This fixes #1940.
2024-05-28 14:16:23 -04:00
Tin Švagelj
f2938d8d66
Make dpi_scale match original behavior (#1936)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-26 19:04:53 +00:00
Brenden Matthews
6f98039492 Don't include the -pre in install dir path.
We version the docs install path, but there's no reason to include the
-pre and git sha in the version for the path. With the git sha in
particular, it could result in having a bunch of dirs for each separate
git commit (annoying).

This resolves #1928.
2024-05-23 11:33:29 -04:00
Tin Švagelj
7526e7e18d
Cleanup remaining dpi scaling of min & max width (#1926)
This was left over from #1877.
2024-05-22 12:52:49 +00:00
Fernando
682db0c4df Fix build with specific option combination.
With some option combination the code to be compiled has not been updated with
regards to the changes in conky::rec, i.e get_height() becomes height() and
get_width() becomes width().
2024-05-20 14:41:21 -04:00
Brenden Matthews
ccbac0a899 Bump version 2024-05-18 14:40:45 -04:00
Tin Švagelj
256ffbd75a
Disable Xinput by default (#1920)
* Disable Xinput by default

Causes performance issues for a lot of people.
See #1886.
2024-05-17 13:09:38 +00:00
Fernando Apesteguía
c635df8689
Fix build with specific option combination (#1918)
Fixes incorrect member accessing left behind after #1910.
2024-05-15 18:18:11 +00:00
Tin Švagelj
2d50767216
Remove _member_access from geometry (#1910)
* It was difficult/too costly ensuring temporary this was correct when vecs contained in rects were accessed directly.
* Added semantics to `rect` and some utility functions.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-13 20:08:27 +00:00
Brenden Matthews
968fc7fcbc Group all actions dependabot updates 2024-05-13 14:38:55 -04:00
dependabot[bot]
488df948a9 build(deps): bump DeterminateSystems/nix-installer-action from 10 to 11
Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 10 to 11.
- [Release notes](https://github.com/determinatesystems/nix-installer-action/releases)
- [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v10...v11)

---
updated-dependencies:
- dependency-name: DeterminateSystems/nix-installer-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-13 14:28:30 -04:00
dependabot[bot]
5fe8cdd5be build(deps): bump DeterminateSystems/magic-nix-cache-action from 4 to 6
Bumps [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action) from 4 to 6.
- [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases)
- [Commits](https://github.com/determinatesystems/magic-nix-cache-action/compare/v4...v6)

---
updated-dependencies:
- dependency-name: DeterminateSystems/magic-nix-cache-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-13 14:23:21 -04:00
Brenden Matthews
4636f4e3a5 Fix dockerhub login 2024-05-13 14:21:19 -04:00
Tin Švagelj
46afeaeef1 Comment out Vc installation
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-13 14:15:25 -04:00
Vincent Cheng
495c1c38b2 Disable Vc_ENABLE_INSTALL by default 2024-05-13 14:15:25 -04:00
Brenden Matthews
71d02514e7
Refactor the CMake 3rdparty/Vc-related bits (#1903)
* Include the 3rdparty/ dir from top-level
 * Set includes/libs at top-level
 * Remove the inner CMake version requirement
 * Fix deprecated use of CMake's exec_program()
2024-05-13 11:53:28 +00:00
Brenden Matthews
49a43e4c98 Bump version 2024-05-11 14:42:26 -04:00
Tin Švagelj
6bf383cf78
Introduce geometry primitives (#1862)
* Introduce geometry primitives based on Vc
* Apply geometry primitives to some existing code

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-07 20:02:47 +00:00
Tin Švagelj
f5b7106088
Enable use of HTML in docs (#1900)
Fix alignment documentation:
- while it renders fine on the web, it's stripped from man pages.
  Inline HTML renders fine in some cases, but tables don't.

There's no unified (remark) plugin that works well with headless
tables pandoc supports as well, so the only way to achieve a similar
effect is to leave header cells empty.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-06 18:51:19 +00:00
Brenden Matthews
a03f0bc562 Fix typo 2024-05-02 15:14:48 -04:00
Brenden Matthews
89e8fe580e Move docker build to separate script for less jank 2024-05-02 15:09:45 -04:00
Brenden Matthews
2578be2447 Try to fix this quote handling again
Unsure why this works but it does 🤷‍♂️
2024-05-02 14:43:59 -04:00
Brenden Matthews
a5cc142bba Fix this env var handling (derp) 2024-05-02 14:17:26 -04:00
Brenden Matthews
6a248a94d2 Docker: improve tagging, distinguish main and latest
* Use `latest` for the latest release
 * Use `main` (or the branch) for the latest dev builds against a branch
 * Tag releases with their version
 * Only push when building against `main` branch
 * Only build amd64 images on PRs for speedier builds
 * Separate main/PR caches
2024-05-02 14:00:15 -04:00
Brenden Matthews
9dfc7318f9 Bump minor version 2024-05-02 13:23:43 -04:00
Brenden Matthews
8ba6cf625c Docker: use 64bit time packages 2024-05-02 13:21:55 -04:00
Brenden Matthews
35d72314d2 Docker: re-enable PR builds 2024-05-02 13:21:55 -04:00
Brenden Matthews
a533bcb8e4 Docker: updated base image to Ubuntu 24.04 LTS
This allows us to drop the CMake compliation step, which should speed up
image build times significantly.
2024-05-02 13:21:55 -04:00