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

136 Commits

Author SHA1 Message Date
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
Phil
ef3f404cca fix potential segfault in get_ioscheduler().
returning a const char * instead of a char * will lead to
trouble if the string is then tried to be free()'d.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1056 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:19:36 +00:00
Phil
e306a2c2e8 some linting on function definitions
* instead of empty args "void" should always be specified.
  Using this, the compiler can detect incorrect function calls,
  like with update_stuff().
* No args seems to be interpreted as "unspecified args" by the
  compiler, as with update_mail_count(). So no checking for
  correctness of arguments when calling was done at all.
* This is not complete yet, as I still don't have any BSD for
  testing.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1055 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:01:03 +00:00
Brenden Matthews
a56e669356 * Fixed battery_bar default size
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1049 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 21:44:50 +00:00
Phil
3966025939 fix indenting in linux.c
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1048 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 20:43:55 +00:00
Phil
749fb99edd two conky fixes
* opened file for laptop_mode wasn't closed again
* hopefully fix reading interface addresses


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1047 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 20:35:20 +00:00
Phil
004d1cb7ba disk_protect - show queue protection state
* disk protection needs a kernel patch and is useful in combination with hdaps


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1045 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 20:08:16 +00:00
Brenden Matthews
c2c01423a8 * $battery_bar sysfs fix (thanks Marcus)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1043 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 05:09:09 +00:00
Brenden Matthews
7613414296 * Fixed linux.c compilation problem due to (suspected) broken linux
headers


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1042 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 03:38:28 +00:00
Phil
bcbca8cb5b enable displaying the used ioscheduler for a given disk
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1034 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 21:10:43 +00:00
Phil
d2ed065fdd laptop_mode displays the current laptop mode
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1033 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 20:13:51 +00:00
Phil
8fd27c0026 make default gateway information accessible
* gw_iface prints the interface having a default gateway
* gw_ip prints the gatway's ip
* if_gw jumps if no default gateway exists
* when there are multiple gateways, gw_iface and gw_ip
  only print "multiple" when they are different (allows
  basic debugging of ones networking setup)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1031 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 19:06:09 +00:00
Brenden Matthews
14f23fb664 fixing warning
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1024 7f574dfc-610e-0410-a909-a81674777703
2008-03-21 23:17:37 +00:00
Brenden Matthews
934c3a94e8 fixing up text_buffer_size stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1021 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 21:28:19 +00:00
Brenden Matthews
a1452f5db4 * Applied 12 patches:
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
        2) Improved audacious support patch (thanks Miroslav)
        3) tp_smapi support patch for IBM laptops (thanks Phil)
        4) user info patch (thanks Roland)
        5) added conky build info patch (thanks Roland)
        6) added if_up patch (thanks Phil)
        7) added reload on SIGHUP patch (thanks Jonas)
        8) added pad percentages patch (thanks Jonas)
        9) added fs_type patch (thanks Ryan)
        10) added xmms2 fixes patch (thanks Lassi)
        11) fix sysfs crash patch (thanks Phil)
        12) multiple ip patch ($addrs)
    * Added more alignment support (top_middle, bottom_middle, middle_left,
    and middle_right).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1010 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 00:23:16 +00:00
Brenden Matthews
dd3b471f2d * Applied 2 patches:
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
		2) Improved audacious support patch (thanks Miroslav)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1009 7f574dfc-610e-0410-a909-a81674777703
2008-03-17 22:27:20 +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
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
Brenden Matthews
2d10c4c08d * Small fix for $ibm_volume (thanks Kapil Hari Paranjape)
* Patch so $tail can read from a fifo file descriptor (thanks Ben Kibbey)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@966 7f574dfc-610e-0410-a909-a81674777703
2007-09-28 20:16:16 +00:00