1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 10:05:22 +00:00
Commit Graph

798 Commits

Author SHA1 Message Date
Nikolas Garofil
20d4c4370a Fix memleaks when reloading configuration and place same parts of main() and reload_config() in a seperate function 2009-07-17 18:01:41 +02:00
Nikolas Garofil
06de5573e8 Fix a lot of unimportant memleaks caused by a CRIT_ERR 2009-07-16 20:28:23 +02:00
Nikolas Garofil
63a8c677b3 Show warnings when not running in X and vars like desktop or monitor are used 2009-07-16 00:31:22 +02:00
Nikolas Garofil
4ec308ef12 Fix freeing unregistered mem when build when running without X 2009-07-15 23:55:22 +02:00
Nikolas Garofil
cd92949e67 Fix strange effects on desktop caused by 4a14668772 2009-07-14 18:10:43 +02:00
Nikolas Garofil
cfa94a967b Fix memleaks introduced by g7bbde2b 2009-07-14 18:05:49 +02:00
Cesare Tirabassi
7bbde2be73 refactored desktop info code so that its only called on X property events; TO DO doesn't work with own_window 2009-07-14 16:57:51 +02:00
Nikolas Garofil
4a14668772 Fix a part of the memleaks in the X-related code,
if you remove all lines above TEXT in defconfig.h,
then it should run without memleaks.
2009-07-14 16:07:33 +02:00
Nikolas Garofil
c924bbe194 Fix memleaks when running with total_run_times 2009-07-14 12:47:24 +02:00
Brenden Matthews
0352b96f39 Use OBJ_THREAD() for weather, get rid of pointless return. 2009-07-13 16:11:21 -06:00
Brenden Matthews
73194dee89 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-13 15:21:42 -06:00
Brenden Matthews
74c19cf8e4 Fix minor $weather memleak. 2009-07-13 15:21:25 -06:00
Cesare Tirabassi
602edfea15 Fix compilation with --disable-own-window (sf.net #2820716) 2009-07-13 23:19:32 +02:00
Cesare Tirabassi
6793959916 weather: removed constraints of 3 locations per uri from docs; corrected possible buffer overflow 2009-07-13 11:31:20 +02:00
Brenden Matthews
e1011c0d13 Refactor some of the new weather code, fix docs.
I moved the weather stuff into its own thread, and also fixed up some
abuse of <simplelist> formatting throughout the docs.  Hopefully we can
keep things a little more uniform from now on.
2009-07-12 23:31:57 -06:00
Cesare Tirabassi
d3f1e6288c Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 21:18:28 +02:00
Nikolas Garofil
d6525d8790 Fix minor memleak 2009-07-12 20:01:31 +02:00
Nikolas Garofil
dc9e6436cc fix: segfault when TEXT is missing and build with x11 2009-07-12 19:42:10 +02:00
Cesare Tirabassi
14c30feaea Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 18:46:07 +02:00
Nikolas Garofil
f6472cbbb5 Fix memleak when build with X11 but turned off in config 2009-07-12 14:52:58 +02:00
Cesare Tirabassi
e11015528e free info.x11.desktop.name in free_text_objects() 2009-07-12 11:58:34 +02:00
Cesare Tirabassi
df17a54301 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 11:45:33 +02:00
Nikolas Garofil
9e6fb9c2fe Fix building without math but with X11 2009-07-12 00:51:17 +02:00
Nikolas Garofil
f4fd1648e9 Fix: reading mem after its freed (current_config) 2009-07-12 00:05:53 +02:00
Cesare Tirabassi
88ae603cf5 Add support for $desktop, $desktop_number and $desktop_name
Should work with any window manager that supports the
freedesktop.org Window Manager Specification
(see http://www.freedesktop.org/wiki/Specifications/wm-spec).

I have tested succesfully with openbox but some more testing with other
wm would be needed!

Support is built-in; if it is not acceptable to loose cpu cycles for this
at every conky refresh step than it should be conditionally compiled.
2009-07-11 10:50:02 +02:00
Brenden Matthews
2fa5f97edb A whole bunch of changes, mostly Lua related.
Improved Lua API (lua_read_parse has been removed in favour of the
conky_parse() Lua API call).  The docs have been improved to reflect the
recent Lua API stuff as well.  Introduced new Lua Cairo and Imlib2
bindings, which require the tolua++ tool.  Fixed some other
miscellaneous doc related things.
2009-07-09 22:47:41 -06:00
Nikolas Garofil
9065d1f422 Added support for swapfree 2009-07-09 20:12:52 +02:00
Nikolas Garofil
3659131192 Fix memleaks in CRIT_ERR 2009-07-08 15:51:08 +02:00
Nikolas Garofil
553528cb3d Fix memleak triggered by (and others) 2009-07-08 00:35:20 +02:00
Cesare Tirabassi
18ecbef1ae weather: lets make this compliant to prehistoric standards and at the same time working ... 2009-07-07 18:08:54 +02:00
Nikolas Garofil
ce9d9e3298 fix minor memleak when closing conky 2009-07-07 17:27:57 +02:00
Nikolas Garofil
1070c60768 Fixed mixed code and declarations (not allowed in some C standards, like C90) 2009-07-07 15:38:13 +02:00
Cesare Tirabassi
1171ab38a5 Added support for $weather (experimental).
Download, parse and display METAR data from the NWS.

icao must be a valid icao for the required location
(see for instance https://pilotweb.nas.faa.gov/qryhtml/icao/).

data_type must be one of the following:

last_update   : display the date (yyyy/mm/dd) and time (UTC)
	        of the last update.
temperature_C : display air temperature in degree Celsius.
temperature_F : display air temperature in degree Fahrenheit.
cloud_cover   : display the highest cloud cover status.
pressure      : display air pressure in millibar.
wind_speed    : display wind speed in km/hour.
wind_dir      : display wind direction.
wind_dir_DEG  : display compass wind direction.
humidity      : display relative humidity in %.
weather       : display any relevant weather event (rain, snow, etc.).

delay_in_minutes (optional, default 30) cannot be lower than 30 min.
Up to 3 stations can be simultaneously queried.

Use --enable-weather to compile this in.
2009-07-07 00:20:12 +02:00
Brenden Matthews
52c68c094c Improved parsing of graph arguments.
Removed "log"|"normal" arguments in	favour of -l switch.
2009-07-04 21:43:45 -06:00
Brenden Matthews
14d90ad7d1 Fix some minor leaky code. 2009-07-04 21:13:00 -06:00
Brenden Matthews
e2caa58923 Remove newline with comment only lines in TEXT. 2009-07-04 20:57:41 -06:00
Nils Schweinsberg
aaca08fc97 Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils). 2009-07-02 00:36:37 -06:00
Phil Sutter
775d591a68 fix a few memleaks 2009-06-22 02:00:11 +02:00
Phil Sutter
867a842b3f fix for testing and debug on FreeBSD
(Probably not complete yet)
2009-06-22 02:00:11 +02:00
Phil Sutter
912ed67d03 fix conf_cookie for FreeBSD
While here, also clean up the #ifdef mess created
around the whole config output support.
2009-06-22 01:59:26 +02:00
Phil Sutter
c6a5a060cf Use the internal process list for if_running on Linux 2009-06-20 01:46:59 +02: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
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
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
Nikolas Garofil
f2176e6f54 Added support for blink 2009-06-13 23:52:41 +02: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
0108d14e68 Added 2009-06-13 01:48:54 +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
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
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
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
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
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
815dcf872d Update command opts docs. 2009-06-06 18:10:20 -06:00
Brenden Matthews
e5abd481cd Fix some stupidity in 33754ecebe. 2009-06-06 17:42:02 -06:00
Brenden Matthews
33754ecebe 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.
2009-06-06 17:25:34 -06:00
Brenden Matthews
8e81d4e816 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-06-06 12:20:13 -06:00
Pavel Labath
aa68da1ce6 Fix bug in template code.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-06 12:18:46 -06:00
Nikolas Garofil
e4934b9f08 Let wireless_link_bar work in shell 2009-06-06 20:04:20 +02:00
Phil Sutter
3170b5191a 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.
2009-06-06 18:18:31 +02:00
Phil Sutter
26ecdcf562 Revert "Bugfix: $addr and $addrs couldn't find ip's before the first update."
This reverts commit 8ffb8b238d.

Surely, there is a better solution for that.
2009-06-06 18:14:06 +02:00
Nikolas Garofil
8ffb8b238d 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.
2009-06-06 17:41:51 +02:00
Brenden Matthews
22733a0b4a Fix 6994caa18b.
Introduced a regression with commit
6994caa18b by getting too happy with
OpenMP.
2009-06-06 03:56:22 -06:00
Brenden Matthews
384a41cb6e Unbreak $combine. 2009-06-06 03:04:36 -06:00
Brenden Matthews
4b35fe5db4 s/IMLIB2/Imlib2/g 2009-06-06 02:32:51 -06:00
Pavel Labath
c76b7f577d A couple more fixes for the template machinery
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-05 21:07:32 -06:00
Phil Sutter
20e4e19f83 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.
2009-06-04 22:51:25 +02:00
Nikolas Garofil
f3fd389ea0 read_tcp werkt maar moet nog stresstesten ondergaan 2009-06-04 19:39:18 +02:00
Nikolas Garofil
25a6fca902 Let entropy_bar, mpd_bar and apcupsd_loadbar work in shell 2009-06-04 18:45:58 +02:00
Brenden Matthews
ff57d1a85e Make Imlib2 global cache flushing actually work. 2009-06-03 13:31:16 -06:00
Brenden Matthews
904354f93b Added some better cache control options for Imlib2. 2009-06-03 13:24:53 -06:00
Nikolas Garofil
3656bced46 some c standards only allow initialisations at the start of a function 2009-06-03 19:17:45 +02:00
Nikolas Garofil
1085ec48cc Make it possible to compile without C99 2009-06-03 18:24:48 +02:00
Nikolas Garofil
5388fc33f6 Let lua_bar work in shell 2009-06-03 17:58:00 +02:00
Brenden Matthews
6994caa18b Minor refactoring for template code. 2009-06-02 14:51:46 -06:00
Pavel Labath
44ead331cd 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>
2009-06-02 14:48:59 -06:00
Pavel Labath
8540821323 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>
2009-06-02 14:48:59 -06:00
Nikolas Garofil
abf515d901 Let execibar work in shell 2009-06-02 21:23:00 +02:00
Nikolas Garofil
7807d369ad Let battery_bar work in shell 2009-06-02 19:16:21 +02:00
Nikolas Garofil
1a9d0bdccd Let fs_bar and fs_bar_free work in shell 2009-06-01 16:09:34 +02:00
Nikolas Garofil
faa9086168 Let cpubar work in shell 2009-06-01 15:07:24 +02:00
Nikolas Garofil
0b8b6ccbae Let swapbar work in shell 2009-06-01 13:48:04 +02:00
Nikolas Garofil
bfc791f08b Let membar work in shell 2009-06-01 12:19:25 +02:00
Pavel Labath
0cb91fc3db Fix mouse click coordinates forwarded to the desktop window
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-31 22:18:12 -06:00
Nikolas Garofil
c3df719716 Created a function to call bars in shell (not only execbar)
TODO use this function in other places
2009-06-01 02:23:47 +02:00
Nikolas Garofil
01bc44aaf6 Don't check if output to X is requested when compiled without X 2009-05-31 16:29:12 +02:00
Brenden Matthews
295203dd4c Fix an issue with reload_config()? 2009-05-30 21:06:49 -06:00
Alexander Graf
0632693be7 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>
2009-05-30 16:21:42 -06:00
Brenden Matthews
a31efb7fbe Fix default sizing for bars/graphs/gauges.
Conflicts:

	src/conky.c
2009-05-29 14:05:10 -06:00
Nikos Ntarmos
8553e33763 Include bsd/bsd.h on kFreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-29 10:57:17 -06:00
Brenden Matthews
650c39b602 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.
2009-05-28 21:27:56 -06:00
Nikos Ntarmos
b51d06d178 Gracefully exit from main_loop()
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:56 -06:00
Nikos Ntarmos
c03655bdfa free(3) previously strdup(3)'ed disp
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:56 -06:00
Nikos Ntarmos
613a440fdc XDestroyRegion(3) only for non-NULL regions
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Nikos Ntarmos
dc2a8e1de8 free(3) strdup(3)'ed templates array
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Brenden Matthews
ed5dbc02bb Simplify graph gradient stuff. 2009-05-26 11:44:16 -06:00
Brenden Matthews
d65c33146e OMPtimize the gradient stuff. 2009-05-26 03:14:52 -06:00
Brenden Matthews
35a72f5a95 Fix some minor graph related bugs. 2009-05-24 23:16:36 -06:00
Brenden Matthews
d03df4a367 Allow ~/... and $HOME/... paths for more stuff. 2009-05-24 22:33:47 -06:00
Brenden Matthews
c92272a943 Fix segfault on reload. 2009-05-24 17:49:50 -06:00
Brenden Matthews
4a08fab0e6 Fix clipping, enable alpha for imlib2. 2009-05-24 16:52:48 -06:00
Brenden Matthews
4ec728fa42 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.
2009-05-24 15:53:32 -06:00
Brenden Matthews
ee9364522a Some OpenMP related fixes.
Fixes for commit 9c331dce49.
2009-05-24 14:02:33 -06:00
Joe Myre
7b7d038035 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 14:24:07 -05:00
Brenden Matthews
06044bf7e5 Try and fix weirdness with hwmon/i2c/platform options. 2009-05-24 13:07:27 -06:00
Joe Myre
9c331dce49 omped it up 2009-05-24 10:41:35 -05:00
Brenden Matthews
bf2d9de16a Add OpenMP to list of compiled in features (for -v). 2009-05-23 21:18:06 -06:00
Brenden Matthews
396494d4a0 Fixed parsing of $hwmon? 2009-05-23 21:01:59 -06:00
Brenden Matthews
c9951a3bac Better checking for cases when inotify doesn't work. 2009-05-22 12:48:46 -06:00
Brenden Matthews
0dc7041e6f Fix other parsing bug with hwmon. 2009-05-22 12:30:09 -06:00
Brenden Matthews
1779ef3efd Fix (possibly overkill) hwmon parsing bug. 2009-05-22 12:29:41 -06:00
Brenden Matthews
011e52650b Added inotify support for reloading Lua scripts automagically. 2009-05-19 22:49:42 -06:00
Brenden Matthews
dd5fbeb41b Improve reload_config() window destruction/creation. 2009-05-19 21:34:43 -06:00
Brenden Matthews
baaba76678 Handle inotify stuff a bit better. 2009-05-19 20:35:02 -06:00
Brenden Matthews
0d3726d352 Oops, remove printf(). 2009-05-19 20:23:44 -06:00
Brenden Matthews
ba0eb5d85d Inotify support.
Added inotify support to reload the config when modified automatically
on systems that support it
2009-05-19 17:14:34 -06:00
Filipe Ferreira
5552f4135e Patch to fix rounding error with CPU values. 2009-05-17 23:30:10 -06:00
Brenden Matthews
6477962dc9 Added support for rending images by way of IMLIB2. 2009-05-17 23:11:22 -06:00
Brenden Matthews
ddcc8ceb70 Merge branch 'master' into imlib2
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
2009-05-17 22:11:40 -06:00
Brenden Matthews
6abbbd50f0 Merge branch 'lua'
Conflicts:
	src/specials.c
2009-05-17 22:00:44 -06:00
Brenden Matthews
e7bf480d48 Fix null pointer boog in $top stuff. 2009-05-17 21:59:05 -06:00
Brenden Matthews
694b736f64 Merge branch 'master' into lua 2009-05-17 20:58:13 -06:00
Nikolas Garofil
914af765e4 execbar can now be used in the shell even when compiled with x11 support 2009-05-17 13:38:51 +02:00
Brenden Matthews
353f0b6ad7 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.
2009-05-16 23:47:02 -06:00
Brenden Matthews
1dc7731f6d Merge branch 'master' into imlib2 2009-05-16 22:24:45 -06:00
Brenden Matthews
41e46ffe41 Oops, remove debug printf(). 2009-05-16 22:24:22 -06:00
Brenden Matthews
d26b946b7b Merge branch 'master' into imlib2 2009-05-16 18:37:11 -06:00
Brenden Matthews
72d15db78a Merge branch 'master' into lua 2009-05-16 18:37:04 -06:00
Brenden Matthews
344fa8498d Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-16 18:28:19 -06:00
Brenden Matthews
d642a3f659 Fixed comment stuff for real this time? 2009-05-16 18:28:04 -06:00
Nikolas Garofil
94d75cc494 add missing var 2009-05-17 01:33:43 +02:00
Brenden Matthews
f2a69f37ad Merge branch 'master' into lua 2009-05-16 17:08:50 -06:00
Brenden Matthews
debf4ec597 Remove unused var. 2009-05-16 17:08:37 -06:00
Brenden Matthews
dd606eb5ae Merge branch 'master' of git.omp.am:/home/omp/git/conky into lua
Conflicts:
	src/specials.c
2009-05-16 17:05:30 -06:00
Brenden Matthews
b661dbf5a7 More lua stuff. 2009-05-16 17:04:26 -06:00
Nikolas Garofil
dae78fb875 Execbar can now also be used on the shell 2009-05-17 00:37:22 +02:00
Brenden Matthews
69718f5b75 Oh my, parse lua output. 2009-05-16 15:06:29 -06:00
Brenden Matthews
72d2aad026 Merge branch 'master' into lua 2009-05-16 14:55:24 -06:00