Nikos Ntarmos [Mon, 8 Jun 2009 15:09:28 +0000 (18:09 +0300)]
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>
Nikos Ntarmos [Mon, 8 Jun 2009 16:35:41 +0000 (19:35 +0300)]
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>
Nikos Ntarmos [Mon, 8 Jun 2009 16:35:40 +0000 (19:35 +0300)]
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>
Brenden Matthews [Mon, 8 Jun 2009 03:49:10 +0000 (21:49 -0600)]
Rearrange changelog a bit.
Brenden Matthews [Mon, 8 Jun 2009 03:45:39 +0000 (21:45 -0600)]
Strip control chars from README.
Brenden Matthews [Mon, 8 Jun 2009 03:23:35 +0000 (21:23 -0600)]
Fix check_docs.py to work with cleaned up XML.
Nikolas Garofil [Sun, 7 Jun 2009 16:41:10 +0000 (18:41 +0200)]
Fix compiling without X11
Nikolas Garofil [Sun, 7 Jun 2009 13:01:48 +0000 (15:01 +0200)]
need_to_load_fonts shouldn't be used without X11
Nikolas Garofil [Sun, 7 Jun 2009 09:58:05 +0000 (11:58 +0200)]
Changelog update
Nikolas Garofil [Sun, 7 Jun 2009 09:41:29 +0000 (11:41 +0200)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Sun, 7 Jun 2009 08:56:22 +0000 (10:56 +0200)]
Changelog updated
Brenden Matthews [Sun, 7 Jun 2009 04:56:29 +0000 (22:56 -0600)]
Make device argument optional for most net stats.
We can use DEFAULTNETDEV for more than just up/downspeedgraph.
Brenden Matthews [Sun, 7 Jun 2009 04:53:40 +0000 (22:53 -0600)]
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.
Brenden Matthews [Sun, 7 Jun 2009 03:09:26 +0000 (21:09 -0600)]
Fix error in docs regarding graph arguments.
Brenden Matthews [Sun, 7 Jun 2009 00:12:25 +0000 (18:12 -0600)]
Add note about -a opts, bump doc date.
Brenden Matthews [Sun, 7 Jun 2009 00:10:20 +0000 (18:10 -0600)]
Update command opts docs.
Brenden Matthews [Sun, 7 Jun 2009 00:03:22 +0000 (18:03 -0600)]
Doc correction.
Brenden Matthews [Sat, 6 Jun 2009 23:42:02 +0000 (17:42 -0600)]
Brenden Matthews [Sat, 6 Jun 2009 23:25:34 +0000 (17:25 -0600)]
Let lua_graph behave more like other graphs.
Changed llua_getinteger() to llua_getnumber() returning a double, so
that you can use floating point values in graphs etc. Lua graph will
scale like other graphs (except execgraph) by default now, and you can
manually set a scale with the scale argument.
Brenden Matthews [Sat, 6 Jun 2009 22:56:35 +0000 (16:56 -0600)]
Add tidying/sorting to check_docs.py.
Brenden Matthews [Sat, 6 Jun 2009 18:20:13 +0000 (12:20 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Pavel Labath [Sat, 6 Jun 2009 18:18:46 +0000 (12:18 -0600)]
Fix bug in template code.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikolas Garofil [Sat, 6 Jun 2009 18:04:20 +0000 (20:04 +0200)]
Let wireless_link_bar work in shell
Phil Sutter [Sat, 6 Jun 2009 16:18:31 +0000 (18:18 +0200)]
Add a better fix for the $addr update problem
In general, initialising last_update_time to next_update_time upon
startup doesn't make sense, as some update functions check for the
distance between the two being higher than a given epsilon to prevent
updating too often. This means that they won't trigger when
update_stuff() is being run for the first time.
Phil Sutter [Sat, 6 Jun 2009 16:14:06 +0000 (18:14 +0200)]
Revert "Bugfix: $addr and $addrs couldn't find ip's before the first update."
This reverts commit
8ffb8b238dfd3614afc582c0d5537e684219d039.
Surely, there is a better solution for that.
Nikolas Garofil [Sat, 6 Jun 2009 15:41:51 +0000 (17:41 +0200)]
Bugfix: $addr and $addrs couldn't find ip's before the first update.
When you started "$updates|${addr eth0}" displayed "0|No Address",
after the first update you got something normal like "1|192.168.0.1"
This patch should fix this.
Brenden Matthews [Sat, 6 Jun 2009 09:56:22 +0000 (03:56 -0600)]
Brenden Matthews [Sat, 6 Jun 2009 09:04:36 +0000 (03:04 -0600)]
Unbreak $combine.
Brenden Matthews [Sat, 6 Jun 2009 08:47:29 +0000 (02:47 -0600)]
More s/IMLIB2/Imlib2/g
Brenden Matthews [Sat, 6 Jun 2009 08:32:51 +0000 (02:32 -0600)]
s/IMLIB2/Imlib2/g
Brenden Matthews [Sat, 6 Jun 2009 08:13:42 +0000 (02:13 -0600)]
Apparently some people want more than 64 fonts.
Pavel Labath [Thu, 4 Jun 2009 15:55:45 +0000 (17:55 +0200)]
A couple more fixes for the template machinery
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Phil Sutter [Thu, 4 Jun 2009 20:51:25 +0000 (22:51 +0200)]
add entropy_perc
There is no rounding done, so e.g. 3.6% get 3%. But double casting and
calling round_to_int() is just too ugly.
Phil Sutter [Thu, 4 Jun 2009 20:00:52 +0000 (22:00 +0200)]
branch conditionally
In case of undefined MATH there were empty branches which could lead to
decreased performance in totally unoptimised code. ;)
Phil Sutter [Sun, 31 May 2009 16:40:07 +0000 (18:40 +0200)]
clarify what the preprocessor define does here
Nikolas Garofil [Thu, 4 Jun 2009 17:39:18 +0000 (19:39 +0200)]
read_tcp werkt maar moet nog stresstesten ondergaan
Nikolas Garofil [Thu, 4 Jun 2009 16:45:58 +0000 (18:45 +0200)]
Let entropy_bar, mpd_bar and apcupsd_loadbar work in shell
Brenden Matthews [Wed, 3 Jun 2009 19:31:16 +0000 (13:31 -0600)]
Make Imlib2 global cache flushing actually work.
Brenden Matthews [Wed, 3 Jun 2009 19:24:53 +0000 (13:24 -0600)]
Added some better cache control options for Imlib2.
Nikolas Garofil [Wed, 3 Jun 2009 17:17:45 +0000 (19:17 +0200)]
some c standards only allow initialisations at the start of a function
Nikolas Garofil [Wed, 3 Jun 2009 16:24:48 +0000 (18:24 +0200)]
Make it possible to compile without C99
Nikolas Garofil [Wed, 3 Jun 2009 15:58:00 +0000 (17:58 +0200)]
Let lua_bar work in shell
Toni Spets [Wed, 3 Jun 2009 06:16:23 +0000 (09:16 +0300)]
Merge OpenBSD patches from ports
Brenden Matthews [Tue, 2 Jun 2009 20:51:46 +0000 (14:51 -0600)]
Minor refactoring for template code.
Pavel Labath [Tue, 2 Jun 2009 14:54:41 +0000 (16:54 +0200)]
Make templates work with --disable-x11
part of the template-handling code was in #ifdef X11, which caused conky to dump core when
compiled without x11.
as a bonus, I changed tests !=' ' to !isspace in two places as it was causing strange effects
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Pavel Labath [Tue, 2 Jun 2009 13:47:30 +0000 (15:47 +0200)]
Fix core dumps while handling templates
Conky would dump core when encountering templates with no parameters (both $templateX and
${templateX}) and when the line contained improperly nested {}.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Tue, 2 Jun 2009 19:44:45 +0000 (13:44 -0600)]
Enable Lua by default.
Nikolas Garofil [Tue, 2 Jun 2009 19:23:00 +0000 (21:23 +0200)]
Let execibar work in shell
Nikolas Garofil [Tue, 2 Jun 2009 17:16:21 +0000 (19:16 +0200)]
Let battery_bar work in shell
Nikolas Garofil [Mon, 1 Jun 2009 14:09:34 +0000 (16:09 +0200)]
Let fs_bar and fs_bar_free work in shell
Nikolas Garofil [Mon, 1 Jun 2009 13:07:24 +0000 (15:07 +0200)]
Let cpubar work in shell
Nikolas Garofil [Mon, 1 Jun 2009 11:48:04 +0000 (13:48 +0200)]
Let swapbar work in shell
Nikolas Garofil [Mon, 1 Jun 2009 10:19:25 +0000 (12:19 +0200)]
Let membar work in shell
Pavel Labath [Sun, 31 May 2009 14:46:05 +0000 (16:46 +0200)]
Fix mouse click coordinates forwarded to the desktop window
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikolas Garofil [Mon, 1 Jun 2009 00:23:47 +0000 (02:23 +0200)]
Created a function to call bars in shell (not only execbar)
TODO use this function in other places
Nikolas Garofil [Sun, 31 May 2009 14:48:16 +0000 (16:48 +0200)]
Make sure that no X11 stuff is in the binary when not requested
Nikolas Garofil [Sun, 31 May 2009 14:29:12 +0000 (16:29 +0200)]
Don't check if output to X is requested when compiled without X
Brenden Matthews [Sun, 31 May 2009 03:06:49 +0000 (21:06 -0600)]
Fix an issue with reload_config()?
Phil Sutter [Sun, 31 May 2009 01:36:12 +0000 (03:36 +0200)]
Fix hostname resolution for mpd_host
When getaddrinfo() returns an IPv6 address, connect() fails since mpd
does not support IPv6. Reproduced by adding the name "localhost" to the
"::1" entry in /etc/hosts.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Alexander Graf [Sat, 30 May 2009 20:20:16 +0000 (22:20 +0200)]
Fix if_existing
The if_existing with 2 arguments checking whether a file contains a specified
string did not work. This is fixed by this patch.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Sat, 30 May 2009 05:31:03 +0000 (23:31 -0600)]
Be more graceful when handling IMAP problems.
Brenden Matthews [Fri, 29 May 2009 20:05:10 +0000 (14:05 -0600)]
Fix default sizing for bars/graphs/gauges.
Conflicts:
src/conky.c
Nikos Ntarmos [Fri, 29 May 2009 15:19:50 +0000 (18:19 +0300)]
conf_cookie is there for kFreeBSD as well
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Fri, 29 May 2009 15:12:12 +0000 (18:12 +0300)]
Include bsd/bsd.h on kFreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Fri, 29 May 2009 03:22:04 +0000 (21:22 -0600)]
Compilation fixes, fix a segfault on shutdown.
There was a missing 'break' in a switch/case statement which caused a
segfault on shutdown when using $if_up.
Nikos Ntarmos [Thu, 28 May 2009 13:50:19 +0000 (16:50 +0300)]
Gracefully exit from main_loop()
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 28 May 2009 13:48:58 +0000 (16:48 +0300)]
free(3) previously strdup(3)'ed disp
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 28 May 2009 13:46:23 +0000 (16:46 +0300)]
XDestroyRegion(3) only for non-NULL regions
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 28 May 2009 13:45:15 +0000 (16:45 +0300)]
XCloseDisplay(3) on re-init_X11()
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 28 May 2009 13:43:15 +0000 (16:43 +0300)]
No need to check for loop variable value
If the first for-loop succedds in finding the desired interface, it will return to its caller. The only way we drop to the second for-loop is if nothing is found thus far, so no need to check for (i == 16).
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 28 May 2009 13:42:27 +0000 (16:42 +0300)]
free(3) previously strndup(3)'ed diskio.dev
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 28 May 2009 13:41:48 +0000 (16:41 +0300)]
free(3) strdup(3)'ed templates array
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 28 May 2009 13:40:59 +0000 (16:40 +0300)]
free(3) previously strndup(3)'ed netstats.dev
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Tue, 26 May 2009 17:44:16 +0000 (11:44 -0600)]
Simplify graph gradient stuff.
Brenden Matthews [Tue, 26 May 2009 09:14:52 +0000 (03:14 -0600)]
OMPtimize the gradient stuff.
Brenden Matthews [Mon, 25 May 2009 05:31:35 +0000 (23:31 -0600)]
Let the graphs be bigger.
Brenden Matthews [Mon, 25 May 2009 05:16:36 +0000 (23:16 -0600)]
Fix some minor graph related bugs.
Brenden Matthews [Mon, 25 May 2009 04:33:47 +0000 (22:33 -0600)]
Allow ~/... and $HOME/... paths for more stuff.
Brenden Matthews [Mon, 25 May 2009 00:15:05 +0000 (18:15 -0600)]
Actually fix hddtemp parsing.
Brenden Matthews [Mon, 25 May 2009 00:02:46 +0000 (18:02 -0600)]
Revert "Fix array bounds problem in hddtemp code."
This reverts commit
d0de7cbd630442f27d58d84c04ea65bb6f3d81d9.
Brenden Matthews [Sun, 24 May 2009 23:49:50 +0000 (17:49 -0600)]
Fix segfault on reload.
Brenden Matthews [Sun, 24 May 2009 23:09:38 +0000 (17:09 -0600)]
Fix array bounds problem in hddtemp code.
Brenden Matthews [Sun, 24 May 2009 22:52:48 +0000 (16:52 -0600)]
Fix clipping, enable alpha for imlib2.
Brenden Matthews [Sun, 24 May 2009 21:53:32 +0000 (15:53 -0600)]
Added fancy new 'temperature gradients' feature.
See docs for more details on 'temperature gradients', which can be
turned on with the -t switch on graphs. Also improved parsing of
options with $execgraph and $execigraph, but may cause some breakage.
Brenden Matthews [Sun, 24 May 2009 20:02:33 +0000 (14:02 -0600)]
Some OpenMP related fixes.
Fixes for commit
9c331dce494881b54db75e1e93a4ce6414a61f20.
Brenden Matthews [Sun, 24 May 2009 19:48:10 +0000 (13:48 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sun, 24 May 2009 19:47:44 +0000 (13:47 -0600)]
Clip out imlib2 buffer properly.
Joe Myre [Sun, 24 May 2009 19:24:07 +0000 (14:24 -0500)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sun, 24 May 2009 19:07:03 +0000 (13:07 -0600)]
Try and fix weirdness with hwmon/i2c/platform options.
Joe Myre [Sun, 24 May 2009 15:41:35 +0000 (10:41 -0500)]
omped it up
Brenden Matthews [Sun, 24 May 2009 03:17:35 +0000 (21:17 -0600)]
Add OpenMP to list of compiled in features (for -v).
Nikos Ntarmos [Fri, 22 May 2009 19:20:10 +0000 (22:20 +0300)]
Delay checking for want_apcupsd.
The if-clause checking for the host operating system being Linux may
change the value of want_apcupsd. Delay checking for its value until
after that.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Fri, 22 May 2009 19:08:18 +0000 (22:08 +0300)]
Allow src/apcupsd.c to compile cleanly on FreeBSD.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 14 May 2009 22:52:18 +0000 (01:52 +0300)]
Integrate FreeBSD diskio support.
This diff moves Linux-specific parts of diskio.c into linux.c and uses
the remaining diskio functions to correctly implement this functionality
for FreeBSD. It also hooks diskio.c to the FreeBSD build.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 14 May 2009 22:52:58 +0000 (01:52 +0300)]
Revert "Disable config-output on FreeBSD."
This reverts commit
a54fa6a8f4e5356f3a2f24be6f7d3613349f0095.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 14 May 2009 22:39:54 +0000 (01:39 +0300)]
Remove unused variables and rearrange includes.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Thu, 14 May 2009 22:36:50 +0000 (01:36 +0300)]
conf_cookie valid only for Linux.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Sun, 24 May 2009 03:01:59 +0000 (21:01 -0600)]
Fixed parsing of $hwmon?
Brenden Matthews [Fri, 22 May 2009 18:48:10 +0000 (12:48 -0600)]
Better checking for cases when inotify doesn't work.
Brenden Matthews [Fri, 22 May 2009 18:30:09 +0000 (12:30 -0600)]
Fix other parsing bug with hwmon.