7 files changed, 35 insertions, 76 deletions

diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 34c747f..21c9bdf 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -156,18 +156,6 @@ win.quitter:colour(1,2,3,4)  -> win.quitter.colour(win.quitter, 1,2,3,4)  ->  __
 win.quitter.colour.r = 5     -> direct access to the table, well "direct" via Thing and Mum.  We eventually want to call skang.colour() though.
 */
 
-struct _Widget
-{
-  char          magic[8];
-  Evas_Object   *obj;
-  Eina_Clist    node;
-  char          *label, *look, *action, *help;
-  // foreground / background colour
-  // thing
-  // types {}
-  // skangCoord x, y, w, h
-};
-
 
 // TODO - These functions should be able to deal with multiple windows.
 // TODO - Should be able to open external and internal windows, and even switch between them on the fly.
@@ -175,7 +163,7 @@ static void _on_click(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
 {
   globals *ourGlobals;
   lua_State *L = data;
-  struct _Widget *wid;
+  Widget *wid;
 
   lua_getfield(L, LUA_REGISTRYINDEX, globName);
   ourGlobals = lua_touserdata(L, -1);
@@ -215,18 +203,12 @@ static int widget(lua_State *L)
   // TODO - The alternative is to just lookup the ELM_*_CLASS in a hash table?
   if (strcmp(type, "button") == 0)
   {
-    struct _Widget *wid;
-
-    wid = calloc(1, sizeof(struct _Widget));
-    strcpy(wid->magic, "Widget");
-    eina_clist_add_head(&ourGlobals->widgets, &wid->node);
-    wid->label = strdup(title);
+    Widget *wid;
 
     // These two lines are likely the only ones that will be different for the different sorts of widgets.
-    wid->obj = eo_add(ELM_OBJ_BUTTON_CLASS, ourGlobals->win);
+    wid = widgetAdd(ourGlobals->win, ELM_OBJ_BUTTON_CLASS, ourGlobals->win->win, title);
     evas_object_smart_callback_add(wid->obj, "clicked", _on_click, L);
 
-    elm_object_part_text_set(wid->obj, NULL, wid->label);
     eo_do(wid->obj,
 //      elm_obj_widget_part_text_set(NULL, wid->label),
         evas_obj_size_set(w, h),
@@ -250,7 +232,7 @@ static int widget(lua_State *L)
 static int action(lua_State *L)
 {
   globals *ourGlobals;
-  struct _Widget *wid = lua_touserdata(L, 1);
+  Widget *wid = lua_touserdata(L, 1);
   char *action = "nada";
 
   lua_getfield(L, LUA_REGISTRYINDEX, globName);
@@ -278,7 +260,6 @@ static int window(lua_State *L)
   globals *ourGlobals;
   char *name = "GuiLua";
   char *title = "GuiLua test harness";
-  Evas_Object *obj;
   int result = 0;
   int w = WIDTH, h = HEIGHT;
 
@@ -287,38 +268,9 @@ static int window(lua_State *L)
   lua_pop(L, 1);
 
   pull_lua(L, 1, "%w %h $title $name", &w, &h, &title, &name);
-
-  // Set the engine to opengl_x11, then open the window.
-  elm_config_preferred_engine_set("opengl_x11");
-  if ((ourGlobals->win = elm_win_util_standard_add(name, title)))
-  {
-    eina_clist_init(&ourGlobals->widgets);
-
-    evas_object_smart_callback_add(ourGlobals->win, "delete,request", _on_done, ourGlobals);
-    evas_object_resize(ourGlobals->win, w, h);
-    evas_object_move(ourGlobals->win, 0, 0);
-    evas_object_show(ourGlobals->win);
-
-    // Get the Evas / canvas from the elm window (that the Evas_Object "lives on"), which is itself an Evas_Object created by Elm, so not sure if it was created internally with Ecore_Evas.
-    ourGlobals->evas = evas_object_evas_get(ourGlobals->win);
-
-    // Add a background image object.
-    obj = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals->win);
-    eo_do(obj,
-        evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
-        elm_obj_image_fill_outside_set(EINA_TRUE),
-        elm_obj_image_file_set("../../media/sky_01.jpg", NULL),
-        evas_obj_visibility_set(EINA_TRUE)
-        );
-    elm_win_resize_object_add(ourGlobals->win, obj);
-    eo_unref(obj);
-
-    lua_pushlightuserdata(L, &ourGlobals->win);
-    result = 1;
-  }
-
-  // Set preferred engine back to default from config
-  elm_config_preferred_engine_set(NULL);
+  ourGlobals->win = winFangAdd(NULL, 0, 0, w, h, title, name);
+  lua_pushlightuserdata(L, &ourGlobals->win);
+  result = 1;
 
   return result;
 }
@@ -367,14 +319,7 @@ static int closeWindow(lua_State *L)
 
   if (ourGlobals->win)
   {
-    struct _Widget *wid;
-
-    // Elm will delete our widgets, but if we are using eo, we need to unref them.
-    EINA_CLIST_FOR_EACH_ENTRY(wid, &ourGlobals->widgets, struct _Widget, node)
-    {
-      eo_unref(wid->obj);
-    }
-    evas_object_del(ourGlobals->win);
+    winFangDel(ourGlobals->win);
   }
 
   if (ourGlobals->logDom >= 0)
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index ee669ce..82415c9 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -1,6 +1,7 @@
 #include "SledjHamr.h"
 #include "LumbrJack.h"
 #include "Runnr.h"
+#include "winFang.h"
 
 
 #define WIDTH  (300)
@@ -14,9 +15,7 @@
 
 typedef struct _globals
 {
-  Evas          *evas;
-  Evas_Object   *win;           // Our Elm window.
-  Eina_Clist    widgets;        // Our windows widgets.
+  winFang       *win;
   int           logDom;         // Our logging domain.
 } globals;
 
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua
index 169e198..8b4a1c8 100755
--- a/src/GuiLua/build.lua
+++ b/src/GuiLua/build.lua
@@ -18,6 +18,7 @@ LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
 removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'})
 
 runCommand('C modules',         dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
-runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
-runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
-runCommand('C apps',            dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
+
+runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
+runCommand('C apps',            dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua -lwinFang ' .. libs)
diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index 261c96f..d3c983a 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -18,12 +18,10 @@ LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
 libs    = libs    .. ' -lIrrlicht -lGL -lbz2'
 
 removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
-removeFiles(dir, {'../../extantz', 'camera.o', 'winFang.o', lib_d .. '/libwinFang.so', 'chat.o', 'files.o', 'woMan.o'})
+removeFiles(dir, {'../../extantz', 'camera.o', 'chat.o', 'files.o', 'woMan.o'})
 
 runCommand('edje_cc',           dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj')
 runCommand('Irrlicht files',    dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
 runCommand(nil,                 dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
 runCommand(nil,                 dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
-runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -fPIC -c winFang.c')
-runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libwinFang.so -o ' .. lib_d .. '/libwinFang.so winFang.o')
 compileFiles('../../extantz',   dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'chat', 'files', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o -lwinFang')
diff --git a/src/libraries/build.lua b/src/libraries/build.lua
index 6566e66..4e277e1 100755
--- a/src/libraries/build.lua
+++ b/src/libraries/build.lua
@@ -15,7 +15,7 @@ end
 
 LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
 
-removeFiles(dir, {'LumbrJack.o', lib_d .. '/libLumbrJack.so', 'Runnr.o', lib_d .. '/libRunnr.so', 'SledjHamr.o', lib_d .. '/libSledjHamr.so'})
+removeFiles(dir, {'LumbrJack.o', lib_d .. '/libLumbrJack.so', 'Runnr.o', lib_d .. '/libRunnr.so', 'SledjHamr.o', lib_d .. '/libSledjHamr.so', 'winFang.o', lib_d .. '/libwinFang.so'})
 
 runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c')
 runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o ' .. lib_d .. '/libLumbrJack.so LumbrJack.o')
@@ -31,3 +31,6 @@ CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
 
 runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c SledjHamr.c')
 runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libSledjHamr.so -o ' .. lib_d .. '/libSledjHamr.so SledjHamr.o')
+
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c winFang.c')
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libwinFang.so -o ' .. lib_d .. '/libwinFang.so winFang.o')
diff --git a/src/extantz/winFang.c b/src/libraries/winFang.c
index a38845a..4d54627 100644
--- a/src/extantz/winFang.c
+++ b/src/libraries/winFang.c
@@ -1,4 +1,4 @@
-#include "extantz.h"
+#include "winFang.h"
 
 
 // Elm inlined image windows needs this to change focus on mouse click.
@@ -144,7 +144,6 @@ winFang *winFangAdd(Evas_Object *parent, int x, int y, int w, int h, char *title
   }
   else
   {
-    elm_config_preferred_engine_set("opengl_x11");
     result->win = elm_win_add(parent, name, ELM_WIN_BASIC);
     evas_object_move(result->win, result->x, result->y);
     evas_object_smart_callback_add(result->win, "delete,request", _on_done, NULL);
@@ -198,7 +197,11 @@ Widget *widgetAdd(winFang *win, const Eo_Class *klass, Evas_Object *parent, char
       evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
       evas_obj_visibility_set(EINA_TRUE)
     );
-    if (title)  elm_object_text_set(result->obj, title);
+    if (title)
+    {
+      result->label = strdup(title);
+      elm_object_text_set(result->obj, result->label);
+    }
   }
 
   return result;
diff --git a/src/extantz/winFang.h b/src/libraries/winFang.h
index 6ae26e4..219dcf0 100644
--- a/src/extantz/winFang.h
+++ b/src/libraries/winFang.h
@@ -1,3 +1,13 @@
+#define EFL_API_OVERRIDE 1
+/* Enable access to unstable EFL API that are still in beta */
+#define EFL_BETA_API_SUPPORT 1
+/* Enable access to unstable EFL EO API. */
+#define EFL_EO_API_SUPPORT 1
+
+
+#include <Eo.h>
+#include <Eina.h>
+#include <Evas.h>
 #include <Elementary.h>