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
Brenden Matthews
e9474c745b Merge pull request #13 from jrk-/rsvg
Lua bindings to librsvg
2013-05-23 17:20:32 -07:00
Brenden Matthews
7a1f20847f Merge pull request #11 from rephorm/patch-1
Fix unknown short battery status
2013-05-23 17:19:59 -07:00
Brenden Matthews
c5c0294785 Merge pull request #10 from troxor/fixmpdcrash
Quick fix for crashes when mpd stops
2013-05-23 17:19:30 -07:00
Jochen Keil
550d644e6c Add rsvg bindings to cmake build framework 2013-05-22 22:39:41 +02:00
Jochen Keil
bec61e922c Include header file for helper functions
Also add function declarations
2013-05-22 22:38:17 +02:00
Jochen Keil
dee71f4eb2 Functions for creating and accessing Dimension/Position structs 2013-05-22 22:37:05 +02:00
Jochen Keil
32c60685ba Wrapper functions for {creat,destroy}ing an rsvg handle
This wrapper functions should facilitate the handling of rsvg handles.
Especially unrefing with g_object_unref does not seem to work properly
using the lua bindings.
2013-05-22 22:35:39 +02:00
Jochen Keil
118332aa00 Inline typedefs 2013-05-22 22:31:57 +02:00
Jochen Keil
4920cb71be Remove unused GIO/GdkPixbuf interface
Conky Lua only uses cairo, so that's everything we need to keep.
Anything else is just a source for trouble.
2013-05-22 22:31:57 +02:00
Jochen Keil
04c7323cac Replace glib types with primitive types
This help tolua++ to recognize them as native types and not as
usertypes.
2013-05-22 22:31:57 +02:00
Jochen Keil
cf94f82c53 Initial groundwork for rsvg bindings
Add scratch files as a start: merge rsvg.h and rsvg-cairo.h.
Concatenate licenses of rsvg.h and rsvg-cairo.
Remove unnecessary defines, private structs, unused apis
(GIO/GdkPixbuf), etc.
Replace deprecated api functions with glib-object functions
Add headers for glib.h and librsvg/rsvg.h
2013-05-22 22:27:27 +02:00
Brian Mattern
b08410dab4 Fix unknown short battery status
Before, in the case of an unknown battery status (which often happens on my Sony VAIO laptop after waking from sleep), the buffer would be unterminated.

(Although, this memmove trick is a bit odd. It would probably be better to remove the memmove's and put a single buffer[1] = '\0'; at the end of the function).
2013-04-30 10:33:42 -07:00
troxor
38f05de4ca Quick fix for crashes when mpd stops 2013-04-27 23:29:20 -05:00
Brenden Matthews
f0d0a03b8e Merge pull request #7 from alcazoid/master
Fix short process names in top
2013-04-09 16:43:17 -07:00
alcazoid
749083a450 Fixed short process names in top
Conky takes process names from /proc/<pid>/stat and it's limited to 16
chars in kernel. That obviously makes top_name_width option to work only
for decreasing name length. To obtain longer names we parse
/proc/<pid>/cmdline.

Not every process has cmdline, so we take both process names and choose
one we want to use. Like this:

- Get process name from /proc/<pid>/stat

- Get process cmdline from /proc/<pid>/cmdline

- Transform cmdline to a bit simpler form(i.e. "/usr/bin/python
 /usr/bin/terminator" to "python /usr/bin/terminator"), keeping
the arguments(might be changed easily)

- Choose the one that is longer and use it
2013-04-09 16:58:15 +02:00
Brenden Matthews
e08669385c Merge pull request #6 from borgified/master
relative paths referring to portions of wiki dont work
2013-04-09 07:57:48 -07:00
Fwiffo
ad100c7bab changed to absolute url paths to fix broken links 2013-03-28 14:29:47 -07:00
Pavel Labath
459dd4109c Hopefully a lua build check which finally works on all distros 2013-02-23 09:51:49 +01:00
Brenden Matthews
318324fc63 Remove unused variable. 2013-01-29 10:59:23 -08:00
Daniel Pielmeier
96935e8221 Fix build checks for Lua >=5.1 and <5.2. 2013-01-29 10:57:40 -08:00
labath
2688875cbc Merge pull request #4 from jwm-art-net/master
fix for where simultaneous installs of lua 5.1 & 5.2 exist
2013-01-15 12:51:23 -08:00
James Morris
2a1afbbbba fix lua/cairo/imlib2 linkage issues 2013-01-15 00:02:25 +00:00
Pavel Labath
8c19f0f520 Minor fix in linux.cc 2013-01-13 13:33:32 +01:00
James Morris
710646c101 fix to force usage of lua 5.1 when both 5.1 and 5.2 installed 2013-01-12 20:26:39 +00:00
James Morris
d0318b94d6 .gitignore ignore cmake files + others 2013-01-12 18:20:59 +00:00
Brenden Matthews
ac644fe44e Merge pull request #2 from shuber2/fix-diskio-dmcrypt-bytecounting
diskio: Fix byte counting on dmcrypt block devices
2013-01-06 10:10:46 -08:00
Stefan Huber
0e1f4526b4 diskio: Fix byte counting on dmcrypt block devices
Byte counting failes if disk is a dmcrypt block device, i.e, if
major==DM_MAJOR. Fix this.
2013-01-05 19:58:25 +01:00
Brenden Matthews
68aab88a5d Remove deprecated autogen.sh. 2012-12-27 10:38:40 -08:00
Maxime Villard
622bf0cd7e Assorted fixes found by valgrind
== common.cc ==
'result' can be uninitialized.

== conky.cc ==
strcpy()'s overlap: undefined behaviour. memmove()'s one is
defined.

== eve.cc ==
Some simplifications, and there are two leaks:
1. 'mySkill' could be leaked. So, let's make 'skill' point to it instead
   of strdup()'ing the buffer.
2. 'output' could be leaked at l.390.

== freebsd.cc ==
Leak of 'freq_sysctl'.

== net_stat.cc ==
free() already null-checks, so we don't need to do it again.

== proc.cc ==
Leak.

Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2012-12-26 23:22:34 +01:00
Brenden Matthews
c08b8bbee7 Change README paths. 2012-12-26 12:49:31 -08:00
Brenden Matthews
a43822fde7 Update travis build file. 2012-12-26 12:45:43 -08:00
Brenden Matthews
080190eae3 Update travis build file. 2012-12-26 12:42:22 -08:00
Brenden Matthews
3f9036021d Update travis build file. 2012-12-26 12:39:28 -08:00
Georgi Valkov
24948ee17e add readme.md and travis.yml 2012-12-26 16:55:26 +02:00
Pavel Labath
5ded90e22a 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:04:08 +01:00
Pavel Labath
cbc131ea6c 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.

Conflicts:

	src/ccurl_thread.c
2012-10-24 23:25:10 +02:00
Pavel Labath
5177c8d282 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 12:07:38 +02:00
Pavel Labath
ef2855080e Make sure we get report if one of the commands in the documentation pipeline fails 2012-10-03 22:51:28 +02:00
Kevin Lyles
09467931d4 Fix graph auto-scaling when the width is 0 2012-10-03 22:45:13 +02:00
Pavel Labath
6f62e113f1 Do not truncate non-human-readable numbers to 32bit (sf.net #3564560)
patch by hdastwb
2012-09-04 12:58:54 +02:00
Nikolas Garofil
a0052f6b19 Fix building without X11
Fix by Scott Moreau
2012-08-26 13:53:25 +02:00
Pavel Labath
55a1c41827 Really fix "conky fails to build with audacious" (sf.net #3539500)
apparently, my previous fix was not sufficient, although I do remember testing it :/

fix by Daniel Pielmeier.
2012-08-25 23:14:46 +02:00
Nikolas Garofil
79636ef8dd Merge branch 'master' of git://git.omp.am/conky 2012-07-25 21:34:32 +02:00
Pavel Labath
89720b4e81 Add preprocessor defitions that request posix features 2012-07-20 20:59:07 +02:00
Pavel Labath
2fcd9c74a8 Detect clock_gettime properly
my implementation of AC_SEARCH_LIBS macro was incorrect. This should hopefully fix it.
2012-07-20 18:09:35 +02:00
Nikolas Garofil
19b9441704 fix if_existing bugs
- it was returning reverse results when searching strings in file
- if didn't detect that files didn't exist when searching for strings
2012-07-20 13:44:53 +02:00
Pavel Labath
8bae807f68 Add a missing include 2012-07-19 18:42:34 +02:00
Nikolas Garofil
3cca68ed3e Fix -i, -u, -x and -y option 2012-07-17 00:05:54 +02:00
Pavel Labath
b34a1a21e7 Use lround instead of std::lround
for unknown reasons DragonFly's gcc does not have lround in the std namespace
cf. sf.net #3289079
2012-07-13 20:17:54 +02:00
Pavel Labath
ef6282fedc Remove \t from sed script
apparently, non-GNU implementations of sed do not understand backslash-sequences.
2012-07-13 20:13:36 +02:00