1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-16 12:10:31 +00:00
Commit Graph

4467 Commits

Author SHA1 Message Date
Tin Švagelj
30b22b253e
Add blame ignore file (#2113)
* Add blame ignore file
* Add a small utility script in extras to aid in maintainence of the file

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-12-09 02:25:43 +00:00
Tin Švagelj
dcbe40bf9c
Move color parse error message out of hex parser (#1937)
Simplifies parsing code, gives a better message and removes responsibility from last parser to report errors.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-12-09 01:09:18 +00:00
Tin Švagelj
e20b0a9d3b
Simplify adding new wayland protocols (#2110)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-12-08 18:10:04 +00:00
Tin Švagelj
4141f80286
Fix non-text content using own_window_argb_value (#2105)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-12-08 15:28:26 +00:00
Tin Švagelj
28a39cb26c
Revert "Use private mapping from provided shm_pool buffer" (#2104)
This reverts commit b486263b27.

It was guided by wrong part of documentation (wl_keyboard::keymap).

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-12-07 20:44:52 +00:00
Willow
2b7e4b250f
Use explicit output ordering (#2103)
Removed output sorting by `priority` in favor of explicit output ordering. Fixes some Wayland initialization bugs.
2024-12-07 19:13:00 +00:00
Toth Janos
0624b756f1 NetBSD: Remove second total_cpu_time calculation. 2024-12-06 16:02:49 +01:00
Toth Janos
c1ecf84e79 NetBSD: Cleanup. 2024-12-06 16:02:49 +01:00
Toth Janos
dd2fbc702c NetBSD: Implement get_top_info(). 2024-12-06 16:02:49 +01:00
Toth Janos
70fd7bdfbc NetBSD: Implement update_running_processes(). 2024-12-06 16:02:49 +01:00
Toth Janos
f4d6e2046c NetBSD: Implement update_total_processes(). 2024-12-06 16:02:49 +01:00
Toth Janos
e9f343ffee NetBSD: Fix CPU Usage.
Report the correct number of CPUs and calculate the per-CPU load.

Start implementing a common BSD interface, as all BSD implementations use
*slightly* different functions to achieve the same goal,
and maintaining them in one place would be easier.

Fixes #2097.
2024-12-06 16:02:49 +01:00
Stefan Huber
d0247218a8 linux: Support power_now in sysfs for get_battery_power_draw()
Not all systems report current_now through the power supply sysfs
interface, but some do report power_now instead. Add support for these,
too.

The new implementation first tries power_now and then falls back to
computing power as the product of current and voltage. The new
implementation also reduces memory footprint on the stack by some 512k.
Also the old implementation potentially left files open under some
circumstances.
2024-12-03 13:19:33 -05:00
Stefan Huber
91250e6277 linux: Fix possible long overflow
The C language defines long to be at least 32 bit and so on ILP32 data
models like Win32 and 32-bit Unix systems. It therefore will overflow
for values of the order of 1e12, which we obtain as a multiplication
result in get_battery_power_draw().

Fix this by an early conversion to double.
2024-12-03 13:19:33 -05:00
Bernhard M. Wiedemann
1a8e49d9ba
Allow custom man build date via SOURCE_DATE_EPOCH (#2096)
Allows making man1/conky.1 in builds reproducible.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.

Also use UTC to be independent of timezone.
2024-11-30 18:16:00 +00:00
Brenden Matthews
15024a0095 Bump minor version 2024-11-29 12:50:17 -05:00
Tóth János
4b33da95a8
Implement -U for Haiku. (#2079)
* Implement `-U` for Haiku.

This patch also fixes a compilation error on Haiku.

Compiled with `cmake -DBUILD_X11=FALSE ..`

Tested on Haiku-r1beta5.
Takes part of #2072.

* Revert `common.cc`.

A cross-platform solution is already implemented in #2080.
This PR will be rebased *after* the OpenBSD fix was merged.

* Haiku: Remove `wordexp.h`.

Use the `to_real_path()` used for OpenBSD.

* Haiku: Remove `HAIKU_HOME_DIR`.

It was not used.
2024-11-29 08:14:05 -05:00
Tóth János
fbbcb6cfda OpenBSD: Fill missing fields in get_top_info(). 2024-11-28 16:03:42 -05:00
Tóth János
f8eb0f4032 OpenBSD: Fix CPU Usage.
Report the correct number of CPUs and calculate the per-CPU load.
2024-11-27 10:08:16 -05:00
Brenden Matthews
a83a9904af Remove macOS-12 build (deprecated) 2024-11-26 14:28:34 -05:00
dependabot[bot]
1967d4d617 build(deps): bump DeterminateSystems/nix-installer-action
Bumps the actions group with 1 update: [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action).


Updates `DeterminateSystems/nix-installer-action` from 15 to 16
- [Release notes](https://github.com/determinatesystems/nix-installer-action/releases)
- [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v15...v16)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-26 14:22:31 -05:00
Tóth János
048ecf9c70
Fix NetBSD build (#2089)
- Fix NetBSD build.
- Use manual `curses` lookup, `FindCurses` doesn't work on NetBSD.
2024-11-25 23:21:21 +00:00
Tóth János
47ec9f911c
Fix OpenBSD build (#2080)
- Fix unclosed OBJ in core.cc when target is OpenBSD
- `to_real_path` changes:
  - Canonicalize result to mimic `realpath` behavior
  - Partially implement `to_real_path` for OpenBSD
  - Add more tests for `to_real_path`.
- Build system improvements:
  - Use same i18n include/link logic for all platforms
  - Replace `HAVE_SOME_SOUNDCARD_H` and `HAVE_LINUX_SOUNDCARD_H` with `HAVE_SOUNDCARD_H`
    and use other defines (__linux__) to guard include
  - Replace `<XXX>_LIBRARIES` with `<XXX>_LINK_LIBRARIES` for linking.
    - Libraries weren't in default linker search path on OpenBSD
- OpenBSD specific:
  - Fix bsdapm.cc
  - Remove diskio stats stubs
  - Stub get_battery_short_status
  - Remove `-stdlib=libc++` build flag on OpenBSD

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
Co-authored-by: gmb <gmb@openbsd76.my.domain>
Co-authored-by: Tin Švagelj <tin.svagelj@live.com>
2024-11-22 23:45:11 +00:00
Simon Lees
9449818c4d lua-imlib2: fix memory leak
If you frequently use this function to draw new images this leak
becomes quite significant
2024-11-18 07:32:33 -05:00
Tóth János
a0ee703ee2 Implement -U for FreeBSD.
Tested on FreeBSD 14.1.
Takes part of #2072.
2024-11-13 07:38:00 -05:00
Brenden Matthews
9e265a37c2 Bump version 2024-11-05 16:01:21 -05:00
Tóth János
b01485b3da Move is_conky_already_running() to src/linux.cc. 2024-11-05 12:13:24 -05:00
Tin Švagelj
3ed65249be Hide U flag altogether if not on Linux
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-11-05 12:13:24 -05:00
Tóth János
e6465e8298 Go back to /proc.
Use `/proc/[pid]/stat` to check if conky is already running.
This will only work on systems where there is a `/proc`.
2024-11-05 12:13:24 -05:00
Tóth János
f806d03306 Fix name check.
A random process named `conky11` won't stop Conky to start when
`-U` is provided.
2024-11-05 12:13:24 -05:00
Tóth János
2d1a921f2d Use ps to check the running processes.
The previous method used `/proc` to check the running processes,
but it is a Linux-specific solution.

This method uses `ps`, hopefully in a POSIX-compliant way.

Linux: https://man7.org/linux/man-pages/man1/ps.1.html
FreeBSD: https://man.freebsd.org/cgi/man.cgi?ps(1)
OpenBSD: https://man.openbsd.org/ps.1
2024-11-05 12:13:24 -05:00
Tóth János
0a5530a670 Implement -U.
If this argument is provided Conky won't start if another Conky process
is already running.
2024-11-05 12:13:24 -05:00
dependabot[bot]
918975838b build(deps): bump DeterminateSystems/nix-installer-action
Bumps the actions group with 1 update: [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action).


Updates `DeterminateSystems/nix-installer-action` from 14 to 15
- [Release notes](https://github.com/determinatesystems/nix-installer-action/releases)
- [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v14...v15)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-05 12:12:36 -05:00
Brenden Matthews
fdec466759 Fix test cases 2024-10-31 08:06:06 -04:00
Brenden Matthews
e6cb164e48 Add algebra unit tests 2024-10-31 08:06:06 -04:00
liestrela
068e1f4358 Fix if_match comparison for string operands containing operator symbols (#1988) 2024-10-31 08:06:06 -04:00
Tin Švagelj
6a1aa57340
Revert "Add automatic labeling for issues (#2057)" (#2058)
This reverts commit 184af03d7e.
2024-10-11 20:04:10 +00:00
Tin Švagelj
184af03d7e
Add automatic labeling for issues (#2057)
* Change labeler action provider
* Add labels for issue content matches

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-10-11 10:56:28 +00:00
heavyjoost
ebef88015a
Fix incorrect X11 dock/panel placement (#2056)
* set initial state wm hint to withdrawn (fix #2046)

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-10-10 01:14:25 +00:00
François Revol
b05810d439 Fix tcp_ping for non-existent local network hosts
Fixes #2042

We can't just assume select() exiting before the timeout to be a
success, since connect() can actually tell us there's no route to host
or other errors.
2024-09-24 22:54:26 +02:00
Thomas Zajic
568d7e75fd audacious.cc: print_audacious_filename(): fix always empty $audacious_filename
print_audacious_filename() always returns an empty (zero-length) $audacious_filename, due to one of the std::min() operators always being 0. Removing the std::min() construct fixes the problem. Fixes #1175.
2024-09-21 08:07:33 -04:00
dependabot[bot]
b64b8016c4 build(deps): bump DeterminateSystems/magic-nix-cache-action
Bumps the actions group with 1 update: [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action).


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

---
updated-dependencies:
- 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>
2024-09-17 09:56:03 -04:00
Gene Carlson
71814776d9 src/fs.cc: Fix whitespace mistake. 2024-09-15 08:20:13 -04:00
Gene Carlson
839602baec src/fs.{cc,h}: Update fs_stats without error spam. 2024-09-15 08:20:13 -04:00
zlice
875c1af663 set display to null for race condition
https://github.com/dunst-project/dunst/blob/master/src/x11/x.c#L499
looks to be the source of some code which now sets display to NULL
for some type of race condition in X11. Xlibint.h allows for building
on Void Linux but needs min/max undefined. closes #1939
2024-09-13 08:22:14 -04:00
dependabot[bot]
bfa1d49142 build(deps): bump DeterminateSystems/nix-installer-action
Bumps the actions group with 1 update: [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action).


Updates `DeterminateSystems/nix-installer-action` from 13 to 14
- [Release notes](https://github.com/determinatesystems/nix-installer-action/releases)
- [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v13...v14)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-10 09:15:56 -04:00
Brenden Matthews
14622a8d9b Bump version 2024-08-29 12:32:08 -04:00
quiescens
788ac88b31 fix for #208, clear the "set" flag on fs_stats entries periodically 2024-08-29 11:11:16 -04:00
w0j0pl
03711ea5e5
Fix logic bug in cache_nvidia_string_value_update() (#2022)
* Update nvidia.cc

Made a suggested change in logic from issue #1177

* Update nvidia.cc

Made a suggested change in logic from issue #1178

* Update nvidia.cc

Made a suggested change in logic from issue #1178
2024-08-29 09:15:09 -04:00
w0j0pl
c428663e02 Update nvidia.cc
Made a suggested change in logic from issue #1177
2024-08-27 16:51:16 -04:00