1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-29 13:39:10 +00:00
Commit Graph

3155 Commits

Author SHA1 Message Date
Brenden Matthews
edb164ddeb Merge pull request #135 from Nooby4Ever/VIM-typo
Fixed typo in the VIM syntax highlight
2015-08-24 08:08:24 -07:00
Brenden Matthews
6d3c227356 Merge pull request #134 from Nooby4Ever/curl-fix
Fixed Curl segmentation fault
2015-08-24 08:07:54 -07:00
Paul Egan
b502ab5f5b Be explicit about documentation encoding. Fixes #91. 2015-08-23 22:12:24 +01:00
Marc Payne
acd1c05d74 Fix compile error with Lua 5.3
lua_gettable returns an int instead of void in Lua 5.3, so provide a
backwards-compatible overload of safe_misc_trampoline to account for this.
Tested with Lua 5.2 and 5.3.

This change does not address other compilation issues related to Lua bindings
for cairo, imlib2, and rsvg.

Fixes #90 and part of #100.
2015-08-21 01:56:37 -06:00
Nelis Oostens
0ab7d5fa33 Fixed Curl header issue
Note: This may not be the correct solution, it depends on the author's intention. Maybe he wanted to keep the headers from the previous call (in other words if there are no new headers use the old ones) and didn't realize they weren't copied in the handle, in which case he'll have to save the headers instead of above.
2015-08-19 22:04:42 +02:00
Nelis Oostens
292c9919be Fixed typo in the VIM syntax highlight
As stated in: http://sourceforge.net/p/conky/bugs/440/
2015-08-14 15:19:12 +02:00
Brenden Matthews
71c8072192 Update README.md 2015-08-01 09:05:16 -07:00
Brenden Matthews
3dbec780bc Merge pull request #126 from Nooby4Ever/fix-issue-12
Added sanity check to avoid making 0x0 window (resulting in Segementation Fault)
2015-08-01 09:03:57 -07:00
Nelis Oostens
fc6888eee3 Added sanity check to avoid making 0x0 window 2015-07-31 08:22:20 +02:00
Brenden Matthews
89c7da5654 Merge pull request #122 from Nooby4Ever/master
Added missing build flags to the print_version function
2015-07-30 16:01:35 -07:00
Brenden Matthews
7044c5296d Merge pull request #120 from ncopa/master
Compatibility improvements
2015-07-30 16:00:51 -07:00
Brenden Matthews
98d3491ddb Merge pull request #119 from marcpayne/getglobal-fix
Ensure getglobal pushes only one value onto stack
2015-07-30 16:00:01 -07:00
Brenden Matthews
9f6d727831 Merge pull request #115 from marcpayne/top-name-verbose
Add top_name_verbose option
2015-07-30 15:59:16 -07:00
Brenden Matthews
bf4f560f5d Merge pull request #111 from rtoijala/patch-1
Call get_cpu_count() when needed
2015-07-30 15:58:12 -07:00
Brenden Matthews
2867799e39 Merge pull request #125 from Nooby4Ever/templateN-doc
Updated templateN documentation
2015-07-27 07:56:10 -07:00
Nelis Oostens
b5e4056b9d Updated templateN to new syntax
- Explicitly mentioned the use of [[ and ]]
2015-07-27 08:08:50 +00:00
Nelis Oostens
d07c9368cb Clarified templateN documentation
- Added arg start counter
2015-07-27 08:06:39 +00:00
Nelis Oostens
8bf8859c73 Added missing build flags to the print_version function
Added:
BUILD_ICAL
BUILD_ICONV
BUILD_MYSQL
BUILD_LUA_RSVG
BUILD_XSHAPE
2015-07-24 16:42:47 +00:00
Natanael Copa
0956b689ec Fix thread local on pre C++11 compilers 2015-07-23 16:36:00 +02:00
Natanael Copa
18877f3992 Change ipv6 check to warning instead of fatal error
The compile server might not have ipv6 but that does not prevent us from
building conky and run it on a machine which has ipv6.
2015-07-23 16:15:30 +02:00
Natanael Copa
476f84cf59 Use portable version of strerror_r
There are 2 variants of strerror_r, GNU extension and a POSIX variant.
Use the more portable POSIX variant.

Also fix a potensial stack-use-after-return bug, instead of relying on
undefined behavoir in GNU libc implementation. The strerror_r manpage
says:

> This may be either a pointer to a string that the function stores in
> buf, or a pointer to some (immutable) static string (in which case buf
> is unused).

So it does not guarantee that it returns a pointer to some (immutable)
static string. It might return a pointer to "buf", in which case we get
a stack-use-after-return bug.

We fix this by declaring a thread local static buffer which we always
return.
2015-07-23 16:07:34 +02:00
Natanael Copa
98b063866f Remove use of sysctl.h
The sysctl.h is not specified in POSIX. This fixes building with musl
libc.
2015-07-23 16:06:42 +02:00
Natanael Copa
8711bdee8b Use posix awk instead of GNU awk
We don't use any fancy GNU awk extensions so chekc for a portable awk
instead of require GNU awk.
2015-07-23 16:05:31 +02:00
Marc Payne
11ec010561 Ensure getglobal pushes only one value onto stack
Currently, state::getglobal pushes two values onto the stack: the global
environment and the requested global. For example, if you call
getglobal("conky"), the stack ends up with the following:

| ... global, conky |

The function config_setting_base::lua_set in setting.cc does not take this
behavior into account, resulting in #97.

To correct this, call replace(-2) at the end of state::getglobal where
LUA_VERSION_NUM >= 502.
2015-07-22 17:16:26 -06:00
Marc Payne
06722e4a2a Add top_name_verbose option
Since commit 749083a, the output of ${top name <num>} contains the full
command line of each process, including arguments. While this feature can
be very useful, it changes the default behavior of Conky.

The present commit adds a new top_name_verbose option that allows the user
to toggle between basenames with no arguments (the old behavior) and full
command lines with arguments. To remain consistent with past versions of
Conky, the default value of top_name_verbose is false.

Fixes #113 (https://github.com/brndnmtthws/conky/issues/113).
2015-07-20 17:27:45 -06:00
rtoijala
f1a3542734 call get_cpu_count() when needed
get_cpu_count() is not called before trying to use cpus so conky exits with

conky: obj->data.i 1 info.cpu_count 0
conky: attempting to use more CPUs than you have!

Fixes issue #93.
2015-07-10 12:22:18 +03:00
Brenden Matthews
9ac60dcc15 Merge pull request #108 from marcpayne/noipv6-segfault-fix
Close file only if it was successfully opened
2015-07-07 15:59:10 -07:00
Brenden Matthews
2c0ef7f5e5 Merge pull request #104 from Stebalien/fix_battery
Fix battery
2015-07-07 15:58:50 -07:00
Brenden Matthews
a64a620ccf Merge pull request #96 from Vincent-C/master
Avoid clobbering CFLAGS/CXXFLAGS set by user
2015-07-07 15:58:14 -07:00
Vincent Cheng
b8082ca1fa Avoid clobbering CFLAGS/CXXFLAGS set by user 2015-07-07 01:38:12 -07:00
Marc Payne
ee08a9e1b0 Close file only if it was successfully opened
If BUILD_IPV6=ON (default), but the user has disabled ipv6 support
in the kernel using the parameter ipv6.disable=1, then conky fails
to open /proc/net/if_inet6. This leads to a segfault when conky
calls fclose(file) regardless. This fix simply moves the fclose call
into the preceding if statement.
2015-07-06 02:51:43 -06:00
Steven Allen
0aa790baac Correctly shorten unknown. 2015-07-02 11:09:50 -04:00
Steven Allen
54a5cb8cbb If we're on AC, there is no battery.
Again, no point in having two ways to say the same thing.
2015-07-02 11:09:24 -04:00
Steven Allen
8852c0083c No point in having two ways to say charged.
replace full with charged.
2015-07-02 11:02:30 -04:00
Brenden Matthews
58abe0e91d Prep for next release. 2015-06-21 17:53:16 -07:00
Brenden Matthews
8a4eb2655d Prep for 1.10.0 release. 2015-06-21 17:49:06 -07:00
Brenden Matthews
7733a6d6f3 Let's be real about the versioning. 2015-05-23 09:30:53 -07:00
Brenden Matthews
138c86449d Update README.md 2015-05-23 08:12:47 -07:00
Brenden Matthews
9c833665d8 Merge pull request #83 from troxor/disk-by-label
Fix segfault on invalid label
2015-03-09 10:41:48 -07:00
Brenden Matthews
85aca29932 Merge pull request #82 from troxor/freetype-include-path
Freetype include path
2015-03-06 16:52:37 -08:00
Troy C
9fd4090a07 Fix segfault on invalid label 2015-02-28 23:03:37 -06:00
Troy C
237fe4864b Adding nested check, due to comments in ft2build.h 2015-02-27 16:22:33 -06:00
Troy C
ac224149de Add freetype path for Ubuntu 12.04 2015-02-27 15:17:15 -06:00
Brenden Matthews
348e5e7390 Merge pull request #81 from troxor/disk-by-label
Specify diskio by device label
2015-02-25 13:23:26 -08:00
Troy C
80470556b9 Fix freetype include path 2015-02-20 19:53:03 -06:00
Troy C
34903b493f Update docs for diskio label 2015-02-19 14:23:37 -06:00
Troy C
345d62a555 Search device labels for diskio 2015-02-19 13:42:50 -06:00
Brenden Matthews
c35c8520ba Merge pull request #72 from steelman/xdg-config-path
Read configuration from ~/.config/conky/conky.conf
2014-11-21 15:08:14 -08:00
Łukasz Stelmach
00481ee9a9 Read configuration from ~/.config/conky/conky.conf
Try to load configuration from ~/.config/conky/conky.conf before
falling back to ~/.conkyrc and /etc/conky/conky.conf.
2014-11-17 22:06:27 +01:00
Brenden Matthews
b03d88dcf9 Merge pull request #71 from adeason/x11-bstore
Enable X11 backing store
2014-10-28 15:47:57 -07:00