Cedric BAIL
parent
ad5a2f59c6
commit
cbad6075d7
|
|
@ -212,3 +212,4 @@
|
|||
2011-04-05 Cedric Bail
|
||||
|
||||
* Remove Evas Quartz backend.
|
||||
* Remove Cairo backend.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ autogen.sh \
|
|||
README.in \
|
||||
README \
|
||||
evas.pc.in \
|
||||
evas-cairo-x11.pc.in \
|
||||
evas-directfb.pc.in \
|
||||
evas-fb.pc.in \
|
||||
evas-opengl-x11.pc.in \
|
||||
|
|
@ -97,10 +96,6 @@ if BUILD_ENGINE_GL_GLEW
|
|||
pkgconfig_DATA += evas-opengl-glew.pc
|
||||
endif
|
||||
|
||||
#if BUILD_ENGINE_CAIRO_X11
|
||||
#pkgconfig_DATA += evas-cairo-x11.pc
|
||||
#endif
|
||||
|
||||
if BUILD_ENGINE_XRENDER_X11
|
||||
pkgconfig_DATA += evas-xrender-x11.pc
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -97,7 +97,6 @@ want_evas_engine_software_xlib="no"
|
|||
want_evas_engine_xrender_x11="no"
|
||||
want_evas_engine_gl_x11="no"
|
||||
want_evas_engine_gl_sdl="no"
|
||||
want_evas_engine_cairo_x11="no"
|
||||
want_evas_engine_software_xcb="no"
|
||||
want_evas_engine_xrender_xcb="no"
|
||||
want_evas_engine_software_gdi="no"
|
||||
|
|
@ -585,9 +584,6 @@ EVAS_CHECK_ENGINE([xrender-x11], [${want_evas_engine_xrender_x11}], [yes], [XRen
|
|||
|
||||
EVAS_CHECK_ENGINE([gl-x11], [${want_evas_engine_gl_x11}], [yes], [OpenGL X11])
|
||||
|
||||
# disable cairo engine for the release
|
||||
#EVAS_CHECK_ENGINE([cairo-x11], [${want_evas_engine_cairo_x11}], [yes], [Cairo X11])
|
||||
|
||||
EVAS_CHECK_ENGINE([software-xcb], [${want_evas_engine_software_xcb}], [no], [Software XCB])
|
||||
|
||||
EVAS_CHECK_ENGINE([xrender-xcb], [${want_evas_engine_xrender_xcb}], [no], [XRender XCB])
|
||||
|
|
@ -619,14 +615,6 @@ EVAS_CHECK_ENGINE([software-16-ddraw], [${want_evas_engine_software_16_ddraw}],
|
|||
|
||||
EVAS_CHECK_ENGINE([software-16-wince], [${want_evas_engine_software_16_wince}], [no], [Software Windows CE 16 bits])
|
||||
|
||||
# common cairo
|
||||
#have_evas_engine_cairo_common="no"
|
||||
#if test "x${have_evas_engine_cairo_x11}" = "xyes" ; then
|
||||
# have_evas_engine_cairo_common="yes"
|
||||
# AC_DEFINE([BUILD_ENGINE_CAIRO_COMMON], [1], [Generic Cairo Rendering Support])
|
||||
#fi
|
||||
#AM_CONDITIONAL([BUILD_ENGINE_CAIRO_COMMON], [test "x$have_evas_engine_cairo_common" = "xyes"])
|
||||
|
||||
# common gl
|
||||
have_evas_engine_gl_common="no"
|
||||
have_static_evas_engine_gl_common="no"
|
||||
|
|
@ -1623,10 +1611,7 @@ evas.spec
|
|||
])
|
||||
|
||||
#disabled for the release:
|
||||
# evas-cairo-x11.pc
|
||||
# evas-software-qtopia.pc
|
||||
# src/modules/engines/cairo_common/Makefile
|
||||
# src/modules/engines/cairo_x11/Makefile
|
||||
# src/modules/engines/software_qtopia/Makefile
|
||||
|
||||
|
||||
|
|
@ -1676,7 +1661,6 @@ if test "x$have_evas_engine_gl_x11" = "xyes"; then
|
|||
else
|
||||
echo
|
||||
fi
|
||||
dnl echo " Cairo X11..................: $have_evas_engine_cairo_x11"
|
||||
echo " Software GDI...............: $have_evas_engine_software_gdi"
|
||||
echo " Software DirectDraw........: $have_evas_engine_software_ddraw"
|
||||
echo " Direct3d...................: $have_evas_engine_direct3d"
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
Name: evas-cairo-x11
|
||||
Description: Evas Cairo X11 engine
|
||||
Version: @VERSION@
|
||||
|
|
@ -212,53 +212,6 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_CAIRO_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_CAIRO_X11],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_engine_[]$1[]_cflags=""
|
||||
evas_engine_[]$1[]_libs=""
|
||||
|
||||
AC_PATH_X
|
||||
AC_PATH_XTRA
|
||||
|
||||
AC_CHECK_HEADER([X11/X.h],
|
||||
[PKG_CHECK_MODULES([CAIRO],
|
||||
[cairo >= 1.0.0],
|
||||
[have_dep="yes" requirement="cairo"]
|
||||
)]
|
||||
)
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
if test "x$2" = "xyes" ; then
|
||||
x_libs="${x_libs} -lX11 -lXext"
|
||||
else
|
||||
x_dir=${x_dir:-/usr/X11R6}
|
||||
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
|
||||
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
|
||||
fi
|
||||
evas_engine_[]$1[]_cflags="${CAIRO_CFLAGS} ${x_cflags}"
|
||||
evas_engine_[]$1[]_libs="${CAIRO_LIBS} ${x_libs}"
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
|
|
|
|||
|
|
@ -179,15 +179,6 @@ EVAS_STATIC_LIBADD += @evas_image_loader_xpm_libs@
|
|||
endif
|
||||
|
||||
|
||||
#if EVAS_STATIC_BUILD_CAIRO_X11
|
||||
#SUBDIRS += \
|
||||
# ../modules/engines/cairo_common \
|
||||
# ../modules/engines/cairo_x11
|
||||
#EVAS_STATIC_MODULE += \
|
||||
# ../modules/engines/cairo_common/libevas_engine_cairo_common.la \
|
||||
# ../modules/engines/cairo_x11/libevas_engine_cairo_x11.la
|
||||
#EVAS_STATIC_LIBADD += @CAIRO_CFLAGS@
|
||||
#endif
|
||||
#if EVAS_STATIC_BUILD_SOFTWARE_QTOPIA
|
||||
#SUBDIRS += ../modules/engines/software_qtopia/
|
||||
#EVAS_STATIC_MODULE += ../modules/engines/software_qtopia/libevas_engine_software_qtopia.la
|
||||
|
|
|
|||
|
|
@ -840,9 +840,6 @@ evas_render_method_list(void)
|
|||
#ifdef BUILD_ENGINE_GL_GLEW
|
||||
methods = eina_list_append(methods, "gl_glew");
|
||||
#endif
|
||||
#ifdef BUILD_ENGINE_CAIRO_X11
|
||||
methods = eina_list_append(methods, "cairo_x11");
|
||||
#endif
|
||||
#ifdef BUILD_ENGINE_DIRECTFB
|
||||
methods = eina_list_append(methods, "directfb");
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ evas_module_paths_init(void)
|
|||
{ evas_##Tn##_##Name##_init, evas_##Tn##_##Name##_shutdown }
|
||||
|
||||
EVAS_EINA_STATIC_MODULE_DEFINE(engine, buffer);
|
||||
EVAS_EINA_STATIC_MODULE_DEFINE(engine, cairo_x11);
|
||||
EVAS_EINA_STATIC_MODULE_DEFINE(engine, direct3d);
|
||||
EVAS_EINA_STATIC_MODULE_DEFINE(engine, directfb);
|
||||
EVAS_EINA_STATIC_MODULE_DEFINE(engine, fb);
|
||||
|
|
@ -138,9 +137,6 @@ static const struct {
|
|||
#ifdef EVAS_STATIC_BUILD_BUFFER
|
||||
EVAS_EINA_STATIC_MODULE_USE(engine, buffer),
|
||||
#endif
|
||||
#ifdef EVAS_STATIC_BUILD_CAIRO_X11
|
||||
EVAS_EINA_STATIC_MODULE_USE(engine, cairo_x11),
|
||||
#endif
|
||||
#ifdef EVAS_STATIC_BUILD_DIRECT3D
|
||||
EVAS_EINA_STATIC_MODULE_USE(engine, direct3d),
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,159 +0,0 @@
|
|||
#ifndef EVAS_CAIRO_COMMON_H
|
||||
#define EVAS_CAIRO_COMMON_H
|
||||
|
||||
#include "evas_common.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
#include <cairo.h>
|
||||
#include <cairo-xlib.h>
|
||||
|
||||
typedef struct _Evas_Cairo_Context Evas_Cairo_Context;
|
||||
typedef struct _Evas_Cairo_Image Evas_Cairo_Image;
|
||||
typedef struct _Evas_Cairo_Polygon Evas_Cairo_Polygon;
|
||||
typedef struct _Evas_Cairo_Polygon_Point Evas_Cairo_Polygon_Point;
|
||||
|
||||
struct _Evas_Cairo_Context
|
||||
{
|
||||
cairo_t *cairo;
|
||||
|
||||
struct {
|
||||
double r, g, b, a;
|
||||
} col;
|
||||
struct {
|
||||
unsigned int set : 1;
|
||||
double r, g, b, a;
|
||||
} mul;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Image
|
||||
{
|
||||
RGBA_Image *im;
|
||||
int references;
|
||||
DATA32 *mulpix;
|
||||
cairo_surface_t *surface;
|
||||
cairo_pattern_t *pattern;
|
||||
#if 0
|
||||
Evas_Cairo_Context *cc;
|
||||
char dirty : 1;
|
||||
char cached : 1;
|
||||
#endif
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Polygon
|
||||
{
|
||||
Eina_List *points;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Polygon_Point
|
||||
{
|
||||
int x, y;
|
||||
};
|
||||
|
||||
#if 0
|
||||
struct _Evas_Cairo_Context
|
||||
{
|
||||
unsigned char r, g, b, a;
|
||||
|
||||
struct {
|
||||
char size : 1;
|
||||
char dither : 1;
|
||||
char blend : 1;
|
||||
char color : 1;
|
||||
char texture : 1;
|
||||
char clip : 1;
|
||||
char buf : 1;
|
||||
char other : 1;
|
||||
} change;
|
||||
|
||||
struct {
|
||||
char active : 1;
|
||||
int x, y, w, h;
|
||||
} clip;
|
||||
|
||||
struct {
|
||||
int checked : 1;
|
||||
int sgis_generate_mipmap : 1;
|
||||
int nv_texture_rectangle : 1;
|
||||
} ext;
|
||||
|
||||
int references;
|
||||
|
||||
Eina_List *images;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Image
|
||||
{
|
||||
Evas_Cairo_Context *cc;
|
||||
RGBA_Image *im;
|
||||
cairo_surface_t *surf;
|
||||
DATA32 *mulpix;
|
||||
int references;
|
||||
char dirty : 1;
|
||||
char cached : 1;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Polygon
|
||||
{
|
||||
Eina_List *points;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Polygon_Point
|
||||
{
|
||||
int x, y;
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
Evas_Engine_GL_Context *evas_gl_common_context_new(void);
|
||||
void evas_gl_common_context_free(Evas_Engine_GL_Context *gc);
|
||||
void evas_gl_common_context_use(Evas_Engine_GL_Context *gc);
|
||||
void evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h);
|
||||
void evas_gl_common_context_color_set(Evas_Engine_GL_Context *gc, int r, int g, int b, int a);
|
||||
void evas_gl_common_context_blend_set(Evas_Engine_GL_Context *gc, int blend);
|
||||
void evas_gl_common_context_dither_set(Evas_Engine_GL_Context *gc, int dither);
|
||||
void evas_gl_common_context_texture_set(Evas_Engine_GL_Context *gc, Evas_GL_Texture *tex, int smooth, int w, int h);
|
||||
void evas_gl_common_context_font_texture_set(Evas_Engine_GL_Context *gc, Evas_GL_Font_Texture *ft);
|
||||
void evas_gl_common_context_clip_set(Evas_Engine_GL_Context *gc, int on, int x, int y, int w, int h);
|
||||
void evas_gl_common_context_read_buf_set(Evas_Engine_GL_Context *gc, GLenum buf);
|
||||
void evas_gl_common_context_write_buf_set(Evas_Engine_GL_Context *gc, GLenum buf);
|
||||
|
||||
Evas_GL_Texture *evas_gl_common_texture_new(Evas_Engine_GL_Context *gc, RGBA_Image *im, int smooth);
|
||||
void evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth);
|
||||
void evas_gl_common_texture_free(Evas_GL_Texture *tex);
|
||||
void evas_gl_common_texture_mipmaps_build(Evas_GL_Texture *tex, RGBA_Image *im, int smooth);
|
||||
|
||||
Evas_GL_Image *evas_gl_common_image_load(Evas_Engine_GL_Context *gc, char *file, char *key);
|
||||
Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, int w, int h, int *data);
|
||||
Evas_GL_Image *evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, int w, int h, int *data);
|
||||
Evas_GL_Image *evas_gl_common_image_new(Evas_Engine_GL_Context *gc, int w, int h);
|
||||
void evas_gl_common_image_free(Evas_GL_Image *im);
|
||||
void evas_gl_common_image_dirty(Evas_GL_Image *im);
|
||||
|
||||
Evas_GL_Polygon *evas_gl_common_poly_point_add(Evas_GL_Polygon *poly, int x, int y);
|
||||
Evas_GL_Polygon *evas_gl_common_poly_points_clear(Evas_GL_Polygon *poly);
|
||||
|
||||
void evas_gl_common_swap_rect(Evas_Engine_GL_Context *gc, int x, int y, int w, int h);
|
||||
|
||||
void evas_gl_common_rect_draw(Evas_Engine_GL_Context *gc, RGBA_Draw_Context *dc, int x, int y, int w, int h);
|
||||
void evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, RGBA_Draw_Context *dc, Evas_GL_Image *im, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int smooth);
|
||||
void evas_gl_common_line_draw(Evas_Engine_GL_Context *gc, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2);
|
||||
void evas_gl_common_poly_draw(Evas_Engine_GL_Context *gc, RGBA_Draw_Context *dc, Evas_GL_Polygon *poly);
|
||||
|
||||
Evas_GL_Font_Texture *evas_gl_font_texture_new(Evas_Engine_GL_Context *gc, RGBA_Font_Glyph *fg);
|
||||
void evas_gl_font_texture_free(Evas_GL_Font_Texture *ft);
|
||||
void evas_gl_font_texture_draw(Evas_Engine_GL_Context *gc, void *surface, RGBA_Draw_Context *dc, RGBA_Font_Glyph *fg, int x, int y);
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
|
@ -65,12 +65,3 @@ if !EVAS_STATIC_BUILD_XRENDER_X11
|
|||
SUBDIRS += xrender_x11
|
||||
endif
|
||||
|
||||
|
||||
#if !EVAS_STATIC_BUILD_CAIRO_X11
|
||||
#SUBDIRS +=
|
||||
#cairo_common
|
||||
#cairo_x11
|
||||
#endif
|
||||
#if !EVAS_STATIC_BUILD_SOFTWARE_QTOPIA
|
||||
#SUBDIRS += software_qtopia
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
.deps
|
||||
.libs
|
||||
Makefile
|
||||
Makefile.in
|
||||
*.lo
|
||||
*.la
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I. \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
-I$(top_srcdir)/src/lib/include \
|
||||
@FREETYPE_CFLAGS@ \
|
||||
@CAIRO_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
if BUILD_ENGINE_CAIRO_COMMON
|
||||
|
||||
noinst_LTLIBRARIES = libevas_engine_cairo_common.la
|
||||
|
||||
libevas_engine_cairo_common_la_SOURCES = \
|
||||
evas_cairo_main.c
|
||||
|
||||
libevas_engine_cairo_common_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la
|
||||
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
evas_cairo_private.h \
|
||||
evas_cairo_common.h
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
#ifndef EVAS_CAIRO_COMMON_H
|
||||
#define EVAS_CAIRO_COMMON_H
|
||||
|
||||
#include "evas_common.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
#include <cairo.h>
|
||||
#include <cairo-xlib.h>
|
||||
|
||||
typedef struct _Evas_Cairo_Context Evas_Cairo_Context;
|
||||
typedef struct _Evas_Cairo_Image Evas_Cairo_Image;
|
||||
typedef struct _Evas_Cairo_Polygon Evas_Cairo_Polygon;
|
||||
typedef struct _Evas_Cairo_Polygon_Point Evas_Cairo_Polygon_Point;
|
||||
|
||||
struct _Evas_Cairo_Context
|
||||
{
|
||||
cairo_t *cairo;
|
||||
|
||||
struct {
|
||||
double r, g, b, a;
|
||||
} col;
|
||||
struct {
|
||||
unsigned int set : 1;
|
||||
double r, g, b, a;
|
||||
} mul;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Image
|
||||
{
|
||||
RGBA_Image *im;
|
||||
int references;
|
||||
DATA32 *mulpix;
|
||||
cairo_surface_t *surface;
|
||||
cairo_pattern_t *pattern;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Polygon
|
||||
{
|
||||
Eina_List *points;
|
||||
};
|
||||
|
||||
struct _Evas_Cairo_Polygon_Point
|
||||
{
|
||||
int x, y;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
.deps
|
||||
.libs
|
||||
Makefile
|
||||
Makefile.in
|
||||
*.lo
|
||||
*.la
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#ifndef _EVAS_ENGINE_CAIRO_X11_H
|
||||
#define _EVAS_ENGINE_CAIRO_X11_H
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
typedef struct _Evas_Engine_Info_Cairo_X11 Evas_Engine_Info_Cairo_X11;
|
||||
|
||||
struct _Evas_Engine_Info_Cairo_X11
|
||||
{
|
||||
/* PRIVATE - don't mess with this baby or evas will poke its tongue out */
|
||||
/* at you and make nasty noises */
|
||||
Evas_Engine_Info magic;
|
||||
|
||||
/* engine specific data & parameters it needs to set up */
|
||||
struct {
|
||||
Display *display;
|
||||
Drawable drawable;
|
||||
Visual *visual;
|
||||
Colormap colormap;
|
||||
int depth;
|
||||
} info;
|
||||
/* engine specific function calls to query stuff about the destination */
|
||||
/* engine (what visual & colormap & depth to use, performance info etc. */
|
||||
|
||||
/* non-blocking or blocking mode */
|
||||
Evas_Engine_Render_Mode render_mode;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I. \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
-I$(top_srcdir)/src/lib/include \
|
||||
-I$(top_srcdir)/src/modules/engines/cairo_common \
|
||||
@FREETYPE_CFLAGS@ \
|
||||
@evas_engine_cairo_x11_cflags@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
if BUILD_ENGINE_CAIRO_X11
|
||||
|
||||
CAIRO_X11_SOURCES = \
|
||||
evas_engine.c \
|
||||
evas_x_main.c
|
||||
|
||||
CAIRO_X11_LIBADD = @evas_engine_cairo_x11_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la
|
||||
|
||||
|
||||
includes_HEADERS = Evas_Engine_Cairo_X11.h
|
||||
includesdir = $(includedir)/evas-@VMAJ@
|
||||
|
||||
if !EVAS_STATIC_BUILD_CAIRO_X11
|
||||
|
||||
pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH)
|
||||
pkg_LTLIBRARIES = module.la
|
||||
|
||||
module_la_SOURCES = $(CAIRO_X11_SOURCES)
|
||||
|
||||
module_la_LIBADD = @EINA_LIBS@ $(CAIRO_X11_SOURCES) $(top_builddir)/src/lib/libevas.la
|
||||
module_la_LDFLAGS = -module -avoid-version
|
||||
module_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
||||
else
|
||||
|
||||
noinst_LTLIBRARIES = libevas_engine_cairo_x11.la
|
||||
|
||||
libevas_engine_cairo_x11_la_SOURCES = $(CAIRO_X11_SOURCES)
|
||||
libevas_engine_cairo_x11_la_LIBADD = $(CAIRO_X11_LIBADD)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_DIST = evas_engine.h
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,69 +0,0 @@
|
|||
#ifndef EVAS_ENGINE_H
|
||||
#define EVAS_ENGINE_H
|
||||
#include "evas_common.h"
|
||||
#include "evas_cairo_common.h"
|
||||
|
||||
extern int _evas_engine_cairo_X11_log_dom ;
|
||||
|
||||
#ifdef ERR
|
||||
# undef ERR
|
||||
#endif
|
||||
#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_cairo_X11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef DBG
|
||||
# undef DBG
|
||||
#endif
|
||||
#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_cairo_X11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef INF
|
||||
# undef INF
|
||||
#endif
|
||||
#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_cairo_X11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef WRN
|
||||
# undef WRN
|
||||
#endif
|
||||
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_cairo_X11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef CRIT
|
||||
# undef CRIT
|
||||
#endif
|
||||
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_cairo_X11_log_dom, __VA_ARGS__)
|
||||
|
||||
|
||||
typedef struct _Evas_Cairo_X11_Window Evas_Cairo_X11_Window;
|
||||
|
||||
struct _Evas_Cairo_X11_Window
|
||||
{
|
||||
Display *disp;
|
||||
Window win;
|
||||
int w, h;
|
||||
int screen;
|
||||
Visual *visual;
|
||||
Colormap colormap;
|
||||
int depth;
|
||||
cairo_surface_t *surface;
|
||||
|
||||
struct {
|
||||
int redraw : 1;
|
||||
int x1, y1, x2, y2;
|
||||
} draw;
|
||||
};
|
||||
|
||||
Evas_Cairo_X11_Window *
|
||||
evas_engine_cairo_x11_window_new(Display *disp,
|
||||
Window win,
|
||||
int screen,
|
||||
Visual *vis,
|
||||
Colormap cmap,
|
||||
int depth,
|
||||
int w,
|
||||
int h);
|
||||
void
|
||||
evas_engine_cairo_x11_window_free(Evas_Cairo_X11_Window *cw);
|
||||
void
|
||||
evas_engine_cairo_x11_window_use(Evas_Cairo_X11_Window *cw);
|
||||
void
|
||||
evas_engine_cairo_x11_window_size_set(Evas_Cairo_X11_Window *cw, int w, int h);
|
||||
|
||||
#endif
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
#include <X11/Xlib.h>
|
||||
#include "evas_common.h"
|
||||
#include "evas_private.h"
|
||||
#include "evas_engine.h"
|
||||
#include "Evas_Engine_Cairo_X11.h"
|
||||
#include "evas_cairo_common.h"
|
||||
|
||||
static Evas_Cairo_X11_Window *_evas_cairo_x11_window = NULL;
|
||||
|
||||
Evas_Cairo_X11_Window *
|
||||
evas_engine_cairo_x11_window_new(Display *disp,
|
||||
Window win,
|
||||
int screen,
|
||||
Visual *vis,
|
||||
Colormap cmap,
|
||||
int depth,
|
||||
int w,
|
||||
int h)
|
||||
{
|
||||
Evas_Cairo_X11_Window *cw;
|
||||
|
||||
cw = calloc(1, sizeof(Evas_Cairo_X11_Window));
|
||||
if (!cw) return NULL;
|
||||
cw->disp = disp;
|
||||
cw->win = win;
|
||||
cw->screen = screen;
|
||||
cw->visual = vis;
|
||||
cw->colormap = cmap;
|
||||
cw->depth = depth;
|
||||
cw->surface = cairo_xlib_surface_create(disp, win, vis, w, h);
|
||||
return cw;
|
||||
}
|
||||
|
||||
void
|
||||
evas_engine_cairo_x11_window_free(Evas_Cairo_X11_Window *cw)
|
||||
{
|
||||
if (cw == _evas_cairo_x11_window) _evas_cairo_x11_window = NULL;
|
||||
cairo_surface_destroy(cw->surface);
|
||||
free(cw);
|
||||
}
|
||||
|
||||
void
|
||||
evas_engine_cairo_x11_window_use(Evas_Cairo_X11_Window *cw)
|
||||
{
|
||||
if (_evas_cairo_x11_window != cw)
|
||||
{
|
||||
_evas_cairo_x11_window = cw;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
evas_engine_cairo_x11_window_size_set(Evas_Cairo_X11_Window *cw, int w, int h)
|
||||
{
|
||||
cairo_xlib_surface_set_size(cw->surface, w, h);
|
||||
}
|
||||
Loading…
Reference in New Issue