1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 04:06:03 +00:00
Commit Graph

3322 Commits

Author SHA1 Message Date
Santtu Lakkala
d8cbdffe95 Make evaluate useful (#226)
Make evaluate actually double-evaluate itself, allowing for constructs
such as: `${eval $${addr ${gw_iface}}}' to work.
2016-05-06 07:24:30 -04:00
marcpayne
8dda4c3995 Parse quoted execgraph cmd before parsing options (#232)
When parsing the argument string for graph objects, check if there is a
double-quoted command in the beginning of the string and extract it
before parsing any options. This prevents items in a command from being
improperly recognized as graph options. It should also eliminate the
need to place commands with spaces into a separate script.

Also, fall back on default_graph_{height,width} instead of using
hard-coded values so that the default values set in a user's config will
work.
2016-05-03 08:04:57 -04:00
Jérôme Poulin
48122dcf82 Make conky resolve symlinks before using them. (#238)
* Make dev_name resolve symlinks before resolving the name.

- When symlinks are not resolved first, you will get an error on startup when
  using path in /dev/disk/by-id, for example, in diskiograph_*.

* Improve diskio device name resolution by always resolving symlinks.

- Any device path will be resolved of any symlinks before getting the usual
  checks for labels et device name.

* Check if diskio device is really a block device, not only if it exists.

- Current check would succeed in case the device is a path, like when using
  label: with an empty argument.
2016-05-03 08:04:14 -04:00
Matt Sturgeon
d8c659e7de nvidiabar, etc (#215)
* First experiment with $nvidiabar

Added nvidiabar, nvidiagraph and nvidiagauge. Using a dummy value of 50% for now until it is integrated with the nvidia value query functions.

* Implement get_nvidia_barval()

`get_nvidia_barval()` no longer returns a dummy "50%" but instead an actual value for supported arguments:

`gpuutil`, `memutil`, `membwutil`, `videoutil`,`pcieutil`, `fanlevel` and `gputemp`
2016-05-03 08:03:45 -04:00
luebking
06f87b9c26 Update immediately when the root pixmap changes (#230)
* use CLOCK_MONOTONIC if supported

get_time is used to control the update interval etc. so there's
no need to query the system time

* repaint immediately when the root pixmap changed

Original patch by pweisenburger,
In addition resets the next_update_time to ensure "now"

FIXES: #48
2016-04-13 10:33:33 -07:00
Guillaume Maudoux
7d7e9b6fd8 Fix race conditions in signal handling (#233)
SIGHUP, SIGUSR1, SIGKINT and SIGTERM are no longer lost to race
    conditions. In particular, a SIGHUP can no more cancel a SIGTERM.
2016-04-13 10:33:04 -07:00
Brenden Matthews
4cb9ab8ab7 Merge pull request #227 from alessandro-g89/master
Improve to_bytes to work with input values with a decimal point
2016-03-28 07:35:35 -07:00
Alessandro Grassi
67e814f182 Improve to_bytes to work with input values with a decimal point 2016-03-23 08:42:16 +01:00
Brenden Matthews
f95366b649 Merge pull request #209 from aandergr/master
keep next_update_time modulo update_interval zero
2016-03-21 10:55:32 -07:00
Brenden Matthews
448d13ff4d Merge pull request #219 from mxmlnkn/doubletotaltraffic
solve double counting at start issue
2016-03-21 09:14:14 -07:00
Brenden Matthews
49babf1181 Merge pull request #184 from marcpayne/lua-bindings
Require Lua 5.1 when building the Lua bindings
2016-03-21 09:12:35 -07:00
mxmlnkn
8ccadeb7bb solve double counting at start issue 2016-02-21 10:34:46 +01:00
Alexander Graf
505c4286b4 keep next_update_time modulo update_interval zero
This patch modifies logic for setting next_update_time such that the
update is done at full update_interval seconds. That is, for example
with update_interval 60.0, update is done at 00:00:00, 00:01:00,
00:02:00, etc.

This might be useful for using conky as a clock widget which only needs
to be updated once per minute, but is obliged to update exactly at
minute change.

It is implemented in a way that is (hopefully) immune to clockchanges
(as for example by NTP or DST).
2016-02-08 22:41:30 +01:00
Brenden Matthews
b38ab1117e Merge pull request #196 from marguerite/master
respect LIB_INSTALL_DIR
2016-01-10 14:06:20 -08:00
Brenden Matthews
fdb8523d26 Merge pull request #198 from marius/master
Use the canonical source for the number of CPUs.
2016-01-10 14:05:37 -08:00
Brenden Matthews
d2d72e2abd Merge pull request #192 from marcpayne/exec-cb-refactor
Refactor the exec callback system
2016-01-10 13:33:39 -08:00
Marius Nuennerich
98c4100b66 Use the canonical source for the number of CPUs.
Counting cpu\d lines from /proc/stat can give the wrong number if CPUs
are present but offline.
2016-01-10 16:13:50 +00:00
Marc Payne
57d9fdd0e0 Comment some of the callback-related code
Some of the code dealing with callbacks and updates was a little
obscure. A few extra comments should help clarify the meaning.
2016-01-09 10:23:36 -07:00
Marc Payne
adae1f6293 Refactor the exec callback system
The main purpose of this commit is to ensure that exec callbacks are
registered at startup (or config reload), so that they have a chance to
run on the first update interval. Much of the code in exec.cc got
consolidated, making it easier to follow. Several checks for NULL
pointers should eliminate some obscure segfaults I noticed, as well.

During the refactoring, I implemented height and width arguments for
execbar and execgauge. The functionality was already there, but wasn't
being used. All this is accompanied by updates to the man page and
plenty of code comments.
2016-01-09 10:19:48 -07:00
marguerite
7dff2e5577 do not override LIB_SUFFIX 2016-01-07 17:26:18 +08:00
marguerite
89f9a6bdf1 respect LIB_INSTALL_DIR 2016-01-07 14:42:14 +08:00
Marc Payne
0dbd27d2de Require Lua 5.1 when building the Lua bindings
The cairo/imlib2/rsvg bindings require tolua++ [1], which is currently only
compatible with Lua 5.1 or earlier. We need to force Conky to compile against
Lua 5.1 if the user chooses to build the bindings.

This commit adds a separate pkg_search_module command specifically for Lua 5.1,
along with a note in the documentation. The original pkg_search_module command
was updated to include (and prefer) Lua 5.3+. Also, I threw in two other minor
random fixes to the docs while I was at it.

[1] https://github.com/LuaDist/toluapp
2015-12-11 16:05:02 -07:00
Brenden Matthews
2fab2d3820 Merge pull request #185 from mxmlnkn/issue-128
Fix BUILD_MATH flag not working, partial #128
2015-12-11 12:56:58 -08:00
Brenden Matthews
39e0c1db13 Merge pull request #181 from fonic/patch-1
Rewrite/enhancement of nvidia module
2015-12-11 12:55:17 -08:00
Brenden Matthews
c2b921170d Merge pull request #182 from mxmlnkn/issue-155
Issue #155: Fix for initial spike on program
2015-12-11 12:54:32 -08:00
mxmlnkn
e7cdccd964 Border cases of scale < 1 would lead to negative lengths, crashing conky
e.g. in the beginning the scale is always 0, leading to NaN and a crash
fixes the "show_graph_scale" not working bug, not yet reported (even though I actually noticed that before, didn't seem to bother me)
also cpugauge works again because fo this BUILD_MATH MATH problem
2015-12-11 11:10:23 +01:00
mxmlnkn
a85ffd5d0d logscale not working was caused by using MATH instead of BUILD_MATH 2015-12-11 01:39:59 +01:00
mxmlnkn
d8f75860b2 Fix for initial spike on program start plus documentation as much as needed to implement that fix
Also some end of line white spaces were automatically removed by SciTE.
2015-12-10 21:46:44 +01:00
fonic
22fe3b1ea4 Rewrite/enhancement of nvidia module
Rewritten nvidia module with new features (refer to Showcase comment). Still work in progress, but could already use some testing by others.
2015-12-09 18:38:20 +01:00
Brenden Matthews
3723edb4e9 Merge pull request #179 from marcpayne/vim-nano-syntax
Add top_name_verbose to nano and vim syntax files
2015-12-05 16:17:35 -08:00
Marc Payne
300560dbd4 Add top_name_verbose to nano and vim syntax files 2015-12-04 20:24:44 -07:00
Brenden Matthews
443ddf54a0 Merge pull request #178 from antonio-malcolm/master
Fix for compiling against toluapp
2015-12-04 10:30:24 -08:00
Brenden Matthews
c1dceef75a Merge pull request #173 from Francesco149/xinerama-support
Fix for Xinerama alignment bugs
2015-12-04 10:29:42 -08:00
Antonio Malcolm
2599288a97 Fix for compiling against toluapp 2015-12-03 20:50:33 -08:00
Brenden Matthews
1abd253470 Merge pull request #177 from cwebster2/master
Final fix for check_include_file
2015-12-01 15:53:39 -08:00
Casey Webster
ce08b9fe7b Final fix for check_include_file
Per disucssion with arclance in #166, the call to check_include_file has
been migrated back to check_include_files and the required define set in
CMAKE_REQUIRED_DEFINITIONS.  This properly removes the dependancy on
the check_include_file module.  Third time is a charm!
2015-12-01 16:53:38 -05:00
Franc[e]sco
162d9d13b7 added support for multiple xinerama heads (fixes issue #172) 2015-12-01 13:53:43 +01:00
Brenden Matthews
9f9a2f262f Merge pull request #176 from brndnmtthws/sudo-less-builds
Disable sudo on Travis builds.
2015-11-30 13:27:13 -08:00
Brenden Matthews
b82eaa2333 Disable sudo on Travis builds. 2015-11-30 13:24:59 -08:00
Brenden Matthews
6e48a22dde Prep for next release. 2015-11-18 07:51:15 -08:00
Brenden Matthews
15662beb39 Update README.md 2015-11-18 07:47:45 -08:00
Brenden Matthews
6f27ce475f Merge pull request #166 from cwebster2/master
Reverts a change from check_include_file to files
2015-11-18 07:21:08 -08:00
Brenden Matthews
ed584c47dc Merge pull request #161 from mlichvar/master
CMake fixes
2015-11-18 07:20:37 -08:00
Miroslav Lichvar
2231588b28 Use LIB_SUFFIX when installing libraries
This is needed on systems with /usr/lib64.
2015-11-18 09:08:06 +01:00
Casey Webster
2f362e44a5 Reverts a change from check_include_file to files
One of the check_include_file checks in ConkyPlatformChecks should
not have been changed to check_include_files because the latter
takes 2 arguments and this call gives 3 (and doens't work right
without the third).
2015-11-17 15:08:58 +00:00
Brenden Matthews
e4721997d7 Merge pull request #165 from cwebster2/master
Fixes typo in ConkyPlatformChecks
2015-11-16 10:21:27 -08:00
Brenden Matthews
ebaeaf3b89 Merge pull request #163 from bldewolf/mpd-threading
lock mpd result before modifying it
2015-11-16 10:12:41 -08:00
Casey Webster
3a574ba88b Fixes typo in ConkyPlatformChecks
Fixes #162 by changing CheckInlcudeFile to
CheckIncludeFiles so that CMake can correctly include
the module.  Change calls to check_include_file to
check_include_files.
2015-11-16 18:04:02 +00:00
Brian De Wolf
01301f31a3 lock mpd result before modifying it
Add a lock to the mpd work callback to prevent another thread from reading the
struct while we're writing to it.
2015-11-08 21:29:29 -08:00
Brenden Matthews
7ae6b00f30 Merge pull request #160 from bldewolf/cppcheck-fix
Expand several buffers identified by cppcheck
2015-11-07 09:32:07 -08:00