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 ecore_evas.c ecore_evas_private.h
Log Message:
working on it.. had to do a namespace change... be consistent!
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/Ecore_Evas.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- Ecore_Evas.h 6 Feb 2003 06:19:40 -0000 1.1.2.2
+++ Ecore_Evas.h 7 Feb 2003 00:24:02 -0000 1.1.2.3
@@ -1,11 +1,21 @@
#ifndef _ECORE_EVAS_H
#define _ECORE_EVAS_H
+#include <Evas.h>
+
#ifdef __cplusplus
extern "C" {
#endif
-int ecore_evas_init(const char *driver, const char *name);
+#ifndef X_H
+typedef unsigned long Window;
+#endif
+
+#ifndef _ECORE_EVAS_PRIVATE_H
+typedef void Ecore_Evas;
+#endif
+
+int ecore_evas_init(void);
int ecore_evas_shutdown(void);
#ifdef __cplusplus
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_evas.c 6 Feb 2003 06:19:40 -0000 1.1.2.2
+++ ecore_evas.c 7 Feb 2003 00:24:02 -0000 1.1.2.3
@@ -14,17 +14,8 @@
* Set up the Evas wrapper system
*/
int
-ecore_evas_init(const char *driver, const char *name)
+ecore_evas_init(void)
{
- 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;
}
@@ -36,6 +27,270 @@
int
ecore_evas_shutdown(void)
{
+ return 0;
+}
+
+#ifndef BUILD_EVAS_X
+static _ecore_evas_x_free(Ecore_Evas *ee);
+static
+_ecore_evas_x_free(Ecore_Evas *ee)
+{
ecore_x_shutdown();
+ /* destroy window here */
+}
+
+Ecore_Evas *
+ecore_evas_x_software_new(const char *disp_name, Window parent,
+ int x, int y, int w, int h)
+{
+ Ecore_Evas *ee;
+
+ if (!ecore_x_init(disp_name)) return NULL;
+ ee = calloc(1, sizeof(Ecore_Evas));
+ if (!ee) return NULL;
+
+ ee->func.func_free = _ecore_evas_x_free;
+ /* init evas here */
+
+ return ee;
+}
+
+Window
+ecore_evas_x_software_window_get(Ecore_Evas *ee)
+{
+ return ee->x11.win;
+}
+
+#else
+Ecore_Evas *
+ecore_evas_x_software_new(const char *disp_name, Window parent,
+ int x, int y, int w, int h)
+{
+ return NULL;
+}
+
+Window
+ecore_evas_x_software_window_get(Ecore_Evas *ee)
+{
return 0;
+}
+#endif
+
+void
+ecore_evas_free(Ecore_Evas *ee)
+{
+ if (!ee) return;
+ if (ee->func.func_free) ee->func.func_free(ee);
+ free(ee);
+}
+
+Evas *
+ecore_evas_get(Ecore_Evas *ee)
+{
+ return ee->evas;
+}
+
+void
+ecore_evas_move(Ecore_Evas *ee, int x, int y)
+{
+}
+
+void
+ecore_evas_resize(Ecore_Evas *ee, int w, int h)
+{
+}
+
+void
+ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
+{
+}
+
+void
+ecore_evas_geometry_get(Ecore_Evas *ee, int *x, int *y, int *w, int *h)
+{
+}
+
+void
+ecore_evas_rotation_set(Ecore_Evas *ee, int rot)
+{
+}
+
+int
+ecore_evas_rotation_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_shaped_set(Ecore_Evas *ee, int shaped)
+{
+}
+
+int
+ecore_evas_shaped_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_show(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_hide(Ecore_Evas *ee)
+{
+}
+
+int
+ecore_evas_visibility_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_title_set(Ecore_Evas *ee, const char *t)
+{
+}
+
+const char *
+ecore_evas_title_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_name_class_set(Ecore_Evas *ee, const char *n, const char *c)
+{
+}
+
+void
+ecore_evas_name_class_get(Ecore_Evas *ee, const char **n, const char **c)
+{
+}
+
+void
+ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h)
+{
+}
+
+void
+ecore_evas_size_min_get(Ecore_Evas *ee, int *w, int *h)
+{
+}
+
+void
+ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h)
+{
+}
+
+void
+ecore_evas_size_max_get(Ecore_Evas *ee, int *w, int *h)
+{
+}
+
+void
+ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h)
+{
+}
+
+void
+ecore_evas_size_base_get(Ecore_Evas *ee, int *w, int *h)
+{
+}
+
+void
+ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h)
+{
+}
+
+void
+ecore_evas_size_step_get(Ecore_Evas *ee, int *w, int *h)
+{
+}
+
+void
+ecore_evas_cursor_set(Ecore_Evas *ee, const char *file, int layer, int hot_x, int
+hot_y)
+{
+}
+
+void
+ecore_evas_cursor_get(Ecore_Evas *ee, char **file, int *layer, int *hot_x, int *hot_y)
+{
+}
+
+void
+ecore_evas_layer_set(Ecore_Evas *ee, int layer)
+{
+}
+
+int
+ecore_evas_layer_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_focus_set(Ecore_Evas *ee, int on)
+{
+}
+
+int
+ecore_evas_focus_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_iconified_set(Ecore_Evas *ee, int on)
+{
+}
+
+int
+ecore_evas_iconified_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_borderless_set(Ecore_Evas *ee, int on)
+{
+}
+
+int
+ecore_evas_borderless_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_override_set(Ecore_Evas *ee, int on)
+{
+}
+
+int
+ecore_evas_override_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_maximized_set(Ecore_Evas *ee, int on)
+{
+}
+
+int
+ecore_evas_maximized_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
+{
+}
+
+int
+ecore_evas_fullscreen_get(Ecore_Evas *ee)
+{
+}
+
+void
+ecore_evas_avoid_damage_set(Ecore_Evas *ee, int on)
+{
+}
+
+int
+ecore_evas_avoid_damage_get(Ecore_Evas *ee)
+{
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas_private.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_evas_private.h 6 Feb 2003 06:19:40 -0000 1.1.2.2
+++ ecore_evas_private.h 7 Feb 2003 00:24:02 -0000 1.1.2.3
@@ -3,4 +3,59 @@
#define BUILD_EVAS_X
+#include <Evas.h>
+#ifdef BUILD_EVAS_X
+#include <Evas_Engine_Software_X11.h>
+#endif
+
+typedef struct _Ecore_Evas Ecore_Evas;
+
+struct _Ecore_Evas
+{
+ Evas *evas;
+ char *driver;
+ char *name;
+ int x, y, w, h;
+ int rotation;
+ int shaped : 1;
+ int visible : 1;
+
+ struct {
+ char *title;
+ char *name;
+ char *clas;
+ struct {
+ int w, h;
+ } min, max, base, step;
+ struct {
+ Evas_Object *object;
+ char *file;
+ int layer;
+ struct {
+ int x, y;
+ } hot;
+ } cursor;
+ int layer;
+ int focused : 1;
+ int iconified : 1;
+ int borderless : 1;
+ int override : 1;
+ int maximized : 1;
+ int fullscreen : 1;
+ int avoid_damage : 1;
+ } prop;
+
+ struct {
+ void (*func_free) (Ecore_Evas *ee);
+ } func;
+
+#ifdef BUILD_EVAS_X
+ struct {
+ Window win;
+ Pixmap pmap;
+ Pixmap mask;
+ } x11;
+#endif
+};
+
#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
