Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 20:44:56 +00:00
Code Issues Releases Activity
1,168 Commits 5 Branches 46 Tags 22 MiB
60fc99ef71
Commit Graph

1168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenden Matthews
e6ad00d26c Conky 1.5.1 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1092 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 04:11:14 +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
Phil
81e424177b fix two typos in docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1089 7f574dfc-610e-0410-a909-a81674777703
 2008-03-31 04:02:33 +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
70b9a1bf2e finally update our debugging CFLAGS 
* drop -Wmissing-prototypes and -Wmissing-declarations,
  as not every function needs a prototype
* in fact the code builds using these flags, at least for
  my setup (--enable-smapi --enable-wlan --enable-rss
  --with-x --disable-portmon)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1079 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 12:55:36 +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
3135d8e672 update ChangeLog 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1075 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 11:13:13 +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
Brenden Matthews
de53544017 moving debug cflags below other stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1061 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 04:09:09 +00:00
Brenden Matthews
fd2854c53e made configure output better; fixed small error in conky.conf 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1060 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 04:02:12 +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
Phil
bc6a75e44f record my recent changes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1050 7f574dfc-610e-0410-a909-a81674777703
 2008-03-26 01:23:56 +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
4ba940b550 corrected indenting 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1046 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 20:13:04 +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