Move winFang to libraries, and convert GuiLua to use it.

3 files changed, 20 insertions, 4 deletions

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>