diff options
Diffstat (limited to '')
-rw-r--r-- | src/GuiLua/GuiLua.c | 7 | ||||
-rw-r--r-- | src/GuiLua/GuiLua.h | 3 | ||||
-rw-r--r-- | src/extantz/extantz.c | 2 | ||||
-rw-r--r-- | src/extantz/extantz.h | 1 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index c845ff1..d960da9 100644 --- a/src/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c | |||
@@ -429,12 +429,15 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world) | |||
429 | return result; | 429 | return result; |
430 | } | 430 | } |
431 | 431 | ||
432 | void GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world) | 432 | GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world) |
433 | { | 433 | { |
434 | GuiLua *result; | ||
434 | char *args[] = {"GuiLUa", "-l", ""}; | 435 | char *args[] = {"GuiLUa", "-l", ""}; |
435 | 436 | ||
436 | args[2] = module; | 437 | args[2] = module; |
437 | GuiLuaDo(3, args, parent, world); | 438 | result = GuiLuaDo(3, args, parent, world); |
439 | result->name = module; | ||
440 | return result; | ||
438 | } | 441 | } |
439 | 442 | ||
440 | void GuiLuaDel(GuiLua *gl) | 443 | void GuiLuaDel(GuiLua *gl) |
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h index 3bd2baf..9ee5a1f 100644 --- a/src/GuiLua/GuiLua.h +++ b/src/GuiLua/GuiLua.h | |||
@@ -18,6 +18,7 @@ | |||
18 | typedef struct _GuiLua | 18 | typedef struct _GuiLua |
19 | { | 19 | { |
20 | lua_State *L; | 20 | lua_State *L; |
21 | char *name; // Name of the module. | ||
21 | winFang *us; // Our window, if it exists. | 22 | winFang *us; // Our window, if it exists. |
22 | winFang *parent; // Our parent window, if it exists. | 23 | winFang *parent; // Our parent window, if it exists. |
23 | EPhysics_World *world; // Our world, if it exists. | 24 | EPhysics_World *world; // Our world, if it exists. |
@@ -31,7 +32,7 @@ typedef struct _GuiLua | |||
31 | extern const char *glName; | 32 | extern const char *glName; |
32 | 33 | ||
33 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world); | 34 | GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world); |
34 | void GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world); | 35 | GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world); |
35 | void GuiLuaDel(GuiLua *gl); | 36 | void GuiLuaDel(GuiLua *gl); |
36 | 37 | ||
37 | #endif | 38 | #endif |
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 8d533fd..a6ffad7 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -626,7 +626,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
626 | // overlay_add(&ourGlobals); | 626 | // overlay_add(&ourGlobals); |
627 | GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world); | 627 | GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world); |
628 | woMan_add(&ourGlobals); | 628 | woMan_add(&ourGlobals); |
629 | GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world); | 629 | ourGlobals.purkle = GuiLuaLoad("purkle", ourGlobals.mainWindow, ourGlobals.world); |
630 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); | 630 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); |
631 | 631 | ||
632 | // Bump the top toolbar above the windows. | 632 | // Bump the top toolbar above the windows. |
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index d24f23c..0bbf76f 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h | |||
@@ -227,6 +227,7 @@ typedef struct _globals | |||
227 | EPhysics_World *world; | 227 | EPhysics_World *world; |
228 | 228 | ||
229 | winFang *files; | 229 | winFang *files; |
230 | GuiLua *purkle; | ||
230 | 231 | ||
231 | Ecore_Con_Server *server; | 232 | Ecore_Con_Server *server; |
232 | const char *address; | 233 | const char *address; |