X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.c;h=c9e5cb7b81df325bb915fecb2339c044069225bd;hp=e8a275f545ee301d03aed0b7980a40b0c39d9a95;hb=04736b55f97f8c12a48158093d0d65420bffece0;hpb=abe6cda3b3163d51889aec4a6276a01d795f0c25 diff --git a/cmd.c b/cmd.c index e8a275f5..c9e5cb7b 100644 --- a/cmd.c +++ b/cmd.c @@ -24,11 +24,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_ALIAS_NAME 32 // this is the largest script file that can be executed in one step // LordHavoc: inreased this from 8192 to 32768 -#define CMDBUFSIZE 32768 +// div0: increased this from 32k to 128k +#define CMDBUFSIZE 131072 // maximum number of parameters to a command #define MAX_ARGS 80 // maximum tokenizable commandline length (counting NUL terminations) -#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + 80) +#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + MAX_ARGS) typedef struct cmdalias_s { @@ -62,6 +63,116 @@ static void Cmd_Wait_f (void) cmd_wait = true; } +typedef struct cmddeferred_s +{ + struct cmddeferred_s *next; + char *value; + double time; +} cmddeferred_t; + +static cmddeferred_t *cmd_deferred_list = NULL; + +/* +============ +Cmd_Defer_f + +Cause a command to be executed after a delay. +============ +*/ +static void Cmd_Defer_f (void) +{ + if(Cmd_Argc() == 1) + { + double time = Sys_DoubleTime(); + cmddeferred_t *next = cmd_deferred_list; + if(!next) + Con_Printf("No commands are pending.\n"); + while(next) + { + Con_Printf("-> In %9.2f: %s\n", next->time-time, next->value); + next = next->next; + } + } else if(Cmd_Argc() == 2 && !strcasecmp("clear", Cmd_Argv(1))) + { + while(cmd_deferred_list) + { + cmddeferred_t *cmd = cmd_deferred_list; + cmd_deferred_list = cmd->next; + Mem_Free(cmd->value); + Mem_Free(cmd); + } + } else if(Cmd_Argc() == 3) + { + const char *value = Cmd_Argv(2); + cmddeferred_t *defcmd = (cmddeferred_t*)Mem_Alloc(tempmempool, sizeof(*defcmd)); + size_t len = strlen(value); + + defcmd->time = Sys_DoubleTime() + atof(Cmd_Argv(1)); + defcmd->value = (char*)Mem_Alloc(tempmempool, len+1); + memcpy(defcmd->value, value, len+1); + defcmd->next = NULL; + + if(cmd_deferred_list) + { + cmddeferred_t *next = cmd_deferred_list; + while(next->next) + next = next->next; + next->next = defcmd; + } else + cmd_deferred_list = defcmd; + /* Stupid me... this changes the order... so commands with the same delay go blub :S + defcmd->next = cmd_deferred_list; + cmd_deferred_list = defcmd;*/ + } else { + Con_Printf("usage: defer \n" + " defer clear\n"); + return; + } +} + +/* +============ +Cmd_Centerprint_f + +Print something to the center of the screen using SCR_Centerprint +============ +*/ +static void Cmd_Centerprint_f (void) +{ + char msg[MAX_INPUTLINE]; + unsigned int i, c, p; + c = Cmd_Argc(); + if(c >= 2) + { + strlcpy(msg, Cmd_Argv(1), sizeof(msg)); + for(i = 2; i < c; ++i) + { + strlcat(msg, " ", sizeof(msg)); + strlcat(msg, Cmd_Argv(i), sizeof(msg)); + } + c = strlen(msg); + for(p = 0, i = 0; i < c; ++i) + { + if(msg[i] == '\\') + { + if(msg[i+1] == 'n') + msg[p++] = '\n'; + else if(msg[i+1] == '\\') + msg[p++] = '\\'; + else { + msg[p++] = '\\'; + msg[p++] = msg[i+1]; + } + ++i; + } else { + msg[p++] = msg[i]; + } + } + msg[p] = '\0'; + SCR_CenterPrint(msg); + } +} + /* ============================================================================= @@ -132,6 +243,41 @@ void Cbuf_InsertText (const char *text) } } +/* +============ +Cbuf_Execute_Deferred --blub +============ +*/ +void Cbuf_Execute_Deferred (void) +{ + cmddeferred_t *cmd, *prev; + double time = Sys_DoubleTime(); + prev = NULL; + cmd = cmd_deferred_list; + while(cmd) + { + if(cmd->time <= time) + { + Cbuf_AddText(cmd->value); + Cbuf_AddText(";\n"); + Mem_Free(cmd->value); + + if(prev) { + prev->next = cmd->next; + Mem_Free(cmd); + cmd = prev->next; + } else { + cmd_deferred_list = cmd->next; + Mem_Free(cmd); + cmd = cmd_deferred_list; + } + continue; + } + prev = cmd; + cmd = cmd->next; + } +} + /* ============ Cbuf_Execute @@ -150,6 +296,7 @@ void Cbuf_Execute (void) // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes cmd_tokenizebufferpos = 0; + Cbuf_Execute_Deferred(); while (cmd_text.cursize) { // find a \n or ; line break @@ -160,7 +307,9 @@ void Cbuf_Execute (void) { if (text[i] == '"') quotes ^= 1; - if (text[i] == '\\' && (text[i+1] == '"' || text[i+1] == '\\')) + // make sure i doesn't get > cursize which causes a negative + // size in memmove, which is fatal --blub + if (i < (cmd_text.cursize-1) && (text[i] == '\\' && (text[i+1] == '"' || text[i+1] == '\\'))) i++; if ( !quotes && text[i] == ';') break; // don't break if inside a quoted string @@ -168,8 +317,17 @@ void Cbuf_Execute (void) break; } - memcpy (line, text, i); - line[i] = 0; + // better than CRASHING on overlong input lines that may SOMEHOW enter the buffer + if(i >= MAX_INPUTLINE) + { + Con_Printf("Warning: console input buffer had an overlong line. Ignored.\n"); + line[0] = 0; + } + else + { + memcpy (line, text, i); + line[i] = 0; + } // delete the text from the command buffer and move remaining commands down // this is necessary because commands (exec, alias) can insert data at the @@ -305,7 +463,7 @@ static void Cmd_Exec_f (void) Con_Printf("couldn't exec %s\n",Cmd_Argv(1)); return; } - Con_DPrintf("execing %s\n",Cmd_Argv(1)); + Con_Printf("execing %s\n",Cmd_Argv(1)); // if executing default.cfg for the first time, lock the cvar defaults // it may seem backwards to insert this text BEFORE the default.cfg @@ -412,7 +570,7 @@ static void Cmd_Toggle_f(void) } else { // Invalid CVar - Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(2) ); + Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(1) ); } } } @@ -668,7 +826,8 @@ static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t * // Exception: $* and $n- don't use the quoted form by default varstr = Cmd_GetDirectCvarValue(varname, alias, &is_multiple); if(is_multiple) - varfunc = "asis"; + if(!varfunc) + varfunc = "asis"; } if(!varstr) @@ -823,12 +982,12 @@ Called for aliases and fills in the alias into the cbuffer */ static void Cmd_ExecuteAlias (cmdalias_t *alias) { - static char buffer[ MAX_INPUTLINE + 2 ]; - static char buffer2[ MAX_INPUTLINE * 2 + 2 ]; + static char buffer[ MAX_INPUTLINE ]; + static char buffer2[ MAX_INPUTLINE ]; Cmd_PreprocessString( alias->value, buffer, sizeof(buffer) - 2, alias ); // insert at start of command buffer, so that aliases execute in order // (fixes bug introduced by Black on 20050705) - + // Note: Cbuf_PreprocessString will be called on this string AGAIN! So we // have to make sure that no second variable expansion takes place, otherwise // alias parameters containing dollar signs can have bad effects. @@ -915,6 +1074,9 @@ void Cmd_Init_Commands (void) Cmd_AddCommand ("cvar_resettodefaults_nosaveonly", Cvar_ResetToDefaults_NoSaveOnly_f, "sets all non-saved cvars to their locked default values (variables that will not be saved to config.cfg)"); Cmd_AddCommand ("cvar_resettodefaults_saveonly", Cvar_ResetToDefaults_SaveOnly_f, "sets all saved cvars to their locked default values (variables that will be saved to config.cfg)"); + Cmd_AddCommand ("cprint", Cmd_Centerprint_f, "print something at the screen center"); + Cmd_AddCommand ("defer", Cmd_Defer_f, "execute a command in the future"); + // DRESK - 5/14/06 // Support Doom3-style Toggle Command Cmd_AddCommand( "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)"); @@ -1307,11 +1469,13 @@ FIXME: lookupnoadd the token to speed search? void Cmd_ExecuteString (const char *text, cmd_source_t src) { int oldpos; + int found; cmd_function_t *cmd; cmdalias_t *a; oldpos = cmd_tokenizebufferpos; cmd_source = src; + found = false; Cmd_TokenizeString (text); @@ -1346,8 +1510,9 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) } else Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(0)); - cmd_tokenizebufferpos = oldpos; - return; + found = true; + goto command_found; + break; case src_client: if (cmd->clientfunction) { @@ -1360,11 +1525,13 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) break; } } +command_found: // if it's a client command and no command was found, say so. if (cmd_source == src_client) { Con_Printf("player \"%s\" tried to %s\n", host_client->name, text); + cmd_tokenizebufferpos = oldpos; return; } @@ -1379,6 +1546,12 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) } } + if(found) // if the command was hooked and found, all is good + { + cmd_tokenizebufferpos = oldpos; + return; + } + // check cvars if (!Cvar_Command () && host_framecount > 0) Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(0));