Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Tag: SPLIT
Ecore_Evas.h Makefile.am ecore_evas.c ecore_evas_private.h
Log Message:
hook it all in
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/Ecore_Evas.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- Ecore_Evas.h 6 Feb 2003 05:13:42 -0000 1.1.2.1
+++ Ecore_Evas.h 6 Feb 2003 06:19:40 -0000 1.1.2.2
@@ -5,8 +5,8 @@
extern "C" {
#endif
-int ecore_evas_init(const char *name);
-void ecore_evas_shutdown(void);
+int ecore_evas_init(const char *driver, const char *name);
+int ecore_evas_shutdown(void);
#ifdef __cplusplus
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- Makefile.am 6 Feb 2003 05:13:42 -0000 1.1.2.1
+++ Makefile.am 6 Feb 2003 06:19:40 -0000 1.1.2.2
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = @evas_cflags@ -I../ecore
+INCLUDES = @evas_cflags@ -I../ecore -I../ecore_x
lib_LTLIBRARIES = libecore_evas.la
include_HEADERS = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- ecore_evas.c 6 Feb 2003 05:13:42 -0000 1.1.2.1
+++ ecore_evas.c 6 Feb 2003 06:19:40 -0000 1.1.2.2
@@ -1,17 +1,30 @@
#include "Ecore.h"
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
+#ifdef BUILD_EVAS_X
+#include "Ecore_X.h"
+#endif
/**
* Init the Evas system
+ * @param driver
* @param name
* @return 1 on success, 0 on failure
*
* Set up the Evas wrapper system
*/
int
-ecore_evas_init(const char *name)
+ecore_evas_init(const char *driver, const char *name)
{
+ if (!driver) return 0;
+#ifdef BUILD_EVAS_X
+ if (!strcmp(driver, "x11"))
+ {
+ if (!ecore_x_init(name)) return 0;
+ }
+ else
+#endif
+ return 0;
return 1;
}
@@ -20,7 +33,9 @@
*
* This closes the Evas system down.
*/
-void
+int
ecore_evas_shutdown(void)
{
+ ecore_x_shutdown();
+ return 0;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas_private.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- ecore_evas_private.h 6 Feb 2003 05:13:42 -0000 1.1.2.1
+++ ecore_evas_private.h 6 Feb 2003 06:19:40 -0000 1.1.2.2
@@ -1,4 +1,6 @@
#ifndef _ECORE_EVAS_PRIVATE_H
#define _ECORE_EVAS_PRIVATE_H
+#define BUILD_EVAS_X
+
#endif
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
