static const float FADE_SPEED = 1;
Console::Console()
- : history_position(history.end()), vm(NULL), backgroundOffset(0),
+ : history_position(history.end()), vm(NULL), backgroundOffset(0),
height(0), alpha(1.0), offset(0), focused(false), stayOpen(0) {
fontheight = 8;
}
-Console::~Console()
+Console::~Console()
{
if(vm != NULL) {
sq_release(Scripting::global_vm, &vm_object);
background2.reset(new Surface("images/engine/console2.png"));
}
-void
-Console::flush(ConsoleStreamBuffer* buffer)
+void
+Console::flush(ConsoleStreamBuffer* buffer)
{
if (buffer == &outputBuffer) {
std::string s = outputBuffer.str();
throw Scripting::SquirrelError(vm, "Couldn't get vm object for console");
sq_addref(vm, &vm_object);
sq_pop(vm, 1);
-
+
// create new roottable for thread
sq_newtable(new_vm);
sq_pushroottable(new_vm);
sq_setroottable(new_vm);
vm = new_vm;
-
+
try {
std::string filename = "scripts/console.nut";
IFileStream stream(filename);
{
using namespace Scripting;
- ready_vm();
+ ready_vm();
- SQInteger oldtop = sq_gettop(vm);
+ SQInteger oldtop = sq_gettop(vm);
try {
if(SQ_FAILED(sq_compilebuffer(vm, command.c_str(), command.length(),
"", SQTrue)))
throw SquirrelError(vm, "Couldn't compile command");
- sq_pushroottable(vm);
+ sq_pushroottable(vm);
if(SQ_FAILED(sq_call(vm, 1, SQTrue, SQTrue)))
throw SquirrelError(vm, "Problem while executing command");
}
}
+// 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();
- addLines("> "+cmdPart);
+ std::string prefix = inputBuffer.str();
+ addLines("> "+prefix);
- std::string cmdList = "";
- int cmdListLen = 0;
+ std::list<std::string> cmds;
- // append all known CCRs to cmdList
+ // 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 cmdList
+ // append all keys of the current root table to list
sq_pushroottable(vm); // push root table
while(true) {
- sq_pushnull(vm); // push null
- while (SQ_SUCCEEDED(sq_next(vm,-2))) {
- const SQChar* s;
- if(SQ_SUCCEEDED(sq_getstring(vm, -2, &s))) {
- std::string cmdKnown = s;
- if (cmdKnown.substr(0, cmdPart.length()) == cmdPart) {
- if (cmdListLen > 0) cmdList = cmdList + ", ";
- cmdList = cmdList + cmdKnown;
- cmdListLen++;
- }
- }
+ // check all keys (and their children) for matches
+ sq_insert_commands(cmds, vm, "", prefix);
- sq_pop(vm, 2); // pop key, val
- }
-
// cycle through parent(delegate) table
- sq_pop(vm, 1); // pop iterator
SQInteger oldtop = sq_gettop(vm);
if(SQ_FAILED(sq_getdelegate(vm, -1)) || oldtop == sq_gettop(vm)) {
break;
sq_pop(vm, 1); // remove table
// depending on number of hits, show matches or autocomplete
- if (cmdListLen == 0) addLines("No known command starts with \""+cmdPart+"\"");
- if (cmdListLen == 1) {
- inputBuffer.str(cmdList);
+ 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) addLines(cmdList);
+ if (cmds.size() > 1) {
+ while (cmds.begin() != cmds.end()) {
+ addLines(cmds.front());
+ cmds.pop_front();
+ }
+ }
}
-void
-Console::addLines(std::string s)
+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)
+void
+Console::addLine(std::string s)
{
// output line to stderr
std::cerr << s << std::endl;
// trim scrollback buffer
while (lines.size() >= 1000)
lines.pop_back();
-
+
// increase console height if necessary
if (height < 64) {
if(height < 4)
}
void
-Console::parse(std::string s)
+Console::parse(std::string s)
{
// make sure we actually have something to parse
if (s.length() == 0) return;
}
bool
-Console::consoleCommand(std::string command, std::vector<std::string> arguments)
+Console::consoleCommand(std::string command, std::vector<std::string> arguments)
{
if (command == "ccrs") {
if (arguments.size() != 1) {
}
bool
-Console::hasFocus()
+Console::hasFocus()
{
return focused;
}
focused = true;
height = 256;
alpha = 1.0;
+ SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
}
-void
+void
Console::hide()
{
focused = false;
// clear input buffer
inputBuffer.str(std::string());
+ SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
}
-void
+void
Console::toggle()
{
if (Console::hasFocus()) {
- Console::hide();
- }
- else {
+ Console::hide();
+ }
+ else {
Console::show();
}
}
}
}
-void
+void
Console::draw(DrawingContext& context)
{
if (height == 0)
context.pop_transform();
}
-void
+void
Console::registerCommand(std::string command, ConsoleCommandReceiver* ccr)
{
commands[command].push_front(ccr);
}
-void
+void
Console::unregisterCommand(std::string command, ConsoleCommandReceiver* ccr)
{
std::map<std::string, std::list<ConsoleCommandReceiver*> >::iterator i = commands.find(command);
i->second.erase(j);
}
-void
+void
Console::unregisterCommands(ConsoleCommandReceiver* ccr)
{
for (std::map<std::string, std::list<ConsoleCommandReceiver*> >::iterator i = commands.begin(); i != commands.end(); i++) {
ConsoleStreamBuffer Console::outputBuffer;
std::ostream Console::input(&Console::inputBuffer);
std::ostream Console::output(&Console::outputBuffer);
-
projects / supertux.git / blobdiff