X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cmd.h;h=adf83b2bb499270cf0b379b03fbd7424890403be;hb=eb5f88dfe5c842c61f52d13b5be72afc39d6e998;hp=5a88ea918a794aeff3386188309f74ed9264d7da;hpb=d74aa38fe15426dc870889a72c1ffd1a8bd38575;p=xonotic%2Fdarkplaces.git diff --git a/cmd.h b/cmd.h index 5a88ea91..adf83b2b 100644 --- a/cmd.h +++ b/cmd.h @@ -41,31 +41,44 @@ The game starts with a Cbuf_AddText ("exec quake.rc\n"); Cbuf_Execute (); struct cmd_state_s; +// Command flags +#define CMD_CLIENT (1<<0) +#define CMD_SERVER (1<<1) +#define CMD_CLIENT_FROM_SERVER (1<<2) +#define CMD_SERVER_FROM_CLIENT (1<<3) +#define CMD_USERINFO (1<<4) +#define CMD_CHEAT (1<<5) + + +#define CMD_SHARED 3 + typedef void(*xcommand_t) (struct cmd_state_s *cmd); typedef enum { src_client, ///< came in over a net connection as a clc_stringcmd ///< host_client will be valid during this state. - src_command ///< from the command buffer + src_local ///< from the command buffer } cmd_source_t; -typedef struct cmdalias_s +typedef struct cmd_alias_s { - struct cmdalias_s *next; + struct cmd_alias_s *next; char name[MAX_ALIAS_NAME]; char *value; qboolean initstate; // indicates this command existed at init char *initialvalue; // backup copy of value at init -} cmdalias_t; +} cmd_alias_t; typedef struct cmd_function_s { + int flags; struct cmd_function_s *next; const char *name; const char *description; xcommand_t function; qboolean csqcfunc; + qboolean autofunc; qboolean initstate; // indicates this command existed at init } cmd_function_t; @@ -83,50 +96,74 @@ typedef struct cmd_userdefined_s cmd_function_t *csqc_functions; // aliases - cmdalias_t *alias; + cmd_alias_t *alias; } 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; - - 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; cvar_state_t *cvars; // which cvar system is this cmd state able to access? (&cvars_all or &cvars_null) 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 cmd_input_s +{ + llist_t list; + cmd_state_t *source; + double delay; + size_t size; + char text[MAX_INPUTLINE]; + qboolean pending; +} cmd_input_t; + +typedef struct cbuf_s +{ + llist_t start; + llist_t deferred; + llist_t free; + 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 // command interpreter for client commands injected by CSQC, MQC or client engine code // uses cmddefs_all extern cmd_state_t cmd_client; -// command interpreter for client commands received over network from server -// uses cmddefs_all -extern cmd_state_t cmd_clientfromserver; // command interpreter for server commands injected by MQC, SVQC, menu engine code or server engine code // uses cmddefs_all extern cmd_state_t cmd_server; @@ -136,10 +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 Cmd_Init_Commands(qboolean dedicated_server); +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. @@ -157,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); //=========================================================================== @@ -182,11 +217,13 @@ void Cmd_SaveInitState(void); // called by FS_GameDir_f, this restores cvars, commands and aliases to init values void Cmd_RestoreInitState(void); -void Cmd_AddCommand(cmd_state_t *cmd, const char *cmd_name, xcommand_t function, const char *description); +void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const char *description); // called by the init functions of other parts of the program to // register commands and functions to call for them. // The cmd_name is referenced later, so it should not be in temp memory +cmd_function_t *Cmd_GetCommand(cmd_state_t *cmd, const char *partial, size_t len, qboolean casesensitive); + /// used by the cvar code to check for cvar / command name overlap qboolean Cmd_Exists (cmd_state_t *cmd, const char *cmd_name); @@ -231,15 +268,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 @@ -248,7 +276,7 @@ void Cmd_ForwardToServer_f (cmd_state_t *cmd); /// enclosing quote marks are also put. qboolean Cmd_QuoteString(char *out, size_t outlen, const char *in, const char *quoteset, qboolean putquotes); -void Cmd_ClearCsqcFuncs (cmd_state_t *cmd); +void Cmd_ClearCSQCCommands (cmd_state_t *cmd); #endif