X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fconsole.cpp;h=cc88905bc2bd1341b7f04e93b94513e3ef387916;hb=3e89eb527d5f3bca2cb8cd219784048764a148f5;hp=4cfa87412277e97e9bf95bbf090b82eb201ae59c;hpb=3cf9d34deb5eb90bad99cd7baa0d391113c1b547;p=supertux.git

diff --git a/src/console.cpp b/src/console.cpp
index 4cfa87412..cc88905bc 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -63,7 +63,7 @@ Console::flush(ConsoleStreamBuffer* buffer)
     std::string s = outputBuffer.str();
     if ((s.length() > 0) && ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r'))) {
       while ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r')) s.erase(s.length()-1);
-      addLine(s);
+      addLines(s);
       outputBuffer.str(std::string());
     }
   }
@@ -71,7 +71,7 @@ Console::flush(ConsoleStreamBuffer* buffer)
     std::string s = inputBuffer.str();
     if ((s.length() > 0) && ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r'))) {
       while ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r')) s.erase(s.length()-1);
-      addLine("> "+s);
+      addLines("> "+s);
       parse(s);
       inputBuffer.str(std::string());
     }
@@ -79,10 +79,8 @@ Console::flush(ConsoleStreamBuffer* buffer)
 }
 
 void
-Console::execute_script(const std::string& command)
+Console::ready_vm()
 {
-  using namespace Scripting;
-
   if(vm == NULL) {
     vm = Scripting::global_vm;
     HSQUIRRELVM new_vm = sq_newthread(vm, 16);
@@ -114,8 +112,16 @@ Console::execute_script(const std::string& command)
       log_warning << "Couldn't load console.nut: " << e.what() << std::endl;
     }
   }
-    
-  int oldtop = sq_gettop(vm); 
+}
+
+void
+Console::execute_script(const std::string& command)
+{
+  using namespace Scripting;
+
+  ready_vm(); 
+
+  SQInteger oldtop = sq_gettop(vm); 
   try {
     if(SQ_FAILED(sq_compilebuffer(vm, command.c_str(), command.length(),
                  "", SQTrue)))
@@ -126,11 +132,11 @@ Console::execute_script(const std::string& command)
       throw SquirrelError(vm, "Problem while executing command");
 
     if(sq_gettype(vm, -1) != OT_NULL)
-      addLine(squirrel2string(vm, -1));
+      addLines(squirrel2string(vm, -1));
   } catch(std::exception& e) {
-    addLine(e.what());
+    addLines(e.what());
   }
-  int newtop = sq_gettop(vm);
+  SQInteger newtop = sq_gettop(vm);
   if(newtop < oldtop) {
     log_fatal << "Script destroyed squirrel stack..." << std::endl;
   } else {
@@ -175,50 +181,155 @@ Console::show_history(int offset)
   }
 }
 
+// Helper functions for Console::autocomplete
+// TODO: Fix rough documentation
+namespace {
+
+void sq_insert_commands(std::list<std::string>& cmds, HSQUIRRELVM vm, std::string table_prefix, std::string search_prefix);
+
+/**
+ * Acts upon key,value on top of stack:
+ * Appends key (plus type-dependent suffix) to cmds if table_prefix+key starts with search_prefix;
+ * Calls sq_insert_commands if search_prefix starts with table_prefix+key (and value is a table/class/instance);
+ */
+void
+sq_insert_command(std::list<std::string>& cmds, HSQUIRRELVM vm, std::string table_prefix, std::string search_prefix)
+{
+  const SQChar* key_chars;
+  if (SQ_FAILED(sq_getstring(vm, -2, &key_chars))) return;
+  std::string key_string = table_prefix + key_chars;
+
+  switch (sq_gettype(vm, -1)) {
+    case OT_INSTANCE:
+      key_string+=".";
+      if (search_prefix.substr(0, key_string.length()) == key_string) {
+        sq_getclass(vm, -1);
+	sq_insert_commands(cmds, vm, key_string, search_prefix);
+        sq_pop(vm, 1);
+      }
+      break;
+    case OT_TABLE:
+    case OT_CLASS:
+      key_string+=".";
+      if (search_prefix.substr(0, key_string.length()) == key_string) {
+	sq_insert_commands(cmds, vm, key_string, search_prefix);
+      }
+      break;
+    case OT_CLOSURE:
+    case OT_NATIVECLOSURE:
+      key_string+="()";
+      break;
+    default:
+      break;
+  }
+
+  if (key_string.substr(0, search_prefix.length()) == search_prefix) {
+    cmds.push_back(key_string);
+  }
+
+}
+
+/**
+ * calls sq_insert_command for all entries of table/class on top of stack
+ */
+void
+sq_insert_commands(std::list<std::string>& cmds, HSQUIRRELVM vm, std::string table_prefix, std::string search_prefix)
+{
+  sq_pushnull(vm); // push iterator
+  while (SQ_SUCCEEDED(sq_next(vm,-2))) {
+    sq_insert_command(cmds, vm, table_prefix, search_prefix);
+    sq_pop(vm, 2); // pop key, val
+  }
+  sq_pop(vm, 1); // pop iterator
+}
+
+
+} 
+// End of Console::autocomplete helper functions
+
 void
 Console::autocomplete()
 {
-  std::string cmdPart = inputBuffer.str();
-  addLine("> "+cmdPart);
+  std::string prefix = inputBuffer.str();
+  addLines("> "+prefix);
 
-  std::string cmdList = "";
-  int cmdListLen = 0;
+  std::list<std::string> cmds;
+
+  // append all known CCRs to list
   for (std::map<std::string, std::list<ConsoleCommandReceiver*> >::iterator i = commands.begin(); i != commands.end(); i++) {
     std::string cmdKnown = i->first;
-    if (cmdKnown.substr(0, cmdPart.length()) == cmdPart) {
-      if (cmdListLen > 0) cmdList = cmdList + ", ";
-      cmdList = cmdList + cmdKnown;
-      cmdListLen++;
+    if (cmdKnown.substr(0, prefix.length()) == prefix) {
+      cmds.push_back(cmdKnown);
+    }
+  }
+
+  ready_vm();
+
+  // append all keys of the current root table to list
+  sq_pushroottable(vm); // push root table
+  while(true) {
+    // check all keys (and their children) for matches
+    sq_insert_commands(cmds, vm, "", prefix);
+
+    // cycle through parent(delegate) table
+    SQInteger oldtop = sq_gettop(vm);
+    if(SQ_FAILED(sq_getdelegate(vm, -1)) || oldtop == sq_gettop(vm)) {
+      break;
     }
+    sq_remove(vm, -2); // remove old table
   }
-  if (cmdListLen == 0) addLine("No known command starts with \""+cmdPart+"\"");
-  if (cmdListLen == 1) {
-    inputBuffer.str(cmdList);
+  sq_pop(vm, 1); // remove table
+
+  // depending on number of hits, show matches or autocomplete
+  if (cmds.size() == 0) addLines("No known command starts with \""+prefix+"\"");
+  if (cmds.size() == 1) {
+    inputBuffer.str(cmds.front());
     inputBuffer.pubseekoff(0, std::ios_base::end, std::ios_base::out);
   }
-  if (cmdListLen > 1) addLine(cmdList);
+  if (cmds.size() > 1) {
+    while (cmds.begin() != cmds.end()) {
+      addLines(cmds.front());
+      cmds.pop_front();
+    }
+  }
+}
+
+void 
+Console::addLines(std::string s) 
+{
+  std::istringstream iss(s);
+  std::string line;
+  while (std::getline(iss, line, '\n')) addLine(line);
 }
 
 void 
 Console::addLine(std::string s) 
 {
+  // output line to stderr
   std::cerr << s << std::endl;
-  while (s.length() > 99) {
-    lines.push_front(s.substr(0, 99-3)+"...");
-    s = "..."+s.substr(99-3);
-  }
-  lines.push_front(s);
-  
+
+  // wrap long lines
+  std::string overflow;
+  do {
+    lines.push_front(Font::wrap_to_chars(s, 99, &overflow));
+    s = overflow;
+  } while (s.length() > 0);
+
+  // trim scrollback buffer
   while (lines.size() >= 1000)
     lines.pop_back();
-  
+ 
+  // increase console height if necessary
   if (height < 64) {
     if(height < 4)
       height = 4;
     height += fontheight;
   }
 
+  // reset console to full opacity
   alpha = 1.0;
+
+  // increase time that console stays open
   if(stayOpen < 6)
     stayOpen += 1.5;
 }
@@ -258,7 +369,7 @@ Console::parse(std::string s)
     try {
       execute_script(s);
     } catch(std::exception& e) {
-      addLine(e.what());
+      addLines(e.what());
     }
     return;
   }
@@ -309,6 +420,7 @@ Console::show()
   focused = true;
   height = 256;
   alpha = 1.0;
+  SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 }
 
 void 
@@ -320,6 +432,7 @@ Console::hide()
 
   // clear input buffer
   inputBuffer.str(std::string());
+  SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
 }
 
 void