1 files changed, 81 insertions, 248 deletions

diff --git a/LuaSL/src/LuaSL_main.c b/LuaSL/src/LuaSL_main.c
index d6485df..621aad2 100644
--- a/LuaSL/src/LuaSL_main.c
+++ b/LuaSL/src/LuaSL_main.c
@@ -2,295 +2,128 @@
 #include "LuaSL.h"
 
 
-static int scriptCount;
-
-static const char *names[] =
-{
-     "bub1", "sh1",
-     "bub2", "sh2",
-     "bub3", "sh3",
-};
+Eina_Strbuf *clientStream;
 
 
-static void
-_edje_signal_cb(void *data, Evas_Object *obj __UNUSED__, const char  *emission, const char  *source)
+Eina_Bool _add(void *data, int type __UNUSED__, Ecore_Con_Event_Client_Add *ev)
 {
-//    gameGlobals *game = data;
+    ecore_con_client_timeout_set(ev->client, 0);
+    return ECORE_CALLBACK_RENEW;
 }
 
-static
-Eina_Bool anim(void *data)
+Eina_Bool _del(void *data, int type __UNUSED__, Ecore_Con_Event_Client_Del *ev)
 {
     gameGlobals *game = data;
-    Evas_Object *bub, *sh;
-    Evas_Coord x, y, w, h, vw, vh;
-    double t, xx, yy, zz, r, fac;
-    double lx, ly;
-    unsigned int i;
 
-    evas_output_viewport_get(game->canvas, 0, 0, &vw, &vh);
-    r = 48;
-    t = ecore_loop_time_get();
-    fac = 2.0 / (double)((sizeof(names) / sizeof(char *) / 2));
-    evas_pointer_canvas_xy_get(game->canvas, &x, &y);
-    lx = x;
-    ly = y;
-
-    for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
+    if (ev->client)
     {
-        bub = evas_object_data_get(game->bg, names[i * 2]);
-        sh = evas_object_data_get(game->bg, names[(i * 2) + 1]);
-        zz = (((2 + sin(t * 6 + (M_PI * (i * fac)))) / 3) * 64) * 2;
-        xx = (cos(t * 4 + (M_PI * (i * fac))) * r) * 2;
-        yy = (sin(t * 6 + (M_PI * (i * fac))) * r) * 2;
-
-        w = zz;
-        h = zz;
-        x = (vw / 2) + xx - (w / 2);
-        y = (vh / 2) + yy - (h / 2);
-
-        evas_object_move(bub, x, y);
-        evas_object_resize(bub, w, h);
-
-        x = x - ((lx - (x + (w / 2))) / 4);
-        y = y - ((ly - (y + (h / 2))) / 4);
-
-        evas_object_move(sh, x, y);
-        evas_object_resize(sh, w, h);
-        evas_object_raise(sh);
-        evas_object_raise(bub);
+        PD("No more clients, exiting.");
+        ecore_con_client_del(ev->client);
+        ecore_main_loop_quit();
     }
     return ECORE_CALLBACK_RENEW;
 }
 
-static void
-_on_delete(Ecore_Evas *ee __UNUSED__)
-{
-   ecore_main_loop_quit();
-}
-
-static void dirList_compile(const char *name, const char *path, void *data)
+Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Client_Data *ev)
 {
     gameGlobals *game = data;
-    char buf[PATH_MAX];
-    char *ext = rindex(name, '.');
+    char SID[PATH_MAX];
+    const char *command;
+    char *ext;
 
-    if (ext)
+    eina_strbuf_append_length(clientStream, ev->data, ev->size);
+    command = eina_strbuf_string_get(clientStream);
+    while ((ext = index(command, '\n')))
     {
-        if ((!LUASL_DEBUG) || (0 == scriptCount))
+        int length = ext - command;
+
+        strncpy(SID, command, length + 1);
+        SID[length] = '\0';
+        eina_strbuf_remove(clientStream, 0, length + 1);
+        ext = rindex(SID, '.');
+        if (ext)
         {
-            if (0 == strcmp(ext, ".lsl"))
+            ext[0] = '\0';
+            command = ext + 1;
+            if (0 == strcmp(command, "compile()"))
             {
-                scriptCount++;
-                snprintf(buf, sizeof(buf), "%s/%s", path, name);
-                if (compileLSL(game, buf, FALSE))
-                    PD("The compile of %s worked,", buf);
+                if (compileLSL(game, SID, FALSE))
+                    PD("The compile of %s worked.", SID);
                 else
-                    PE("The compile of %s failed!", buf);
+                    PE("The compile of %s failed!", SID);
             }
-        }
-    }
-}
-
-static void dirList_run(const char *name, const char *path, void *data)
-{
-    gameGlobals *game = data;
-    char buf[PATH_MAX];
-    char *ext = rindex(name, '.');
+            else if (0 == strcmp(command, "start()"))
+            {
+                runLuaFile(game, SID);
+            }
+            else if (0 == strcmp(command, "exit()"))
+            {
+                PD("Told to exit.");
+                ecore_main_loop_quit();
+            }
+            else
+            {
+                char temp[PATH_MAX];
+                const char *status = NULL;
 
-    if (ext)
-    {
-        if (0 == strcmp(ext, ".out"))
-        {
-            snprintf(buf, sizeof(buf), "%s/%s", path, name);
-//          PD("Running Lua script %s", buf);
-            runLuaFile(game, buf);
+                snprintf(temp, sizeof(temp), "%s.events", SID);
+                status = sendToChannel(temp, command, NULL, NULL);
+                if (status)
+                    PE("Error sending command %s to script %s : %s", command, temp, status);
+            }
         }
-    }
-}
 
-static void dirList_quit(const char *name, const char *path, void *data)
-{
-    gameGlobals *game = data;
-    char buf[PATH_MAX];
-    char *ext = rindex(name, '.');
-
-    if (ext)
-    {
-        if (0 == strcmp(ext, ".out"))
-        {
-            const char *status = NULL;
-
-            snprintf(buf, sizeof(buf), "%s/%s.events", path, name);
-//          PD("Quitting Lua script %s", buf);
-            status = sendToChannel(buf, "quit()", NULL, NULL);
-            if (status)
-                PE("Error trying to kill script %s : %s", buf, status);
-        }
+        // Get the next blob to check it.
+        command = eina_strbuf_string_get(clientStream);
     }
+
+   return ECORE_CALLBACK_RENEW;
 }
 
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-    /* put here any init specific to this app like parsing args etc. */
     gameGlobals game;
-    char *programName = argv[0];
-    boolean badArgs = FALSE;
-
-    if (!ecore_evas_init())
-        return EXIT_FAILURE;
-
-    if (!edje_init())
-    {
-        ecore_evas_shutdown();
-        return EXIT_FAILURE;
-    }
+    int result = EXIT_FAILURE;
 
     memset(&game, 0, sizeof(gameGlobals));
+    game.address = "127.0.01";
+    game.port = 8211;
 
-    loggingStartup(&game);
-
-    // get the arguments passed in
-    while (--argc > 0 && *++argv != '\0')
+    if (eina_init())
     {
-        if (*argv[0] == '-')
+        loggingStartup(&game);
+        if (ecore_con_init())
         {
-            // point to the characters after the '-' sign
-            char *s = argv[0] + 1;
-
-            switch (*s)
+            if ((game.server = ecore_con_server_add(ECORE_CON_REMOTE_TCP, game.address, game.port, &game)))
             {
-                case 'u':
+                ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD,  (Ecore_Event_Handler_Cb) _add,  &game);
+                ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL,  (Ecore_Event_Handler_Cb) _del,  &game);
+                ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA, (Ecore_Event_Handler_Cb) _data, &game);
+                ecore_con_server_timeout_set(game.server, 0);
+                ecore_con_server_client_limit_set(game.server, -1, 0);
+                clientStream = eina_strbuf_new();
+
+                if (edje_init())
                 {
-                    game.ui = TRUE;
-                    break;
+                    result = 0;
+                    compilerSetup(&game);
+                    runnerSetup(&game);
+                    ecore_main_loop_begin();
+                    runnerTearDown(&game);
+                    edje_shutdown();
                 }
-                default:
-                    badArgs = TRUE;
+                else
+                    PCm("Failed to init edje!");
             }
+            else
+                PCm("Failed to add server!");
+            ecore_con_shutdown();
         }
         else
-            badArgs = TRUE;
-    }
-
-
-    if (badArgs)
-    {
-        // display the program usage to the user as they have it wrong
-        printf("Usage: %s [-u]\n", programName);
-        printf("   -u: Show the test UI.\n");
+            PCm("Failed to init ecore_con!");
     }
     else
-//    else if ((game.config) && (game.data))
-    {
-        unsigned int i;
-        Evas_Object *bub, *sh;
-        Ecore_Animator *ani;
-        char *group = "main";
-        char buf[PATH_MAX];
-        struct timeval lastTime2;
-        struct timeval thisTime2;
-        float diff;
-
-        if (game.ui)
-        {
-            /* this will give you a window with an Evas canvas under the first engine available */
-            game.ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
-            if (!game.ee)
-            {
-                PEm("You got to have at least one evas engine built and linked up to ecore-evas for this example to run properly.");
-                edje_shutdown();
-                ecore_evas_shutdown();
-                return -1;
-            }
-            game.canvas = ecore_evas_get(game.ee);
-            ecore_evas_title_set(game.ee, "LuaSL test harness");
-            ecore_evas_show(game.ee);
-
-            game.bg = evas_object_rectangle_add(game.canvas);
-            evas_object_color_set(game.bg, 255, 255, 255, 255); /* white bg */
-            evas_object_move(game.bg, 0, 0); /* at canvas' origin */
-            evas_object_size_hint_weight_set(game.bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-            evas_object_resize(game.bg, WIDTH, HEIGHT); /* covers full canvas */
-            evas_object_show(game.bg);
-            ecore_evas_object_associate(game.ee, game.bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
-            evas_object_focus_set(game.bg, EINA_TRUE);
-
-            game.edje = edje_object_add(game.canvas);
-            snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
-            if (!edje_object_file_set(game.edje, buf, group))
-            {
-                int err = edje_object_load_error_get(game.edje);
-                const char *errmsg = edje_load_error_str(err);
-                PEm("Could not load '%s' from %s: %s\n", group, buf, errmsg);
-
-                evas_object_del(game.edje);
-                ecore_evas_free(game.ee);
-                edje_shutdown();
-                ecore_evas_shutdown();
-                return -2;
-            }
-            evas_object_move(game.edje, 0, 0);
-            evas_object_resize(game.edje, WIDTH, HEIGHT);
-            evas_object_show(game.edje);
-
-            snprintf(buf, sizeof(buf), "%s/images/bubble_sh.png", PACKAGE_DATA_DIR);
-            for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
-            {
-                sh = evas_object_image_filled_add(game.canvas);
-                evas_object_image_file_set(sh, buf, NULL);
-                evas_object_resize(sh, 64, 64);
-                evas_object_show(sh);
-                evas_object_data_set(game.bg, names[(i * 2) + 1], sh);
-            }
-
-            snprintf(buf, sizeof(buf), "%s/images/bubble.png", PACKAGE_DATA_DIR);
-            for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
-            {
-                bub = evas_object_image_filled_add(game.canvas);
-                evas_object_image_file_set(bub, buf, NULL);
-                evas_object_resize(bub, 64, 64);
-                evas_object_show(bub);
-                evas_object_data_set(game.bg, names[(i * 2)], bub);
-            }
-            ani = ecore_animator_add(anim, &game);
-            evas_object_data_set(game.bg, "animator", ani);
-
-            // Setup our callbacks.
-            ecore_evas_callback_delete_request_set(game.ee, _on_delete);
-            edje_object_signal_callback_add(game.edje, "*", "game_*", _edje_signal_cb, &game);
-        }
-
-        // Do the compiles.
-        scriptCount = 0;
-        compilerSetup(&game);
-        runnerSetup(&game);
-        gettimeofday(&lastTime2, 0);
-        snprintf(buf, sizeof(buf), "%s/Test sim/objects", PACKAGE_DATA_DIR);
-        eina_file_dir_list(buf, EINA_TRUE, dirList_compile, &game);
-        diff = timeDiff(&thisTime2, &lastTime2);
-        printf("Compiling %d LSL scripts took %f seconds, that's %f scripts per second.\n", scriptCount, diff, scriptCount / diff);
-        eina_file_dir_list(buf, EINA_TRUE, dirList_run, &game);
-
-        if (game.ui)
-        {
-            ecore_main_loop_begin();
-            ecore_animator_del(ani);
-            ecore_evas_free(game.ee);
-        }
-        else
-        {
-            // Wait awhile, then quit all scripts we started, for testing.
-            sleep(2);
-            snprintf(buf, sizeof(buf), "%s/Test sim/objects", PACKAGE_DATA_DIR);
-            eina_file_dir_list(buf, EINA_TRUE, dirList_quit, &game);
-        }
-
-        runnerTearDown(&game);
-        edje_shutdown();
-        ecore_evas_shutdown();
-    }
+        fprintf(stderr, "Failed to init eina!");
 
-    return 0;
+    return result;
 }