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.
Brenden Matthews [Fri, 22 May 2009 18:29:41 +0000 (12:29 -0600)]
Fix (possibly overkill) hwmon parsing bug.
Brenden Matthews [Fri, 22 May 2009 17:23:05 +0000 (11:23 -0600)]
Fix imlib2 cache setting.
Brenden Matthews [Fri, 22 May 2009 07:39:38 +0000 (01:39 -0600)]
Fix backwards width/height args for image drawing.
Brenden Matthews [Fri, 22 May 2009 07:18:07 +0000 (01:18 -0600)]
Use original image size when not specified.
Brenden Matthews [Fri, 22 May 2009 05:03:06 +0000 (23:03 -0600)]
Bump to 1.7.2.
Brenden Matthews [Wed, 20 May 2009 17:53:43 +0000 (11:53 -0600)]
Oops, null pointer.
Brenden Matthews [Wed, 20 May 2009 04:56:33 +0000 (22:56 -0600)]
Oh yeah, make sure it compiles without inotify.
Also removed BSD licensing stuff that pertains to old torsmo code.
Brenden Matthews [Wed, 20 May 2009 04:51:50 +0000 (22:51 -0600)]
Add message to show the Lua script was reloaded.
Brenden Matthews [Wed, 20 May 2009 04:49:42 +0000 (22:49 -0600)]
Added inotify support for reloading Lua scripts automagically.
Brenden Matthews [Wed, 20 May 2009 03:34:43 +0000 (21:34 -0600)]
Improve reload_config() window destruction/creation.
Brenden Matthews [Wed, 20 May 2009 02:35:02 +0000 (20:35 -0600)]
Handle inotify stuff a bit better.
Brenden Matthews [Wed, 20 May 2009 02:23:44 +0000 (20:23 -0600)]
Oops, remove printf().
Brenden Matthews [Tue, 19 May 2009 23:14:34 +0000 (17:14 -0600)]
Inotify support.
Added inotify support to reload the config when modified automatically
on systems that support it
Brenden Matthews [Mon, 18 May 2009 21:49:40 +0000 (15:49 -0600)]
Don't need a prev ptr in this list.
Filipe Ferreira [Mon, 18 May 2009 05:30:10 +0000 (23:30 -0600)]
Patch to fix rounding error with CPU values.
Brenden Matthews [Mon, 18 May 2009 05:11:22 +0000 (23:11 -0600)]
Added support for rending images by way of IMLIB2.
Brenden Matthews [Mon, 18 May 2009 04:11:40 +0000 (22:11 -0600)]
Merge branch 'master' into imlib2
Conflicts:
extras/nano/conky.nanorc
extras/vim/syntax/conkyrc.vim
Brenden Matthews [Mon, 18 May 2009 04:03:37 +0000 (22:03 -0600)]
Added support for the Lua programming language.
Changelog update.
Brenden Matthews [Mon, 18 May 2009 04:00:44 +0000 (22:00 -0600)]
Merge branch 'lua'
Conflicts:
src/specials.c
Brenden Matthews [Mon, 18 May 2009 03:59:05 +0000 (21:59 -0600)]
Fix null pointer boog in $top stuff.
Brenden Matthews [Mon, 18 May 2009 02:58:13 +0000 (20:58 -0600)]
Merge branch 'master' into lua
Nikolas Garofil [Sun, 17 May 2009 11:38:51 +0000 (13:38 +0200)]
execbar can now be used in the shell even when compiled with x11 support
Brenden Matthews [Sun, 17 May 2009 05:47:02 +0000 (23:47 -0600)]
More work on imlib2 stuff.
Seems to be some rendering corruption which I'm not sure the reason for,
but other than that I think it works okay.
Brenden Matthews [Sun, 17 May 2009 04:24:45 +0000 (22:24 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Sun, 17 May 2009 04:24:22 +0000 (22:24 -0600)]
Oops, remove debug printf().
Brenden Matthews [Sun, 17 May 2009 00:37:11 +0000 (18:37 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Sun, 17 May 2009 00:37:04 +0000 (18:37 -0600)]
Merge branch 'master' into lua
Brenden Matthews [Sun, 17 May 2009 00:28:19 +0000 (18:28 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sun, 17 May 2009 00:28:04 +0000 (18:28 -0600)]
Fixed comment stuff for real this time?
Nikolas Garofil [Sat, 16 May 2009 23:33:43 +0000 (01:33 +0200)]
add missing var
Brenden Matthews [Sat, 16 May 2009 23:19:15 +0000 (17:19 -0600)]
Fix docs.
Brenden Matthews [Sat, 16 May 2009 23:08:50 +0000 (17:08 -0600)]
Merge branch 'master' into lua
Brenden Matthews [Sat, 16 May 2009 23:08:37 +0000 (17:08 -0600)]
Remove unused var.
Brenden Matthews [Sat, 16 May 2009 23:05:30 +0000 (17:05 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky into lua
Conflicts:
src/specials.c
Brenden Matthews [Sat, 16 May 2009 23:04:26 +0000 (17:04 -0600)]
More lua stuff.
Nikolas Garofil [Sat, 16 May 2009 22:37:22 +0000 (00:37 +0200)]
Execbar can now also be used on the shell
Brenden Matthews [Sat, 16 May 2009 21:06:29 +0000 (15:06 -0600)]
Oh my, parse lua output.
Brenden Matthews [Sat, 16 May 2009 20:55:24 +0000 (14:55 -0600)]
Merge branch 'master' into lua
Brenden Matthews [Sat, 16 May 2009 20:55:05 +0000 (14:55 -0600)]
Couple minor lua changes.
Toni Spets [Sat, 16 May 2009 17:57:43 +0000 (20:57 +0300)]
Moved the Lua function calling to it's own function
Toni Spets [Sat, 16 May 2009 17:37:53 +0000 (20:37 +0300)]
Specifically ask for an integer from Lua for percentage
Toni Spets [Sat, 16 May 2009 17:32:47 +0000 (20:32 +0300)]
Updated AUTHORS to match Lua stuff, also updated my email
Nikolas Garofil [Sat, 16 May 2009 13:57:01 +0000 (15:57 +0200)]
Use a builtin config without X11-support when compiled without it
also, make sure X isn't initialised when compiled without x11-support
Nikolas Garofil [Sat, 16 May 2009 11:14:45 +0000 (13:14 +0200)]
Bugfix: Segfault when starting with no configfile.