Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity
1,581 Commits 5 Branches 46 Tags 22 MiB
3659131192
Commit Graph

82 Commits

Author SHA1 Message Date
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
Philip Kovacs
33943bda7c * Added var $platform which is similar to $i2c and accommodates the conversion 
of many devices from /sys/bus/i2c/devices to /sys/bus/platform/devices.
* Removed config item post_21_kernel since it forced all i2c device lookups
    to go to /sys/bus/platform/devices and some people may need a mix of both
    i2c and platform devices.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@917 7f574dfc-610e-0410-a909-a81674777703
 2007-08-13 00:28:48 +00:00
Toni Spets
dbe5ee1f3f Didn't remove all references to linkstatus ;-) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@910 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 20:57:14 +00:00
Brenden Matthews
27b4c8550c clarifying licensing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@904 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 19:53:44 +00:00
Roman Bogorodskiy
cf49198176 Remove freebsd wifi stuff since the API seems to be 
changed and I have no wifi devices to test it.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@893 7f574dfc-610e-0410-a909-a81674777703
 2007-08-06 16:42:48 +00:00
Brenden Matthews
f95d63bf56 * Fixed potential issue on FreeBSD when nprocs < 10 (thanks zotrix) 
* Added support for multiple batteries when using acpi (thanks Phil)
    * a bunch of code cleanups (thanks Psychon)
    * added max length paramater to mpd_title (thinks fow)
    * a number of small bug fixes


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@889 7f574dfc-610e-0410-a909-a81674777703
 2007-08-05 04:47:21 +00:00
Toni Spets
a2fbf01fe2 fixed apm_adapter for both openbsd and freebsd and some build warnings cleaned 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@862 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 09:32:21 +00:00
Roman Bogorodskiy
60764129c1 Fix build on teh free bds. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@859 7f574dfc-610e-0410-a909-a81674777703
 2007-05-05 16:46:12 +00:00
Roman Bogorodskiy
7515d8319a Fix build on FreeBSD on arches !(i386 or amd64). 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@857 7f574dfc-610e-0410-a909-a81674777703
 2007-04-15 04:58:41 +00:00
Philip Kovacs
4f7f4bf11e conky 1.4.6-svn trunk 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@836 7f574dfc-610e-0410-a909-a81674777703
 2007-02-25 23:35:53 +00:00
Philip Kovacs
1c35f432e5 Conky 1.5.0 -- client/server prototype 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@818 7f574dfc-610e-0410-a909-a81674777703
 2006-12-23 06:01:16 +00:00
Philip Kovacs
5ff932ff21 split battery off into battery and battery_time 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@814 7f574dfc-610e-0410-a909-a81674777703
 2006-12-12 23:21:14 +00:00
Roman Bogorodskiy
de84fcac2a Fix ${freq} and ${freq_g} on FreeBSD. 
Reported by:	Karsten Rothemund <karsten@photor.de>


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@804 7f574dfc-610e-0410-a909-a81674777703
 2006-12-03 18:10:21 +00:00
Philip Kovacs
9a016c9377 added , , for crypto freaks 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@797 7f574dfc-610e-0410-a909-a81674777703
 2006-11-30 20:46:34 +00:00
Roman Bogorodskiy
38d2d64b08 Cleanup wifi code a bit. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@758 7f574dfc-610e-0410-a909-a81674777703
 2006-11-12 14:17:31 +00:00
Roman Bogorodskiy
112253e474 Fix build on FreeBSD. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@756 7f574dfc-610e-0410-a909-a81674777703
 2006-11-12 06:11:47 +00:00
Philip Kovacs
9bbdaa03c5 SIGUSR1 fix on freebsd and linux 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@738 7f574dfc-610e-0410-a909-a81674777703
 2006-11-08 03:06:42 +00:00
Roman Bogorodskiy
a5de2b09d9 Stepan Zastupov's "fucking patch" (that's how he identifies it 
himself) for WiFi stuff. Basicly, we use strlcpy() instead of
strncpy(). strlcpy() is avaible since FreeBSD 3.3 and on
Debian/kFreeBSD and simular systems it's possible to install
a third party lib to get a support for it (if somebody cares).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@712 7f574dfc-610e-0410-a909-a81674777703
 2006-10-19 18:52:14 +00:00
Roman Bogorodskiy
00e92953b6 Add WiFi signal level detection support on FreeBSD (patch by 
Stepan Zastupov).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@711 7f574dfc-610e-0410-a909-a81674777703
 2006-10-18 16:02:28 +00:00
Roman Bogorodskiy
fe7ec00729 - Fix build on FreeBSD by moving volage stuff under #ifdef __linux__ 
and adjusting get_freq() prototype
- Fix Xdamage detection, make it not mandatory


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@678 7f574dfc-610e-0410-a909-a81674777703
 2006-08-01 21:24:15 +00:00