X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=6230fa021854d31fd72fb6535b664e3ddd196446;hb=aa1c1c80669d14260da64518ca05abc4529354d5;hp=6bb65872eeeb6b9a31d2b747b97806be879ae3c7;hpb=0a05c446ba26bd5897645a37ceec8646c5bc93eb;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index 6bb65872..6230fa02 100644 --- a/cmd.c +++ b/cmd.c @@ -22,9 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "thread.h" -cmd_state_t cmd_client; -cmd_state_t cmd_server; -cmd_state_t cmd_serverfromclient; +cmd_state_t *cmd_local; +cmd_state_t *cmd_serverfromclient; cmd_userdefined_t cmd_userdefined_all; cmd_userdefined_t cmd_userdefined_null; @@ -34,25 +33,21 @@ typedef struct cmd_iter_s { } cmd_iter_t; -static cmd_iter_t cmd_iter_all[] = { - {&cmd_client}, - {&cmd_server}, - {&cmd_serverfromclient}, - {NULL}, -}; +static cmd_iter_t *cmd_iter_all; +mempool_t *cbuf_mempool; // we only run the +whatever commandline arguments once qbool host_stuffcmdsrun = false; //============================================================================= -void Cbuf_Lock(cbuf_t *cbuf) +void Cbuf_Lock(cmd_buf_t *cbuf) { Thread_LockMutex(cbuf->lock); } -void Cbuf_Unlock(cbuf_t *cbuf) +void Cbuf_Unlock(cmd_buf_t *cbuf) { Thread_UnlockMutex(cbuf->lock); } @@ -79,43 +74,40 @@ Cmd_Defer_f Cause a command to be executed after a delay. ============ */ -static cmd_input_t *Cbuf_LinkGet(cbuf_t *cbuf, cmd_input_t *existing); +static void Cbuf_ParseText(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool allowpending); +static void Cbuf_LinkString(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool leavepending, unsigned int cmdsize); static void Cmd_Defer_f (cmd_state_t *cmd) { cmd_input_t *current; - cbuf_t *cbuf = cmd->cbuf; + cmd_buf_t *cbuf = cmd->cbuf; + unsigned int cmdsize; if(Cmd_Argc(cmd) == 1) { - if(List_IsEmpty(&cbuf->deferred)) + if(List_Is_Empty(&cbuf->deferred)) Con_Printf("No commands are pending.\n"); else { - llist_t *pos; - List_ForEach(pos, &cbuf->deferred) - { - current = List_Container(*pos, cmd_input_t, list); + List_For_Each_Entry(current, &cbuf->deferred, cmd_input_t, list) Con_Printf("-> In %9.2f: %s\n", current->delay, current->text); - } } } else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1))) { - while(!List_IsEmpty(&cbuf->deferred)) + while(!List_Is_Empty(&cbuf->deferred)) + { + cbuf->size -= List_Entry(cbuf->deferred.next, cmd_input_t, list)->length; List_Move_Tail(cbuf->deferred.next, &cbuf->free); + } } - else if(Cmd_Argc(cmd) == 3) + else if(Cmd_Argc(cmd) == 3 && (cmdsize = strlen(Cmd_Argv(cmd, 2))) ) { - const char *text = Cmd_Argv(cmd, 2); - current = Cbuf_LinkGet(cbuf, NULL); - current->size = strlen(text); - current->source = cmd; - current->delay = atof(Cmd_Argv(cmd, 1)); - - memcpy(current->text, text, current->size + 1); + Cbuf_Lock(cbuf); - List_Move_Tail(¤t->list, &cbuf->deferred); + Cbuf_LinkString(cmd, &cbuf->deferred, NULL, Cmd_Argv(cmd, 2), false, cmdsize); + List_Entry(cbuf->deferred.prev, cmd_input_t, list)->delay = atof(Cmd_Argv(cmd, 1)); + Cbuf_Unlock(cbuf); } else { @@ -173,159 +165,135 @@ static void Cmd_Centerprint_f (cmd_state_t *cmd) COMMAND BUFFER + * The Quake command-line is super basic. It can be entered in the console + * or in config files. A semicolon is used to terminate a command and chain + * them together. Otherwise, a newline delineates command input. + * + * In most engines, the Quake command-line is a simple linear text buffer that + * is parsed when it executes. In Darkplaces, we use a linked list of command + * input and parse the input on the spot. + * + * This was done because Darkplaces allows multiple command interpreters on the + * same thread. Previously, each interpreter maintained its own buffer and this + * caused problems related to execution order, and maintaining a single simple + * buffer for all interpreters makes it non-trivial to keep track of which + * command should execute on which interpreter. + ============================================================================= */ /* ============ -Cbuf_ParseText +Cbuf_NodeGet -Parses Quake console command-line -Returns true if command is complete +Returns an existing buffer node for appending or reuse, or allocates a new one ============ */ -static qbool Cbuf_ParseText(char **start, size_t *size) +static cmd_input_t *Cbuf_NodeGet(cmd_buf_t *cbuf, cmd_input_t *existing) { - int i = 0; - qbool quotes = false; - qbool comment = false; // Does not imply end because we might be starting the line with a comment. - qbool escaped = false; - qbool end = false; // Reached the end of a valid command - char *offset = NULL; // Non-NULL if valid command. Used by the caller to know where to start copying. - size_t cmdsize = 0; // Non-zero if valid command. Basically bytes to copy for the caller. - - /* - * Allow escapes in quotes. Ignore newlines and - * comments. Return 0 if input consists solely - * of either of those, and ignore blank input. - */ - while(!end) - { - switch ((*start)[i]) - { - case '/': - if(!quotes && (*start)[i+1] == '/' && (i == 0 || ISWHITESPACE((*start)[i-1]))) - comment = true; - break; - case 0: - if(!end && cmdsize) - return false; - comment = false; - end = true; - break; - case '\r': - case '\n': - comment = false; - quotes = false; - end = true; - break; - } - - if(!comment) - { - switch ((*start)[i]) - { - case ';': - if(!quotes) - end = true; - break; - case '"': - if (!escaped) - quotes = !quotes; - else - escaped = false; - break; - case '\\': - if (!escaped && quotes) - escaped = true; - else if (escaped) - escaped = false; - break; - } - - if(!offset) - { - if(!end) - offset = (char *)&(*start)[i]; - else if ((*start)[i]) - end = false; - } - else - cmdsize++; - } - i++; + cmd_input_t *node; + if(existing && existing->pending) + node = existing; + else if(!List_Is_Empty(&cbuf->free)) + { + node = List_Entry(cbuf->free.next, cmd_input_t, list); + node->length = node->pending = 0; } - - *start = offset; - *size = cmdsize; - - return true; + else + { + node = (cmd_input_t *)Mem_Alloc(cbuf_mempool, sizeof(cmd_input_t)); + node->list.prev = node->list.next = &node->list; + node->size = node->length = node->pending = 0; + } + return node; } -static cmd_input_t *Cbuf_LinkGet(cbuf_t *cbuf, cmd_input_t *existing) +/* +============ +Cbuf_LinkString + +Copies a command string into a buffer node +============ +*/ +static void Cbuf_LinkString(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool leavepending, unsigned int cmdsize) { - cmd_input_t *ret = NULL; - if(existing && existing->pending) - ret = existing; - else + cmd_buf_t *cbuf = cmd->cbuf; + cmd_input_t *node = Cbuf_NodeGet(cbuf, existing); + unsigned int offset = node->length; // > 0 if(pending) + + // node will match existing if its text was pending continuation + if(node != existing) { - if(!List_IsEmpty(&cbuf->free)) - ret = List_Container(*cbuf->free.next, cmd_input_t, list); - else - { - ret = (cmd_input_t *)Z_Malloc(sizeof(cmd_input_t)); - ret->list.next = ret->list.prev = &ret->list; - } - ret->size = 0; - ret->pending = false; + node->source = cmd; + List_Move_Tail(&node->list, head); + } + + node->length += cmdsize; + if(node->size < node->length) + { + node->text = (char *)Mem_Realloc(cbuf_mempool, node->text, node->length + 1); + node->size = node->length; } + cbuf->size += cmdsize; - return ret; + strlcpy(&node->text[offset], text, cmdsize + 1); // always sets the last char to \0 + //Con_Printf("^5Cbuf_LinkString(): %s `^7%s^5`\n", node->pending ? "append" : "new", &node->text[offset]); + node->pending = leavepending; } +/* +============ +Cbuf_ParseText -// Cloudwalk: Not happy with this, but it works. -static void Cbuf_LinkCreate(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text) +Parses text to isolate command strings for linking into the buffer +separators: \n \r or unquoted and uncommented ';' +============ +*/ +static void Cbuf_ParseText(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool allowpending) { - char *in = (char *)&text[0]; - qbool complete; - cbuf_t *cbuf = cmd->cbuf; - size_t totalsize = 0, newsize = 0; - cmd_input_t *current = NULL; + unsigned int cmdsize = 0, start = 0, pos; + qbool quotes = false, comment = false; - // Slide the pointer down until we reach the end - while(in) + for (pos = 0; text[pos]; ++pos) { - /* - * FIXME: Upon reaching a terminator, we make a redundant - * call just to say "it's the end of the input stream". - */ - complete = Cbuf_ParseText(&in, &newsize); - - // Valid command - if(newsize) + switch(text[pos]) { - if(!current) - current = Cbuf_LinkGet(cbuf, existing); + case ';': + if (comment || quotes) + break; + case '\r': + case '\n': + comment = false; + quotes = false; // matches div0-stable + if (cmdsize) + { + Cbuf_LinkString(cmd, head, existing, &text[start], false, cmdsize); + cmdsize = 0; + } + else if (existing && existing->pending) // all I got was this lousy \n + existing->pending = false; + continue; // don't increment cmdsize - if(!current->pending) - { - current->source = cmd; - List_Move_Tail(¤t->list, head); - } + case '/': + if (!quotes && text[pos + 1] == '/' && (pos == 0 || ISWHITESPACE(text[pos - 1]))) + comment = true; + break; + case '"': + if (!comment && (pos == 0 || text[pos - 1] != '\\')) + quotes = !quotes; + break; + } - current->pending = complete; - totalsize += newsize; - strlcpy(¤t->text[current->size], in, newsize + 1); - current->size += newsize; + if (!comment) + { + if (!cmdsize) + start = pos; + ++cmdsize; } - else if (existing && !totalsize) - existing->pending = false; - current = NULL; - in = &in[newsize]; } - cbuf->size += totalsize; + if (cmdsize) // the line didn't end yet but we do have a string + Cbuf_LinkString(cmd, head, existing, &text[start], allowpending, cmdsize); } /* @@ -338,7 +306,7 @@ Adds command text at the end of the buffer void Cbuf_AddText (cmd_state_t *cmd, const char *text) { size_t l = strlen(text); - cbuf_t *cbuf = cmd->cbuf; + cmd_buf_t *cbuf = cmd->cbuf; llist_t llist = {&llist, &llist}; Cbuf_Lock(cbuf); @@ -347,9 +315,9 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text) Con_Print("Cbuf_AddText: overflow\n"); else { - Cbuf_LinkCreate(cmd, &llist, (List_IsEmpty(&cbuf->start) ? NULL : List_Container(*cbuf->start.prev, cmd_input_t, list)), text); - if(!List_IsEmpty(&llist)) - List_Splice_Tail(&llist, &cbuf->start); + // If the string terminates but the (last) line doesn't, the node will be left in the pending state (to be continued). + Cbuf_ParseText(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.prev, cmd_input_t, list)), text, true); + List_Splice_Tail(&llist, &cbuf->start); } Cbuf_Unlock(cbuf); } @@ -359,23 +327,24 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text) Cbuf_InsertText Adds command text immediately after the current command -FIXME: actually change the command buffer to do less copying ============ */ void Cbuf_InsertText (cmd_state_t *cmd, const char *text) { - cbuf_t *cbuf = cmd->cbuf; + cmd_buf_t *cbuf = cmd->cbuf; llist_t llist = {&llist, &llist}; size_t l = strlen(text); Cbuf_Lock(cbuf); - // we need to memmove the existing text and stuff this in before it... - if (cbuf->size + l >= (size_t)cbuf->maxsize) + if (cbuf->size + l >= cbuf->maxsize) Con_Print("Cbuf_InsertText: overflow\n"); else { - Cbuf_LinkCreate(cmd, &llist, List_Container(*cbuf->start.next, cmd_input_t, list), text); + // bones_was_here assertion: when prepending to the buffer it never makes sense to leave node(s) in the `pending` state, + // it would have been impossible to append to such text later in the old raw text buffer, + // and allowing it causes bugs when .cfg files lack \n at EOF (see: https://gitlab.com/xonotic/darkplaces/-/issues/378). + Cbuf_ParseText(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.next, cmd_input_t, list)), text, false); List_Splice(&llist, &cbuf->start); } @@ -387,29 +356,27 @@ void Cbuf_InsertText (cmd_state_t *cmd, const char *text) Cbuf_Execute_Deferred --blub ============ */ -static void Cbuf_Execute_Deferred (cbuf_t *cbuf) +static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf) { - llist_t *pos; - cmd_input_t *current; - double eat; + cmd_input_t *current, *n; + vec_t eat; if (host.realtime - cbuf->deferred_oldtime < 0 || host.realtime - cbuf->deferred_oldtime > 1800) cbuf->deferred_oldtime = host.realtime; eat = host.realtime - cbuf->deferred_oldtime; - if (eat < (1.0 / 120.0)) + if (eat < 1/128) return; cbuf->deferred_oldtime = host.realtime; - List_ForEach(pos, &cbuf->deferred) + List_For_Each_Entry_Safe(current, n, &cbuf->deferred, cmd_input_t, list) { - current = List_Container(*pos, cmd_input_t, list); current->delay -= eat; if(current->delay <= 0) { - cbuf->size += current->size; - List_Move(pos, &cbuf->start); - // We must return and come back next frame or the engine will freeze. Fragile... like glass :3 - return; + Cbuf_AddText(current->source, current->text); // parse deferred string and append its cmdstring(s) + List_Entry(cbuf->start.prev, cmd_input_t, list)->pending = false; // faster than div0-stable's Cbuf_AddText(";\n"); + List_Move_Tail(¤t->list, &cbuf->free); // make deferred string memory available for reuse + cbuf->size -= current->length; } } } @@ -419,25 +386,30 @@ static void Cbuf_Execute_Deferred (cbuf_t *cbuf) Cbuf_Execute ============ */ +extern qbool prvm_runawaycheck; static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmd_alias_t *alias ); -void Cbuf_Execute (cbuf_t *cbuf) +void Cbuf_Execute (cmd_buf_t *cbuf) { cmd_input_t *current; char preprocessed[MAX_INPUTLINE]; char *firstchar; + unsigned int i = 0; // LadyHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes cbuf->tokenizebufferpos = 0; - while (!List_IsEmpty(&cbuf->start)) + while (!List_Is_Empty(&cbuf->start)) { /* * Delete the text from the command buffer and move remaining * commands down. This is necessary because commands (exec, alias) * can insert data at the beginning of the text buffer */ - current = List_Container(*cbuf->start.next, cmd_input_t, list); - + current = List_Entry(cbuf->start.next, cmd_input_t, list); + + // Recycle memory so using WASD doesn't cause a malloc and free + List_Move_Tail(¤t->list, &cbuf->free); + /* * Assume we're rolling with the current command-line and * always set this false because alias expansion or cbuf insertion @@ -445,7 +417,7 @@ void Cbuf_Execute (cbuf_t *cbuf) */ current->pending = false; - cbuf->size -= current->size; + cbuf->size -= current->length; firstchar = current->text; while(*firstchar && ISWHITESPACE(*firstchar)) @@ -462,9 +434,6 @@ void Cbuf_Execute (cbuf_t *cbuf) Cmd_ExecuteString (current->source, current->text, src_local, false); } - // Recycle memory so using WASD doesn't cause a malloc and free - List_Move_Tail(¤t->list, &cbuf->free); - current = NULL; if (cbuf->wait) @@ -476,11 +445,42 @@ void Cbuf_Execute (cbuf_t *cbuf) cbuf->wait = false; break; } + + if (++i == 1000000 && prvm_runawaycheck) + { + Con_Printf(CON_WARN "Cbuf_Execute: runaway loop counter hit limit of %d commands, clearing command buffers!\n", i); + while (!List_Is_Empty(&cbuf->start)) + List_Move_Tail(cbuf->start.next, &cbuf->free); + while (!List_Is_Empty(&cbuf->deferred)) + List_Move_Tail(cbuf->deferred.next, &cbuf->free); + cbuf->size = 0; + } } } -void Cbuf_Frame(cbuf_t *cbuf) +/* +=================== +Cbuf_Frame_Input + +Add them exactly as if they had been typed at the console +=================== +*/ +static void Cbuf_Frame_Input(void) { + char *line; + + while ((line = Sys_ConsoleInput())) + Cbuf_AddText(cmd_local, line); +} + +void Cbuf_Frame(cmd_buf_t *cbuf) +{ + // check for commands typed to the host + Cbuf_Frame_Input(); + +// R_TimeReport("preconsole"); + + // execute commands queued with the defer command Cbuf_Execute_Deferred(cbuf); if (cbuf->size) { @@ -488,6 +488,8 @@ void Cbuf_Frame(cbuf_t *cbuf) Cbuf_Execute(cbuf); SV_UnlockThreadMutex(); } + +// R_TimeReport("console"); } /* @@ -513,10 +515,6 @@ static void Cmd_StuffCmds_f (cmd_state_t *cmd) int i, j, l; // this is for all commandline options combined (and is bounds checked) char build[MAX_INPUTLINE]; - - // come back later so we don't crash - if(host.state == host_init) - return; if (Cmd_Argc (cmd) != 1) { @@ -767,6 +765,7 @@ static void Cmd_Exec(cmd_state_t *cmd, const char *filename) "csqc_polygons_defaultmaterial_nocullface 1\n" "con_chatsound_team_mask 13\n" "sv_gameplayfix_customstats 1\n" +"mod_q1bsp_zero_hullsize_cutoff 8.03125\n" ); break; // Steel Storm: Burning Retribution csqc misinterprets CSQC_InputEvent if type is a value other than 0 or 1 @@ -1135,7 +1134,7 @@ static const char *Cmd_GetDirectCvarValue(cmd_state_t *cmd, const char *varname, } } - if((cvar = Cvar_FindVar(cmd->cvars, varname, cmd->cvars_flagsmask)) && !(cvar->flags & CVAR_PRIVATE)) + if((cvar = Cvar_FindVar(cmd->cvars, varname, cmd->cvars_flagsmask)) && !(cvar->flags & CF_PRIVATE)) return cvar->string; return NULL; @@ -1493,7 +1492,7 @@ static void Cmd_List_f (cmd_state_t *cmd) } count = 0; - for (func = cmd->userdefined->csqc_functions; func; func = func->next) + for (func = cmd->userdefined->qc_functions; func; func = func->next) { if (partial && (ispattern ? !matchpattern_with_separator(func->name, partial, false, "", false) : strncmp(partial, func->name, len))) continue; @@ -1551,17 +1550,17 @@ static void Cmd_Apropos_f(cmd_state_t *cmd) Cvar_PrintHelp(cvar, cvar->name, true); count++; } - for (int i = 0; i < cvar->aliasindex; i++) + for (char **cvar_alias = cvar->aliases; cvar_alias && *cvar_alias; cvar_alias++) { - if (matchpattern_with_separator(cvar->aliases[i], partial, true, "", false)) + if (matchpattern_with_separator(*cvar_alias, partial, true, "", false)) { Con_Printf ("cvar "); - Cvar_PrintHelp(cvar, cvar->aliases[i], true); + Cvar_PrintHelp(cvar, *cvar_alias, true); count++; } } } - for (func = cmd->userdefined->csqc_functions; func; func = func->next) + for (func = cmd->userdefined->qc_functions; func; func = func->next) { if (!matchpattern_with_separator(func->name, partial, true, "", false)) if (!matchpattern_with_separator(func->description, partial, true, "", false)) @@ -1589,6 +1588,23 @@ static void Cmd_Apropos_f(cmd_state_t *cmd) Con_Printf("%i result%s\n\n", count, (count > 1) ? "s" : ""); } +static cmd_state_t *Cmd_AddInterpreter(cmd_buf_t *cbuf, cvar_state_t *cvars, int cvars_flagsmask, int cmds_flagsmask, cmd_userdefined_t *userdefined) +{ + cmd_state_t *cmd = (cmd_state_t *)Mem_Alloc(tempmempool, sizeof(cmd_state_t)); + + cmd->mempool = Mem_AllocPool("commands", 0, NULL); + // space for commands and script files + cmd->cbuf = cbuf; + cmd->null_string = ""; + + cmd->cvars = cvars; + cmd->cvars_flagsmask = cvars_flagsmask; + cmd->cmd_flags = cmds_flagsmask; + cmd->userdefined = userdefined; + + return cmd; +} + /* ============ Cmd_Init @@ -1596,9 +1612,10 @@ Cmd_Init */ void Cmd_Init(void) { - cmd_iter_t *cmd_iter; - cbuf_t *cbuf = (cbuf_t *)Z_Malloc(sizeof(cbuf_t)); - cbuf->maxsize = 655360; + cmd_buf_t *cbuf; + cbuf_mempool = Mem_AllocPool("Command buffer", 0, NULL); + cbuf = (cmd_buf_t *)Mem_Alloc(cbuf_mempool, sizeof(cmd_buf_t)); + cbuf->maxsize = CMDBUFSIZE; cbuf->lock = Thread_CreateMutex(); cbuf->wait = false; host.cbuf = cbuf; @@ -1607,75 +1624,59 @@ void Cmd_Init(void) cbuf->deferred.prev = cbuf->deferred.next = &(cbuf->deferred); cbuf->free.prev = cbuf->free.next = &(cbuf->free); - for (cmd_iter = cmd_iter_all; cmd_iter->cmd; cmd_iter++) - { - cmd_state_t *cmd = cmd_iter->cmd; - cmd->mempool = Mem_AllocPool("commands", 0, NULL); - // space for commands and script files - cmd->cbuf = cbuf; - cmd->null_string = ""; - } - // client console can see server cvars because the user may start a server - cmd_client.cvars = &cvars_all; - cmd_client.cvars_flagsmask = CVAR_CLIENT | CVAR_SERVER; - cmd_client.cmd_flags = CMD_CLIENT | CMD_CLIENT_FROM_SERVER; - cmd_client.auto_flags = CMD_SERVER_FROM_CLIENT; - cmd_client.auto_function = CL_ForwardToServer_f; // FIXME: Move this to the client. - cmd_client.userdefined = &cmd_userdefined_all; - // dedicated server console can only see server cvars, there is no client - cmd_server.cvars = &cvars_all; - cmd_server.cvars_flagsmask = CVAR_SERVER; - cmd_server.cmd_flags = CMD_SERVER; - cmd_server.auto_flags = 0; - cmd_server.auto_function = NULL; - cmd_server.userdefined = &cmd_userdefined_all; + // FIXME: Get rid of cmd_iter_all eventually. This is just a hack to reduce the amount of work to make the interpreters dynamic. + cmd_iter_all = (cmd_iter_t *)Mem_Alloc(tempmempool, sizeof(cmd_iter_t) * 3); + + // local console + cmd_iter_all[0].cmd = cmd_local = Cmd_AddInterpreter(cbuf, &cvars_all, CF_CLIENT | CF_SERVER, CF_CLIENT | CF_CLIENT_FROM_SERVER | CF_SERVER_FROM_CLIENT, &cmd_userdefined_all); + cmd_local->Handle = Cmd_CL_Callback; + cmd_local->NotFound = NULL; + // server commands received from clients have no reason to access cvars, cvar expansion seems perilous. - cmd_serverfromclient.cvars = &cvars_null; - cmd_serverfromclient.cvars_flagsmask = 0; - cmd_serverfromclient.cmd_flags = CMD_SERVER_FROM_CLIENT | CMD_USERINFO; - cmd_serverfromclient.auto_flags = 0; - cmd_serverfromclient.auto_function = NULL; - cmd_serverfromclient.userdefined = &cmd_userdefined_null; + cmd_iter_all[1].cmd = cmd_serverfromclient = Cmd_AddInterpreter(cbuf, &cvars_null, 0, CF_SERVER_FROM_CLIENT | CF_USERINFO, &cmd_userdefined_null); + cmd_serverfromclient->Handle = Cmd_SV_Callback; + cmd_serverfromclient->NotFound = Cmd_SV_NotFound; + cmd_iter_all[2].cmd = NULL; // // register our commands // // client-only commands - Cmd_AddCommand(CMD_SHARED, "wait", Cmd_Wait_f, "make script execution wait for next rendered frame"); - Cmd_AddCommand(CMD_CLIENT, "cprint", Cmd_Centerprint_f, "print something at the screen center"); + Cmd_AddCommand(CF_SHARED, "wait", Cmd_Wait_f, "make script execution wait for next rendered frame"); + Cmd_AddCommand(CF_CLIENT, "cprint", Cmd_Centerprint_f, "print something at the screen center"); // maintenance commands used for upkeep of cvars and saved configs - Cmd_AddCommand(CMD_SHARED, "stuffcmds", Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)"); - Cmd_AddCommand(CMD_SHARED, "cvar_lockdefaults", Cvar_LockDefaults_f, "stores the current values of all cvars into their default values, only used once during startup after parsing default.cfg"); - Cmd_AddCommand(CMD_SHARED, "cvar_resettodefaults_all", Cvar_ResetToDefaults_All_f, "sets all cvars to their locked default values"); - Cmd_AddCommand(CMD_SHARED, "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(CMD_SHARED, "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(CF_SHARED, "stuffcmds", Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)"); + Cmd_AddCommand(CF_SHARED, "cvar_lockdefaults", Cvar_LockDefaults_f, "stores the current values of all cvars into their default values, only used once during startup after parsing default.cfg"); + Cmd_AddCommand(CF_SHARED, "cvar_resettodefaults_all", Cvar_ResetToDefaults_All_f, "sets all cvars to their locked default values"); + Cmd_AddCommand(CF_SHARED, "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(CF_SHARED, "cvar_resettodefaults_saveonly", Cvar_ResetToDefaults_SaveOnly_f, "sets all saved cvars to their locked default values (variables that will be saved to config.cfg)"); // general console commands used in multiple environments - Cmd_AddCommand(CMD_SHARED, "exec", Cmd_Exec_f, "execute a script file"); - Cmd_AddCommand(CMD_SHARED, "echo",Cmd_Echo_f, "print a message to the console (useful in scripts)"); - Cmd_AddCommand(CMD_SHARED, "alias",Cmd_Alias_f, "create a script function (parameters are passed in as $X (being X a number), $* for all parameters, $X- for all parameters starting from $X). Without arguments show the list of all alias"); - Cmd_AddCommand(CMD_SHARED, "unalias",Cmd_UnAlias_f, "remove an alias"); - Cmd_AddCommand(CMD_SHARED, "set", Cvar_Set_f, "create or change the value of a console variable"); - Cmd_AddCommand(CMD_SHARED, "seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg"); - Cmd_AddCommand(CMD_SHARED, "unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)"); + Cmd_AddCommand(CF_SHARED, "exec", Cmd_Exec_f, "execute a script file"); + Cmd_AddCommand(CF_SHARED, "echo",Cmd_Echo_f, "print a message to the console (useful in scripts)"); + Cmd_AddCommand(CF_SHARED, "alias",Cmd_Alias_f, "create a script function (parameters are passed in as $X (being X a number), $* for all parameters, $X- for all parameters starting from $X). Without arguments show the list of all alias"); + Cmd_AddCommand(CF_SHARED, "unalias",Cmd_UnAlias_f, "remove an alias"); + Cmd_AddCommand(CF_SHARED, "set", Cvar_Set_f, "create or change the value of a console variable"); + Cmd_AddCommand(CF_SHARED, "seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg"); + Cmd_AddCommand(CF_SHARED, "unset", Cvar_Del_f, "delete a cvar (does not work for static ones like _cl_name, or read-only ones)"); #ifdef FILLALLCVARSWITHRUBBISH - Cmd_AddCommand(CMD_SHARED, "fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns"); + Cmd_AddCommand(CF_SHARED, "fillallcvarswithrubbish", Cvar_FillAll_f, "fill all cvars with a specified number of characters to provoke buffer overruns"); #endif /* FILLALLCVARSWITHRUBBISH */ // 2000-01-09 CmdList, CvarList commands By Matthias "Maddes" Buecher // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com - Cmd_AddCommand(CMD_SHARED, "cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix or matching the specified wildcard pattern"); - Cmd_AddCommand(CMD_SHARED, "cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix or matching the specified wildcard pattern"); - Cmd_AddCommand(CMD_SHARED, "apropos", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description"); - Cmd_AddCommand(CMD_SHARED, "find", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description"); + Cmd_AddCommand(CF_SHARED, "cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix or matching the specified wildcard pattern"); + Cmd_AddCommand(CF_SHARED, "cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix or matching the specified wildcard pattern"); + Cmd_AddCommand(CF_SHARED, "apropos", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description"); + Cmd_AddCommand(CF_SHARED, "find", Cmd_Apropos_f, "lists all console variables/commands/aliases containing the specified string in the name or description"); - Cmd_AddCommand(CMD_SHARED, "defer", Cmd_Defer_f, "execute a command in the future"); + Cmd_AddCommand(CF_SHARED, "defer", Cmd_Defer_f, "execute a command in the future"); // DRESK - 5/14/06 // Support Doom3-style Toggle Command - Cmd_AddCommand(CMD_SHARED | CMD_CLIENT_FROM_SERVER, "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)"); + Cmd_AddCommand(CF_SHARED | CF_CLIENT_FROM_SERVER, "toggle", Cmd_Toggle_f, "toggles a console variable's values (use for more info)"); } /* @@ -1705,7 +1706,7 @@ void Cmd_Shutdown(void) Cmd_Argc ============ */ -int Cmd_Argc (cmd_state_t *cmd) +inline int Cmd_Argc (cmd_state_t *cmd) { return cmd->argc; } @@ -1715,7 +1716,7 @@ int Cmd_Argc (cmd_state_t *cmd) Cmd_Argv ============ */ -const char *Cmd_Argv(cmd_state_t *cmd, int arg) +inline const char *Cmd_Argv(cmd_state_t *cmd, int arg) { if (arg >= cmd->argc ) return cmd->null_string; @@ -1727,7 +1728,7 @@ const char *Cmd_Argv(cmd_state_t *cmd, int arg) Cmd_Args ============ */ -const char *Cmd_Args (cmd_state_t *cmd) +inline const char *Cmd_Args (cmd_state_t *cmd) { return cmd->args; } @@ -1746,6 +1747,7 @@ static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text) cmd->argc = 0; cmd->args = NULL; + cmd->cmdline = NULL; while (1) { @@ -1769,6 +1771,8 @@ static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text) if (!*text) return; + if(!cmd->argc) + cmd->cmdline = text; if (cmd->argc == 1) cmd->args = text; @@ -1802,22 +1806,13 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const cmd_function_t *func; cmd_function_t *prev, *current; cmd_state_t *cmd; - xcommand_t save = NULL; - qbool auto_add = false; int i; - for (i = 0; i < 3; i++) + for (i = 0; i < 2; i++) { cmd = cmd_iter_all[i].cmd; - if ((flags & cmd->cmd_flags) || (flags & cmd->auto_flags)) + if (flags & cmd->cmd_flags) { - if((flags & cmd->auto_flags) && cmd->auto_function) - { - save = function; - function = cmd->auto_function; - auto_add = true; - } - // fail if the command is a variable name if (Cvar_FindVar(cmd->cvars, cmd_name, ~0)) { @@ -1832,10 +1827,8 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const { if (!strcmp(cmd_name, func->name)) { - if(func->autofunc && !auto_add) - break; Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name); - goto next; + continue; } } @@ -1845,7 +1838,6 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const func->function = function; func->description = description; func->next = cmd->engine_functions; - func->autofunc = auto_add; // insert it at the right alphanumeric position for (prev = NULL, current = cmd->engine_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next) @@ -1860,69 +1852,51 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const } else { - // mark csqcfunc if the function already exists in the csqc_functions list - for (func = cmd->userdefined->csqc_functions; func; func = func->next) + // mark qcfunc if the function already exists in the qc_functions list + for (func = cmd->userdefined->qc_functions; func; func = func->next) { if (!strcmp(cmd_name, func->name)) { - func->csqcfunc = true; //[515]: csqc + func->qcfunc = true; //[515]: csqc continue; } } - func = (cmd_function_t *)Mem_Alloc(cmd->mempool, sizeof(cmd_function_t)); + func->flags = flags; func->name = cmd_name; func->function = function; func->description = description; - func->csqcfunc = true; //[515]: csqc - func->next = cmd->userdefined->csqc_functions; - func->autofunc = false; + func->qcfunc = true; //[515]: csqc + func->next = cmd->userdefined->qc_functions; + + // bones_was_here: if this QC command overrides an engine command, store its pointer + // to avoid doing this search at invocation if QC declines to handle this command. + for (cmd_function_t *f = cmd->engine_functions; f; f = f->next) + { + if (!strcmp(cmd_name, f->name)) + { + Con_DPrintf("Adding QC override of engine command %s\n", cmd_name); + func->overridden = f; + break; + } + } // insert it at the right alphanumeric position - for (prev = NULL, current = cmd->userdefined->csqc_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next) + for (prev = NULL, current = cmd->userdefined->qc_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next) ; if (prev) { prev->next = func; } else { - cmd->userdefined->csqc_functions = func; + cmd->userdefined->qc_functions = func; } func->next = current; } - if (save) - function = save; } -next: - auto_add = false; - continue; } } -static int Cmd_Compare(const char *s1, const char *s2, size_t len, qbool casesensitive) -{ - if(len) - return (casesensitive ? strncmp(s1, s2, len) : strncasecmp(s1, s2, len)); - else - return (casesensitive ? strcmp(s1, s2) : strcasecmp(s1, s2)); -} - -cmd_function_t *Cmd_GetCommand(cmd_state_t *cmd, const char *partial, size_t len, qbool casesensitive) -{ - cmd_function_t *func = NULL; - - // check functions - for (func = cmd->userdefined->csqc_functions; func; func = func->next) - if (!Cmd_Compare(partial, func->name, len, casesensitive)) - break; - - for (func=cmd->engine_functions ; func ; func=func->next) - if (!Cmd_Compare(partial, func->name, len, casesensitive)) - break; - - return func; -} - /* ============ Cmd_Exists @@ -1930,11 +1904,20 @@ Cmd_Exists */ qbool Cmd_Exists (cmd_state_t *cmd, const char *cmd_name) { - if(Cmd_GetCommand(cmd, cmd_name, 0, true)) - return true; + cmd_function_t *func; + + for (func = cmd->userdefined->qc_functions; func; func = func->next) + if (!strcmp(cmd_name, func->name)) + return true; + + for (func=cmd->engine_functions ; func ; func=func->next) + if (!strcmp (cmd_name,func->name)) + return true; + return false; } + /* ============ Cmd_CompleteCommand @@ -1943,10 +1926,22 @@ Cmd_CompleteCommand const char *Cmd_CompleteCommand (cmd_state_t *cmd, const char *partial) { cmd_function_t *func; + size_t len; + + len = strlen(partial); + + if (!len) + return NULL; + +// check functions + for (func = cmd->userdefined->qc_functions; func; func = func->next) + if (!strncasecmp(partial, func->name, len)) + return func->name; + + for (func = cmd->engine_functions; func; func = func->next) + if (!strncasecmp(partial, func->name, len)) + return func->name; - func = Cmd_GetCommand(cmd, partial, strlen(partial), false); - if(func) - return func->name; return NULL; } @@ -1972,7 +1967,7 @@ int Cmd_CompleteCountPossible (cmd_state_t *cmd, const char *partial) return 0; // Loop through the command list and count all partial matches - for (func = cmd->userdefined->csqc_functions; func; func = func->next) + for (func = cmd->userdefined->qc_functions; func; func = func->next) if (!strncasecmp(partial, func->name, len)) h++; @@ -2003,7 +1998,7 @@ const char **Cmd_CompleteBuildList (cmd_state_t *cmd, const char *partial) len = strlen(partial); buf = (const char **)Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *)); // Loop through the functions lists and print all matches - for (func = cmd->userdefined->csqc_functions; func; func = func->next) + for (func = cmd->userdefined->qc_functions; func; func = func->next) if (!strncasecmp(partial, func->name, len)) buf[bpos++] = func->name; for (func = cmd->engine_functions; func; func = func->next) @@ -2020,7 +2015,7 @@ void Cmd_CompleteCommandPrint (cmd_state_t *cmd, const char *partial) cmd_function_t *func; size_t len = strlen(partial); // Loop through the command list and print all matches - for (func = cmd->userdefined->csqc_functions; func; func = func->next) + for (func = cmd->userdefined->qc_functions; func; func = func->next) if (!strncasecmp(partial, func->name, len)) Con_Printf("^2%s^7: %s\n", func->name, func->description); for (func = cmd->engine_functions; func; func = func->next) @@ -2129,7 +2124,7 @@ const char **Cmd_CompleteAliasBuildList (cmd_state_t *cmd, const char *partial) void Cmd_ClearCSQCCommands (cmd_state_t *cmd) { cmd_function_t *func; - cmd_function_t **next = &cmd->userdefined->csqc_functions; + cmd_function_t **next = &cmd->userdefined->qc_functions; while(*next) { @@ -2141,6 +2136,79 @@ void Cmd_ClearCSQCCommands (cmd_state_t *cmd) extern cvar_t sv_cheats; +/* + * Cloudwalk FIXME: This idea sounded great in my head but... + * How do we handle commands that can be received by the client, + * but which the server can also execute locally? + * + * If we create a callback where the engine will forward to server + * but try to execute the command locally if it's dedicated, + * we're back to intermixing client and server code which I'm + * trying to avoid. There's no other way I can think of to + * implement that behavior that doesn't involve an #ifdef, or + * making a mess of hooks. + */ +qbool Cmd_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) +{ + if (func->function) + func->function(cmd); + else + Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(cmd, 0)); + return true; +} + +qbool Cmd_CL_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) +{ + // TODO: Assign these functions to QC commands directly? + if(func->qcfunc) + { + if(((func->flags & CF_CLIENT) && CL_VM_ConsoleCommand(text)) || + ((func->flags & CF_SERVER) && SV_VM_ConsoleCommand(text))) + return true; + + if (func->overridden) // If this QC command overrides an engine command, + func = func->overridden; // fall back to that command. + } + if (func->flags & CF_SERVER_FROM_CLIENT) + { + if(host_isclient.integer) + { + CL_ForwardToServer_f(cmd); + return true; + } + else if(!(func->flags & CF_SERVER)) + { + Con_Printf("Cannot execute client commands from a dedicated server console.\n"); + return true; + } + } + return Cmd_Callback(cmd, func, text, src); +} + +qbool Cmd_SV_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) +{ + if(func->qcfunc && (func->flags & CF_SERVER)) + return SV_VM_ConsoleCommand(text); + else if (src == src_client) + { + if((func->flags & CF_CHEAT) && !sv_cheats.integer) + SV_ClientPrintf("No cheats allowed. The server must have sv_cheats set to 1\n"); + else + func->function(cmd); + return true; + } + return false; +} + +qbool Cmd_SV_NotFound(cmd_state_t *cmd, cmd_function_t *func, const char *text, cmd_source_t src) +{ + if (cmd->source == src_client) + { + Con_Printf("Client \"%s\" tried to execute \"%s\"\n", host_client->name, text); + return true; + } + return false; +} /* ============ Cmd_ExecuteString @@ -2166,39 +2234,29 @@ void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qb goto done; // no tokens // check functions - func = Cmd_GetCommand(cmd, cmd->argv[0], 0, false); - if(func) + for (func = cmd->userdefined->qc_functions; func; func = func->next) { - if (func->csqcfunc && CL_VM_ConsoleCommand(text)) //[515]: csqc - goto done; - else + if (!strcasecmp(cmd->argv[0], func->name)) { - switch (src) - { - case src_local: - if (func->function) - func->function(cmd); - else - Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(cmd, 0)); + if(cmd->Handle(cmd, func, text, src)) + goto done; + } + } + + for (func = cmd->engine_functions; func; func=func->next) + { + if (!strcasecmp (cmd->argv[0], func->name)) + { + if(cmd->Handle(cmd, func, text, src)) goto done; - case src_client: - if (func->function) - { - if((func->flags & CMD_CHEAT) && !sv_cheats.integer) - SV_ClientPrintf("No cheats allowed. The server must have sv_cheats set to 1\n"); - else - func->function(cmd); - goto done; - } - } } } // if it's a client command and no command was found, say so. - if (cmd->source == src_client) + if(cmd->NotFound) { - Con_Printf("Client \"%s\" tried to execute \"%s\"\n", host_client->name, text); - goto done; + if(cmd->NotFound(cmd, func, text, src)) + goto done; } // check alias @@ -2256,7 +2314,7 @@ void Cmd_SaveInitState(void) cmd_state_t *cmd = cmd_iter->cmd; cmd_function_t *f; cmd_alias_t *a; - for (f = cmd->userdefined->csqc_functions; f; f = f->next) + for (f = cmd->userdefined->qc_functions; f; f = f->next) f->initstate = true; for (f = cmd->engine_functions; f; f = f->next) f->initstate = true; @@ -2277,7 +2335,7 @@ void Cmd_RestoreInitState(void) cmd_state_t *cmd = cmd_iter->cmd; cmd_function_t *f, **fp; cmd_alias_t *a, **ap; - for (fp = &cmd->userdefined->csqc_functions; (f = *fp);) + for (fp = &cmd->userdefined->qc_functions; (f = *fp);) { if (f->initstate) fp = &f->next; @@ -2328,3 +2386,7 @@ void Cmd_RestoreInitState(void) } Cvar_RestoreInitState(&cvars_all); } + +void Cmd_NoOperation_f(cmd_state_t *cmd) +{ +}