move engine headers into engine dirs - and removes lots of useless old headers.

SVN revision: 22344
This commit is contained in:
Carsten Haitzler 2006-04-25 04:00:21 +00:00
parent bd5274b1f7
commit 21e63c83b9
29 changed files with 218 additions and 188 deletions

View File

@ -1,21 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = \
evas_cairo_common.h \
evas_common.h \
evas_engine_api_buffer.h \
evas_engine_api_cairo_x11.h \
evas_engine_api_directfb.h \
evas_engine_api_fb.h \
evas_engine_api_gl_x11.h \
evas_engine_api_software_qtopia.h \
evas_engine_api_software_win32_gdi.h \
evas_engine_api_software_x11.h \
evas_engine_api_software_xcb.h \
evas_engine_api_xrender_x11.h \
evas_engine_api_xrender_xcb.h \
evas_gl_common.h \
evas_private.h \
evas_options.h \
evas_macros.h \
evas_mmx.h \
evas_options.h \
evas_private.h
evas_common.h

View File

@ -1,6 +0,0 @@
#ifndef EVAS_ENGINE_BUFFER_H
#define EVAS_ENGINE_BUFFER_H
extern Evas_Func evas_engine_buffer_func;
#endif

View File

@ -1,7 +0,0 @@
#ifndef EVAS_ENGINE_CAIRO_X11_H
#define EVAS_ENGINE_CAIRO_X11_H
#include <X11/Xlib.h>
extern Evas_Func evas_engine_cairo_x11_func;
#endif

View File

@ -1,8 +0,0 @@
#ifndef EVAS_ENGINE_DIRECTFB_H
#define EVAS_ENGINE_DIRECTFB_H
#include <directfb.h>
extern Evas_Func evas_engine_directfb_func;
#endif

View File

@ -1,6 +0,0 @@
#ifndef EVAS_ENGINE_FB_H
#define EVAS_ENGINE_FB_H
extern Evas_Func evas_engine_fb_func;
#endif

View File

@ -1,10 +0,0 @@
#ifndef EVAS_ENGINE_GL_X11_H
#define EVAS_ENGINE_GL_X11_H
#include <X11/Xlib.h>
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glx.h>
extern Evas_Func evas_engine_gl_x11_func;
#endif

View File

@ -1,6 +0,0 @@
#ifndef EVAS_ENGINE_SOFTWARE_QTOPOIA_H
#define EVAS_ENGINE_SOFTWARE_QTOPIA_H
extern Evas_Func evas_engine_software_qtopia_func;
#endif

View File

@ -1,6 +0,0 @@
#ifndef EVAS_ENGINE_SOFTWARE_WIN32_GDI_H
#define EVAS_ENGINE_SOFTWARE_WIN32_GDI_H
extern Evas_Func evas_engine_software_win32_gdi_func;
#endif

View File

@ -1,7 +0,0 @@
#ifndef EVAS_ENGINE_SOFTWARE_X11_H
#define EVAS_ENGINE_SOFTWARE_X11_H
#include <X11/Xlib.h>
extern Evas_Func evas_engine_software_x11_func;
#endif

View File

@ -1,7 +0,0 @@
#ifndef EVAS_ENGINE_SOFTWARE_XCB_H
#define EVAS_ENGINE_SOFTWARE_XCB_H
#include <X11/XCB/xcb.h>
extern Evas_Func evas_engine_software_xcb_func;
#endif /* EVAS_ENGINE_SOFTWARE_XCB_H */

View File

@ -1,7 +0,0 @@
#ifndef EVAS_ENGINE_XRENDER_X11_H
#define EVAS_ENGINE_XRENDER_X11_H
#include <X11/Xlib.h>
extern Evas_Func evas_engine_xrender_x11_func;
#endif

View File

@ -1,7 +0,0 @@
#ifndef EVAS_ENGINE_XRENDER_XCB_H
#define EVAS_ENGINE_XRENDER_XCB_H
#include <X11/XCB/xcb.h>
extern Evas_Func evas_engine_xrender_xcb_func;
#endif

View File

@ -15,35 +15,3 @@ software_x11 \
software_xcb \
xrender_x11 \
xrender_xcb
# FIXME: these should go into engine subdirs so engines are much more fully
# self-contained.
EXTRA_DIST = \
Evas_Engine_DirectFB.h \
Evas_Engine_GL_X11.h \
Evas_Engine_Cairo_X11.h
if BUILD_ENGINE_DIRECTFB
ENGINE_DIRECTFB_INC = Evas_Engine_DirectFB.h
else
ENGINE_DIRECTFB_INC =
endif
if BUILD_ENGINE_GL_X11
ENGINE_GL_X11_INC = Evas_Engine_GL_X11.h
else
ENGINE_GL_X11_INC =
endif
if BUILD_ENGINE_CAIRO_X11
ENGINE_CAIRO_X11_INC = Evas_Engine_Cairo_X11.h
else
ENGINE_CAIRO_X11_INC =
endif
include_HEADERS = \
$(ENGINE_DIRECTFB_INC) \
$(ENGINE_GL_X11_INC) \
$(ENGINE_CAIRO_X11_INC)

View File

@ -15,6 +15,7 @@ if BUILD_ENGINE_CAIRO_COMMON
noinst_LTLIBRARIES = libevas_engine_cairo_common.la
libevas_engine_cairo_common_la_SOURCES = \
evas_cairo_private.h \
evas_cairo_common.h \
evas_cairo_main.c
libevas_engine_cairo_common_la_LIBADD = @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la

View File

@ -0,0 +1,169 @@
#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;
typedef struct _Evas_Cairo_Gradient Evas_Cairo_Gradient;
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
{
Evas_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;
Evas_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
{
Evas_List *points;
};
struct _Evas_Cairo_Polygon_Point
{
int x, y;
};
struct _Evas_Cairo_Gradient
{
RGBA_Gradient *grad;
};
#endif
/*
Evas_GL_Context *evas_gl_common_context_new(void);
void evas_gl_common_context_free(Evas_GL_Context *gc);
void evas_gl_common_context_use(Evas_GL_Context *gc);
void evas_gl_common_context_resize(Evas_GL_Context *gc, int w, int h);
void evas_gl_common_context_color_set(Evas_GL_Context *gc, int r, int g, int b, int a);
void evas_gl_common_context_blend_set(Evas_GL_Context *gc, int blend);
void evas_gl_common_context_dither_set(Evas_GL_Context *gc, int dither);
void evas_gl_common_context_texture_set(Evas_GL_Context *gc, Evas_GL_Texture *tex, int smooth, int w, int h);
void evas_gl_common_context_font_texture_set(Evas_GL_Context *gc, Evas_GL_Font_Texture *ft);
void evas_gl_common_context_clip_set(Evas_GL_Context *gc, int on, int x, int y, int w, int h);
void evas_gl_common_context_read_buf_set(Evas_GL_Context *gc, GLenum buf);
void evas_gl_common_context_write_buf_set(Evas_GL_Context *gc, GLenum buf);
Evas_GL_Texture *evas_gl_common_texture_new(Evas_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_GL_Context *gc, char *file, char *key);
Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_GL_Context *gc, int w, int h, int *data);
Evas_GL_Image *evas_gl_common_image_new_from_copied_data(Evas_GL_Context *gc, int w, int h, int *data);
Evas_GL_Image *evas_gl_common_image_new(Evas_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);
Evas_GL_Gradient *evas_gl_common_gradient_color_add(Evas_GL_Gradient *gr, int r, int g, int b, int a, int distance);
Evas_GL_Gradient *evas_gl_common_gradient_colors_clear(Evas_GL_Gradient *gr);
void evas_gl_common_swap_rect(Evas_GL_Context *gc, int x, int y, int w, int h);
void evas_gl_common_rect_draw(Evas_GL_Context *gc, RGBA_Draw_Context *dc, int x, int y, int w, int h);
void evas_gl_common_image_draw(Evas_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_GL_Context *gc, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2);
void evas_gl_common_poly_draw(Evas_GL_Context *gc, RGBA_Draw_Context *dc, Evas_GL_Polygon *poly);
void evas_gl_common_gradient_draw(Evas_GL_Context *gc, RGBA_Draw_Context *dc, Evas_GL_Gradient *gr, int x, int y, int w, int h, double angle);
Evas_GL_Font_Texture *evas_gl_font_texture_new(Evas_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_GL_Context *gc, void *surface, RGBA_Draw_Context *dc, RGBA_Font_Glyph *fg, int x, int y);
*/
#endif

View File

@ -1,36 +1,31 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
-I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ @x_cflags@ @CAIRO_CFLAGS@
INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines/cairo_common @FREETYPE_CFLAGS@ @x_cflags@ @CAIRO_CFLAGS@
if BUILD_ENGINE_CAIRO_X11
pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH)
pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
pkg_LTLIBRARIES = module.la
module_la_SOURCES = \
evas_engine.h \
evas_engine.c \
evas_x_main.c
module_la_LIBADD = @CAIRO_LIBS@ @x_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_LIBADD = @CAIRO_LIBS@ @x_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_DEPENDENCIES = \
$(top_builddir)/config.h
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Cairo_X11.h
endif
EXTRA_DIST = \
evas_engine.h \
evas_engine.c \
evas_x_main.c
evas_x_main.c \
Evas_Engine_Cairo_X11.h

View File

@ -1,10 +1,10 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include <X11/Xlib.h>
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_cairo_x11.h"
#include "Evas_Engine_Cairo_X11.h"
#include "evas_cairo_common.h"

View File

@ -1,7 +1,7 @@
#include <X11/Xlib.h>
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_cairo_x11.h"
#include "Evas_Engine_Cairo_X11.h"
#include "evas_cairo_common.h"

View File

@ -1,20 +1,14 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
-I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ @DIRECTFB_CFLAGS@
INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @DIRECTFB_CFLAGS@
if BUILD_ENGINE_DIRECTFB
pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = \
evas_engine_dfb.c \
@ -22,12 +16,11 @@ evas_engine_dfb_image_objects.c \
evas_engine_dfb_image_objects.h \
evas_engine_dfb.h
module_la_LIBADD = @DIRECTFB_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version \
-L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_LIBADD = @DIRECTFB_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_DEPENDENCIES = $(top_builddir)/config.h
module_la_DEPENDENCIES = \
$(top_builddir)/config.h
include_HEADERS = Evas_Engine_DirectFB.h
endif
@ -35,4 +28,5 @@ EXTRA_DIST = \
evas_engine_dfb.c \
evas_engine_dfb_image_objects.c \
evas_engine_dfb_image_objects.h \
evas_engine_dfb.h
evas_engine_dfb.h \
Evas_Engine_DirectFB.h

View File

@ -1,20 +1,15 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ @gl_cflags@
INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @gl_cflags@
if BUILD_ENGINE_GL_COMMON
noinst_LTLIBRARIES = libevas_engine_gl_common.la
noinst_LTLIBRARIES = libevas_engine_gl_common.la
libevas_engine_gl_common_la_SOURCES = \
evas_gl_private.h \
evas_gl_common.h \
evas_gl_context.c \
evas_gl_font.c \
evas_gl_gradient.c \
@ -25,10 +20,9 @@ evas_gl_polygon.c \
evas_gl_rectangle.c \
evas_gl_texture.c
libevas_engine_gl_common_la_LIBADD = @gl_libs@ $(top_builddir)/src/lib/libevas.la
libevas_engine_gl_common_la_LIBADD = @gl_libs@ $(top_builddir)/src/lib/libevas.la
libevas_engine_gl_common_la_DEPENDENCIES = \
$(top_builddir)/config.h
libevas_engine_gl_common_la_DEPENDENCIES = $(top_builddir)/config.h
endif

View File

@ -1,36 +1,30 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
-I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ @x_cflags@ @gl_cflags@
INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines/gl_common @FREETYPE_CFLAGS@ @x_cflags@ @gl_cflags@
if BUILD_ENGINE_GL_X11
pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
pkg_LTLIBRARIES = module.la
module_la_SOURCES = \
evas_engine.h \
evas_engine.c \
evas_x_main.c
module_la_LIBADD = @gl_libs@ @x_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_LIBADD = @gl_libs@ @x_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_DEPENDENCIES = $(top_builddir)/config.h
module_la_DEPENDENCIES = \
$(top_builddir)/config.h
include_HEADERS = Evas_Engine_GL_X11.h
endif
EXTRA_DIST = \
evas_engine.h \
evas_engine.c \
evas_x_main.c
evas_x_main.c \
Evas_Engine_GL_X11.h

View File

@ -1,7 +1,10 @@
#include <X11/Xlib.h>
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glx.h>
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_gl_x11.h"
#include "Evas_Engine_GL_X11.h"
#include "evas_gl_common.h"

View File

@ -1,7 +1,10 @@
#include <X11/Xlib.h>
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glx.h>
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_gl_x11.h"
#include "Evas_Engine_GL_X11.h"
#include "evas_gl_common.h"

View File

@ -1,7 +1,6 @@
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_software_qtopia.h"
#include "Evas_Engine_Software_Qtopia.h"
/* function tables - filled in later (func and parent func) */

View File

@ -1,7 +1,7 @@
#include <X11/XCB/xcb.h>
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
#include "evas_engine_api_software_xcb.h"
#include "Evas_Engine_Software_Xcb.h"
/* function tables - filled in later (func and parent func) */