1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-19 11:35:12 +00:00
Commit Graph

277 Commits

Author SHA1 Message Date
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
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
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
c0f06aa0a0 Bump version 2024-04-24 15:17:13 -04: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
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
Brenden Matthews
5a61390b14 Bump version 2024-04-18 07:15:05 -04:00
Brenden Matthews
ae13f0c42d Bump version 2024-04-17 06:47:37 -04:00
Brenden Matthews
0cfd5c0a31
Bump version 2024-03-03 09:25:37 -05:00
Brenden Matthews
9f59adf36b
Bump version 2024-02-26 14:18:53 -05:00
Brenden Matthews
84c8e187e9 Fix xcb include path 2024-02-26 08:36:50 -05:00
Brenden Matthews
e4bdabc538 Compile tolua++ output as C++ 2024-02-23 13:10:12 -05:00
Brenden Matthews
35357e437c Update copyright 2024-02-22 08:53:35 -05:00
Brenden Matthews
ac9d107e77 Remove build date and associated vars
For reproducible builds, the build date messes things up, and some
distros just set it to 1980 now anyway. Thus, it's better to remove the
date altogether.
2024-02-22 08:36:21 -05:00
Brenden Matthews
a1ab393318
Bump version 2024-02-20 09:10:19 -05:00
Tin
2e17a53d49
Prevent infinite loop in DependentOption
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
cbfdb13f50
Hide Nvidia on non-linux OSs
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
20f9f60c6a
Fix build & cleanup
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
cbebe44707
Fix DependentOptions splitting arguments on spaces
Fix broken x11.cc

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
4936c7492c
Provide a notice when build options get disabled
Reformat files and hope it invalidates CI cache :)

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
7a3020fad5
Fix CMake script
Cleanup debug statements

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
a4ac632db7
Fix X11 area enter & leave bug
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:32 -05:00
Tin
b1b7ae8b2c
Fix X11 build
Fix most issues with X11 event propagation.
Remove X11 code from mouse-events.cc/.h completely.

CMake:
Update toluapp cmake_minimum_required to stop it complaining during build.
Fix ConkyPlatformCheck.cmake not providing access to cairo, imlib2 and rsvg to Wayland.
Move BUILD_MOUSE_EVENTS includes under BUILD_GUI so they're not duplicated.

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:32 -05:00
Tin Svagelj
afa5f326e8
Prepare environment
Signed-off-by: Tin Svagelj <tin.svagelj@live.com>
2023-11-19 14:14:59 -05:00
Brenden Matthews
70a0e518c1
Bump version 2023-10-13 15:55:55 -04:00
Brenden Matthews
23a1ad3848
Bump version 2023-10-10 14:32:33 -04:00
Brenden Matthews
7b9d292892
Bump version 2023-08-15 12:24:18 -04:00
Brenden Matthews
a41d82b6a6
Bump version 2023-08-09 08:53:51 -04:00
François Revol
8f403251a8 Fix missing asprintf definition on Haiku
It needs _GNU_SOURCE and is declared in stdio.h as on GNU/Linux,
but I suppose it's not included by the existing includes.
2023-08-08 08:40:51 -04:00
Brenden Matthews
ddddf00eb5
Bump version 2023-05-16 19:24:18 -04:00
Brenden Matthews
091d71b5d1
Bump version 2023-04-10 17:38:15 -04:00
Brenden Matthews
49b3487b76
Bump version 2023-03-31 13:40:48 -04:00
Brenden Matthews
afaeb6c01f
Bump version 2023-03-31 13:39:51 -04:00
bi4k8
dab87c5246
Fix memory leaks in X11 display backend (#1483)
* display-x11: fix memory leaks

FcFini() was never being called, which meant FontConfig did not clean up its internal storage.

furthermore, restore a commented-out call to XftFontClose()

9acf0bb4c commented this call out, but it does not seem to cause any problems now on reload now

* feat: Move docs to website, rearrange bits (#1475)

* build(deps): bump actions/stale from 7 to 8 (#1472)

Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add fontconfig platform checks

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: bi4k8 <bi4k8@github>
Co-authored-by: Brenden Matthews <brenden@brndn.io>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brenden Matthews <github@brenden.brndn.io>
2023-03-31 12:54:20 -04:00
Brenden Matthews
7b97eb73f0
Bump version. 2023-03-06 08:08:28 -05:00
Brenden Matthews
d7ca8efbf0
Bump version. 2023-03-04 11:49:59 -05:00
Brenden Matthews
209bb5d24d Require Lua 5.3 or newer
This fixes #1431.
2023-02-26 12:57:33 -05:00
Brenden Matthews
be4a595380
Bump version. 2023-02-24 08:35:48 -05:00
Brenden Matthews
e3ed817216
Bump version. 2023-02-18 09:35:48 -05:00
Brenden Matthews
1f55cb120e
Bump version. 2023-02-18 09:33:38 -05:00
tranquillity-codes
4b8d5eb34a
Add an above-all overlay mode for own_window_type, utility (#1402)
* Add libXdamage to flake.nix

* Add TYPE_UTILITY as above-all alternative to TYPE_OVERRIDE

* Click-through for TYPE_UTILITY

* Added libxfixes to MacOS CI workflow

* Disable building of XFIXES on MacOS

* Fix build for xinerama/xfixes on macos.

* Update Lua version check.

* Tidy this up.

* Fix BUILD_XFIXES on Linux

* Sigh, fix this.

---------

Co-authored-by: tranquillity-codes <dev@itycodes.org>
Co-authored-by: Brenden Matthews <brenden@brndn.io>
2023-02-16 22:03:14 -05:00
Brenden Matthews
761f05c2b4 Also replace this. 2023-02-16 21:54:40 -05:00
Brenden Matthews
ba870aa733 Use FindLua CMake module. 2023-02-16 21:54:40 -05:00
Jaak Ristioja
8afa62d889 cmake/config.h.in: Added missing BUILD_ prefix to #cmakedefine for MOUSE_EVENTS
Mouse events were introduced by commit 7fbdfbd4d4
which states in the commit message that MOUSE_EVENTS was also renamed to
BUILD_MOUSE_EVENTS. However, this renamal seems to have been incomplete, as the
respective option in cmake/config.h.in was left to MOUSE_EVENTS. This commit
fixes this.

Closes: https://github.com/brndnmtthws/conky/issues/1380
Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
2023-01-30 19:17:29 -05:00
Brenden Matthews
1b1ca6d559
Bump version. 2023-01-01 14:04:49 -05:00
Brenden Matthews
3f43ff1aa8
Bump version. 2023-01-01 13:40:26 -05:00
Tin Švagelj
7fbdfbd4d4
Added mouse events to conky (#955)
* Add mouse events.

Signed-off-by: Tin Svagelj <tin.svagelj@live.com>

* Rename MOUSE_EVENTS flag to BUILD_MOUSE_EVENTS.

Signed-off-by: Tin Svagelj <tin.svagelj@live.com>

* Update NORM_ERR func argument from std::string to char*

Because func was previously char* I forgot to update NORM_ERR function
argument to `func.c_str()` not that it's std::string.

Previously func was pointing to std::string memory that was freed at
assignment.

Signed-off-by: Tin Svagelj <tin.svagelj@live.com>

Signed-off-by: Tin Svagelj <tin.svagelj@live.com>
2023-01-01 12:39:57 -05:00
Brenden Matthews
acfb4116b3 Use libc++ even without maint mode, cleanup old flag settings. 2022-12-27 09:15:29 -05:00