mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-11 07:42:18 +00:00
12c84046f3
This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
92 lines
2.6 KiB
C
92 lines
2.6 KiB
C
/*
|
|
cmd.h
|
|
|
|
Command buffer and command execution
|
|
|
|
Copyright (C) 1996-1997 Id Software, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to:
|
|
|
|
Free Software Foundation, Inc.
|
|
59 Temple Place - Suite 330
|
|
Boston, MA 02111-1307, USA
|
|
|
|
*/
|
|
|
|
#ifndef __QF_cmd_h
|
|
#define __QF_cmd_h
|
|
|
|
/** \defgroup cmd Command management.
|
|
\ingroup utils
|
|
*/
|
|
///@{
|
|
|
|
#include "QF/qtypes.h"
|
|
#include "QF/cbuf.h"
|
|
|
|
typedef void (*xcommand_t) (void);
|
|
typedef void (*xdatacmd_t) (void *data);
|
|
|
|
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 a command buffer
|
|
} cmd_source_t;
|
|
|
|
typedef struct cmd_function_s {
|
|
struct cmd_function_s *next;
|
|
const char *name;
|
|
xcommand_t function;
|
|
xdatacmd_t datafunc;
|
|
void *data;
|
|
const char *description;
|
|
} cmd_function_t;
|
|
|
|
extern cmd_source_t cmd_source;
|
|
|
|
void Cmd_Init_Hash (void);
|
|
void Cmd_Init (void);
|
|
|
|
int Cmd_AddCommand (const char *cmd_name, xcommand_t function,
|
|
const char *description);
|
|
int Cmd_AddDataCommand (const char *cmd_name, xdatacmd_t function,
|
|
void *data, const char *description);
|
|
int Cmd_RemoveCommand (const char *cmd_name);
|
|
|
|
qboolean Cmd_Exists (const char *cmd_name);
|
|
const char *Cmd_CompleteCommand (const char *partial) __attribute__((pure));
|
|
int Cmd_CompleteCountPossible (const char *partial) __attribute__((pure));
|
|
const char **Cmd_CompleteBuildList (const char *partial);
|
|
|
|
|
|
int Cmd_Argc (void) __attribute__((pure));
|
|
const char *Cmd_Argv (int arg) __attribute__((pure));
|
|
const char *Cmd_Args (int start) __attribute__((pure));
|
|
struct cbuf_args_s;
|
|
int Cmd_Command (struct cbuf_args_s *args);
|
|
int Cmd_ExecuteString (const char *text, cmd_source_t src);
|
|
struct cbuf_s;
|
|
void Cmd_StuffCmds (struct cbuf_s *cbuf);
|
|
int Cmd_Exec_File (struct cbuf_s *cbuf, const char *path, int qfs);
|
|
void Cmd_AddProvider(const char *name, struct cbuf_interpreter_s *interp);
|
|
struct cbuf_interpreter_s *Cmd_GetProvider(const char *name);
|
|
|
|
|
|
extern struct cbuf_args_s *cmd_args;
|
|
extern int cmd_warncmd;
|
|
|
|
///@}
|
|
|
|
#endif//__QF_cmd_h
|