#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;
}
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
-qboolean host_stuffcmdsrun = false;
+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);
}
Cause a command to be executed after a delay.
============
*/
-static cbuf_cmd_t *Cbuf_LinkGet(cbuf_t *cbuf, cbuf_cmd_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)
{
- cbuf_cmd_t *current;
- cbuf_t *cbuf = cmd->cbuf;
+ cmd_input_t *current;
+ 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, cbuf_cmd_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));
+ Cbuf_Lock(cbuf);
- memcpy(current->text, text, current->size + 1);
-
- 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
{
}
}
+/*
+=============================================================================
+
+ 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.
+
+=============================================================================
+*/
+
/*
============
-Cmd_Centerprint_f
+Cbuf_NodeGet
-Print something to the center of the screen using SCR_Centerprint
+Returns an existing buffer node for appending or reuse, or allocates a new one
============
*/
-static void Cmd_Centerprint_f (cmd_state_t *cmd)
+static cmd_input_t *Cbuf_NodeGet(cmd_buf_t *cbuf, cmd_input_t *existing)
{
- char msg[MAX_INPUTLINE];
- unsigned int i, c, p;
- c = Cmd_Argc(cmd);
- if(c >= 2)
+ cmd_input_t *node;
+ if(existing && existing->pending)
+ node = existing;
+ else if(!List_Is_Empty(&cbuf->free))
{
- strlcpy(msg, Cmd_Argv(cmd,1), sizeof(msg));
- for(i = 2; i < c; ++i)
- {
- strlcat(msg, " ", sizeof(msg));
- strlcat(msg, Cmd_Argv(cmd, i), sizeof(msg));
- }
- c = (unsigned int)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);
+ node = List_Entry(cbuf->free.next, cmd_input_t, list);
+ node->length = node->pending = 0;
}
+ 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;
}
-/*
-=============================================================================
-
- COMMAND BUFFER
-
-=============================================================================
-*/
-
/*
============
-Cbuf_ParseText
+Cbuf_LinkString
-Parses Quake console command-line
-Returns size of parsed command-line
+Copies a command string into a buffer node.
+The input should not be null-terminated, the output will be.
============
*/
-static size_t Cbuf_ParseText(char **in)
+static void Cbuf_LinkString(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool leavepending, unsigned int cmdsize)
{
- int i = 0;
- qboolean quotes = false;
- qboolean comment = false; // Does not imply end because we might be starting the line with a comment.
- qboolean escaped = false;
- qboolean 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 ((*in)[i])
- {
- case '/':
- if(!quotes && (*in)[i+1] == '/' && (i == 0 || ISWHITESPACE((*in)[i-1])))
- comment = true;
- break;
- case 0:
- if(!end && cmdsize)
- // Use bit magic to indicate an incomplete (pending) command.
- cmdsize |= (1<<17);
- comment = false;
- end = true;
- break;
- case '\r':
- case '\n':
- comment = false;
- quotes = false;
- end = true;
- break;
- }
-
- if(!comment)
- {
- switch ((*in)[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;
- }
+ cmd_buf_t *cbuf = cmd->cbuf;
+ cmd_input_t *node = Cbuf_NodeGet(cbuf, existing);
+ unsigned int offset = node->length; // > 0 if(pending)
- if(!offset)
- {
- if(!end)
- offset = (char *)&(*in)[i];
- else if ((*in)[i])
- end = false;
- }
- else
- cmdsize++;
- }
- i++;
+ // node will match existing if its text was pending continuation
+ if(node != existing)
+ {
+ node->source = cmd;
+ List_Move_Tail(&node->list, head);
}
- *in = offset;
-
- return cmdsize;
-}
-
-static cbuf_cmd_t *Cbuf_LinkGet(cbuf_t *cbuf, cbuf_cmd_t *existing)
-{
- cbuf_cmd_t *ret = NULL;
- if(existing && existing->pending)
- ret = existing;
- else
+ node->length += cmdsize;
+ if(node->size < node->length)
{
- if(!List_IsEmpty(&cbuf->free))
- ret = List_Container(*cbuf->free.next, cbuf_cmd_t, list);
- else
- {
- ret = (cbuf_cmd_t *)Z_Malloc(sizeof(cbuf_cmd_t));
- ret->list.next = ret->list.prev = &ret->list;
- }
- ret->size = 0;
- ret->pending = false;
+ node->text = (char *)Mem_Realloc(cbuf_mempool, node->text, node->length + 1);
+ node->size = node->length;
}
+ cbuf->size += cmdsize;
- return ret;
+ dp_ustr2stp(&node->text[offset], node->length + 1, text, cmdsize);
+ //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, cbuf_cmd_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];
- cbuf_t *cbuf = cmd->cbuf;
- size_t totalsize = 0, newsize = 0;
- cbuf_cmd_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".
- */
- newsize = Cbuf_ParseText(&in);
-
- // 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;
+ }
- if(newsize & (1<<17))
- current->pending = true;
- totalsize += (newsize &= ~(1<<17));
- 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);
}
/*
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);
-
- if (cbuf->maxsize - cbuf->size <= l)
- Con_Print("Cbuf_AddText: overflow\n");
- else
+ if (cbuf->size + l > cbuf->maxsize)
{
- Cbuf_LinkCreate(cmd, &llist, (List_IsEmpty(&cbuf->start) ? NULL : List_Container(*cbuf->start.prev, cbuf_cmd_t, list)), text);
- if(!List_IsEmpty(&llist))
- List_Splice_Tail(&llist, &cbuf->start);
+ Con_Printf(CON_WARN "Cbuf_AddText: input too large, %luKB ought to be enough for anybody.\n", (unsigned long)(cbuf->maxsize / 1024));
+ return;
}
+
+ Cbuf_Lock(cbuf);
+
+ // 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);
}
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)
- Con_Print("Cbuf_InsertText: overflow\n");
- else
+ if (cbuf->size + l > cbuf->maxsize)
{
- Cbuf_LinkCreate(cmd, &llist, List_Container(*cbuf->start.next, cbuf_cmd_t, list), text);
- List_Splice(&llist, &cbuf->start);
+ Con_Printf(CON_WARN "Cbuf_InsertText: input too large, %luKB ought to be enough for anybody.\n", (unsigned long)(cbuf->maxsize / 1024));
+ return;
}
+ Cbuf_Lock(cbuf);
+
+ // 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);
+
Cbuf_Unlock(cbuf);
}
Cbuf_Execute_Deferred --blub
============
*/
-static void Cbuf_Execute_Deferred (cbuf_t *cbuf)
+static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf)
{
- llist_t *pos;
- cbuf_cmd_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.0/128.0)
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, cbuf_cmd_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;
}
}
}
Cbuf_Execute
============
*/
-static qboolean Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias );
-void Cbuf_Execute (cbuf_t *cbuf)
+extern qbool prvm_runawaycheck;
+void Cbuf_Execute (cmd_buf_t *cbuf)
{
- cbuf_cmd_t *current;
- char preprocessed[MAX_INPUTLINE];
- char *firstchar;
+ cmd_input_t *current;
+ 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, cbuf_cmd_t, list);
+ current = List_Entry(cbuf->start.next, cmd_input_t, list);
/*
* Assume we're rolling with the current command-line and
*/
current->pending = false;
- cbuf->size -= current->size;
-
- firstchar = current->text;
- while(*firstchar && ISWHITESPACE(*firstchar))
- ++firstchar;
- if((strncmp(firstchar, "alias", 5) || !ISWHITESPACE(firstchar[5])) &&
- (strncmp(firstchar, "bind", 4) || !ISWHITESPACE(firstchar[4])) &&
- (strncmp(firstchar, "in_bind", 7) || !ISWHITESPACE(firstchar[7])))
- {
- if(Cmd_PreprocessString(current->source, current->text, preprocessed, sizeof(preprocessed), NULL ))
- Cmd_ExecuteString(current->source, preprocessed, src_local, false);
- }
- else
- {
- Cmd_ExecuteString (current->source, current->text, src_local, false);
- }
-
+ Cmd_PreprocessAndExecuteString(current->source, current->text, current->length, src_local, false);
+ cbuf->size -= current->length;
// Recycle memory so using WASD doesn't cause a malloc and free
List_Move_Tail(¤t->list, &cbuf->free);
- current = NULL;
-
if (cbuf->wait)
{
/*
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);
+ Cbuf_Clear(cbuf);
+ }
}
}
-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;
+
+ if ((line = Sys_ConsoleInput()))
+ {
+ // bones_was_here: prepending allows a loop such as `alias foo "bar; wait; foo"; foo`
+ // to be broken with an alias or unalias command
+ Cbuf_InsertText(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)
{
Cbuf_Execute(cbuf);
SV_UnlockThreadMutex();
}
+
+// R_TimeReport("console");
+}
+
+void Cbuf_Clear(cmd_buf_t *cbuf)
+{
+ 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;
}
/*
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)
{
{
char *f;
size_t filenameLen = strlen(filename);
- qboolean isdefaultcfg =
+ qbool isdefaultcfg =
!strcmp(filename, "default.cfg") ||
(filenameLen >= 12 && !strcmp(filename + filenameLen - 12, "/default.cfg"));
f = (char *)FS_LoadFile (filename, tempmempool, false, NULL);
if (!f)
{
- Con_Printf("couldn't exec %s\n",filename);
+ Con_Printf(CON_WARN "couldn't exec %s\n",filename);
return;
}
Con_Printf("execing %s\n",filename);
Cbuf_InsertText(cmd, "\n"
"csqc_polygons_defaultmaterial_nocullface 1\n"
"con_chatsound_team_mask 13\n"
-"sv_gameplayfix_customstats 1\n"
+"sv_qcstats 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
s = FS_Search(Cmd_Argv(cmd, 1), true, true, NULL);
if(!s || !s->numfilenames)
{
- Con_Printf("couldn't exec %s\n",Cmd_Argv(cmd, 1));
+ Con_Printf(CON_WARN "couldn't exec %s\n",Cmd_Argv(cmd, 1));
return;
}
}
else
{ // Invalid CVar
- Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(cmd, 1) );
+ Con_Printf(CON_WARN "ERROR : CVar '%s' not found\n", Cmd_Argv(cmd, 1) );
}
}
}
*/
static void Cmd_Alias_f (cmd_state_t *cmd)
{
- cmdalias_t *a;
+ cmd_alias_t *a;
char line[MAX_INPUTLINE];
int i, c;
const char *s;
s = Cmd_Argv(cmd, 1);
if (strlen(s) >= MAX_ALIAS_NAME)
{
- Con_Print("Alias name is too long\n");
+ Con_Print(CON_WARN "Alias name is too long\n");
return;
}
if (!a)
{
- cmdalias_t *prev, *current;
+ cmd_alias_t *prev, *current;
- a = (cmdalias_t *)Z_Malloc (sizeof(cmdalias_t));
- strlcpy (a->name, s, sizeof (a->name));
+ a = (cmd_alias_t *)Z_Malloc (sizeof(cmd_alias_t));
+ dp_strlcpy (a->name, s, sizeof (a->name));
// insert it at the right alphanumeric position
for( prev = NULL, current = cmd->userdefined->alias ; current && strcmp( current->name, a->name ) < 0 ; prev = current, current = current->next )
;
for (i=2 ; i < c ; i++)
{
if (i != 2)
- strlcat (line, " ", sizeof (line));
- strlcat (line, Cmd_Argv(cmd, i), sizeof (line));
+ dp_strlcat (line, " ", sizeof (line));
+ dp_strlcat (line, Cmd_Argv(cmd, i), sizeof (line));
}
- strlcat (line, "\n", sizeof (line));
+ dp_strlcat (line, "\n", sizeof (line));
alloclen = strlen (line) + 1;
if(alloclen >= 2)
*/
static void Cmd_UnAlias_f (cmd_state_t *cmd)
{
- cmdalias_t *a, *p;
+ cmd_alias_t *a, *p;
int i;
const char *s;
=============================================================================
*/
-static const char *Cmd_GetDirectCvarValue(cmd_state_t *cmd, const char *varname, cmdalias_t *alias, qboolean *is_multiple)
+static const char *Cmd_GetDirectCvarValue(cmd_state_t *cmd, const char *varname, cmd_alias_t *alias, qbool *is_multiple)
{
cvar_t *cvar;
long argno;
}
}
- 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;
}
-qboolean Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quoteset, qboolean putquotes)
+qbool Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quoteset, qbool putquotes)
{
- qboolean quote_quot = !!strchr(quoteset, '"');
- qboolean quote_backslash = !!strchr(quoteset, '\\');
- qboolean quote_dollar = !!strchr(quoteset, '$');
+ qbool quote_quot = !!strchr(quoteset, '"');
+ qbool quote_backslash = !!strchr(quoteset, '\\');
+ qbool quote_dollar = !!strchr(quoteset, '$');
if(putquotes)
{
return false;
}
-static const char *Cmd_GetCvarValue(cmd_state_t *cmd, const char *var, size_t varlen, cmdalias_t *alias)
+static const char *Cmd_GetCvarValue(cmd_state_t *cmd, const char *var, size_t varlen, cmd_alias_t *alias)
{
static char varname[MAX_INPUTLINE]; // cmd_mutex
static char varval[MAX_INPUTLINE]; // cmd_mutex
const char *varstr = NULL;
char *varfunc;
- qboolean required = false;
- qboolean optional = false;
+ qbool required = false;
+ qbool optional = false;
static char asis[] = "asis"; // just to suppress const char warnings
if(varlen >= MAX_INPUTLINE)
varstr = Cmd_GetDirectCvarValue(cmd, Cmd_GetDirectCvarValue(cmd, varname + 1, alias, NULL), alias, NULL);
else
{
- qboolean is_multiple = false;
+ qbool is_multiple = false;
// Exception: $* and $n- don't use the quoted form by default
varstr = Cmd_GetDirectCvarValue(cmd, varname, alias, &is_multiple);
if(is_multiple)
return varstr;
}
-/*
+/**
Cmd_PreprocessString
Preprocesses strings and replaces $*, $param#, $cvar accordingly. Also strips comments.
+Returns the number of bytes written to *outtext excluding the \0 terminator.
*/
-static qboolean Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ) {
+static size_t Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmd_alias_t *alias)
+{
const char *in;
size_t eat, varlen;
unsigned outlen;
// don't crash if there's no room in the outtext buffer
if( maxoutlen == 0 ) {
- return false;
+ return 0;
}
maxoutlen--; // because of \0
{
val = Cmd_GetCvarValue(cmd, in + 1, varlen, alias);
if(!val)
- return false;
+ return 0;
eat = varlen + 2;
}
else
varlen = strspn(in, "#*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
val = Cmd_GetCvarValue(cmd, in, varlen, alias);
if(!val)
- return false;
+ return 0;
eat = varlen;
}
if(val)
else
outtext[outlen++] = *in++;
}
- outtext[outlen] = 0;
- return true;
+ outtext[outlen] = '\0';
+ return outlen;
}
/*
Called for aliases and fills in the alias into the cbuffer
============
*/
-static void Cmd_ExecuteAlias (cmd_state_t *cmd, cmdalias_t *alias)
+static void Cmd_ExecuteAlias (cmd_state_t *cmd, cmd_alias_t *alias)
{
static char buffer[ MAX_INPUTLINE ]; // cmd_mutex
static char buffer2[ MAX_INPUTLINE ]; // cmd_mutex
- qboolean ret = Cmd_PreprocessString( cmd, alias->value, buffer, sizeof(buffer) - 2, alias );
+ qbool ret = Cmd_PreprocessString( cmd, alias->value, buffer, sizeof(buffer) - 2, alias );
if(!ret)
return;
// insert at start of command buffer, so that aliases execute in order
Cbuf_InsertText(cmd, buffer2);
}
+void Cmd_PreprocessAndExecuteString(cmd_state_t *cmd, const char *text, size_t textlen, cmd_source_t src, qbool lockmutex)
+{
+ char preprocessed[MAX_INPUTLINE];
+ size_t preprocessed_len;
+ const char *firstchar;
+
+ firstchar = text;
+ while(*firstchar && ISWHITESPACE(*firstchar))
+ ++firstchar;
+ if((strncmp(firstchar, "alias", 5) || !ISWHITESPACE(firstchar[5]))
+ && (strncmp(firstchar, "bind", 4) || !ISWHITESPACE(firstchar[4]))
+ && (strncmp(firstchar, "in_bind", 7) || !ISWHITESPACE(firstchar[7])))
+ {
+ if((preprocessed_len = Cmd_PreprocessString(cmd, text, preprocessed, sizeof(preprocessed), NULL)))
+ Cmd_ExecuteString(cmd, preprocessed, preprocessed_len, src, lockmutex);
+ }
+ else
+ Cmd_ExecuteString(cmd, text, textlen, src, lockmutex);
+}
+
/*
========
Cmd_List
const char *partial;
size_t len;
int count;
- qboolean ispattern;
+ qbool ispattern;
if (Cmd_Argc(cmd) > 1)
{
}
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;
{
cmd_function_t *func;
cvar_t *cvar;
- cmdalias_t *alias;
+ cmd_alias_t *alias;
const char *partial;
int count;
- qboolean ispattern;
+ qbool ispattern;
char vabuf[1024];
if (Cmd_Argc(cmd) > 1)
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))
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, unsigned cvars_flagsmask, unsigned 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_flagsmask = cmds_flagsmask;
+ cmd->userdefined = userdefined;
+
+ return cmd;
+}
+
/*
============
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;
+ unsigned cvars_flagsmask, cmds_flagsmask;
+
+ 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;
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++)
+ // 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
+ if (cls.state == ca_dedicated)
{
- 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;
+ cvars_flagsmask = CF_SERVER;
+ cmds_flagsmask = CF_SERVER | CF_SERVER_FROM_CLIENT;
+ }
+ else
+ {
+ cvars_flagsmask = CF_CLIENT | CF_SERVER;
+ cmds_flagsmask = CF_CLIENT | CF_SERVER | CF_CLIENT_FROM_SERVER | CF_SERVER_FROM_CLIENT;
+ }
+ cmd_iter_all[0].cmd = cmd_local = Cmd_AddInterpreter(cbuf, &cvars_all, cvars_flagsmask, cmds_flagsmask, &cmd_userdefined_all);
+ cmd_local->Handle = Cmd_CL_Callback;
+
// 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_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");
// 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)");
}
/*
}
}
-/*
-============
-Cmd_Argc
-============
-*/
-int Cmd_Argc (cmd_state_t *cmd)
-{
- return cmd->argc;
-}
-
-/*
-============
-Cmd_Argv
-============
-*/
-const char *Cmd_Argv(cmd_state_t *cmd, int arg)
-{
- if (arg >= cmd->argc )
- return cmd->null_string;
- return cmd->argv[arg];
-}
-
-/*
-============
-Cmd_Args
-============
-*/
-const char *Cmd_Args (cmd_state_t *cmd)
-{
- return cmd->args;
-}
-
/*
============
Cmd_TokenizeString
Parses the given string into command line tokens.
+Takes a null terminated string. Does not need to be /n terminated.
============
*/
-// AK: This function should only be called from ExcuteString because the current design is a bit of an hack
+// AK: This function should only be called from ExecuteString because the current design is a bit of an hack
static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text)
{
int l;
cmd->argc = 0;
cmd->args = NULL;
+ cmd->cmdline = NULL;
while (1)
{
if (!*text)
return;
+ if(!cmd->argc)
+ cmd->cmdline = text;
if (cmd->argc == 1)
cmd->args = text;
l = (int)strlen(com_token) + 1;
if (cmd->cbuf->tokenizebufferpos + l > CMD_TOKENIZELENGTH)
{
- Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguments\n", CMD_TOKENIZELENGTH);
+ Con_Printf(CON_WARN "Cmd_TokenizeString: ran out of %i character buffer space for command arguments\n", CMD_TOKENIZELENGTH);
break;
}
memcpy (cmd->cbuf->tokenizebuffer + cmd->cbuf->tokenizebufferpos, com_token, l);
Cmd_AddCommand
============
*/
-void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const char *description)
+void Cmd_AddCommand(unsigned flags, const char *cmd_name, xcommand_t function, const char *description)
{
cmd_function_t *func;
cmd_function_t *prev, *current;
cmd_state_t *cmd;
- xcommand_t save = NULL;
- qboolean 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_flagsmask)
{
- 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))
{
- Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name);
+ Con_Printf(CON_WARN "Cmd_AddCommand: %s already defined as a var\n", cmd_name);
return;
}
{
if (!strcmp(cmd_name, func->name))
{
- if(func->autofunc && !auto_add)
- break;
- Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
- goto next;
+ Con_Printf(CON_WARN "Cmd_AddCommand: %s already defined\n", cmd_name);
+ continue;
}
}
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)
}
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, qboolean 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, qboolean 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
============
*/
-qboolean Cmd_Exists (cmd_state_t *cmd, const char *cmd_name)
+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
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;
}
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++;
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)
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)
*/
const char *Cmd_CompleteAlias (cmd_state_t *cmd, const char *partial)
{
- cmdalias_t *alias;
+ cmd_alias_t *alias;
size_t len;
len = strlen(partial);
// written by LadyHavoc
void Cmd_CompleteAliasPrint (cmd_state_t *cmd, const char *partial)
{
- cmdalias_t *alias;
+ cmd_alias_t *alias;
size_t len = strlen(partial);
// Loop through the alias list and print all matches
for (alias = cmd->userdefined->alias; alias; alias = alias->next)
*/
int Cmd_CompleteAliasCountPossible (cmd_state_t *cmd, const char *partial)
{
- cmdalias_t *alias;
+ cmd_alias_t *alias;
size_t len;
int h;
*/
const char **Cmd_CompleteAliasBuildList (cmd_state_t *cmd, const char *partial)
{
- cmdalias_t *alias;
+ cmd_alias_t *alias;
size_t len = 0;
size_t bpos = 0;
size_t sizeofbuf = (Cmd_CompleteAliasCountPossible (cmd, partial) + 1) * sizeof (const char *);
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)
{
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)
+{
+ if (func->function)
+ func->function(cmd);
+ else
+ Con_Printf(CON_WARN "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, size_t textlen, cmd_source_t src)
+{
+ // TODO: Assign these functions to QC commands directly?
+ if(func->qcfunc)
+ {
+ if(((func->flags & CF_CLIENT) && CL_VM_ConsoleCommand(text, textlen)) ||
+ ((func->flags & CF_SERVER) && SV_VM_ConsoleCommand(text, textlen)))
+ 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(CON_WARN "Cannot execute client commands from a dedicated server console.\n");
+ return true;
+ }
+ }
+ return Cmd_Callback(cmd, func);
+}
+
+qbool Cmd_SV_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, size_t textlen, cmd_source_t src)
+{
+ if(func->qcfunc && (func->flags & CF_SERVER))
+ return SV_VM_ConsoleCommand(text, textlen);
+ else if (src == src_client)
+ {
+ if((func->flags & CF_CHEAT) && !sv_cheats.integer)
+ SV_ClientPrintf(CON_WARN "No cheats allowed. The server must have sv_cheats set to 1\n");
+ else
+ func->function(cmd);
+ return true;
+ }
+ return false;
+}
+
/*
============
Cmd_ExecuteString
FIXME: lookupnoadd the token to speed search?
============
*/
-void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qboolean lockmutex)
+void Cmd_ExecuteString(cmd_state_t *cmd, const char *text, size_t textlen, cmd_source_t src, qbool lockmutex)
{
int oldpos;
cmd_function_t *func;
- cmdalias_t *a;
+ cmd_alias_t *a;
+
if (lockmutex)
Cbuf_Lock(cmd->cbuf);
oldpos = cmd->cbuf->tokenizebufferpos;
goto done; // no tokens
// check functions
- func = Cmd_GetCommand(cmd, cmd->argv[0], 0, false);
- if(func)
- {
- if (func->csqcfunc && CL_VM_ConsoleCommand(text)) //[515]: csqc
- goto done;
- else
- {
- 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));
- 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.
+ for (func = cmd->userdefined->qc_functions; func; func = func->next)
+ if (!strcasecmp(cmd->argv[0], func->name))
+ if(cmd->Handle(cmd, func, text, textlen, src))
+ goto functions_done;
+
+ for (func = cmd->engine_functions; func; func=func->next)
+ if (!strcasecmp (cmd->argv[0], func->name))
+ if(cmd->Handle(cmd, func, text, textlen, src))
+ goto functions_done;
+
+functions_done:
+ // If it's a client command and wasn't found and handled, say so.
+ // Also don't let clients call server aliases.
if (cmd->source == src_client)
{
- Con_Printf("Client \"%s\" tried to execute \"%s\"\n", host_client->name, text);
+ if (!func)
+ Con_Printf("Client \"%s\" tried to execute \"%s\"\n", host_client->name, text);
goto done;
}
// check alias
+ // Execute any alias with the same name as a command after the command.
for (a=cmd->userdefined->alias ; a ; a=a->next)
{
if (!strcasecmp (cmd->argv[0], a->name))
}
}
+ // If the command was found and handled don't try to handle it as a cvar.
+ if (func)
+ goto done;
+
// check cvars
- if (!Cvar_Command(cmd) && host.framecount > 0)
- Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(cmd, 0));
+ // Xonotic is still maintained so we don't want to hide problems from getting fixed
+ if (!Cvar_Command(cmd) && (host.framecount > 0 || gamemode == GAME_XONOTIC))
+ Con_Printf(CON_WARN "Unknown command \"%s\"\n", Cmd_Argv(cmd, 0));
done:
cmd->cbuf->tokenizebufferpos = oldpos;
if (lockmutex)
if (!parm)
{
- Con_Printf ("Cmd_CheckParm: NULL");
+ Con_Printf(CON_WARN "Cmd_CheckParm: NULL");
return 0;
}
{
cmd_state_t *cmd = cmd_iter->cmd;
cmd_function_t *f;
- cmdalias_t *a;
- for (f = cmd->userdefined->csqc_functions; f; f = f->next)
+ cmd_alias_t *a;
+ 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;
{
cmd_state_t *cmd = cmd_iter->cmd;
cmd_function_t *f, **fp;
- cmdalias_t *a, **ap;
- for (fp = &cmd->userdefined->csqc_functions; (f = *fp);)
+ cmd_alias_t *a, **ap;
+ for (fp = &cmd->userdefined->qc_functions; (f = *fp);)
{
if (f->initstate)
fp = &f->next;
}
Cvar_RestoreInitState(&cvars_all);
}
+
+void Cmd_NoOperation_f(cmd_state_t *cmd)
+{
+}
projects / xonotic / darkplaces.git / blobdiff