Prepare for using GuiLua from extantz, but not going through with it just yet, too tired.

3 files changed, 15 insertions, 19 deletions

diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index c67788e..f14d74d 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -178,6 +178,7 @@ static void _on_click(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
   }
 }
 
+// TODO - skang.thingasm() should pass us the winFang pointer it has as the parent module.
 static int widget(lua_State *L)
 {
   globals *ourGlobals;
@@ -223,18 +224,13 @@ static int widget(lua_State *L)
 
 static int action(lua_State *L)
 {
-  globals *ourGlobals;
   Widget *wid = lua_touserdata(L, 1);
   char *action = "nada";
 
-  lua_getfield(L, LUA_REGISTRYINDEX, globName);
-  ourGlobals = lua_touserdata(L, -1);
-  lua_pop(L, 1);
-
   pull_lua(L, 2, "$", &action);
   if (wid && strcmp(wid->magic, "Widget") == 0)
   {
-    PD("Setting action %s", action);
+printf(">>>>>>>>>> Setting action : %s\n", action);
     wid->action = strdup(action);
   }
   return 0;
@@ -303,10 +299,7 @@ static int closeWindow(lua_State *L)
   ourGlobals = lua_touserdata(L, -1);
   lua_pop(L, 1);
 
-  if (ourGlobals->win)
-  {
-    winFangDel(ourGlobals->win);
-  }
+  winFangDel(ourGlobals->win);
 
   if (ourGlobals->logDom >= 0)
   {
@@ -386,7 +379,7 @@ int luaopen_GuiLua(lua_State *L)
 }
 
 
-void GuiLuaDo(int argc, char **argv)
+void GuiLuaDo(int argc, char **argv, Eina_Bool mainloop)
 {
   lua_State  *L;
   lua_Number  i;
@@ -416,12 +409,15 @@ void GuiLuaDo(int argc, char **argv)
     lua_setfield(L, LUA_GLOBALSINDEX, SKANG);
 
 
-    // Run the main loop via a Lua call.
-    // This does nothing if no module opened a window.
-    if (0 != luaL_dostring(L, "skang.loopWindow()"))
-      PEm("Error running - skang.loopWindow()");
-    lua_pop(L, closeWindow(L));
-    lua_close(L);
+    if (mainloop)
+    {
+      // Run the main loop via a Lua call.
+      // This does nothing if no module opened a window.
+      if (0 != luaL_dostring(L, "skang.loopWindow()"))
+        PEm("Error running - skang.loopWindow()");
+      lua_pop(L, closeWindow(L));
+      lua_close(L);
+    }
   }
   else
     fprintf(stderr, "Failed to start Lua!\n");
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 82415c9..4ea782e 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -20,4 +20,4 @@ typedef struct _globals
 } globals;
 
 
-void GuiLuaDo(int argc, char **argv);
+void GuiLuaDo(int argc, char **argv, Eina_Bool mainloop);
diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c
index f78c1c5..19e448b 100644
--- a/src/GuiLua/skang.c
+++ b/src/GuiLua/skang.c
@@ -4,7 +4,7 @@
 EAPI_MAIN int elm_main(int argc, char **argv)
 {
   HamrTime(elm_main, "GuiLua");
-  GuiLuaDo(argc, argv);
+  GuiLuaDo(argc, argv, EINA_TRUE);
 
   return 0;
 }