1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Commit Graph

743 Commits

Author SHA1 Message Date
Nikolas Garofil
8745d71edf Proper indenting for eve-code, made a define of the default netdev, and moved some defines to configure.ac.in
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1222 7f574dfc-610e-0410-a909-a81674777703
2008-07-12 01:22:40 +00:00
Nikolas Garofil
47462b5d1e solve warnings
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1221 7f574dfc-610e-0410-a909-a81674777703
2008-07-09 23:05:48 +00:00
Philip Kovacs
b58d412441 removed gnulib completely. use a simple getnameinfo function check for --enable-portmon.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1218 7f574dfc-610e-0410-a909-a81674777703
2008-07-07 20:09:37 +00:00
Nikolas Garofil
9094035f8e Fix bug in optional normal/log argument for graphs
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1217 7f574dfc-610e-0410-a909-a81674777703
2008-07-06 13:04:29 +00:00
Nikolas Garofil
97de8557b2 Made log/normal argument for graphs optional
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1216 7f574dfc-610e-0410-a909-a81674777703
2008-07-06 10:56:59 +00: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
Philip Kovacs
a2775d30d1 --libtool version of gnulib installed
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1211 7f574dfc-610e-0410-a909-a81674777703
2008-07-03 23:28:51 +00:00
Philip Kovacs
5619ce52ad adjust #includes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1208 7f574dfc-610e-0410-a909-a81674777703
2008-07-01 19:43:24 +00:00
Nikolas Garofil
fec88c0429 Compilation with --enable-testing works by removing stdio.h
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1207 7f574dfc-610e-0410-a909-a81674777703
2008-07-01 17:33:21 +00:00
Philip Kovacs
c7c822426c latest gnulib sources
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1206 7f574dfc-610e-0410-a909-a81674777703
2008-07-01 14:46:13 +00:00
Nikolas Garofil
72f416212f configure option for mathfunctions
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1204 7f574dfc-610e-0410-a909-a81674777703
2008-07-01 11:13:40 +00:00
Philip Kovacs
5ce58e014e Add libgnu convenience lib, modules stdio and getaddrinfo.
We now make no assumption about availability of functions
such as snprintf and getnameinfo.  If the target machine 
doesnt have them, libgnu provides them.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1203 7f574dfc-610e-0410-a909-a81674777703
2008-07-01 01:26:02 +00:00
Philip Kovacs
003785e754 Remove recently added _POSIX_C_SOURCE 200112L as it conflicts
with feature requirements for glibc when using snprintf.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1200 7f574dfc-610e-0410-a909-a81674777703
2008-06-30 00:56:01 +00:00
Nikolas Garofil
5884358016 Get rid of obsolete gethostbyaddr and getservbyport
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1199 7f574dfc-610e-0410-a909-a81674777703
2008-06-29 09:26:15 +00:00
Brenden Matthews
35e1932ad1 fix missing entries in Makefile.am
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1198 7f574dfc-610e-0410-a909-a81674777703
2008-06-29 00:27:09 +00:00
Brenden Matthews
896863e2d8 Added support for EVE-Online skill monitoring (thanks Asbjørn); fixed up/downspeedgraph segfault
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1197 7f574dfc-610e-0410-a909-a81674777703
2008-06-28 20:14:04 +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
Phil
7f09a767f0 (re)define FALSE and TRUE, non-existent on my system
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1195 7f574dfc-610e-0410-a909-a81674777703
2008-06-25 21:06:54 +00:00
Phil
28478344ab two new smapi variables and a bit of documentation improvement
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1194 7f574dfc-610e-0410-a909-a81674777703
2008-06-25 10:08:27 +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
54120a3d83 Re-arranged some if statements to reduce redundancy
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1185 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:25:37 +00:00
Kevin Lyles
02dad6a2cb Consolidated all barnum code into get_barnum
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1184 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:25:29 +00:00
Kevin Lyles
bca75f302c Consolidated all popen calls (and repeated surrounding code) into read_exec
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1183 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:25:22 +00:00
Kevin Lyles
415d927a0e Removed some redundancies between imap and pop3
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1182 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:25:16 +00:00
Kevin Lyles
9a6f79b0e2 Renamed all my_infos to the more-descriptive tmp_info
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1181 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:25:03 +00:00
Kevin Lyles
e7e874ac61 Renamed more global variables with global_ prefix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1180 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:24:56 +00:00
Kevin Lyles
e528397a02 Replaced the global text_object array and count with a text_object_list
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1179 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:24:51 +00:00
Kevin Lyles
01ca7ad07a Added comments to a couple of non-obvious lines (to me, anyway)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1178 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 09:24:39 +00:00
Kevin Lyles
d79958ac84 Split help output into a separate function
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1171 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 19:59:30 +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
Kevin Lyles
2fd832f6b0 Refactored out some redundancy in the tab conversion code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1169 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 19:57:12 +00:00
Kevin Lyles
6d4829ca83 Removed some redundancy in mpd_elapsed and mpd_length
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1168 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 19:56:30 +00:00
Kevin Lyles
9ffbf32b1d Changed addr to print "No Address" when there is no address
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1167 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 19:54:31 +00:00
Kevin Lyles
bb80900ca6 Refactored format_seconds and format_seconds_short
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1165 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 07:04:11 +00:00
Kevin Lyles
40f2fcfd7b Fixed compilation issues with --enable-testing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1164 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 06:17:53 +00:00
Nikolas Garofil
2e2765393e magic nums to defines and don't check ut_name and ut_line length because it can't be larger then UT_NAMESIZE and UT_LINESIZE
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1162 7f574dfc-610e-0410-a909-a81674777703
2008-06-17 20:44:06 +00:00
Nikolas Garofil
6472addc09 3 Bufferoverflows in a struct utmp
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1161 7f574dfc-610e-0410-a909-a81674777703
2008-06-16 20:12:39 +00:00
Philip Kovacs
d036b5de5c move audacious defs into header
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1159 7f574dfc-610e-0410-a909-a81674777703
2008-06-16 19:40:28 +00:00
Philip Kovacs
6bb956c6e0 restore audacious functionality broken by previous header spliting commits.
headers are for interfaces and typedefs, not data.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1157 7f574dfc-610e-0410-a909-a81674777703
2008-06-15 20:17:37 +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
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
Kevin Lyles
59704d5e3e Moved struct process to top.h
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1153 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 05:32:46 +00:00
Nikolas Garofil
83bf37fe85 Bugfix: execgraph scale 0-0 instead of 0-100
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1149 7f574dfc-610e-0410-a909-a81674777703
2008-06-08 20:39:07 +00:00
Nikolas Garofil
26bea66044 Bugfix: didn't work
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1143 7f574dfc-610e-0410-a909-a81674777703
2008-06-08 11:16:51 +00:00
Nikolas Garofil
a306817910 Bugfix: same text multiple times caused by if-family
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1141 7f574dfc-610e-0410-a909-a81674777703
2008-06-07 19:11:29 +00:00
Nikolas Garofil
538dbe4e91 Bugfix: DEV_NAME tried to read uninitialised mem
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1139 7f574dfc-610e-0410-a909-a81674777703
2008-06-07 12:34:07 +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
3969388b4a Bugfix: Lines printed to STDOUT with out_to_console were printed twice
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1127 7f574dfc-610e-0410-a909-a81674777703
2008-06-04 22:35:02 +00:00
Nikolas Garofil
a9624c80cc Bugfix: chars followed by backspace should not be displayed
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1126 7f574dfc-610e-0410-a909-a81674777703
2008-06-04 08:51: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
Brenden Matthews
8f8d5c1c8c * Added --quiet patch (thanks sceptik)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1123 7f574dfc-610e-0410-a909-a81674777703
2008-06-03 21:01:40 +00:00
Brenden Matthews
7ff7c1083c * Added NVIDIA Graficcard support patch (thanks meissna)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1122 7f574dfc-610e-0410-a909-a81674777703
2008-06-03 20:46:15 +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
a7da3b17bc docs; small code simplification
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1119 7f574dfc-610e-0410-a909-a81674777703
2008-05-06 22:41:28 +00:00
Brenden Matthews
c70e1ead9f updating docs, syntax highlighting, code formatting
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1118 7f574dfc-610e-0410-a909-a81674777703
2008-05-06 21:44:23 +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
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
39a00f4cfa fixed hddtemp problems as well as some other misc things
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1112 7f574dfc-610e-0410-a909-a81674777703
2008-04-22 22:54:22 +00:00
Brenden Matthews
5c01c5991e fixed crash on realloc due to use of strncpy
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1111 7f574dfc-610e-0410-a909-a81674777703
2008-04-22 21:54:49 +00:00
Brenden Matthews
1dafa537d4 add missing math.h include
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1110 7f574dfc-610e-0410-a909-a81674777703
2008-04-17 20:46:29 +00:00
Brenden Matthews
5c32bc6bc8 include stdarg.h for va_start/va_end
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1109 7f574dfc-610e-0410-a909-a81674777703
2008-04-17 20:40:53 +00:00
Brenden Matthews
feca8d2fb5 add missing include
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1107 7f574dfc-610e-0410-a909-a81674777703
2008-04-16 01:36:55 +00:00
Brenden Matthews
801cf11545 * Added patch for the following (thanks larsko):
* New $loadgraph to show a graph of load averages,
* add "show_graph_scale" option to turn off/on the showing of the
current max value for the graph,
* minor code fixes,
* update nano and vim syntax highlighting stuff.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1104 7f574dfc-610e-0410-a909-a81674777703
2008-04-13 04:10:35 +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
77f8e9bba7 define our own strndup() when its not available (thanks to Pippijn for the idea)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1101 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 19:46:09 +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
d46bcb0945 * Added patch to use mail_spool correctly (thanks Kapil)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1099 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 18:29:08 +00:00
Brenden Matthews
fa94cac75f * Fixed segfault when configuration doesn't contain TEXT block (thanks
Pippijn).

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1098 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 02:12:57 +00:00
Brenden Matthews
011f03b50d docs
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1097 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 21:37: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
798207efbf bump version; doc fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1094 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 04:59:00 +00:00
Phil
d923325773 make specifying hdd names more flexible
* the macro DEV_NAME() "removes" any leading "/dev/"
  if existing
* the only object that needs the full path is hddtemp,
  so add code there to add "/dev/" if necessary
  (can't be done via macro)
* attempt to fix also the hddtemp output, as the
  "degree"-sign seems to be inserted in utf-8 and
  printed in latin.
* hddtemp breaks the rules by inserting the unit
  itself, but as it could be either "C" or "F", this
  would lead to confusion otherwise


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1091 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 15:33:54 +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
bbdbf3b4e3 fix possible mem leak in prepare_diskio_stat, fix return value on failure
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1088 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 03:56:03 +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
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
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
Brenden Matthews
675b9fac96 mpd fix take 2
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1081 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 02:29:12 +00:00
Brenden Matthews
3efefaf182 * Fixed bug in libmpdclient that caused file descriptors to be left open.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1080 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 01:23:04 +00:00
Phil
00eb4ec9af some relocation of header includes
* conky.h must come first, because it includes config.h
  which again defines _GNU_SOURCE, which is necessary
  for strdup() & Co.
* declaring cpu_separate in top.h makes no sense, as it
  includes conky.h which declares cpu_separate itself


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1078 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 12:44:29 +00:00
Phil
a8bb0d7052 fix typo
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1077 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:49:10 +00:00
Phil
2da63063d8 make use of __attribute__
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1076 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:35:02 +00:00
Phil
5c4fee8d32 implement upwards path traversal to find fs type
* yes, this is a feature and right now there is something
  like a feature freeze.
* BUT I tested this with: /, /tmp, /dev/mapper, /dev, //,
  /mnt/, /tmp/bla (the last one was non-existent, creating
  it during runtime and even mounting tmpfs on it led to
  expected results.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1074 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:09:47 +00:00
Phil
9d4c7ed14e improve header style
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1073 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 10:13:25 +00:00
Phil
871689ef5b no 'a' modifier in C99
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1072 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 10:11:16 +00:00
Phil
d75301498a remove unused global mail_s instance
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1071 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 09:59:27 +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
a16a96911a fix register_iconv
* not sure but this looked completely wrong, as 'iconv'
  is a function.
* if iconv_cd is NULL, iconv_count is 0 and therefore
  realloc should do the same as malloc here.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1069 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 07:24:25 +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
4766f33456 don't use %Lu here, too
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1067 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 05:28:33 +00:00
Phil
42a62c0178 clear naming for the global text objects
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1066 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 05:23:45 +00:00
Phil
963bb6211c fix thread definitions
* we code against interfaces (void *f(void *))
* casting function pointers to object pointers
  is a no-no says gcc


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1065 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 05:14:35 +00:00
Phil
fea715f038 declaring info in common.c is redundant
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1064 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:55:41 +00:00
Phil
36a18732ea ISO C99 forbids named variadic macros
* also at least a single variadic argument must be
  specified, so this (absolutely perfect) code doesn't
  work
* this should fix it without changing the way the
  macros are to be called


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1063 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:47:10 +00:00
Brenden Matthews
cb653c0baa fix segfault
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1062 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:41:37 +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
59c5fe4d11 oh yeah, battery_percent too
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1054 7f574dfc-610e-0410-a909-a81674777703
2008-03-28 23:23:21 +00:00
Brenden Matthews
60985a41e7 * Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent).
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1053 7f574dfc-610e-0410-a909-a81674777703
2008-03-28 23:17:01 +00:00
Brenden Matthews
8de47c132d adding missing include to smapi code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1052 7f574dfc-610e-0410-a909-a81674777703
2008-03-27 20:01:27 +00:00
Brenden Matthews
5c9e2dcbfc minor updates; changing package naming to meet http://devmanual.gentoo.org/ebuild-writing/file-format/index.html guidelines to begin doing prereleases
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1051 7f574dfc-610e-0410-a909-a81674777703
2008-03-27 19:46:35 +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
Phil
d6953f4864 check validity of specified config
* I accidentially used wrong args when testing conky -> segfault
* reproduce using 'conky -c /this/doesnt/exist'
* code should be portable, but untested on freebsd


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1044 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 19:24:55 +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
Brenden Matthews
902ff4ca5c fixed compilation with --disable-x11
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1041 7f574dfc-610e-0410-a909-a81674777703
2008-03-23 17:26:41 +00:00
Phil
6a528f4e17 support displaying current nameservers
* gathers information from /etc/resolv.conf
* included (still commented) code to prevent reading too often,
  as I'm not sure whether reading from a real FS (not /proc or /sys)
  could generate higher load in some cases -> comments please!


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1035 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 22:58:26 +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
929f1d5878 fixed another memleak issue in smapi.c
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1032 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 19:39:43 +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
Phil
1fa2c2f809 bury dead code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1030 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:21:46 +00:00
Phil
9b222e23e9 hopefully fix spaced_print
* when printing only width bytes to buf, with
  width being set to pad_percents which itself
  is set by the user to zero, nothing is printed
* in the unlikely (but possible) case of width > size,
  this could lead to a segfault


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1029 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:18:25 +00:00
Phil
c1cb65ff6d smapi review
* rewrote some functions in src/smapi.c for more
  simplicity and less malloc/free hell
* added object cleanup in free_text_objects(),
  valgrind said it was missing
* fixed indenting in construct_text_object()
* fixed use of spaced_print() in generate_text_internal()


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1028 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:08:47 +00:00
Brenden Matthews
94bb46b868 added $execpi, new ebuild, various other misc updates
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1027 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 06:10:54 +00:00
Brenden Matthews
ed92bf7f60 small fix for newly introduced bug in non-xft font loading--thanks Phil
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1025 7f574dfc-610e-0410-a909-a81674777703
2008-03-21 23:39:38 +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
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
Brenden Matthews
46e129e7b1 * Added CRLF characters to POP3 and IMAP stuff (should play nicer with
some servers now).
	* Added preliminary support for parsing the output of external commands
	(via $execp)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1019 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 20:33:31 +00:00
Brenden Matthews
e48d5ce71e cleaning up
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1018 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 19:22:29 +00:00
Brenden Matthews
a76c4fb437 trying to fix more leaks
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1017 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 05:28:23 +00:00
Brenden Matthews
2698046591 2008-03-19
* Fixed a number of small memory leaks.
	* Performed some minor profiling on Conky; introduced
	small_text_buffer_size and large_text_buffer_size config options instead
	of just text_buffer_size.
	* Fixed some minor bugs introduced by new patches.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1014 7f574dfc-610e-0410-a909-a81674777703
2008-03-19 22:28:23 +00:00
Brenden Matthews
4ad58c9d04 adding $Id$
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1013 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 17:10:27 +00:00
Brenden Matthews
6928262418 adding missing files
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1012 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 17:09:47 +00:00
Brenden Matthews
b77da1255a updating new file props
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1011 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 17:08:22 +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
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
3cf1a29768 Refactored the top and top_mem handling to use a switch statement
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1006 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:31 +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
c96f5b1143 Removed unused macros and removed X11 options from the options string unless X11 is enabled
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1004 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:13 +00:00
Kevin Lyles
32c8f71eaa Added missing break statements and a missing freebsd kernel check
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1003 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:00 +00:00
Kevin Lyles
2a7a05342f Fixed a typo and re-added an accidentally removed line
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1002 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:00:45 +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
Kevin Lyles
e7b786d79a Fixed round_to_int to handle negative numbers properly
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1000 7f574dfc-610e-0410-a909-a81674777703
2008-02-19 03:33:12 +00:00
Kevin Lyles
e39a3ad8e4 Fixed some typos and restored a few accidentally removed lines in the recent diskio patch.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@999 7f574dfc-610e-0410-a909-a81674777703
2008-02-10 11:14:19 +00:00
Brenden Matthews
d8a95d90b0 adding license header
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@998 7f574dfc-610e-0410-a909-a81674777703
2008-02-09 02:28:31 +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