1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00
Commit Graph

1303 Commits

Author SHA1 Message Date
Phil Sutter
c84b485178 update the default config along with the syntax files 2008-12-12 15:32:16 +01:00
Phil Sutter
19a6e7c925 rewrite tcp-portmon hooks
Global variables belonging to tcp-portmon are now separated from
conky.c, cleaning up struct information and struct text_object a bit.
2008-12-11 15:28:21 +01:00
Phil Sutter
4b89c3b17d make semantics of custom strndup() comply with glibc
From strdup(3):
| If s is longer than n, only n characters are copied, and a
| terminating null byte ('\0') is added.

So allocate at most n+1 bytes and make sure the last one is zero, as
strncpy() doesn't add it itself.

So in fact to allow a maximum space for string dup of 23, strndup() has
to be called like this:
| dup = strndup(src, 23 - 1);

FIXME: Find the critical points in code this change touches and make
sure the invocation there is correct.
2008-12-11 15:28:21 +01:00
Phil Sutter
f96e77c91b rewrite template engine completely
Two things that pissed me off about the old one:
* only limited support for nesting templates
* totally broken output when using conditionals inside a template

The later one was the hard one to fix. ;)
It requires to already have the full text substituted before the text
objects are being created from it. Generating only the contained objects
broke, because the conditionals got wrong offsets to jump to.

After that was fixed, full nesting support is realised by simply
repeating the replacement until no more template objects are found.
2008-12-11 15:28:21 +01:00
Brenden Matthews
5a69344055 Fix call to timed_thread_test(). 2008-12-09 16:37:24 -07: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
a40cfd9702 Add an option to timed_thread_test() to not wait for the interval period (so that IMAP IDLE works better) 2008-12-09 01:37:59 -07:00
Brenden Matthews
12b6e3ffef Merge branch 'master' of git.omp.am:/home/omp/git/conky 2008-12-08 23:15:20 -07:00
Brenden Matthews
16c3c2e27a Update READMEs. 2008-12-08 23:14:46 -07:00
Brenden Matthews
9684e6b36f Removing svn ebuild, changing svn references to git. 2008-12-08 23:12:58 -07:00
Philip Kovacs
6fa3e19d4b added additional ignore files for later libtool versions. 2008-12-08 23:49:35 -05:00
Brenden Matthews
422b979d46 We need the README for autmake to work correctly. 2008-12-08 21:26:12 -07:00
Phil Sutter
aa363ec3b3 update changelog 2008-12-08 16:19:35 +01:00
Phil Sutter
ffbac491d2 drop docs of dropped objects
All the Fahrenheit specific objects have been removed due to
f5259295cf, remove their documentation
also.
2008-12-08 16:11:39 +01:00
Phil Sutter
f7fa9c4139 remove the automatically created README from git
This is causing trouble, as after each build switching branches is
impossible until the local modifications of README are being committed.
Since the whole file will be created when compiling conky, we can safely
ignore it (like with doc/conky.1).
2008-12-08 16:03:46 +01:00
Phil Sutter
bb079848b1 rewrite hddtemp 2008-12-08 16:01:15 +01:00
Phil Sutter
a92601f069 fix for renamed DEBUG2 macro (again) 2008-12-08 15:05:29 +01:00
Phil Sutter
92bdce5d1a set conky in dock mode to be withdrawn
Withdrawn windows are those you get from applications supporting the
'-w' flag, like e.g. gkrellm or all those sweet WindowMaker dockapps
(wmcpu and Co.). In Fluxbox, these windows are drawn into the slit. Most
other window managers put them into their "taskbar", AFAIK.
This patch makes Conky act exactly the same if the following settings
are selected:

| own_window yes
| own_window_type dock
2008-12-08 01:45:12 +01:00
Phil Sutter
f5259295cf make unit of all temperatures selectable
This introduces a new configuration variable called "temperature_unit",
specifying the unit of all temperature sensors. To achieve this, each
object outputting a temperature has to call temp_print() like so:
| temp_print(p, p_max_size, <temp val as double>, <unit of val>);
to specify the input temperature unit, either one of the constants
TEMP_CELSIUS or TEMP_FAHRENHEIT.
2008-12-08 01:45:12 +01:00
Phil Sutter
1a4e4b3b69 fix runtime debugging macros
Sadly, configure --enable-debug defines the macro DEBUG which conflicts
with the level1 debugging output macro. Rename them to DBG() and DBG2().
2008-12-08 01:42:19 +01:00
Brenden Matthews
e2c49531f3 Limit $battery_percent to 100 (bug 2145006) 2008-12-07 15:58:40 -07:00
Brenden Matthews
39ba74a590 Don't put unit with hddtemp values for consistency (bug 2133107) 2008-12-07 15:54:40 -07:00
Brenden Matthews
1fcbecf4af Fix broken $execbar (bug 2133709) 2008-12-07 15:49:04 -07:00
Brenden Matthews
5626eade7f Fix last 'fix' 2008-12-07 15:44:10 -07:00
Brenden Matthews
9345e2bb8f Allow more than 9 CPUs for CPU stats (bug 2155500) 2008-12-07 15:34:46 -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
6aa61e6dff Update README, fix file perms for changelog2html.py. 2008-12-07 01:35:56 -07:00
Brenden Matthews
2135d7ca4b Regenerating docs. 2008-12-07 01:28:36 -07:00
Brenden Matthews
112772e361 Add some more debug messages to imap/pop3 stuff, refactor some pop3
code, add filename:lineno to DEBUG() macro.
2008-12-07 01:08:27 -07:00
Brenden Matthews
8f9d5a6d4a Updating .gitignore 2008-12-07 00:38:50 -07:00
Erik Waling
51fe4fa419 Fetch volume through Audacious API (thanks Erik) 2008-12-07 00:38:06 -07:00
Cesare Tirabassi
b64203b547 Fix for buffer overflow with $execi (thanks Cesare) 2008-12-07 00:31:53 -07:00
Brenden Matthews
bb87a917f6 Re-generating docs 2008-12-07 00:25:59 -07:00
Lassi Selander
20b2d2f464 Adds a variable if_xmms2_connected to hide objects when xmms2d is not
running (thanks Lassi)
2008-12-07 00:22:05 -07:00
Pavol Rusnak
e4e9cf4311 Fix for wrong usage of strncat (thanks Pavol) 2008-12-07 00:18:34 -07:00
Brenden Matthews
f7281c192a Updating changelog (and testing ciabot). 2008-12-06 23:39:16 -07:00
Brenden Matthews
726934998d First commit to fresh new hip git repo for Conky. 2008-12-06 23:03:24 -07:00
Phil
d1b139f8e2 since DEV_NAME() is used when calling, this check is needless
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1274 7f574dfc-610e-0410-a909-a81674777703
2008-12-06 19:10:27 +00:00
Phil
c4b98f0762 Add debugging output at runtime
The new command line option '-D' ('--debug') increases debugging level by one.
For debugging output a user could be interested in, use the macros DEBUG() and
DEBUG2(). Functionality is equal to the ERR() macro. DEBUG2() prints stuff only
if debugging level is greater one, which means that '--debug' has been
specified more than once. This patch also includes usage of the macros for the
new template object (as debugging syntax errors in templates is one thing a
user potentially needs to do).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1273 7f574dfc-610e-0410-a909-a81674777703
2008-11-30 20:53:20 +00:00
Phil
a89bef1b0e update README and manpage
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1272 7f574dfc-610e-0410-a909-a81674777703
2008-11-29 13:03:50 +00:00
Phil
ecb3004c0f improve template support
* handle escaped characters in parameters to the template object, too
* add samples to the documentation
* do some code cleanup by outsourcing the string substitution into it's
  own function


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1271 7f574dfc-610e-0410-a909-a81674777703
2008-11-29 13:02:42 +00:00
Phil
ce5eb880e7 add support for template objects
Basically you can define a template like this:

| template0 \1:\n   ${fs_free \2} / ${fs_used \2}

and use it later like this:

| ${template0 root /}
| ${template0 boot /boot}

which is exactly the same as the following:

| root:
|    ${fs_free /} / ${fs_used /}
| boot:
|    ${fs_free /boot} / ${fs_used /boot}

hope you like it, I do already. :)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1270 7f574dfc-610e-0410-a909-a81674777703
2008-11-29 01:34:54 +00:00
Phil
820e0d24c4 fix my own fix
The second parameter is optional, so have conky act accordingly. This time I
tested using either two or three params and it worked flawlessly.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1269 7f574dfc-610e-0410-a909-a81674777703
2008-11-04 23:25:28 +00:00
Phil
f44003e07c fix a potential segfault
* happened when passing wrong arguments to ${scroll}, particularly with only
  one instead of the mandatory two unsigned ints
* as it's not clear whether %n will change the value returned by sscanf or not,
  use a solution that works in both situations (%n incrementing the return
  value or not)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1268 7f574dfc-610e-0410-a909-a81674777703
2008-11-04 21:42:48 +00:00
Brenden Matthews
4be537a020 * Added $if_mpd_playing patch (thanks tarpman)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1267 7f574dfc-610e-0410-a909-a81674777703
2008-10-08 11:44:27 +00:00
Brenden Matthews
1ab4b8ec51 * Applied OpenBSD patches
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1266 7f574dfc-610e-0410-a909-a81674777703
2008-10-08 11:41:16 +00:00
Brenden Matthews
06954506f1 fix small typo in docs (thanks gaston)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1265 7f574dfc-610e-0410-a909-a81674777703
2008-10-01 18:16:16 +00:00
Brenden Matthews
e5fd6f8027 add openbsd.h to EXTRA_DIST
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1264 7f574dfc-610e-0410-a909-a81674777703
2008-10-01 18:12:02 +00:00
Brenden Matthews
bb74efed2e remove quality debugging code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1263 7f574dfc-610e-0410-a909-a81674777703
2008-09-29 01:38:57 +00:00