//=============================================================================
-void Cbuf_Lock(cmd_state_t *cmd)
+void Cbuf_Lock(cbuf_t *cbuf)
{
- Thread_AtomicLock(&cmd->text_lock);
+ Thread_LockMutex(cbuf->lock);
}
-void Cbuf_Unlock(cmd_state_t *cmd)
+void Cbuf_Unlock(cbuf_t *cbuf)
{
- Thread_AtomicUnlock(&cmd->text_lock);
+ Thread_UnlockMutex(cbuf->lock);
}
*/
static void Cmd_Wait_f (cmd_state_t *cmd)
{
- cmd->wait = true;
+ cmd->cbuf->wait = true;
}
/*
Cause a command to be executed after a delay.
============
*/
+static cbuf_cmd_t *Cbuf_LinkGet(cbuf_t *cbuf, cbuf_cmd_t *existing);
static void Cmd_Defer_f (cmd_state_t *cmd)
{
+ cbuf_cmd_t *current;
+ cbuf_t *cbuf = cmd->cbuf;
+
if(Cmd_Argc(cmd) == 1)
{
- cmddeferred_t *next = cmd->deferred_list;
- if(!next)
+ if(List_IsEmpty(&cbuf->deferred))
Con_Printf("No commands are pending.\n");
- while(next)
+ else
{
- Con_Printf("-> In %9.2f: %s\n", next->delay, next->value);
- next = next->next;
+ llist_t *pos;
+ List_ForEach(pos, &cbuf->deferred)
+ {
+ current = List_Container(*pos, cbuf_cmd_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)))
+ }
+ else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1)))
{
- while(cmd->deferred_list)
- {
- cmddeferred_t *defcmd = cmd->deferred_list;
- cmd->deferred_list = defcmd->next;
- Mem_Free(defcmd->value);
- Mem_Free(defcmd);
- }
- } else if(Cmd_Argc(cmd) == 3)
+ while(!List_IsEmpty(&cbuf->deferred))
+ List_Move_Tail(cbuf->deferred.next, &cbuf->free);
+ }
+ else if(Cmd_Argc(cmd) == 3)
{
- const char *value = Cmd_Argv(cmd, 2);
- cmddeferred_t *defcmd = (cmddeferred_t*)Mem_Alloc(tempmempool, sizeof(*defcmd));
- size_t len = strlen(value);
+ 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));
- defcmd->delay = atof(Cmd_Argv(cmd, 1));
- defcmd->value = (char*)Mem_Alloc(tempmempool, len+1);
- memcpy(defcmd->value, value, len+1);
- defcmd->next = NULL;
+ memcpy(current->text, text, current->size + 1);
- 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 {
+ List_Move_Tail(¤t->list, &cbuf->deferred);
+
+ }
+ else
+ {
Con_Printf("usage: defer <seconds> <command>\n"
" defer clear\n");
return;
=============================================================================
*/
+/*
+============
+Cbuf_ParseText
+
+Parses Quake console command-line
+Returns true if command is complete
+============
+*/
+static qboolean Cbuf_ParseText(char **start, size_t *size)
+{
+ 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 ((*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++;
+ }
+
+ *start = offset;
+ *size = cmdsize;
+
+ return true;
+}
+
+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
+ {
+ 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;
+ }
+
+ return ret;
+}
+
+
+// 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)
+{
+ char *in = (char *)&text[0];
+ qboolean complete;
+ cbuf_t *cbuf = cmd->cbuf;
+ size_t totalsize = 0, newsize = 0;
+ cbuf_cmd_t *current = NULL;
+
+ // Slide the pointer down until we reach the end
+ while(in)
+ {
+ /*
+ * 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)
+ {
+ if(!current)
+ current = Cbuf_LinkGet(cbuf, existing);
+
+ if(!current->pending)
+ {
+ current->source = cmd;
+ List_Move_Tail(¤t->list, head);
+ }
+
+ current->pending = complete;
+ totalsize += newsize;
+ strlcpy(¤t->text[current->size], in, newsize + 1);
+ current->size += newsize;
+ }
+ else if (existing && !totalsize)
+ existing->pending = false;
+ current = NULL;
+ in = &in[newsize];
+ }
+
+ cbuf->size += totalsize;
+}
+
/*
============
Cbuf_AddText
*/
void Cbuf_AddText (cmd_state_t *cmd, const char *text)
{
- int l;
+ size_t l = strlen(text);
+ cbuf_t *cbuf = cmd->cbuf;
+ llist_t llist = {&llist, &llist};
- l = (int)strlen(text);
+ Cbuf_Lock(cbuf);
- Cbuf_Lock(cmd);
- if (cmd->text.maxsize - cmd->text.cursize <= l)
+ if (cbuf->maxsize - cbuf->size <= l)
Con_Print("Cbuf_AddText: overflow\n");
else
- SZ_Write(&cmd->text, (const unsigned char *)text, l);
- Cbuf_Unlock(cmd);
+ {
+ 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);
+ }
+ Cbuf_Unlock(cbuf);
}
-
/*
============
Cbuf_InsertText
Adds command text immediately after the current command
-Adds a \n to the text
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;
+ llist_t llist = {&llist, &llist};
size_t l = strlen(text);
- Cbuf_Lock(cmd);
+
+ Cbuf_Lock(cbuf);
+
// we need to memmove the existing text and stuff this in before it...
- if (cmd->text.cursize + l >= (size_t)cmd->text.maxsize)
+ if (cbuf->size + l >= (size_t)cbuf->maxsize)
Con_Print("Cbuf_InsertText: overflow\n");
else
{
- // we don't have a SZ_Prepend, so...
- memmove(cmd->text.data + l, cmd->text.data, cmd->text.cursize);
- cmd->text.cursize += (int)l;
- memcpy(cmd->text.data, text, l);
+ Cbuf_LinkCreate(cmd, &llist, List_Container(*cbuf->start.next, cbuf_cmd_t, list), text);
+ List_Splice(&llist, &cbuf->start);
}
- Cbuf_Unlock(cmd);
+
+ Cbuf_Unlock(cbuf);
}
/*
Cbuf_Execute_Deferred --blub
============
*/
-static void Cbuf_Execute_Deferred (cmd_state_t *cmd)
+static void Cbuf_Execute_Deferred (cbuf_t *cbuf)
{
- cmddeferred_t *defcmd, *prev;
+ llist_t *pos;
+ cbuf_cmd_t *current;
double eat;
- if (host.realtime - cmd->deferred_oldrealtime < 0 || host.realtime - cmd->deferred_oldrealtime > 1800) cmd->deferred_oldrealtime = host.realtime;
- eat = host.realtime - cmd->deferred_oldrealtime;
+
+ 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))
return;
- cmd->deferred_oldrealtime = host.realtime;
- prev = NULL;
- defcmd = cmd->deferred_list;
- while(defcmd)
+ cbuf->deferred_oldtime = host.realtime;
+
+ List_ForEach(pos, &cbuf->deferred)
{
- defcmd->delay -= eat;
- if(defcmd->delay <= 0)
+ current = List_Container(*pos, cbuf_cmd_t, list);
+ current->delay -= eat;
+ if(current->delay <= 0)
{
- Cbuf_AddText(cmd, defcmd->value);
- Cbuf_AddText(cmd, ";\n");
- Mem_Free(defcmd->value);
-
- if(prev) {
- prev->next = defcmd->next;
- Mem_Free(defcmd);
- defcmd = prev->next;
- } else {
- cmd->deferred_list = defcmd->next;
- Mem_Free(defcmd);
- defcmd = cmd->deferred_list;
- }
- continue;
+ 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;
}
- prev = defcmd;
- defcmd = defcmd->next;
}
}
Cbuf_Execute
============
*/
-static qboolean Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias );
-void Cbuf_Execute (cmd_state_t *cmd)
+static qboolean Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmd_alias_t *alias );
+void Cbuf_Execute (cbuf_t *cbuf)
{
- int i;
- char *text;
- char line[MAX_INPUTLINE];
+ cbuf_cmd_t *current;
char preprocessed[MAX_INPUTLINE];
char *firstchar;
- qboolean quotes;
- char *comment;
// LadyHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes
- cmd->tokenizebufferpos = 0;
+ cbuf->tokenizebufferpos = 0;
- while (cmd->text.cursize)
+ while (!List_IsEmpty(&cbuf->start))
{
-// find a \n or ; line break
- text = (char *)cmd->text.data;
-
- quotes = false;
- comment = NULL;
- for (i=0 ; i < cmd->text.cursize ; i++)
- {
- if(!comment)
- {
- if (text[i] == '"')
- quotes = !quotes;
-
- if(quotes)
- {
- // 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++;
- }
- else
- {
- if(text[i] == '/' && text[i + 1] == '/' && (i == 0 || ISWHITESPACE(text[i-1])))
- comment = &text[i];
- if(text[i] == ';')
- break; // don't break if inside a quoted string or comment
- }
- }
-
- if (text[i] == '\r' || text[i] == '\n')
- break;
- }
-
- // better than CRASHING on overlong input lines that may SOMEHOW enter the buffer
- if(i >= MAX_INPUTLINE)
+ /*
+ * 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);
+
+ /*
+ * Assume we're rolling with the current command-line and
+ * always set this false because alias expansion or cbuf insertion
+ * without a newline may set this true, and cause weirdness.
+ */
+ 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])))
{
- Con_Printf(CON_WARN "Warning: console input buffer had an overlong line. Ignored.\n");
- line[0] = 0;
+ if(Cmd_PreprocessString(current->source, current->text, preprocessed, sizeof(preprocessed), NULL ))
+ Cmd_ExecuteString(current->source, preprocessed, src_local, false);
}
else
{
- memcpy (line, text, comment ? (comment - text) : i);
- line[comment ? (comment - text) : i] = 0;
+ Cmd_ExecuteString (current->source, current->text, src_local, false);
}
-// 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
+ // Recycle memory so using WASD doesn't cause a malloc and free
+ List_Move_Tail(¤t->list, &cbuf->free);
- if (i == cmd->text.cursize)
- cmd->text.cursize = 0;
- else
- {
- i++;
- cmd->text.cursize -= i;
- memmove (cmd->text.data, text+i, cmd->text.cursize);
- }
+ current = NULL;
-// execute the command line
- firstchar = line;
- 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 (cbuf->wait)
{
- if(Cmd_PreprocessString( cmd, line, preprocessed, sizeof(preprocessed), NULL ))
- Cmd_ExecuteString (cmd, preprocessed, src_command, false);
- }
- else
- {
- Cmd_ExecuteString (cmd, line, src_command, false);
- }
-
- if (cmd->wait)
- { // skip out while text still remains in buffer, leaving it
- // for next frame
- cmd->wait = false;
+ /*
+ * Skip out while text still remains in
+ * buffer, leaving it for next frame
+ */
+ cbuf->wait = false;
break;
}
}
}
-void Cbuf_Frame(cmd_state_t *cmd)
+void Cbuf_Frame(cbuf_t *cbuf)
{
- Cbuf_Execute_Deferred(cmd);
- if (cmd->text.cursize)
+ Cbuf_Execute_Deferred(cbuf);
+ if (cbuf->size)
{
SV_LockThreadMutex();
- Cbuf_Execute(cmd);
+ Cbuf_Execute(cbuf);
SV_UnlockThreadMutex();
}
}
if (!strcmp(filename, "config.cfg"))
{
filename = CONFIGFILENAME;
- if (COM_CheckParm("-noconfig"))
+ if (Sys_CheckParm("-noconfig"))
return; // don't execute config.cfg
}
if (isdefaultcfg)
Cbuf_InsertText(cmd, "\ncvar_lockdefaults\n");
- // insert newline after the text to make sure the last line is terminated (some text editors omit the trailing newline)
- // (note: insertion order here is backwards from execution order, so this adds it after the text, by calling it before...)
- Cbuf_InsertText (cmd, "\n");
Cbuf_InsertText (cmd, f);
Mem_Free(f);
return;
}
- s = FS_Search(Cmd_Argv(cmd, 1), true, true);
+ 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));
*/
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;
if (!a)
{
- cmdalias_t *prev, *current;
+ cmd_alias_t *prev, *current;
- a = (cmdalias_t *)Z_Malloc (sizeof(cmdalias_t));
+ a = (cmd_alias_t *)Z_Malloc (sizeof(cmd_alias_t));
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 )
*/
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, qboolean *is_multiple)
{
cvar_t *cvar;
long argno;
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
Preprocesses strings and replaces $*, $param#, $cvar accordingly. Also strips comments.
*/
-static qboolean Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias ) {
+static qboolean 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;
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
{
cmd_function_t *func;
cvar_t *cvar;
- cmdalias_t *alias;
+ cmd_alias_t *alias;
const char *partial;
int count;
qboolean ispattern;
void Cmd_Init(void)
{
cmd_iter_t *cmd_iter;
+ cbuf_t *cbuf = (cbuf_t *)Z_Malloc(sizeof(cbuf_t));
+ cbuf->maxsize = 655360;
+ cbuf->lock = Thread_CreateMutex();
+ cbuf->wait = false;
+ host.cbuf = cbuf;
+
+ cbuf->start.prev = cbuf->start.next = &(cbuf->start);
+ 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->text.data = cmd->text_buf;
- cmd->text.maxsize = sizeof(cmd->text_buf);
- cmd->text.cursize = 0;
+ 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_SERVER_FROM_CLIENT;
+ 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;
// 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_state_t *cmd = cmd_iter->cmd;
- if (cmd->text_lock)
+ if (cmd->cbuf->lock)
{
// we usually have this locked when we get here from Host_Quit_f
- Cbuf_Unlock(cmd);
+ Cbuf_Unlock(cmd->cbuf);
}
Mem_FreePool(&cmd->mempool);
return cmd->args;
}
-
/*
============
Cmd_TokenizeString
if (cmd->argc < MAX_ARGS)
{
l = (int)strlen(com_token) + 1;
- if (cmd->tokenizebufferpos + l > CMD_TOKENIZELENGTH)
+ if (cmd->cbuf->tokenizebufferpos + l > CMD_TOKENIZELENGTH)
{
Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguments\n", CMD_TOKENIZELENGTH);
break;
}
- memcpy (cmd->tokenizebuffer + cmd->tokenizebufferpos, com_token, l);
- cmd->argv[cmd->argc] = cmd->tokenizebuffer + cmd->tokenizebufferpos;
- cmd->tokenizebufferpos += l;
+ memcpy (cmd->cbuf->tokenizebuffer + cmd->cbuf->tokenizebufferpos, com_token, l);
+ cmd->argv[cmd->argc] = cmd->cbuf->tokenizebuffer + cmd->cbuf->tokenizebufferpos;
+ cmd->cbuf->tokenizebufferpos += l;
cmd->argc++;
}
}
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++)
{
cmd = cmd_iter_all[i].cmd;
- if (flags & cmd->cmd_flags)
+ if ((flags & cmd->cmd_flags) || (flags & cmd->auto_flags))
{
- if(cmd == &cmd_client && (flags & CMD_SERVER_FROM_CLIENT) && !(flags & CMD_CLIENT))
+ if((flags & cmd->auto_flags) && cmd->auto_function)
{
save = function;
- function = CL_ForwardToServer_f;
+ function = cmd->auto_function;
+ auto_add = true;
}
+
// fail if the command is a variable name
if (Cvar_FindVar(cmd->cvars, cmd_name, ~0))
{
{
if (!strcmp(cmd_name, func->name))
{
+ if(func->autofunc && !auto_add)
+ break;
Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
goto next;
}
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)
func->description = description;
func->csqcfunc = true; //[515]: csqc
func->next = cmd->userdefined->csqc_functions;
+ func->autofunc = false;
// 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)
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)
{
- cmd_function_t *func;
-
- for (func = cmd->userdefined->csqc_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;
-
+ if(Cmd_GetCommand(cmd, cmd_name, 0, true))
+ 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->csqc_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;
}
*/
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 *);
{
int oldpos;
cmd_function_t *func;
- cmdalias_t *a;
+ cmd_alias_t *a;
if (lockmutex)
- Cbuf_Lock(cmd);
- oldpos = cmd->tokenizebufferpos;
+ Cbuf_Lock(cmd->cbuf);
+ oldpos = cmd->cbuf->tokenizebufferpos;
cmd->source = src;
Cmd_TokenizeString (cmd, text);
goto done; // no tokens
// check functions
- for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+ func = Cmd_GetCommand(cmd, cmd->argv[0], 0, false);
+ if(func)
{
- if (!strcasecmp(cmd->argv[0], func->name))
- {
- if (func->csqcfunc && CL_VM_ConsoleCommand(text)) //[515]: csqc
- goto done;
- break;
- }
- }
-
- for (func = cmd->engine_functions; func; func=func->next)
- {
- if (!strcasecmp (cmd->argv[0], func->name))
+ if (func->csqcfunc && CL_VM_ConsoleCommand(text)) //[515]: csqc
+ goto done;
+ else
{
switch (src)
{
- case src_command:
+ case src_local:
if (func->function)
func->function(cmd);
else
goto done;
}
}
- break;
}
}
if (!Cvar_Command(cmd) && host.framecount > 0)
Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(cmd, 0));
done:
- cmd->tokenizebufferpos = oldpos;
+ cmd->cbuf->tokenizebufferpos = oldpos;
if (lockmutex)
- Cbuf_Unlock(cmd);
+ Cbuf_Unlock(cmd->cbuf);
}
/*
{
cmd_state_t *cmd = cmd_iter->cmd;
cmd_function_t *f;
- cmdalias_t *a;
+ cmd_alias_t *a;
for (f = cmd->userdefined->csqc_functions; f; f = f->next)
f->initstate = true;
for (f = cmd->engine_functions; f; f = f->next)
{
cmd_state_t *cmd = cmd_iter->cmd;
cmd_function_t *f, **fp;
- cmdalias_t *a, **ap;
+ cmd_alias_t *a, **ap;
for (fp = &cmd->userdefined->csqc_functions; (f = *fp);)
{
if (f->initstate)
projects / xonotic / darkplaces.git / blobdiff