Convert GuiLua and skang to Elementary.

4 files changed, 39 insertions, 112 deletions

diff --git a/ClientHamr/GuiLua/GuiLua.c b/ClientHamr/GuiLua/GuiLua.c
index 47f63d5..985d0c6 100644
--- a/ClientHamr/GuiLua/GuiLua.c
+++ b/ClientHamr/GuiLua/GuiLua.c
@@ -204,18 +204,6 @@ void loggingStartup(globals *ourGlobals)
   eina_log_level_set(EINA_LOG_LEVEL_DBG);
   eina_log_domain_level_set("GuiLua", EINA_LOG_LEVEL_DBG);
   eina_log_print_cb_set(_ggg_log_print_cb, stderr);
-
-  // Shut up the excess debugging shit from EFL.
-  eina_log_domain_level_set("eo", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("eet", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("ecore", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("ecore_audio", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("ecore_evas", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("ecore_input_evas", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("ecore_system_upower", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("ecore_x", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("evas_main", EINA_LOG_LEVEL_WARN);
-  eina_log_domain_level_set("eldbus", EINA_LOG_LEVEL_WARN);
 }
 
 char *getDateTime(struct tm **nowOut, char *dateOut, time_t *timeOut)
@@ -242,9 +230,11 @@ char *getDateTime(struct tm **nowOut, char *dateOut, time_t *timeOut)
 }
 
 
-static void _on_delete(Ecore_Evas *ee /*__UNUSED__*/)
+static void _on_done(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-  ecore_main_loop_quit();
+//  globals *ourGlobals = data;
+
+  elm_exit();
 }
 
 static int openWindow(lua_State *L)
@@ -255,36 +245,16 @@ static int openWindow(lua_State *L)
   ourGlobals = lua_touserdata(L, -1);
   lua_pop(L, 1);
 
-  if ((ourGlobals->eina = eina_init()))
-  {
-    loggingStartup(ourGlobals);
-
-    PI("GuiLua running as an application.\n");
+  loggingStartup(ourGlobals);
+  PI("GuiLua running as an application.\n");
 
-    if ((ourGlobals->ecore_evas = ecore_evas_init()))
-    {
-      if ((ourGlobals->edje = edje_init()))
-      {
-        /* this will give you a window with an Evas canvas under the first engine available */
-        ourGlobals->ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
-        if (ourGlobals->ee)
-        {
-          ourGlobals->canvas = ecore_evas_get(ourGlobals->ee);
-          ecore_evas_title_set(ourGlobals->ee, "GuiLua test harness");
-          ecore_evas_show(ourGlobals->ee);
-          ecore_evas_callback_delete_request_set(ourGlobals->ee, _on_delete);
-        }
-        else
-          PC("You got to have at least one evas engine built and linked up to ecore-evas for this to run properly.");
-      }
-      else
-        PC("Failed to init edje!");
-    }
-    else
-      PC("Failed to init ecore_evas!");
+  if ((ourGlobals->win = elm_win_util_standard_add("GuiLua", "GuiLua test harness")))
+  {
+    evas_object_smart_callback_add(ourGlobals->win, "delete,request", _on_done, ourGlobals);
+    evas_object_resize(ourGlobals->win, WIDTH, HEIGHT);
+    evas_object_move(ourGlobals->win, 0, 0);
+    evas_object_show(ourGlobals->win);
   }
-  else
-    fprintf(stderr, "Failed to init eina!\n");
 
   return 0;
 }
@@ -297,8 +267,8 @@ static int loopWindow(lua_State *L)
   ourGlobals = lua_touserdata(L, -1);
   lua_pop(L, 1);
 
-  if (ourGlobals->canvas)
-    ecore_main_loop_begin();
+  if (ourGlobals->win)
+    elm_run();
 
   return 0;
 }
@@ -311,29 +281,17 @@ static int closeWindow(lua_State *L)
   ourGlobals = lua_touserdata(L, -1);
   lua_pop(L, 1);
 
-  if (ourGlobals->eina)
+  if (ourGlobals->win)
+    evas_object_del(ourGlobals->win);
+
+  if (ourGlobals->logDom >= 0)
   {
-    if (ourGlobals->ecore_evas)
-    {
-      if (ourGlobals->edje)
-      {
-        if (ourGlobals->ee)
-        {
-          ecore_evas_free(ourGlobals->ee);
-          ourGlobals->ee = NULL;
-        }
-        ourGlobals->edje = edje_shutdown();
-      }
-      ourGlobals->ecore_evas = ecore_evas_shutdown();
-    }
-    if (ourGlobals->logDom >= 0)
-    {
-      eina_log_domain_unregister(ourGlobals->logDom);
-      ourGlobals->logDom = -1;
-    }
-    ourGlobals->eina = eina_shutdown();
+    eina_log_domain_unregister(ourGlobals->logDom);
+    ourGlobals->logDom = -1;
   }
 
+  elm_shutdown();
+
   return 0;
 }
 
diff --git a/ClientHamr/GuiLua/GuiLua.h b/ClientHamr/GuiLua/GuiLua.h
index 127841f..6debac5 100644
--- a/ClientHamr/GuiLua/GuiLua.h
+++ b/ClientHamr/GuiLua/GuiLua.h
@@ -1,11 +1,9 @@
 
-#include <Eet.h>
-#include <Ecore.h>
-#include <Ecore_Evas.h>
-#include <Edje.h>
 #include <stdio.h>
 #include <ctype.h>
 
+#include <Elementary.h>
+
 #include <lua.h>
 #include <luajit.h>
 #include <lualib.h>
@@ -47,11 +45,9 @@ typedef enum
 
 struct _globals
 {
-  Ecore_Evas    *ee;            // Our window.
-  Evas          *canvas;        // The canvas for drawing directly onto.
-  Evas_Object   *bg;            // Our background edje.
+  Evas_Object   *win;           // Our Elm window.
   lua_State     *L;             // Our Lua state.
-  int           eina, logDom, ecore_evas, edje;
+  int           logDom;         // Our logging domain.
 };
 
 
diff --git a/ClientHamr/GuiLua/build.sh b/ClientHamr/GuiLua/build.sh
index 0ef46b9..076c106 100755
--- a/ClientHamr/GuiLua/build.sh
+++ b/ClientHamr/GuiLua/build.sh
@@ -4,49 +4,17 @@ export LOCALDIR=`pwd`
 
 # No need for a make file, or dependencies, the entire thing takes only a few seconds to build.
 
-# This assumes you have EFL installed in one of two standard places.
-if [ -d "/opt/EFL" ]
-then
-    export E17DIR="/opt/EFL"
-else
-    export E17DIR="/usr"
-fi
 
 CFLAGS="-g -Wall -I include -I $LOCALDIR"
 CFLAGS="$CFLAGS -I ../../libraries"
-#CFLAGS="$CFLAGS -I ../../libraries/LuaJIT-2.0.2/src"
 CFLAGS="$CFLAGS $(pkg-config --cflags luajit)"
-#CFLAGS="$CFLAGS -I /usr/include/lua5.1"
-CFLAGS="$CFLAGS -I $E17DIR/include/eo-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/eina-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/eina-1/eina"
-CFLAGS="$CFLAGS -I $E17DIR/include/eet-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/embryo-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/edje-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/evas-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/efl-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-con-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-evas-1"
-CFLAGS="$CFLAGS -I $E17DIR/include/ecore-file-1"
-CFLAGS="$CFLAGS -I $E17DIR/include"
+CFLAGS="$CFLAGS $(pkg-config --cflags elementary)"
+CFLAGS="$CFLAGS -DPACKAGE_BIN_DIR=\"$LOCALDIR\""
+CFLAGS="$CFLAGS -DPACKAGE_LIB_DIR=\"$LOCALDIR\""
 CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS"
 
-#LDFLAGS="-L ../../libraries/LuaJIT-2.0.2/src -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
-#libs="-leo -lecore -levas -ledje -lembryo -leet -leina -lluajit -lpthread -lm"
-LDFLAGS="-L $LOCALDIR $(pkg-config --libs-only-L luajit) -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
-libs="-leo -lecore -levas -ledje -lembryo -leet -leina $(pkg-config --libs luajit) -lpthread -lm -ldl"
-#LDFLAGS="-L /usr/lib/lua/5.1 -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
-#libs="-lecore -levas -ledje -lembryo -leet -leina -llua5.1 -lpthread -lm"
-# These need to be added to libs if linking staticaly, though some parts of EFL don't like that.
-#-lecore_evas \
-#-lecore_file \
-#-ldl \
-#-lfontconfig \
-#-lfreetype \
-#-lexpat \
-#-lrt \
-#-lz
+LDFLAGS="-L $LOCALDIR $(pkg-config --libs-only-L luajit) -L lib -L /usr/lib -L /lib"
+libs="$(pkg-config --cflags --libs elementary) $(pkg-config --libs luajit) -lpthread -lm -ldl"
 
 echo "clean"
 rm -f test_c.so GuiLua.o libGuiLua.so skang
diff --git a/ClientHamr/GuiLua/skang.c b/ClientHamr/GuiLua/skang.c
index ed92ff9..facc239 100644
--- a/ClientHamr/GuiLua/skang.c
+++ b/ClientHamr/GuiLua/skang.c
@@ -1,11 +1,16 @@
 #include "GuiLua.h"
 
 
-int main(int argc, char **argv)
+EAPI_MAIN int elm_main(int argc, char **argv)
 {
-  int result = EXIT_FAILURE;
+  elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
+  elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
+  elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
+  elm_app_info_set(elm_main, "GuiLua", "skang.lua");
 
   GuiLuaDo(argc, argv);
 
-  return result;
+  return 0;
 }
+
+ELM_MAIN()