1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Commit Graph

1658 Commits

Author SHA1 Message Date
Brenden Matthews
11d5286a40 Some Imlib2 refactoring. 2009-06-14 21:05:11 -06:00
Ole Christian Tvedt
5f31a052bb Fixed $if_mpd_playing. Would not return false after true.
Previously, is_playing was never returned to 0 even if a song stopped
playing.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 20:07:59 -06:00
Ole Christian Tvedt
9048af353a Read MPD connection data from environment.
Most MPD clients read the MPD_HOST and MPD_PORT
environment variables. Now, conky will too.

MPD_HOST can be either "hostname" or "password@hostname".

If a user specifies a host in the configuration, the
password set in MPD_HOST will be ignored. This is to
prevent the password from being sent to the wrong host.

In other words, if the host is specified in the conky
configuration, the password must be too (if there is
one).

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 20:07:59 -06:00
Brenden Matthews
8b9f0b6851 Fixup some imlib2 flush interval stuff. 2009-06-14 16:12:12 -06:00
Ole Christian Tvedt
07cfe08dd3 Fixed docs for upspeed and downspeed (not necessarily in KiB any longer).
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 16:00:32 -06:00
Brenden Matthews
b78650d29a Approach the per-image cache control another way. 2009-06-14 14:50:30 -06:00
Brenden Matthews
be75e07c9d Increase backwards compat for border_margin.
Even though border_margin is deprecated, we'll set border_inner_margin
anyway so lazy people won't complain too much.
2009-06-14 12:24:18 -06:00
Lassi Selander
b4f88ff319 Fix XMMS2 related crash (sf.net #2806111 and #2805310, thanks Lassi). 2009-06-14 12:03:50 -06:00
Brenden Matthews
c001f73f72 Update changelog for 23e89dca08. 2009-06-13 17:47:32 -06:00
Ole Christian Tvedt
23e89dca08 Added own_window_type panel
The panel type reserves space along the edge of the
screen, just like regular DE panels, taskbars and the
like. I have tested it for several hours now with lots
of different settings, and it seems to be working fine.

Works especially well with alignment top_??? or
bottom_??? and single-line output. Something like
this:

  own_window yes
  own_window_type panel

  alignment bottom_left
  maximum_width 1680
  minimum_size 1680
  gap_x 0
  gap_y 0

  stippled_borders 1
  draw_borders yes

  update_interval 3.0

  TEXT
  $nodename $tab $freq_g ${color grey}GHz$color $tab $memperc% ${color grey}RAM$color $tab $cpu% ${color grey}CPU $tab etc...etc...$alignr${time %F %R}

The line after TEXT is supposed to be on one line,
just in case some channel has messed it up.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-13 17:46:09 -06:00
Pavel Labath
9e976d9dc4 Better parsing of process names containing funky chars 2009-06-14 00:02:50 +02:00
Nikolas Garofil
f2176e6f54 Added support for blink 2009-06-13 23:52:41 +02:00
Brenden Matthews
182ca0c57c Show count of variables/config settings. 2009-06-13 15:05:06 -06:00
Brenden Matthews
9ce2c8ba07 Fix regression in Lua inotify stuff. 2009-06-13 13:40:27 -06:00
Ole Christian Tvedt
74340eaa9c A mainly cosmetic update.
One useless "if (own_window)" check was removed. It is already inside another
identical check, and so will always evaluate to true.

One strncmp against the word "dock" was limited to four characters instead of
seven, for consistency with the other checks in the configuration parsing code.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-13 13:21:38 -06:00
Brenden Matthews
26d7547c1e Ugh...finish ca340d2643. 2009-06-13 13:19:40 -06:00
Brenden Matthews
ca340d2643 Fix inotify segfault (sf.net #2804886).
Fix segfault due to bad checking of return values for inotify code
(sf.net #2804886)
2009-06-13 13:17:18 -06:00
Nikolas Garofil
1933df5f31 full text last commit: Added to_bytes 2009-06-13 01:59:04 +02:00
Nikolas Garofil
0108d14e68 Added 2009-06-13 01:48:54 +02:00
Pavel Labath
c5e319ec74 Changelog... 2009-06-12 19:54:30 +02:00
Pavel Labath
c0d1c313e9 Support for per-task I/O statistics - $top_io
Basically, I just added three new process properties (io_read, io_write, io_perc - representing
the amount of I/O done by the process during the update interval) and $top_io, that sorts
processes based on io_perc.

Atm, it's completely #ifdef'd, since it requires kernel support. But that creates some wierd
looking syntax at some places, so it may be better to remove some ifdefs.  It even may be
possible to completely remove the ifdefs (ie. convert them to #ifdef linux) since the code will
compile just fine even if the kernel doesn't support I/O accounting. I'll leave that for someone
else to decide.
2009-06-12 19:39:45 +02:00
Pavel Labath
71f6880b01 Just moving an obviously misplaced comment 2009-06-12 19:21:34 +02:00
Brenden Matthews
d114bcf58a Pixel perfect borders? 2009-06-11 22:35:19 -06:00
Brenden Matthews
e45db41a9d Added border_inner_margin and border_outer_margin.
The border_margin config option is now deprecated.  This also resolves
an issue with weird border_margin values causing X to crash.
2009-06-11 19:07:21 -06:00
Brenden Matthews
357901e6f2 Apply fs stat changes to fs_free_perc also (thanks Cesare). 2009-06-11 01:28:11 -06:00
Brenden Matthews
8e55089537 Revert b6e691e8ac, fix original problem. 2009-06-10 14:13:17 -06:00
Brenden Matthews
eb722bf30d Revert "Clarify fs free stats."
This reverts commit da65a4bcf8.
2009-06-10 14:09:34 -06:00
Brenden Matthews
1571bb1aad Fix regression with loading of non-Xft fonts (sf.net #2804324). 2009-06-10 14:08:39 -06:00
Brenden Matthews
da65a4bcf8 Clarify fs free stats. 2009-06-10 11:31:24 -06:00
Pavel Labath
7cbc8dc13f Include conky_no_x11.conf in the tarballs
otherwise, building with --enable-config-output --disable-x11 fails.
2009-06-10 17:57:41 +02:00
Brenden Matthews
15a270fa13 Changeloggin' 2009-06-09 19:06:01 -06:00
Brenden Matthews
2469b9bea9 Fixed a regression with font rendering.
Fixed a regression which causes fonts to not be rendered properly with
certain types of windows.
2009-06-09 18:39:26 -06:00
Brenden Matthews
4b1728316e Update changelog. 2009-06-09 14:57:36 -06:00
Pavel Labath
6586d47813 Fix comments in TEXT section
When a '#' is found in TEXT, section remove_comments() is called.  However, that function doesn't
limit itself to removing that particular comment. Instead, it greedily removes all "comments" from
the string, including those in ${color $abcdef} constructs. This, obviously, makes a mess of
things.

Solution: I added a new function, remove_comment(), that only removes the current comment.

Note: Atm, the function doesn't delete the newline, since that was the current behavior, and is
the natural one for the config section. However, for the TEXT it seems better to delete the \n
too, to avoid blank lines.

Note2: this also fixes the bug in strfold(), which incorectly copied the string, truncating it by
one byte.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-09 14:56:19 -06:00
Vincent Breitmoser
f3aa025872 Added format_human_readable option (sf.net #2803345, thanks Vincent). 2009-06-09 14:52:18 -06:00
Nikolas Garofil
c392152d3a extra displayoptions for battery_short and make sure full isn't handled as unknown 2009-06-08 21:15:18 +02:00
Nikos Ntarmos
3361596592 Include sys/param.h for FreeBSD
We need this on FreeBSD as some of the constants used in ucred.h and
mount.h are defined there.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-08 13:05:20 -06:00
Nikos Ntarmos
d934d11e48 Check for deleted and not expunged emails
This should fix bug #2802529. I've also revamped the X-Mozilla-Status
header handling which was kind of fishy till now.

Disclaimer: I have no mbox folders around to test it.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-08 13:05:20 -06:00
Nikos Ntarmos
8476bb08b5 Lua's pkg-config name is lua-5.1 on FreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-08 13:05:19 -06:00
Brenden Matthews
cec8535e87 Rearrange changelog a bit. 2009-06-07 21:49:10 -06:00
Brenden Matthews
e995be8cf8 Strip control chars from README. 2009-06-07 21:45:39 -06:00
Brenden Matthews
6ebfffe542 Fix check_docs.py to work with cleaned up XML. 2009-06-07 21:23:35 -06:00
Nikolas Garofil
25e46ca341 Fix compiling without X11 2009-06-07 18:41:10 +02:00
Nikolas Garofil
b11f2466af need_to_load_fonts shouldn't be used without X11 2009-06-07 15:01:48 +02:00
Nikolas Garofil
3a9bb96865 Changelog update 2009-06-07 11:58:05 +02:00
Nikolas Garofil
bcbeb402c0 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-06-07 11:41:29 +02:00
Nikolas Garofil
06c0dbf8b4 Changelog updated 2009-06-07 10:56:22 +02:00
Brenden Matthews
a9c8ae4145 Make device argument optional for most net stats.
We can use DEFAULTNETDEV for more than just up/downspeedgraph.
2009-06-06 22:56:29 -06:00
Brenden Matthews
00e559aef8 reload_config() fix, fix default net graph args.
Closing the X display on reload caused some weirdness.  We can just
leave it open between reloads.  For whatever reason we had a macro
inside quotes for the default net device.
2009-06-06 22:53:40 -06:00
Brenden Matthews
17d5310981 Fix error in docs regarding graph arguments. 2009-06-06 21:09:26 -06:00