sv_ccmds: Perform actual name change from a single function. Announce in chat.

[xonotic/darkplaces.git] / cmd.h

diff --git a/cmd.h b/cmd.h
index 72f481b680bf3aa5fab8dd47fc6f2051931b7473..e6011011ce4e781685c222b363754edafd5ec58c 100644 (file)
--- a/cmd.h
+++ b/cmd.h
@@ -78,6 +78,7 @@ typedef struct cmd_function_s
        const char *description;
        xcommand_t function;
        qboolean csqcfunc;
+       qboolean autofunc;
        qboolean initstate; // indicates this command existed at init
 } cmd_function_t;
 
@@ -102,26 +103,16 @@ cmd_userdefined_t;
 /// command interpreter state - the tokenizing and execution of commands, as well as pointers to which cvars and aliases they can access
 typedef struct cmd_state_s
 {
-       qboolean wait;
-
        mempool_t *mempool;
 
-       char tokenizebuffer[CMD_TOKENIZELENGTH];
-       int tokenizebufferpos;
-
-       cmddeferred_t *deferred_list;
-       double deferred_oldrealtime;
-
-       sizebuf_t text;
-       unsigned char text_buf[CMDBUFSIZE];
-       Thread_SpinLock text_lock;
-
        int argc;
        const char *argv[MAX_ARGS];
        const char *null_string;
        const char *args;
        cmd_source_t source;
 
+       struct cbuf_s *cbuf;
+
        cmd_userdefined_t *userdefined; // possible csqc functions and aliases to execute
 
        cmd_function_t *engine_functions;
@@ -130,9 +121,43 @@ typedef struct cmd_state_s
        int cvars_flagsmask; // which CVAR_* flags should be visible to this interpreter? (CVAR_CLIENT | CVAR_SERVER, or just CVAR_SERVER)
 
        int cmd_flags; // cmd flags that identify this interpreter
+
+       /*
+        * If a requested flag matches auto_flags, a command will be
+        * added to a given interpreter with auto_function. For example,
+        * a CMD_SERVER_FROM_CLIENT command should be automatically added
+        * to the client interpreter as CL_ForwardToServer_f. It can be
+        * overridden at any time.
+        */
+       int auto_flags;
+       xcommand_t auto_function;
 }
 cmd_state_t;
 
+typedef struct cbuf_cmd_s
+{
+       struct cbuf_cmd_s *prev, *next;
+       cmd_state_t *source;
+       double delay;
+       size_t size;
+       char text[MAX_INPUTLINE];
+} cbuf_cmd_t;
+
+typedef struct cbuf_s
+{
+       cbuf_cmd_t *start;
+       cbuf_cmd_t *deferred;
+       cbuf_cmd_t *free;
+       qboolean pending;
+       qboolean wait;
+       size_t maxsize;
+       size_t size;
+       char tokenizebuffer[CMD_TOKENIZELENGTH];
+       int tokenizebufferpos;
+       double deferred_oldtime;
+       void *lock;
+} cbuf_t;
+
 extern cmd_userdefined_t cmd_userdefined_all; // aliases and csqc functions
 extern cmd_userdefined_t cmd_userdefined_null; // intentionally empty
 
@@ -148,8 +173,8 @@ extern cmd_state_t cmd_serverfromclient;
 
 extern qboolean host_stuffcmdsrun;
 
-void Cbuf_Lock(cmd_state_t *cmd);
-void Cbuf_Unlock(cmd_state_t *cmd);
+void Cbuf_Lock(cbuf_t *cbuf);
+void Cbuf_Unlock(cbuf_t *cbuf);
 
 /*! as new commands are generated from the console or keybindings,
  * the text is added to the end of the command buffer.
@@ -167,9 +192,9 @@ void Cbuf_InsertText (cmd_state_t *cmd, const char *text);
  * Normally called once per frame, but may be explicitly invoked.
  * \note Do not call inside a command function!
  */
-void Cbuf_Execute (cmd_state_t *cmd);
-/*! Performs deferred commands and runs Cbuf_Execute, called by Host_Main */
-void Cbuf_Frame (cmd_state_t *cmd);
+void Cbuf_Execute (cbuf_t *cbuf);
+/*! Performs deferred commands and runs Cbuf_Execute, called by Host_Frame */
+void Cbuf_Frame (cbuf_t *cbuf);
 
 //===========================================================================
 
@@ -241,15 +266,6 @@ int Cmd_CheckParm (cmd_state_t *cmd, const char *parm);
 /// The text can come from the command buffer, a remote client, or stdin.
 void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qboolean lockmutex);
 
-/// adds the string as a clc_stringcmd to the client message.
-/// (used when there is no reason to generate a local command to do it)
-void Cmd_ForwardStringToServer (const char *s);
-
-/// adds the current command line as a clc_stringcmd to the client message.
-/// things like godmode, noclip, etc, are commands directed to the server,
-/// so when they are typed in at the console, they will need to be forwarded.
-void Cmd_ForwardToServer_f (cmd_state_t *cmd);
-
 /// quotes a string so that it can be used as a command argument again;
 /// quoteset is a string that contains one or more of ", \, $ and specifies
 /// the characters to be quoted (you usually want to either pass "\"\\" or