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

2313 Commits

Author SHA1 Message Date
Alexey Bondarenko
99f593a344 Fix $scroll'ing of UTF-8 strings (for v1.9.1). (#292)
* Fix scrolling of UTF-8 strings.

* Make fix work only in UTF-8 mode.

* Fix segfault when length of text inside of $scroll changes.

* Use strnlen to determine length of buffer.

* Remove skipping trailing bytes of UTF-8 characters (not necessary as string is shifted by characters). Add check for end of string in scrolling loop.
2016-07-18 08:09:34 -07:00
Pavel Labath
30d09e2e67 Fix bug #452 in apcupsd
the code was using sizeof on an array function parameter...
2014-10-03 10:32:00 +02:00
Brenden Matthews
260e7c8bd6 Merge pull request #53 from Tucos/eval
Fix regression regarding $eval
2014-07-25 12:24:26 -07:00
Bas Pape
d8e21721b6 Remove unnecessary strncpy for $eval 2014-06-20 18:27:25 +02:00
Bas Pape
c48b086799 Fix regression regarding $eval
In order to be useful $eval needs to evaluate the given string twice,
for example: `${eval $${downspeedf ${gw_iface}}}` should first yield
e.g. '${downspeedf eth0}', then the second evaluation yields the desired
result.
Commit 2fa5f97edb refactored some parsing bits
into the evaluate function, but this caused $eval to call
parse_conky_vars only once.
2014-06-19 21:17:23 +02:00
Brenden Matthews
ab826d98db Merge pull request #47 from damluk/1.9.1
Check if a font has been loaded instead of adding it multiple times
2014-06-17 17:23:33 -07:00
Brenden Matthews
a1338eca61 Merge pull request #52 from Tucos/imlib_image_alpha
Add configuration setting imlib_image_alpha
2014-06-17 17:20:55 -07:00
Brenden Matthews
3225ee4d0d Merge pull request #50 from Tucos/1.9.1
Two fixes related to X11
2014-06-17 17:20:33 -07:00
Bas Pape
c6d2a43d28 Add configuration setting imlib_image_alpha
This option is passed verbatim to both calls to
imlib_image_set_has_alpha. When false, imlib will not merge the alpha
channel when blending the image into the window visual, which means that
own_window_argb_visual will not result in transparent images. The option
is enabled by default to preserve the current behaviour.
2014-06-17 21:06:33 +02:00
Bas Pape
f48c80cad1 Calculate text width for single character strings
Both get_string_width_special and calc_text_with already have an early
return for output_methods other than TO_X. In the case of TO_X even
for single character strings the width needs to be calculated for
specials, as otherwise $alignr for single characters is wrong.
2014-06-07 16:01:40 +02:00
Damian Lukowski
0fb5d65b22 Check if a font has been loaded before instead of adding it possibly multiple times.
In some configurations conky terminated after several minutes
with the message: "Conky: you don't need that many fonts, sorry."
2014-05-01 10:50:01 +02:00
Brenden Matthews
e8e21a9ff9 Merge pull request #34 from evmcl/1.9.1
Added the cat and catp variables.
2014-01-12 10:48:33 -08:00
Evan McLean
5ea37b4b52 Added the cat and catp variables. 2013-12-18 17:35:08 +11:00
Bas Pape
cb6934001f Set X11 related options for all loaded configs
load_config_file_x11 is called only for the main config, but this goes
against the behaviour for $include for most options. Calling it at the
end of load_config_file will make $include semantics also apply to those
options (such as colorN).
2013-12-17 20:15:21 +01:00
Ted Marston
11a13d3454 Fixed graph initialization defaults. 2013-10-27 09:12:50 -07:00
Brenden Matthews
9f7e1c0d53 Add build file. 2013-09-15 09:46:24 -07:00
Brenden Matthews
b458ebb100 Merge pull request #23 from adeason/1.9.1_inotifyfd
Set uninitialized inotify_fd to -1, not 0
2013-09-15 09:42:19 -07:00
Brenden Matthews
39e2afffdc Merge pull request #16 from horazont/1.9.1
Make diskio work with /dev/disk/*/* paths
2013-09-15 09:41:41 -07:00
Brenden Matthews
b6aa1b15fd Merge pull request #15 from Tucos/1.9.1
Small fixes
2013-09-15 09:41:19 -07:00
Andrew Deason
32a7343539 Set uninitialized inotify_fd to -1, not 0
Currently we set inotify_fd to the value 0 when inotify_fd hasn't been
created yet, or after we close it. But 0 is a valid fd, and we check
for the value -1 to see if it's been initialized. So, if inotify
support is compiled in, but we disable_auto_reload, we can end up
closing fd 0. This can screw up various other things in weird ways,
including that exec'd processes appear to have an invalid stdin.

So, set inotify_fd to -1 to clear all of this up.
(cherry picked from commit f670e70d7c)
2013-08-18 14:07:44 -05:00
Bas Pape
d80a97d2f2 Use dcompare when comparing doubles.
Truncated longs are not desired as ${if_match 0.1 > 0.0} would skip the
block.
2013-08-13 19:50:27 +02:00
Jonas Wielicki
ba76bf00ae Make diskio work with /dev/disk/*/* paths
This uses the POSIX.1-2008 function realpath; if it does not comply with
the standard, bad things will happen (unspecified behaviour). Linux does
it right from the beginning.
2013-06-24 10:09:31 +02:00
Nikolas Garofil
750820475e Fix building without X11 but with Lua 2013-06-22 13:02:38 +02:00
Bas Pape
275ba43836 Get cpu count when $top is used.
Fixes ${top cpu} when top_cpu_seperate is used in some cases.
info.cpu_count is filled lazily when objects that need it are used, but
this was not the case for $top.
2013-06-19 21:49:00 +02:00
labath
a21bf46a6c Merge pull request #5 from jwm-art-net/1.9.1
1.9.1
2013-02-11 12:52:52 -08:00
James Morris
3eb3ed319a standardize JACK informational messages 2013-02-01 11:14:27 +00:00
James Morris
3c1e9bdcc2 fix jack client open/close for lua-script-only operation 2013-02-01 11:01:34 +00:00
James Morris
0195329833 jack object counting... + temporary debug output 2013-01-31 00:52:29 +00:00
James Morris
3068dfabd7 jack fix call to jack_close on reload 2013-01-30 11:19:26 +00:00
James Morris
0a83453ceb add jack transport data 2013-01-18 02:50:47 +00:00
James Morris
86e0b167d0 tweaks + jack documentation 2013-01-18 01:05:29 +00:00
James Morris
501bdc03e8 jack audio connection kit data 2013-01-16 12:38:28 +00:00
labath
5d2857e0bc Merge pull request #3 from jwm-art-net/1.9.1
1.9.1 autotools modernizations
2013-01-15 12:57:39 -08:00
James Morris
b0a22d534d cut $HOME when $HOME not found 2013-01-12 17:07:23 +00:00
James Morris
a1d1a4f076 fix mem corruption originating in load_xoap_keys 2013-01-12 17:05:52 +00:00
James Morris
588c296784 minor autotools modernization take 2 2013-01-12 15:24:06 +00:00
James Morris
a8d12cceb5 minor modernization of autotools files 2013-01-12 13:32:57 +00:00
Georg Hopp
81dc114723 remove commented code 2013-01-10 11:45:59 -08:00
Georg Hopp
36c3401a42 fix imap message count updates 2013-01-10 11:45:54 -08:00
Pavel Labath
bfaa84bd77 Fix wlan stats segfault (sf.net #3581218)
Sometimes wlan related TEXT causes segment fault, and backtrace shows it's strtok in
iw_get_stats.

I read the code of wireless_tools, which says 'strtok not thread safe, not used in WE-12 and
later' for iw_get_stats. But it need to first check if has_range and then we_version_compiled.

In conky/src/linux.cc, iw_get_stats is called before iw_get_range_info, hence has_range is always
0 in iw_get_stats and strtok is used. I simply move iw_get_range_info before iw_get_stats and no
segfault up to now.

patch by ruikai
2012-11-01 15:05:52 +01:00
Pavel Labath
2c024f9a86 Fix curl-related crashes (sf.net #3386728)
curl implements some of the timeouts using alarm(), where the alarm handler longjmp()s back into the
curl code. This is a bad idea in multi-threaded applications, since it is not guaranteed that
SIGALARM will be recieved by the correct thread. Therefore, we instruct curl to avoid using
signals.
2012-10-20 13:04:11 +02:00
Pavel Labath
8a6f985fb9 MPD: add mpd_albumartist (sf.net #3532376)
Adds mpd_albumartist support as an object since mpd_artist lists all participating artists of the
current song and not the main album artist.

patch by Sébastien Lavoie-Courchesne
2012-10-07 11:46:31 +02:00
Pavel Labath
f388c14086 Fix drawing of line graphs (sf.net #3557517)
patch by dmrdmr.
2012-10-05 23:54:00 +02:00
Pavel Labath
9d399607dd Do not truncate non-human-readable numbers to 32bit (sf.net #3564560)
patch by hdastwb
2012-10-01 23:30:05 +02:00
Pavel Labath
1c1feb7db2 Fix a memory leak in top.c (sf.net #3543857)
The leak was caused by commit 8827d61, attempting to solve a problem with top displaying 10th
process incorrectly.

I think there should be a more elegant solution to this, but I don't know how to find it atm
(it could be due the fact that it's 4am here).
2012-07-20 04:19:38 +02:00
Pavel Labath
fd9462da5e Fix "conky failes to build with --disable-ncurses" (sf.net #3541329) 2012-07-13 13:41:09 +02:00
Pavel Labath
410c89ab1c Fix "Using log-scaled graph with show_graph_scale causes segfault" (sf.net #3538674)
bug reported by Nikslay
2012-06-28 18:21:38 +02:00
Pavel Labath
2011665234 Fix shades, this time for real 2012-06-27 22:35:54 +02:00
Pavel Labath
818df1078c Bugfix: Shades weren't placed correct after a $goto 2012-06-27 16:10:09 +02:00
Pavel Labath
8827d6158e Fix an off-by-one in top.c (sf.net #3538234)
bug reported by arclance
2012-06-26 23:22:59 +02:00