aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-16 11:56:01 +1000
committerDavid Walter Seikel2014-05-16 11:56:01 +1000
commit6817120ef7804b8214a4bf00f5df2e40af890b35 (patch)
tree1f7164ad4bbabd2083aa5b5c55d04abeb1268882
parentSkang moduleBegin() stuffs the module in the C registry, so no one has to do ... (diff)
downloadSledjHamr-6817120ef7804b8214a4bf00f5df2e40af890b35.zip
SledjHamr-6817120ef7804b8214a4bf00f5df2e40af890b35.tar.gz
SledjHamr-6817120ef7804b8214a4bf00f5df2e40af890b35.tar.bz2
SledjHamr-6817120ef7804b8214a4bf00f5df2e40af890b35.tar.xz
Add a stub LSLGuiMess Lua script.
-rw-r--r--lib/LSLGuiMess.lua31
-rw-r--r--src/extantz/extantz.c7
-rw-r--r--src/extantz/extantz.h1
-rw-r--r--src/love/love.c1
4 files changed, 38 insertions, 2 deletions
diff --git a/lib/LSLGuiMess.lua b/lib/LSLGuiMess.lua
new file mode 100644
index 0000000..bc781ce
--- /dev/null
+++ b/lib/LSLGuiMess.lua
@@ -0,0 +1,31 @@
1--[[ LSLGuiMess - replicates the horrid and barely usable LSL user interface crap.
2]]
3
4do
5
6 local skang = require 'skang'
7 -- This module has no default skin, it creates windows as needed.
8 local _M = skang.moduleBegin('LSLGuiMess', nil, 'Copyright 2014 David Seikel', '0.1', '2014-05-16 11:07:00')
9
10--[[ TODO -
11
12llDialog(key id, string message, list buttons, integer chat_channel)
13 http://lslwiki.net/lslwiki/wakka.php?wakka=llDialog
14
15llTextBox()
16 http://wiki.secondlife.com/wiki/LlTextBox
17
18llSetText(string text, vector color, float alpha)
19 http://lslwiki.net/lslwiki/wakka.php?wakka=llSetText
20
21llSetSitText(string text)
22 http://lslwiki.net/lslwiki/wakka.php?wakka=llSetSitText
23
24llSetTouchText(string text)
25 http://lslwiki.net/lslwiki/wakka.php?wakka=llSetTouchText
26
27]]
28
29 skang.moduleEnd(_M)
30end
31
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 87ea40e..6c68bd2 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -61,6 +61,10 @@ static Eina_Bool _data(void *data, int type, Ecore_Con_Event_Server_Data *ev)
61 lua_getfield(ourGlobals->purkle->L, LUA_REGISTRYINDEX, ourGlobals->purkle->name); 61 lua_getfield(ourGlobals->purkle->L, LUA_REGISTRYINDEX, ourGlobals->purkle->name);
62 _M = lua_gettop(ourGlobals->purkle->L); 62 _M = lua_gettop(ourGlobals->purkle->L);
63 push_lua(ourGlobals->purkle->L, "@ ( $ )", _M, "append", buf, 0); 63 push_lua(ourGlobals->purkle->L, "@ ( $ )", _M, "append", buf, 0);
64
65 lua_getfield(ourGlobals->LSLGuiMess->L, LUA_REGISTRYINDEX, ourGlobals->LSLGuiMess->name);
66 _M = lua_gettop(ourGlobals->LSLGuiMess->L);
67
64 PI("Dialog from %s - %s", SID, command); 68 PI("Dialog from %s - %s", SID, command);
65 // TODO - Somewhere in the chain the new lines that MLP likes to put into llDialog's message munge things. Fix that. 69 // TODO - Somewhere in the chain the new lines that MLP likes to put into llDialog's message munge things. Fix that.
66 } 70 }
@@ -651,7 +655,8 @@ EAPI_MAIN int elm_main(int argc, char **argv)
651// overlay_add(&ourGlobals); 655// overlay_add(&ourGlobals);
652 GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world); 656 GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world);
653 woMan_add(&ourGlobals); 657 woMan_add(&ourGlobals);
654 ourGlobals.purkle = GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world); 658 ourGlobals.LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals.mainWindow, ourGlobals.world);
659 ourGlobals.purkle = GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world);
655 ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); 660 ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
656 661
657 // Bump the top toolbar above the windows. 662 // Bump the top toolbar above the windows.
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index bfab4cb..9a8f2bf 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -230,6 +230,7 @@ typedef struct _globals
230 230
231 winFang *files; 231 winFang *files;
232 GuiLua *purkle; 232 GuiLua *purkle;
233 GuiLua *LSLGuiMess;
233 234
234 Ecore_Con_Server *server; 235 Ecore_Con_Server *server;
235 const char *address; 236 const char *address;
diff --git a/src/love/love.c b/src/love/love.c
index aede741..113118c 100644
--- a/src/love/love.c
+++ b/src/love/love.c
@@ -368,7 +368,6 @@ static Eina_Bool _dataLuaSL(void *data, int type, Ecore_Con_Event_Server_Data *e
368 { 368 {
369 if (ourGlobals->client) sendBack(ourGlobals->client, SID, command); 369 if (ourGlobals->client) sendBack(ourGlobals->client, SID, command);
370 else PW("No where to send %s", command); 370 else PW("No where to send %s", command);
371 PD("DIALOG %s", command);
372 } 371 }
373 else if (0 == strncmp(command, "llMessageLinked(", 16)) 372 else if (0 == strncmp(command, "llMessageLinked(", 16))
374 { 373 {