Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-24 11:55:43 +00:00
Code Issues Releases Activity
3,975 Commits 5 Branches 46 Tags 22 MiB
fe27753929
Commit Graph

3975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bi4k8
fe27753929 move color settings to their own file 
these settings are used for GUI builds as well as ncurses builds, and if we support colors in console and HTTP output, will be used there too

colors really are essential to what Conky does, even if some outputs don't support them, so it makes sense to build support for them unconditionally
 2023-02-06 10:15:34 -05:00
bi4k8
9b2706fc49 build x11-color.cc for any GUI, not just wayland 
we should actually build this for ncurses and html backends too, not just GUI ones
 2023-02-06 10:15:34 -05:00
bi4k8
9ab51edf9f ncurses: allocate custom colors 
color0-9 will now use their configured RGB values exactly
 2023-02-06 10:15:34 -05:00
bi4k8
d51bf688ba ncurses: call init_pair immediately before using colors 
this allows using color0, etc. in ncurses; the nearest available ncurses color will be used
 2023-02-06 10:15:34 -05:00
bi4k8
9cc4b083fc core: avoid argb32 roundtrips when calling set_current_text_color 2023-02-06 10:15:34 -05:00
bi4k8
ec24079a3a remove x11 dependency for color parsing 
this means we can use the same, portable color-parsing code
everywhere, including ncurses
 2023-02-06 10:15:34 -05:00
bi4k8
a72902fa35 add Colour type and use it pervasively 2023-02-06 10:15:34 -05:00
dependabot[bot]
7451decef5 build(deps): bump @fontsource/newsreader from 4.5.9 to 4.5.10 in /web 
Bumps [@fontsource/newsreader](https://github.com/fontsource/fontsource/tree/HEAD/fonts/google/newsreader) from 4.5.9 to 4.5.10.
- [Release notes](https://github.com/fontsource/fontsource/releases)
- [Changelog](https://github.com/fontsource/fontsource/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fontsource/fontsource/commits/HEAD/fonts/google/newsreader)

---
updated-dependencies:
- dependency-name: "@fontsource/newsreader"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 08:33:18 -05:00
dependabot[bot]
4f3bafe47e build(deps-dev): bump cypress from 12.3.0 to 12.5.0 in /web 
Bumps [cypress](https://github.com/cypress-io/cypress) from 12.3.0 to 12.5.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v12.3.0...v12.5.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 08:23:38 -05:00
dependabot[bot]
596a31a63c build(deps): bump @fontsource/inter from 4.5.14 to 4.5.15 in /web 
Bumps [@fontsource/inter](https://github.com/fontsource/fontsource/tree/HEAD/fonts/google/inter) from 4.5.14 to 4.5.15.
- [Release notes](https://github.com/fontsource/fontsource/releases)
- [Changelog](https://github.com/fontsource/fontsource/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fontsource/fontsource/commits/HEAD/fonts/google/inter)

---
updated-dependencies:
- dependency-name: "@fontsource/inter"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 08:22:53 -05:00
dependabot[bot]
af0ecbff0d build(deps): bump @fontsource/fira-code from 4.5.12 to 4.5.13 in /web 
Bumps [@fontsource/fira-code](https://github.com/fontsource/fontsource/tree/HEAD/fonts/google/fira-code) from 4.5.12 to 4.5.13.
- [Release notes](https://github.com/fontsource/fontsource/releases)
- [Changelog](https://github.com/fontsource/fontsource/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fontsource/fontsource/commits/HEAD/fonts/google/fira-code)

---
updated-dependencies:
- dependency-name: "@fontsource/fira-code"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 07:59:41 -05:00
dependabot[bot]
e45e1c88e8 build(deps-dev): bump eslint from 8.32.0 to 8.33.0 in /web 
Bumps [eslint](https://github.com/eslint/eslint) from 8.32.0 to 8.33.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.32.0...v8.33.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 07:59:14 -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
dependabot[bot]
6055764022 build(deps-dev): bump postcss from 8.4.20 to 8.4.21 in /web 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.20 to 8.4.21.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.20...8.4.21)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-23 19:48:05 -05:00
dependabot[bot]
262b4c3b3b build(deps-dev): bump eslint from 8.31.0 to 8.32.0 in /web 
Bumps [eslint](https://github.com/eslint/eslint) from 8.31.0 to 8.32.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.31.0...v8.32.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-23 19:46:23 -05:00
dependabot[bot]
1e9f30d43d build(deps): bump @tailwindcss/typography from 0.5.8 to 0.5.9 in /web 
Bumps [@tailwindcss/typography](https://github.com/tailwindcss/typography) from 0.5.8 to 0.5.9.
- [Release notes](https://github.com/tailwindcss/typography/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindcss/typography/compare/v0.5.8...v0.5.9)

---
updated-dependencies:
- dependency-name: "@tailwindcss/typography"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-23 19:39:48 -05:00
dependabot[bot]
d59dae7a88 build(deps-dev): bump cypress from 12.2.0 to 12.3.0 in /web 
Bumps [cypress](https://github.com/cypress-io/cypress) from 12.2.0 to 12.3.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v12.2.0...v12.3.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-23 19:39:27 -05:00
dependabot[bot]
da04a4d27d build(deps-dev): bump next-mdx-remote from 4.2.0 to 4.3.0 in /web 
Bumps [next-mdx-remote](https://github.com/hashicorp/next-mdx-remote) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/hashicorp/next-mdx-remote/releases)
- [Commits](https://github.com/hashicorp/next-mdx-remote/compare/v4.2.0...v4.3.0)

---
updated-dependencies:
- dependency-name: next-mdx-remote
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-23 19:39:11 -05:00
bi4k8
d3e9bcbe71 wayland: use arithmetic instead of wrong-endian memcpy 
this fixes corruption of parsed colors in Wayland-only builds
 2023-01-04 07:59:33 -05:00
bi4k8
31b4c27abc use ARGB, not RGBA, for Wayland color values 
this impacts only colors from which we compute Cairo colors, not the
rendered pixel buffers themselves, which were already and remain
ARGB32.

this makes Wayland and (24-bit) X11 use the same representation of
colors, fixing bugs when both backends were enabled.

we should still eventually switch to a backend-independent color
representation, because there are no guarantees of which pixel format
X11 will use (it isn't alway ARGB32) and backends like ncurses have
their own color representation; in most code we just hope the
unsigned long will be interpreted by the same backend as wrote it.
 2023-01-03 08:35:23 -05:00
bi4k8
1c95c6d577 wayland: trigger window resize when scale changes 
scale changes are applied by window_resize, so we need to make
sure it gets called when the scale has changed.
 2023-01-03 08:34:35 -05:00
dependabot[bot]
34d2a9ec76 build(deps-dev): bump @types/node from 18.11.17 to 18.11.18 in /web 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.11.17 to 18.11.18.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-02 12:46:48 -05:00
dependabot[bot]
b8b78bb8f4 build(deps-dev): bump eslint-config-prettier from 8.5.0 to 8.6.0 in /web 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 8.5.0 to 8.6.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v8.5.0...v8.6.0)

---
updated-dependencies:
- dependency-name: eslint-config-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-02 12:46:33 -05:00
dependabot[bot]
0db7718bc3 build(deps-dev): bump eslint from 8.30.0 to 8.31.0 in /web 
Bumps [eslint](https://github.com/eslint/eslint) from 8.30.0 to 8.31.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.30.0...v8.31.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-02 12:46:16 -05:00
Brenden Matthews
2f4ce1e4de
Parameterize the cmake version. 2023-01-01 17:35:15 -05:00
Brenden Matthews
98b70966eb
Update minimum cmake version. 2023-01-01 14:35:41 -05:00
Brenden Matthews
1b1ca6d559
Bump version. 2023-01-01 14:04:49 -05:00
Brenden Matthews
5fb9dfe10e Add basic Nix flake. 2023-01-01 13:44:29 -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
31d247a80d
Include libc++ in docker build. 2022-12-27 15:34:49 -05:00
Brenden Matthews
0e61013ac9 Fix these warns. 2022-12-27 09:15:29 -05:00
Brenden Matthews
3e827ba82f Fix this def. 2022-12-27 09:15:29 -05:00
Brenden Matthews
00a16a776c Adjust these buffer sizes. 2022-12-27 09:15:29 -05:00
Brenden Matthews
61e8550615 Fix string dest length. 2022-12-27 09:15:29 -05:00
Brenden Matthews
acfb4116b3 Use libc++ even without maint mode, cleanup old flag settings. 2022-12-27 09:15:29 -05:00
Brenden Matthews
218a8fd930 Use libc++ by default when building with clang. 2022-12-27 09:15:29 -05:00
Brenden Matthews
a0b526278a Bump cmake version in docker build. 2022-12-27 09:15:29 -05:00
Jan Beich
3fb6534eff
Add missing Wayland dependency on BSDs (#1349) 
src/display-wayland.cc:38:10: fatal error: 'sys/epoll.h' file not found
 #include <sys/epoll.h>
          ^~~~~~~~~~~~~

ld: error: undefined symbol: epoll_create1
>>> referenced by display-wayland.cc
>>>               src/CMakeFiles/conky.dir/display-wayland.cc.o:(conky::display_output_wayland::initialize())

ld: error: undefined symbol: epoll_ctl
>>> referenced by display-wayland.cc
>>>               src/CMakeFiles/conky.dir/display-wayland.cc.o:(conky::display_output_wayland::main_loop_wait(double))

ld: error: undefined symbol: epoll_wait
>>> referenced by display-wayland.cc
>>>               src/CMakeFiles/conky.dir/display-wayland.cc.o:(conky::display_output_wayland::main_loop_wait(double))
 2022-12-27 08:04:58 -05:00
Brenden Matthews
7d93cbcf09
Bump version. 2022-12-26 13:54:52 -05:00
Brenden Matthews
dbe66565c9
Use the cmake commands here instead. (#1346) 
* Use the cmake commands here instead.

* This command requires a dir arg.

* Use ctest command here.

* Limit CI to main & PRs.
 2022-12-26 13:54:10 -05:00
Brenden Matthews
9bf55cfbfd Drop this message. 2022-12-26 13:21:40 -05:00
Brenden Matthews
ffd34a4fc0 Fix missing settings fail. 2022-12-26 13:21:40 -05:00
Brenden Matthews
c28ad36c4c This is superfluous. 2022-12-26 13:21:40 -05:00
Brenden Matthews
59513b4c65 Add this back. 2022-12-26 13:21:40 -05:00
Brenden Matthews
c48df06359 Fix (some) wayland/x11 init ordering issues. 2022-12-26 13:21:40 -05:00
Brenden Matthews
64b001f2f8 Default wayland build to off. 2022-12-26 13:21:40 -05:00
dependabot[bot]
7206490f49 build(deps): bump actions/stale from 6 to 7 
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7.
- [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/v6...v7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-26 13:16:12 -05:00
Brenden Matthews
e6643508f0
Put the code coverage stuff behind a build flag. 2022-12-26 11:46:29 -05:00
Brenden Matthews
eb1968e43a
Try it this way instead. 2022-12-25 09:06:00 -05:00