2 files changed, 45 insertions, 14 deletions

diff --git a/lib/LSLGuiMess.lua b/lib/LSLGuiMess.lua
index bc781ce..ff7538e 100644
--- a/lib/LSLGuiMess.lua
+++ b/lib/LSLGuiMess.lua
@@ -6,11 +6,10 @@ do
   local skang = require 'skang'
   -- This module has no default skin, it creates windows as needed.
   local _M = skang.moduleBegin('LSLGuiMess', nil, 'Copyright 2014 David Seikel', '0.1', '2014-05-16 11:07:00')
+  local purkle = require 'purkle'
 
---[[ TODO -
 
-llDialog(key id, string message, list buttons, integer chat_channel)
-  http://lslwiki.net/lslwiki/wakka.php?wakka=llDialog
+--[[ TODO -
 
 llTextBox()
   http://wiki.secondlife.com/wiki/LlTextBox
@@ -26,6 +25,38 @@ llSetTouchText(string text)
 
 ]]
 
-  skang.moduleEnd(_M)
+
+
+--[[ llDialog(key id, string message, list buttons, integer chat_channel)
+     http://lslwiki.net/lslwiki/wakka.php?wakka=llDialog
+]]
+llDialog = function (id, message, buttons, channel)
+  local win = skang.window(200, 25 + 25 * #buttons, message, 'llDialogWindow')
+
+print('llDialog(' .. id .. ', ' .. message .. ', , ' .. channel .. ')')
+skang.printTableStart(buttons, '', 'buttons')
+
+  for i, v in ipairs(buttons) do
+    skang.thingasm{win, 'button' .. i, 'Selects button ' .. i, types = 'widget', widget='"button", "' .. v .. '", 10, ' .. (25 * i) ..  ', 60, 25'}
+    win.W['button' .. i].action = 'purkle.say(' .. channel .. ', "onefang Rejected", "' .. id .. '", "' .. v .. '")'
+  end
+
 end
 
+
+local doLua = function (command)
+  -- Yes I know, it hurt my brain just writing this.  lol
+  -- It just swaps square brackets for curly ones, coz LSL uses [] to surround lists, and Lua uses {} to surround tables.
+  local c, err = loadstring(string.gsub(command, '[%[%]]', {['['] = '{', [']'] = '}'}))
+  if c then
+    setfenv(c, _M)
+    c()
+  else
+    print("ERROR - " .. err)
+  end
+
+end
+skang.thingasm('doLua', 'Run a Lua command.', doLua, 'string')
+
+  skang.moduleEnd(_M)
+end
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 5122f42..c980b3e 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -46,27 +46,27 @@ static Eina_Bool _data(void *data, int type, Ecore_Con_Event_Server_Data *ev)
           || (0 == strncmp(command, "llSay(", 6))
           || (0 == strncmp(command, "llShout(", 8)))
         {
-          int _M;
+          int _P;
+char *name = "that's me";
 
-          sprintf(buf, "%s: %s", SID, command);
           lua_getfield(ourGlobals->purkle->L, LUA_REGISTRYINDEX, ourGlobals->purkle->name);
-          _M = lua_gettop(ourGlobals->purkle->L);
-          push_lua(ourGlobals->purkle->L, "@ ( $ )", _M, "append", buf, 0);
+          _P = lua_gettop(ourGlobals->purkle->L);
+
+          sprintf(buf, "%s: %s", SID, command);
+          push_lua(ourGlobals->purkle->L, "@ ( $ )", _P, "append", buf, 0);
+//        push_lua(ourGlobals->purkle->L, "@ ( $ %a $b $c $d )", _P, "say", _P, name, SID, buf, 0);
         }
         else if (0 == strncmp(command, "llDialog(", 9))
         {
           int _M;
 
-          sprintf(buf, "%s: %s", SID, command);
-          lua_getfield(ourGlobals->purkle->L, LUA_REGISTRYINDEX, ourGlobals->purkle->name);
-          _M = lua_gettop(ourGlobals->purkle->L);
-          push_lua(ourGlobals->purkle->L, "@ ( $ )", _M, "append", buf, 0);
-
           lua_getfield(ourGlobals->LSLGuiMess->L, LUA_REGISTRYINDEX, ourGlobals->LSLGuiMess->name);
           _M = lua_gettop(ourGlobals->LSLGuiMess->L);
 
-          PI("Dialog from %s - %s", SID, command);
           // TODO - Somewhere in the chain the new lines that MLP likes to put into llDialog's message munge things.  Fix that.
+          sprintf(buf, "%s: %s", SID, command);
+          push_lua(ourGlobals->LSLGuiMess->L, "@ ( $ )", _M, "doLua", command, 0);
+
         }
         else
         {