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

3886 Commits

Author SHA1 Message Date
Steven Xu
0498e6a433 feat: make gw_iface work with downspeedgraph & upspeedgraph, e.g. ${downspeedgraph ${gw_iface}} 2022-08-26 10:22:37 -04:00
crolsma
ead54f4f73 Document unimplemented weather features 2022-08-26 10:21:41 -04:00
Petr Vaněk
f90f6325b9 Avoid out-of-bounds write in graph_append function
Retrieve graph only when s->graph is already allocated, which also mens
that the s->graph_width is bigger than 0, and thus avoid out-of-bounds
write in graph_append function.

Prior to 594d0c85ba ("Fix bug of "Graph reset when using conditional
color"") s->graph was not (re)allocated when s->graph_width and
s->graph_allocated were equal to zero, therefore, s->graph stayed equal
to nullptr. This effectively meant that graph_append function returned
immediately after call and did nothing.

This behavior changed with introduction of std::map<int, double *> graphs,
because its retrieve_graph support function allocates s->graph even for
s->graph_width equal to 0. Then, subsequent call of graph_append can
continue and the first element of the graph is set later in this
function in line:

  graph->graph[0] = f; /* add new data */

causing out-of-bounds write, as there is not enough space in array of
zero length. This write messes up internal data of memory allocator (at
least in musl libc case) and the application later segfaults in attempt
to free this memory in store_graph function.

Fixes: 594d0c85ba ("Fix bug of "Graph reset when using conditional color"")
2022-08-26 10:21:13 -04:00
Petr Vaněk
18d5aebc46 Access graph id through g->id
struct graph * is already available through g variable, let's use it
directly.
2022-08-26 10:21:13 -04:00
dessert1
3afb405359 fix typo in in lua_parse description
s/you put (you place 'conky_' in front of it)/\1/
2022-07-18 11:19:57 -04:00
Chaitanya Kukde
8f5014b90f Add License information to cmake uninstall source 2021-05-17 10:08:37 -05:00
Chaitanya Kukde
01d4c8ca84 Fixes #1068 : Add cmake uninstall target 2021-05-17 10:08:37 -05:00
Marius Feraru
5a674449b4 add units_spacer option for tuning string between values and units 2021-04-26 09:48:46 -05:00
Brenden Matthews
527076d4df
Bump version for next release. 2021-04-25 09:03:09 -05:00
Brenden Matthews
7fb40fb5f2 Revert "fix: update update last_update_time earlier, so the network speed is correctly displayed, otherwise the speed shown is much lower than the actual speed (resolves #863)"
This reverts commit 415c730133.
2021-04-25 09:00:29 -05:00
Brenden Matthews
da2ddb00ed Partially revert change from c352069b31.
It's not quite clear to me what the intent was here, but I don't believe
this change was correct. We shouldn't block on callbacks within the main
loop.

This fixes #901.
2021-04-25 09:00:29 -05:00
Brenden Matthews
4445b3c065 CMAKE_CXX_EXTENSIONS should be disabled by default. 2021-04-25 09:00:29 -05:00
Rogier Reerink
d2831ba197 Reverted the AUTHORS file and added my name. 2021-04-22 10:06:36 -05:00
Rogier Reerink
f14310645f Added an intel_backlight variable description. 2021-04-22 10:06:36 -05:00
Rogier Reerink
71213b408b Fixed character encoding. 2021-04-22 10:06:36 -05:00
Rogier Reerink
df11925db3 Added support for Intel backlight. 2021-04-22 10:06:36 -05:00
Brenden Matthews
23a4936835 Add a legacymem variable for free compat.
It seems there is some confusion between the way Conky reports free
memory, versus other programs. I'm adding a new variable, `legacymem`,
to provide the same value that is reported on older programs that don't
report memory the way recommended by newer kernels.

For more details, see:
 * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
 * https://github.com/brndnmtthws/conky/pull/859
 * https://github.com/brndnmtthws/conky/pull/1028
 * https://github.com/brndnmtthws/conky/issues/1090

This resolves #1090.
2021-04-22 10:03:43 -05:00
Brenden Matthews
a971046819
Roll back change from 91a3f2ed87.
While made in earnest, I think this change was incorrect and actually
caused a regression.

Thanks to ChrisCheney for communicating this in a way that my small ape
brain could understand.

This resolves issue #1090.
2021-04-22 08:37:34 -05:00
Brenden Matthews
42e565fe3b
Don't build appimage on PRs. 2021-04-21 09:46:36 -05:00
Brenden Matthews
9970c07aeb
Fix XGetDefault DPI handling.
XGetDefault doesn't always return a value, check that it returns
something before assuming it's valid.

This fixes #1088.
2021-04-20 08:13:24 -05:00
Brenden Matthews
d966e8522a
Run clang-format. 2021-04-18 11:45:29 -05:00
Zhaf
78f46d5e6b Add ClassName hint to own window even when the Override_redirect is true 2021-04-18 11:10:37 -05:00
Brenden Matthews
8860053985
Save this file before committing. 2021-04-18 11:07:22 -05:00
Brenden Matthews
eeca044d09
Relocate this var. 2021-04-18 11:05:28 -05:00
Brenden Matthews
ca3574436b
Minor build fix, but do it right. 2021-04-18 11:02:19 -05:00
Brenden Matthews
cc092014a3
Minor build fix. 2021-04-18 10:57:20 -05:00
Brenden Matthews
62c098761b
Update compiler matrix. 2021-04-18 10:55:30 -05:00
Brenden Matthews
282e877f13
Update compiler matrix. 2021-04-18 10:53:59 -05:00
Brenden Matthews
90e4056c01
Update compiler matrix. 2021-04-18 10:51:43 -05:00
Brenden Matthews
6d25b04a66
Update compiler matrix. 2021-04-18 10:48:42 -05:00
Brenden Matthews
8044475129
Run apt-get update first. 2021-04-18 10:46:00 -05:00
Livanh
3be1320e6c Use xft_dpi_scale function instead of DPI_SCALE macro 2021-04-10 11:32:24 -05:00
Livanh
1c6c4bcf6a Scale UI elements according to Xft.dpi 2021-04-10 11:32:24 -05:00
Brenden Matthews
bb3d66ade5
Update README.md 2021-03-25 09:22:49 -04:00
Steven Xu
415c730133 fix: update update last_update_time earlier, so the network speed is correctly displayed, otherwise the speed shown is much lower than the actual speed (resolves #863) 2021-03-24 10:10:17 -05:00
Brenden Matthews
33aa5060c2
Make sure gradient width is >=2.
This should resolve #1070 for real this time.
2021-03-09 07:54:37 -06:00
Brenden Matthews
16f2ed659e
Tidy up gradient stuff. 2021-03-06 06:58:08 -06:00
Brenden Matthews
211244d888
Provide a more useful header in the default config. 2021-03-04 18:01:01 -06:00
Brenden Matthews
0f3c706336 Replace temporary colour array with smart pointer.
This should fix #1070.
2021-03-04 09:56:20 -05:00
Brenden Matthews
d3527e1ed9 Add archlinux & alpine builds. 2021-03-03 15:39:02 -05:00
Brenden Matthews
3c43c4c7fe Refactor hsv code. 2021-03-03 12:19:20 -05:00
Brenden Matthews
cb9c5e22e5
Update badges. 2021-03-02 15:07:39 -06:00
Brenden Matthews
dbdc003a96
Appese clang-format. 2021-03-02 13:38:08 -06:00
Brenden Matthews
5da4481f55
Fix non-IPV6 build (resolves #1033). 2021-03-02 13:17:46 -06:00
Brenden Matthews
d75a146889
Don't build tests in appimage. 2021-03-02 12:43:11 -06:00
Brenden Matthews
b27944af55
Enable most features in AppImage build (fixes 1064). 2021-03-02 12:40:22 -06:00
Brenden Matthews
9bc0302934
Enable wireless in builds. 2021-03-02 12:27:59 -06:00
Brenden Matthews
7c248469b4
Bump version. 2021-03-02 09:47:27 -06:00
Brenden Matthews
77f77d8f51
Update release name. 2021-03-02 09:41:45 -06:00
Brenden Matthews
7f84662c2c
Bump version. 2021-03-02 09:39:20 -06:00