cvarlist, buf_cvarlist: support wildcards if present (if not present, it's treated...

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 4c91a49235545f8a1adbe62f47b26d2c35ddde8d..47a5735ddeb16477d6bcd2dd8992feb42de12ce8 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -21,7 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
 
 #include "quakedef.h"
 

+char *cvar_dummy_description = "custom cvar";
+

 cvar_t *cvar_vars = NULL;
 cvar_t *cvar_vars = NULL;

+cvar_t *cvar_hashtable[65536];

 char *cvar_null_string = "";
 
 /*
 char *cvar_null_string = "";
 
 /*


@@ -31,10 +34,13 @@ Cvar_FindVar
 */
 cvar_t *Cvar_FindVar (const char *var_name)
 {
 */
 cvar_t *Cvar_FindVar (const char *var_name)
 {

+       int hashindex;

        cvar_t *var;
 
        cvar_t *var;
 

-       for (var = cvar_vars;var;var = var->next)
-               if (!strcasecmp (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 (!strcmp (var_name, var->name))

                        return var;
 
        return NULL;
                        return var;
 
        return NULL;


@@ -110,6 +116,21 @@ const char *Cvar_VariableDefString (const char *var_name)
        return var->defstring;
 }
 
        return var->defstring;
 }
 

+/*
+============
+Cvar_VariableDescription
+============
+*/
+const char *Cvar_VariableDescription (const char *var_name)
+{
+       cvar_t *var;
+
+       var = Cvar_FindVar (var_name);
+       if (!var)
+               return cvar_null_string;
+       return var->description;
+}
+

 
 /*
 ============
 
 /*
 ============


@@ -199,7 +220,7 @@ void Cvar_CompleteCvarPrint (const char *partial)
        // Loop through the command list and print all matches
        for (cvar = cvar_vars; cvar; cvar = cvar->next)
                if (!strncasecmp(partial, cvar->name, len))
        // 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("%s : %s (%s) : %s\n", cvar->name, cvar->value, cvar->defstring, cvar->description);
+                       Con_Printf ("%c3%s%s : \"%s\" (\"%s\") : %s\n", STRING_COLOR_TAG, cvar->name, STRING_COLOR_DEFAULT_STR, cvar->string, cvar->defstring, cvar->description);

 }
 
 
 }
 
 


@@ -211,6 +232,7 @@ Cvar_Set
 void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
        qboolean changed;
 void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
        qboolean changed;

+       size_t valuelen;

 
        changed = strcmp(var->string, value);
        // LordHavoc: don't reallocate when there is no change
 
        changed = strcmp(var->string, value);
        // LordHavoc: don't reallocate when there is no change


@@ -218,17 +240,61 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
                return;
 
        // LordHavoc: don't reallocate when the buffer is the same size
                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
 
        {
                Z_Free (var->string);   // free the old value string
 

-               var->string = (char *)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 && sv.active)
                SV_BroadcastPrintf("\"%s\" changed to \"%s\"\n", var->name, var->string);
        var->value = atof (var->string);
        var->integer = (int) var->value;
        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)
+               {
+                       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);
+       else if ((var->flags & CVAR_NQUSERINFOHACK) && cls.state != ca_dedicated)
+       {
+               // update the cls.userinfo to have proper values for the
+               // silly nq config variables.
+               //
+               // this is done when these variables are changed rather than at
+               // connect time because if the user or code checks the userinfo and it
+               // holds weird values it may cause confusion...
+               if (!strcmp(var->name, "_cl_color"))
+               {
+                       int top = (var->integer >> 4) & 15, bottom = var->integer & 15;
+                       CL_SetInfo("topcolor", va("%i", top), true, false, false, false);
+                       CL_SetInfo("bottomcolor", va("%i", bottom), true, false, false, false);
+                       if (cls.protocol != PROTOCOL_QUAKEWORLD && cls.netcon)
+                       {
+                               MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                               MSG_WriteString(&cls.netcon->message, va("color %i %i", top, bottom));
+                       }
+               }
+               else if (!strcmp(var->name, "_cl_rate"))
+                       CL_SetInfo("rate", va("%i", var->integer), true, false, false, false);
+               else if (!strcmp(var->name, "_cl_playerskin"))
+                       CL_SetInfo("playerskin", var->string, true, false, false, false);
+               else if (!strcmp(var->name, "_cl_playermodel"))
+                       CL_SetInfo("playermodel", var->string, true, false, false, false);
+               else if (!strcmp(var->name, "_cl_name"))
+                       CL_SetInfo("name", var->string, true, false, false, false);
+       }

 }
 
 void Cvar_SetQuick (cvar_t *var, const char *value)
 }
 
 void Cvar_SetQuick (cvar_t *var, const char *value)


@@ -239,7 +305,7 @@ void Cvar_SetQuick (cvar_t *var, const char *value)
                return;
        }
 
                return;
        }
 

-       if (developer.integer)
+       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);
                Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value);
 
        Cvar_SetQuick_Internal(var, value);


@@ -267,9 +333,9 @@ void Cvar_SetValueQuick(cvar_t *var, float value)
        char val[MAX_INPUTLINE];
 
        if ((float)((int)value) == value)
        char val[MAX_INPUTLINE];
 
        if ((float)((int)value) == value)

-               sprintf(val, "%i", (int)value);
+               dpsnprintf(val, sizeof(val), "%i", (int)value);

        else
        else

-               sprintf(val, "%f", value);
+               dpsnprintf(val, sizeof(val), "%f", value);

        Cvar_SetQuick(var, val);
 }
 
        Cvar_SetQuick(var, val);
 }
 


@@ -278,9 +344,9 @@ void Cvar_SetValue(const char *var_name, float value)
        char val[MAX_INPUTLINE];
 
        if ((float)((int)value) == value)
        char val[MAX_INPUTLINE];
 
        if ((float)((int)value) == value)

-               sprintf(val, "%i", (int)value);
+               dpsnprintf(val, sizeof(val), "%i", (int)value);

        else
        else

-               sprintf(val, "%f", value);
+               dpsnprintf(val, sizeof(val), "%f", value);

        Cvar_Set(var_name, val);
 }
 
        Cvar_Set(var_name, val);
 }
 


@@ -293,10 +359,12 @@ Adds a freestanding variable to the variable list.
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {

+       int hashindex;

        cvar_t *current, *next, *cvar;
        char *oldstr;
        cvar_t *current, *next, *cvar;
        char *oldstr;

+       size_t alloclen;

 
 

-       if (developer.integer)
+       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
                Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
 
 // first check to see if it has already been defined


@@ -305,7 +373,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
        {
                if (cvar->flags & CVAR_ALLOCATED)
                {
        {
                if (cvar->flags & CVAR_ALLOCATED)
                {

-                       if (developer.integer)
+                       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)
                                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)


@@ -351,10 +419,11 @@ void Cvar_RegisterVariable (cvar_t *variable)
 
 // copy the value off, because future sets will Z_Free it
        oldstr = variable->string;
 
 // copy the value off, because future sets will Z_Free it
        oldstr = variable->string;

-       variable->string = (char *)Z_Malloc (strlen(variable->string)+1);
-       strcpy (variable->string, oldstr);
-       variable->defstring = (char *)Z_Malloc (strlen(variable->string)+1);
-       strcpy (variable->defstring, 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;
 
        variable->value = atof (variable->string);
        variable->integer = (int) variable->value;
 


@@ -368,6 +437,11 @@ void Cvar_RegisterVariable (cvar_t *variable)
                cvar_vars = variable;
        }
        variable->next = next;
                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;

 }
 
 /*
 }
 
 /*


@@ -377,11 +451,13 @@ Cvar_Get
 Adds a newly allocated variable to the variable list or sets its value.
 ============
 */
 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)
+cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *newdescription)

 {
 {

-       cvar_t *cvar;
+       int hashindex;
+       cvar_t *current, *next, *cvar;
+       size_t alloclen;

 
 

-       if (developer.integer)
+       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
                Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
 
 // first check to see if it has already been defined


@@ -390,14 +466,19 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags)
        {
                cvar->flags |= flags;
                Cvar_SetQuick_Internal (cvar, value);
        {
                cvar->flags |= flags;
                Cvar_SetQuick_Internal (cvar, value);

-               // also set the default value (but only once)
-               if (~cvar->flags & CVAR_DEFAULTSET)
+               if(newdescription && (cvar->flags & CVAR_ALLOCATED))

                {
                {

-                       cvar->flags |= CVAR_DEFAULTSET;
+                       if(cvar->description != cvar_dummy_description)
+                               Z_Free(cvar->description);

 
 

-                       Z_Free(cvar->defstring);
-                       cvar->defstring = (char *)Z_Malloc(strlen(value) + 1);
-                       strcpy(cvar->defstring, value);
+                       if(*newdescription)
+                       {
+                               alloclen = strlen(newdescription) + 1;
+                               cvar->description = (char *)Z_Malloc(alloclen);
+                               memcpy(cvar->description, newdescription, alloclen);
+                       }
+                       else
+                               cvar->description = cvar_dummy_description;

                }
                return cvar;
        }
                }
                return cvar;
        }


@@ -410,21 +491,45 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags)
        }
 
 // allocate a new cvar, cvar name, and cvar string
        }
 
 // 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));
 // FIXME: these never get Z_Free'd
        cvar = (cvar_t *)Z_Malloc(sizeof(cvar_t));

-       cvar->flags = flags | CVAR_ALLOCATED | CVAR_DEFAULTSET;
-       cvar->name = (char *)Z_Malloc(strlen(name)+1);
-       strcpy(cvar->name, name);
-       cvar->string = (char *)Z_Malloc(strlen(value)+1);
-       strcpy(cvar->string, value);
-       cvar->defstring = (char *)Z_Malloc(strlen(value)+1);
-       strcpy(cvar->defstring, value);
+       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->value = atof (cvar->string);
        cvar->integer = (int) cvar->value;
 

+       if(newdescription && *newdescription)
+       {
+               alloclen = strlen(newdescription) + 1;
+               cvar->description = (char *)Z_Malloc(alloclen);
+               memcpy(cvar->description, newdescription, alloclen);
+       }
+       else
+               cvar->description = cvar_dummy_description; // actually checked by VM_cvar_type
+

 // link the variable in
 // link the variable in

-       cvar->next = cvar_vars;
-       cvar_vars = cvar;
+// 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;
 }
 
        return cvar;
 }
 


@@ -452,7 +557,8 @@ qboolean    Cvar_Command (void)
                return true;
        }
 
                return true;
        }
 

-       Con_DPrint("Cvar_Command: ");
+       if (developer.integer >= 100)
+               Con_DPrint("Cvar_Command: ");

 
        if (v->flags & CVAR_READONLY)
        {
 
        if (v->flags & CVAR_READONLY)
        {


@@ -460,10 +566,71 @@ qboolean  Cvar_Command (void)
                return true;
        }
        Cvar_Set (v->name, Cmd_Argv(1));
                return true;
        }
        Cvar_Set (v->name, Cmd_Argv(1));

+       if (developer.integer >= 100)
+               Con_DPrint("\n");

        return true;
 }
 
 
        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
 /*
 ============
 Cvar_WriteVariables


@@ -476,8 +643,9 @@ void Cvar_WriteVariables (qfile_t *f)
 {
        cvar_t  *var;
 
 {
        cvar_t  *var;
 

+       // don't save cvars that match their default value

        for (var = cvar_vars ; var ; var = var->next)
        for (var = cvar_vars ; var ; var = var->next)

-               if (var->flags & CVAR_SAVE)
+               if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED)))

                        FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
 }
 
                        FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
 }
 


@@ -495,6 +663,7 @@ void Cvar_List_f (void)
        const char *partial;
        size_t len;
        int count;
        const char *partial;
        size_t len;
        int count;

+       qboolean ispattern;

 
        if (Cmd_Argc() > 1)
        {
 
        if (Cmd_Argc() > 1)
        {


@@ -507,18 +676,25 @@ void Cvar_List_f (void)
                len = 0;
        }
 
                len = 0;
        }
 

+       ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
+

        count = 0;
        for (cvar = cvar_vars; cvar; cvar = cvar->next)
        {
        count = 0;
        for (cvar = cvar_vars; cvar; cvar = cvar->next)
        {

-               if (partial && strncasecmp (partial,cvar->name,len))
+               if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len)))

                        continue;
 
                        continue;
 

-               Con_Printf("%s is \"%s\" [\"%s\"]\n", cvar->name, cvar->string, cvar->defstring);
+               Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);

                count++;
        }
 
                count++;
        }
 

-       if (partial)
-               Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial);
+       if (len)
+       {
+               if(ispattern)
+                       Con_Printf("%i cvar(s) matching \"%s\"\n", count, partial);
+               else
+                       Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial);
+       }

        else
                Con_Printf("%i cvar(s)\n", count);
 }
        else
                Con_Printf("%i cvar(s)\n", count);
 }


@@ -531,7 +707,7 @@ void Cvar_Set_f (void)
        // make sure it's the right number of parameters
        if (Cmd_Argc() < 3)
        {
        // 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");
+               Con_Printf("Set: wrong number of parameters, usage: set <variablename> <value> [<description>]\n");

                return;
        }
 
                return;
        }
 


@@ -543,10 +719,11 @@ void Cvar_Set_f (void)
                return;
        }
 
                return;
        }
 

-       Con_DPrint("Set: ");
+       if (developer.integer >= 100)
+               Con_DPrint("Set: ");

 
        // all looks ok, create/modify the cvar
 
        // all looks ok, create/modify the cvar

-       Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0);
+       Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL);

 }
 
 void Cvar_SetA_f (void)
 }
 
 void Cvar_SetA_f (void)


@@ -556,7 +733,7 @@ void Cvar_SetA_f (void)
        // make sure it's the right number of parameters
        if (Cmd_Argc() < 3)
        {
        // 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");
+               Con_Printf("SetA: wrong number of parameters, usage: seta <variablename> <value> [<description>]\n");

                return;
        }
 
                return;
        }
 


@@ -568,10 +745,11 @@ void Cvar_SetA_f (void)
                return;
        }
 
                return;
        }
 

-       Con_DPrint("SetA: ");
+       if (developer.integer >= 100)
+               Con_DPrint("SetA: ");

 
        // all looks ok, create/modify the cvar
 
        // all looks ok, create/modify the cvar

-       Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE);
+       Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL);

 }
 
 
 }