X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=8f3abc390a64e94d92aa8998b7df4c53154506ca;hb=6565597d1fb3cdf77b34f2497e6a0d54c544a9c5;hp=b5fdf2b732f47756b803948a184d0b966bc4b841;hpb=d7806f79c4f18721e664022ea8a852b7e90c5ca8;p=xonotic%2Fdarkplaces.git diff --git a/cvar.c b/cvar.c index b5fdf2b7..8f3abc39 100644 --- a/cvar.c +++ b/cvar.c @@ -21,8 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" +char *cvar_dummy_description = "custom cvar"; + cvar_t *cvar_vars = NULL; -cvar_t *cvar_hashtable[65536]; +cvar_t *cvar_hashtable[CVAR_HASHSIZE]; char *cvar_null_string = ""; /* @@ -36,9 +38,9 @@ cvar_t *Cvar_FindVar (const char *var_name) cvar_t *var; // use hash lookup to minimize search time - hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)); + hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE; for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain) - if (!strcasecmp (var_name, var->name)) + if (!strcmp (var_name, var->name)) return var; return NULL; @@ -114,6 +116,21 @@ const char *Cvar_VariableDefString (const char *var_name) 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; +} + /* ============ @@ -203,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)) - Con_Printf("%s : \"%s\" (\"%s\") : %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); + Con_Printf ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); } @@ -215,20 +232,24 @@ Cvar_Set void Cvar_SetQuick_Internal (cvar_t *var, const char *value) { qboolean changed; + size_t valuelen; + prvm_prog_t *tmpprog; + int i; - changed = strcmp(var->string, value); + changed = strcmp(var->string, value) != 0; // LordHavoc: don't reallocate when there is no change if (!changed) 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 = (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) @@ -246,12 +267,89 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value) } } #endif - if ((var->flags & CVAR_USERINFO) && changed && cls.state != ca_dedicated) + 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) { - InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), var->name, var->string); - if (cls.state == ca_connected) - Cmd_ForwardStringToServer(va("setinfo \"%s\" \"%s\"\n", var->name, var->string)); + // 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); + else if (!strcmp(var->name, "rcon_secure")) + { + // whenever rcon_secure is changed to 0, clear rcon_password for + // security reasons (prevents a send-rcon-password-as-plaintext + // attack based on NQ protocol session takeover and svc_stufftext) + if(var->integer <= 0) + Cvar_Set("rcon_password", ""); + } + else if (!strcmp(var->name, "net_slist_favorites")) + NetConn_UpdateFavorites(); } + + tmpprog = prog; + for(i = 0; i < PRVM_MAXPROGS; ++i) + { + if(PRVM_ProgLoaded(i)) + { + PRVM_SetProg(i); + if(var->globaldefindex_progid[i] == prog->id) + { + // MUST BE SYNCED WITH prvm_edict.c PRVM_LoadProgs + int j; + const char *s; + prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[var->globaldefindex[i]].ofs); + switch(prog->globaldefs[var->globaldefindex[i]].type & ~DEF_SAVEGLOBAL) + { + case ev_float: + val->_float = var->value; + break; + case ev_vector: + s = var->string; + VectorClear(val->vector); + for (j = 0;j < 3;j++) + { + while (*s && ISWHITESPACE(*s)) + s++; + if (!*s) + break; + val->vector[j] = atof(s); + while (!ISWHITESPACE(*s)) + s++; + if (!*s) + break; + } + break; + case ev_string: + PRVM_ChangeEngineString(var->globaldefindex_stringno[i], var->string); + val->string = var->globaldefindex_stringno[i]; + break; + } + } + } + } + prog = tmpprog; } void Cvar_SetQuick (cvar_t *var, const char *value) @@ -262,8 +360,8 @@ void Cvar_SetQuick (cvar_t *var, const char *value) return; } - if (developer.integer) - Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value); + if (developer_extra.integer) + Con_DPrintf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value); Cvar_SetQuick_Internal(var, value); } @@ -290,9 +388,9 @@ void Cvar_SetValueQuick(cvar_t *var, float value) char val[MAX_INPUTLINE]; if ((float)((int)value) == value) - sprintf(val, "%i", (int)value); + dpsnprintf(val, sizeof(val), "%i", (int)value); else - sprintf(val, "%f", value); + dpsnprintf(val, sizeof(val), "%f", value); Cvar_SetQuick(var, val); } @@ -301,9 +399,9 @@ void Cvar_SetValue(const char *var_name, float value) char val[MAX_INPUTLINE]; if ((float)((int)value) == value) - sprintf(val, "%i", (int)value); + dpsnprintf(val, sizeof(val), "%i", (int)value); else - sprintf(val, "%f", value); + dpsnprintf(val, sizeof(val), "%f", value); Cvar_Set(var_name, val); } @@ -319,9 +417,10 @@ void Cvar_RegisterVariable (cvar_t *variable) int hashindex; cvar_t *current, *next, *cvar; char *oldstr; + size_t alloclen; - if (developer.integer) - Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags); + if (developer_extra.integer) + Con_DPrintf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags); // first check to see if it has already been defined cvar = Cvar_FindVar (variable->name); @@ -329,8 +428,8 @@ void Cvar_RegisterVariable (cvar_t *variable) { if (cvar->flags & CVAR_ALLOCATED) { - if (developer.integer) - Con_Printf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags); + if (developer_extra.integer) + Con_DPrintf("... 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 @@ -362,7 +461,7 @@ void Cvar_RegisterVariable (cvar_t *variable) Z_Free(cvar); } else - Con_Printf("Can't register variable %s, already defined\n", variable->name); + Con_DPrintf("Can't register variable %s, already defined\n", variable->name); return; } @@ -375,10 +474,11 @@ void Cvar_RegisterVariable (cvar_t *variable) // 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; @@ -394,7 +494,7 @@ void Cvar_RegisterVariable (cvar_t *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)); + hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE; variable->nextonhashchain = cvar_hashtable[hashindex]; cvar_hashtable[hashindex] = variable; } @@ -406,13 +506,14 @@ 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) +cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *newdescription) { int hashindex; cvar_t *current, *next, *cvar; + size_t alloclen; - if (developer.integer) - Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags); + if (developer_extra.integer) + Con_DPrintf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags); // first check to see if it has already been defined cvar = Cvar_FindVar (name); @@ -420,18 +521,30 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags) { 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; } +// check for pure evil + if (!*name) + { + Con_Printf("Cvar_Get: invalid variable name\n"); + return NULL; + } + // check for overlap with a command if (Cmd_Exists (name)) { @@ -440,18 +553,29 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags) } // 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 | 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->description = "custom cvar"; + + 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 // alphanumerical order @@ -464,7 +588,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags) cvar->next = next; // link to head of list in this hash table index - hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)); + hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE; cvar->nextonhashchain = cvar_hashtable[hashindex]; cvar_hashtable[hashindex] = cvar; @@ -491,11 +615,12 @@ qboolean Cvar_Command (void) // perform a variable print or set if (Cmd_Argc() == 1) { - Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, v->string, v->defstring); + Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring); return true; } - Con_DPrint("Cvar_Command: "); + if (developer_extra.integer) + Con_DPrint("Cvar_Command: "); if (v->flags & CVAR_READONLY) { @@ -503,10 +628,72 @@ qboolean Cvar_Command (void) return true; } Cvar_Set (v->name, Cmd_Argv(1)); + if (developer_extra.integer) + 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) + if((var->flags & CVAR_NORESETTODEFAULTS) == 0) + 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_NORESETTODEFAULTS | CVAR_SAVE)) == 0) + 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_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE) + Cvar_SetQuick(var, var->defstring); +} + + /* ============ Cvar_WriteVariables @@ -518,10 +705,16 @@ with the archive flag set to true. void Cvar_WriteVariables (qfile_t *f) { cvar_t *var; + char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE]; + // 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 \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string); + if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED))) + { + Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$"); + Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$"); + FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2); + } } @@ -538,6 +731,7 @@ void Cvar_List_f (void) const char *partial; size_t len; int count; + qboolean ispattern; if (Cmd_Argc() > 1) { @@ -550,18 +744,25 @@ void Cvar_List_f (void) len = 0; } + ispattern = partial && (strchr(partial, '*') || strchr(partial, '?')); + 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; - Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); + Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description); 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, (count > 1) ? "s" : "", partial); + else + Con_Printf("%i cvar%s beginning with \"%s\"\n", count, (count > 1) ? "s" : "", partial); + } else Con_Printf("%i cvar(s)\n", count); } @@ -574,7 +775,7 @@ void Cvar_Set_f (void) // make sure it's the right number of parameters if (Cmd_Argc() < 3) { - Con_Printf("Set: wrong number of parameters, usage: set \n"); + Con_Printf("Set: wrong number of parameters, usage: set []\n"); return; } @@ -586,10 +787,11 @@ void Cvar_Set_f (void) return; } - Con_DPrint("Set: "); + if (developer_extra.integer) + Con_DPrint("Set: "); // 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) @@ -599,7 +801,7 @@ void Cvar_SetA_f (void) // make sure it's the right number of parameters if (Cmd_Argc() < 3) { - Con_Printf("SetA: wrong number of parameters, usage: seta \n"); + Con_Printf("SetA: wrong number of parameters, usage: seta []\n"); return; } @@ -611,10 +813,46 @@ void Cvar_SetA_f (void) return; } - Con_DPrint("SetA: "); + if (developer_extra.integer) + Con_DPrint("SetA: "); // 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); } - +#ifdef FILLALLCVARSWITHRUBBISH +void Cvar_FillAll_f() +{ + char *buf, *p, *q; + int n, i; + cvar_t *var; + qboolean verify; + if(Cmd_Argc() != 2) + { + Con_Printf("Usage: %s length to plant rubbish\n", Cmd_Argv(0)); + Con_Printf("Usage: %s -length to verify that the rubbish is still there\n", Cmd_Argv(0)); + return; + } + n = atoi(Cmd_Argv(1)); + verify = (n < 0); + if(verify) + n = -n; + buf = Z_Malloc(n + 1); + buf[n] = 0; + for(var = cvar_vars; var; var = var->next) + { + for(i = 0, p = buf, q = var->name; i < n; ++i) + { + *p++ = *q++; + if(!*q) + q = var->name; + } + if(verify && strcmp(var->string, buf)) + { + Con_Printf("\n%s does not contain the right rubbish, either this is the first run or a possible overrun was detected, or something changed it intentionally; it DOES contain: %s\n", var->name, var->string); + } + Cvar_SetQuick(var, buf); + } + Z_Free(buf); +} +#endif /* FILLALLCVARSWITHRUBBISH */