summaryrefslogtreecommitdiffstats
path: root/src/lua.c
diff options
context:
space:
mode:
authorandmarti1424 <andmarti@gmail.com>2017-03-16 21:22:45 -0300
committerandmarti1424 <andmarti@gmail.com>2017-03-16 21:22:45 -0300
commit75fae2480269e6edd54a6b51bfd7bdfe1d7fa4b9 (patch)
tree89e95283fa87c04528ee5dc1537beb1161b9f683 /src/lua.c
parentd853d543a072e225fc31d61f8e48a1dfc2116654 (diff)
Fix tabs
Diffstat (limited to 'src/lua.c')
-rw-r--r--src/lua.c110
1 files changed, 49 insertions, 61 deletions
diff --git a/src/lua.c b/src/lua.c
index 8a1b1f3..9682b1f 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -28,7 +28,6 @@
#include "screen.h"
#include "conf.h"
-
extern FILE * fdoutput;
extern WINDOW * input_win;
@@ -127,7 +126,6 @@ static int l_sc (lua_State *L) {
return 0;
}
-
static int l_colrow2a(lua_State *L) {
int c, r;
char buf[16];
@@ -139,7 +137,6 @@ static int l_colrow2a(lua_State *L) {
return 1;
}
-
static int l_colrow(lua_State *L) {
char buf[16];
char *val;
@@ -240,8 +237,6 @@ LC_NUMBER2(curcol,curcol)
LC_NUMBER2(maxcols,maxcols)
LC_NUMBER2(maxrows,maxrows)
-
-
static const luaL_reg sclib[] = {
{ "lgetnum", l_getnum },
{ "lsetnum", l_setnum },
@@ -258,27 +253,24 @@ static const luaL_reg sclib[] = {
{NULL,NULL}
};
-
-
void doLuainit() {
- char buffer[PATHLEN];
- char buffer1[PATHLEN];
-
- L = luaL_newstate(); /* Create Lua state variable */
- luaL_openlibs(L); /* Load Lua libraries */
+ char buffer[PATHLEN];
+ char buffer1[PATHLEN];
+
+ L = luaL_newstate(); /* Create Lua state variable */
+ luaL_openlibs(L); /* Load Lua libraries */
sprintf(buffer,"lua/init.lua");
- if(plugin_exists(buffer,strlen(buffer),buffer1))
- {
- if (luaL_loadfile(L, buffer1)) { /* Load but don't run the Lua script */
- fprintf(stderr, "\nWarning :\n Couldn't load init.lua: %s\n\n", lua_tostring(L,-1));
- return;
- }
- if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
- fprintf(stderr, "\nFATAL ERROR:\n Couldn't initialized Lua: %s\n\n", lua_tostring(L,-1));
- }
- luaL_register(L, "sc", sclib); /* Load SC specific LUA commands after init.lua exec*/
-
+ if(plugin_exists(buffer,strlen(buffer),buffer1)) {
+ if (luaL_loadfile(L, buffer1)) { /* Load but don't run the Lua script */
+ fprintf(stderr, "\nWarning :\n Couldn't load init.lua: %s\n\n", lua_tostring(L,-1));
+ return;
+ }
+ if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
+ fprintf(stderr, "\nFATAL ERROR:\n Couldn't initialized Lua: %s\n\n", lua_tostring(L,-1));
+ }
+ luaL_register(L, "sc", sclib); /* Load SC specific LUA commands after init.lua exec*/
+
return;
}
@@ -294,31 +286,29 @@ char * doLUA( struct enode * se) {
cmd = seval(NULL, se->e.o.left);
sprintf(buffer,"lua/%s",cmd);
- if(plugin_exists(buffer,strlen(buffer),buffer1))
- {
- if (luaL_loadfile(L, buffer1)) /* Load but don't run the Lua script */
- bail(L, "luaL_loadfile() failed"); /* Error out if file can't be read */
+ if(plugin_exists(buffer,strlen(buffer),buffer1)) {
+ if (luaL_loadfile(L, buffer1)) /* Load but don't run the Lua script */
+ bail(L, "luaL_loadfile() failed"); /* Error out if file can't be read */
- if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
- bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
+ if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
+ bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
- /* Tell what function to run */
- // lua_getglobal(L, "tellme");
- }
+ /* Tell what function to run */
+ // lua_getglobal(L, "tellme");
+ }
return 0;
}
-
void doLuaTriger() {
- if (luaL_loadfile(L, "trigger.lua")) /* Load but don't run the Lua script */
- return;
- //bail(L, "luaL_loadfile() failed"); /* Error out if file can't be read */
+ if (luaL_loadfile(L, "trigger.lua")) /* Load but don't run the Lua script */
+ return;
+ //bail(L, "luaL_loadfile() failed"); /* Error out if file can't be read */
- if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
- bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
+ if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
+ bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
- lua_getglobal(L, "trigger"); /* Tell what function to run */
+ lua_getglobal(L, "trigger"); /* Tell what function to run */
//sc_debug("In C, calling Lua");
if (lua_pcall(L, 0, 0, 0)) /* Run the function */
@@ -356,32 +346,30 @@ void doLuaTrigger_cell(struct ent *p, int flags) {
struct trigger *trigger = p->trigger;
char buffer[PATHLEN];
char buffer1[PATHLEN];
-
+
row = p->row;
col = p->col;
sprintf(buffer,"lua/%s",trigger->file);
- if(plugin_exists(buffer,strlen(buffer),buffer1))
- {
- if (luaL_loadfile(L, buffer1)) /* Load but don't run the Lua script */
- return;
- //bail(L, "luaL_loadfile() failed"); /* Error out if file can't be read */
-
-
- if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
- bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
-
- lua_getglobal(L, trigger->function); /* Tell what function to run */
-
- lua_pushinteger(L,col);
- lua_pushinteger(L,row);
- lua_pushinteger(L, flags);
- //sc_debug("In C, calling Lua");
- if (lua_pcall(L, 3, 0, 0)) /* Run the function */
- bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
- //sc_debug("Back in C again");
- }
-
+ if(plugin_exists(buffer,strlen(buffer),buffer1)) {
+ if (luaL_loadfile(L, buffer1)) /* Load but don't run the Lua script */
+ return;
+ //bail(L, "luaL_loadfile() failed"); /* Error out if file can't be read */
+
+
+ if (lua_pcall(L, 0, 0, 0)) /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
+ bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
+
+ lua_getglobal(L, trigger->function); /* Tell what function to run */
+
+ lua_pushinteger(L,col);
+ lua_pushinteger(L,row);
+ lua_pushinteger(L, flags);
+ //sc_debug("In C, calling Lua");
+ if (lua_pcall(L, 3, 0, 0)) /* Run the function */
+ bail(L, "lua_pcall() failed"); /* Error out if Lua file has an error */
+ //sc_debug("Back in C again");
+ }
return;
}
#endif