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

455 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Brenden Matthews
35b4ed3aff 2008-01-05
* Applied some more submitted patches:
        1) Add long forms of (most of) the command-line options.
        2) Added an option (top_cpu_separate) that emulates top's "separate
        cpus" option.  Processor usage is shown as a percentage of a
        single processor on your system, instead of a percentage
        of all processors combined.
        3) Adds a parameter (time) to top and top_mem that will show the
        cumulative CPU time of a process.
        4) Simplified integer rounding.
        5) Fixed the window width when a goto is used.
        6) Fixed the window width when an offset is used.
        (thanks Kevin Lyles).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@994 7f574dfc-610e-0410-a909-a81674777703
2008-01-06 01:35:14 +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
Philip Kovacs
dd572d3d24 Fix compilation error with --disable-x11 (bug #1830373).
Bump doc stylesheet from 4.3 to 4.4.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@987 7f574dfc-610e-0410-a909-a81674777703
2007-11-14 21:41:08 +00:00
Philip Kovacs
73e578ee19 fix mpd_smart bug #1822773
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@984 7f574dfc-610e-0410-a909-a81674777703
2007-10-31 22:49:09 +00:00
Philip Kovacs
723771f304 add system config file to -v output
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@982 7f574dfc-610e-0410-a909-a81674777703
2007-10-23 22:06:02 +00:00
Philip Kovacs
c08db2aba5 Externalize default config file: /conky/conky.conf
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@981 7f574dfc-610e-0410-a909-a81674777703
2007-10-23 21:52:11 +00:00
Philip Kovacs
7c07529932 Remove ${tail /var/log/Xorg.0.log} from default text
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@979 7f574dfc-610e-0410-a909-a81674777703
2007-10-21 23:36:53 +00:00
Philip Kovacs
03d011678b Initialize music_player_interval so built-in .conkyrc actual works.
Lower timed_thread minimum timing interval from 50 usecs to 10 usecs.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@978 7f574dfc-610e-0410-a909-a81674777703
2007-10-21 18:04:53 +00:00
Philip Kovacs
8d81c9a6d7 conky 1.4.8
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@974 7f574dfc-610e-0410-a909-a81674777703
2007-10-18 21:12:27 +00:00
Philip Kovacs
441cedd2ad struct alignment patch #1812924
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@973 7f574dfc-610e-0410-a909-a81674777703
2007-10-17 20:31:27 +00:00
Philip Kovacs
0a7cb47470 fix uninitialized var warning
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@970 7f574dfc-610e-0410-a909-a81674777703
2007-10-03 01:43:40 +00:00
Brenden Matthews
58c1eb36c3 Multiple mailbox patch (thanks Ben Kibbey)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@969 7f574dfc-610e-0410-a909-a81674777703
2007-10-02 23:57:41 +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
Toni Spets
60f4ea4fb7 OpenBSD cleanups, remove unsupported printf flag and fix non-dynamic cpu_freq
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@964 7f574dfc-610e-0410-a909-a81674777703
2007-09-17 04:40:13 +00:00
Brenden Matthews
965031790a * Zero out imap and pop3 stuff when the connection fails
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@960 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 04:36:09 +00:00
Philip Kovacs
62f8ff9be7 mpd_interval -> music_player_interval
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@957 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 04:26:08 +00:00
Brenden Matthews
87e4c550e4 * Fixed some minor memory leaks associated with SIGUSR1
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@956 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 03:58:22 +00:00
Brenden Matthews
16ea4f6587 * Improved performance slightly
* Added mpd_interval config option to specify an update interval for the
    mpd thread

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@954 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 03:02:33 +00:00
Philip Kovacs
6c052dae9b Fix timed thread race condition, seen esp. on new kernel scheduler (cfs).
Fix $audacious_title not being displayed when no length argument indicated.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@943 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 21:35:30 +00:00
Brenden Matthews
12baf6c0b4 some small fixes for mpd stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@935 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 02:05:02 +00:00
Brenden Matthews
9b71a6cd7b * Fixed issue with SIGPIPE and mpd
* Updated COPYING (with more clarifications)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@927 7f574dfc-610e-0410-a909-a81674777703
2007-08-27 20:26:58 +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
f72122bd06 svn merge -rHEAD:918 .
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@921 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 19:09:33 +00:00
Toni Spets
f296609096 really apply the hwmon patch (tracker item 1650894)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@919 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 17:33:41 +00:00
Philip Kovacs
1b509f9357 platform stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@918 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 00:56:42 +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
dc676df556 That one neither
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@916 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:17:53 +00:00
Toni Spets
73869df9af Whoops. Didn't see that coming.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@915 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:16:44 +00:00
Toni Spets
116ff7b661 Removed more unused stuff from openbsd.c
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@914 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:14:06 +00:00
Toni Spets
fc7c9b5fae Removed ACPI battery code for OpenBSD
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@912 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:06:30 +00:00
Toni Spets
8370c19025 Remove deprecated linkstatus completely from conky source
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@909 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 20:51:36 +00:00
Toni Spets
5dbf418c2d Fixed wireless documentation. Fixed wireless quality display when its zero. Added copyright notes.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@907 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 20:38:58 +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
Toni Spets
772619e99a Probably fixed wireless spacer
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@903 7f574dfc-610e-0410-a909-a81674777703
2007-08-08 08:59:44 +00:00
Toni Spets
6b553ec7de Added spacer for wireless variables. Fixed some tabs. Disabled old wireless code.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@900 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 23:18:02 +00:00
Toni Spets
602998c06d Added wireless_link_qual_perc. Cleaned unused variables from wireless code. Updated prss source. Had 6 hours of sleep.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@898 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 22:05:06 +00:00
Toni Spets
a3e81ae59f RSS was not really disabled when it was supposed to be. Experimental wireless support.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@896 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 12:51:08 +00:00
Toni Spets
3bc35afa30 Fixed major issues with ACPI batteries
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@894 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 06:05:19 +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
7793867d6b * Updated to libmpdclient 0.13.0
* Added post_21_kernel config param to specify kernels 2.6.22 and newer
    so i2c works properly


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@890 7f574dfc-610e-0410-a909-a81674777703
2007-08-05 22:16:26 +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
906e7e8bfd Removed the first new line in RSS titles
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@888 7f574dfc-610e-0410-a909-a81674777703
2007-07-19 16:32:00 +00:00
Philip Kovacs
c559001bab Fix PID display, patch #1753934. thanks sohalt.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@885 7f574dfc-610e-0410-a909-a81674777703
2007-07-15 18:11:35 +00:00
Philip Kovacs
6c95750cc6 Right-justify top/top_mem vars (pid/cpu/mem} so they align on the decimal.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@881 7f574dfc-610e-0410-a909-a81674777703
2007-06-23 00:29:54 +00:00
Toni Spets
204886795a Fixed crash when RSS feed item didn't have title
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@879 7f574dfc-610e-0410-a909-a81674777703
2007-06-06 14:19:09 +00:00
Philip Kovacs
02960c2c7f fix scan_font nonsense
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@878 7f574dfc-610e-0410-a909-a81674777703
2007-06-05 19:02:51 +00:00
Philip Kovacs
a2cfdd4c67 fix scan_font nonsense
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@877 7f574dfc-610e-0410-a909-a81674777703
2007-06-05 18:54:39 +00:00
Toni Spets
2c8426dcc7 Again fixed things in the RSS code. Removed possible trailing \n from RSS data. Hopefully fixed iconv memory freeing problems. Graps had non-freed malloced data.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@876 7f574dfc-610e-0410-a909-a81674777703
2007-06-03 11:20:47 +00:00
Toni Spets
3872bafeef Fixed memory leaks found with valgrind
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@875 7f574dfc-610e-0410-a909-a81674777703
2007-06-03 09:18:54 +00:00
Toni Spets
b6d1465635 RSS updates: more flexible output and updated prss code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@873 7f574dfc-610e-0410-a909-a81674777703
2007-06-02 08:17:33 +00:00
Toni Spets
3fdb6b7027 New initial RSS code. Parser written by Sisu (Mikko Sysikaski) with more portable libxml2. It is still unstable and in development.\n\nNote: automake and autoconf scripts needs to be updated to support libxml2\!
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@868 7f574dfc-610e-0410-a909-a81674777703
2007-06-01 10:42:57 +00:00
Roman Bogorodskiy
85fdf4bf7e - Remove debug printf's from RSS code
- Don't eat last char of the RSS title


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@865 7f574dfc-610e-0410-a909-a81674777703
2007-05-06 12:33:38 +00:00
Roman Bogorodskiy
3b03ca2a76 Experimental RSS code.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@864 7f574dfc-610e-0410-a909-a81674777703
2007-05-06 12:17:13 +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
Philip Kovacs
60b842df90 added color[0-9] variable patch (thanks jieryn)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@858 7f574dfc-610e-0410-a909-a81674777703
2007-04-25 17:22:06 +00:00
Brenden Matthews
fc72692cc7 * Added if_existing patch for string matching (thanks cromka)
* Added hwmon support (thanks flitsch)
* Some xmms2 updates (thanks sleipner)
* Added $battery_percent and $battery_bar (thanks akash)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@855 7f574dfc-610e-0410-a909-a81674777703
2007-04-06 06:11:53 +00:00
Brenden Matthews
3d9d260f4c Added if_empty patch (thanks Erik)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@854 7f574dfc-610e-0410-a909-a81674777703
2007-04-06 05:01:48 +00:00
Roman Bogorodskiy
a38ecf286d Not sure if a right fix, but no segault at least.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@851 7f574dfc-610e-0410-a909-a81674777703
2007-03-28 18:43:53 +00:00
Roman Bogorodskiy
164839a299 Fix build on all platforms that doesn't have memrchr() function,
not just workaround it for OpenBSD only.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@850 7f574dfc-610e-0410-a909-a81674777703
2007-03-28 17:53:40 +00:00
Brenden Matthews
0ab1d8b96a * OpenBSD support added to Conky (thanks hifi)
* Updated mboxscan stuff (thanks calmar)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@848 7f574dfc-610e-0410-a909-a81674777703
2007-03-01 01:43:43 +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
70add5d09d include missing mboxscan.h;
fix signedness warnings


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@832 7f574dfc-610e-0410-a909-a81674777703
2007-02-14 19:45:18 +00:00
Brenden Matthews
45acd5c3b9 * Added buffer_text_size option to change the size of the buffer for
things like $exec, $tail, et cetera
* Added $mboxscan which lets you display the Subject and From fields
from recent email in an mbox file
* Disambiguated (is that a word?) $cpu docs


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@831 7f574dfc-610e-0410-a909-a81674777703
2007-02-12 01:03:10 +00:00
Philip Kovacs
c268b7130e claen up warnings
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@826 7f574dfc-610e-0410-a909-a81674777703
2007-01-08 01:27:30 +00:00
Philip Kovacs
75a8cfc091 fix warnings
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@824 7f574dfc-610e-0410-a909-a81674777703
2006-12-29 23:38:57 +00:00
Brenden Matthews
5cfe6b093d head/tail rewrite patch
diskio read/write patch
added check for zlib to configure script

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@823 7f574dfc-610e-0410-a909-a81674777703
2006-12-29 23:14:31 +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