Enlightenment CVS committal
Author : doursse
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_wince.c
Log Message:
add ecore_evas for wince
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- Ecore_Evas.h 26 May 2008 05:16:33 -0000 1.37
+++ Ecore_Evas.h 6 Jun 2008 13:57:02 -0000 1.38
@@ -64,6 +64,7 @@
#define HAVE_ECORE_EVAS_DIRECTFB 1
#define HAVE_ECORE_EVAS_WIN32 1
#define HAVE_ECORE_EVAS_SDL 1
+#define HAVE_ECORE_EVAS_WINCE 1
typedef enum _Ecore_Evas_Engine_Type
{
@@ -77,7 +78,8 @@
ECORE_EVAS_ENGINE_SOFTWARE_DDRAW,
ECORE_EVAS_ENGINE_SOFTWARE_DDRAW_16,
ECORE_EVAS_ENGINE_DIRECT3D,
- ECORE_EVAS_ENGINE_SDL
+ ECORE_EVAS_ENGINE_SDL,
+ ECORE_EVAS_ENGINE_SOFTWARE_WINCE,
} Ecore_Evas_Engine_Type;
typedef enum _Ecore_Evas_Avoid_Damage_Type
@@ -101,6 +103,10 @@
typedef void Ecore_Win32_Window;
#endif
+#ifndef __ECORE_WINCE_H__
+typedef void Ecore_WinCE_Window;
+#endif
+
#ifndef _ECORE_EVAS_PRIVATE_H
/* basic data types */
typedef struct _Ecore_Evas Ecore_Evas;
@@ -177,6 +183,32 @@
EAPI Ecore_Win32_Window *ecore_evas_direct3d_window_get(Ecore_Evas *ee);
EAPI Ecore_Evas *ecore_evas_sdl_new(const char* name, int w, int h, int
fullscreen, int hwsurface, int noframe, int alpha);
+
+EAPI Ecore_Evas *ecore_evas_software_wince_new(Ecore_WinCE_Window *parent,
+ int x,
+ int y,
+ int width,
+ int height);
+
+EAPI Ecore_Evas *ecore_evas_software_wince_fb_new(Ecore_WinCE_Window
*parent,
+ int x,
+ int y,
+ int
width,
+ int
height);
+
+EAPI Ecore_Evas *ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window
*parent,
+ int x,
+ int y,
+ int
width,
+ int
height);
+
+EAPI Ecore_Evas *ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window
*parent,
+ int x,
+ int y,
+ int
width,
+ int
height);
+
+EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(Ecore_Evas *ee);
/* generic manipulation calls */
EAPI Ecore_Evas *ecore_evas_ecore_evas_get(Evas *e);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- Makefile.am 26 May 2008 07:07:50 -0000 1.22
+++ Makefile.am 6 Jun 2008 13:57:02 -0000 1.23
@@ -40,6 +40,14 @@
ECORE_SDL_LIB =
endif
+if BUILD_ECORE_WINCE
+ECORE_WINCE_INC = -I$(top_srcdir)/src/lib/ecore_wince
+ECORE_WINCE_LIB = $(top_builddir)/src/lib/ecore_wince/libecore_wince.la
+else
+ECORE_WINCE_INC =
+ECORE_WINCE_LIB =
+endif
+
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
@@ -50,6 +58,7 @@
$(ECORE_DIRECTFB_INC) \
$(ECORE_WIN32_INC) \
$(ECORE_SDL_INC) \
+$(ECORE_WINCE_INC) \
@EVAS_CFLAGS@ \
@XCB_CFLAGS@
@@ -63,13 +72,13 @@
libecore_evas_la_SOURCES = \
ecore_evas.c \
-ecore_evas_private.h \
ecore_evas_x.c \
ecore_evas_fb.c \
ecore_evas_buffer.c \
ecore_evas_directfb.c \
ecore_evas_win32.c \
-ecore_evas_sdl.c
+ecore_evas_sdl.c \
+ecore_evas_wince.c
libecore_evas_la_LIBADD = \
$(ECORE_X_LIB) \
@@ -77,6 +86,7 @@
$(ECORE_DIRECTFB_LIB) \
$(ECORE_WIN32_LIB) \
$(ECORE_SDL_LIB) \
+$(ECORE_WINCE_LIB) \
$(top_builddir)/src/lib/ecore/libecore.la \
@EVAS_LIBS@ \
@XCB_LIBS@ \
@@ -91,16 +101,10 @@
$(ECORE_DIRECTFB_LIB) \
$(ECORE_WIN32_LIB) \
$(ECORE_SDL_LIB) \
+$(ECORE_WINCE_LIB) \
$(top_builddir)/src/lib/ecore/libecore.la
endif
EXTRA_DIST = \
-ecore_evas.c \
-ecore_evas_private.h \
-ecore_evas_x.c \
-ecore_evas_fb.c \
-ecore_evas_buffer.c \
-ecore_evas_directfb.c \
-ecore_evas_win32.c \
-ecore_evas_sdl.c
+ecore_evas_private.h
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ecore_evas.c 29 May 2008 02:00:03 -0000 1.46
+++ ecore_evas.c 6 Jun 2008 13:57:02 -0000 1.47
@@ -84,6 +84,12 @@
#else
return 0;
#endif
+ case ECORE_EVAS_ENGINE_SOFTWARE_WINCE:
+#ifdef BUILD_ECORE_EVAS_WINCE
+ return 1;
+#else
+ return 0;
+#endif
default:
return 0;
break;
@@ -128,6 +134,9 @@
#endif
#ifdef BUILD_ECORE_EVAS_DIRECTFB
while (_ecore_evas_directfb_shutdown());
+#endif
+#ifdef BUILD_ECORE_EVAS_WINCE
+ while (_ecore_evas_wince_shutdown());
#endif
evas_shutdown();
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ecore_evas_private.h 26 May 2008 05:16:33 -0000 1.40
+++ ecore_evas_private.h 6 Jun 2008 13:57:02 -0000 1.41
@@ -77,6 +77,10 @@
# include <Evas_Engine_Direct3D.h>
# endif
#endif
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
+# include "Ecore_WinCE.h"
+# include <Evas_Engine_Software_16_WinCE.h>
+#endif
#define IDLE_FLUSH_TIME 0.5
@@ -195,6 +199,11 @@
} state;
} win32;
#endif
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
+ struct {
+ Ecore_WinCE_Window *window;
+ } wince;
+#endif
Ecore_Timer *idle_flush_timer;
};
@@ -292,6 +301,9 @@
#endif
#ifdef BUILD_ECORE_WIN32
int _ecore_evas_win32_shutdown(void);
+#endif
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
+int _ecore_evas_wince_shutdown(void);
#endif
void _ecore_evas_fps_debug_init(void);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
