1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Commit Graph

155 Commits

Author SHA1 Message Date
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
Brenden Matthews
e7bf480d48 Fix null pointer boog in $top stuff. 2009-05-17 21:59:05 -06:00
Phil Sutter
ae7996bdd1 fix hwmon for 2.6.29, simplify code a bit 2009-05-12 00:49:40 +02:00
Brenden Matthews
af55c4afb1 Use a reduction here. 2009-05-05 17:43:45 -06:00
Brenden Matthews
fde096c435 Added some completely pointless OpenMP optimizations(?) 2009-05-05 17:36:12 -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
Brenden Matthews
293f6ad7e2 Fix possible mem leak with net stats. 2009-03-16 15:56:37 -06:00
Brenden Matthews
613df97a6c Fix wacky net speed values on startup. 2009-03-16 14:14:18 -06:00
Phil Sutter
d500f1005a outsource ibm-acpi stuff into it's own source file
Despite this is actually not much code and could stay inside linux.c as
well, this makes sense as I want to combine smapi and ibm-acpi
functionality. Virtually every user of a notebook made by IBM/Lenovo
will want both, so this should be a feature not a bug.

Besides making the ibm-acpi objects being built optionally, this should
not change anything to the code flow.
2009-02-22 02:58:29 +01:00
Martin Tůma
f7aeae2c01 Fix shown battery status patch.
Fix shown battery status when the battery is not charging any more but is not full charged patch sf.net id #2556056 (thanks Martin).
2009-02-17 22:19:25 -07:00
Swoög
b516e19440 Patch to add $battery_short variable. 2009-02-17 21:49:45 -07:00
Alexander Graf
9c679bf33f Add ${top_time} sorting processes by CPU time 2009-02-07 15:01:50 +01:00
Brenden Matthews
35a2d09c5f Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-17 17:03:33 -07:00
Phil Sutter
f85c1ea5a6 Make gateway objects also detect routes with missing RTF_GATEWAY flag
This was a bug, not a feature. From the FreeBSD manpage rtentry(9):

| Vt struct sockaddr *rt_gateway;
|
| The "target" of the route, which can either represent a destination in
| its own right (some protocols will put a link-layer address here), or
| some intermediate stop on the way to that destination (if the
| RTF_GATEWAY flag is set).

So for a default route with "dest" and "mask" both zero, either
RTF_GATEWAY is present, or "gate" is zero.
2008-12-17 02:37:07 +01:00
Brenden Matthews
2b128b7a7c Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-15 18:00:05 -07:00
Phil Sutter
9a85812e06 here comes the big header include rewrite
Some statics are now defined by configure.ac.in, conky.h got a lot
smaller, which I see as a positive sign.

This patch should not change any functionality, just change what's
defined where. Some features I did/could not test are probably broken,
also compiling for any other OS surely won't complete now. Though I
think fixing these problems is as easy as including some missing
headers.

I've done compile checks with the following configure options:
./configure --enable-eve --enable-rss --enable-smapi
	--enable-wlan --enable-debug --enable-testing

So what needs to be tested is:
- audacious
- BMPx
- xmms2
- nvidia
2008-12-15 23:12:33 +01:00
Brenden Matthews
650be03fd4 Improve behaviour of $pb_battery. 2008-12-13 20:55:45 -07:00
Phil Sutter
5445c8890a fix disk_protect for linux-2.6.27
The path for the sysfs attribute has changed. Also negative values show
disabled disk protect, so catch this when interpreting the file's
content.
2008-12-14 02:51:50 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Brenden Matthews
5a5e7fd8e2 Fix broken cpu usage stuff (due to a previous commit). 2008-12-09 16:15:06 -07:00
Brenden Matthews
e2c49531f3 Limit $battery_percent to 100 (bug 2145006) 2008-12-07 15:58:40 -07:00
Brenden Matthews
5626eade7f Fix last 'fix' 2008-12-07 15:44:10 -07:00
Brenden Matthews
6fab949926 Removing $freq_dyn and $freq_dyn_g
I have decided to remove $freq_dyn and $freq_dyn_g due to license issues
(see sf.net tracker bug #2166612)
2008-12-07 15:15:57 -07:00
Brenden Matthews
068f6b5b09 * Fixed bug with freq_dyn on x86_64 (thanks Miroslav)
* Fixed buffer overflow in update_net_stats() (thanks Miroslav)
* Small fix for nvidia mem freq (thanks Cezary)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1244 7f574dfc-610e-0410-a909-a81674777703
2008-09-08 04:48:13 +00:00
Phil
56ba0250ab fix error reporting for battery_* variables
* reproduce with a config displaying stuff for BAT0 and BAT1
  while only BAT0 is installed: the call to get_battery_stuff()
  for the existent BAT0 will reset the static variable rep and
  the errors for BAT1 will be reported over and over again
* this fix is not perfect: if both batteries are missing, only
  the first errors will be reported; but better than flooding the
  terminal


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1243 7f574dfc-610e-0410-a909-a81674777703
2008-09-01 23:46:48 +00:00
Nikolas Garofil
23321c408d made defines of some literal values and defines to configure.ac.in
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1223 7f574dfc-610e-0410-a909-a81674777703
2008-07-12 10:25:05 +00:00
Brenden Matthews
66079c5585 Added sysfs AC adapter support patch (thanks Byron); Small compilation error fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1196 7f574dfc-610e-0410-a909-a81674777703
2008-06-28 19:17:49 +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
Nikolas Garofil
c1c34ae443 'inline' removed from functions that are called from different files
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1187 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 14:18:44 +00:00
Kevin Lyles
c72a564cea Removed all trailing whitespace
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1156 7f574dfc-610e-0410-a909-a81674777703
2008-06-15 18:38:33 +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
Nikolas Garofil
b24e258165 small changes to let code compile with enable-testing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1134 7f574dfc-610e-0410-a909-a81674777703
2008-06-06 12:14:15 +00:00
Nikolas Garofil
07269f678d Bugfix: gw_iface with a empty routingtable no longer causes a crash
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1124 7f574dfc-610e-0410-a909-a81674777703
2008-06-04 08:09:49 +00:00
Phil
bd6196c6b0 configurable if_up, may check for:
* IFF_UP flag,
* IFF_UP and IFF_RUNNING flags or
* IFF_UP, IFF_RUNNING flags and assigned address


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1121 7f574dfc-610e-0410-a909-a81674777703
2008-05-30 11:30:58 +00:00
Brenden Matthews
fda6b66eb9 * own_window_type dock patch (thanks Morgan).
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1115 7f574dfc-610e-0410-a909-a81674777703
2008-04-29 21:31:04 +00:00
Brenden Matthews
fcb1260a39 exclude reserved IPs with if_up
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1113 7f574dfc-610e-0410-a909-a81674777703
2008-04-22 22:59:04 +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
c6c02f6cf9 capitalization consistency
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1096 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 06:10:58 +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
0ee3efdc0f make diskio accept devices starting with "/dev/"
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1087 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 03:51:29 +00:00
Brenden Matthews
ceedc66f8d more battery cleanup
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1083 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 04:02:53 +00:00
Brenden Matthews
fbb58187b5 add more checking in libmpdclient; make battery stuff look the same for sysfs and proc
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1082 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 03:26:55 +00:00
Phil
ab63c2b024 rename all shadowing variables for -Wshadow
* sadly intuitive names like "time" or "index" are already
  globally defined (functions in time.h and string.h)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1070 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 09:58:09 +00:00
Phil
2913a71216 the big relocation patch
* this moves all declarations to the beginning of their block
  to prevent mixed declarations and code


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1068 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 06:24:04 +00:00
Phil
d151828d23 make intense use of const keyword
* accidential writes to const char * are being detected
  at compile time
* also clean up casting at some places


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1059 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 03:45:36 +00:00
Phil
418b3d62e0 match signedness and format when scanning into variables
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1058 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 03:01:48 +00:00
Phil
ac2dd1b34b use %llu instead of %Lu
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1057 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:28:38 +00:00