1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Commit Graph

40 Commits

Author SHA1 Message Date
Brenden Matthews
bb8723dd36
Add toluapp subtree (#712)
* First commit!

* Import to git

* Droping down CMake requirement

* Corrected installation of libraries

* Adding travis build

* Updated cmake macros

* Fixed find package

* Updated travis hook

* Updated travis hook

* Patch to support Lua 5.3.

* Fix Lua header include directives in tolua++.h

Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers.

As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble.

But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers.

Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first.

See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195

* Remove email notifications.

* Update travis build.

* Build shared and static libs.

* Patch toluapp to support Lua 5.3.

With this change, support for Lua 5.1 is dropped.

This resolve #116.

* Add some comments to clarify the toluapp handling.

* Add minor sonar fix.
2018-12-20 15:18:51 -05:00
Nikolas Garofil
4d5db325d9 Fix problems found when fixing docker (#575)
* Require at least glib-2.36 (from 03/2013) to remove deprecated g_type_init()

* Fix empty continuation line in Dockerfile

* Require at least libmicrohttpd 0.9.25 (from 09/2012) to replace deprecated MHD_create_response_from_data()

* fix versioncheck libmicrohttpd

* Missing char for null-terminator in print_v6addrs()

* safe_asprintf to fix /proc/subdir bufferoverflows

There is no max length of /proc/subdir, increasing the value of /proc/sys/kernel/pid_max is one way this can happen

* Fix conversion constant c++ string to variable char array

* Fix strncpy using unrelated MPD_BUFFER_MAX_LENGTH

* Use strncpy instead of strcpy in eve.cc

* Use strncpy instead of strcpy in libmpdclient.cc

* move safe_asprintf back and use ostreams in proc.cc to make sonarcloud happy
2018-08-07 09:38:36 -04:00
Brenden Matthews
124b3dfaa4
Added destroy methods to some functions to fix memory leaks. (#535) 2018-07-08 20:51:44 -04:00
Brenden Matthews
eebc8c653b
Add formatting/static analysis (#486)
* Reform source with clang-format.

Rules applied with:
    $ find . -iname *.h -o -iname *.cc | xargs clang-format \
        -style=file -i -fallback-style=google

* Add clang-format and analyze to build.

Based on the excellent work at: https://github.com/ttroy50/cmake-examples

* Clean up CMake stuff on macOS.

* Remove vim/emacs modelines.

* Update copyright dates.

* Build fixes.

* Build fixes.

* Build fixes.

* Build fixes.

* Build fixes.

* Build fixes.
2018-05-12 12:03:00 -04:00
marguerite
89f9a6bdf1 respect LIB_INSTALL_DIR 2016-01-07 14:42:14 +08:00
Miroslav Lichvar
2231588b28 Use LIB_SUFFIX when installing libraries
This is needed on systems with /usr/lib64.
2015-11-18 09:08:06 +01:00
Vincent Cheng
b8082ca1fa Avoid clobbering CFLAGS/CXXFLAGS set by user 2015-07-07 01:38:12 -07:00
Oliver Wilkerson
935280e36c Added cairo blending modes to support libcairo-1.10.0 2013-10-31 18:12:57 -05:00
Jochen Keil
56b5a7eeca Wrapper for drawing images with imlib2 and cairo
One problem is, that tolua/lua does not handle plain data pointers
properly. Therefore something like

local surface = cairo_image_surface_create_for_data(
    imlib_image_get_data_for_reading_only(), ..

will fail using the lua bindings. Hence this wrapper, which adds
a function which be used to draw an imlib image to a cairo surface.

This also addresses another issue, drawing images with a transparent
background (e.g. gifs or pngs) to the cairo surface properly. Apparently
the image format of imlib is incompatible to cairos which uses
pre-multiplied data. This is also explained in the cairo documentation.
A fix for this issue is to blend the image with another alpha mask to
get the correct values. The code and explanation for this was taken from

  http://lists.cairographics.org/archives/cairo/2008-March/013492.html

Executive Summary: This wrapper function can load (transparent) images
(e.g. gif or png) from a file by using imlib and draw them on a cairo
surface.
2013-06-08 12:09:35 +02:00
Jochen Keil
550d644e6c Add rsvg bindings to cmake build framework 2013-05-22 22:39:41 +02:00
Jochen Keil
bec61e922c Include header file for helper functions
Also add function declarations
2013-05-22 22:38:17 +02:00
Jochen Keil
dee71f4eb2 Functions for creating and accessing Dimension/Position structs 2013-05-22 22:37:05 +02:00
Jochen Keil
32c60685ba Wrapper functions for {creat,destroy}ing an rsvg handle
This wrapper functions should facilitate the handling of rsvg handles.
Especially unrefing with g_object_unref does not seem to work properly
using the lua bindings.
2013-05-22 22:35:39 +02:00
Jochen Keil
118332aa00 Inline typedefs 2013-05-22 22:31:57 +02:00
Jochen Keil
4920cb71be Remove unused GIO/GdkPixbuf interface
Conky Lua only uses cairo, so that's everything we need to keep.
Anything else is just a source for trouble.
2013-05-22 22:31:57 +02:00
Jochen Keil
04c7323cac Replace glib types with primitive types
This help tolua++ to recognize them as native types and not as
usertypes.
2013-05-22 22:31:57 +02:00
Jochen Keil
cf94f82c53 Initial groundwork for rsvg bindings
Add scratch files as a start: merge rsvg.h and rsvg-cairo.h.
Concatenate licenses of rsvg.h and rsvg-cairo.
Remove unnecessary defines, private structs, unused apis
(GIO/GdkPixbuf), etc.
Replace deprecated api functions with glib-object functions
Add headers for glib.h and librsvg/rsvg.h
2013-05-22 22:27:27 +02:00
James Morris
2a1afbbbba fix lua/cairo/imlib2 linkage issues 2013-01-15 00:02:25 +00:00
Brenden Matthews
ddef05d4eb Update version, copyright. 2012-05-03 16:34:44 -07:00
Pavel Labath
c80deb2d69 Fix "wrong type of arguments for cairo_set_dash", sf.net #3014648
I am not particularly proud of this solution. If you have a better one, feel free to implement
it.
2010-06-13 18:57:07 +02:00
Brenden Matthews
58cbbf57a3 Coulpe minor build fixes. 2010-01-04 18:43:40 -08:00
Brenden Matthews
b8a678728c Remove automake build system, fix defconfig.h. 2010-01-04 18:07:49 -08:00
Brenden Matthews
2951f5571c Add missing copyright notices. 2010-01-01 15:49:41 -08:00
Brenden Matthews
cf9e498b24 Update copyright notices. 2010-01-01 15:46:17 -08:00
Brenden Matthews
fb33419cd4 Add CMake build support for Lua bindings. 2009-12-17 19:46:26 -08:00
Brenden Matthews
f36f747aca Add (broken) cmake build stuff. 2009-11-26 11:25:32 -08:00
Brenden Matthews
8bd41caa51 Add creation functions for certain cairo structures. 2009-11-25 12:53:42 -08:00
Brenden Matthews
584d05d2ad Add the -p/--pause command line option. 2009-10-03 14:26:39 -07:00
Phil Sutter
ce7ec81531 fix lua automake rules for distfile creation 2009-09-05 02:37:11 +02:00
Brenden Matthews
932131f7eb Actually fix Lua extra compiler includes.
I did it wrong with 1a86405cd9.
2009-07-30 23:41:33 -06:00
Brenden Matthews
17298fee2f Undo some automake brain damage. 2009-07-30 23:19:48 -06:00
Brenden Matthews
46effdcbc4 Fix Lua extra compiler includes. 2009-07-30 22:21:09 -06:00
Brenden Matthews
985a72b444 Couple minor automake fixes. 2009-07-30 13:55:25 -06:00
Cesare Tirabassi
81c691d15a add emacs indentation variables to source files in line with current vim settings 2009-07-28 23:44:22 +02:00
Brenden Matthews
04ee7dc2fc Add/fix vim modelines for automake stuff. 2009-07-27 14:49:19 -06:00
Cesare Tirabassi
0268d3529c remove imlib_clip_line from lua/imlib2.pkg; the actual code for this (was in rgbadraw.c) has been removed upstream but not the prototype 2009-07-26 19:31:53 +02:00
Cesare Tirabassi
d817ab7965 add tolua++5.1 as an additional helper function and set library flag accordingly 2009-07-21 00:04:53 +02:00
Brenden Matthews
613d302e64 Include *.pkg in dist too. 2009-07-19 23:58:05 -06:00
Cesare Tirabassi
ba414d8ab8 fix out-of-tree builds 2009-07-20 00:43:41 +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