Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Makefile.am ecore_evas.c ecore_evas_x.c
Added Files:
Ecore_Evas.h
Log Message:
ok fix some things with SSL and ecore_evas. you ALWYAs have at least the api
to do ssl and al fo ecorE_evas stuff
BUt ecore_* may not be BUILT with that support
so the api stub exists
but it may just return NULL. theres calls to query for support here.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 21 Oct 2004 07:52:08 -0000 1.7
+++ Makefile.am 22 Oct 2004 03:41:48 -0000 1.8
@@ -29,7 +29,7 @@
$(ECORE_FB_INC) \
@evas_cflags@
-libecore_evas_la_LDFLAGS = -version-info 1:0:0 \
+libecore_evas_la_LDFLAGS = $(LDFLAGS) -version-info 1:0:0 \
$(ECORE_X_LDF) \
$(ECORE_FB_LDF) \
-L$(top_builddir)/src/lib/ecore/.libs
@@ -60,7 +60,6 @@
endif
EXTRA_DIST = \
-Ecore_Evas.h.in \
ecore_evas.c \
ecore_evas_x.c \
ecore_evas_fb.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore_evas.c 20 Oct 2004 17:51:28 -0000 1.16
+++ ecore_evas.c 22 Oct 2004 03:41:48 -0000 1.17
@@ -7,6 +7,47 @@
static int _ecore_evas_init_count = 0;
/**
+ * Query if a particular renginering engine target has support
+ * @param engine The engine to check support for
+ * @return 1 if the particualr engine is supported, 0 if it is not
+ *
+ * Query if engine @param engine is supported by ecore_evas. 1 is returned if
+ * it is, and 0 is returned if it is not supported.
+ */
+int
+ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
+{
+ switch (engine)
+ {
+ case ECORE_EVAS_ENGINE_SOFTWARE_X11:
+#ifdef BUILD_ECORE_X
+ return 1;
+#else
+ return 0;
+#endif
+ break;
+ case ECORE_EVAS_ENGINE_SOFTWARE_FB:
+#ifdef BUILD_ECORE_EVAS_FB
+ return 1;
+#else
+ return 0;
+#endif
+ break;
+ case ECORE_EVAS_ENGINE_GL_X11:
+#ifdef BUILD_ECORE_EVAS_GL
+ return 1;
+#else
+ return 0;
+#endif
+ break;
+ default:
+ return 0;
+ break;
+ };
+ return 0;
+}
+
+/**
* Init the Evas system.
* @return greater than 0 on success, 0 on failure
*
@@ -16,8 +57,7 @@
ecore_evas_init(void)
{
if (_ecore_evas_init_count == 0)
- evas_init ();
-
+ evas_init ();
return ++_ecore_evas_init_count;
}
@@ -39,8 +79,7 @@
#ifdef BUILD_ECORE_EVAS_FB
while (_ecore_evas_fb_shutdown());
#endif
-
- evas_shutdown();
+ evas_shutdown();
}
if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0;
return _ecore_evas_init_count;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ecore_evas_x.c 27 Aug 2004 10:02:45 -0000 1.23
+++ ecore_evas_x.c 22 Oct 2004 03:41:48 -0000 1.24
@@ -3,8 +3,11 @@
#include "ecore_private.h"
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
+#ifdef BUILD_ECORE_X
#include "Ecore_X.h"
+#endif
+#ifdef BUILD_ECORE_X
static int _ecore_evas_init_count = 0;
static int _ecore_evas_fps_debug = 0;
@@ -1114,6 +1117,7 @@
_ecore_evas_withdrawn_set,
_ecore_evas_sticky_set
};
+#endif
/**
* To be documented.
@@ -1124,6 +1128,7 @@
ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h)
{
+#ifdef BUILD_ECORE_X
Evas_Engine_Info_Software_X11 *einfo;
Ecore_Evas *ee;
int rmethod;
@@ -1187,6 +1192,9 @@
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
return ee;
+#else
+ return NULL;
+#endif
}
/**
@@ -1197,14 +1205,18 @@
Ecore_X_Window
ecore_evas_software_x11_window_get(Ecore_Evas *ee)
{
+#ifdef BUILD_ECORE_X
return ee->engine.x.win_container;
+#else
+ return 0;
+#endif
}
-#ifdef BUILD_ECORE_EVAS_GL
Ecore_Evas *
ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h)
{
+#ifdef BUILD_ECORE_EVAS_GL
Evas_Engine_Info_GL_X11 *einfo;
Ecore_Evas *ee;
int rmethod;
@@ -1292,6 +1304,9 @@
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
return ee;
+#else
+ return NULL;
+#endif
}
/**
@@ -1302,6 +1317,9 @@
Ecore_X_Window
ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
{
+#ifdef BUILD_ECORE_EVAS_GL
return ee->engine.x.win_container;
-}
+#else
+ return 0;
#endif
+}
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
