Centralise the PACKAGE_* stuff, move our libraries to lib, and shuffle stuff to suit.

7 files changed, 526 insertions, 0 deletions

diff --git a/src/libraries/LumbrJack.c b/src/libraries/LumbrJack.c
new file mode 100644
index 0000000..084d916
--- /dev/null
+++ b/src/libraries/LumbrJack.c
@@ -0,0 +1,85 @@
+/*  LumbrJack - a logging library that wraps Eina logging.
+
+*/
+
+
+#include "LumbrJack.h"
+
+
+static char dateTime[DATE_TIME_LEN];
+
+static void _ggg_log_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args)
+{
+  FILE *f = data;
+  char dt[DATE_TIME_LEN + 1];
+  char fileTab[256], funcTab[256];
+
+  getDateTime(NULL, dt, NULL);
+  dt[19] = '\0';
+  if (12 > strlen(file))
+    snprintf(fileTab, sizeof(fileTab), "%s\t\t", file);
+  else
+    snprintf(fileTab, sizeof(fileTab), "%s\t", file);
+  snprintf(funcTab, sizeof(funcTab), "\t%s", fnc);
+  fprintf(f, "%s ", dt);
+  if (f == stderr)
+    eina_log_print_cb_stderr(d, level, fileTab, funcTab, line, fmt, data, args);
+  else if (f == stdout)
+    eina_log_print_cb_stdout(d, level, fileTab, funcTab, line, fmt, data, args);
+  fflush(f);
+}
+
+int loggingStartup(char *name, int logDom)
+{
+  if (logDom < 0)
+  {
+    logDom = eina_log_domain_register(name, NULL);
+    if (logDom < 0)
+    {
+      EINA_LOG_CRIT("could not register log domain '%s'", name);
+      return logDom;
+    }
+  }
+  eina_log_level_set(EINA_LOG_LEVEL_DBG);
+  eina_log_domain_level_set(name, 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("eldbus", 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_con", 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_input_evas", EINA_LOG_LEVEL_WARN);
+  eina_log_domain_level_set("ecore_system_upower", EINA_LOG_LEVEL_WARN);
+  eina_log_domain_level_set("eio", EINA_LOG_LEVEL_WARN);
+  eina_log_domain_level_set("evas_main", EINA_LOG_LEVEL_WARN);
+
+  return logDom;
+}
+
+char *getDateTime(struct tm **nowOut, char *dateOut, time_t *timeOut)
+{
+  struct tm *newTime;
+  time_t  szClock;
+  char *date = dateTime;
+
+  // Get time in seconds
+  time(&szClock);
+  // Convert time to struct tm form
+  newTime = localtime(&szClock);
+
+  if (nowOut)
+    *nowOut = newTime;
+  if (dateOut)
+    date = dateOut;
+  if (timeOut)
+    *timeOut = szClock;
+
+  // format
+  strftime(date, DATE_TIME_LEN, "%d/%m/%Y %H:%M:%S\r", newTime);
+  return (dateTime);
+}
diff --git a/src/libraries/LumbrJack.h b/src/libraries/LumbrJack.h
new file mode 100644
index 0000000..4a3290c
--- /dev/null
+++ b/src/libraries/LumbrJack.h
@@ -0,0 +1,38 @@
+
+#include <stdio.h>
+#include <ctype.h>
+
+#include <Eina.h>
+
+
+#define PC(...) EINA_LOG_DOM_CRIT(ourGlobals->logDom, __VA_ARGS__)
+#define PE(...) EINA_LOG_DOM_ERR(ourGlobals->logDom, __VA_ARGS__)
+#define PW(...) EINA_LOG_DOM_WARN(ourGlobals->logDom, __VA_ARGS__)
+#define PD(...) EINA_LOG_DOM_DBG(ourGlobals->logDom, __VA_ARGS__)
+#define PI(...) EINA_LOG_DOM_INFO(ourGlobals->logDom, __VA_ARGS__)
+
+#define PCm(...) EINA_LOG_DOM_CRIT(ourGlobals.logDom, __VA_ARGS__)
+#define PEm(...) EINA_LOG_DOM_ERR(ourGlobals.logDom, __VA_ARGS__)
+#define PWm(...) EINA_LOG_DOM_WARN(ourGlobals.logDom, __VA_ARGS__)
+#define PDm(...) EINA_LOG_DOM_DBG(ourGlobals.logDom, __VA_ARGS__)
+#define PIm(...) EINA_LOG_DOM_INFO(ourGlobals.logDom, __VA_ARGS__)
+
+#define D()     PD("DEBUG")
+
+
+// "01:03:52 01-01-1973\n\0"
+#define DATE_TIME_LEN  21
+
+
+#ifndef FALSE
+// NEVER change this
+typedef enum
+{
+  FALSE = 0,
+  TRUE  = 1
+} boolean;
+#endif
+
+
+int loggingStartup(char *name, int logDom);
+char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut);
diff --git a/src/libraries/Runnr.c b/src/libraries/Runnr.c
new file mode 100644
index 0000000..a24e7f5
--- /dev/null
+++ b/src/libraries/Runnr.c
@@ -0,0 +1,318 @@
+/*  Runnr - a library that deals with running Lua scripts.
+
+*/
+
+
+#include "Runnr.h"
+
+
+void dumpStack(lua_State *L, int i)
+{
+  int type = lua_type(L, i);
+
+  switch (type)
+  {
+    case LUA_TNONE              :  printf("Stack %d is empty\n", i);  break;
+    case LUA_TNIL               :  printf("Stack %d is a nil\n", i);  break;
+    case LUA_TBOOLEAN           :  printf("Stack %d is a boolean - %d\n", i, lua_toboolean(L, i));  break;
+    case LUA_TNUMBER            :  printf("Stack %d is a number\n - %f", i, lua_tonumber(L, i));  break;
+    case LUA_TSTRING            :  printf("Stack %d is a string - %s\n", i, lua_tostring(L, i));  break;
+    case LUA_TFUNCTION          :  printf("Stack %d is a function\n", i);  break;
+    case LUA_TTHREAD            :  printf("Stack %d is a thread\n", i);  break;
+    case LUA_TTABLE             :
+    {
+      int j;
+
+      printf("Stack %d is a table", i);
+      lua_getfield(L, i, "_NAME");
+      j = lua_gettop(L);
+      if (lua_isstring(L, j))
+        printf(" - %s", lua_tostring(L, j));
+      lua_pop(L, 1);
+      printf("\n");
+      break;
+    }
+    case LUA_TUSERDATA          :  printf("Stack %d is a userdata\n", i);  break;
+    case LUA_TLIGHTUSERDATA     :  printf("Stack %d is a light userdata\n", i);  break;
+    default                     :  printf("Stack %d is unknown\n", i);  break;
+  }
+}
+
+
+// These are what the various symbols are for each type -
+//  int         %
+//  num         #
+//  str         $
+//  bool        !
+//  C func      &
+//  table.field @  Expects an integer and a string.
+//  nil         ~
+//  table       {} Starts and stops filling up a new table.
+//              (  Just syntax sugar for call.
+//  call        )  Expects an integer, the number of results left after the call.
+// FIXME: Still to do, if we ever use them -
+//  stack       =  Get a value from the stack, expects a stack index.
+//  userdata    +
+//  lightuserdata       *
+//  thread      ^
+
+static char *_push_name(lua_State *L, char *q, int *idx)  // Stack usage [-0, +1, e or m]
+{
+  char *p = q;
+  char temp = '\0';
+
+  // A simplistic scan through an identifier, it's wrong, but it's quick,
+  // and we don't mind that it's wrong, coz this is only internal.
+  while (isalnum((int)*q))
+    q++;
+  temp = *q;
+  *q = '\0';
+  if (*idx > 0)
+    lua_getfield(L, *idx, p);    // Stack usage [-0, +1, e]
+  else
+  {
+    if (p != q)
+      lua_pushstring(L, p);       // Stack usage [-0, +1, m]
+    else
+    {
+      lua_pushnumber(L, (lua_Number) (0 - (*idx)));
+      (*idx)--;
+    }
+  }
+  *q = temp;
+
+  return q;
+}
+
+int pull_lua(lua_State *L, int i, char *params, ...)         // Stack usage -
+                                                             // if i is a table
+                                                             //   [-n, +n, e]
+                                                             // else
+                                                             //   [-0, +0, -]
+{
+   va_list vl;
+   char *f = strdup(params);
+   char *p = f;
+   int n = 0, j = i, count = 0;
+   Eina_Bool table = EINA_FALSE;
+
+   if (!f) return -1;
+   va_start(vl, params);
+
+   if (lua_istable(L, i))                                                // Stack usage [-0, +0, -]
+     {
+        j = -1;
+        table = EINA_TRUE;
+     }
+
+   while (*p)
+     {
+        char *q;
+        Eina_Bool get = EINA_TRUE;
+
+        while (isspace((int)*p))
+           p++;
+        q = p + 1;
+        switch (*p)
+          {
+             case '%':
+               {
+                  if (table)  q = _push_name(L, q, &i);                     // Stack usage [-0, +1, e]
+                  if (lua_isnumber(L, j))                                // Stack usage [-0, +0, -]
+                    {
+                       int *v = va_arg(vl, int *);
+                       *v = lua_tointeger(L, j);                         // Stack usage [-0, +0, -]
+                       n++;
+                    }
+                  break;
+               }
+             case '#':
+               {
+                  if (table)  q = _push_name(L, q, &i);                     // Stack usage [-0, +1, e]
+                  if (lua_isnumber(L, j))                                // Stack usage [-0, +0, -]
+                    {
+                       double *v = va_arg(vl, double *);
+                       *v = lua_tonumber(L, j);                          // Stack usage [-0, +0, -]
+                       n++;
+                    }
+                  break;
+               }
+             case '$':
+               {
+                  if (table)  q = _push_name(L, q, &i);                     // Stack usage [-0, +1, e]
+                  if (lua_isstring(L, j))                                // Stack usage [-0, +0, -]
+                    {
+                       char **v = va_arg(vl, char **);
+                       size_t len;
+                       char *temp = (char *) lua_tolstring(L, j, &len);  // Stack usage [-0, +0, m]
+
+                       len++;  // Cater for the null at the end.
+                       *v = malloc(len);
+                       if (*v)
+                         {
+                            memcpy(*v, temp, len);
+                            n++;
+                         }
+                    }
+                  break;
+               }
+             case '!':
+               {
+                  if (table)  q = _push_name(L, q, &i);                     // Stack usage [-0, +1, e]
+                  if (lua_isboolean(L, j))                               // Stack usage [-0, +0, -]
+                    {
+                       int *v = va_arg(vl, int *);
+                       *v = lua_toboolean(L, j);                         // Stack usage [-0, +0, -]
+                       n++;
+                    }
+                  break;
+               }
+             default:
+               {
+                  get = EINA_FALSE;
+                  break;
+               }
+          }
+
+        if (get)
+          {
+             if (table)
+               {
+                  // If this is a table, then we pushed a value on the stack, pop it off.
+                  lua_pop(L, 1);                                         // Stack usage [-n, +0, -]
+               }
+            else
+                j++;
+            count++;
+          }
+        p = q;
+     }
+
+   va_end(vl);
+   free(f);
+   if (count > n)
+      n = 0;
+   else if (table)
+     n = 1;
+   return n;
+}
+
+int push_lua(lua_State *L, char *params, ...)       // Stack usage [-0, +n, em]
+{
+  va_list vl;
+  char *f = strdup(params);
+  char *p = f;
+  int n = 0, table = 0, i = -1;
+
+  if (!f) return -1;
+
+  va_start(vl, params);
+
+  while (*p)
+  {
+    char *q;
+    Eina_Bool set = EINA_TRUE;
+
+    while (isspace((int)*p))
+      p++;
+    q = p + 1;
+    switch (*p)
+    {
+      case '%':
+      {
+        if (table)  q = _push_name(L, q, &i);   // Stack usage [-0, +1, m]
+        lua_pushinteger(L, va_arg(vl, int));    // Stack usage [-0, +1, -]
+        break;
+      }
+      case '#':
+      {
+        if (table)  q = _push_name(L, q, &i);   // Stack usage [-0, +1, m]
+        lua_pushnumber(L, va_arg(vl, double));  // Stack usage [-0, +1, -]
+        break;
+      }
+      case '$':
+      {
+        if (table)  q = _push_name(L, q, &i);   // Stack usage [-0, +1, m]
+        lua_pushstring(L, va_arg(vl, char *));  // Stack usage [-0, +1, m]
+        break;
+      }
+      case '!':
+      {
+        if (table)  q = _push_name(L, q, &i);   // Stack usage [-0, +1, m]
+        lua_pushboolean(L, va_arg(vl, int));    // Stack usage [-0, +1, -]
+        break;
+      }
+      case '=':
+      {
+        if (table)  q = _push_name(L, q, &i);   // Stack usage [-0, +1, m]
+        lua_pushvalue(L, va_arg(vl, int));      // Stack usage [-0, +1, -]
+        break;
+      }
+      case '@':
+      {
+        int   tabl = va_arg(vl, int);
+        char *field = va_arg(vl, char *);
+
+        if (table)  q = _push_name(L, q, &i);   // Stack usage [-0, +1, m]
+        lua_getfield(L, tabl, field);           // Stack usage [-0, +1, e]
+        break;
+      }
+      case '&':
+      {
+        if (table)  q = _push_name(L, q, &i);     // Stack usage [-0, +1, m]
+        lua_pushcfunction(L, va_arg(vl, void *)); // Stack usage [-0, +1, m]
+        break;
+      }
+      case '~':
+      {
+        if (table)  q = _push_name(L, q, &i);   // Stack usage [-0, +1, m]
+        lua_pushnil(L);                         // Stack usage [-0, +1, -]
+        break;
+      }
+      case '(':         // Just syntax sugar.
+      {
+        set = EINA_FALSE;
+        break;
+      }
+      case ')':
+      {
+        lua_call(L, n - 1, va_arg(vl, int));
+        n = 0;
+        set = EINA_FALSE;
+        break;
+      }
+      case '{':
+      {
+        lua_newtable(L);
+        table++;
+        n++;
+        set = EINA_FALSE;
+        break;
+      }
+      case '}':
+      {
+        table--;
+        set = EINA_FALSE;
+        break;
+      }
+      default:
+      {
+        set = EINA_FALSE;
+        break;
+      }
+    }
+
+    if (set)
+    {
+      if (table > 0)
+        lua_settable(L, -3);                         // Stack usage [-2, +0, e]
+      else
+        n++;
+    }
+    p = q;
+  }
+
+  va_end(vl);
+  free(f);
+  return n;
+}
diff --git a/src/libraries/Runnr.h b/src/libraries/Runnr.h
new file mode 100644
index 0000000..dc720ff
--- /dev/null
+++ b/src/libraries/Runnr.h
@@ -0,0 +1,15 @@
+
+#include <stdio.h>
+#include <ctype.h>
+
+#include <Eina.h>
+
+#include <lua.h>
+#include <luajit.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+
+void dumpStack(lua_State *L, int i);
+int pull_lua(lua_State *L, int i, char *params, ...);
+int push_lua(lua_State *L, char *params, ...);
diff --git a/src/libraries/SledjHamr.c b/src/libraries/SledjHamr.c
new file mode 100644
index 0000000..aa68774
--- /dev/null
+++ b/src/libraries/SledjHamr.c
@@ -0,0 +1,23 @@
+#include "SledjHamr.h"
+
+void HamrTime(void *elm_main, char *domain)
+{
+  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_compile_locale_set(PACKAGE_LOCALE_DIR);
+  // Do this after the above calls, but before changing the working directory, or screwing with argv[0].
+  // It tries to set up the package paths depending on where the executable is, so things are relocatable.
+  // First argument is the elm_main() function that Elementary starts us from.
+  // Second argument should be a lower case string used as the "domain", which is different from the log domain.
+  //   It's used lower case as part of the data directory path.
+  //     So, if prefix is /usr/local, then the system data dir is /usr/local/share,
+  //     and this apps data dir is /usr/local/share/"domain".
+  //   It's used upper case as part of environment variables to override directory paths at run time.
+  //     So "DOMAIN"_PREFIX, "DOMAIN"_BIN_DIR, "DOMAIN"_LIB_DIR, "DOMAIN"_DATA_DIR, and "DOMAIN"_LOCALE_DIR
+  // Third argument is the name of a file it can check for to make sure it found the correct path.
+  //  This file is looked for in the data dir.
+  elm_app_info_set(elm_main, domain, "checkme.txt");
+  // Once this is all setup, the code can do -
+  // elm_app_prefix_dir_get();  // or bin, lib, data, locale.
+}
diff --git a/src/libraries/SledjHamr.h b/src/libraries/SledjHamr.h
new file mode 100644
index 0000000..893d90e
--- /dev/null
+++ b/src/libraries/SledjHamr.h
@@ -0,0 +1,14 @@
+
+#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 <stdio.h>
+#include <ctype.h>
+
+#include <Elementary.h>
+
+
+void HamrTime(void *elm_main, char *domain);
diff --git a/src/libraries/build.lua b/src/libraries/build.lua
new file mode 100755
index 0000000..6566e66
--- /dev/null
+++ b/src/libraries/build.lua
@@ -0,0 +1,33 @@
+#!/usr/bin/env lua
+
+local dir = ...
+
+if 'nil' == type(dir) then
+  local build, err = loadfile('../../build.lua')
+  if build then
+    setfenv(build, getfenv(2))
+    build(2)
+  else
+    print("ERROR - " .. err)
+  end
+  dir = workingDir
+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'})
+
+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')
+
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -fPIC -c Runnr.c')
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libRunnr.so -o ' .. lib_d .. '/libRunnr.so Runnr.o')
+
+-- For Elm apps, these are all centrally controlled in libSledjHamr.
+CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'    .. bin_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'    .. lib_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"'   .. data_d   .. '\\"'
+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')