X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cvar.c;h=8e125cbe349d201de51fc00d9ab3f004efd3455e;hp=678e01a30c37283e90fb4dca5878b346cba4b93b;hb=bd117c30bdcd6dc925030dc47cb6492d5d9da2d2;hpb=eebd18fb1a1b617f7d8f454e4efbb80838331101

diff --git a/cvar.c b/cvar.c
index 678e01a3..8e125cbe 100644
--- a/cvar.c
+++ b/cvar.c
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 cvar_t *cvar_vars = NULL;
+cvar_t *cvar_hashtable[65536];
 char *cvar_null_string = "";
 
 /*
@@ -31,10 +32,13 @@ Cvar_FindVar
 */
 cvar_t *Cvar_FindVar (const char *var_name)
 {
+	int hashindex;
 	cvar_t *var;
 
-	for (var = cvar_vars;var;var = var->next)
-		if (!strcmp (var_name, var->name))
+	// use hash lookup to minimize search time
+	hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
+	for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain)
+		if (!strcasecmp (var_name, var->name))
 			return var;
 
 	return NULL;
@@ -95,6 +99,21 @@ const char *Cvar_VariableString (const char *var_name)
 	return var->string;
 }
 
+/*
+============
+Cvar_VariableDefString
+============
+*/
+const char *Cvar_VariableDefString (const char *var_name)
+{
+	cvar_t *var;
+
+	var = Cvar_FindVar (var_name);
+	if (!var)
+		return cvar_null_string;
+	return var->defstring;
+}
+
 
 /*
 ============
@@ -104,7 +123,7 @@ Cvar_CompleteVariable
 const char *Cvar_CompleteVariable (const char *partial)
 {
 	cvar_t		*cvar;
-	int			len;
+	size_t		len;
 
 	len = strlen(partial);
 
@@ -113,7 +132,7 @@ const char *Cvar_CompleteVariable (const char *partial)
 
 // check functions
 	for (cvar=cvar_vars ; cvar ; cvar=cvar->next)
-		if (!strncmp (partial,cvar->name, len))
+		if (!strncasecmp (partial,cvar->name, len))
 			return cvar->name;
 
 	return NULL;
@@ -131,7 +150,7 @@ const char *Cvar_CompleteVariable (const char *partial)
 int Cvar_CompleteCountPossible (const char *partial)
 {
 	cvar_t	*cvar;
-	int		len;
+	size_t	len;
 	int		h;
 
 	h = 0;
@@ -160,13 +179,13 @@ int Cvar_CompleteCountPossible (const char *partial)
 const char **Cvar_CompleteBuildList (const char *partial)
 {
 	const cvar_t *cvar;
-	int len = 0;
-	int bpos = 0;
-	int sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
+	size_t len = 0;
+	size_t bpos = 0;
+	size_t sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
 	const char **buf;
 
 	len = strlen(partial);
-	buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
+	buf = (const char **)Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
 	// Loop through the alias list and print all matches
 	for (cvar = cvar_vars; cvar; cvar = cvar->next)
 		if (!strncasecmp(partial, cvar->name, len))
@@ -176,20 +195,27 @@ const char **Cvar_CompleteBuildList (const char *partial)
 	return buf;
 }
 
+// written by LordHavoc
+void Cvar_CompleteCvarPrint (const char *partial)
+{
+	cvar_t *cvar;
+	size_t len = strlen(partial);
+	// Loop through the command list and print all matches
+	for (cvar = cvar_vars; cvar; cvar = cvar->next)
+		if (!strncasecmp(partial, cvar->name, len))
+			Con_Printf ("%c3%s%s : \"%s\" (\"%s\") : %s\n", STRING_COLOR_TAG, cvar->name, STRING_COLOR_DEFAULT_STR, cvar->string, cvar->defstring, cvar->description);
+}
+
+
 /*
 ============
 Cvar_Set
 ============
 */
-void Cvar_SetQuick (cvar_t *var, const char *value)
+void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
 	qboolean changed;
-
-	if (var == NULL)
-	{
-		Con_Printf("Cvar_SetQuick: var == NULL\n");
-		return;
-	}
+	size_t valuelen;
 
 	changed = strcmp(var->string, value);
 	// LordHavoc: don't reallocate when there is no change
@@ -197,20 +223,47 @@ void Cvar_SetQuick (cvar_t *var, const char *value)
 		return;
 
 	// LordHavoc: don't reallocate when the buffer is the same size
-	if (!var->string || strlen(var->string) != strlen(value))
+	valuelen = strlen(value);
+	if (!var->string || strlen(var->string) != valuelen)
 	{
 		Z_Free (var->string);	// free the old value string
 
-		var->string = Z_Malloc (strlen(value)+1);
+		var->string = (char *)Z_Malloc (valuelen + 1);
 	}
-	strcpy (var->string, value);
+	memcpy (var->string, value, valuelen + 1);
 	var->value = atof (var->string);
 	var->integer = (int) var->value;
-	if ((var->flags & CVAR_NOTIFY) && changed)
+	if ((var->flags & CVAR_NOTIFY) && changed && sv.active)
+		SV_BroadcastPrintf("\"%s\" changed to \"%s\"\n", var->name, var->string);
+#if 0
+	// TODO: add infostring support to the server?
+	if ((var->flags & CVAR_SERVERINFO) && changed && sv.active)
 	{
+		InfoString_SetValue(svs.serverinfo, sizeof(svs.serverinfo), var->name, var->string);
 		if (sv.active)
-			SV_BroadcastPrintf ("\"%s\" changed to \"%s\"\n", var->name, var->string);
+		{
+			MSG_WriteByte (&sv.reliable_datagram, svc_serverinfostring);
+			MSG_WriteString (&sv.reliable_datagram, var->name);
+			MSG_WriteString (&sv.reliable_datagram, var->string);
+		}
+	}
+#endif
+	if ((var->flags & CVAR_USERINFO) && cls.state != ca_dedicated)
+		CL_SetInfo(var->name, var->string, true, false, false, false);
+}
+
+void Cvar_SetQuick (cvar_t *var, const char *value)
+{
+	if (var == NULL)
+	{
+		Con_Print("Cvar_SetQuick: var == NULL\n");
+		return;
 	}
+
+	if (developer.integer >= 100)
+		Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value);
+
+	Cvar_SetQuick_Internal(var, value);
 }
 
 void Cvar_Set (const char *var_name, const char *value)
@@ -219,11 +272,9 @@ void Cvar_Set (const char *var_name, const char *value)
 	var = Cvar_FindVar (var_name);
 	if (var == NULL)
 	{
-		// there is an error in C code if this happens
-		Con_Printf ("Cvar_Set: variable %s not found\n", var_name);
+		Con_Printf("Cvar_Set: variable %s not found\n", var_name);
 		return;
 	}
-
 	Cvar_SetQuick(var, value);
 }
 
@@ -234,7 +285,7 @@ Cvar_SetValue
 */
 void Cvar_SetValueQuick(cvar_t *var, float value)
 {
-	char val[256];
+	char val[MAX_INPUTLINE];
 
 	if ((float)((int)value) == value)
 		sprintf(val, "%i", (int)value);
@@ -245,7 +296,7 @@ void Cvar_SetValueQuick(cvar_t *var, float value)
 
 void Cvar_SetValue(const char *var_name, float value)
 {
-	char val[256];
+	char val[MAX_INPUTLINE];
 
 	if ((float)((int)value) == value)
 		sprintf(val, "%i", (int)value);
@@ -263,34 +314,159 @@ Adds a freestanding variable to the variable list.
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {
-	char	*oldstr;
+	int hashindex;
+	cvar_t *current, *next, *cvar;
+	char *oldstr;
+	size_t alloclen;
+
+	if (developer.integer >= 100)
+		Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
 
 // first check to see if it has already been defined
-	if (Cvar_FindVar (variable->name))
+	cvar = Cvar_FindVar (variable->name);
+	if (cvar)
 	{
-		Con_Printf ("Can't register variable %s, already defined\n", variable->name);
+		if (cvar->flags & CVAR_ALLOCATED)
+		{
+			if (developer.integer >= 100)
+				Con_Printf("...  replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
+			// fixed variables replace allocated ones
+			// (because the engine directly accesses fixed variables)
+			// NOTE: this isn't actually used currently
+			// (all cvars are registered before config parsing)
+			variable->flags |= (cvar->flags & ~CVAR_ALLOCATED);
+			// cvar->string is now owned by variable instead
+			variable->string = cvar->string;
+			variable->defstring = cvar->defstring;
+			variable->value = atof (variable->string);
+			variable->integer = (int) variable->value;
+			// replace cvar with this one...
+			variable->next = cvar->next;
+			if (cvar_vars == cvar)
+			{
+				// head of the list is easy to change
+				cvar_vars = variable;
+			}
+			else
+			{
+				// otherwise find it somewhere in the list
+				for (current = cvar_vars;current->next != cvar;current = current->next)
+					;
+				current->next = variable;
+			}
+
+			// get rid of old allocated cvar
+			// (but not cvar->string and cvar->defstring, because we kept those)
+			Z_Free(cvar->name);
+			Z_Free(cvar);
+		}
+		else
+			Con_Printf("Can't register variable %s, already defined\n", variable->name);
 		return;
 	}
 
 // check for overlap with a command
 	if (Cmd_Exists (variable->name))
 	{
-		Con_Printf ("Cvar_RegisterVariable: %s is a command\n", variable->name);
+		Con_Printf("Cvar_RegisterVariable: %s is a command\n", variable->name);
 		return;
 	}
 
 // copy the value off, because future sets will Z_Free it
 	oldstr = variable->string;
-	variable->string = Z_Malloc (strlen(variable->string)+1);
-	strcpy (variable->string, oldstr);
+	alloclen = strlen(variable->string) + 1;
+	variable->string = (char *)Z_Malloc (alloclen);
+	memcpy (variable->string, oldstr, alloclen);
+	variable->defstring = (char *)Z_Malloc (alloclen);
+	memcpy (variable->defstring, oldstr, alloclen);
 	variable->value = atof (variable->string);
 	variable->integer = (int) variable->value;
 
 // link the variable in
-	variable->next = cvar_vars;
-	cvar_vars = variable;
+// alphanumerical order
+	for( current = NULL, next = cvar_vars ; next && strcmp( next->name, variable->name ) < 0 ; current = next, next = next->next )
+		;
+	if( current ) {
+		current->next = variable;
+	} else {
+		cvar_vars = variable;
+	}
+	variable->next = next;
+
+	// link to head of list in this hash table index
+	hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name));
+	variable->nextonhashchain = cvar_hashtable[hashindex];
+	cvar_hashtable[hashindex] = variable;
 }
 
+/*
+============
+Cvar_Get
+
+Adds a newly allocated variable to the variable list or sets its value.
+============
+*/
+cvar_t *Cvar_Get (const char *name, const char *value, int flags)
+{
+	int hashindex;
+	cvar_t *current, *next, *cvar;
+	size_t alloclen;
+
+	if (developer.integer >= 100)
+		Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
+
+// first check to see if it has already been defined
+	cvar = Cvar_FindVar (name);
+	if (cvar)
+	{
+		cvar->flags |= flags;
+		Cvar_SetQuick_Internal (cvar, value);
+		return cvar;
+	}
+
+// check for overlap with a command
+	if (Cmd_Exists (name))
+	{
+		Con_Printf("Cvar_Get: %s is a command\n", name);
+		return NULL;
+	}
+
+// allocate a new cvar, cvar name, and cvar string
+// TODO: factorize the following code with the one at the end of Cvar_RegisterVariable()
+// FIXME: these never get Z_Free'd
+	cvar = (cvar_t *)Z_Malloc(sizeof(cvar_t));
+	cvar->flags = flags | CVAR_ALLOCATED;
+	alloclen = strlen(name) + 1;
+	cvar->name = (char *)Z_Malloc(alloclen);
+	memcpy(cvar->name, name, alloclen);
+	alloclen = strlen(value) + 1;
+	cvar->string = (char *)Z_Malloc(alloclen);
+	memcpy(cvar->string, value, alloclen);
+	cvar->defstring = (char *)Z_Malloc(alloclen);
+	memcpy(cvar->defstring, value, alloclen);
+	cvar->value = atof (cvar->string);
+	cvar->integer = (int) cvar->value;
+	cvar->description = "custom cvar";
+
+// link the variable in
+// alphanumerical order
+	for( current = NULL, next = cvar_vars ; next && strcmp( next->name, cvar->name ) < 0 ; current = next, next = next->next )
+		;
+	if( current )
+		current->next = cvar;
+	else
+		cvar_vars = cvar;
+	cvar->next = next;
+
+	// link to head of list in this hash table index
+	hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name));
+	cvar->nextonhashchain = cvar_hashtable[hashindex];
+	cvar_hashtable[hashindex] = cvar;
+
+	return cvar;
+}
+
+
 /*
 ============
 Cvar_Command
@@ -310,15 +486,84 @@ qboolean	Cvar_Command (void)
 // perform a variable print or set
 	if (Cmd_Argc() == 1)
 	{
-		Con_Printf ("\"%s\" is \"%s\"\n", v->name, v->string);
+		Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, v->string, v->defstring);
 		return true;
 	}
 
+	if (developer.integer >= 100)
+		Con_DPrint("Cvar_Command: ");
+
+	if (v->flags & CVAR_READONLY)
+	{
+		Con_Printf("%s is read-only\n", v->name);
+		return true;
+	}
 	Cvar_Set (v->name, Cmd_Argv(1));
+	if (developer.integer >= 100)
+		Con_DPrint("\n");
 	return true;
 }
 
 
+void Cvar_UnlockDefaults (void)
+{
+	cvar_t *var;
+	// unlock the default values of all cvars
+	for (var = cvar_vars ; var ; var = var->next)
+		var->flags &= ~CVAR_DEFAULTSET;
+}
+
+
+void Cvar_LockDefaults_f (void)
+{
+	cvar_t *var;
+	// lock in the default values of all cvars
+	for (var = cvar_vars ; var ; var = var->next)
+	{
+		if (!(var->flags & CVAR_DEFAULTSET))
+		{
+			size_t alloclen;
+
+			//Con_Printf("locking cvar %s (%s -> %s)\n", var->name, var->string, var->defstring);
+			var->flags |= CVAR_DEFAULTSET;
+			Z_Free(var->defstring);
+			alloclen = strlen(var->string) + 1;
+			var->defstring = (char *)Z_Malloc(alloclen);
+			memcpy(var->defstring, var->string, alloclen);
+		}
+	}
+}
+
+
+void Cvar_ResetToDefaults_All_f (void)
+{
+	cvar_t *var;
+	// restore the default values of all cvars
+	for (var = cvar_vars ; var ; var = var->next)
+		Cvar_SetQuick(var, var->defstring);
+}
+
+
+void Cvar_ResetToDefaults_NoSaveOnly_f (void)
+{
+	cvar_t *var;
+	// restore the default values of all cvars
+	for (var = cvar_vars ; var ; var = var->next)
+		if (!(var->flags & CVAR_SAVE))
+			Cvar_SetQuick(var, var->defstring);
+}
+
+
+void Cvar_ResetToDefaults_SaveOnly_f (void)
+{
+	cvar_t *var;
+	// restore the default values of all cvars
+	for (var = cvar_vars ; var ; var = var->next)
+		if (var->flags & CVAR_SAVE)
+			Cvar_SetQuick(var, var->defstring);
+}
+
+
 /*
 ============
 Cvar_WriteVariables
@@ -331,9 +576,10 @@ void Cvar_WriteVariables (qfile_t *f)
 {
 	cvar_t	*var;
 
+	// don't save cvars that match their default value
 	for (var = cvar_vars ; var ; var = var->next)
-		if (var->flags & CVAR_SAVE)
-			FS_Printf (f, "%s \"%s\"\n", var->name, var->string);
+		if (var->flags & CVAR_SAVE && strcmp(var->string, var->defstring))
+			FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
 }
 
 
@@ -348,7 +594,8 @@ void Cvar_List_f (void)
 {
 	cvar_t *cvar;
 	const char *partial;
-	int len, count;
+	size_t len;
+	int count;
 
 	if (Cmd_Argc() > 1)
 	{
@@ -364,17 +611,68 @@ void Cvar_List_f (void)
 	count = 0;
 	for (cvar = cvar_vars; cvar; cvar = cvar->next)
 	{
-		if (partial && strncmp (partial,cvar->name,len))
+		if (partial && strncasecmp (partial,cvar->name,len))
 			continue;
 
-		Con_Printf ("%s is \"%s\"\n", cvar->name, cvar->string);
+		Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
 		count++;
 	}
 
-	Con_Printf ("%i cvar(s)", count);
 	if (partial)
-		Con_Printf (" beginning with \"%s\"", partial);
-	Con_Printf ("\n");
+		Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial);
+	else
+		Con_Printf("%i cvar(s)\n", count);
 }
 // 2000-01-09 CvarList command by Maddes
 
+void Cvar_Set_f (void)
+{
+	cvar_t *cvar;
+
+	// make sure it's the right number of parameters
+	if (Cmd_Argc() < 3)
+	{
+		Con_Printf("Set: wrong number of parameters, usage: set <variablename> <value>\n");
+		return;
+	}
+
+	// check if it's read-only
+	cvar = Cvar_FindVar(Cmd_Argv(1));
+	if (cvar && cvar->flags & CVAR_READONLY)
+	{
+		Con_Printf("Set: %s is read-only\n", cvar->name);
+		return;
+	}
+
+	Con_DPrint("Set: ");
+
+	// all looks ok, create/modify the cvar
+	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0);
+}
+
+void Cvar_SetA_f (void)
+{
+	cvar_t *cvar;
+
+	// make sure it's the right number of parameters
+	if (Cmd_Argc() < 3)
+	{
+		Con_Printf("SetA: wrong number of parameters, usage: seta <variablename> <value>\n");
+		return;
+	}
+
+	// check if it's read-only
+	cvar = Cvar_FindVar(Cmd_Argv(1));
+	if (cvar && cvar->flags & CVAR_READONLY)
+	{
+		Con_Printf("SetA: %s is read-only\n", cvar->name);
+		return;
+	}
+
+	Con_DPrint("SetA: ");
+
+	// all looks ok, create/modify the cvar
+	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE);
+}
+
+