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

421 Commits

Author SHA1 Message Date
Phil Sutter
fb4b8fd005 organise text objects in a linked list
In fact, this eases code a lot. Even the ifblock handling, which was the
biggest problem of the rewrite, could be cleaned up a lot.
2008-12-15 23:03:39 +01:00
Phil Sutter
62a6c0cbac have a maximum width for all variable length mpd vars
Thanks to FreakGuard (IRC) preparing this one.
2008-12-15 19:40:54 +01:00
Phil Sutter
0f7ac0f5af simplify free_text_objects a bit 2008-12-15 19:40:45 +01:00
Phil Sutter
a98d6e06ac simplify if_existing evaluation 2008-12-15 19:40:37 +01:00
Phil Sutter
334447308f enable DEV_NAME to handle symlinks
Using a macro is not possible anymore, so have a function dev_name() do
the job. Functionality is the same as the old DEV_NAME, unless the
specified path is a symlink in which case it's being dereferenced first.

To save callers from having to free the returned string, a static local
buffer is used (effectively rendering the function non-reentrant).
2008-12-14 17:53:31 +01:00
Phil Sutter
1ddb6a88b9 use the builtin config also as a default one
This depends on fopencookie, which is linux-specific. For BSD, there is
a similar function called funopen, which can be used as a drop-in
replacement.
2008-12-14 15:45:30 +01:00
Brenden Matthews
0a5942a94b Move imap/pop3 stuff into mail.c 2008-12-14 04:22:36 +01:00
Phil Sutter
7a6ce89226 implement sample config printing support
This patch makes Conky print a sample config when being called with the
'-C' flag.

A short test showed an increase of ~10kbytes of the conky binary's size.
2008-12-12 15:38:01 +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
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
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
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
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
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
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
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
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
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
c5fcc5c6f1 handle BYE from server when idling (IMAP stuff)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1261 7f574dfc-610e-0410-a909-a81674777703
2008-09-26 21:29:02 +00:00
Brenden Matthews
1849db04e1 respect IMAP IDLE timeout period
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1260 7f574dfc-610e-0410-a909-a81674777703
2008-09-26 21:09:48 +00:00
Brenden Matthews
ae92753584 close socket before exiting thread
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1259 7f574dfc-610e-0410-a909-a81674777703
2008-09-25 18:29:04 +00:00
Brenden Matthews
3115cd8389 improving IMAP IDLE support, more
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1258 7f574dfc-610e-0410-a909-a81674777703
2008-09-25 04:01:47 +00:00
Brenden Matthews
e80ec4cc5f improving IMAP IDLE support
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1257 7f574dfc-610e-0410-a909-a81674777703
2008-09-25 03:11:24 +00:00
Brenden Matthews
c15287e798 fix small bug in imap idle stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1256 7f574dfc-610e-0410-a909-a81674777703
2008-09-24 21:04:29 +00:00
Brenden Matthews
7de6c1d061 * Introduced (buggy) support for IMAP IDLE
* Added support for MOC (the console audio player) (thanks henux)
* Added scroll step patch (thanks asto)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1252 7f574dfc-610e-0410-a909-a81674777703
2008-09-24 06:59:45 +00:00
Brenden Matthews
0c2c9dd038 * Added small patch to support negative values (such as negative disk capacity) (thanks hinokind)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1251 7f574dfc-610e-0410-a909-a81674777703
2008-09-12 05:03:38 +00:00
Brenden Matthews
6769495e10 * Improve Conky's overall interval timing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1250 7f574dfc-610e-0410-a909-a81674777703
2008-09-12 03:01:33 +00:00
Brenden Matthews
7996b9d05c oops, remove debug stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1246 7f574dfc-610e-0410-a909-a81674777703
2008-09-11 03:22:37 +00:00
Brenden Matthews
4ca31d2ce4 * Improved hddtemp support
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1245 7f574dfc-610e-0410-a909-a81674777703
2008-09-11 03:21:39 +00:00
Phil
3adb16ea40 another indentation (and some whitespace) fixup
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1242 7f574dfc-610e-0410-a909-a81674777703
2008-09-01 23:08:09 +00:00
Phil
36e34a3c8d enable max length argument for mpd_smart
* this also fixes mpd_title for changing lengths, e.g.
  ${mpd_title 2} ${mpd_title 3} ${mpd_title 4}


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1241 7f574dfc-610e-0410-a909-a81674777703
2008-09-01 22:30:54 +00:00
Phil
e873442ec5 fix indenting in construct_text_object()
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1240 7f574dfc-610e-0410-a909-a81674777703
2008-09-01 22:05:24 +00:00
Brenden Matthews
740eca5cf2 * Fix compile error when MPD support not enabled
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1236 7f574dfc-610e-0410-a909-a81674777703
2008-08-14 17:10:41 +00:00
Brenden Matthews
6cbffa71ef remove hardcoded retry stuff; put -Werror back in (who the fk removed that?)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1234 7f574dfc-610e-0410-a909-a81674777703
2008-08-05 18:43:24 +00:00
Brenden Matthews
961b70b6e6 * Add option to specify number of retries for IMAP/POP3 stuff (via -r)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1233 7f574dfc-610e-0410-a909-a81674777703
2008-08-05 18:00:30 +00:00