1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-10-02 23:19:08 +00:00
Commit Graph

101 Commits

Author SHA1 Message Date
Brenden Matthews
cf9e498b24 Update copyright notices. 2010-01-01 15:46:17 -08:00
Phil Sutter
bfd7eabc0f convert get_battery_perct_bar to double 2009-12-04 22:18:53 +01:00
Phil Sutter
d3aafc4a75 reenable top for all target OS's
Occurs to work fine on FreeBSD, the other BSD's probably need more work,
anyway.
2009-12-01 00:45:17 +01:00
Phil Sutter
b8e600b9a4 convert bsd apm objects to callbacks.print 2009-12-01 00:32:32 +01:00
Phil Sutter
4e63422d10 battery_bar: convert to callbacks.barval 2009-11-30 23:48:04 +01:00
Phil Sutter
5249c9da04 if_mounted: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
44f76f4876 drop leftover freq_dynamic code in freebsd.c and openbsd.c
As the comment states, those functions were originally copied from
linux.c; in fact just the code which has been removed due to licensing
issues.
2009-11-16 19:41:06 +01:00
Phil Sutter
bde5845077 drop adt746x objects
This was really creepy stuff. Last updated in April, 2006 to work with
kernels > 2.6.12. I consider this "fobar" (fscking obsolete beyond all
recognition) and doubt anyone still uses this. If you do, blame me. :)
2009-11-13 00:47:23 +01:00
Phil Sutter
8922603b91 entropy: outsource code
This patch ought to be small and simple ...

The reason why it's not is me wanting the entropy data out of struct
information. This means update_entropy() can not be used anymore, as it
uses this globally available object.

The solution I am presenting here is quite messy regarding header
includes. Hopefully this will go away soon as I plan on creating some
sort of "OS library" containing all OS specific routines and defining
macros for easier capability checking in the non-specific code. This on
the other hand means we'll need "wrappers" around OS specific objects,
but that's not as bad as it seems - having non-specific text objects
only will definitely clean up the code, and capabilities can be checked
where they should be.
2009-11-13 00:02:16 +01:00
Phil Sutter
556751c8c9 top: drop problematic field totalmem
The field totalmem was formerly used to hold the percentage of used mem
by a process. So at update time, the field info.memmax was being
addressed, which is potentially being updated at the same time, As all
updating routines potentially run in parallel. Though there is an
(quite) easy fix for this: calculate the percentage upon object
printing. This works because conky synchronises all update routines
right before printing the result. (To omit locking on it's own.)
2009-11-03 23:24:09 +01:00
Phil Sutter
8b76d8fb60 net_stats: outsource network-related objects 2009-11-03 01:50:28 +01:00
Pavel Labath
09c0bccf55 Move vi modelines closer to the beginning, so they're more likely to be actually used. 2009-09-12 12:50:51 +02:00
Brenden Matthews
043cf686c6 Revert "Uhh..ansohus"
This reverts commit 9827726ae5.

Or this.
2009-08-07 01:24:24 -06:00
Brenden Matthews
9827726ae5 Uhh..ansohus 2009-08-06 00:54:40 -06:00
Cesare Tirabassi
81c691d15a add emacs indentation variables to source files in line with current vim settings 2009-07-28 23:44:22 +02:00
Brenden Matthews
d97cd93a1c Add vim modelines. 2009-07-27 14:47:31 -06:00
Nikos Ntarmos
739e47f9ec Teach freebsd.c to use the new CRIT_ERR format
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-07-20 11:51:02 -06:00
Nikolas Garofil
06de5573e8 Fix a lot of unimportant memleaks caused by a CRIT_ERR 2009-07-16 20:28:23 +02:00
Nikolas Garofil
9065d1f422 Added support for swapfree 2009-07-09 20:12:52 +02:00
Phil Sutter
867a842b3f fix for testing and debug on FreeBSD
(Probably not complete yet)
2009-06-22 02:00:11 +02:00
Phil Sutter
26ecdcf562 Revert "Bugfix: $addr and $addrs couldn't find ip's before the first update."
This reverts commit 8ffb8b238d.

Surely, there is a better solution for that.
2009-06-06 18:14:06 +02:00
Nikolas Garofil
8ffb8b238d Bugfix: $addr and $addrs couldn't find ip's before the first update.
When you started "$updates|${addr eth0}" displayed "0|No Address",
after the first update you got something normal like "1|192.168.0.1"
This patch should fix this.
2009-06-06 17:41:51 +02:00
Nikos Ntarmos
12d0d1477f Integrate FreeBSD diskio support.
This diff moves Linux-specific parts of diskio.c into linux.c and uses
the remaining diskio functions to correctly implement this functionality
for FreeBSD. It also hooks diskio.c to the FreeBSD build.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:32 -06:00
Nikos Ntarmos
0880c1722d Remove unused variables and rearrange includes.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:31 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Nikos Ntarmos
99a496b3ea Adding if_up support for FreeBSD.
Moved interface_up(...) from linux.{c.h} to common.{c,h} and taught it
to check for ENXIO as well to make it work on FreeBSD.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:57 +01:00
Nikos Ntarmos
50bac84006 Bringing FreeBSD up to date with latest commits
Several things were broken after the switch to 1.7-rc branches. This
diff fixes all compilations issues and updates some functions that were
left empty previously.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:51 +01:00
Nikos Ntarmos
15bd2ca5ec sysfs is a Linux-only feature.
Moving sysfs-related functions and defs out of common.h and into
linux.h, as sysfs exists only on Linux, and updating openbsd.c,
netbsd.c, and freebsd.c accordingly.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:48 +01:00
Nikos Ntarmos
e275b05242 Disk i/o support on FreeBSD patch.
Patch sf.net id #2657227 (thanks Nikos).
2009-03-15 19:11:49 -06:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Roman Bogorodskiy
67d66b03eb - Use u_int instead of unsigned long for storing
vm related values returned by sysctl
- Minor style fix in preproccessor comments


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1215 7f574dfc-610e-0410-a909-a81674777703
2008-07-06 09:25:28 +00:00
Nikolas Garofil
312d3d6de8 Merge with conky1-extra, Changelog contains the changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 20:37:58 +00:00
Kevin Lyles
5a8b03fba7 Moved global diskio variables into info
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1170 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 19:58:07 +00:00
Roman Bogorodskiy
00b26c0834 More or less working on FreeBSD now.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1155 7f574dfc-610e-0410-a909-a81674777703
2008-06-15 07:08:52 +00:00
Kevin Lyles
610b0b628d Split conky.h into several smaller header files
In order to do this correctly:
	Removed duplicate includes
	Fixed mpd functions to accept mpd_s instead of information
	Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants)



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
Roman Bogorodskiy
947dfb558d Small portion of FreeBSD fixes:
- diskio.c is not needed for freebsd
- sync cpu freq related functions prototypes
- cleanup #indef's

It still doesn't compile on FreeBSD though.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1117 7f574dfc-610e-0410-a909-a81674777703
2008-05-03 12:30:05 +00:00
Brenden Matthews
4d7ecc7951 * Getting rid of goto usage throughout code.
* Fix bug due to usage of gethostbyname() in threads (which is not
	reentrant) by using gethostbyname_r() when available.
	* Added patch for battery_time problem on 2.6.24 (thanks wedge).
	* Added patch to fix broken xmms2 stuff (thanks sleipner).
	* Added patch to fix SIGHUP/SIGUSR1 segfault (thanks norsetto).
	* Added patch to improve $if_up (thanks Aseem).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1103 7f574dfc-610e-0410-a909-a81674777703
2008-04-10 22:45:45 +00:00
Brenden Matthews
a6a4a4c548 * Replacing strdup() with strndup() throughout
(this is probably going to break a few things)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1100 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 18:44:49 +00:00
Brenden Matthews
be2cd44e6d doc cleanup
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1090 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 04:56:39 +00:00
Brenden Matthews
c2c6a63f5a * Added mem_res and mem_vsize to $top.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1084 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 07:04:25 +00:00
Brenden Matthews
4fe68fcc04 fixing problem where p_max_size becomes <1
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1020 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 20:56:13 +00:00
Roman Bogorodskiy
ae8c4198b8 Fix compilation.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1008 7f574dfc-610e-0410-a909-a81674777703
2008-02-24 16:35:18 +00:00
Kevin Lyles
3d26a4880e Reformatted all code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 20:30:45 +00:00
Kevin Lyles
9c3ae23a15 Fixed a few minor type issues
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1005 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:23 +00:00
Kevin Lyles
9a44d8b1c8 Fixed broken compilation on FreeBSD
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1001 7f574dfc-610e-0410-a909-a81674777703
2008-02-19 18:48:54 +00:00
Brenden Matthews
433b564e14 * Applied 2 patches:
1) Add diskio for individual devices
        2) Improved output of units, added "short_units" option


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@996 7f574dfc-610e-0410-a909-a81674777703
2008-02-09 02:21:06 +00:00
Philip Kovacs
651be79121 applied submitted patches for get_ibm_acpi_volume bug,
realtime clock bug and kFreeBSD support (thanks KPH).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@993 7f574dfc-610e-0410-a909-a81674777703
2007-12-31 00:00:35 +00:00
Roman Bogorodskiy
2addde8cc4 Never commit stuff before you're going to bed.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@925 7f574dfc-610e-0410-a909-a81674777703
2007-08-22 05:11:06 +00:00
Roman Bogorodskiy
3c0aaee4dc Fix a typo - variable was used before declarated and
the code was broken, though it was under #ifdef i386,
so conky compiled fine on other arches.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@924 7f574dfc-610e-0410-a909-a81674777703
2007-08-21 18:40:08 +00:00
Philip Kovacs
10a5ee6074 hwmon leveraging existing code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@922 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 23:14:01 +00:00