Rearrange things in the libraries.

10 files changed, 71 insertions, 73 deletions

diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 3791c94..c6ac70a 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -1,6 +1,7 @@
 
 #include "LuaSL.h"
 #include "Runnr.h"
+#include "SledjHamr.h"
 
 /* TODO - problem de jour
 */
diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c
index c2a4855..32ed090 100644
--- a/src/LuaSL/LuaSL_main.c
+++ b/src/LuaSL/LuaSL_main.c
@@ -1,6 +1,7 @@
 
 #include "LuaSL.h"
 #include "Runnr.h"
+#include "SledjHamr.h"
 
 
 int logDom;     // Our logging domain.
diff --git a/src/libraries/Runnr.c b/src/libraries/Runnr.c
index 238bfb2..b775e19 100644
--- a/src/libraries/Runnr.c
+++ b/src/libraries/Runnr.c
@@ -402,37 +402,3 @@ int push_lua(lua_State *L, char *params, ...)       // Stack usage [-0, +n, em]
   free(f);
   return n;
 }
-
-void sendBack(Ecore_Con_Client *client, const char *SID, const char *message, ...)
-{
-    va_list args;
-    char buf[PATH_MAX];
-    int length = strlen(SID);
-
-    strncpy(buf, SID, length);
-    buf[length++] = '.';
-    va_start(args, message);
-    length += vsprintf(&buf[length], message, args);
-    va_end(args);
-    buf[length++] = '\n';
-    buf[length++] = '\0';
-    ecore_con_client_send(client, buf, strlen(buf));
-    ecore_con_client_flush(client);
-}
-
-void sendForth(Ecore_Con_Server *server, const char *SID, const char *message, ...)
-{
-    va_list args;
-    char buf[PATH_MAX];
-    int length = strlen(SID);
-
-    strncpy(buf, SID, length);
-    buf[length++] = '.';
-    va_start(args, message);
-    length += vsprintf(&buf[length], message, args);
-    va_end(args);
-    buf[length++] = '\n';
-    buf[length++] = '\0';
-    ecore_con_server_send(server, buf, strlen(buf));
-    ecore_con_server_flush(server);
-}
diff --git a/src/libraries/Runnr.h b/src/libraries/Runnr.h
index 5e3629d..0e0fc73 100644
--- a/src/libraries/Runnr.h
+++ b/src/libraries/Runnr.h
@@ -4,7 +4,6 @@
 #include <ctype.h>
 
 #include <Eina.h>
-#include <Ecore_Con.h>
 
 #include <lua.h>
 #include <luajit.h>
@@ -17,7 +16,4 @@ void doLuaString(lua_State *L, char *string, char *module);
 int pull_lua(lua_State *L, int i, char *params, ...);
 int push_lua(lua_State *L, char *params, ...);
 
-void sendBack(Ecore_Con_Client *client, const char *SID, const char *message, ...);
-void sendForth(Ecore_Con_Server *server, const char *SID, const char *message, ...);
-
 #endif
diff --git a/src/libraries/SledjHamr.c b/src/libraries/SledjHamr.c
index 6137199..2d6ed3a 100644
--- a/src/libraries/SledjHamr.c
+++ b/src/libraries/SledjHamr.c
@@ -1,36 +1,35 @@
 #include "SledjHamr.h"
 
-void HamrTime(void *elm_main, char *domain)
+void sendBack(Ecore_Con_Client *client, const char *SID, const char *message, ...)
 {
-  char *env, cwd[PATH_MAX], temp[PATH_MAX * 2];
+    va_list args;
+    char buf[PATH_MAX];
+    int length = strlen(SID);
 
-  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.
+    strncpy(buf, SID, length);
+    buf[length++] = '.';
+    va_start(args, message);
+    length += vsprintf(&buf[length], message, args);
+    va_end(args);
+    buf[length++] = '\n';
+    buf[length++] = '\0';
+    ecore_con_client_send(client, buf, strlen(buf));
+    ecore_con_client_flush(client);
+}
 
-  getcwd(cwd, PATH_MAX);
-  env = getenv("LUA_CPATH");
-  if (!env)  env = "";
-  sprintf(temp, "%s;%s/lib?.so;%s/?.so;%s/?.so", env, elm_app_lib_dir_get(), elm_app_lib_dir_get(), cwd);
-  setenv("LUA_CPATH", temp, 1);
+void sendForth(Ecore_Con_Server *server, const char *SID, const char *message, ...)
+{
+    va_list args;
+    char buf[PATH_MAX];
+    int length = strlen(SID);
 
-  env = getenv("LUA_PATH");
-  if (!env)  env = "";
-  sprintf(temp, "%s;%s/?.lua;%s/?.lua", env, elm_app_lib_dir_get(), cwd);
-  setenv("LUA_PATH", temp, 1);
+    strncpy(buf, SID, length);
+    buf[length++] = '.';
+    va_start(args, message);
+    length += vsprintf(&buf[length], message, args);
+    va_end(args);
+    buf[length++] = '\n';
+    buf[length++] = '\0';
+    ecore_con_server_send(server, buf, strlen(buf));
+    ecore_con_server_flush(server);
 }
diff --git a/src/libraries/SledjHamr.h b/src/libraries/SledjHamr.h
index aee845d..548c5e0 100644
--- a/src/libraries/SledjHamr.h
+++ b/src/libraries/SledjHamr.h
@@ -8,15 +8,14 @@
 /* Enable access to unstable EFL EO API. */
 #define EFL_EO_API_SUPPORT 1
 
-//#include <ctype.h>
 #include <stdlib.h>
 
-#include <Elementary.h>
+#include <Ecore_Con.h>
 
 
 #define ARRAY_LENGTH(array) (sizeof(array) / sizeof(*array))
 
-
-void HamrTime(void *elm_main, char *domain);
+void sendBack(Ecore_Con_Client *client, const char *SID, const char *message, ...);
+void sendForth(Ecore_Con_Server *server, const char *SID, const char *message, ...);
 
 #endif
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c
index 5662970..dc5188a 100644
--- a/src/libraries/winFang.c
+++ b/src/libraries/winFang.c
@@ -1,7 +1,40 @@
 #include "winFang.h"
 
 
-
+void HamrTime(void *elm_main, char *domain)
+{
+  char *env, cwd[PATH_MAX], temp[PATH_MAX * 2];
+
+  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.
+
+  getcwd(cwd, PATH_MAX);
+  env = getenv("LUA_CPATH");
+  if (!env)  env = "";
+  sprintf(temp, "%s;%s/lib?.so;%s/?.so;%s/?.so", env, elm_app_lib_dir_get(), elm_app_lib_dir_get(), cwd);
+  setenv("LUA_CPATH", temp, 1);
+
+  env = getenv("LUA_PATH");
+  if (!env)  env = "";
+  sprintf(temp, "%s;%s/?.lua;%s/?.lua", env, elm_app_lib_dir_get(), cwd);
+  setenv("LUA_PATH", temp, 1);
+}
 
 static void _checkWindowBounds(winFang *win, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
 {
diff --git a/src/libraries/winFang.h b/src/libraries/winFang.h
index 3d721ef..bae3082 100644
--- a/src/libraries/winFang.h
+++ b/src/libraries/winFang.h
@@ -89,6 +89,8 @@ typedef struct _Widget
   Evas_Smart_Cb on_del;
 } Widget;
 
+void HamrTime(void *elm_main, char *domain);
+
 winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, char *name, EPhysics_World *world);
 void winFangHide(winFang *win);
 void winFangShow(winFang *win);
diff --git a/src/love/love.c b/src/love/love.c
index b8b4645..82c6eb1 100644
--- a/src/love/love.c
+++ b/src/love/love.c
@@ -18,6 +18,7 @@ Dedicated to my girl Boots, coz she means the world to me.
 
 #include "LumbrJack.h"
 #include "Runnr.h"
+#include "SledjHamr.h"
 
 
 #define WIDTH  (512)
diff --git a/src/purkle/purkle.c b/src/purkle/purkle.c
index 62f78a2..6770ff4 100644
--- a/src/purkle/purkle.c
+++ b/src/purkle/purkle.c
@@ -1,7 +1,7 @@
 //#include "LumbrJack.h"
 #include "GuiLua.h"
 #include "Runnr.h"
-#include "winFang.h"
+#include "SledjHamr.h"
 
 
 static const char *ourName = "purkle";