1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00
Commit Graph

3172 Commits

Author SHA1 Message Date
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
Andrew Deason
b9dba46fb3 Enable X11 backing store
In our XCreateWindow call, we always set the backing_store attribute
to 'Always'. But since we never add the CWBackingStore to our value
mask, the backing_store setting always gets set to the default
NotUseful. This means that the backing store is never turned on, and
so when unobscuring the conky window, portions of the display will not
be drawn immediately if conky is blocked doing something else (e.g.
network, disk, the process is stopped), which is really annoying.

To fix this, specify the CWBackingStore flag in our value mask, so the
conky data is always visible, even if conky is blocking on some other
operation.
2014-10-25 19:34:25 -05:00
Andrew Deason
cd95b659c7 Consolidate common X11 XSetWindowAttributes flags
We always specify CWOverrideRedirect. So just assign that to flags
once, instead of assigning it to flags in four different cases.
2014-10-25 19:33:19 -05:00
Brenden Matthews
a2b5c3f3cf Merge pull request #64 from dnk/xshape
add support for x11 shape extension
2014-09-09 07:36:39 -07:00
Denis Gorodnichev
442f78119c add support for x11 shape extension
x11 shape extension (version >= 1.1) provide ability to set up input region
set up empty input region for undecorated window to create transparent window for mouse events
2014-09-09 11:12:44 +04:00
Brenden Matthews
689b404606 Merge pull request #54 from calimeroteknik/realfree
Fix size of the reported "buffers/cache" memory.
2014-07-24 08:35:50 -07:00
CTK
3e85698458 Fix size of the reported "buffers/cache" memory.
It now reports only reclaimable memory, by excluding shared memory,
and including the reclaimable part of the SLAB cache.

So '$mem' with 'no_buffers yes' is now the "really used" (unreclaimable) memory.
And when reaching OOM conditions, conky will always report high memory usage.

Related post:
http://calimeroteknik.free.fr/blag/?article20/really-used-memory-on-gnu-linux
2014-06-19 23:24:19 +02:00
Brenden Matthews
eef323eafd Merge pull request #48 from paulegan/graph-in-shell
Support for graph output on console/shell
2014-06-17 17:23:17 -07:00
Brenden Matthews
4ea42d3190 Update README.md 2014-06-17 17:22:30 -07:00
Brenden Matthews
ce605fc0b3 Update README.md 2014-06-17 17:21:56 -07:00
Nikolas Garofil
70f27ccfab Fix invalid read 2014-05-30 12:24:55 +02:00
Paul Egan
9809f7cd91 Support for graph output on console/shell 2014-05-05 21:07:55 +01:00
Brenden Matthews
3696f0ea51 Merge pull request #44 from ldx/allbattperct
Compute mean percentage for multiple batteries.
2014-03-09 13:58:10 -07:00
Vilmos Nebehaj
cda5afda69 Address PR comments.
In particular:
- Don't call get_battery_perct() recursively.
- Use define for length of string holding battery name.
- We can use strcpy() since bat is zero-terminated.
2014-03-09 21:32:15 +01:00
Vilmos Nebehaj
f39de709e3 Update docs for battery_bar and battery_percent. 2014-03-09 18:54:41 +01:00
Vilmos Nebehaj
3fb201bbc8 Use strncmp() when checking battery name. 2014-03-09 18:53:26 +01:00
Vilmos Nebehaj
ad92c60d6b Compute mean percentage for multiple batteries.
If a laptop has multiple batteries, compute the mean percentage if the
user asks for 'all' instead of a specific battery.
2014-03-09 14:03:36 +01:00
Brenden Matthews
120d6e1f94 Merge pull request #33 from eskerda/eskerda-thinklight
add support for $ibm_thinklight
2013-12-17 12:27:52 -08:00
eskerda
68263d4556 add support for $ibm_thinklight
Some IBM/Lenovo models come with a light on the top edge of the
display to illuminate the keyboard. This either reports 'on', 'off'
or 'unknown'.
2013-12-06 16:44:37 +01:00
Brenden Matthews
b5e17a4c50 Merge pull request #30 from oliverseal/master
Added cairo blending modes to support libcairo-1.10.0
2013-11-10 20:02:11 -08:00
Oliver Wilkerson
935280e36c Added cairo blending modes to support libcairo-1.10.0 2013-10-31 18:12:57 -05:00
Brenden Matthews
e001eb6244 Fix whitespace. 2013-09-15 09:45:56 -07:00
Brenden Matthews
b5f8ea5069 Merge pull request #24 from ZDroid/patch-1
Github -> GitHub, conky -> Conky
2013-09-15 09:42:55 -07:00
Brenden Matthews
b37f0493be Merge pull request #22 from adeason/inotifyfd
Set uninitialized inotify_fd to -1, not 0
2013-09-15 09:42:32 -07:00
Zlatan Vasović
f3b58d7a89 Github -> GitHub, conky -> Conky 2013-09-13 22:49:55 +02:00
Andrew Deason
f670e70d7c 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.
2013-08-18 13:50:17 -05:00
Pavel Labath
02dfacd694 Add support for lua 5.2
luamm is now able to be compiled with both lua 5.1 and 5.2 (assuming 5.2 has backward
compatibility features compiled in). It is my intention to always support at least two versions
of lua.
2013-07-13 23:55:28 +02:00
Pavel Labath
0f94f409a1 Fix an some strange code found by a clang warning 2013-07-13 19:42:20 +02:00
Pavel Labath
fc84f0f6a0 Fix compilation with clang 2013-07-13 19:42:04 +02:00
Pavel Labath
2b8d603a9f Remove the cmake test for gcc-4.4
It tests for gcc, and conky is perfectly capable of being compiled with e.g. clang.
2013-07-13 19:40:23 +02:00
Nikolas Garofil
9d36db7138 Fix warning about unused result in strerror_r() redefinition
On systems, the buildprocess will complain:
  [  7%] Building CXX object src/CMakeFiles/conky.dir/c++wrap.cc.o
  conky/src/c++wrap.cc: In function ‘std::string strerror_r(int)’:
  conky/src/c++wrap.cc:66:37: warning: ignoring return value of ‘char* strerror_r(int, char*, size_t)’, declared with attribute warn_unused_result [-Wunused-result]

According to "man 3 strerror_r" the buffer used as 2nd arg is not always used, this patch also fixes that problem.
2013-06-20 22:07:40 +02:00
Nikolas Garofil
36189de425 Fix warning about unused result of write() in priv::callback_base::stop()
On systems with a strict compiler, the buildprocess will complain:
  [ 70%] Building CXX object src/CMakeFiles/conky.dir/update-cb.cc.o
  conky/src/update-cb.cc: In member function ‘void conky::priv::callback_base::stop()’:
  conky/src/update-cb.cc:49:34: warning: ignoring return value of ‘ssize_t write(int, const void*, size_t)’, declared with attribute warn_unused_result [-Wunused-result

This patch fixes this warning (and by doing this also checks if the write worked)
2013-06-20 19:43:46 +02:00
Brenden Matthews
c272852bcb Merge pull request #14 from jrk-/image_wrapper
Wrapper for drawing images with imlib2 and cairo
2013-06-08 09:52:51 -07:00
Jochen Keil
56b5a7eeca Wrapper for drawing images with imlib2 and cairo
One problem is, that tolua/lua does not handle plain data pointers
properly. Therefore something like

local surface = cairo_image_surface_create_for_data(
    imlib_image_get_data_for_reading_only(), ..

will fail using the lua bindings. Hence this wrapper, which adds
a function which be used to draw an imlib image to a cairo surface.

This also addresses another issue, drawing images with a transparent
background (e.g. gifs or pngs) to the cairo surface properly. Apparently
the image format of imlib is incompatible to cairos which uses
pre-multiplied data. This is also explained in the cairo documentation.
A fix for this issue is to blend the image with another alpha mask to
get the correct values. The code and explanation for this was taken from

  http://lists.cairographics.org/archives/cairo/2008-March/013492.html

Executive Summary: This wrapper function can load (transparent) images
(e.g. gif or png) from a file by using imlib and draw them on a cairo
surface.
2013-06-08 12:09:35 +02:00