X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=keys.c;h=0168b3f93ee16cd3d76379ab56612f0595ab7865;hp=817ce92da6a38ae589788aa4f374b33ba420db61;hb=770b47df3531baa6b270871b7a0174ccfabacd31;hpb=137357d6b7e13e7b2d4bbaeb719dfd4f218a1e5e

diff --git a/keys.c b/keys.c
index 817ce92d..0168b3f9 100644
--- a/keys.c
+++ b/keys.c
@@ -23,6 +23,7 @@
 #include "quakedef.h"
 #include "cl_video.h"
 #include "utf8lib.h"
+#include "csprogs.h"
 
 cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well; when set to 2, this even works when not at the start of the line in console input; when set to 3, this works even if the toggleconsole key is the color tag"};
 
@@ -107,6 +108,8 @@ static void Key_History_Push(void)
 	if(key_line[1]) // empty?
 	if(strcmp(key_line, "]quit")) // putting these into the history just sucks
 	if(strncmp(key_line, "]quit ", 6)) // putting these into the history just sucks
+	if(strcmp(key_line, "]rcon_password")) // putting these into the history just sucks
+	if(strncmp(key_line, "]rcon_password ", 15)) // putting these into the history just sucks
 		ConBuffer_AddLine(&history, key_line + 1, strlen(key_line) - 1, 0);
 	Con_Printf("%s\n", key_line); // don't mark empty lines as history
 	history_line = -1;
@@ -114,7 +117,7 @@ static void Key_History_Push(void)
 		history_matchfound = false;
 }
 
-qboolean Key_History_Get_foundCommand(void)
+static qboolean Key_History_Get_foundCommand(void)
 {
 	if (!history_matchfound)
 		return false;
@@ -201,7 +204,8 @@ static void Key_History_Find_Backwards(void)
 {
 	int i;
 	const char *partial = key_line + 1;
-	size_t digits = strlen(va("%i", HIST_MAXLINES));
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
 
 	if (history_line == -1) // editing the "new" line
 		strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
@@ -219,7 +223,7 @@ static void Key_History_Find_Backwards(void)
 	if (!*partial)
 		partial = "*";
 	else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
-		partial = va("*%s*", partial);
+		partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
 
 	for ( ; i >= 0; i--)
 		if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
@@ -235,7 +239,8 @@ static void Key_History_Find_Forwards(void)
 {
 	int i;
 	const char *partial = key_line + 1;
-	size_t digits = strlen(va("%i", HIST_MAXLINES));
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
 
 	if (history_line == -1) // editing the "new" line
 		return;
@@ -250,7 +255,7 @@ static void Key_History_Find_Forwards(void)
 	if (!*partial)
 		partial = "*";
 	else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
-		partial = va("*%s*", partial);
+		partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
 
 	for ( ; i < CONBUFFER_LINES_COUNT(&history); i++)
 		if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
@@ -266,13 +271,14 @@ static void Key_History_Find_All(void)
 {
 	const char *partial = key_line + 1;
 	int i, count = 0;
-	size_t digits = strlen(va("%i", HIST_MAXLINES));
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
 	Con_Printf("History commands containing \"%s\":\n", key_line + 1);
 
 	if (!*partial)
 		partial = "*";
 	else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
-		partial = va("*%s*", partial);
+		partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
 
 	for (i=0; i<CONBUFFER_LINES_COUNT(&history); i++)
 		if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
@@ -287,7 +293,8 @@ static void Key_History_f(void)
 {
 	char *errchar = NULL;
 	int i = 0;
-	size_t digits = strlen(va("%i", HIST_MAXLINES));
+	char vabuf[1024];
+	size_t digits = strlen(va(vabuf, sizeof(vabuf), "%i", HIST_MAXLINES));
 
 	if (Cmd_Argc () > 1)
 	{
@@ -1192,17 +1199,16 @@ int chat_mode;
 char		chat_buffer[MAX_INPUTLINE];
 unsigned int	chat_bufferlen = 0;
 
-extern int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
-
 static void
 Key_Message (int key, int ascii)
 {
+	char vabuf[1024];
 	if (key == K_ENTER || ascii == 10 || ascii == 13)
 	{
 		if(chat_mode < 0)
-			Cmd_ExecuteString(chat_buffer, src_command); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
+			Cmd_ExecuteString(chat_buffer, src_command, true); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
 		else
-			Cmd_ForwardStringToServer(va("%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
+			Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
 
 		key_dest = key_game;
 		chat_bufferlen = 0;
@@ -1283,10 +1289,9 @@ FIXME: handle quote special (general escape sequence?)
 ===================
 */
 const char *
-Key_KeynumToString (int keynum)
+Key_KeynumToString (int keynum, char *tinystr, size_t tinystrlength)
 {
 	const keyname_t  *kn;
-	static char tinystr[2];
 
 	// -1 is an invalid code
 	if (keynum < 0)
@@ -1300,8 +1305,11 @@ Key_KeynumToString (int keynum)
 	// if it is printable, output it as a single character
 	if (keynum > 32 && keynum < 256)
 	{
-		tinystr[0] = keynum;
-		tinystr[1] = 0;
+		if (tinystrlength >= 2)
+		{
+			tinystr[0] = keynum;
+			tinystr[1] = 0;
+		}
 		return tinystr;
 	}
 
@@ -1494,6 +1502,7 @@ static void
 Key_PrintBindList(int j)
 {
 	char bindbuf[MAX_INPUTLINE];
+	char tinystr[2];
 	const char *p;
 	int i;
 
@@ -1504,9 +1513,9 @@ Key_PrintBindList(int j)
 		{
 			Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false);
 			if (j == 0)
-				Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i), bindbuf);
+				Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 			else
-				Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+				Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 		}
 	}
 }
@@ -1586,6 +1595,7 @@ Key_WriteBindings (qfile_t *f)
 {
 	int         i, j;
 	char bindbuf[MAX_INPUTLINE];
+	char tinystr[2];
 	const char *p;
 
 	for (j = 0; j < MAX_BINDMAPS; j++)
@@ -1597,9 +1607,9 @@ Key_WriteBindings (qfile_t *f)
 			{
 				Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false); // don't need to escape $ because cvars are not expanded inside bind
 				if (j == 0)
-					FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
+					FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 				else
-					FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+					FS_Printf(f, "in_bind %d %s \"%s\"\n", j, Key_KeynumToString (i, tinystr, sizeof(tinystr)), bindbuf);
 			}
 		}
 	}
@@ -1686,8 +1696,6 @@ void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bi
 	}
 }
 
-qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
-
 /*
 ===================
 Called by the system between frames for both key up and key down events
@@ -1741,6 +1749,7 @@ Key_Event (int key, int ascii, qboolean down)
 	const char *bind;
 	qboolean q;
 	keydest_t keydest = key_dest;
+	char vabuf[1024];
 
 	if (key < 0 || key >= MAX_KEYS)
 		return;
@@ -1852,7 +1861,7 @@ Key_Event (int key, int ascii, qboolean down)
 
 			case key_game:
 				// csqc has priority over toggle menu if it wants to (e.g. handling escape for UI stuff in-game.. :sick:)
-				q = CL_VM_InputEvent(down, key, ascii);
+				q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
 				if (!q && down)
 					MR_ToggleMenu(1);
 				break;
@@ -1874,14 +1883,14 @@ Key_Event (int key, int ascii, qboolean down)
 			{
 				// button commands add keynum as a parm
 				if (bind[0] == '+')
-					Cbuf_AddText (va("%s %i\n", bind, key));
+					Cbuf_AddText (va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
 				else
 				{
 					Cbuf_AddText (bind);
 					Cbuf_AddText ("\n");
 				}
 			} else if(bind[0] == '+' && !down && keydown[key] == 0)
-				Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+				Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
 		}
 		return;
 	}
@@ -1899,6 +1908,10 @@ Key_Event (int key, int ascii, qboolean down)
 			Con_ToggleConsole_f ();
 			return;
 		}
+
+		if (COM_CheckParm ("-noconsole"))
+			return; // only allow the key bind to turn off console
+
 		Key_Console (key, ascii);
 		return;
 	}
@@ -1936,7 +1949,7 @@ Key_Event (int key, int ascii, qboolean down)
 			MR_KeyEvent (key, ascii, down);
 			break;
 		case key_game:
-			q = CL_VM_InputEvent(down, key, ascii);
+			q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
 			// ignore key repeats on binds and only send the bind if the event hasnt been already processed by csqc
 			if (!q && bind)
 			{
@@ -1944,14 +1957,14 @@ Key_Event (int key, int ascii, qboolean down)
 				{
 					// button commands add keynum as a parm
 					if (bind[0] == '+')
-						Cbuf_AddText (va("%s %i\n", bind, key));
+						Cbuf_AddText (va(vabuf, sizeof(vabuf), "%s %i\n", bind, key));
 					else
 					{
 						Cbuf_AddText (bind);
 						Cbuf_AddText ("\n");
 					}
 				} else if(bind[0] == '+' && !down && keydown[key] == 0)
-					Cbuf_AddText(va("-%s %i\n", bind + 1, key));
+					Cbuf_AddText(va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key));
 			}
 			break;
 		default: