1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 18:15:17 +00:00
Commit Graph

4347 Commits

Author SHA1 Message Date
Brenden Matthews
71ff774a44 Ensure we use correct LLVM in nix dev shell 2024-05-02 08:32:38 -04:00
Brenden Matthews
1352c28d1b Change debug message level 2024-05-02 08:32:22 -04:00
Brenden Matthews
d6a6aadc5c Add BUILD_COLOUR_NAME_MAP build flag
You can now specify `BUILD_COLOUR_NAME_MAP=OFF` to disable building the
gperf-based colour map, which also removes the requirement for gperf at
build time.
2024-05-02 08:32:22 -04:00
Brenden Matthews
6008bd7923 Fix AppImage version naming
The version should match what Conky itself outputs.
2024-05-01 15:03:31 -04:00
Brenden Matthews
fe5552f3a8 Use MODULE library type for Lua libs
Per the docs at
https://cmake.org/cmake/help/latest/command/add_library.html, we should
use `MODULE` rather than `SHARED` for the Lua libraries.

This mostly affects macOS, where the libraries are compiled as MH_DYLIB
(`.dylib`) rather than MH_BUNDLE (`.so`).
2024-05-01 15:03:14 -04:00
Brenden Matthews
8aa7116e5f Make sure the git command is run from the source dir 2024-05-01 15:02:58 -04:00
Brenden Matthews
e8fd689b92 Make version string semver compliant, add git sha
Per https://semver.org/, use `-pre` rather than `_pre` version postfix,
and include the git short commit hash in the version string.
2024-05-01 15:02:58 -04:00
Brenden Matthews
d8c8fd3de5 CLI: -V now displays a short version string
* -v shows the full version output with build details
 * -V (capital V) shows only the short version string
2024-05-01 14:44:28 -04:00
Brenden Matthews
17bc14f5fb Update nix flake w/ LLVM 18 2024-05-01 14:11:49 -04:00
Tin Švagelj
7b44b2a27b
Update DPI when changed in resource manager (#1878)
* Update xft_dpi on property change
  * Added fallback calculation when Xft is disabled.
* Removed display_width/height and replaced it with workarea for
  consistency.
* Make DPI work on X11 when Xft is disabled
* Make find_subwindow more specific, rename it

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-01 14:55:05 +00:00
Tin Švagelj
384bbed0df
Use _NET_VIRTUAL_ROOTS for querying virtual roots (#1875)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 20:59:28 +00:00
Tin Švagelj
e1f301354b
Remove dpi scaling of maximum width (#1877)
* Fix dpi scaling maximum_width setting
* Set workspace dimensions from WL output_geometry
* Append script parent dir to lua package.path
* Fix issues with dpi_scale function selection
* Re-implement rounding through `type_traits` generically

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 20:21:39 +00:00
Tin Švagelj
b486263b27
Use private mapping from provided shm_pool buffer (#1876)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 16:14:34 +00:00
Tin Švagelj
f3f53fd764
Fix conky-cairo_imlib2_helper dependency conditions (#1874)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 15:17:44 +00:00
Brenden Matthews
bbc6193014 Docker: Add gperf, enable Lua Cairo Xlib bindings 2024-04-28 18:41:41 -04:00
Brenden Matthews
10045ab9f1 Require gperf at build-time
Rather than allowing the build to continue without gperf, we should
fail with an error so that the colour behaviour does not change in a
backward incompatible manner. The old colour behaviour should continue
to work going forward.

This resolves #1868.
2024-04-28 18:27:34 -04:00
Brenden Matthews
777b9a8dd7 Simplify binary include handling (and fix build) 2024-04-28 16:50:15 -04:00
Brenden Matthews
ef3ed8c1dc Include these when linting 2024-04-28 15:22:59 -04:00
Brenden Matthews
7598b89960 Disable -Wregister on gperf output
Older versions of gperf use the `register` keyword which is deprecated
in C++17, and warnings are treated as errors.

This disables the warning on gperf's output (colour-names.hh). I also
renamed `colour-names.cc` -> `colour-names.hh` because we're including
it as a header, not compiling it separately.

This resolves #1865.
2024-04-28 15:22:59 -04:00
Brenden Matthews
b6b9b3666e Enable cURL, RSS on mac build, lint codeql.yml 2024-04-25 20:13:02 -04:00
Brenden Matthews
e686a5f991 Set RELEASE=ON only when it's a release 2024-04-25 20:13:02 -04:00
Brenden Matthews
e93819b2ea Print appimage version for visibility 2024-04-25 20:13:02 -04:00
Brenden Matthews
e2147bd5d7 Re-enable RSS in AppImage, also enable in Nix flake
The behaviour of the RSS flag changed in 4936c74, previously it would
enable cURL support when it was switched on, but now you must pass both
BUILD_RSS=ON and BUILD_CURL=ON to CMake at configure time.

This fixes #1861.
2024-04-25 20:13:02 -04:00
Tin Švagelj
71c4e6ea52
Fix bad query_x11_windows early returns (#1864)
* Fix bad early returns
* Prevent fallback tree traversal from propagation code

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-26 00:09:20 +00:00
Brenden Matthews
0821c25533 This span doesn't need to exist 2024-04-24 17:01:38 -04:00
Brenden Matthews
3d62277edd Fix type def, handle error case 2024-04-24 17:01:38 -04:00
Brenden Matthews
4c2969778b Link to latest commit in web footer 2024-04-24 17:01:38 -04:00
Brenden Matthews
224c5ebd72 Explicitly note updated time is UTC 2024-04-24 15:17:29 -04:00
Brenden Matthews
c0f06aa0a0 Bump version 2024-04-24 15:17:13 -04:00
Tin Švagelj
c5ee70177c
set_struts improvements (#1849)
Simplify and speed up strut code

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-24 13:56:28 +00:00
Tin Švagelj
93ffab51a0
Use perfect hash (gperf) for parsing color names (#1848)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-24 06:24:54 +00:00
Tin Švagelj
6adf6b9dd4
Cleanup build flags, global namespace and includes (#1841)
- Separated displays so they don't have to all be included in build even when the features are disabled.
- Removed weird linker magic for display init and replaced it with straightforward (and faster) template functions that behave the same.
  - Replaced `disabled_display_output` classes with log messages.
- Add explicit compiler errors when feature dependent headers get included where they shouldn't (wl, x11).
- Switch BUILD_MOUSE_EVENTS dependency from OWN_WINDOW to BUILD_X11.
- Other minor improvements to some existing code which shouldn't affect behavior.
- Improve documentation.
- Remove X11 from unrelated headers.
  - This reaches 0% unneeded X11 polution in the sources.
  - Reenabled parts of window_type which would work in Wayland.
  - Remove unneeded guards.
- Display files are now no longer compiled if their features are disabled.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-23 21:15:37 +00:00
Faris Han
c51fbe66f6 Fix web components and pages (UI) 2024-04-22 07:22:34 -04:00
Brenden Matthews
260ac6aaec Revert "Fix matrix URL"
This reverts commit c8d1bbe58c.
2024-04-20 13:35:31 -04:00
Brenden Matthews
c8d1bbe58c Fix matrix URL 2024-04-20 10:04:14 -04:00
Tin Švagelj
45500b1439
Separate cairo-xlib.h Lua bindings from cairo.h (#1844)
- Separate cairo-xlib.h Lua bindings from cairo.h
  - This allows cairo.h to be used from Lua on Wayland without X11 as requirement.
- Add pango dependency for Wayland (adds pangocairo).
- Make graphics related bindings depend on BUILD_GUI.
- Remove BUILD_GUI guard around options in platform checks.
  - Keeping only checks that **directly contain module requirements**

A way of creating surfaces in Lua that uses Shm allocated buffers should
be added in future. This commit only cleans up build options to avoid weird
errors.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-19 15:31:23 +00:00
Tin Švagelj
c7df9c092e
Fix imlib_cache_size_setting::lua_setter (#1843)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-19 15:28:36 +00:00
Tin Švagelj
49be2177af
Track more context labels (#1842) 2024-04-19 15:27:58 +00:00
Brenden Matthews
e1222c5baf Always run Nix & AppImage builds on PRs 2024-04-18 07:51:42 -04:00
Brenden Matthews
6f8f8fe648 Annoyingly, the artifacts go into a subdir
The artifact files are actually zip files, and when extracted, are in
subdirs within the artifact path.
2024-04-18 07:26:49 -04:00
Brenden Matthews
5a61390b14 Bump version 2024-04-18 07:15:05 -04:00
Tin Švagelj
d815f9aa49
Create missing atom for query (#1834)
I'm assuming sending None Atom in the request will cause an error.
I defined those properties on my platform so that's why the function
didn't fail.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-17 19:40:01 +00:00
Brenden Matthews
f9579ffce2 Name not optional 2024-04-17 07:33:18 -04:00
Brenden Matthews
3980c591bd Rename release artifacts 2024-04-17 07:33:18 -04:00
Brenden Matthews
1dedaa2231 Fix release artifact path 2024-04-17 07:09:05 -04:00
Brenden Matthews
fcf56693b9 Separate feature/bug/deps release labels 2024-04-17 07:05:17 -04:00
Brenden Matthews
ae13f0c42d Bump version 2024-04-17 06:47:37 -04:00
Tin Švagelj
f4b3229fc3
Exclusive XInput event handling (#1821)
- This commit changes mouse events to use XInput exclusively if it's not disabled.
- Added support for changing valuator properties through device configuration (see wiki for details).
- Fixed and cleaned up a lot of previously added code.
2024-04-17 02:04:14 +00:00
Brenden Matthews
d56c0372f5 Issue template: Link docs to obtain stack traces 2024-04-15 14:06:40 -04:00
Tin Švagelj
c2dfa29f33
Refactor x11 event handling (#1819)
Move event handling code into separate functions.
2024-04-12 14:46:39 +00:00