9 files changed, 106 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index f362a55..89c6cfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /docs/XMRE.txt
 /extantz
+/love
 /LuaSL
 /skang
 /libraries/irrlicht-1.8.1/bin/Linux/01.HelloWorld
diff --git a/build.lua b/build.lua
index 1128d71..bf8a460 100755
--- a/build.lua
+++ b/build.lua
@@ -94,6 +94,7 @@ if 'nil' == type(args) then
   runCommand('Irrlicht','libraries/irrlicht-1.8.1/source/Irrlicht', 'make')
   buildSub('libraries', 'src/libraries')
   buildSub('LuaSL',     'src/LuaSL')
+  buildSub('love',      'src/love')
   buildSub('GuiLua',    'src/GuiLua')
   buildSub('purkle',    'src/purkle')
   buildSub('extantz',   'src/extantz')
diff --git a/docs/README.Lspace b/docs/README.Lspace
index a86de96..2eb9b24 100644
--- a/docs/README.Lspace
+++ b/docs/README.Lspace
@@ -1 +1,3 @@
-Sim contents server, which is pretty much a web server.
+Sim contents server, which is pretty much a web server.  Should support
+WebDAV so people can point their file browsers at it.  More details in
+love.txt.
diff --git a/docs/love.txt b/docs/love.txt
new file mode 100644
index 0000000..c704aba
--- /dev/null
+++ b/docs/love.txt
@@ -0,0 +1,67 @@
+Love makes the world go around.  Though in this case, it's the name of
+the world server, the module that directly controls what happens to the
+content of the virtual world.
+
+The love world server that deals with changing the world.  It manages
+the on disk representation of the world, and lets others screw with it
+via nails pumps.  Love also sends nails events on changes.
+
+World server vs local world.
+----------------------------
+
+Extantz defaults to running a local world at start up.  Lspace serves
+the content for a networked world.  They may be the same world if the
+local world is also networked.  Nails pumps commands to and from the
+world.
+
+Lspace just serves the results as a web server.  The love world server
+changes on disk content, Lspace checks on disk modified time stamps to
+deal with "do you have a newer version" HTTP requests.  Standard web
+server stuff really, though a mod_nails might be useful to catch events
+in order to invalidate any internal web caches.
+
+For networked worlds, Extantz fetches new content from Lspace, and hooks
+up to the nails pump of the love server for changes.  For local worlds,
+extantz would basically BE the world server?  No, that duplicates
+things, it can just run a local love server, then connect to it like
+every one else.  No need to connect to a local Lspace server, just deal
+with the file system direct.
+
+The local love server would be configured to listen on 127.0.0.1, and/or
+the outside IP address.  Extantz checks to see if there's one running on
+127.0.0.1 first before starting one if needed.
+
+Separate vs combined.
+---------------------
+
+There's two ways of doing this.  The world server could be part of
+Lspace, or they could be separate modules.  What we really have is a web
+server, backing store, and command pump.  The command pump is nails, and
+should be a library that is shared, since both ends of the protocol
+would be needed by most modules.
+
+Combined might be useful to conserve resources.  They both need to deal
+with the contents of the world.  Lspace just serves it to the outside
+world via HTTP, but needs to track changes.  Love makes those changes,
+and also sends changes via nails to every one.  Keeping the current
+working set in memory only once saves a lot of memory.
+
+The down sides of combined is that one might bog down the other, and it
+gets harder to use standard web servers.
+
+Separated is good coz Lspace might just be any ordinary web server. 
+They already have mechanisms in place to serve dynamic data, and even
+deal with changes to the files.
+
+The down side of separated is that changes might be slower propogating
+to the web server, and there might be two copies of any given set of
+assets in memory at once.
+
+A third option is to be separated, but any given web server could have a
+mod_love type module written for it.  This could share memory with the
+love server process.  So tighter integration is an option, but they can
+work apart.  Changes happen in this shared memory, driven by the command
+pump in the love server.  Lspace just needs read access, and just
+serves the current state of the world.  Love server persists to disk
+when it's ready to, though the shared memory can just be memory mapped
+files.
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index 4bf0c09..0efcca3 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -14,19 +14,16 @@ if 'nil' == type(dir) then
 end
 
 
-removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', '../../media/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
+removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
 
 -- Run lemon first, flex depends on it to define the symbol values.
 runCommand('lemon',   dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
 runCommand('flex',    dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
-runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj')
 
 -- While SledHamr.c does this, we can't use that here, coz LuaSL is not an Elm app.
--- Neither is LuaSL_test actually.
 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 .. '\\"'
 
 compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '')
-compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'}, '')
diff --git a/src/LuaSL/test.sh b/src/LuaSL/test.sh
index 435c5e2..e8471c8 100755
--- a/src/LuaSL/test.sh
+++ b/src/LuaSL/test.sh
@@ -20,8 +20,8 @@ case $@ in
         echo "_______________ STARTING LuaSL _______________"
         ../../LuaSL &
         sleep 1
-        echo "_______________ STARTING LuaSL_test _______________"
-        ./LuaSL_test
+        echo "_______________ STARTING love _______________"
+        ../../love
         ;;
 
 esac
diff --git a/src/love/build.lua b/src/love/build.lua
new file mode 100755
index 0000000..c1a52e2
--- /dev/null
+++ b/src/love/build.lua
@@ -0,0 +1,27 @@
+#!/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
+
+
+removeFiles(dir, {'../../love', '*.o', '../../media/love.edj'})
+
+runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ../../media/love.edj')
+
+-- While SledHamr.c does this, we can't use that here, coz love is not an Elm app.
+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 .. '\\"'
+
+compileFiles('../../love', dir, {'love', '../LuaSL/LuaSL_utilities'}, '')
diff --git a/src/LuaSL/LuaSL_test.c b/src/love/love.c
index 8fc86c0..e30c8ac 100644
--- a/src/LuaSL/LuaSL_test.c
+++ b/src/love/love.c
@@ -1,5 +1,5 @@
 
-#include "LuaSL.h"
+#include "../LuaSL/LuaSL.h"
 
 
 int logDom;     // Our logging domain.
@@ -314,7 +314,7 @@ int main(int argc, char **argv)
 
     if (eina_init())
     {
-        logDom = loggingStartup("LuaSL_test", logDom);
+        logDom = loggingStartup("love", logDom);
         ourGlobals.scripts = eina_hash_string_superfast_new(NULL);
 
         if (ecore_con_init())
@@ -380,7 +380,7 @@ int main(int argc, char **argv)
                                     return -1;
                                 }
                                 ourGlobals.canvas = ecore_evas_get(ourGlobals.ee);
-                                ecore_evas_title_set(ourGlobals.ee, "LuaSL test harness");
+                                ecore_evas_title_set(ourGlobals.ee, "love test harness (snickers)");
                                 ecore_evas_show(ourGlobals.ee);
 
                                 ourGlobals.bg = evas_object_rectangle_add(ourGlobals.canvas);
@@ -393,7 +393,7 @@ int main(int argc, char **argv)
                                 evas_object_focus_set(ourGlobals.bg, EINA_TRUE);
 
                                 ourGlobals.edje = edje_object_add(ourGlobals.canvas);
-                                snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
+                                snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, "love");
                                 if (!edje_object_file_set(ourGlobals.edje, buf, group))
                                 {
                                     int err = edje_object_load_error_get(ourGlobals.edje);
diff --git a/src/LuaSL/LuaSL.edc b/src/love/love.edc
index 844fc8e..844fc8e 100644
--- a/src/LuaSL/LuaSL.edc
+++ b/src/love/love.edc