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

3877 Commits

Author SHA1 Message Date
François Revol
281097a2a5 move X11 stuff from conky.cc to display-x11
Still some things to sort out, but seems to work.

A lot of variables and calls had to be made non-static.
2022-09-10 20:39:11 +02:00
François Revol
e97be17f7f move file output to a separate display-file 2022-09-10 20:39:11 +02:00
François Revol
5c389ecdb5 add display accessors
we want to be able to access either all outputs, or the currently
selected one (if any, else return the top one, which ought to be the GUI
one if we have one).
2022-09-10 20:39:11 +02:00
François Revol
1c5198bccd proper console display (move code out of conky.cc) 2022-09-10 20:39:11 +02:00
François Revol
e4b05557fa display-*: return void for most calls as return-value is useless 2022-09-10 20:39:11 +02:00
François Revol
fd683ee8ce display-*: Fix copyright 2022-09-10 20:39:11 +02:00
François Revol
4ffd09be1e Replace BUILD_X11 ifdef by BUILD_GUI when it makes sense 2022-09-10 20:39:11 +02:00
François Revol
c965ea7d00 http display: use lower priority than graphical displays 2022-09-10 20:39:11 +02:00
François Revol
f30263c2fc Initial ncurses display-output
Some leftovers still, but it still works.
2022-09-10 20:39:11 +02:00
François Revol
a4f9474de1 Add a display-output flag to tell if it's graphical-based
or text-only.
2022-09-10 20:39:11 +02:00
François Revol
2074dabdaf Make sure the console output isn't enabled along with ncurses 2022-09-10 20:39:11 +02:00
François Revol
ef957bfb91 Actually allow more than one display-output at once
We already do this like with HTTP+stdout.
2022-09-10 20:39:11 +02:00
François Revol
7c8d486b9f Move HTTP output code from conky.cc to display-http 2022-09-10 20:39:11 +02:00
François Revol
17ceb82079 Initial stubbing of display backends
Hopefully this will lead the way to adding support for things like
Wayland and Haiku graphics, cf. #56.

We define a display_output_base class that display backends
can derive from to implement display-specific calls.
2022-09-10 20:39:11 +02:00
François Revol
bc0b79f032 Make out_to_stderr setting non-static 2022-09-10 20:39:11 +02:00
François Revol
0cc7edfd0b Add a BUILD_GUI define (for now only defined on BUILD_X11) 2022-09-10 20:39:11 +02:00
Brenden Matthews
714e3a5cbd
Bump version. 2022-09-10 13:18:06 -05:00
Brenden Matthews
d42be04ae9
Add missing docker build deps. 2022-09-10 13:05:39 -05:00
Brenden Matthews
c654d3ab1c
Update buildx actions. 2022-09-10 12:29:21 -05:00
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