eressea hat eine interaktive console (mit -C)

src/eressea/Jamfile

@@ -22,6 +22,7 @@ LUASERVER_SOURCES =
  <lua>unit.cpp
  server.cpp
  korrektur.c
+ console.c
  ;
 
 LinkLibraries $(SERVER) :

src/eressea/console.c

@@ -0,0 +1,180 @@
+#include "console.h"
+
+/* lua includes */
+#include <lua50/lauxlib.h>
+#include <lua50/lualib.h>
+
+/* libc includes */
+#include <assert.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+/*** Lua Console ***/
+/*
+** this macro defines a function to show the prompt and reads the
+** next line for manual input
+*/
+#ifndef lua_readline
+#define lua_readline(L,prompt) readline(L,prompt)
+
+/* maximum length of an input line */
+#ifndef MAXINPUT
+#define MAXINPUT        512
+#endif
+
+static int 
+readline(lua_State *l, const char *prompt) 
+{
+  static char buffer[MAXINPUT];
+  if (prompt) {
+    fputs(prompt, stdout);
+    fflush(stdout);
+  }
+  if (fgets(buffer, sizeof(buffer), stdin) == NULL)
+    return 0;  /* read fails */
+  else {
+    lua_pushstring(l, buffer);
+    return 1;
+  }
+}
+#endif
+
+#ifndef PROMPT
+#define PROMPT          "E> "
+#endif
+
+#ifndef PROMPT2
+#define PROMPT2         "E>> "
+#endif
+
+static const char *
+get_prompt(lua_State * L, int firstline) 
+{
+  const char *p = NULL;
+  lua_pushstring(L, firstline ? "_PROMPT" : "_PROMPT2");
+  lua_rawget(L, LUA_GLOBALSINDEX);
+  p = lua_tostring(L, -1);
+  if (p == NULL) p = (firstline ? PROMPT : PROMPT2);
+  lua_pop(L, 1);  /* remove global */
+  return p;
+}
+
+static int 
+incomplete(lua_State * L, int status) 
+{
+  if (status!=LUA_ERRSYNTAX) return 0;
+  if (strstr(lua_tostring(L, -1), "near `<eof>'") == NULL) return 0;
+
+  lua_pop(L, 1);
+  return 1;
+}
+
+static void 
+l_message(const char *pname, const char *msg) 
+{
+  if (pname) fprintf(stderr, "%s: ", pname);
+  fprintf(stderr, "%s\n", msg);
+}
+
+static int 
+l_report(lua_State * L, int status) 
+{
+  const char *msg;
+  if (status) {
+    msg = lua_tostring(L, -1);
+    if (msg == NULL) msg = "(error with no message)";
+    l_message(NULL, msg);
+    lua_pop(L, 1);
+  }
+  return status;
+}
+
+/*
+** this macro can be used by some `history' system to save lines
+** read in manual input
+*/
+#ifndef lua_saveline
+#define lua_saveline(L,line)    /* empty */
+#endif
+
+static int 
+load_string(lua_State * L) 
+{
+  int status;
+  lua_settop(L, 0);
+  if (lua_readline(L, get_prompt(L, 1)) == 0)  /* no input? */
+    return -1;
+  if (lua_tostring(L, -1)[0] == '=') {  /* line starts with `=' ? */
+    lua_pushfstring(L, "return %s", lua_tostring(L, -1)+1);/* `=' -> `return' */
+    lua_remove(L, -2);  /* remove original line */
+  }
+  for (;;) {  /* repeat until gets a complete line */
+    status = luaL_loadbuffer(L, lua_tostring(L, 1), lua_strlen(L, 1), "=stdin");
+    if (!incomplete(L, status)) break;  /* cannot try to add lines? */
+    if (lua_readline(L, get_prompt(L, 0)) == 0)  /* no more input? */
+      return -1;
+    lua_concat(L, lua_gettop(L));  /* join lines */
+  }
+  lua_saveline(L, lua_tostring(L, 1));
+  lua_remove(L, 1);  /* remove line */
+  return status;
+}
+
+static void 
+lstop(lua_State *l, lua_Debug *ar) 
+{
+  (void)ar;  /* unused arg. */
+  lua_sethook(l, NULL, 0, 0);
+  luaL_error(l, "interrupted!");
+}
+
+static lua_State * global_state = NULL;
+static void 
+laction(int i) 
+{
+  signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
+                      terminate process (default action) */
+  assert(global_state!=NULL);
+  lua_sethook(global_state, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
+}
+
+static int 
+lcall(lua_State * L, int narg, int clear) 
+{
+  int status;
+  int base = lua_gettop(L) - narg;  /* function index */
+  lua_pushliteral(L, "_TRACEBACK");
+  lua_rawget(L, LUA_GLOBALSINDEX);  /* get traceback function */
+  lua_insert(L, base);  /* put it under chunk and args */
+  assert(global_state==NULL);
+  global_state = L; /* baaaad hack */
+  signal(SIGINT, laction);
+  status = lua_pcall(L, narg, (clear ? 0 : LUA_MULTRET), base);
+  signal(SIGINT, SIG_DFL);
+  assert(global_state==L);
+  global_state=NULL;
+  lua_remove(L, base);  /* remove traceback function */
+  return status;
+}
+
+int
+lua_console(lua_State * L)
+{
+  int status;
+  while ((status = load_string(L)) != -1) {
+    if (status == 0) status = lcall(L, 0, 0);
+    l_report(L, status);
+    if (status == 0 && lua_gettop(L) > 0) {  /* any result to print? */
+      lua_getglobal(L, "print");
+      lua_insert(L, 1);
+      if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != 0)
+        l_message(NULL, lua_pushfstring(L, "error calling `print' (%s)",
+        lua_tostring(L, -1)));
+    }
+  }
+  lua_settop(L, 0);  /* clear stack */
+  fputs("\n", stdout);
+  return 0;
+}

src/eressea/console.h

@@ -0,0 +1,20 @@
+/* vi: set ts=2:
+ * Eressea PB(E)M host   Christian Schlittchen (corwin@amber.kn-bremen.de)
+ * (C) 1998-2004         Katja Zedel (katze@felidae.kn-bremen.de)
+ *                       Enno Rehling (enno@eressea-pbem.de)
+ *
+ * This program may not be used, modified or distributed without
+ * prior permission by the authors of Eressea.
+ **/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <lua50/lua.h>
+
+  extern int lua_console(lua_State * L);
+
+#ifdef __cplusplus
+}
+#endif
+

src/eressea/eressea-lua.vcproj

@@ -339,6 +339,12 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\console.c">
+		</File>
+		<File
+			RelativePath=".\console.h">
+		</File>
 		<File
 			RelativePath=".\korrektur.c">
 			<FileConfiguration

src/eressea/main.c

@@ -426,56 +426,6 @@ init_malloc_debug(void)
 }
 #endif
 
-#if 0
-static void
-write_stats(void)
-{
-	FILE * F;
-	char zText[MAX_PATH];
-	strcat(strcpy(zText, resourcepath()), "/spells");
-	F = fopen(zText, "wt");
-	if (F) {
-		int i, m = -1;
-		for (i=0;spelldaten[i].id;++i) {
-			if (spelldaten[i].magietyp!=m) {
-				m=spelldaten[i].magietyp;
-				fprintf(F, "\n%s\n", magietypen[m]);
-			}
-			fprintf(F, "%d\t%s\n", spelldaten[i].level, spelldaten[i].name);
-		}
-		fclose(F);
-	} else {
-		sprintf(buf, "fopen(%s): ", zText);
-		perror(buf);
-	}
-	strcat(strcpy(zText, resourcepath()), "/bonus");
-	F = fopen(buf, "wt");
-	if (F) {
-		race_t r;
-		for (r=0;r!=MAXRACES;++r) {
-			skill_t sk;
-			int i = 0;
-			fprintf(F, "const bonus %s_bonus = {\n\t", race[r].name[0]);
-			for (sk=0;sk!=MAXSKILLS;sk++) {
-				if (race[r].bonus[sk]) {
-					if (i==8) {
-						i = 0;
-						fputs("\n\t", F);
-					}
-					fprintf(F, "{ SK_%s, %d }, ", skillname(sk, NULL), race[r].bonus[sk]);
-					++i;
-				}
-			}
-			fputs("{ SK_NONE, 0 }\n};\n", F);
-		}
-		fclose(F);
-	} else {
-		sprintf(buf, "fopen(%s): ", zText);
-		perror(zText);
-	}
-}
-#endif
-
 static int
 usage(const char * prog, const char * arg)
 {

src/eressea/server.cpp

@@ -29,6 +29,7 @@
 #include <eressea.h>
 
 #include "korrektur.h"
+#include "console.h"
 
 /* initialization - TODO: init in separate module */
 #include <attributes/attributes.h>
@@ -97,7 +98,6 @@
 #include <cstring>
 #include <ctime>
 #include <clocale>
-
 /**
 ** global variables we are importing from other modules
 **/
@@ -147,22 +147,6 @@ struct settings global = {
     1000, /* maxunits */
 };
 
-#if 0
-static int
-crwritemap(void)
-{
-  FILE * F = fopen("world.cr", "w+");
-  region * r;
-  for (r=regions;r;r=r->next) {
-    plane * p = rplane(r);
-    fprintf(F, "REGION %d %d %d\n", r->x, r->y, p?p->id:0);
-    fprintf(F, "\"%s\";Name\n\"%s\";Terrain\n", rname(r, default_locale), LOC(default_locale, terrain[rterrain(r)].name));
-  }
-  fclose(F);
-	return 0;
-}
-#endif
-
 static void
 game_init(void)
 {
@@ -522,12 +506,16 @@ read_args(int argc, char **argv, lua_State * luaState)
       else if (strcmp(argv[i]+2, "nobattle")==0) nobattle = true;
       else if (strcmp(argv[i]+2, "nomonsters")==0) nomonsters = true;
       else if (strcmp(argv[i]+2, "nodebug")==0) nobattledebug = true;
+      else if (strcmp(argv[i]+2, "console")==0) luafile=NULL;
       else if (strcmp(argv[i]+2, "crabsolute")==0) opt_cr_absolute_coords = true;
       else if (strcmp(argv[i]+2, "help")==0)
         return usage(argv[0], NULL);
       else
         return usage(argv[0], argv[i]);
     } else switch(argv[i][1]) {
+      case 'C':
+        luafile=NULL;
+        break;
       case 'o':
         g_reportdir = argv[++i];
         break;
@@ -664,7 +652,8 @@ main(int argc, char *argv[])
   game_init();
 
   // run the main script
-  lua_dofile(luaState, luafile);
+  if (luafile==NULL) lua_console(luaState);
+  else lua_dofile(luaState, luafile);
 
 #ifdef CLEANUP_CODE
   game_done();