Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Ecore_Evas.h Makefile.am ecore_evas.c ecore_evas_private.h
Added Files:
ecore_evas_directfb.c
Log Message:
turran's dfb stuff! whee! :)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Ecore_Evas.h 8 Oct 2005 12:43:17 -0000 1.14
+++ Ecore_Evas.h 15 Oct 2005 10:37:37 -0000 1.15
@@ -47,6 +47,7 @@
#define HAVE_ECORE_EVAS_X 1
#define HAVE_ECORE_EVAS_FB 1
#define HAVE_ECORE_EVAS_GL 1
+#define HAVE_ECORE_EVAS_DIRECTFB 1
typedef enum
{
@@ -54,7 +55,8 @@
ECORE_EVAS_ENGINE_SOFTWARE_FB,
ECORE_EVAS_ENGINE_GL_X11,
ECORE_EVAS_ENGINE_SOFTWARE_BUFFER,
- ECORE_EVAS_ENGINE_XRENDER_X11
+ ECORE_EVAS_ENGINE_XRENDER_X11,
+ ECORE_EVAS_ENGINE_DIRECTFB
} Ecore_Evas_Engine_Type;
#ifndef _ECORE_X_H
@@ -62,6 +64,11 @@
typedef unsigned int Ecore_X_Window;
#endif
+#ifndef _ECORE_DIRECTFB_H
+#define _ECORE_DIRECTFB_WINDOW_PREDEF
+typedef void Ecore_DirectFB_Window;
+#endif
+
#ifndef _ECORE_EVAS_PRIVATE_H
/* basic data types */
typedef void Ecore_Evas;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Makefile.am 5 Sep 2005 08:40:50 -0000 1.12
+++ Makefile.am 15 Oct 2005 10:37:37 -0000 1.13
@@ -20,6 +20,16 @@
ECORE_FB_LDF =
endif
+if BUILD_ECORE_DIRECTFB
+ECORE_DIRECTFB_INC = -I$(top_srcdir)/src/lib/ecore_directfb [EMAIL PROTECTED]@
+ECORE_DIRECTFB_LIB =
$(top_builddir)/src/lib/ecore_directfb/libecore_directfb.la
+ECORE_DIRECTFB_LDF = -L$(top_builddir)/src/lib/ecore_directfb/.libs
+else
+ECORE_DIRECTFB_INC =
+ECORE_DIRECTFB_LIB =
+ECORE_DIRECTFB_LDF =
+endif
+
INCLUDES = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
@@ -27,11 +37,13 @@
-I$(top_builddir)/src/lib/ecore_evas \
$(ECORE_X_INC) \
$(ECORE_FB_INC) \
+$(ECORE_DIRECTFB_INC) \
@EVAS_CFLAGS@
libecore_evas_la_LDFLAGS = -version-info 1:0:0 \
$(ECORE_X_LDF) \
$(ECORE_FB_LDF) \
+$(ECORE_DIRECTFB_LDF) \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_EVAS
@@ -45,17 +57,20 @@
ecore_evas_private.h \
ecore_evas_x.c \
ecore_evas_fb.c \
-ecore_evas_buffer.c
+ecore_evas_buffer.c \
+ecore_evas_directfb.c
libecore_evas_la_LIBADD = \
$(ECORE_X_LIB) \
$(ECORE_FB_LIB) \
+$(ECORE_DIRECTFB_LIB) \
$(top_builddir)/src/lib/ecore/libecore.la \
@EVAS_LIBS@
libecore_evas_la_DEPENDENCIES = \
$(ECORE_X_LIB) \
$(ECORE_FB_LIB) \
+$(ECORE_DIRECTFB_LIB) \
$(top_builddir)/src/lib/ecore/libecore.la
endif
@@ -65,5 +80,6 @@
ecore_evas_private.h \
ecore_evas_x.c \
ecore_evas_fb.c \
-ecore_evas_buffer.c
+ecore_evas_buffer.c \
+ecore_evas_directfb.c
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_evas.c 8 Oct 2005 12:41:59 -0000 1.22
+++ ecore_evas.c 15 Oct 2005 10:37:37 -0000 1.23
@@ -56,6 +56,11 @@
return 0;
#endif
break;
+ case ECORE_EVAS_ENGINE_DIRECTFB:
+#ifdef BUILD_ECORE_EVAS_DIRECTFB
+ return 1;
+#endif
+ return 0;
default:
return 0;
break;
@@ -98,6 +103,9 @@
#ifdef BUILD_ECORE_EVAS_BUFFER
while (_ecore_evas_buffer_shutdown());
#endif
+#ifdef BUILD_ECORE_EVAS_DIRECTFB
+ while (_ecore_evas_directfb_shutdown());
+#endif
evas_shutdown();
}
if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ecore_evas_private.h 8 Oct 2005 12:41:59 -0000 1.18
+++ ecore_evas_private.h 15 Oct 2005 10:37:37 -0000 1.19
@@ -18,6 +18,10 @@
#define ECORE_MAGIC_EVAS 0x76543211
+#ifndef BUILD_ECORE_DIRECTFB
+#undef BUILD_ECORE_EVAS_DIRECTFB
+#endif
+
#ifdef BUILD_ECORE_X
#include "Ecore_X.h"
#include <Evas_Engine_Software_X11.h>
@@ -33,6 +37,10 @@
#ifdef BUILD_ECORE_EVAS_FB
#include <Evas_Engine_FB.h>
#endif
+#ifdef BUILD_ECORE_EVAS_DIRECTFB
+#include <Evas_Engine_DirectFB.h>
+#include "Ecore_DirectFB.h"
+#endif
#ifdef BUILD_ECORE_EVAS_BUFFER
#include <Evas_Engine_Buffer.h>
#endif
@@ -131,6 +139,14 @@
Evas_Object *image;
} buffer;
#endif
+#ifdef BUILD_ECORE_EVAS_DIRECTFB
+ struct {
+ Ecore_DirectFB_Window *window;
+ /*IDirectFBWindow *window;
+ DirectFBSurface *surface;
+ DirectFBWindowID id;*/
+ } directfb;
+#endif
};
struct _Ecore_Evas
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
