oops - forgot about engine headers. moved headers. fixed. install again

SVN revision: 19804
This commit is contained in:
Carsten Haitzler 2006-01-14 18:24:41 +00:00
parent debdc91f2c
commit f3ff4e9ffe
11 changed files with 119 additions and 329 deletions

View File

@ -1,36 +0,0 @@
#ifndef _EVAS_ENGINE_BUFFER_H
#define _EVAS_ENGINE_BUFFER_H
#define EVAS_ENGINE_BUFFER_DEPTH_ARGB32 0
#define EVAS_ENGINE_BUFFER_DEPTH_BGRA32 1
#define EVAS_ENGINE_BUFFER_DEPTH_RGB24 2
#define EVAS_ENGINE_BUFFER_DEPTH_BGR24 3
typedef struct _Evas_Engine_Info_Buffer Evas_Engine_Info_Buffer;
struct _Evas_Engine_Info_Buffer
{
/* PRIVATE - don't mess with this baby or evas will poke its tongue out */
/* at you and make nasty noises */
Evas_Engine_Info magic;
struct {
int depth_type;
void *dest_buffer;
int dest_buffer_row_bytes;
char use_color_key : 1;
int alpha_threshold;
int color_key_r;
int color_key_g;
int color_key_b;
struct {
void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes);
void (*free_update_region) (int x, int y, int w, int h, void *data);
} func;
} info;
};
#endif

View File

@ -1,27 +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. */
};
#endif

View File

@ -1,22 +0,0 @@
#ifndef _EVAS_ENGINE_DIRECTFB_H
#define _EVAS_ENGINE_DIRECTFB_H
#include <directfb/directfb.h>
typedef struct _Evas_Engine_Info_DirectFB Evas_Engine_Info_DirectFB;
struct _Evas_Engine_Info_DirectFB
{
/* PRIVATE - don't mess with this baby or evas will poke its tongue out */
/* at you and make nasty noises */
Evas_Engine_Info magic;
struct {
IDirectFB *dfb;
IDirectFBSurface *surface;
DFBSurfaceDrawingFlags flags;
} info;
};
#endif

View File

@ -1,22 +0,0 @@
#ifndef _EVAS_ENGINE_FB_H
#define _EVAS_ENGINE_FB_H
typedef struct _Evas_Engine_Info_FB Evas_Engine_Info_FB;
struct _Evas_Engine_Info_FB
{
/* PRIVATE - don't mess with this baby or evas will poke its tongue out */
/* at you and make nasty noises */
Evas_Engine_Info magic;
struct {
int virtual_terminal;
int device_number;
int refresh;
int rotation;
} info;
};
#endif

View File

@ -1,32 +0,0 @@
#ifndef _EVAS_ENGINE_GL_X11_H
#define _EVAS_ENGINE_GL_X11_H
#include <X11/Xlib.h>
typedef struct _Evas_Engine_Info_GL_X11 Evas_Engine_Info_GL_X11;
struct _Evas_Engine_Info_GL_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. */
struct {
Visual * (*best_visual_get) (Display *disp, int screen);
Colormap (*best_colormap_get) (Display *disp, int screen);
int (*best_depth_get) (Display *disp, int screen);
} func;
};
#endif

View File

@ -1,31 +0,0 @@
#ifndef _EVAS_ENGINE_SOFTWARE_QTOPIA_H
#define _EVAS_ENGINE_SOFTWARE_QTOPIA_H
#ifdef EVAS_COMMON_H
#ifdef EVAS_PRIVATE_H
typedef void QWidget;
#endif
#endif
#ifndef EVAS_COMMON_H
#ifndef EVAS_PRIVATE_H
#include <qwidget.h>
#endif
#endif
typedef struct _Evas_Engine_Info_Software_Qtopia Evas_Engine_Info_Software_Qtopia;
struct _Evas_Engine_Info_Software_Qtopia
{
/* PRIVATE - don't mess with this baby or evas will poke its tongue out */
/* at you and make nasty noises */
Evas_Engine_Info magic;
struct {
QWidget *target;
int rotation;
} info;
};
#endif

View File

@ -1,28 +0,0 @@
#ifndef _EVAS_ENGINE_SOFTWARE_WIN32_GDI_H
#define _EVAS_ENGINE_SOFTWARE_WIN32_GDI_H
typedef struct _Evas_Engine_Info_Software_Win32_GDI Evas_Engine_Info_Software_Win32_GDI;
struct _Evas_Engine_Info_Software_Win32_GDI
{
/* 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 {
HWND hwnd;
/*
Colormap colormap;
*/
int depth;
int rotation;
} info;
/* engine specific function calls to query stuff about the destination */
/* engine (what visual & colormap & depth to use, performance info etc. */
};
#endif

View File

@ -1,48 +0,0 @@
#ifndef _EVAS_ENGINE_SOFTWARE_X11_H
#define _EVAS_ENGINE_SOFTWARE_X11_H
#include <X11/Xlib.h>
typedef struct _Evas_Engine_Info_Software_X11 Evas_Engine_Info_Software_X11;
struct _Evas_Engine_Info_Software_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;
Pixmap mask;
Visual *visual;
Colormap colormap;
int depth;
int rotation;
int alloc_grayscale : 1;
int debug : 1;
int shape_dither : 1;
int alloc_colors_max;
} info;
/* engine specific function calls to query stuff about the destination */
/* engine (what visual & colormap & depth to use, performance info etc. */
struct {
Visual * (*best_visual_get) (Display *disp, int screen);
Colormap (*best_colormap_get) (Display *disp, int screen);
int (*best_depth_get) (Display *disp, int screen);
Evas_Performance *(*performance_test) (Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth);
void (*performance_free) (Evas_Performance *perf);
char * (*performance_data_get) (Evas_Performance *perf);
char * (*performance_key_get) (Evas_Performance *perf);
Evas_Performance *(*performance_new) (Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth);
void (*performance_build) (Evas_Performance *perf, const char *data);
void (*performance_device_store) (Evas_Performance *perf);
} func;
};
#endif

View File

@ -1,58 +0,0 @@
#ifndef _EVAS_ENGINE_SOFTWARE_XCB_H
#define _EVAS_ENGINE_SOFTWARE_XCB_H
#include <X11/XCB/xcb.h>
typedef struct _Evas_Engine_Info_Software_Xcb Evas_Engine_Info_Software_Xcb;
struct _Evas_Engine_Info_Software_Xcb
{
/* 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 {
XCBConnection *conn;
XCBDRAWABLE drawable;
XCBDRAWABLE mask;
XCBVISUALTYPE *visual;
XCBCOLORMAP colormap;
int depth;
int rotation;
int alloc_grayscale : 1;
int debug : 1;
int shape_dither : 1;
int alloc_colors_max;
} info;
/* engine specific function calls to query stuff about the destination */
/* engine (what visual & colormap & depth to use, performance info etc. */
struct {
XCBVISUALTYPE * (*best_visual_get) (XCBConnection *conn, int screen);
XCBCOLORMAP (*best_colormap_get) (XCBConnection *conn, int screen);
int (*best_depth_get) (XCBConnection *conn, int screen);
Evas_Performance *(*performance_test) (Evas *e,
XCBConnection *conn,
XCBVISUALTYPE *vis,
XCBCOLORMAP cmap,
XCBDRAWABLE draw,
int depth);
void (*performance_free) (Evas_Performance *perf);
char * (*performance_data_get) (Evas_Performance *perf);
char * (*performance_key_get) (Evas_Performance *perf);
Evas_Performance *(*performance_new) (Evas *e,
XCBConnection *conn,
XCBVISUALTYPE *vis,
XCBCOLORMAP cmap,
XCBDRAWABLE draw,
int depth);
void (*performance_build) (Evas_Performance *perf,
const char *data);
void (*performance_device_store) (Evas_Performance *perf);
} func;
};
#endif /* _EVAS_ENGINE_SOFTWARE_XCB_H */

View File

@ -1,25 +0,0 @@
#ifndef _EVAS_ENGINE_XRENDER_X11_H
#define _EVAS_ENGINE_XRENDER_X11_H
#include <X11/Xlib.h>
typedef struct _Evas_Engine_Info_XRender_X11 Evas_Engine_Info_XRender_X11;
struct _Evas_Engine_Info_XRender_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;
Pixmap mask;
Visual *visual;
unsigned char destination_alpha : 1;
} info;
};
#endif

View File

@ -12,3 +12,122 @@ software_win32_gdi \
software_x11 \
software_xcb \
xrender_x11
# FIXME: these should go into engine subdirs so engines are much more fully
# self-contained.
EXTRA_DIST = \
Evas_Engine_Software_X11.h \
Evas_Engine_Software_Xcb.h \
Evas_Engine_DirectFB.h \
Evas_Engine_FB.h \
Evas_Engine_Buffer.h \
Evas_Engine_Software_Win32_GDI.h \
Evas_Engine_Software_Qtopia.h \
Evas_Engine_GL_X11.h \
Evas_Engine_Cairo_X11.h \
Evas_Engine_XRender_X11.h
if BUILD_ENGINE_SOFTWARE_X11
ENGINE_SOFTWARE_X11 = engines/software_x11/libevas_engine_software_x11.la
ENGINE_SOFTWARE_X11_INC = Evas_Engine_Software_X11.h
else
ENGINE_SOFTWARE_X11 =
ENGINE_SOFTWARE_X11_INC =
endif
if BUILD_ENGINE_SOFTWARE_XCB
ENGINE_SOFTWARE_XCB = engines/software_xcb/libevas_engine_software_xcb.la
ENGINE_SOFTWARE_XCB_INC = Evas_Engine_Software_Xcb.h
else
ENGINE_SOFTWARE_XCB =
ENGINE_SOFTWARE_XCB_INC =
endif
if BUILD_ENGINE_DIRECTFB
ENGINE_DIRECTFB = engines/directfb/libevas_engine_directfb.la
ENGINE_DIRECTFB_INC = Evas_Engine_DirectFB.h
else
ENGINE_DIRECTFB =
ENGINE_DIRECTFB_INC =
endif
if BUILD_ENGINE_FB
ENGINE_FB = engines/fb/libevas_engine_fb.la
ENGINE_FB_INC = Evas_Engine_FB.h
else
ENGINE_FB =
ENGINE_FB_INC =
endif
if BUILD_ENGINE_BUFFER
ENGINE_BUFFER = engines/buffer/libevas_engine_buffer.la
ENGINE_BUFFER_INC = Evas_Engine_Buffer.h
else
ENGINE_BUFFER =
ENGINE_BUFFER_INC =
endif
if BUILD_ENGINE_SOFTWARE_QTOPIA
ENGINE_SOFTWARE_QTOPIA =
engines/software_qtopia/libevas_engine_software_qtopia.la
ENGINE_SOFTWARE_QTOPIA_INC = Evas_Engine_Software_Qtopia.h
else
ENGINE_SOFTWARE_QTOPIA =
ENGINE_SOFTWARE_QTOPIA_INC =
endif
if BUILD_ENGINE_GL_COMMON
ENGINE_GL_COMMON = engines/gl_common/libevas_engine_gl_common.la
ENGINE_GL_COMMON_INC =
else
ENGINE_GL_COMMON =
ENGINE_GL_COMMON_INC =
endif
if BUILD_ENGINE_GL_X11
ENGINE_GL_X11 = engines/gl_x11/libevas_engine_gl_x11.la
ENGINE_GL_X11_INC = Evas_Engine_GL_X11.h
else
ENGINE_GL_X11 =
ENGINE_GL_X11_INC =
endif
if BUILD_ENGINE_CAIRO_COMMON
ENGINE_CAIRO_COMMON =
engines/cairo_common/libevas_engine_cairo_common.la
ENGINE_CAIRO_COMMON_INC =
else
ENGINE_CAIRO_COMMON =
ENGINE_CAIRO_COMMON_INC =
endif
if BUILD_ENGINE_CAIRO_X11
ENGINE_CAIRO_X11 = engines/cairo_x11/libevas_engine_cairo_x11.la
ENGINE_CAIRO_X11_INC = Evas_Engine_Cairo_X11.h
else
ENGINE_CAIRO_X11 =
ENGINE_CAIRO_X11_INC =
endif
if BUILD_ENGINE_XRENDER_X11
ENGINE_XRENDER_X11 = engines/xrender_x11/libevas_engine_xrender_x11.la
ENGINE_XRENDER_X11_INC = Evas_Engine_XRender_X11.h
else
ENGINE_XRENDER_X11 =
ENGINE_XRENDER_X11_INC =
endif
include_HEADERS = \
$(ENGINE_SOFTWARE_X11_INC) \
$(ENGINE_SOFTWARE_XCB_INC) \
$(ENGINE_DIRECTFB_INC) \
$(ENGINE_FB_INC) \
$(ENGINE_BUFFER_INC) \
$(ENGINE_SOFTWARE_QTOPIA_INC) \
$(ENGINE_GL_COMMON_INC) \
$(ENGINE_GL_X11_INC) \
$(ENGINE_CAIRO_COMMON_INC) \
$(ENGINE_CAIRO_X11_INC) \
$(ENGINE_XRENDER_X11_INC)