Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-06 05:17:57 +00:00
Code Issues Releases Activity
3,908 Commits 5 Branches 46 Tags 22 MiB
06c33cc3b0
Commit Graph

3908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenden Matthews
4df3e5dc0c
Add missing libfuse2 for appimage. 2022-09-10 12:20:57 -05:00
Petr Vaněk
b357b370c6 Correct dependencies on generated header files 
This change corrects dependencies on generated defconfig.h and/or
convertconf.h header files because they must be generated before
compilation of conky.cc and main.cc if BUILD_BUILTIN_CONFIG and/or
BUILD_OLD_CONFIG are set.

Fixes: https://github.com/brndnmtthws/conky/issues/1118
 2022-09-10 13:14:13 -04:00
Brenden Matthews
b49ca7bbb1
Add missing dbus-glib dep. 2022-09-10 12:13:42 -05:00
Brenden Matthews
b6b63899ed
Run appimage build on 22.04. 2022-09-10 12:09:46 -05:00
Brenden Matthews
61dad53d55
Switch docker base to jammy (it's lts), reenable librsvg. 2022-09-10 12:06:35 -05:00
Brenden Matthews
b5bc9bf379
Disable librsvg on ubuntu 20.04. 2022-09-10 12:03:39 -05:00
Brenden Matthews
7436ade19d
Docker: bump cmake, disable librsvg bindings. 2022-09-10 12:01:39 -05:00
Brenden Matthews
5d5ee12c67
Require librsvg >=2.52. 2022-09-10 11:58:27 -05:00
Brenden Matthews
5d02762903
Comment out rsvg_handle_get_intrinsic_size_in_pixels for now. 2022-09-10 11:57:16 -05:00
Brenden Matthews
182b4f0c11
Don't include version header directly. 2022-09-10 11:24:58 -05:00
Brenden Matthews
d3d804ef0f
rsvg_handle_get_intrinsic_size_in_pixels only available on librsvg 2.52 
or newer.
 2022-09-10 11:23:00 -05:00
Brenden Matthews
12452f8896
Remove deprecated rsvg_handle_get_dimensions, add 
rsvg_handle_get_intrinsic_size_in_pixels.
 2022-09-10 10:51:38 -05:00
Brenden Matthews
f156de5a4f
Remove deprecated rsvg_handle_render_cairo, add 
rsvg_handle_render_document.
 2022-09-10 10:47:31 -05:00
Brenden Matthews
7a5c27a585
Remove deprecated rsvg_handle_render_cairo_sub, add 
rsvg_handle_render_layer in place.
 2022-09-10 10:44:45 -05:00
Brenden Matthews
869dc95504
Add missing dbus-glib. 2022-09-10 10:32:55 -05:00
Brenden Matthews
554eb2abaa
Only install libc++ for clang. 2022-09-10 10:30:17 -05:00
Brenden Matthews
684eaab11d
No clang 15 (yet). 2022-09-10 10:26:35 -05:00
Brenden Matthews
99b923244c
No clang 9. 2022-09-10 10:25:34 -05:00
Brenden Matthews
dc790bc093
Take 2. 2022-09-10 10:23:48 -05:00
Brenden Matthews
2c99ccfbe0
Update OS/compilers. 2022-09-10 10:19:52 -05:00
Miroslav Lichvar
a6f955cbf4 Include hsv_gradient.h even if BUILTIN_CONFIG is disabled. 2022-08-26 10:34:28 -04:00
Steven Xu
54e40520ae feat: make gw_iface work with downspeed & upspeed, e.g. ${downspeed ${gw_iface}} 
The previous code was buggy as it didn't call `update_gateway_info()`, so it displayed 0 bytes for the speeds.
 2022-08-26 10:22:37 -04:00
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